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/RocketHideoutB3F.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/RocketHideoutB3F.asm (renamed from scripts/rockethideout3.asm) | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/scripts/rockethideout3.asm b/scripts/RocketHideoutB3F.asm index ac08e868..4dd537b3 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/RocketHideoutB3F.asm @@ -1,13 +1,13 @@ -RocketHideout3Script: +RocketHideoutB3F_Script: call EnableAutoTextBoxDrawing - ld hl, RocketHideout3TrainerHeaders - ld de, RocketHideout3ScriptPointers - ld a, [wRocketHideout3CurScript] + ld hl, RocketHideout3TrainerHeader0 + ld de, RocketHideoutB3F_ScriptPointers + ld a, [wRocketHideoutB3FCurScript] call ExecuteCurMapScriptInTable - ld [wRocketHideout3CurScript], a + ld [wRocketHideoutB3FCurScript], a ret -RocketHideout3ScriptPointers: +RocketHideoutB3F_ScriptPointers: dw RocketHideout3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -143,13 +143,12 @@ RocketHideout3Script3: ld [wCurMapScript], a ret -RocketHideout3TextPointers: +RocketHideoutB3F_TextPointers: dw RocketHideout3Text1 dw RocketHideout3Text2 dw PickUpItemText dw PickUpItemText -RocketHideout3TrainerHeaders: RocketHideout3TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -159,10 +158,10 @@ RocketHideout3TrainerHeader0: dw RocketHideout3EndBattleText2 ; TextEndBattle dw RocketHideout3EndBattleText2 ; TextEndBattle -RocketHideout3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 +RocketHideout3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 dw RocketHideout3BattleTxt ; TextBeforeBattle dw RocketHideout3AfterBattleText3 ; TextAfterBattle dw RocketHideout3EndBattleText3 ; TextEndBattle @@ -190,7 +189,7 @@ RocketHideout3AfterBattleTxt2: RocketHideout3Text2: TX_ASM - ld hl, RocketHideout3TrainerHeader2 + ld hl, RocketHideout3TrainerHeader1 call TalkToTrainer jp TextScriptEnd |