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

"33 colors are indeed more than 4"

Browse source 
Fixed the build issues caused by Zach's newly pushed sprites having too many colours.

Also, adds my version of the GSC-style Soldier sprite.

Also also, gave Dokuroar a slight weight increase to give it a better catch rate for the Heavy Ball.

Also also also, touched up the Dokuroar cutscene a bit (it now shakes the floor with each step, it moves slower, and its walking animation now animates correctly.)
This commit is contained in:
Martha Schilling 2024-10-10 21:26:50 +01:00
parent de6d1d9d56
commit ab6051a5d5
7 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/pokemon/dex_entries/dokuroar.asm
View file

@ -1,5 +1,5 @@
db "SKELETAL@" ; species name db "SKELETAL@" ; species name
dw 807, 4660 ; height, weight - placeholder dw 902, 4960 ; height, weight - placeholder
db "Believed to be a" db "Believed to be a"
next "spirit inhabiting" next "spirit inhabiting"

BIN
gfx/pokemon/balumba/back.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 721 B

After

Width:  |  Height:  |  Size: 325 B

BIN
gfx/pokemon/balumba/front.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 885 B

BIN
gfx/pokemon/togekiss/back.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 734 B

After

Width:  |  Height:  |  Size: 332 B

BIN
gfx/pokemon/togekiss/front.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
gfx/trainers/soldier.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 632 B

After

Width:  |  Height:  |  Size: 590 B

21
maps/LavenderCryptDokuroarsRoom.asm
View file

@ -64,13 +64,20 @@ DokuroarAttackScript:
pause 15 pause 15
closetext closetext
applymovement LAVENDERCRYPT_DOKUROAR2, DokuroarJumpscare applymovement LAVENDERCRYPT_DOKUROAR2, DokuroarJumpscare
pause 12 playsound SFX_PLACE_PUZZLE_PIECE_DOWN
applymovement LAVENDERCRYPT_DOKUROAR2, DokuroarJumpscare earthquake 15
pause 12 pause 5
applymovement LAVENDERCRYPT_DOKUROAR2, DokuroarJumpscare
turnobject PLAYER, UP turnobject PLAYER, UP
showemote EMOTE_SHOCK, PLAYER, 15 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 opentext
writetext DokuroarFightText writetext DokuroarFightText
cry DOKUROAR cry DOKUROAR
@ -85,7 +92,7 @@ DokuroarAttackScript:
end end
DokuroarJumpscare: DokuroarJumpscare:
big_step DOWN slow_step DOWN
step_end step_end
LavenderCryptDokuroarTalk: LavenderCryptDokuroarTalk:
@ -140,4 +147,4 @@ LavenderCryptDokuroarsRoom_MapEvents:
def_object_events 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, 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