Sync with pokered

1 files changed, 66 insertions, 72 deletions

diff --git a/scripts/vermiliongym.asm b/scripts/VermilionGym.asm
index 90ffc34c..0af37945 100755
--- a/scripts/vermiliongym.asm
+++ b/scripts/VermilionGym.asm
@@ -1,22 +1,22 @@
-VermilionGymScript:
+VermilionGym_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	push hl
-	call nz, VermilionGymScript_5ca4c
+	call nz, VermilionGymLoadName
 	pop hl
 	bit 6, [hl]
 	res 6, [hl]
-	call nz, VermilionGymScript_5ca6d
+	call nz, VermilionGymSetDoorTile
 	call EnableAutoTextBoxDrawing
 	ld hl, VermilionGymTrainerHeader0
-	ld de, VermilionGymScriptPointers
+	ld de, VermilionGym_ScriptPointers
 	ld a, [wVermilionGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wVermilionGymCurScript], a
 	ret
 
-VermilionGymScript_5ca4c:
+VermilionGymLoadName:
 	ld hl, Gym3CityName
 	ld de, Gym3LeaderName
 	jp LoadGymLeaderAndCityName
@@ -27,42 +27,41 @@ Gym3CityName:
 Gym3LeaderName:
 	db "LT.SURGE@"
 
-VermilionGymScript_5ca6d:
+VermilionGymSetDoorTile:
 	CheckEvent EVENT_2ND_LOCK_OPENED
-	jr nz, .opened_second_lock
-	ld a, $24
-	jr .load_door_tile
-
-.opened_second_lock
+	jr nz, .doorsOpen
+	ld a, $24 ; double door tile ID
+	jr .replaceTile
+.doorsOpen
 	ld a, SFX_GO_INSIDE
 	call PlaySound
-	ld a, $5
-.load_door_tile
+	ld a, $5 ; clear floor tile ID
+.replaceTile
 	ld [wNewTileBlockID], a
 	lb bc, 2, 2
 	predef_jump ReplaceTileBlock
 
-VermilionGymScript_5ca8a:
+VermilionGymResetScripts:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wVermilionGymCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-VermilionGymScriptPointers:
+VermilionGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
-	dw VermilionGymScript3
+	dw VermilionGymLTSurgePostBattle
 
-VermilionGymScript3:
+VermilionGymLTSurgePostBattle:
 	ld a, [wIsInBattle]
-	cp $ff
-	jp z, VermilionGymScript_5ca8a
-	ld a, $f0
+	cp $ff ; did we lose?
+	jp z, VermilionGymResetScripts
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 
-VermilionGymScript_5caaa:
+VermilionGymReceiveTM24:
 	ld a, $6
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -74,13 +73,12 @@ VermilionGymScript_5caaa:
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_GOT_TM24
-	jr .set_gym_flags
-
+	jr .gymVictory
 .BagFull
 	ld a, $8
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
-.set_gym_flags
+.gymVictory
 	ld hl, wObtainedBadges
 	set 2, [hl]
 	ld hl, wBeatGymFlags
@@ -89,19 +87,18 @@ VermilionGymScript_5caaa:
 	; deactivate gym trainers
 	SetEventRange EVENT_BEAT_VERMILION_GYM_TRAINER_0, EVENT_BEAT_VERMILION_GYM_TRAINER_2
 
-	jp VermilionGymScript_5ca8a
+	jp VermilionGymResetScripts
 
-VermilionGymTextPointers:
-	dw VermilionGymText1
-	dw VermilionGymText2
-	dw VermilionGymText3
-	dw VermilionGymText4
-	dw VermilionGymText5
-	dw VermilionGymText6
-	dw VermilionGymText7
-	dw VermilionGymText8
+VermilionGym_TextPointers:
+	dw LTSurgeText
+	dw VermilionGymTrainerText1
+	dw VermilionGymTrainerText2
+	dw VermilionGymTrainerText3
+	dw VermilionGymFanText
+	dw LTSurgeThunderbadgeInfoText
+	dw ReceivedTM24Text
+	dw TM24NoRoomText
 
-VermilionGymTrainerHeaders:
 VermilionGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_0
 	db ($3 << 4) ; trainer's view range
@@ -131,23 +128,21 @@ VermilionGymTrainerHeader2:
 
 	db $ff
 
-VermilionGymText1:
+LTSurgeText:
 	TX_ASM
 	CheckEvent EVENT_BEAT_LT_SURGE
-	jr z, .engage_surge
+	jr z, .beforeBeat
 	CheckEventReuseA EVENT_GOT_TM24
-	jr nz, .after_win_text
-	call z, VermilionGymScript_5caaa
+	jr nz, .afterBeat
+	call z, VermilionGymReceiveTM24
 	call DisableWaitingAfterTextDisplay
-	jr .text_script_end
-
-.after_win_text
-	ld hl, VermilionGymText_5cb72
+	jr .done
+.afterBeat
+	ld hl, LTSurgePostBattleAdviceText
 	call PrintText
-	jr .text_script_end
-
-.engage_surge
-	ld hl, VermilionGymText_5cb6d
+	jr .done
+.beforeBeat
+	ld hl, LTSurgePreBattleText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
@@ -163,31 +158,31 @@ VermilionGymText1:
 	ld [wGymLeaderNo], a
 	xor a
 	ld [hJoyHeld], a
-	ld a, $3
+	ld a, $3 ; set script index to LT Surge post-battle script
 	ld [wVermilionGymCurScript], a
 	ld [wCurMapScript], a
-.text_script_end
+.done
 	jp TextScriptEnd
 
-VermilionGymText_5cb6d:
-	TX_FAR _VermilionGymText_5cb6d
+LTSurgePreBattleText:
+	TX_FAR _LTSurgePreBattleText
 	db "@"
 
-VermilionGymText_5cb72:
-	TX_FAR _VermilionGymText_5cb72
+LTSurgePostBattleAdviceText:
+	TX_FAR _LTSurgePostBattleAdviceText
 	db "@"
 
-VermilionGymText6:
-	TX_FAR _VermilionGymText_5cb77
+LTSurgeThunderbadgeInfoText:
+	TX_FAR _LTSurgeThunderbadgeInfoText
 	db "@"
 
-VermilionGymText7:
+ReceivedTM24Text:
 	TX_FAR _ReceivedTM24Text
 	TX_SFX_KEY_ITEM
 	TX_FAR _TM24ExplanationText
 	db "@"
 
-VermilionGymText8:
+TM24NoRoomText:
 	TX_FAR _TM24NoRoomText
 	db "@"
 
@@ -195,7 +190,7 @@ ReceivedThunderbadgeText:
 	TX_FAR _ReceivedThunderbadgeText
 	db "@"
 
-VermilionGymText2:
+VermilionGymTrainerText1:
 	TX_ASM
 	ld hl, VermilionGymTrainerHeader0
 	call TalkToTrainer
@@ -213,7 +208,7 @@ VermilionGymAfterBattleText1:
 	TX_FAR _VermilionGymAfterBattleText1
 	db "@"
 
-VermilionGymText3:
+VermilionGymTrainerText2:
 	TX_ASM
 	ld hl, VermilionGymTrainerHeader1
 	call TalkToTrainer
@@ -231,7 +226,7 @@ VermilionGymAfterBattleText2:
 	TX_FAR _VermilionGymAfterBattleText2
 	db "@"
 
-VermilionGymText4:
+VermilionGymTrainerText3:
 	TX_ASM
 	ld hl, VermilionGymTrainerHeader2
 	call TalkToTrainer
@@ -249,25 +244,24 @@ VermilionGymAfterBattleText3:
 	TX_FAR _VermilionGymAfterBattleText3
 	db "@"
 
-VermilionGymText5:
+VermilionGymFanText:
 	TX_ASM
 	ld a, [wBeatGymFlags]
 	bit 2, a
-	jr nz, .beat_surge
-	ld hl, VermilionGymText_5cbf4
+	jr nz, .afterBeat
+	ld hl, VermilionGymFanPreBattleText
 	call PrintText
-	jr .text_script_end
-
-.beat_surge
-	ld hl, VermilionGymText_5cbf9
+	jr .done
+.afterBeat
+	ld hl, VermilionGymFanPostBattleText
 	call PrintText
-.text_script_end
+.done
 	jp TextScriptEnd
 
-VermilionGymText_5cbf4:
-	TX_FAR _VermilionGymText_5cbf4
+VermilionGymFanPreBattleText:
+	TX_FAR _VermilionGymFanPreBattleText
 	db "@"
 
-VermilionGymText_5cbf9:
-	TX_FAR _VermilionGymText_5cbf9
+VermilionGymFanPostBattleText:
+	TX_FAR _VermilionGymFanPostBattleText
 	db "@"