diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /scripts/saffrongym.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/saffrongym.asm')
| -rwxr-xr-x | scripts/saffrongym.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 140b1130..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) @@ -36,7 +36,7 @@ SaffronGymScriptPointers: ; 5d053 (17:5053) dw SaffronGymScript3 SaffronGymScript3: ; 5d05b (17:505b) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SaffronGymText_5d048 ld a, $f0 @@ -60,7 +60,7 @@ SaffronGymText_5d068: ; 5d068 (17:5068) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5d091 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 5, [hl] ld hl, wBeatGymFlags set 5, [hl] @@ -177,9 +177,9 @@ SaffronGymText1: ; 5d118 (17:5118) call EngageMapTrainer call InitBattleEnemyParameters ld a, $6 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a ld a, $3 - ld [W_SAFFRONGYMCURSCRIPT], a + ld [wSaffronGymCurScript], a .asm_5d15f jp TextScriptEnd |