Merge branch 'master' of github.com:pret/pokeyellow

1 files changed, 43 insertions, 43 deletions

diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm
index f36071e9..90ffc34c 100755
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -1,5 +1,5 @@
-VermilionGymScript: ; 5ca26 (17:4a26)
-	ld hl, wd126
+VermilionGymScript:
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	push hl
@@ -11,23 +11,23 @@ VermilionGymScript: ; 5ca26 (17:4a26)
 	call EnableAutoTextBoxDrawing
 	ld hl, VermilionGymTrainerHeader0
 	ld de, VermilionGymScriptPointers
-	ld a, [W_VERMILIONGYMCURSCRIPT]
+	ld a, [wVermilionGymCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [W_VERMILIONGYMCURSCRIPT], a
+	ld [wVermilionGymCurScript], a
 	ret
 
-VermilionGymScript_5ca4c: ; 5ca4c (17:4a4c)
+VermilionGymScript_5ca4c:
 	ld hl, Gym3CityName
 	ld de, Gym3LeaderName
 	jp LoadGymLeaderAndCityName
 
-Gym3CityName: ; 5ca55 (17:4a55)
+Gym3CityName:
 	db "VERMILION CITY@"
 
-Gym3LeaderName: ; 5ca64 (17:4a64)
+Gym3LeaderName:
 	db "LT.SURGE@"
 
-VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d)
+VermilionGymScript_5ca6d:
 	CheckEvent EVENT_2ND_LOCK_OPENED
 	jr nz, .opened_second_lock
 	ld a, $24
@@ -42,27 +42,27 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d)
 	lb bc, 2, 2
 	predef_jump ReplaceTileBlock
 
-VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a)
+VermilionGymScript_5ca8a:
 	xor a
 	ld [wJoyIgnore], a
-	ld [W_VERMILIONGYMCURSCRIPT], a
-	ld [W_CURMAPSCRIPT], a
+	ld [wVermilionGymCurScript], a
+	ld [wCurMapScript], a
 	ret
 
-VermilionGymScriptPointers: ; 5ca95 (17:4a95)
+VermilionGymScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw VermilionGymScript3
 
-VermilionGymScript3: ; 5ca9d (17:4a9d)
+VermilionGymScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, VermilionGymScript_5ca8a
 	ld a, $f0
 	ld [wJoyIgnore], a
 
-VermilionGymScript_5caaa: ; 5caaa (17:4aaa)
+VermilionGymScript_5caaa:
 	ld a, $6
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -91,7 +91,7 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa)
 
 	jp VermilionGymScript_5ca8a
 
-VermilionGymTextPointers: ; 5cae8 (17:4ae8)
+VermilionGymTextPointers:
 	dw VermilionGymText1
 	dw VermilionGymText2
 	dw VermilionGymText3
@@ -101,8 +101,8 @@ VermilionGymTextPointers: ; 5cae8 (17:4ae8)
 	dw VermilionGymText7
 	dw VermilionGymText8
 
-VermilionGymTrainerHeaders: ; 5caf8 (17:4af8)
-VermilionGymTrainerHeader0: ; 5caf8 (17:4af8)
+VermilionGymTrainerHeaders:
+VermilionGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_0
@@ -111,7 +111,7 @@ VermilionGymTrainerHeader0: ; 5caf8 (17:4af8)
 	dw VermilionGymEndBattleText1 ; TextEndBattle
 	dw VermilionGymEndBattleText1 ; TextEndBattle
 
-VermilionGymTrainerHeader1: ; 5cb04 (17:4b04)
+VermilionGymTrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_1
@@ -120,7 +120,7 @@ VermilionGymTrainerHeader1: ; 5cb04 (17:4b04)
 	dw VermilionGymEndBattleText2 ; TextEndBattle
 	dw VermilionGymEndBattleText2 ; TextEndBattle
 
-VermilionGymTrainerHeader2: ; 5cb10 (17:4b10)
+VermilionGymTrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_2
@@ -131,7 +131,7 @@ VermilionGymTrainerHeader2: ; 5cb10 (17:4b10)
 
 	db $ff
 
-VermilionGymText1: ; 5cb1d (17:4b1d)
+VermilionGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_LT_SURGE
 	jr z, .engage_surge
@@ -164,92 +164,92 @@ VermilionGymText1: ; 5cb1d (17:4b1d)
 	xor a
 	ld [hJoyHeld], a
 	ld a, $3
-	ld [W_VERMILIONGYMCURSCRIPT], a
-	ld [W_CURMAPSCRIPT], a
+	ld [wVermilionGymCurScript], a
+	ld [wCurMapScript], a
 .text_script_end
 	jp TextScriptEnd
 
-VermilionGymText_5cb6d: ; 5cb6d (17:4b6d)
+VermilionGymText_5cb6d:
 	TX_FAR _VermilionGymText_5cb6d
 	db "@"
 
-VermilionGymText_5cb72: ; 5cb72 (17:4b72)
+VermilionGymText_5cb72:
 	TX_FAR _VermilionGymText_5cb72
 	db "@"
 
-VermilionGymText6: ; 5cb77 (17:4b77)
+VermilionGymText6:
 	TX_FAR _VermilionGymText_5cb77
 	db "@"
 
-VermilionGymText7: ; 5cb7c (17:4b7c)
+VermilionGymText7:
 	TX_FAR _ReceivedTM24Text
 	TX_SFX_KEY_ITEM
 	TX_FAR _TM24ExplanationText
 	db "@"
 
-VermilionGymText8: ; 5cb86 (17:4b86)
+VermilionGymText8:
 	TX_FAR _TM24NoRoomText
 	db "@"
 
-ReceivedThunderbadgeText: ; 5cb8b (17:4b8b)
+ReceivedThunderbadgeText:
 	TX_FAR _ReceivedThunderbadgeText
 	db "@"
 
-VermilionGymText2: ; 5cb90 (17:4b90)
+VermilionGymText2:
 	TX_ASM
 	ld hl, VermilionGymTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-VermilionGymBattleText1: ; 5cb9a (17:4b9a)
+VermilionGymBattleText1:
 	TX_FAR _VermilionGymBattleText1
 	db "@"
 
-VermilionGymEndBattleText1: ; 5cb9f (17:4b9f)
+VermilionGymEndBattleText1:
 	TX_FAR _VermilionGymEndBattleText1
 	db "@"
 
-VermilionGymAfterBattleText1: ; 5cba4 (17:4ba4)
+VermilionGymAfterBattleText1:
 	TX_FAR _VermilionGymAfterBattleText1
 	db "@"
 
-VermilionGymText3: ; 5cba9 (17:4ba9)
+VermilionGymText3:
 	TX_ASM
 	ld hl, VermilionGymTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-VermilionGymBattleText2: ; 5cbb3 (17:4bb3)
+VermilionGymBattleText2:
 	TX_FAR _VermilionGymBattleText2
 	db "@"
 
-VermilionGymEndBattleText2: ; 5cbb8 (17:4bb8)
+VermilionGymEndBattleText2:
 	TX_FAR _VermilionGymEndBattleText2
 	db "@"
 
-VermilionGymAfterBattleText2: ; 5cbbd (17:4bbd)
+VermilionGymAfterBattleText2:
 	TX_FAR _VermilionGymAfterBattleText2
 	db "@"
 
-VermilionGymText4: ; 5cbc2 (17:4bc2)
+VermilionGymText4:
 	TX_ASM
 	ld hl, VermilionGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-VermilionGymBattleText3: ; 5cbcc (17:4bcc)
+VermilionGymBattleText3:
 	TX_FAR _VermilionGymBattleText3
 	db "@"
 
-VermilionGymEndBattleText3: ; 5cbd1 (17:4bd1)
+VermilionGymEndBattleText3:
 	TX_FAR _VermilionGymEndBattleText3
 	db "@"
 
-VermilionGymAfterBattleText3: ; 5cbd6 (17:4bd6)
+VermilionGymAfterBattleText3:
 	TX_FAR _VermilionGymAfterBattleText3
 	db "@"
 
-VermilionGymText5: ; 5cbdb (17:4bdb)
+VermilionGymText5:
 	TX_ASM
 	ld a, [wBeatGymFlags]
 	bit 2, a
@@ -264,10 +264,10 @@ VermilionGymText5: ; 5cbdb (17:4bdb)
 .text_script_end
 	jp TextScriptEnd
 
-VermilionGymText_5cbf4: ; 5cbf4 (17:4bf4)
+VermilionGymText_5cbf4:
 	TX_FAR _VermilionGymText_5cbf4
 	db "@"
 
-VermilionGymText_5cbf9: ; 5cbf9 (17:4bf9)
+VermilionGymText_5cbf9:
 	TX_FAR _VermilionGymText_5cbf9
 	db "@"