From 269f2c3ba72776e975f5b00d9a1361cadbda42a7 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 11 Jun 2016 15:45:24 -0500 Subject: Sync with pokered from August 29, 2015 to April 6, 2016 --- scripts/saffrongym.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts/saffrongym.asm') diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index cae60f45..aae06103 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -1,14 +1,14 @@ SaffronGymScript: ; 5d00d (17:500d) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, .extra call EnableAutoTextBoxDrawing ld hl, SaffronGymTrainerHeader0 ld de, SaffronGymScriptPointers - ld a, [W_SAFFRONGYMCURSCRIPT] + ld a, [wSaffronGymCurScript] call ExecuteCurMapScriptInTable - ld [W_SAFFRONGYMCURSCRIPT], a + ld [wSaffronGymCurScript], a ret .extra @@ -25,8 +25,8 @@ Gym6LeaderName: ; 5d040 (17:5040) SaffronGymText_5d048: ; 5d048 (17:5048) xor a ld [wJoyIgnore], a - ld [W_SAFFRONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSaffronGymCurScript], a + ld [wCurMapScript], a ret SaffronGymScriptPointers: ; 5d053 (17:5053) @@ -179,7 +179,7 @@ SaffronGymText1: ; 5d118 (17:5118) ld a, $6 ld [wGymLeaderNo], a ld a, $3 - ld [W_SAFFRONGYMCURSCRIPT], a + ld [wSaffronGymCurScript], a .asm_5d15f jp TextScriptEnd -- cgit v1.3.1-sl0p