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.
147 lines
3.6 KiB
NASM
147 lines
3.6 KiB
NASM
SilphGauntlet2F_Script:
|
|
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
|
|
SilphGauntlet2FTrainerHeader0:
|
|
trainer EVENT_BEAT_GAUNTLET_LASS, 2, SilphGauntlet2FBattleText1, SilphGauntlet2FEndBattleText1, SilphGauntlet2FAfterBattleText1
|
|
SilphGauntlet2FTrainerHeader1:
|
|
trainer EVENT_BEAT_GAUNTLET_HIKER, 1, SilphGauntlet2FBattleText2, SilphGauntlet2FEndBattleText2, SilphGauntlet2FAfterBattleText2
|
|
SilphGauntlet2FTrainerHeader2:
|
|
trainer EVENT_BEAT_GAUNTLET_SUPER_NERD, 1, SilphGauntlet2FBattleText3, SilphGauntlet2FEndBattleText3, SilphGauntlet2FAfterBattleText3
|
|
SilphGauntlet2FTrainerHeader3:
|
|
trainer EVENT_BEAT_GAUNTLET_POKEMANIAC, 1, SilphGauntlet2FBattleText4, SilphGauntlet2FEndBattleText4, SilphGauntlet2FAfterBattleText4
|
|
SilphGauntlet2FTrainerHeader4:
|
|
trainer EVENT_BEAT_GAUNTLET_BEAUTY, 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 |