dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start anim objtemplates

Browse Source
This commit is contained in:
Evan
2019-12-01 20:23:36 -05:00
parent 1bdeb05793
commit 86e62e24c1
32 changed files with 6396 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_anim.c
+140 -158
View File
@@ -3,6 +3,7 @@
#include "battle_anim.h"
#include "battle_controllers.h"
#include "battle_interface.h"
#include "battle_bg.h"
#include "bg.h"
#include "decompress.h"
#include "dma3.h"
@@ -22,6 +23,8 @@
extern const u16 gMovesWithQuietBGM[];
extern const u8 *const gBattleAnims_Moves[];
extern const struct CompressedSpriteSheet gUnknown_8399388[];
extern const struct CompressedSpritePalette gUnknown_8399C90[];
// RAM
EWRAM_DATA static const u8 *sBattleAnimScriptPtr = NULL;
@@ -53,6 +56,16 @@ static void AddSpriteIndex(u16 index);
static void ClearSpriteIndex(u16 index);
static void WaitAnimFrameCount(void);
static void RunAnimScriptCommand(void);
static void sub_8073558(u8 taskId);
static void Task_FadeToBg(u8 taskId);
static void Task_PanFromInitialToTarget(u8 taskId);
static void task_pA_ma0A_obj_to_bg_pal(u8 taskId);
static void LoadMoveBg(u16 bgId);
static void LoadDefaultBg(void);
static void Task_LoopAndPlaySE(u8 taskId);
static void Task_WaitAndPlaySE(u8 taskId);
static void sub_807331C(u8 taskId);
static void ScriptCmd_loadspritegfx(void);
static void ScriptCmd_unloadspritegfx(void);
static void ScriptCmd_createsprite(void);
@@ -103,7 +116,7 @@ static void ScriptCmd_doublebattle_2E(void);
static void ScriptCmd_stopsound(void);
// Data
const struct OamData gOamData_AffineOff_ObjNormal_8x8 =
const struct OamData gOamData_AffineOff_ObjNormal_8x8 = //gOamData_83AC9C8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -118,7 +131,7 @@ const struct OamData gOamData_AffineOff_ObjNormal_8x8 =
};
const struct OamData gOamData_AffineOff_ObjNormal_16x16 =
const struct OamData gOamData_AffineOff_ObjNormal_16x16 = //gOamData_83AC9D0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -132,7 +145,7 @@ const struct OamData gOamData_AffineOff_ObjNormal_16x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjNormal_32x32 =
const struct OamData gOamData_AffineOff_ObjNormal_32x32 = //gOamData_83AC9D8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -146,7 +159,7 @@ const struct OamData gOamData_AffineOff_ObjNormal_32x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjNormal_64x64 =
const struct OamData gOamData_AffineOff_ObjNormal_64x64 = //gOamData_83AC9E0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -160,7 +173,7 @@ const struct OamData gOamData_AffineOff_ObjNormal_64x64 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjNormal_16x8 =
const struct OamData gOamData_AffineOff_ObjNormal_16x8 = //gOamData_83AC9E8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -174,7 +187,7 @@ const struct OamData gOamData_AffineOff_ObjNormal_16x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjNormal_32x8 =
const struct OamData gOamData_AffineOff_ObjNormal_32x8 = //gOamData_83AC9F0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -188,7 +201,7 @@ const struct OamData gOamData_AffineOff_ObjNormal_32x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjNormal_32x16 =
const struct OamData gOamData_AffineOff_ObjNormal_32x16 = //gOamData_83AC9F8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -202,7 +215,7 @@ const struct OamData gOamData_AffineOff_ObjNormal_32x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjNormal_64x32 =
const struct OamData gOamData_AffineOff_ObjNormal_64x32 = //gOamData_83ACA00
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -216,7 +229,7 @@ const struct OamData gOamData_AffineOff_ObjNormal_64x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjNormal_8x16 =
const struct OamData gOamData_AffineOff_ObjNormal_8x16 = //gOamData_83ACA08
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -230,7 +243,7 @@ const struct OamData gOamData_AffineOff_ObjNormal_8x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjNormal_8x32 =
const struct OamData gOamData_AffineOff_ObjNormal_8x32 = //gOamData_83ACA10
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -244,7 +257,7 @@ const struct OamData gOamData_AffineOff_ObjNormal_8x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjNormal_16x32 =
const struct OamData gOamData_AffineOff_ObjNormal_16x32 = //gOamData_83ACA18
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -258,7 +271,7 @@ const struct OamData gOamData_AffineOff_ObjNormal_16x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjNormal_32x64 =
const struct OamData gOamData_AffineOff_ObjNormal_32x64 = //gOamData_83ACA20
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -272,7 +285,7 @@ const struct OamData gOamData_AffineOff_ObjNormal_32x64 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjNormal_8x8 =
const struct OamData gOamData_AffineNormal_ObjNormal_8x8 = //gOamData_83ACA28
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -286,7 +299,7 @@ const struct OamData gOamData_AffineNormal_ObjNormal_8x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjNormal_16x16 =
const struct OamData gOamData_AffineNormal_ObjNormal_16x16 = //gOamData_83ACA30
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -300,7 +313,7 @@ const struct OamData gOamData_AffineNormal_ObjNormal_16x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjNormal_32x32 =
const struct OamData gOamData_AffineNormal_ObjNormal_32x32 = //gOamData_83ACA38
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -314,7 +327,7 @@ const struct OamData gOamData_AffineNormal_ObjNormal_32x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjNormal_64x64 =
const struct OamData gOamData_AffineNormal_ObjNormal_64x64 = //gOamData_83ACA40
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -328,7 +341,7 @@ const struct OamData gOamData_AffineNormal_ObjNormal_64x64 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjNormal_16x8 =
const struct OamData gOamData_AffineNormal_ObjNormal_16x8 = //gOamData_83ACA48
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -342,7 +355,7 @@ const struct OamData gOamData_AffineNormal_ObjNormal_16x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjNormal_32x8 =
const struct OamData gOamData_AffineNormal_ObjNormal_32x8 = //gOamData_83ACA50
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -356,7 +369,7 @@ const struct OamData gOamData_AffineNormal_ObjNormal_32x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjNormal_32x16 =
const struct OamData gOamData_AffineNormal_ObjNormal_32x16 = //gOamData_83ACA58
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -370,7 +383,7 @@ const struct OamData gOamData_AffineNormal_ObjNormal_32x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjNormal_64x32 =
const struct OamData gOamData_AffineNormal_ObjNormal_64x32 = //gOamData_83ACA60
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -384,7 +397,7 @@ const struct OamData gOamData_AffineNormal_ObjNormal_64x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjNormal_8x16 =
const struct OamData gOamData_AffineNormal_ObjNormal_8x16 = //gOamData_83ACA68
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -398,7 +411,7 @@ const struct OamData gOamData_AffineNormal_ObjNormal_8x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjNormal_8x32 =
const struct OamData gOamData_AffineNormal_ObjNormal_8x32 = //gOamData_83ACA70
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -412,7 +425,7 @@ const struct OamData gOamData_AffineNormal_ObjNormal_8x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjNormal_16x32 =
const struct OamData gOamData_AffineNormal_ObjNormal_16x32 = //gOamData_83ACA78
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -426,7 +439,7 @@ const struct OamData gOamData_AffineNormal_ObjNormal_16x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjNormal_32x64 =
const struct OamData gOamData_AffineNormal_ObjNormal_32x64 = //gOamData_83ACA80
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -440,7 +453,7 @@ const struct OamData gOamData_AffineNormal_ObjNormal_32x64 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjNormal_8x8 =
const struct OamData gOamData_AffineDouble_ObjNormal_8x8 = //gOamData_83ACA88
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -454,7 +467,7 @@ const struct OamData gOamData_AffineDouble_ObjNormal_8x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjNormal_16x16 =
const struct OamData gOamData_AffineDouble_ObjNormal_16x16 = //gOamData_83ACA90
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -468,7 +481,7 @@ const struct OamData gOamData_AffineDouble_ObjNormal_16x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjNormal_32x32 =
const struct OamData gOamData_AffineDouble_ObjNormal_32x32 = //gOamData_83ACA98
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -482,7 +495,7 @@ const struct OamData gOamData_AffineDouble_ObjNormal_32x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjNormal_64x64 =
const struct OamData gOamData_AffineDouble_ObjNormal_64x64 = //gOamData_83ACAA0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -496,7 +509,7 @@ const struct OamData gOamData_AffineDouble_ObjNormal_64x64 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjNormal_16x8 =
const struct OamData gOamData_AffineDouble_ObjNormal_16x8 = //gOamData_83ACAA8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -510,7 +523,7 @@ const struct OamData gOamData_AffineDouble_ObjNormal_16x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjNormal_32x8 =
const struct OamData gOamData_AffineDouble_ObjNormal_32x8 = //gOamData_83ACAB0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -524,7 +537,7 @@ const struct OamData gOamData_AffineDouble_ObjNormal_32x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjNormal_32x16 =
const struct OamData gOamData_AffineDouble_ObjNormal_32x16 = //gOamData_83ACAB8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -538,7 +551,7 @@ const struct OamData gOamData_AffineDouble_ObjNormal_32x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjNormal_64x32 =
const struct OamData gOamData_AffineDouble_ObjNormal_64x32 = //gOamData_83ACAC0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -552,7 +565,7 @@ const struct OamData gOamData_AffineDouble_ObjNormal_64x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjNormal_8x16 =
const struct OamData gOamData_AffineDouble_ObjNormal_8x16 = //gOamData_83ACAC8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -566,7 +579,7 @@ const struct OamData gOamData_AffineDouble_ObjNormal_8x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjNormal_8x32 =
const struct OamData gOamData_AffineDouble_ObjNormal_8x32 = //gOamData_83ACAD0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -580,7 +593,7 @@ const struct OamData gOamData_AffineDouble_ObjNormal_8x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjNormal_16x32 =
const struct OamData gOamData_AffineDouble_ObjNormal_16x32 = //gOamData_83ACAD8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -594,7 +607,7 @@ const struct OamData gOamData_AffineDouble_ObjNormal_16x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjNormal_32x64 =
const struct OamData gOamData_AffineDouble_ObjNormal_32x64 = //gOamData_83ACAE0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -608,7 +621,7 @@ const struct OamData gOamData_AffineDouble_ObjNormal_32x64 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjBlend_8x8 =
const struct OamData gOamData_AffineOff_ObjBlend_8x8 = //gOamData_83ACAE8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -622,7 +635,7 @@ const struct OamData gOamData_AffineOff_ObjBlend_8x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjBlend_16x16 =
const struct OamData gOamData_AffineOff_ObjBlend_16x16 = //gOamData_83ACAF0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -636,7 +649,7 @@ const struct OamData gOamData_AffineOff_ObjBlend_16x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjBlend_32x32 =
const struct OamData gOamData_AffineOff_ObjBlend_32x32 = //gOamData_83ACAF8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -650,7 +663,7 @@ const struct OamData gOamData_AffineOff_ObjBlend_32x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjBlend_64x64 =
const struct OamData gOamData_AffineOff_ObjBlend_64x64 = //gOamData_83ACB00
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -664,7 +677,7 @@ const struct OamData gOamData_AffineOff_ObjBlend_64x64 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjBlend_16x8 =
const struct OamData gOamData_AffineOff_ObjBlend_16x8 = //gOamData_83ACB08
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -678,7 +691,7 @@ const struct OamData gOamData_AffineOff_ObjBlend_16x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjBlend_32x8 =
const struct OamData gOamData_AffineOff_ObjBlend_32x8 = //gOamData_83ACB10
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -692,7 +705,7 @@ const struct OamData gOamData_AffineOff_ObjBlend_32x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjBlend_32x16 =
const struct OamData gOamData_AffineOff_ObjBlend_32x16 = //gOamData_83ACB18
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -706,7 +719,7 @@ const struct OamData gOamData_AffineOff_ObjBlend_32x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjBlend_64x32 =
const struct OamData gOamData_AffineOff_ObjBlend_64x32 = //gOamData_83ACB20
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -720,7 +733,7 @@ const struct OamData gOamData_AffineOff_ObjBlend_64x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjBlend_8x16 =
const struct OamData gOamData_AffineOff_ObjBlend_8x16 = //gOamData_83ACB28
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -734,7 +747,7 @@ const struct OamData gOamData_AffineOff_ObjBlend_8x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjBlend_8x32 =
const struct OamData gOamData_AffineOff_ObjBlend_8x32 = //gOamData_83ACB30
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -748,7 +761,7 @@ const struct OamData gOamData_AffineOff_ObjBlend_8x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjBlend_16x32 =
const struct OamData gOamData_AffineOff_ObjBlend_16x32 = //gOamData_83ACB38
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -762,7 +775,7 @@ const struct OamData gOamData_AffineOff_ObjBlend_16x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineOff_ObjBlend_32x64 =
const struct OamData gOamData_AffineOff_ObjBlend_32x64 = //gOamData_83ACB40
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -776,7 +789,7 @@ const struct OamData gOamData_AffineOff_ObjBlend_32x64 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjBlend_8x8 =
const struct OamData gOamData_AffineNormal_ObjBlend_8x8 = //gOamData_83ACB48
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -790,7 +803,7 @@ const struct OamData gOamData_AffineNormal_ObjBlend_8x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjBlend_16x16 =
const struct OamData gOamData_AffineNormal_ObjBlend_16x16 = //gOamData_83ACB50
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -804,7 +817,7 @@ const struct OamData gOamData_AffineNormal_ObjBlend_16x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjBlend_32x32 =
const struct OamData gOamData_AffineNormal_ObjBlend_32x32 = //gOamData_83ACB58
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -818,7 +831,7 @@ const struct OamData gOamData_AffineNormal_ObjBlend_32x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjBlend_64x64 =
const struct OamData gOamData_AffineNormal_ObjBlend_64x64 = //gOamData_83ACB60
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -832,7 +845,7 @@ const struct OamData gOamData_AffineNormal_ObjBlend_64x64 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjBlend_16x8 =
const struct OamData gOamData_AffineNormal_ObjBlend_16x8 = //gOamData_83ACB68
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -846,7 +859,7 @@ const struct OamData gOamData_AffineNormal_ObjBlend_16x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjBlend_32x8 =
const struct OamData gOamData_AffineNormal_ObjBlend_32x8 = //gOamData_83ACB70
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -860,7 +873,7 @@ const struct OamData gOamData_AffineNormal_ObjBlend_32x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjBlend_32x16 =
const struct OamData gOamData_AffineNormal_ObjBlend_32x16 = //gOamData_83ACB78
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -874,7 +887,7 @@ const struct OamData gOamData_AffineNormal_ObjBlend_32x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjBlend_64x32 =
const struct OamData gOamData_AffineNormal_ObjBlend_64x32 = //gOamData_83ACB80
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -888,7 +901,7 @@ const struct OamData gOamData_AffineNormal_ObjBlend_64x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjBlend_8x16 =
const struct OamData gOamData_AffineNormal_ObjBlend_8x16 = //gOamData_83ACB88
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -902,7 +915,7 @@ const struct OamData gOamData_AffineNormal_ObjBlend_8x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjBlend_8x32 =
const struct OamData gOamData_AffineNormal_ObjBlend_8x32 = //gOamData_83ACB90
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -916,7 +929,7 @@ const struct OamData gOamData_AffineNormal_ObjBlend_8x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjBlend_16x32 =
const struct OamData gOamData_AffineNormal_ObjBlend_16x32 = //gOamData_83ACB98
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -930,7 +943,7 @@ const struct OamData gOamData_AffineNormal_ObjBlend_16x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineNormal_ObjBlend_32x64 =
const struct OamData gOamData_AffineNormal_ObjBlend_32x64 = //gOamData_83ACBA0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -944,7 +957,7 @@ const struct OamData gOamData_AffineNormal_ObjBlend_32x64 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjBlend_8x8 =
const struct OamData gOamData_AffineDouble_ObjBlend_8x8 = //gOamData_83ACBA8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -958,7 +971,7 @@ const struct OamData gOamData_AffineDouble_ObjBlend_8x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjBlend_16x16 =
const struct OamData gOamData_AffineDouble_ObjBlend_16x16 = //gOamData_83ACBB0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -972,7 +985,7 @@ const struct OamData gOamData_AffineDouble_ObjBlend_16x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjBlend_32x32 =
const struct OamData gOamData_AffineDouble_ObjBlend_32x32 = //gOamData_83ACBB8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -986,7 +999,7 @@ const struct OamData gOamData_AffineDouble_ObjBlend_32x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjBlend_64x64 =
const struct OamData gOamData_AffineDouble_ObjBlend_64x64 = //gOamData_83ACBC0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -1000,7 +1013,7 @@ const struct OamData gOamData_AffineDouble_ObjBlend_64x64 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjBlend_16x8 =
const struct OamData gOamData_AffineDouble_ObjBlend_16x8 = //gOamData_83ACBC8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -1014,7 +1027,7 @@ const struct OamData gOamData_AffineDouble_ObjBlend_16x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjBlend_32x8 =
const struct OamData gOamData_AffineDouble_ObjBlend_32x8 = //gOamData_83ACBD0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -1028,7 +1041,7 @@ const struct OamData gOamData_AffineDouble_ObjBlend_32x8 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjBlend_32x16 =
const struct OamData gOamData_AffineDouble_ObjBlend_32x16 = //gOamData_83ACBD8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -1042,7 +1055,7 @@ const struct OamData gOamData_AffineDouble_ObjBlend_32x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjBlend_64x32 =
const struct OamData gOamData_AffineDouble_ObjBlend_64x32 = //gOamData_83ACBE0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -1056,7 +1069,7 @@ const struct OamData gOamData_AffineDouble_ObjBlend_64x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjBlend_8x16 =
const struct OamData gOamData_AffineDouble_ObjBlend_8x16 = //gOamData_83ACBE8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -1070,7 +1083,7 @@ const struct OamData gOamData_AffineDouble_ObjBlend_8x16 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjBlend_8x32 =
const struct OamData gOamData_AffineDouble_ObjBlend_8x32 = //gOamData_83ACBF0
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -1084,7 +1097,7 @@ const struct OamData gOamData_AffineDouble_ObjBlend_8x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjBlend_16x32 =
const struct OamData gOamData_AffineDouble_ObjBlend_16x32 = //gOamData_83ACBF8
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -1098,7 +1111,7 @@ const struct OamData gOamData_AffineDouble_ObjBlend_16x32 =
.paletteNum = 0,
};
const struct OamData gOamData_AffineDouble_ObjBlend_32x64 =
const struct OamData gOamData_AffineDouble_ObjBlend_32x64 = //gOamData_83ACC00
{
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
@@ -1944,8 +1957,8 @@ static void ScriptCmd_loadspritegfx(void)
sBattleAnimScriptPtr++;
index = T1_READ_16(sBattleAnimScriptPtr);
LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)]);
LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(index)]);
LoadCompressedSpriteSheetUsingHeap(&gUnknown_8399388[GET_TRUE_SPRITE_INDEX(index)]);
LoadCompressedSpritePaletteUsingHeap(&gUnknown_8399C90[GET_TRUE_SPRITE_INDEX(index)]);
sBattleAnimScriptPtr += 2;
AddSpriteIndex(GET_TRUE_SPRITE_INDEX(index));
gAnimFramesToWait = 1;
@@ -2072,6 +2085,13 @@ static void ScriptCmd_waitforvisualfinish(void)
}
}
static void ScriptCmd_hang1(void)
{
}
static void ScriptCmd_hang2(void)
{
}
static void ScriptCmd_end(void)
{
s32 i;
@@ -2117,11 +2137,8 @@ static void ScriptCmd_end(void)
if (!continuousAnim) // May have been used for debug?
{
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
if (!IsContest())
{
sub_80A8278();
UpdateOamPriorityInAllHealthboxes(1);
}
sub_80767F0();
UpdateOamPriorityInAllHealthboxes(1);
gAnimScriptActive = FALSE;
}
}
@@ -2160,12 +2177,11 @@ static void ScriptCmd_monbg(void)
if (IsBattlerSpriteVisible(battlerId))
{
u8 position = GetBattlerPosition(battlerId);
if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
toBG_2 = TRUE;
if (position < B_POSITION_OPPONENT_LEFT) // || position == B_POSITION_PLAYER_RIGHT)
toBG_2 = FALSE;
else
toBG_2 = TRUE;
MoveBattlerSpriteToBG(battlerId, toBG_2, FALSE);
MoveBattlerSpriteToBG(battlerId, toBG_2);
taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10);
gAnimVisualTaskCount++;
gTasks[taskId].data[t1_MONBG_BATTLER] = battlerId;
@@ -2179,12 +2195,11 @@ static void ScriptCmd_monbg(void)
if (IsBattlerSpriteVisible(battlerId))
{
u8 position = GetBattlerPosition(battlerId);
if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
toBG_2 = TRUE;
if (position < B_POSITION_OPPONENT_LEFT) // || position == B_POSITION_PLAYER_RIGHT)
toBG_2 = FALSE;
else
toBG_2 = TRUE;
MoveBattlerSpriteToBG(battlerId, toBG_2, FALSE);
MoveBattlerSpriteToBG(battlerId, toBG_2);
taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10);
gAnimVisualTaskCount++;
gTasks[taskId].data[0] = battlerId;
@@ -2266,7 +2281,7 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2)
}
}
void sub_80730C0(u16 a, u16 *b, u32 c, u8 d)
void sub_80730C0(u16 a, u16 *b, s32 c, u8 d)
{
s32 i, j;
s32 var;
@@ -2275,6 +2290,7 @@ void sub_80730C0(u16 a, u16 *b, u32 c, u8 d)
var = 32;
else
var = 64;
a <<= 12;
for (i = 0; i < var; i++)
{
@@ -2288,17 +2304,17 @@ void sub_8073128(bool8 to_BG2)
struct BattleAnimBgData animBg;
sub_80752A0(&animBg);
if (!to_BG2))
if (!to_BG2)
{
sub_8075358(1);
gBattle_BG1_X = NULL;
gBattle_BG1_Y = NULL;
gBattle_BG1_X = 0;
gBattle_BG1_Y = 0;
}
else
{
sub_8075358(2);
gBattle_BG2_X = NULL;
gBattle_BG2_Y = NULL;
gBattle_BG2_X = 0;
gBattle_BG2_Y = 0;
}
}
@@ -2378,10 +2394,9 @@ static void sub_807331C(u8 taskId)
{
u8 to_BG2;
u8 position = GetBattlerPosition(gTasks[taskId].data[2]);
if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
to_BG2 = TRUE;
if (position < B_POSITION_OPPONENT_LEFT)
to_BG2 = FALSE;
else
to_BG2 = TRUE;
if (sMonAnimTaskIdArray[0] != 0xFF)
{
@@ -2422,24 +2437,22 @@ static void ScriptCmd_monbg_22(void)
if (IsBattlerSpriteVisible(battlerId))
{
u8 position = GetBattlerPosition(battlerId);
if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
toBG_2 = TRUE;
if (position < B_POSITION_OPPONENT_LEFT)
toBG_2 = FALSE;
else
toBG_2 = TRUE;
MoveBattlerSpriteToBG(battlerId, toBG_2, FALSE);
MoveBattlerSpriteToBG(battlerId, toBG_2);
}
battlerId ^= BIT_FLANK;
if (animBattlerId > 1 && IsBattlerSpriteVisible(battlerId))
{
u8 position = GetBattlerPosition(battlerId);
if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
toBG_2 = TRUE;
if (position < B_POSITION_OPPONENT_LEFT)
toBG_2 = FALSE;
else
toBG_2 = TRUE;
MoveBattlerSpriteToBG(battlerId, toBG_2, FALSE);
MoveBattlerSpriteToBG(battlerId, toBG_2);
}
sBattleAnimScriptPtr++;
@@ -2480,19 +2493,21 @@ static void ScriptCmd_clearmonbg_23(void)
static void sub_8073558(u8 taskId)
{
gTasks[taskId].data[1]++;
bool8 to_BG2;
gTasks[taskId].data[1]++;
if (gTasks[taskId].data[1] != 1)
{
bool8 toBG_2;
u8 battlerId = gTasks[taskId].data[2];
u8 position = GetBattlerPosition(battlerId);
if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
toBG_2 = FALSE;
else
toBG_2 = TRUE;
to_BG2 = TRUE;
if (position < B_POSITION_OPPONENT_LEFT)
to_BG2 = FALSE;
if (IsBattlerSpriteVisible(battlerId))
sub_8073128(toBG_2);
if (gTasks[taskId].data[0] > 1 && IsBattlerSpriteVisible(battlerId ^ BIT_FLANK))
sub_8073128(toBG_2 ^ 1);
@@ -2627,9 +2642,7 @@ static void ScriptCmd_fadetobgfromset(void)
sBattleAnimScriptPtr += 3;
taskId = CreateTask(Task_FadeToBg, 5);
if (IsContest())
gTasks[taskId].tBackgroundId = bg3;
else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
gTasks[taskId].tBackgroundId = bg2;
else
gTasks[taskId].tBackgroundId = bg1;
@@ -2676,34 +2689,14 @@ static void Task_FadeToBg(u8 taskId)
static void LoadMoveBg(u16 bgId)
{
if (IsContest())
{
const u32 *tilemap = gBattleAnimBackgroundTable[bgId].tilemap;
void *dmaSrc;
void *dmaDest;
LZDecompressWram(tilemap, gDecompressionBuffer);
sub_80730C0(sub_80A6D94(), (void*)(gDecompressionBuffer), 0x100, 0);
dmaSrc = gDecompressionBuffer;
dmaDest = (void *)(BG_SCREEN_ADDR(26));
DmaCopy32(3, dmaSrc, dmaDest, 0x800);
LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_SCREEN_ADDR(4)));
LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, sub_80A6D94() * 16, 32);
}
else
{
LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)(BG_SCREEN_ADDR(26)));
LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_CHAR_ADDR(2)));
LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, 32, 32);
}
LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)(BG_SCREEN_ADDR(26)));
LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_CHAR_ADDR(2)));
LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, 32, 32);
}
static void LoadDefaultBg(void)
{
if (IsContest())
LoadContestBgAfterMoveAnim();
else
DrawMainBattleBackground();
DrawMainBattleBackground();
}
static void ScriptCmd_restorebg(void)
@@ -2754,18 +2747,13 @@ static void ScriptCmd_changebg(void)
s8 BattleAnimAdjustPanning(s8 pan)
{
if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive)
if (gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive)
{
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
pan = SOUND_PAN_TARGET;
else
pan = SOUND_PAN_ATTACKER;
}
else if (IsContest())
{
if (gBattleAnimAttacker != gBattleAnimTarget || gBattleAnimAttacker != 2 || pan != SOUND_PAN_TARGET)
pan *= -1;
}
else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
{
if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
@@ -2796,7 +2784,7 @@ s8 BattleAnimAdjustPanning(s8 pan)
s8 BattleAnimAdjustPanning2(s8 pan)
{
if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive)
if (gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive)
{
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
pan = SOUND_PAN_TARGET;
@@ -2805,7 +2793,7 @@ s8 BattleAnimAdjustPanning2(s8 pan)
}
else
{
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER || IsContest())
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
pan = -pan;
}
return pan;
@@ -2896,7 +2884,7 @@ static void ScriptCmd_panse_1B(void)
sBattleAnimScriptPtr += 6;
}
void Task_PanFromInitialToTarget(u8 taskId)
static void Task_PanFromInitialToTarget(u8 taskId)
{
bool32 destroyTask = FALSE;
if (gTasks[taskId].tFrameCounter++ >= gTasks[taskId].tFramesToWait)
@@ -3169,10 +3157,7 @@ static void ScriptCmd_jumpargeq(void)
static void ScriptCmd_jumpifcontest(void)
{
sBattleAnimScriptPtr++;
if (IsContest())
sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr);
else
sBattleAnimScriptPtr += 4;
sBattleAnimScriptPtr += 5;
}
static void ScriptCmd_monbgprio_28(void)
@@ -3190,7 +3175,7 @@ static void ScriptCmd_monbgprio_28(void)
battlerId = gBattleAnimAttacker;
battlerPosition = GetBattlerPosition(battlerId);
if (!IsContest() && (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_OPPONENT_RIGHT))
if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_OPPONENT_RIGHT)
{
SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
SetAnimBgAttribute(2, BG_ANIM_PRIORITY, 2);
@@ -3200,11 +3185,8 @@ static void ScriptCmd_monbgprio_28(void)
static void ScriptCmd_monbgprio_29(void)
{
sBattleAnimScriptPtr++;
if (!IsContest())
{
SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
SetAnimBgAttribute(2, BG_ANIM_PRIORITY, 2);
}
SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
SetAnimBgAttribute(2, BG_ANIM_PRIORITY, 2);
}
static void ScriptCmd_monbgprio_2A(void)
@@ -3223,7 +3205,7 @@ static void ScriptCmd_monbgprio_2A(void)
battlerId = gBattleAnimAttacker;
battlerPosition = GetBattlerPosition(battlerId);
if (!IsContest() && (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_OPPONENT_RIGHT))
if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_OPPONENT_RIGHT)
{
SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
SetAnimBgAttribute(2, BG_ANIM_PRIORITY, 2);
@@ -3261,7 +3243,7 @@ static void ScriptCmd_doublebattle_2D(void)
wantedBattler = sBattleAnimScriptPtr[1];
sBattleAnimScriptPtr += 2;
if (!IsContest() && IsDoubleBattle()
if (IsDoubleBattle()
&& GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
{
if (wantedBattler == ANIM_ATTACKER)
@@ -3296,7 +3278,7 @@ static void ScriptCmd_doublebattle_2E(void)
wantedBattler = sBattleAnimScriptPtr[1];
sBattleAnimScriptPtr += 2;
if (!IsContest() && IsDoubleBattle()
if (IsDoubleBattle()
&& GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
{
if (wantedBattler == ANIM_ATTACKER)
src/battle_anim_effects_1.c
+5617
View File
File diff suppressed because it is too large Load Diff
src/battle_anim_mons.c
+2 -2
View File
@@ -88,7 +88,7 @@ static const struct SpriteTemplate gUnknown_83AE054[] =
{
.tileTag = 0xD755,
.paletteTag = 0xD755,
.oam = &gOamData_83ACA40,
.oam = &gOamData_AffineNormal_ObjNormal_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -97,7 +97,7 @@ static const struct SpriteTemplate gUnknown_83AE054[] =
{
.tileTag = 0xD756,
.paletteTag = 0xD756,
.oam = &gOamData_83ACA40,
.oam = &gOamData_AffineNormal_ObjNormal_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
src/bug.c
+9 -9
View File
@@ -46,7 +46,7 @@ const struct SpriteTemplate gUnknown_83E7224 =
{
.tileTag = ANIM_TAG_HORN_HIT_2,
.paletteTag = ANIM_TAG_HORN_HIT_2,
.oam = &gOamData_83ACAB8,
.oam = &gOamData_AffineDouble_ObjNormal_32x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7218,
@@ -82,7 +82,7 @@ const struct SpriteTemplate gUnknown_83E7278 =
{
.tileTag = ANIM_TAG_NEEDLE,
.paletteTag = ANIM_TAG_NEEDLE,
.oam = &gOamData_83ACA30,
.oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E726C,
@@ -93,7 +93,7 @@ const struct SpriteTemplate gWebThreadSpriteTemplate =
{
.tileTag = ANIM_TAG_WEB_THREAD,
.paletteTag = ANIM_TAG_WEB_THREAD,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -104,7 +104,7 @@ const struct SpriteTemplate gUnknown_83E72A8 =
{
.tileTag = ANIM_TAG_STRING,
.paletteTag = ANIM_TAG_STRING,
.oam = &gOamData_83ACA00,
.oam = &gOamData_AffineOff_ObjNormal_64x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -127,7 +127,7 @@ const struct SpriteTemplate gSpiderWebSpriteTemplate =
{
.tileTag = ANIM_TAG_SPIDER_WEB,
.paletteTag = ANIM_TAG_SPIDER_WEB,
.oam = &gOamData_83ACBC0,
.oam = &gOamData_AffineDouble_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E72D8,
@@ -138,7 +138,7 @@ const struct SpriteTemplate gLinearStingerSpriteTemplate =
{
.tileTag = ANIM_TAG_NEEDLE,
.paletteTag = ANIM_TAG_NEEDLE,
.oam = &gOamData_83ACA30,
.oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -149,7 +149,7 @@ const struct SpriteTemplate gPinMissileSpriteTemplate =
{
.tileTag = ANIM_TAG_NEEDLE,
.paletteTag = ANIM_TAG_NEEDLE,
.oam = &gOamData_83ACA30,
.oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -160,7 +160,7 @@ const struct SpriteTemplate gIcicleSpearSpriteTemplate =
{
.tileTag = ANIM_TAG_ICICLE_SPEAR,
.paletteTag = ANIM_TAG_ICICLE_SPEAR,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -187,7 +187,7 @@ const struct SpriteTemplate gUnknown_83E7378 =
{
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_83ACB60,
.oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7374,
src/dark.c
+5 -5
View File
@@ -27,7 +27,7 @@ const struct SpriteTemplate gUnknown_83E7878 =
{
.tileTag = ANIM_TAG_TIED_BAG,
.paletteTag = ANIM_TAG_TIED_BAG,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -98,7 +98,7 @@ const struct SpriteTemplate gUnknown_83E7930 =
{
.tileTag = ANIM_TAG_SHARP_TEETH,
.paletteTag = ANIM_TAG_SHARP_TEETH,
.oam = &gOamData_83ACB60,
.oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7910,
@@ -109,7 +109,7 @@ const struct SpriteTemplate gUnknown_83E7948 =
{
.tileTag = ANIM_TAG_CLAMP,
.paletteTag = ANIM_TAG_CLAMP,
.oam = &gOamData_83ACB60,
.oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7910,
@@ -140,7 +140,7 @@ const struct SpriteTemplate gUnknown_83E7998 =
{
.tileTag = ANIM_TAG_SMALL_BUBBLES,
.paletteTag = ANIM_TAG_SMALL_BUBBLES,
.oam = &gOamData_83ACA30,
.oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7990,
@@ -177,7 +177,7 @@ const struct SpriteTemplate gUnknown_83E79E8 =
{
.tileTag = ANIM_TAG_CLAW_SLASH,
.paletteTag = ANIM_TAG_CLAW_SLASH,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E79E0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
src/dragon.c
+6 -6
View File
@@ -35,7 +35,7 @@ const struct SpriteTemplate gUnknown_83E772C =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E7728,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -88,7 +88,7 @@ const struct SpriteTemplate gUnknown_83E77A4 =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83ACA98,
.oam = &gOamData_AffineDouble_ObjNormal_32x32,
.anims = gUnknown_83E7764,
.images = NULL,
.affineAnims = gUnknown_83E779C,
@@ -114,7 +114,7 @@ const struct SpriteTemplate gUnknown_83E77D8 =
{
.tileTag = ANIM_TAG_FIRE_PLUME,
.paletteTag = ANIM_TAG_FIRE_PLUME,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E77D4,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -157,7 +157,7 @@ const struct SpriteTemplate gUnknown_83E7830 =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83ACA98,
.oam = &gOamData_AffineDouble_ObjNormal_32x32,
.anims = gUnknown_83E7800,
.images = NULL,
.affineAnims = gUnknown_83E7828,
@@ -168,7 +168,7 @@ const struct SpriteTemplate gUnknown_83E7848 =
{
.tileTag = ANIM_TAG_HOLLOW_ORB,
.paletteTag = ANIM_TAG_HOLLOW_ORB,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -179,7 +179,7 @@ const struct SpriteTemplate gUnknown_83E7860 =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E7728,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
src/electric.c
+18 -18
View File
@@ -53,7 +53,7 @@ const struct SpriteTemplate gUnknown_83E5F38 =
{
.tileTag = ANIM_TAG_LIGHTNING,
.paletteTag = ANIM_TAG_LIGHTNING,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5F34,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -77,7 +77,7 @@ const struct SpriteTemplate gUnknown_83E5F74 =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E5F70,
@@ -104,7 +104,7 @@ const struct SpriteTemplate gUnknown_83E5FAC =
{
.tileTag = ANIM_TAG_SHOCK,
.paletteTag = ANIM_TAG_SHOCK,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5FA8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -115,7 +115,7 @@ const struct SpriteTemplate gUnknown_83E5FC4 =
{
.tileTag = ANIM_TAG_SPARK_2,
.paletteTag = ANIM_TAG_SPARK_2,
.oam = &gOamData_83ACA30,
.oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -126,7 +126,7 @@ const struct SpriteTemplate gUnknown_83E5FDC =
{
.tileTag = ANIM_TAG_BLACK_BALL_2,
.paletteTag = ANIM_TAG_BLACK_BALL_2,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -148,7 +148,7 @@ const struct SpriteTemplate gUnknown_83E6008 =
{
.tileTag = ANIM_TAG_SPARK_2,
.paletteTag = ANIM_TAG_SPARK_2,
.oam = &gOamData_83ACA30,
.oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E6004,
@@ -185,7 +185,7 @@ const struct SpriteTemplate gUnknown_83E6058 =
{
.tileTag = ANIM_TAG_SHOCK_3,
.paletteTag = ANIM_TAG_SHOCK_3,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E6030,
.images = NULL,
.affineAnims = gUnknown_83E6054,
@@ -196,7 +196,7 @@ const struct SpriteTemplate gUnknown_83E6070 =
{
.tileTag = ANIM_TAG_SPARK_2,
.paletteTag = ANIM_TAG_SPARK_2,
.oam = &gOamData_83ACA30,
.oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E6004,
@@ -207,7 +207,7 @@ const struct SpriteTemplate gElectricitySpriteTemplate =
{
.tileTag = ANIM_TAG_SPARK_2,
.paletteTag = ANIM_TAG_SPARK_2,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -218,7 +218,7 @@ static const struct SpriteTemplate gUnknown_83E60A0 =
{
.tileTag = ANIM_TAG_SPARK,
.paletteTag = ANIM_TAG_SPARK,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -229,7 +229,7 @@ const struct SpriteTemplate gUnknown_83E60B8 =
{
.tileTag = ANIM_TAG_SPARK_H,
.paletteTag = ANIM_TAG_SPARK_H,
.oam = &gOamData_83AC9F8,
.oam = &gOamData_AffineOff_ObjNormal_32x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -284,7 +284,7 @@ static const struct SpriteTemplate gUnknown_83E6120 =
{
.tileTag = ANIM_TAG_ELECTRIC_ORBS,
.paletteTag = ANIM_TAG_ELECTRIC_ORBS,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gUnknown_83E6118,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -332,7 +332,7 @@ const struct SpriteTemplate gUnknown_83E61D4 =
{
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_83ACB60,
.oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E61C8,
@@ -357,7 +357,7 @@ const struct SpriteTemplate gUnknown_83E6204 =
{
.tileTag = ANIM_TAG_ELECTRICITY,
.paletteTag = ANIM_TAG_ELECTRICITY,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E6200,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -368,7 +368,7 @@ const struct SpriteTemplate gUnknown_83E621C =
{
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_83ACB60,
.oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E61C8,
@@ -422,7 +422,7 @@ static const struct SpriteTemplate gUnknown_83E6278 =
{
.tileTag = ANIM_TAG_SPARK,
.paletteTag = ANIM_TAG_SPARK,
.oam = &gOamData_83ACAC8,
.oam = &gOamData_AffineDouble_ObjNormal_8x16,
.anims = gUnknown_83E6254,
.images = NULL,
.affineAnims = gUnknown_83E6274,
@@ -433,7 +433,7 @@ const struct SpriteTemplate gUnknown_83E6290 =
{
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_83ACB60,
.oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E61C8,
@@ -444,7 +444,7 @@ static const struct SpriteTemplate gUnknown_83E62A8 =
{
.tileTag = ANIM_TAG_SPARK,
.paletteTag = ANIM_TAG_SPARK,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
src/fighting.c
+20 -20
View File
@@ -39,7 +39,7 @@ const struct SpriteTemplate gUnknown_83E668C =
{
.tileTag = ANIM_TAG_HUMANOID_FOOT,
.paletteTag = ANIM_TAG_HUMANOID_FOOT,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -97,7 +97,7 @@ const struct SpriteTemplate gUnknown_83E66E0 =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66CC,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -108,7 +108,7 @@ const struct SpriteTemplate gUnknown_83E66F8 =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66CC,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -119,7 +119,7 @@ const struct SpriteTemplate gFistFootSpriteTemplate =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66CC,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -130,7 +130,7 @@ const struct SpriteTemplate gUnknown_83E6728 =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66CC,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -141,7 +141,7 @@ const struct SpriteTemplate gUnknown_83E6740 =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66D8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -152,7 +152,7 @@ const struct SpriteTemplate gUnknown_83E6758 =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66D0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -175,7 +175,7 @@ const struct SpriteTemplate gUnknown_83E678C =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_83ACA98,
.oam = &gOamData_AffineDouble_ObjNormal_32x32,
.anims = gUnknown_83E66CC,
.images = NULL,
.affineAnims = gUnknown_83E6788,
@@ -198,7 +198,7 @@ const struct SpriteTemplate gMegaPunchKickSpriteTemplate =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_83ACA98,
.oam = &gOamData_AffineDouble_ObjNormal_32x32,
.anims = gUnknown_83E66CC,
.images = NULL,
.affineAnims = gUnknown_83E67BC,
@@ -209,7 +209,7 @@ const struct SpriteTemplate gUnknown_83E67D8 =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66D0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -220,7 +220,7 @@ const struct SpriteTemplate gUnknown_83E67F0 =
{
.tileTag = ANIM_TAG_DUCK,
.paletteTag = ANIM_TAG_DUCK,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -231,7 +231,7 @@ const struct SpriteTemplate gUnknown_83E6808 =
{
.tileTag = ANIM_TAG_BLUE_LIGHT_WALL,
.paletteTag = ANIM_TAG_BLUE_LIGHT_WALL,
.oam = &gOamData_83ACB00,
.oam = &gOamData_AffineOff_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -242,7 +242,7 @@ const struct SpriteTemplate gUnknown_83E6820 =
{
.tileTag = ANIM_TAG_TORN_METAL,
.paletteTag = ANIM_TAG_TORN_METAL,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -267,7 +267,7 @@ const struct SpriteTemplate gUnknown_83E6864 =
{
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_83ACBC0,
.oam = &gOamData_AffineDouble_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E6860,
@@ -278,7 +278,7 @@ const struct SpriteTemplate gUnknown_83E687C =
{
.tileTag = ANIM_TAG_FLAT_ROCK,
.paletteTag = ANIM_TAG_FLAT_ROCK,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -289,7 +289,7 @@ const struct SpriteTemplate gUnknown_83E6894 =
{
.tileTag = ANIM_TAG_METEOR,
.paletteTag = ANIM_TAG_METEOR,
.oam = &gOamData_83AC9E0,
.oam = &gOamData_AffineOff_ObjNormal_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -300,7 +300,7 @@ const struct SpriteTemplate gUnknown_83E68AC =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66CC,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -342,7 +342,7 @@ const struct SpriteTemplate gUnknown_83E6900 =
{
.tileTag = ANIM_TAG_PURPLE_SCRATCH,
.paletteTag = ANIM_TAG_PURPLE_SCRATCH,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E68F4,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -381,7 +381,7 @@ const struct SpriteTemplate gUnknown_83E6948 =
{
.tileTag = ANIM_TAG_PURPLE_SWIPE,
.paletteTag = ANIM_TAG_PURPLE_SWIPE,
.oam = &gOamData_83AC9E0,
.oam = &gOamData_AffineOff_ObjNormal_64x64,
.anims = gUnknown_83E693C,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -404,7 +404,7 @@ const struct SpriteTemplate gUnknown_83E697C =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_83ACA98,
.oam = &gOamData_AffineDouble_ObjNormal_32x32,
.anims = gUnknown_83E66CC,
.images = NULL,
.affineAnims = gUnknown_83E6978,
src/fire.c
+19 -19
View File
@@ -64,7 +64,7 @@ const struct SpriteTemplate gUnknown_83E5BE0 =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5BD8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -75,7 +75,7 @@ const struct SpriteTemplate gUnknown_83E5BF8 =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5BD8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -131,7 +131,7 @@ const struct SpriteTemplate gUnknown_83E5C70 =
{
.tileTag = ANIM_TAG_FIRE,
.paletteTag = ANIM_TAG_FIRE,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E5C34,
.images = NULL,
.affineAnims = gUnknown_83E5C6C,
@@ -142,7 +142,7 @@ const struct SpriteTemplate gUnknown_83E5C88 =
{
.tileTag = ANIM_TAG_FIRE,
.paletteTag = ANIM_TAG_FIRE,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5C34,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -153,7 +153,7 @@ const struct SpriteTemplate gUnknown_83E5CA0 =
{
.tileTag = ANIM_TAG_FIRE_PLUME,
.paletteTag = ANIM_TAG_FIRE_PLUME,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5C50,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -164,7 +164,7 @@ const struct SpriteTemplate gUnknown_83E5CB8 =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5C50,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -188,7 +188,7 @@ const struct SpriteTemplate gUnknown_83E5CE4 =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5CE0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -211,7 +211,7 @@ const struct SpriteTemplate gUnknown_83E5D18 =
{
.tileTag = ANIM_TAG_SUNLIGHT,
.paletteTag = ANIM_TAG_SUNLIGHT,
.oam = &gOamData_83ACB58,
.oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E5D14,
@@ -237,7 +237,7 @@ const struct SpriteTemplate gEmberSpriteTemplate =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -248,7 +248,7 @@ const struct SpriteTemplate gEmberFlareSpriteTemplate =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5D48,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -259,7 +259,7 @@ const struct SpriteTemplate gUnknown_83E5D7C =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5D48,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -270,7 +270,7 @@ const struct SpriteTemplate gUnknown_83E5D94 =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5D48,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -311,7 +311,7 @@ const struct SpriteTemplate gUnknown_83E5DE4 =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5DB8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -322,7 +322,7 @@ const struct SpriteTemplate gUnknown_83E5DFC =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5D48,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -333,7 +333,7 @@ const struct SpriteTemplate gUnknown_83E5E14 =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5D48,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -344,7 +344,7 @@ static const struct SpriteTemplate gUnknown_83E5E2C =
{
.tileTag = ANIM_TAG_WARM_ROCK,
.paletteTag = ANIM_TAG_WARM_ROCK,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -366,7 +366,7 @@ const struct SpriteTemplate gUnknown_83E5E60 =
{
.tileTag = ANIM_TAG_WARM_ROCK,
.paletteTag = ANIM_TAG_WARM_ROCK,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -412,7 +412,7 @@ const struct SpriteTemplate gUnknown_83E5EB4 =
{
.tileTag = ANIM_TAG_WISP_ORB,
.paletteTag = ANIM_TAG_WISP_ORB,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_83E5EA4,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -437,7 +437,7 @@ const struct SpriteTemplate gUnknown_83E5EE4 =
{
.tileTag = ANIM_TAG_WISP_FIRE,
.paletteTag = ANIM_TAG_WISP_FIRE,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5EE0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
src/flying.c
+16 -16
View File
@@ -39,7 +39,7 @@ const struct SpriteTemplate gUnknown_83E6AE8 =
{
.tileTag = ANIM_TAG_GUST,
.paletteTag = ANIM_TAG_GUST,
.oam = &gOamData_83ACA20,
.oam = &gOamData_AffineOff_ObjNormal_32x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -62,7 +62,7 @@ const struct SpriteTemplate gUnknown_83E6B1C =
{
.tileTag = ANIM_TAG_GUST,
.paletteTag = ANIM_TAG_GUST,
.oam = &gOamData_83ACA80,
.oam = &gOamData_AffineNormal_ObjNormal_32x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E6B18,
@@ -87,7 +87,7 @@ const struct SpriteTemplate gUnknown_83E6B4C =
{
.tileTag = ANIM_TAG_AIR_WAVE_2,
.paletteTag = ANIM_TAG_AIR_WAVE_2,
.oam = &gOamData_83AC9F8,
.oam = &gOamData_AffineOff_ObjNormal_32x16,
.anims = gUnknown_83E6B48,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -130,7 +130,7 @@ const struct SpriteTemplate gUnknown_83E6BB8 =
{
.tileTag = ANIM_TAG_ROUND_SHADOW,
.paletteTag = ANIM_TAG_ROUND_SHADOW,
.oam = &gOamData_83ACAA0,
.oam = &gOamData_AffineDouble_ObjNormal_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E6B8C,
@@ -141,7 +141,7 @@ const struct SpriteTemplate gUnknown_83E6BD0 =
{
.tileTag = ANIM_TAG_ROUND_SHADOW,
.paletteTag = ANIM_TAG_ROUND_SHADOW,
.oam = &gOamData_83ACA40,
.oam = &gOamData_AffineNormal_ObjNormal_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E6BB0,
@@ -170,7 +170,7 @@ const struct SpriteTemplate gUnknown_83E6C00 =
{
.tileTag = ANIM_TAG_WHITE_FEATHER,
.paletteTag = ANIM_TAG_WHITE_FEATHER,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E6BF8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -184,7 +184,7 @@ const struct SpriteTemplate gUnknown_83E6C38 =
{
.tileTag = ANIM_TAG_SMALL_BUBBLES,
.paletteTag = ANIM_TAG_SMALL_BUBBLES,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -195,7 +195,7 @@ const struct SpriteTemplate gUnknown_83E6C50 =
{
.tileTag = ANIM_TAG_WHITE_FEATHER,
.paletteTag = ANIM_TAG_WHITE_FEATHER,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E6BF8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -221,7 +221,7 @@ const struct SpriteTemplate gUnknown_83E6C84 =
{
.tileTag = ANIM_TAG_WHIRLWIND_LINES,
.paletteTag = ANIM_TAG_WHIRLWIND_LINES,
.oam = &gOamData_83AC9F8,
.oam = &gOamData_AffineOff_ObjNormal_32x16,
.anims = gUnknown_83E6C80,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -247,7 +247,7 @@ const struct SpriteTemplate gUnknown_83E6CD0 =
{
.tileTag = ANIM_TAG_ROUND_SHADOW,
.paletteTag = ANIM_TAG_ROUND_SHADOW,
.oam = &gOamData_83ACAA0,
.oam = &gOamData_AffineDouble_ObjNormal_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E6CCC,
@@ -269,7 +269,7 @@ const struct SpriteTemplate gUnknown_83E6CFC =
{
.tileTag = ANIM_TAG_ROUND_SHADOW,
.paletteTag = ANIM_TAG_ROUND_SHADOW,
.oam = &gOamData_83ACAA0,
.oam = &gOamData_AffineDouble_ObjNormal_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E6CF8,
@@ -294,7 +294,7 @@ const struct SpriteTemplate gUnknown_83E6D40 =
{
.tileTag = ANIM_TAG_ROUND_SHADOW,
.paletteTag = ANIM_TAG_ROUND_SHADOW,
.oam = &gOamData_83ACAA0,
.oam = &gOamData_AffineDouble_ObjNormal_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E6D3C,
@@ -320,7 +320,7 @@ const struct SpriteTemplate gUnknown_83E6D7C =
{
.tileTag = ANIM_TAG_SPLASH,
.paletteTag = ANIM_TAG_SPLASH,
.oam = &gOamData_83ACAA0,
.oam = &gOamData_AffineDouble_ObjNormal_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -331,7 +331,7 @@ const struct SpriteTemplate gUnknown_83E6D94 =
{
.tileTag = ANIM_TAG_SWEAT_BEAD,
.paletteTag = ANIM_TAG_SWEAT_BEAD,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -342,7 +342,7 @@ const struct SpriteTemplate gUnknown_83E6DAC =
{
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_83ACB00,
.oam = &gOamData_AffineOff_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -353,7 +353,7 @@ const struct SpriteTemplate gUnknown_83E6DB4 =
{
.tileTag = ANIM_TAG_BIRD,
.paletteTag = ANIM_TAG_BIRD,
.oam = &gOamData_83ACAA0,
.oam = &gOamData_AffineDouble_ObjNormal_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
src/ghost.c
+9 -9
View File
@@ -63,7 +63,7 @@ const struct SpriteTemplate gUnknown_83E75C4 =
{
.tileTag = ANIM_TAG_YELLOW_BALL,
.paletteTag = ANIM_TAG_YELLOW_BALL,
.oam = &gOamData_83ACA90,
.oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E75C0,
@@ -74,7 +74,7 @@ const struct SpriteTemplate gUnknown_83E75DC =
{
.tileTag = ANIM_TAG_YELLOW_BALL,
.paletteTag = ANIM_TAG_YELLOW_BALL,
.oam = &gOamData_83ACAF0,
.oam = &gOamData_AffineOff_ObjBlend_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -96,7 +96,7 @@ const struct SpriteTemplate gShadowBallSpriteTemplate =
{
.tileTag = ANIM_TAG_SHADOW_BALL,
.paletteTag = ANIM_TAG_SHADOW_BALL,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7604,
@@ -122,7 +122,7 @@ const struct SpriteTemplate gUnknown_83E763C =
{
.tileTag = ANIM_TAG_LICK,
.paletteTag = ANIM_TAG_LICK,
.oam = &gOamData_83ACA18,
.oam = &gOamData_AffineOff_ObjNormal_16x32,
.anims = gUnknown_83E7638,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -146,7 +146,7 @@ const struct SpriteTemplate gUnknown_83E7668 =
{
.tileTag = ANIM_TAG_WHITE_SHADOW,
.paletteTag = ANIM_TAG_WHITE_SHADOW,
.oam = &gOamData_83ACB20,
.oam = &gOamData_AffineOff_ObjBlend_64x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -157,7 +157,7 @@ const struct SpriteTemplate gUnknown_83E7680 =
{
.tileTag = ANIM_TAG_NAIL,
.paletteTag = ANIM_TAG_NAIL,
.oam = &gOamData_83ACB18,
.oam = &gOamData_AffineOff_ObjBlend_32x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -168,7 +168,7 @@ const struct SpriteTemplate gUnknown_83E7698 =
{
.tileTag = ANIM_TAG_GHOSTLY_SPIRIT,
.paletteTag = ANIM_TAG_GHOSTLY_SPIRIT,
.oam = &gOamData_83ACAF8,
.oam = &gOamData_AffineOff_ObjBlend_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -179,7 +179,7 @@ const struct SpriteTemplate gUnknown_83E76B0 =
{
.tileTag = ANIM_TAG_DEVIL,
.paletteTag = ANIM_TAG_DEVIL,
.oam = &gOamData_83ACAF8,
.oam = &gOamData_AffineOff_ObjBlend_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -204,7 +204,7 @@ const struct SpriteTemplate gUnknown_83E76E0 =
{
.tileTag = ANIM_TAG_PURPLE_FLAME,
.paletteTag = ANIM_TAG_PURPLE_FLAME,
.oam = &gOamData_83ACB38,
.oam = &gOamData_AffineOff_ObjBlend_16x32,
.anims = gUnknown_83E76DC,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
src/ground.c
+7 -7
View File
@@ -52,7 +52,7 @@ const struct SpriteTemplate gUnknown_83E7A28 =
{
.tileTag = ANIM_TAG_BONE,
.paletteTag = ANIM_TAG_BONE,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7A20,
@@ -63,7 +63,7 @@ const struct SpriteTemplate gUnknown_83E7A40 =
{
.tileTag = ANIM_TAG_BONE,
.paletteTag = ANIM_TAG_BONE,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7A24,
@@ -74,7 +74,7 @@ const struct SpriteTemplate gUnknown_83E7A58 =
{
.tileTag = ANIM_TAG_MUD_SAND,
.paletteTag = ANIM_TAG_MUD_SAND,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -96,7 +96,7 @@ const struct SpriteTemplate gUnknown_83E7A7C =
{
.tileTag = ANIM_TAG_MUD_SAND,
.paletteTag = ANIM_TAG_MUD_SAND,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_83E7A78,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -107,7 +107,7 @@ const struct SpriteTemplate gUnknown_83E7A94 =
{
.tileTag = ANIM_TAG_MUD_SAND,
.paletteTag = ANIM_TAG_MUD_SAND,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -118,7 +118,7 @@ const struct SpriteTemplate gUnknown_83E7AAC =
{
.tileTag = ANIM_TAG_MUD_SAND,
.paletteTag = ANIM_TAG_MUD_SAND,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -129,7 +129,7 @@ const struct SpriteTemplate gUnknown_83E7AC4 =
{
.tileTag = ANIM_TAG_DIRT_MOUND,
.paletteTag = ANIM_TAG_DIRT_MOUND,
.oam = &gOamData_83AC9F8,
.oam = &gOamData_AffineOff_ObjNormal_32x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
src/ice.c
+19 -19
View File
@@ -66,7 +66,7 @@ static const struct SpriteTemplate gUnknown_83E62D0 =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -155,7 +155,7 @@ const struct SpriteTemplate gUnknown_83E6348 =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_83ACBE8,
.oam = &gOamData_AffineDouble_ObjBlend_8x16,
.anims = gUnknown_83E6320,
.images = NULL,
.affineAnims = gUnknown_83E6344,
@@ -166,7 +166,7 @@ const struct SpriteTemplate gUnknown_83E6360 =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_83ACAE8,
.oam = &gOamData_AffineOff_ObjBlend_8x8,
.anims = gUnknown_83E6324,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -188,7 +188,7 @@ const struct SpriteTemplate gUnknown_83E638C =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_83ACB88,
.oam = &gOamData_AffineNormal_ObjBlend_8x16,
.anims = gUnknown_83E6320,
.images = NULL,
.affineAnims = gUnknown_83E6388,
@@ -199,7 +199,7 @@ const struct SpriteTemplate gUnknown_83E63A4 =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_83ACAE8,
.oam = &gOamData_AffineOff_ObjBlend_8x8,
.anims = gUnknown_83E6324,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -223,7 +223,7 @@ const struct SpriteTemplate gUnknown_83E63E0 =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_83ACB88,
.oam = &gOamData_AffineNormal_ObjBlend_8x16,
.anims = gUnknown_83E6320,
.images = NULL,
.affineAnims = gUnknown_83E63DC,
@@ -234,7 +234,7 @@ const struct SpriteTemplate gUnknown_83E63F8 =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_83ACB48,
.oam = &gOamData_AffineNormal_ObjBlend_8x8,
.anims = gUnknown_83E6324,
.images = NULL,
.affineAnims = gUnknown_83E63DC,
@@ -245,7 +245,7 @@ const struct SpriteTemplate gUnknown_83E6410 =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gUnknown_83E6328,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -256,7 +256,7 @@ const struct SpriteTemplate gUnknown_83E6428 =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_83E632C,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -267,7 +267,7 @@ const struct SpriteTemplate gUnknown_83E6440 =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gUnknown_83E6328,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -295,7 +295,7 @@ const struct SpriteTemplate gUnknown_83E647C =
{
.tileTag = ANIM_TAG_ICE_SPIKES,
.paletteTag = ANIM_TAG_ICE_SPIKES,
.oam = &gOamData_83ACB28,
.oam = &gOamData_AffineOff_ObjBlend_8x16,
.anims = gUnknown_83E6478,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -318,7 +318,7 @@ const struct SpriteTemplate gUnknown_83E64A4 =
{
.tileTag = ANIM_TAG_MIST_CLOUD,
.paletteTag = ANIM_TAG_MIST_CLOUD,
.oam = &gOamData_83ACB18,
.oam = &gOamData_AffineOff_ObjBlend_32x16,
.anims = gUnknown_83E64A0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -329,7 +329,7 @@ const struct SpriteTemplate gUnknown_83E64BC =
{
.tileTag = ANIM_TAG_PURPLE_GAS_CLOUD,
.paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD,
.oam = &gOamData_83ACB18,
.oam = &gOamData_AffineOff_ObjBlend_32x16,
.anims = gUnknown_83E64A0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -345,7 +345,7 @@ const struct SpriteTemplate gUnknown_83E64E8 =
{
.tileTag = ANIM_TAG_SMALL_BUBBLES,
.paletteTag = ANIM_TAG_SMALL_BUBBLES,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -361,7 +361,7 @@ const struct SpriteTemplate gUnknown_83E6514 =
{
.tileTag = ANIM_TAG_PURPLE_GAS_CLOUD,
.paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD,
.oam = &gOamData_83ACB18,
.oam = &gOamData_AffineOff_ObjBlend_32x16,
.anims = gUnknown_83E64A0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -422,7 +422,7 @@ static const struct SpriteTemplate gUnknown_83E65A4 =
{
.tileTag = ANIM_TAG_HAIL,
.paletteTag = ANIM_TAG_HAIL,
.oam = &gOamData_83ACA30,
.oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E6594,
@@ -433,7 +433,7 @@ const struct SpriteTemplate gUnknown_83E65BC =
{
.tileTag = ANIM_TAG_HAIL,
.paletteTag = ANIM_TAG_HAIL,
.oam = &gOamData_83ACA30,
.oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E65A0,
@@ -504,7 +504,7 @@ const struct SpriteTemplate gUnknown_83E665C =
{
.tileTag = ANIM_TAG_ICE_CHUNK,
.paletteTag = ANIM_TAG_ICE_CHUNK,
.oam = &gOamData_83ACA98,
.oam = &gOamData_AffineDouble_ObjNormal_32x32,
.anims = gUnknown_83E65F0,
.images = NULL,
.affineAnims = gUnknown_83E6648,
@@ -515,7 +515,7 @@ const struct SpriteTemplate gUnknown_83E6674 =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gUnknown_83E6324,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
src/mevent_8145654.c
+2 -2
View File
@@ -59,7 +59,7 @@ void sub_8145D18(u8 whichWindow);
void sub_8146060(void);
void sub_81461D8(void);
extern const struct OamData gOamData_83AC9F8;
extern const struct OamData gOamData_AffineOff_ObjNormal_32x16;
const u8 gUnknown_8467068[][3] = {
{0, 2, 3},
@@ -114,7 +114,7 @@ const struct SpritePalette gUnknown_8467F60[] = {
{gUnknown_8467ED4, 0x8000}
};
const struct SpriteTemplate gUnknown_8467FA0 = {
0x8000, 0x8000, &gOamData_83AC9F8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
0x8000, 0x8000, &gOamData_AffineOff_ObjNormal_32x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
};
const struct UnkStruct_8467FB8 gUnknown_8467FB8[8] = {
{1, 0, 0, 0, gUnknown_846718C, gUnknown_8467288, gUnknown_846708C},
src/normal.c
+10 -10
View File
@@ -63,7 +63,7 @@ const struct SpriteTemplate gConfusionDuckSpriteTemplate =
{
.tileTag = ANIM_TAG_DUCK,
.paletteTag = ANIM_TAG_DUCK,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_83E7B04,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -111,7 +111,7 @@ const struct SpriteTemplate gUnknown_83E7B70 =
{
.tileTag = ANIM_TAG_SPARKLE_4,
.paletteTag = ANIM_TAG_SPARKLE_4,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E7B6C,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -168,7 +168,7 @@ const struct SpriteTemplate gBasicHitSplatSpriteTemplate =
{
.tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT,
.oam = &gOamData_83ACB58,
.oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7BF8,
@@ -179,7 +179,7 @@ const struct SpriteTemplate gUnknown_83E7C20 =
{
.tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT,
.oam = &gOamData_83ACB58,
.oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7BF8,
@@ -190,7 +190,7 @@ const struct SpriteTemplate gUnknown_83E7C38 =
{
.tileTag = ANIM_TAG_WATER_IMPACT,
.paletteTag = ANIM_TAG_WATER_IMPACT,
.oam = &gOamData_83ACB58,
.oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7BF8,
@@ -201,7 +201,7 @@ const struct SpriteTemplate gUnknown_83E7C50 =
{
.tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT,
.oam = &gOamData_83ACB58,
.oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7BF8,
@@ -212,7 +212,7 @@ const struct SpriteTemplate gUnknown_83E7C68 =
{
.tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT,
.oam = &gOamData_83ACB58,
.oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7BF8,
@@ -223,7 +223,7 @@ const struct SpriteTemplate gUnknown_83E7C80 =
{
.tileTag = ANIM_TAG_CROSS_IMPACT,
.paletteTag = ANIM_TAG_CROSS_IMPACT,
.oam = &gOamData_83ACAF8,
.oam = &gOamData_AffineOff_ObjBlend_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -234,7 +234,7 @@ const struct SpriteTemplate gUnknown_83E7C98 =
{
.tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7BF8,
@@ -245,7 +245,7 @@ const struct SpriteTemplate gUnknown_83E7CB0 =
{
.tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT,
.oam = &gOamData_83ACB58,
.oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7BF8,
src/oak_speech.c
+10 -10
View File
@@ -328,12 +328,12 @@ static const union AnimCmd *const sGrassPlatformAnims3[] = {
sGrassPlatformAnim3
};
extern const struct OamData gOamData_83ACAF8;
extern const struct OamData gOamData_AffineOff_ObjBlend_32x32;
static const struct SpriteTemplate sOakSpeech_GrassPlatformSpriteTemplates[3] = {
{ 0x1000, 0x1000, &gOamData_83ACAF8, sGrassPlatformAnims1, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
{ 0x1000, 0x1000, &gOamData_83ACAF8, sGrassPlatformAnims2, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
{ 0x1000, 0x1000, &gOamData_83ACAF8, sGrassPlatformAnims3, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
{ 0x1000, 0x1000, &gOamData_AffineOff_ObjBlend_32x32, sGrassPlatformAnims1, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
{ 0x1000, 0x1000, &gOamData_AffineOff_ObjBlend_32x32, sGrassPlatformAnims2, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
{ 0x1000, 0x1000, &gOamData_AffineOff_ObjBlend_32x32, sGrassPlatformAnims3, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
};
static const union AnimCmd sPikaAnim1[] = {
@@ -389,14 +389,14 @@ static const union AnimCmd *const sPikaAnims3[] = {
sPikaAnim3
};
extern const struct OamData gOamData_83AC9D8;
extern const struct OamData gOamData_83AC9F8;
extern const struct OamData gOamData_83AC9E8;
extern const struct OamData gOamData_AffineOff_ObjNormal_32x32;
extern const struct OamData gOamData_AffineOff_ObjNormal_32x16;
extern const struct OamData gOamData_AffineOff_ObjNormal_16x8;
static const struct SpriteTemplate sOakSpeech_PikaSpriteTemplates[3] = {
{ 0x1001, 0x1001, &gOamData_83AC9D8, sPikaAnims1, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
{ 0x1002, 0x1001, &gOamData_83AC9F8, sPikaAnims2, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
{ 0x1003, 0x1001, &gOamData_83AC9E8, sPikaAnims3, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }
{ 0x1001, 0x1001, &gOamData_AffineOff_ObjNormal_32x32, sPikaAnims1, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
{ 0x1002, 0x1001, &gOamData_AffineOff_ObjNormal_32x16, sPikaAnims2, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy },
{ 0x1003, 0x1001, &gOamData_AffineOff_ObjNormal_16x8, sPikaAnims3, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }
};
static const u8 *const sHelpDocsPtrs[] = {
src/poison.c
+7 -7
View File
@@ -30,7 +30,7 @@ const struct SpriteTemplate gUnknown_83E69AC =
{
.tileTag = ANIM_TAG_TOXIC_BUBBLE,
.paletteTag = ANIM_TAG_TOXIC_BUBBLE,
.oam = &gOamData_83ACA18,
.oam = &gOamData_AffineOff_ObjNormal_16x32,
.anims = gUnknown_83E69A8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -98,7 +98,7 @@ const struct SpriteTemplate gUnknown_83E6A20 =
{
.tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE,
.oam = &gOamData_83ACA90,
.oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = gUnknown_83E69DC,
.images = NULL,
.affineAnims = gUnknown_83E6A18,
@@ -109,7 +109,7 @@ const struct SpriteTemplate gUnknown_83E6A38 =
{
.tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE,
.oam = &gOamData_83ACA90,
.oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = gUnknown_83E69DC,
.images = NULL,
.affineAnims = gUnknown_83E6A18,
@@ -120,7 +120,7 @@ const struct SpriteTemplate gUnknown_83E6A50 =
{
.tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE,
.oam = &gOamData_83ACA30,
.oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gUnknown_83E69E4,
.images = NULL,
.affineAnims = gUnknown_83E6A1C,
@@ -143,7 +143,7 @@ const struct SpriteTemplate gUnknown_83E6A84 =
{
.tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE,
.oam = &gOamData_83ACA90,
.oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = gUnknown_83E69E0,
.images = NULL,
.affineAnims = gUnknown_83E6A80,
@@ -166,7 +166,7 @@ const struct SpriteTemplate gPoisonBubbleSpriteTemplate =
{
.tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE,
.oam = &gOamData_83ACA30,
.oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gUnknown_83E69DC,
.images = NULL,
.affineAnims = gUnknown_83E6AB4,
@@ -177,7 +177,7 @@ const struct SpriteTemplate gWaterBubbleSpriteTemplate =
{
.tileTag = ANIM_TAG_SMALL_BUBBLES,
.paletteTag = ANIM_TAG_SMALL_BUBBLES,
.oam = &gOamData_83ACB50,
.oam = &gOamData_AffineNormal_ObjBlend_16x16,
.anims = gUnknown_83E5A78,
.images = NULL,
.affineAnims = gUnknown_83E6AB4,
src/psychic.c
+16 -16
View File
@@ -43,7 +43,7 @@ const struct SpriteTemplate gUnknown_83E6DF8 =
{
.tileTag = ANIM_TAG_SPIRAL,
.paletteTag = ANIM_TAG_SPIRAL,
.oam = &gOamData_83ACB60,
.oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E6DF4,
@@ -54,7 +54,7 @@ const struct SpriteTemplate gUnknown_83E6E10 =
{
.tileTag = ANIM_TAG_GREEN_LIGHT_WALL,
.paletteTag = ANIM_TAG_GREEN_LIGHT_WALL,
.oam = &gOamData_83ACB00,
.oam = &gOamData_AffineOff_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -65,7 +65,7 @@ const struct SpriteTemplate gUnknown_83E6E28 =
{
.tileTag = ANIM_TAG_BLUE_LIGHT_WALL,
.paletteTag = ANIM_TAG_BLUE_LIGHT_WALL,
.oam = &gOamData_83ACB00,
.oam = &gOamData_AffineOff_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -76,7 +76,7 @@ const struct SpriteTemplate gUnknown_83E6E40 =
{
.tileTag = ANIM_TAG_RED_LIGHT_WALL,
.paletteTag = ANIM_TAG_RED_LIGHT_WALL,
.oam = &gOamData_83ACB00,
.oam = &gOamData_AffineOff_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -87,7 +87,7 @@ const struct SpriteTemplate gUnknown_83E6E58 =
{
.tileTag = ANIM_TAG_GRAY_LIGHT_WALL,
.paletteTag = ANIM_TAG_GRAY_LIGHT_WALL,
.oam = &gOamData_83ACB00,
.oam = &gOamData_AffineOff_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -98,7 +98,7 @@ const struct SpriteTemplate gUnknown_83E6E70 =
{
.tileTag = ANIM_TAG_ORANGE_LIGHT_WALL,
.paletteTag = ANIM_TAG_ORANGE_LIGHT_WALL,
.oam = &gOamData_83ACB00,
.oam = &gOamData_AffineOff_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -124,7 +124,7 @@ const struct SpriteTemplate gUnknown_83E6EA4 =
{
.tileTag = ANIM_TAG_SPARKLE_4,
.paletteTag = ANIM_TAG_SPARKLE_4,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E6EA0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -149,7 +149,7 @@ const struct SpriteTemplate gUnknown_83E6ED4 =
{
.tileTag = ANIM_TAG_SPARKLE_3,
.paletteTag = ANIM_TAG_SPARKLE_3,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_83E6ED0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -160,7 +160,7 @@ const struct SpriteTemplate gUnknown_83E6EEC =
{
.tileTag = ANIM_TAG_GOLD_RING,
.paletteTag = ANIM_TAG_GOLD_RING,
.oam = &gOamData_83ACA18,
.oam = &gOamData_AffineOff_ObjNormal_16x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -217,7 +217,7 @@ const struct SpriteTemplate gUnknown_83E6F8C =
{
.tileTag = ANIM_TAG_BENT_SPOON,
.paletteTag = ANIM_TAG_BENT_SPOON,
.oam = &gOamData_83ACA18,
.oam = &gOamData_AffineOff_ObjNormal_16x32,
.anims = gUnknown_83E6F84,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -259,7 +259,7 @@ const struct SpriteTemplate gUnknown_83E6FF4 =
{
.tileTag = ANIM_TAG_AMNESIA,
.paletteTag = ANIM_TAG_AMNESIA,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E6FC4,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -285,7 +285,7 @@ static const struct SpriteTemplate gUnknown_83E7044 =
{
.tileTag = ANIM_TAG_HOLLOW_ORB,
.paletteTag = ANIM_TAG_HOLLOW_ORB,
.oam = &gOamData_83ACAF0,
.oam = &gOamData_AffineOff_ObjBlend_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -296,7 +296,7 @@ const struct SpriteTemplate gUnknown_83E705C =
{
.tileTag = 0x280A,
.paletteTag = 0x280A,
.oam = &gOamData_83AC9E0,
.oam = &gOamData_AffineOff_ObjNormal_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -349,7 +349,7 @@ static const struct SpriteTemplate gUnknown_83E7114 =
{
.tileTag = ANIM_TAG_BLUEGREEN_ORB,
.paletteTag = ANIM_TAG_BLUEGREEN_ORB,
.oam = &gOamData_83ACA30,
.oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7104,
@@ -372,7 +372,7 @@ const struct SpriteTemplate gUnknown_83E7148 =
{
.tileTag = ANIM_TAG_WHITE_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_WHITE_CIRCLE_OF_LIGHT,
.oam = &gOamData_83ACBC0,
.oam = &gOamData_AffineDouble_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E7144,
@@ -410,7 +410,7 @@ const struct SpriteTemplate gUnknown_83E71D0 =
{
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_83ACBC0,
.oam = &gOamData_AffineDouble_ObjBlend_64x64,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_83E71C8,
src/rock.c
+14 -14
View File
@@ -55,7 +55,7 @@ const struct SpriteTemplate gUnknown_83E73B4 =
{
.tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E73A8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -66,7 +66,7 @@ const struct SpriteTemplate gUnknown_83E73CC =
{
.tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E73A8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -77,7 +77,7 @@ const struct SpriteTemplate gUnknown_83E73E4 =
{
.tileTag = ANIM_TAG_MUD_SAND,
.paletteTag = ANIM_TAG_MUD_SAND,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -101,7 +101,7 @@ const struct SpriteTemplate gUnknown_83E7420 =
{
.tileTag = ANIM_TAG_WATER_ORB,
.paletteTag = ANIM_TAG_WATER_ORB,
.oam = &gOamData_83ACB50,
.oam = &gOamData_AffineNormal_ObjBlend_16x16,
.anims = gUnknown_83E5958,
.images = NULL,
.affineAnims = gUnknown_83E741C,
@@ -112,7 +112,7 @@ const struct SpriteTemplate gUnknown_83E7438 =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5D48,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -123,7 +123,7 @@ const struct SpriteTemplate gUnknown_83E7450 =
{
.tileTag = ANIM_TAG_FLYING_DIRT,
.paletteTag = ANIM_TAG_FLYING_DIRT,
.oam = &gOamData_83AC9F8,
.oam = &gOamData_AffineOff_ObjNormal_32x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -213,7 +213,7 @@ const struct SpriteTemplate gUnknown_83E74C0 =
{
.tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E74A8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -224,7 +224,7 @@ const struct SpriteTemplate gUnknown_83E74D8 =
{
.tileTag = ANIM_TAG_MUD_SAND,
.paletteTag = ANIM_TAG_MUD_SAND,
.oam = &gOamData_83AC9C8,
.oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -235,7 +235,7 @@ const struct SpriteTemplate gUnknown_83E74F0 =
{
.tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -246,7 +246,7 @@ const struct SpriteTemplate gUnknown_83E7508 =
{
.tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E74A8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
@@ -275,7 +275,7 @@ const struct SpriteTemplate gUnknown_83E7548 =
{
.tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E74A8,
.images = NULL,
.affineAnims = gUnknown_83E7540,
@@ -286,7 +286,7 @@ const struct SpriteTemplate gUnknown_83E7560 =
{
.tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E74A8,
.images = NULL,
.affineAnims = gUnknown_83E7540,
@@ -297,7 +297,7 @@ const struct SpriteTemplate gUnknown_83E7578 =
{
.tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_83AC9D8,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E74B8,
.images = NULL,
.affineAnims = gUnknown_83E7540,
@@ -308,7 +308,7 @@ const struct SpriteTemplate gUnknown_83E7590 =
{
.tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_83ACA38,
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E74B0,
.images = NULL,
.affineAnims = gUnknown_83E7540,
src/text.c
+2 -2
View File
@@ -15,7 +15,7 @@
#include "constants/songs.h"
extern u8 gGlyphInfo[0x90];
extern const struct OamData gOamData_83AC9D0;
extern const struct OamData gOamData_AffineOff_ObjNormal_16x16;
static void DecompressGlyphFont3(u16 glyphId, bool32 isJapanese);
static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese);
@@ -59,7 +59,7 @@ const struct SpriteTemplate gUnknown_81EA6B4 =
{
.tileTag = 0x8000,
.paletteTag = 0x8000,
.oam = &gOamData_83AC9D0,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,