diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/RocketHideoutB2F.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/RocketHideoutB2F.asm (renamed from scripts/rockethideout2.asm) | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/rockethideout2.asm b/scripts/RocketHideoutB2F.asm index b29e5396..1b487df2 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/RocketHideoutB2F.asm @@ -1,13 +1,13 @@ -RocketHideout2Script: +RocketHideoutB2F_Script: call EnableAutoTextBoxDrawing - ld hl, RocketHideout2TrainerHeaders - ld de, RocketHideout2ScriptPointers - ld a, [wRocketHideout2CurScript] + ld hl, RocketHideout2TrainerHeader0 + ld de, RocketHideoutB2F_ScriptPointers + ld a, [wRocketHideoutB2FCurScript] call ExecuteCurMapScriptInTable - ld [wRocketHideout2CurScript], a + ld [wRocketHideoutB2FCurScript], a ret -RocketHideout2ScriptPointers: +RocketHideoutB2F_ScriptPointers: dw RocketHideout2Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -413,14 +413,13 @@ SpinnerPlayerFacingDirections: SpinnerArrowAnimTiles: INCBIN "gfx/spinner_arrow.2bpp" -RocketHideout2TextPointers: +RocketHideoutB2F_TextPointers: dw RocketHideout2Text1 dw PickUpItemText dw PickUpItemText dw PickUpItemText dw PickUpItemText -RocketHideout2TrainerHeaders: RocketHideout2TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 db ($4 << 4) ; trainer's view range |