From e34d77b23dcc81208cd46c6f2dfcceb065a58cf4 Mon Sep 17 00:00:00 2001 From: Fexty12573 Date: Fri, 8 Aug 2025 16:59:54 +0200 Subject: [PATCH] Rename overlay12 to battle_anim --- include/battle/battle_context.h | 2 +- include/battle/ov16_0223DF00.h | 2 +- include/battle/struct_ov16_0225BFFC_t.h | 4 +- include/battle/struct_ov16_0225CBB8.h | 4 +- include/battle/struct_ov16_0225D9A8.h | 2 +- include/battle/struct_ov16_0225EA80.h | 8 +-- include/battle/struct_ov16_0225F764.h | 2 +- .../battle_anim_system.h | 4 +- .../const_ov12_0223B0A0.h | 0 .../const_ov12_0223B0B8.h | 0 .../const_ov12_0223B0DC.h | 0 .../is_form_symmetrical.h | 0 .../ov12_022237EC.h | 0 .../ov12_0222389C.h | 0 .../ov12_0222421C.h | 2 +- .../ov12_02225104.h | 2 +- .../ov12_02225640.h | 2 +- .../ov12_02225864.h | 2 +- .../ov12_02226998.h | 0 .../ov12_022269C0.h | 2 +- .../ov12_02226B84.h | 2 +- .../ov12_0222AC70.h | 2 +- .../ov12_0222D6B0.h | 2 +- .../ov12_0222E784.h | 2 +- .../ov12_0222E91C.h | 2 +- .../ov12_0222F700.h | 2 +- .../ov12_022346A4.h | 2 +- .../ov12_02234E44.h | 2 +- .../ov12_02235254.h | 2 +- .../ov12_02235E94.h | 12 ++-- .../ov12_02237E54.h | 0 .../ov12_02237EFC.h | 8 +-- .../ov12_022380BC.h | 2 +- .../struct_ball_rotation_decl.h | 0 .../struct_ov12_02221BBC_decl.h | 0 .../struct_ov12_02223764.h | 2 +- .../struct_ov12_02223764_sub1.h | 0 .../struct_ov12_02225640.h | 2 +- .../struct_ov12_02235998.h | 0 .../struct_ov12_02235FE0_decl.h | 0 .../struct_ov12_02236030.h | 0 .../struct_ov12_02236648_decl.h | 0 .../struct_ov12_02236690.h | 0 .../struct_ov12_02237728.h | 0 .../struct_ov12_02237EFC.h | 0 .../struct_ov12_02237F38.h | 0 .../struct_ov12_02237F98_decl.h | 0 .../struct_ov12_02238004_decl.h | 0 .../struct_ov12_022380DC.h | 0 include/overlay017/struct_ov17_0223F88C.h | 2 +- include/overlay017/struct_ov17_022489C8.h | 4 +- include/overlay017/struct_ov17_02248A24.h | 2 +- include/overlay076/struct_ov76_0223C398.h | 4 +- include/struct_defs/battle_system.h | 2 +- platinum.us/main.lsf | 66 +++++++++---------- platinum.us/sbins_shared.sha1 | 2 +- src/battle/battle_display.c | 22 +++---- src/battle/battle_io_command.c | 6 +- src/battle/battle_script.c | 4 +- src/battle/ov16_0223B140.c | 16 ++--- src/battle/ov16_0223DF00.c | 2 +- .../battle_anim_system.c | 18 ++--- .../is_form_symmetrical.c | 2 +- .../ov12_022237EC.c | 6 +- .../ov12_0222389C.c | 6 +- .../ov12_0222421C.c | 12 ++-- .../ov12_02225104.c | 10 +-- .../ov12_02225640.c | 8 +-- .../ov12_02225864.c | 8 +-- .../ov12_02226998.c | 24 +++---- .../ov12_022269C0.c | 4 +- .../ov12_02226B84.c | 8 +-- .../ov12_0222AC70.c | 8 +-- .../ov12_0222D6B0.c | 8 +-- .../ov12_0222E784.c | 8 +-- .../ov12_0222E91C.c | 14 ++-- .../ov12_0222F700.c | 8 +-- .../ov12_022346A4.c | 8 +-- .../ov12_02234E44.c | 6 +- .../ov12_02235254.c | 6 +- .../ov12_02235E94.c | 20 +++--- .../ov12_02237E54.c | 2 +- .../ov12_02237EFC.c | 10 +-- .../ov12_022380BC.c | 10 +-- src/meson.build | 46 ++++++------- src/overlay017/ov17_0223B140.c | 6 +- src/overlay017/ov17_0223CB1C.c | 4 +- src/overlay017/ov17_0223DAD0.c | 4 +- src/overlay017/ov17_0223F118.c | 4 +- src/overlay017/ov17_022413D8.c | 2 +- src/overlay017/ov17_02243C28.c | 2 +- src/overlay017/ov17_02247A48.c | 4 +- src/overlay017/ov17_0224F4D4.c | 4 +- src/overlay076/ov76_0223B140.c | 6 +- src/overlay076/ov76_0223B870.c | 2 +- src/overlay076/ov76_0223D338.c | 6 +- src/unk_02097B18.c | 4 +- 97 files changed, 261 insertions(+), 261 deletions(-) rename include/{overlay012 => battle_anim}/battle_anim_system.h (99%) rename include/{overlay012 => battle_anim}/const_ov12_0223B0A0.h (100%) rename include/{overlay012 => battle_anim}/const_ov12_0223B0B8.h (100%) rename include/{overlay012 => battle_anim}/const_ov12_0223B0DC.h (100%) rename include/{overlay012 => battle_anim}/is_form_symmetrical.h (100%) rename include/{overlay012 => battle_anim}/ov12_022237EC.h (100%) rename include/{overlay012 => battle_anim}/ov12_0222389C.h (100%) rename include/{overlay012 => battle_anim}/ov12_0222421C.h (83%) rename include/{overlay012 => battle_anim}/ov12_02225104.h (85%) rename include/{overlay012 => battle_anim}/ov12_02225640.h (82%) rename include/{overlay012 => battle_anim}/ov12_02225864.h (99%) rename include/{overlay012 => battle_anim}/ov12_02226998.h (100%) rename include/{overlay012 => battle_anim}/ov12_022269C0.h (92%) rename include/{overlay012 => battle_anim}/ov12_02226B84.h (98%) rename include/{overlay012 => battle_anim}/ov12_0222AC70.h (97%) rename include/{overlay012 => battle_anim}/ov12_0222D6B0.h (94%) rename include/{overlay012 => battle_anim}/ov12_0222E784.h (79%) rename include/{overlay012 => battle_anim}/ov12_0222E91C.h (91%) rename include/{overlay012 => battle_anim}/ov12_0222F700.h (98%) rename include/{overlay012 => battle_anim}/ov12_022346A4.h (93%) rename include/{overlay012 => battle_anim}/ov12_02234E44.h (89%) rename include/{overlay012 => battle_anim}/ov12_02235254.h (99%) rename include/{overlay012 => battle_anim}/ov12_02235E94.h (86%) rename include/{overlay012 => battle_anim}/ov12_02237E54.h (100%) rename include/{overlay012 => battle_anim}/ov12_02237EFC.h (75%) rename include/{overlay012 => battle_anim}/ov12_022380BC.h (90%) rename include/{overlay012 => battle_anim}/struct_ball_rotation_decl.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_02221BBC_decl.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_02223764.h (90%) rename include/{overlay012 => battle_anim}/struct_ov12_02223764_sub1.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_02225640.h (89%) rename include/{overlay012 => battle_anim}/struct_ov12_02235998.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_02235FE0_decl.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_02236030.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_02236648_decl.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_02236690.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_02237728.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_02237EFC.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_02237F38.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_02237F98_decl.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_02238004_decl.h (100%) rename include/{overlay012 => battle_anim}/struct_ov12_022380DC.h (100%) rename src/{overlay012 => battle_anim}/battle_anim_system.c (99%) rename src/{overlay012 => battle_anim}/is_form_symmetrical.c (93%) rename src/{overlay012 => battle_anim}/ov12_022237EC.c (95%) rename src/{overlay012 => battle_anim}/ov12_0222389C.c (99%) rename src/{overlay012 => battle_anim}/ov12_0222421C.c (99%) rename src/{overlay012 => battle_anim}/ov12_02225104.c (97%) rename src/{overlay012 => battle_anim}/ov12_02225640.c (96%) rename src/{overlay012 => battle_anim}/ov12_02225864.c (99%) rename src/{overlay012 => battle_anim}/ov12_02226998.c (90%) rename src/{overlay012 => battle_anim}/ov12_022269C0.c (98%) rename src/{overlay012 => battle_anim}/ov12_02226B84.c (99%) rename src/{overlay012 => battle_anim}/ov12_0222AC70.c (99%) rename src/{overlay012 => battle_anim}/ov12_0222D6B0.c (99%) rename src/{overlay012 => battle_anim}/ov12_0222E784.c (96%) rename src/{overlay012 => battle_anim}/ov12_0222E91C.c (99%) rename src/{overlay012 => battle_anim}/ov12_0222F700.c (99%) rename src/{overlay012 => battle_anim}/ov12_022346A4.c (98%) rename src/{overlay012 => battle_anim}/ov12_02234E44.c (98%) rename src/{overlay012 => battle_anim}/ov12_02235254.c (99%) rename src/{overlay012 => battle_anim}/ov12_02235E94.c (99%) rename src/{overlay012 => battle_anim}/ov12_02237E54.c (96%) rename src/{overlay012 => battle_anim}/ov12_02237EFC.c (95%) rename src/{overlay012 => battle_anim}/ov12_022380BC.c (96%) diff --git a/include/battle/battle_context.h b/include/battle/battle_context.h index ebcad83485..63ae112ac4 100644 --- a/include/battle/battle_context.h +++ b/include/battle/battle_context.h @@ -10,7 +10,7 @@ #include "battle/ai_context.h" #include "battle/battle_message.h" #include "battle/battle_mon.h" -#include "overlay012/struct_ball_rotation_decl.h" +#include "battle_anim/struct_ball_rotation_decl.h" #include "char_transfer.h" #include "sprite_system.h" diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index 3c40c29e83..3773718346 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -19,7 +19,7 @@ #include "battle/struct_ov16_02268520.h" #include "battle/struct_ov16_02268A14_decl.h" #include "battle/struct_ov16_0226D160_decl.h" -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "bag.h" #include "bg_window.h" diff --git a/include/battle/struct_ov16_0225BFFC_t.h b/include/battle/struct_ov16_0225BFFC_t.h index 1d56002e96..b91f30ad63 100644 --- a/include/battle/struct_ov16_0225BFFC_t.h +++ b/include/battle/struct_ov16_0225BFFC_t.h @@ -4,8 +4,8 @@ #include "battle/struct_ov16_0225BFFC_sub1.h" #include "battle/struct_ov16_022674C4.h" #include "battle/struct_ov16_0226C378.h" -#include "overlay012/struct_ball_rotation_decl.h" -#include "overlay012/struct_ov12_02223764.h" +#include "battle_anim/struct_ball_rotation_decl.h" +#include "battle_anim/struct_ov12_02223764.h" #include "bg_window.h" #include "narc.h" diff --git a/include/battle/struct_ov16_0225CBB8.h b/include/battle/struct_ov16_0225CBB8.h index bca0a66555..2a9096215c 100644 --- a/include/battle/struct_ov16_0225CBB8.h +++ b/include/battle/struct_ov16_0225CBB8.h @@ -3,8 +3,8 @@ #include "struct_decls/battle_system.h" -#include "overlay012/struct_ov12_02237F98_decl.h" -#include "overlay012/struct_ov12_02238004_decl.h" +#include "battle_anim/struct_ov12_02237F98_decl.h" +#include "battle_anim/struct_ov12_02238004_decl.h" typedef struct { BattleSystem *unk_00; diff --git a/include/battle/struct_ov16_0225D9A8.h b/include/battle/struct_ov16_0225D9A8.h index 0a40e0b811..5e54ff0c5a 100644 --- a/include/battle/struct_ov16_0225D9A8.h +++ b/include/battle/struct_ov16_0225D9A8.h @@ -5,7 +5,7 @@ #include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_02265BBC.h" -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "pokemon_sprite.h" diff --git a/include/battle/struct_ov16_0225EA80.h b/include/battle/struct_ov16_0225EA80.h index 8a00171458..76c7bb62d9 100644 --- a/include/battle/struct_ov16_0225EA80.h +++ b/include/battle/struct_ov16_0225EA80.h @@ -5,10 +5,10 @@ #include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_02265BBC.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/struct_ball_rotation_decl.h" -#include "overlay012/struct_ov12_02223764.h" -#include "overlay012/struct_ov12_02235FE0_decl.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/struct_ball_rotation_decl.h" +#include "battle_anim/struct_ov12_02223764.h" +#include "battle_anim/struct_ov12_02235FE0_decl.h" typedef struct { BattleSystem *unk_00; diff --git a/include/battle/struct_ov16_0225F764.h b/include/battle/struct_ov16_0225F764.h index a548dd7017..4a60aa3cb5 100644 --- a/include/battle/struct_ov16_0225F764.h +++ b/include/battle/struct_ov16_0225F764.h @@ -5,7 +5,7 @@ #include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_02265BBC.h" -#include "overlay012/struct_ball_rotation_decl.h" +#include "battle_anim/struct_ball_rotation_decl.h" #include "pokemon_sprite.h" diff --git a/include/overlay012/battle_anim_system.h b/include/battle_anim/battle_anim_system.h similarity index 99% rename from include/overlay012/battle_anim_system.h rename to include/battle_anim/battle_anim_system.h index dd07f4ee5a..0db0346f42 100644 --- a/include/overlay012/battle_anim_system.h +++ b/include/battle_anim/battle_anim_system.h @@ -7,8 +7,8 @@ #include "battle/battle_anim_battler_context.h" #include "battle/struct_ov16_02265BBC.h" -#include "overlay012/struct_ov12_02223764.h" -#include "overlay012/struct_ov12_022380DC.h" +#include "battle_anim/struct_ov12_02223764.h" +#include "battle_anim/struct_ov12_022380DC.h" #include "bg_window.h" #include "palette.h" diff --git a/include/overlay012/const_ov12_0223B0A0.h b/include/battle_anim/const_ov12_0223B0A0.h similarity index 100% rename from include/overlay012/const_ov12_0223B0A0.h rename to include/battle_anim/const_ov12_0223B0A0.h diff --git a/include/overlay012/const_ov12_0223B0B8.h b/include/battle_anim/const_ov12_0223B0B8.h similarity index 100% rename from include/overlay012/const_ov12_0223B0B8.h rename to include/battle_anim/const_ov12_0223B0B8.h diff --git a/include/overlay012/const_ov12_0223B0DC.h b/include/battle_anim/const_ov12_0223B0DC.h similarity index 100% rename from include/overlay012/const_ov12_0223B0DC.h rename to include/battle_anim/const_ov12_0223B0DC.h diff --git a/include/overlay012/is_form_symmetrical.h b/include/battle_anim/is_form_symmetrical.h similarity index 100% rename from include/overlay012/is_form_symmetrical.h rename to include/battle_anim/is_form_symmetrical.h diff --git a/include/overlay012/ov12_022237EC.h b/include/battle_anim/ov12_022237EC.h similarity index 100% rename from include/overlay012/ov12_022237EC.h rename to include/battle_anim/ov12_022237EC.h diff --git a/include/overlay012/ov12_0222389C.h b/include/battle_anim/ov12_0222389C.h similarity index 100% rename from include/overlay012/ov12_0222389C.h rename to include/battle_anim/ov12_0222389C.h diff --git a/include/overlay012/ov12_0222421C.h b/include/battle_anim/ov12_0222421C.h similarity index 83% rename from include/overlay012/ov12_0222421C.h rename to include/battle_anim/ov12_0222421C.h index ac1d7af0f6..ab38a1711a 100644 --- a/include/overlay012/ov12_0222421C.h +++ b/include/battle_anim/ov12_0222421C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_0222421C_H #define POKEPLATINUM_OV12_0222421C_H -#include "overlay012/struct_ov12_02225640.h" +#include "battle_anim/struct_ov12_02225640.h" #include "spl.h" diff --git a/include/overlay012/ov12_02225104.h b/include/battle_anim/ov12_02225104.h similarity index 85% rename from include/overlay012/ov12_02225104.h rename to include/battle_anim/ov12_02225104.h index b8abd60cf2..3361fc43ec 100644 --- a/include/overlay012/ov12_02225104.h +++ b/include/battle_anim/ov12_02225104.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_02225104_H #define POKEPLATINUM_OV12_02225104_H -#include "overlay012/struct_ov12_02225640.h" +#include "battle_anim/struct_ov12_02225640.h" #include "spl.h" diff --git a/include/overlay012/ov12_02225640.h b/include/battle_anim/ov12_02225640.h similarity index 82% rename from include/overlay012/ov12_02225640.h rename to include/battle_anim/ov12_02225640.h index a31dc4546c..81bd0136cf 100644 --- a/include/overlay012/ov12_02225640.h +++ b/include/battle_anim/ov12_02225640.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_02225640_H #define POKEPLATINUM_OV12_02225640_H -#include "overlay012/struct_ov12_02225640.h" +#include "battle_anim/struct_ov12_02225640.h" #include "spl.h" diff --git a/include/overlay012/ov12_02225864.h b/include/battle_anim/ov12_02225864.h similarity index 99% rename from include/overlay012/ov12_02225864.h rename to include/battle_anim/ov12_02225864.h index e1e399f462..ea0f9cb946 100644 --- a/include/overlay012/ov12_02225864.h +++ b/include/battle_anim/ov12_02225864.h @@ -3,7 +3,7 @@ #include "nitro/hw/common/lcd.h" -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "buffer_manager.h" #include "palette.h" diff --git a/include/overlay012/ov12_02226998.h b/include/battle_anim/ov12_02226998.h similarity index 100% rename from include/overlay012/ov12_02226998.h rename to include/battle_anim/ov12_02226998.h diff --git a/include/overlay012/ov12_022269C0.h b/include/battle_anim/ov12_022269C0.h similarity index 92% rename from include/overlay012/ov12_022269C0.h rename to include/battle_anim/ov12_022269C0.h index 6c9f8e21a1..25793dda8f 100644 --- a/include/overlay012/ov12_022269C0.h +++ b/include/battle_anim/ov12_022269C0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_022269C0_H #define POKEPLATINUM_OV12_022269C0_H -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "sprite_system.h" diff --git a/include/overlay012/ov12_02226B84.h b/include/battle_anim/ov12_02226B84.h similarity index 98% rename from include/overlay012/ov12_02226B84.h rename to include/battle_anim/ov12_02226B84.h index 626dcf524f..d493f689c1 100644 --- a/include/overlay012/ov12_02226B84.h +++ b/include/battle_anim/ov12_02226B84.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_02226B84_H #define POKEPLATINUM_OV12_02226B84_H -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "sprite_system.h" diff --git a/include/overlay012/ov12_0222AC70.h b/include/battle_anim/ov12_0222AC70.h similarity index 97% rename from include/overlay012/ov12_0222AC70.h rename to include/battle_anim/ov12_0222AC70.h index 268e6a31db..3d4ecd3c07 100644 --- a/include/overlay012/ov12_0222AC70.h +++ b/include/battle_anim/ov12_0222AC70.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_0222AC70_H #define POKEPLATINUM_OV12_0222AC70_H -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "sprite_system.h" diff --git a/include/overlay012/ov12_0222D6B0.h b/include/battle_anim/ov12_0222D6B0.h similarity index 94% rename from include/overlay012/ov12_0222D6B0.h rename to include/battle_anim/ov12_0222D6B0.h index 48e62ef3f9..c386d2736e 100644 --- a/include/overlay012/ov12_0222D6B0.h +++ b/include/battle_anim/ov12_0222D6B0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_0222D6B0_H #define POKEPLATINUM_OV12_0222D6B0_H -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "sprite_system.h" diff --git a/include/overlay012/ov12_0222E784.h b/include/battle_anim/ov12_0222E784.h similarity index 79% rename from include/overlay012/ov12_0222E784.h rename to include/battle_anim/ov12_0222E784.h index 0d2d56f073..86fecc4ff5 100644 --- a/include/overlay012/ov12_0222E784.h +++ b/include/battle_anim/ov12_0222E784.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_0222E784_H #define POKEPLATINUM_OV12_0222E784_H -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" void BattleAnimScriptFunc_Mimic(BattleAnimSystem *system); diff --git a/include/overlay012/ov12_0222E91C.h b/include/battle_anim/ov12_0222E91C.h similarity index 91% rename from include/overlay012/ov12_0222E91C.h rename to include/battle_anim/ov12_0222E91C.h index 9451e81ce0..f0379d9389 100644 --- a/include/overlay012/ov12_0222E91C.h +++ b/include/battle_anim/ov12_0222E91C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_0222E91C_H #define POKEPLATINUM_OV12_0222E91C_H -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "sprite_system.h" diff --git a/include/overlay012/ov12_0222F700.h b/include/battle_anim/ov12_0222F700.h similarity index 98% rename from include/overlay012/ov12_0222F700.h rename to include/battle_anim/ov12_0222F700.h index 0c200bb081..b320573709 100644 --- a/include/overlay012/ov12_0222F700.h +++ b/include/battle_anim/ov12_0222F700.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_0222F700_H #define POKEPLATINUM_OV12_0222F700_H -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "sprite_system.h" diff --git a/include/overlay012/ov12_022346A4.h b/include/battle_anim/ov12_022346A4.h similarity index 93% rename from include/overlay012/ov12_022346A4.h rename to include/battle_anim/ov12_022346A4.h index bd0e0ddd77..df6f47838b 100644 --- a/include/overlay012/ov12_022346A4.h +++ b/include/battle_anim/ov12_022346A4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_022346A4_H #define POKEPLATINUM_OV12_022346A4_H -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "sprite_system.h" diff --git a/include/overlay012/ov12_02234E44.h b/include/battle_anim/ov12_02234E44.h similarity index 89% rename from include/overlay012/ov12_02234E44.h rename to include/battle_anim/ov12_02234E44.h index 77f6697439..7536300535 100644 --- a/include/overlay012/ov12_02234E44.h +++ b/include/battle_anim/ov12_02234E44.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_02234E44_H #define POKEPLATINUM_OV12_02234E44_H -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" void BattleAnimScriptFunc_StatChangeUp(BattleAnimSystem *system); void BattleAnimScriptFunc_StatChangeDown(BattleAnimSystem *system); diff --git a/include/overlay012/ov12_02235254.h b/include/battle_anim/ov12_02235254.h similarity index 99% rename from include/overlay012/ov12_02235254.h rename to include/battle_anim/ov12_02235254.h index fcdbfd01a7..e18d7eee09 100644 --- a/include/overlay012/ov12_02235254.h +++ b/include/battle_anim/ov12_02235254.h @@ -5,7 +5,7 @@ #include "generated/battle_script_battlers.h" -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "math_util.h" #include "pokemon_sprite.h" diff --git a/include/overlay012/ov12_02235E94.h b/include/battle_anim/ov12_02235E94.h similarity index 86% rename from include/overlay012/ov12_02235E94.h rename to include/battle_anim/ov12_02235E94.h index 44ca216e53..026e437464 100644 --- a/include/overlay012/ov12_02235E94.h +++ b/include/battle_anim/ov12_02235E94.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_OV12_02235E94_H #define POKEPLATINUM_OV12_02235E94_H -#include "overlay012/struct_ball_rotation_decl.h" -#include "overlay012/struct_ov12_02235FE0_decl.h" -#include "overlay012/struct_ov12_02236030.h" -#include "overlay012/struct_ov12_02236648_decl.h" -#include "overlay012/struct_ov12_02236690.h" -#include "overlay012/struct_ov12_02237728.h" +#include "battle_anim/struct_ball_rotation_decl.h" +#include "battle_anim/struct_ov12_02235FE0_decl.h" +#include "battle_anim/struct_ov12_02236030.h" +#include "battle_anim/struct_ov12_02236648_decl.h" +#include "battle_anim/struct_ov12_02236690.h" +#include "battle_anim/struct_ov12_02237728.h" #include "spl.h" diff --git a/include/overlay012/ov12_02237E54.h b/include/battle_anim/ov12_02237E54.h similarity index 100% rename from include/overlay012/ov12_02237E54.h rename to include/battle_anim/ov12_02237E54.h diff --git a/include/overlay012/ov12_02237EFC.h b/include/battle_anim/ov12_02237EFC.h similarity index 75% rename from include/overlay012/ov12_02237EFC.h rename to include/battle_anim/ov12_02237EFC.h index 05cbe441e8..a9c38342d1 100644 --- a/include/overlay012/ov12_02237EFC.h +++ b/include/battle_anim/ov12_02237EFC.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_OV12_02237EFC_H #define POKEPLATINUM_OV12_02237EFC_H -#include "overlay012/struct_ov12_02237EFC.h" -#include "overlay012/struct_ov12_02237F38.h" -#include "overlay012/struct_ov12_02237F98_decl.h" -#include "overlay012/struct_ov12_02238004_decl.h" +#include "battle_anim/struct_ov12_02237EFC.h" +#include "battle_anim/struct_ov12_02237F38.h" +#include "battle_anim/struct_ov12_02237F98_decl.h" +#include "battle_anim/struct_ov12_02238004_decl.h" UnkStruct_ov12_02237F98 *ov12_02237EFC(int heapID, UnkStruct_ov12_02237EFC *param1); UnkStruct_ov12_02238004 *ov12_02237F38(UnkStruct_ov12_02237F98 *param0, UnkStruct_ov12_02237F38 *param1); diff --git a/include/overlay012/ov12_022380BC.h b/include/battle_anim/ov12_022380BC.h similarity index 90% rename from include/overlay012/ov12_022380BC.h rename to include/battle_anim/ov12_022380BC.h index 3adfda5064..c2a727da52 100644 --- a/include/overlay012/ov12_022380BC.h +++ b/include/battle_anim/ov12_022380BC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV12_022380BC_H #define POKEPLATINUM_OV12_022380BC_H -#include "overlay012/struct_ov12_022380DC.h" +#include "battle_anim/struct_ov12_022380DC.h" void ov12_022380BC(UnkStruct_ov12_022380DC *param0, int heapID); void ov12_022380CC(UnkStruct_ov12_022380DC *param0, int heapID); diff --git a/include/overlay012/struct_ball_rotation_decl.h b/include/battle_anim/struct_ball_rotation_decl.h similarity index 100% rename from include/overlay012/struct_ball_rotation_decl.h rename to include/battle_anim/struct_ball_rotation_decl.h diff --git a/include/overlay012/struct_ov12_02221BBC_decl.h b/include/battle_anim/struct_ov12_02221BBC_decl.h similarity index 100% rename from include/overlay012/struct_ov12_02221BBC_decl.h rename to include/battle_anim/struct_ov12_02221BBC_decl.h diff --git a/include/overlay012/struct_ov12_02223764.h b/include/battle_anim/struct_ov12_02223764.h similarity index 90% rename from include/overlay012/struct_ov12_02223764.h rename to include/battle_anim/struct_ov12_02223764.h index 61dc62081f..fef8bb192f 100644 --- a/include/overlay012/struct_ov12_02223764.h +++ b/include/battle_anim/struct_ov12_02223764.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV12_02223764_H #include "battle/pokemon_sprite_data.h" -#include "overlay012/struct_ov12_02223764_sub1.h" +#include "battle_anim/struct_ov12_02223764_sub1.h" #include "pokemon_sprite.h" #include "sprite_system.h" diff --git a/include/overlay012/struct_ov12_02223764_sub1.h b/include/battle_anim/struct_ov12_02223764_sub1.h similarity index 100% rename from include/overlay012/struct_ov12_02223764_sub1.h rename to include/battle_anim/struct_ov12_02223764_sub1.h diff --git a/include/overlay012/struct_ov12_02225640.h b/include/battle_anim/struct_ov12_02225640.h similarity index 89% rename from include/overlay012/struct_ov12_02225640.h rename to include/battle_anim/struct_ov12_02225640.h index 283af45c27..5fde83b726 100644 --- a/include/overlay012/struct_ov12_02225640.h +++ b/include/battle_anim/struct_ov12_02225640.h @@ -3,7 +3,7 @@ #include -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "particle_system.h" diff --git a/include/overlay012/struct_ov12_02235998.h b/include/battle_anim/struct_ov12_02235998.h similarity index 100% rename from include/overlay012/struct_ov12_02235998.h rename to include/battle_anim/struct_ov12_02235998.h diff --git a/include/overlay012/struct_ov12_02235FE0_decl.h b/include/battle_anim/struct_ov12_02235FE0_decl.h similarity index 100% rename from include/overlay012/struct_ov12_02235FE0_decl.h rename to include/battle_anim/struct_ov12_02235FE0_decl.h diff --git a/include/overlay012/struct_ov12_02236030.h b/include/battle_anim/struct_ov12_02236030.h similarity index 100% rename from include/overlay012/struct_ov12_02236030.h rename to include/battle_anim/struct_ov12_02236030.h diff --git a/include/overlay012/struct_ov12_02236648_decl.h b/include/battle_anim/struct_ov12_02236648_decl.h similarity index 100% rename from include/overlay012/struct_ov12_02236648_decl.h rename to include/battle_anim/struct_ov12_02236648_decl.h diff --git a/include/overlay012/struct_ov12_02236690.h b/include/battle_anim/struct_ov12_02236690.h similarity index 100% rename from include/overlay012/struct_ov12_02236690.h rename to include/battle_anim/struct_ov12_02236690.h diff --git a/include/overlay012/struct_ov12_02237728.h b/include/battle_anim/struct_ov12_02237728.h similarity index 100% rename from include/overlay012/struct_ov12_02237728.h rename to include/battle_anim/struct_ov12_02237728.h diff --git a/include/overlay012/struct_ov12_02237EFC.h b/include/battle_anim/struct_ov12_02237EFC.h similarity index 100% rename from include/overlay012/struct_ov12_02237EFC.h rename to include/battle_anim/struct_ov12_02237EFC.h diff --git a/include/overlay012/struct_ov12_02237F38.h b/include/battle_anim/struct_ov12_02237F38.h similarity index 100% rename from include/overlay012/struct_ov12_02237F38.h rename to include/battle_anim/struct_ov12_02237F38.h diff --git a/include/overlay012/struct_ov12_02237F98_decl.h b/include/battle_anim/struct_ov12_02237F98_decl.h similarity index 100% rename from include/overlay012/struct_ov12_02237F98_decl.h rename to include/battle_anim/struct_ov12_02237F98_decl.h diff --git a/include/overlay012/struct_ov12_02238004_decl.h b/include/battle_anim/struct_ov12_02238004_decl.h similarity index 100% rename from include/overlay012/struct_ov12_02238004_decl.h rename to include/battle_anim/struct_ov12_02238004_decl.h diff --git a/include/overlay012/struct_ov12_022380DC.h b/include/battle_anim/struct_ov12_022380DC.h similarity index 100% rename from include/overlay012/struct_ov12_022380DC.h rename to include/battle_anim/struct_ov12_022380DC.h diff --git a/include/overlay017/struct_ov17_0223F88C.h b/include/overlay017/struct_ov17_0223F88C.h index ed2d288720..e376ec69de 100644 --- a/include/overlay017/struct_ov17_0223F88C.h +++ b/include/overlay017/struct_ov17_0223F88C.h @@ -5,7 +5,7 @@ #include "struct_defs/struct_02095C48_sub1.h" #include "battle/pokemon_sprite_data.h" -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "overlay017/struct_ov17_0223F2E4.h" #include "bg_window.h" diff --git a/include/overlay017/struct_ov17_022489C8.h b/include/overlay017/struct_ov17_022489C8.h index d1765253de..aefe79b69f 100644 --- a/include/overlay017/struct_ov17_022489C8.h +++ b/include/overlay017/struct_ov17_022489C8.h @@ -1,8 +1,8 @@ #ifndef POKEPLATINUM_STRUCT_OV17_022489C8_H #define POKEPLATINUM_STRUCT_OV17_022489C8_H -#include "overlay012/struct_ov12_02235FE0_decl.h" -#include "overlay012/struct_ov12_02236030.h" +#include "battle_anim/struct_ov12_02235FE0_decl.h" +#include "battle_anim/struct_ov12_02236030.h" #include "pokemon.h" diff --git a/include/overlay017/struct_ov17_02248A24.h b/include/overlay017/struct_ov17_02248A24.h index fdc5ec0bf6..2c16467cc7 100644 --- a/include/overlay017/struct_ov17_02248A24.h +++ b/include/overlay017/struct_ov17_02248A24.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV17_02248A24_H #define POKEPLATINUM_STRUCT_OV17_02248A24_H -#include "overlay012/struct_ball_rotation_decl.h" +#include "battle_anim/struct_ball_rotation_decl.h" #include "overlay017/struct_ov17_02247A48.h" typedef struct { diff --git a/include/overlay076/struct_ov76_0223C398.h b/include/overlay076/struct_ov76_0223C398.h index e43e53183f..39a4ff519b 100644 --- a/include/overlay076/struct_ov76_0223C398.h +++ b/include/overlay076/struct_ov76_0223C398.h @@ -6,8 +6,8 @@ #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02015920_decl.h" -#include "overlay012/struct_ball_rotation_decl.h" -#include "overlay012/struct_ov12_02235FE0_decl.h" +#include "battle_anim/struct_ball_rotation_decl.h" +#include "battle_anim/struct_ov12_02235FE0_decl.h" #include "overlay022/struct_ov22_02258A48.h" #include "bg_window.h" diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index 88a59222d8..ebf6af4b9c 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -20,7 +20,7 @@ #include "battle/struct_ov16_02268A14_decl.h" #include "battle/struct_ov16_0226D160_decl.h" #include "overlay010/struct_ov10_0221F800.h" -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "bag.h" #include "bg_window.h" diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 35fe7e254a..67a2200cf8 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -630,32 +630,32 @@ Overlay overlay11 Object main.nef.p/src_overlay011_particle_helper.c.o } -Overlay overlay12 +Overlay battle_anim { After overlay11 - Object main.nef.p/src_overlay012_battle_anim_system.c.o - Object main.nef.p/src_overlay012_ov12_022237EC.c.o - Object main.nef.p/src_overlay012_ov12_0222389C.c.o - Object main.nef.p/src_overlay012_ov12_0222421C.c.o - Object main.nef.p/src_overlay012_ov12_02225104.c.o - Object main.nef.p/src_overlay012_ov12_02225640.c.o - Object main.nef.p/src_overlay012_ov12_02225864.c.o - Object main.nef.p/src_overlay012_ov12_02226998.c.o - Object main.nef.p/src_overlay012_ov12_022269C0.c.o - Object main.nef.p/src_overlay012_ov12_02226B84.c.o - Object main.nef.p/src_overlay012_ov12_0222AC70.c.o - Object main.nef.p/src_overlay012_ov12_0222D6B0.c.o - Object main.nef.p/src_overlay012_ov12_0222E784.c.o - Object main.nef.p/src_overlay012_ov12_0222E91C.c.o - Object main.nef.p/src_overlay012_ov12_0222F700.c.o - Object main.nef.p/src_overlay012_ov12_022346A4.c.o - Object main.nef.p/src_overlay012_ov12_02234E44.c.o - Object main.nef.p/src_overlay012_ov12_02235254.c.o - Object main.nef.p/src_overlay012_ov12_02235E94.c.o - Object main.nef.p/src_overlay012_ov12_02237E54.c.o - Object main.nef.p/src_overlay012_ov12_02237EFC.c.o - Object main.nef.p/src_overlay012_ov12_022380BC.c.o - Object main.nef.p/src_overlay012_is_form_symmetrical.c.o + Object main.nef.p/src_battle_anim_battle_anim_system.c.o + Object main.nef.p/src_battle_anim_ov12_022237EC.c.o + Object main.nef.p/src_battle_anim_ov12_0222389C.c.o + 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_ov12_02226998.c.o + Object main.nef.p/src_battle_anim_ov12_022269C0.c.o + Object main.nef.p/src_battle_anim_ov12_02226B84.c.o + Object main.nef.p/src_battle_anim_ov12_0222AC70.c.o + Object main.nef.p/src_battle_anim_ov12_0222D6B0.c.o + Object main.nef.p/src_battle_anim_ov12_0222E784.c.o + Object main.nef.p/src_battle_anim_ov12_0222E91C.c.o + Object main.nef.p/src_battle_anim_ov12_0222F700.c.o + Object main.nef.p/src_battle_anim_ov12_022346A4.c.o + Object main.nef.p/src_battle_anim_ov12_02234E44.c.o + Object main.nef.p/src_battle_anim_ov12_02235254.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 + Object main.nef.p/src_battle_anim_ov12_022380BC.c.o + Object main.nef.p/src_battle_anim_is_form_symmetrical.c.o } Overlay overlay13 @@ -688,7 +688,7 @@ Overlay overlay15 Overlay battle { - After overlay12 + After battle_anim Object main.nef.p/src_battle_ov16_0223B140.c.o Object main.nef.p/src_battle_ov16_0223DF00.c.o Object main.nef.p/src_battle_battle_script.c.o @@ -709,7 +709,7 @@ Overlay battle Overlay overlay17 { - After overlay12 + After battle_anim Object main.nef.p/src_overlay017_ov17_0223B140.c.o Object main.nef.p/src_overlay017_ov17_0223CB1C.c.o Object main.nef.p/src_overlay017_ov17_0223DAD0.c.o @@ -1246,7 +1246,7 @@ Overlay overlay70 Overlay trainer_card_screen { - After overlay12 + After battle_anim Object main.nef.p/src_trainer_card_screen_trainer_card_screen.c.o Object main.nef.p/src_trainer_card_screen_trainer_card_display_text.c.o Object main.nef.p/src_trainer_card_screen_trainer_card_sprites.c.o @@ -1280,7 +1280,7 @@ Overlay overlay75 Overlay overlay76 { - After overlay12 + After battle_anim Object main.nef.p/src_overlay076_ov76_0223B140.c.o Object main.nef.p/src_overlay076_ov76_0223B870.c.o Object main.nef.p/src_overlay076_ov76_0223D338.c.o @@ -1330,7 +1330,7 @@ Overlay journal_display Overlay overlay82 { - After overlay12 + After battle_anim Object main.nef.p/src_overlay082_ov82_0223B140.c.o Object main.nef.p/src_overlay082_ov82_0223B2E0.c.o } @@ -1363,7 +1363,7 @@ Overlay overlay85 Overlay overlay86 { - After overlay12 + After battle_anim Object main.nef.p/src_overlay086_ov86_0223B140.c.o } @@ -1376,7 +1376,7 @@ Overlay overlay87 Overlay overlay88 { - After overlay12 + After battle_anim Object main.nef.p/src_overlay088_ov88_0223B140.c.o Object main.nef.p/src_overlay088_ov88_0223E9C4.c.o } @@ -1414,7 +1414,7 @@ Overlay boat_cutscene Overlay overlay94 { - After overlay12 + After battle_anim Object main.nef.p/src_overlay094_ov94_0223B140.c.o Object main.nef.p/src_overlay094_ov94_0223BCB0.c.o Object main.nef.p/src_overlay094_ov94_0223C610.c.o @@ -1446,7 +1446,7 @@ Overlay overlay95 Overlay overlay96 { - After overlay12 + After battle_anim Object main.nef.p/src_overlay096_ov96_0223B140.c.o Object main.nef.p/src_overlay096_ov96_0223B6A0.c.o Object main.nef.p/src_overlay096_ov96_0223BCE0.c.o diff --git a/platinum.us/sbins_shared.sha1 b/platinum.us/sbins_shared.sha1 index 124575b546..85b7109f21 100644 --- a/platinum.us/sbins_shared.sha1 +++ b/platinum.us/sbins_shared.sha1 @@ -11,7 +11,7 @@ fef29cf33d4dfd1f068a7b67798e7b5950fce749 *overlay7.sbin ba1a20a286990d2d318af29cd6e8dad389d45504 *overlay9.sbin 05ab4e12c01211ce4305bde303e06ce11dda78af *overlay10.sbin a6dc7a7e32c14081b5db5a0a5e1e5120bebe52a9 *overlay11.sbin -fa28629441497607e072a3aceebfb6d167457020 *overlay12.sbin +fa28629441497607e072a3aceebfb6d167457020 *battle_anim.sbin 8b64b97469bff5dc372b5178baa4676f7b2bcfc2 *overlay13.sbin d9b09c1e37088d6aaeb73143ecec98ab3327ec67 *trainer_ai.sbin de8a847bff8c343d69b853a215e6ee775ef2ef96 *overlay15.sbin diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index 761a4280bf..009c01f631 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -95,17 +95,17 @@ #include "battle/struct_ov16_0226C378.h" #include "battle/struct_ov16_0226D160_decl.h" #include "battle/trainer_ai.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/const_ov12_0223B0A0.h" -#include "overlay012/const_ov12_0223B0B8.h" -#include "overlay012/const_ov12_0223B0DC.h" -#include "overlay012/ov12_02235E94.h" -#include "overlay012/ov12_02237EFC.h" -#include "overlay012/ov12_022380BC.h" -#include "overlay012/struct_ov12_02236030.h" -#include "overlay012/struct_ov12_02237728.h" -#include "overlay012/struct_ov12_02237F38.h" -#include "overlay012/struct_ov12_022380DC.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/const_ov12_0223B0A0.h" +#include "battle_anim/const_ov12_0223B0B8.h" +#include "battle_anim/const_ov12_0223B0DC.h" +#include "battle_anim/ov12_02235E94.h" +#include "battle_anim/ov12_02237EFC.h" +#include "battle_anim/ov12_022380BC.h" +#include "battle_anim/struct_ov12_02236030.h" +#include "battle_anim/struct_ov12_02237728.h" +#include "battle_anim/struct_ov12_02237F38.h" +#include "battle_anim/struct_ov12_022380DC.h" #include "overlay013/battle_bag.h" #include "overlay013/battle_bag_utils.h" #include "overlay013/battle_party.h" diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c index cf8380e6e4..8cfc7af60e 100644 --- a/src/battle/battle_io_command.c +++ b/src/battle/battle_io_command.c @@ -61,9 +61,9 @@ #include "battle/struct_ov16_02266A38.h" #include "battle/struct_ov16_022674C4.h" #include "battle/struct_ov16_02268A14_decl.h" -#include "overlay012/ov12_02235E94.h" -#include "overlay012/ov12_022380BC.h" -#include "overlay012/struct_ov12_02237728.h" +#include "battle_anim/ov12_02235E94.h" +#include "battle_anim/ov12_022380BC.h" +#include "battle_anim/struct_ov12_02237728.h" #include "bg_window.h" #include "flags.h" diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index 0ca561b350..43413ec921 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -36,8 +36,8 @@ #include "battle/ov16_02268520.h" #include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_0225BFFC_t.h" -#include "overlay012/ov12_02235E94.h" -#include "overlay012/struct_ov12_02237728.h" +#include "battle_anim/ov12_02235E94.h" +#include "battle_anim/struct_ov12_02237728.h" #include "bg_window.h" #include "char_transfer.h" diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 8fe4f6ccd5..d3fa80ac1a 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -31,7 +31,7 @@ #include "overlay010/ov10_0221F800.h" #include "overlay010/struct_ov10_0221F800.h" #include "overlay011/particle_helper.h" -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "bag.h" #include "bg_window.h" @@ -89,7 +89,7 @@ FS_EXTERN_OVERLAY(overlay10); FS_EXTERN_OVERLAY(overlay11); -FS_EXTERN_OVERLAY(overlay12); +FS_EXTERN_OVERLAY(battle_anim); FS_EXTERN_OVERLAY(overlay13); FS_EXTERN_OVERLAY(trainer_ai); FS_EXTERN_OVERLAY(pokedex); @@ -225,7 +225,7 @@ BOOL Battle_Main(ApplicationManager *appMan, int *param1) break; case 8: Overlay_LoadByID(FS_OVERLAY_ID(overlay11), 2); - Overlay_LoadByID(FS_OVERLAY_ID(overlay12), 2); + Overlay_LoadByID(FS_OVERLAY_ID(battle_anim), 2); ov16_0223B790(appMan); *param1 = 9; break; @@ -297,7 +297,7 @@ void ov16_0223B384(BattleSystem *battleSys) ov16_0223F314(battleSys, 3); if (battleSys->overlayFlags == 0) { - Overlay_UnloadByID(FS_OVERLAY_ID(overlay12)); + Overlay_UnloadByID(FS_OVERLAY_ID(battle_anim)); } else { Overlay_UnloadByID(FS_OVERLAY_ID(trainer_ai)); } @@ -328,7 +328,7 @@ void ov16_0223B430(BattleSystem *battleSys) Overlay_UnloadByID(FS_OVERLAY_ID(overlay13)); if (battleSys->overlayFlags == 0) { - Overlay_LoadByID(FS_OVERLAY_ID(overlay12), 2); + Overlay_LoadByID(FS_OVERLAY_ID(battle_anim), 2); } else { Overlay_LoadByID(FS_OVERLAY_ID(trainer_ai), 2); } @@ -476,9 +476,9 @@ void BattleSystem_LoadFightOverlay(BattleSystem *battleSys, int flags) if (flags == 0) { Overlay_UnloadByID(FS_OVERLAY_ID(trainer_ai)); - Overlay_LoadByID(FS_OVERLAY_ID(overlay12), 2); + Overlay_LoadByID(FS_OVERLAY_ID(battle_anim), 2); } else { - Overlay_UnloadByID(FS_OVERLAY_ID(overlay12)); + Overlay_UnloadByID(FS_OVERLAY_ID(battle_anim)); Overlay_LoadByID(FS_OVERLAY_ID(trainer_ai), 2); } } @@ -805,7 +805,7 @@ static void ov16_0223BCB4(ApplicationManager *appMan) Heap_Free(battleSystem); Overlay_UnloadByID(FS_OVERLAY_ID(overlay11)); - Overlay_UnloadByID(FS_OVERLAY_ID(overlay12)); + Overlay_UnloadByID(FS_OVERLAY_ID(battle_anim)); if (!sub_020389B8()) { Overlay_UnloadByID(FS_OVERLAY_ID(pokedex)); diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index d2bddcd352..61b1e279d4 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -36,7 +36,7 @@ #include "battle/struct_ov16_02268520.h" #include "battle/struct_ov16_02268A14_decl.h" #include "battle/struct_ov16_0226D160_decl.h" -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "bag.h" #include "bg_window.h" diff --git a/src/overlay012/battle_anim_system.c b/src/battle_anim/battle_anim_system.c similarity index 99% rename from src/overlay012/battle_anim_system.c rename to src/battle_anim/battle_anim_system.c index 31e259edb2..fd158d3a49 100644 --- a/src/overlay012/battle_anim_system.c +++ b/src/battle_anim/battle_anim_system.c @@ -1,4 +1,4 @@ -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include #include @@ -19,14 +19,14 @@ #include "battle/pokemon_sprite_data.h" #include "battle/struct_ov16_02265BBC.h" #include "global/utility.h" -#include "overlay012/is_form_symmetrical.h" -#include "overlay012/ov12_022237EC.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02226998.h" -#include "overlay012/ov12_02235254.h" -#include "overlay012/ov12_022380BC.h" -#include "overlay012/struct_ov12_02223764.h" -#include "overlay012/struct_ov12_022380DC.h" +#include "battle_anim/is_form_symmetrical.h" +#include "battle_anim/ov12_022237EC.h" +#include "battle_anim/ov12_02225864.h" +#include "battle_anim/ov12_02226998.h" +#include "battle_anim/ov12_02235254.h" +#include "battle_anim/ov12_022380BC.h" +#include "battle_anim/struct_ov12_02223764.h" +#include "battle_anim/struct_ov12_022380DC.h" #include "overlay017/ov17_022413D8.h" #include "bg_window.h" diff --git a/src/overlay012/is_form_symmetrical.c b/src/battle_anim/is_form_symmetrical.c similarity index 93% rename from src/overlay012/is_form_symmetrical.c rename to src/battle_anim/is_form_symmetrical.c index d4fc99af8e..626e71f15e 100644 --- a/src/overlay012/is_form_symmetrical.c +++ b/src/battle_anim/is_form_symmetrical.c @@ -1,4 +1,4 @@ -#include "overlay012/is_form_symmetrical.h" +#include "battle_anim/is_form_symmetrical.h" #include #include diff --git a/src/overlay012/ov12_022237EC.c b/src/battle_anim/ov12_022237EC.c similarity index 95% rename from src/overlay012/ov12_022237EC.c rename to src/battle_anim/ov12_022237EC.c index cea8545a4e..c9cec847b1 100644 --- a/src/overlay012/ov12_022237EC.c +++ b/src/battle_anim/ov12_022237EC.c @@ -1,11 +1,11 @@ -#include "overlay012/ov12_022237EC.h" +#include "battle_anim/ov12_022237EC.h" #include #include #include "overlay011/particle_helper.h" -#include "overlay012/ov12_0222389C.h" -#include "overlay012/ov12_0222421C.h" +#include "battle_anim/ov12_0222389C.h" +#include "battle_anim/ov12_0222421C.h" #include "narc.h" #include "particle_system.h" diff --git a/src/overlay012/ov12_0222389C.c b/src/battle_anim/ov12_0222389C.c similarity index 99% rename from src/overlay012/ov12_0222389C.c rename to src/battle_anim/ov12_0222389C.c index 2475953468..82dd957194 100644 --- a/src/overlay012/ov12_0222389C.c +++ b/src/battle_anim/ov12_0222389C.c @@ -1,10 +1,10 @@ -#include "overlay012/ov12_0222389C.h" +#include "battle_anim/ov12_0222389C.h" #include #include -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02235254.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02235254.h" #include "camera.h" #include "particle_system.h" diff --git a/src/overlay012/ov12_0222421C.c b/src/battle_anim/ov12_0222421C.c similarity index 99% rename from src/overlay012/ov12_0222421C.c rename to src/battle_anim/ov12_0222421C.c index 4091eec2f1..18460c41a6 100644 --- a/src/overlay012/ov12_0222421C.c +++ b/src/battle_anim/ov12_0222421C.c @@ -1,13 +1,13 @@ -#include "overlay012/ov12_0222421C.h" +#include "battle_anim/ov12_0222421C.h" #include #include -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02225104.h" -#include "overlay012/ov12_02225640.h" -#include "overlay012/ov12_02235254.h" -#include "overlay012/struct_ov12_02225640.h" +#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/struct_ov12_02225640.h" #include "heap.h" #include "inlines.h" diff --git a/src/overlay012/ov12_02225104.c b/src/battle_anim/ov12_02225104.c similarity index 97% rename from src/overlay012/ov12_02225104.c rename to src/battle_anim/ov12_02225104.c index 92ef4287c0..d360f370b5 100644 --- a/src/overlay012/ov12_02225104.c +++ b/src/battle_anim/ov12_02225104.c @@ -1,12 +1,12 @@ -#include "overlay012/ov12_02225104.h" +#include "battle_anim/ov12_02225104.h" #include #include -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_0222421C.h" -#include "overlay012/ov12_02235254.h" -#include "overlay012/struct_ov12_02225640.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_0222421C.h" +#include "battle_anim/ov12_02235254.h" +#include "battle_anim/struct_ov12_02225640.h" #include "particle_system.h" #include "spl.h" diff --git a/src/overlay012/ov12_02225640.c b/src/battle_anim/ov12_02225640.c similarity index 96% rename from src/overlay012/ov12_02225640.c rename to src/battle_anim/ov12_02225640.c index 1c5dc20a90..7a33760b52 100644 --- a/src/overlay012/ov12_02225640.c +++ b/src/battle_anim/ov12_02225640.c @@ -1,11 +1,11 @@ -#include "overlay012/ov12_02225640.h" +#include "battle_anim/ov12_02225640.h" #include #include -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02235254.h" -#include "overlay012/struct_ov12_02225640.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02235254.h" +#include "battle_anim/struct_ov12_02225640.h" #include "camera.h" #include "particle_system.h" diff --git a/src/overlay012/ov12_02225864.c b/src/battle_anim/ov12_02225864.c similarity index 99% rename from src/overlay012/ov12_02225864.c rename to src/battle_anim/ov12_02225864.c index 316dce0cb3..eafda84a1e 100644 --- a/src/overlay012/ov12_02225864.c +++ b/src/battle_anim/ov12_02225864.c @@ -1,4 +1,4 @@ -#include "overlay012/ov12_02225864.h" +#include "battle_anim/ov12_02225864.h" #include "nitro/hw/common/lcd.h" #include "nitro/types.h" @@ -8,9 +8,9 @@ #include "constants/battle/battle_anim.h" #include "constants/graphics.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02235254.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02225864.h" +#include "battle_anim/ov12_02235254.h" #include "battle_script_battlers.h" #include "buffer_manager.h" diff --git a/src/overlay012/ov12_02226998.c b/src/battle_anim/ov12_02226998.c similarity index 90% rename from src/overlay012/ov12_02226998.c rename to src/battle_anim/ov12_02226998.c index 6376a1fb7b..6fc0483467 100644 --- a/src/overlay012/ov12_02226998.c +++ b/src/battle_anim/ov12_02226998.c @@ -1,20 +1,20 @@ -#include "overlay012/ov12_02226998.h" +#include "battle_anim/ov12_02226998.h" #include #include #include "global/utility.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02226998.h" -#include "overlay012/ov12_022269C0.h" -#include "overlay012/ov12_02226B84.h" -#include "overlay012/ov12_0222AC70.h" -#include "overlay012/ov12_0222D6B0.h" -#include "overlay012/ov12_0222E784.h" -#include "overlay012/ov12_0222E91C.h" -#include "overlay012/ov12_0222F700.h" -#include "overlay012/ov12_022346A4.h" -#include "overlay012/ov12_02234E44.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02226998.h" +#include "battle_anim/ov12_022269C0.h" +#include "battle_anim/ov12_02226B84.h" +#include "battle_anim/ov12_0222AC70.h" +#include "battle_anim/ov12_0222D6B0.h" +#include "battle_anim/ov12_0222E784.h" +#include "battle_anim/ov12_0222E91C.h" +#include "battle_anim/ov12_0222F700.h" +#include "battle_anim/ov12_022346A4.h" +#include "battle_anim/ov12_02234E44.h" static const BattleAnimScriptFunc sBattleAnimScriptFuncs[] = { BattleAnimScriptFunc_Nop, diff --git a/src/overlay012/ov12_022269C0.c b/src/battle_anim/ov12_022269C0.c similarity index 98% rename from src/overlay012/ov12_022269C0.c rename to src/battle_anim/ov12_022269C0.c index fa8f7cd4f5..a7c68cdbe3 100644 --- a/src/overlay012/ov12_022269C0.c +++ b/src/battle_anim/ov12_022269C0.c @@ -1,9 +1,9 @@ -#include "overlay012/ov12_022269C0.h" +#include "battle_anim/ov12_022269C0.h" #include #include -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "heap.h" #include "sprite.h" diff --git a/src/overlay012/ov12_02226B84.c b/src/battle_anim/ov12_02226B84.c similarity index 99% rename from src/overlay012/ov12_02226B84.c rename to src/battle_anim/ov12_02226B84.c index ef061da481..eefb848b16 100644 --- a/src/overlay012/ov12_02226B84.c +++ b/src/battle_anim/ov12_02226B84.c @@ -1,4 +1,4 @@ -#include "overlay012/ov12_02226B84.h" +#include "battle_anim/ov12_02226B84.h" #include "nitro/hw/common/lcd.h" #include @@ -9,9 +9,9 @@ #include "constants/graphics.h" #include "global/utility.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02235254.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02225864.h" +#include "battle_anim/ov12_02235254.h" #include "battle_script_battlers.h" #include "bg_window.h" diff --git a/src/overlay012/ov12_0222AC70.c b/src/battle_anim/ov12_0222AC70.c similarity index 99% rename from src/overlay012/ov12_0222AC70.c rename to src/battle_anim/ov12_0222AC70.c index 1e6cdbbbeb..97cb185066 100644 --- a/src/overlay012/ov12_0222AC70.c +++ b/src/battle_anim/ov12_0222AC70.c @@ -1,4 +1,4 @@ -#include "overlay012/ov12_0222AC70.h" +#include "battle_anim/ov12_0222AC70.h" #include "nitro/pad/common/pad.h" #include @@ -8,9 +8,9 @@ #include "constants/battle/battle_anim.h" #include "constants/graphics.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02235254.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02225864.h" +#include "battle_anim/ov12_02235254.h" #include "battle_script_battlers.h" #include "bg_window.h" diff --git a/src/overlay012/ov12_0222D6B0.c b/src/battle_anim/ov12_0222D6B0.c similarity index 99% rename from src/overlay012/ov12_0222D6B0.c rename to src/battle_anim/ov12_0222D6B0.c index 6f126d839b..db4044dff4 100644 --- a/src/overlay012/ov12_0222D6B0.c +++ b/src/battle_anim/ov12_0222D6B0.c @@ -1,13 +1,13 @@ -#include "overlay012/ov12_0222D6B0.h" +#include "battle_anim/ov12_0222D6B0.h" #include #include #include "constants/battle/battle_anim.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02235254.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02225864.h" +#include "battle_anim/ov12_02235254.h" #include "bg_window.h" #include "heap.h" diff --git a/src/overlay012/ov12_0222E784.c b/src/battle_anim/ov12_0222E784.c similarity index 96% rename from src/overlay012/ov12_0222E784.c rename to src/battle_anim/ov12_0222E784.c index 84911dc94e..5e389a538c 100644 --- a/src/overlay012/ov12_0222E784.c +++ b/src/battle_anim/ov12_0222E784.c @@ -1,11 +1,11 @@ -#include "overlay012/ov12_0222E784.h" +#include "battle_anim/ov12_0222E784.h" #include "constants/battle.h" #include "constants/battle/battle_anim.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02235254.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02225864.h" +#include "battle_anim/ov12_02235254.h" #include "pokemon_sprite.h" #include "sprite_system.h" diff --git a/src/overlay012/ov12_0222E91C.c b/src/battle_anim/ov12_0222E91C.c similarity index 99% rename from src/overlay012/ov12_0222E91C.c rename to src/battle_anim/ov12_0222E91C.c index 3d8c7e280d..186badb73a 100644 --- a/src/overlay012/ov12_0222E91C.c +++ b/src/battle_anim/ov12_0222E91C.c @@ -1,4 +1,4 @@ -#include "overlay012/ov12_0222E91C.h" +#include "battle_anim/ov12_0222E91C.h" #include "nitro/hw/common/lcd.h" #include @@ -7,12 +7,12 @@ #include "constants/battle/battle_anim.h" #include "constants/graphics.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_0222D6B0.h" -#include "overlay012/ov12_02235254.h" -#include "overlay012/ov12_022380BC.h" -#include "overlay012/struct_ov12_022380DC.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02225864.h" +#include "battle_anim/ov12_0222D6B0.h" +#include "battle_anim/ov12_02235254.h" +#include "battle_anim/ov12_022380BC.h" +#include "battle_anim/struct_ov12_022380DC.h" #include "battle_script_battlers.h" #include "bg_window.h" diff --git a/src/overlay012/ov12_0222F700.c b/src/battle_anim/ov12_0222F700.c similarity index 99% rename from src/overlay012/ov12_0222F700.c rename to src/battle_anim/ov12_0222F700.c index 265a836b5e..93b376fc3e 100644 --- a/src/overlay012/ov12_0222F700.c +++ b/src/battle_anim/ov12_0222F700.c @@ -1,4 +1,4 @@ -#include "overlay012/ov12_0222F700.h" +#include "battle_anim/ov12_0222F700.h" #include "nitro/gx/g2.h" #include "nitro/hw/common/lcd.h" @@ -9,9 +9,9 @@ #include "constants/battle/battle_anim.h" #include "constants/graphics.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02235254.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02225864.h" +#include "battle_anim/ov12_02235254.h" #include "pch/global_pch.h" #include "battle_script_battlers.h" diff --git a/src/overlay012/ov12_022346A4.c b/src/battle_anim/ov12_022346A4.c similarity index 98% rename from src/overlay012/ov12_022346A4.c rename to src/battle_anim/ov12_022346A4.c index 911671e17d..83bba463ca 100644 --- a/src/overlay012/ov12_022346A4.c +++ b/src/battle_anim/ov12_022346A4.c @@ -1,11 +1,11 @@ -#include "overlay012/ov12_022346A4.h" +#include "battle_anim/ov12_022346A4.h" #include #include -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02235254.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02225864.h" +#include "battle_anim/ov12_02235254.h" #include "heap.h" #include "pokemon_sprite.h" diff --git a/src/overlay012/ov12_02234E44.c b/src/battle_anim/ov12_02234E44.c similarity index 98% rename from src/overlay012/ov12_02234E44.c rename to src/battle_anim/ov12_02234E44.c index f9b6c3f908..96a6934849 100644 --- a/src/overlay012/ov12_02234E44.c +++ b/src/battle_anim/ov12_02234E44.c @@ -1,4 +1,4 @@ -#include "overlay012/ov12_02234E44.h" +#include "battle_anim/ov12_02234E44.h" #include "nitro/os/common/emulator.h" #include @@ -8,8 +8,8 @@ #include "constants/battle/battle_anim.h" #include "constants/graphics.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02235254.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02235254.h" #include "bg_window.h" #include "graphics.h" diff --git a/src/overlay012/ov12_02235254.c b/src/battle_anim/ov12_02235254.c similarity index 99% rename from src/overlay012/ov12_02235254.c rename to src/battle_anim/ov12_02235254.c index 3c2c735b96..58d3746e15 100644 --- a/src/overlay012/ov12_02235254.c +++ b/src/battle_anim/ov12_02235254.c @@ -1,4 +1,4 @@ -#include "overlay012/ov12_02235254.h" +#include "battle_anim/ov12_02235254.h" #include #include @@ -6,8 +6,8 @@ #include "constants/battle.h" #include "constants/battle/battle_anim.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_02235254.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_02235254.h" #include "camera.h" #include "fx_util.h" diff --git a/src/overlay012/ov12_02235E94.c b/src/battle_anim/ov12_02235E94.c similarity index 99% rename from src/overlay012/ov12_02235E94.c rename to src/battle_anim/ov12_02235E94.c index 7d1464d170..5940e01294 100644 --- a/src/overlay012/ov12_02235E94.c +++ b/src/battle_anim/ov12_02235E94.c @@ -1,19 +1,19 @@ -#include "overlay012/ov12_02235E94.h" +#include "battle_anim/ov12_02235E94.h" #include #include #include "struct_defs/seal_case.h" -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_022237EC.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02235254.h" -#include "overlay012/ov12_02237E54.h" -#include "overlay012/struct_ov12_02223764.h" -#include "overlay012/struct_ov12_02236030.h" -#include "overlay012/struct_ov12_02236690.h" -#include "overlay012/struct_ov12_02237728.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_022237EC.h" +#include "battle_anim/ov12_02225864.h" +#include "battle_anim/ov12_02235254.h" +#include "battle_anim/ov12_02237E54.h" +#include "battle_anim/struct_ov12_02223764.h" +#include "battle_anim/struct_ov12_02236030.h" +#include "battle_anim/struct_ov12_02236690.h" +#include "battle_anim/struct_ov12_02237728.h" #include "heap.h" #include "math_util.h" diff --git a/src/overlay012/ov12_02237E54.c b/src/battle_anim/ov12_02237E54.c similarity index 96% rename from src/overlay012/ov12_02237E54.c rename to src/battle_anim/ov12_02237E54.c index a80c509a06..00c34a5c93 100644 --- a/src/overlay012/ov12_02237E54.c +++ b/src/battle_anim/ov12_02237E54.c @@ -1,4 +1,4 @@ -#include "overlay012/ov12_02237E54.h" +#include "battle_anim/ov12_02237E54.h" #include #include diff --git a/src/overlay012/ov12_02237EFC.c b/src/battle_anim/ov12_02237EFC.c similarity index 95% rename from src/overlay012/ov12_02237EFC.c rename to src/battle_anim/ov12_02237EFC.c index 0adadce589..6ada812084 100644 --- a/src/overlay012/ov12_02237EFC.c +++ b/src/battle_anim/ov12_02237EFC.c @@ -1,12 +1,12 @@ -#include "overlay012/ov12_02237EFC.h" +#include "battle_anim/ov12_02237EFC.h" #include #include -#include "overlay012/battle_anim_system.h" -#include "overlay012/ov12_022237EC.h" -#include "overlay012/struct_ov12_02237EFC.h" -#include "overlay012/struct_ov12_02237F38.h" +#include "battle_anim/battle_anim_system.h" +#include "battle_anim/ov12_022237EC.h" +#include "battle_anim/struct_ov12_02237EFC.h" +#include "battle_anim/struct_ov12_02237F38.h" #include "heap.h" #include "particle_system.h" diff --git a/src/overlay012/ov12_022380BC.c b/src/battle_anim/ov12_022380BC.c similarity index 96% rename from src/overlay012/ov12_022380BC.c rename to src/battle_anim/ov12_022380BC.c index 83d9d0a2b7..457a917456 100644 --- a/src/overlay012/ov12_022380BC.c +++ b/src/battle_anim/ov12_022380BC.c @@ -1,12 +1,12 @@ -#include "overlay012/ov12_022380BC.h" +#include "battle_anim/ov12_022380BC.h" #include #include -#include "overlay012/const_ov12_0223B0A0.h" -#include "overlay012/const_ov12_0223B0B8.h" -#include "overlay012/const_ov12_0223B0DC.h" -#include "overlay012/struct_ov12_022380DC.h" +#include "battle_anim/const_ov12_0223B0A0.h" +#include "battle_anim/const_ov12_0223B0B8.h" +#include "battle_anim/const_ov12_0223B0DC.h" +#include "battle_anim/struct_ov12_022380DC.h" #include "narc.h" #include "pokemon.h" diff --git a/src/meson.build b/src/meson.build index 759a857e01..4564e34384 100644 --- a/src/meson.build +++ b/src/meson.build @@ -491,29 +491,29 @@ pokeplatinum_c = files( 'overlay010/ov10_0221F800.c', 'overlay011/move_palettes.c', 'overlay011/particle_helper.c', - 'overlay012/is_form_symmetrical.c', - 'overlay012/battle_anim_system.c', - 'overlay012/ov12_022237EC.c', - 'overlay012/ov12_0222389C.c', - 'overlay012/ov12_0222421C.c', - 'overlay012/ov12_02225104.c', - 'overlay012/ov12_02225640.c', - 'overlay012/ov12_02225864.c', - 'overlay012/ov12_02226998.c', - 'overlay012/ov12_022269C0.c', - 'overlay012/ov12_02226B84.c', - 'overlay012/ov12_0222AC70.c', - 'overlay012/ov12_0222D6B0.c', - 'overlay012/ov12_0222E784.c', - 'overlay012/ov12_0222E91C.c', - 'overlay012/ov12_0222F700.c', - 'overlay012/ov12_022346A4.c', - 'overlay012/ov12_02234E44.c', - 'overlay012/ov12_02235254.c', - 'overlay012/ov12_02235E94.c', - 'overlay012/ov12_02237E54.c', - 'overlay012/ov12_02237EFC.c', - 'overlay012/ov12_022380BC.c', + 'battle_anim/is_form_symmetrical.c', + 'battle_anim/battle_anim_system.c', + 'battle_anim/ov12_022237EC.c', + 'battle_anim/ov12_0222389C.c', + 'battle_anim/ov12_0222421C.c', + 'battle_anim/ov12_02225104.c', + 'battle_anim/ov12_02225640.c', + 'battle_anim/ov12_02225864.c', + 'battle_anim/ov12_02226998.c', + 'battle_anim/ov12_022269C0.c', + 'battle_anim/ov12_02226B84.c', + 'battle_anim/ov12_0222AC70.c', + 'battle_anim/ov12_0222D6B0.c', + 'battle_anim/ov12_0222E784.c', + 'battle_anim/ov12_0222E91C.c', + 'battle_anim/ov12_0222F700.c', + 'battle_anim/ov12_022346A4.c', + 'battle_anim/ov12_02234E44.c', + 'battle_anim/ov12_02235254.c', + 'battle_anim/ov12_02235E94.c', + 'battle_anim/ov12_02237E54.c', + 'battle_anim/ov12_02237EFC.c', + 'battle_anim/ov12_022380BC.c', 'overlay013/battle_party.c', 'overlay013/ov13_02221A88.c', 'overlay013/ov13_02224500.c', diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index 618578d781..dfe9703fa8 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -6,7 +6,7 @@ #include "struct_defs/struct_02099F80.h" #include "overlay011/particle_helper.h" -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "overlay017/const_ov17_022536B4.h" #include "overlay017/ov17_0223F118.h" #include "overlay017/ov17_0223F7E4.h" @@ -54,7 +54,7 @@ #include "vram_transfer.h" FS_EXTERN_OVERLAY(overlay11); -FS_EXTERN_OVERLAY(overlay12); +FS_EXTERN_OVERLAY(battle_anim); FS_EXTERN_OVERLAY(overlay22); static void ov17_0223B728(BgConfig *param0); @@ -375,7 +375,7 @@ int ov17_0223B580(ApplicationManager *appMan, int *param1) sub_02095A24(); sub_02039794(); Overlay_UnloadByID(FS_OVERLAY_ID(overlay11)); - Overlay_UnloadByID(FS_OVERLAY_ID(overlay12)); + Overlay_UnloadByID(FS_OVERLAY_ID(battle_anim)); Overlay_UnloadByID(FS_OVERLAY_ID(overlay22)); return 1; diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index 76bd94dda2..018fc65dc5 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -46,7 +46,7 @@ #include "vram_transfer.h" FS_EXTERN_OVERLAY(overlay11); -FS_EXTERN_OVERLAY(overlay12); +FS_EXTERN_OVERLAY(battle_anim); FS_EXTERN_OVERLAY(overlay22); static void ov17_0223D0C8(void *param0); @@ -340,7 +340,7 @@ int ov17_0223CF8C(ApplicationManager *appMan, int *param1) sub_02095A24(); sub_02039794(); Overlay_UnloadByID(FS_OVERLAY_ID(overlay11)); - Overlay_UnloadByID(FS_OVERLAY_ID(overlay12)); + Overlay_UnloadByID(FS_OVERLAY_ID(battle_anim)); Overlay_UnloadByID(FS_OVERLAY_ID(overlay22)); return 1; diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index 95aa1fc0c6..5dc6a1d48f 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -55,7 +55,7 @@ #include "vram_transfer.h" FS_EXTERN_OVERLAY(overlay11); -FS_EXTERN_OVERLAY(overlay12); +FS_EXTERN_OVERLAY(battle_anim); FS_EXTERN_OVERLAY(overlay22); static void ov17_0223E09C(void *param0); @@ -447,7 +447,7 @@ int ov17_0223DF0C(ApplicationManager *appMan, int *param1) sub_02095A24(); sub_02039794(); Overlay_UnloadByID(FS_OVERLAY_ID(overlay11)); - Overlay_UnloadByID(FS_OVERLAY_ID(overlay12)); + Overlay_UnloadByID(FS_OVERLAY_ID(battle_anim)); Overlay_UnloadByID(FS_OVERLAY_ID(overlay22)); return 1; diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index 5ab573d1f3..fe19eb438e 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -36,7 +36,7 @@ #include "unk_02012744.h" FS_EXTERN_OVERLAY(overlay11); -FS_EXTERN_OVERLAY(overlay12); +FS_EXTERN_OVERLAY(battle_anim); FS_EXTERN_OVERLAY(overlay22); static void ov17_0223F6E8(SysTask *param0, void *param1); @@ -73,7 +73,7 @@ static const struct { static void NitroStaticInit(void) { Overlay_LoadByID(FS_OVERLAY_ID(overlay11), 2); - Overlay_LoadByID(FS_OVERLAY_ID(overlay12), 2); + Overlay_LoadByID(FS_OVERLAY_ID(battle_anim), 2); Overlay_LoadByID(FS_OVERLAY_ID(overlay22), 2); } diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index d1fc967405..8ce5552bf9 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -6,7 +6,7 @@ #include "struct_defs/struct_020954F0.h" #include "struct_defs/struct_02095C48.h" -#include "overlay012/is_form_symmetrical.h" +#include "battle_anim/is_form_symmetrical.h" #include "overlay017/const_ov17_022536B4.h" #include "overlay017/ov17_0223B140.h" #include "overlay017/ov17_0223F118.h" diff --git a/src/overlay017/ov17_02243C28.c b/src/overlay017/ov17_02243C28.c index eadf03bdc7..d12414526c 100644 --- a/src/overlay017/ov17_02243C28.c +++ b/src/overlay017/ov17_02243C28.c @@ -5,7 +5,7 @@ #include "battle/battle_anim_battler_context.h" #include "battle/struct_ov16_02265BBC.h" -#include "overlay012/battle_anim_system.h" +#include "battle_anim/battle_anim_system.h" #include "overlay017/ov17_0223F7E4.h" #include "overlay017/ov17_022413D8.h" #include "overlay017/ov17_0224F18C.h" diff --git a/src/overlay017/ov17_02247A48.c b/src/overlay017/ov17_02247A48.c index 4921f5900c..55bc8e3132 100644 --- a/src/overlay017/ov17_02247A48.c +++ b/src/overlay017/ov17_02247A48.c @@ -3,8 +3,8 @@ #include #include -#include "overlay012/ov12_02235E94.h" -#include "overlay012/struct_ov12_02237728.h" +#include "battle_anim/ov12_02235E94.h" +#include "battle_anim/struct_ov12_02237728.h" #include "overlay017/ov17_022476F8.h" #include "overlay017/ov17_0224F18C.h" #include "overlay017/struct_ov17_02243C28.h" diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index 620f2e03a2..d53e1ed030 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -43,7 +43,7 @@ #include "vram_transfer.h" FS_EXTERN_OVERLAY(overlay11); -FS_EXTERN_OVERLAY(overlay12); +FS_EXTERN_OVERLAY(battle_anim); FS_EXTERN_OVERLAY(overlay22); static void ov17_0224FA24(void *param0); @@ -340,7 +340,7 @@ int ov17_0224F86C(ApplicationManager *appMan, int *param1) sub_02039794(); Overlay_UnloadByID(FS_OVERLAY_ID(overlay11)); - Overlay_UnloadByID(FS_OVERLAY_ID(overlay12)); + Overlay_UnloadByID(FS_OVERLAY_ID(battle_anim)); Overlay_UnloadByID(FS_OVERLAY_ID(overlay22)); return 1; diff --git a/src/overlay076/ov76_0223B140.c b/src/overlay076/ov76_0223B140.c index e2f9db4320..3d34991ef0 100644 --- a/src/overlay076/ov76_0223B140.c +++ b/src/overlay076/ov76_0223B140.c @@ -6,7 +6,7 @@ #include "struct_defs/seal_case.h" -#include "overlay012/ov12_02237E54.h" +#include "battle_anim/ov12_02237E54.h" #include "overlay076/struct_ov76_0223B52C.h" #include "overlay076/struct_ov76_0223DE00.h" @@ -19,12 +19,12 @@ #include "unk_02097B18.h" FS_EXTERN_OVERLAY(overlay11); -FS_EXTERN_OVERLAY(overlay12); +FS_EXTERN_OVERLAY(battle_anim); static void NitroStaticInit(void) { Overlay_LoadByID(FS_OVERLAY_ID(overlay11), 2); - Overlay_LoadByID(FS_OVERLAY_ID(overlay12), 2); + Overlay_LoadByID(FS_OVERLAY_ID(battle_anim), 2); } static void ov76_0223B15C(TouchScreenRect *rect, u8 param1, u8 param2) diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index 7174f5e725..73625e183a 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 "overlay012/ov12_02225864.h" +#include "battle_anim/ov12_02225864.h" #include "overlay076/const_ov76_0223EF3C.h" #include "overlay076/ov76_0223D338.h" #include "overlay076/struct_ov76_0223BBAC.h" diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index 3c2d5940bb..41033e30f5 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -11,9 +11,9 @@ #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_02099F80.h" -#include "overlay012/ov12_02235E94.h" -#include "overlay012/struct_ov12_02236030.h" -#include "overlay012/struct_ov12_02237728.h" +#include "battle_anim/ov12_02235E94.h" +#include "battle_anim/struct_ov12_02236030.h" +#include "battle_anim/struct_ov12_02237728.h" #include "overlay076/const_ov76_0223EF3C.h" #include "overlay076/funcptr_ov76_0223D674.h" #include "overlay076/ov76_0223B140.h" diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index 118dfd8f86..5ed418ce44 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -47,7 +47,7 @@ #include "constdata/const_020F64C0.h" FS_EXTERN_OVERLAY(overlay11); -FS_EXTERN_OVERLAY(overlay12); +FS_EXTERN_OVERLAY(battle_anim); FS_EXTERN_OVERLAY(overlay76); typedef struct { @@ -262,7 +262,7 @@ static int sub_02097D88(ApplicationManager *appMan, int *param1) Heap_Destroy(HEAP_ID_53); Overlay_UnloadByID(FS_OVERLAY_ID(overlay11)); - Overlay_UnloadByID(FS_OVERLAY_ID(overlay12)); + Overlay_UnloadByID(FS_OVERLAY_ID(battle_anim)); return 1; }