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/victoryroad3.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/victoryroad3.asm')
| -rwxr-xr-x | scripts/victoryroad3.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 22e6813a..4cdf3fb0 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -3,13 +3,13 @@ VictoryRoad3Script: ; 44980 (11:4980) call EnableAutoTextBoxDrawing ld hl, VictoryRoad3TrainerHeaders ld de, VictoryRoad3ScriptPointers - ld a, [W_VICTORYROAD3CURSCRIPT] + ld a, [wVictoryRoad3CurScript] call ExecuteCurMapScriptInTable - ld [W_VICTORYROAD3CURSCRIPT], a + ld [wVictoryRoad3CurScript], a ret VictoryRoad3Script_44996: ; 44996 (11:4996) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -36,7 +36,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) ld a, [wCoordIndex] cp $1 jr nz, .asm_449dc - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] SetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 ret |