mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-16 18:30: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.7 KiB
NASM
147 lines
3.7 KiB
NASM
SilphGauntlet3F_Script:
|
|
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
|
|
|
|
SilphGauntlet3FTrainerHeaders:
|
|
def_trainers
|
|
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
|
|
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
|
|
|
|
text_end |