diff options
Diffstat (limited to 'scripts/vermiliongym.asm')
| -rwxr-xr-x | scripts/vermiliongym.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 6933890f..41ca1e53 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -1,5 +1,5 @@ -VermilionGymScript: - ld hl, wd126 +VermilionGymScript: ; 5ca26 (17:4a26) + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] push hl @@ -11,9 +11,9 @@ VermilionGymScript: 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: @@ -44,8 +44,8 @@ VermilionGymScript_5ca6d: VermilionGymScript_5ca8a: xor a ld [wJoyIgnore], a - ld [W_VERMILIONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wVermilionGymCurScript], a + ld [wCurMapScript], a ret VermilionGymScriptPointers: @@ -160,8 +160,8 @@ VermilionGymText1: xor a ld [hJoyHeld], a ld a, $3 - ld [W_VERMILIONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wVermilionGymCurScript], a + ld [wCurMapScript], a .asm_5cb6a jp TextScriptEnd |