summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_anim_effects_1.c6
-rw-r--r--src/battle_anim_effects_2.c25
-rw-r--r--src/battle_anim_effects_3.c32
-rw-r--r--src/battle_anim_mons.c2
-rw-r--r--src/battle_anim_special.c29
-rw-r--r--src/ghost.c6
6 files changed, 53 insertions, 47 deletions
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index ff0927f88..093d2b345 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -2375,7 +2375,7 @@ static void AnimAbsorptionOrbStep(struct Sprite* sprite)
void AnimHyperBeamOrb(struct Sprite* sprite)
{
u16 speed;
- u16 animNum = Random2();
+ u16 animNum = Random();
StartSpriteAnim(sprite, animNum % 8);
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
@@ -2385,14 +2385,14 @@ void AnimHyperBeamOrb(struct Sprite* sprite)
else
sprite->pos1.x += 20;
- speed = Random2();
+ speed = Random();
sprite->data[0] = (speed & 31) + 64;
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
InitAnimFastLinearTranslationWithSpeed(sprite);
- sprite->data[5] = Random2() & 0xFF;
+ sprite->data[5] = Random() & 0xFF;
sprite->data[6] = sprite->subpriority;
sprite->callback = AnimHyperBeamOrbStep;
sprite->callback(sprite);
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index cea915921..9cd6f4839 100644
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -343,7 +343,7 @@ const struct SpriteTemplate gWaterPulseRingSpriteTemplate = //gUnknown_83E3CE8
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gWaterPulseRingAffineAnimTable,
- .callback = sub_80AC6D8,
+ .callback = AnimWaterPulseRing, //water.c
};
const struct SpriteTemplate gEggThrowSpriteTemplate = //gUnknown_83E3D00
@@ -1828,9 +1828,9 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite)
for (i = 0; i < 8; i++)
ptr[i - 7] = 0;
- rand = Random2();
+ rand = Random();
sprite->data[6] = 0xFFF4 - (rand & 7);
- rand = Random2();
+ rand = Random();
sprite->data[7] = (rand % 0xA0) + 0xA0;
sprite->callback = AnimBulletSeed_Step2;
sprite->affineAnimPaused = 0;
@@ -3238,9 +3238,9 @@ void AnimTask_HeartsBackground(u8 taskId)
SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
sub_80752A0(&animBg);
- AnimLoadCompressedBgGfx(animBg.bgId, &gUnknown_08C232E0, animBg.tilesOffset);
- sub_80A6D60(&animBg, &gUnknown_08C23D78, 0);
- LoadCompressedPalette(&gUnknown_08C23D50, animBg.paletteId * 16, 32);
+ AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimBg_AttractTilemap);
+ AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBg_AttractGfx, animBg.tilesOffset);
+ LoadCompressedPalette(gBattleAnimBg_AttractPal, animBg.paletteId * 16, 32);
gTasks[taskId].func = HeartsBackground_Step;
}
@@ -3316,15 +3316,16 @@ void AnimTask_ScaryFace(u8 taskId)
SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
sub_80752A0(&animBg);
+
if (IsContest())
- sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFaceContest, 0);
+ LZDecompressVram(gBattleAnimBgTilemap_ScaryFaceContest, animBg.bgTilemap);
else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
- sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFacePlayer, 0);
+ AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimBgTilemap_ScaryFacePlayer);
else
- sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFaceOpponent, 0);
+ AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimBgTilemap_ScaryFaceOpponent);
- AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08C249F8, animBg.tilesOffset);
- LoadCompressedPalette(gUnknown_08C249D0, animBg.paletteId * 16, 32);
+ AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnim_ScaryFaceGfx, animBg.tilesOffset);
+ LoadCompressedPalette(gBattleAnim_ScaryFacePal, animBg.paletteId * 16, 32);
gTasks[taskId].func = ScaryFace_Step;
}
@@ -3546,7 +3547,7 @@ void AnimPinkHeart(struct Sprite *sprite)
sprite->pos1.y += sprite->pos2.y;
sprite->pos2.x = 0;
sprite->pos2.y = 0;
- sprite->data[3] = Random2() % 180;
+ sprite->data[3] = Random() % 180;
}
}
}
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index ab8b3f20a..4b2a3f310 100644
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -120,10 +120,6 @@ static void AnimRecycleStep(struct Sprite *);
static void AnimTask_SlackOffSquishStep(u8);
// Data
-extern const u32 gUnknown_8D2A8C0[];
-extern const u32 gUnknown_8D2A808[];
-extern const u32 gUnknown_8D2A8A8[];
-
const union AnimCmd gScratchAnimCmds[] = //83FEDE4
{
ANIMCMD_FRAME(0, 4),
@@ -2151,13 +2147,13 @@ void AnimMiniTwinklingStar(struct Sprite *sprite)
u8 rand;
s8 y;
- rand = Random2() & 3;
+ rand = Random() & 3;
if (rand == 0)
sprite->oam.tileNum += 4;
else
sprite->oam.tileNum += 5;
- y = Random2() & 7;
+ y = Random() & 7;
if (y > 3)
y = -y;
@@ -2362,9 +2358,9 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1);
sub_80752A0(&animBg);
- AnimLoadCompressedBgTilemap(animBg.bgId, gUnknown_8D2A8C0);
- AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_8D2A808, animBg.tilesOffset);
- LoadCompressedPalette(gUnknown_8D2A8A8, animBg.paletteId * 16, 32);
+ AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnim_MorningSunTilemap);
+ AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnim_MorningSunGfx, animBg.tilesOffset);
+ LoadCompressedPalette(gBattleAnim_MorningSunPal, animBg.paletteId * 16, 32);
if (IsContest())
{
sub_80730C0(animBg.paletteId, animBg.bgTilemap, 0, 0);
@@ -2443,7 +2439,7 @@ void AnimGreenStar(struct Sprite *sprite)
u8 spriteId1;
u8 spriteId2;
- xOffset = Random2();
+ xOffset = Random();
xOffset &= 0x3F;
if (xOffset > 31)
xOffset = 32 - xOffset;
@@ -2541,9 +2537,9 @@ void AnimTask_DoomDesireLightBeam(u8 taskId)
SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1);
sub_80752A0(&animBg);
- AnimLoadCompressedBgTilemap(animBg.bgId, gUnknown_8D2A8C0);
- AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_8D2A808, animBg.tilesOffset);
- LoadCompressedPalette(gUnknown_8D2A8A8, animBg.paletteId * 16, 32);
+ AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnim_MorningSunTilemap);
+ AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnim_MorningSunGfx, animBg.tilesOffset);
+ LoadCompressedPalette(gBattleAnim_MorningSunPal, animBg.paletteId * 16, 32);
if (IsContest())
{
@@ -3011,10 +3007,10 @@ void AnimFlatterConfetti(struct Sprite *sprite)
int rand1;
int rand2;
- tileOffset = Random2() % 12;
+ tileOffset = Random() % 12;
sprite->oam.tileNum += tileOffset;
- rand1 = Random2() & 0x1FF;
- rand2 = Random2() & 0xFF;
+ rand1 = Random() & 0x1FF;
+ rand2 = Random() & 0xFF;
if (rand1 & 1)
sprite->data[0] = 0x5E0 + rand1;
@@ -3249,7 +3245,7 @@ static void AnimTask_RolePlaySilhouetteStep2(u8 taskId)
TrySetSpriteRotScale(&gSprites[spriteId], TRUE, gTasks[taskId].data[10], gTasks[taskId].data[11], 0);
if (++gTasks[taskId].data[12] == 9)
{
- sub_80A749C(&gSprites[spriteId]);
+ sub_8075AD8(&gSprites[spriteId]);
DestroySpriteAndFreeResources_(&gSprites[spriteId]);
gTasks[taskId].func = DestroyAnimVisualTaskAndDisableBlend;
}
@@ -3771,7 +3767,7 @@ static void CreateSweatDroplets(u8 taskId, bool8 arg1)
for (i = 0; i < 4; i++)
{
- u8 spriteId = CreateSprite(&gFacadeSweatDrop, xCoords[i], yCoords[i & 1], task->data[6] - 5);
+ u8 spriteId = CreateSprite(&gFacadeSweatDropSpriteTemplate, xCoords[i], yCoords[i & 1], task->data[6] - 5);
if (spriteId != MAX_SPRITES)
{
gSprites[spriteId].data[0] = 0;
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c
index bdba7ae3b..7f3516670 100644
--- a/src/battle_anim_mons.c
+++ b/src/battle_anim_mons.c
@@ -884,7 +884,7 @@ void AnimLoadCompressedBgTilemap(u32 bgId, const u32 *src)
CopyBgTilemapBufferToVram(bgId);
}
-u8 sub_8075454(void)
+u8 GetBattleBgPaletteNum(void)
{
return 2;
}
diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c
index a93913b82..c228048cc 100644
--- a/src/battle_anim_special.c
+++ b/src/battle_anim_special.c
@@ -20,6 +20,7 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/songs.h"
+#include "constants/pokemon.h"
// Defines
#define TAG_PARTICLES_POKEBALL 55020
@@ -39,9 +40,13 @@
#define LOHALF(n) ((n) & 0xFFFF)
// IWRAM
-EWRAM_DATA int gUnknown_3005424 = 0;
-EWRAM_DATA u16 gUnknown_3005428 = 0;
-EWRAM_DATA u16 gUnknown_300542C = 0;
+//EWRAM_DATA int gUnknown_3005424 = 0;
+//EWRAM_DATA u16 gUnknown_3005428 = 0;
+//EWRAM_DATA u16 gUnknown_300542C = 0;
+
+extern u32 gUnknown_3005424;
+extern u32 gUnknown_3005428;
+extern u32 gUnknown_300542C;
// Function Declarations
static void sub_80EEDF4(u8);
@@ -99,9 +104,8 @@ static void PremierBallOpenParticleAnimation(u8);
static void sub_80F1B3C(struct Sprite *);
// Data
-extern const u32 gUnknown_8D2EC24[];
-extern const u32 gUnknown_8D2EC70[];
-extern const struct SpriteTemplate gBallSpriteTemplates[]; //for now
+extern const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT]; //for now
+extern const u32 gBattleAnimSpriteGfx_Particles[];
struct BallCaptureSuccessStarData
{
@@ -455,8 +459,8 @@ void sub_80EEC0C(u8 taskId)
gSprites[spriteId4].callback = SpriteCallbackDummy;
sub_80752A0(&unknownStruct);
- AnimLoadCompressedBgTilemap(unknownStruct.bgId, gUnknown_8D2EC70);
- AnimLoadCompressedBgGfx(unknownStruct.bgId, gUnknown_8D2EC24, unknownStruct.tilesOffset);
+ AnimLoadCompressedBgTilemap(unknownStruct.bgId, gUnknown_D2EC24_Tilemap);
+ AnimLoadCompressedBgGfx(unknownStruct.bgId, gUnknown_D2EC24_Gfx, unknownStruct.tilesOffset);
LoadCompressedPalette(gCureBubblesPal, unknownStruct.paletteId << 4, 32);
gBattle_BG1_X = -gSprites[spriteId3].pos1.x + 32;
@@ -2293,9 +2297,14 @@ void sub_80F1C8C(u8 taskId)
DestroyAnimVisualTask(taskId);
}
-void sub_80F1C8C(u8 taskId)
+void sub_80F1CE4(u8 taskId)
{
- // to do
+ if (gBattleCommunication[MULTISTRING_CHOOSER] > 2)
+ gBattleAnimArgs[7] = 0;
+ else
+ gBattleAnimArgs[7] = gBattleCommunication[MULTISTRING_CHOOSER];
+
+ DestroyAnimVisualTask(taskId);
}
// 080F1D14
diff --git a/src/ghost.c b/src/ghost.c
index 643cc3b0d..793c9838c 100644
--- a/src/ghost.c
+++ b/src/ghost.c
@@ -1319,13 +1319,13 @@ static void sub_80B6BE4(u8 taskId)
SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X);
SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y);
sub_80752C8(&animBgData, 2);
- AnimLoadCompressedBgGfx(animBgData.bgId, gFile_graphics_battle_anims_backgrounds_scary_face_sheet, animBgData.tilesOffset);
- LoadCompressedPalette(gFile_graphics_battle_anims_backgrounds_scary_face_palette, 16 * animBgData.paletteId, 0x20);
+ AnimLoadCompressedBgGfx(animBgData.bgId, gBattleAnim_ScaryFaceGfx, animBgData.tilesOffset);
+ LoadCompressedPalette(gBattleAnim_ScaryFacePal, 16 * animBgData.paletteId, 0x20);
break;
case 3:
sub_80752C8(&animBgData, 2);
gMonSpritesGfxPtr->field_17C = AllocZeroed(0x2000);
- LZDecompressWram(gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap, gMonSpritesGfxPtr->field_17C);
+ LZDecompressWram(gBattleAnimBgTilemap_ScaryFacePlayer, gMonSpritesGfxPtr->field_17C);
sub_80730C0(animBgData.paletteId, gMonSpritesGfxPtr->field_17C, 256, 0);
CopyToBgTilemapBufferRect_ChangePalette(animBgData.bgId, gMonSpritesGfxPtr->field_17C, 0, 0, 0x20, 0x20, 0x11);
CopyBgTilemapBufferToVram(2);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 13:56:21 +0000