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

wug

Browse source 
Replaces the nonsensical Crocky static with a more fitting Wugtrio encounter. Currently (hilariously) makes the Champion theme play in the battle, working on a fix later
This commit is contained in:
MementoMartha 2023-04-05 23:20:22 +01:00
parent 3e6e9ea240
commit c9833e5d91
6 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/event_constants.asm
View file

@ -585,7 +585,7 @@
; New static encounter events ; New static encounter events
const_next $620 const_next $620
const_skip const_skip
const EVENT_BEAT_CROCKY const EVENT_BEAT_WUGTRIO
const_skip 7 const_skip 7
const EVENT_BEAT_MEW const EVENT_BEAT_MEW
const_skip 7 const_skip 7

2
constants/hide_show_constants.asm
View file

@ -237,7 +237,7 @@ DEF SHOW EQU $15
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; E1 const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; E1
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; E2 const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; E2
const HS_ARTICUNO ; E3 const HS_ARTICUNO ; E3
const HS_CROCKY ; E4 const HS_WUGTRIO ; E4
const HS_MEW ; E5 const HS_MEW ; E5
const HS_MOLTRES ; E6 const HS_MOLTRES ; E6
; const HS_OMEGA ; E7 X ; const HS_OMEGA ; E7 X

3
data/maps/objects/DiglettsCave.asm
View file

@ -6,9 +6,8 @@ DiglettsCave_Object:
warp_event 37, 31, DIGLETTS_CAVE_ROUTE_11, 3 warp_event 37, 31, DIGLETTS_CAVE_ROUTE_11, 3
def_bg_events def_bg_events
bg_event 17, 25, 2 ; DiglettsCaveText1
def_object_events def_object_events
object_event 29, 12, SPRITE_MONSTER, STAY, DOWN, 1, CROCKY, 28 | OW_POKEMON object_event 29, 12, SPRITE_BOULDER, STAY, DOWN, 1, WUGTRIO, 28 | OW_POKEMON
def_warps_to DIGLETTS_CAVE def_warps_to DIGLETTS_CAVE

2
maps/DiglettsCave.blk
View file

@ -1 +1 @@
,+,+>,+,)+vvvvv+vv+vvnn+v)vL%+77zt%--%+r+s*f+s s%+~kkkk[[o>~kk[o ,+,+>,+,)+vvvvv+vv+vvnn+v)vL%+77zt%--%+r+sf+s s%+~kkkk[[o>~kk[o

21
scripts/DiglettsCave.asm
View file

@ -13,29 +13,24 @@ DiglettsCave_ScriptPointers:
dw EndTrainerBattle dw EndTrainerBattle
DiglettsCave_TextPointers: DiglettsCave_TextPointers:
dw CrockyText dw WugtrioText
dw DiglettsCaveText1
DiglettsCaveTrainerHeaders: DiglettsCaveTrainerHeaders:
def_trainers def_trainers
CrockyTrainerHeader: WugtrioTrainerHeader:
trainer EVENT_BEAT_CROCKY, 0, CrockyBattleText, CrockyBattleText, CrockyBattleText trainer EVENT_BEAT_WUGTRIO, 0, WugtrioBattleText, WugtrioBattleText, WugtrioBattleText
db -1 ; end db -1 ; end
CrockyText: WugtrioText:
text_asm text_asm
ld hl, CrockyTrainerHeader ld hl, WugtrioTrainerHeader
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd jp TextScriptEnd
CrockyBattleText: WugtrioBattleText:
text_far _CrockyBattleText text_far _WugtrioBattleText
text_asm text_asm
ld a, CROCKY ld a, WUGTRIO
call PlayCry call PlayCry
call WaitForSoundToFinish call WaitForSoundToFinish
jp TextScriptEnd jp TextScriptEnd
DiglettsCaveText1:
text_far _DiglettsCaveText1
text_end

14
text/DiglettsCave.asm
View file

@ -1,13 +1,3 @@
_DiglettsCaveText1:: _WugtrioBattleText::
text "DANGER!" text "Wug! Wug! Wug!@"
line "A hostile CROCKY"
cont "is nesting here!"
para "Looks like the"
line "sign has many"
cont "bite marks."
done
_CrockyBattleText::
text "Graogh!@"
text_end text_end