Terrados & Bug Fix

Fixes Molambino and Luanbo not evolving properly (oops) and adds Magiprey/Terrados. Since there's no place to put Magiprey in Johto or Kanto, this'll likely be a Nihon exclusive. Got some stuff in mind!
This commit is contained in:
Llinos Evans 2024-07-07 09:27:46 +01:00
parent b451ca81ce
commit 62bdbe2a1b
44 changed files with 151 additions and 3 deletions

View file

@ -165,6 +165,8 @@ AnimationPointers:
dw TaurosAnimation
dw MagikarpAnimation
dw GyaradosAnimation
dw MagipreyAnimation
dw TerradosAnimation
dw LaprasAnimation
dw DittoAnimation
dw EeveeAnimation

View file

@ -163,6 +163,8 @@ TriculesAnimation: INCLUDE "gfx/pokemon/tricules/anim.asm"
TaurosAnimation: INCLUDE "gfx/pokemon/tauros/anim.asm"
MagikarpAnimation: INCLUDE "gfx/pokemon/magikarp/anim.asm"
GyaradosAnimation: INCLUDE "gfx/pokemon/gyarados/anim.asm"
MagipreyAnimation: INCLUDE "gfx/pokemon/magiprey/anim.asm"
TerradosAnimation: INCLUDE "gfx/pokemon/terrados/anim.asm"
LaprasAnimation: INCLUDE "gfx/pokemon/lapras/anim.asm"
DittoAnimation: INCLUDE "gfx/pokemon/ditto/anim.asm"
EeveeAnimation: INCLUDE "gfx/pokemon/eevee/anim.asm"

View file

@ -165,6 +165,8 @@ BitmasksPointers:
dw TaurosBitmasks
dw MagikarpBitmasks
dw GyaradosBitmasks
dw MagipreyBitmasks
dw TerradosBitmasks
dw LaprasBitmasks
dw DittoBitmasks
dw EeveeBitmasks

View file

@ -163,6 +163,8 @@ TriculesBitmasks: INCLUDE "gfx/pokemon/tricules/bitmask.asm"
TaurosBitmasks: INCLUDE "gfx/pokemon/tauros/bitmask.asm"
MagikarpBitmasks: INCLUDE "gfx/pokemon/magikarp/bitmask.asm"
GyaradosBitmasks: INCLUDE "gfx/pokemon/gyarados/bitmask.asm"
MagipreyBitmasks: INCLUDE "gfx/pokemon/magiprey/bitmask.asm"
TerradosBitmasks: INCLUDE "gfx/pokemon/terrados/bitmask.asm"
LaprasBitmasks: INCLUDE "gfx/pokemon/lapras/bitmask.asm"
DittoBitmasks: INCLUDE "gfx/pokemon/ditto/bitmask.asm"
EeveeBitmasks: INCLUDE "gfx/pokemon/eevee/bitmask.asm"

View file

@ -165,6 +165,8 @@ FramesPointers:
dba TaurosFrames
dba MagikarpFrames
dba GyaradosFrames
dba MagipreyFrames
dba TerradosFrames
dba LaprasFrames
dba DittoFrames
dba EeveeFrames

View file

@ -165,6 +165,8 @@ AnimationIdlePointers:
dw TaurosAnimationIdle
dw MagikarpAnimationIdle
dw GyaradosAnimationIdle
dw MagipreyAnimationIdle
dw TerradosAnimationIdle
dw LaprasAnimationIdle
dw DittoAnimationIdle
dw EeveeAnimationIdle

View file

@ -163,6 +163,8 @@ TriculesAnimationIdle: INCLUDE "gfx/pokemon/tricules/anim_idle.asm"
TaurosAnimationIdle: INCLUDE "gfx/pokemon/tauros/anim_idle.asm"
MagikarpAnimationIdle: INCLUDE "gfx/pokemon/magikarp/anim_idle.asm"
GyaradosAnimationIdle: INCLUDE "gfx/pokemon/gyarados/anim_idle.asm"
MagipreyAnimationIdle: INCLUDE "gfx/pokemon/magiprey/anim_idle.asm"
TerradosAnimationIdle: INCLUDE "gfx/pokemon/terrados/anim_idle.asm"
LaprasAnimationIdle: INCLUDE "gfx/pokemon/lapras/anim_idle.asm"
DittoAnimationIdle: INCLUDE "gfx/pokemon/ditto/anim_idle.asm"
EeveeAnimationIdle: INCLUDE "gfx/pokemon/eevee/anim_idle.asm"

View file

@ -165,6 +165,8 @@ TriculesFrames: INCLUDE "gfx/pokemon/tricules/frames.asm"
TaurosFrames: INCLUDE "gfx/pokemon/tauros/frames.asm"
MagikarpFrames: INCLUDE "gfx/pokemon/magikarp/frames.asm"
GyaradosFrames: INCLUDE "gfx/pokemon/gyarados/frames.asm"
MagipreyFrames: INCLUDE "gfx/pokemon/magiprey/frames.asm"
TerradosFrames: INCLUDE "gfx/pokemon/terrados/frames.asm"
LaprasFrames: INCLUDE "gfx/pokemon/lapras/frames.asm"
DittoFrames: INCLUDE "gfx/pokemon/ditto/frames.asm"
EeveeFrames: INCLUDE "gfx/pokemon/eevee/frames.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

@ -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