thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-29 13:43:17 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Viridian Pre-Gym Trainers now see Red

Browse source 
I don't know why this was the fix, but it was. `const_skip` seems to mess with the trainer sight mechanics.
This commit is contained in:
Llinos Evans 2023-04-17 11:19:17 +01:00
parent 8d5a424f3d
commit 9f47eea04c
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/event_constants.asm
View file

@ -26,9 +26,9 @@
const EVENT_VIRIDIAN_GYM_OPEN const EVENT_VIRIDIAN_GYM_OPEN
const EVENT_GOT_TM42 const EVENT_GOT_TM42
const EVENT_BEAT_YUJIROU const EVENT_BEAT_YUJIROU
const_skip 11
const EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0 const EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0
const EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1 const EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1
const_skip 11
const EVENT_OAK_GOT_PARCEL const EVENT_OAK_GOT_PARCEL
const EVENT_GOT_OAKS_PARCEL const EVENT_GOT_OAKS_PARCEL
const_skip 22 const_skip 22

2
ram/wram.asm
View file

@ -2040,7 +2040,7 @@ wBrunosRoomCurScript:: db
wAgathasRoomCurScript:: db wAgathasRoomCurScript:: db
wCeruleanCaveB1FCurScript:: db wCeruleanCaveB1FCurScript:: db
wVictoryRoad1FCurScript:: db wVictoryRoad1FCurScript:: db
wFarawayIslandInsideCurScript:: db ; this should work wFarawayIslandInsideCurScript:: db
wLancesRoomCurScript:: db wLancesRoomCurScript:: db
wPokemonMansionB2FCurScript:: db wPokemonMansionB2FCurScript:: db
wMtMoonCraterCurScript:: db wMtMoonCraterCurScript:: db

10
scripts/ViridianPreGym.asm
View file

@ -6,7 +6,7 @@ ViridianPreGym_Script:
call ExecuteCurMapScriptInTable call ExecuteCurMapScriptInTable
ld [wViridianPreGymCurScript], a ld [wViridianPreGymCurScript], a
ret ret
ViridianPreGymResetScripts: ViridianPreGymResetScripts:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
@ -28,7 +28,7 @@ ViridianGymYujirouPostBattle:
ld [wJoyIgnore], a ld [wJoyIgnore], a
YujirouHasBeenBeaten: YujirouHasBeenBeaten:
SetEvent EVENT_BEAT_YUJIROU SetEvent EVENT_BEAT_YUJIROU, EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1
jp ViridianPreGymResetScripts jp ViridianPreGymResetScripts
ViridianPreGym_TextPointers: ViridianPreGym_TextPointers:
@ -46,11 +46,11 @@ ViridianPreGym_TextPointers:
dw ViridianPreGymStatue2 dw ViridianPreGymStatue2
ViridianPreGymTrainerHeaders: ViridianPreGymTrainerHeaders:
def_trainers 6 def_trainers 3
ViridianPreGymTrainerHeader0: ViridianPreGymTrainerHeader0:
trainer EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0, 1, ViridianPreGymBattleText1, ViridianPreGymEndBattleText1, ViridianPreGymAfterBattleText1 trainer EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0, 3, ViridianPreGymBattleText1, ViridianPreGymEndBattleText1, ViridianPreGymAfterBattleText1
ViridianPreGymTrainerHeader1: ViridianPreGymTrainerHeader1:
trainer EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1, 2, ViridianPreGymBattleText2, ViridianPreGymEndBattleText2, ViridianPreGymAfterBattleText2 trainer EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1, 3, ViridianPreGymBattleText2, ViridianPreGymEndBattleText2, ViridianPreGymAfterBattleText2
db -1 ;end db -1 ;end
YujirouText: YujirouText: