summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/hall_of_fame.c3
-rw-r--r--src/pokemon_3.c11
-rw-r--r--src/pokemon_animation.c2135
3 files changed, 1502 insertions, 647 deletions
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 3e70e22fa..38183e807 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -25,6 +25,7 @@
#include "random.h"
#include "event_data.h"
#include "overworld.h"
+#include "new_menu_helpers.h"
struct HallofFameMon
{
@@ -53,7 +54,6 @@ static EWRAM_DATA struct HofGfx *sHofGfxPtr = NULL;
extern bool8 gHasHallOfFameRecords;
extern u32 gUnknown_0203BCD4;
-extern u8 gDecompressionBuffer[];
extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern MainCallback gGameContinueCallback;
extern u32 gDamagedSaveSectors;
@@ -82,7 +82,6 @@ extern const u8 gContestConfetti_Gfx[];
extern const u8 gContestConfetti_Pal[];
extern void sub_81973C4(u8, u8);
-extern u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
extern void sub_8175620(void);
extern u8 TrySavingData(u8);
extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16);
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 95ec4b6a2..7ffb2f36a 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -74,8 +74,6 @@ extern u8 GetFrontierOpponentClass(u16 trainerId);
extern u8 pokemon_order_func(u8 bankPartyId);
extern void GetFrontierTrainerName(u8* dest, u16 trainerId);
extern void sub_81C488C(u8);
-extern void sub_817F578(struct Sprite*, u8 frontAnimId);
-extern u8 GetSpeciesBackAnimId(u16 species);
static void sub_806E6CC(u8 taskId);
@@ -1508,7 +1506,7 @@ static void Task_PokemonSummaryAnimateAfterDelay(u8 taskId)
{
if (--gTasks[taskId].data[3] == 0)
{
- sub_817F578(READ_PTR_FROM_TASK(taskId, 0), gTasks[taskId].data[2]);
+ StartMonSummaryAnimation(READ_PTR_FROM_TASK(taskId, 0), gTasks[taskId].data[2]);
sub_81C488C(0xFF);
DestroyTask(taskId);
}
@@ -1523,7 +1521,6 @@ void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u
}
extern void SpriteCallbackDummy_2(struct Sprite*);
-extern void sub_817F60C(struct Sprite*);
void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3)
{
@@ -1580,11 +1577,11 @@ void PokemonSummaryDoMonAnimation(struct Sprite* sprite, u16 species, bool8 oneF
gTasks[taskId].data[2] = gMonFrontAnimIdsTable[species - 1];
gTasks[taskId].data[3] = gMonAnimationDelayTable[species - 1];
sub_81C488C(taskId);
- sub_817F60C(sprite);
+ SetSpriteCB_MonAnimDummy(sprite);
}
else
{
- sub_817F578(sprite, gMonFrontAnimIdsTable[species - 1]);
+ StartMonSummaryAnimation(sprite, gMonFrontAnimIdsTable[species - 1]);
}
}
@@ -1603,7 +1600,7 @@ void BattleAnimateBackSprite(struct Sprite* sprite, u16 species)
}
else
{
- LaunchAnimationTaskForBackSprite(sprite, GetSpeciesBackAnimId(species));
+ LaunchAnimationTaskForBackSprite(sprite, GetSpeciesBackAnimSet(species));
sprite->callback = SpriteCallbackDummy_2;
}
}
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 67915d228..c8fcff93a 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -16,167 +16,171 @@ struct UnkAnimStruct
};
extern u16 gBattlePartyID[];
-extern bool32 gUnknown_03001274;
-extern struct UnkAnimStruct gUnknown_03001240[];
-extern u8 gUnknown_03001270;
// this file's functions
-void pokemonanimfunc_00(struct Sprite *sprite);
-void pokemonanimfunc_01(struct Sprite *sprite);
-void pokemonanimfunc_02(struct Sprite *sprite);
-void pokemonanimfunc_03(struct Sprite *sprite);
-void pokemonanimfunc_04(struct Sprite *sprite);
-void pokemonanimfunc_05(struct Sprite *sprite);
-void pokemonanimfunc_06(struct Sprite *sprite);
-void pokemonanimfunc_07(struct Sprite *sprite);
-void pokemonanimfunc_08(struct Sprite *sprite);
-void pokemonanimfunc_09(struct Sprite *sprite);
-void pokemonanimfunc_0A(struct Sprite *sprite);
-void pokemonanimfunc_0B(struct Sprite *sprite);
-void pokemonanimfunc_0C(struct Sprite *sprite);
-void pokemonanimfunc_0D(struct Sprite *sprite);
-void pokemonanimfunc_0E(struct Sprite *sprite);
-void pokemonanimfunc_0F(struct Sprite *sprite);
-void pokemonanimfunc_10(struct Sprite *sprite);
-void pokemonanimfunc_11(struct Sprite *sprite);
-void pokemonanimfunc_12(struct Sprite *sprite);
-void pokemonanimfunc_13(struct Sprite *sprite);
-void pokemonanimfunc_14(struct Sprite *sprite);
-void pokemonanimfunc_15(struct Sprite *sprite);
-void pokemonanimfunc_16(struct Sprite *sprite);
-void pokemonanimfunc_17(struct Sprite *sprite);
-void pokemonanimfunc_18(struct Sprite *sprite);
-void pokemonanimfunc_19(struct Sprite *sprite);
-void pokemonanimfunc_1A(struct Sprite *sprite);
-void pokemonanimfunc_1B(struct Sprite *sprite);
-void pokemonanimfunc_1C(struct Sprite *sprite);
-void pokemonanimfunc_1D(struct Sprite *sprite);
-void pokemonanimfunc_1E(struct Sprite *sprite);
-void pokemonanimfunc_1F(struct Sprite *sprite);
-void pokemonanimfunc_20(struct Sprite *sprite);
-void pokemonanimfunc_21(struct Sprite *sprite);
-void pokemonanimfunc_22(struct Sprite *sprite);
-void pokemonanimfunc_23(struct Sprite *sprite);
-void pokemonanimfunc_24(struct Sprite *sprite);
-void pokemonanimfunc_25(struct Sprite *sprite);
-void pokemonanimfunc_26(struct Sprite *sprite);
-void pokemonanimfunc_27(struct Sprite *sprite);
-void pokemonanimfunc_28(struct Sprite *sprite);
-void pokemonanimfunc_29(struct Sprite *sprite);
-void pokemonanimfunc_2A(struct Sprite *sprite);
-void pokemonanimfunc_2B(struct Sprite *sprite);
-void pokemonanimfunc_2C(struct Sprite *sprite);
-void pokemonanimfunc_2D(struct Sprite *sprite);
-void pokemonanimfunc_2E(struct Sprite *sprite);
-void pokemonanimfunc_2F(struct Sprite *sprite);
-void pokemonanimfunc_30(struct Sprite *sprite);
-void pokemonanimfunc_31(struct Sprite *sprite);
-void pokemonanimfunc_32(struct Sprite *sprite);
-void pokemonanimfunc_33(struct Sprite *sprite);
-void pokemonanimfunc_34(struct Sprite *sprite);
-void pokemonanimfunc_35(struct Sprite *sprite);
-void pokemonanimfunc_36(struct Sprite *sprite);
-void pokemonanimfunc_37(struct Sprite *sprite);
-void pokemonanimfunc_38(struct Sprite *sprite);
-void pokemonanimfunc_39(struct Sprite *sprite);
-void pokemonanimfunc_3A(struct Sprite *sprite);
-void pokemonanimfunc_3B(struct Sprite *sprite);
-void pokemonanimfunc_3C(struct Sprite *sprite);
-void pokemonanimfunc_3D(struct Sprite *sprite);
-void pokemonanimfunc_3E(struct Sprite *sprite);
-void pokemonanimfunc_3F(struct Sprite *sprite);
-void pokemonanimfunc_40(struct Sprite *sprite);
-void pokemonanimfunc_41(struct Sprite *sprite);
-void pokemonanimfunc_42(struct Sprite *sprite);
-void pokemonanimfunc_43(struct Sprite *sprite);
-void pokemonanimfunc_44(struct Sprite *sprite);
-void pokemonanimfunc_45(struct Sprite *sprite);
-void pokemonanimfunc_46(struct Sprite *sprite);
-void pokemonanimfunc_47(struct Sprite *sprite);
-void pokemonanimfunc_48(struct Sprite *sprite);
-void pokemonanimfunc_49(struct Sprite *sprite);
-void pokemonanimfunc_4A(struct Sprite *sprite);
-void pokemonanimfunc_4B(struct Sprite *sprite);
-void pokemonanimfunc_4C(struct Sprite *sprite);
-void pokemonanimfunc_4D(struct Sprite *sprite);
-void pokemonanimfunc_4E(struct Sprite *sprite);
-void pokemonanimfunc_4F(struct Sprite *sprite);
-void pokemonanimfunc_50(struct Sprite *sprite);
-void pokemonanimfunc_51(struct Sprite *sprite);
-void pokemonanimfunc_52(struct Sprite *sprite);
-void pokemonanimfunc_53(struct Sprite *sprite);
-void pokemonanimfunc_54(struct Sprite *sprite);
-void pokemonanimfunc_55(struct Sprite *sprite);
-void pokemonanimfunc_56(struct Sprite *sprite);
-void pokemonanimfunc_57(struct Sprite *sprite);
-void pokemonanimfunc_58(struct Sprite *sprite);
-void pokemonanimfunc_59(struct Sprite *sprite);
-void pokemonanimfunc_5A(struct Sprite *sprite);
-void pokemonanimfunc_5B(struct Sprite *sprite);
-void pokemonanimfunc_5C(struct Sprite *sprite);
-void pokemonanimfunc_5D(struct Sprite *sprite);
-void pokemonanimfunc_5E(struct Sprite *sprite);
-void pokemonanimfunc_5F(struct Sprite *sprite);
-void pokemonanimfunc_60(struct Sprite *sprite);
-void pokemonanimfunc_61(struct Sprite *sprite);
-void pokemonanimfunc_62(struct Sprite *sprite);
-void pokemonanimfunc_63(struct Sprite *sprite);
-void pokemonanimfunc_64(struct Sprite *sprite);
-void pokemonanimfunc_65(struct Sprite *sprite);
-void pokemonanimfunc_66(struct Sprite *sprite);
-void pokemonanimfunc_67(struct Sprite *sprite);
-void pokemonanimfunc_68(struct Sprite *sprite);
-void pokemonanimfunc_69(struct Sprite *sprite);
-void pokemonanimfunc_6A(struct Sprite *sprite);
-void pokemonanimfunc_6B(struct Sprite *sprite);
-void pokemonanimfunc_6C(struct Sprite *sprite);
-void pokemonanimfunc_6D(struct Sprite *sprite);
-void pokemonanimfunc_6E(struct Sprite *sprite);
-void pokemonanimfunc_6F(struct Sprite *sprite);
-void pokemonanimfunc_70(struct Sprite *sprite);
-void pokemonanimfunc_71(struct Sprite *sprite);
-void pokemonanimfunc_72(struct Sprite *sprite);
-void pokemonanimfunc_73(struct Sprite *sprite);
-void pokemonanimfunc_74(struct Sprite *sprite);
-void pokemonanimfunc_75(struct Sprite *sprite);
-void pokemonanimfunc_76(struct Sprite *sprite);
-void pokemonanimfunc_77(struct Sprite *sprite);
-void pokemonanimfunc_78(struct Sprite *sprite);
-void pokemonanimfunc_79(struct Sprite *sprite);
-void pokemonanimfunc_7A(struct Sprite *sprite);
-void pokemonanimfunc_7B(struct Sprite *sprite);
-void pokemonanimfunc_7C(struct Sprite *sprite);
-void pokemonanimfunc_7D(struct Sprite *sprite);
-void pokemonanimfunc_7E(struct Sprite *sprite);
-void pokemonanimfunc_7F(struct Sprite *sprite);
-void pokemonanimfunc_80(struct Sprite *sprite);
-void pokemonanimfunc_81(struct Sprite *sprite);
-void pokemonanimfunc_82(struct Sprite *sprite);
-void pokemonanimfunc_83(struct Sprite *sprite);
-void pokemonanimfunc_84(struct Sprite *sprite);
-void pokemonanimfunc_85(struct Sprite *sprite);
-void pokemonanimfunc_86(struct Sprite *sprite);
-void pokemonanimfunc_87(struct Sprite *sprite);
-void pokemonanimfunc_88(struct Sprite *sprite);
-void pokemonanimfunc_89(struct Sprite *sprite);
-void pokemonanimfunc_8A(struct Sprite *sprite);
-void pokemonanimfunc_8B(struct Sprite *sprite);
-void pokemonanimfunc_8C(struct Sprite *sprite);
-void pokemonanimfunc_8D(struct Sprite *sprite);
-void pokemonanimfunc_8E(struct Sprite *sprite);
-void pokemonanimfunc_8F(struct Sprite *sprite);
-void pokemonanimfunc_90(struct Sprite *sprite);
-void pokemonanimfunc_91(struct Sprite *sprite);
-void pokemonanimfunc_92(struct Sprite *sprite);
-void pokemonanimfunc_93(struct Sprite *sprite);
-void pokemonanimfunc_94(struct Sprite *sprite);
-void pokemonanimfunc_95(struct Sprite *sprite);
-void pokemonanimfunc_96(struct Sprite *sprite);
-
-void SpriteCB_SetDummyOnAnimEnd(struct Sprite *sprite);
+static void pokemonanimfunc_00(struct Sprite *sprite);
+static void pokemonanimfunc_01(struct Sprite *sprite);
+static void pokemonanimfunc_02(struct Sprite *sprite);
+static void pokemonanimfunc_03(struct Sprite *sprite);
+static void pokemonanimfunc_04(struct Sprite *sprite);
+static void pokemonanimfunc_05(struct Sprite *sprite);
+static void pokemonanimfunc_06(struct Sprite *sprite);
+static void pokemonanimfunc_07(struct Sprite *sprite);
+static void pokemonanimfunc_08(struct Sprite *sprite);
+static void pokemonanimfunc_09(struct Sprite *sprite);
+static void pokemonanimfunc_0A(struct Sprite *sprite);
+static void pokemonanimfunc_0B(struct Sprite *sprite);
+static void pokemonanimfunc_0C(struct Sprite *sprite);
+static void pokemonanimfunc_0D(struct Sprite *sprite);
+static void pokemonanimfunc_0E(struct Sprite *sprite);
+static void pokemonanimfunc_0F(struct Sprite *sprite);
+static void pokemonanimfunc_10(struct Sprite *sprite);
+static void pokemonanimfunc_11(struct Sprite *sprite);
+static void pokemonanimfunc_12(struct Sprite *sprite);
+static void pokemonanimfunc_13(struct Sprite *sprite);
+static void pokemonanimfunc_14(struct Sprite *sprite);
+static void pokemonanimfunc_15(struct Sprite *sprite);
+static void pokemonanimfunc_16(struct Sprite *sprite);
+static void pokemonanimfunc_17(struct Sprite *sprite);
+static void pokemonanimfunc_18(struct Sprite *sprite);
+static void pokemonanimfunc_19(struct Sprite *sprite);
+static void pokemonanimfunc_1A(struct Sprite *sprite);
+static void pokemonanimfunc_1B(struct Sprite *sprite);
+static void pokemonanimfunc_1C(struct Sprite *sprite);
+static void pokemonanimfunc_1D(struct Sprite *sprite);
+static void pokemonanimfunc_1E(struct Sprite *sprite);
+static void pokemonanimfunc_1F(struct Sprite *sprite);
+static void pokemonanimfunc_20(struct Sprite *sprite);
+static void pokemonanimfunc_21(struct Sprite *sprite);
+static void pokemonanimfunc_22(struct Sprite *sprite);
+static void pokemonanimfunc_23(struct Sprite *sprite);
+static void pokemonanimfunc_24(struct Sprite *sprite);
+static void pokemonanimfunc_25(struct Sprite *sprite);
+static void pokemonanimfunc_26(struct Sprite *sprite);
+static void pokemonanimfunc_27(struct Sprite *sprite);
+static void pokemonanimfunc_28(struct Sprite *sprite);
+static void pokemonanimfunc_29(struct Sprite *sprite);
+static void pokemonanimfunc_2A(struct Sprite *sprite);
+static void pokemonanimfunc_2B(struct Sprite *sprite);
+static void pokemonanimfunc_2C(struct Sprite *sprite);
+static void pokemonanimfunc_2D(struct Sprite *sprite);
+static void pokemonanimfunc_2E(struct Sprite *sprite);
+static void pokemonanimfunc_2F(struct Sprite *sprite);
+static void pokemonanimfunc_30(struct Sprite *sprite);
+static void pokemonanimfunc_31(struct Sprite *sprite);
+static void pokemonanimfunc_32(struct Sprite *sprite);
+static void pokemonanimfunc_33(struct Sprite *sprite);
+static void pokemonanimfunc_34(struct Sprite *sprite);
+static void pokemonanimfunc_35(struct Sprite *sprite);
+static void pokemonanimfunc_36(struct Sprite *sprite);
+static void pokemonanimfunc_37(struct Sprite *sprite);
+static void pokemonanimfunc_38(struct Sprite *sprite);
+static void pokemonanimfunc_39(struct Sprite *sprite);
+static void pokemonanimfunc_3A(struct Sprite *sprite);
+static void pokemonanimfunc_3B(struct Sprite *sprite);
+static void pokemonanimfunc_3C(struct Sprite *sprite);
+static void pokemonanimfunc_3D(struct Sprite *sprite);
+static void pokemonanimfunc_3E(struct Sprite *sprite);
+static void pokemonanimfunc_3F(struct Sprite *sprite);
+static void pokemonanimfunc_40(struct Sprite *sprite);
+static void pokemonanimfunc_41(struct Sprite *sprite);
+static void pokemonanimfunc_42(struct Sprite *sprite);
+static void pokemonanimfunc_43(struct Sprite *sprite);
+static void pokemonanimfunc_44(struct Sprite *sprite);
+static void pokemonanimfunc_45(struct Sprite *sprite);
+static void pokemonanimfunc_46(struct Sprite *sprite);
+static void pokemonanimfunc_47(struct Sprite *sprite);
+static void pokemonanimfunc_48(struct Sprite *sprite);
+static void pokemonanimfunc_49(struct Sprite *sprite);
+static void pokemonanimfunc_4A(struct Sprite *sprite);
+static void pokemonanimfunc_4B(struct Sprite *sprite);
+static void pokemonanimfunc_4C(struct Sprite *sprite);
+static void pokemonanimfunc_4D(struct Sprite *sprite);
+static void pokemonanimfunc_4E(struct Sprite *sprite);
+static void pokemonanimfunc_4F(struct Sprite *sprite);
+static void pokemonanimfunc_50(struct Sprite *sprite);
+static void pokemonanimfunc_51(struct Sprite *sprite);
+static void pokemonanimfunc_52(struct Sprite *sprite);
+static void pokemonanimfunc_53(struct Sprite *sprite);
+static void pokemonanimfunc_54(struct Sprite *sprite);
+static void pokemonanimfunc_55(struct Sprite *sprite);
+static void pokemonanimfunc_56(struct Sprite *sprite);
+static void pokemonanimfunc_57(struct Sprite *sprite);
+static void pokemonanimfunc_58(struct Sprite *sprite);
+static void pokemonanimfunc_59(struct Sprite *sprite);
+static void pokemonanimfunc_5A(struct Sprite *sprite);
+static void pokemonanimfunc_5B(struct Sprite *sprite);
+static void pokemonanimfunc_5C(struct Sprite *sprite);
+static void pokemonanimfunc_5D(struct Sprite *sprite);
+static void pokemonanimfunc_5E(struct Sprite *sprite);
+static void pokemonanimfunc_5F(struct Sprite *sprite);
+static void pokemonanimfunc_60(struct Sprite *sprite);
+static void pokemonanimfunc_61(struct Sprite *sprite);
+static void pokemonanimfunc_62(struct Sprite *sprite);
+static void pokemonanimfunc_63(struct Sprite *sprite);
+static void pokemonanimfunc_64(struct Sprite *sprite);
+static void pokemonanimfunc_65(struct Sprite *sprite);
+static void pokemonanimfunc_66(struct Sprite *sprite);
+static void pokemonanimfunc_67(struct Sprite *sprite);
+static void pokemonanimfunc_68(struct Sprite *sprite);
+static void pokemonanimfunc_69(struct Sprite *sprite);
+static void pokemonanimfunc_6A(struct Sprite *sprite);
+static void pokemonanimfunc_6B(struct Sprite *sprite);
+static void pokemonanimfunc_6C(struct Sprite *sprite);
+static void pokemonanimfunc_6D(struct Sprite *sprite);
+static void pokemonanimfunc_6E(struct Sprite *sprite);
+static void pokemonanimfunc_6F(struct Sprite *sprite);
+static void pokemonanimfunc_70(struct Sprite *sprite);
+static void pokemonanimfunc_71(struct Sprite *sprite);
+static void pokemonanimfunc_72(struct Sprite *sprite);
+static void pokemonanimfunc_73(struct Sprite *sprite);
+static void pokemonanimfunc_74(struct Sprite *sprite);
+static void pokemonanimfunc_75(struct Sprite *sprite);
+static void pokemonanimfunc_76(struct Sprite *sprite);
+static void pokemonanimfunc_77(struct Sprite *sprite);
+static void pokemonanimfunc_78(struct Sprite *sprite);
+static void pokemonanimfunc_79(struct Sprite *sprite);
+static void pokemonanimfunc_7A(struct Sprite *sprite);
+static void pokemonanimfunc_7B(struct Sprite *sprite);
+static void pokemonanimfunc_7C(struct Sprite *sprite);
+static void pokemonanimfunc_7D(struct Sprite *sprite);
+static void pokemonanimfunc_7E(struct Sprite *sprite);
+static void pokemonanimfunc_7F(struct Sprite *sprite);
+static void pokemonanimfunc_80(struct Sprite *sprite);
+static void pokemonanimfunc_81(struct Sprite *sprite);
+static void pokemonanimfunc_82(struct Sprite *sprite);
+static void pokemonanimfunc_83(struct Sprite *sprite);
+static void pokemonanimfunc_84(struct Sprite *sprite);
+static void pokemonanimfunc_85(struct Sprite *sprite);
+static void pokemonanimfunc_86(struct Sprite *sprite);
+static void pokemonanimfunc_87(struct Sprite *sprite);
+static void pokemonanimfunc_88(struct Sprite *sprite);
+static void pokemonanimfunc_89(struct Sprite *sprite);
+static void pokemonanimfunc_8A(struct Sprite *sprite);
+static void pokemonanimfunc_8B(struct Sprite *sprite);
+static void pokemonanimfunc_8C(struct Sprite *sprite);
+static void pokemonanimfunc_8D(struct Sprite *sprite);
+static void pokemonanimfunc_8E(struct Sprite *sprite);
+static void pokemonanimfunc_8F(struct Sprite *sprite);
+static void pokemonanimfunc_90(struct Sprite *sprite);
+static void pokemonanimfunc_91(struct Sprite *sprite);
+static void pokemonanimfunc_92(struct Sprite *sprite);
+static void pokemonanimfunc_93(struct Sprite *sprite);
+static void pokemonanimfunc_94(struct Sprite *sprite);
+static void pokemonanimfunc_95(struct Sprite *sprite);
+static void pokemonanimfunc_96(struct Sprite *sprite);
+
+static void SpriteCB_SetDummyOnAnimEnd(struct Sprite *sprite);
+
+#define STRUCT_COUNT 4
+
+// IWRAM bss
+static IWRAM_DATA struct UnkAnimStruct sUnknown_03001240[STRUCT_COUNT];
+static IWRAM_DATA u8 sUnknown_03001270;
+static IWRAM_DATA bool32 sUnknown_03001274;
// const rom data
-static const u8 sSpeciesToBackAnimId[] =
+static const u8 sSpeciesToBackAnimSet[] =
{
0x00, // SPECIES_NONE
0x13, // SPECIES_BULBASAUR
@@ -592,7 +596,7 @@ static const u8 sSpeciesToBackAnimId[] =
0x11, // SPECIES_CHIMECHO
};
-const u8 gUnknown_0860AA64[][2] =
+static const u8 sUnknown_0860AA64[][2] =
{
{0, 5},
{1, 1},
@@ -610,7 +614,7 @@ const u8 gUnknown_0860AA64[][2] =
{0, 0xFF}
};
-const u8 gUnknown_0860AA80[][2] =
+static const u8 sUnknown_0860AA80[][2] =
{
{6, 30},
{0xFE, 15},
@@ -773,7 +777,7 @@ static void (* const sMonAnimFunctions[])(struct Sprite *sprite) =
pokemonanimfunc_96
};
-// counting from Id 1, because 0 in sSpeciesToBackAnimId is used for mons with no back animation
+// counting from Id 1, because 0 in sSpeciesToBackAnimSet is used for mons with no back animation
static const u8 sBackAnimationIds[] =
{
0x60, 0x5f, 0x02, // 1
@@ -832,30 +836,30 @@ static const u8 sBackAnimNatureModTable[] =
0x01, // NATURE_QUIRKY
};
-static const union AffineAnimCmd gSpriteAffineAnim_860AD48[] =
+static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] =
{
- AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
+ AFFINEANIMCMD_FRAME(256, 256, 0, 0),
AFFINEANIMCMDTYPE_END
};
-static const union AffineAnimCmd gSpriteAffineAnim_860AD58[] =
+static const union AffineAnimCmd sSpriteAffineAnim_860AD58[] =
{
- AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+ AFFINEANIMCMD_FRAME(-256, 256, 0, 0),
AFFINEANIMCMDTYPE_END
};
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_860AD68[] =
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_860AD68[] =
{
- gSpriteAffineAnim_860AD48,
- gSpriteAffineAnim_860AD58
+ sSpriteAffineAnim_860AD48,
+ sSpriteAffineAnim_860AD58
};
// code
-void MonAnimDummySpriteCallback(struct Sprite *sprite)
+static void MonAnimDummySpriteCallback(struct Sprite *sprite)
{
}
-void sub_817F3F0(struct Sprite *sprite, s16 index, s16 amplitudeX, s16 amplitudeY)
+static void sub_817F3F0(struct Sprite *sprite, u16 index, s16 amplitudeX, s16 amplitudeY)
{
s16 xAdder, yAdder;
@@ -872,38 +876,45 @@ void sub_817F3F0(struct Sprite *sprite, s16 index, s16 amplitudeX, s16 amplitude
sprite->pos2.y = yAdder + amplitudeY;
}
-u8 GetSpeciesBackAnimId(u16 species)
+u8 GetSpeciesBackAnimSet(u16 species)
{
- if (sSpeciesToBackAnimId[species] != 0)
- return sSpeciesToBackAnimId[species] - 1;
+ if (sSpeciesToBackAnimSet[species] != 0)
+ return sSpeciesToBackAnimSet[species] - 1;
else
return 0;
}
-void sub_817F498(u8 taskId)
+#define tState data[0]
+#define tPtrLO data[1]
+#define tPtrHI data[2]
+#define tAnimId data[3]
+#define tSaved0 data[4]
+#define tSaved2 data[5]
+
+static void Task_HandleMonAnimation(u8 taskId)
{
u32 i;
- struct Sprite *sprite = (struct Sprite*)(u32)((gTasks[taskId].data[1] << 0x10) | (gTasks[taskId].data[2]));
+ struct Sprite *sprite = (struct Sprite*)(u32)((gTasks[taskId].tPtrLO << 0x10) | (gTasks[taskId].tPtrHI));
- if (gTasks[taskId].data[0] == 0)
+ if (gTasks[taskId].tState == 0)
{
- gTasks[taskId].data[4] = sprite->data[0];
- gTasks[taskId].data[5] = sprite->data[2];
+ gTasks[taskId].tSaved0 = sprite->data[0];
+ gTasks[taskId].tSaved2 = sprite->data[2];
sprite->data[1] = 1;
sprite->data[0] = 0;
for (i = 2; i < 8; i++)
sprite->data[i] = 0;
- sprite->callback = sMonAnimFunctions[gTasks[taskId].data[3]];
- gUnknown_03001274 = FALSE;
+ sprite->callback = sMonAnimFunctions[gTasks[taskId].tAnimId];
+ sUnknown_03001274 = FALSE;
- gTasks[taskId].data[0]++;
+ gTasks[taskId].tState++;
}
if (sprite->callback == SpriteCallbackDummy)
{
- sprite->data[0] = gTasks[taskId].data[4];
- sprite->data[2] = gTasks[taskId].data[5];
+ sprite->data[0] = gTasks[taskId].tSaved0;
+ sprite->data[2] = gTasks[taskId].tSaved2;
sprite->data[1] = 0;
DestroyTask(taskId);
@@ -912,39 +923,46 @@ void sub_817F498(u8 taskId)
void LaunchAnimationTaskForFrontSprite(struct Sprite *sprite, u8 frontAnimId)
{
- u8 taskId = CreateTask(sub_817F498, 128);
- gTasks[taskId].data[1] = (u32)(sprite) >> 0x10;
- gTasks[taskId].data[2] = (u32)(sprite);
- gTasks[taskId].data[3] = frontAnimId;
+ u8 taskId = CreateTask(Task_HandleMonAnimation, 128);
+ gTasks[taskId].tPtrLO = (u32)(sprite) >> 0x10;
+ gTasks[taskId].tPtrHI = (u32)(sprite);
+ gTasks[taskId].tAnimId = frontAnimId;
}
-void sub_817F578(struct Sprite *sprite, u8 frontAnimId)
+void StartMonSummaryAnimation(struct Sprite *sprite, u8 frontAnimId)
{
- gUnknown_03001274 = TRUE;
+ sUnknown_03001274 = TRUE;
sprite->callback = sMonAnimFunctions[frontAnimId];
}
-void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, u8 backAnimId)
+void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, u8 backAnimSet)
{
u8 nature, taskId, animId, bank;
- taskId = CreateTask(sub_817F498, 128);
- gTasks[taskId].data[1] = (u32)(sprite) >> 0x10;
- gTasks[taskId].data[2] = (u32)(sprite);
+ taskId = CreateTask(Task_HandleMonAnimation, 128);
+ gTasks[taskId].tPtrLO = (u32)(sprite) >> 0x10;
+ gTasks[taskId].tPtrHI = (u32)(sprite);
bank = sprite->data[0];
nature = GetNature(&gPlayerParty[gBattlePartyID[bank]]);
- animId = 3 * backAnimId + sBackAnimNatureModTable[nature];
- gTasks[taskId].data[3] = sBackAnimationIds[animId];
+ animId = 3 * backAnimSet + sBackAnimNatureModTable[nature];
+ gTasks[taskId].tAnimId = sBackAnimationIds[animId];
}
-void sub_817F60C(struct Sprite *sprite)
+#undef tState
+#undef tPtrLO
+#undef tPtrHI
+#undef tAnimId
+#undef tSaved0
+#undef tSaved2
+
+void SetSpriteCB_MonAnimDummy(struct Sprite *sprite)
{
sprite->callback = MonAnimDummySpriteCallback;
}
-void SetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
+static void SetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
{
u8 matrixNum;
struct ObjAffineSrcData affineSrcData;
@@ -963,12 +981,12 @@ void SetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
gOamMatrices[matrixNum].d = dest.d;
}
-void HandleStartAffineAnim(struct Sprite *sprite)
+static void HandleStartAffineAnim(struct Sprite *sprite)
{
sprite->oam.affineMode = 3;
- sprite->affineAnims = gSpriteAffineAnimTable_860AD68;
+ sprite->affineAnims = sSpriteAffineAnimTable_860AD68;
- if (gUnknown_03001274 == TRUE)
+ if (sUnknown_03001274 == TRUE)
InitSpriteAffineAnim(sprite);
if (!sprite->data[1])
@@ -980,7 +998,7 @@ void HandleStartAffineAnim(struct Sprite *sprite)
sprite->affineAnimPaused = 1;
}
-void HandleSetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
+static void HandleSetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
{
if (!sprite->data[1])
{
@@ -991,42 +1009,42 @@ void HandleSetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rota
SetAffineData(sprite, xScale, yScale, rotation);
}
-void sub_817F70C(struct Sprite *sprite)
+static void sub_817F70C(struct Sprite *sprite)
{
if (!sprite->data[1])
sprite->pos2.x *= -1;
}
-bool32 sub_817F724(u8 id)
+static bool32 sub_817F724(u8 id)
{
- if (id >= 4)
+ if (id >= STRUCT_COUNT)
{
return FALSE;
}
else
{
- gUnknown_03001240[id].field_6 = 0;
- gUnknown_03001240[id].field_0 = 0;
- gUnknown_03001240[id].field_4 = 1;
- gUnknown_03001240[id].field_2 = 0;
- gUnknown_03001240[id].field_8 = 0;
+ sUnknown_03001240[id].field_6 = 0;
+ sUnknown_03001240[id].field_0 = 0;
+ sUnknown_03001240[id].field_4 = 1;
+ sUnknown_03001240[id].field_2 = 0;
+ sUnknown_03001240[id].field_8 = 0;
return TRUE;
}
}
-u8 sub_817F758(void)
+static u8 sub_817F758(void)
{
- gUnknown_03001270 = (gUnknown_03001270 + 1) % 4;
- sub_817F724(gUnknown_03001270);
- return gUnknown_03001270;
+ sUnknown_03001270 = (sUnknown_03001270 + 1) % STRUCT_COUNT;
+ sub_817F724(sUnknown_03001270);
+ return sUnknown_03001270;
}
-void sub_817F77C(struct Sprite *sprite)
+static void sub_817F77C(struct Sprite *sprite)
{
sprite->oam.affineMode = 1;
CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
- if (gUnknown_03001274 == TRUE)
+ if (sUnknown_03001274 == TRUE)
{
if (!sprite->data[1])
sprite->hFlip = 1;
@@ -1039,14 +1057,14 @@ void sub_817F77C(struct Sprite *sprite)
}
}
-void pokemonanimfunc_01(struct Sprite *sprite)
+static void pokemonanimfunc_01(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
HandleStartAffineAnim(sprite);
if (sprite->data[2] > 40)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
@@ -1062,7 +1080,7 @@ void pokemonanimfunc_01(struct Sprite *sprite)
sprite->data[2]++;
}
-void pokemonanimfunc_02(struct Sprite *sprite)
+static void pokemonanimfunc_02(struct Sprite *sprite)
{
if (sprite->data[2] > 40)
{
@@ -1083,7 +1101,7 @@ void pokemonanimfunc_02(struct Sprite *sprite)
sprite->data[2]++;
}
-void sub_817F8FC(struct Sprite *sprite)
+static void sub_817F8FC(struct Sprite *sprite)
{
sub_817F70C(sprite);
@@ -1101,14 +1119,14 @@ void sub_817F8FC(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void pokemonanimfunc_03(struct Sprite *sprite)
+static void pokemonanimfunc_03(struct Sprite *sprite)
{
sprite->data[0] = 40;
sub_817F8FC(sprite);
sprite->callback = sub_817F8FC;
}
-void sub_817F978(struct Sprite *sprite)
+static void sub_817F978(struct Sprite *sprite)
{
sub_817F70C(sprite);
@@ -1126,7 +1144,7 @@ void sub_817F978(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void pokemonanimfunc_04(struct Sprite *sprite)
+static void pokemonanimfunc_04(struct Sprite *sprite)
{
sprite->data[0] = 40;
sub_817F978(sprite);
@@ -1134,7 +1152,7 @@ void pokemonanimfunc_04(struct Sprite *sprite)
}
#ifdef NONMATCHING
-void sub_817F9F4(struct Sprite *sprite)
+static void sub_817F9F4(struct Sprite *sprite)
{
s32 counter = sprite->data[2];
@@ -1166,7 +1184,7 @@ void sub_817F9F4(struct Sprite *sprite)
#else
__attribute__((naked))
-void sub_817F9F4(struct Sprite *sprite)
+static void sub_817F9F4(struct Sprite *sprite)
{
asm(".syntax unified\n\
push {r4,lr}\n\
@@ -1235,14 +1253,14 @@ _0817FA60:\n\
#endif // NONMATCHING
-void pokemonanimfunc_1E(struct Sprite *sprite)
+static void pokemonanimfunc_1E(struct Sprite *sprite)
{
sprite->data[0] = 4;
sub_817F9F4(sprite);
sprite->callback = sub_817F9F4;
}
-void pokemonanimfunc_06(struct Sprite *sprite)
+static void pokemonanimfunc_06(struct Sprite *sprite)
{
s32 counter = sprite->data[2];
@@ -1282,14 +1300,14 @@ void pokemonanimfunc_06(struct Sprite *sprite)
sprite->data[2] += 12;
}
-void pokemonanimfunc_09(struct Sprite *sprite)
+static void pokemonanimfunc_09(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
HandleStartAffineAnim(sprite);
if (sprite->data[2] > 40)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
@@ -1314,7 +1332,7 @@ void pokemonanimfunc_09(struct Sprite *sprite)
sprite->data[2]++;
}
-static const s8 gUnknown_0860AD70[][3] =
+static const s8 sUnknown_0860AD70[][3] =
{
{-1, -1, 6},
{2, 0, 6},
@@ -1328,16 +1346,16 @@ static const s8 gUnknown_0860AD70[][3] =
{0, 0, 0},
};
-void sub_817FC20(struct Sprite *sprite)
+static void sub_817FC20(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] == 0)
sprite->data[3] = 0;
- if (gUnknown_0860AD70[sprite->data[3]][2] == sprite->data[2])
+ if (sUnknown_0860AD70[sprite->data[3]][2] == sprite->data[2])
{
- if (gUnknown_0860AD70[sprite->data[3]][2] == 0)
+ if (sUnknown_0860AD70[sprite->data[3]][2] == 0)
{
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
@@ -1348,26 +1366,26 @@ void sub_817FC20(struct Sprite *sprite)
}
}
- if (gUnknown_0860AD70[sprite->data[3]][2] == 0)
+ if (sUnknown_0860AD70[sprite->data[3]][2] == 0)
{
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
else
{
- sprite->pos2.x += gUnknown_0860AD70[sprite->data[3]][0];
- sprite->pos2.y += gUnknown_0860AD70[sprite->data[3]][1];
+ sprite->pos2.x += sUnknown_0860AD70[sprite->data[3]][0];
+ sprite->pos2.y += sUnknown_0860AD70[sprite->data[3]][1];
sprite->data[2]++;
sub_817F70C(sprite);
}
}
-void pokemonanimfunc_0A(struct Sprite *sprite)
+static void pokemonanimfunc_0A(struct Sprite *sprite)
{
sub_817FC20(sprite);
sprite->callback = sub_817FC20;
}
-void sub_817FCDC(struct Sprite *sprite)
+static void sub_817FCDC(struct Sprite *sprite)
{
s32 counter = sprite->data[2];
@@ -1384,7 +1402,7 @@ void sub_817FCDC(struct Sprite *sprite)
sprite->data[2] += sprite->data[0];
}
-void pokemonanimfunc_0F(struct Sprite *sprite)
+static void pokemonanimfunc_0F(struct Sprite *sprite)
{
sprite->data[0] = 60;
sprite->data[7] = 3;
@@ -1392,7 +1410,7 @@ void pokemonanimfunc_0F(struct Sprite *sprite)
sprite->callback = sub_817FCDC;
}
-void sub_817FD44(struct Sprite *sprite)
+static void sub_817FD44(struct Sprite *sprite)
{
s32 counter = sprite->data[2];
@@ -1409,14 +1427,14 @@ void sub_817FD44(struct Sprite *sprite)
sprite->data[2] += sprite->data[0];
}
-void pokemonanimfunc_10(struct Sprite *sprite)
+static void pokemonanimfunc_10(struct Sprite *sprite)
{
sprite->data[0] = 60;
sub_817FD44(sprite);
sprite->callback = sub_817FD44;
}
-void pokemonanimfunc_11(struct Sprite *sprite)
+static void pokemonanimfunc_11(struct Sprite *sprite)
{
if (sprite->data[2] > 512)
{
@@ -1444,30 +1462,30 @@ void pokemonanimfunc_11(struct Sprite *sprite)
sprite->data[2] += 9;
}
-void sub_817FE30(struct Sprite *sprite)
+static void sub_817FE30(struct Sprite *sprite)
{
s16 id = sprite->data[0];
- if (gUnknown_03001240[id].field_0 != 0)
+ if (sUnknown_03001240[id].field_0 != 0)
{
- gUnknown_03001240[id].field_0--;
+ sUnknown_03001240[id].field_0--;
}
else
{
- if (sprite->data[2] == 0 && gUnknown_03001240[id].field_8 == 0)
+ if (sprite->data[2] == 0 && sUnknown_03001240[id].field_8 == 0)
{
HandleStartAffineAnim(sprite);
- gUnknown_03001240[id].field_8++;
+ sUnknown_03001240[id].field_8++;
}
- if (sprite->data[2] > gUnknown_03001240[id].field_6)
+ if (sprite->data[2] > sUnknown_03001240[id].field_6)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
- if (gUnknown_03001240[id].field_4 > 1)
+ if (sUnknown_03001240[id].field_4 > 1)
{
- gUnknown_03001240[id].field_4--;
- gUnknown_03001240[id].field_0 = 10;
+ sUnknown_03001240[id].field_4--;
+ sUnknown_03001240[id].field_0 = 10;
sprite->data[2] = 0;
}
else
@@ -1479,62 +1497,62 @@ void sub_817FE30(struct Sprite *sprite)
else
{
sprite->data[6] = Sin(sprite->data[2] % 256, 4096);
- HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[6]);
+ HandleSetAffineData(sprite, 256, 256, sprite->data[6]);
}
sprite->data[2] += 16;
}
}
-void pokemonanimfunc_12(struct Sprite *sprite)
+static void pokemonanimfunc_12(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_6 = 512;
- gUnknown_03001240[id].field_0 = 0;
+ sUnknown_03001240[id].field_6 = 512;
+ sUnknown_03001240[id].field_0 = 0;
sub_817FE30(sprite);
sprite->callback = sub_817FE30;
}
-void sub_817FF3C(struct Sprite *sprite)
+static void sub_817FF3C(struct Sprite *sprite)
{
u8 id = sprite->data[0];
if (sprite->data[2] == 0)
HandleStartAffineAnim(sprite);
- if (sprite->data[2] > gUnknown_03001240[id].field_0)
+ if (sprite->data[2] > sUnknown_03001240[id].field_0)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
else
{
- sprite->data[6] = (65536 / gUnknown_03001240[id].field_8) * sprite->data[2];
- HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[6]);
+ sprite->data[6] = (65536 / sUnknown_03001240[id].field_8) * sprite->data[2];
+ HandleSetAffineData(sprite, 256, 256, sprite->data[6]);
}
sprite->data[2]++;
}
-void pokemonanimfunc_1F(struct Sprite *sprite)
+static void pokemonanimfunc_1F(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_0 = 60;
- gUnknown_03001240[id].field_8 = 20;
+ sUnknown_03001240[id].field_0 = 60;
+ sUnknown_03001240[id].field_8 = 20;
sub_817FF3C(sprite);
sprite->callback = sub_817FF3C;
}
-void sub_817FFF0(struct Sprite *sprite)
+static void sub_817FFF0(struct Sprite *sprite)
{
u8 id = sprite->data[0];
sub_817F70C(sprite);
- if (sprite->data[2] > gUnknown_03001240[id].field_6)
+ if (sprite->data[2] > sUnknown_03001240[id].field_6)
{
sprite->pos2.x = 0;
sprite->pos2.y = 0;
@@ -1544,26 +1562,26 @@ void sub_817FFF0(struct Sprite *sprite)
{
s16 index = (sprite->data[2] + 192) % 256;
- sprite->pos2.x = -(Cos(index, gUnknown_03001240[id].field_8 * 2));
- sprite->pos2.y = Sin(index, gUnknown_03001240[id].field_8) + gUnknown_03001240[id].field_8;
+ sprite->pos2.x = -(Cos(index, sUnknown_03001240[id].field_8 * 2));
+ sprite->pos2.y = Sin(index, sUnknown_03001240[id].field_8) + sUnknown_03001240[id].field_8;
}
- sprite->data[2] += gUnknown_03001240[id].field_2;
+ sprite->data[2] += sUnknown_03001240[id].field_2;
sub_817F70C(sprite);
}
-void pokemonanimfunc_14(struct Sprite *sprite)
+static void pokemonanimfunc_14(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_6 = 512;
- gUnknown_03001240[id].field_8 = 6;
- gUnknown_03001240[id].field_2 = 24;
+ sUnknown_03001240[id].field_6 = 512;
+ sUnknown_03001240[id].field_8 = 6;
+ sUnknown_03001240[id].field_2 = 24;
sub_817FFF0(sprite);
sprite->callback = sub_817FFF0;
}
-void pokemonanimfunc_15(struct Sprite *sprite)
+static void pokemonanimfunc_15(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
@@ -1582,7 +1600,7 @@ void pokemonanimfunc_15(struct Sprite *sprite)
sprite->data[2]++;
}
-void pokemonanimfunc_16(struct Sprite *sprite)
+static void pokemonanimfunc_16(struct Sprite *sprite)
{
s16 index1 = 0, index2 = 0;
@@ -1591,7 +1609,7 @@ void pokemonanimfunc_16(struct Sprite *sprite)
if (sprite->data[2] > 40)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
@@ -1617,7 +1635,7 @@ void pokemonanimfunc_16(struct Sprite *sprite)
sprite->data[2]++;
}
-void pokemonanimfunc_17(struct Sprite *sprite)
+static void pokemonanimfunc_17(struct Sprite *sprite)
{
s16 posY = 0, index1 = 0, index2 = 0;
@@ -1626,7 +1644,7 @@ void pokemonanimfunc_17(struct Sprite *sprite)
if (sprite->data[2] > 40)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
sprite->pos2.y = posY;
@@ -1658,12 +1676,12 @@ void pokemonanimfunc_17(struct Sprite *sprite)
sprite->data[2]++;
}
-void sub_818031C(struct Sprite *sprite)
+static void sub_818031C(struct Sprite *sprite)
{
u8 index = sprite->data[2];
u8 var7 = sprite->data[6];
- u8 var5 = gUnknown_0860AA80[sprite->data[5]][0];
- u8 var6 = gUnknown_0860AA80[sprite->data[5]][1];
+ u8 var5 = sUnknown_0860AA80[sprite->data[5]][0];
+ u8 var6 = sUnknown_0860AA80[sprite->data[5]][1];
u8 amplitude = 0;
if (var5 != 0xFE)
@@ -1693,14 +1711,14 @@ void sub_818031C(struct Sprite *sprite)
}
}
-void pokemonanimfunc_19(struct Sprite *sprite)
+static void pokemonanimfunc_19(struct Sprite *sprite)
{
sprite->data[0] = 48;
sub_818031C(sprite);
sprite->callback = sub_818031C;
}
-void pokemonanimfunc_1A(struct Sprite *sprite)
+static void pokemonanimfunc_1A(struct Sprite *sprite)
{
u8 counter = 0;
@@ -1712,7 +1730,7 @@ void pokemonanimfunc_1A(struct Sprite *sprite)
if (sprite->data[2] > 35)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
sprite->pos2.x = 0;
@@ -1722,25 +1740,25 @@ void pokemonanimfunc_1A(struct Sprite *sprite)
s16 index = ((counter - 10) * 128) / 20;
if (counter < 10)
- HandleSetAffineData(sprite, 0x100, 0x100, counter / 2 * 512);
+ HandleSetAffineData(sprite, 256, 256, counter / 2 * 512);
else if (counter >= 10 && counter <= 29)
sprite->pos2.x = -(Sin(index, 5));
else
- HandleSetAffineData(sprite, 0x100, 0x100, (35 - counter) / 2 * 1024);
+ HandleSetAffineData(sprite, 256, 256, (35 - counter) / 2 * 1024);
}
sprite->data[2]++;
sub_817F70C(sprite);
}
-void pokemonanimfunc_1B(struct Sprite *sprite)
+static void pokemonanimfunc_1B(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
HandleStartAffineAnim(sprite);
if (sprite->data[2] > 100)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->pos2.y = 0;
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -1749,13 +1767,13 @@ void pokemonanimfunc_1B(struct Sprite *sprite)
{
s16 index = (sprite->data[2] * 256) / 100;
sprite->pos2.y = Sin(index, 10);
- HandleSetAffineData(sprite, 0x100, 0x100, Sin(index, 3276));
+ HandleSetAffineData(sprite, 256, 256, Sin(index, 3276));
}
sprite->data[2]++;
}
-void sub_81804F8(struct Sprite *sprite)
+static void sub_81804F8(struct Sprite *sprite)
{
s32 var = 0;
s16 index = 0;
@@ -1765,7 +1783,7 @@ void sub_81804F8(struct Sprite *sprite)
if (sprite->data[2] > 100)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->pos2.y = 0;
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -1776,20 +1794,20 @@ void sub_81804F8(struct Sprite *sprite)
var = (sprite->data[2] * 512) / 100;
var &= 0xFF;
sprite->pos2.y = Sin(index, sprite->data[0]);
- HandleSetAffineData(sprite, 0x100, 0x100, Sin(var, 3276));
+ HandleSetAffineData(sprite, 256, 256, Sin(var, 3276));
}
sprite->data[2]++;
}
-void pokemonanimfunc_1C(struct Sprite *sprite)
+static void pokemonanimfunc_1C(struct Sprite *sprite)
{
sprite->data[0] = 10;
sub_81804F8(sprite);
sprite->callback = sub_81804F8;
}
-void sub_81805B0(struct Sprite *sprite)
+static void sub_81805B0(struct Sprite *sprite)
{
s32 var = 0;
s16 index = 0;
@@ -1799,7 +1817,7 @@ void sub_81805B0(struct Sprite *sprite)
if (sprite->data[2] > 100)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->pos2.y = 0;
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -1810,20 +1828,20 @@ void sub_81805B0(struct Sprite *sprite)
var = (sprite->data[2] * 512) / 100;
var &= 0xFF;
sprite->pos2.y = -(Sin(index / 2, sprite->data[0] * 2));
- HandleSetAffineData(sprite, 0x100, 0x100, Sin(var, 3276));
+ HandleSetAffineData(sprite, 256, 256, Sin(var, 3276));
}
sprite->data[2]++;
}
-void pokemonanimfunc_18(struct Sprite *sprite)
+static void pokemonanimfunc_18(struct Sprite *sprite)
{
sprite->data[0] = 5;
sub_81805B0(sprite);
sprite->callback = sub_81805B0;
}
-void pokemonanimfunc_1D(struct Sprite *sprite)
+static void pokemonanimfunc_1D(struct Sprite *sprite)
{
s32 var;
s16 index = 0;
@@ -1836,7 +1854,7 @@ void pokemonanimfunc_1D(struct Sprite *sprite)
if (sprite->data[2] > 100)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->pos2.x = 0;
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -1849,14 +1867,14 @@ void pokemonanimfunc_1D(struct Sprite *sprite)
var = (sprite->data[2] * 512) / toDiv;
var &= 0xFF;
sprite->pos2.x = Sin(index, 8);
- HandleSetAffineData(sprite, 0x100, 0x100, Sin(var, 3276));
+ HandleSetAffineData(sprite, 256, 256, Sin(var, 3276));
}
sprite->data[2]++;
sub_817F70C(sprite);
}
-void sub_8180714(struct Sprite *sprite)
+static void sub_8180714(struct Sprite *sprite)
{
s16 posY = 0;
@@ -1870,7 +1888,7 @@ void sub_8180714(struct Sprite *sprite)
if (sprite->data[2] > sprite->data[0] * 3)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->pos2.y = 0;
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -1885,7 +1903,7 @@ void sub_8180714(struct Sprite *sprite)
posY = (256 - yScale) / 8;
sprite->pos2.y = -(Sin(sprite->data[3], 10)) - posY;
- HandleSetAffineData(sprite, 0x100 - Sin(sprite->data[4], 32), yScale, 0);
+ HandleSetAffineData(sprite, 256 - Sin(sprite->data[4], 32), yScale, 0);
sprite->data[2]++;
sprite->data[4] = (sprite->data[4] + 128 / sprite->data[0]) & 0xFF;
}
@@ -1893,20 +1911,20 @@ void sub_8180714(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void pokemonanimfunc_00(struct Sprite *sprite)
+static void pokemonanimfunc_00(struct Sprite *sprite)
{
sprite->data[0] = 16;
sub_8180714(sprite);
sprite->callback = sub_8180714;
}
-void sub_8180828(struct Sprite *sprite)
+static void sub_8180828(struct Sprite *sprite)
{
s16 posY = 0;
if (sprite->data[2] > (128 / sprite->data[6]) * sprite->data[7])
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->pos2.y = 0;
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -1925,7 +1943,7 @@ void sub_8180828(struct Sprite *sprite)
}
}
-void pokemonanimfunc_13(struct Sprite *sprite)
+static void pokemonanimfunc_13(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -1937,7 +1955,7 @@ void pokemonanimfunc_13(struct Sprite *sprite)
sub_8180828(sprite);
}
-static const s8 gUnknown_0860AD8E[][8][3] =
+static const s8 sUnknown_0860AD8E[][8][3] =
{
{
{0, 8, 8},
@@ -1961,7 +1979,7 @@ static const s8 gUnknown_0860AD8E[][8][3] =
},
};
-void sub_8180900(struct Sprite *sprite)
+static void sub_8180900(struct Sprite *sprite)
{
s16 var;
u8 structId;
@@ -1972,10 +1990,10 @@ void sub_8180900(struct Sprite *sprite)
sub_817F70C(sprite);
structId = sprite->data[0];
- var = gUnknown_03001240[structId].field_6;
- r9 = gUnknown_0860AD8E[gUnknown_03001240[structId].field_8][sprite->data[4]][0];
- r10 = gUnknown_0860AD8E[gUnknown_03001240[structId].field_8][sprite->data[4]][1] - r9;
- arrId = gUnknown_03001240[structId].field_8;
+ var = sUnknown_03001240[structId].field_6;
+ r9 = sUnknown_0860AD8E[sUnknown_03001240[structId].field_8][sprite->data[4]][0];
+ r10 = sUnknown_0860AD8E[sUnknown_03001240[structId].field_8][sprite->data[4]][1] - r9;
+ arrId = sUnknown_03001240[structId].field_8;
r7 = sprite->data[3];
if (sprite->data[2] == 0)
@@ -1984,9 +2002,9 @@ void sub_8180900(struct Sprite *sprite)
sprite->data[2]++;
}
- if (gUnknown_0860AD8E[arrId][sprite->data[4]][2] == 0)
+ if (sUnknown_0860AD8E[arrId][sprite->data[4]][2] == 0)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->pos2.x = 0;
sprite->pos2.y = 0;
sub_817F77C(sprite);
@@ -1996,13 +2014,13 @@ void sub_8180900(struct Sprite *sprite)
{
u16 rotation;
- sprite->pos2.y = -(Sin(r7 * 128 / gUnknown_0860AD8E[arrId][sprite->data[4]][2], 10));
- sprite->pos2.x = (r10 * r7 / gUnknown_0860AD8E[arrId][sprite->data[4]][2]) + r9;
+ sprite->pos2.y = -(Sin(r7 * 128 / sUnknown_0860AD8E[arrId][sprite->data[4]][2], 10));
+ sprite->pos2.x = (r10 * r7 / sUnknown_0860AD8E[arrId][sprite->data[4]][2]) + r9;
rotation = -(var * sprite->pos2.x) / 8;
- HandleSetAffineData(sprite, 0x100, 0x100, rotation);
+ HandleSetAffineData(sprite, 256, 256, rotation);
- if (r7 == gUnknown_0860AD8E[arrId][sprite->data[4]][2])
+ if (r7 == sUnknown_0860AD8E[arrId][sprite->data[4]][2])
{
sprite->data[4]++;
sprite->data[3] = 0;
@@ -2016,16 +2034,16 @@ void sub_8180900(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void pokemonanimfunc_05(struct Sprite *sprite)
+static void pokemonanimfunc_05(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_6 = 4096;
- gUnknown_03001240[id].field_8 = sprite->data[6];
+ sUnknown_03001240[id].field_6 = 4096;
+ sUnknown_03001240[id].field_8 = sprite->data[6];
sub_8180900(sprite);
sprite->callback = sub_8180900;
}
-void pokemonanimfunc_20(struct Sprite *sprite)
+static void pokemonanimfunc_20(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
@@ -2044,7 +2062,7 @@ void pokemonanimfunc_20(struct Sprite *sprite)
sprite->data[2] += 2;
}
-void pokemonanimfunc_21(struct Sprite *sprite)
+static void pokemonanimfunc_21(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
@@ -2063,7 +2081,7 @@ void pokemonanimfunc_21(struct Sprite *sprite)
sprite->data[2] += 2;
}
-void pokemonanimfunc_22(struct Sprite *sprite)
+static void pokemonanimfunc_22(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
@@ -2082,7 +2100,7 @@ void pokemonanimfunc_22(struct Sprite *sprite)
sprite->data[2] += 2;
}
-void pokemonanimfunc_23(struct Sprite *sprite)
+static void pokemonanimfunc_23(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
@@ -2101,7 +2119,7 @@ void pokemonanimfunc_23(struct Sprite *sprite)
sprite->data[2] += 2;
}
-void pokemonanimfunc_24(struct Sprite *sprite)
+static void pokemonanimfunc_24(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
@@ -2120,19 +2138,19 @@ void pokemonanimfunc_24(struct Sprite *sprite)
sprite->data[2] += 2;
}
-void sub_8180CB4(struct Sprite *sprite);
-void sub_8180CE8(struct Sprite *sprite);
-void sub_8180D44(struct Sprite *sprite);
-void sub_8180DC0(struct Sprite *sprite);
-void sub_8180E28(struct Sprite *sprite);
+static void sub_8180CB4(struct Sprite *sprite);
+static void sub_8180CE8(struct Sprite *sprite);
+static void sub_8180D44(struct Sprite *sprite);
+static void sub_8180DC0(struct Sprite *sprite);
+static void sub_8180E28(struct Sprite *sprite);
-void pokemonanimfunc_25(struct Sprite *sprite)
+static void pokemonanimfunc_25(struct Sprite *sprite)
{
HandleStartAffineAnim(sprite);
sprite->callback = sub_8180CB4;
}
-void sub_8180CB4(struct Sprite *sprite)
+static void sub_8180CB4(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (++sprite->pos2.x > 7)
@@ -2144,7 +2162,7 @@ void sub_8180CB4(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8180CE8(struct Sprite *sprite)
+static void sub_8180CE8(struct Sprite *sprite)
{
sub_817F70C(sprite);
@@ -2172,7 +2190,7 @@ void sub_8180CE8(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8180D44(struct Sprite *sprite)
+static void sub_8180D44(struct Sprite *sprite)
{
u8 rotation;
@@ -2184,7 +2202,7 @@ void sub_8180D44(struct Sprite *sprite)
if (++sprite->data[5] > sprite->data[6])
sprite->data[5] = sprite->data[6];
- HandleSetAffineData(sprite, 0x100, 0x100, rotation * 256);
+ HandleSetAffineData(sprite, 256, 256, rotation * 256);
if (sprite->pos2.x < -8)
{
@@ -2198,7 +2216,7 @@ void sub_8180D44(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8180DC0(struct Sprite *sprite)
+static void sub_8180DC0(struct Sprite *sprite)
{
sub_817F70C(sprite);
@@ -2208,7 +2226,7 @@ void sub_8180DC0(struct Sprite *sprite)
if (sprite->data[2] < 0)
sprite->data[2] = 0;
- HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[2] << 8);
+ HandleSetAffineData(sprite, 256, 256, sprite->data[2] << 8);
if (sprite->data[2] == 0)
sprite->callback = sub_8180E28;
}
@@ -2222,7 +2240,7 @@ void sub_8180DC0(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8180E28(struct Sprite *sprite)
+static void sub_8180E28(struct Sprite *sprite)
{
sub_817F70C(sprite);
@@ -2237,18 +2255,18 @@ void sub_8180E28(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8180E78(struct Sprite *sprite);
-void sub_8180ED0(struct Sprite *sprite);
-void sub_8180F2C(struct Sprite *sprite);
+static void sub_8180E78(struct Sprite *sprite);
+static void sub_8180ED0(struct Sprite *sprite);
+static void sub_8180F2C(struct Sprite *sprite);
-void pokemonanimfunc_26(struct Sprite *sprite)
+static void pokemonanimfunc_26(struct Sprite *sprite)
{
HandleStartAffineAnim(sprite);
sprite->data[3] = 0;
sprite->callback = sub_8180E78;
}
-void sub_8180E78(struct Sprite *sprite)
+static void sub_8180E78(struct Sprite *sprite)
{
sub_817F70C(sprite);
sprite->pos2.x++;
@@ -2267,7 +2285,7 @@ void sub_8180E78(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8180ED0(struct Sprite *sprite)
+static void sub_8180ED0(struct Sprite *sprite)
{
sub_817F70C(sprite);
sprite->pos2.x = Cos(sprite->data[4], 16) - 8;
@@ -2286,7 +2304,7 @@ void sub_8180ED0(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8180F2C(struct Sprite *sprite)
+static void sub_8180F2C(struct Sprite *sprite)
{
sub_817F70C(sprite);
@@ -2302,7 +2320,7 @@ void sub_8180F2C(struct Sprite *sprite)
sprite->pos2.y = -(Sin(sprite->data[2], 5)) + 4;
sprite->data[2] -= 4;
rotation = sprite->data[2] - 32;
- HandleSetAffineData(sprite, 0x100, 0x100, rotation * 512);
+ HandleSetAffineData(sprite, 256, 256, rotation * 512);
if (sprite->data[2] <= 32)
{
@@ -2316,7 +2334,7 @@ void sub_8180F2C(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void pokemonanimfunc_27(struct Sprite *sprite)
+static void pokemonanimfunc_27(struct Sprite *sprite)
{
if (sprite->data[3] > 0)
{
@@ -2335,17 +2353,17 @@ void pokemonanimfunc_27(struct Sprite *sprite)
}
}
-void sub_8181024(struct Sprite *sprite);
-void sub_8181068(struct Sprite *sprite);
-void sub_81810C4(struct Sprite *sprite);
+static void sub_8181024(struct Sprite *sprite);
+static void sub_8181068(struct Sprite *sprite);
+static void sub_81810C4(struct Sprite *sprite);
-void pokemonanimfunc_28(struct Sprite *sprite)
+static void pokemonanimfunc_28(struct Sprite *sprite)
{
HandleStartAffineAnim(sprite);
sprite->callback = sub_8181024;
}
-void sub_8181024(struct Sprite *sprite)
+static void sub_8181024(struct Sprite *sprite)
{
sub_817F70C(sprite);
sprite->pos2.x--;
@@ -2362,7 +2380,7 @@ void sub_8181024(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8181068(struct Sprite *sprite)
+static void sub_8181068(struct Sprite *sprite)
{
u32 rotation;
@@ -2371,7 +2389,7 @@ void sub_8181068(struct Sprite *sprite)
sprite->pos2.x = Cos(sprite->data[2], 22);
sprite->pos2.y = -(Sin(sprite->data[2], 22));
rotation = sprite->data[2] - 32;
- HandleSetAffineData(sprite, 0x100, 0x100, rotation * 512);
+ HandleSetAffineData(sprite, 256, 256, rotation * 512);
if (sprite->data[2] <= 32)
sprite->callback = sub_81810C4;
@@ -2379,7 +2397,7 @@ void sub_8181068(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_81810C4(struct Sprite *sprite)
+static void sub_81810C4(struct Sprite *sprite)
{
sub_817F70C(sprite);
sprite->pos2.x--;
@@ -2394,17 +2412,17 @@ void sub_81810C4(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8181110(struct Sprite *sprite);
-void sub_8181144(struct Sprite *sprite);
-void sub_81811A4(struct Sprite *sprite);
+static void sub_8181110(struct Sprite *sprite);
+static void sub_8181144(struct Sprite *sprite);
+static void sub_81811A4(struct Sprite *sprite);
-void pokemonanimfunc_29(struct Sprite *sprite)
+static void pokemonanimfunc_29(struct Sprite *sprite)
{
HandleStartAffineAnim(sprite);
sprite->callback = sub_8181110;
}
-void sub_8181110(struct Sprite *sprite)
+static void sub_8181110(struct Sprite *sprite)
{
sub_817F70C(sprite);
sprite->pos2.x++;
@@ -2419,7 +2437,7 @@ void sub_8181110(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8181144(struct Sprite *sprite)
+static void sub_8181144(struct Sprite *sprite)
{
sub_817F70C(sprite);
sprite->data[2] += 16;
@@ -2437,11 +2455,11 @@ void sub_8181144(struct Sprite *sprite)
sprite->pos2.y += 2;
}
- HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[2] << 8);
+ HandleSetAffineData(sprite, 256, 256, sprite->data[2] << 8);
sub_817F70C(sprite);
}
-void sub_81811A4(struct Sprite *sprite)
+static void sub_81811A4(struct Sprite *sprite)
{
sub_817F70C(sprite);
sprite->pos2.x++;
@@ -2458,21 +2476,21 @@ void sub_81811A4(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8181214(struct Sprite *sprite);
+static void sub_8181214(struct Sprite *sprite);
-void pokemonanimfunc_2A(struct Sprite *sprite)
+static void pokemonanimfunc_2A(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_2 = 2;
+ sUnknown_03001240[id].field_2 = 2;
sub_8181214(sprite);
sprite->callback = sub_8181214;
}
-void sub_8181214(struct Sprite *sprite)
+static void sub_8181214(struct Sprite *sprite)
{
- if (gUnknown_03001240[sprite->data[0]].field_0 != 0)
+ if (sUnknown_03001240[sprite->data[0]].field_0 != 0)
{
- gUnknown_03001240[sprite->data[0]].field_0--;
+ sUnknown_03001240[sprite->data[0]].field_0--;
}
else
{
@@ -2481,7 +2499,7 @@ void sub_8181214(struct Sprite *sprite)
{
sprite->data[2]++;
HandleStartAffineAnim(sprite);
- sprite->data[7] = gUnknown_03001240[sprite->data[0]].field_2;
+ sprite->data[7] = sUnknown_03001240[sprite->data[0]].field_2;
sprite->data[3] = -1;
sprite->data[4] = -1;
sprite->data[5] = 0;
@@ -2508,12 +2526,12 @@ void sub_8181214(struct Sprite *sprite)
{
sprite->pos2.x = 0;
sprite->pos2.y = 0;
- if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+ if (sUnknown_03001240[sprite->data[0]].field_4 > 1)
{
- gUnknown_03001240[sprite->data[0]].field_4--;
+ sUnknown_03001240[sprite->data[0]].field_4--;
sprite->data[5] = 0;
sprite->data[6] = 0;
- gUnknown_03001240[sprite->data[0]].field_0 = 10;
+ sUnknown_03001240[sprite->data[0]].field_0 = 10;
}
else
{
@@ -2522,14 +2540,14 @@ void sub_8181214(struct Sprite *sprite)
}
}
- HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[6] << 8);
+ HandleSetAffineData(sprite, 256, 256, sprite->data[6] << 8);
sub_817F70C(sprite);
}
}
-void sub_8181370(struct Sprite *sprite);
+static void sub_8181370(struct Sprite *sprite);
-void pokemonanimfunc_2B(struct Sprite *sprite)
+static void pokemonanimfunc_2B(struct Sprite *sprite)
{
HandleStartAffineAnim(sprite);
sprite->data[6] = 0;
@@ -2537,7 +2555,7 @@ void pokemonanimfunc_2B(struct Sprite *sprite)
sprite->callback = sub_8181370;
}
-void sub_8181370(struct Sprite *sprite)
+static void sub_8181370(struct Sprite *sprite)
{
sub_817F70C(sprite);
sprite->data[6] += 4;
@@ -2545,12 +2563,12 @@ void sub_8181370(struct Sprite *sprite)
sprite->pos2.y = -(Sin((sprite->data[6] * 2) & 0xFF, 8));
if (sprite->data[6] > 192 && sprite->data[7] == 1)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->data[7]++;
}
else if (sprite->data[6] > 64 && sprite->data[7] == 0)
{
- HandleSetAffineData(sprite, -0x100, 0x100, 0);
+ HandleSetAffineData(sprite, -256, 256, 0);
sprite->data[7]++;
}
@@ -2558,14 +2576,14 @@ void sub_8181370(struct Sprite *sprite)
{
sprite->pos2.x = 0;
sprite->pos2.y = 0;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
sub_817F70C(sprite);
}
-void pokemonanimfunc_2C(struct Sprite *sprite)
+static void pokemonanimfunc_2C(struct Sprite *sprite)
{
if (++sprite->data[2] == 1)
{
@@ -2575,7 +2593,7 @@ void pokemonanimfunc_2C(struct Sprite *sprite)
sprite->data[4] = 0;
}
- if (gUnknown_0860AA64[sprite->data[6]][1] == 0xFF)
+ if (sUnknown_0860AA64[sprite->data[6]][1] == 0xFF)
{
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
@@ -2583,7 +2601,7 @@ void pokemonanimfunc_2C(struct Sprite *sprite)
{
if (sprite->data[4] == 1)
{
- if (gUnknown_0860AA64[sprite->data[6]][0] != 0)
+ if (sUnknown_0860AA64[sprite->data[6]][0] != 0)
BlendPalette(sprite->data[7], 0x10, 0x10, 0x3FF);
else
BlendPalette(sprite->data[7], 0x10, 0, 0x3FF);
@@ -2591,7 +2609,7 @@ void pokemonanimfunc_2C(struct Sprite *sprite)
sprite->data[4] = 0;
}
- if (gUnknown_0860AA64[sprite->data[6]][1] == sprite->data[5])
+ if (sUnknown_0860AA64[sprite->data[6]][1] == sprite->data[5])
{
sprite->data[4] = 1;
sprite->data[5] = 0;
@@ -2604,19 +2622,19 @@ void pokemonanimfunc_2C(struct Sprite *sprite)
}
}
-void sub_81814D4(struct Sprite *sprite)
+static void sub_81814D4(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
HandleStartAffineAnim(sprite);
sub_817F70C(sprite);
- if (sprite->data[2] > gUnknown_03001240[sprite->data[0]].field_8)
+ if (sprite->data[2] > sUnknown_03001240[sprite->data[0]].field_8)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->pos2.x = 0;
- if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+ if (sUnknown_03001240[sprite->data[0]].field_4 > 1)
{
- gUnknown_03001240[sprite->data[0]].field_4--;
+ sUnknown_03001240[sprite->data[0]].field_4--;
sprite->data[2] = 0;
}
else
@@ -2627,36 +2645,36 @@ void sub_81814D4(struct Sprite *sprite)
}
else
{
- s16 index = (sprite->data[2] * 256) / gUnknown_03001240[sprite->data[0]].field_8;
+ s16 index = (sprite->data[2] * 256) / sUnknown_03001240[sprite->data[0]].field_8;
sprite->pos2.x = -(Sin(index, 10));
- HandleSetAffineData(sprite, 0x100, 0x100, Sin(index, 3276));
+ HandleSetAffineData(sprite, 256, 256, Sin(index, 3276));
}
sprite->data[2]++;
sub_817F70C(sprite);
}
-void pokemonanimfunc_2D(struct Sprite *sprite)
+static void pokemonanimfunc_2D(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_8 = 50;
+ sUnknown_03001240[id].field_8 = 50;
sub_81814D4(sprite);
sprite->callback = sub_81814D4;
}
-void sub_81815D4(struct Sprite *sprite)
+static void sub_81815D4(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
HandleStartAffineAnim(sprite);
sub_817F70C(sprite);
- if (sprite->data[2] > gUnknown_03001240[sprite->data[0]].field_8)
+ if (sprite->data[2] > sUnknown_03001240[sprite->data[0]].field_8)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->pos2.x = 0;
- if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+ if (sUnknown_03001240[sprite->data[0]].field_4 > 1)
{
- gUnknown_03001240[sprite->data[0]].field_4--;
+ sUnknown_03001240[sprite->data[0]].field_4--;
sprite->data[2] = 0;
}
else
@@ -2667,28 +2685,28 @@ void sub_81815D4(struct Sprite *sprite)
}
else
{
- s16 index = (sprite->data[2] * 256) / gUnknown_03001240[sprite->data[0]].field_8;
+ s16 index = (sprite->data[2] * 256) / sUnknown_03001240[sprite->data[0]].field_8;
sprite->pos2.x = -(Sin(index, 10));
- HandleSetAffineData(sprite, 0x100, 0x100, -(Sin(index, 3276)));
+ HandleSetAffineData(sprite, 256, 256, -(Sin(index, 3276)));
}
sprite->data[2]++;
sub_817F70C(sprite);
}
-void pokemonanimfunc_2E(struct Sprite *sprite)
+static void pokemonanimfunc_2E(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_8 = 50;
+ sUnknown_03001240[id].field_8 = 50;
sub_81815D4(sprite);
sprite->callback = sub_81815D4;
}
-void sub_8181708(struct Sprite *sprite);
-void sub_8181770(struct Sprite *sprite);
-void sub_8181794(struct Sprite *sprite);
+static void sub_8181708(struct Sprite *sprite);
+static void sub_8181770(struct Sprite *sprite);
+static void sub_8181794(struct Sprite *sprite);
-void pokemonanimfunc_2F(struct Sprite *sprite)
+static void pokemonanimfunc_2F(struct Sprite *sprite)
{
HandleStartAffineAnim(sprite);
sprite->data[6] = -(14 * sprite->centerToCornerVecX / 10);
@@ -2696,7 +2714,7 @@ void pokemonanimfunc_2F(struct Sprite *sprite)
sprite->callback = sub_8181708;
}
-void sub_8181708(struct Sprite *sprite)
+static void sub_8181708(struct Sprite *sprite)
{
sub_817F70C(sprite);
sprite->data[7]--;
@@ -2704,7 +2722,7 @@ void sub_8181708(struct Sprite *sprite)
sprite->pos2.y = -(Sin(sprite->data[7], sprite->data[6] += 0)); // dummy += 0 is needed to match
- HandleSetAffineData(sprite, 0x100, 0x100, (sprite->data[7] - 128) << 8);
+ HandleSetAffineData(sprite, 256, 256, (sprite->data[7] - 128) << 8);
if (sprite->data[7] <= 120)
{
sprite->data[7] = 120;
@@ -2715,7 +2733,7 @@ void sub_8181708(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8181770(struct Sprite *sprite)
+static void sub_8181770(struct Sprite *sprite)
{
if (sprite->data[3] == 20)
{
@@ -2726,7 +2744,7 @@ void sub_8181770(struct Sprite *sprite)
sprite->data[3]++;
}
-void sub_8181794(struct Sprite *sprite)
+static void sub_8181794(struct Sprite *sprite)
{
sub_817F70C(sprite);
sprite->data[7] += 2;
@@ -2734,12 +2752,12 @@ void sub_8181794(struct Sprite *sprite)
sprite->pos2.y = -(Sin(sprite->data[7], sprite->data[6] += 0)); // dummy += 0 is needed to match
- HandleSetAffineData(sprite, 0x100, 0x100, (sprite->data[7] - 128) << 8);
+ HandleSetAffineData(sprite, 256, 256, (sprite->data[7] - 128) << 8);
if (sprite->data[7] >= 128)
{
sprite->pos2.x = 0;
sprite->pos2.y = 0;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->data[2] = 0;
sub_817F77C(sprite);
sprite->callback = pokemonanimfunc_10;
@@ -2748,11 +2766,11 @@ void sub_8181794(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8181810(struct Sprite *sprite)
+static void sub_8181810(struct Sprite *sprite)
{
- if (gUnknown_03001240[sprite->data[0]].field_0 != 0)
+ if (sUnknown_03001240[sprite->data[0]].field_0 != 0)
{
- gUnknown_03001240[sprite->data[0]].field_0--;
+ sUnknown_03001240[sprite->data[0]].field_0--;
}
else
{
@@ -2769,7 +2787,7 @@ void sub_8181810(struct Sprite *sprite)
sprite->data[7] = Sin(sprite->data[4], 256);
sprite->pos2.y = Sin(sprite->data[4], 16);
sprite->data[6] = Sin(sprite->data[4], 32);
- HandleSetAffineData(sprite, 0x100 - sprite->data[6], 0x100 + sprite->data[7], 0);
+ HandleSetAffineData(sprite, 256 - sprite->data[6], 256 + sprite->data[7], 0);
if (sprite->data[4] == 128)
{
sprite->data[4] = 0;
@@ -2781,38 +2799,38 @@ void sub_8181810(struct Sprite *sprite)
sprite->data[7] = Sin(sprite->data[4], 32);
sprite->pos2.y = -(Sin(sprite->data[4], 8));
sprite->data[6] = Sin(sprite->data[4], 128);
- HandleSetAffineData(sprite, 0x100 + sprite->data[6], 0x100 - sprite->data[7], 0);
+ HandleSetAffineData(sprite, 256 + sprite->data[6], 256 - sprite->data[7], 0);
if (sprite->data[4] == 128)
{
- if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+ if (sUnknown_03001240[sprite->data[0]].field_4 > 1)
{
- gUnknown_03001240[sprite->data[0]].field_4--;
- gUnknown_03001240[sprite->data[0]].field_0 = 10;
+ sUnknown_03001240[sprite->data[0]].field_4--;
+ sUnknown_03001240[sprite->data[0]].field_0 = 10;
sprite->data[4] = 0;
sprite->data[5] = 0;
}
else
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
}
}
- sprite->data[4] += gUnknown_03001240[sprite->data[0]].field_6;
+ sprite->data[4] += sUnknown_03001240[sprite->data[0]].field_6;
}
}
-void pokemonanimfunc_30(struct Sprite *sprite)
+static void pokemonanimfunc_30(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_6 = 4;
+ sUnknown_03001240[id].field_6 = 4;
sub_8181810(sprite);
sprite->callback = sub_8181810;
}
-void pokemonanimfunc_31(struct Sprite *sprite)
+static void pokemonanimfunc_31(struct Sprite *sprite)
{
s32 counter = sprite->data[2];
sub_817F70C(sprite);
@@ -2847,25 +2865,25 @@ void pokemonanimfunc_31(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8181ABC(struct Sprite *sprite);
-void sub_8181B4C(struct Sprite *sprite);
-void sub_8181C2C(struct Sprite *sprite);
+static void sub_8181ABC(struct Sprite *sprite);
+static void sub_8181B4C(struct Sprite *sprite);
+static void sub_8181C2C(struct Sprite *sprite);
-void pokemonanimfunc_32(struct Sprite *sprite)
+static void pokemonanimfunc_32(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_8 = -1;
+ sUnknown_03001240[id].field_8 = -1;
HandleStartAffineAnim(sprite);
sprite->data[3] = 0;
sub_8181ABC(sprite);
sprite->callback = sub_8181ABC;
}
-void sub_8181ABC(struct Sprite *sprite)
+static void sub_8181ABC(struct Sprite *sprite)
{
- if (gUnknown_03001240[sprite->data[0]].field_0 != 0)
+ if (sUnknown_03001240[sprite->data[0]].field_0 != 0)
{
- gUnknown_03001240[sprite->data[0]].field_0--;
+ sUnknown_03001240[sprite->data[0]].field_0--;
}
else
{
@@ -2880,7 +2898,7 @@ void sub_8181ABC(struct Sprite *sprite)
}
else
{
- s32 var = 8 * gUnknown_03001240[sprite->data[0]].field_8;
+ s32 var = 8 * sUnknown_03001240[sprite->data[0]].field_8;
sprite->pos2.x = var * (counter % 128) / 128;
sprite->pos2.y = -(Sin(counter % 128, 8));
sprite->data[2] += 12;
@@ -2890,12 +2908,12 @@ void sub_8181ABC(struct Sprite *sprite)
}
}
-void sub_8181B4C(struct Sprite *sprite)
+static void sub_8181B4C(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] > 48)
{
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->pos2.y = 0;
sprite->data[2] = 0;
sprite->callback = sub_8181C2C;
@@ -2907,7 +2925,7 @@ void sub_8181B4C(struct Sprite *sprite)
if (sprite->data[2] >= 16 && sprite->data[2] <= 31)
{
sprite->data[3] += 8;
- sprite->pos2.x -= gUnknown_03001240[sprite->data[0]].field_8;
+ sprite->pos2.x -= sUnknown_03001240[sprite->data[0]].field_8;
}
yDelta = 0;
@@ -2924,7 +2942,7 @@ void sub_8181B4C(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8181C2C(struct Sprite *sprite)
+static void sub_8181C2C(struct Sprite *sprite)
{
s32 counter;
@@ -2932,10 +2950,10 @@ void sub_8181C2C(struct Sprite *sprite)
counter = sprite->data[2];
if (counter > 128)
{
- if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+ if (sUnknown_03001240[sprite->data[0]].field_4 > 1)
{
- gUnknown_03001240[sprite->data[0]].field_4--;
- gUnknown_03001240[sprite->data[0]].field_0 = 10;
+ sUnknown_03001240[sprite->data[0]].field_4--;
+ sUnknown_03001240[sprite->data[0]].field_0 = 10;
sprite->data[3] = 0;
sprite->data[2] = 0;
sprite->data[4] = 0;
@@ -2952,9 +2970,9 @@ void sub_8181C2C(struct Sprite *sprite)
}
else
{
- register s32 var asm("r4") = gUnknown_03001240[sprite->data[0]].field_8;
+ register s32 var asm("r4") = sUnknown_03001240[sprite->data[0]].field_8;
- sprite->pos2.x = (var << 3) * (counter % 128) / 128 - (gUnknown_03001240[sprite->data[0]].field_8 * 8);
+ sprite->pos2.x = (var << 3) * (counter % 128) / 128 - (sUnknown_03001240[sprite->data[0]].field_8 * 8);
sprite->pos2.y = -(Sin(counter % 128, 8));
}
@@ -2962,7 +2980,7 @@ void sub_8181C2C(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8181CE8(struct Sprite *sprite)
+static void sub_8181CE8(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -2975,10 +2993,10 @@ void sub_8181CE8(struct Sprite *sprite)
{
sprite->pos2.x = 0;
sprite->pos2.y = 0;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
- if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+ HandleSetAffineData(sprite, 256, 256, 0);
+ if (sUnknown_03001240[sprite->data[0]].field_4 > 1)
{
- gUnknown_03001240[sprite->data[0]].field_4--;
+ sUnknown_03001240[sprite->data[0]].field_4--;
sprite->data[2] = 0;
sprite->data[7] = 0;
}
@@ -2996,21 +3014,21 @@ void sub_8181CE8(struct Sprite *sprite)
sprite->pos2.x = -(Sin(sprite->data[7], 16));
rotation = Sin(sprite->data[7], 32);
- HandleSetAffineData(sprite, 0x100, 0x100, rotation << 8);
- sprite->data[7] += gUnknown_03001240[sprite->data[0]].field_6;
+ HandleSetAffineData(sprite, 256, 256, rotation << 8);
+ sprite->data[7] += sUnknown_03001240[sprite->data[0]].field_6;
sub_817F70C(sprite);
}
}
-void pokemonanimfunc_33(struct Sprite *sprite)
+static void pokemonanimfunc_33(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_6 = 4;
+ sUnknown_03001240[id].field_6 = 4;
sub_8181CE8(sprite);
sprite->callback = sub_8181CE8;
}
-void pokemonanimfunc_34(struct Sprite *sprite)
+static void pokemonanimfunc_34(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -3023,7 +3041,7 @@ void pokemonanimfunc_34(struct Sprite *sprite)
{
sprite->pos2.x = 0;
sprite->pos2.y = 0;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
sub_817F70C(sprite);
@@ -3035,13 +3053,13 @@ void pokemonanimfunc_34(struct Sprite *sprite)
sprite->pos2.x = -(Sin(sprite->data[7], 16));
sprite->pos2.y = -(Sin(sprite->data[7] % 128, 16));
rotation = Sin(sprite->data[7], 32);
- HandleSetAffineData(sprite, 0x100, 0x100, rotation << 8);
+ HandleSetAffineData(sprite, 256, 256, rotation << 8);
sprite->data[7] += 8;
sub_817F70C(sprite);
}
}
-void pokemonanimfunc_35(struct Sprite *sprite)
+static void pokemonanimfunc_35(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
sprite->data[7] = 0;
@@ -3065,18 +3083,18 @@ void pokemonanimfunc_35(struct Sprite *sprite)
}
}
-void sub_8181F14(struct Sprite *sprite);
-void sub_8181F50(struct Sprite *sprite);
-void sub_8181FC0(struct Sprite *sprite);
+static void sub_8181F14(struct Sprite *sprite);
+static void sub_8181F50(struct Sprite *sprite);
+static void sub_8181FC0(struct Sprite *sprite);
-void pokemonanimfunc_36(struct Sprite *sprite)
+static void pokemonanimfunc_36(struct Sprite *sprite)
{
HandleStartAffineAnim(sprite);
sprite->data[7] = 0;
sprite->callback = sub_8181F14;
}
-void sub_8181F14(struct Sprite *sprite)
+static void sub_8181F14(struct Sprite *sprite)
{
if (sprite->data[7] > 31)
{
@@ -3089,10 +3107,10 @@ void sub_8181F14(struct Sprite *sprite)
sprite->data[7] += 4;
}
- HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[7] << 8);
+ HandleSetAffineData(sprite, 256, 256, sprite->data[7] << 8);
}
-void sub_8181F50(struct Sprite *sprite)
+static void sub_8181F50(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] > 512)
@@ -3110,7 +3128,7 @@ void sub_8181F50(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_8181FC0(struct Sprite *sprite)
+static void sub_8181FC0(struct Sprite *sprite)
{
sub_817F70C(sprite);
sprite->data[7] -= 2;
@@ -3126,11 +3144,11 @@ void sub_8181FC0(struct Sprite *sprite)
sprite->pos2.x = -(Sin(sprite->data[7] * 2, 16));
}
- HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[7] << 8);
+ HandleSetAffineData(sprite, 256, 256, sprite->data[7] << 8);
sub_817F70C(sprite);
}
-void pokemonanimfunc_37(struct Sprite *sprite)
+static void pokemonanimfunc_37(struct Sprite *sprite)
{
u16 rotation;
@@ -3158,16 +3176,16 @@ void pokemonanimfunc_37(struct Sprite *sprite)
}
rotation = Sin(sprite->data[7] % 128, 16);
- HandleSetAffineData(sprite, 0x100, 0x100, rotation << 8);
+ HandleSetAffineData(sprite, 256, 256, rotation << 8);
sub_817F70C(sprite);
}
-void sub_81820FC(struct Sprite *sprite);
-void sub_818216C(struct Sprite *sprite);
-void sub_81821CC(struct Sprite *sprite);
-void sub_8182248(struct Sprite *sprite);
+static void sub_81820FC(struct Sprite *sprite);
+static void sub_818216C(struct Sprite *sprite);
+static void sub_81821CC(struct Sprite *sprite);
+static void sub_8182248(struct Sprite *sprite);
-void pokemonanimfunc_38(struct Sprite *sprite)
+static void pokemonanimfunc_38(struct Sprite *sprite)
{
HandleStartAffineAnim(sprite);
sprite->data[7] = 0;
@@ -3175,7 +3193,7 @@ void pokemonanimfunc_38(struct Sprite *sprite)
sprite->callback = sub_81820FC;
}
-void sub_81820FC(struct Sprite *sprite)
+static void sub_81820FC(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[7] > 24)
@@ -3193,11 +3211,11 @@ void sub_81820FC(struct Sprite *sprite)
sprite->pos2.y = -(Sin(sprite->data[7], 8));
}
- HandleSetAffineData(sprite, 0x100, 0x100, -(sprite->data[7]) << 8);
+ HandleSetAffineData(sprite, 256, 256, -(sprite->data[7]) << 8);
sub_817F70C(sprite);
}
-void sub_818216C(struct Sprite *sprite)
+static void sub_818216C(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[7] > 32)
@@ -3212,11 +3230,11 @@ void sub_818216C(struct Sprite *sprite)
sprite->pos2.y = -(Sin(sprite->data[7], 8));
}
- HandleSetAffineData(sprite, 0x100, 0x100, -(sprite->data[7]) << 8);
+ HandleSetAffineData(sprite, 256, 256, -(sprite->data[7]) << 8);
sub_817F70C(sprite);
}
-void sub_81821CC(struct Sprite *sprite)
+static void sub_81821CC(struct Sprite *sprite)
{
sub_817F70C(sprite);
sprite->data[7] += (sprite->data[6] * 4);
@@ -3234,11 +3252,11 @@ void sub_81821CC(struct Sprite *sprite)
sprite->data[5]++;
}
- HandleSetAffineData(sprite, 0x100, 0x100, -(sprite->data[7]) << 8);
+ HandleSetAffineData(sprite, 256, 256, -(sprite->data[7]) << 8);
sub_817F70C(sprite);
}
-void sub_8182248(struct Sprite *sprite)
+static void sub_8182248(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[7] <= 0)
@@ -3254,11 +3272,11 @@ void sub_8182248(struct Sprite *sprite)
sprite->pos2.y = -(Sin(sprite->data[7], 8));
}
- HandleSetAffineData(sprite, 0x100, 0x100, -(sprite->data[7]) << 8);
+ HandleSetAffineData(sprite, 256, 256, -(sprite->data[7]) << 8);
sub_817F70C(sprite);
}
-void pokemonanimfunc_39(struct Sprite *sprite)
+static void pokemonanimfunc_39(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] > 40)
@@ -3290,7 +3308,7 @@ void pokemonanimfunc_39(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void pokemonanimfunc_3A(struct Sprite *sprite)
+static void pokemonanimfunc_3A(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] == 0)
@@ -3309,7 +3327,7 @@ void pokemonanimfunc_3A(struct Sprite *sprite)
{
s16 scale = (8 * sprite->data[6]) / 20;
scale = Sin(sprite->data[7] - scale, 64);
- HandleSetAffineData(sprite, 0x100 - scale, 0x100 - scale, 0);
+ HandleSetAffineData(sprite, 256 - scale, 256 - scale, 0);
}
}
else
@@ -3321,7 +3339,7 @@ void pokemonanimfunc_3A(struct Sprite *sprite)
if (sprite->data[7] > 63)
{
sprite->data[7] = 64;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
@@ -3352,13 +3370,13 @@ void pokemonanimfunc_3A(struct Sprite *sprite)
}
sprite->data[7] += 2;
- HandleSetAffineData(sprite, 0x100 - var, 0x100 - var, 0);
+ HandleSetAffineData(sprite, 256 - var, 256 - var, 0);
}
sub_817F70C(sprite);
}
-void pokemonanimfunc_3B(struct Sprite *sprite)
+static void pokemonanimfunc_3B(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -3370,7 +3388,7 @@ void pokemonanimfunc_3B(struct Sprite *sprite)
if (sprite->data[7] > 512)
{
sprite->pos2.y = 0;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
@@ -3381,11 +3399,11 @@ void pokemonanimfunc_3B(struct Sprite *sprite)
sprite->pos2.y = Sin(sprite->data[7] % 256, 8);
sprite->data[7] += 8;
yScale = Sin(sprite->data[7] % 128, 96);
- HandleSetAffineData(sprite, 0x100, yScale + 0x100, 0);
+ HandleSetAffineData(sprite, 256, yScale + 256, 0);
}
}
-void pokemonanimfunc_3C(struct Sprite *sprite)
+static void pokemonanimfunc_3C(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -3397,7 +3415,7 @@ void pokemonanimfunc_3C(struct Sprite *sprite)
if (sprite->data[7] > 256)
{
sprite->pos2.y = 0;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
@@ -3408,22 +3426,22 @@ void pokemonanimfunc_3C(struct Sprite *sprite)
sprite->pos2.y = Sin(sprite->data[7], 16);
sprite->data[7] += 4;
yScale = Sin((sprite->data[7] % 64) * 2, 128);
- HandleSetAffineData(sprite, 0x100, yScale + 0x100, 0);
+ HandleSetAffineData(sprite, 256, yScale + 256, 0);
}
}
-void sub_81825F8(struct Sprite *sprite);
-void sub_8182648(struct Sprite *sprite);
-void sub_81826F8(struct Sprite *sprite);
+static void sub_81825F8(struct Sprite *sprite);
+static void sub_8182648(struct Sprite *sprite);
+static void sub_81826F8(struct Sprite *sprite);
-void pokemonanimfunc_3D(struct Sprite *sprite)
+static void pokemonanimfunc_3D(struct Sprite *sprite)
{
HandleStartAffineAnim(sprite);
sprite->callback = sub_81825F8;
sprite->data[7] = 0;
}
-void sub_81825F8(struct Sprite *sprite)
+static void sub_81825F8(struct Sprite *sprite)
{
s16 yScale;
@@ -3440,10 +3458,10 @@ void sub_81825F8(struct Sprite *sprite)
yScale = Sin(sprite->data[7], 128);
}
- HandleSetAffineData(sprite, 0x100, 0x100 + yScale, 0);
+ HandleSetAffineData(sprite, 256, 256 + yScale, 0);
}
-void sub_8182648(struct Sprite *sprite)
+static void sub_8182648(struct Sprite *sprite)
{
s16 yScale;
@@ -3473,7 +3491,7 @@ void sub_8182648(struct Sprite *sprite)
yScale = Cos((index * 2) + sprite->data[7], 128) * sign;
}
- HandleSetAffineData(sprite, 0x100, 0x100 + yScale, 0);
+ HandleSetAffineData(sprite, 256, 256 + yScale, 0);
if (sprite->data[6] == 3)
{
sprite->data[7] = 0;
@@ -3481,7 +3499,7 @@ void sub_8182648(struct Sprite *sprite)
}
}
-void sub_81826F8(struct Sprite *sprite)
+static void sub_81826F8(struct Sprite *sprite)
{
s16 yScale;
@@ -3493,20 +3511,20 @@ void sub_81826F8(struct Sprite *sprite)
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
sprite->pos2.y = 0;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
}
- HandleSetAffineData(sprite, 0x100, 0x100 + yScale, 0);
+ HandleSetAffineData(sprite, 256, 256 + yScale, 0);
}
-void sub_8182764(struct Sprite *sprite)
+static void sub_8182764(struct Sprite *sprite)
{
if (sprite->data[7] > sprite->data[5])
{
sprite->pos2.x = 0;
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
}
else
{
@@ -3515,11 +3533,11 @@ void sub_8182764(struct Sprite *sprite)
sprite->pos2.x = Sin(sprite->data[7] % 256, sprite->data[4]);
sprite->data[7] += sprite->data[6];
xScale = Sin(sprite->data[7] % 128, 96);
- HandleSetAffineData(sprite, 0x100 + xScale, 0x100, 0);
+ HandleSetAffineData(sprite, 256 + xScale, 256, 0);
}
}
-void pokemonanimfunc_3E(struct Sprite *sprite)
+static void pokemonanimfunc_3E(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -3534,14 +3552,14 @@ void pokemonanimfunc_3E(struct Sprite *sprite)
sub_8182764(sprite);
}
-void sub_8182830(struct Sprite *sprite)
+static void sub_8182830(struct Sprite *sprite)
{
if (sprite->data[7] > sprite->data[5])
{
sprite->pos2.x = 0;
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
}
else
{
@@ -3550,11 +3568,11 @@ void sub_8182830(struct Sprite *sprite)
sprite->pos2.x = Sin(sprite->data[7] % 256, sprite->data[4]);
sprite->data[7] += sprite->data[6];
xScale = Sin((sprite->data[7] % 64) * 2, 128);
- HandleSetAffineData(sprite, 0x100 + xScale, 0x100, 0);
+ HandleSetAffineData(sprite, 256 + xScale, 256, 0);
}
}
-void pokemonanimfunc_3F(struct Sprite *sprite)
+static void pokemonanimfunc_3F(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -3569,7 +3587,7 @@ void pokemonanimfunc_3F(struct Sprite *sprite)
sub_8182830(sprite);
}
-void pokemonanimfunc_40(struct Sprite *sprite)
+static void pokemonanimfunc_40(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] == 0)
@@ -3583,7 +3601,7 @@ void pokemonanimfunc_40(struct Sprite *sprite)
{
sprite->pos2.x = 0;
sub_817F77C(sprite);
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
else
@@ -3593,13 +3611,13 @@ void pokemonanimfunc_40(struct Sprite *sprite)
sprite->pos2.x = Sin(sprite->data[7] % 256, 8);
sprite->data[7] += 8;
scale = Sin(sprite->data[7] % 128, 96);
- HandleSetAffineData(sprite, 0x100 + scale, 0x100 + scale, 0);
+ HandleSetAffineData(sprite, 256 + scale, 256 + scale, 0);
}
sub_817F70C(sprite);
}
-void pokemonanimfunc_41(struct Sprite *sprite)
+static void pokemonanimfunc_41(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] == 0)
@@ -3613,7 +3631,7 @@ void pokemonanimfunc_41(struct Sprite *sprite)
{
sprite->pos2.x = 0;
sub_817F77C(sprite);
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
else
@@ -3623,13 +3641,13 @@ void pokemonanimfunc_41(struct Sprite *sprite)
sprite->pos2.x = -(Sin((sprite->data[7] % 256) / 2, 16));
sprite->data[7] += 8;
scale = -(Sin((sprite->data[7] % 256) / 2, 64));
- HandleSetAffineData(sprite, 0x100 + scale, 0x100 + scale, 0);
+ HandleSetAffineData(sprite, 256 + scale, 256 + scale, 0);
}
sub_817F70C(sprite);
}
-void pokemonanimfunc_42(struct Sprite *sprite)
+static void pokemonanimfunc_42(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] == 0)
@@ -3643,7 +3661,7 @@ void pokemonanimfunc_42(struct Sprite *sprite)
{
sprite->pos2.x = 0;
sub_817F77C(sprite);
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
else
@@ -3653,13 +3671,13 @@ void pokemonanimfunc_42(struct Sprite *sprite)
sprite->pos2.x = -(Sin(sprite->data[7] % 256 , 8));
sprite->data[7] += 8;
scale = Sin((sprite->data[7] % 256) / 2, 96);
- HandleSetAffineData(sprite, 0x100 + scale, 0x100 + scale, 0);
+ HandleSetAffineData(sprite, 256 + scale, 256 + scale, 0);
}
sub_817F70C(sprite);
}
-void pokemonanimfunc_43(struct Sprite *sprite)
+static void pokemonanimfunc_43(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] > 2048)
@@ -3693,7 +3711,7 @@ void pokemonanimfunc_43(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void pokemonanimfunc_44(struct Sprite *sprite)
+static void pokemonanimfunc_44(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] == 0)
@@ -3750,50 +3768,50 @@ void pokemonanimfunc_44(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void pokemonanimfunc_45(struct Sprite *sprite)
+static void pokemonanimfunc_45(struct Sprite *sprite)
{
sprite->data[0] = 32;
sub_8180714(sprite);
sprite->callback = sub_8180714;
}
-void pokemonanimfunc_46(struct Sprite *sprite)
+static void pokemonanimfunc_46(struct Sprite *sprite)
{
sprite->data[0] = 80;
sub_817F8FC(sprite);
sprite->callback = sub_817F8FC;
}
-void pokemonanimfunc_47(struct Sprite *sprite)
+static void pokemonanimfunc_47(struct Sprite *sprite)
{
sprite->data[0] = 80;
sub_817F978(sprite);
sprite->callback = sub_817F978;
}
-void pokemonanimfunc_48(struct Sprite *sprite)
+static void pokemonanimfunc_48(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_6 = 2048;
- gUnknown_03001240[id].field_8 = sprite->data[6];
+ sUnknown_03001240[id].field_6 = 2048;
+ sUnknown_03001240[id].field_8 = sprite->data[6];
sub_8180900(sprite);
sprite->callback = sub_8180900;
}
-void pokemonanimfunc_49(struct Sprite *sprite)
+static void pokemonanimfunc_49(struct Sprite *sprite)
{
sprite->data[6] = 1;
pokemonanimfunc_05(sprite);
}
-void pokemonanimfunc_4A(struct Sprite *sprite)
+static void pokemonanimfunc_4A(struct Sprite *sprite)
{
sprite->data[6] = 1;
pokemonanimfunc_48(sprite);
}
-void pokemonanimfunc_4B(struct Sprite *sprite)
+static void pokemonanimfunc_4B(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
sprite->data[0] = 0;
@@ -3809,7 +3827,7 @@ void pokemonanimfunc_4B(struct Sprite *sprite)
}
}
-void pokemonanimfunc_4C(struct Sprite *sprite)
+static void pokemonanimfunc_4C(struct Sprite *sprite)
{
sprite->data[0] = 30;
sprite->data[7] = 3;
@@ -3817,156 +3835,156 @@ void pokemonanimfunc_4C(struct Sprite *sprite)
sprite->callback = sub_817FCDC;
}
-void pokemonanimfunc_4D(struct Sprite *sprite)
+static void pokemonanimfunc_4D(struct Sprite *sprite)
{
sprite->data[0] = 30;
sub_817FD44(sprite);
sprite->callback = sub_817FD44;
}
-void pokemonanimfunc_4E(struct Sprite *sprite)
+static void pokemonanimfunc_4E(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_6 = 1024;
- gUnknown_03001240[id].field_0 = 0;
- gUnknown_03001240[id].field_4 = 2;
+ sUnknown_03001240[id].field_6 = 1024;
+ sUnknown_03001240[id].field_0 = 0;
+ sUnknown_03001240[id].field_4 = 2;
sub_817FE30(sprite);
sprite->callback = sub_817FE30;
}
-void pokemonanimfunc_4F(struct Sprite *sprite)
+static void pokemonanimfunc_4F(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_6 = 512;
- gUnknown_03001240[id].field_8 = 3;
- gUnknown_03001240[id].field_2 = 12;
+ sUnknown_03001240[id].field_6 = 512;
+ sUnknown_03001240[id].field_8 = 3;
+ sUnknown_03001240[id].field_2 = 12;
sub_817FFF0(sprite);
sprite->callback = sub_817FFF0;
}
-void pokemonanimfunc_50(struct Sprite *sprite)
+static void pokemonanimfunc_50(struct Sprite *sprite)
{
sprite->data[0] = 24;
sub_818031C(sprite);
sprite->callback = sub_818031C;
}
-void pokemonanimfunc_51(struct Sprite *sprite)
+static void pokemonanimfunc_51(struct Sprite *sprite)
{
sprite->data[0] = 5;
sub_81804F8(sprite);
sprite->callback = sub_81804F8;
}
-void pokemonanimfunc_52(struct Sprite *sprite)
+static void pokemonanimfunc_52(struct Sprite *sprite)
{
sprite->data[0] = 3;
sub_817F9F4(sprite);
sprite->callback = sub_817F9F4;
}
-void pokemonanimfunc_53(struct Sprite *sprite)
+static void pokemonanimfunc_53(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_0 = 60;
- gUnknown_03001240[id].field_8 = 30;
+ sUnknown_03001240[id].field_0 = 60;
+ sUnknown_03001240[id].field_8 = 30;
sub_817FF3C(sprite);
sprite->callback = sub_817FF3C;
}
-void pokemonanimfunc_54(struct Sprite *sprite)
+static void pokemonanimfunc_54(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_2 = 1;
- gUnknown_03001240[id].field_4 = 2;
+ sUnknown_03001240[id].field_2 = 1;
+ sUnknown_03001240[id].field_4 = 2;
sub_8181214(sprite);
sprite->callback = sub_8181214;
}
-void pokemonanimfunc_55(struct Sprite *sprite)
+static void pokemonanimfunc_55(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_6 = 4;
- gUnknown_03001240[id].field_4 = 2;
+ sUnknown_03001240[id].field_6 = 4;
+ sUnknown_03001240[id].field_4 = 2;
sub_8181810(sprite);
sprite->callback = sub_8181810;
}
-void pokemonanimfunc_56(struct Sprite *sprite)
+static void pokemonanimfunc_56(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_8 = 1;
- gUnknown_03001240[id].field_4 = 2;
+ sUnknown_03001240[id].field_8 = 1;
+ sUnknown_03001240[id].field_4 = 2;
HandleStartAffineAnim(sprite);
sprite->data[3] = 0;
sub_8181ABC(sprite);
sprite->callback = sub_8181ABC;
}
-void pokemonanimfunc_07(struct Sprite *sprite)
+static void pokemonanimfunc_07(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_6 = 2;
+ sUnknown_03001240[id].field_6 = 2;
sub_8181CE8(sprite);
sprite->callback = sub_8181CE8;
}
-void pokemonanimfunc_08(struct Sprite *sprite)
+static void pokemonanimfunc_08(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_6 = 4;
- gUnknown_03001240[id].field_4 = 2;
+ sUnknown_03001240[id].field_6 = 4;
+ sUnknown_03001240[id].field_4 = 2;
sub_8181CE8(sprite);
sprite->callback = sub_8181CE8;
}
-void pokemonanimfunc_0B(struct Sprite *sprite)
+static void pokemonanimfunc_0B(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_8 = 100;
+ sUnknown_03001240[id].field_8 = 100;
sub_81814D4(sprite);
sprite->callback = sub_81814D4;
}
-void pokemonanimfunc_0C(struct Sprite *sprite)
+static void pokemonanimfunc_0C(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_8 = 50;
- gUnknown_03001240[id].field_4 = 2;
+ sUnknown_03001240[id].field_8 = 50;
+ sUnknown_03001240[id].field_4 = 2;
sub_81814D4(sprite);
sprite->callback = sub_81814D4;
}
-void pokemonanimfunc_0D(struct Sprite *sprite)
+static void pokemonanimfunc_0D(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_8 = 100;
+ sUnknown_03001240[id].field_8 = 100;
sub_81815D4(sprite);
sprite->callback = sub_81815D4;
}
-void pokemonanimfunc_0E(struct Sprite *sprite)
+static void pokemonanimfunc_0E(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_8 = 50;
- gUnknown_03001240[id].field_4 = 2;
+ sUnknown_03001240[id].field_8 = 50;
+ sUnknown_03001240[id].field_4 = 2;
sub_81815D4(sprite);
sprite->callback = sub_81815D4;
}
-void sub_8183140(struct Sprite *sprite)
+static void sub_8183140(struct Sprite *sprite)
{
s32 counter = sprite->data[2];
if (counter > 2304)
@@ -3982,7 +4000,7 @@ void sub_8183140(struct Sprite *sprite)
sprite->data[2] += sprite->data[0];
}
-void pokemonanimfunc_57(struct Sprite *sprite)
+static void pokemonanimfunc_57(struct Sprite *sprite)
{
sprite->data[0] = 60;
sprite->data[7] = 3;
@@ -3990,7 +4008,7 @@ void pokemonanimfunc_57(struct Sprite *sprite)
sprite->callback = sub_8183140;
}
-void pokemonanimfunc_58(struct Sprite *sprite)
+static void pokemonanimfunc_58(struct Sprite *sprite)
{
sprite->data[0] = 30;
sprite->data[7] = 3;
@@ -3998,7 +4016,7 @@ void pokemonanimfunc_58(struct Sprite *sprite)
sprite->callback = sub_8183140;
}
-void pokemonanimfunc_59(struct Sprite *sprite)
+static void pokemonanimfunc_59(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] > 2048)
@@ -4032,7 +4050,7 @@ void pokemonanimfunc_59(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void sub_81832C8(struct Sprite *sprite)
+static void sub_81832C8(struct Sprite *sprite)
{
s16 index1 = 0, index2 = 0;
@@ -4040,7 +4058,7 @@ void sub_81832C8(struct Sprite *sprite)
{
sprite->pos2.y = 0;
sprite->data[5] = 0;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
if (sprite->data[4] <= 1)
{
sub_817F77C(sprite);
@@ -4067,18 +4085,18 @@ void sub_81832C8(struct Sprite *sprite)
}
if (sprite->data[1] == 0)
- xScale = -0x100 - Sin(index2, 16);
+ xScale = -256 - Sin(index2, 16);
else
- xScale = 0x100 + Sin(index2, 16);
+ xScale = 256 + Sin(index2, 16);
amplitude = sprite->data[3];
- yScale = 0x100 - Sin(index2, amplitude) - Sin(index1, amplitude / 5);
+ yScale = 256 - Sin(index2, amplitude) - Sin(index1, amplitude / 5);
SetAffineData(sprite, xScale, yScale, 0);
sprite->data[5]++;
}
}
-void pokemonanimfunc_5A(struct Sprite *sprite)
+static void pokemonanimfunc_5A(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4094,14 +4112,14 @@ void pokemonanimfunc_5A(struct Sprite *sprite)
sub_81832C8(sprite);
}
-void sub_8183418(struct Sprite *sprite)
+static void sub_8183418(struct Sprite *sprite)
{
s16 index1 = 0, index2;
if (sprite->data[5] > sprite->data[6])
{
sprite->data[5] = 0;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
if (sprite->data[4] <= 1)
{
sub_817F77C(sprite);
@@ -4130,16 +4148,16 @@ void sub_8183418(struct Sprite *sprite)
amplitude = sprite->data[3];
if (sprite->data[1] == 0)
- xScale = -0x100 + Sin(index2, amplitude) + Sin(index1, amplitude / 5 * 2);
+ xScale = -256 + Sin(index2, amplitude) + Sin(index1, amplitude / 5 * 2);
else
- xScale = 0x100 - Sin(index2, amplitude) - Sin(index1, amplitude / 5 * 2);
+ xScale = 256 - Sin(index2, amplitude) - Sin(index1, amplitude / 5 * 2);
- SetAffineData(sprite, xScale, 0x100, 0);
+ SetAffineData(sprite, xScale, 256, 0);
sprite->data[5]++;
}
}
-void pokemonanimfunc_5B(struct Sprite *sprite)
+static void pokemonanimfunc_5B(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4155,19 +4173,19 @@ void pokemonanimfunc_5B(struct Sprite *sprite)
sub_8183418(sprite);
}
-void sub_8183574(struct Sprite *sprite)
+static void sub_8183574(struct Sprite *sprite)
{
u8 var6, var7;
u8 var8 = sprite->data[2];
u8 var9 = sprite->data[6];
- u8 var5 = gUnknown_0860AA80[sprite->data[5]][0];
+ u8 var5 = sUnknown_0860AA80[sprite->data[5]][0];
u8 var2 = var5;
if (var5 != 0xFF)
var5 = sprite->data[7];
else
var5 = 0xFF; // needed to match
- var6 = gUnknown_0860AA80[sprite->data[5]][1];
+ var6 = sUnknown_0860AA80[sprite->data[5]][1];
var7 = 0;
if (var2 != 0xFE)
var7 = (var6 - var9) * var5 / var6;
@@ -4193,7 +4211,7 @@ void sub_8183574(struct Sprite *sprite)
}
}
-void pokemonanimfunc_5C(struct Sprite *sprite)
+static void pokemonanimfunc_5C(struct Sprite *sprite)
{
sprite->data[0] = 40;
sprite->data[7] = 6;
@@ -4201,7 +4219,7 @@ void pokemonanimfunc_5C(struct Sprite *sprite)
sprite->callback = sub_8183574;
}
-void pokemonanimfunc_5D(struct Sprite *sprite)
+static void pokemonanimfunc_5D(struct Sprite *sprite)
{
sprite->data[0] = 70;
sprite->data[7] = 6;
@@ -4209,14 +4227,14 @@ void pokemonanimfunc_5D(struct Sprite *sprite)
sprite->callback = sub_817FCDC;
}
-void pokemonanimfunc_5E(struct Sprite *sprite)
+static void pokemonanimfunc_5E(struct Sprite *sprite)
{
sprite->data[0] = 20;
sub_817F8FC(sprite);
sprite->callback = sub_817F8FC;
}
-void pokemonanimfunc_5F(struct Sprite *sprite)
+static void pokemonanimfunc_5F(struct Sprite *sprite)
{
if (sprite->data[2] > 40)
{
@@ -4237,7 +4255,7 @@ void pokemonanimfunc_5F(struct Sprite *sprite)
sprite->data[2]++;
}
-void pokemonanimfunc_60(struct Sprite *sprite)
+static void pokemonanimfunc_60(struct Sprite *sprite)
{
if (sprite->data[2] > 40)
{
@@ -4258,7 +4276,7 @@ void pokemonanimfunc_60(struct Sprite *sprite)
sprite->data[2]++;
}
-void pokemonanimfunc_61(struct Sprite *sprite)
+static void pokemonanimfunc_61(struct Sprite *sprite)
{
sprite->data[0] = 70;
sprite->data[7] = 6;
@@ -4266,7 +4284,7 @@ void pokemonanimfunc_61(struct Sprite *sprite)
sprite->callback = sub_8183140;
}
-void pokemonanimfunc_62(struct Sprite *sprite)
+static void pokemonanimfunc_62(struct Sprite *sprite)
{
sprite->data[0] = 24;
sprite->data[7] = 6;
@@ -4274,7 +4292,7 @@ void pokemonanimfunc_62(struct Sprite *sprite)
sprite->callback = sub_8183574;
}
-void pokemonanimfunc_63(struct Sprite *sprite)
+static void pokemonanimfunc_63(struct Sprite *sprite)
{
sprite->data[0] = 56;
sprite->data[7] = 9;
@@ -4282,25 +4300,25 @@ void pokemonanimfunc_63(struct Sprite *sprite)
sprite->callback = sub_8183574;
}
-void pokemonanimfunc_64(struct Sprite *sprite)
+static void pokemonanimfunc_64(struct Sprite *sprite)
{
u8 id = sprite->data[0] = sub_817F758();
- gUnknown_03001240[id].field_6 = 1024;
- gUnknown_03001240[id].field_8 = 6;
- gUnknown_03001240[id].field_2 = 24;
+ sUnknown_03001240[id].field_6 = 1024;
+ sUnknown_03001240[id].field_8 = 6;
+ sUnknown_03001240[id].field_2 = 24;
sub_817FFF0(sprite);
sprite->callback = sub_817FFF0;
}
-void sub_81837DC(struct Sprite *sprite)
+static void sub_81837DC(struct Sprite *sprite)
{
s16 index1 = 0, index2 = 0;
if (sprite->data[5] > sprite->data[6])
{
sprite->pos2.y = 0;
sprite->data[5] = 0;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
if (sprite->data[4] <= 1)
{
sub_817F77C(sprite);
@@ -4329,17 +4347,17 @@ void sub_81837DC(struct Sprite *sprite)
amplitude = sprite->data[3];
if (sprite->data[1] == 0)
- xScale = Sin(index2, amplitude) + (Sin(index1, amplitude / 5 * 2) - 0x100);
+ xScale = Sin(index2, amplitude) + (Sin(index1, amplitude / 5 * 2) - 256);
else
- xScale = 0x100 - Sin(index1, amplitude / 5 * 2) - Sin(index2, amplitude);
+ xScale = 256 - Sin(index1, amplitude / 5 * 2) - Sin(index2, amplitude);
- yScale = 0x100 - Sin(index1, amplitude / 5) - Sin(index2, amplitude);
+ yScale = 256 - Sin(index1, amplitude / 5) - Sin(index2, amplitude);
SetAffineData(sprite, xScale, yScale, 0);
sprite->data[5]++;
}
}
-void pokemonanimfunc_65(struct Sprite *sprite)
+static void pokemonanimfunc_65(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4355,7 +4373,7 @@ void pokemonanimfunc_65(struct Sprite *sprite)
sub_81837DC(sprite);
}
-void pokemonanimfunc_66(struct Sprite *sprite)
+static void pokemonanimfunc_66(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] > 2048)
@@ -4389,7 +4407,7 @@ void pokemonanimfunc_66(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void pokemonanimfunc_67(struct Sprite *sprite)
+static void pokemonanimfunc_67(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] > 2048)
@@ -4423,7 +4441,7 @@ void pokemonanimfunc_67(struct Sprite *sprite)
sub_817F70C(sprite);
}
-static const s8 gUnknown_0860ADBE[][3] =
+static const s8 sUnknown_0860ADBE[][3] =
{
// x y timer
{1, 1, 12},
@@ -4432,19 +4450,19 @@ static const s8 gUnknown_0860ADBE[][3] =
{0, 0, 0}
};
-void sub_8183B4C(struct Sprite *sprite)
+static void sub_8183B4C(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] == 0)
sprite->data[3] = 0;
- if (gUnknown_0860ADBE[sprite->data[3]][2] / sprite->data[5] == sprite->data[2])
+ if (sUnknown_0860ADBE[sprite->data[3]][2] / sprite->data[5] == sprite->data[2])
{
sprite->data[3]++;
sprite->data[2] = 0;
}
- if (gUnknown_0860ADBE[sprite->data[3]][2] / sprite->data[5] == 0)
+ if (sUnknown_0860ADBE[sprite->data[3]][2] / sprite->data[5] == 0)
{
if (--sprite->data[6] == 0)
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -4454,14 +4472,14 @@ void sub_8183B4C(struct Sprite *sprite)
else
{
s32 amplitude = sprite->data[5];
- sprite->pos2.x += (gUnknown_0860ADBE[sprite->data[3]][0] * amplitude);
- sprite->pos2.y += (gUnknown_0860ADBE[sprite->data[3]][1] * sprite->data[5]); // what's the point of the var if you're not reusing it?
+ sprite->pos2.x += (sUnknown_0860ADBE[sprite->data[3]][0] * amplitude);
+ sprite->pos2.y += (sUnknown_0860ADBE[sprite->data[3]][1] * sprite->data[5]); // what's the point of the var if you're not reusing it?
sprite->data[2]++;
sub_817F70C(sprite);
}
}
-void pokemonanimfunc_68(struct Sprite *sprite)
+static void pokemonanimfunc_68(struct Sprite *sprite)
{
sprite->data[5] = 1;
sprite->data[6] = 1;
@@ -4469,7 +4487,7 @@ void pokemonanimfunc_68(struct Sprite *sprite)
sprite->callback = sub_8183B4C;
}
-void pokemonanimfunc_69(struct Sprite *sprite)
+static void pokemonanimfunc_69(struct Sprite *sprite)
{
sprite->data[5] = 2;
sprite->data[6] = 1;
@@ -4477,7 +4495,7 @@ void pokemonanimfunc_69(struct Sprite *sprite)
sprite->callback = sub_8183B4C;
}
-void pokemonanimfunc_6A(struct Sprite *sprite)
+static void pokemonanimfunc_6A(struct Sprite *sprite)
{
sprite->data[5] = 2;
sprite->data[6] = 2;
@@ -4485,7 +4503,7 @@ void pokemonanimfunc_6A(struct Sprite *sprite)
sprite->callback = sub_8183B4C;
}
-void sub_8183C6C(struct Sprite *sprite)
+static void sub_8183C6C(struct Sprite *sprite)
{
if (sprite->data[7] > 255)
{
@@ -4493,7 +4511,7 @@ void sub_8183C6C(struct Sprite *sprite)
{
sub_817F77C(sprite);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
- HandleSetAffineData(sprite, 0x100, 0x100, 0);
+ HandleSetAffineData(sprite, 256, 256, 0);
}
else
{
@@ -4510,11 +4528,11 @@ void sub_8183C6C(struct Sprite *sprite)
sprite->data[7] = 256;
scale = Sin(sprite->data[7] / 2, 64);
- HandleSetAffineData(sprite, 0x100 - scale, 0x100 - scale, 0);
+ HandleSetAffineData(sprite, 256 - scale, 256 - scale, 0);
}
}
-void pokemonanimfunc_6B(struct Sprite *sprite)
+static void pokemonanimfunc_6B(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] == 0)
@@ -4530,7 +4548,7 @@ void pokemonanimfunc_6B(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void pokemonanimfunc_6C(struct Sprite *sprite)
+static void pokemonanimfunc_6C(struct Sprite *sprite)
{
sub_817F70C(sprite);
if (sprite->data[2] == 0)
@@ -4546,7 +4564,7 @@ void pokemonanimfunc_6C(struct Sprite *sprite)
sub_817F70C(sprite);
}
-void pokemonanimfunc_6D(struct Sprite *sprite)
+static void pokemonanimfunc_6D(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4561,7 +4579,7 @@ void pokemonanimfunc_6D(struct Sprite *sprite)
sub_8182764(sprite);
}
-void pokemonanimfunc_6E(struct Sprite *sprite)
+static void pokemonanimfunc_6E(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4576,7 +4594,7 @@ void pokemonanimfunc_6E(struct Sprite *sprite)
sub_8182764(sprite);
}
-void pokemonanimfunc_6F(struct Sprite *sprite)
+static void pokemonanimfunc_6F(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4591,7 +4609,7 @@ void pokemonanimfunc_6F(struct Sprite *sprite)
sub_8182830(sprite);
}
-void pokemonanimfunc_70(struct Sprite *sprite)
+static void pokemonanimfunc_70(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4606,7 +4624,7 @@ void pokemonanimfunc_70(struct Sprite *sprite)
sub_8182830(sprite);
}
-void pokemonanimfunc_71(struct Sprite *sprite)
+static void pokemonanimfunc_71(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4618,7 +4636,7 @@ void pokemonanimfunc_71(struct Sprite *sprite)
sub_8180828(sprite);
}
-void pokemonanimfunc_72(struct Sprite *sprite)
+static void pokemonanimfunc_72(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4630,7 +4648,7 @@ void pokemonanimfunc_72(struct Sprite *sprite)
sub_8180828(sprite);
}
-void pokemonanimfunc_73(struct Sprite *sprite)
+static void pokemonanimfunc_73(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4645,7 +4663,7 @@ void pokemonanimfunc_73(struct Sprite *sprite)
sub_81832C8(sprite);
}
-void pokemonanimfunc_74(struct Sprite *sprite)
+static void pokemonanimfunc_74(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4660,7 +4678,7 @@ void pokemonanimfunc_74(struct Sprite *sprite)
sub_81832C8(sprite);
}
-void pokemonanimfunc_75(struct Sprite *sprite)
+static void pokemonanimfunc_75(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4676,7 +4694,7 @@ void pokemonanimfunc_75(struct Sprite *sprite)
sub_8183418(sprite);
}
-void pokemonanimfunc_76(struct Sprite *sprite)
+static void pokemonanimfunc_76(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4692,7 +4710,7 @@ void pokemonanimfunc_76(struct Sprite *sprite)
sub_8183418(sprite);
}
-void pokemonanimfunc_77(struct Sprite *sprite)
+static void pokemonanimfunc_77(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4708,7 +4726,7 @@ void pokemonanimfunc_77(struct Sprite *sprite)
sub_81837DC(sprite);
}
-void pokemonanimfunc_78(struct Sprite *sprite)
+static void pokemonanimfunc_78(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4724,7 +4742,7 @@ void pokemonanimfunc_78(struct Sprite *sprite)
sub_81837DC(sprite);
}
-void sub_8183FA8(struct Sprite *sprite)
+static void sub_8183FA8(struct Sprite *sprite)
{
if (sprite->data[7] > 255)
{
@@ -4752,7 +4770,7 @@ void sub_8183FA8(struct Sprite *sprite)
}
}
-void pokemonanimfunc_79(struct Sprite *sprite)
+static void pokemonanimfunc_79(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4767,7 +4785,7 @@ void pokemonanimfunc_79(struct Sprite *sprite)
sub_8183FA8(sprite);
}
-void pokemonanimfunc_7A(struct Sprite *sprite)
+static void pokemonanimfunc_7A(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4782,7 +4800,7 @@ void pokemonanimfunc_7A(struct Sprite *sprite)
sub_8183FA8(sprite);
}
-void pokemonanimfunc_7B(struct Sprite *sprite)
+static void pokemonanimfunc_7B(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -4796,3 +4814,844 @@ void pokemonanimfunc_7B(struct Sprite *sprite)
sub_8183FA8(sprite);
}
+
+static void sub_81840C4(struct Sprite *sprite)
+{
+ if (sprite->data[7] > 256)
+ {
+ if (sprite->data[6] <= sprite->data[4])
+ {
+ sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+ }
+ else
+ {
+ sprite->data[4]++;
+ sprite->data[7] = 0;
+ }
+
+ sprite->pos2.x = 0;
+ sprite->pos2.y = 0;
+ }
+ else
+ {
+ s16 posX;
+
+ if (sprite->data[7] > 159)
+ {
+ if (sprite->data[7] > 256)
+ sprite->data[7] = 256;
+
+ sprite->pos2.y = -(Sin(sprite->data[7] % 256, 8));
+ }
+ else if (sprite->data[7] > 95)
+ {
+ sprite->pos2.y = Sin(96, 6) - Sin((sprite->data[7] - 96) * 2, 4);
+ }
+ else
+ {
+ sprite->pos2.y = Sin(sprite->data[7], 6);
+ }
+
+ posX = -(Sin(sprite->data[7] / 2, sprite->data[5]));
+ if (sprite->data[4] % 2 == 0)
+ posX *= -1;
+
+ sprite->pos2.x = posX;
+ sprite->data[7] += sprite->data[3];
+ }
+}
+
+static void pokemonanimfunc_7C(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[2] = 1;
+ sprite->data[6] = 2;
+ sprite->data[7] = 0;
+ sprite->data[5] = 16;
+ sprite->data[4] = 1;
+ sprite->data[3] = 4;
+ }
+
+ sub_81840C4(sprite);
+}
+
+static void pokemonanimfunc_7D(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[2] = 1;
+ sprite->data[6] = 2;
+ sprite->data[7] = 0;
+ sprite->data[5] = 16;
+ sprite->data[4] = 1;
+ sprite->data[3] = 6;
+ }
+
+ sub_81840C4(sprite);
+}
+
+static void pokemonanimfunc_7E(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[2] = 1;
+ sprite->data[6] = 3;
+ sprite->data[7] = 0;
+ sprite->data[5] = 16;
+ sprite->data[4] = 1;
+ sprite->data[3] = 8;
+ }
+
+ sub_81840C4(sprite);
+}
+
+static void pokemonanimfunc_7F(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[2] = 1;
+ sprite->data[6] = 1;
+ sprite->data[7] = 0;
+ sprite->data[5] = 4;
+ sprite->data[4] = 6;
+ sprite->data[3] = 4;
+ }
+
+ sub_8183FA8(sprite);
+}
+
+static void pokemonanimfunc_80(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[2] = 1;
+ sprite->data[6] = 1;
+ sprite->data[7] = 0;
+ sprite->data[5] = 4;
+ sprite->data[4] = 6;
+ sprite->data[3] = 6;
+ }
+
+ sub_8183FA8(sprite);
+}
+
+static void pokemonanimfunc_81(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[2] = 1;
+ sprite->data[6] = 2;
+ sprite->data[7] = 0;
+ sprite->data[5] = 4;
+ sprite->data[4] = 6;
+ sprite->data[3] = 8;
+ }
+
+ sub_8183FA8(sprite);
+}
+
+static void sub_8184290(struct Sprite *sprite)
+{
+ u16 index = Sin((sprite->data[2] * 128) / sprite->data[7], sprite->data[5]);
+ sprite->data[6] = -(index << 8);
+ sub_817F3F0(sprite, index, sprite->data[4], 0);
+ HandleSetAffineData(sprite, 256, 256, sprite->data[6]);
+}
+
+static void pokemonanimfunc_82(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ HandleStartAffineAnim(sprite);
+ sprite->data[7] = 60;
+ sprite->data[5] = 8;
+ sprite->data[4] = -32;
+ sprite->data[3] = 1;
+ sprite->data[0] = 0;
+ }
+
+ if (sprite->data[2] > sprite->data[7])
+ {
+ HandleSetAffineData(sprite, 256, 256, 0);
+ sprite->pos2.x = 0;
+ sprite->pos2.y = 0;
+ sprite->data[0]++;
+ if (sprite->data[3] <= sprite->data[0])
+ {
+ sub_817F77C(sprite);
+ sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+ return;
+ }
+ else
+ {
+ sprite->data[2] = 0;
+ }
+ }
+ else
+ {
+ sub_8184290(sprite);
+ }
+
+ sprite->data[2]++;
+}
+
+static void pokemonanimfunc_83(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ HandleStartAffineAnim(sprite);
+ sprite->data[7] = 90;
+ sprite->data[5] = 8;
+ sprite->data[4] = -32;
+ sprite->data[3] = 1;
+ sprite->data[0] = 0;
+ }
+
+ if (sprite->data[2] > sprite->data[7])
+ {
+ HandleSetAffineData(sprite, 256, 256, 0);
+ sprite->pos2.x = 0;
+ sprite->pos2.y = 0;
+ sprite->data[0]++;
+ if (sprite->data[3] <= sprite->data[0])
+ {
+ sub_817F77C(sprite);
+ sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+ return;
+ }
+ else
+ {
+ sprite->data[2] = 0;
+ }
+ }
+ else
+ {
+ sub_8184290(sprite);
+ }
+
+ sprite->data[2]++;
+}
+
+static void pokemonanimfunc_84(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ HandleStartAffineAnim(sprite);
+ sprite->data[7] = 30;
+ sprite->data[5] = 8;
+ sprite->data[4] = -32;
+ sprite->data[3] = 2;
+ sprite->data[0] = 0;
+ }
+
+ if (sprite->data[2] > sprite->data[7])
+ {
+ HandleSetAffineData(sprite, 256, 256, 0);
+ sprite->pos2.x = 0;
+ sprite->pos2.y = 0;
+ sprite->data[0]++;
+ if (sprite->data[3] <= sprite->data[0])
+ {
+ sub_817F77C(sprite);
+ sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+ return;
+ }
+ else
+ {
+ sprite->data[2] = 0;
+ }
+ }
+ else
+ {
+ sub_8184290(sprite);
+ }
+
+ sprite->data[2]++;
+}
+
+static void sub_8184468(struct Sprite *sprite)
+{
+ if (sprite->data[2] > sprite->data[7])
+ {
+ sprite->pos2.y = 0;
+ HandleSetAffineData(sprite, 256, 256, 0);
+ sub_817F77C(sprite);
+ sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+ }
+ else
+ {
+ u8 posY_unsigned;
+ s8 posY_signed;
+ s32 posY;
+ s16 index = (u16)(sprite->data[2] % sprite->data[6] * 256) / sprite->data[6] % 256;
+ if (sprite->data[2] % 2 == 0)
+ {
+ sprite->data[4] = Sin(index, 32) + 256;
+ sprite->data[5] = Sin(index, 32) + 256;
+ posY_unsigned = Sin(index, 32);
+ posY_signed = posY_unsigned;
+ }
+ else
+ {
+ sprite->data[4] = Sin(index, 8) + 256;
+ sprite->data[5] = Sin(index, 8) + 256;
+ posY_unsigned = Sin(index, 8);
+ posY_signed = posY_unsigned;
+ }
+
+ posY = posY_signed;
+ if (posY < 0)
+ posY += 7;
+ sprite->pos2.y = (u32)(posY) >> 3;
+ HandleSetAffineData(sprite, sprite->data[4], sprite->data[5], 0);
+ }
+
+ sprite->data[2]++;
+}
+
+static void pokemonanimfunc_85(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ HandleStartAffineAnim(sprite);
+ sprite->pos2.y += 2;
+ sprite->data[6] = 40;
+ sprite->data[7] = 80;
+ }
+
+ sub_8184468(sprite);
+}
+
+static void pokemonanimfunc_86(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ HandleStartAffineAnim(sprite);
+ sprite->pos2.y += 2;
+ sprite->data[6] = 40;
+ sprite->data[7] = 40;
+ }
+
+ sub_8184468(sprite);
+}
+
+static void pokemonanimfunc_87(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ HandleStartAffineAnim(sprite);
+ sprite->pos2.y += 2;
+ sprite->data[6] = 80;
+ sprite->data[7] = 80;
+ }
+
+ sub_8184468(sprite);
+}
+
+static void sub_8184610(struct Sprite *sprite);
+static void sub_8184640(struct Sprite *sprite);
+static void sub_8184678(struct Sprite *sprite);
+static void sub_81846B8(struct Sprite *sprite);
+
+static void sub_81845D4(struct Sprite *sprite)
+{
+ sub_817F70C(sprite);
+ sprite->pos2.x -= sprite->data[2];
+ if (sprite->pos2.x <= -sprite->data[6])
+ {
+ sprite->pos2.x = -sprite->data[6];
+ sprite->data[7] = 2;
+ sprite->callback = sub_8184610;
+ }
+
+ sub_817F70C(sprite);
+}
+
+static void sub_8184610(struct Sprite *sprite)
+{
+ sub_817F70C(sprite);
+ sprite->pos2.x += sprite->data[7];
+ sprite->data[7]++;
+ if (sprite->pos2.x >= 0)
+ sprite->callback = sub_8184640;
+
+ sub_817F70C(sprite);
+}
+
+static void sub_8184640(struct Sprite *sprite)
+{
+ sub_817F70C(sprite);
+ sprite->pos2.x += sprite->data[7];
+ sprite->data[7]++;
+ if (sprite->pos2.x > sprite->data[6])
+ {
+ sprite->pos2.x = sprite->data[6];
+ sprite->callback = sub_8184678;
+ }
+
+ sub_817F70C(sprite);
+}
+
+static void sub_8184678(struct Sprite *sprite)
+{
+ sub_817F70C(sprite);
+ if (sprite->data[3] >= sprite->data[5])
+ {
+ sprite->callback = sub_81846B8;
+ }
+ else
+ {
+ sprite->pos2.x += sprite->data[4];
+ sprite->data[4] *= -1;
+ sprite->data[3]++;
+ }
+
+ sub_817F70C(sprite);
+}
+
+static void sub_81846B8(struct Sprite *sprite)
+{
+ sub_817F70C(sprite);
+ sprite->pos2.x -= 2;
+ if (sprite->pos2.x <= 0)
+ {
+ sprite->pos2.x = 0;
+ sub_817F77C(sprite);
+ sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+ }
+
+ sub_817F70C(sprite);
+}
+
+static void pokemonanimfunc_88(struct Sprite *sprite)
+{
+ HandleStartAffineAnim(sprite);
+ sprite->data[7] = 4;
+ sprite->data[6] = 12;
+ sprite->data[5] = 16;
+ sprite->data[4] = 4;
+ sprite->data[3] = 0;
+ sprite->data[2] = 2;
+ sprite->callback = sub_81845D4;
+}
+
+static void pokemonanimfunc_89(struct Sprite *sprite)
+{
+ HandleStartAffineAnim(sprite);
+ sprite->data[7] = 2;
+ sprite->data[6] = 8;
+ sprite->data[5] = 12;
+ sprite->data[4] = 2;
+ sprite->data[3] = 0;
+ sprite->data[2] = 1;
+ sprite->callback = sub_81845D4;
+}
+
+static void pokemonanimfunc_8A(struct Sprite *sprite)
+{
+ HandleStartAffineAnim(sprite);
+ sprite->data[7] = 0;
+ sprite->data[6] = 6;
+ sprite->data[5] = 6;
+ sprite->data[4] = 2;
+ sprite->data[3] = 0;
+ sprite->data[2] = 1;
+ sprite->callback = sub_81845D4;
+}
+
+static void sub_8184770(struct Sprite *sprite)
+{
+ sprite->pos2.x = sprite->data[1];
+ if (sprite->data[0] > 1)
+ {
+ sprite->data[1] *= -1;
+ sprite->data[0] = 0;
+ }
+ else
+ {
+ sprite->data[0]++;
+ }
+}
+
+struct YellowBlendStruct
+{
+ u8 field_0;
+ u8 field_1;
+};
+
+static const struct YellowBlendStruct sUnknown_0860ADCC[] =
+{
+ {0, 1},
+ {1, 2},
+ {0, 15},
+ {1, 1},
+ {0, 15},
+ {1, 1},
+ {0, 15},
+ {1, 1},
+ {0, 1},
+ {1, 1},
+ {0, 1},
+ {1, 1},
+ {0, 1},
+ {1, 1},
+ {0, 1},
+ {1, 1},
+ {0, 1},
+ {1, 1},
+ {0, 1},
+ {0, 0xFF}
+};
+
+static const struct YellowBlendStruct sUnknown_0860AE1C[] =
+{
+ {0, 5},
+ {1, 1},
+ {0, 15},
+ {1, 4},
+ {0, 2},
+ {1, 2},
+ {0, 2},
+ {1, 2},
+ {0, 2},
+ {1, 2},
+ {0, 2},
+ {1, 2},
+ {0, 2},
+ {0, 0xFF}
+};
+
+static const struct YellowBlendStruct sUnknown_0860AE54[] =
+{
+ {0, 1},
+ {1, 1},
+ {0, 20},
+ {1, 1},
+ {0, 20},
+ {1, 1},
+ {0, 20},
+ {1, 1},
+ {0, 1},
+ {0, 0xFF}
+};
+
+static const struct YellowBlendStruct *const sUnknown_0860AE7C[] =
+{
+ sUnknown_0860ADCC,
+ sUnknown_0860AE1C,
+ sUnknown_0860AE54
+};
+
+static void BackAnimBlendYellow(struct Sprite *sprite)
+{
+ const struct YellowBlendStruct *array = sUnknown_0860AE7C[sprite->data[3]];
+ sub_8184770(sprite);
+ if (array[sprite->data[6]].field_1 == 0xFF)
+ {
+ sprite->pos2.x = 0;
+ sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+ }
+ else
+ {
+ if (sprite->data[4] == 1)
+ {
+ if (array[sprite->data[6]].field_0 != 0)
+ BlendPalette(sprite->data[7], 0x10, 0x10, 0x3FF);
+ else
+ BlendPalette(sprite->data[7], 0x10, 0, 0x3FF);
+
+ sprite->data[4] = 0;
+ }
+
+ if (array[sprite->data[6]].field_1 == sprite->data[5])
+ {
+ sprite->data[4] = 1;
+ sprite->data[5] = 0;
+ sprite->data[6]++;
+ }
+ else
+ {
+ sprite->data[5]++;
+ }
+ }
+}
+
+static void pokemonanimfunc_8B(struct Sprite *sprite)
+{
+ if (++sprite->data[2] == 1)
+ {
+ sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+ sprite->data[6] = 0;
+ sprite->data[5] = 0;
+ sprite->data[4] = 0;
+ sprite->data[3] = 0;
+ }
+
+ BackAnimBlendYellow(sprite);
+}
+
+static void pokemonanimfunc_8C(struct Sprite *sprite)
+{
+ if (++sprite->data[2] == 1)
+ {
+ sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+ sprite->data[6] = 0;
+ sprite->data[5] = 0;
+ sprite->data[4] = 0;
+ sprite->data[3] = 1;
+ }
+
+ BackAnimBlendYellow(sprite);
+}
+
+static void pokemonanimfunc_8D(struct Sprite *sprite)
+{
+ if (++sprite->data[2] == 1)
+ {
+ sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+ sprite->data[6] = 0;
+ sprite->data[5] = 0;
+ sprite->data[4] = 0;
+ sprite->data[3] = 2;
+ }
+
+ BackAnimBlendYellow(sprite);
+}
+
+static const u16 sUnknown_0860AE88[] =
+{
+ 0x1F, 0x3E0, 0x7C00, 0x0
+};
+
+static void BackAnimBlend(struct Sprite *sprite)
+{
+ if (sprite->data[2] > 127)
+ {
+ BlendPalette(sprite->data[7], 0x10, 0, 0x1F);
+ sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+ }
+ else
+ {
+ sprite->data[6] = Sin(sprite->data[2], 12);
+ BlendPalette(sprite->data[7], 0x10, sprite->data[6], sUnknown_0860AE88[sprite->data[1]]);
+ }
+}
+
+static void sub_8184934(struct Sprite *sprite)
+{
+ if (sprite->data[3] < sprite->data[4])
+ {
+ sub_817F70C(sprite);
+ if (sprite->data[5] > sprite->data[0])
+ {
+ if (++sprite->data[3] < sprite->data[4])
+ sprite->data[5] = 0;
+
+ sprite->pos2.x = 0;
+ }
+ else
+ {
+ s8 sign = 1 - (sprite->data[3] % 2 * 2);
+ sprite->pos2.x = sign * Sin((sprite->data[5] * 384 / sprite->data[0]) % 256, 6);
+ sprite->data[5]++;
+ }
+
+ sub_817F70C(sprite);
+ }
+}
+
+static void pokemonanimfunc_8E(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+ sprite->data[0] = 10;
+ sprite->data[5] = 0;
+ sprite->data[4] = 2;
+ sprite->data[3] = 0;
+ sprite->data[1] = 0;
+ }
+
+ if (sprite->data[2] % 2 == 0)
+ BackAnimBlend(sprite);
+
+ if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+ sub_8184934(sprite);
+
+ sprite->data[2]++;
+}
+
+static void pokemonanimfunc_8F(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+ sprite->data[0] = 20;
+ sprite->data[5] = 0;
+ sprite->data[4] = 1;
+ sprite->data[3] = 0;
+ sprite->data[1] = 0;
+ }
+
+ if (sprite->data[2] % 2 == 0)
+ BackAnimBlend(sprite);
+
+ if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+ sub_8184934(sprite);
+
+ sprite->data[2]++;
+}
+
+static void pokemonanimfunc_90(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+ sprite->data[0] = 80;
+ sprite->data[5] = 0;
+ sprite->data[4] = 1;
+ sprite->data[3] = 0;
+ sprite->data[1] = 0;
+ }
+
+ if (sprite->data[2] % 2 == 0)
+ BackAnimBlend(sprite);
+
+ if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+ sub_8184934(sprite);
+
+ sprite->data[2]++;
+}
+
+static void pokemonanimfunc_91(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+ sprite->data[0] = 10;
+ sprite->data[5] = 0;
+ sprite->data[4] = 2;
+ sprite->data[3] = 0;
+ sprite->data[1] = 1;
+ }
+
+ if (sprite->data[2] % 2 == 0)
+ BackAnimBlend(sprite);
+
+ if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+ sub_8184934(sprite);
+
+ sprite->data[2]++;
+}
+
+static void pokemonanimfunc_92(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+ sprite->data[0] = 20;
+ sprite->data[5] = 0;
+ sprite->data[4] = 1;
+ sprite->data[3] = 0;
+ sprite->data[1] = 1;
+ }
+
+ if (sprite->data[2] % 2 == 0)
+ BackAnimBlend(sprite);
+
+ if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+ sub_8184934(sprite);
+
+ sprite->data[2]++;
+}
+
+static void pokemonanimfunc_93(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+ sprite->data[0] = 80;
+ sprite->data[5] = 0;
+ sprite->data[4] = 1;
+ sprite->data[3] = 0;
+ sprite->data[1] = 1;
+ }
+
+ if (sprite->data[2] % 2 == 0)
+ BackAnimBlend(sprite);
+
+ if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+ sub_8184934(sprite);
+
+ sprite->data[2]++;
+}
+
+static void pokemonanimfunc_94(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+ sprite->data[0] = 10;
+ sprite->data[5] = 0;
+ sprite->data[4] = 2;
+ sprite->data[3] = 0;
+ sprite->data[1] = 2;
+ }
+
+ if (sprite->data[2] % 2 == 0)
+ BackAnimBlend(sprite);
+
+ if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+ sub_8184934(sprite);
+
+ sprite->data[2]++;
+}
+
+static void pokemonanimfunc_95(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+ sprite->data[0] = 20;
+ sprite->data[5] = 0;
+ sprite->data[4] = 1;
+ sprite->data[3] = 0;
+ sprite->data[1] = 2;
+ }
+
+ if (sprite->data[2] % 2 == 0)
+ BackAnimBlend(sprite);
+
+ if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+ sub_8184934(sprite);
+
+ sprite->data[2]++;
+}
+
+static void pokemonanimfunc_96(struct Sprite *sprite)
+{
+ if (sprite->data[2] == 0)
+ {
+ sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+ sprite->data[0] = 80;
+ sprite->data[5] = 0;
+ sprite->data[4] = 1;
+ sprite->data[3] = 0;
+ sprite->data[1] = 2;
+ }
+
+ if (sprite->data[2] % 2 == 0)
+ BackAnimBlend(sprite);
+
+ if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+ sub_8184934(sprite);
+
+ sprite->data[2]++;
+}
+
+static void SpriteCB_SetDummyOnAnimEnd(struct Sprite *sprite)
+{
+ if (sprite->animEnded)
+ sprite->callback = SpriteCallbackDummy;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 21:32:45 +0000