diff --git a/data/pokemon/dex_entries/dokuroar.asm b/data/pokemon/dex_entries/dokuroar.asm index d44a037..7843239 100644 --- a/data/pokemon/dex_entries/dokuroar.asm +++ b/data/pokemon/dex_entries/dokuroar.asm @@ -1,5 +1,5 @@ db "SKELETAL@" ; species name - dw 807, 4660 ; height, weight - placeholder + dw 902, 4960 ; height, weight - placeholder db "Believed to be a" next "spirit inhabiting" diff --git a/gfx/pokemon/balumba/back.png b/gfx/pokemon/balumba/back.png index 5d9013a..4aa08e8 100644 Binary files a/gfx/pokemon/balumba/back.png and b/gfx/pokemon/balumba/back.png differ diff --git a/gfx/pokemon/balumba/front.png b/gfx/pokemon/balumba/front.png index c07b5ae..0e1eaa8 100644 Binary files a/gfx/pokemon/balumba/front.png and b/gfx/pokemon/balumba/front.png differ diff --git a/gfx/pokemon/togekiss/back.png b/gfx/pokemon/togekiss/back.png index b23dd74..2a1e337 100644 Binary files a/gfx/pokemon/togekiss/back.png and b/gfx/pokemon/togekiss/back.png differ diff --git a/gfx/pokemon/togekiss/front.png b/gfx/pokemon/togekiss/front.png index 2b0e545..39dfc71 100644 Binary files a/gfx/pokemon/togekiss/front.png and b/gfx/pokemon/togekiss/front.png differ diff --git a/gfx/trainers/soldier.png b/gfx/trainers/soldier.png index 26bf56e..13475f4 100644 Binary files a/gfx/trainers/soldier.png and b/gfx/trainers/soldier.png differ diff --git a/maps/LavenderCryptDokuroarsRoom.asm b/maps/LavenderCryptDokuroarsRoom.asm index eeb977e..652900f 100644 --- a/maps/LavenderCryptDokuroarsRoom.asm +++ b/maps/LavenderCryptDokuroarsRoom.asm @@ -64,13 +64,20 @@ DokuroarAttackScript: pause 15 closetext applymovement LAVENDERCRYPT_DOKUROAR2, DokuroarJumpscare - pause 12 - applymovement LAVENDERCRYPT_DOKUROAR2, DokuroarJumpscare - pause 12 - applymovement LAVENDERCRYPT_DOKUROAR2, DokuroarJumpscare + playsound SFX_PLACE_PUZZLE_PIECE_DOWN + earthquake 15 + pause 5 turnobject PLAYER, UP showemote EMOTE_SHOCK, PLAYER, 15 - pause 15 + pause 5 + applymovement LAVENDERCRYPT_DOKUROAR2, DokuroarJumpscare + playsound SFX_PLACE_PUZZLE_PIECE_DOWN + earthquake 15 + pause 5 + applymovement LAVENDERCRYPT_DOKUROAR2, DokuroarJumpscare + playsound SFX_PLACE_PUZZLE_PIECE_DOWN + earthquake 15 + pause 5 opentext writetext DokuroarFightText cry DOKUROAR @@ -85,7 +92,7 @@ DokuroarAttackScript: end DokuroarJumpscare: - big_step DOWN + slow_step DOWN step_end LavenderCryptDokuroarTalk: @@ -140,4 +147,4 @@ LavenderCryptDokuroarsRoom_MapEvents: def_object_events object_event 6, 7, SPRITE_MONSTER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_SCRIPT, 0, DokuroarTalkScript, EVENT_CRYPT_DOKUROAR_1 - object_event 6, 7, SPRITE_MONSTER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_SCRIPT, 0, DokuroarTalkScript2, EVENT_CRYPT_DOKUROAR_2 + object_event 6, 7, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_SCRIPT, 0, DokuroarTalkScript2, EVENT_CRYPT_DOKUROAR_2