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/rockethideout2.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/rockethideout2.asm')
| -rwxr-xr-x | scripts/rockethideout2.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index f269faef..db266be3 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -2,9 +2,9 @@ RocketHideout2Script: ; 44e27 (11:4e27) call EnableAutoTextBoxDrawing ld hl, RocketHideout2TrainerHeaders ld de, RocketHideout2ScriptPointers - ld a, [W_ROCKETHIDEOUT2CURSCRIPT] + ld a, [wRocketHideout2CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKETHIDEOUT2CURSCRIPT], a + ld [wRocketHideout2CurScript], a ret RocketHideout2ScriptPointers: ; 44e3a (11:4e3a) @@ -14,9 +14,9 @@ RocketHideout2ScriptPointers: ; 44e3a (11:4e3a) dw RocketHideout2Script3 RocketHideout2Script0: ; 44e42 (11:4e42) - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a ld hl, RocketHideout2ArrowTilePlayerMovement call DecodeArrowMovementRLE @@ -30,7 +30,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42) ld a, $ff ld [wJoyIgnore], a ld a, $3 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret ;format: @@ -310,7 +310,7 @@ RocketHideout2Script3: ; 44fc2 (11:4fc2) ld hl, wd736 res 7, [hl] ld a, $0 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) @@ -323,7 +323,7 @@ LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) add hl, bc ld a, [hl] ld [wSpriteStateData1 + 2], a - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] cp FACILITY ld hl, FacilitySpinnerArrows jr z, .asm_44ff6 |