Sawakita
cd4c3f1d90
Add routine that ends text-scripts ($24D7).
...
hg-commit-id: 89e0ea79b7ff
2012-01-12 20:59:03 +01:00
Bryan Bishop
dab1920405
more labels for PewterCityTexts
...
hg-commit-id: 54b85a52f3bf
2012-01-12 13:55:18 -06:00
Bryan Bishop
34e8c31153
labels for ViridianCityText14 and ViridianCityText15
...
hg-commit-id: f35e40e60a17
2012-01-12 13:50:08 -06:00
Bryan Bishop
c1ad3c081e
insert $8 asm for Route11GateUpstairsText2
...
hg-commit-id: 152301ccc043
2012-01-12 13:22:41 -06:00
Bryan Bishop
2e22ddb2b6
insert $8 asm for CeruleanHouse3Text1
...
hg-commit-id: 37862fe18a17
2012-01-12 13:10:31 -06:00
Bryan Bishop
dba77d1afa
insert text script for CeruleanPokecenterText4
...
hg-commit-id: b9dcdcbb2839
2012-01-12 13:07:58 -06:00
Bryan Bishop
0e9c4d7922
insert $8 asm for Route11GateUpstairsText4
...
hg-commit-id: 8254a228899c
2012-01-12 13:04:00 -06:00
Bryan Bishop
969360c42f
insert $8 asm for PewterPokecenterText3
...
hg-commit-id: 69196d26d8a0
2012-01-12 12:59:23 -06:00
Bryan Bishop
808a1d909a
insert $8 asm for Lab4Text1
...
hg-commit-id: 6f50551b0d5d
2012-01-12 12:57:32 -06:00
Bryan Bishop
1ae8e7e41e
insert $8 asm for NameRaterText1
...
hg-commit-id: dd9f5126d4a5
2012-01-12 12:55:54 -06:00
Bryan Bishop
7e35470fb1
update gbz80disasm based on sawakita's changes
...
Changes include:
* .ASM_ labels now include their offset in the label
* byte_labels keeps better track of when a label is defined versus used
* reverse relative jumps now work
* reverse unconditional relative jumps can end a script
hg-commit-id: 8afc93fce17a
2012-01-12 12:35:03 -06:00
Bryan Bishop
41085fdac1
improve newlines around INCBINs
...
hg-commit-id: 0fc00a2e33a5
2012-01-12 11:43:39 -06:00
Bryan Bishop
ccd18da901
minor formatting and some hidden $17s
...
hg-commit-id: fc40b8c56a2f
2012-01-12 10:16:20 -06:00
Bryan Bishop
e86e0962c6
minor formatting
...
hg-commit-id: 6901fd7898c8
2012-01-12 01:53:00 -06:00
Bryan Bishop
418dc214d8
insert texts pointer labels
...
hg-commit-id: 18cc3e2ec33b
2012-01-12 01:31:14 -06:00
Bryan Bishop
101defa567
texts for marts and pokecenters
...
hg-commit-id: 7f2bd9622f0e
2012-01-11 23:19:31 -06:00
Bryan Bishop
244b30b760
text labels for MartInventories on various marts
...
hg-commit-id: f0b79b11f8ed
2012-01-11 23:09:03 -06:00
Bryan Bishop
2927702b53
add in more $17s
...
hg-commit-id: 7b3ae9787536
2012-01-11 21:17:38 -06:00
Bryan Bishop
ed0587753d
switch CeladonHouse2 -> CeladonHouse
...
hg-commit-id: 1e13e8181c4c
2012-01-11 21:09:37 -06:00
Bryan Bishop
6a6860d7fa
insert more missing TX_FARs
...
hg-commit-id: dece9a5f3932
2012-01-11 21:06:45 -06:00
Bryan Bishop
df541ab098
some TX_FARs for the cerulean pokecenter
...
hg-commit-id: a0f54bfe94a6
2012-01-11 20:36:11 -06:00
Bryan Bishop
54743111e7
text script for Route7Text1
...
hg-commit-id: 7143f59d5210
2012-01-11 20:29:26 -06:00
Bryan Bishop
a0e7348eed
add CeruleanCityText11 for 0x19707
...
hg-commit-id: 0db3e375cded
2012-01-11 20:25:27 -06:00
Bryan Bishop
5b0afd9517
insert $8 asm for CinnabarGymText1
...
hg-commit-id: 1323fe54b35e
2012-01-11 18:58:40 -06:00
Bryan Bishop
eb021a274a
insert $8 asm for Route16GateUpstairsText3
...
hg-commit-id: defaa9b4cfbb
2012-01-11 18:53:41 -06:00
Bryan Bishop
340e6b77a6
insert $8 asm for Route16GateUpstairsText4
...
hg-commit-id: a33b319c7b23
2012-01-11 18:53:07 -06:00
Bryan Bishop
64beee9952
insert $8 asm for Route18GateHeaderText2
...
hg-commit-id: 2bccab15cbe2
2012-01-11 18:52:31 -06:00
Bryan Bishop
6e0d93897b
insert $8 asm for Route18GateHeaderText3
...
hg-commit-id: 84b2f21095ca
2012-01-11 18:51:56 -06:00
Bryan Bishop
f398a688be
insert $8 asm for Route22GateText1
...
hg-commit-id: a4e7cb7451d7
2012-01-11 18:51:03 -06:00
Bryan Bishop
9140cc9f6b
insert $8 asm for Route12GateUpstairsText3
...
hg-commit-id: f33babf523fe
2012-01-11 18:46:27 -06:00
Bryan Bishop
8c4b673527
more labels to $24f4
...
hg-commit-id: 4823454a80f5
2012-01-11 18:04:08 -06:00
Bryan Bishop
d1a8c31e77
insert $8 asm for SilphCo7Text2
...
hg-commit-id: 916768f25e5b
2012-01-11 17:59:09 -06:00
Bryan Bishop
ce68f6d50a
add some missing labels
...
hg-commit-id: 5d83b388692d
2012-01-11 17:53:47 -06:00
Bryan Bishop
68d4d86a8f
insert $8 asm for SSAnne2Text2
...
hg-commit-id: 630f9825b2f0
2012-01-11 17:44:56 -06:00
Bryan Bishop
c3f1948295
insert $8 asm for FanClubText3
...
hg-commit-id: fe1fe41ba506
2012-01-11 17:40:57 -06:00
Bryan Bishop
6d6c18a301
formatting and comments
...
hg-commit-id: 4cf41759eaf0
2012-01-11 16:20:28 -06:00
Bryan Bishop
e503e4a11f
insert $8 asm for BillsHouseText1
...
It might be wrong in a few places.
hg-commit-id: 06d15cb0916a
2012-01-11 15:46:14 -06:00
Bryan Bishop
4ce1147ea1
insert $8 asm for PowerPlantText1 through PowerPlantText9
...
hg-commit-id: 007d3cf47ac8
2012-01-11 15:06:47 -06:00
Bryan Bishop
981000457c
minor formatting
...
hg-commit-id: b6dfe0dfccd2
2012-01-11 13:57:19 -06:00
Bryan Bishop
691aa8e157
add labels for route 6, 7 and 8 text 1
...
hg-commit-id: 47a63dca1005
2012-01-11 13:51:35 -06:00
Bryan Bishop
9929aeebdd
insert $8 asm for DayCareMText1
...
hg-commit-id: ac1232cf7507
2012-01-11 13:49:09 -06:00
Bryan Bishop
9dc95999a7
insert $8 asm for Route5GateText1
...
hg-commit-id: 85a92f85a4aa
2012-01-11 13:47:43 -06:00
Bryan Bishop
364636ca80
lots of $8 asm for MuseumF1Text1
...
hg-commit-id: 23064c3aae09
2012-01-11 13:32:18 -06:00
Bryan Bishop
6246ff333e
OaksLabText11 is a dupe label
...
hg-commit-id: a30f0752edf9
2012-01-11 13:02:49 -06:00
Bryan Bishop
7612f12b90
OaksLabText7 is a dupe label
...
hg-commit-id: 11bdde35e19c
2012-01-11 13:01:38 -06:00
Bryan Bishop
184c4b6e28
fix $8 asm for OaksLabText2 and mystery/unknown text
...
hg-commit-id: 455eee06f3bf
2012-01-11 12:55:36 -06:00
Bryan Bishop
de9a27a599
insert $8 asm for Route24Text1
...
hg-commit-id: f6abf7fc106a
2012-01-11 12:36:16 -06:00
Bryan Bishop
eecf03049d
fix $8 asm for Route23Text7
...
hg-commit-id: 2eafd9cbee4d
2012-01-11 12:34:08 -06:00
Bryan Bishop
f7c85f3f46
fix asm for route 15 texts 1 through 10 inclusive
...
hg-commit-id: ebc3762217dc
2012-01-11 12:24:57 -06:00
Bryan Bishop
167d9baac3
fix asm for route 9 texts 1 through 9 inclusive
...
hg-commit-id: e139dfb9a032
2012-01-11 12:20:16 -06:00
Bryan Bishop
cd59b24ca9
insert $8 asm for Route6Text1
...
hg-commit-id: f56f59f86532
2012-01-11 12:09:17 -06:00
Bryan Bishop
9c9d28d7d3
insert $8 asm for CeruleanCityText2
...
hg-commit-id: d0395d887ccb
2012-01-11 12:08:35 -06:00
Bryan Bishop
89e2139d29
insert $8 asm for PewterCityText4
...
hg-commit-id: ee53f387f876
2012-01-11 12:07:37 -06:00
Bryan Bishop
3dc998e060
Merge in sawakita's coincase work.
...
hg-commit-id: 3265210c8894
2012-01-11 11:45:21 -06:00
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
