diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /scripts/RocketHideoutB2F.asm | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip | |
Add macros, constants, and labels for map scripts and text (#367)
This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
Diffstat (limited to 'scripts/RocketHideoutB2F.asm')
| -rw-r--r-- | scripts/RocketHideoutB2F.asm | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/scripts/RocketHideoutB2F.asm b/scripts/RocketHideoutB2F.asm index 4fa32e34..3a7ffa9b 100644 --- a/scripts/RocketHideoutB2F.asm +++ b/scripts/RocketHideoutB2F.asm @@ -8,12 +8,13 @@ RocketHideoutB2F_Script: ret RocketHideoutB2F_ScriptPointers: - dw RocketHideout2Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw RocketHideout2Script3 + def_script_pointers + dw_const RocketHideoutB2FDefaultScript, SCRIPT_ROCKETHIDEOUTB2F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROCKETHIDEOUTB2F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROCKETHIDEOUTB2F_END_BATTLE + dw_const RocketHideoutB2FPlayerSpinningScript, SCRIPT_ROCKETHIDEOUTB2F_PLAYER_SPINNING -RocketHideout2Script0: +RocketHideoutB2FDefaultScript: ld a, [wYCoord] ld b, a ld a, [wXCoord] @@ -27,9 +28,9 @@ RocketHideout2Script0: call StartSimulatingJoypadStates ld a, SFX_ARROW_TILES call PlaySound - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a - ld a, $3 + ld a, SCRIPT_ROCKETHIDEOUTB2F_PLAYER_SPINNING ld [wCurMapScript], a ret @@ -255,7 +256,7 @@ RocketHideout2ArrowMovement36: db D_LEFT, 5 db -1 ; end -RocketHideout2Script3: +RocketHideoutB2FPlayerSpinningScript: ld a, [wSimulatedJoypadStatesIndex] and a jr nz, LoadSpinnerArrowTiles @@ -263,39 +264,40 @@ RocketHideout2Script3: ld [wJoyIgnore], a ld hl, wd736 res 7, [hl] - ld a, $0 + ld a, SCRIPT_ROCKETHIDEOUTB2F_DEFAULT ld [wCurMapScript], a ret INCLUDE "engine/overworld/spinners.asm" RocketHideoutB2F_TextPointers: - dw RocketHideout2Text1 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const RocketHideoutB2FRocketText, TEXT_ROCKETHIDEOUTB2F_ROCKET + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB2F_MOON_STONE + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB2F_NUGGET + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB2F_TM_HORN_DRILL + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB2F_SUPER_POTION RocketHideout2TrainerHeaders: def_trainers RocketHideout2TrainerHeader0: - trainer EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0, 4, RocketHideout2BattleText2, RocketHideout2EndBattleText2, RocketHideout2AfterBattleTxt2 + trainer EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0, 4, RocketHideoutB1FRocketBattleText, RocketHideoutB1FRocketEndBattleText, RocketHideoutB1FRocketAfterBattleText db -1 ; end -RocketHideout2Text1: +RocketHideoutB2FRocketText: text_asm ld hl, RocketHideout2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout2BattleText2: - text_far _RocketHideout2BattleText2 +RocketHideoutB1FRocketBattleText: + text_far _RocketHideoutB1FRocketBattleText text_end -RocketHideout2EndBattleText2: - text_far _RocketHideout2EndBattleText2 +RocketHideoutB1FRocketEndBattleText: + text_far _RocketHideoutB1FRocketEndBattleText text_end -RocketHideout2AfterBattleTxt2: - text_far _RocketHideout2AfterBattleTxt2 +RocketHideoutB1FRocketAfterBattleText: + text_far _RocketHideoutB1FRocketAfterBattleText text_end |