summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.hgignore3
-rw-r--r--common.asm913
-rw-r--r--extras/gbz80disasm.py6
-rw-r--r--extras/print_pc_items.py9
4 files changed, 506 insertions, 425 deletions
diff --git a/.hgignore b/.hgignore
index 4ae8e30e..afbb546c 100644
--- a/.hgignore
+++ b/.hgignore
@@ -6,6 +6,9 @@ syntax: glob
#compiled object file
*.o
+#no binaries
+*.exe
+
#roms
*.gbc
diff --git a/common.asm b/common.asm
index 1589ec03..4309c676 100644
--- a/common.asm
+++ b/common.asm
@@ -12453,12 +12453,12 @@ ViridianCityText2: ; 0x19107
db $08 ; asm
ld a, [$d356]
cp $7f
- ld hl, $5127
+ ld hl, UnnamedText_19127
jr z, .asm_ae9fe ; 0x19110
ld a, [$d751]
bit 1, a
jr nz, .asm_ae9fe ; 0x19117
- ld hl, $5122
+ ld hl, UnnamedText_19122
.asm_ae9fe ; 0x1911c
call PrintText
jp TextScriptEnd
@@ -12475,17 +12475,17 @@ UnnamedText_19127: ; 0x19127
ViridianCityText3: ; 0x1912c
db $08 ; asm
- ld hl, $514d
+ ld hl, UnnamedText_1914d
call PrintText
call $35ec
ld a, [$cc26]
and a
jr nz, .asm_6dfea ; 0x1913a
- ld hl, $5157
+ ld hl, UnnamedText_19157
call PrintText
jr .asm_d611f ; 0x19142
.asm_6dfea ; 0x19144
- ld hl, $5152
+ ld hl, UnnamedText_19152
call PrintText
.asm_d611f ; 0x1914a
jp TextScriptEnd
@@ -12510,11 +12510,11 @@ ViridianCityText4: ; 0x1915c
ld a, [$d74b]
bit 5, a
jr nz, .asm_83894 ; 0x19162
- ld hl, $5175
+ ld hl, UnnamedText_19175
call PrintText
jr .asm_700a6 ; 0x1916a
.asm_83894 ; 0x1916c
- ld hl, $517a
+ ld hl, UnnamedText_1917a
call PrintText
.asm_700a6 ; 0x19172
jp TextScriptEnd
@@ -12531,7 +12531,7 @@ UnnamedText_1917a: ; 0x1917a
ViridianCityText5: ; 0x1917f
db $08 ; asm
- ld hl, $5191
+ ld hl, UnnamedText_19191
call PrintText
call $50cf
ld a, $3
@@ -12548,22 +12548,22 @@ ViridianCityText6: ; 0x19196
ld a, [$d74c]
bit 1, a
jr nz, .asm_4e5a0 ; 0x1919c
- ld hl, $51ca
+ ld hl, UnnamedText_191ca
call PrintText
- ld bc,(TM_42 << 8) | 1
+ ld bc, (TM_42 << 8) | 1
call GiveItem
jr nc, .asm_b655e ; 0x191aa
- ld hl, $51cf
+ ld hl, ReceivedTM42Text
call PrintText
ld hl, $d74c
set 1, [hl]
jr .asm_3c73c ; 0x191b7
.asm_b655e ; 0x191b9
- ld hl, $51da
+ ld hl, UnnamedText_191da
call PrintText
jr .asm_3c73c ; 0x191bf
.asm_4e5a0 ; 0x191c1
- ld hl, $51d5
+ ld hl, UnnamedText_191d5
call PrintText
.asm_3c73c ; 0x191c7
jp TextScriptEnd
@@ -12573,7 +12573,10 @@ UnnamedText_191ca: ; 0x191ca
db $50
; 0x191ca + 5 bytes
-INCBIN "baserom.gbc",$191cf,$191d5 - $191cf
+ReceivedTM42Text: ; 0x191cf
+ TX_FAR _ReceivedTM42Text ; 0xa469a
+ db $10, $50
+; 0x191cf + 6 bytes = 0x191d5
UnnamedText_191d5: ; 0x191d5
TX_FAR _UnnamedText_191d5
@@ -12587,7 +12590,7 @@ UnnamedText_191da: ; 0x191da
ViridianCityText7: ; 0x191df
db $08 ; asm
- ld hl, $520a
+ ld hl, UnnamedText_1920a
call PrintText
ld c, $2
call $3739
@@ -12595,13 +12598,13 @@ ViridianCityText7: ; 0x191df
ld a, [$cc26]
and a
jr z, .asm_42f68 ; 0x191f2
- ld hl, $520f
+ ld hl, UnnamedText_1920f
call PrintText
ld a, $1
ld [$d5f4], a
jr .asm_2413a ; 0x191ff
.asm_42f68 ; 0x19201
- ld hl, $5214
+ ld hl, UnnamedText_19214
call PrintText
.asm_2413a ; 0x19207
jp TextScriptEnd
@@ -12685,17 +12688,17 @@ PewterCityText2: ; 0x193ac
PewterCityText3: ; 0x193b1
db $08 ; asm
- ld hl, $53f1
+ ld hl, UnnamedText_193f1
call PrintText
call $35ec
ld a, [$cc26]
and a
jr nz, .asm_f46a9 ; 0x193bf
- ld hl, $53f6
+ ld hl, UnnamedText_193f6
call PrintText
jr .asm_ac429 ; 0x193c7
.asm_f46a9 ; 0x193c9
- ld hl, $53fb
+ ld hl, UnnamedText_193fb
call PrintText
xor a
ldh [$b3], a
@@ -12737,17 +12740,17 @@ UnnamedText_19400: ; 0x19400
PewterCityText4: ; 0x19405
db $8
- ld hl, $5427
+ ld hl, UnnamedText_19427
call PrintText
call $35ec
ld a, [$cc26]
cp $0
jr nz, .asm_e4603
- ld hl, $542c
+ ld hl, UnnamedText_1942c
call PrintText
jr .asm_e4604 ; 0x1941c $6
.asm_e4603
- ld hl, $5431
+ ld hl, UnnamedText_19431
call PrintText
.asm_e4604 ; 0x19424
jp TextScriptEnd
@@ -12770,7 +12773,7 @@ UnnamedText_19431: ; 0x19431
PewterCityText5: ; 0x19436
db $08 ; asm
- ld hl, $545d
+ ld hl, UnnamedText_1945d
call PrintText
xor a
ldh [$b4], a
@@ -13005,11 +13008,11 @@ CeruleanCityText1: ; 0x1964f
ld a, [$d75a]
bit 0, a
jr z, .asm_a89f9 ; 0x19655
- ld hl, $5677
+ ld hl, UnnamedText_19677
call PrintText
jr .asm_815c6 ; 0x1965d
.asm_a89f9 ; 0x1965f
- ld hl, $5668
+ ld hl, UnnamedText_19668
call PrintText
.asm_815c6 ; 0x19665
jp TextScriptEnd
@@ -13124,17 +13127,17 @@ CeruleanCityText7: ; 0x1970c
ldh a, [$d3]
cp $b4
jr c, .asm_e9fc9 ; 0x19711
- ld hl, $5730
+ ld hl, UnnamedText_19730
call PrintText
jr .asm_d486e ; 0x19719
.asm_e9fc9 ; 0x1971b
cp $64
jr c, .asm_df99b ; 0x1971d
- ld hl, $5735
+ ld hl, UnnamedText_19735
call PrintText
jr .asm_d486e ; 0x19725
.asm_df99b ; 0x19727
- ld hl, $573a
+ ld hl, UnnamedText_1973a
call PrintText
.asm_d486e ; 0x1972d
jp TextScriptEnd
@@ -13159,23 +13162,23 @@ CeruleanCityText8: ; 0x1973f
ldh a, [$d3]
cp $b4
jr c, .asm_e28da ; 0x19744
- ld hl, $576f
+ ld hl, UnnamedText_1976f
call PrintText
jr .asm_f2f38 ; 0x1974c
.asm_e28da ; 0x1974e
cp $78
jr c, .asm_15d08 ; 0x19750
- ld hl, $5774
+ ld hl, UnnamedText_19774
call PrintText
jr .asm_f2f38 ; 0x19758
.asm_15d08 ; 0x1975a
cp $3c
jr c, .asm_d7fea ; 0x1975c
- ld hl, $5779
+ ld hl, UnnamedText_19779
call PrintText
jr .asm_f2f38 ; 0x19764
.asm_d7fea ; 0x19766
- ld hl, $577e
+ ld hl, UnnamedText_1977e
call PrintText
.asm_f2f38 ; 0x1976c
jp TextScriptEnd
@@ -13305,11 +13308,11 @@ VermilionCityText2: ; 0x1988e
ld a, [$d803]
bit 2, a
jr nz, .asm_359bd ; 0x19894
- ld hl, $58a7
+ ld hl, UnnamedText_198a7
call PrintText
jr .asm_735d9 ; 0x1989c
.asm_359bd ; 0x1989e
- ld hl, $58ac
+ ld hl, UnnamedText_198ac
call PrintText
.asm_735d9 ; 0x198a4
jp TextScriptEnd
@@ -13336,11 +13339,11 @@ VermilionCityText3: ; 0x198b1
call $34bf
jr nc, .asm_57b73 ; 0x198c6
.asm_07af3 ; 0x198c8
- ld hl, $5904
+ ld hl, UnnamedText_19904
call PrintText
jr .asm_79bd1 ; 0x198ce
.asm_57b73 ; 0x198d0
- ld hl, $5909
+ ld hl, UnnamedText_19909
call PrintText
ld b, $3f
ld a, $1c
@@ -13348,17 +13351,17 @@ VermilionCityText3: ; 0x198b1
ld a, b
and a
jr nz, .asm_0419b ; 0x198df
- ld hl, $5913
+ ld hl, UnnamedText_19913
call PrintText
jr .asm_79bd1 ; 0x198e7
.asm_0419b ; 0x198e9
- ld hl, $590e
+ ld hl, UnnamedText_1990e
call PrintText
ld a, $4
ld [$d62a], a
jr .asm_79bd1 ; 0x198f4
.asm_3e0e9 ; 0x198f6
- ld hl, $5918
+ ld hl, UnnamedText_19918
call PrintText
.asm_79bd1 ; 0x198fc
jp TextScriptEnd
@@ -13465,22 +13468,22 @@ CeladonCityText5: ; 0x1999e
ld a, [$d777]
bit 0, a
jr nz, .asm_7053f ; 0x199a4
- ld hl, $59d2
+ ld hl, UnnamedText_199d2
call PrintText
- ld bc,(TM_41 << 8) | 1
+ ld bc, (TM_41 << 8) | 1
call GiveItem
jr c, .asm_890ec ; 0x199b2
- ld hl, $59e2
+ ld hl, UnnamedText_199e2
call PrintText
jr .asm_c765a ; 0x199ba
.asm_890ec ; 0x199bc
- ld hl, $59d7
+ ld hl, UnnamedText_199d7
call PrintText
ld hl, $d777
set 0, [hl]
jr .asm_c765a ; 0x199c7
.asm_7053f ; 0x199c9
- ld hl, $59dd
+ ld hl, UnnamedText_199dd
call PrintText
.asm_c765a ; 0x199cf
jp TextScriptEnd
@@ -13490,7 +13493,10 @@ UnnamedText_199d2: ; 0x199d2
db $50
; 0x199d2 + 5 bytes
-INCBIN "baserom.gbc",$199d7,$199dd - $199d7
+UnnamedText_199d7: ; 0x199d7
+ TX_FAR _UnnamedText_199d7 ; 0xa5b5a
+ db $0B, $50
+; 0x199d7 + 6 bytes = 0x199dd
UnnamedText_199dd: ; 0x199dd
TX_FAR _UnnamedText_199dd
@@ -13608,7 +13614,7 @@ FuchsiaCityText18: ; 0x19a8b
FuchsiaCityText19: ; 0x19a90
db $08 ; asm
- ld hl, $5a9f
+ ld hl, UnnamedText_19a9f
call PrintText
ld a, $28
call $349b
@@ -13621,7 +13627,7 @@ UnnamedText_19a9f: ; 0x19a9f
FuchsiaCityText20: ; 0x19aa4
db $08 ; asm
- ld hl, $5ab3
+ ld hl, UnnamedText_19ab3
call PrintText
ld a, $6
call $349b
@@ -13634,7 +13640,7 @@ UnnamedText_19ab3: ; 0x19ab3
FuchsiaCityText21: ; 0x19ab8
db $08 ; asm
- ld hl, $5ac7
+ ld hl, UnnamedText_19ac7
call PrintText
ld a, $2
call $349b
@@ -13647,7 +13653,7 @@ UnnamedText_19ac7: ; 0x19ac7
FuchsiaCityText22: ; 0x19acc
db $08 ; asm
- ld hl, $5adb
+ ld hl, UnnamedText_19adb
call PrintText
ld a, $25
call $349b
@@ -13660,7 +13666,7 @@ UnnamedText_19adb: ; 0x19adb
FuchsiaCityText23: ; 0x19ae0
db $08 ; asm
- ld hl, $5aef
+ ld hl, UnnamedText_19aef
call PrintText
ld a, $13
call $349b
@@ -13678,16 +13684,16 @@ FuchsiaCityText24: ; 0x19af4
jr nz, .asm_3b4e8 ; 0x19afa
bit 7, a
jr nz, .asm_667d5 ; 0x19afe
- ld hl, $5b2a
+ ld hl, UnnamedText_19b2a
call PrintText
jr .asm_4343f ; 0x19b06
.asm_3b4e8 ; 0x19b08
- ld hl, $5b20
+ ld hl, UnnamedText_19b20
call PrintText
ld a, $62
jr .asm_81556 ; 0x19b10
.asm_667d5 ; 0x19b12
- ld hl, $5b25
+ ld hl, UnnamedText_19b25
call PrintText
ld a, $5a
.asm_81556 ; 0x19b1a
@@ -26727,19 +26733,21 @@ RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82)
RockTunnel1Script: ; 0x444dc
call $3c3c
- ld hl, $4505
- ld de, $44ef
+ ld hl, Unnamed_44505 ; $4505
+ ld de, Unnamed_444ef ; $44ef
ld a, [$d621]
call $3160
ld [$d621], a
ret
; 0x444ef
+Unnamed_444ef:
INCBIN "baserom.gbc",$444ef,$6
RockTunnel1Texts: ; 0x444f5
dw RockTunnel1Text1, RockTunnel1Text2, RockTunnel1Text3, RockTunnel1Text4, RockTunnel1Text5, RockTunnel1Text6, RockTunnel1Text7, RockTunnel1Text8
+Unnamed_44505:
INCBIN "baserom.gbc",$44505,$55
RockTunnel1Text1: ; 0x4455a
@@ -33143,8 +33151,7 @@ SaffronCityText11: ; 0x50c67
SaffronCityText12: ; 0x50c6c
TX_FAR _SaffronCityText12
-
-INCBIN "baserom.gbc",$50c70,$50c72 - $50c70
+ db $15, $50
SaffronCityText13: ; 0x50c72
TX_FAR _SaffronCityText13
@@ -33209,6 +33216,8 @@ INCBIN "baserom.gbc",$50cc6,$5c
Route20Texts: ; 0x50d22
dw Route20Text1, Route20Text2, Route20Text3, Route20Text4, Route20Text5, Route20Text6, Route20Text7, Route20Text8, Route20Text9, Route20Text10, Route20Text11, Route20Text12
+Route20TrainerHeaders:
+Route20TrainerHeader1:
INCBIN "baserom.gbc",$50d3a,$79
Route20Text1: ; 0x50db3
@@ -33805,22 +33814,22 @@ Route24Text1: ; 0x514a4
ld a, [$d7ef]
bit 0, a
jr nz, .asm_a03f5 ; 0x514af $48
- ld hl, $5510
+ ld hl, UnnamedText_51510
call PrintText
ld bc, $3101
call GiveItem
jr nc, .asm_3a23d ; 0x514bd $43
ld hl, $d7ef
set 0, [hl]
- ld hl, $551a
+ ld hl, UnnamedText_5151a
call PrintText
- ld hl, $5526
+ ld hl, UnnamedText_51526
call PrintText
ld hl, $d72d
set 6, [hl]
set 7, [hl]
- ld hl, $552b
- ld de, $552b
+ ld hl, UnnamedText_5152b
+ ld de, $552b ; probably UnnamedText_5152b
call $3354
ld a, [$ff00+$8c]
ld [$cf13], a
@@ -33833,25 +33842,27 @@ Route24Text1: ; 0x514a4
ld [$da39], a
jp TextScriptEnd
.asm_a03f5 ; 0x514f9
- ld hl, $5530
+ ld hl, UnnamedText_51530
call PrintText
jp TextScriptEnd
.asm_3a23d ; 0x51502
- ld hl, $5521
+ ld hl, UnnamedText_51521
call PrintText
ld hl, $d7f0
set 1, [hl]
jp TextScriptEnd
; 0x51510
-INCBIN "baserom.gbc",$51510,$51515 - $51510
-
-UnnamedText_51515: ; 0x51515
- TX_FAR _UnnamedText_51515
+UnnamedText_51510: ; 0x51510
+ TX_FAR _UnnamedText_51510 ; 0x92721
+ db $0B
+ TX_FAR _UnnamedText_51515 ; 0x92755
db $50
-; 0x51515 + 5 bytes
+; 0x5151a
-INCBIN "baserom.gbc",$5151a,$51521 - $5151a
+UnnamedText_5151a: ; 0x5151a
+ TX_FAR _UnnamedText_5151a ; 0x92779
+ db $0B, $6, $50
UnnamedText_51521: ; 0x51521
TX_FAR _UnnamedText_51521
@@ -34482,26 +34493,26 @@ SilphCo7Text1: ; 0x51d8e
ld a, [$d838]
bit 7, a
jr nz, .asm_688b4 ; 0x51d9b
- ld hl, $5ddd
+ ld hl, UnnamedText_51ddd
call PrintText
jr .asm_b3069 ; 0x51da3
.asm_d7e17 ; 0x51da5
- ld hl, $5dd3
+ ld hl, UnnamedText_51dd3
call PrintText
- ld bc,(LAPRAS << 8) | 15
+ ld bc, (LAPRAS << 8) | 15
call GivePokemon
jr nc, .asm_b3069 ; 0x51db1
ld a, [$ccd3]
and a
call z, $3865
call $3c3c
- ld hl, $5dd8
+ ld hl, UnnamedText_51dd8
call PrintText
ld hl, $d72e
set 0, [hl]
jr .asm_b3069 ; 0x51dc8
.asm_688b4 ; 0x51dca
- ld hl, $5de2
+ ld hl, UnnamedText_51de2
call PrintText
.asm_b3069 ; 0x51dd0
jp TextScriptEnd
@@ -34531,11 +34542,11 @@ SilphCo7Text2: ; 0x51de7
ld a, [$d838]
bit 7, a
jr nz, .asm_892ce ; 0x51ded $8
- ld hl, $5e00
+ ld hl, UnnamedText_51e00
call PrintText
jr .asm_e4d89 ; 0x51df5 $6
.asm_892ce ; 0x51df7
- ld hl, $5e05
+ ld hl, UnnamedText_51e05
call PrintText
.asm_e4d89 ; 0x51dfd
jp TextScriptEnd
@@ -34556,11 +34567,11 @@ SilphCo7Text3: ; 0x51e0a
ld a, [$d838]
bit 7, a
jr nz, .asm_254aa ; 0x51e10
- ld hl, $5e23
+ ld hl, UnnamedText_51e23
call PrintText
jr .asm_6472b ; 0x51e18
.asm_254aa ; 0x51e1a
- ld hl, $5e28
+ ld hl, UnnamedText_51e28
call PrintText
.asm_6472b ; 0x51e20
jp TextScriptEnd
@@ -34580,11 +34591,11 @@ SilphCo7Text4: ; 0x51e2d
ld a, [$d838]
bit 7, a
jr nz, .asm_0f7ee ; 0x51e33
- ld hl, $5e46
+ ld hl, UnnamedText_51e46
call PrintText
jr .asm_27a32 ; 0x51e3b
.asm_0f7ee ; 0x51e3d
- ld hl, $5e4b
+ ld hl, UnnamedText_51e4b
call PrintText
.asm_27a32 ; 0x51e43
jp TextScriptEnd
@@ -34685,7 +34696,7 @@ UnnamedText_51eaf: ; 0x51eaf
SilphCo7Text9: ; 0x51eb4
db $08 ; asm
- ld hl, $5ebe
+ ld hl, UnnamedText_51ebe
call PrintText
jp TextScriptEnd
@@ -35368,7 +35379,7 @@ HandlePrizeChoice: ; 14:68C6
ld c,a
pop af
ld b,a
- call $3E48 ; GivePokemon
+ call GivePokemon
push af
ld a,[$CCD3] ; XXX is there room?
and a
@@ -36062,7 +36073,7 @@ Route2Text4: ; 0x554f3
Route3Script: ; 0x554f8
call $3c3c
- ld hl, $5525
+ ld hl, Unknown_55525
ld de, $550b
ld a, [$d5f8]
call $3160
@@ -36075,6 +36086,7 @@ INCBIN "baserom.gbc",$5550b,$6
Route3Texts: ; 0x55511
dw Route3Text1, Route3Text2, Route3Text3, Route3Text4, Route3Text5, Route3Text6, Route3Text7, Route3Text8, Route3Text9, Route3Text10
+Unknown_55525:
INCBIN "baserom.gbc",$55525,$61
Route3Text1: ; 0x55586
@@ -36255,19 +36267,21 @@ Route3Text10: ; 0x55653
Route4Script: ; 0x55658
call $3c3c
- ld hl, $567d
- ld de, $566b
+ ld hl, Unknown_5567d
+ ld de, UnknownData_5566b
ld a, [$d5f9]
call $3160
ld [$d5f9], a
ret
; 0x5566b
+UnknownData_5566b:
INCBIN "baserom.gbc",$5566b,$6
Route4Texts: ; 0x55671
dw Route4Text1, Route4Text2, Route4Text3, Route4Text4, Route4Text5, Route4Text6
+Unknown_5567d:
INCBIN "baserom.gbc",$5567d,$d
Route4Text1: ; 0x5568a
@@ -36335,7 +36349,14 @@ Route12Text13: ; 0x556eb
Route12Text14: ; 0x556f0
db $57
-INCBIN "baserom.gbc",$556f1,$55758 - $556f1
+INCBIN "baserom.gbc",$556f1,$5571b - $556f1
+
+; XXX
+UnnamedText_5571b: ; 0x5571b
+ db $5, $20, $cf, $d7, $ce, $57
+; 0x5571b + 6 bytes = 0x55721
+
+INCBIN "baserom.gbc",$55721,$55758 - $55721
Route9Text1: ; 0x55758
db $8 ; asm
@@ -37702,27 +37723,27 @@ VermilionHouse2Text1: ; 0x56075
ld a, [$d728]
bit 3, a
jr nz, asm_03ef5 ; 0x5607b
- ld hl, $60b1
+ ld hl, UnnamedText_560b1
call PrintText
call $35ec
ld a, [$cc26]
and a
jr nz, asm_eb1b7 ; 0x5608a
- ld bc,(OLD_ROD << 8) | 1
+ ld bc, (OLD_ROD << 8) | 1
call GiveItem
jr nc, asm_fd67b ; 0x56092
ld hl, $d728
set 3, [hl]
- ld hl, $60b6
+ ld hl, UnnamedText_560b6
jr asm_5dd95 ; 0x5609c
asm_fd67b ; 0x5609e
- ld hl, $60ca
+ ld hl, UnnamedText_560ca
jr asm_5dd95 ; 0x560a1
asm_eb1b7 ; 0x560a3
- ld hl, $60c0
+ ld hl, UnnamedText_560c0
jr asm_5dd95 ; 0x560a6
asm_03ef5 ; 0x560a8
- ld hl, $60c5
+ ld hl, UnnamedText_560c5
asm_5dd95 ; 0x560ab
call PrintText
jp TextScriptEnd
@@ -37732,12 +37753,12 @@ UnnamedText_560b1: ; 0x560b1
db $50
; 0x560b1 + 5 bytes
-INCBIN "baserom.gbc",$560b6,$560bb - $560b6
-
-UnnamedText_560bb: ; 0x560bb
- TX_FAR _UnnamedText_560bb
+UnnamedText_560b6: ; 0x560b6
+ TX_FAR _UnnamedText_560b6 ; 0x9c554
+ db $0B
+ TX_FAR _UnnamedText_560bb ; 0x9c5a4
db $50
-; 0x560bb + 5 bytes
+; 0x560c0
UnnamedText_560c0: ; 0x560c0
TX_FAR _UnnamedText_560c0
@@ -37842,27 +37863,27 @@ FuchsiaHouse3Text1: ; 0x56181
ld a, [$d728]
bit 4, a
jr nz, asm_6084e ; 0x56187
- ld hl, $61bd
+ ld hl, UnnamedText_561bd
call PrintText
call $35ec
ld a, [$cc26]
and a
jr nz, asm_3ace4 ; 0x56196
- ld bc,(GOOD_ROD << 8) | 1
+ ld bc, (GOOD_ROD << 8) | 1
call GiveItem
jr nc, asm_628ee ; 0x5619e
ld hl, $d728
set 4, [hl]
- ld hl, $61c2
+ ld hl, UnnamedText_561c2
jr asm_1b09c ; 0x561a8
asm_628ee ; 0x561aa
- ld hl, $621c
+ ld hl, UnnamedText_5621c
jr asm_1b09c ; 0x561ad
asm_3ace4 ; 0x561af
- ld hl, $6212
+ ld hl, UnnamedText_56212
jr asm_1b09c ; 0x561b2
asm_6084e ; 0x561b4
- ld hl, $6217
+ ld hl, UnnamedText_56217
asm_1b09c ; 0x561b7
call PrintText
jp TextScriptEnd
@@ -37872,7 +37893,12 @@ UnnamedText_561bd: ; 0x561bd
db $50
; 0x561bd + 5 bytes
-INCBIN "baserom.gbc",$561c2,$56212 - $561c2
+UnnamedText_561c2: ; 0x561c2
+ TX_FAR _UnnamedText_561c2 ; 0xa06e8
+ db $0B, $50
+; 0x561c8
+
+INCBIN "baserom.gbc",$561c8,$56212 - $561c8
UnnamedText_56212: ; 0x56212
TX_FAR _UnnamedText_56212
@@ -37927,19 +37953,19 @@ DayCareMText1: ; 0x56254
call $36f4
ld a, [$da48]
and a
- jp nz, $62e1
- ld hl, $640f
+ jp nz, Unnamed_562e1
+ ld hl, UnnamedText_5640f
call PrintText
call $35ec
ld a, [$cc26]
and a
- ld hl, $643b
- jp nz, $6409
+ ld hl, UnnamedText_5643b
+ jp nz, Unnamed_56409
ld a, [$d163]
dec a
- ld hl, $6445
- jp z, $6409
- ld hl, $6414
+ ld hl, UnnamedText_56445
+ jp z, Unnamed_56409
+ ld hl, UnnamedText_56414
call PrintText
xor a
ld [$cfcb], a
@@ -37951,19 +37977,19 @@ DayCareMText1: ; 0x56254
call $3dbe
call $20ba
pop af
- ld hl, $6437
- jp c, $6409
- ld hl, $571b
+ ld hl, UnnamedText_56437
+ jp c, Unnamed_56409
+ ld hl, UnnamedText_5571b
ld b, $8
call Bankswitch
- ld hl, $644a
- jp c, $6409
+ ld hl, UnnamedText_5644a
+ jp c, Unnamed_56409
xor a
ld [$cc2b], a
ld a, [$cf92]
ld hl, $d2b5
call $15ba
- ld hl, $6419
+ ld hl, UnnamedText_56419
call PrintText
ld a, $1
ld [$da48], a
@@ -37975,11 +38001,17 @@ DayCareMText1: ; 0x56254
call $391f
ld a, [$cf91]
call $13d0
- ld hl, $641e
- jp $6409
+ ld hl, UnnamedText_5641e
+ jp Unnamed_56409
; 0x562e1
-INCBIN "baserom.gbc",$562e1,$5640f - $562e1
+Unnamed_562e1:
+INCBIN "baserom.gbc",$562e1,$56409 - $562e1
+
+Unnamed_56409: ; 0x56409
+ call PrintText
+ jp TextScriptEnd
+; 0x5640f
UnnamedText_5640f: ; 0x5640f
TX_FAR _UnnamedText_5640f
@@ -38021,10 +38053,10 @@ UnnamedText_56432: ; 0x56432
db $50
; 0x56432 + 5 bytes
-INCBIN "baserom.gbc",$56437,$5643b - $56437
-
+UnnamedText_56437: ; 0x56437
+ TX_FAR _UnnamedText_56437 ; 0x8c000
UnnamedText_5643b: ; 0x5643b
- TX_FAR _UnnamedText_5643b
+ TX_FAR _UnnamedText_5643b ; 0x8c013
db $50
; 0x5643b + 5 bytes
@@ -38089,27 +38121,27 @@ Route12HouseText1: ; 0x56484
ld a, [$d728]
bit 5, a
jr nz, asm_b4cad ; 0x5648a
- ld hl, $64c0
+ ld hl, UnnamedText_564c0
call PrintText
call $35ec
ld a, [$cc26]
and a
jr nz, asm_a2d76 ; 0x56499
- ld bc,(SUPER_ROD << 8) | 1
+ ld bc, (SUPER_ROD << 8) | 1
call GiveItem
jr nc, asm_e3b89 ; 0x564a1
ld hl, $d728
set 5, [hl]
- ld hl, $64c5
+ ld hl, UnnamedText_564c5
jr asm_df984 ; 0x564ab
asm_e3b89 ; 0x564ad
- ld hl, $64d9
+ ld hl, UnnamedText_564d9
jr asm_df984 ; 0x564b0
asm_a2d76 ; 0x564b2
- ld hl, $64cf
+ ld hl, UnnamedText_564cf
jr asm_df984 ; 0x564b5
asm_b4cad ; 0x564b7
- ld hl, $64d4
+ ld hl, UnnamedText_564d4
asm_df984 ; 0x564ba
call PrintText
jp TextScriptEnd
@@ -38119,12 +38151,12 @@ UnnamedText_564c0: ; 0x564c0
db $50
; 0x564c0 + 5 bytes
-INCBIN "baserom.gbc",$564c5,$564ca - $564c5
-
-UnnamedText_564ca: ; 0x564ca
- TX_FAR _UnnamedText_564ca
+UnnamedText_564c5: ; 0x564c5
+ TX_FAR _UnnamedText_564c5 ; 0x8ca00
+ db $0B
+ TX_FAR _UnnamedText_564ca ; 0x8ca4f
db $50
-; 0x564ca + 5 bytes
+; 0x564c5 + 10 bytes = 0x564cf
UnnamedText_564cf: ; 0x564cf
TX_FAR _UnnamedText_564cf
@@ -38187,9 +38219,9 @@ SilphCo8Text1: ; 0x565aa
db $08 ; asm
ld a, [$d838]
bit 7, a
- ld hl, $65c3
+ ld hl, UnnamedText_565c3
jr nz, asm_a468f ; 0x565b3
- ld hl, $65be
+ ld hl, UnnamedText_565be
asm_a468f ; 0x565b8
call PrintText
jp TextScriptEnd
@@ -40265,13 +40297,13 @@ FanClubText1: ; 0x59b94
ld a, [$d771]
bit 7, a
jr nz, asm_67b22 ; 0x59b9a
- ld hl, $5bb7
+ ld hl, UnnamedText_59bb7
call PrintText
ld hl, $d771
set 6, [hl]
jr asm_64f01 ; 0x59ba7
asm_67b22 ; 0x59ba9
- ld hl, $5bbc
+ ld hl, UnnamedText_59bbc
call PrintText
ld hl, $d771
res 7, [hl]
@@ -40293,13 +40325,13 @@ FanClubText2: ; 0x59bc1
ld a, [$d771]
bit 6, a
jr nz, asm_5cd59 ; 0x59bc7
- ld hl, $5be4
+ ld hl, UnnamedText_59be4
call PrintText
ld hl, $d771
set 7, [hl]
jr asm_59625 ; 0x59bd4
asm_5cd59 ; 0x59bd6
- ld hl, $5be9
+ ld hl, UnnamedText_59be9
call PrintText
ld hl, $d771
res 6, [hl]
@@ -40318,7 +40350,7 @@ UnnamedText_59be9: ; 0x59be9
FanClubText3: ; 0x59bee
db $8
- ld hl, $5c00
+ ld hl, UnnamedText_59c00
call PrintText
ld a, $54
call $13d0
@@ -40333,9 +40365,9 @@ UnnamedText_59c00: ; 0x59c00
FanClubText4: ; 0x59c05
db $08 ; asm
- ld hl, $5c17
+ ld hl, UnnamedText_59c17
call PrintText
- ld a,SEEL
+ ld a, SEEL
call $13d0
call $3748
jp TextScriptEnd
@@ -40349,32 +40381,32 @@ FanClubText5: ; 0x59c1c
db $08 ; asm
call $5b73
jr nz, asm_38bb3 ; 0x59c20
- ld hl, $5c65
+ ld hl, UnnamedText_59c65
call PrintText
call $35ec
ld a, [$cc26]
and a
jr nz, asm_2c8d7 ; 0x59c2f
- ld hl, $5c6a
+ ld hl, UnnamedText_59c6a
call PrintText
- ld bc,(BIKE_VOUCHER << 8) | 1
+ ld bc, (BIKE_VOUCHER << 8) | 1
call GiveItem
jr nc, asm_867d4 ; 0x59c3d
- ld hl, $5c6f
+ ld hl, ReceivedBikeVoucherText
call PrintText
ld hl, $d771
set 1, [hl]
jr asm_d3c26 ; 0x59c4a
asm_867d4 ; 0x59c4c
- ld hl, $5c83
+ ld hl, UnnamedText_59c83
call PrintText
jr asm_d3c26 ; 0x59c52
asm_2c8d7 ; 0x59c54
- ld hl, $5c79
+ ld hl, UnnamedText_59c79
call PrintText
jr asm_d3c26 ; 0x59c5a
asm_38bb3 ; 0x59c5c
- ld hl, $5c7e
+ ld hl, UnnamedText_59c7e
call PrintText
asm_d3c26 ; 0x59c62
jp TextScriptEnd
@@ -40389,12 +40421,12 @@ UnnamedText_59c6a: ; 0x59c6a
db $50
; 0x59c6a + 5 bytes
-INCBIN "baserom.gbc",$59c6f,$59c74 - $59c6f
-
-UnnamedText_59c74: ; 0x59c74
- TX_FAR _UnnamedText_59c74
+ReceivedBikeVoucherText: ; 0x59c6f
+ TX_FAR _ReceivedBikeVoucherText ; 0x9a82e
+ db $11
+ TX_FAR _UnnamedText_59c74 ; 0x9a844
db $50
-; 0x59c74 + 5 bytes
+; 0x59c6f + 10 bytes = 0x59c79
UnnamedText_59c79: ; 0x59c79
TX_FAR _UnnamedText_59c79
@@ -40480,18 +40512,18 @@ SilphCo2Text1: ; 0x59dc1
ld a, [$d826]
bit 7, a
jr nz, asm_b8a0d ; 0x59dc7
- ld hl, $5ded
+ ld hl, UnnamedText_59ded
call PrintText
- ld bc,(TM_36 << 8) | 1
+ ld bc, (TM_36 << 8) | 1
call GiveItem
- ld hl, $5dfd
+ ld hl, TM36NoRoomText
jr nc, asm_2c1e0 ; 0x59dd8
ld hl, $d826
set 7, [hl]
- ld hl, $5df2
+ ld hl, ReceivedTM36Text
jr asm_2c1e0 ; 0x59de2
asm_b8a0d ; 0x59de4
- ld hl, $5df8
+ ld hl, TM36ExplanationText
asm_2c1e0 ; 0x59de7
call PrintText
jp TextScriptEnd
@@ -40501,15 +40533,18 @@ UnnamedText_59ded: ; 0x59ded
db $50
; 0x59ded + 5 bytes
-INCBIN "baserom.gbc",$59df2,$59df8 - $59df2
+ReceivedTM36Text: ; 0x59df2
+ TX_FAR _ReceivedTM36Text ; 0x824ba
+ db $0B, $50
+; 0x59df2 + 6 bytes = 0x59df8
-UnnamedText_59df8: ; 0x59df8
- TX_FAR _UnnamedText_59df8
+TM36ExplanationText: ; 0x59df8
+ TX_FAR _TM36ExplanationText
db $50
; 0x59df8 + 5 bytes
-UnnamedText_59dfd: ; 0x59dfd
- TX_FAR _UnnamedText_59dfd
+TM36NoRoomText: ; 0x59dfd
+ TX_FAR _TM36NoRoomText
db $50
; 0x59dfd + 5 bytes
@@ -40654,15 +40689,16 @@ INCBIN "baserom.gbc",$59f71,$53
SilphCo3Texts: ; 0x59fc4
dw SilphCo3Text1, SilphCo3Text2, SilphCo3Text3, SilphCo3Text4
+SilphCo3TrainerHeader1: ; 0x59fcc
INCBIN "baserom.gbc",$59fcc,$19
SilphCo3Text1: ; 0x59fe5
db $08 ; asm
ld a, [$d838]
bit 7, a
- ld hl, $5ffe
+ ld hl, UnnamedText_59ffe
jr nz, asm_8c56f ; 0x59fee
- ld hl, $5ff9
+ ld hl, UnnamedText_59ff9
asm_8c56f ; 0x59ff3
call PrintText
jp TextScriptEnd
@@ -40679,7 +40715,7 @@ UnnamedText_59ffe: ; 0x59ffe
SilphCo3Text2: ; 0x5a003
db $08 ; asm
- ld hl, $5fcc
+ ld hl, SilphCo3TrainerHeader1
call LoadTrainerHeader
jp TextScriptEnd
@@ -40799,9 +40835,9 @@ SilphCo10Text3: ; 0x5a1bf
db $08 ; asm
ld a, [$d838]
bit 7, a
- ld hl, $61d8
+ ld hl, UnnamedText_5a1d8
jr nz, asm_cf85f ; 0x5a1c8
- ld hl, $61d3
+ ld hl, UnnamedText_5a1d3
asm_cf85f ; 0x5a1cd
call PrintText
jp TextScriptEnd
@@ -41229,7 +41265,7 @@ asm_d49e7: ; 0x5c153
ld a, [$d754]
bit 0, a
jr nz, asm_31a16 ; 0x5c158 $10
- ld hl, $423d
+ ld hl, UnnamedText_5c23d
call PrintText
jp $4217
asm_b8709: ; 0x5c163
@@ -41237,7 +41273,7 @@ asm_b8709: ; 0x5c163
bit 0, a
jr z, asm_3ded4 ; 0x5c168 $9
asm_31a16: ; 0x5c16a
- ld hl, $4242
+ ld hl, UnnamedText_5c242
call PrintText
jp $4217
asm_3ded4: ; 0x5c173
@@ -41246,7 +41282,7 @@ asm_3ded4: ; 0x5c173
call $30e8
xor a
ld [$ff00+$b4], a
- ld hl, $421f
+ ld hl, UnnamedText_5c21f
call PrintText
call $35ec
ld a, [$cc26]
@@ -41259,11 +41295,11 @@ asm_3ded4: ; 0x5c173
ld [$ff00+$a1], a
call $35a6
jr nc, asm_0f3e3 ; 0x5c199 $9
- ld hl, $4229
+ ld hl, UnnamedText_5c229
call PrintText
jp $41da
asm_0f3e3: ; 0x5c1a4
- ld hl, $4224
+ ld hl, UnnamedText_5c224
call PrintText
ld hl, $d754
set 0, [hl]
@@ -41299,17 +41335,17 @@ asm_0b094: ; 0x5c1f2
ld [$d619], a
jr asm_d1145 ; 0x5c1f7 $1e
;XXX what calls this?
- ld hl, $422e
+ ld hl, UnnamedText_5c22e
call PrintText
call $35ec
ld a, [$cc26]
cp $0
jr nz, asm_d1144
- ld hl, $4233
+ ld hl, UnnamedText_5c233
call PrintText
jr asm_d1145 ; 0x5c20f $6
asm_d1144:
- ld hl, $4238
+ ld hl, UnnamedText_5c238
call PrintText
asm_d1145: ; 0x5c217
jp TextScriptEnd
@@ -41362,7 +41398,7 @@ UnnamedText_5c242: ; 0x5c242
MuseumF1Text2: ; 0x5c247
db $08 ; asm
- ld hl, $4251
+ ld hl, UnnamedText_5c251
call PrintText
jp TextScriptEnd
@@ -41376,9 +41412,9 @@ MuseumF1Text3: ; 0x5c256
ld a, [$d754]
bit 1, a
jr nz, .asm_16599 ; 0x5c25c
- ld hl, $428e
+ ld hl, UnnamedText_5c28e
call PrintText
- ld bc,(OLD_AMBER << 8) | 1
+ ld bc, (OLD_AMBER << 8) | 1
call GiveItem
jr nc, .asm_91ebf ; 0x5c26a
ld hl, $d754
@@ -41387,13 +41423,13 @@ MuseumF1Text3: ; 0x5c256
ld [$cc4d], a
ld a, $11
call Predef
- ld hl, $4293
+ ld hl, ReceivedOldAmberText
jr .asm_52e0f ; 0x5c27e
.asm_91ebf ; 0x5c280
- ld hl, $429e
+ ld hl, UnnamedText_5c29e
jr .asm_52e0f ; 0x5c283
.asm_16599 ; 0x5c285
- ld hl, $4299
+ ld hl, UnnamedText_5c299
.asm_52e0f ; 0x5c288
call PrintText
jp TextScriptEnd
@@ -41403,7 +41439,10 @@ UnnamedText_5c28e: ; 0x5c28e
db $50
; 0x5c28e + 5 bytes
-INCBIN "baserom.gbc",$5c293,$5c299 - $5c293
+ReceivedOldAmberText: ; 0x5c293
+ TX_FAR _ReceivedOldAmberText ; 0x96790
+ db $0B, $50
+; 0x5c293 + 6 bytes = 0x5c299
UnnamedText_5c299: ; 0x5c299
TX_FAR _UnnamedText_5c299
@@ -41417,7 +41456,7 @@ UnnamedText_5c29e: ; 0x5c29e
MuseumF1Text4: ; 0x5c2a3
db $08 ; asm
- ld hl, $42ad
+ ld hl, UnnamedText_5c2ad
call PrintText
jp TextScriptEnd
@@ -41428,7 +41467,7 @@ UnnamedText_5c2ad: ; 0x5c2ad
MuseumF1Text5: ; 0x5c2b2
db $08 ; asm
- ld hl, $42bc
+ ld hl, UnnamedText_5c2bc
call PrintText
jp TextScriptEnd
@@ -41566,17 +41605,17 @@ PewterGymText1: ; 0x5c44e
call $30b6
jr .asm_e0ffb ; 0x5c460
.asm_ff7d0 ; 0x5c462
- ld hl, $44a3
+ ld hl, UnnamedText_5c4a3
call PrintText
jr .asm_e0ffb ; 0x5c468
.asm_4a735 ; 0x5c46a
- ld hl, $449e
+ ld hl, UnnamedText_5c49e
call PrintText
ld hl, $d72d
set 6, [hl]
set 7, [hl]
- ld hl, $44bc
- ld de, $44bc
+ ld hl, UnnamedText_5c4bc
+ ld de, $44bc ; probably UnnamedText_5c4bc
call $3354
ldh a, [$8c]
ld [$cf13], a
@@ -41618,12 +41657,12 @@ PewterGymText6: ; 0x5c4b7
TX_FAR _UnnamedText_5c4b7
db $50
-INCBIN "baserom.gbc",$5c4bc,$5c4c1 - $5c4bc
-
-UnnamedText_5c4c1: ; 0x5c4c1
- TX_FAR _UnnamedText_5c4c1
+UnnamedText_5c4bc: ; 0x5c4bc
+ TX_FAR _UnnamedText_5c4bc ; 0x981c9
+ db $0B
+ TX_FAR _UnnamedText_5c4c1 ; 0x98232
db $50
-; 0x5c4c1 + 5 bytes
+; 0x5c4c6
PewterGymText2: ; 0x5c4c6
db $08 ; asm
@@ -41651,24 +41690,24 @@ PewterGymText3: ; 0x5c4df
ld a, [$d72a]
bit 0, a
jr nz, .asm_71369 ; 0x5c4e5
- ld hl, $4515
+ ld hl, UnnamedText_5c515
call PrintText
call $35ec
ld a, [$cc26]
and a
jr nz, .asm_6123a ; 0x5c4f4
- ld hl, $451a
+ ld hl, UnnamedText_5c51a
call PrintText
jr .asm_d1578 ; 0x5c4fc
.asm_6123a ; 0x5c4fe
- ld hl, $4524
+ ld hl, UnnamedText_5c524
call PrintText
.asm_d1578 ; 0x5c504
- ld hl, $451f
+ ld hl, UnnamedText_5c51f
call PrintText
jr .asm_07013 ; 0x5c50a
.asm_71369 ; 0x5c50c
- ld hl, $4529
+ ld hl, UnnamedText_5c529
call PrintText
.asm_07013 ; 0x5c512
jp TextScriptEnd
@@ -41746,7 +41785,7 @@ PewterPokecenterText3: ; 0x5c59b
db $8
ld a, $1
ld [$cc3c], a
- ld hl, $4603
+ ld hl, PewterPokecenterText5
call PrintText
ld a, $ff
call $23b1
@@ -41792,14 +41831,15 @@ PewterPokecenterText3: ; 0x5c59b
jp TextScriptEnd
; 0x5c603
-PewterPokecenterText5: ; broken TX_FAR to _PewterPokecenterText4
- db $17, $44, $47, $26
+PewterPokecenterText5: ; 0x5c603
+ TX_FAR _PewterPokecenterText5 ; 0x98744
db $50
+; 0x5c603 + 5 bytes = 0x5c608
-;XXX wtf?
+; 0x5c608 XXX
db $30, $38, $34, $3c
-PewterPokecenterText4: ; XXX confirm text_id number
+PewterPokecenterText4: ; 0x5c60b
db $f6
PewterPokecenterObject: ; 0x5c60d (size=44)
@@ -41913,11 +41953,11 @@ CeruleanGymText1: ; 0x5c771
call $30b6
jr .asm_95b04 ; 0x5c783
.asm_37a1b ; 0x5c785
- ld hl, $47c3
+ ld hl, UnnamedText_5c7c3
call PrintText
jr .asm_95b04 ; 0x5c78b
.asm_10854 ; 0x5c78d
- ld hl, $47be
+ ld hl, UnnamedText_5c7be
call PrintText
ld hl, $d72d
set 6, [hl]
@@ -42012,11 +42052,11 @@ CeruleanGymText4: ; 0x5c811
ld a, [$d75e]
bit 7, a
jr nz, .asm_f80ce ; 0x5c817
- ld hl, $482a
+ ld hl, UnnamedText_5c82a
call PrintText
jr .asm_18a31 ; 0x5c81f
.asm_f80ce ; 0x5c821
- ld hl, $482f
+ ld hl, UnnamedText_5c82f
call PrintText
.asm_18a31 ; 0x5c827
jp TextScriptEnd
@@ -42167,11 +42207,11 @@ LavenderMartText3: ; 0x5c93a
ld a, [$d7e0]
bit 7, a
jr nz, .asm_c88d4 ; 0x5c940
- ld hl, $4953
+ ld hl, UnnamedText_5c953
call PrintText
jr .asm_6d225 ; 0x5c948
.asm_c88d4 ; 0x5c94a
- ld hl, $4958
+ ld hl, UnnamedText_5c958
call PrintText
.asm_6d225 ; 0x5c950
jp TextScriptEnd
@@ -42339,11 +42379,11 @@ VermilionGymText1: ; 0x5cb1d
call $30b6
jr .asm_23621 ; 0x5cb2f
.asm_41203 ; 0x5cb31
- ld hl, $4b72
+ ld hl, UnnamedText_5cb72
call PrintText
jr .asm_23621 ; 0x5cb37
.asm_7cc29 ; 0x5cb39
- ld hl, $4b6d
+ ld hl, UnnamedText_5cb6d
call PrintText
ld hl, $d72d
set 6, [hl]
@@ -42381,19 +42421,18 @@ VermilionGymText6:
; 0x5cb77 + 5 bytes
VermilionGymText7: ; 0x5cb7c
-
-INCBIN "baserom.gbc",$5cb7c,5
-
-UnnamedText_5cb81:
- TX_FAR _UnnamedText_5cb81
+ TX_FAR _ReceivedTM24Text ; 0x9c0e0
+ db $11
+ TX_FAR _TM24ExplanationText ; 0x9c0f5
db $50
+; 0x5cb7c + 10 bytes = 0x5cb86
VermilionGymText8: ; 0x5cb86
- TX_FAR _UnnamedText_5cb86
+ TX_FAR _TM24NoRoomText
db $50
-UnnamedText_5cb8b:
- TX_FAR _UnnamedText_5cb8b
+ReceivedThunderbadgeText:
+ TX_FAR _ReceivedThunderbadgeText
db $50
VermilionGymText2: ; 0x5cb90
@@ -42464,11 +42503,11 @@ VermilionGymText5: ; 0x5cbdb
ld a, [$d72a]
bit 2, a
jr nz, .asm_13b67 ; 0x5cbe1
- ld hl, $4bf4
+ ld hl, UnnamedText_5cbf4
call PrintText
jr .asm_c2b38 ; 0x5cbe9
.asm_13b67 ; 0x5cbeb
- ld hl, $4bf9
+ ld hl, UnnamedText_5cbf9
call PrintText
.asm_c2b38 ; 0x5cbf1
jp TextScriptEnd
@@ -42528,17 +42567,17 @@ CopycatsHouseF2Text1: ; 0x5cc82
jr nz, .asm_7ccf3 ; 0x5cc88
ld a, $1
ld [$cc3c], a
- ld hl, $4cd4
+ ld hl, UnnamedText_5ccd4
call PrintText
- ld b,POKE_DOLL
- call $3493
+ ld b, POKE_DOLL
+ call $3493 ; probably check has item or take item
jr z, .asm_62ecd ; 0x5cc9a
- ld hl, $4cd9
+ ld hl, UnnamedText_5ccd9
call PrintText
- ld bc,(TM_31 << 8) | 1
+ ld bc, (TM_31 << 8) | 1
call GiveItem
jr nc, .asm_16690 ; 0x5cca8
- ld hl, $4cde
+ ld hl, ReceivedTM31Text
call PrintText
ld a, $33
ldh [$db], a
@@ -42549,11 +42588,11 @@ CopycatsHouseF2Text1: ; 0x5cc82
set 0, [hl]
jr .asm_62ecd ; 0x5ccc1
.asm_16690 ; 0x5ccc3
- ld hl, $4cee
+ ld hl, TM31NoRoomText
call PrintText
jr .asm_62ecd ; 0x5ccc9
.asm_7ccf3 ; 0x5cccb
- ld hl, $4ce9
+ ld hl, TM31ExplanationText2
call PrintText
.asm_62ecd ; 0x5ccd1
jp TextScriptEnd
@@ -42568,14 +42607,23 @@ UnnamedText_5ccd9: ; 0x5ccd9
db $50
; 0x5ccd9 + 5 bytes
-INCBIN "baserom.gbc",$5ccde,$5cce9 - $5ccde
+ReceivedTM31Text: ; 0x5ccde
+ TX_FAR _ReceivedTM31Text ; 0xa1675
+ db $0B
+TM31ExplanationText1: ; 0x5cce2
+ TX_FAR _TM31ExplanationText1 ; 0xa1689
+ db $d, $50
+; 0x5cce9
-UnnamedText_5cce9: ; 0x5cce9
- TX_FAR _UnnamedText_5cce9
+TM31ExplanationText2: ; 0x5cce9
+ TX_FAR _TM31ExplanationText2 ; 0xa16c5
db $50
-; 0x5cce9 + 5 bytes
+; 0x5cce9 + 5 bytes = 0x5ccee
-INCBIN "baserom.gbc",$5ccee,$6
+TM31NoRoomText: ; 0x5ccee
+ TX_FAR _TM31NoRoomText ; 0xa1733
+ db $d, $50
+; 0x5ccf4
CopycatsHouseF2Text2: ; 0x5ccf4
TX_FAR _CopycatsHouseF2Text2
@@ -42595,9 +42643,9 @@ CopycatsHouseF2Text7: ; 0x5cd03
db $08 ; asm
ld a, [$c109]
cp $4
- ld hl, $4d1c
+ ld hl, UnnamedText_5cd1c
jr nz, .asm_399a4 ; 0x5cd0c
- ld hl, $4d17
+ ld hl, UnnamedText_5cd17
.asm_399a4 ; 0x5cd11
call PrintText
jp TextScriptEnd
@@ -42661,10 +42709,10 @@ FightingDojoText1: ; 0x5ce44
db $08 ; asm
ld a, [$d7b1]
bit 0, a
- jp nz, $4e7d
+ jp nz, .continue1\@
bit 1, a
- jp nz, $4e85
- ld hl, $4e8e
+ jp nz, .continue2\@
+ ld hl, UnnamedText_5ce8e
call PrintText
ld hl, $d72d
set 6, [hl]
@@ -42680,10 +42728,12 @@ FightingDojoText1: ; 0x5ce44
ld [$d642], a
ld [$da39], a
jr .asm_9dba4 ; 0x5ce7b
- ld hl, $4e9d
+.continue1\@ ; 0x5ce7d
+ ld hl, UnnamedText_5ce9d
call PrintText
jr .asm_9dba4 ; 0x5ce83
- ld hl, $4e98
+.continue2\@ ; 0x5ce85f
+ ld hl, FightingDojoText8
call PrintText
.asm_9dba4 ; 0x5ce8b
jp TextScriptEnd
@@ -42797,13 +42847,13 @@ FightingDojoText6: ; 0x5cf06
ld a, [$d7b1]
and $c0
jr z, .asm_f8e28 ; 0x5cf0c
- ld hl, $4f96
+ ld hl, UnnamedText_5cf96
call PrintText
jr .asm_3a2c8 ; 0x5cf14
.asm_f8e28 ; 0x5cf16
ld a, $2b
call $349b
- ld hl, $4f49
+ ld hl, UnnamedText_5cf49
call PrintText
call $35ec
ld a, [$cc26]
@@ -42811,7 +42861,7 @@ FightingDojoText6: ; 0x5cf06
jr nz, .asm_3a2c8 ; 0x5cf28
ld a, [$cf91]
ld b, a
- ld c,30
+ ld c, 30
call GivePokemon
jr nc, .asm_3a2c8 ; 0x5cf33
ld a, $4a
@@ -42834,13 +42884,13 @@ FightingDojoText7: ; 0x5cf4e
ld a, [$d7b1]
and $c0
jr z, .asm_170a9 ; 0x5cf54
- ld hl, $4f96
+ ld hl, UnnamedText_5cf96
call PrintText
jr .asm_f1f47 ; 0x5cf5c
.asm_170a9 ; 0x5cf5e
ld a, $2c
call $349b
- ld hl, $4f91
+ ld hl, UnnamedText_5cf91
call PrintText
call $35ec
ld a, [$cc26]
@@ -42936,17 +42986,17 @@ SaffronGymText1: ; 0x5d118
call $30b6
jr .asm_34c2c ; 0x5d12a
.asm_8d2f6 ; 0x5d12c
- ld hl, $516e
+ ld hl, UnnamedText_5d16e
call PrintText
jr .asm_34c2c ; 0x5d132
.asm_e3544 ; 0x5d134
- ld hl, $5162
+ ld hl, UnnamedText_5d162
call PrintText
ld hl, $d72d
set 6, [hl]
set 7, [hl]
- ld hl, $5167
- ld de, $5167
+ ld hl, UnnamedText_5d167
+ ld de, $5167 ; probably UnnamedText_5d167
call $3354
ldh a, [$8c]
ld [$cf13], a
@@ -43039,11 +43089,11 @@ SaffronGymText9: ; 0x5d1cd
ld a, [$d7b3]
bit 1, a
jr nz, .asm_13f3c ; 0x5d1d3
- ld hl, $51e6
+ ld hl, UnnamedText_5d1e6
call PrintText
jr .asm_e9907 ; 0x5d1db
.asm_13f3c ; 0x5d1dd
- ld hl, $51eb
+ ld hl, UnnamedText_5d1eb
call PrintText
.asm_e9907 ; 0x5d1e3
jp TextScriptEnd
@@ -43478,7 +43528,7 @@ Route2GateText1: ; 0x5d5db
ld hl, $d7c2
set 0, [hl]
.asm_6592c ; 0x5d60d
- ld hl, $5616
+ ld hl, UnnamedText_5d616
call PrintText
.asm_ad646 ; 0x5d613
jp TextScriptEnd
@@ -43739,18 +43789,18 @@ SilphCo9Text1: ; 0x5d8b8
ld a, [$d838]
bit 7, a
jr nz, .asm_a14c3 ; 0x5d8be
- ld hl, $58e5
+ ld hl, UnnamedText_5d8e5
call PrintText
ld a, $7
call Predef
call $20d8
call Delay3
call $20f6
- ld hl, $58ea
+ ld hl, UnnamedText_5d8ea
call PrintText
jr .asm_b6e28 ; 0x5d8da
.asm_a14c3 ; 0x5d8dc
- ld hl, $58ef
+ ld hl, UnnamedText_5d8ef
call PrintText
.asm_b6e28 ; 0x5d8e2
jp TextScriptEnd
@@ -44266,17 +44316,17 @@ PokemonTower2Text1: ; 0x605df
ld a, [$d764]
bit 7, a
jr z, .asm_16f24 ; 0x605e5
- ld hl, $463c
+ ld hl, UnnamedText_6063c
call PrintText
jr .asm_41852 ; 0x605ed
.asm_16f24 ; 0x605ef
- ld hl, $462d
+ ld hl, UnnamedText_6062d
call PrintText
ld hl, $d72d
set 6, [hl]
set 7, [hl]
- ld hl, $4632
- ld de, $4637
+ ld hl, UnnamedText_60632
+ ld de, UnnamedText_60637 ; XXX $4637
call $3354
ld a, $f2
ld [$d059], a
@@ -44887,7 +44937,7 @@ PokemonTower7Text3: ; 0x60e80
PokemonTower7Text4: ; 0x60e8a
db $08 ; asm
- ld hl, $4ec4
+ ld hl, UnnamedText_60ec4
call PrintText
ld hl, $d7e0
set 7, [hl]
@@ -45441,7 +45491,7 @@ SSAnne2Text1: ; 0x614e1
SSAnne2Text2: ; 0x614e6
db $8
- ld hl, $5500
+ ld hl, UnnamedText_61500
call PrintText
ld hl, $d72d
set 6, [hl]
@@ -45692,20 +45742,20 @@ SSAnne6Text6: ; 0x617de
SSAnne6Text7: ; 0x617e3
db $08 ; asm
- ld hl, $5807
+ ld hl, UnnamedText_61807
call PrintText
ldh a, [$d3]
bit 7, a
jr z, .asm_93eb1 ; 0x617ee
- ld hl, $580c
+ ld hl, UnnamedText_6180c
jr .asm_63292 ; 0x617f3
.asm_93eb1 ; 0x617f5
bit 4, a
jr z, .asm_7436c ; 0x617f7
- ld hl, $5811
+ ld hl, UnnamedText_61811
jr .asm_63292 ; 0x617fc
.asm_7436c ; 0x617fe
- ld hl, $5816
+ ld hl, UnnamedText_61816
.asm_63292 ; 0x61801
call PrintText
jp TextScriptEnd
@@ -45776,46 +45826,75 @@ SSAnne7Text1: ; 0x618ad
ld a, [$d803]
bit 0, a
jr nz, .asm_797c4 ; 0x618b3
- ld hl, $58ec
+ ld hl, SSAnne7RubText
call PrintText
- ld hl, $5927
+ ld hl, ReceivingHM01Text
call PrintText
- ld bc,(HM_01 << 8) | 1
+ ld bc, (HM_01 << 8) | 1
call GiveItem
jr nc, .asm_ccdcd ; 0x618c7
- ld hl, $592c
+ ld hl, ReceivedHM01Text
call PrintText
ld hl, $d803
set 0, [hl]
jr .asm_0faf5 ; 0x618d4
.asm_ccdcd ; 0x618d6
- ld hl, $5937
+ ld hl, HM01NoRoomText
call PrintText
ld hl, $d72d
set 5, [hl]
jr .asm_0faf5 ; 0x618e1
.asm_797c4 ; 0x618e3
- ld hl, $5932
+ ld hl, UnnamedText_61932
call PrintText
.asm_0faf5 ; 0x618e9
jp TextScriptEnd
-INCBIN "baserom.gbc",$618ec,$61927 - $618ec
+SSAnne7RubText: ; 0x618ec
+ TX_FAR _SSAnne7RubText ; 0x812dd
+ db $8
+ ld a, [$c0ef]
+ cp $1f
+ ld [$c0f0], a
+ jr nz, .asm_61908 ; 0x618f9 $d
+ ld a, $ff
+ ld [$c0ee], a
+ call $23b1
+ ld a, $2
+ ld [$c0ef], a
+.asm_61908
+ ld a, $e8
+ ld [$c0ee], a
+ call $23b1
+.asm_61910
+ ld a, [$c026]
+ cp $e8
+ jr z, .asm_61910 ; 0x61915 $f9
+ call $2307
+ ld hl, $d803
+ set 1, [hl]
+ ld hl, $d72d
+ res 5, [hl]
+ jp TextScriptEnd
+; 0x61927
-UnnamedText_61927: ; 0x61927
- TX_FAR _UnnamedText_61927
+ReceivingHM01Text: ; 0x61927
+ TX_FAR _ReceivingHM01Text
db $50
; 0x61927 + 5 bytes
-INCBIN "baserom.gbc",$6192c,$61932 - $6192c
+ReceivedHM01Text: ; 0x6192c
+ TX_FAR _ReceivedHM01Text ; 0x8140d
+ db $11, $50
+; 0x6192c + 6 bytes = 0x61932
UnnamedText_61932: ; 0x61932
TX_FAR _UnnamedText_61932
db $50
; 0x61932 + 5 bytes
-UnnamedText_61937: ; 0x61937
- TX_FAR _UnnamedText_61937
+HM01NoRoomText: ; 0x61937
+ TX_FAR _HM01NoRoomText
db $50
; 0x61937 + 5 bytes
@@ -46074,7 +46153,7 @@ SSAnne9Text4: ; 0x61bd3
SSAnne9Text5: ; 0x61bdd
db $08 ; asm
call $3719
- ld hl, $5bf2
+ ld hl, UnnamedText_61bf2
call PrintText
call $3725
ld a, $84
@@ -46088,7 +46167,7 @@ UnnamedText_61bf2: ; 0x61bf2
SSAnne9Text7: ; 0x61bf7
db $08 ; asm
- ld hl, $5c01
+ ld hl, UnnamedText_61c01
call PrintText
jp TextScriptEnd
@@ -46099,7 +46178,7 @@ UnnamedText_61c01: ; 0x61c01
SSAnne9Text8: ; 0x61c06
db $08 ; asm
- ld hl, $5c10
+ ld hl, UnnamedText_61c10
call PrintText
jp TextScriptEnd
@@ -46110,7 +46189,7 @@ UnnamedText_61c10: ; 0x61c10
SSAnne9Text10: ; 0x61c15
db $08 ; asm
- ld hl, $5c1f
+ ld hl, UnnamedText_61c1f
call PrintText
jp TextScriptEnd
@@ -46121,7 +46200,7 @@ UnnamedText_61c1f: ; 0x61c1f
SSAnne9Text11: ; 0x61c24
db $08 ; asm
- ld hl, $5c2e
+ ld hl, UnnamedText_61c2e
call PrintText
jp TextScriptEnd
@@ -46132,7 +46211,7 @@ UnnamedText_61c2e: ; 0x61c2e
SSAnne9Text12: ; 0x61c33
db $08 ; asm
- ld hl, $5c3d
+ ld hl, UnnamedText_61c3d
call PrintText
jp TextScriptEnd
@@ -46143,7 +46222,7 @@ UnnamedText_61c3d: ; 0x61c3d
SSAnne9Text13: ; 0x61c42
db $08 ; asm
- ld hl, $5c4c
+ ld hl, UnnamedText_61c4c
call PrintText
jp TextScriptEnd
@@ -46588,40 +46667,44 @@ SilphCo11Text1: ; 0x622dc
db $08 ; asm
ld a, [$d838]
bit 5, a
- jp nz, $6308
- ld hl, $6311
+ jp nz, .asm_62308
+ ld hl, SilphCoPresidentText
call PrintText
- ld bc,(MASTER_BALL << 8) | 1
+ ld bc, (MASTER_BALL << 8) | 1
call GiveItem
jr nc, .asm_36088 ; 0x622f1
- ld hl, $6316
+ ld hl, ReceivedSilphCoMasterBallText
call PrintText
ld hl, $d838
set 5, [hl]
jr .asm_fd405 ; 0x622fe
.asm_36088 ; 0x62300
- ld hl, $6321
+ ld hl, SilphCoMasterBallNoRoomText
call PrintText
jr .asm_fd405 ; 0x62306
- ld hl, $631c
+.asm_62308 ; 0x62308
+ ld hl, UnnamedText_6231c
call PrintText
.asm_fd405 ; 0x6230e
jp TextScriptEnd
-UnnamedText_62311: ; 0x62311
- TX_FAR _UnnamedText_62311
+SilphCoPresidentText: ; 0x62311
+ TX_FAR _SilphCoPresidentText
db $50
; 0x62311 + 5 bytes
-INCBIN "baserom.gbc",$62316,$6231c - $62316
+ReceivedSilphCoMasterBallText: ; 0x62316
+ TX_FAR _ReceivedSilphCoMasterBallText ; 0x84f63
+ db $11, $50
+; 0x62316 + 6 bytes = 0x6231c
UnnamedText_6231c: ; 0x6231c
TX_FAR _UnnamedText_6231c
db $50
; 0x6231c + 5 bytes
-UnnamedText_62321: ; 0x62321
- TX_FAR _UnnamedText_62321
+SilphCoMasterBallNoRoomText: ; 0x62321
+ TX_FAR _SilphCoMasterBallNoRoomText
db $50
; 0x62321 + 5 bytes
@@ -47271,7 +47354,7 @@ Predef54: ; 0x71ad9
jr nz,.asm_99bca ; 0x71b4b $b
call Function71c07
jr c,.asm_99bca ; 0x71b50 $6
- ld hl,$5d8d
+ ld hl, UnnamedText_71d8d
call PrintText
.asm_99bca ; 0x71b58
ld hl,$cd12
@@ -47339,7 +47422,7 @@ Function71c07: ; 0x71c07
ld b,$1
ld a,$10
call Predef
- ld hl,$5d88
+ ld hl, UnnamedText_71d88
call PrintText
ld a,[$cf92]
push af
@@ -48259,7 +48342,7 @@ ViridianGymText1: ; 0x74a69
.asm_9fc95 ; 0x74a7d
ld a, $1
ld [$cc3c], a
- ld hl, $4ad9
+ ld hl, UnnamedText_74ad9
call PrintText
call $20ef
ld a, $32
@@ -48271,7 +48354,7 @@ ViridianGymText1: ; 0x74a69
call $20d1
jr .asm_6dff7 ; 0x74a9e
.asm_6de66 ; 0x74aa0
- ld hl, $4ace
+ ld hl, UnnamedText_74ace
call PrintText
ld hl, $d72d
set 6, [hl]
@@ -48298,11 +48381,12 @@ UnnamedText_74ace: ; 0x74ace
UnnamedText_74ad3: ; 0x74ad3
TX_FAR _UnnamedText_74ad3
db $0b, $50
-; 0x74ad3 + 6 bytes
+; 0x74ad9
-UnnamedText_74ad8:
- TX_FAR _UnnamedText_74ad8
+UnnamedText_74ad9: ; 0x74ad9
+ TX_FAR _UnnamedText_74ad9
db $0d, $50
+; 0x74add
ViridianGymText12: ; 0x74adf
TX_FAR _ViridianGymText12
@@ -48495,11 +48579,11 @@ ViridianGymText10: ; 0x74bbb
ld a, [$d751]
bit 1, a
jr nz, .asm_1abd1 ; 0x74bc1
- ld hl, $4bd4
+ ld hl, UnnamedText_74bd4
call PrintText
jr .asm_6064d ; 0x74bc9
.asm_1abd1 ; 0x74bcb
- ld hl, $4bd9
+ ld hl, UnnamedText_74bd9
call PrintText
.asm_6064d ; 0x74bd1
jp TextScriptEnd
@@ -48563,7 +48647,7 @@ PewterMartTexts: ; 0x74cb6
PewterMartText2: ; 0x74cbc
db $08 ; asm
- ld hl, $4cc6
+ ld hl, UnnamedText_74cc6
call PrintText
jp TextScriptEnd
@@ -48574,7 +48658,7 @@ UnnamedText_74cc6: ; 0x74cc6
PewterMartText3: ; 0x74ccb
db $08 ; asm
- ld hl, $4cd5
+ ld hl, UnnamedText_74cd5
call PrintText
jp TextScriptEnd
@@ -48672,15 +48756,15 @@ CeruleanHouse3Texts:
CeruleanHouse3Text1: ; 0x74e15
db $8
- ld hl, $4e77
+ ld hl, UnnamedText_74e77
call PrintText
xor a
ld [$cc26], a
ld [$cc36], a
.asm_74e23
- ld hl, $4e7c
+ ld hl, UnnamedText_74e7c
call PrintText
- ld hl, $4e6d
+ ld hl, UnnamedText_74e6d
call $2a5a
ld hl, $cf7b
ld a, l
@@ -48709,11 +48793,12 @@ CeruleanHouse3Text1: ; 0x74e15
.asm_74e60
xor a
ld [$cc36], a
- ld hl, $4e81
+ ld hl, UnnamedText_74e81
call PrintText
jp TextScriptEnd
; 0x74e6d
+UnnamedText_74e6d: ; 0x74e6d
db $8,BOULDERBADGE,CASCADEBADGE,THUNDERBADGE,RAINBOWBADGE,SOULBADGE,MARSHBADGE,VOLCANOBADGE,EARTHBADGE,$FF
UnnamedText_74e77: ; 0x74e77
@@ -48949,19 +49034,19 @@ FuchsiaHouse2Text1: ; 0x750c2
ld a, [$d78e]
bit 1, a
jr nz, .asm_60cba ; 0x750d6
- ld hl, $5135
+ ld hl, UnnamedText_75135
call PrintText
call $35ec
ld a, [$cc26]
and a
- ld hl, $513f
+ ld hl, UnnamedText_7513f
jr nz, .asm_61238 ; 0x750e8
- ld hl, $513a
+ ld hl, UnnamedText_7513a
.asm_61238 ; 0x750ed
call PrintText
jr .asm_52039 ; 0x750f0
.asm_3f30f ; 0x750f2
- ld hl, $5144
+ ld hl, UnnamedText_75144
call PrintText
ld a, $40
ldh [$db], a
@@ -48971,22 +49056,22 @@ FuchsiaHouse2Text1: ; 0x750c2
ld hl, $d78e
set 1, [hl]
.asm_60cba ; 0x75109
- ld hl, $514e
+ ld hl, UnnamedText_7514e
call PrintText
ld bc,(HM_04 << 8) | 1
call GiveItem
jr nc, .asm_53b90 ; 0x75115
- ld hl, $5153
+ ld hl, UnnamedText_75153
call PrintText
ld hl, $d78e
set 0, [hl]
jr .asm_52039 ; 0x75122
.asm_58feb ; 0x75124
- ld hl, $5159
+ ld hl, UnnamedText_75159
call PrintText
jr .asm_52039 ; 0x7512a
.asm_53b90 ; 0x7512c
- ld hl, $515e
+ ld hl, UnnamedText_7515e
call PrintText
.asm_52039 ; 0x75132
jp TextScriptEnd
@@ -49040,9 +49125,9 @@ FuchsiaHouse2Text4: ; 0x75163
db $08 ; asm
ldh a, [$8c]
cp $4
- ld hl, $517b
+ ld hl, UnnamedText_7517b
jr nz, .asm_4c9a2 ; 0x7516b
- ld hl, $5176
+ ld hl, UnnamedText_75176
.asm_4c9a2 ; 0x75170
call PrintText
jp TextScriptEnd
@@ -49233,7 +49318,7 @@ SafariZoneEntranceText4: ; 0x752ca
ld [$ff00+$a1], a
call $35a6
jr nc, .asm_752f9 ; 0x752ef $8
- ld hl, $536a
+ ld hl, UnnamedText_7536a
call PrintText
jr .asm_7534c ; 0x752f7 $53
.asm_752f9
@@ -49251,7 +49336,7 @@ SafariZoneEntranceText4: ; 0x752ca
ld a, $13
ld [$d125], a
call $30e8
- ld hl, $535b
+ ld hl, UnnamedText_7535b
call PrintText
ld a, $1e
ld [$da47], a
@@ -49268,7 +49353,7 @@ SafariZoneEntranceText4: ; 0x752ca
ld a, $3
ld [$d61f], a
jr .asm_75358 ; 0x75344 $12
- ld hl, $5365
+ ld hl, UnnamedText_75365
call PrintText
.asm_7534c
ld a, $80
@@ -49306,7 +49391,7 @@ SafariZoneEntranceText5: ; 0x7536f
ld a, [$cc26]
and a
jr nz, .asm_7539c ; 0x7537b $1f
- ld hl, $53bb
+ ld hl, UnnamedText_753bb
call PrintText
xor a
ld [$c109], a
@@ -49320,7 +49405,7 @@ SafariZoneEntranceText5: ; 0x7536f
ld [$cf0d], a
jr .asm_753b3 ; 0x7539a $17
.asm_7539c
- ld hl, $53c0
+ ld hl, UnnamedText_753c0
call PrintText
ld a, $4
ld [$c109], a
@@ -49352,14 +49437,14 @@ SafariZoneEntranceText6: ; 0x753c5
SafariZoneEntranceText2: ; 0x753ca
db $08 ; asm
- ld hl, $53e6
+ ld hl, UnnamedText_753e6
call PrintText
call $35ec
ld a, [$cc26]
and a
- ld hl, $53f0
+ ld hl, UnnamedText_753f0
jr nz, .asm_278a6 ; 0x753db
- ld hl, $53eb
+ ld hl, UnnamedText_753eb
.asm_278a6 ; 0x753e0
call PrintText
jp TextScriptEnd
@@ -49447,17 +49532,17 @@ FuchsiaGymText1: ; 0x75534
call $30b6
jr .asm_e84c6 ; 0x75546
.asm_adc3b ; 0x75548
- ld hl, $558b
+ ld hl, UnnamedText_7558b
call PrintText
jr .asm_e84c6 ; 0x7554e
.asm_181b6 ; 0x75550
- ld hl, $5581
+ ld hl, UnnamedText_75581
call PrintText
ld hl, $d72d
set 6, [hl]
set 7, [hl]
- ld hl, $5586
- ld de, $5586
+ ld hl, UnnamedText_75586
+ ld de, $5586 ; probably UnnamedText_75586
call $3354
ldh a, [$8c]
ld [$cf13], a
@@ -49636,9 +49721,9 @@ FuchsiaGymText8: ; 0x7563a
db $08 ; asm
ld a, [$d792]
bit 1, a
- ld hl, $5653
+ ld hl, UnnamedText_75653
jr nz, .asm_50671 ; 0x75643
- ld hl, $564e
+ ld hl, UnnamedText_7564e
.asm_50671 ; 0x75648
call PrintText
jp TextScriptEnd
@@ -49893,14 +49978,14 @@ CinnabarGymText1: ; 0x758df
call $30b6
jp TextScriptEnd
.asm_3012f ; 0x758f4
- ld hl, $5920
+ ld hl, UnnamedText_75920
call PrintText
jp TextScriptEnd
.asm_d9332 ; 0x758fd
- ld hl, $5914
+ ld hl, UnnamedText_75914
call PrintText
- ld hl, $5919
- ld de, $5919
+ ld hl, UnnamedText_75919
+ ld de, UnnamedText_75919 ; $5919 XXX
call $3354
ld a, $7
ld [$d05c], a
@@ -49946,14 +50031,14 @@ CinnabarGymText2: ; 0x75939
ld a, [$d79a]
bit 2, a
jr nz, .asm_46bb4 ; 0x75942
- ld hl, $595f
+ ld hl, UnnamedText_7595f
call PrintText
- ld hl, $5964
- ld de, $5964
+ ld hl, UnnamedText_75964
+ ld de, UnnamedText_75964 ; $5964 XXX
call $3354
jp $58b7
.asm_46bb4 ; 0x75956
- ld hl, $5969
+ ld hl, UnnamedText_75969
call PrintText
jp TextScriptEnd
@@ -49978,14 +50063,14 @@ CinnabarGymText3: ; 0x7596e
ld a, [$d79a]
bit 3, a
jr nz, .asm_4b406 ; 0x75977
- ld hl, $5994
+ ld hl, UnnamedText_75994
call PrintText
- ld hl, $5999
- ld de, $5999
+ ld hl, UnnamedText_75999
+ ld de, UnnamedText_75999 ; $5999 XXX
call $3354
jp $58b7
.asm_4b406 ; 0x7598b
- ld hl, $599e
+ ld hl, UnnamedText_7599e
call PrintText
jp TextScriptEnd
@@ -50010,14 +50095,14 @@ CinnabarGymText4: ; 0x759a3
ld a, [$d79a]
bit 4, a
jr nz, .asm_c0673 ; 0x759ac
- ld hl, $59c9
+ ld hl, UnnamedText_759c9
call PrintText
- ld hl, $59ce
- ld de, $59ce
+ ld hl, UnnamedText_759ce
+ ld de, UnnamedText_759ce ; $59ce XXX
call $3354
jp $58b7
.asm_c0673 ; 0x759c0
- ld hl, $59d3
+ ld hl, UnnamedText_759d3
call PrintText
jp TextScriptEnd
@@ -50042,14 +50127,14 @@ CinnabarGymText5: ; 0x759d8
ld a, [$d79a]
bit 5, a
jr nz, .asm_5cfd7 ; 0x759e1
- ld hl, $59fe
+ ld hl, UnnamedText_759fe
call PrintText
- ld hl, $5a03
- ld de, $5a03
+ ld hl, UnnamedText_75a03
+ ld de, UnnamedText_75a03 ; $5a03 XXX
call $3354
jp $58b7
.asm_5cfd7 ; 0x759f5
- ld hl, $5a08
+ ld hl, UnnamedText_75a08
call PrintText
jp TextScriptEnd
@@ -50074,14 +50159,14 @@ CinnabarGymText6: ; 0x75a0d
ld a, [$d79a]
bit 6, a
jr nz, .asm_776b4 ; 0x75a16
- ld hl, $5a33
+ ld hl, UnnamedText_75a33
call PrintText
- ld hl, $5a38
- ld de, $5a38
+ ld hl, UnnamedText_75a38
+ ld de, UnnamedText_75a38
call $3354
jp $58b7
.asm_776b4 ; 0x75a2a
- ld hl, $5a3d
+ ld hl, UnnamedText_75a3d
call PrintText
jp TextScriptEnd
@@ -50106,7 +50191,7 @@ CinnabarGymText7: ; 0x75a42
ld a, [$d79a]
bit 7, a
jr nz, .asm_2f755 ; 0x75a4b
- ld hl, $5a68
+ ld hl, UnnamedText_75a68
call PrintText
ld hl, $5a6d
ld de, $5a6d
@@ -50138,14 +50223,14 @@ CinnabarGymText8: ; 0x75a77
ld a, [$d79b]
bit 0, a
jr nz, .asm_d87be ; 0x75a80
- ld hl, $5a9d
+ ld hl, UnnamedText_75a9d
call PrintText
- ld hl, $5aa2
- ld de, $5aa2
+ ld hl, UnnamedText_75aa2
+ ld de, UnnamedText_75aa2 ; $5aa2 XXX
call $3354
jp $58b7
.asm_d87be ; 0x75a94
- ld hl, $5aa7
+ ld hl, UnnamedText_75aa7
call PrintText
jp TextScriptEnd
@@ -50169,10 +50254,10 @@ CinnabarGymText9: ; 0x75aac
ld a, [$d79a]
bit 1, a
jr nz, .asm_627d9 ; 0x75ab2
- ld hl, $5ac2
+ ld hl, UnnamedText_75ac2
jr .asm_0b11d ; 0x75ab7
.asm_627d9 ; 0x75ab9
- ld hl, $5ac7
+ ld hl, UnnamedText_75ac7
.asm_0b11d ; 0x75abc
call PrintText
jp TextScriptEnd
@@ -50354,22 +50439,22 @@ Lab3Text1: ; 0x75c94
ld a, [$d7a1]
bit 7, a
jr nz, .asm_e551a ; 0x75c9a
- ld hl, $5cc8
+ ld hl, UnnamedText_75cc8
call PrintText
- ld bc,(TM_35 << 8) | 1
+ ld bc, (TM_35 << 8) | 1
call GiveItem
jr nc, .asm_6c187 ; 0x75ca8
- ld hl, $5ccd
+ ld hl, UnnamedText_75ccd
call PrintText
ld hl, $d7a1
set 7, [hl]
jr .asm_eb896 ; 0x75cb5
.asm_6c187 ; 0x75cb7
- ld hl, $5cd8
+ ld hl, UnnamedText_75cd8
call PrintText
jr .asm_eb896 ; 0x75cbd
.asm_e551a ; 0x75cbf
- ld hl, $5cd3
+ ld hl, UnnamedText_75cd3
call PrintText
.asm_eb896 ; 0x75cc5
jp TextScriptEnd
@@ -50452,7 +50537,7 @@ Lab4Text1: ; 0x75d6c
ld a, [$d7a3]
bit 0, a
jr nz, .asm_75d96 ; 0x75d72 $22
- ld hl, $5dc6
+ ld hl, UnnamedText_75dc6
call PrintText
call $5d38
ld a, [$cd37]
@@ -50463,19 +50548,19 @@ Lab4Text1: ; 0x75d6c
call Bankswitch
jr .asm_75d93 ; 0x75d8b $6
.asm_75d8d
- ld hl, $5dcb
+ ld hl, UnnamedText_75dcb
call PrintText
.asm_75d93
jp TextScriptEnd
.asm_75d96
bit 1, a
jr z, .asm_75da2 ; 0x75d98 $8
- ld hl, $5dd0
+ ld hl, UnnamedText_75dd0
call PrintText
jr .asm_75d93 ; 0x75da0 $f1
.asm_75da2
call $5de8
- ld hl, $5dd5
+ ld hl, UnnamedText_75dd5
call PrintText
ld hl, $d7a3
set 2, [hl]
@@ -50784,9 +50869,9 @@ GaryText1: ; 0x760e0
db $08 ; asm
ld a, [$d867]
bit 1, a
- ld hl, $60f4
+ ld hl, UnnamedText_760f4
jr z, .asm_17e9f ; 0x760e9
- ld hl, $6103
+ ld hl, UnnamedText_76103
.asm_17e9f ; 0x760ee
call PrintText
jp TextScriptEnd
@@ -50820,7 +50905,7 @@ GaryText3: ; 0x7610d
ld a, [$d717]
ld [$d11e], a
call GetMonName
- ld hl, $6120
+ ld hl, UnnamedText_76120
call PrintText
jp TextScriptEnd
; 0x76120
@@ -52511,7 +52596,7 @@ _UnnamedText_61816: ; 0x812a6
db "fillets du beef?", $57
; 0x812a6 + 55 bytes
-UnnamedText_812dd: ; 0x812dd
+_SSAnne7RubText: ; 0x812dd
db $0, "CAPTAIN: Ooargh...", $4f
db "I feel hideous...", $55
db "Urrp! Seasick...", $51
@@ -52522,7 +52607,7 @@ UnnamedText_812dd: ; 0x812dd
db "Rub-rub...@@"
; 0x81347
-_UnnamedText_61927: ; 0x81347
+_ReceivingHM01Text: ; 0x81347
db $0, "CAPTAIN: Whew!", $4f
db "Thank you! I", $55
db "feel much better!", $51
@@ -52538,7 +52623,7 @@ _UnnamedText_61927: ; 0x81347
db "any time!", $58
; 0x81347 + 198 bytes
-UnnamedText_8140d: ; 0x8140d
+_ReceivedHM01Text: ; 0x8140d
db $0, $52, " got", $4f
db "@"
TX_RAM $cf4b
@@ -52552,7 +52637,7 @@ _UnnamedText_61932: ; 0x8141c
db "guess it's time.", $57
; 0x8141c + 65 bytes
-_UnnamedText_61937: ; 0x8145d
+_HM01NoRoomText: ; 0x8145d
db $0, "Oh no! You have", $4f
db "no room for this!", $57
; 0x8145d + 35 bytes
@@ -53165,14 +53250,14 @@ _UnnamedText_59ded: ; 0x82454
db "please take this!", $58
; 0x82454 + 102 bytes
-UnnamedText_824ba: ; 0x824ba
+_ReceivedTM36Text: ; 0x824ba
db $0, $52, " got", $4f
db "@"
TX_RAM $cf4b
db $0, "!@@"
; 0x824c9
-_UnnamedText_59df8: ; 0x824c9
+_TM36ExplanationText: ; 0x824c9
db $0, "TM36 is", $4f
db "SELFDESTRUCT!", $51
db "It's powerful, but", $4f
@@ -53181,7 +53266,7 @@ _UnnamedText_59df8: ; 0x824c9
db "Be careful.", $57
; 0x824c9 + 83 bytes
-_UnnamedText_59dfd: ; 0x8251c
+_TM36NoRoomText: ; 0x8251c
db $0, "You don't have any", $4f
db "room for this.", $57
; 0x8251c + 34 bytes
@@ -53923,7 +54008,7 @@ _UnnamedText_5a1f6: ; 0x84e66
db "Then go on home!", $57
; 0x84e66 + 53 bytes
-_UnnamedText_62311: ; 0x84e9b
+_SilphCoPresidentText: ; 0x84e9b
db $0, "PRESIDENT: Thank", $4f
db "you for saving", $55
db "SILPH!", $51
@@ -53940,7 +54025,7 @@ _UnnamedText_62311: ; 0x84e9b
db "will do!", $58
; 0x84e9b + 200 bytes
-UnnamedText_84f63: ; 0x84f63
+_ReceivedSilphCoMasterBallText: ; 0x84f63
db $0, $52, " got a", $4f
db "@"
TX_RAM $cf4b
@@ -53962,7 +54047,7 @@ _UnnamedText_6231c: ; 0x84f74
db "it, though.", $57
; 0x84f74 + 159 bytes
-_UnnamedText_62321: ; 0x85013
+_SilphCoMasterBallNoRoomText: ; 0x85013
db $0, "You have no", $4f
db "room for this.", $57
; 0x85013 + 28 bytes
@@ -56708,7 +56793,7 @@ UnknownText_8acd6: ; 0x8acd6
SECTION "bank23",DATA,BANK[$23]
-UnknownText_8c000: ; 0x8c000
+_UnnamedText_56437: ; 0x8c000
db $0, "All right then,", $4f
db "@@"
; 0x8c000 + 19 bytes
@@ -57034,7 +57119,7 @@ _UnnamedText_564c0: ; 0x8c9b3
db "fish?", $57
; 0x8c9b3 + 77 bytes
-UnknownText_8ca00: ; 0x8ca00
+_UnnamedText_564c5: ; 0x8ca00
db $0, "Grand! I like", $4f
db "your style!", $51
db "Take this and", $4f
@@ -59927,7 +60012,7 @@ _Route23Text8: ; 0x92700
db $0, "VICTORY ROAD GATE", $4f
db "- #MON LEAGUE", $57
-UnknownText_92721: ; 0x92721
+_UnnamedText_51510: ; 0x92721
db $0, "Congratulations!", $4f
db "You beat our 5", $55
db "contest trainers!@@"
@@ -59939,7 +60024,7 @@ _UnnamedText_51515: ; 0x92755
db "fabulous prize!", $58
; 0x92755 + 36 bytes
-UnknownText_92779: ; 0x92779
+_UnnamedText_5151a: ; 0x92779
db $0, $52, " received", $4f
db "a @"
; 0x92779 + 15 bytes
@@ -61148,7 +61233,7 @@ _UnnamedText_74ad3: ; 0x95ed5
db "the EARTHBADGE!@@"
; 0x95ed5 + 85 bytes
-_UnnamedText_74ad8: ; 0x95f2b
+_UnnamedText_74ad9: ; 0x95f2b
db $0, "Having lost, I", $4f
db "cannot face my", $55
db "underlings!", $55
@@ -61427,7 +61512,7 @@ _UnnamedText_5c28e: ; 0x966b4
db "get it examined!", $58
; 0x966b4 + 220 bytes
-ReceivedOldAmberText: ; 0x96790
+_ReceivedOldAmberText: ; 0x96790
db $0, $52, " received", $4f
db "OLD AMBER!@@"
; 0x96790 + 24 bytes
@@ -61554,7 +61639,7 @@ _UnnamedText_5c4b7: ; 0x981ab
db "room for this!", $57
; 0x981ab + 30 bytes
-UnnamedText_981c9: ; 0x981c9
+_UnnamedText_5c4bc: ; 0x981c9
db $0, "I took", $4f
db "you for granted.", $51
db "As proof of your", $4f
@@ -61698,7 +61783,7 @@ _PewterPokecenterText1: ; 0x98704
db "I'm on the phone!", $51
db "Scram!", $57
-UnnamedText_98744: ; 0x98744
+_PewterPokecenterText5: ; 0x98744
db $0, "JIGGLYPUFF: Puu", $4f
db "pupuu!", $57
; 0x9875c
@@ -62709,7 +62794,7 @@ _UnnamedText_59c6a: ; 0x9a6e0
db "you to have this!", $58
; 0x9a6e0 + 334 bytes
-UnnamedText_9a82e: ; 0x9a82e
+_ReceivedBikeVoucherText: ; 0x9a82e
db $0, $52, " received", $4f
db "a @"
TX_RAM $cf4b
@@ -62823,14 +62908,14 @@ _UnnamedText_5cb77: ; 0x9c069
db "kid! Take this!", $57
; 0x9c069 + 119 bytes
-UnnamedText_9c0e0: ; 0x9c0e0
+_ReceivedTM24Text: ; 0x9c0e0
db $0, $52, " received ", $4f
db "@"
TX_RAM $cf4b
db $0, "!@@"
; 0x9c0f5
-_UnnamedText_5cb81: ; 0x9c0f5
+_TM24ExplanationText: ; 0x9c0f5
db $0, $51
db "TM24 contains", $4f
db "THUNDERBOLT!", $51
@@ -62838,12 +62923,12 @@ _UnnamedText_5cb81: ; 0x9c0f5
db "electric #MON!", $57
; 0x9c0f5 + 59 bytes
-_UnnamedText_5cb86: ; 0x9c130
+_TM24NoRoomText: ; 0x9c130
db $0, "Yo kid, make room", $4f
db "in your pack!", $57
; 0x9c130 + 33 bytes
-_UnnamedText_5cb8b: ; 0x9c151
+_ReceivedThunderbadgeText: ; 0x9c151
db $0, "Whoa!", $51
db "You're the real", $4f
db "deal, kid!", $51
@@ -62963,7 +63048,7 @@ _UnnamedText_560b1: ; 0x9c510
db "fish?", $57
; 0x9c510 + 68 bytes
-UnnamedText_9c554: ; 0x9c554
+_UnnamedText_560b6: ; 0x9c554
db $0, "Grand! I like", $4f
db "your style!", $51
db "Take this and", $4f
@@ -64345,7 +64430,7 @@ _UnnamedText_561bd: ; 0xa0695
db "fish?", $57
; 0xa0695 + 83 bytes
-UnnamedText_a06e8: ; 0xa06e8
+_UnnamedText_561c2: ; 0xa06e8
db $0, "Grand! I like", $4f
db "your style!", $51
db "Take this and", $4f
@@ -64856,14 +64941,14 @@ _UnnamedText_5ccd9: ; 0xa1636
db "this, then!", $58
; 0xa1636 + 63 bytes
-UnnamedText_a1675: ; 0xa1675
+_ReceivedTM31Text: ; 0xa1675
db $0, $52, " received", $4f
db "@"
TX_RAM $cf4b
db $0, "!@@"
; 0xa1689
-UnnamedText_a1689: ; 0xa1689
+_TM31ExplanationText1: ; 0xa1689
db $0, $51
db "TM31 contains my", $4f
db "favorite, MIMIC!", $51
@@ -64871,7 +64956,7 @@ UnnamedText_a1689: ; 0xa1689
db "#MON!@@"
; 0xa16c5
-_UnnamedText_5cce9: ; 0xa16c5
+_TM31ExplanationText2: ; 0xa16c5
db $0, $52, ": Hi!", $4f
db "Thanks for TM31!", $51
db $52, ": Pardon?", $51
@@ -64882,7 +64967,7 @@ _UnnamedText_5cce9: ; 0xa16c5
db "It's a scream!", $57
; 0xa16c5 + 110 bytes
-UnnamedText_a1733: ; 0xa1733
+_TM31NoRoomText: ; 0xa1733
db $0, "Don't you want", $4f
db "this?@@"
; 0xa1749
@@ -65758,7 +65843,7 @@ _UnnamedText_191ca: ; 0xa45ea
db "have this TM.", $58
; 0xa45ea + 176 bytes
-ReceivedTM42Text: ; 0xa469a
+_ReceivedTM42Text: ; 0xa469a
db $0, $52, " received", $4f
db "TM42!@@"
; 0xa46ad
@@ -66347,7 +66432,7 @@ _UnnamedText_199d2: ; 0xa5afd
db "dropping by!", $58
; 0xa5afd + 93 bytes
-UnnamedText_a5b5a: ; 0xa5b5a
+_UnnamedText_199d7: ; 0xa5b5a
db $0, $52, " received", $4f
db "@"
TX_RAM $cf4b
diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index dbfb4e32..699d91aa 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -546,7 +546,7 @@ end_08_scripts_with = [
0xc9, #ret
###0xda, 0xe9, 0xd2, 0xc2, 0xca, 0xc3, 0x38, 0x30, 0x20, 0x28, 0x18, 0xd8, 0xd0, 0xc0, 0xc8, 0xc9
]
-relative_jumps = [0x38, 0x30, 0x20, 0x28, 0x18, 0xc3, 0xda]
+relative_jumps = [0x38, 0x30, 0x20, 0x28, 0x18, 0xc3, 0xda, 0xc2]
relative_unconditional_jumps = [0xc3, 0x18]
#TODO: replace call and a pointer with call and a label
@@ -566,6 +566,8 @@ asm_commands = {
"24d7": "TextScriptEnd",
"3e5c": "GenRandom", #bank 4
"6581": "ItemUseNotTime",
+ "3a87": "AddNTimes",
+ "3dab": "IsInArray", #bank 3
}
def random_asm_label():
@@ -722,7 +724,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
number += byte2 << 8;
insertion = "$%.4x" % (number)
- if maybe_byte in call_commands:
+ if maybe_byte in call_commands or current_byte in relative_unconditional_jumps or current_byte in relative_jumps:
if insertion[1:] in asm_commands:
insertion = asm_commands[insertion[1:]]
diff --git a/extras/print_pc_items.py b/extras/print_pc_items.py
deleted file mode 100644
index 7b9dc6c3..00000000
--- a/extras/print_pc_items.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/python
-#author: Bryan Bishop <kanzure@gmail.com>
-#date: 2012-01-19
-#spit out some constants
-
-for x in range(1, 51):
- print "W_BOXITEM%.2d EQU $%s" % (x, ("%.2x" % (0xd539+(x*2))).upper())
- print "W_BOXITEM%.2dQTY EQU $%s" % (x, ("%.2x" % (0xd539+(x*2)+1)).upper())
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 11:22:02 +0000