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/powerplant.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/powerplant.asm')
| -rwxr-xr-x | scripts/powerplant.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index 48f291e1..1470a091 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -2,9 +2,9 @@ PowerPlantScript: ; 1e2c6 (7:62c6) call EnableAutoTextBoxDrawing ld hl, PowerPlantTrainerHeaders ld de, PowerPlantScriptPointers - ld a, [W_POWERPLANTCURSCRIPT] + ld a, [wPowerPlantCurScript] call ExecuteCurMapScriptInTable - ld [W_POWERPLANTCURSCRIPT], a + ld [wPowerPlantCurScript], a ret PowerPlantScriptPointers: ; 1e2d9 (7:62d9) @@ -114,8 +114,8 @@ PowerPlantTrainerHeader8: ; 1e35b (7:635b) InitVoltorbBattle: ; 1e368 (7:6368) call TalkToTrainer - ld a, [W_CURMAPSCRIPT] - ld [W_POWERPLANTCURSCRIPT], a + ld a, [wCurMapScript] + ld [wPowerPlantCurScript], a jp TextScriptEnd PowerPlantText1: ; 1e374 (7:6374) |