mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-17 02:40:50 +12:00
508a4e790e
Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you. - Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them - Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy. - Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later. - Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8. - Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively - Restructured the Pokedex a little. Don't worry, Lickitung's still number 108! - All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones - Removed Blastyke as a Game Corner prize, replacing it with Squeamata. - Garnet Cavern is now properly listed as a dungeon map - Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden - Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent - Finished Gauntlet 6F except for the trainer text (PvK please help) - Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage. - Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit - Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke. - New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone! - Fixed a bug preventing the trade for Haunter from being accessed.
168 lines
4.2 KiB
NASM
168 lines
4.2 KiB
NASM
SilphGauntlet5F_Script:
|
|
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
|
|
SilphGauntlet5FTrainerHeader0:
|
|
trainer EVENT_BEAT_GAUNTLET_JUGGLER, 3, SilphGauntlet5FBattleText1, SilphGauntlet5FEndBattleText1, SilphGauntlet5FAfterBattleText1
|
|
SilphGauntlet5FTrainerHeader1:
|
|
trainer EVENT_BEAT_GAUNTLET_PSYCHIC, 1, SilphGauntlet5FBattleText2, SilphGauntlet5FEndBattleText2, SilphGauntlet5FAfterBattleText2
|
|
SilphGauntlet5FTrainerHeader2:
|
|
trainer EVENT_BEAT_GAUNTLET_CUE_BALL, 2, SilphGauntlet5FBattleText3, SilphGauntlet5FEndBattleText3, SilphGauntlet5FAfterBattleText3
|
|
SilphGauntlet5FTrainerHeader3:
|
|
trainer EVENT_BEAT_GAUNTLET_SWIMMER, 2, SilphGauntlet5FBattleText4, SilphGauntlet5FEndBattleText4, SilphGauntlet5FAfterBattleText4
|
|
SilphGauntlet5FTrainerHeader4:
|
|
trainer EVENT_BEAT_GAUNTLET_TAMER, 2, SilphGauntlet5FBattleText5, SilphGauntlet5FEndBattleText5, SilphGauntlet5FAfterBattleText5
|
|
SilphGauntlet5FTrainerHeader5:
|
|
trainer EVENT_BEAT_GAUNTLET_COOLTRAINER_F, 2, SilphGauntlet5FBattleText6, SilphGauntlet5FEndBattleText6, SilphGauntlet5FAfterBattleText6
|
|
SilphGauntlet5FTrainerHeader6:
|
|
trainer EVENT_BEAT_GAUNTLET_COOLTRAINER_M, 2, 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 |