diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-01-13 22:38:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 22:38:16 -0600 |
| commit | 725b86ebbec23bd1f53fd60bf0201c904fee951d (patch) | |
| tree | a37f4d33c5b77635c7ff72b91a73fcd90c4af915 /scripts/RocketHideoutB4F.asm | |
| parent | Merge pull request #195 from Rangi42/master (diff) | |
| parent | Rename map files, labels, and constants to be consistent and work with Polish... (diff) | |
| download | pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip | |
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | scripts/RocketHideoutB4F.asm (renamed from scripts/rockethideout4.asm) | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/rockethideout4.asm b/scripts/RocketHideoutB4F.asm index e8361988..b2ce21f4 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/RocketHideoutB4F.asm @@ -1,11 +1,11 @@ -RocketHideout4Script: +RocketHideoutB4F_Script: call RocketHideout4Script_45473 call EnableAutoTextBoxDrawing ld hl, RocketHideout4TrainerHeader0 - ld de, RocketHideout4ScriptPointers - ld a, [wRocketHideout4CurScript] + ld de, RocketHideoutB4F_ScriptPointers + ld a, [wRocketHideoutB4FCurScript] call ExecuteCurMapScriptInTable - ld [wRocketHideout4CurScript], a + ld [wRocketHideoutB4FCurScript], a ret RocketHideout4Script_45473: @@ -33,11 +33,11 @@ RocketHideout4Script_45473: RocketHideout4Script_454a3: xor a ld [wJoyIgnore], a - ld [wRocketHideout4CurScript], a + ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a ret -RocketHideout4ScriptPointers: +RocketHideoutB4F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -55,10 +55,10 @@ RocketHideout4Script3: ld [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack - ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI + ld a, HS_ROCKET_HIDEOUT_B4F_GIOVANNI ld [wMissableObjectIndex], a predef HideObject - ld a, HS_ROCKET_HIDEOUT_4_ITEM_4 + ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_4 ld [wMissableObjectIndex], a predef ShowObject call UpdateSprites @@ -68,11 +68,11 @@ RocketHideout4Script3: ld hl, wCurrentMapScriptFlags set 5, [hl] ld a, $0 - ld [wRocketHideout4CurScript], a + ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a ret -RocketHideout4TextPointers: +RocketHideoutB4F_TextPointers: dw RocketHideout4Text1 dw RocketHideout4Text2 dw RocketHideout4Text3 @@ -132,7 +132,7 @@ RocketHideout4Text1: xor a ld [hJoyHeld], a ld a, $3 - ld [wRocketHideout4CurScript], a + ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a jr .asm_209f0 .asm_545571 @@ -209,7 +209,7 @@ RocketHideout4AfterBattleText4: call PrintText CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY jr nz, .asm_455e9 - ld a, HS_ROCKET_HIDEOUT_4_ITEM_5 + ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5 ld [wMissableObjectIndex], a predef ShowObject .asm_455e9 |