Commit graph

498 commits

Author SHA1 Message Date
Sawakita
92a0acca73 Add complete Text-special command $F7, used in CeladonPrizeRoom's menus.
Add also some unused data.

hg-commit-id: 1aa76dd5de95
2012-01-11 16:30:43 +01:00
Bryan Bishop
58f94c6b0d insert FuchsiaCityText6 to FuchsiaCityText10
hg-commit-id: b601bff2c175
2012-01-11 02:18:48 -06:00
Bryan Bishop
68b76de9f2 add labels for $24ef
hg-commit-id: 2336ee2e9bb9
2012-01-11 02:17:46 -06:00
Bryan Bishop
09289d049b calculate usage count for undone texts
hg-commit-id: d3d02d17f44b
2012-01-11 02:15:37 -06:00
Bryan Bishop
5173776c1a add labels for $24f4
It would be nice to consolidate these labels sometime.

hg-commit-id: 5e42bc17a4ba
2012-01-11 02:03:43 -06:00
Bryan Bishop
d73fb7c62b insert $8 asm for SaffronHouse1Text2
hg-commit-id: 17b0b80e75d0
2012-01-11 00:48:35 -06:00
Bryan Bishop
3fe6c18e32 insert $8 asm for LavenderHouse2Text1 and CopycatsHouseF1Text3
hg-commit-id: bdebc5431d24
2012-01-11 00:46:09 -06:00
Bryan Bishop
7db2305640 insert $8 asm for LavenderHouse1Text3 and LavenderHouse1Text4
hg-commit-id: 0bb9b249a63e
2012-01-11 00:41:35 -06:00
Bryan Bishop
8ce98b8c1b insert $8 asm for CeladonMansion1Text3 and Text4
hg-commit-id: bb2ad6a49436
2012-01-11 00:12:03 -06:00
Bryan Bishop
32e7c1376b insert asm for CeladonMansion1Text1
hg-commit-id: 4cd9f49cf4e7
2012-01-11 00:08:49 -06:00
IIMarckus
cdfdfb3337 Merge.
hg-commit-id: d2fa964e97d1
2012-01-10 23:05:13 -07:00
IIMarckus
5137fe402b Predef 54, used for in‐game trades.
hg-commit-id: 02f0dd9e097a
2012-01-10 22:44:50 -07:00
IIMarckus
317a98db94 Use item names in object data.
hg-commit-id: 800f382722dc
2012-01-10 20:57:41 -07:00
Bryan Bishop
078de8c3c8 Merge.
hg-commit-id: a16a040fd67a
2012-01-10 21:41:36 -06:00
IIMarckus
376810b3be Use constants in trainer object data.
hg-commit-id: 07bbae7f8446
2012-01-10 19:53:02 -07:00
IIMarckus
d9f764e923 $CD3D seems to be used only for trades, so document it as such.
hg-commit-id: 3207c2aa47df
2012-01-10 18:16:18 -07:00
Bryan Bishop
19a3f455b7 asm for SSAnne10Text8
hg-commit-id: 7da8883183fd
2012-01-10 19:04:24 -06:00
Sawakita
7221205034 Add texts used in Prize Corner Menu script (aka text-special $F7). Add also what seems a leftover unused text.
hg-commit-id: 0dfe514a7bbb
2012-01-11 01:16:24 +01:00
Bryan Bishop
baa077c579 clean up Lab2Text2 asm
hg-commit-id: 6eafc37892a0
2012-01-10 17:40:19 -06:00
Bryan Bishop
f90b3fece1 RockTunnel1 texts and update gbz80disasm to not handle $8
hg-commit-id: 86d0d495afbc
2012-01-10 17:35:03 -06:00
Bryan Bishop
22e331c330 asm for SSAnne8Text8
hg-commit-id: bdbbbc812f6b
2012-01-10 17:02:48 -06:00
Bryan Bishop
2a81950a3e texts for VermilionHouse1 and asm
hg-commit-id: e4d9de97f235
2012-01-10 16:58:00 -06:00
Sawakita
6ca9439c65 Function $3493, former CheckBagItemExist, is now called IsItemInBag (consistency). Added base routine for text-special id $F7
hg-commit-id: 105c01affa23
2012-01-10 23:54:38 +01:00
Bryan Bishop
9f64c38b0c asm for PewterHouse1Text1
hg-commit-id: b5b69e108340
2012-01-10 16:45:55 -06:00
Bryan Bishop
eeba935da9 insert $8 asm for CeladonCityText7 after TX_FAR
hg-commit-id: c6893d996b1d
2012-01-10 16:44:15 -06:00
Bryan Bishop
b5f656e3c8 insert $8 asm for VermilionCityText5 after TX_FAR
hg-commit-id: 80e8ce9ea8fd
2012-01-10 16:41:34 -06:00
Bryan Bishop
62daaef8e9 remove excess newlines
hg-commit-id: e909337273e4
2012-01-10 14:33:34 -06:00
Bryan Bishop
deb5bf89ae call $00b5 -> call CopyData
hg-commit-id: e6a487cf2186
2012-01-10 14:31:38 -06:00
Bryan Bishop
c52d1a1e87 remove empty INCBINs from pokered.asm
hg-commit-id: 9da7ef61c406
2012-01-10 14:24:34 -06:00
Bryan Bishop
cb9e9404c5 replace call $3e6d -> call Predef
hg-commit-id: 8045c9d0d1a1
2012-01-10 14:12:24 -06:00
Bryan Bishop
464f06ced7 Merge.
hg-commit-id: 5d78a23cd0c7
2012-01-10 13:47:00 -06:00
Bryan Bishop
76dc9b8170 call $2f9e -> call GetMonName
hg-commit-id: 7bb690c08a4d
2012-01-10 13:44:54 -06:00
IIMarckus
b8077a31f8 Fix typo: Lavendar → Lavender.
hg-commit-id: f7b8d7224f5c
2012-01-10 12:10:15 -07:00
Bryan Bishop
7990b5f632 call $31cc -> call LoadTrainerHeader
hg-commit-id: ad7efeae25ae
2012-01-10 12:06:48 -06:00
Bryan Bishop
24d5cdd15e call $3dd7 -> call Delay3
hg-commit-id: 48f0de3e5ee3
2012-01-10 11:06:45 -06:00
Bryan Bishop
b37a473c7c call $35d6 -> call Bankswitch
Thanks sawakita.

hg-commit-id: 3f365e56f6e6
2012-01-10 09:50:56 -06:00
Bryan Bishop
468d065715 call $3927 -> call AddPokemonToParty
hg-commit-id: a4ec02195797
2012-01-10 02:11:54 -06:00
Bryan Bishop
e8fdd637b6 remove trailing whitespace
hg-commit-id: 97ab9714f6e2
2012-01-10 01:54:03 -06:00
Bryan Bishop
e7ca984d9d call $3e48 -> call GivePokemon
hg-commit-id: 47cc1351a7b5
2012-01-10 01:48:44 -06:00
Bryan Bishop
983b87069d call $3c49 -> call PrintText
hg-commit-id: 2d9bb23f9db3
2012-01-10 01:05:09 -06:00
Bryan Bishop
a036d99f28 replace all MR__MIME -> MR_MIME
hg-commit-id: d7c6ab9c996e
2012-01-10 00:35:23 -06:00
Bryan Bishop
0527d9686d OAK_S_PARCEL -> OAKS_PARCEL
hg-commit-id: e03d18825d81
2012-01-10 00:32:54 -06:00
Bryan Bishop
69f6603b82 clean up Route2Text2 asm
hg-commit-id: ba721fa305ad
2012-01-10 00:27:06 -06:00
IIMarckus
eb9ea271da Expand arguments to $3E48 (give Pokémon).
hg-commit-id: 19b5e33a08c7
2012-01-09 23:10:50 -07:00
IIMarckus
0c9db7d447 Expand arguments to $3493, $13D0.
hg-commit-id: 20f43fcec416
2012-01-09 23:07:18 -07:00
IIMarckus
0c2da1f0fb Expand arguments to $3e2e.
hg-commit-id: 0676d79eee24
2012-01-09 22:49:15 -07:00
Bryan Bishop
096e5155e2 asm injection for most $08 text scripts
hg-commit-id: 585b34d6c244
2012-01-09 23:12:43 -06:00
Bryan Bishop
7819dc288e CELADON_HOUSE_2 -> CELADON_HOUSE
hg-commit-id: 0574f08aaf85
2012-01-09 01:19:10 -06:00
Bryan Bishop
b6d8ebb416 fix map naming mistakes in celadon city
hg-commit-id: d7234963d818
2012-01-09 01:15:09 -06:00
Sawakita
cdaf8e3d9a Add function to get a monster's name from a given id (internal order).
hg-commit-id: 42e7deffd9b8
2012-01-08 23:45:46 +01:00
Sawakita
4b11f36a0a Add explanatory comment to function CheckBagItemExist ($3493).
hg-commit-id: 1765b4515253
2012-01-08 14:12:18 +01:00
Sawakita
e590a10b81 Function3493 is now labeled CheckBagItemExist.
hg-commit-id: 8afe60ff982a
2012-01-08 14:07:32 +01:00
Bryan Bishop
dc0af17185 insert labels for map texts pointer lists
hg-commit-id: f374e6e126d7
2012-01-08 05:03:58 -06:00
Bryan Bishop
be26f828bd even more TX_FAR insertions
hg-commit-id: 44e1dbd6bd48
2012-01-08 04:48:59 -06:00
Bryan Bishop
82eb22acc5 more TX_FAR insertions
hg-commit-id: ba6ffc8ba7af
2012-01-08 03:43:35 -06:00
Bryan Bishop
a1dcf11f7c minor spacing and formatting
hg-commit-id: 4141f2d72c99
2012-01-07 16:25:31 -06:00
Bryan Bishop
4c0265e6d5 fix _ViridianHouseText1
hg-commit-id: d6fa1ce51d98
2012-01-07 16:23:50 -06:00
Bryan Bishop
db8de333af merge and more typo fixes
hg-commit-id: d50dff2b19cd
2012-01-07 16:08:15 -06:00
IIMarckus
f3bc5b4cad Add an explanatory comment.
hg-commit-id: 83fada9b6062
2012-01-07 14:46:55 -07:00
Bryan Bishop
3fb87cc7db fix map files for cinnibar -> cinnabar
hg-commit-id: 8d9cd5c5d165
2012-01-07 15:43:36 -06:00
Bryan Bishop
10307a7032 typo fix for cinnibar -> cinnabar
hg-commit-id: 5001a53ec965
2012-01-07 15:40:25 -06:00
Bryan Bishop
53d2e24212 add TX_FAR target texts into pokered
hg-commit-id: 17491cbcc0dd
2012-01-07 15:13:45 -06:00
Bryan Bishop
53f6e08cfb trainer pics and basemoney (stag019)
hg-commit-id: cfc025c5493c
2012-01-07 02:03:58 -06:00
Bryan Bishop
242a02aaa7 analyze_text now works with TX_FAR
hg-commit-id: a32cf6cdc6f2
2012-01-06 14:23:12 -06:00
IIMarckus
2d9ab82912 Improve sprite names.
hg-commit-id: 9536a76e3bfa
2012-01-05 22:53:41 -07:00
IIMarckus
faa63c870b Merge.
hg-commit-id: c6f5d5a99ac0
2012-01-05 22:36:06 -07:00
Bryan Bishop
cfe485a1e6 insert object asm
hg-commit-id: 9974e529c8d6
2012-01-05 20:57:41 -06:00
Bryan Bishop
813959be7f use sprite constants in pretty printer
hg-commit-id: cd88256deb01
2012-01-05 19:51:32 -06:00
Bryan Bishop
1cd1d213d5 update PalletTownObject to use sprite constants
hg-commit-id: e3adb2ca074c
2012-01-05 19:30:18 -06:00
Bryan Bishop
238a5e62ae pretty printer for object labels and asm
hg-commit-id: 9bde3604346f
2012-01-05 12:49:17 -06:00
Bryan Bishop
cd587686b2 extract "referenced texts" from maps
hg-commit-id: 94497200a58e
2012-01-04 23:34:57 -06:00
Bryan Bishop
78fca64b60 commenting some addresses
hg-commit-id: d497cf886c56
2012-01-04 15:19:03 -06:00
Bryan Bishop
f6b2d98ed9 improve spacing
hg-commit-id: 257c1743c396
2012-01-04 03:28:33 -06:00
Bryan Bishop
27af4ea2ab add block labels to map headers
.. and a tool for assisting with that.

hg-commit-id: f832fa6e62f9
2012-01-04 01:57:15 -06:00
Bryan Bishop
8ef51d4697 add most of the block labels
map_block_dumper now compiles on each insert, which can help to figure out
which labels are breaking the project.

hg-commit-id: 1e1383f3aa30
2012-01-04 00:57:22 -06:00
Bryan Bishop
3f35c6cf07 import lots of block labels
map_block_dumper is very buggy, so not all labels are included yet.

hg-commit-id: 1880e2dfbf9e
2012-01-04 00:11:39 -06:00
IIMarckus
67d3093008 Merge.
hg-commit-id: bd1661c6d0ce
2012-01-03 21:05:57 -07:00
IIMarckus
fc08fc672b Use map IDs in connections.
hg-commit-id: 8376b329c44a
2012-01-03 21:02:08 -07:00
Bryan Bishop
77a7db9b6f map header banks labels
hg-commit-id: d44464a63b34
2012-01-03 21:11:33 -06:00
Bryan Bishop
82f96c1fd1 apply labels to map header pointers
hg-commit-id: fa396df12a25
2012-01-03 20:19:46 -06:00
Bryan Bishop
b39515837f fix typos in map header labels
hg-commit-id: c08a300e1368
2012-01-03 19:40:24 -06:00
IIMarckus
7c1662a128 Merge.
hg-commit-id: 0284b4cb83de
2012-01-03 17:16:00 -07:00
Bryan Bishop
638cf29252 Agatha_h map header asm
hg-commit-id: 7ccf3950d450
2012-01-03 18:07:02 -06:00
Bryan Bishop
1995b33450 Bruno_h map header asm
hg-commit-id: 0945271a7a2d
2012-01-03 18:06:51 -06:00
Bryan Bishop
14eaa3af91 Loreli_h map header asm
hg-commit-id: fa9d04e0d350
2012-01-03 18:06:41 -06:00
Bryan Bishop
c6ea921af0 CopycatsHouseF1_h map header asm
hg-commit-id: 150985995e8c
2012-01-03 18:06:28 -06:00
Bryan Bishop
3605666a51 CinnibarMart_h map header asm
hg-commit-id: a4db807a1782
2012-01-03 18:06:14 -06:00
Bryan Bishop
71a8ed8a30 CinnibarPokecenter_h map header asm
Someone should fix all these typos.

hg-commit-id: 34e75fbee1e8
2012-01-03 18:05:58 -06:00
Bryan Bishop
a4a24081f6 Lab4_h map header asm
hg-commit-id: 70ccb152f714
2012-01-03 18:05:32 -06:00
Bryan Bishop
f942384a40 Lab3_h map header asm
hg-commit-id: 76be28006281
2012-01-03 18:05:19 -06:00
Bryan Bishop
ec360c7164 Lab2_h map header asm
hg-commit-id: f4739a7893e8
2012-01-03 18:05:09 -06:00
Bryan Bishop
5c7fa2adef Lab1_h map header asm
hg-commit-id: 30e76cbfd9e7
2012-01-03 18:04:58 -06:00
Bryan Bishop
3213b1ffff CinnibarGym_h map header asm
hg-commit-id: 374ef5b4e790
2012-01-03 18:03:44 -06:00
Bryan Bishop
4f10b26ae4 FuchsiaMeetingRoom_h map header asm
hg-commit-id: dd8f340c232c
2012-01-03 18:03:30 -06:00
Bryan Bishop
49299e799f FuchsiaGYM_h map header asm
hg-commit-id: 2f892e5efc63
2012-01-03 18:03:19 -06:00
Bryan Bishop
cfc7c7607a SafariZoneEntrance_h map header asm
hg-commit-id: 57435711287a
2012-01-03 18:03:06 -06:00
Bryan Bishop
2bb99cc0a5 FuchsiaHouse2_h map header asm
hg-commit-id: e8b96603579a
2012-01-03 18:00:58 -06:00
Bryan Bishop
13db6606f9 FuchsiaPokecenter_h map header asm
hg-commit-id: 7127d4713006
2012-01-03 18:00:40 -06:00
Bryan Bishop
d598f06995 FuchsiaHouse1_h map header asm
hg-commit-id: 13c77564712c
2012-01-03 18:00:28 -06:00
Bryan Bishop
2308421700 CeruleanHouse3_h map header asm
hg-commit-id: 5cd79b6a7367
2012-01-03 18:00:13 -06:00