dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Write palette IDs in hex

Browse Source
This commit is contained in:
Martin Griffin
2022-08-19 15:29:35 +01:00
parent cce9918908
commit 6fed961ed6
129 changed files with 1262 additions and 1240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon_animation.c
+15 -14
View File
@@ -1,5 +1,6 @@
#include "global.h"
#include "battle.h"
#include "palette.h"
#include "pokemon.h"
#include "pokemon_animation.h"
#include "sprite.h"
@@ -1538,7 +1539,7 @@ static void Anim_CircleCounterclockwise(struct Sprite *sprite)
#define GlowColor(color, colorIncrement, speed) \
{ \
if (sprite->data[2] == 0) \
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256; \
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum); \
\
if (sprite->data[2] > 128) \
{ \
@@ -2473,7 +2474,7 @@ static void Anim_FlashYellow(struct Sprite *sprite)
{
if (++sprite->data[2] == 1)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[6] = 0;
sprite->data[5] = 0;
sprite->data[4] = 0;
@@ -5262,7 +5263,7 @@ static void Anim_ShakeFlashYellow_Fast(struct Sprite *sprite)
{
if (++sprite->data[2] == 1)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[6] = 0;
sprite->data[5] = 0;
sprite->data[4] = 0;
@@ -5276,7 +5277,7 @@ static void Anim_ShakeFlashYellow(struct Sprite *sprite)
{
if (++sprite->data[2] == 1)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[6] = 0;
sprite->data[5] = 0;
sprite->data[4] = 0;
@@ -5290,7 +5291,7 @@ static void Anim_ShakeFlashYellow_Slow(struct Sprite *sprite)
{
if (++sprite->data[2] == 1)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[6] = 0;
sprite->data[5] = 0;
sprite->data[4] = 0;
@@ -5356,7 +5357,7 @@ static void Anim_ShakeGlowRed_Fast(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[0] = 10;
sprite->data[5] = 0;
sprite->data[4] = 2;
@@ -5377,7 +5378,7 @@ static void Anim_ShakeGlowRed(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[0] = 20;
sprite->data[5] = 0;
sprite->data[4] = 1;
@@ -5398,7 +5399,7 @@ static void Anim_ShakeGlowRed_Slow(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[0] = 80;
sprite->data[5] = 0;
sprite->data[4] = 1;
@@ -5419,7 +5420,7 @@ static void Anim_ShakeGlowGreen_Fast(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[0] = 10;
sprite->data[5] = 0;
sprite->data[4] = 2;
@@ -5440,7 +5441,7 @@ static void Anim_ShakeGlowGreen(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[0] = 20;
sprite->data[5] = 0;
sprite->data[4] = 1;
@@ -5461,7 +5462,7 @@ static void Anim_ShakeGlowGreen_Slow(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[0] = 80;
sprite->data[5] = 0;
sprite->data[4] = 1;
@@ -5482,7 +5483,7 @@ static void Anim_ShakeGlowBlue_Fast(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[0] = 10;
sprite->data[5] = 0;
sprite->data[4] = 2;
@@ -5503,7 +5504,7 @@ static void Anim_ShakeGlowBlue(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[0] = 20;
sprite->data[5] = 0;
sprite->data[4] = 1;
@@ -5524,7 +5525,7 @@ static void Anim_ShakeGlowBlue_Slow(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[7] = OBJ_PLTT_ID(sprite->oam.paletteNum);
sprite->data[0] = 80;
sprite->data[5] = 0;
sprite->data[4] = 1;