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/victoryroad1.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/victoryroad1.asm')
| -rwxr-xr-x | scripts/victoryroad1.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index 11f5d5db..af0c3c3e 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -1,14 +1,14 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] call nz, .next call EnableAutoTextBoxDrawing ld hl, VictoryRoad1TrainerHeaders ld de, VictoryRoad1ScriptPointers - ld a, [W_VICTORYROAD1CURSCRIPT] + ld a, [wVictoryRoad1CurScript] call ExecuteCurMapScriptInTable - ld [W_VICTORYROAD1CURSCRIPT], a + ld [wVictoryRoad1CurScript], a ret .next CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH @@ -29,7 +29,7 @@ VictoryRoad1Script0: ; 5da40 (17:5a40) ld hl, CoordsData_5da5c call CheckBoulderCoords jp nc, CheckFightingMapTrainers - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH ret |