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/victoryroad2.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/victoryroad2.asm')
| -rwxr-xr-x | scripts/victoryroad2.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index cb956b1c..c1fc6dc7 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -1,18 +1,18 @@ VictoryRoad2Script: ; 5179d (14:579d) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, VictoryRoad2Script_517c4 - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] call nz, VictoryRoad2Script_517c9 call EnableAutoTextBoxDrawing ld hl, VictoryRoad2TrainerHeaders ld de, VictoryRoad2ScriptPointers - ld a, [W_VICTORYROAD2CURSCRIPT] + ld a, [wVictoryRoad2CurScript] call ExecuteCurMapScriptInTable - ld [W_VICTORYROAD2CURSCRIPT], a + ld [wVictoryRoad2CurScript], a ret VictoryRoad2Script_517c4: ; 517c4 (14:57c4) @@ -59,7 +59,7 @@ VictoryRoad2Script0: ; 517f1 (14:57f1) SetEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ret nz .asm_51810 - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ret |