Nihon Route 49, Folage, and Barreau

This commit adds Nihon Route 49. It has everything necessary to work, but the wild Pokemon don't seem to spawn. I've added infrastructure that should allow this to happen, and it works for Kanto, so I am presuming that some other tomfoolery is at work.

I've also added Folage and Barreau, and implemented Folage into the Headbutt Tree table. This was to give them to the Bug Catcher on the route.
This commit is contained in:
Llinos Evans 2023-11-03 22:17:30 +00:00
parent e9cab6db16
commit 9c824b3c5e
65 changed files with 369 additions and 59 deletions

View file

@ -201,6 +201,8 @@ AnimationPointers:
dw LedianAnimation
dw SpinarakAnimation
dw AriadosAnimation
dw FolageAnimation
dw BarreauAnimation
dw CrobatAnimation
dw ChinchouAnimation
dw LanturnAnimation

View file

@ -199,6 +199,8 @@ LedybaAnimation: INCLUDE "gfx/pokemon/ledyba/anim.asm"
LedianAnimation: INCLUDE "gfx/pokemon/ledian/anim.asm"
SpinarakAnimation: INCLUDE "gfx/pokemon/spinarak/anim.asm"
AriadosAnimation: INCLUDE "gfx/pokemon/ariados/anim.asm"
FolageAnimation: INCLUDE "gfx/pokemon/folage/anim.asm"
BarreauAnimation: INCLUDE "gfx/pokemon/barreau/anim.asm"
CrobatAnimation: INCLUDE "gfx/pokemon/crobat/anim.asm"
ChinchouAnimation: INCLUDE "gfx/pokemon/chinchou/anim.asm"
LanturnAnimation: INCLUDE "gfx/pokemon/lanturn/anim.asm"

View file

@ -0,0 +1 @@
endanim

View file

@ -0,0 +1 @@
endanim

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 315 B

View file

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

View file

@ -201,6 +201,8 @@ BitmasksPointers:
dw LedianBitmasks
dw SpinarakBitmasks
dw AriadosBitmasks
dw FolageBitmasks
dw BarreauBitmasks
dw CrobatBitmasks
dw ChinchouBitmasks
dw LanturnBitmasks

View file

@ -199,6 +199,8 @@ LedybaBitmasks: INCLUDE "gfx/pokemon/ledyba/bitmask.asm"
LedianBitmasks: INCLUDE "gfx/pokemon/ledian/bitmask.asm"
SpinarakBitmasks: INCLUDE "gfx/pokemon/spinarak/bitmask.asm"
AriadosBitmasks: INCLUDE "gfx/pokemon/ariados/bitmask.asm"
FolageBitmasks: INCLUDE "gfx/pokemon/folage/bitmask.asm"
BarreauBitmasks: INCLUDE "gfx/pokemon/barreau/bitmask.asm"
CrobatBitmasks: INCLUDE "gfx/pokemon/crobat/bitmask.asm"
ChinchouBitmasks: INCLUDE "gfx/pokemon/chinchou/bitmask.asm"
LanturnBitmasks: INCLUDE "gfx/pokemon/lanturn/bitmask.asm"

View file

@ -0,0 +1 @@
endanim

View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/folage/back.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 315 B

View file

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

View file

@ -201,6 +201,8 @@ FramesPointers:
dba LedianFrames
dba SpinarakFrames
dba AriadosFrames
dba FolageFrames
dba BarreauFrames
dba CrobatFrames
dba ChinchouFrames
dba LanturnFrames

View file

@ -201,6 +201,8 @@ AnimationIdlePointers:
dw LedianAnimationIdle
dw SpinarakAnimationIdle
dw AriadosAnimationIdle
dw FolageAnimationIdle
dw BarreauAnimationIdle
dw CrobatAnimationIdle
dw ChinchouAnimationIdle
dw LanturnAnimationIdle

View file

@ -199,6 +199,8 @@ LedybaAnimationIdle: INCLUDE "gfx/pokemon/ledyba/anim_idle.asm"
LedianAnimationIdle: INCLUDE "gfx/pokemon/ledian/anim_idle.asm"
SpinarakAnimationIdle: INCLUDE "gfx/pokemon/spinarak/anim_idle.asm"
AriadosAnimationIdle: INCLUDE "gfx/pokemon/ariados/anim_idle.asm"
FolageAnimationIdle: INCLUDE "gfx/pokemon/folage/anim_idle.asm"
BarreauAnimationIdle: INCLUDE "gfx/pokemon/barreau/anim_idle.asm"
CrobatAnimationIdle: INCLUDE "gfx/pokemon/crobat/anim_idle.asm"
ChinchouAnimationIdle: INCLUDE "gfx/pokemon/chinchou/anim_idle.asm"
LanturnAnimationIdle: INCLUDE "gfx/pokemon/lanturn/anim_idle.asm"

View file

@ -23,6 +23,8 @@ LedybaFrames: INCLUDE "gfx/pokemon/ledyba/frames.asm"
LedianFrames: INCLUDE "gfx/pokemon/ledian/frames.asm"
SpinarakFrames: INCLUDE "gfx/pokemon/spinarak/frames.asm"
AriadosFrames: INCLUDE "gfx/pokemon/ariados/frames.asm"
FolageFrames: INCLUDE "gfx/pokemon/folage/frames.asm"
BarreauFrames: INCLUDE "gfx/pokemon/barreau/frames.asm"
CrobatFrames: INCLUDE "gfx/pokemon/crobat/frames.asm"
ChinchouFrames: INCLUDE "gfx/pokemon/chinchou/frames.asm"
LanturnFrames: INCLUDE "gfx/pokemon/lanturn/frames.asm"