Adding data for Silph Gauntlet Trainers (2, 3, 5F)

Adds the trainers themselves, dialogue still needs to be written but PvK can help with that

Currently they either don't see you or challenge you multiple times...probably issues with where the event constants are located, will sort out once I figure out the problem
This commit is contained in:
Martha Schilling 2023-07-15 22:07:51 +01:00
parent ffd03c1b06
commit 91e06763dd
19 changed files with 936 additions and 71 deletions

View file

@ -84,20 +84,20 @@
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
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
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
@ -106,24 +106,24 @@
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
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
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_next $100 - 2
const EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
const EVENT_BEAT_POKEMON_TOWER_RIVAL
const_skip

View file

@ -15,7 +15,7 @@ Route12_Object:
object_event 14, 31, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 3
object_event 5, 39, SPRITE_FISHER, STAY, UP, 3, OPP_FISHER, 4
object_event 11, 92, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9
object_event 14, 76, SPRITE_SUPER_NERD, STAY, UP, 5, OPP_ROCKER, 2
object_event 14, 76, SPRITE_ROCKER, STAY, UP, 5, OPP_ROCKER, 2
object_event 12, 40, SPRITE_FISHER, STAY, LEFT, 6, OPP_FISHER, 5
object_event 9, 52, SPRITE_FISHER, STAY, RIGHT, 7, OPP_FISHER, 6
object_event 6, 87, SPRITE_FISHER, STAY, DOWN, 8, OPP_FISHER, 11

View file

@ -3,10 +3,16 @@ SilphGauntlet2F_Object:
def_warp_events
warp_event 7, 5, SILPH_GAUNTLET_1F, 2
warp_event 3, 13, SILPH_GAUNTLET_3F, 1
warp_event 3, 13, SILPH_GAUNTLET_3F, 1
def_bg_events
def_object_events
object_event 13, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_LASS, 19
object_event 21, 9, SPRITE_YOUNGSTER, STAY, UP, 2, OPP_JUNIOR, 1
object_event 24, 13, SPRITE_HIKER, STAY, RIGHT, 3, OPP_HIKER, 15
object_event 23, 19, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_SUPER_NERD, 8
object_event 11, 16, SPRITE_SUPER_NERD, STAY, DOWN, 5, OPP_POKEMANIAC, 8
object_event 2, 16, SPRITE_HIKER, STAY, RIGHT, 6, OPP_BLACKBELT, 19
def_warps_to SILPH_GAUNTLET_2F

View file

@ -22,5 +22,12 @@ SilphGauntlet3F_Object:
def_bg_events
def_object_events
object_event 13, 13, SPRITE_SAILOR, STAY, UP, 1, OPP_SAILOR, 9
object_event 12, 23, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_FIREFIGHTER, 2
object_event 2, 23, SPRITE_GENTLEMAN, STAY, DOWN, 3, OPP_GENTLEMAN, 4
object_event 21, 12, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_ENGINEER, 4
object_event 6, 7, SPRITE_ROCKER, STAY, RIGHT, 5, OPP_ROCKER, 3
object_event 22, 23, SPRITE_FISHER, STAY, DOWN, 6, OPP_FISHER, 12
object_event 30, 23, SPRITE_BEAUTY, STAY, RIGHT, 7, OPP_BEAUTY, 11
def_warps_to SILPH_GAUNTLET_3F

View file

@ -8,5 +8,12 @@ SilphGauntlet5F_Object:
def_bg_events
def_object_events
object_event 1, 10, SPRITE_ROCKER, STAY, RIGHT, 1, OPP_JUGGLER, 6
object_event 6, 6, SPRITE_BIKER, STAY, DOWN, 2, OPP_BIKER, 16
object_event 6, 15, SPRITE_GAMBLER, STAY, RIGHT, 3, OPP_CUE_BALL, 10
object_event 14, 10, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_SWIMMER, 16
object_event 14, 2, SPRITE_ROCKER, STAY, DOWN, 5, OPP_TAMER, 6
object_event 4, 2, SPRITE_COOLTRAINER_M, STAY, DOWN, 6, OPP_COOLTRAINER_M, 4
object_event 9, 5, SPRITE_COOLTRAINER_F, STAY, UP, 7, OPP_COOLTRAINER_F, 4
def_warps_to SILPH_GAUNTLET_5F

View file

@ -10,7 +10,7 @@ VermilionGym_Object:
def_object_events
object_event 5, 1, SPRITE_ROCKER, STAY, DOWN, 1, OPP_LT_SURGE, 1
object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, 2, OPP_GENTLEMAN, 3
object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_ROCKER, 1
object_event 3, 8, SPRITE_ROCKER, STAY, LEFT, 3, OPP_ROCKER, 1
object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, 4, OPP_SAILOR, 8
object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person

View file

@ -225,33 +225,33 @@ JrTrainerFData:
PokemaniacData:
; Route 10
db 30, RHYHORN, LICKITUNG, 0
db 20, CUBONE, SLOWPOKE, 0
db 21, CHARMELEON, CUBONE, 0
; Rock Tunnel B1F
db 20, SLOWPOKE, LICKITUNG, RHYHORN, 0
db 22, CHARMANDER, CUBONE, 0
db 25, SKIMPER, 0
; Victory Road 2F
db 40, CHARMELEON, LAPRAS, LICKILICKY, RHYDON, 0
db 40, BAWLIGUA, LAPRAS, LICKILICKY, RHYDON, 0
; Rock Tunnel 1F
db 23, CUBONE, SLOWPOKE, 0
; Silph Gauntlet (currently 2F but may move up to 5F)
; Silph Gauntlet 2F (Mt. Moon)
db 63, GUARDIA, SLOWKING, CHARIZARD, STEELIX, LICKILICKY, RHYPERIOR, 0
; Feels almost aimless...
; The Super Nerd has some weird choices, but I think they're mostly inorganic Pokemon, except for Fire-types that the Cinnabar Gym Trainers use.
SuperNerdData:
; Mt. Moon 1F
db 11, MAGNEMITE, VOLTORB, 0
; Mt. Moon B2F - the fossil guy fight
db 12, GRIMER, VOLTORB, KOFFING, 0
; Route 8
db 20, VOLTORB, KOFFING, VOLTORB, MAGNEMITE, 0
db 22, GRIMER, MUK, GRIMER, 0
db 26, KOFFING, 0
db 20, GRIMER, KOFFING, KOFFING, MAGNEMITE, 0
db 22, VOLTORB, KOFFING, MAGNETITE, 0
db 26, ELECTRODE, 0
; Unused
db 30, PORYGON, 0 ; - used in celadon university
db 25, MAGNETITE, ELECTRODE, KABUTO, OMANYTE, 0 ; - used in celadon university
; Silph Gauntlet 2F (Mt. Moon)
db 63, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, MAGMORTAR, 0
db 63, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, PORYGONZ, 0
; Cinnabar Gym
db 36, VULPIX, NINETALES, CHARIZARD, 0
db 34, PONYTA, CHARMANDER, RAPIDASH, ARCANINE, 0
@ -261,30 +261,31 @@ SuperNerdData:
; Expanding the Hiker's cast is hard, as Rock-types are actually quite limited.
; Machop is more of an exception and not the rule, it's just "strong".
; So, I have added a few Ground-types that you could reasonably expect to see in each area.
; The Zubat line should also be there given how prevalent they tend to be inside caves...
HikerData:
; Mt. Moon 1F
db 10, GEODUDE, GEODUDE, ONIX, 0
; Route 25
db 15, MACHOP, GEODUDE, 0
db 13, GEODUDE, GEODUDE, MACHOP, GEODUDE, 0
db 13, GEODUDE, ZUBAT, MACHOP, ZUBAT, 0
db 17, ONIX, 0
; Route 9
db 21, GEODUDE, ONIX, 0
db 20, GEODUDE, MACHOP, DIGLETT, 0
; Route 10
db 21, CUBONE, ONIX, 0
db 19, SANDSHREW, GRAVELER, 0
db 19, ZUBAT, GRAVELER, 0
; Rock Tunnel B1F
db 21, GEODUDE, GEODUDE, GRAVELER, 0 ; The "Self-Destructing Hiker", fairly notorious and good to keep
db 23, NIDOKING, 0 ; could be a little strong, but I'll give it a go
db 24, GOLBAT, 0
; Route 9/Rock Tunnel B1F
db 20, MACHOP, RHYHORN, 0
; Rock Tunnel 1F
db 19, GEODUDE, MACHOP, RHYHORN, 0
db 20, MACHOP, DIGLETT, ONIX, 0
db 20, ZUBAT, DIGLETT, ONIX, 0
db 21, GEODUDE, GRAVELER, 0
; Silph Gauntlet 2F (Mt. Moon)
db 63, STEELIX, GOLEM, MACHAMP, CROBAT, CROAKOZUNA, GUARDIA, 0
db 63, STEELIX, GOLEM, MACHAMP, CROBAT, DUGTRIO, GUARDIA, 0
; Poison Pokemon. Poison Pokemon everywhere.
; Much of this seems to represent the pollution caused by petrol gas.
@ -317,7 +318,7 @@ BikerData:
db 28, GRIMER, GRIMER, SEADRA, 0
db 29, MAGMAR, 0
; Silph Gauntlet 5F (Safari Zone)
db 66, GENGAR, MUK_A, WEEZING, FLAREON, KINGDRA, CHARIZARD, 0
db 66, GOROTORA, MUK_A, WEEZING, FLAREON, KINGDRA, CHARIZARD, 0
; Fire specialist
BurglarData:
@ -486,7 +487,7 @@ JugglerData:
; Victory Road 2F
db 48, ELECTRODE, HYPNO, MR_MIME, 0 ; buffed roster
; Silph Gauntlet 5F (Safari Zone)
db 66, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, GENGAR, SLOWKING, 0
db 66, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, VICTREEBEL, SLOWKING_G, 0
; Fuchsia Gym
db 38, UMBREON, 0
; Fuchsia Gym
@ -505,7 +506,7 @@ TamerData:
; Victory Road 2F
db 44, KANGASKHAN, TAUROS, GOLDUCK, PRIMEAPE, 0
; Silph Gauntlet 5F (Safari Zone)
db 66, RHYPERIOR, GOLDUCK, KANGASKHAN, ANNIHILAPE, TRAMPEL, TAUROS, 0
db 66, RHYPERIOR, ARBOK, KANGASKHAN, ANNIHILAPE, TRAMPEL, TAUROS, 0
; yep bird yep bird yep bird yep bird
; If nothing else, just make them less agonising to fight.
@ -720,25 +721,27 @@ ChannelerData:
db 38, ESPEON, 0
db 33, JYNX, EXEGGCUTE, KADABRA, 0
; Normal specialists
; Mostly Normal specialists
StudentData:
; Viridian Pre-Gym
db 4, PIDGEY, RATTATA, 0
db 6, CLEFAIRY, 0
; Silph Gauntlet 1F (Viridian Forest)
db 62, CLEFABLE, PENDRAKEN, WIGGLYTUFF, BARUNDA, BELLOSSOM, NINETALES_A, 0 ; may revise
db 62, WIGGLYTUFF, PIDGEOT, TRAMPEL, CLEFABLE, KANGASKHAN, DEER, 0 ; all Normal types that Yujirou doesn't use
; Celadon University
db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
; Water specialists
; Mainly Water specialists, but can also use anything else that hits Fire super-effectively
FirefighterData:
; For Cerulean Gym
; Cerulean Gym
db 15, POLIWAG, CHEEP, SQUIRTLE, 0
; Silph Gauntlet 3F (S.S Anne)
db 64, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0 ; mostly water-types, but adding other types that hit Fire super-effectively
db 64, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0
JuniorData:
; Silph Gauntlet 2F (Mt. Moon)
db 63, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0 ; no idea what to do with this guy's team, so I'll redo this later
JackData:
; Silph Gauntlet 7F (Chief's Office)
db 70, ANIMON, PURAKKUSU, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0 ; not 100% sure what to do with this guy...

View file

@ -142,3 +142,5 @@ BlackbeltData:
db 38, CACTUS, DUGTRIO, STEELIX, 0
; Victory Road 2F
db 43, MACHOKE, MACHOP, MACHOKE, 0
; Silph Gauntlet 2F (Mt. Moon)
db 63, HITMONLEE, JABETTA, HITMONCHAN, POLIWRATH, CARAPTHOR, MACHAMP, 0

View file

@ -161,6 +161,8 @@ SetPal_Overworld:
jr z, .pachinko
cp GAME_CORNER_PRIZE_ROOM
jr z, .pachinko
cp SILPH_GAUNTLET_1F
jr z, .faraway
cp CELESTE_HILL_OUTSIDE
jr z, .celeste
cp CELESTE_HILL

View file

@ -2018,7 +2018,7 @@ wRedsHouse2FCurScript:: db
wViridianMartCurScript:: db
wRoute22GateCurScript:: db
wCeruleanCityCurScript:: db
ds 7
ds 5
wSSAnneBowCurScript:: db
wViridianForestCurScript:: db
wMuseum1FCurScript:: db
@ -2030,7 +2030,6 @@ wRoute21CurScript:: db
wSafariZoneGateCurScript:: db
wRockTunnelB1FCurScript:: db
wRockTunnel1FCurScript:: db
ds 1
wRoute11CurScript:: db
wRoute12CurScript:: db
wRoute15CurScript:: db
@ -2049,7 +2048,6 @@ wRocketHideoutB1FCurScript:: db
wRocketHideoutB2FCurScript:: db
wRocketHideoutB3FCurScript:: db
wRocketHideoutB4FCurScript:: db
ds 1
wRoute6GateCurScript:: db
wRoute8GateCurScript:: db
ds 1
@ -2087,7 +2085,11 @@ wLancesRoomCurScript:: db
wPokemonMansionB2FCurScript:: db
wMtMoonCraterCurScript:: db
wSilphGauntlet1FCurScript:: db
wSilphGauntlet2FCurScript:: db
wSilphGauntlet3FCurScript:: db
wSilphGauntlet4FCurScript:: db
wSilphGauntlet5FCurScript:: db
wSilphGauntlet6FCurScript:: db
wSilphCo10FCurScript:: db
wSilphCo11FCurScript:: db
wCelesteHillCurScript:: db

View file

@ -1,6 +1,147 @@
SilphGauntlet2F_Script:
jp EnableAutoTextBoxDrawing
call EnableAutoTextBoxDrawing
ld hl, SilphGauntlet2FTrainerHeaders
ld de, SilphGauntlet2F_ScriptPointers
ld a, [wSilphGauntlet2FCurScript]
call ExecuteCurMapScriptInTable
ld [wSilphGauntlet2FCurScript], a
ret
SilphGauntlet2F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
SilphGauntlet2F_TextPointers:
dw SilphGauntlet2FText1
dw SilphGauntlet2FText2
dw SilphGauntlet2FText3
dw SilphGauntlet2FText4
dw SilphGauntlet2FText5
dw SilphGauntlet2FText6
SilphGauntlet2FTrainerHeaders:
def_trainers 7
SilphGauntlet2FTrainerHeader0:
trainer EVENT_BEAT_GAUNTLET_LASS, 2, SilphGauntlet2FBattleText1, SilphGauntlet2FEndBattleText1, SilphGauntlet2FAfterBattleText1
SilphGauntlet2FTrainerHeader1:
trainer EVENT_BEAT_GAUNTLET_JUNIOR, 1, SilphGauntlet2FBattleText2, SilphGauntlet2FEndBattleText2, SilphGauntlet2FAfterBattleText2
SilphGauntlet2FTrainerHeader2:
trainer EVENT_BEAT_GAUNTLET_HIKER, 1, SilphGauntlet2FBattleText3, SilphGauntlet2FEndBattleText3, SilphGauntlet2FAfterBattleText3
SilphGauntlet2FTrainerHeader3:
trainer EVENT_BEAT_GAUNTLET_SUPER_NERD, 1, SilphGauntlet2FBattleText4, SilphGauntlet2FEndBattleText4, SilphGauntlet2FAfterBattleText4
SilphGauntlet2FTrainerHeader4:
trainer EVENT_BEAT_GAUNTLET_POKEMANIAC, 3, SilphGauntlet2FBattleText5, SilphGauntlet2FEndBattleText5, SilphGauntlet2FAfterBattleText5
SilphGauntlet2FTrainerHeader5:
trainer EVENT_BEAT_GAUNTLET_BLACK_BELT, 1, SilphGauntlet2FBattleText6, SilphGauntlet2FEndBattleText6, SilphGauntlet2FAfterBattleText6
db -1 ; end
SilphGauntlet2FText1:
text_asm
ld hl, SilphGauntlet2FTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet2FBattleText1:
text_far _SilphGauntlet2FBattleText1
text_end
SilphGauntlet2FEndBattleText1:
text_far _SilphGauntlet2FEndBattleText1
text_end
SilphGauntlet2FAfterBattleText1:
text_far _SilphGauntlet2FAfterBattleText1
text_end
SilphGauntlet2FText2:
text_asm
ld hl, SilphGauntlet2FTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet2FBattleText2:
text_far _SilphGauntlet2FBattleText2
text_end
SilphGauntlet2FEndBattleText2:
text_far _SilphGauntlet2FEndBattleText2
text_end
SilphGauntlet2FAfterBattleText2:
text_far _SilphGauntlet2FAfterBattleText2
text_end
SilphGauntlet2FText3:
text_asm
ld hl, SilphGauntlet2FTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet2FBattleText3:
text_far _SilphGauntlet2FBattleText3
text_end
SilphGauntlet2FEndBattleText3:
text_far _SilphGauntlet2FEndBattleText3
text_end
SilphGauntlet2FAfterBattleText3:
text_far _SilphGauntlet2FAfterBattleText3
text_end
SilphGauntlet2FText4:
text_asm
ld hl, SilphGauntlet2FTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet2FBattleText4:
text_far _SilphGauntlet2FBattleText4
text_end
SilphGauntlet2FEndBattleText4:
text_far _SilphGauntlet2FEndBattleText4
text_end
SilphGauntlet2FAfterBattleText4:
text_far _SilphGauntlet2FAfterBattleText4
text_end
SilphGauntlet2FText5:
text_asm
ld hl, SilphGauntlet2FTrainerHeader4
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet2FBattleText5:
text_far _SilphGauntlet2FBattleText5
text_end
SilphGauntlet2FEndBattleText5:
text_far _SilphGauntlet2FEndBattleText5
text_end
SilphGauntlet2FAfterBattleText5:
text_far _SilphGauntlet2FAfterBattleText5
text_end
SilphGauntlet2FText6:
text_asm
ld hl, SilphGauntlet2FTrainerHeader5
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet2FBattleText6:
text_far _SilphGauntlet2FBattleText6
text_end
SilphGauntlet2FEndBattleText6:
text_far _SilphGauntlet2FEndBattleText6
text_end
SilphGauntlet2FAfterBattleText6:
text_far _SilphGauntlet2FAfterBattleText6
text_end
text_end

View file

@ -1,6 +1,168 @@
SilphGauntlet3F_Script:
jp EnableAutoTextBoxDrawing
call EnableAutoTextBoxDrawing
ld hl, SilphGauntlet3FTrainerHeaders
ld de, SilphGauntlet3F_ScriptPointers
ld a, [wSilphGauntlet3FCurScript]
call ExecuteCurMapScriptInTable
ld [wSilphGauntlet3FCurScript], a
ret
SilphGauntlet3F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
SilphGauntlet3F_TextPointers:
dw SilphGauntlet3FText1
dw SilphGauntlet3FText2
dw SilphGauntlet3FText3
dw SilphGauntlet3FText4
dw SilphGauntlet3FText5
dw SilphGauntlet3FText6
dw SilphGauntlet3FText7
SilphGauntlet3FTrainerHeaders:
def_trainers 5
SilphGauntlet3FTrainerHeader0:
trainer EVENT_BEAT_GAUNTLET_SAILOR, 1, SilphGauntlet3FBattleText1, SilphGauntlet3FEndBattleText1, SilphGauntlet3FAfterBattleText1
SilphGauntlet3FTrainerHeader1:
trainer EVENT_BEAT_GAUNTLET_FIREFIGHTER, 2, SilphGauntlet3FBattleText2, SilphGauntlet3FEndBattleText2, SilphGauntlet3FAfterBattleText2
SilphGauntlet3FTrainerHeader2:
trainer EVENT_BEAT_GAUNTLET_GENTLEMAN, 2, SilphGauntlet3FBattleText3, SilphGauntlet3FEndBattleText3, SilphGauntlet3FAfterBattleText3
SilphGauntlet3FTrainerHeader3:
trainer EVENT_BEAT_GAUNTLET_ENGINEER, 1, SilphGauntlet3FBattleText4, SilphGauntlet3FEndBattleText4, SilphGauntlet3FAfterBattleText4
SilphGauntlet3FTrainerHeader4:
trainer EVENT_BEAT_GAUNTLET_ROCKER, 1, SilphGauntlet3FBattleText5, SilphGauntlet3FEndBattleText5, SilphGauntlet3FAfterBattleText5
SilphGauntlet3FTrainerHeader5:
trainer EVENT_BEAT_GAUNTLET_FISHER, 2, SilphGauntlet3FBattleText6, SilphGauntlet3FEndBattleText6, SilphGauntlet3FAfterBattleText6
SilphGauntlet3FTrainerHeader6:
trainer EVENT_BEAT_GAUNTLET_BEAUTY, 3, SilphGauntlet3FBattleText7, SilphGauntlet3FEndBattleText7, SilphGauntlet3FAfterBattleText7
db -1 ; end
SilphGauntlet3FText1:
text_asm
ld hl, SilphGauntlet3FTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet3FBattleText1:
text_far _SilphGauntlet3FBattleText1
text_end
SilphGauntlet3FEndBattleText1:
text_far _SilphGauntlet3FEndBattleText1
text_end
SilphGauntlet3FAfterBattleText1:
text_far _SilphGauntlet3FAfterBattleText1
text_end
SilphGauntlet3FText2:
text_asm
ld hl, SilphGauntlet3FTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet3FBattleText2:
text_far _SilphGauntlet3FBattleText2
text_end
SilphGauntlet3FEndBattleText2:
text_far _SilphGauntlet3FEndBattleText2
text_end
SilphGauntlet3FAfterBattleText2:
text_far _SilphGauntlet3FAfterBattleText2
text_end
SilphGauntlet3FText3:
text_asm
ld hl, SilphGauntlet3FTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet3FBattleText3:
text_far _SilphGauntlet3FBattleText3
text_end
SilphGauntlet3FEndBattleText3:
text_far _SilphGauntlet3FEndBattleText3
text_end
SilphGauntlet3FAfterBattleText3:
text_far _SilphGauntlet3FAfterBattleText3
text_end
SilphGauntlet3FText4:
text_asm
ld hl, SilphGauntlet3FTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet3FBattleText4:
text_far _SilphGauntlet3FBattleText4
text_end
SilphGauntlet3FEndBattleText4:
text_far _SilphGauntlet3FEndBattleText4
text_end
SilphGauntlet3FAfterBattleText4:
text_far _SilphGauntlet3FAfterBattleText4
text_end
SilphGauntlet3FText5:
text_asm
ld hl, SilphGauntlet3FTrainerHeader4
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet3FBattleText5:
text_far _SilphGauntlet3FBattleText5
text_end
SilphGauntlet3FEndBattleText5:
text_far _SilphGauntlet3FEndBattleText5
text_end
SilphGauntlet3FAfterBattleText5:
text_far _SilphGauntlet3FAfterBattleText5
text_end
SilphGauntlet3FText6:
text_asm
ld hl, SilphGauntlet3FTrainerHeader5
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet3FBattleText6:
text_far _SilphGauntlet3FBattleText6
text_end
SilphGauntlet3FEndBattleText6:
text_far _SilphGauntlet3FEndBattleText6
text_end
SilphGauntlet3FAfterBattleText6:
text_far _SilphGauntlet3FAfterBattleText6
text_end
SilphGauntlet3FText7:
text_asm
ld hl, SilphGauntlet3FTrainerHeader6
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet3FBattleText7:
text_far _SilphGauntlet3FBattleText7
text_end
SilphGauntlet3FEndBattleText7:
text_far _SilphGauntlet3FEndBattleText7
text_end
SilphGauntlet3FAfterBattleText7:
text_far _SilphGauntlet3FAfterBattleText7
text_end
text_end

View file

@ -58,7 +58,7 @@ SilphGauntlet4F_TextPointers:
dw PurifiedZoneText
SilphGauntlet4FTrainerHeaders:
def_trainers 7
def_trainers 4
SilphGauntlet4FTrainerHeader0:
trainer EVENT_BEAT_GAUNTLET_SCIENTIST, 1, SilphGauntlet4FBattleText1, SilphGauntlet4FEndBattleText1, SilphGauntlet4FAfterBattleText1
SilphGauntlet4FTrainerHeader1:

View file

@ -1,6 +1,168 @@
SilphGauntlet5F_Script:
jp EnableAutoTextBoxDrawing
call EnableAutoTextBoxDrawing
ld hl, SilphGauntlet5FTrainerHeaders
ld de, SilphGauntlet5F_ScriptPointers
ld a, [wSilphGauntlet5FCurScript]
call ExecuteCurMapScriptInTable
ld [wSilphGauntlet5FCurScript], a
ret
SilphGauntlet5F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
SilphGauntlet5F_TextPointers:
dw SilphGauntlet5FText1
dw SilphGauntlet5FText2
dw SilphGauntlet5FText3
dw SilphGauntlet5FText4
dw SilphGauntlet5FText5
dw SilphGauntlet5FText6
dw SilphGauntlet5FText7
SilphGauntlet5FTrainerHeaders:
def_trainers 2
SilphGauntlet5FTrainerHeader0:
trainer EVENT_BEAT_GAUNTLET_JUGGLER, 3, SilphGauntlet5FBattleText1, SilphGauntlet5FEndBattleText1, SilphGauntlet5FAfterBattleText1
SilphGauntlet5FTrainerHeader1:
trainer EVENT_BEAT_GAUNTLET_BIKER, 2, SilphGauntlet5FBattleText2, SilphGauntlet5FEndBattleText2, SilphGauntlet5FAfterBattleText2
SilphGauntlet5FTrainerHeader2:
trainer EVENT_BEAT_GAUNTLET_CUE_BALL, 1, SilphGauntlet5FBattleText3, SilphGauntlet5FEndBattleText3, SilphGauntlet5FAfterBattleText3
SilphGauntlet5FTrainerHeader3:
trainer EVENT_BEAT_GAUNTLET_SWIMMER, 3, SilphGauntlet5FBattleText4, SilphGauntlet5FEndBattleText4, SilphGauntlet5FAfterBattleText4
SilphGauntlet5FTrainerHeader4:
trainer EVENT_BEAT_GAUNTLET_TAMER, 3, SilphGauntlet5FBattleText5, SilphGauntlet5FEndBattleText5, SilphGauntlet5FAfterBattleText5
SilphGauntlet5FTrainerHeader5:
trainer EVENT_BEAT_GAUNTLET_COOLTRAINER_F, 3, SilphGauntlet5FBattleText6, SilphGauntlet5FEndBattleText6, SilphGauntlet5FAfterBattleText6
SilphGauntlet5FTrainerHeader6:
trainer EVENT_BEAT_GAUNTLET_COOLTRAINER_M, 3, SilphGauntlet5FBattleText7, SilphGauntlet5FEndBattleText7, SilphGauntlet5FAfterBattleText7
db -1 ; end
SilphGauntlet5FText1:
text_asm
ld hl, SilphGauntlet5FTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet5FBattleText1:
text_far _SilphGauntlet5FBattleText1
text_end
SilphGauntlet5FEndBattleText1:
text_far _SilphGauntlet5FEndBattleText1
text_end
SilphGauntlet5FAfterBattleText1:
text_far _SilphGauntlet5FAfterBattleText1
text_end
SilphGauntlet5FText2:
text_asm
ld hl, SilphGauntlet5FTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet5FBattleText2:
text_far _SilphGauntlet5FBattleText2
text_end
SilphGauntlet5FEndBattleText2:
text_far _SilphGauntlet5FEndBattleText2
text_end
SilphGauntlet5FAfterBattleText2:
text_far _SilphGauntlet5FAfterBattleText2
text_end
SilphGauntlet5FText3:
text_asm
ld hl, SilphGauntlet5FTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet5FBattleText3:
text_far _SilphGauntlet5FBattleText3
text_end
SilphGauntlet5FEndBattleText3:
text_far _SilphGauntlet5FEndBattleText3
text_end
SilphGauntlet5FAfterBattleText3:
text_far _SilphGauntlet5FAfterBattleText3
text_end
SilphGauntlet5FText4:
text_asm
ld hl, SilphGauntlet5FTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet5FBattleText4:
text_far _SilphGauntlet5FBattleText4
text_end
SilphGauntlet5FEndBattleText4:
text_far _SilphGauntlet5FEndBattleText4
text_end
SilphGauntlet5FAfterBattleText4:
text_far _SilphGauntlet5FAfterBattleText4
text_end
SilphGauntlet5FText5:
text_asm
ld hl, SilphGauntlet5FTrainerHeader4
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet5FBattleText5:
text_far _SilphGauntlet5FBattleText5
text_end
SilphGauntlet5FEndBattleText5:
text_far _SilphGauntlet5FEndBattleText5
text_end
SilphGauntlet5FAfterBattleText5:
text_far _SilphGauntlet5FAfterBattleText5
text_end
SilphGauntlet5FText6:
text_asm
ld hl, SilphGauntlet5FTrainerHeader5
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet5FBattleText6:
text_far _SilphGauntlet5FBattleText6
text_end
SilphGauntlet5FEndBattleText6:
text_far _SilphGauntlet5FEndBattleText6
text_end
SilphGauntlet5FAfterBattleText6:
text_far _SilphGauntlet5FAfterBattleText6
text_end
SilphGauntlet5FText7:
text_asm
ld hl, SilphGauntlet5FTrainerHeader6
call TalkToTrainer
jp TextScriptEnd
SilphGauntlet5FBattleText7:
text_far _SilphGauntlet5FBattleText7
text_end
SilphGauntlet5FEndBattleText7:
text_far _SilphGauntlet5FEndBattleText7
text_end
SilphGauntlet5FAfterBattleText7:
text_far _SilphGauntlet5FAfterBattleText7
text_end
text_end

View file

@ -285,7 +285,10 @@ INCLUDE "text/tradeback_move_tutor.asm"
INCLUDE "text/CelesteHill.asm"
INCLUDE "text/BrunswickTrail.asm"
INCLUDE "text/SilphGauntlet1F.asm"
INCLUDE "text/SilphGauntlet2F.asm"
INCLUDE "text/SilphGauntlet3F.asm"
INCLUDE "text/SilphGauntlet4F.asm"
INCLUDE "text/SilphGauntlet5F.asm"
INCLUDE "text/SilphGauntlet7F.asm"
INCLUDE "text/CitrinePokecenter.asm"
INCLUDE "text/CitrineMart.asm"

View file

@ -42,18 +42,21 @@ _SilphGauntlet1FAfterBattleText2::
done
_SilphGauntlet1FBattleText3::
text "Go, CLEFABLE!"
line "Let's win this!"
text "Comment to be"
line "written."
cont "STUDENT"
done
_SilphGauntlet1FEndBattleText3::
text "Aww..."
line "Not enough!"
text "Comment to be"
line "written."
cont "STUDENT"
prompt
_SilphGauntlet1FAfterBattleText3::
text "You still fought"
line "well, CLEFABLE!"
text "Comment to be"
line "written."
cont "STUDENT"
done
_SilphGauntlet1FBattleText4::
@ -102,10 +105,8 @@ _SilphGauntlet1FEndBattleText6::
prompt
_SilphGauntlet1FAfterBattleText6::
text "Huh? AERODACTYL"
line "isn't a bird?"
para "It has wings, it's"
line "good enough!"
text "Comment to be"
line "written."
cont "BIRD KEEPER"
done

115
text/SilphGauntlet2F.asm Normal file
View file

@ -0,0 +1,115 @@
_SilphGauntlet2FBattleText1::
text "Comment to be"
line "written."
cont "LASS"
done
_SilphGauntlet2FEndBattleText1::
text "Comment to be"
line "written."
cont "LASS"
prompt
_SilphGauntlet2FAfterBattleText1::
text "Comment to be"
line "written."
cont "LASS"
done
_SilphGauntlet2FBattleText2::
text "Comment to be"
line "written."
cont "JUNIOR"
done
_SilphGauntlet2FEndBattleText2::
text "Comment to be"
line "written."
cont "JUNIOR"
prompt
_SilphGauntlet2FAfterBattleText2::
text "Comment to be"
line "written."
cont "JUNIOR"
done
_SilphGauntlet2FBattleText3::
text "Comment to be"
line "written."
cont "HIKER"
done
_SilphGauntlet2FEndBattleText3::
text "Comment to be"
line "written."
cont "HIKER"
prompt
_SilphGauntlet2FAfterBattleText3::
text "Comment to be"
line "written."
cont "HIKER"
done
_SilphGauntlet2FBattleText4::
text "Comment to be"
line "written."
cont "SUPER NERD"
done
_SilphGauntlet2FEndBattleText4::
text "Comment to be"
line "written."
cont "SUPER NERD"
prompt
_SilphGauntlet2FAfterBattleText4::
text "Comment to be"
line "written."
cont "SUPER NERD"
done
_SilphGauntlet2FBattleText5::
text "Comment to be"
line "written."
cont "#MANIAC"
done
_SilphGauntlet2FEndBattleText5::
text "Comment to be"
line "written."
cont "#MANIAC"
prompt
_SilphGauntlet2FAfterBattleText5::
text "Comment to be"
line "written."
cont "#MANIAC"
done
_SilphGauntlet2FBattleText6::
text "I'm here training"
line "become the next"
cont "KARATE MASTER..."
para "Battle with me so"
line "I may hone my"
cont "skills!"
done
_SilphGauntlet2FEndBattleText6::
text "I"
line "still have a long"
cont "way to go..."
prompt
_SilphGauntlet2FAfterBattleText6::
text "You are truly"
line "powerful."
para "Keep battling,"
cont "and you will"
cont "surely succeed."
done

126
text/SilphGauntlet3F.asm Normal file
View file

@ -0,0 +1,126 @@
_SilphGauntlet3FBattleText1::
text "Comment to be"
line "written."
cont "SAILOR"
done
_SilphGauntlet3FEndBattleText1::
text "Comment to be"
line "written."
cont "SAILOR"
prompt
_SilphGauntlet3FAfterBattleText1::
text "Comment to be"
line "written."
cont "SAILOR"
done
_SilphGauntlet3FBattleText2::
text "Comment to be"
line "written."
cont "FIREFIGHTER"
done
_SilphGauntlet3FEndBattleText2::
text "Comment to be"
line "written."
cont "FIREFIGHTER"
prompt
_SilphGauntlet3FAfterBattleText2::
text "Comment to be"
line "written."
cont "FIREFIGHTER"
done
_SilphGauntlet3FBattleText3::
text "Comment to be"
line "written."
cont "GENTLEMAN"
done
_SilphGauntlet3FEndBattleText3::
text "Comment to be"
line "written."
cont "GENTLEMAN"
prompt
_SilphGauntlet3FAfterBattleText3::
text "Comment to be"
line "written."
cont "GENTLEMAN"
done
_SilphGauntlet3FBattleText4::
text "Comment to be"
line "written."
cont "ENGINEER"
done
_SilphGauntlet3FEndBattleText4::
text "Comment to be"
line "written."
cont "ENGINEER"
prompt
_SilphGauntlet3FAfterBattleText4::
text "Comment to be"
line "written."
cont "ENGINEER"
done
_SilphGauntlet3FBattleText5::
text "Comment to be"
line "written."
cont "ROCKER"
done
_SilphGauntlet3FEndBattleText5::
text "Comment to be"
line "written."
cont "ROCKER"
prompt
_SilphGauntlet3FAfterBattleText5::
text "Comment to be"
line "written."
cont "ROCKER"
done
_SilphGauntlet3FBattleText6::
text "Comment to be"
line "written."
cont "FISHER"
done
_SilphGauntlet3FEndBattleText6::
text "Comment to be"
line "written."
cont "FISHER"
prompt
_SilphGauntlet3FAfterBattleText6::
text "Comment to be"
line "written."
cont "FISHER"
done
_SilphGauntlet3FBattleText7::
text "Comment to be"
line "written."
cont "BEAUTY"
done
_SilphGauntlet3FEndBattleText7::
text "Comment to be"
line "written."
cont "BEAUTY"
prompt
_SilphGauntlet3FAfterBattleText7::
text "Comment to be"
line "written."
cont "BEAUTY"
done

126
text/SilphGauntlet5F.asm Normal file
View file

@ -0,0 +1,126 @@
_SilphGauntlet5FBattleText1::
text "Comment to be"
line "written."
cont "JUGGLER"
done
_SilphGauntlet5FEndBattleText1::
text "Comment to be"
line "written."
cont "JUGGLER"
prompt
_SilphGauntlet5FAfterBattleText1::
text "Comment to be"
line "written."
cont "JUGGLER"
done
_SilphGauntlet5FBattleText2::
text "Comment to be"
line "written."
cont "BIKER"
done
_SilphGauntlet5FEndBattleText2::
text "Comment to be"
line "written."
cont "BIKER"
prompt
_SilphGauntlet5FAfterBattleText2::
text "Comment to be"
line "written."
cont "BIKER"
done
_SilphGauntlet5FBattleText3::
text "Comment to be"
line "written."
cont "CUE BALL"
done
_SilphGauntlet5FEndBattleText3::
text "Comment to be"
line "written."
cont "CUE BALL"
prompt
_SilphGauntlet5FAfterBattleText3::
text "Comment to be"
line "written."
cont "CUE BALL"
done
_SilphGauntlet5FBattleText4::
text "Comment to be"
line "written."
cont "SWIMMER"
done
_SilphGauntlet5FEndBattleText4::
text "Comment to be"
line "written."
cont "SWIMMER"
prompt
_SilphGauntlet5FAfterBattleText4::
text "Comment to be"
line "written."
cont "SWIMMER"
done
_SilphGauntlet5FBattleText5::
text "Comment to be"
line "written."
cont "TAMER"
done
_SilphGauntlet5FEndBattleText5::
text "Comment to be"
line "written."
cont "TAMER"
prompt
_SilphGauntlet5FAfterBattleText5::
text "Comment to be"
line "written."
cont "TAMER"
done
_SilphGauntlet5FBattleText6::
text "Comment to be"
line "written."
cont "COOLTRAINER F"
done
_SilphGauntlet5FEndBattleText6::
text "Comment to be"
line "written."
cont "COOLTRAINER F"
prompt
_SilphGauntlet5FAfterBattleText6::
text "Comment to be"
line "written."
cont "COOLTRAINER F"
done
_SilphGauntlet5FBattleText7::
text "Comment to be"
line "written."
cont "COOLTRAINER M"
done
_SilphGauntlet5FEndBattleText7::
text "Comment to be"
line "written."
cont "COOLTRAINER M"
prompt
_SilphGauntlet5FAfterBattleText7::
text "Comment to be"
line "written."
cont "COOLTRAINER M"
done