Game-Decompilation/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2025-02-17 04:39:21 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #309 from lhearachel/math
Some checks are pending
build / build (push) Waiting to run
Details

Browse Source 
Document math.c
This commit is contained in:
Rachel 2024-11-22 09:51:12 -08:00 committed by GitHub
commit 13fe3e1b08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
140 changed files with 651 additions and 649 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/inlines.h
View File

@ -15,14 +15,12 @@
#include "heap.h"
#include "location.h"
#include "map_header.h"
#include "math.h"
#include "narc.h"
#include "palette.h"
#include "script_manager.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system_flags.h"
#include "unk_0201D15C.h"
#include "vars_flags.h"
static inline void inline_ov61_0222C3B0_sub_1(UnkStruct_ov61_0222C3B0 *);
static inline void inline_ov61_0222C3B0_sub(SysTask *, void *);

41
include/math.h Normal file
View File

@ -0,0 +1,41 @@
#ifndef POKEPLATINUM_MATH_H
#define POKEPLATINUM_MATH_H
#include <nitro/fx/fx.h>
#include "constants/heap.h"
enum AffineTransformationMatrixMode {
AFFINE_MODE_NORMAL = 0,
AFFINE_MODE_MAX_256,
AFFINE_MODE_MAX_360,
};
fx32 CalcSineDegrees(u16 degrees);
fx32 CalcCosineDegrees(u16 degrees);
fx32 CalcSineDegrees_Wraparound(u16 degrees);
fx32 CalcCosineDegrees_Wraparound(u16 degrees);
u16 CalcAngleRotationIdx(u16 degrees);
u16 CalcAngleRotationIdx_Wraparound(u16 degrees);
fx32 CalcSineDegrees_FX32(fx32 degrees);
fx32 CalcCosineDegrees_FX32(fx32 degrees);
u32 LCRNG_GetSeed(void);
void LCRNG_SetSeed(u32 seed);
u16 LCRNG_Next(void);
u32 ARNG_Next(u32 seed);
void MTRNG_SetSeed(u32 seed);
u32 MTRNG_Next(void);
void CreateAffineTransformationMatrix(MtxFx22 *matrix, u16 degrees, fx32 xScale, fx32 yScale, u8 mode);
s32 CalcDotProduct2D(s32 x0, s32 y0, s32 x1, s32 y1, u32 unused);
s32 CalcRadialAngle(u16 radius, s32 distance);
u32 SumBytes(const void *data, u32 size);
void EncodeData(void *data, u32 size, u32 seed);
void DecodeData(void *data, u32 size, u32 seed);
u16 CalcCRC16Checksum(const void *data, u32 dataLen);
void InitCRC16Table(enum HeapId heapID);
#endif // POKEPLATINUM_MATH_H

29
include/unk_0201D15C.h
View File

@ -1,29 +0,0 @@
#ifndef POKEPLATINUM_UNK_0201D15C_H
#define POKEPLATINUM_UNK_0201D15C_H
#include <nitro/fx/fx.h>
fx32 sub_0201D15C(u16 param0);
fx32 sub_0201D1D4(u16 param0);
fx32 sub_0201D250(u16 param0);
fx32 sub_0201D264(u16 param0);
u16 sub_0201D278(u16 param0);
u16 sub_0201D2A4(u16 param0);
fx32 sub_0201D2B8(fx32 param0);
fx32 sub_0201D2C4(fx32 param0);
u32 LCRNG_GetSeed(void);
void LCRNG_SetSeed(u32 seed);
u16 LCRNG_Next(void);
u32 ARNG_Next(u32 seed);
void MTRNG_SetSeed(u32 seed);
u32 MTRNG_Next(void);
void sub_0201D470(MtxFx22 *param0, u16 param1, fx32 param2, fx32 param3, u8 param4);
s32 sub_0201D4CC(s32 param0, s32 param1, s32 param2, s32 param3, u32 param4);
s32 sub_0201D580(u16 param0, s32 param1);
u32 SumBytes(const void *data, u32 size);
void EncodeData(void *data, u32 size, u32 seed);
void DecodeData(void *data, u32 size, u32 seed);
u16 sub_0201D628(const void *param0, u32 param1);
void sub_0201D640(int param0);
#endif // POKEPLATINUM_UNK_0201D15C_H

2
platinum.us/main.lsf
View File

@ -73,7 +73,7 @@ Static main
Object main.nef.p/src_sys_task_manager.c.o
Object main.nef.p/src_unk_0201CED8.c.o
Object main.nef.p/src_charcode.c.o
Object main.nef.p/src_unk_0201D15C.c.o
Object main.nef.p/src_math.c.o
Object main.nef.p/src_text.c.o
Object main.nef.p/src_unk_0201DBEC.c.o
Object main.nef.p/src_unk_0201DD00.c.o

4
src/battle/healthbar.c
View File

@ -19,6 +19,7 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "heap.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "palette.h"
@ -30,7 +31,6 @@
#include "text.h"
#include "unk_0200C440.h"
#include "unk_0200C6E4.h"
#include "unk_0201D15C.h"
#include "unk_0208C098.h"
#define HEALTHBAR_SCROLL_SPEED 24
@ -1855,6 +1855,6 @@ static void ov16_022684BC(SysTask *param0, void *param1)
v0->unk_54 -= 360;
}
v1 = FX_Mul(sub_0201D15C(v0->unk_54), 0x1800) / FX32_ONE;
v1 = FX_Mul(CalcSineDegrees(v0->unk_54), 0x1800) / FX32_ONE;
Healthbar_OffsetPositionXY(v0, 0, v1);
}

2
src/battle/ov16_0223B140.c
View File

@ -50,6 +50,7 @@
#include "gx_layers.h"
#include "hardware_palette.h"
#include "heap.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "overlay_manager.h"
@ -75,7 +76,6 @@
#include "unk_0201567C.h"
#include "unk_02015F84.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0201E3D8.h"
#include "unk_0202419C.h"

4
src/battle/ov16_02264798.c
View File

@ -9,10 +9,10 @@
#include "battle/struct_ov16_0225BFFC_decl.h"
#include "battle/struct_ov16_0225BFFC_t.h"
#include "math.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_0200762C.h"
#include "unk_0201D15C.h"
static void ov16_02264800(SysTask *param0, void *param1);
@ -55,6 +55,6 @@ static void ov16_02264800(SysTask *param0, void *param1)
v0->unk_198 -= 360;
}
v1 = FX_Mul(sub_0201D15C(v0->unk_198), 0x1800) / FX32_ONE;
v1 = FX_Mul(CalcSineDegrees(v0->unk_198), 0x1800) / FX32_ONE;
sub_02007DEC(v0->unk_20, 4, v1);
}

2
src/battle/ov16_0226871C.c
View File

@ -37,6 +37,7 @@
#include "graphics.h"
#include "heap.h"
#include "inlines.h"
#include "math.h"
#include "message.h"
#include "message_util.h"
#include "move_table.h"
@ -56,7 +57,6 @@
#include "unk_0200C6E4.h"
#include "unk_02012744.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201E86C.h"
#include "unk_0207C908.h"
#include "unk_0208C098.h"

4
src/battle/ov16_0226DE44.c
View File

@ -9,12 +9,12 @@
#include "struct_defs/struct_0200D0F4.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "palette.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_0200C6E4.h"
#include "unk_0201D15C.h"
typedef struct UnkStruct_ov16_0226DEEC_t {
CellActorData *unk_00;
@ -173,7 +173,7 @@ static void ov16_0226DFD8(SysTask *param0, void *param1)
}
if (v0->unk_1C == 0) {
v1 = FX_Mul(sub_0201D15C(v0->unk_10 / 100), 14 << FX32_SHIFT) / FX32_ONE;
v1 = FX_Mul(CalcSineDegrees(v0->unk_10 / 100), 14 << FX32_SHIFT) / FX32_ONE;
sub_0200D500(v0->unk_00, v0->unk_08, v0->unk_0C - v1, v0->unk_14);
}
}

12
src/bg_window.c
View File

@ -5,7 +5,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "unk_0201D15C.h"
#include "math.h"
static u8 ConvertToGxBgScreenSize(u8 bgScreenSize, u8 bgType);
static void GetBgScreenTileDimensions(u8 bgScreenSize, u8 *outXTiles, u8 *outYTiles);
@ -747,7 +747,7 @@ void Bg_SetAffineParams(BgConfig *bgConfig, u8 bgLayer, const MtxFx22 *mtx, int
static void ResetBgAffineTransforms(BgConfig *bgConfig, u8 bgLayer)
{
MtxFx22 mtx;
sub_0201D470(&mtx, 0, FX32_ONE, FX32_ONE, 0);
CreateAffineTransformationMatrix(&mtx, 0, FX32_ONE, FX32_ONE, AFFINE_MODE_NORMAL);
Bg_SetAffineParams(bgConfig, bgLayer, &mtx, 0, 0);
}
@ -2460,7 +2460,7 @@ static void RunScheduledScrolls(BgConfig *bgConfig)
G2_SetBG2Offset(bgConfig->bgs[BG_LAYER_MAIN_2].xOffset, bgConfig->bgs[BG_LAYER_MAIN_2].yOffset);
} else {
MtxFx22 mtx;
sub_0201D470(&mtx, bgConfig->bgs[BG_LAYER_MAIN_2].rotation, bgConfig->bgs[BG_LAYER_MAIN_2].xScale, bgConfig->bgs[BG_LAYER_MAIN_2].yScale, 2);
CreateAffineTransformationMatrix(&mtx, bgConfig->bgs[BG_LAYER_MAIN_2].rotation, bgConfig->bgs[BG_LAYER_MAIN_2].xScale, bgConfig->bgs[BG_LAYER_MAIN_2].yScale, AFFINE_MODE_MAX_360);
G2_SetBG2Affine(&mtx, bgConfig->bgs[BG_LAYER_MAIN_2].xCenter, bgConfig->bgs[BG_LAYER_MAIN_2].yCenter, bgConfig->bgs[BG_LAYER_MAIN_2].xOffset, bgConfig->bgs[BG_LAYER_MAIN_2].yOffset);
}
}
@ -2470,7 +2470,7 @@ static void RunScheduledScrolls(BgConfig *bgConfig)
G2_SetBG3Offset(bgConfig->bgs[BG_LAYER_MAIN_3].xOffset, bgConfig->bgs[BG_LAYER_MAIN_3].yOffset);
} else {
MtxFx22 mtx;
sub_0201D470(&mtx, bgConfig->bgs[BG_LAYER_MAIN_3].rotation, bgConfig->bgs[BG_LAYER_MAIN_3].xScale, bgConfig->bgs[BG_LAYER_MAIN_3].yScale, 2);
CreateAffineTransformationMatrix(&mtx, bgConfig->bgs[BG_LAYER_MAIN_3].rotation, bgConfig->bgs[BG_LAYER_MAIN_3].xScale, bgConfig->bgs[BG_LAYER_MAIN_3].yScale, AFFINE_MODE_MAX_360);
G2_SetBG3Affine(&mtx, bgConfig->bgs[BG_LAYER_MAIN_3].xCenter, bgConfig->bgs[BG_LAYER_MAIN_3].yCenter, bgConfig->bgs[BG_LAYER_MAIN_3].xOffset, bgConfig->bgs[BG_LAYER_MAIN_3].yOffset);
}
}
@ -2488,7 +2488,7 @@ static void RunScheduledScrolls(BgConfig *bgConfig)
G2S_SetBG2Offset(bgConfig->bgs[BG_LAYER_SUB_2].xOffset, bgConfig->bgs[BG_LAYER_SUB_2].yOffset);
} else {
MtxFx22 mtx;
sub_0201D470(&mtx, bgConfig->bgs[BG_LAYER_SUB_2].rotation, bgConfig->bgs[BG_LAYER_SUB_2].xScale, bgConfig->bgs[BG_LAYER_SUB_2].yScale, 2);
CreateAffineTransformationMatrix(&mtx, bgConfig->bgs[BG_LAYER_SUB_2].rotation, bgConfig->bgs[BG_LAYER_SUB_2].xScale, bgConfig->bgs[BG_LAYER_SUB_2].yScale, AFFINE_MODE_MAX_360);
G2S_SetBG2Affine(&mtx, bgConfig->bgs[BG_LAYER_SUB_2].xCenter, bgConfig->bgs[BG_LAYER_SUB_2].yCenter, bgConfig->bgs[BG_LAYER_SUB_2].xOffset, bgConfig->bgs[BG_LAYER_SUB_2].yOffset);
}
}
@ -2498,7 +2498,7 @@ static void RunScheduledScrolls(BgConfig *bgConfig)
G2S_SetBG3Offset(bgConfig->bgs[BG_LAYER_SUB_3].xOffset, bgConfig->bgs[BG_LAYER_SUB_3].yOffset);
} else {
MtxFx22 mtx;
sub_0201D470(&mtx, bgConfig->bgs[BG_LAYER_SUB_3].rotation, bgConfig->bgs[BG_LAYER_SUB_3].xScale, bgConfig->bgs[BG_LAYER_SUB_3].yScale, 2);
CreateAffineTransformationMatrix(&mtx, bgConfig->bgs[BG_LAYER_SUB_3].rotation, bgConfig->bgs[BG_LAYER_SUB_3].xScale, bgConfig->bgs[BG_LAYER_SUB_3].yScale, AFFINE_MODE_MAX_360);
G2S_SetBG3Affine(&mtx, bgConfig->bgs[BG_LAYER_SUB_3].xCenter, bgConfig->bgs[BG_LAYER_SUB_3].yCenter, bgConfig->bgs[BG_LAYER_SUB_3].xOffset, bgConfig->bgs[BG_LAYER_SUB_3].yOffset);
}
}

2
src/game_records.c
View File

@ -3,7 +3,7 @@
#include <nitro.h>
#include "game_records.h"
#include "unk_0201D15C.h"
#include "math.h"
#include "unk_0202631C.h"
#define START_ENCODED_RECORDS RECORD_TRAINER_SCORE

2
src/game_start.c
View File

@ -8,6 +8,7 @@
#include "heap.h"
#include "location.h"
#include "main.h"
#include "math.h"
#include "overlay_manager.h"
#include "party.h"
#include "pokemon.h"
@ -19,7 +20,6 @@
#include "system_flags.h"
#include "trainer_info.h"
#include "unk_02017428.h"
#include "unk_0201D15C.h"
#include "unk_0205C980.h"
#include "unk_0206B9D8.h"
#include "vars_flags.h"

2
src/main.c
View File

@ -16,6 +16,7 @@
#include "game_overlay.h"
#include "game_start.h"
#include "main.h"
#include "math.h"
#include "overlay_manager.h"
#include "rtc.h"
#include "save_player.h"
@ -26,7 +27,6 @@
#include "unk_0200F174.h"
#include "unk_02017428.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201E3D8.h"
#include "unk_02022844.h"
#include "unk_0202419C.h"

251
src/math.c Normal file
View File

@ -0,0 +1,251 @@
#include "math.h"
#include <nitro/math/crc.h>
#include "heap.h"
static u16 LCRNG_NextFrom(u32 *seed);
fx32 CalcSineDegrees(u16 degrees)
{
if (degrees >= 360) {
return 0;
}
fx16 sin = FX_SinIdx(CalcAngleRotationIdx(degrees));
return FX32_CONST(FX_FX16_TO_F32(sin));
}
fx32 CalcCosineDegrees(u16 degrees)
{
if (degrees >= 360) {
return 0;
}
fx16 cos = FX_CosIdx(CalcAngleRotationIdx(degrees));
return FX32_CONST(FX_FX16_TO_F32(cos));
}
fx32 CalcSineDegrees_Wraparound(u16 degrees)
{
degrees %= 360;
return CalcSineDegrees(degrees);
}
fx32 CalcCosineDegrees_Wraparound(u16 degrees)
{
degrees %= 360;
return CalcCosineDegrees(degrees);
}
u16 CalcAngleRotationIdx(u16 degrees)
{
if (degrees >= 360) {
return 0;
}
return FX_DEG_TO_IDX(degrees * FX32_ONE);
}
u16 CalcAngleRotationIdx_Wraparound(u16 degrees)
{
degrees %= 360;
return CalcAngleRotationIdx(degrees);
}
fx32 CalcSineDegrees_FX32(fx32 degrees)
{
u16 degreesUnshifted = degrees >> FX32_SHIFT;
return CalcSineDegrees_Wraparound(degreesUnshifted);
}
fx32 CalcCosineDegrees_FX32(fx32 degrees)
{
u16 degreesUnshifted = degrees >> FX32_SHIFT;
return CalcCosineDegrees_Wraparound(degreesUnshifted);
}
#define LCRNG_MULTIPLIER 1103515245L
#define LCRNG_INCREMENT 24691
static u32 sLCRNGState;
u32 LCRNG_GetSeed()
{
return sLCRNGState;
}
void LCRNG_SetSeed(u32 seed)
{
sLCRNGState = seed;
}
u16 LCRNG_Next()
{
sLCRNGState = sLCRNGState * LCRNG_MULTIPLIER + LCRNG_INCREMENT;
return sLCRNGState >> 16;
}
// Matsumoto, M. & Nishimura, T. 1998. "Mersenne Twister: A 623-Dimensionally Equidistributed Uniform Pseudo-Random Number Generator."
#define MT19937_N 624 // degree of recurrence (number of total words)
#define MT19937_M 397 // middle word offset
#define MT19937_W 32 // word size (number of bits)
#define MT19937_R 31 // separation point of a single word; number of bits of the lower bitmask
#define MT19937_F 1812433253 // additional initialization constant
#define MT19937_A 0x9908B0DF // coefficient of the rational normal form twist matrix
#define MT19937_B 0x9D2C5680 // tempering bitmask
#define MT19937_C 0xEFC60000 // tempering bitmask
#define MT19937_S 7 // tempering bitshift (masked against B)
#define MT19937_T 15 // tempering bitshift (masked against C)
#define MT19937_U 11 // tempering bitshift (not masked)
#define MT19937_L 18 // tempering bitshift (not masked)
#define MT19937_UMASK (0xFFFFFFFF << MT19937_R)
#define MT19937_LMASK (0xFFFFFFFF >> (MT19937_W - MT19937_R))
#define MT19937_DEFAULT_SEED 5489
u32 ARNG_Next(u32 seed)
{
return seed * MT19937_F + 1;
}
static u32 sMTRNGState[MT19937_N];
static int sMTRNGIndex = MT19937_N + 1;
static u32 sMTRNGXor[2] = { 0, MT19937_A };
void MTRNG_SetSeed(u32 seed)
{
sMTRNGState[0] = seed;
for (sMTRNGIndex = 1; sMTRNGIndex < MT19937_N; sMTRNGIndex++) {
sMTRNGState[sMTRNGIndex] = MT19937_F * (sMTRNGState[sMTRNGIndex - 1] ^ (sMTRNGState[sMTRNGIndex - 1] >> (MT19937_W - 2))) + sMTRNGIndex;
}
}
u32 MTRNG_Next()
{
u32 result;
if (sMTRNGIndex >= MT19937_N) {
if (sMTRNGIndex == MT19937_N + 1) {
MTRNG_SetSeed(MT19937_DEFAULT_SEED);
}
int i;
for (i = 0; i < MT19937_N - MT19937_M; i++) {
result = (sMTRNGState[i] & MT19937_UMASK) | (sMTRNGState[i + 1] & MT19937_LMASK);
sMTRNGState[i] = sMTRNGState[i + MT19937_M] ^ (result >> 1) ^ sMTRNGXor[result & 1];
}
for (; i < MT19937_N - 1; i++) {
result = (sMTRNGState[i] & MT19937_UMASK) | (sMTRNGState[i + 1] & MT19937_LMASK);
sMTRNGState[i] = sMTRNGState[i + (MT19937_M - MT19937_N)] ^ (result >> 1) ^ sMTRNGXor[result & 1];
}
result = (sMTRNGState[MT19937_N - 1] & MT19937_UMASK) | (sMTRNGState[0] & MT19937_LMASK);
sMTRNGState[MT19937_N - 1] = sMTRNGState[MT19937_M - 1] ^ (result >> 1) ^ sMTRNGXor[result & 1];
sMTRNGIndex = 0;
}
result = sMTRNGState[sMTRNGIndex++];
result ^= (result >> MT19937_U);
result ^= (result << MT19937_S) & MT19937_B;
result ^= (result << MT19937_T) & MT19937_C;
result ^= (result >> MT19937_L);
return result;
}
void CreateAffineTransformationMatrix(MtxFx22 *matrix, u16 degrees, fx32 xScale, fx32 yScale, u8 mode)
{
if (mode == AFFINE_MODE_MAX_256) {
degrees = (u32)(0xFFFF * degrees) >> 8;
} else if (mode == AFFINE_MODE_MAX_360) {
degrees = (u32)(0xFFFF * degrees) / 360;
}
MTX_Rot22(matrix, FX_SinIdx(degrees), FX_CosIdx(degrees));
MTX_ScaleApply22(matrix, matrix, xScale, yScale);
}
static inline void CalcCrossProduct(const VecFx32 *a, const VecFx32 *b, VecFx32 *outResult)
{
outResult->x = 0;
outResult->y = 0;
outResult->z = FX_Mul(a->x, b->y) - FX_Mul(b->x, a->y);
}
s32 CalcDotProduct2D(s32 x0, s32 y0, s32 x1, s32 y1, u32 unused)
{
VecFx32 vec0, vec1, vecResult, cross;
fx32 crossMagnitude;
fx32 dotProduct;
s32 result;
VEC_Set(&vec0, x0 << FX32_SHIFT, y0 << FX32_SHIFT, 0);
VEC_Set(&vec1, x1 << FX32_SHIFT, y1 << FX32_SHIFT, 0);
CalcCrossProduct(&vec0, &vec1, &cross);
crossMagnitude = cross.x + cross.y + cross.z;
VEC_Set(&vec0, y0 << FX32_SHIFT, x0 << FX32_SHIFT, 0);
VEC_Normalize(&vec0, &vecResult);
VEC_Set(&vec0, x0 << FX32_SHIFT, y0 << FX32_SHIFT, 0);
VEC_Set(&vec1, x1 << FX32_SHIFT, y1 << FX32_SHIFT, 0);
VEC_Subtract(&vec1, &vec0, &cross);
dotProduct = VEC_DotProduct(&vecResult, &cross);
result = dotProduct >> FX32_SHIFT;
result = MATH_IAbs(result);
if (crossMagnitude <= 0) {
result *= -1;
}
return result;
}
s32 CalcRadialAngle(u16 radius, s32 distance)
{
s32 circumference = FX_Mul((2 * radius) << FX32_SHIFT, FX32_CONST(3.140f)) >> FX32_SHIFT;
return (distance * 0xFFFF) / circumference;
}
u32 SumBytes(const void *data, u32 size)
{
u32 sum = 0;
for (int i = 0; i < size; i++) {
sum += ((const u8 *)data)[i];
}
return sum;
}
void EncodeData(void *data, u32 size, u32 seed)
{
u16 *halfWords = (u16 *)data;
for (int i = 0; i < size / 2; i++) {
halfWords[i] ^= LCRNG_NextFrom(&seed);
}
}
void DecodeData(void *data, u32 size, u32 seed)
{
EncodeData(data, size, seed);
}
static u16 LCRNG_NextFrom(u32 *seed)
{
*seed = *seed * LCRNG_MULTIPLIER + LCRNG_INCREMENT;
return *seed >> 16;
}
static MATHCRC16Table *sCRC16Table = NULL;
u16 CalcCRC16Checksum(const void *data, u32 dataLen)
{
return MATH_CalcCRC16CCITT(sCRC16Table, data, dataLen);
}
void InitCRC16Table(enum HeapId heapID)
{
GF_ASSERT(sCRC16Table == NULL);
sCRC16Table = Heap_AllocFromHeap(heapID, sizeof(MATHCRC16Table));
MATH_CRC16CCITTInitTable(sCRC16Table);
}

2
src/meson.build
View File

@ -68,7 +68,7 @@ pokeplatinum_c = files(
'sys_task_manager.c',
'unk_0201CED8.c',
'charcode.c',
'unk_0201D15C.c',
'math.c',
'text.c',
'unk_0201DBEC.c',
'unk_0201DD00.c',

2
src/overlay005/ov5_021D5EB8.c
View File

@ -17,6 +17,7 @@
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "sprite_resource.h"
#include "sys_task.h"
@ -25,7 +26,6 @@
#include "unk_020093B4.h"
#include "unk_0200A328.h"
#include "unk_0200A784.h"
#include "unk_0201D15C.h"
#include "unk_0201E190.h"
#include "unk_0202309C.h"

2
src/overlay005/ov5_021E622C.c
View File

@ -18,6 +18,7 @@
#include "game_records.h"
#include "heap.h"
#include "item.h"
#include "math.h"
#include "message.h"
#include "message_util.h"
#include "party.h"
@ -28,7 +29,6 @@
#include "string_template.h"
#include "trainer_info.h"
#include "unk_02017038.h"
#include "unk_0201D15C.h"
#include "unk_020261E4.h"
#include "unk_0202CC64.h"
#include "unk_020559DC.h"

2
src/overlay005/ov5_021EB1A0.c
View File

@ -19,7 +19,7 @@
#include "overlay101/struct_ov101_021D5D90_decl.h"
#include "map_object.h"
#include "unk_0201D15C.h"
#include "math.h"
#include "unk_02020AEC.h"
typedef struct {

2
src/overlay005/ov5_021F08CC.c
View File

@ -22,6 +22,7 @@
#include "game_records.h"
#include "heap.h"
#include "map_object.h"
#include "math.h"
#include "message.h"
#include "party.h"
#include "player_avatar.h"
@ -33,7 +34,6 @@
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_02005474.h"
#include "unk_0201D15C.h"
#include "unk_0205D8CC.h"
#include "unk_020655F4.h"
#include "unk_0206CCB0.h"

2
src/overlay005/ov5_021F6454.c
View File

@ -29,6 +29,7 @@
#include "inlines.h"
#include "list_menu.h"
#include "map_object.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "party.h"
@ -45,7 +46,6 @@
#include "unk_020041CC.h"
#include "unk_02005474.h"
#include "unk_0200F174.h"
#include "unk_0201D15C.h"
#include "unk_02020AEC.h"
#include "unk_0202631C.h"
#include "unk_0202C858.h"

6
src/overlay005/ov5_021F8560.c
View File

@ -16,8 +16,8 @@
#include "overlay101/struct_ov101_021D86B0.h"
#include "map_object.h"
#include "math.h"
#include "player_avatar.h"
#include "unk_0201D15C.h"
#include "unk_020711EC.h"
#include "unk_02073838.h"
@ -220,8 +220,8 @@ static void ov5_021F86E4(UnkStruct_ov101_021D5D90 *param0, void *param1)
v4 = &v0->unk_20;
}
v3.x += ((FX32_ONE * 0) + v4->x) + sub_0201D1D4(v0->unk_08) * v0->unk_0A;
v3.y += ((FX32_ONE * (+8)) + v4->y) + sub_0201D15C(v0->unk_08) * v0->unk_0A;
v3.x += ((FX32_ONE * 0) + v4->x) + CalcCosineDegrees(v0->unk_08) * v0->unk_0A;
v3.y += ((FX32_ONE * (+8)) + v4->y) + CalcSineDegrees(v0->unk_08) * v0->unk_0A;
v3.z += ((FX32_ONE * 0) + v4->z);
}

2
src/overlay005/vs_seeker.c
View File

@ -16,6 +16,7 @@
#include "heap.h"
#include "map_header_data.h"
#include "map_object.h"
#include "math.h"
#include "player_avatar.h"
#include "script_manager.h"
#include "string_template.h"
@ -23,7 +24,6 @@
#include "sys_task_manager.h"
#include "system_flags.h"
#include "unk_02005474.h"
#include "unk_0201D15C.h"
#include "unk_020655F4.h"
#include "unk_0206AFE0.h"
#include "vars_flags.h"

18
src/overlay006/ov6_0223E140.c
View File

@ -30,12 +30,12 @@
#include "gx_layers.h"
#include "heap.h"
#include "map_object.h"
#include "math.h"
#include "narc.h"
#include "player_avatar.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_02005474.h"
#include "unk_0201D15C.h"
#include "unk_020655F4.h"
void include_unk_ov6_02248F30();
@ -1138,7 +1138,7 @@ static BOOL ov6_0223EBDC(UnkStruct_ov6_0223EA98 *param0)
case 3:
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
param0->unk_D8 += (sub_0201D264(param0->unk_D0 * (180 / 20)) * 3);
param0->unk_D8 += (CalcCosineDegrees_Wraparound(param0->unk_D0 * (180 / 20)) * 3);
param0->unk_D0++;
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_D8);
@ -1157,7 +1157,7 @@ static BOOL ov6_0223EBDC(UnkStruct_ov6_0223EA98 *param0)
case 5:
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
param0->unk_D8 -= (sub_0201D264(param0->unk_D0 * (90 / 20)) * 3);
param0->unk_D8 -= (CalcCosineDegrees_Wraparound(param0->unk_D0 * (90 / 20)) * 3);
param0->unk_D0++;
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_D8);
@ -1214,7 +1214,7 @@ static BOOL ov6_0223EE5C(UnkStruct_ov6_0223EA98 *param0)
case 3:
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
param0->unk_D8 += (sub_0201D264(param0->unk_D0 * (180 / 32)) * 3);
param0->unk_D8 += (CalcCosineDegrees_Wraparound(param0->unk_D0 * (180 / 32)) * 3);
param0->unk_D0++;
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_D8);
@ -1228,7 +1228,7 @@ static BOOL ov6_0223EE5C(UnkStruct_ov6_0223EA98 *param0)
param0->unk_18++;
case 5:
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
param0->unk_D8 -= (sub_0201D264(param0->unk_D0 * (360 / 32)) * 2);
param0->unk_D8 -= (CalcCosineDegrees_Wraparound(param0->unk_D0 * (360 / 32)) * 2);
param0->unk_D0++;
Easy3DObject_SetPosition(&param0->unk_24, v1, v2, param0->unk_D8);
@ -1252,7 +1252,7 @@ static BOOL ov6_0223EE5C(UnkStruct_ov6_0223EA98 *param0)
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
v0[1] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
param0->unk_D0++;
param0->unk_DC -= (sub_0201D264((param0->unk_D0 + 1) * (180 / 32)) * 4);
param0->unk_DC -= (CalcCosineDegrees_Wraparound((param0->unk_D0 + 1) * (180 / 32)) * 4);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00 + param0->unk_DC, v2, param0->unk_F4.unk_00);
if (v0[0] && v0[1]) {
@ -1267,7 +1267,7 @@ static BOOL ov6_0223EE5C(UnkStruct_ov6_0223EA98 *param0)
param0->unk_18++;
case 9:
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
param0->unk_D8 += (sub_0201D264(param0->unk_D0 * (360 / 32)) * 1);
param0->unk_D8 += (CalcCosineDegrees_Wraparound(param0->unk_D0 * (360 / 32)) * 1);
param0->unk_D0++;
Easy3DObject_SetPosition(&param0->unk_24, v1, v2, param0->unk_D8);
@ -1291,7 +1291,7 @@ static BOOL ov6_0223EE5C(UnkStruct_ov6_0223EA98 *param0)
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
v0[1] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
param0->unk_E0 += (sub_0201D264(param0->unk_D0 * (180 / 32)) * 2);
param0->unk_E0 += (CalcCosineDegrees_Wraparound(param0->unk_D0 * (180 / 32)) * 2);
param0->unk_D0++;
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00 + param0->unk_E0);
@ -1389,7 +1389,7 @@ static BOOL ov6_0223EE5C(UnkStruct_ov6_0223EA98 *param0)
GX_SetMasterBrightness(param0->unk_0C);
}
param0->unk_DC += (sub_0201D264((param0->unk_D0 + 1) * (180 / 32)) * 8);
param0->unk_DC += (CalcCosineDegrees_Wraparound((param0->unk_D0 + 1) * (180 / 32)) * 8);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_D4 + param0->unk_DC, v2, param0->unk_F4.unk_00);
if (v0[0]) {

2
src/overlay006/ov6_02240C9C.c
View File

@ -36,6 +36,7 @@
#include "map_header.h"
#include "map_header_data.h"
#include "map_tile_behavior.h"
#include "math.h"
#include "narc.h"
#include "party.h"
#include "player_avatar.h"
@ -47,7 +48,6 @@
#include "system_flags.h"
#include "trainer_data.h"
#include "trainer_info.h"
#include "unk_0201D15C.h"
#include "unk_0202631C.h"
#include "unk_0202D7A8.h"
#include "unk_02054884.h"

2
src/overlay006/ov6_022426AC.c
View File

@ -8,6 +8,7 @@
#include "cell_actor.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "pokemon.h"
#include "sprite_resource.h"
@ -16,7 +17,6 @@
#include "unk_020093B4.h"
#include "unk_0200A328.h"
#include "unk_020131EC.h"
#include "unk_0201D15C.h"
typedef struct UnkStruct_ov6_022426B8_t {
SpriteResourceCollection *unk_00[4];

58
src/overlay006/ov6_02243258.c
View File

@ -18,6 +18,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "map_object.h"
#include "math.h"
#include "narc.h"
#include "player_avatar.h"
#include "pokemon.h"
@ -29,7 +30,6 @@
#include "unk_0200A328.h"
#include "unk_0200F174.h"
#include "unk_020131EC.h"
#include "unk_0201D15C.h"
#include "unk_0205D8CC.h"
#include "unk_020711EC.h"
@ -573,7 +573,7 @@ static CellActor *ov6_022437DC(UnkStruct_ov6_02243258 *param0)
CellActor_SetAffineOverwriteMode(v0, 2);
CellActor_SetAffineTranslation(v0, &v2);
CellActor_SetAffineScale(v0, &v3);
CellActor_SetAffineZRotation(v0, sub_0201D2A4(0));
CellActor_SetAffineZRotation(v0, CalcAngleRotationIdx_Wraparound(0));
return v0;
}
@ -704,15 +704,15 @@ static void ov6_02243950(UnkStruct_ov101_021D5D90 *param0)
v2->unk_40 = (FX32_ONE * 45);
v2->unk_48 = (FX32_ONE * (128 + 64));
v2->unk_4C = (FX32_ONE * 32);
v2->unk_14.x = sub_0201D264(45) * ((v2->unk_48) / FX32_ONE);
v2->unk_14.y = sub_0201D250((v2->unk_40) / FX32_ONE) * ((v2->unk_48) / FX32_ONE);
v2->unk_14.x = CalcCosineDegrees_Wraparound(45) * ((v2->unk_48) / FX32_ONE);
v2->unk_14.y = CalcSineDegrees_Wraparound((v2->unk_40) / FX32_ONE) * ((v2->unk_48) / FX32_ONE);
v0.x = v2->unk_08.x + v2->unk_14.x;
v0.y = v2->unk_08.y + v2->unk_14.y;
CellActor_SetPosition(v2->unk_68, &v0);
CellActor_SetAffineScale(v2->unk_68, &v1);
CellActor_SetAffineZRotation(v2->unk_68, sub_0201D2A4((v2->unk_38) / FX32_ONE));
CellActor_SetAffineZRotation(v2->unk_68, CalcAngleRotationIdx_Wraparound((v2->unk_38) / FX32_ONE));
CellActor_SetPriority(v2->unk_68, 132);
CellActor_SetDrawFlag(v2->unk_68, 1);
@ -731,7 +731,7 @@ static void ov6_02243950(UnkStruct_ov101_021D5D90 *param0)
CellActor_SetAffineOverwriteMode(v3, 2);
CellActor_SetAffineTranslation(v3, &v4);
CellActor_SetAffineScale(v3, &v5);
CellActor_SetAffineZRotation(v3, sub_0201D2A4(0));
CellActor_SetAffineZRotation(v3, CalcAngleRotationIdx_Wraparound(0));
CellActor_SetAnim(v3, 2);
}
@ -758,8 +758,8 @@ static int ov6_02243AB8(UnkStruct_ov6_02249110 *param0)
param0->unk_4C = 0x1000;
}
param0->unk_14.x = sub_0201D264(45) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.y = sub_0201D250((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.x = CalcCosineDegrees_Wraparound(45) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.y = CalcSineDegrees_Wraparound((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE);
if (((param0->unk_40) / FX32_ONE) < 90) {
param0->unk_40 += 0x4000;
@ -823,15 +823,15 @@ static int ov6_02243BEC(UnkStruct_ov6_02249110 *param0)
param0->unk_4C = (FX32_ONE * 16);
}
param0->unk_14.x = sub_0201D264((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.y = sub_0201D250(128) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.x = CalcCosineDegrees_Wraparound((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.y = CalcSineDegrees_Wraparound(128) * ((param0->unk_48) / FX32_ONE);
if (param0->unk_40 < (FX32_ONE * 160)) {
param0->unk_40 += 0x1000;
}
param0->unk_38 += 0x2000;
CellActor_SetAffineZRotation(v1, sub_0201D2A4((param0->unk_38) / FX32_ONE));
CellActor_SetAffineZRotation(v1, CalcAngleRotationIdx_Wraparound((param0->unk_38) / FX32_ONE));
param0->unk_2C.x += param0->unk_50;
if (param0->unk_2C.x > 0x1000) {
@ -895,7 +895,7 @@ static int ov6_02243CFC(UnkStruct_ov6_02249110 *param0)
CellActor_SetPosition(param0->unk_68, &v0);
CellActor_SetAffineScale(param0->unk_68, &v1);
CellActor_SetAffineZRotation(param0->unk_68, sub_0201D2A4((param0->unk_38) / FX32_ONE));
CellActor_SetAffineZRotation(param0->unk_68, CalcAngleRotationIdx_Wraparound((param0->unk_38) / FX32_ONE));
CellActor_SetDrawFlag(param0->unk_68, 1);
CellActor_SetAnim(param0->unk_58.unk_08, 6);
CellActor_SetAnimateFlag(param0->unk_58.unk_08, 1);
@ -920,8 +920,8 @@ static int ov6_02243DC0(UnkStruct_ov6_02249110 *param0)
param0->unk_48 = 0;
}
param0->unk_14.x = sub_0201D264(315) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.y = sub_0201D250((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.x = CalcCosineDegrees_Wraparound(315) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.y = CalcSineDegrees_Wraparound((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE);
if (((param0->unk_40) / FX32_ONE) < 180) {
param0->unk_40 -= 0x4000;
@ -946,7 +946,7 @@ static int ov6_02243DC0(UnkStruct_ov6_02249110 *param0)
param0->unk_38 = (FX32_ONE * 60);
}
CellActor_SetAffineZRotation(v1, sub_0201D2A4((param0->unk_38) / FX32_ONE));
CellActor_SetAffineZRotation(v1, CalcAngleRotationIdx_Wraparound((param0->unk_38) / FX32_ONE));
v0.x = param0->unk_08.x + param0->unk_14.x;
v0.y = param0->unk_08.y + param0->unk_14.y;
@ -1906,7 +1906,7 @@ static CellActor *ov6_02244D4C(UnkStruct_ov6_02243FFC *param0, const VecFx32 *pa
CellActor_SetAffineOverwriteMode(v0, 2);
CellActor_SetAffineTranslation(v0, &v1);
CellActor_SetAffineScale(v0, &v2);
CellActor_SetAffineZRotation(v0, sub_0201D2A4(0));
CellActor_SetAffineZRotation(v0, CalcAngleRotationIdx_Wraparound(0));
return v0;
}
@ -2411,7 +2411,7 @@ static void ov6_0224551C(UnkStruct_ov6_02243FFC *param0)
CellActor_SetPosition(v2->unk_58, &v0);
CellActor_SetAffineScale(v2->unk_58, &v1);
CellActor_SetAffineZRotation(v2->unk_58, sub_0201D2A4((v2->unk_38) / FX32_ONE));
CellActor_SetAffineZRotation(v2->unk_58, CalcAngleRotationIdx_Wraparound((v2->unk_38) / FX32_ONE));
CellActor_SetDrawFlag(v2->unk_58, 1);
}
@ -2426,8 +2426,8 @@ static int ov6_022455C4(UnkStruct_ov6_02249198 *param0)
param0->unk_4C += 0x4000;
}
param0->unk_14.x = sub_0201D264(315) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.y = sub_0201D250((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.x = CalcCosineDegrees_Wraparound(315) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.y = CalcSineDegrees_Wraparound((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE);
if (((param0->unk_40) / FX32_ONE) < 270) {
param0->unk_40 += 0x4000;
@ -2452,7 +2452,7 @@ static int ov6_022455C4(UnkStruct_ov6_02249198 *param0)
param0->unk_38 = 0;
}
CellActor_SetAffineZRotation(v1, sub_0201D2A4((param0->unk_38) / FX32_ONE));
CellActor_SetAffineZRotation(v1, CalcAngleRotationIdx_Wraparound((param0->unk_38) / FX32_ONE));
v0.x = param0->unk_08.x + param0->unk_14.x;
v0.y = param0->unk_08.y + param0->unk_14.y;
@ -2498,15 +2498,15 @@ static void ov6_022456D4(UnkStruct_ov6_02243FFC *param0)
v2->unk_40 = (FX32_ONE * 225);
v2->unk_48 = (FX32_ONE * (128 + 64));
v2->unk_4C = (FX32_ONE * 32);
v2->unk_14.x = sub_0201D264(315) * ((v2->unk_48) / FX32_ONE);
v2->unk_14.y = sub_0201D250((v2->unk_40) / FX32_ONE) * ((v2->unk_48) / FX32_ONE);
v2->unk_14.x = CalcCosineDegrees_Wraparound(315) * ((v2->unk_48) / FX32_ONE);
v2->unk_14.y = CalcSineDegrees_Wraparound((v2->unk_40) / FX32_ONE) * ((v2->unk_48) / FX32_ONE);
v0.x = v2->unk_08.x + v2->unk_14.x;
v0.y = v2->unk_08.y + v2->unk_14.y;
CellActor_SetPosition(v2->unk_58, &v0);
CellActor_SetAffineScale(v2->unk_58, &v1);
CellActor_SetAffineZRotation(v2->unk_58, sub_0201D2A4((v2->unk_38) / FX32_ONE));
CellActor_SetAffineZRotation(v2->unk_58, CalcAngleRotationIdx_Wraparound((v2->unk_38) / FX32_ONE));
CellActor_SetDrawFlag(v2->unk_58, 1);
v2->unk_60 = ov6_02245B4C(param0->unk_244, param0->unk_248);
@ -2525,7 +2525,7 @@ static void ov6_022456D4(UnkStruct_ov6_02243FFC *param0)
CellActor_SetAffineOverwriteMode(v3, 2);
CellActor_SetAffineTranslation(v3, &v4);
CellActor_SetAffineScale(v3, &v5);
CellActor_SetAffineZRotation(v3, sub_0201D2A4(0));
CellActor_SetAffineZRotation(v3, CalcAngleRotationIdx_Wraparound(0));
}
}
@ -2548,8 +2548,8 @@ static int ov6_02245840(UnkStruct_ov6_02249198 *param0)
param0->unk_4C = 0x1000;
}
param0->unk_14.x = sub_0201D264(315) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.y = sub_0201D250((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.x = CalcCosineDegrees_Wraparound(315) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.y = CalcSineDegrees_Wraparound((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE);
if (((param0->unk_40) / FX32_ONE) < 270) {
param0->unk_40 += 0x4000;
@ -2574,7 +2574,7 @@ static int ov6_02245840(UnkStruct_ov6_02249198 *param0)
param0->unk_38 = (FX32_ONE * 360);
}
CellActor_SetAffineZRotation(v1, sub_0201D2A4((param0->unk_38) / FX32_ONE));
CellActor_SetAffineZRotation(v1, CalcAngleRotationIdx_Wraparound((param0->unk_38) / FX32_ONE));
v0.x = param0->unk_08.x + param0->unk_14.x;
v0.y = param0->unk_08.y + param0->unk_14.y;
@ -2657,8 +2657,8 @@ static int ov6_02245A0C(UnkStruct_ov6_02249198 *param0)
param0->unk_4C = (FX32_ONE * 16);
}
param0->unk_14.x = sub_0201D264((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.y = sub_0201D250(128) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.x = CalcCosineDegrees_Wraparound((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE);
param0->unk_14.y = CalcSineDegrees_Wraparound(128) * ((param0->unk_48) / FX32_ONE);
if (param0->unk_40 < (FX32_ONE * 135)) {
param0->unk_40 += 0x1000;

2
src/overlay006/ov6_022465FC.c
View File

@ -10,9 +10,9 @@
#include "overlay006/struct_ov6_022465F4_decl.h"
#include "savedata/save_table.h"
#include "math.h"
#include "narc.h"
#include "rtc.h"
#include "unk_0201D15C.h"
#include "unk_0202E2CC.h"
#include "unk_020559DC.h"
#include "unk_0206CCB0.h"

2
src/overlay006/ov6_02246A30.c
View File

@ -10,10 +10,10 @@
#include "field/field_system.h"
#include "inlines.h"
#include "math.h"
#include "save_player.h"
#include "system_flags.h"
#include "trainer_info.h"
#include "unk_0201D15C.h"
#include "unk_0202631C.h"
#include "vars_flags.h"

2
src/overlay008/ov8_02249960.c
View File

@ -44,6 +44,7 @@
#include "map_object.h"
#include "map_object_move.h"
#include "map_tile_behavior.h"
#include "math.h"
#include "message.h"
#include "player_avatar.h"
#include "render_window.h"
@ -55,7 +56,6 @@
#include "sys_task_manager.h"
#include "trainer_info.h"
#include "unk_02005474.h"
#include "unk_0201D15C.h"
#include "unk_02027F50.h"
#include "unk_02054D00.h"
#include "unk_0205D8CC.h"

8
src/overlay009/ov9_02249960.c
View File

@ -49,6 +49,7 @@
#include "map_object.h"
#include "map_object_move.h"
#include "map_tile_behavior.h"
#include "math.h"
#include "narc.h"
#include "player_avatar.h"
#include "resource_collection.h"
@ -62,7 +63,6 @@
#include "unk_020093B4.h"
#include "unk_0200A328.h"
#include "unk_0201CED8.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_02020AEC.h"
#include "unk_02027F50.h"
@ -2844,12 +2844,12 @@ static void ov9_0224B2CC(UnkStruct_ov101_021D5D90 *param0, void *param1)
v3 = v4->unk_08.unk_04.unk_18;
v3.x += (FX32_ONE * 0) + (sub_0201D1D4((v4->unk_00) / FX32_ONE) * v4->unk_08.unk_04.unk_10);
v3.y += (FX32_ONE * -512) + (sub_0201D15C((v4->unk_00) / FX32_ONE) * v4->unk_08.unk_04.unk_10);
v3.x += (FX32_ONE * 0) + (CalcCosineDegrees((v4->unk_00) / FX32_ONE) * v4->unk_08.unk_04.unk_10);
v3.y += (FX32_ONE * -512) + (CalcSineDegrees((v4->unk_00) / FX32_ONE) * v4->unk_08.unk_04.unk_10);
sub_020715D4(param0, &v3);
CellActor_SetPosition(v4->unk_40, &v3);
CellActor_SetAffineZRotation(v4->unk_40, sub_0201D2A4((v0) / FX32_ONE));
CellActor_SetAffineZRotation(v4->unk_40, CalcAngleRotationIdx_Wraparound((v0) / FX32_ONE));
}
static void ov9_0224B3A4(UnkStruct_ov101_021D5D90 *param0, void *param1)

2
src/overlay010/ov10_0221F800.c
View File

@ -37,6 +37,7 @@
#include "item.h"
#include "journal.h"
#include "map_header.h"
#include "math.h"
#include "menu.h"
#include "message.h"
#include "narc.h"
@ -59,7 +60,6 @@
#include "unk_02012744.h"
#include "unk_02014000.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0202419C.h"
#include "unk_02024220.h"

4
src/overlay012/ov12_02226B84.c
View File

@ -28,13 +28,13 @@
#include "graphics.h"
#include "heap.h"
#include "inlines.h"
#include "math.h"
#include "palette.h"
#include "spl.h"
#include "sys_task_manager.h"
#include "unk_0200762C.h"
#include "unk_0200C6E4.h"
#include "unk_02014000.h"
#include "unk_0201D15C.h"
#include "unk_0201F834.h"
typedef struct {
@ -2912,7 +2912,7 @@ static void ov12_02229A6C(SysTask *param0, void *param1)
if (v0->unk_30) {
v0->unk_2C += (360 / (v0->unk_06));
SPLEmitter_SetPosY(v0->unk_38, (v0->unk_A8[0].unk_02 * 172) + sub_0201D250(v0->unk_2C));
SPLEmitter_SetPosY(v0->unk_38, (v0->unk_A8[0].unk_02 * 172) + CalcSineDegrees_Wraparound(v0->unk_2C));
}
}
}

2
src/overlay012/ov12_0222D6B0.c
View File

@ -22,10 +22,10 @@
#include "bg_window.h"
#include "heap.h"
#include "math.h"
#include "sys_task_manager.h"
#include "unk_0200762C.h"
#include "unk_0200C6E4.h"
#include "unk_0201D15C.h"
typedef struct {
u8 unk_00;

2
src/overlay012/ov12_02235E94.c
View File

@ -26,6 +26,7 @@
#include "overlay104/struct_ov104_02241308.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "palette.h"
#include "pokemon.h"
@ -36,7 +37,6 @@
#include "unk_020093B4.h"
#include "unk_0200C6E4.h"
#include "unk_02014000.h"
#include "unk_0201D15C.h"
#include "unk_0202C9F4.h"
#include "unk_02097B18.h"

10
src/overlay017/ov17_022413D8.c
View File

@ -30,6 +30,7 @@
#include "graphics.h"
#include "heap.h"
#include "inlines.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "palette.h"
@ -44,7 +45,6 @@
#include "unk_0200762C.h"
#include "unk_0200C6E4.h"
#include "unk_02012744.h"
#include "unk_0201D15C.h"
#include "unk_0208C098.h"
#include "unk_02094EDC.h"
@ -1913,8 +1913,8 @@ static void ov17_022434E0(SysTask *param0, void *param1)
}
v3 = v0->unk_10 / 0x100;
v1 = FX_Mul(sub_0201D1D4(v0->unk_1E / 100), v3 << FX32_SHIFT) / FX32_ONE;
v2 = FX_Mul(sub_0201D15C(v0->unk_1E / 100), v3 << FX32_SHIFT) / FX32_ONE;
v1 = FX_Mul(CalcCosineDegrees(v0->unk_1E / 100), v3 << FX32_SHIFT) / FX32_ONE;
v2 = FX_Mul(CalcSineDegrees(v0->unk_1E / 100), v3 << FX32_SHIFT) / FX32_ONE;
SpriteActor_SetSpritePositionXY(v0->unk_08, v0->unk_21 + v1, v0->unk_22 + v2);
break;
default:
@ -2023,8 +2023,8 @@ static void ov17_02243750(SysTask *param0, void *param1)
v0->unk_0C -= 360 * 100;
}
v3 = FX_Mul(sub_0201D15C(v0->unk_0C / 100), (12 << FX32_SHIFT)) / FX32_ONE;
v4 = FX_Mul(sub_0201D1D4(v0->unk_0C / 100), (6 << FX32_SHIFT)) / FX32_ONE;
v3 = FX_Mul(CalcSineDegrees(v0->unk_0C / 100), (12 << FX32_SHIFT)) / FX32_ONE;
v4 = FX_Mul(CalcCosineDegrees(v0->unk_0C / 100), (6 << FX32_SHIFT)) / FX32_ONE;
v0->unk_20 += 0x80;
SpriteActor_SetSpritePositionXY(v0->unk_04, (v0->unk_1C >> 8) + v3, (v0->unk_20 >> 8) + v4);

4
src/overlay017/ov17_022476F8.c
View File

@ -17,6 +17,7 @@
#include "bg_window.h"
#include "game_options.h"
#include "heap.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "pokemon.h"
@ -28,7 +29,6 @@
#include "unk_02005474.h"
#include "unk_0200762C.h"
#include "unk_0200C6E4.h"
#include "unk_0201D15C.h"
typedef struct {
u8 *unk_00;
@ -143,7 +143,7 @@ static void ov17_02247840(SysTask *param0, void *param1)
switch (v0->unk_14) {
case 0:
v1 = sub_0201D2B8(v0->unk_10) * 8 / FX32_ONE;
v1 = CalcSineDegrees_FX32(v0->unk_10) * 8 / FX32_ONE;
v0->unk_10 += (6 << FX32_SHIFT);
v0->unk_0C -= 0x100;

8
src/overlay017/ov17_0224A0FC.c
View File

@ -40,6 +40,7 @@
#include "game_options.h"
#include "heap.h"
#include "inlines.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "palette.h"
@ -55,7 +56,6 @@
#include "unk_0200C6E4.h"
#include "unk_02012744.h"
#include "unk_02014000.h"
#include "unk_0201D15C.h"
#include "unk_020933F8.h"
#include "unk_02094EDC.h"
@ -1878,7 +1878,7 @@ static void ov17_0224BF58(UnkStruct_ov17_0224BE50 *param0)
}
v2 = (param0->unk_19 == 0) ? 3 : 3;
v1 = sub_0201D1D4(param0->unk_14 >> 8) * v2 / FX32_ONE;
v1 = CalcCosineDegrees(param0->unk_14 >> 8) * v2 / FX32_ONE;
param0->unk_0C->unk_04 = v1 + Unk_ov17_022546F4[param0->unk_19][0] - v2;
ov22_0225B100(param0->unk_0C->unk_00, param0->unk_0C->unk_04, param0->unk_0C->unk_08);
@ -2063,7 +2063,7 @@ void ov17_0224C49C(UnkStruct_ov17_0224C384 *param0, u32 param1, u32 param2, int
v7 = (256 - v6) / 2;
v3 = v0 + v7;
v4 = (0x12 * 8);
v4 -= sub_0201D15C(v5) * 10 / FX32_ONE;
v4 -= CalcSineDegrees(v5) * 10 / FX32_ONE;
sub_0200D500(param0->unk_04, v3, v4, (256 * FX32_ONE));
SpriteActor_EnableObject(param0->unk_04, 1);
@ -2217,7 +2217,7 @@ static void ov17_0224C7B8(SysTask *param0, void *param1)
v0->unk_24 = v0->unk_28;
v0->unk_10++;
case 1:
v1 = sub_0201D2B8(v0->unk_20) * 4 / FX32_ONE;
v1 = CalcSineDegrees_FX32(v0->unk_20) * 4 / FX32_ONE;
v2 = v0->unk_20;
v0->unk_20 += (50 << FX32_SHIFT);

4
src/overlay017/ov17_02250744.c
View File

@ -20,6 +20,7 @@
#include "game_options.h"
#include "graphics.h"
#include "heap.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "palette.h"
@ -34,7 +35,6 @@
#include "unk_02005474.h"
#include "unk_0200762C.h"
#include "unk_0200C6E4.h"
#include "unk_0201D15C.h"
#include "unk_020933F8.h"
#include "unk_02094EDC.h"
@ -562,7 +562,7 @@ static void ov17_02251140(SysTask *param0, void *param1)
v0->unk_1C -= 360 << 8;
}
v0->unk_10 = FX_Mul(sub_0201D15C(v0->unk_1C / 0x100), v0->unk_12 << FX32_SHIFT) / FX32_ONE;
v0->unk_10 = FX_Mul(CalcSineDegrees(v0->unk_1C / 0x100), v0->unk_12 << FX32_SHIFT) / FX32_ONE;
v0->unk_08 -= v0->unk_14;
v0->unk_0C += 0x280;

4
src/overlay019/ov19_021D8B54.c
View File

@ -18,10 +18,10 @@
#include "cell_actor.h"
#include "graphics.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_0201D15C.h"
typedef struct {
CellActor *unk_00;
@ -592,7 +592,7 @@ static void ov19_021D9600(SysTask *param0, void *param1)
v0->unk_0C += v0->unk_1C;
v1.y = v0->unk_0C;
v0->unk_18 += v0->unk_20;
v2 = v0->unk_24 * sub_0201D15C(v0->unk_18 >> FX32_SHIFT);
v2 = v0->unk_24 * CalcSineDegrees(v0->unk_18 >> FX32_SHIFT);
v1.x = v0->unk_14 + v2;
CellActor_SetPosition(v0->unk_00, &v1);

4
src/overlay019/ov19_021DCF88.c
View File

@ -16,12 +16,12 @@
#include "enums.h"
#include "graphics.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "strbuf.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "text.h"
#include "unk_0201D15C.h"
#include "unk_020797C8.h"
typedef struct {
@ -356,7 +356,7 @@ static void ov19_021DD024(UnkStruct_ov19_021DCF88 *param0)
for (v3 = 1; v3 < (16 - 1); v3++) {
v0 += v2;
param0->unk_D4[v3] = (sub_0201D15C(v0 >> FX32_SHIFT) * 16) >> FX32_SHIFT;
param0->unk_D4[v3] = (CalcSineDegrees(v0 >> FX32_SHIFT) * 16) >> FX32_SHIFT;
param0->unk_E4[v3] = 16 - param0->unk_D4[v3];
}

6
src/overlay021/ov21_021D76B0.c
View File

@ -26,6 +26,7 @@
#include "cell_actor.h"
#include "core_sys.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "sprite_resource.h"
#include "touch_screen.h"
@ -34,7 +35,6 @@
#include "unk_0200A328.h"
#include "unk_0200A9DC.h"
#include "unk_02012744.h"
#include "unk_0201D15C.h"
#include "unk_0201F834.h"
#include "unk_02023FCC.h"
@ -337,7 +337,7 @@ static int ov21_021D7950(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo
ov21_021D84A8(v3->unk_00[2], v3->unk_0C[2], -14, 2, 5);
if (v0->unk_1C->unk_20 == 0) {
ov21_021D8354(v3, v2, sub_0201D580(524, v1->unk_0C), v1->unk_1C);
ov21_021D8354(v3, v2, CalcRadialAngle(524, v1->unk_0C), v1->unk_1C);
} else if (v0->unk_1C->unk_20 == 1) {
ov21_021D83C0(v3, v2, v0);
} else {
@ -831,7 +831,7 @@ static void ov21_021D8324(UnkStruct_ov21_021D7A64 *param0)
v3 = gCoreSys.touchX - (128 + 120);
v2 = gCoreSys.touchY - (104 + -0);
param0->unk_0C = sub_0201D4CC(v1, v0, v3, v2, 524);
param0->unk_0C = CalcDotProduct2D(v1, v0, v3, v2, 524);
param0->unk_0C *= 10;
}

6
src/overlay021/ov21_021E4CA4.c
View File

@ -24,6 +24,7 @@
#include "cell_actor.h"
#include "core_sys.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "sprite_resource.h"
#include "touch_screen.h"
@ -33,7 +34,6 @@
#include "unk_0200A328.h"
#include "unk_0200A9DC.h"
#include "unk_02012744.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0201F834.h"
#include "unk_02023FCC.h"
@ -1017,7 +1017,7 @@ static void ov21_021E5A44(UnkStruct_ov21_021E51DC *param0)
v0 = param0->unk_58 - 157;
v3 = gCoreSys.touchX - 51;
v2 = gCoreSys.touchY - 157;
v4 = sub_0201D4CC(v1, v0, v3, v2, 0);
v4 = CalcDotProduct2D(v1, v0, v3, v2, 0);
if (MATH_IAbs(v4) < 1) {
return;
@ -1101,7 +1101,7 @@ static void ov21_021E5AD8(UnkStruct_ov21_021E51DC *param0)
static void ov21_021E5B50(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_021E51DC *param1)
{
CellActor_SetAffineZRotation(param0->unk_00, sub_0201D580(14, param1->unk_5C));
CellActor_SetAffineZRotation(param0->unk_00, CalcRadialAngle(14, param1->unk_5C));
}
static void ov21_021E5B6C(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, const UnkStruct_ov21_021E51DC *param2)

2
src/overlay022/ov22_02257F50.c
View File

@ -18,10 +18,10 @@
#include "overlay022/struct_ov22_022599A0.h"
#include "heap.h"
#include "math.h"
#include "sys_task_manager.h"
#include "touch_screen.h"
#include "unk_0200679C.h"
#include "unk_0201D15C.h"
typedef struct {
UnkStruct_ov22_02259560 *unk_00;

2
src/overlay022/ov22_022589E0.c
View File

@ -20,10 +20,10 @@
#include "core_sys.h"
#include "heap.h"
#include "math.h"
#include "sys_task_manager.h"
#include "unk_02005474.h"
#include "unk_0200679C.h"
#include "unk_0201D15C.h"
typedef struct {
UnkStruct_ov22_0225A0E4 *unk_00;

2
src/overlay023/ov23_0223E140.c
View File

@ -38,6 +38,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "journal.h"
#include "math.h"
#include "menu.h"
#include "narc.h"
#include "render_window.h"
@ -58,7 +59,6 @@
#include "unk_0200A9DC.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0201E86C.h"
#include "unk_0201F834.h"

2
src/overlay023/ov23_0224340C.c
View File

@ -36,6 +36,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "map_object_move.h"
#include "math.h"
#include "narc.h"
#include "player_avatar.h"
#include "sprite_resource.h"
@ -48,7 +49,6 @@
#include "unk_020093B4.h"
#include "unk_0200A328.h"
#include "unk_0200A9DC.h"
#include "unk_0201D15C.h"
#include "unk_0201E86C.h"
#include "unk_0201F834.h"
#include "unk_0202854C.h"

2
src/overlay023/ov23_02248F1C.c
View File

@ -16,6 +16,7 @@
#include "communication_system.h"
#include "graphics.h"
#include "gx_layers.h"
#include "math.h"
#include "narc.h"
#include "player_avatar.h"
#include "render_window.h"
@ -27,7 +28,6 @@
#include "unk_020093B4.h"
#include "unk_0200A328.h"
#include "unk_0200F174.h"
#include "unk_0201D15C.h"
#include "unk_0205D8CC.h"
typedef struct {

2
src/overlay023/ov23_0224DC40.c
View File

@ -22,6 +22,7 @@
#include "game_records.h"
#include "heap.h"
#include "list_menu.h"
#include "math.h"
#include "menu.h"
#include "message.h"
#include "render_window.h"
@ -30,7 +31,6 @@
#include "sys_task_manager.h"
#include "trainer_info.h"
#include "unk_02005474.h"
#include "unk_0201D15C.h"
#include "unk_0202854C.h"
#include "unk_020573FC.h"
#include "unk_0206AFE0.h"

4
src/overlay033/ov33_02256474.c
View File

@ -21,12 +21,12 @@
#include "graphics.h"
#include "heap.h"
#include "inlines.h"
#include "math.h"
#include "narc.h"
#include "pokemon.h"
#include "pokemon_icon.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_0201D15C.h"
typedef struct {
UnkStruct_ov25_022558C4 *unk_00;
@ -789,7 +789,7 @@ static void ov33_0225718C(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_
v0->unk_34_val3[2] = 2;
}
VEC_Set(&v0->unk_20, 0, -20 * sub_0201D15C(v0->unk_34_val3[1]), 0);
VEC_Set(&v0->unk_20, 0, -20 * CalcSineDegrees(v0->unk_34_val3[1]), 0);
VEC_Add(&v0->unk_14, &v0->unk_20, &param0->unk_A4);
ov25_02255900(v0->unk_00, param0->unk_A4.x, param0->unk_A4.y);

2
src/overlay041/ov41_022567B0.c
View File

@ -19,8 +19,8 @@
#include "bg_window.h"
#include "graphics.h"
#include "heap.h"
#include "math.h"
#include "sys_task_manager.h"
#include "unk_0201D15C.h"
#include "unk_02099D44.h"
struct UnkStruct_ov41_022567B0_t {

2
src/overlay042/ov42_022561C0.c
View File

@ -9,9 +9,9 @@
#include "bg_window.h"
#include "heap.h"
#include "math.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_0201D15C.h"
#include "unk_02099D44.h"
typedef struct {

4
src/overlay053/ov53_02256420.c
View File

@ -19,9 +19,9 @@
#include "bg_window.h"
#include "graphics.h"
#include "heap.h"
#include "math.h"
#include "pokemon_icon.h"
#include "sys_task_manager.h"
#include "unk_0201D15C.h"
struct UnkStruct_ov53_02256420_t {
const UnkStruct_ov53_02256420_1 *unk_00;
@ -195,7 +195,7 @@ static void ov53_022565E0(SysTask *param0, void *param1)
fx32 v4;
v3 = ((((180 << FX32_SHIFT) / 16) * v2) + FX32_HALF) >> FX32_SHIFT;
v4 = sub_0201D15C(v3) * 24;
v4 = CalcSineDegrees(v3) * 24;
ov25_02255900(v0->unk_9C, v0->unk_A4, v0->unk_A0 - v4);
}
ov25_0225524C(param1);

4
src/overlay058/ov58_021D0D80.c
View File

@ -26,6 +26,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "journal.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "overlay_manager.h"
@ -44,7 +45,6 @@
#include "unk_0200F174.h"
#include "unk_02015920.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0201E3D8.h"
#include "unk_0201E86C.h"
@ -1596,7 +1596,7 @@ static void ov58_021D2888(u16 *param0)
*param0 = 0;
}
v0 = sub_0201D250(*param0);
v0 = CalcSineDegrees_Wraparound(*param0);
v3 = 15 + (v0 * 10) / FX32_ONE;
v1 = GX_RGB(29, v3, 0);

4
src/overlay059/ov59_021D0D80.c
View File

@ -27,6 +27,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "journal.h"
#include "math.h"
#include "menu.h"
#include "message.h"
#include "message_util.h"
@ -47,7 +48,6 @@
#include "unk_0200A784.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0201E86C.h"
#include "unk_0201F834.h"
@ -1434,7 +1434,7 @@ static void ov59_021D23B0(u16 *param0)
*param0 = 0;
}
v0 = sub_0201D250(*param0);
v0 = CalcSineDegrees_Wraparound(*param0);
v3 = 15 + (v0 * 10) / FX32_ONE;
v1 = GX_RGB(29, v3, 0);

6
src/overlay062/ov62_022300D8.c
View File

@ -21,6 +21,7 @@
#include "bg_window.h"
#include "graphics.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "palette.h"
@ -31,7 +32,6 @@
#include "text.h"
#include "unk_0200C6E4.h"
#include "unk_02012744.h"
#include "unk_0201D15C.h"
#include "unk_0201E86C.h"
#include "unk_02030A80.h"
#include "unk_0208C010.h"
@ -551,7 +551,7 @@ void ov62_02230C28(SysTask *param0, void *param1)
sub_0200D638(v0->unk_00[0], &v1, &v2);
sub_0200D638(v0->unk_00[1], &v3, &v4);
v1 = v1 + ((sub_0201D250((v0->unk_20 * 0xffff) / 360) * 1) * (v0->unk_18 * -1));
v1 = v1 + ((CalcSineDegrees_Wraparound((v0->unk_20 * 0xffff) / 360) * 1) * (v0->unk_18 * -1));
v3 = v1;
v0->unk_20 += 32;
@ -607,7 +607,7 @@ void ov62_02230C28(SysTask *param0, void *param1)
sub_0200D638(v0->unk_00[0], &v9, &v10);
sub_0200D638(v0->unk_00[1], &v11, &v12);
v9 = v0->unk_0C + ((sub_0201D250((v0->unk_20 * 0xffff) / 360) * 3) * (v0->unk_18 * -1));
v9 = v0->unk_0C + ((CalcSineDegrees_Wraparound((v0->unk_20 * 0xffff) / 360) * 3) * (v0->unk_18 * -1));
v11 = v9;
if (v0->unk_19 % 2) {

4
src/overlay062/ov62_02234A10.c
View File

@ -15,6 +15,7 @@
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "message.h"
#include "palette.h"
#include "strbuf.h"
@ -24,7 +25,6 @@
#include "unk_0200C6E4.h"
#include "unk_0200F174.h"
#include "unk_02012744.h"
#include "unk_0201D15C.h"
#include "unk_0208B284.h"
static void ov62_02234A10(UnkStruct_0208C06C *param0);
@ -336,7 +336,7 @@ BOOL ov62_02235008(UnkStruct_0208C06C *param0)
}
v8 = v6 * FX32_ONE;
v7 = v0->unk_00[v3].unk_0C + (sub_0201D250((v0->unk_00[v3].unk_04 * 0xffff) / 360) * 16);
v7 = v0->unk_00[v3].unk_0C + (CalcSineDegrees_Wraparound((v0->unk_00[v3].unk_04 * 0xffff) / 360) * 16);
v0->unk_00[v3].unk_04 += (-4 * 1);
sub_0200D614(param0->unk_534.unk_C8[v3].unk_00, v7, v8);

10
src/overlay062/ov62_02236CBC.c
View File

@ -18,13 +18,13 @@
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "palette.h"
#include "touch_screen.h"
#include "unk_02005474.h"
#include "unk_0200C6E4.h"
#include "unk_02012744.h"
#include "unk_0201D15C.h"
#include "unk_0202D05C.h"
#include "unk_02030A80.h"
#include "unk_0206AFE0.h"
@ -473,8 +473,8 @@ static BOOL ov62_022375A4(UnkStruct_0208C06C *param0)
v0->unk_04[v1] = 1.0f;
}
v4 = (128 << FX32_SHIFT) + sub_0201D250(v0->unk_2C[v1]) * v0->unk_18[v1];
v5 = (106 << FX32_SHIFT) - sub_0201D264(v0->unk_2C[v1]) * v0->unk_18[v1];
v4 = (128 << FX32_SHIFT) + CalcSineDegrees_Wraparound(v0->unk_2C[v1]) * v0->unk_18[v1];
v5 = (106 << FX32_SHIFT) - CalcCosineDegrees_Wraparound(v0->unk_2C[v1]) * v0->unk_18[v1];
sub_0200D614(v0->unk_68[v1], v4, v5);
SpriteActor_GetSpritePositionXY(v0->unk_68[v1], &v2, &v3);
@ -523,8 +523,8 @@ static BOOL ov62_022376C4(UnkStruct_0208C06C *param0)
SpriteActor_EnableObject(v0->unk_54[v1], 0);
}
v4 = (128 << FX32_SHIFT) - sub_0201D250(v0->unk_2C[v1]) * v0->unk_18[v1];
v5 = (106 << FX32_SHIFT) - sub_0201D264(v0->unk_2C[v1]) * v0->unk_18[v1];
v4 = (128 << FX32_SHIFT) - CalcSineDegrees_Wraparound(v0->unk_2C[v1]) * v0->unk_18[v1];
v5 = (106 << FX32_SHIFT) - CalcCosineDegrees_Wraparound(v0->unk_2C[v1]) * v0->unk_18[v1];
sub_0200D614(v0->unk_68[v1], v4, v5);
SpriteActor_GetSpritePositionXY(v0->unk_68[v1], &v2, &v3);

6
src/overlay065/ov65_02235060.c
View File

@ -27,11 +27,11 @@
#include "core_sys.h"
#include "graphics.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "sprite_resource.h"
#include "unk_020093B4.h"
#include "unk_0200A328.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#define MCR_PCANM_DESTPL(x) ((7 * 32) + (((x) + 1) * 2))
@ -939,7 +939,7 @@ static void ov65_02235EF8(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354
v0.unk_02 = ov63_0222BF90(param1->unk_00, 1);
v1 = v0;
v0.unk_02 += FX_Mul(sub_0201D15C(param1->unk_08), -192 * FX32_ONE) >> FX32_SHIFT;
v0.unk_02 += FX_Mul(CalcSineDegrees(param1->unk_08), -192 * FX32_ONE) >> FX32_SHIFT;
ov63_0222CFE0(param1->unk_04, v0);
ov63_0222D060(param1->unk_04, v1);
@ -960,7 +960,7 @@ static void ov65_02235F94(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354
if (v3 > 0) {
v3 = v3 % 6;
v0 = (180 * v3) / 6;
v1.unk_02 -= FX_Mul(sub_0201D15C(v0), 4 * FX32_ONE) >> FX32_SHIFT;
v1.unk_02 -= FX_Mul(CalcSineDegrees(v0), 4 * FX32_ONE) >> FX32_SHIFT;
}
ov63_0222CFE0(param1->unk_04, v1);

2
src/overlay066/ov66_0222DDF0.c
View File

@ -47,6 +47,7 @@
#include "heap.h"
#include "inlines.h"
#include "journal.h"
#include "math.h"
#include "message.h"
#include "party.h"
#include "pokemon.h"
@ -58,7 +59,6 @@
#include "unk_020041CC.h"
#include "unk_02005474.h"
#include "unk_02014D38.h"
#include "unk_0201D15C.h"
#include "unk_0202631C.h"
#include "unk_0202C858.h"
#include "unk_02030EA4.h"

6
src/overlay069/ov69_0225C700.c
View File

@ -30,6 +30,7 @@
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "overlay_manager.h"
@ -49,7 +50,6 @@
#include "unk_0200F174.h"
#include "unk_02015920.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0201E86C.h"
#include "unk_0201F834.h"
@ -1283,11 +1283,11 @@ static u32 ov69_0225D194(const VecFx32 *param0, const VecFx32 *param1)
v0 = MATH_ABS(param0->x - param1->x);
v1 = MATH_ABS(param0->y - param1->y);
if (v0 > sub_0201D278(180)) {
if (v0 > CalcAngleRotationIdx(180)) {
v0 = 0xffff - v0;
}
if (v1 > sub_0201D278(180)) {
if (v1 > CalcAngleRotationIdx(180)) {
v1 = 0xffff - v1;
}

6
src/overlay070/ov70_0225C9B4.c
View File

@ -22,8 +22,8 @@
#include "core_sys.h"
#include "heap.h"
#include "math.h"
#include "unk_02005474.h"
#include "unk_0201D15C.h"
typedef struct {
fx32 unk_00;
@ -1133,8 +1133,8 @@ static void ov70_0225D81C(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA
v2 = v2 % 6;
v0 = (180 * v2) / 6;
v1.z += FX_Mul(sub_0201D15C(v0), -2 * FX32_ONE);
v1.y += FX_Mul(sub_0201D15C(v0), 10 * FX32_ONE);
v1.z += FX_Mul(CalcSineDegrees(v0), -2 * FX32_ONE);
v1.y += FX_Mul(CalcSineDegrees(v0), 10 * FX32_ONE);
}
ov66_022347F8(param0->unk_04, &v1);

2
src/overlay070/ov70_02260B44.c
View File

@ -13,8 +13,8 @@
#include "easy3d_object.h"
#include "graphics.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "unk_0201D15C.h"
typedef struct {
BOOL unk_00;

2
src/overlay070/ov70_022630A4.c
View File

@ -36,9 +36,9 @@
#include "core_sys.h"
#include "enums.h"
#include "list_menu.h"
#include "math.h"
#include "strbuf.h"
#include "unk_02005474.h"
#include "unk_0201D15C.h"
typedef struct {
fx32 unk_00;

2
src/overlay070/ov70_02266E9C.c
View File

@ -20,9 +20,9 @@
#include "enums.h"
#include "list_menu.h"
#include "math.h"
#include "strbuf.h"
#include "unk_02005474.h"
#include "unk_0201D15C.h"
typedef struct {
ListMenuTemplate unk_00;

6
src/overlay070/ov70_0226CE54.c
View File

@ -14,8 +14,8 @@
#include "overlay070/struct_ov70_02261E10_decl.h"
#include "heap.h"
#include "math.h"
#include "unk_02005474.h"
#include "unk_0201D15C.h"
typedef struct {
u16 unk_00;
@ -346,7 +346,7 @@ static void ov70_0226D31C(UnkStruct_ov70_0226D2A0 *param0, UnkStruct_ov70_02261E
{
param0->unk_04.val1.unk_00 = 0;
param0->unk_04.val1.unk_02 = 8;
param0->unk_04.val1.unk_04 = (sub_0201D2A4(5));
param0->unk_04.val1.unk_04 = (CalcAngleRotationIdx_Wraparound(5));
param0->unk_04.val1.unk_06 = 2;
param0->unk_04.val1.unk_08 = 4;
}
@ -355,7 +355,7 @@ static void ov70_0226D33C(UnkStruct_ov70_0226D2A0 *param0, UnkStruct_ov70_02261E
{
param0->unk_04.val1.unk_00 = 0;
param0->unk_04.val1.unk_02 = 16;
param0->unk_04.val1.unk_04 = (sub_0201D2A4(10));
param0->unk_04.val1.unk_04 = (CalcAngleRotationIdx_Wraparound(10));
param0->unk_04.val1.unk_06 = 4;
param0->unk_04.val1.unk_08 = 2;
}

4
src/overlay072/ov72_0223D7A0.c
View File

@ -28,6 +28,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "inlines.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "overlay_manager.h"
@ -48,7 +49,6 @@
#include "unk_02012744.h"
#include "unk_02015920.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0201E3D8.h"
#include "unk_0201E86C.h"
@ -1069,7 +1069,7 @@ static void ov72_0223E8D0(u16 *param0)
*param0 = 0;
}
v0 = sub_0201D250(*param0);
v0 = CalcSineDegrees_Wraparound(*param0);
v3 = 15 + (v0 * 10) / FX32_ONE;
v1 = GX_RGB(29, v3, 0);

4
src/overlay077/ov77_021D0D80.c
View File

@ -17,6 +17,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "main.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "overlay_manager.h"
@ -27,7 +28,6 @@
#include "unk_0200A9DC.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201E190.h"
#include "unk_0202419C.h"
#include "unk_02024220.h"
@ -530,7 +530,7 @@ static void ov77_021D1568(UnkStruct_ov77_021D1568 *param0, UnkStruct_ov77_021D12
param0->unk_2A8 += 2;
param0->unk_2A8 %= 360;
v1 = sub_0201D250((param0->unk_2A8 * 0xffff) / 360);
v1 = CalcSineDegrees_Wraparound((param0->unk_2A8 * 0xffff) / 360);
v1 *= 0.30;
param1->unk_80.y -= v1;

2
src/overlay077/ov77_021D25B0.c
View File

@ -22,6 +22,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "main.h"
#include "math.h"
#include "narc.h"
#include "overlay_manager.h"
#include "sys_task.h"
@ -32,7 +33,6 @@
#include "unk_0200F174.h"
#include "unk_02014000.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0202419C.h"
#include "unk_02024220.h"

2
src/overlay077/ov77_021D6670.c
View File

@ -10,13 +10,13 @@
#include "cell_actor.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "sprite_resource.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_020093B4.h"
#include "unk_0200A328.h"
#include "unk_0200A784.h"
#include "unk_0201D15C.h"
#include "unk_0201E86C.h"
#include "unk_0201F834.h"

8
src/overlay079/ov79_021D2268.c
View File

@ -25,6 +25,7 @@
#include "font.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "overlay_manager.h"
@ -41,7 +42,6 @@
#include "unk_0200C6E4.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_020393C8.h"
#include "unk_0208C098.h"
@ -840,7 +840,7 @@ static void ov79_021D2E74(SysTask *param0, void *param1)
v3.y = v2->unk_00.y + FX_Mul(v2->unk_18.y, v0->unk_0C);
v4 = FX_Mul(v2->unk_48, v0->unk_0C);
v4 = FX_Mul(sub_0201D250(v4 >> 12), FX32_CONST(-64));
v4 = FX_Mul(CalcSineDegrees_Wraparound(v4 >> 12), FX32_CONST(-64));
v5 = FX32_ONE;
v3.y += FX_Mul(v4, v5);
@ -1063,7 +1063,7 @@ static void ov79_021D34A8(SysTask *param0, void *param1)
sub_02007DEC(v1->unk_C8, 1, v3.y >> 12);
v4 = FX_Mul(v2->unk_48, v0->unk_0C);
v4 = FX_Mul(sub_0201D250(v4 >> 12), FX32_CONST(-6));
v4 = FX_Mul(CalcSineDegrees_Wraparound(v4 >> 12), FX32_CONST(-6));
sub_02007DEC(v1->unk_C8, 4, v4 >> 12);
@ -1161,7 +1161,7 @@ static void ov79_021D36F0(SysTask *param0, void *param1)
VecFx32 v3;
fx32 v4, v5;
v4 = sub_0201D250(v2->unk_50);
v4 = CalcSineDegrees_Wraparound(v2->unk_50);
v5 = FX_Mul(v4, FX32_CONST(2));
if (v2->unk_50 > 359) {

2
src/overlay083/ov83_0223D6A8.c
View File

@ -43,6 +43,7 @@
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "render_window.h"
#include "sprite_resource.h"
@ -56,7 +57,6 @@
#include "unk_0200A328.h"
#include "unk_02015064.h"
#include "unk_02015920.h"
#include "unk_0201D15C.h"
#include "unk_0201E3BC.h"
#include "unk_02098FFC.h"

6
src/overlay083/ov83_0223F7F4.c
View File

@ -21,8 +21,8 @@
#include "berry_data.h"
#include "core_sys.h"
#include "heap.h"
#include "math.h"
#include "poffin.h"
#include "unk_0201D15C.h"
#include "unk_0201E3BC.h"
s32 ov83_0223F7F4(int param0, int param1, int param2, int param3, int param4, int param5)
@ -37,7 +37,7 @@ s32 ov83_0223F7F4(int param0, int param1, int param2, int param3, int param4, in
param2 -= param4;
param3 -= param5;
v3 = sub_0201D4CC(param2, param3, param0, param1, 0);
v3 = CalcDotProduct2D(param2, param3, param0, param1, 0);
v3 = ((v3) * 160);
return v3;
@ -195,7 +195,7 @@ u16 ov83_0223F900(UnkStruct_ov83_0223F8AC *param0, const UnkStruct_ov83_0223FE50
}
v5 = param0->unk_08;
param0->unk_08 += sub_0201D580(68, ((param0->unk_0C) / 160));
param0->unk_08 += CalcRadialAngle(68, ((param0->unk_0C) / 160));
if (((param3 == 0) && (param0->unk_0C >= 0)) || ((param3 == 1) && (param0->unk_0C < 0))) {
if (param3 == 0) {

6
src/overlay084/ov84_0223B5A0.c
View File

@ -28,6 +28,7 @@
#include "heap.h"
#include "item.h"
#include "list_menu.h"
#include "math.h"
#include "menu.h"
#include "message.h"
#include "narc.h"
@ -47,7 +48,6 @@
#include "unk_0200C6E4.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0201E3D8.h"
#include "unk_0202D7A8.h"
@ -2968,8 +2968,8 @@ static BOOL ov84_0223EB84(UnkStruct_ov84_0223B5A0 *param0, u16 param1)
if (ov84_0223EB6C() == 1) {
s32 v0, v1;
v0 = sub_0201D4CC(128 - param0->unk_49E, 80 - param0->unk_4A0, 128 - gCoreSys.touchX, 80 - gCoreSys.touchY, 80);
v1 = sub_0201D580(80, v0 * 2);
v0 = CalcDotProduct2D(128 - param0->unk_49E, 80 - param0->unk_4A0, 128 - gCoreSys.touchX, 80 - gCoreSys.touchY, 80);
v1 = CalcRadialAngle(80, v0 * 2);
v1 = ((v1 << 8) / 182) >> 8;
param0->unk_49A += v1;

6
src/overlay086/ov86_0223B140.c
View File

@ -24,6 +24,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "inlines.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "overlay_manager.h"
@ -44,7 +45,6 @@
#include "unk_0200F174.h"
#include "unk_020131EC.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
typedef struct {
fx32 unk_00;
@ -1607,8 +1607,8 @@ static void inline inline_ov86_0223CB74(UnkStruct_ov86_0223CAE4 *param0)
int v0 = param0->unk_808 >> FX32_SHIFT;
fx32 v1, v2;
v1 = param0->unk_818 + FX_Mul(sub_0201D1D4(v0), 10240);
v2 = FX_Mul(sub_0201D15C(v0), 10240) - FX16_ONE;
v1 = param0->unk_818 + FX_Mul(CalcCosineDegrees(v0), 10240);
v2 = FX_Mul(CalcSineDegrees(v0), 10240) - FX16_ONE;
VEC_Fx16Set(&(param0->unk_826), v1 - 576, v2, 0);
VEC_Fx16Set(&(param0->unk_82C), v1 + 576, v2, 0);

4
src/overlay088/ov88_0223B140.c
View File

@ -38,6 +38,7 @@
#include "item.h"
#include "journal.h"
#include "list_menu.h"
#include "math.h"
#include "menu.h"
#include "message.h"
#include "message_util.h"
@ -66,7 +67,6 @@
#include "unk_0200F174.h"
#include "unk_020131EC.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0201E86C.h"
#include "unk_0201F834.h"
@ -1545,7 +1545,7 @@ static void ov88_0223CEF0(u16 *param0)
*param0 = 0;
}
v0 = sub_0201D250(*param0);
v0 = CalcSineDegrees_Wraparound(*param0);
v3 = 15 + (v0 * 10) / FX32_ONE;
v1 = GX_RGB(29, v3, 0);

6
src/overlay092/ov92_021D0D80.c
View File

@ -19,6 +19,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "list_menu.h"
#include "math.h"
#include "menu.h"
#include "message.h"
#include "narc.h"
@ -34,7 +35,6 @@
#include "unk_02005474.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0202419C.h"
#include "unk_0202C858.h"
#include "unk_020996D0.h"
@ -1539,11 +1539,11 @@ static u32 ov92_021D28C0(const UnkStruct_ov92_021D28C0 *param0, const UnkStruct_
v0 = MATH_ABS(param0->unk_00 - param1->unk_00);
v1 = MATH_ABS(param0->unk_04 - param1->unk_04);
if (v0 > sub_0201D278(180)) {
if (v0 > CalcAngleRotationIdx(180)) {
v0 = 0xffff - v0;
}
if (v1 > sub_0201D278(180)) {
if (v1 > CalcAngleRotationIdx(180)) {
v1 = 0xffff - v1;
}

6
src/overlay095/ov95_02248590.c
View File

@ -21,11 +21,11 @@
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_02005474.h"
#include "unk_0200F174.h"
#include "unk_0201D15C.h"
#include "unk_0202419C.h"
enum {
@ -923,8 +923,8 @@ static void ov95_022492DC(UnkStruct_ov95_0224922C *param0)
}
}
param0->unk_14.x = param0->unk_08.x + FX_Mul(sub_0201D1D4(v0), param0->unk_38);
param0->unk_14.z = param0->unk_08.z + FX_Mul(sub_0201D15C(v0), param0->unk_3C);
param0->unk_14.x = param0->unk_08.x + FX_Mul(CalcCosineDegrees(v0), param0->unk_38);
param0->unk_14.z = param0->unk_08.z + FX_Mul(CalcSineDegrees(v0), param0->unk_3C);
param0->unk_20.y += param0->unk_56;
for (v1 = 0; v1 < 3; v1++) {

6
src/overlay095/ov95_02249740.c
View File

@ -19,12 +19,12 @@
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_02005474.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0202419C.h"
enum {
@ -511,8 +511,8 @@ static void ov95_02249D38(UnkStruct_ov95_02249C28 *param0)
param0->unk_5C--;
}
param0->unk_1C.x = FX_Mul(sub_0201D1D4(v0), param0->unk_44);
param0->unk_1C.y = FX_Mul(sub_0201D15C(v0), param0->unk_48);
param0->unk_1C.x = FX_Mul(CalcCosineDegrees(v0), param0->unk_44);
param0->unk_1C.y = FX_Mul(CalcSineDegrees(v0), param0->unk_48);
param0->unk_1C.z = 0;
param0->unk_34.x += 0x300;

6
src/overlay095/ov95_0224A390.c
View File

@ -19,12 +19,12 @@
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_02005474.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0202419C.h"
#include "unk_020393C8.h"
@ -507,8 +507,8 @@ static void ov95_0224A978(UnkStruct_ov95_0224A848 *param0)
ov95_022479D4(param0->unk_0C, param0->unk_5C);
}
param0->unk_1C.x = FX_Mul(sub_0201D1D4(v0), param0->unk_44);
param0->unk_1C.y = FX_Mul(sub_0201D15C(v0), param0->unk_48);
param0->unk_1C.x = FX_Mul(CalcCosineDegrees(v0), param0->unk_44);
param0->unk_1C.y = FX_Mul(CalcSineDegrees(v0), param0->unk_48);
param0->unk_1C.z = 0;
param0->unk_34.x -= 0x300;

38
src/overlay097/ov97_0222D30C.c
View File

@ -31,6 +31,7 @@
#include "heap.h"
#include "list_menu.h"
#include "main.h"
#include "math.h"
#include "message.h"
#include "message_util.h"
#include "overlay_manager.h"
@ -53,7 +54,6 @@
#include "unk_0200A328.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0202DAB4.h"
#include "unk_02033200.h"
#include "unk_020363E8.h"
@ -1447,8 +1447,8 @@ static void ov97_0222EA68(UnkStruct_ov97_0222E398 *param0)
int v2 = LCRNG_Next() % 360;
int v3 = 64 + (LCRNG_Next() % 32);
v1.x = param0->unk_88[v0].unk_10.x + (sub_0201D250(v2) * v3);
v1.y = param0->unk_88[v0].unk_10.y + (sub_0201D264(v2) * v3);
v1.x = param0->unk_88[v0].unk_10.x + (CalcSineDegrees_Wraparound(v2) * v3);
v1.y = param0->unk_88[v0].unk_10.y + (CalcCosineDegrees_Wraparound(v2) * v3);
CellActor_SetPosition(param0->unk_88[v0].unk_0C, &v1);
}
@ -1592,31 +1592,31 @@ static void ov97_0222EEB8(SysTask *param0, void *param1)
if (v0->unk_2C == 0) {
v0->unk_34 += 8;
v0->unk_34 %= 360;
v0->unk_40 = (sub_0201D264(v0->unk_34) * v0->unk_38) >> FX32_SHIFT;
v0->unk_40 = (CalcCosineDegrees_Wraparound(v0->unk_34) * v0->unk_38) >> FX32_SHIFT;
v1.x = v0->unk_10.x + (sub_0201D250(v0->unk_28) * v0->unk_40 * +1);
v1.y = v0->unk_10.y + (sub_0201D264(v0->unk_28) * v0->unk_44 * +1);
v1.x = v0->unk_10.x + (CalcSineDegrees_Wraparound(v0->unk_28) * v0->unk_40 * +1);
v1.y = v0->unk_10.y + (CalcCosineDegrees_Wraparound(v0->unk_28) * v0->unk_44 * +1);
} else if (v0->unk_2C == 1) {
v0->unk_34 += 8;
v0->unk_34 %= 360;
v0->unk_44 = (sub_0201D250(v0->unk_34) * v0->unk_38) >> FX32_SHIFT;
v0->unk_44 = (CalcSineDegrees_Wraparound(v0->unk_34) * v0->unk_38) >> FX32_SHIFT;
v1.x = v0->unk_10.x + (sub_0201D250(v0->unk_28) * v0->unk_40 * +1);
v1.y = v0->unk_10.y + (sub_0201D264(v0->unk_28) * v0->unk_44 * +1);
v1.x = v0->unk_10.x + (CalcSineDegrees_Wraparound(v0->unk_28) * v0->unk_40 * +1);
v1.y = v0->unk_10.y + (CalcCosineDegrees_Wraparound(v0->unk_28) * v0->unk_44 * +1);
} else if (v0->unk_2C == 2) {
v0->unk_34 += 8;
v0->unk_34 %= 360;
v0->unk_44 = (sub_0201D250(v0->unk_34) * v0->unk_38) >> FX32_SHIFT;
v0->unk_44 = (CalcSineDegrees_Wraparound(v0->unk_34) * v0->unk_38) >> FX32_SHIFT;
v1.x = v0->unk_10.x + (sub_0201D250(v0->unk_28) * v0->unk_40 * -1);
v1.y = v0->unk_10.y + (sub_0201D264(v0->unk_28) * v0->unk_44 * -1);
v1.x = v0->unk_10.x + (CalcSineDegrees_Wraparound(v0->unk_28) * v0->unk_40 * -1);
v1.y = v0->unk_10.y + (CalcCosineDegrees_Wraparound(v0->unk_28) * v0->unk_44 * -1);
} else if (v0->unk_2C == 3) {
v0->unk_34 += 8;
v0->unk_34 %= 360;
v0->unk_40 = (sub_0201D264(v0->unk_34) * v0->unk_38) >> FX32_SHIFT;
v0->unk_40 = (CalcCosineDegrees_Wraparound(v0->unk_34) * v0->unk_38) >> FX32_SHIFT;
v1.x = v0->unk_10.x + (sub_0201D250(v0->unk_28) * v0->unk_40 * -1);
v1.y = v0->unk_10.y + (sub_0201D264(v0->unk_28) * v0->unk_44 * -1);
v1.x = v0->unk_10.x + (CalcSineDegrees_Wraparound(v0->unk_28) * v0->unk_40 * -1);
v1.y = v0->unk_10.y + (CalcCosineDegrees_Wraparound(v0->unk_28) * v0->unk_44 * -1);
} else if (v0->unk_2C == 4) {
if (v0->unk_38 < (64 + 32)) {
v0->unk_38 += v0->unk_3C;
@ -1625,8 +1625,8 @@ static void ov97_0222EEB8(SysTask *param0, void *param1)
v0->unk_40 = v0->unk_38;
v0->unk_44 = v0->unk_38;
v1.x = v0->unk_10.x + (sub_0201D250(v0->unk_28) * v0->unk_40 * +1);
v1.y = v0->unk_10.y + (sub_0201D264(v0->unk_28) * v0->unk_44 * +1);
v1.x = v0->unk_10.x + (CalcSineDegrees_Wraparound(v0->unk_28) * v0->unk_40 * +1);
v1.y = v0->unk_10.y + (CalcCosineDegrees_Wraparound(v0->unk_28) * v0->unk_44 * +1);
} else if (v0->unk_2C == 5) {
if (v0->unk_38 < (64 + 32)) {
v0->unk_38 += v0->unk_3C;
@ -1635,8 +1635,8 @@ static void ov97_0222EEB8(SysTask *param0, void *param1)
v0->unk_40 = v0->unk_38;
v0->unk_44 = v0->unk_38;
v1.x = v0->unk_10.x + (sub_0201D250(v0->unk_28) * v0->unk_40 * -1);
v1.y = v0->unk_10.y + (sub_0201D264(v0->unk_28) * v0->unk_44 * -1);
v1.x = v0->unk_10.x + (CalcSineDegrees_Wraparound(v0->unk_28) * v0->unk_40 * -1);
v1.y = v0->unk_10.y + (CalcCosineDegrees_Wraparound(v0->unk_28) * v0->unk_44 * -1);
} else {
v0->unk_04 = 10;
v0->unk_1C += FX32_CONST(0.5);

4
src/overlay099/ov99_021D2C08.c
View File

@ -12,9 +12,9 @@
#include "overlay099/struct_ov99_021D3A40.h"
#include "bg_window.h"
#include "math.h"
#include "unk_0200A9DC.h"
#include "unk_0200C6E4.h"
#include "unk_0201D15C.h"
typedef struct {
s32 unk_00;
@ -140,7 +140,7 @@ static void ov99_021D2D18(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C
v0->unk_08 -= 360 << FX32_SHIFT;
}
v2 = FX_Mul(sub_0201D2B8(v0->unk_08), v1->unk_18);
v2 = FX_Mul(CalcSineDegrees_FX32(v0->unk_08), v1->unk_18);
v0->unk_00 += v1->unk_0C;
v0->unk_04 += v1->unk_10;

22
src/overlay099/ov99_021D2E28.c
View File

@ -12,10 +12,10 @@
#include "overlay099/struct_ov99_021D3A40.h"
#include "bg_window.h"
#include "math.h"
#include "palette.h"
#include "unk_0200A9DC.h"
#include "unk_0200C6E4.h"
#include "unk_0201D15C.h"
typedef struct {
s32 unk_00;
@ -140,8 +140,8 @@ static void ov99_021D2ED8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E
param1->unk_94[v1].unk_04 = Unk_ov99_021D4BDC[v1].unk_44;
param1->unk_94[v1].unk_10 = Unk_ov99_021D4BDC[v1].unk_10;
param1->unk_94[v1].unk_1C = Unk_ov99_021D4BDC[v1].unk_0C;
param1->unk_94[v1].unk_28 = FX_Mul(sub_0201D2B8(Unk_ov99_021D4BDC[v1].unk_10), Unk_ov99_021D4BDC[v1].unk_04);
param1->unk_94[v1].unk_2C = FX_Mul(sub_0201D2C4(Unk_ov99_021D4BDC[v1].unk_10), Unk_ov99_021D4BDC[v1].unk_08);
param1->unk_94[v1].unk_28 = FX_Mul(CalcSineDegrees_FX32(Unk_ov99_021D4BDC[v1].unk_10), Unk_ov99_021D4BDC[v1].unk_04);
param1->unk_94[v1].unk_2C = FX_Mul(CalcCosineDegrees_FX32(Unk_ov99_021D4BDC[v1].unk_10), Unk_ov99_021D4BDC[v1].unk_08);
param1->unk_94[v1].unk_34 = Unk_ov99_021D4BDC[v1].unk_00;
sub_0200D650(param0->unk_10E0[v0], param1->unk_94[v1].unk_00 + param1->unk_94[v1].unk_28, param1->unk_94[v1].unk_04 + param1->unk_94[v1].unk_2C, ((192 + 80) << FX32_SHIFT));
@ -188,8 +188,8 @@ static void ov99_021D2FD4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E
v0->unk_39++;
}
v0->unk_28 = FX_Mul(sub_0201D2B8(v0->unk_10), v1->unk_04);
v0->unk_2C = FX_Mul(sub_0201D2C4(v0->unk_10), v1->unk_08);
v0->unk_28 = FX_Mul(CalcSineDegrees_FX32(v0->unk_10), v1->unk_04);
v0->unk_2C = FX_Mul(CalcCosineDegrees_FX32(v0->unk_10), v1->unk_08);
break;
case 2:
v0->unk_00 += v0->unk_28;
@ -211,8 +211,8 @@ static void ov99_021D2FD4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E
v0->unk_18 -= 360 << FX32_SHIFT;
}
v0->unk_28 = FX_Mul(sub_0201D2B8(v0->unk_14), v1->unk_24);
v0->unk_2C = FX_Mul(sub_0201D2B8(v0->unk_18), v1->unk_28);
v0->unk_28 = FX_Mul(CalcSineDegrees_FX32(v0->unk_14), v1->unk_24);
v0->unk_2C = FX_Mul(CalcSineDegrees_FX32(v0->unk_18), v1->unk_28);
if (param0->unk_10FC >= 5970) {
v0->unk_20 -= v1->unk_2C / 20;
@ -228,13 +228,13 @@ static void ov99_021D2FD4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E
v0->unk_04 = v0->unk_04 + v0->unk_2C;
v0->unk_10 = 0;
v0->unk_1C = v1->unk_3C;
v0->unk_28 = FX_Mul(sub_0201D2B8(0), v1->unk_34);
v0->unk_2C = FX_Mul(sub_0201D2C4(0), v1->unk_38);
v0->unk_28 = FX_Mul(CalcSineDegrees_FX32(0), v1->unk_34);
v0->unk_2C = FX_Mul(CalcCosineDegrees_FX32(0), v1->unk_38);
v0->unk_39++;
case 5:
v0->unk_10 += v0->unk_1C;
v0->unk_28 = FX_Mul(sub_0201D2C4(v0->unk_10), v1->unk_34);
v0->unk_2C = FX_Mul(sub_0201D2B8(v0->unk_10), v1->unk_38);
v0->unk_28 = FX_Mul(CalcCosineDegrees_FX32(v0->unk_10), v1->unk_34);
v0->unk_2C = FX_Mul(CalcSineDegrees_FX32(v0->unk_10), v1->unk_38);
if (v0->unk_10 >= (180 << FX32_SHIFT)) {
v0->unk_39++;

4
src/overlay099/ov99_021D340C.c
View File

@ -12,10 +12,10 @@
#include "overlay099/struct_ov99_021D35E8.h"
#include "overlay099/struct_ov99_021D3A40.h"
#include "math.h"
#include "palette.h"
#include "unk_0200A9DC.h"
#include "unk_0200C6E4.h"
#include "unk_0201D15C.h"
typedef struct {
s16 unk_00;
@ -195,7 +195,7 @@ static void ov99_021D35E8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D34
v0->unk_08 -= 360 << FX32_SHIFT;
}
v2 = FX_Mul(sub_0201D2B8(v0->unk_08), v1->unk_10);
v2 = FX_Mul(CalcSineDegrees_FX32(v0->unk_08), v1->unk_10);
v0->unk_00 += v1->unk_04;
v0->unk_04 += v1->unk_08;

2
src/overlay099/ov99_021D4134.c
View File

@ -13,9 +13,9 @@
#include "easy3d_object.h"
#include "graphics.h"
#include "heap.h"
#include "math.h"
#include "palette.h"
#include "unk_0200C6E4.h"
#include "unk_0201D15C.h"
typedef struct {
u16 unk_00;

2
src/overlay100/ov100_021D13E4.c
View File

@ -21,6 +21,7 @@
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "palette.h"
#include "sys_task.h"
@ -28,7 +29,6 @@
#include "unk_02005474.h"
#include "unk_0200C6E4.h"
#include "unk_0200F174.h"
#include "unk_0201D15C.h"
#include "unk_0202419C.h"
static void ov100_021D1808(UnkStruct_ov100_021D1808 *param0);

2
src/overlay100/ov100_021D1C44.c
View File

@ -21,6 +21,7 @@
#include "easy3d_object.h"
#include "graphics.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "palette.h"
#include "sys_task.h"
@ -30,7 +31,6 @@
#include "unk_02005474.h"
#include "unk_0200C6E4.h"
#include "unk_0200F174.h"
#include "unk_0201D15C.h"
#include "unk_0202419C.h"
static void ov100_021D1C98(UnkStruct_ov100_021D1C98 *param0);

18
src/overlay100/ov100_021D400C.c
View File

@ -5,9 +5,9 @@
#include "overlay100/struct_ov100_021D4104.h"
#include "math.h"
#include "sys_task_manager.h"
#include "unk_0200C6E4.h"
#include "unk_0201D15C.h"
typedef struct {
f32 unk_00;
@ -89,8 +89,8 @@ static BOOL ov100_021D4104(UnkStruct_ov100_021D4104 *param0, s16 param1, s16 par
param0->unk_20 += 8;
param0->unk_20 %= 360;
v7 += (sub_0201D250(param0->unk_20) * 1);
v8 += (sub_0201D264(param0->unk_20) * 1);
v7 += (CalcSineDegrees_Wraparound(param0->unk_20) * 1);
v8 += (CalcCosineDegrees_Wraparound(param0->unk_20) * 1);
sub_0200D5E8(param0->unk_00, v7, v8);
}
@ -110,8 +110,8 @@ static void ov100_021D4214(UnkStruct_ov100_021D4104 *param0)
param0->unk_1C += 8;
param0->unk_1C %= 360;
v0 = (128 << FX32_SHIFT) + (sub_0201D250(param0->unk_1C) * 64);
v1 = (48 << FX32_SHIFT) + (sub_0201D264(param0->unk_1C) * 24);
v0 = (128 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(param0->unk_1C) * 64);
v1 = (48 << FX32_SHIFT) + (CalcCosineDegrees_Wraparound(param0->unk_1C) * 24);
sub_0200D650(param0->unk_00, v0, v1, FX32_CONST(192));
@ -125,8 +125,8 @@ static void ov100_021D4264(UnkStruct_ov100_021D4104 *param0, int param1, int par
param0->unk_1C += 8;
param0->unk_1C %= 360;
v0 = (param1 << FX32_SHIFT) + (sub_0201D250(param0->unk_1C) * param3);
v1 = (param2 << FX32_SHIFT) + (sub_0201D264(param0->unk_1C) * param4);
v0 = (param1 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(param0->unk_1C) * param3);
v1 = (param2 << FX32_SHIFT) + (CalcCosineDegrees_Wraparound(param0->unk_1C) * param4);
sub_0200D650(param0->unk_00, v0, v1, FX32_CONST(192));
}
@ -179,8 +179,8 @@ static void ov100_021D4318(UnkStruct_ov100_021D4104 *param0)
sub_0200D67C(param0->unk_00, &v0, &v1, FX32_CONST(192));
v0 += (sub_0201D250(param0->unk_20) * (3 * param0->unk_28[0]));
v1 += (sub_0201D264(param0->unk_20) * (3 * param0->unk_28[1]));
v0 += (CalcSineDegrees_Wraparound(param0->unk_20) * (3 * param0->unk_28[0]));
v1 += (CalcCosineDegrees_Wraparound(param0->unk_20) * (3 * param0->unk_28[1]));
sub_0200D650(param0->unk_00, v0, v1, FX32_CONST(192));

2
src/overlay101/ov101_021D1A28.c
View File

@ -36,10 +36,10 @@
#include "core_sys.h"
#include "enums.h"
#include "heap.h"
#include "math.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_02005474.h"
#include "unk_0201D15C.h"
#include "unk_020711EC.h"
typedef struct {

12
src/overlay101/ov101_021D59AC.c
View File

@ -14,10 +14,10 @@
#include "cell_actor.h"
#include "enums.h"
#include "math.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_02005474.h"
#include "unk_0201D15C.h"
#include "unk_020711EC.h"
typedef struct {
@ -845,7 +845,7 @@ static void ov101_021D6410(UnkStruct_ov101_021D13C8 *param0, UnkStruct_ov101_021
CellActor_SetAffineOverwriteMode(param1->unk_04, 2);
CellActor_SetAffineTranslation(param1->unk_04, &v0);
CellActor_SetAffineScale(param1->unk_04, &v1);
CellActor_SetAffineZRotation(param1->unk_04, sub_0201D2A4(0));
CellActor_SetAffineZRotation(param1->unk_04, CalcAngleRotationIdx_Wraparound(0));
CellActor_SetAnimateFlag(param1->unk_04, 1);
}
@ -1105,7 +1105,7 @@ static int ov101_021D682C(UnkStruct_ov101_021D66D0 *param0)
ov101_021D84A4(param0->unk_20->unk_450, &param0->unk_24, &v0, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 4, 4, 4, 4, 2, 6);
CellActor_SetAffineOverwriteMode(param0->unk_24.unk_04, 2);
CellActor_SetAffineTranslation(param0->unk_24.unk_04, &v1);
CellActor_SetAffineZRotation(param0->unk_24.unk_04, sub_0201D2A4(0));
CellActor_SetAffineZRotation(param0->unk_24.unk_04, CalcAngleRotationIdx_Wraparound(0));
param0->unk_0C = 1;
param0->unk_08++;
@ -1749,7 +1749,7 @@ static int ov101_021D7304(UnkStruct_ov101_021D5D90 *param0, void *param1)
CellActor_SetAffineOverwriteMode(v3->unk_08.unk_04, 2);
CellActor_SetAffineTranslation(v3->unk_08.unk_04, &v1);
CellActor_SetAffineScale(v3->unk_08.unk_04, &v2);
CellActor_SetAffineZRotation(v3->unk_08.unk_04, sub_0201D2A4(0));
CellActor_SetAffineZRotation(v3->unk_08.unk_04, CalcAngleRotationIdx_Wraparound(0));
CellActor_SetAnimateFlag(v3->unk_08.unk_04, 1);
return 1;
@ -1862,7 +1862,7 @@ static int ov101_021D74A0(UnkStruct_ov101_021D5D90 *param0, void *param1)
CellActor_SetAffineOverwriteMode(v3->unk_08.unk_04, 2);
CellActor_SetAffineTranslation(v3->unk_08.unk_04, &v1);
CellActor_SetAffineScale(v3->unk_08.unk_04, &v2);
CellActor_SetAffineZRotation(v3->unk_08.unk_04, sub_0201D2A4(0));
CellActor_SetAffineZRotation(v3->unk_08.unk_04, CalcAngleRotationIdx_Wraparound(0));
CellActor_SetAnimateFlag(v3->unk_08.unk_04, 1);
return 1;
@ -2136,7 +2136,7 @@ static int ov101_021D7810(UnkStruct_ov101_021D5D90 *param0, void *param1)
CellActor_SetAffineOverwriteMode(v6->unk_18[v0].unk_04, 2);
CellActor_SetAffineTranslation(v6->unk_18[v0].unk_04, &v4);
CellActor_SetAffineScale(v6->unk_18[v0].unk_04, &v5);
CellActor_SetAffineZRotation(v6->unk_18[v0].unk_04, sub_0201D2A4(0));
CellActor_SetAffineZRotation(v6->unk_18[v0].unk_04, CalcAngleRotationIdx_Wraparound(0));
v2 = (v6->unk_04 % (v1 * 10)) / v1;

2
src/overlay104/ov104_0222DCE0.c
View File

@ -21,6 +21,7 @@
#include "flags.h"
#include "heap.h"
#include "map_header.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "party.h"
@ -30,7 +31,6 @@
#include "strbuf.h"
#include "string_template.h"
#include "trainer_info.h"
#include "unk_0201D15C.h"
#include "unk_0202C858.h"
#include "unk_02038F8C.h"
#include "unk_0208C098.h"

6
src/overlay104/ov104_0222FBE4.c
View File

@ -67,6 +67,7 @@
#include "field_comm_manager.h"
#include "game_records.h"
#include "heap.h"
#include "math.h"
#include "menu.h"
#include "message.h"
#include "narc.h"
@ -88,7 +89,6 @@
#include "unk_0200F174.h"
#include "unk_02014000.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0202ACE0.h"
#include "unk_0202D05C.h"
#include "unk_0202F1D4.h"
@ -2252,7 +2252,7 @@ static void ov104_022313FC(SysTask *param0, void *param1)
v10 = v4->unk_00[v0].unk_0C & 0xffff;
v11 = v4->unk_00[v0].unk_0C >> 16;
sub_0201D470(&v5, 0, FX32_ONE, FX32_ONE, 0);
CreateAffineTransformationMatrix(&v5, 0, FX32_ONE, FX32_ONE, AFFINE_MODE_NORMAL);
v12 = v6 + v4->unk_00[v0].unk_08;
v13 = v7 + v4->unk_00[v0].unk_0A;
@ -2317,7 +2317,7 @@ static void ov104_022313FC(SysTask *param0, void *param1)
v14 = v4->unk_00[v0].unk_0C & 0xffff;
v15 = v4->unk_00[v0].unk_0C >> 16;
sub_0201D470(&v5, 0, FX32_ONE, FX32_ONE, 0);
CreateAffineTransformationMatrix(&v5, 0, FX32_ONE, FX32_ONE, AFFINE_MODE_NORMAL);
v16 = v6 + v4->unk_00[v0].unk_08;
v17 = v7 + v4->unk_00[v0].unk_0A;

2
src/overlay104/ov104_022339B4.c
View File

@ -21,10 +21,10 @@
#include "game_records.h"
#include "heap.h"
#include "math.h"
#include "party.h"
#include "pokemon.h"
#include "savedata.h"
#include "unk_0201D15C.h"
#include "unk_0202FF4C.h"
#include "unk_0203061C.h"
#include "unk_0205DFC4.h"

2
src/overlay104/ov104_02237DD8.c
View File

@ -27,12 +27,12 @@
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
#include "palette.h"
#include "party.h"
#include "pokemon.h"
#include "savedata.h"
#include "unk_0201D15C.h"
#include "unk_02030494.h"
#include "unk_0203061C.h"
#include "unk_0205DFC4.h"

2
src/overlay104/ov104_0223A7F4.c
View File

@ -19,12 +19,12 @@
#include "communication_system.h"
#include "field_battle_data_transfer.h"
#include "heap.h"
#include "math.h"
#include "message.h"
#include "party.h"
#include "pokemon.h"
#include "strbuf.h"
#include "trainer_info.h"
#include "unk_0201D15C.h"
#include "unk_02096420.h"
static const struct {

2
src/overlay104/ov104_0223AF58.c
View File

@ -18,10 +18,10 @@
#include "communication_system.h"
#include "field_battle_data_transfer.h"
#include "heap.h"
#include "math.h"
#include "party.h"
#include "pokemon.h"
#include "trainer_info.h"
#include "unk_0201D15C.h"
#include "unk_02030108.h"
#include "unk_02096420.h"

2
src/overlay104/ov104_0223B6F4.c
View File

@ -19,13 +19,13 @@
#include "communication_system.h"
#include "field_battle_data_transfer.h"
#include "heap.h"
#include "math.h"
#include "message.h"
#include "party.h"
#include "pokemon.h"
#include "save_player.h"
#include "strbuf.h"
#include "trainer_info.h"
#include "unk_0201D15C.h"
#include "unk_0203061C.h"
#include "unk_0205DFC4.h"
#include "unk_02096420.h"

2
src/overlay104/ov104_0223BCBC.c
View File

@ -15,13 +15,13 @@
#include "communication_system.h"
#include "field_battle_data_transfer.h"
#include "heap.h"
#include "math.h"
#include "message.h"
#include "party.h"
#include "pokemon.h"
#include "save_player.h"
#include "strbuf.h"
#include "trainer_info.h"
#include "unk_0201D15C.h"
#include "unk_02096420.h"
u8 ov104_0223BD70(u8 param0, BOOL param1);

2
src/overlay108/ov108_02241AE0.c
View File

@ -28,6 +28,7 @@
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
#include "math.h"
#include "menu.h"
#include "message.h"
#include "narc.h"
@ -47,7 +48,6 @@
#include "unk_0200A784.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_02030494.h"
#include "unk_0203061C.h"

8
src/overlay109/ov109_021D0D80.c
View File

@ -38,6 +38,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "journal.h"
#include "math.h"
#include "message.h"
#include "narc.h"
#include "overlay_manager.h"
@ -57,7 +58,6 @@
#include "unk_0200C6E4.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0201E3D8.h"
#include "unk_0202419C.h"
@ -2482,9 +2482,9 @@ static void ov109_021D2D78(UnkStruct_ov109_021D2D78 *param0, const VecFx32 *para
ov109_021D39D4(&v1, param0->unk_20);
v0 = (u16)((v1) / FX32_ONE);
param0->unk_44.x = (FX32_ONE * 0) + param0->unk_50.x + param1->x + (sub_0201D1D4(v0) * 22);
param0->unk_44.x = (FX32_ONE * 0) + param0->unk_50.x + param1->x + (CalcCosineDegrees(v0) * 22);
param0->unk_44.y = (FX32_ONE * -6) + param0->unk_50.y + param1->y;
param0->unk_44.z = (FX32_ONE * 0) + param0->unk_50.z + param1->z + (sub_0201D15C(v0) * 22);
param0->unk_44.z = (FX32_ONE * 0) + param0->unk_50.z + param1->z + (CalcSineDegrees(v0) * 22);
param0->unk_24.unk_00 = ((param0->unk_2C.x) / FX32_ONE);
param0->unk_24.unk_02 = ((param0->unk_2C.y) / FX32_ONE);
@ -2902,7 +2902,7 @@ static void ov109_021D3370(UnkStruct_ov109_021D3370 *param0)
param0->unk_0C = (FX32_ONE * 20);
param0->unk_04++;
case 1:
v0 = sub_0201D15C((param0->unk_10) / FX32_ONE) * ((param0->unk_08) / FX32_ONE);
v0 = CalcSineDegrees((param0->unk_10) / FX32_ONE) * ((param0->unk_08) / FX32_ONE);
v1->unk_2C.z = 0;
ov109_021D39D4(&v1->unk_2C.z, v0);

4
src/overlay109/ov109_021D3D50.c
View File

@ -26,6 +26,7 @@
#include "gx_layers.h"
#include "heap.h"
#include "journal.h"
#include "math.h"
#include "menu.h"
#include "message.h"
#include "message_util.h"
@ -47,7 +48,6 @@
#include "unk_0200A784.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201D15C.h"
#include "unk_0201DBEC.h"
#include "unk_0201E86C.h"
#include "unk_0201F834.h"
@ -1427,7 +1427,7 @@ static void ov109_021D5314(u16 *param0)
*param0 = 0;
}
v0 = sub_0201D250(*param0);
v0 = CalcSineDegrees_Wraparound(*param0);
v3 = 15 + (v0 * 10) / FX32_ONE;
v1 = GX_RGB(29, v3, 0);

Some files were not shown because too many files have changed in this diff Show More