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/SilphCo10F.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/SilphCo10F.asm')
| -rw-r--r-- | scripts/SilphCo10F.asm | 84 |
1 files changed, 43 insertions, 41 deletions
diff --git a/scripts/SilphCo10F.asm b/scripts/SilphCo10F.asm index b8b5bfea..7cc2c58e 100644 --- a/scripts/SilphCo10F.asm +++ b/scripts/SilphCo10F.asm @@ -1,5 +1,5 @@ SilphCo10F_Script: - call SilphCo10Script_5a14f + call SilphCo10FGateCallbackScript call EnableAutoTextBoxDrawing ld hl, SilphCo10TrainerHeaders ld de, SilphCo10F_ScriptPointers @@ -8,14 +8,14 @@ SilphCo10F_Script: ld [wSilphCo10FCurScript], a ret -SilphCo10Script_5a14f: +SilphCo10FGateCallbackScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo10GateCoords - call SilphCo2Script_59d43 - call SilphCo10Text_5a176 + ld hl, .GateCoordinates + call SilphCo2F_SetCardKeyDoorYScript + call SilphCo10F_SetUnlockedSilphCoDoorsScript CheckEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR ret nz ld a, $54 @@ -23,11 +23,11 @@ SilphCo10Script_5a14f: lb bc, 4, 5 predef_jump ReplaceTileBlock -SilphCo10GateCoords: +.GateCoordinates: dbmapcoord 5, 4 db -1 ; end -SilphCo10Text_5a176: +SilphCo10F_SetUnlockedSilphCoDoorsScript: ldh a, [hUnlockedSilphCoDoors] and a ret z @@ -35,76 +35,78 @@ SilphCo10Text_5a176: ret SilphCo10F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SILPHCO10F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO10F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SILPHCO10F_END_BATTLE SilphCo10F_TextPointers: - dw SilphCo10Text1 - dw SilphCo10Text2 - dw SilphCo10Text3 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const SilphCo10FRocketText, TEXT_SILPHCO10F_ROCKET + dw_const SilphCo10FScientistText, TEXT_SILPHCO10F_SCIENTIST + dw_const SilphCo10FSilphWorkerFText, TEXT_SILPHCO10F_SILPH_WORKER_F + dw_const PickUpItemText, TEXT_SILPHCO10F_TM_EARTHQUAKE + dw_const PickUpItemText, TEXT_SILPHCO10F_RARE_CANDY + dw_const PickUpItemText, TEXT_SILPHCO10F_CARBOS SilphCo10TrainerHeaders: def_trainers SilphCo10TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_10F_TRAINER_0, 3, SilphCo10BattleText1, SilphCo10EndBattleText1, SilphCo10AfterBattleText1 + trainer EVENT_BEAT_SILPH_CO_10F_TRAINER_0, 3, SilphCo10FRocketBattleText, SilphCo10FRocketEndBattleText, SilphCo10FRocketAfterBattleText SilphCo10TrainerHeader1: - trainer EVENT_BEAT_SILPH_CO_10F_TRAINER_1, 4, SilphCo10BattleText2, SilphCo10EndBattleText2, SilphCo10AfterBattleText2 + trainer EVENT_BEAT_SILPH_CO_10F_TRAINER_1, 4, SilphCo10FScientistBattleText, SilphCo10FScientistEndBattleText, SilphCo10FScientistAfterBattleText db -1 ; end -SilphCo10Text1: +SilphCo10FRocketText: text_asm ld hl, SilphCo10TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo10Text2: +SilphCo10FScientistText: text_asm ld hl, SilphCo10TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo10Text3: +SilphCo10FSilphWorkerFText: text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - ld hl, SilphCo10Text_5a1d8 - jr nz, .asm_cf85f - ld hl, SilphCo10Text_5a1d3 -.asm_cf85f + ld hl, .QuietAboutMyCryingText + jr nz, .beat_giovanni + ld hl, .ImScaredText +.beat_giovanni call PrintText jp TextScriptEnd -SilphCo10Text_5a1d3: - text_far _SilphCo10Text_5a1d3 +.ImScaredText: + text_far _SilphCo10FSilphWorkerFImScaredText text_end -SilphCo10Text_5a1d8: - text_far _SilphCo10Text_5a1d8 +.QuietAboutMyCryingText: + text_far _SilphCo10FSilphWorkerFQuietAboutMyCryingText text_end -SilphCo10BattleText1: - text_far _SilphCo10BattleText1 +SilphCo10FRocketBattleText: + text_far _SilphCo10FRocketBattleText text_end -SilphCo10EndBattleText1: - text_far _SilphCo10EndBattleText1 +SilphCo10FRocketEndBattleText: + text_far _SilphCo10FRocketEndBattleText text_end -SilphCo10AfterBattleText1: - text_far _SilphCo10AfterBattleText1 +SilphCo10FRocketAfterBattleText: + text_far _SilphCo10FRocketAfterBattleText text_end -SilphCo10BattleText2: - text_far _SilphCo10BattleText2 +SilphCo10FScientistBattleText: + text_far _SilphCo10FScientistBattleText text_end -SilphCo10EndBattleText2: - text_far _SilphCo10EndBattleText2 +SilphCo10FScientistEndBattleText: + text_far _SilphCo10FScientistEndBattleText text_end -SilphCo10AfterBattleText2: - text_far _SilphCo10AfterBattleText2 +SilphCo10FScientistAfterBattleText: + text_far _SilphCo10FScientistAfterBattleText text_end |