A few bank03 data tables and text labels

3 files changed, 202 insertions, 94 deletions

diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index c1ca2d0..c3dcd8c 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -1094,7 +1094,7 @@ PC_c7ea: ; c7ea (3:47ea)
 	jr z, .asm_c82f
 	call Func_c2a3
 	ld a, [wd0b9]
-	ld hl, Unknown_c846
+	ld hl, PointerTable_c846
 	call JumpToFunctionInTable
 	ld hl, Func_c84e
 	call Func_c32b
@@ -1110,11 +1110,26 @@ PC_c7ea: ; c7ea (3:47ea)
 	call Func_39fc
 	ret
 
-Unknown_c846: ; c846 (3:4846)
-	INCROM $c846, $c84e
+PointerTable_c846: ; c846 (3:4846)
+	dw Func_c859
+	dw Func_c86d
+	dw Func_c872
+	dw Func_c877
 
 Func_c84e: ; c84e (3:484e)
-	INCROM $c84e, $c891
+	INCROM $c84e, $c859
+
+Func_c859: ; c859 (3:4859)
+	INCROM $c859, $c86d
+
+Func_c86d: ; c86d (3:486d)
+	INCROM $c86d, $c872
+
+Func_c872: ; c872 (3:4872)
+	INCROM $c872, $c877
+
+Func_c877: ; c877 (3:4877)
+	INCROM $c877, $c891
 
 Func_c891: ; c891 (3:4891)
 	push hl
@@ -1813,9 +1828,10 @@ SetScriptPointer: ; cc8b (3:4c8b)
 	inc hl
 	ld [hl], b
 	ret
-; 0xcc92
 
-	INCROM $cc92, $cc96
+GetScriptArgs5AfterPointer: ; cc92 (3:4c92)
+	ld a, $5
+	jr GetScriptArgsAfterPointer
 
 GetScriptArgs1AfterPointer: ; cc96 (3:4c96)
 	ld a, $1
@@ -2590,7 +2606,7 @@ Func_d135: ; d135 (3:5135)
 	rlca
 	ld c, a
 	ld b, $0
-	ld hl, $5151
+	ld hl, MapNames - 2
 	add hl, bc
 	ld e, [hl]
 	inc hl
@@ -2601,7 +2617,19 @@ Func_d135: ; d135 (3:5135)
 	ld [hl], d
 	jp IncreaseScriptPointerBy2
 
-	INCROM $d153, $d16b
+MapNames: ; d153 (3:5153)
+	tx MasonLaboratoryMapNameText
+	tx MrIshiharasHouseMapNameText
+	tx FightingClubMapNameText
+	tx RockClubMapNameText
+	tx WaterClubMapNameText
+	tx LightningClubMapNameText
+	tx GrassClubMapNameText
+	tx PsychicClubMapNameText
+	tx ScienceClubMapNameText
+	tx FireClubMapNameText
+	tx ChallengeHallMapNameText
+	tx PokemonDomeMapNameText
 
 Func_d16b: ; d16b (3:516b)
 	ld hl, wCurrentNPCNameTx
@@ -2655,7 +2683,7 @@ Func_d1b3: ; d1b3 (3:51b3)
 ;	fallthrough
 
 .asm_d1c3
-	ld hl, Unknown_d1dc
+	ld hl, TradeCardNames
 asm_d1c6:
 	ld e, a
 	add a
@@ -2671,8 +2699,51 @@ asm_d1c6:
 	ld [wTxRam2 + 1], a
 	jp IncreaseScriptPointerBy1
 
-Unknown_d1dc: ; d1dc (3:51dc)
-	INCROM $d1dc, $d209
+TradeCardNames: ; d1dc (3:51dc)
+	db MEWTWO2
+	tx MewtwoTradeCardName
+
+	db MEW1
+	tx MewTradeCardName
+
+	db ARCANINE1
+	tx ArcanineTradeCardName
+
+	db PIKACHU3
+	tx PikachuTradeCardName
+
+	db PIKACHU4
+	tx PikachuTradeCardName
+
+	db SURFING_PIKACHU1
+	tx SurfingPikachuTradeCardName
+
+	db SURFING_PIKACHU2
+	tx SurfingPikachuTradeCardName
+
+	db ELECTABUZZ1
+	tx ElectabuzzTradeCardName
+
+	db SLOWPOKE1
+	tx SlowpokeTradeCardName
+
+	db MEWTWO3
+	tx MewtwoTradeCardName
+
+	db MEWTWO2
+	tx MewtwoTradeCardName
+
+	db MEW1
+	tx MewTradeCardName
+
+	db JIGGLYPUFF1
+	tx JigglypuffTradeCardName
+
+	db SUPER_ENERGY_RETRIEVAL
+	tx SuperEnergyRetrievalTradeCardName
+
+	db FLYING_PIKACHU
+	tx FlyingPikachuTradeCardName
 
 Func_d209: ; d209 (3:5209)
 	get_flag_value EVENT_FLAG_71
@@ -2706,13 +2777,16 @@ Func_d209: ; d209 (3:5209)
 
 LegendaryCards: ; d234 (3:5234)
 	db ZAPDOS3
-	tx Text03f0
+	tx ZapdosLegendaryCardName
+
 	db MOLTRES2
-	tx Text03f1
+	tx MoltresLegendaryCardName
+
 	db ARTICUNO2
-	tx Text03f2
+	tx ArticunoLegendaryCardName
+
 	db DRAGONITE1
-	tx Text03f3
+	tx DragoniteLegendaryCardName
 
 Flags_d240: ; d240 (3:5240)
 	db EVENT_FLAG_6D
@@ -2747,7 +2821,7 @@ ScriptCommand_ChooseDeckToDuelAgainstMultichoice: ; d24c (3:524c)
 	tx Text03f7
 	tx Text03f8
 
-	INCROM $d26f, $d271
+	dw NULL
 
 ScriptCommand_ChooseStarterDeckMultichoice: ; d271 (3:5271)
 	ld hl, .multichoice_menu_args
@@ -5670,10 +5744,16 @@ Func_f121: ; f121 (3:7121)
 	ret
 
 Unknown_f146: ; f146 (3:7146)
-	INCROM $f146, $f156
+	db $01, $00, EVENT_FLAG_50, $01
+	db $03, $03, EVENT_FLAG_51, $02
+	db $07, $03, EVENT_FLAG_52, $03
+	db $07, $00, EVENT_FLAG_53, $04
 
 Unknown_f156: ; f156 (3:7156)
-	INCROM $f156, $f166
+	db $01, $00, EVENT_FLAG_54, $05
+	db $03, $03, EVENT_FLAG_55, $06
+	db $07, $03, EVENT_FLAG_56, $07
+	db $07, $00, EVENT_FLAG_57, $08
 
 Script_f166: ; f166 (3:7166)
 	INCROM $f166, $f239
@@ -6151,36 +6231,61 @@ Preload_ChallengeHallOpponent: ; f559 (3:7559)
 Func_f580: ; f580 (3:7580)
 	get_flag_value EVENT_FLAG_44
 	cp $3
-	jr z, .asm_f596
+	jr z, .pick_challenger_include_ronald
 	get_flag_value EVENT_FLAG_45
 	cp $3
-	ld d, $18
-	jr nz, .asm_f598
-	ld a, $2
-	jr .asm_f5ac
+	ld d, ChallengeHallNPCsEnd - ChallengeHallNPCs - 1 ; discount Ronald
+	jr nz, .pick_challenger
+	ld a, NPC_RONALD1
+	jr .force_ronald
 
-.asm_f596
-	ld d, $19
+.pick_challenger_include_ronald
+	ld d, ChallengeHallNPCsEnd - ChallengeHallNPCs
 
-.asm_f598
+.pick_challenger
 	ld a, d
 	call Random
 	ld c, a
 	call Func_f5cc
-	jr c, .asm_f598
+	jr c, .pick_challenger
 	call Func_f5d4
 	ld b, $0
-	ld hl, Unknown_f5b3
+	ld hl, ChallengeHallNPCs
 	add hl, bc
 	ld a, [hl]
 
-.asm_f5ac
+.force_ronald
 	ld [wTempNPC], a
 	ld [wd696], a
 	ret
 
-Unknown_f5b3: ; f5b3 (3:75b3)
-	INCROM $f5b3, $f5cc
+ChallengeHallNPCs: ; f5b3 (3:75b3)
+	db NPC_CHRIS
+	db NPC_MICHAEL
+	db NPC_JESSICA
+	db NPC_MATTHEW
+	db NPC_RYAN
+	db NPC_ANDREW
+	db NPC_SARA
+	db NPC_AMANDA
+	db NPC_JOSHUA
+	db NPC_JENNIFER
+	db NPC_NICHOLAS
+	db NPC_BRANDON
+	db NPC_BRITTANY
+	db NPC_KRISTIN
+	db NPC_HEATHER
+	db NPC_ROBERT
+	db NPC_DANIEL
+	db NPC_STEPHANIE
+	db NPC_JOSEPH
+	db NPC_DAVID
+	db NPC_ERIK
+	db NPC_JOHN
+	db NPC_ADAM
+	db NPC_JONATHAN
+	db NPC_RONALD1
+ChallengeHallNPCsEnd:
 
 Func_f5cc: ; f5cc (3:75cc)
 	INCROM $f5cc, $f5d4
@@ -6385,16 +6490,16 @@ Func_fc2b: ; fc2b (3:7c2b)
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
-	ld a, $b0
+	ld a, LOW(ClerkNPCName_)
 	ld [wCurrentNPCNameTx], a
-	ld a, $3
+	ld a, HIGH(ClerkNPCName_)
 	ld [wCurrentNPCNameTx+1], a
 	jp SetNextScript
 
 PointerTable_fc4c: ; fc4c (3:7c4c)
-	dw Unknown_fc64
-	dw Unknown_fc68
-	dw Unknown_fc60
+	dw Script_fc64
+	dw Script_fc68
+	dw Script_fc60
 
 Script_fc52: ; fc52 (3:7c52)
 	start_script
@@ -6406,14 +6511,17 @@ Script_fc52: ; fc52 (3:7c52)
 	run_command Func_cd76
 	quit_script_fully
 
-Unknown_fc60: ; fc60 (3:7c60)
-	INCROM $fc60, $fc64
+Script_fc60: ; fc60 (3:7c60)
+	start_script
+	print_text_quit_fully Text06ca
 
-Unknown_fc64: ; fc64 (3:7c64)
-	INCROM $fc64, $fc68
+Script_fc64: ; fc64 (3:7c64)
+	start_script
+	print_text_quit_fully Text06cb
 
-Unknown_fc68: ; fc68 (3:7c68)
-	INCROM $fc68, $fc6c
+Script_fc68: ; fc68 (3:7c68)
+	start_script
+	print_text_quit_fully Text06cc
 
 ; Clerk looks away from you if you can't use infrared
 ; This is one of the preloads that does not change whether or not they appear
diff --git a/src/text/text3.asm b/src/text/text3.asm
index dd18539..a0cf867 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -994,51 +994,51 @@ Text032f: ; 3e768 (f:6768)
 	text "     ??'s House     "
 	done
 
-Text0330: ; 3e77e (f:677e)
+MasonLaboratoryMapNameText: ; 3e77e (f:677e)
 	text "Mason Laboratory"
 	done
 
-Text0331: ; 3e790 (f:6790)
+MrIshiharasHouseMapNameText: ; 3e790 (f:6790)
 	text "Mr Ishihara's House"
 	done
 
-Text0332: ; 3e7a5 (f:67a5)
+FightingClubMapNameText: ; 3e7a5 (f:67a5)
 	text "Fighting"
 	done
 
-Text0333: ; 3e7af (f:67af)
+RockClubMapNameText: ; 3e7af (f:67af)
 	text "Rock"
 	done
 
-Text0334: ; 3e7b5 (f:67b5)
+WaterClubMapNameText: ; 3e7b5 (f:67b5)
 	text "Water"
 	done
 
-Text0335: ; 3e7bc (f:67bc)
+LightningClubMapNameText: ; 3e7bc (f:67bc)
 	text "Lightning"
 	done
 
-Text0336: ; 3e7c7 (f:67c7)
+GrassClubMapNameText: ; 3e7c7 (f:67c7)
 	text "Grass"
 	done
 
-Text0337: ; 3e7ce (f:67ce)
+PsychicClubMapNameText: ; 3e7ce (f:67ce)
 	text "Psychic"
 	done
 
-Text0338: ; 3e7d7 (f:67d7)
+ScienceClubMapNameText: ; 3e7d7 (f:67d7)
 	text "Science"
 	done
 
-Text0339: ; 3e7e0 (f:67e0)
+FireClubMapNameText: ; 3e7e0 (f:67e0)
 	text "Fire"
 	done
 
-Text033a: ; 3e7e6 (f:67e6)
+ChallengeHallMapNameText: ; 3e7e6 (f:67e6)
 	text "Challenge Hall"
 	done
 
-Text033b: ; 3e7f6 (f:67f6)
+PokemonDomeMapNameText: ; 3e7f6 (f:67f6)
 	text "Pokémon Dome"
 	done
 
@@ -1860,59 +1860,59 @@ AaronNPCName: ; 3f823 (f:7823)
 	text "Aaron"
 	done
 
-Text03e8: ; 3f82a (f:782a)
+MewtwoTradeCardName: ; 3f82a (f:782a)
 	text "<Lv>60 MEWTWO "
 	done
 
-Text03e9: ; 3f838 (f:7838)
+MewTradeCardName: ; 3f838 (f:7838)
 	text "<Lv>8 MEW "
 	done
 
-Text03ea: ; 3f842 (f:7842)
+ArcanineTradeCardName: ; 3f842 (f:7842)
 	text "<Lv>34 ARCANINE"
 	done
 
-Text03eb: ; 3f851 (f:7851)
+PikachuTradeCardName: ; 3f851 (f:7851)
 	text "<Lv>16 PIKACHU"
 	done
 
-Text03ec: ; 3f85f (f:785f)
+SurfingPikachuTradeCardName: ; 3f85f (f:785f)
 	text "<Lv>13 SURFING PIKACHU"
 	done
 
-Text03ed: ; 3f875 (f:7875)
+ElectabuzzTradeCardName: ; 3f875 (f:7875)
 	text "<Lv>20 ELECTABUZZ"
 	done
 
-Text03ee: ; 3f886 (f:7886)
+SlowpokeTradeCardName: ; 3f886 (f:7886)
 	text "<Lv>9 SLOWPOKE"
 	done
 
-Text03ef: ; 3f894 (f:7894)
+JigglypuffTradeCardName: ; 3f894 (f:7894)
 	text "<Lv>12 JIGGLYPUFF"
 	done
 
-Text03f0: ; 3f8a5 (f:78a5)
+ZapdosLegendaryCardName: ; 3f8a5 (f:78a5)
 	text "<Lv>68 ZAPDOS"
 	done
 
-Text03f1: ; 3f8b2 (f:78b2)
+MoltresLegendaryCardName: ; 3f8b2 (f:78b2)
 	text "<Lv>37 MOLTRES"
 	done
 
-Text03f2: ; 3f8c0 (f:78c0)
+ArticunoLegendaryCardName: ; 3f8c0 (f:78c0)
 	text "<Lv>37 ARTICUNO"
 	done
 
-Text03f3: ; 3f8cf (f:78cf)
+DragoniteLegendaryCardName: ; 3f8cf (f:78cf)
 	text "<Lv>41 DRAGONITE"
 	done
 
-Text03f4: ; 3f8df (f:78df)
+SuperEnergyRetrievalTradeCardName: ; 3f8df (f:78df)
 	text "Super Energy Retrieval"
 	done
 
-Text03f5: ; 3f8f7 (f:78f7)
+FlyingPikachuTradeCardName: ; 3f8f7 (f:78f7)
 	text "<Lv>12 FLYING PIKACHU"
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index a061dc9..3e9e463 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -817,18 +817,18 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text032d                                           ; 0x032d
 	textpointer Text032e                                           ; 0x032e
 	textpointer Text032f                                           ; 0x032f
-	textpointer Text0330                                           ; 0x0330
-	textpointer Text0331                                           ; 0x0331
-	textpointer Text0332                                           ; 0x0332
-	textpointer Text0333                                           ; 0x0333
-	textpointer Text0334                                           ; 0x0334
-	textpointer Text0335                                           ; 0x0335
-	textpointer Text0336                                           ; 0x0336
-	textpointer Text0337                                           ; 0x0337
-	textpointer Text0338                                           ; 0x0338
-	textpointer Text0339                                           ; 0x0339
-	textpointer Text033a                                           ; 0x033a
-	textpointer Text033b                                           ; 0x033b
+	textpointer MasonLaboratoryMapNameText                         ; 0x0330
+	textpointer MrIshiharasHouseMapNameText                        ; 0x0331
+	textpointer FightingClubMapNameText                            ; 0x0332
+	textpointer RockClubMapNameText                                ; 0x0333
+	textpointer WaterClubMapNameText                               ; 0x0334
+	textpointer LightningClubMapNameText                           ; 0x0335
+	textpointer GrassClubMapNameText                               ; 0x0336
+	textpointer PsychicClubMapNameText                             ; 0x0337
+	textpointer ScienceClubMapNameText                             ; 0x0338
+	textpointer FireClubMapNameText                                ; 0x0339
+	textpointer ChallengeHallMapNameText                           ; 0x033a
+	textpointer PokemonDomeMapNameText                             ; 0x033b
 	textpointer Text033c                                           ; 0x033c
 	textpointer Text033d                                           ; 0x033d
 	textpointer Text033e                                           ; 0x033e
@@ -1001,20 +1001,20 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer GrannyNPCName                                      ; 0x03e5
 	textpointer GuideNPCName                                       ; 0x03e6
 	textpointer AaronNPCName                                       ; 0x03e7
-	textpointer Text03e8                                           ; 0x03e8
-	textpointer Text03e9                                           ; 0x03e9
-	textpointer Text03ea                                           ; 0x03ea
-	textpointer Text03eb                                           ; 0x03eb
-	textpointer Text03ec                                           ; 0x03ec
-	textpointer Text03ed                                           ; 0x03ed
-	textpointer Text03ee                                           ; 0x03ee
-	textpointer Text03ef                                           ; 0x03ef
-	textpointer Text03f0                                           ; 0x03f0
-	textpointer Text03f1                                           ; 0x03f1
-	textpointer Text03f2                                           ; 0x03f2
-	textpointer Text03f3                                           ; 0x03f3
-	textpointer Text03f4                                           ; 0x03f4
-	textpointer Text03f5                                           ; 0x03f5
+	textpointer MewtwoTradeCardName                                ; 0x03e8
+	textpointer MewTradeCardName                                   ; 0x03e9
+	textpointer ArcanineTradeCardName                              ; 0x03ea
+	textpointer PikachuTradeCardName                               ; 0x03eb
+	textpointer SurfingPikachuTradeCardName                        ; 0x03ec
+	textpointer ElectabuzzTradeCardName                            ; 0x03ed
+	textpointer SlowpokeTradeCardName                              ; 0x03ee
+	textpointer JigglypuffTradeCardName                            ; 0x03ef
+	textpointer ZapdosLegendaryCardName                            ; 0x03f0
+	textpointer MoltresLegendaryCardName                           ; 0x03f1
+	textpointer ArticunoLegendaryCardName                          ; 0x03f2
+	textpointer DragoniteLegendaryCardName                         ; 0x03f3
+	textpointer SuperEnergyRetrievalTradeCardName                  ; 0x03f4
+	textpointer FlyingPikachuTradeCardName                         ; 0x03f5
 	textpointer Text03f6                                           ; 0x03f6
 	textpointer Text03f7                                           ; 0x03f7
 	textpointer Text03f8                                           ; 0x03f8