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/RocketHideoutB1F.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/RocketHideoutB1F.asm')
| -rw-r--r-- | scripts/RocketHideoutB1F.asm | 126 |
1 files changed, 64 insertions, 62 deletions
diff --git a/scripts/RocketHideoutB1F.asm b/scripts/RocketHideoutB1F.asm index 44964e14..f6c64bda 100644 --- a/scripts/RocketHideoutB1F.asm +++ b/scripts/RocketHideoutB1F.asm @@ -1,5 +1,5 @@ RocketHideoutB1F_Script: - call RocketHideout1Script_44be0 + call RocketHideoutB1FDoorCallbackScript call EnableAutoTextBoxDrawing ld hl, RocketHideout1TrainerHeaders ld de, RocketHideoutB1F_ScriptPointers @@ -8,149 +8,151 @@ RocketHideoutB1F_Script: ld [wRocketHideoutB1FCurScript], a ret -RocketHideout1Script_44be0: +RocketHideoutB1FDoorCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_677 - jr nz, .asm_44c01 + jr nz, .door_open CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 - jr nz, .asm_44bf7 - ld a, $54 - jr .asm_44c03 -.asm_44bf7 + jr nz, .play_sound_door_open + ld a, $54 ; Door Block + jr .set_door_block +.play_sound_door_open ld a, SFX_GO_INSIDE call PlaySound CheckEventHL EVENT_677 -.asm_44c01 - ld a, $e -.asm_44c03 +.door_open + ld a, $e ; Floor Block +.set_door_block ld [wNewTileBlockID], a lb bc, 8, 12 predef_jump ReplaceTileBlock RocketHideoutB1F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROCKETHIDEOUTB1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROCKETHIDEOUTB1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROCKETHIDEOUTB1F_END_BATTLE RocketHideoutB1F_TextPointers: - dw RocketHideout1Text1 - dw RocketHideout1Text2 - dw RocketHideout1Text3 - dw RocketHideout1Text4 - dw RocketHideout1Text5 - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const RocketHideoutB1FRocket1Text, TEXT_ROCKETHIDEOUTB1F_ROCKET1 + dw_const RocketHideoutB1FRocket2Text, TEXT_ROCKETHIDEOUTB1F_ROCKET2 + dw_const RocketHideoutB1FRocket3Text, TEXT_ROCKETHIDEOUTB1F_ROCKET3 + dw_const RocketHideoutB1FRocket4Text, TEXT_ROCKETHIDEOUTB1F_ROCKET4 + dw_const RocketHideoutB1FRocket5Text, TEXT_ROCKETHIDEOUTB1F_ROCKET5 + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB1F_ESCAPE_ROPE + dw_const PickUpItemText, TEXT_ROCKETHIDEOUTB1F_HYPER_POTION RocketHideout1TrainerHeaders: def_trainers RocketHideout1TrainerHeader0: - trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, RocketHideout1BattleText2, RocketHideout1EndBattleText2, RocketHideout1AfterBattleTxt2 + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, RocketHideoutB1FRocket1BattleText, RocketHideoutB1FRocket1EndBattleText, RocketHideoutB1FRocket1AfterBattleText RocketHideout1TrainerHeader1: - trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1, 2, RocketHideout1BattleText3, RocketHideout1EndBattleText3, RocketHideout1AfterBattleTxt3 + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1, 2, RocketHideoutB1FRocket2BattleText, RocketHideoutB1FRocket2EndBattleText, RocketHideoutB1FRocket2AfterBattleText RocketHideout1TrainerHeader2: - trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2, 2, RocketHideout1BattleText4, RocketHideout1EndBattleText4, RocketHideout1AfterBattleTxt4 + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2, 2, RocketHideoutB1FRocket3BattleText, RocketHideoutB1FRocket3EndBattleText, RocketHideoutB1FRocket3AfterBattleText RocketHideout1TrainerHeader3: - trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3, 3, RocketHideout1BattleText5, RocketHideout1EndBattleText5, RocketHideout1AfterBattleTxt5 + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3, 3, RocketHideoutB1FRocket4BattleText, RocketHideoutB1FRocket4EndBattleText, RocketHideoutB1FRocket4AfterBattleText RocketHideout1TrainerHeader4: - trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4, 3, RocketHideout1BattleText6, RocketHideout1EndBattleText6, RocketHideout1AfterBattleTxt6 + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4, 3, RocketHideoutB1FRocket5BattleText, RocketHideoutB1FRocket5EndBattleText, RocketHideoutB1FRocket5AfterBattleText db -1 ; end -RocketHideout1Text1: +RocketHideoutB1FRocket1Text: text_asm ld hl, RocketHideout1TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text2: +RocketHideoutB1FRocket2Text: text_asm ld hl, RocketHideout1TrainerHeader1 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text3: +RocketHideoutB1FRocket3Text: text_asm ld hl, RocketHideout1TrainerHeader2 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text4: +RocketHideoutB1FRocket4Text: text_asm ld hl, RocketHideout1TrainerHeader3 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text5: +RocketHideoutB1FRocket5Text: text_asm ld hl, RocketHideout1TrainerHeader4 call TalkToTrainer jp TextScriptEnd -RocketHideout1EndBattleText6: - text_far _RocketHideout1EndBattleText6 +RocketHideoutB1FRocket5EndBattleText: + text_far _RocketHideoutB1FRocket5EndBattleText text_asm SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 - ld hl, RocketHideout1Text_44c9f + ld hl, .prompt_end ret -RocketHideout1Text_44c9f: +.prompt_end: text_promptbutton text_end -RocketHideout1BattleText2: - text_far _RocketHideout1BattleText2 +RocketHideoutB1FRocket1BattleText: + text_far _RocketHideoutB1FRocket1BattleText text_end -RocketHideout1EndBattleText2: - text_far _RocketHideout1EndBattleText2 +RocketHideoutB1FRocket1EndBattleText: + text_far _RocketHideoutB1FRocket1EndBattleText text_end -RocketHideout1AfterBattleTxt2: - text_far _RocketHideout1AfterBattleTxt2 +RocketHideoutB1FRocket1AfterBattleText: + text_far _RocketHideoutB1FRocket1AfterBattleText text_end -RocketHideout1BattleText3: - text_far _RocketHideout1BattleText3 +RocketHideoutB1FRocket2BattleText: + text_far _RocketHideoutB1FRocket2BattleText text_end -RocketHideout1EndBattleText3: - text_far _RocketHideout1EndBattleText3 +RocketHideoutB1FRocket2EndBattleText: + text_far _RocketHideoutB1FRocket2EndBattleText text_end -RocketHideout1AfterBattleTxt3: - text_far _RocketHideout1AfterBattleTxt3 +RocketHideoutB1FRocket2AfterBattleText: + text_far _RocketHideoutB1FRocket2AfterBattleText text_end -RocketHideout1BattleText4: - text_far _RocketHideout1BattleText4 +RocketHideoutB1FRocket3BattleText: + text_far _RocketHideoutB1FRocket3BattleText text_end -RocketHideout1EndBattleText4: - text_far _RocketHideout1EndBattleText4 +RocketHideoutB1FRocket3EndBattleText: + text_far _RocketHideoutB1FRocket3EndBattleText text_end -RocketHideout1AfterBattleTxt4: - text_far _RocketHideout1AfterBattleTxt4 +RocketHideoutB1FRocket3AfterBattleText: + text_far _RocketHideoutB1FRocket3AfterBattleText text_end -RocketHideout1BattleText5: - text_far _RocketHideout1BattleText5 +RocketHideoutB1FRocket4BattleText: + text_far _RocketHideoutB1FRocket4BattleText text_end -RocketHideout1EndBattleText5: - text_far _RocketHideout1EndBattleText5 +RocketHideoutB1FRocket4EndBattleText: + text_far _RocketHideoutB1FRocket4EndBattleText text_end -RocketHideout1AfterBattleTxt5: - text_far _RocketHideout1AfterBattleTxt5 +RocketHideoutB1FRocket4AfterBattleText: + text_far _RocketHideoutB1FRocket4AfterBattleText text_end -RocketHideout1BattleText6: - text_far _RocketHideout1BattleText6 +RocketHideoutB1FRocket5BattleText: + text_far _RocketHideoutB1FRocket5BattleText text_end -RocketHideout1AfterBattleTxt6: - text_far _RocketHideout1AfterBattleTxt6 +RocketHideoutB1FRocket5AfterBattleText: + text_far _RocketHideoutB1FRocket5AfterBattleText text_end |
