diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
| commit | c979b3bb03b121dd03a800df74144cd69a74601a (patch) | |
| tree | 0d6bb48125efe6f6215347967383ba4c3b7da391 /scripts/rockethideout4.asm | |
| parent | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (diff) | |
| parent | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'scripts/rockethideout4.asm')
| -rwxr-xr-x | scripts/rockethideout4.asm | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index c6d48852..2b3e0e89 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -1,4 +1,4 @@ -RocketHideout4Script: ; 4545d (11:545d) +RocketHideout4Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout4TrainerHeader0 ld de, RocketHideout4ScriptPointers @@ -7,7 +7,7 @@ RocketHideout4Script: ; 4545d (11:545d) ld [wRocketHideout4CurScript], a ret -RocketHideout4Script_45510: ; 45510 (11:54a3) +RocketHideout4Script_45510: CheckAndResetEvent EVENT_6A0 call nz, RocketHideout4Script_45525 xor a @@ -24,7 +24,7 @@ RocketHideout4Script_45525: call RocketHideout4Script_45756 ret -RocketHideout4ScriptPointers: ; 454ae (11:54ae)c +RocketHideout4ScriptPointers: dw RocketHideout4Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -40,7 +40,7 @@ RocketHideout4ScriptPointers: ; 454ae (11:54ae)c dw RocketHideout4Script12 dw RocketHideout4Script13 -RocketHideout4Script3: ; 454b6 (11:54b6) +RocketHideout4Script3: ld a, [wIsInBattle] cp $ff jp z, RocketHideout4Script_45510 @@ -200,8 +200,8 @@ RocketHideout4Script10: ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, RocketHideout4JessieJamesEndBattleText ; 457b2 - ld de, RocketHideout4JessieJamesEndBattleText ; 457b2 + ld hl, RocketHideout4JessieJamesEndBattleText + ld de, RocketHideout4JessieJamesEndBattleText call SaveEndBattleTextPointers ld a, OPP_ROCKET ld [wCurOpponent], a @@ -266,8 +266,7 @@ RocketHideout4Script13: xor a ld [hJoyHeld], a ld [wJoyIgnore], a - ld hl, wd81b - set 2, [hl] + SetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 ld a, $0 call RocketHideout4Script_4551e ret @@ -284,7 +283,7 @@ RocketHideout4Script_45756: predef HideObject ret -RocketHideout4TextPointers: ; 45501 (11:5501) +RocketHideout4TextPointers: dw RocketHideout4Text0 dw RocketHideout4Text1 dw RocketHideout4Text2 @@ -304,10 +303,10 @@ RocketHideout4TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 db ($1 << 4) dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 - dw RocketHideout4Trainer0BeforeText ; 4581d - dw RocketHideout4Trainer0AfterText ; 4583a - dw RocketHideout4Trainer0EndBattleText ; 45822 - dw RocketHideout4Trainer0EndBattleText ; 45822 + dw RocketHideout4Trainer0BeforeText + dw RocketHideout4Trainer0AfterText + dw RocketHideout4Trainer0EndBattleText + dw RocketHideout4Trainer0EndBattleText db $ff RocketHideout4Text1: |