diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/PokemonMansionB1F.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/PokemonMansionB1F.asm')
| -rw-r--r-- | scripts/PokemonMansionB1F.asm | 88 |
1 files changed, 45 insertions, 43 deletions
diff --git a/scripts/PokemonMansionB1F.asm b/scripts/PokemonMansionB1F.asm index 4ca84624..74f1648e 100644 --- a/scripts/PokemonMansionB1F.asm +++ b/scripts/PokemonMansionB1F.asm @@ -1,5 +1,5 @@ PokemonMansionB1F_Script: - call Mansion4Script_523cf + call MansionB1FCheckReplaceSwitchDoorBlocks call EnableAutoTextBoxDrawing ld hl, Mansion4TrainerHeaders ld de, PokemonMansionB1F_ScriptPointers @@ -8,39 +8,39 @@ PokemonMansionB1F_Script: ld [wPokemonMansionB1FCurScript], a ret -Mansion4Script_523cf: +MansionB1FCheckReplaceSwitchDoorBlocks: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_MANSION_SWITCH_ON - jr nz, .asm_523ff + jr nz, .switchTurnedOn ld a, $e ld bc, $80d - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e ld bc, $b06 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $5f ld bc, $304 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $54 ld bc, $808 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ret -.asm_523ff +.switchTurnedOn ld a, $2d ld bc, $80d - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $5f ld bc, $b06 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e ld bc, $304 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e ld bc, $808 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ret Mansion4Script_Switches:: @@ -49,70 +49,72 @@ Mansion4Script_Switches:: ret nz xor a ldh [hJoyHeld], a - ld a, $9 + ld a, TEXT_POKEMONMANSIONB1F_SWITCH ldh [hSpriteIndexOrTextID], a jp DisplayTextID PokemonMansionB1F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_POKEMONMANSIONB1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONMANSIONB1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_POKEMONMANSIONB1F_END_BATTLE PokemonMansionB1F_TextPointers: - dw Mansion4Text1 - dw Mansion4Text2 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw Mansion4Text7 - dw PickUpItemText - dw Mansion3Text6 + def_text_pointers + dw_const PokemonMansionB1FBurglarText, TEXT_POKEMONMANSIONB1F_BURGLAR + dw_const PokemonMansionB1FScientistText, TEXT_POKEMONMANSIONB1F_SCIENTIST + dw_const PickUpItemText, TEXT_POKEMONMANSIONB1F_RARE_CANDY + dw_const PickUpItemText, TEXT_POKEMONMANSIONB1F_FULL_RESTORE + dw_const PickUpItemText, TEXT_POKEMONMANSIONB1F_TM_BLIZZARD + dw_const PickUpItemText, TEXT_POKEMONMANSIONB1F_TM_SOLARBEAM + dw_const PokemonMansionB1FDiaryText, TEXT_POKEMONMANSIONB1F_DIARY + dw_const PickUpItemText, TEXT_POKEMONMANSIONB1F_SECRET_KEY + dw_const PokemonMansion2FSwitchText, TEXT_POKEMONMANSIONB1F_SWITCH ; This switch uses the text script from the 2F. Mansion4TrainerHeaders: def_trainers Mansion4TrainerHeader0: - trainer EVENT_BEAT_MANSION_4_TRAINER_0, 0, Mansion4BattleText1, Mansion4EndBattleText1, Mansion4AfterBattleText1 + trainer EVENT_BEAT_MANSION_4_TRAINER_0, 0, PokemonMansionB1FBurglarBattleText, PokemonMansionB1FBurglarEndBattleText, PokemonMansionB1FBurglarAfterBattleText Mansion4TrainerHeader1: - trainer EVENT_BEAT_MANSION_4_TRAINER_1, 3, Mansion4BattleText2, Mansion4EndBattleText2, Mansion4AfterBattleText2 + trainer EVENT_BEAT_MANSION_4_TRAINER_1, 3, PokemonMansionB1FScientistBattleText, PokemonMansionB1FScientistEndBattleText, PokemonMansionB1FScientistAfterBattleText db -1 ; end -Mansion4Text1: +PokemonMansionB1FBurglarText: text_asm ld hl, Mansion4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Mansion4Text2: +PokemonMansionB1FScientistText: text_asm ld hl, Mansion4TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Mansion4BattleText1: - text_far _Mansion4BattleText1 +PokemonMansionB1FBurglarBattleText: + text_far _PokemonMansionB1FBurglarBattleText text_end -Mansion4EndBattleText1: - text_far _Mansion4EndBattleText1 +PokemonMansionB1FBurglarEndBattleText: + text_far _PokemonMansionB1FBurglarEndBattleText text_end -Mansion4AfterBattleText1: - text_far _Mansion4AfterBattleText1 +PokemonMansionB1FBurglarAfterBattleText: + text_far _PokemonMansionB1FBurglarAfterBattleText text_end -Mansion4BattleText2: - text_far _Mansion4BattleText2 +PokemonMansionB1FScientistBattleText: + text_far _PokemonMansionB1FScientistBattleText text_end -Mansion4EndBattleText2: - text_far _Mansion4EndBattleText2 +PokemonMansionB1FScientistEndBattleText: + text_far _PokemonMansionB1FScientistEndBattleText text_end -Mansion4AfterBattleText2: - text_far _Mansion4AfterBattleText2 +PokemonMansionB1FScientistAfterBattleText: + text_far _PokemonMansionB1FScientistAfterBattleText text_end -Mansion4Text7: - text_far _Mansion4Text7 +PokemonMansionB1FDiaryText: + text_far _PokemonMansionB1FDiaryText text_end |