Label Pokemon Dome Entrance scripts

src/engine/bank0b.asm

@@ -8116,18 +8116,18 @@ PokemonDomeEntrance_StepEvents:
 	db $ff
 
 PokemonDomeEntrance_NPCs:
-	npc NPC_POKEMON_DOME_FAT_GUY, 8, 3, NORTH, Func_2fe1d
+	npc NPC_POKEMON_DOME_FAT_GUY, 8, 3, NORTH, PokemonDomeEntrance_AppearAfterGRCoin
 	db $ff
 
 PokemonDomeEntrance_NPCInteractions:
-	npc_script NPC_POKEMON_DOME_FAT_GUY, Func_2fda3
+	npc_script NPC_POKEMON_DOME_FAT_GUY, Script_PokemonDomeFatGuy
 	db $ff
 
 PokemonDomeEntrance_OWInteractions:
 	ow_script 4, 2, PCMenu
 	ow_script 5, 2, PCMenu
-	ow_script 9, 1, Func_2fe2a
-	ow_script 10, 1, Func_2fe2a
+	ow_script 9, 1, Script_PlateOfLegends
+	ow_script 10, 1, Script_PlateOfLegends
 	ow_script 1, 2, Script_LegendaryPokemonCardsVol1Book
 	ow_script 2, 2, Script_LegendaryPokemonCardsVol2Book
 	ow_script 3, 2, Script_LegendaryPokemonCardsVol3Book
@@ -8146,10 +8146,10 @@ PokemonDomeEntrance_MapScripts:
 Func_2fd73:
 	ld a, EVENT_GOT_GR_COIN
 	farcall GetEventValue
-	jr nz, .asm_2fd80
+	jr nz, .done
 	ld a, MUSIC_HERE_COMES_GR
 	ld [wNextMusic], a
-.asm_2fd80
+.done
 	scf
 	ccf
 	ret
@@ -8169,14 +8169,14 @@ Func_2fd8a:
 Func_2fd93:
 	ld hl, PokemonDomeEntrance_NPCInteractions
 	call Func_328c
-	jr nc, .asm_2fda1
+	jr nc, .done
 	ld hl, PokemonDomeEntrance_OWInteractions
 	call Func_32bf
-.asm_2fda1
+.done
 	scf
 	ret
 
-Func_2fda3:
+Script_PokemonDomeFatGuy:
 	ld a, NPC_POKEMON_DOME_FAT_GUY
 	ld [wScriptNPC], a
 	ldtx hl, DialogFatGuyText
@@ -8188,81 +8188,82 @@ Func_2fda3:
 	start_script
 	start_dialog
 	check_event EVENT_MASONS_LAB_CHALLENGE_MACHINE_STATE
-	script_jump_if_b0z .ows_2fdfa
+	script_jump_if_b0z .postgame
 	check_event EVENT_FREED_ROD
-	script_jump_if_b0z .ows_2fdf4
+	script_jump_if_b0z .has_rod
 	check_event EVENT_FREED_JACK
-	script_jump_if_b0z .ows_2fde3
+	script_jump_if_b0z .has_jack
 	check_event EVENT_FREED_COURTNEY
-	script_jump_if_b0z .ows_2fddd
+	script_jump_if_b0z .has_courtney
 	check_event EVENT_FREED_STEVE
-	script_jump_if_b0z .ows_2fdd7
-	print_npc_text Text102a
+	script_jump_if_b0z .has_steve
+; no grand masters
+	print_npc_text PokemonDomeFatGuyAllGrandMastersGoneText
 	end_dialog
 	end_script
 	ret
-.ows_2fdd7
-	print_npc_text Text102b
+.has_steve
+	print_npc_text PokemonDomeFatGuySteveIsBackText
 	end_dialog
 	end_script
 	ret
-.ows_2fddd
-	print_npc_text Text102c
+.has_courtney
+	print_npc_text PokemonDomeFatGuyCourtneyIsBackText
 	end_dialog
 	end_script
 	ret
-.ows_2fde3
+.has_jack
 	check_event EVENT_FREED_COURTNEY
-	script_jump_if_b0z .ows_2fdee
-	print_npc_text Text102d
+	script_jump_if_b0z .rod_left
+	print_npc_text PokemonDomeFatGuyJackIsBackText
 	end_dialog
 	end_script
 	ret
-.ows_2fdee
-	print_npc_text Text102e
+.rod_left
+	print_npc_text PokemonDomeFatGuyWeNeedRodText
 	end_dialog
 	end_script
 	ret
-.ows_2fdf4
-	print_npc_text Text102f
+.has_rod
+	print_npc_text PokemonDomeFatGuyRodIsBackText
 	end_dialog
 	end_script
 	ret
-.ows_2fdfa
+.postgame
 	check_event EVENT_SET_UNTIL_MAP_RELOAD_1
-	script_jump_if_b0z .ows_2fe17
+	script_jump_if_b0z .cup_played
 	get_var VAR_0D
 	compare_loaded_var $02
-	script_jump_if_b0nz .ows_2fe11
+	script_jump_if_b0nz .cup_active
 	compare_loaded_var $03
-	script_jump_if_b0nz .ows_2fe11
-	print_npc_text Text1030
+	script_jump_if_b0nz .cup_active
+	print_npc_text PokemonDomeFatGuyGrandMasterCupInactiveText
 	end_dialog
 	end_script
 	ret
-.ows_2fe11
-	print_npc_text Text1031
+.cup_active
+	print_npc_text PokemonDomeFatGuyGrandMasterCupActiveText
 	end_dialog
 	end_script
 	ret
-.ows_2fe17
-	print_npc_text Text1032
+.cup_played
+	print_npc_text PokemonDomeFatGuyGrandMasterCupPlayedText
 	end_dialog
 	end_script
 	ret
 
-Func_2fe1d:
+PokemonDomeEntrance_AppearAfterGRCoin:
 	ld a, EVENT_GOT_GR_COIN
 	farcall GetEventValue
-	jr nz, .asm_2fe27
+	jr nz, .appear
 	scf
 	ret
-.asm_2fe27
+.appear
 	scf
 	ccf
 	ret
 
-Func_2fe2a:
+Script_PlateOfLegends:
 	ld a, NPC_MARK
 	ld [wScriptNPC], a
 	ldtx hl, DialogPlateOfLegendsText
@@ -8273,7 +8274,7 @@ Func_2fe2a:
 	xor a
 	start_script
 	start_dialog
-	print_npc_text Text1033
+	print_npc_text PlateOfLegendsText
 	end_dialog
 	end_script
 	ret

src/text/text11.asm

@@ -943,7 +943,7 @@ Text1029:
 	linefw "おとずれるが よい"
 	done
 
-Text102a:
+PokemonDomeFatGuyAllGrandMastersGoneText:
 	textfw "伝説のポケモンカードを まもっていた"
 	linefw "ポケモンドームの グランドマスターは"
 	linefw "4にんとも GR団によって"
@@ -952,7 +952,7 @@ Text102a:
 	linefw "いったい どうなってしまうのだろう"
 	done
 
-Text102b:
+PokemonDomeFatGuySteveIsBackText:
 	textfw "イナズマのグランドマスター"
 	linefw "スティーブさんが もどってきたんだ!"
 	linefw "まだ 3にんのグランドマスターが"
@@ -961,7 +961,7 @@ Text102b:
 	linefw "たすけだしてくれないかなぁ~"
 	done
 
-Text102c:
+PokemonDomeFatGuyCourtneyIsBackText:
 	textfw "やった~ 炎のクイーン!"
 	linefw "ヒロコさんが もどってきたよ!"
 	linefw "いったい だれが"
@@ -970,7 +970,7 @@ Text102c:
 	linefw "グランドマスターが あと ふたりだ"
 	done
 
-Text102d:
+PokemonDomeFatGuyJackIsBackText:
 	textfw "やあ こおりの グランドマスター"
 	linefw "カネコウジさんが もどってきたよ!"
 	linefw "いったい だれが"
@@ -979,7 +979,7 @@ Text102d:
 	linefw "リュウドーさんの ふたりだ"
 	done
 
-Text102e:
+PokemonDomeFatGuyWeNeedRodText:
 	textfw "きいたぜ <RAMNAME>! きみだって"
 	linefw "グランドマスターを たすけたのは!"
 	linefw "あとは グランドマスターのリーダー"
@@ -990,14 +990,14 @@ Text102e:
 	linefw "伝説のポケモンカードを ゲットだ!"
 	done
 
-Text102f:
+PokemonDomeFatGuyRodIsBackText:
 	textfw "リュウドーさんも もどってきたし"
 	linefw "ファイナルカップ ふっかつだ!"
 	linefw "4にんのグランドマスターに 勝って"
 	linefw "伝説のポケモンカードを ゲットだ!"
 	done
 
-Text1030:
+PokemonDomeFatGuyGrandMasterCupInactiveText:
 	textfw "グランドマスターたちが ひらく"
 	linefw "グランドマスター杯は スゴイ!"
 	linefw "ゆうしょう賞品は"
@@ -1008,7 +1008,7 @@ Text1030:
 	linefw "なぞに つつまれているんだ!!"
 	done
 
-Text1031:
+PokemonDomeFatGuyGrandMasterCupActiveText:
 	textfw "いま ポケモンドームでは"
 	linefw "グランドマスター杯が かいさい中だ!"
 	linefw "グランドマスター杯は"
@@ -1019,7 +1019,7 @@ Text1031:
 	linefw "すきなのを 2枚えらべるんだ!!"
 	done
 
-Text1032:
+PokemonDomeFatGuyGrandMasterCupPlayedText:
 	textfw "どうだった!"
 	linefw "ゆうしょう できたかい?"
 	linefw "グランドマスター杯は めったに"
@@ -1027,7 +1027,7 @@ Text1032:
 	linefw "つぎは いつになるのかなぁ~"
 	done
 
-Text1033:
+PlateOfLegendsText:
 	textfw "「伝説のポケモンカードを"
 	linefw " もとめる ものたちへ"
 	linefw " このポケモンドームに ありし"

src/text/text_offsets.asm

@@ -4154,16 +4154,16 @@ SECTION "Text Offsets 2", ROMX
 	textpointer Text1027                                              ; 0x1027
 	textpointer Text1028                                              ; 0x1028
 	textpointer Text1029                                              ; 0x1029
-	textpointer Text102a                                              ; 0x102a
-	textpointer Text102b                                              ; 0x102b
-	textpointer Text102c                                              ; 0x102c
-	textpointer Text102d                                              ; 0x102d
-	textpointer Text102e                                              ; 0x102e
-	textpointer Text102f                                              ; 0x102f
-	textpointer Text1030                                              ; 0x1030
-	textpointer Text1031                                              ; 0x1031
-	textpointer Text1032                                              ; 0x1032
-	textpointer Text1033                                              ; 0x1033
+	textpointer PokemonDomeFatGuyAllGrandMastersGoneText              ; 0x102a
+	textpointer PokemonDomeFatGuySteveIsBackText                      ; 0x102b
+	textpointer PokemonDomeFatGuyCourtneyIsBackText                   ; 0x102c
+	textpointer PokemonDomeFatGuyJackIsBackText                       ; 0x102d
+	textpointer PokemonDomeFatGuyWeNeedRodText                        ; 0x102e
+	textpointer PokemonDomeFatGuyRodIsBackText                        ; 0x102f
+	textpointer PokemonDomeFatGuyGrandMasterCupInactiveText           ; 0x1030
+	textpointer PokemonDomeFatGuyGrandMasterCupActiveText             ; 0x1031
+	textpointer PokemonDomeFatGuyGrandMasterCupPlayedText             ; 0x1032
+	textpointer PlateOfLegendsText                                    ; 0x1033
 	textpointer Text1034                                              ; 0x1034
 	textpointer Text1035                                              ; 0x1035
 	textpointer Text1036                                              ; 0x1036