thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Silph Gauntlet 1F trainers!

Browse source 
Currently working fine except the trainers can't see you, which I'll try fixing soon
This commit is contained in:
MementoMartha 2023-04-25 03:15:43 +01:00
parent 6a693a931b
commit 0b334abbf3
7 changed files with 315 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
constants/event_constants.asm
View file

@ -779,6 +779,55 @@ 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

6
data/maps/objects/SilphGauntlet1F.asm
View file

@ -8,5 +8,11 @@ SilphGauntlet1F_Object:
def_bg_events
def_object_events
object_event 3, 3, SPRITE_YOUNGSTER, STAY, UP, 1, OPP_YOUNGSTER, 13
object_event 3, 14, SPRITE_YOUNGSTER, STAY, LEFT, 2, OPP_BUG_CATCHER, 12
object_event 16, 14, SPRITE_GIRL, STAY, DOWN, 3, OPP_STUDENT, 3
object_event 16, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, 4, OPP_JR_TRAINER_M, 6
object_event 5, 7, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 25
object_event 5, 12, SPRITE_COOLTRAINER_M, STAY, DOWN, 6, OPP_BIRD_KEEPER, 13
def_warps_to SILPH_GAUNTLET_1F

10
data/trainers/parties.asm
View file

@ -165,7 +165,7 @@ JrTrainerMData:
db 20, SQUIRTLE, 0
db 16, SPEAROW, RATICATE, 0
; Unused - this will be used in the Silph Gauntlet
db 63, DUGTRIO, PRIMEAPE, SANDSLASH, BLASTOISE, NIDOKING, ARCANINE, 0
db 62, DUGTRIO, PRIMEAPE, SANDSLASH, BLASTOISE, NIDOKING, ARCANINE, 0
; Route 9
db 21, GROWLITHE, CHARMANDER, 0
db 19, RATTATA, DIGLETT, EKANS, SANDSHREW, 0
@ -210,7 +210,7 @@ JrTrainerFData:
; Route 20
db 30, TENTACOOL, HORSEA, SEEL, 0
; New - this will be used in the Silph Gauntlet
; db 63, TSUBOMITTO, SEAKING, MADAAMU, BELLOSSOM, GOROCHU, VENUSAUR, 0
db 62, TSUBOMITTO, SEAKING, MADAAMU, BELLOSSOM, GOROCHU, VENUSAUR, 0
PokemaniacData:
; Route 10
@ -480,7 +480,8 @@ BirdKeeperData:
db 30, FEAROW, FEAROW, PIDGEOTTO, 0
; Unused
db 39, PIDGEOTTO, PIDGEOTTO, PIDGEY, PIDGEOTTO, 0
db 42, FARFETCHD, FEAROW, 0
; Unused - this will be used in the Silph Gauntlet
db 62, FEAROW, GOLDUCK, DODRIO, PORYGON2, MADAAMU, AERODACTYL, 0
; Route 14
db 28, PIDGEY, DODUO, PIDGEOTTO, 0
db 26, PIDGEY, SPEAROW, PIDGEY, FEAROW, 0
@ -666,8 +667,11 @@ ChannelerData:
db 33, JYNX, EXEGGCUTE, KADABRA, 0
StudentData:
; Viridian Pre-Gym
db 6, PIDGEY, RATTATA, 0
db 6, CLEFAIRY, 0
; Silph Gauntlet
db 62, CLEFABLE, PENDRAKEN, WIGGLYTUFF, BARUNDA, BELLOSSOM, SLOWKING, 0 ; may revise
FirefighterData:
; For Cerulean Gym

2
ram/wram.asm
View file

@ -2071,7 +2071,7 @@ wFarawayIslandInsideCurScript:: db
wLancesRoomCurScript:: db
wPokemonMansionB2FCurScript:: db
wMtMoonCraterCurScript:: db
ds 2
wSilphGauntlet1FCurScript:: db
wSilphCo10FCurScript:: db
wSilphCo11FCurScript:: db
ds 1

141
scripts/SilphGauntlet1F.asm
View file

@ -1,6 +1,145 @@
SilphGauntlet1F_Script:
jp EnableAutoTextBoxDrawing
call EnableAutoTextBoxDrawing
ld hl, SilphGauntlet1FTrainerHeaders
ld de, SilphGauntlet1F_ScriptPointers
ld a, [wSilphGauntlet1FCurScript]
call ExecuteCurMapScriptInTable
ld [wSilphGauntlet1FCurScript], a
ret
SilphGauntlet1F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
SilphGauntlet1F_TextPointers:
dw SilphGauntlet1FText1
dw SilphGauntlet1FText2
dw SilphGauntlet1FText3
dw SilphGauntlet1FText4
dw SilphGauntlet1FText5
dw SilphGauntlet1FText6
SilphGauntlet1FTrainerHeaders:
def_trainers 6
SilphGauntlet1FTrainerHeader0:
trainer EVENT_BEAT_GAUNTLET_YOUNGSTER, 3, SilphGauntlet1FBattleText1, SilphGauntlet1FEndBattleText1, SilphGauntlet1FAfterBattleText1
SilphGauntlet1FTrainerHeader1:
trainer EVENT_BEAT_GAUNTLET_BUG_CATCHER, 2, SilphGauntlet1FBattleText2, SilphGauntlet1FEndBattleText2, SilphGauntlet1FAfterBattleText2
SilphGauntlet1FTrainerHeader2:
trainer EVENT_BEAT_GAUNTLET_STUDENT, 4, SilphGauntlet1FBattleText3, SilphGauntlet1FEndBattleText3, SilphGauntlet1FAfterBattleText3
SilphGauntlet1FTrainerHeader3:
trainer EVENT_BEAT_GAUNTLET_JR_TRAINER_M, 2, SilphGauntlet1FBattleText4, SilphGauntlet1FEndBattleText4, SilphGauntlet1FAfterBattleText4
SilphGauntlet1FTrainerHeader4:
trainer EVENT_BEAT_GAUNTLET_JR_TRAINER_F, 2, SilphGauntlet1FBattleText5, SilphGauntlet1FEndBattleText5, SilphGauntlet1FAfterBattleText5
SilphGauntlet1FTrainerHeader5:
trainer EVENT_BEAT_GAUNTLET_BIRD_KEEPER, 3, 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
SilphGauntlet1FBattleText1:
text_far _SilphGauntlet1FBattleText1
text_end
SilphGauntlet1FEndBattleText1:
text_far _SilphGauntlet1FEndBattleText1
text_end
SilphGauntlet1FAfterBattleText1:
text_far _SilphGauntlet1FAfterBattleText1
text_end
SilphGauntlet1FBattleText2:
text_far _SilphGauntlet1FBattleText2
text_end
SilphGauntlet1FEndBattleText2:
text_far _SilphGauntlet1FEndBattleText2
text_end
SilphGauntlet1FAfterBattleText2:
text_far _SilphGauntlet1FAfterBattleText2
text_end
SilphGauntlet1FBattleText3:
text_far _SilphGauntlet1FBattleText3
text_end
SilphGauntlet1FEndBattleText3:
text_far _SilphGauntlet1FEndBattleText3
text_end
SilphGauntlet1FAfterBattleText3:
text_far _SilphGauntlet1FAfterBattleText3
text_end
SilphGauntlet1FBattleText4:
text_far _SilphGauntlet1FBattleText4
text_end
SilphGauntlet1FEndBattleText4:
text_far _SilphGauntlet1FEndBattleText4
text_end
SilphGauntlet1FAfterBattleText4:
text_far _SilphGauntlet1FAfterBattleText4
text_end
SilphGauntlet1FBattleText5:
text_far _SilphGauntlet1FBattleText5
text_end
SilphGauntlet1FEndBattleText5:
text_far _SilphGauntlet1FEndBattleText5
text_end
SilphGauntlet1FAfterBattleText5:
text_far _SilphGauntlet1FAfterBattleText5
text_end
SilphGauntlet1FBattleText6:
text_far _SilphGauntlet1FBattleText6
text_end
SilphGauntlet1FEndBattleText6:
text_far _SilphGauntlet1FEndBattleText6
text_end
SilphGauntlet1FAfterBattleText6:
text_far _SilphGauntlet1FAfterBattleText6
text_end
text_end

1
text.asm
View file

@ -284,6 +284,7 @@ INCLUDE "text/CitrineRocketHouse.asm"
INCLUDE "text/CitrineTradebackHouse.asm"
INCLUDE "text/tradeback_move_tutor.asm"
INCLUDE "text/BrunswickTrail.asm"
INCLUDE "text/SilphGauntlet1F.asm"
INCLUDE "text/SilphGauntlet7F.asm"
SECTION "Pokédex Text", ROMX

111
text/SilphGauntlet1F.asm Normal file
View file

@ -0,0 +1,111 @@
_SilphGauntlet1FBattleText1::
text "Hey! Welcome to"
line "SILPH GAUNTLET!"
para "This whole place"
line "is full of really"
cont "strong trainers,"
cont "so let's see how"
cont "strong you are!"
done
_SilphGauntlet1FEndBattleText1::
text "Whoa!"
line "Pretty good!"
prompt
_SilphGauntlet1FAfterBattleText1::
text "I'm still only the"
line "first trainer!"
cont "It gets tougher"
cont "from here!"
done
_SilphGauntlet1FBattleText2::
text "This indoor forest"
line "is so cool!"
para "Don't you think it"
line "looks just like"
cont "VIRIDIAN FOREST?"
done
_SilphGauntlet1FEndBattleText2::
text "No!"
line "My bugs!"
prompt
_SilphGauntlet1FAfterBattleText2::
text "I wonder what the"
line "upper floors look"
cont "like..."
done
_SilphGauntlet1FBattleText3::
text "Go, CLEFABLE!"
line "Let's win this!"
done
_SilphGauntlet1FEndBattleText3::
text "Aww..."
line "Not enough!"
prompt
_SilphGauntlet1FAfterBattleText3::
text "You still fought"
line "well, CLEFABLE!"
done
_SilphGauntlet1FBattleText4::
text "Camping here is"
line "fun, but I prefer"
cont "the outdoors..."
done
_SilphGauntlet1FEndBattleText4::
text "What?"
line "How'd I lose?"
prompt
_SilphGauntlet1FAfterBattleText4::
text "I would've won if"
line "we were outside!"
done
_SilphGauntlet1FBattleText5::
text "I wish forests"
line "didn't have so"
cont "many gross bugs!"
done
_SilphGauntlet1FEndBattleText5::
text "Eek!"
line "No way!"
prompt
_SilphGauntlet1FAfterBattleText5::
text "TSUBOMITTO loves"
line "eating bugs, so"
cont "it's perfect"
cont "for me!"
done
_SilphGauntlet1FBattleText6::
text "My bird #MON"
line "love perching on"
cont "the trees here."
done
_SilphGauntlet1FEndBattleText6::
text "We"
line "still lost?"
prompt
_SilphGauntlet1FAfterBattleText6::
text "Huh? AERODACTYL"
line "isn't a bird?"
para "It has wings, it's"
line "good enough!"
done