diff --git a/include/battle_anim/ov12_02225864.h b/include/battle_anim/battle_anim_helpers.h similarity index 98% rename from include/battle_anim/ov12_02225864.h rename to include/battle_anim/battle_anim_helpers.h index ea0f9cb946..a1427ed259 100644 --- a/include/battle_anim/ov12_02225864.h +++ b/include/battle_anim/battle_anim_helpers.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_OV12_02225864_H -#define POKEPLATINUM_OV12_02225864_H +#ifndef POKEPLATINUM_BATTLE_ANIM_HELPERS_H +#define POKEPLATINUM_BATTLE_ANIM_HELPERS_H #include "nitro/hw/common/lcd.h" @@ -229,4 +229,4 @@ PaletteFadeContext *PaletteFadeContext_New(PaletteData *param0, enum HeapId heap void BattleAnimUtil_MakeBgPalsGrayscale(BattleAnimSystem *param0); void BattleAnimUtil_ReturnBgPalsToNormal(BattleAnimSystem *param0); -#endif // POKEPLATINUM_OV12_02225864_H +#endif // POKEPLATINUM_BATTLE_ANIM_HELPERS_H diff --git a/include/battle_anim/ov12_02235254.h b/include/battle_anim/battle_anim_util.h similarity index 97% rename from include/battle_anim/ov12_02235254.h rename to include/battle_anim/battle_anim_util.h index e18d7eee09..ce8f6a4bee 100644 --- a/include/battle_anim/ov12_02235254.h +++ b/include/battle_anim/battle_anim_util.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_OV12_02235254_H -#define POKEPLATINUM_OV12_02235254_H +#ifndef POKEPLATINUM_BATTLE_ANIM_UTIL_H +#define POKEPLATINUM_BATTLE_ANIM_UTIL_H #include @@ -96,4 +96,4 @@ static inline BOOL BattleAnimUtil_IsMaskSet(int value, int mask) return FALSE; } -#endif // POKEPLATINUM_OV12_02235254_H +#endif // POKEPLATINUM_BATTLE_ANIM_UTIL_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 8c2add5df6..0f3cfb9ce8 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -639,7 +639,7 @@ Overlay battle_anim Object main.nef.p/src_battle_anim_ov12_0222421C.c.o Object main.nef.p/src_battle_anim_ov12_02225104.c.o Object main.nef.p/src_battle_anim_ov12_02225640.c.o - Object main.nef.p/src_battle_anim_ov12_02225864.c.o + Object main.nef.p/src_battle_anim_battle_anim_helpers.c.o Object main.nef.p/src_battle_anim_script_func_tables.c.o Object main.nef.p/src_battle_anim_script_func_examples.c.o Object main.nef.p/src_battle_anim_script_funcs_3.c.o @@ -650,7 +650,7 @@ Overlay battle_anim Object main.nef.p/src_battle_anim_script_funcs_2.c.o Object main.nef.p/src_battle_anim_ov12_022346A4.c.o Object main.nef.p/src_battle_anim_script_funcs_stat_change.c.o - Object main.nef.p/src_battle_anim_ov12_02235254.c.o + Object main.nef.p/src_battle_anim_battle_anim_util.c.o Object main.nef.p/src_battle_anim_ov12_02235E94.c.o Object main.nef.p/src_battle_anim_ov12_02237E54.c.o Object main.nef.p/src_battle_anim_ov12_02237EFC.c.o diff --git a/src/battle_anim/ov12_02225864.c b/src/battle_anim/battle_anim_helpers.c similarity index 99% rename from src/battle_anim/ov12_02225864.c rename to src/battle_anim/battle_anim_helpers.c index eafda84a1e..8163579b9d 100644 --- a/src/battle_anim/ov12_02225864.c +++ b/src/battle_anim/battle_anim_helpers.c @@ -1,4 +1,4 @@ -#include "battle_anim/ov12_02225864.h" +#include "battle_anim/battle_anim_helpers.h" #include "nitro/hw/common/lcd.h" #include "nitro/types.h" @@ -9,8 +9,8 @@ #include "constants/graphics.h" #include "battle_anim/battle_anim_system.h" -#include "battle_anim/ov12_02225864.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_helpers.h" +#include "battle_anim/battle_anim_util.h" #include "battle_script_battlers.h" #include "buffer_manager.h" diff --git a/src/battle_anim/battle_anim_system.c b/src/battle_anim/battle_anim_system.c index 3cb78295d3..2dccb10833 100644 --- a/src/battle_anim/battle_anim_system.c +++ b/src/battle_anim/battle_anim_system.c @@ -21,9 +21,9 @@ #include "global/utility.h" #include "battle_anim/is_form_symmetrical.h" #include "battle_anim/battle_particle_util.h" -#include "battle_anim/ov12_02225864.h" +#include "battle_anim/battle_anim_helpers.h" #include "battle_anim/script_func_tables.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_util.h" #include "battle_anim/ov12_022380BC.h" #include "battle_anim/struct_ov12_02223764.h" #include "battle_anim/struct_ov12_022380DC.h" diff --git a/src/battle_anim/ov12_02235254.c b/src/battle_anim/battle_anim_util.c similarity index 99% rename from src/battle_anim/ov12_02235254.c rename to src/battle_anim/battle_anim_util.c index 58d3746e15..cbfea1affb 100644 --- a/src/battle_anim/ov12_02235254.c +++ b/src/battle_anim/battle_anim_util.c @@ -1,4 +1,4 @@ -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_util.h" #include #include @@ -7,7 +7,7 @@ #include "constants/battle/battle_anim.h" #include "battle_anim/battle_anim_system.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_util.h" #include "camera.h" #include "fx_util.h" diff --git a/src/battle_anim/ov12_0222389C.c b/src/battle_anim/ov12_0222389C.c index 82dd957194..b3bc1fd9e7 100644 --- a/src/battle_anim/ov12_0222389C.c +++ b/src/battle_anim/ov12_0222389C.c @@ -4,7 +4,7 @@ #include #include "battle_anim/battle_anim_system.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_util.h" #include "camera.h" #include "particle_system.h" diff --git a/src/battle_anim/ov12_0222421C.c b/src/battle_anim/ov12_0222421C.c index 18460c41a6..6d851101af 100644 --- a/src/battle_anim/ov12_0222421C.c +++ b/src/battle_anim/ov12_0222421C.c @@ -6,7 +6,7 @@ #include "battle_anim/battle_anim_system.h" #include "battle_anim/ov12_02225104.h" #include "battle_anim/ov12_02225640.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_util.h" #include "battle_anim/struct_ov12_02225640.h" #include "heap.h" diff --git a/src/battle_anim/ov12_02225104.c b/src/battle_anim/ov12_02225104.c index d360f370b5..7f9586fefc 100644 --- a/src/battle_anim/ov12_02225104.c +++ b/src/battle_anim/ov12_02225104.c @@ -5,7 +5,7 @@ #include "battle_anim/battle_anim_system.h" #include "battle_anim/ov12_0222421C.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_util.h" #include "battle_anim/struct_ov12_02225640.h" #include "particle_system.h" diff --git a/src/battle_anim/ov12_02225640.c b/src/battle_anim/ov12_02225640.c index 7a33760b52..6fc9b86361 100644 --- a/src/battle_anim/ov12_02225640.c +++ b/src/battle_anim/ov12_02225640.c @@ -4,7 +4,7 @@ #include #include "battle_anim/battle_anim_system.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_util.h" #include "battle_anim/struct_ov12_02225640.h" #include "camera.h" diff --git a/src/battle_anim/ov12_022346A4.c b/src/battle_anim/ov12_022346A4.c index 83bba463ca..398d20ebf4 100644 --- a/src/battle_anim/ov12_022346A4.c +++ b/src/battle_anim/ov12_022346A4.c @@ -4,8 +4,8 @@ #include #include "battle_anim/battle_anim_system.h" -#include "battle_anim/ov12_02225864.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_helpers.h" +#include "battle_anim/battle_anim_util.h" #include "heap.h" #include "pokemon_sprite.h" diff --git a/src/battle_anim/ov12_02235E94.c b/src/battle_anim/ov12_02235E94.c index 142ac54de0..75d347c7db 100644 --- a/src/battle_anim/ov12_02235E94.c +++ b/src/battle_anim/ov12_02235E94.c @@ -7,8 +7,8 @@ #include "battle_anim/battle_anim_system.h" #include "battle_anim/battle_particle_util.h" -#include "battle_anim/ov12_02225864.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_helpers.h" +#include "battle_anim/battle_anim_util.h" #include "battle_anim/ov12_02237E54.h" #include "battle_anim/struct_ov12_02223764.h" #include "battle_anim/struct_ov12_02236030.h" diff --git a/src/battle_anim/script_func_mimic.c b/src/battle_anim/script_func_mimic.c index 31a2dc776f..607c1dc756 100644 --- a/src/battle_anim/script_func_mimic.c +++ b/src/battle_anim/script_func_mimic.c @@ -4,8 +4,8 @@ #include "constants/battle/battle_anim.h" #include "battle_anim/battle_anim_system.h" -#include "battle_anim/ov12_02225864.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_helpers.h" +#include "battle_anim/battle_anim_util.h" #include "pokemon_sprite.h" #include "sprite_system.h" diff --git a/src/battle_anim/script_funcs_0.c b/src/battle_anim/script_funcs_0.c index d11d2fee0e..b524b57adf 100644 --- a/src/battle_anim/script_funcs_0.c +++ b/src/battle_anim/script_funcs_0.c @@ -9,8 +9,8 @@ #include "constants/graphics.h" #include "battle_anim/battle_anim_system.h" -#include "battle_anim/ov12_02225864.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_helpers.h" +#include "battle_anim/battle_anim_util.h" #include "battle_script_battlers.h" #include "bg_window.h" diff --git a/src/battle_anim/script_funcs_1.c b/src/battle_anim/script_funcs_1.c index 3ca2c8c1b5..0d26258019 100644 --- a/src/battle_anim/script_funcs_1.c +++ b/src/battle_anim/script_funcs_1.c @@ -8,9 +8,9 @@ #include "constants/graphics.h" #include "battle_anim/battle_anim_system.h" -#include "battle_anim/ov12_02225864.h" +#include "battle_anim/battle_anim_helpers.h" #include "battle_anim/script_funcs_4.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_util.h" #include "battle_anim/ov12_022380BC.h" #include "battle_anim/struct_ov12_022380DC.h" diff --git a/src/battle_anim/script_funcs_2.c b/src/battle_anim/script_funcs_2.c index e77029112e..8b445b0941 100644 --- a/src/battle_anim/script_funcs_2.c +++ b/src/battle_anim/script_funcs_2.c @@ -10,8 +10,8 @@ #include "constants/graphics.h" #include "battle_anim/battle_anim_system.h" -#include "battle_anim/ov12_02225864.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_helpers.h" +#include "battle_anim/battle_anim_util.h" #include "pch/global_pch.h" #include "battle_script_battlers.h" diff --git a/src/battle_anim/script_funcs_3.c b/src/battle_anim/script_funcs_3.c index dabda45a33..6a48b16a5d 100644 --- a/src/battle_anim/script_funcs_3.c +++ b/src/battle_anim/script_funcs_3.c @@ -10,8 +10,8 @@ #include "global/utility.h" #include "battle_anim/battle_anim_system.h" -#include "battle_anim/ov12_02225864.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_helpers.h" +#include "battle_anim/battle_anim_util.h" #include "battle_script_battlers.h" #include "bg_window.h" diff --git a/src/battle_anim/script_funcs_4.c b/src/battle_anim/script_funcs_4.c index b2022a9970..e7cd94cee6 100644 --- a/src/battle_anim/script_funcs_4.c +++ b/src/battle_anim/script_funcs_4.c @@ -6,8 +6,8 @@ #include "constants/battle/battle_anim.h" #include "battle_anim/battle_anim_system.h" -#include "battle_anim/ov12_02225864.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_helpers.h" +#include "battle_anim/battle_anim_util.h" #include "bg_window.h" #include "heap.h" diff --git a/src/battle_anim/script_funcs_stat_change.c b/src/battle_anim/script_funcs_stat_change.c index f5b6bd0954..6fa36dd4c6 100644 --- a/src/battle_anim/script_funcs_stat_change.c +++ b/src/battle_anim/script_funcs_stat_change.c @@ -9,7 +9,7 @@ #include "constants/graphics.h" #include "battle_anim/battle_anim_system.h" -#include "battle_anim/ov12_02235254.h" +#include "battle_anim/battle_anim_util.h" #include "bg_window.h" #include "graphics.h" diff --git a/src/meson.build b/src/meson.build index 6e639a400b..eaafd225f1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -498,7 +498,7 @@ pokeplatinum_c = files( 'battle_anim/ov12_0222421C.c', 'battle_anim/ov12_02225104.c', 'battle_anim/ov12_02225640.c', - 'battle_anim/ov12_02225864.c', + 'battle_anim/battle_anim_helpers.c', 'battle_anim/script_func_tables.c', 'battle_anim/script_func_examples.c', 'battle_anim/script_funcs_3.c', @@ -509,7 +509,7 @@ pokeplatinum_c = files( 'battle_anim/script_funcs_2.c', 'battle_anim/ov12_022346A4.c', 'battle_anim/script_funcs_stat_change.c', - 'battle_anim/ov12_02235254.c', + 'battle_anim/battle_anim_util.c', 'battle_anim/ov12_02235E94.c', 'battle_anim/ov12_02237E54.c', 'battle_anim/ov12_02237EFC.c', diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index 73625e183a..efa4161f40 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -8,7 +8,7 @@ #include "struct_defs/seal_case.h" #include "struct_defs/struct_020127E8.h" -#include "battle_anim/ov12_02225864.h" +#include "battle_anim/battle_anim_helpers.h" #include "overlay076/const_ov76_0223EF3C.h" #include "overlay076/ov76_0223D338.h" #include "overlay076/struct_ov76_0223BBAC.h"