thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-07 00:25:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Buu and Grenmar? Nowaynowaynoway!

Browse source 
This required me to scrap some unused content from `load_font.asm`. However, this is only really a temporary fix - we need to decouple footprints.asm from it and make it load from separate banks to keep going.

Look at how Pokemon sprites are loaded for reference.
This commit is contained in:
Llinos Evans 2024-07-09 20:20:51 +01:00
parent b62062a82c
commit ae81f290d2
48 changed files with 182 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gfx/font.asm
View file

@ -32,19 +32,10 @@ INCBIN "gfx/battle/expbar.2bpp"
TownMapGFX:
INCBIN "gfx/pokegear/town_map.2bpp.lz"
UnusedWeekdayKanjiGFX: ; unreferenced
INCBIN "gfx/font/unused_weekday_kanji.2bpp"
UnusedBoldFontGFX: ; unreferenced
INCBIN "gfx/font/unused_bold_font.1bpp"
TextboxSpaceGFX:
; StatsScreen_LoadTextboxSpaceGFX reads 2bpp; LoadFrame reads first half as 1bpp
INCBIN "gfx/font/space.2bpp"
UnusedUpArrowGFX: ; unreferenced
INCBIN "gfx/font/unused_up_arrow.1bpp"
MobilePhoneTilesGFX:
INCBIN "gfx/mobile/phone_tiles.2bpp"

2
gfx/footprints.asm
View file

@ -168,6 +168,7 @@ INCBIN "gfx/footprints/mr__mime.1bpp"
INCBIN "gfx/footprints/scyther.1bpp"
INCBIN "gfx/footprints/kleavor.1bpp"
INCBIN "gfx/footprints/jynx.1bpp"
INCBIN "gfx/footprints/buu.1bpp"
INCBIN "gfx/footprints/electabuzz.1bpp"
INCBIN "gfx/footprints/magmar.1bpp"
INCBIN "gfx/footprints/pinsir.1bpp"
@ -321,6 +322,7 @@ INCBIN "gfx/footprints/donphan.1bpp"
INCBIN "gfx/footprints/porygon2.1bpp"
INCBIN "gfx/footprints/stantler.1bpp"
INCBIN "gfx/footprints/smeargle.1bpp"
INCBIN "gfx/footprints/grenmar.1bpp"
INCBIN "gfx/footprints/tyrogue.1bpp"
INCBIN "gfx/footprints/hitmontop.1bpp"
INCBIN "gfx/footprints/smoochum.1bpp"

BIN
gfx/footprints/buu.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 74 B

BIN
gfx/footprints/grenmar.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 74 B

4
gfx/pics.asm
View file

@ -982,3 +982,7 @@ MagnezoneFrontpic: INCBIN "gfx/pokemon/magnezone/front.animated.2bpp.lz"
MagnezoneBackpic: INCBIN "gfx/pokemon/magnezone/back.2bpp.lz"
GavillainFrontpic: INCBIN "gfx/pokemon/gavillain/front.animated.2bpp.lz"
GavillainBackpic: INCBIN "gfx/pokemon/gavillain/back.2bpp.lz"
BuuFrontpic: INCBIN "gfx/pokemon/buu/front.animated.2bpp.lz"
BuuBackpic: INCBIN "gfx/pokemon/buu/back.2bpp.lz"
GrenmarFrontpic: INCBIN "gfx/pokemon/grenmar/front.animated.2bpp.lz"
GrenmarBackpic: INCBIN "gfx/pokemon/grenmar/back.2bpp.lz"

2
gfx/pokemon/anim_pointers.asm
View file

@ -167,6 +167,7 @@ AnimationPointers:
dw ScytherAnimation
dw KleavorAnimation
dw JynxAnimation
dw BuuAnimation
dw ElectabuzzAnimation
dw MagmarAnimation
dw PinsirAnimation
@ -320,6 +321,7 @@ AnimationPointers:
dw Porygon2Animation
dw StantlerAnimation
dw SmeargleAnimation
dw GrenmarAnimation
dw TyrogueAnimation
dw HitmontopAnimation
dw SmoochumAnimation

2
gfx/pokemon/anims.asm
View file

@ -165,6 +165,7 @@ MrMimeAnimation: INCLUDE "gfx/pokemon/mr__mime/anim.asm"
ScytherAnimation: INCLUDE "gfx/pokemon/scyther/anim.asm"
KleavorAnimation: INCLUDE "gfx/pokemon/kleavor/anim.asm"
JynxAnimation: INCLUDE "gfx/pokemon/jynx/anim.asm"
BuuAnimation: INCLUDE "gfx/pokemon/buu/anim.asm"
ElectabuzzAnimation: INCLUDE "gfx/pokemon/electabuzz/anim.asm"
MagmarAnimation: INCLUDE "gfx/pokemon/magmar/anim.asm"
PinsirAnimation: INCLUDE "gfx/pokemon/pinsir/anim.asm"
@ -318,6 +319,7 @@ DonphanAnimation: INCLUDE "gfx/pokemon/donphan/anim.asm"
Porygon2Animation: INCLUDE "gfx/pokemon/porygon2/anim.asm"
StantlerAnimation: INCLUDE "gfx/pokemon/stantler/anim.asm"
SmeargleAnimation: INCLUDE "gfx/pokemon/smeargle/anim.asm"
GrenmarAnimation: INCLUDE "gfx/pokemon/grenmar/anim.asm"
TyrogueAnimation: INCLUDE "gfx/pokemon/tyrogue/anim.asm"
HitmontopAnimation: INCLUDE "gfx/pokemon/hitmontop/anim.asm"
SmoochumAnimation: INCLUDE "gfx/pokemon/smoochum/anim.asm"

2
gfx/pokemon/bitmask_pointers.asm
View file

@ -167,6 +167,7 @@ BitmasksPointers:
dw ScytherBitmasks
dw KleavorBitmasks
dw JynxBitmasks
dw BuuBitmasks
dw ElectabuzzBitmasks
dw MagmarBitmasks
dw PinsirBitmasks
@ -320,6 +321,7 @@ BitmasksPointers:
dw Porygon2Bitmasks
dw StantlerBitmasks
dw SmeargleBitmasks
dw GrenmarBitmasks
dw TyrogueBitmasks
dw HitmontopBitmasks
dw SmoochumBitmasks

2
gfx/pokemon/bitmasks.asm
View file

@ -165,6 +165,7 @@ MrMimeBitmasks: INCLUDE "gfx/pokemon/mr__mime/bitmask.asm"
ScytherBitmasks: INCLUDE "gfx/pokemon/scyther/bitmask.asm"
KleavorBitmasks: INCLUDE "gfx/pokemon/kleavor/bitmask.asm"
JynxBitmasks: INCLUDE "gfx/pokemon/jynx/bitmask.asm"
BuuBitmasks: INCLUDE "gfx/pokemon/buu/bitmask.asm"
ElectabuzzBitmasks: INCLUDE "gfx/pokemon/electabuzz/bitmask.asm"
MagmarBitmasks: INCLUDE "gfx/pokemon/magmar/bitmask.asm"
PinsirBitmasks: INCLUDE "gfx/pokemon/pinsir/bitmask.asm"
@ -318,6 +319,7 @@ DonphanBitmasks: INCLUDE "gfx/pokemon/donphan/bitmask.asm"
Porygon2Bitmasks: INCLUDE "gfx/pokemon/porygon2/bitmask.asm"
StantlerBitmasks: INCLUDE "gfx/pokemon/stantler/bitmask.asm"
SmeargleBitmasks: INCLUDE "gfx/pokemon/smeargle/bitmask.asm"
GrenmarBitmasks: INCLUDE "gfx/pokemon/grenmar/bitmask.asm"
TyrogueBitmasks: INCLUDE "gfx/pokemon/tyrogue/bitmask.asm"
HitmontopBitmasks: INCLUDE "gfx/pokemon/hitmontop/bitmask.asm"
SmoochumBitmasks: INCLUDE "gfx/pokemon/smoochum/bitmask.asm"

1
gfx/pokemon/buu/anim.asm Normal file
View file

@ -0,0 +1 @@
endanim

1
gfx/pokemon/buu/anim_idle.asm Normal file
View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/buu/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

BIN
gfx/pokemon/buu/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

2
gfx/pokemon/buu/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 22, 22, 12
RGB 07, 15, 25

2
gfx/pokemon/frame_pointers.asm
View file

@ -167,6 +167,7 @@ FramesPointers:
dba ScytherFrames
dba KleavorFrames
dba JynxFrames
dba BuuFrames
dba ElectabuzzFrames
dba MagmarFrames
dba PinsirFrames
@ -320,6 +321,7 @@ FramesPointers:
dba Porygon2Frames
dba StantlerFrames
dba SmeargleFrames
dba GrenmarFrames
dba TyrogueFrames
dba HitmontopFrames
dba SmoochumFrames

1
gfx/pokemon/grenmar/anim.asm Normal file
View file

@ -0,0 +1 @@
endanim

1
gfx/pokemon/grenmar/anim_idle.asm Normal file
View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/grenmar/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

BIN
gfx/pokemon/grenmar/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

2
gfx/pokemon/grenmar/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 22, 22, 12
RGB 07, 15, 25

2
gfx/pokemon/idle_pointers.asm
View file

@ -167,6 +167,7 @@ AnimationIdlePointers:
dw ScytherAnimationIdle
dw KleavorAnimationIdle
dw JynxAnimationIdle
dw BuuAnimationIdle
dw ElectabuzzAnimationIdle
dw MagmarAnimationIdle
dw PinsirAnimationIdle
@ -320,6 +321,7 @@ AnimationIdlePointers:
dw Porygon2AnimationIdle
dw StantlerAnimationIdle
dw SmeargleAnimationIdle
dw GrenmarAnimationIdle
dw TyrogueAnimationIdle
dw HitmontopAnimationIdle
dw SmoochumAnimationIdle

2
gfx/pokemon/idles.asm
View file

@ -165,6 +165,7 @@ MrMimeAnimationIdle: INCLUDE "gfx/pokemon/mr__mime/anim_idle.asm"
ScytherAnimationIdle: INCLUDE "gfx/pokemon/scyther/anim_idle.asm"
KleavorAnimationIdle: INCLUDE "gfx/pokemon/kleavor/anim_idle.asm"
JynxAnimationIdle: INCLUDE "gfx/pokemon/jynx/anim_idle.asm"
BuuAnimationIdle: INCLUDE "gfx/pokemon/buu/anim_idle.asm"
ElectabuzzAnimationIdle: INCLUDE "gfx/pokemon/electabuzz/anim_idle.asm"
MagmarAnimationIdle: INCLUDE "gfx/pokemon/magmar/anim_idle.asm"
PinsirAnimationIdle: INCLUDE "gfx/pokemon/pinsir/anim_idle.asm"
@ -318,6 +319,7 @@ DonphanAnimationIdle: INCLUDE "gfx/pokemon/donphan/anim_idle.asm"
Porygon2AnimationIdle: INCLUDE "gfx/pokemon/porygon2/anim_idle.asm"
StantlerAnimationIdle: INCLUDE "gfx/pokemon/stantler/anim_idle.asm"
SmeargleAnimationIdle: INCLUDE "gfx/pokemon/smeargle/anim_idle.asm"
GrenmarAnimationIdle: INCLUDE "gfx/pokemon/grenmar/anim_idle.asm"
TyrogueAnimationIdle: INCLUDE "gfx/pokemon/tyrogue/anim_idle.asm"
HitmontopAnimationIdle: INCLUDE "gfx/pokemon/hitmontop/anim_idle.asm"
SmoochumAnimationIdle: INCLUDE "gfx/pokemon/smoochum/anim_idle.asm"

1
gfx/pokemon/johto_frames.asm
View file

@ -122,6 +122,7 @@ DonphanFrames: INCLUDE "gfx/pokemon/donphan/frames.asm"
Porygon2Frames: INCLUDE "gfx/pokemon/porygon2/frames.asm"
StantlerFrames: INCLUDE "gfx/pokemon/stantler/frames.asm"
SmeargleFrames: INCLUDE "gfx/pokemon/smeargle/frames.asm"
GrenmarFrames: INCLUDE "gfx/pokemon/grenmar/frames.asm"
TyrogueFrames: INCLUDE "gfx/pokemon/tyrogue/frames.asm"
HitmontopFrames: INCLUDE "gfx/pokemon/hitmontop/frames.asm"
SmoochumFrames: INCLUDE "gfx/pokemon/smoochum/frames.asm"

1
gfx/pokemon/kanto_frames.asm
View file

@ -167,6 +167,7 @@ MrMimeFrames: INCLUDE "gfx/pokemon/mr__mime/frames.asm"
ScytherFrames: INCLUDE "gfx/pokemon/scyther/frames.asm"
KleavorFrames: INCLUDE "gfx/pokemon/kleavor/frames.asm"
JynxFrames: INCLUDE "gfx/pokemon/jynx/frames.asm"
BuuFrames: INCLUDE "gfx/pokemon/buu/frames.asm"
ElectabuzzFrames: INCLUDE "gfx/pokemon/electabuzz/frames.asm"
MagmarFrames: INCLUDE "gfx/pokemon/magmar/frames.asm"
PinsirFrames: INCLUDE "gfx/pokemon/pinsir/frames.asm"