mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-20 22:28:41 +13:00
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
parent
ffd03c1b06
commit
91e06763dd
19 changed files with 936 additions and 71 deletions
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
Loading…
Add table
Add a link
Reference in a new issue