wug

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

constants/event_constants.asm

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

constants/hide_show_constants.asm

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

data/maps/objects/DiglettsCave.asm

@@ -6,9 +6,8 @@ DiglettsCave_Object:
 	warp_event 37, 31, DIGLETTS_CAVE_ROUTE_11, 3
 
 	def_bg_events
-	bg_event 17, 25, 2 ; DiglettsCaveText1
 
 	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

maps/DiglettsCave.blk

@@ -1 +1 @@
-,+,+>,+
,)+
vvvvv
+vv
+vv
nn+v)vL

%+77
zt%--%+

r


+s

*f+s




	s







%+~kkkk[[o




>~kk[o
+,+,+>,+
,)+
vvvvv
+vv
+vv
nn+v)vL

%+77
zt%--%+

r


+s

f+s




	s







%+~kkkk[[o




>~kk[o

scripts/DiglettsCave.asm

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

text/DiglettsCave.asm

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