From 993861722973dc3bf26102f6f377d13b6de50bef Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Tue, 25 Apr 2023 15:57:33 +0100 Subject: [PATCH] Finally fixing the Gauntlet 1F Trainers Adding trainers properly is hell, 1/5, would not recommend --- constants/event_constants.asm | 96 +++++++++++++++++------------------ scripts/SilphGauntlet1F.asm | 72 +++++++++++++------------- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 2925882e..b99e7993 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -67,6 +67,53 @@ const EVENT_BEAT_MISTY const EVENT_GOT_BICYCLE +; Silph Gauntlet events ; Why is there so much free space here, my god + ; 1F Trainers + const EVENT_BEAT_GAUNTLET_YOUNGSTER + const EVENT_BEAT_GAUNTLET_BUG_CATCHER + const EVENT_BEAT_GAUNTLET_STUDENT + const EVENT_BEAT_GAUNTLET_JR_TRAINER_M + const EVENT_BEAT_GAUNTLET_JR_TRAINER_F + const EVENT_BEAT_GAUNTLET_BIRD_KEEPER + ; 2F Trainers + ; const EVENT_BEAT_GAUNTLET_LASS + ; const EVENT_BEAT_GAUNTLET_JUNIOR + ; const EVENT_BEAT_GAUNTLET_HIKER + ; const EVENT_BEAT_GAUNTLET_SUPER_NERD + ; const EVENT_BEAT_GAUNTLET_POKEMANIAC + ; const EVENT_BEAT_GAUNTLET_BLACK_BELT + ; 3F Trainers + ; const EVENT_BEAT_GAUNTLET_SAILOR + ; const EVENT_BEAT_GAUNTLET_FIREFIGHTER + ; const EVENT_BEAT_GAUNTLET_GENTLEMAN + ; const EVENT_BEAT_GAUNTLET_ENGINEER + ; const EVENT_BEAT_GAUNTLET_ROCKER + ; const EVENT_BEAT_GAUNTLET_FISHER + ; const EVENT_BEAT_GAUNTLET_BEAUTY + ; 4F Trainers + ; const EVENT_BEAT_GAUNTLET_SCIENTIST + ; const EVENT_BEAT_GAUNTLET_GAMBLER + ; const EVENT_BEAT_GAUNTLET_ROCKET + ; const EVENT_BEAT_GAUNTLET_PSYCHIC + ; const EVENT_BEAT_GAUNTLET_BURGLAR + ; const EVENT_BEAT_GAUNTLET_CHANNELER + ; 5F Trainers + ; const EVENT_BEAT_GAUNTLET_JUGGLER + ; const EVENT_BEAT_GAUNTLET_BIKER + ; const EVENT_BEAT_GAUNTLET_CUE_BALL + ; const EVENT_BEAT_GAUNTLET_SWIMMER + ; const EVENT_BEAT_GAUNTLET_TAMER + ; const EVENT_BEAT_GAUNTLET_COOLTRAINER_F + ; const EVENT_BEAT_GAUNTLET_COOLTRAINER_M + ; 6F Trainers + ; const EVENT_BEAT_GAUNTLET_BROCK + ; const EVENT_BEAT_GAUNTLET_MISTY + ; const EVENT_BEAT_GAUNTLET_SURGE + ; const EVENT_BEAT_GAUNTLET_ERIKA + ; const EVENT_BEAT_GAUNTLET_KOGA + ; const EVENT_BEAT_GAUNTLET_SABRINA + ; const EVENT_BEAT_GAUNTLET_BLAINE + ; Lavender Town events const_next $F0 - 2 const EVENT_POKEMON_TOWER_RIVAL_ON_LEFT @@ -779,55 +826,6 @@ DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 1 const EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 const_skip 4 const EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH - -; Silph Gauntlet events - const_next $930 - const_skip 6 - ; 1F Trainers - const EVENT_BEAT_GAUNTLET_YOUNGSTER - const EVENT_BEAT_GAUNTLET_BUG_CATCHER - const EVENT_BEAT_GAUNTLET_STUDENT - const EVENT_BEAT_GAUNTLET_JR_TRAINER_M - const EVENT_BEAT_GAUNTLET_JR_TRAINER_F - const EVENT_BEAT_GAUNTLET_BIRD_KEEPER - ; 2F Trainers - ; const EVENT_BEAT_GAUNTLET_LASS - ; const EVENT_BEAT_GAUNTLET_JUNIOR - ; const EVENT_BEAT_GAUNTLET_HIKER - ; const EVENT_BEAT_GAUNTLET_SUPER_NERD - ; const EVENT_BEAT_GAUNTLET_POKEMANIAC - ; const EVENT_BEAT_GAUNTLET_BLACK_BELT - ; 3F Trainers - ; const EVENT_BEAT_GAUNTLET_SAILOR - ; const EVENT_BEAT_GAUNTLET_FIREFIGHTER - ; const EVENT_BEAT_GAUNTLET_GENTLEMAN - ; const EVENT_BEAT_GAUNTLET_ENGINEER - ; const EVENT_BEAT_GAUNTLET_ROCKER - ; const EVENT_BEAT_GAUNTLET_FISHER - ; const EVENT_BEAT_GAUNTLET_BEAUTY - ; 4F Trainers - ; const EVENT_BEAT_GAUNTLET_SCIENTIST - ; const EVENT_BEAT_GAUNTLET_GAMBLER - ; const EVENT_BEAT_GAUNTLET_ROCKET - ; const EVENT_BEAT_GAUNTLET_PSYCHIC - ; const EVENT_BEAT_GAUNTLET_BURGLAR - ; const EVENT_BEAT_GAUNTLET_CHANNELER - ; 5F Trainers - ; const EVENT_BEAT_GAUNTLET_JUGGLER - ; const EVENT_BEAT_GAUNTLET_BIKER - ; const EVENT_BEAT_GAUNTLET_CUE_BALL - ; const EVENT_BEAT_GAUNTLET_SWIMMER - ; const EVENT_BEAT_GAUNTLET_TAMER - ; const EVENT_BEAT_GAUNTLET_COOLTRAINER_F - ; const EVENT_BEAT_GAUNTLET_COOLTRAINER_M - ; 6F Trainers - ; const EVENT_BEAT_GAUNTLET_BROCK - ; const EVENT_BEAT_GAUNTLET_MISTY - ; const EVENT_BEAT_GAUNTLET_SURGE - ; const EVENT_BEAT_GAUNTLET_ERIKA - ; const EVENT_BEAT_GAUNTLET_KOGA - ; const EVENT_BEAT_GAUNTLET_SABRINA - ; const EVENT_BEAT_GAUNTLET_BLAINE ; Rock Tunnel events const_next $9B0 diff --git a/scripts/SilphGauntlet1F.asm b/scripts/SilphGauntlet1F.asm index 52344397..c65c9eac 100644 --- a/scripts/SilphGauntlet1F.asm +++ b/scripts/SilphGauntlet1F.asm @@ -21,52 +21,24 @@ SilphGauntlet1F_TextPointers: dw SilphGauntlet1FText6 SilphGauntlet1FTrainerHeaders: - def_trainers 6 + def_trainers SilphGauntlet1FTrainerHeader0: - trainer EVENT_BEAT_GAUNTLET_YOUNGSTER, 3, SilphGauntlet1FBattleText1, SilphGauntlet1FEndBattleText1, SilphGauntlet1FAfterBattleText1 + trainer EVENT_BEAT_GAUNTLET_YOUNGSTER, 1, SilphGauntlet1FBattleText1, SilphGauntlet1FEndBattleText1, SilphGauntlet1FAfterBattleText1 SilphGauntlet1FTrainerHeader1: - trainer EVENT_BEAT_GAUNTLET_BUG_CATCHER, 2, SilphGauntlet1FBattleText2, SilphGauntlet1FEndBattleText2, SilphGauntlet1FAfterBattleText2 + trainer EVENT_BEAT_GAUNTLET_BUG_CATCHER, 1, SilphGauntlet1FBattleText2, SilphGauntlet1FEndBattleText2, SilphGauntlet1FAfterBattleText2 SilphGauntlet1FTrainerHeader2: - trainer EVENT_BEAT_GAUNTLET_STUDENT, 4, SilphGauntlet1FBattleText3, SilphGauntlet1FEndBattleText3, SilphGauntlet1FAfterBattleText3 + trainer EVENT_BEAT_GAUNTLET_STUDENT, 1, SilphGauntlet1FBattleText3, SilphGauntlet1FEndBattleText3, SilphGauntlet1FAfterBattleText3 SilphGauntlet1FTrainerHeader3: - trainer EVENT_BEAT_GAUNTLET_JR_TRAINER_M, 2, SilphGauntlet1FBattleText4, SilphGauntlet1FEndBattleText4, SilphGauntlet1FAfterBattleText4 + trainer EVENT_BEAT_GAUNTLET_JR_TRAINER_M, 1, SilphGauntlet1FBattleText4, SilphGauntlet1FEndBattleText4, SilphGauntlet1FAfterBattleText4 SilphGauntlet1FTrainerHeader4: - trainer EVENT_BEAT_GAUNTLET_JR_TRAINER_F, 2, SilphGauntlet1FBattleText5, SilphGauntlet1FEndBattleText5, SilphGauntlet1FAfterBattleText5 + trainer EVENT_BEAT_GAUNTLET_JR_TRAINER_F, 1, SilphGauntlet1FBattleText5, SilphGauntlet1FEndBattleText5, SilphGauntlet1FAfterBattleText5 SilphGauntlet1FTrainerHeader5: - trainer EVENT_BEAT_GAUNTLET_BIRD_KEEPER, 3, SilphGauntlet1FBattleText6, SilphGauntlet1FEndBattleText6, SilphGauntlet1FAfterBattleText6 + trainer EVENT_BEAT_GAUNTLET_BIRD_KEEPER, 1, SilphGauntlet1FBattleText6, SilphGauntlet1FEndBattleText6, SilphGauntlet1FAfterBattleText6 db -1 ; end SilphGauntlet1FText1: text_asm ld hl, SilphGauntlet1FTrainerHeader0 - jr SilphGauntlet1FTalkToTrainer - -SilphGauntlet1FText2: - text_asm - ld hl, SilphGauntlet1FTrainerHeader1 - jr SilphGauntlet1FTalkToTrainer - -SilphGauntlet1FText3: - text_asm - ld hl, SilphGauntlet1FTrainerHeader2 - jr SilphGauntlet1FTalkToTrainer - -SilphGauntlet1FText4: - text_asm - ld hl, SilphGauntlet1FTrainerHeader3 - jr SilphGauntlet1FTalkToTrainer - -SilphGauntlet1FText5: - text_asm - ld hl, SilphGauntlet1FTrainerHeader4 - jr SilphGauntlet1FTalkToTrainer - -SilphGauntlet1FText6: - text_asm - ld hl, SilphGauntlet1FTrainerHeader5 - jr SilphGauntlet1FTalkToTrainer - -SilphGauntlet1FTalkToTrainer: call TalkToTrainer jp TextScriptEnd @@ -82,6 +54,12 @@ SilphGauntlet1FAfterBattleText1: text_far _SilphGauntlet1FAfterBattleText1 text_end +SilphGauntlet1FText2: + text_asm + ld hl, SilphGauntlet1FTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + SilphGauntlet1FBattleText2: text_far _SilphGauntlet1FBattleText2 text_end @@ -93,6 +71,12 @@ SilphGauntlet1FEndBattleText2: SilphGauntlet1FAfterBattleText2: text_far _SilphGauntlet1FAfterBattleText2 text_end + +SilphGauntlet1FText3: + text_asm + ld hl, SilphGauntlet1FTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd SilphGauntlet1FBattleText3: text_far _SilphGauntlet1FBattleText3 @@ -106,6 +90,12 @@ SilphGauntlet1FAfterBattleText3: text_far _SilphGauntlet1FAfterBattleText3 text_end +SilphGauntlet1FText4: + text_asm + ld hl, SilphGauntlet1FTrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + SilphGauntlet1FBattleText4: text_far _SilphGauntlet1FBattleText4 text_end @@ -117,6 +107,12 @@ SilphGauntlet1FEndBattleText4: SilphGauntlet1FAfterBattleText4: text_far _SilphGauntlet1FAfterBattleText4 text_end + +SilphGauntlet1FText5: + text_asm + ld hl, SilphGauntlet1FTrainerHeader4 + call TalkToTrainer + jp TextScriptEnd SilphGauntlet1FBattleText5: text_far _SilphGauntlet1FBattleText5 @@ -130,6 +126,12 @@ SilphGauntlet1FAfterBattleText5: text_far _SilphGauntlet1FAfterBattleText5 text_end +SilphGauntlet1FText6: + text_asm + ld hl, SilphGauntlet1FTrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + SilphGauntlet1FBattleText6: text_far _SilphGauntlet1FBattleText6 text_end