diff --git a/include/battle/healthbar.h b/include/battle/healthbar.h index 939e9d791..f7490b116 100644 --- a/include/battle/healthbar.h +++ b/include/battle/healthbar.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV16_02266F1C_H #include "struct_decls/cell_actor_data.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "battle/struct_ov16_022674C4.h" +#include "palette.h" + #define HEALTHBAR_INFO_NONE 0 #define HEALTHBAR_INFO_HP_GAUGE (1 << 0) #define HEALTHBAR_INFO_CURRENT_HP (1 << 1) diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index b9251e609..87f1b4687 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -7,7 +7,6 @@ #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -32,6 +31,7 @@ #include "bg_window.h" #include "game_options.h" #include "message.h" +#include "palette.h" #include "pokemon.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/battle/ov16_0226DB7C.h b/include/battle/ov16_0226DB7C.h index cde1f9d8e..58df2ce9c 100644 --- a/include/battle/ov16_0226DB7C.h +++ b/include/battle/ov16_0226DB7C.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_OV16_0226DB7C_H #define POKEPLATINUM_OV16_0226DB7C_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "battle/struct_ov16_0226DC24_decl.h" +#include "palette.h" + void ov16_0226DB7C(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7); void ov16_0226DBFC(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); diff --git a/include/battle/ov16_0226DE44.h b/include/battle/ov16_0226DE44.h index 11030c2d9..d884ea41e 100644 --- a/include/battle/ov16_0226DE44.h +++ b/include/battle/ov16_0226DE44.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_OV16_0226DE44_H #define POKEPLATINUM_OV16_0226DE44_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "battle/struct_ov16_0226DEEC_decl.h" +#include "palette.h" + void ov16_0226DE44(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7); void ov16_0226DEC4(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); diff --git a/include/battle/party_gauge.h b/include/battle/party_gauge.h index c144aee84..0d77d518b 100644 --- a/include/battle/party_gauge.h +++ b/include/battle/party_gauge.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_BATTLE_PARTY_GAUGE_H #define POKEPLATINUM_BATTLE_PARTY_GAUGE_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "battle/struct_ov16_0226D160_decl.h" +#include "palette.h" + enum PartyGaugeSide { PARTY_GAUGE_OURS, PARTY_GAUGE_THEIRS, diff --git a/include/battle/struct_ov16_02264408.h b/include/battle/struct_ov16_02264408.h index 80a764070..c320b5274 100644 --- a/include/battle/struct_ov16_02264408.h +++ b/include/battle/struct_ov16_02264408.h @@ -2,7 +2,6 @@ #define POKEPLATINUM_STRUCT_OV16_02264408_H #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_defs/chatot_cry.h" @@ -10,6 +9,7 @@ #include "battle/struct_ov16_02264408_sub1.h" #include "bg_window.h" +#include "palette.h" typedef struct { SpriteRenderer *unk_00; diff --git a/include/inlines.h b/include/inlines.h index 6f707affc..e10b68c94 100644 --- a/include/inlines.h +++ b/include/inlines.h @@ -15,10 +15,10 @@ #include "field_script_context.h" #include "heap.h" #include "map_header.h" +#include "palette.h" #include "script_manager.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0201D15C.h" #include "unk_0206A8DC.h" diff --git a/include/overlay011/ov11_0221F800.h b/include/overlay011/ov11_0221F800.h index 92bd8c43b..c5c4dd97a 100644 --- a/include/overlay011/ov11_0221F800.h +++ b/include/overlay011/ov11_0221F800.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV11_0221F800_H #define POKEPLATINUM_OV11_0221F800_H -#include "struct_decls/struct_02002F38_decl.h" +#include "palette.h" const u16 *ov11_0221F800(int param0); void ov11_0221F81C(PaletteData *param0, int param1, int param2, int param3, int param4); diff --git a/include/overlay012/ov12_0221FC20.h b/include/overlay012/ov12_0221FC20.h index ea5821b03..10425677c 100644 --- a/include/overlay012/ov12_0221FC20.h +++ b/include/overlay012/ov12_0221FC20.h @@ -4,7 +4,6 @@ #include "struct_decls/battle_system.h" #include "struct_decls/cell_actor_data.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" @@ -19,6 +18,7 @@ #include "overlay012/struct_ov12_022380DC.h" #include "bg_window.h" +#include "palette.h" #include "spl.h" #include "sys_task_manager.h" diff --git a/include/overlay012/ov12_02225864.h b/include/overlay012/ov12_02225864.h index e586f5570..9556fcd89 100644 --- a/include/overlay012/ov12_02225864.h +++ b/include/overlay012/ov12_02225864.h @@ -3,7 +3,6 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "overlay012/funcptr_ov12_02226274.h" #include "overlay012/struct_ov12_0221FCDC_decl.h" @@ -15,6 +14,8 @@ #include "overlay012/struct_ov12_0222660C_decl.h" #include "overlay012/struct_ov12_022267D4_decl.h" +#include "palette.h" + void ov12_02225864(int param0, int param1, s16 *param2, s16 *param3); void ov12_02225898(UnkStruct_ov12_0221FCDC *param0, int param1, s16 *param2, s16 *param3); s16 ov12_022258E0(UnkStruct_ov12_0221FCDC *param0, int param1, int param2); diff --git a/include/overlay012/struct_ov12_02223764_sub1.h b/include/overlay012/struct_ov12_02223764_sub1.h index 9ac5e719d..26b04171e 100644 --- a/include/overlay012/struct_ov12_02223764_sub1.h +++ b/include/overlay012/struct_ov12_02223764_sub1.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_OV12_02223764_SUB1_H #define POKEPLATINUM_STRUCT_OV12_02223764_SUB1_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" +#include "palette.h" + typedef struct { SpriteRenderer *unk_00; SpriteGfxHandler *unk_04; diff --git a/include/overlay012/struct_ov12_0223595C.h b/include/overlay012/struct_ov12_0223595C.h index d3b4b418e..aadb41572 100644 --- a/include/overlay012/struct_ov12_0223595C.h +++ b/include/overlay012/struct_ov12_0223595C.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV12_0223595C_H #define POKEPLATINUM_STRUCT_OV12_0223595C_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "overlay012/struct_ov12_0221FCDC_decl.h" #include "bg_window.h" +#include "palette.h" typedef struct { u8 unk_00; diff --git a/include/overlay012/struct_ov12_02237728.h b/include/overlay012/struct_ov12_02237728.h index b79bf7da3..43528987d 100644 --- a/include/overlay012/struct_ov12_02237728.h +++ b/include/overlay012/struct_ov12_02237728.h @@ -2,9 +2,10 @@ #define POKEPLATINUM_STRUCT_OV12_02237728_H #include "struct_decls/battle_system.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" +#include "palette.h" + typedef struct BallThrow { int type; int heapID; diff --git a/include/overlay013/struct_ov13_022213F0.h b/include/overlay013/struct_ov13_022213F0.h index dbe07fa40..3a66aef50 100644 --- a/include/overlay013/struct_ov13_022213F0.h +++ b/include/overlay013/struct_ov13_022213F0.h @@ -2,7 +2,6 @@ #define POKEPLATINUM_STRUCT_OV13_022213F0_H #include "struct_decls/cell_actor_data.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -12,6 +11,7 @@ #include "bg_window.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/overlay013/struct_ov13_02227244.h b/include/overlay013/struct_ov13_02227244.h index a48e9c654..fbad6dd8f 100644 --- a/include/overlay013/struct_ov13_02227244.h +++ b/include/overlay013/struct_ov13_02227244.h @@ -2,7 +2,6 @@ #define POKEPLATINUM_STRUCT_OV13_02227244_H #include "struct_decls/cell_actor_data.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -13,6 +12,7 @@ #include "bag.h" #include "bg_window.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/overlay017/ov17_0223F118.h b/include/overlay017/ov17_0223F118.h index dd9aa7135..69d22a347 100644 --- a/include/overlay017/ov17_0223F118.h +++ b/include/overlay017/ov17_0223F118.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_OV17_0223F118_H #define POKEPLATINUM_OV17_0223F118_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" @@ -13,6 +12,7 @@ #include "overlay017/struct_ov17_0223F744.h" #include "bg_window.h" +#include "palette.h" #include "strbuf.h" #include "text.h" diff --git a/include/overlay017/ov17_022413D8.h b/include/overlay017/ov17_022413D8.h index 1f5e49575..be9090b67 100644 --- a/include/overlay017/ov17_022413D8.h +++ b/include/overlay017/ov17_022413D8.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_OV17_022413D8_H #define POKEPLATINUM_OV17_022413D8_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -15,6 +14,8 @@ #include "overlay017/struct_ov17_02246F24.h" #include "overlay017/struct_ov17_022472F8.h" +#include "palette.h" + void ov17_022413D8(void); void ov17_022413E4(UnkStruct_ov17_02246F24 *param0, int param1, int param2); void ov17_02241428(UnkStruct_ov17_02246F24 *param0); diff --git a/include/overlay017/ov17_02252AB0.h b/include/overlay017/ov17_02252AB0.h index 2d0f7abbc..c3f427567 100644 --- a/include/overlay017/ov17_02252AB0.h +++ b/include/overlay017/ov17_02252AB0.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_OV17_02252AB0_H #define POKEPLATINUM_OV17_02252AB0_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "overlay017/struct_ov17_02252B48_decl.h" +#include "palette.h" + void ov17_02252AB0(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, u32 param3, u32 param4, u32 param5, u32 param6); void ov17_02252B20(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); UnkStruct_ov17_02252B48 *ov17_02252B48(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); diff --git a/include/overlay017/struct_ov17_0223F744.h b/include/overlay017/struct_ov17_0223F744.h index 1632ebd52..7135354ae 100644 --- a/include/overlay017/struct_ov17_0223F744.h +++ b/include/overlay017/struct_ov17_0223F744.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV17_0223F744_H #define POKEPLATINUM_STRUCT_OV17_0223F744_H -#include "struct_decls/struct_02002F38_decl.h" - +#include "palette.h" #include "sys_task_manager.h" typedef struct { diff --git a/include/overlay017/struct_ov17_0223F88C.h b/include/overlay017/struct_ov17_0223F88C.h index b9cc1061b..60f81c776 100644 --- a/include/overlay017/struct_ov17_0223F88C.h +++ b/include/overlay017/struct_ov17_0223F88C.h @@ -3,7 +3,6 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -16,6 +15,7 @@ #include "bg_window.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/overlay017/struct_ov17_0224145C.h b/include/overlay017/struct_ov17_0224145C.h index 32cde3488..94c86e270 100644 --- a/include/overlay017/struct_ov17_0224145C.h +++ b/include/overlay017/struct_ov17_0224145C.h @@ -1,8 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV17_0224145C_H #define POKEPLATINUM_STRUCT_OV17_0224145C_H -#include "struct_decls/struct_02002F38_decl.h" - +#include "palette.h" #include "sys_task_manager.h" typedef struct { diff --git a/include/overlay017/struct_ov17_022476F8.h b/include/overlay017/struct_ov17_022476F8.h index b3ca3bb7f..35753a725 100644 --- a/include/overlay017/struct_ov17_022476F8.h +++ b/include/overlay017/struct_ov17_022476F8.h @@ -3,7 +3,6 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -14,6 +13,7 @@ #include "bg_window.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/overlay017/struct_ov17_0224A1EC.h b/include/overlay017/struct_ov17_0224A1EC.h index 8611b2103..a4c3f5512 100644 --- a/include/overlay017/struct_ov17_0224A1EC.h +++ b/include/overlay017/struct_ov17_0224A1EC.h @@ -3,7 +3,6 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -24,6 +23,7 @@ #include "bg_window.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" #include "sys_task_manager.h" diff --git a/include/overlay017/struct_ov17_022507C4.h b/include/overlay017/struct_ov17_022507C4.h index 7cede5962..15f31b058 100644 --- a/include/overlay017/struct_ov17_022507C4.h +++ b/include/overlay017/struct_ov17_022507C4.h @@ -3,7 +3,6 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -15,6 +14,7 @@ #include "bg_window.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" #include "sys_task_manager.h" diff --git a/include/overlay021/struct_ov21_021E8E0C.h b/include/overlay021/struct_ov21_021E8E0C.h index e988b6ac9..12eea450b 100644 --- a/include/overlay021/struct_ov21_021E8E0C.h +++ b/include/overlay021/struct_ov21_021E8E0C.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_OV21_021E8E0C_H #define POKEPLATINUM_STRUCT_OV21_021E8E0C_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "bg_window.h" +#include "palette.h" #include "pokemon.h" typedef struct { diff --git a/include/overlay062/struct_ov62_0223118C.h b/include/overlay062/struct_ov62_0223118C.h index 65ad042d3..c4cad25cf 100644 --- a/include/overlay062/struct_ov62_0223118C.h +++ b/include/overlay062/struct_ov62_0223118C.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV62_0223118C_H #define POKEPLATINUM_STRUCT_OV62_0223118C_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -17,6 +16,7 @@ #include "bg_window.h" #include "message.h" +#include "palette.h" #include "touch_screen.h" typedef struct { diff --git a/include/overlay062/struct_ov62_02246BF4_sub2.h b/include/overlay062/struct_ov62_02246BF4_sub2.h index 183e6d83d..349ee7505 100644 --- a/include/overlay062/struct_ov62_02246BF4_sub2.h +++ b/include/overlay062/struct_ov62_02246BF4_sub2.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV62_02246BF4_SUB2_H #define POKEPLATINUM_STRUCT_OV62_02246BF4_SUB2_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02023FCC_decl.h" #include "bg_window.h" +#include "palette.h" #include "touch_screen.h" typedef struct { diff --git a/include/overlay063/ov63_0222AE60.h b/include/overlay063/ov63_0222AE60.h index 6a3e6df17..13460fdba 100644 --- a/include/overlay063/ov63_0222AE60.h +++ b/include/overlay063/ov63_0222AE60.h @@ -1,13 +1,12 @@ #ifndef POKEPLATINUM_OV63_0222AE60_H #define POKEPLATINUM_OV63_0222AE60_H -#include "struct_decls/struct_02002F38_decl.h" - #include "overlay063/struct_ov63_0222AE60_decl.h" #include "overlay063/struct_ov63_0222BB38_decl.h" #include "overlay064/struct_ov64_022302EC.h" #include "cell_actor.h" +#include "palette.h" UnkStruct_ov63_0222AE60 *ov63_0222AE60(CellActorCollection *param0, PaletteData *param1, u32 param2, u32 param3); void ov63_0222AF14(UnkStruct_ov63_0222AE60 *param0); diff --git a/include/overlay063/ov63_0222CCE4.h b/include/overlay063/ov63_0222CCE4.h index 8f19ed850..3b373f605 100644 --- a/include/overlay063/ov63_0222CCE4.h +++ b/include/overlay063/ov63_0222CCE4.h @@ -1,14 +1,13 @@ #ifndef POKEPLATINUM_OV63_0222CCE4_H #define POKEPLATINUM_OV63_0222CCE4_H -#include "struct_decls/struct_02002F38_decl.h" - #include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay063/struct_ov63_0222CD2C.h" #include "overlay063/struct_ov63_0222CE44.h" #include "cell_actor.h" +#include "palette.h" UnkStruct_ov63_0222CD2C *ov63_0222CCE4(CellActorCollection *param0, PaletteData *param1, u32 param2, u32 param3, u32 param4); UnkStruct_ov63_0222CD2C *ov63_0222CD2C(CellActorCollection *param0, PaletteData *param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6); diff --git a/include/overlay076/ov76_0223B870.h b/include/overlay076/ov76_0223B870.h index 65ce96611..7fb855336 100644 --- a/include/overlay076/ov76_0223B870.h +++ b/include/overlay076/ov76_0223B870.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_OV76_0223B870_H #define POKEPLATINUM_OV76_0223B870_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -11,6 +10,7 @@ #include "overlay076/struct_ov76_0223DE00.h" #include "bg_window.h" +#include "palette.h" void ov76_0223B8A8(UnkStruct_ov76_0223DE00 *param0); void ov76_0223B8C4(UnkStruct_ov76_0223DE00 *param0); diff --git a/include/overlay076/struct_ov76_0223C398.h b/include/overlay076/struct_ov76_0223C398.h index 23dba338e..a47c5c62e 100644 --- a/include/overlay076/struct_ov76_0223C398.h +++ b/include/overlay076/struct_ov76_0223C398.h @@ -5,7 +5,6 @@ #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -21,6 +20,7 @@ #include "overlay022/struct_ov22_02258A48.h" #include "bg_window.h" +#include "palette.h" #include "touch_screen.h" typedef struct { diff --git a/include/overlay099/struct_ov99_021D2CB0.h b/include/overlay099/struct_ov99_021D2CB0.h index 5274d36cc..eb514c3fc 100644 --- a/include/overlay099/struct_ov99_021D2CB0.h +++ b/include/overlay099/struct_ov99_021D2CB0.h @@ -2,7 +2,6 @@ #define POKEPLATINUM_STRUCT_OV99_021D2CB0_H #include "struct_decls/cell_actor_data.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -18,6 +17,7 @@ #include "camera.h" #include "easy3d_object.h" #include "message.h" +#include "palette.h" #include "sys_task_manager.h" typedef struct { diff --git a/include/overlay100/struct_ov100_021D46C8.h b/include/overlay100/struct_ov100_021D46C8.h index e278eaea9..59d9dca53 100644 --- a/include/overlay100/struct_ov100_021D46C8.h +++ b/include/overlay100/struct_ov100_021D46C8.h @@ -4,7 +4,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -18,6 +17,7 @@ #include "bg_window.h" #include "camera.h" #include "message.h" +#include "palette.h" typedef struct { NARC *unk_00; diff --git a/include/overlay104/ov104_0223D768.h b/include/overlay104/ov104_0223D768.h index 5e7ab554b..84d93604c 100644 --- a/include/overlay104/ov104_0223D768.h +++ b/include/overlay104/ov104_0223D768.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV104_0223D768_H #include "struct_decls/cell_actor_data.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" +#include "palette.h" + void ov104_0223D768(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, PaletteData *param3, u16 param4); void ov104_0223D7EC(SpriteGfxHandler *param0, u16 param1); CellActorData *ov104_0223D828(SpriteRenderer *param0, SpriteGfxHandler *param1, u16 param2); diff --git a/include/overlay104/ov104_0223D9E4.h b/include/overlay104/ov104_0223D9E4.h index 345d23e2d..82d9b20ba 100644 --- a/include/overlay104/ov104_0223D9E4.h +++ b/include/overlay104/ov104_0223D9E4.h @@ -1,11 +1,10 @@ #ifndef POKEPLATINUM_OV104_0223D9E4_H #define POKEPLATINUM_OV104_0223D9E4_H -#include "struct_decls/struct_02002F38_decl.h" - #include "overlay104/struct_ov104_0223DA28_decl.h" #include "bg_window.h" +#include "palette.h" UnkStruct_ov104_0223DA28 *ov104_0223D9E4(BgConfig *param0, PaletteData *param1); void ov104_0223DA28(UnkStruct_ov104_0223DA28 *param0); diff --git a/include/overlay104/struct_ov104_0223C4CC.h b/include/overlay104/struct_ov104_0223C4CC.h index ab38c62d4..29139dfc9 100644 --- a/include/overlay104/struct_ov104_0223C4CC.h +++ b/include/overlay104/struct_ov104_0223C4CC.h @@ -2,7 +2,6 @@ #define POKEPLATINUM_STRUCT_OV104_0223C4CC_H #include "struct_decls/cell_actor_data.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_0209B75C_decl.h" @@ -21,6 +20,7 @@ #include "overlay104/struct_ov104_0223D5F0_decl.h" #include "bg_window.h" +#include "palette.h" #include "sys_task_manager.h" typedef struct UnkStruct_ov104_0223C4CC_t { diff --git a/include/overlay116/struct_ov116_022649E4.h b/include/overlay116/struct_ov116_022649E4.h index 3aaa679ee..a1d353cd3 100644 --- a/include/overlay116/struct_ov116_022649E4.h +++ b/include/overlay116/struct_ov116_022649E4.h @@ -3,7 +3,6 @@ #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -13,6 +12,7 @@ #include "bg_window.h" #include "camera.h" +#include "palette.h" typedef struct { NARC *unk_00; diff --git a/include/overlay117/struct_ov117_02261280.h b/include/overlay117/struct_ov117_02261280.h index aa539247e..47d9ea71d 100644 --- a/include/overlay117/struct_ov117_02261280.h +++ b/include/overlay117/struct_ov117_02261280.h @@ -3,7 +3,6 @@ #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" @@ -32,6 +31,7 @@ #include "bg_window.h" #include "camera.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" #include "sys_task_manager.h" diff --git a/include/overlay119/ov119_021D0D80.h b/include/overlay119/ov119_021D0D80.h index da6d23e7d..92e051b33 100644 --- a/include/overlay119/ov119_021D0D80.h +++ b/include/overlay119/ov119_021D0D80.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_OV119_021D0D80_H #define POKEPLATINUM_OV119_021D0D80_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02014014_decl.h" #include "struct_defs/struct_0207C690.h" @@ -11,6 +10,7 @@ #include "overlay119/struct_ov119_021D1930.h" #include "bg_window.h" +#include "palette.h" #include "pokemon.h" void ov119_021D0D80(void); diff --git a/include/overlay119/struct_ov119_021D17B8.h b/include/overlay119/struct_ov119_021D17B8.h index 83932b462..99998b8e1 100644 --- a/include/overlay119/struct_ov119_021D17B8.h +++ b/include/overlay119/struct_ov119_021D17B8.h @@ -3,7 +3,6 @@ #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -14,6 +13,7 @@ #include "overlay119/struct_ov119_021D14DC.h" #include "bg_window.h" +#include "palette.h" typedef struct { BgConfig *unk_00; diff --git a/include/unk_02002F38.h b/include/palette.h similarity index 72% rename from include/unk_02002F38.h rename to include/palette.h index aeb10d65a..0c48d7a1f 100644 --- a/include/unk_02002F38.h +++ b/include/palette.h @@ -1,7 +1,42 @@ -#ifndef POKEPLATINUM_UNK_02002F38_H -#define POKEPLATINUM_UNK_02002F38_H +#ifndef POKEPLATINUM_PALETTE_H +#define POKEPLATINUM_PALETTE_H -#include "struct_decls/struct_02002F38_decl.h" +typedef struct { + u16 unk_00_0 : 5; + u16 unk_00_5 : 5; + u16 unk_00_10 : 5; + u16 unk_00_15 : 1; +} UnkStruct_0200393C; + +typedef struct { + u16 unk_00; + u16 unk_02_0 : 6; + u16 unk_02_6 : 5; + u16 unk_02_11 : 5; + u16 unk_04_0 : 15; + u16 unk_04_15 : 1; + u16 unk_06_0 : 4; + u16 unk_06_4 : 6; + u16 : 6; +} UnkStruct_0200330C; + +typedef struct { + u16 *unk_00; + u16 *unk_04; + u32 unk_08; + UnkStruct_0200330C unk_0C; +} UnkStruct_020032D0; + +typedef struct PaletteData { + UnkStruct_020032D0 unk_00[14]; + u16 unk_118_0 : 2; + u16 unk_118_2 : 14; + u16 unk_11A_0 : 14; + u16 unk_11A_14 : 1; + u16 unk_11A_15 : 1; + u8 unk_11C; + u8 unk_11D[3]; +} PaletteData; PaletteData *sub_02002F38(int param0); void sub_02002F54(PaletteData *param0); @@ -30,4 +65,4 @@ void sub_02003A2C(PaletteData *param0, int param1, u16 param2, u8 param3, u16 pa void sub_02003A8C(u16 *param0, int param1, int param2, int param3, int param4); void sub_02003B08(PaletteData *param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6, int param7, int param8, int param9); -#endif // POKEPLATINUM_UNK_02002F38_H +#endif // POKEPLATINUM_PALETTE_H diff --git a/include/pokemon.h b/include/pokemon.h index 837f399af..bdbe4aaa7 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -10,7 +10,6 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -22,6 +21,7 @@ #include "overlay005/struct_ov5_021DE5D0.h" +#include "palette.h" #include "string.h" #include "trainer_info.h" diff --git a/include/struct_decls/struct_02002F38_decl.h b/include/struct_decls/struct_02002F38_decl.h deleted file mode 100644 index da02ed0d2..000000000 --- a/include/struct_decls/struct_02002F38_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02002F38_DECL_H -#define POKEPLATINUM_STRUCT_02002F38_DECL_H - -typedef struct UnkStruct_02002F38_t PaletteData; - -#endif // POKEPLATINUM_STRUCT_02002F38_DECL_H diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index 5e490a1d8..b02a94916 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -8,7 +8,6 @@ #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/pokemon_animation_sys_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -36,6 +35,7 @@ #include "bg_window.h" #include "game_options.h" #include "message.h" +#include "palette.h" #include "poketch_data.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/struct_defs/struct_020032D0.h b/include/struct_defs/struct_020032D0.h deleted file mode 100644 index 9c5249078..000000000 --- a/include/struct_defs/struct_020032D0.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_020032D0_H -#define POKEPLATINUM_STRUCT_020032D0_H - -#include "struct_defs/struct_0200330C.h" - -typedef struct { - u16 *unk_00; - u16 *unk_04; - u32 unk_08; - UnkStruct_0200330C unk_0C; -} UnkStruct_020032D0; - -#endif // POKEPLATINUM_STRUCT_020032D0_H diff --git a/include/struct_defs/struct_0200330C.h b/include/struct_defs/struct_0200330C.h deleted file mode 100644 index d3d4d7065..000000000 --- a/include/struct_defs/struct_0200330C.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_0200330C_H -#define POKEPLATINUM_STRUCT_0200330C_H - -typedef struct { - u16 unk_00; - u16 unk_02_0 : 6; - u16 unk_02_6 : 5; - u16 unk_02_11 : 5; - u16 unk_04_0 : 15; - u16 unk_04_15 : 1; - u16 unk_06_0 : 4; - u16 unk_06_4 : 6; - u16 : 6; -} UnkStruct_0200330C; - -#endif // POKEPLATINUM_STRUCT_0200330C_H diff --git a/include/struct_defs/struct_0207A778.h b/include/struct_defs/struct_0207A778.h index 824e5943d..0ce0dfcf3 100644 --- a/include/struct_defs/struct_0207A778.h +++ b/include/struct_defs/struct_0207A778.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_0207A778_H #define POKEPLATINUM_STRUCT_0207A778_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02027F8C_decl.h" #include "overlay006/battle_params.h" #include "bg_window.h" +#include "palette.h" typedef struct { BattleParams *unk_00; diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index 83e511ead..7cf4c5c36 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -4,7 +4,6 @@ #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_party_decl.h" @@ -18,6 +17,7 @@ #include "game_records.h" #include "message.h" #include "overlay_manager.h" +#include "palette.h" #include "pokemon.h" #include "poketch_data.h" #include "strbuf.h" diff --git a/include/struct_defs/struct_02089688_sub1.h b/include/struct_defs/struct_02089688_sub1.h index 06ee30a1c..0cbb4bc20 100644 --- a/include/struct_defs/struct_02089688_sub1.h +++ b/include/struct_defs/struct_02089688_sub1.h @@ -2,7 +2,6 @@ #define POKEPLATINUM_STRUCT_02089688_SUB1_H #include "struct_decls/font_oam.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -11,6 +10,7 @@ #include "struct_defs/sprite_manager_allocation.h" #include "bg_window.h" +#include "palette.h" #include "touch_screen.h" typedef struct { diff --git a/include/struct_defs/struct_0208B878_sub1.h b/include/struct_defs/struct_0208B878_sub1.h index 46fe31f20..c5f530982 100644 --- a/include/struct_defs/struct_0208B878_sub1.h +++ b/include/struct_defs/struct_0208B878_sub1.h @@ -1,11 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_0208B878_SUB1_H #define POKEPLATINUM_STRUCT_0208B878_SUB1_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" +#include "palette.h" + typedef struct { NARC *unk_00; SpriteRenderer *unk_04; diff --git a/include/unk_0200C6E4.h b/include/unk_0200C6E4.h index 3932a93be..1cd39590f 100644 --- a/include/unk_0200C6E4.h +++ b/include/unk_0200C6E4.h @@ -7,7 +7,6 @@ #include "constants/palette.h" #include "struct_decls/cell_actor_data.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -21,6 +20,7 @@ #include "overlay104/struct_ov104_0224133C.h" #include "cell_actor.h" +#include "palette.h" SpriteRenderer *sub_0200C6E4(int param0); SpriteGfxHandler *sub_0200C704(SpriteRenderer *param0); diff --git a/include/unk_0201567C.h b/include/unk_0201567C.h index b5f94fef4..12e4bb15d 100644 --- a/include/unk_0201567C.h +++ b/include/unk_0201567C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0201567C_H #define POKEPLATINUM_UNK_0201567C_H -#include "struct_decls/struct_02002F38_decl.h" +#include "palette.h" void *sub_0201567C(PaletteData *param0, u16 param1, u16 param2, u32 param3); void sub_02015738(void *param0, u8 param1); diff --git a/include/unk_0207C908.h b/include/unk_0207C908.h index 6f882f5cd..01ef934b7 100644 --- a/include/unk_0207C908.h +++ b/include/unk_0207C908.h @@ -4,11 +4,12 @@ #include #include "struct_decls/cell_actor_data.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/sprite_template.h" +#include "palette.h" + u32 sub_0207C908(int param0); u32 sub_0207C920(void); u32 sub_0207C924(void); diff --git a/include/unk_0208B284.h b/include/unk_0208B284.h index 77d16a5d9..b715ca211 100644 --- a/include/unk_0208B284.h +++ b/include/unk_0208B284.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_UNK_0208B284_H #define POKEPLATINUM_UNK_0208B284_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/struct_0208B284.h" #include "struct_defs/struct_0208B878.h" +#include "palette.h" + UnkStruct_0208B878 *sub_0208B284(UnkStruct_0208B284 param0, SpriteRenderer *param1, SpriteGfxHandler *param2, PaletteData *param3); void sub_0208B63C(UnkStruct_0208B878 *param0, int param1); BOOL sub_0208B878(UnkStruct_0208B878 *param0, int param1); diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 89c09f6d5..2517811c1 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -22,7 +22,7 @@ Static main Object main.nef.p/src_unk_020021B0.c.o Object main.nef.p/src_render_text.c.o Object main.nef.p/src_font.c.o - Object main.nef.p/src_unk_02002F38.c.o + Object main.nef.p/src_palette.c.o Object main.nef.p/src_unk_02003B60.c.o Object main.nef.p/src_unk_020041CC.c.o Object main.nef.p/src_unk_02005474.c.o diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index 6c39381d8..401605448 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -8,7 +8,6 @@ #include "struct_decls/battle_system.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -131,13 +130,13 @@ #include "message.h" #include "move_table.h" #include "narc.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200762C.h" diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c index 6435ad10c..35cbef74f 100644 --- a/src/battle/battle_io_command.c +++ b/src/battle/battle_io_command.c @@ -6,7 +6,6 @@ #include "constants/battle/battle_io.h" #include "struct_decls/battle_system.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -75,6 +74,7 @@ #include "flags.h" #include "heap.h" #include "narc.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "unk_0200762C.h" diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index b8d1659d7..212568b8e 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -14,7 +14,6 @@ #include "struct_decls/battle_system.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -59,6 +58,7 @@ #include "message.h" #include "move_table.h" #include "overlay_manager.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "pokemon_icon.h" @@ -69,7 +69,6 @@ #include "touch_screen.h" #include "trainer_data.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006224.h" #include "unk_0200762C.h" diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index 2b9e2664b..efb4acb66 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -6,7 +6,6 @@ #include "constants/heap.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -23,13 +22,13 @@ #include "heap.h" #include "message.h" #include "narc.h" +#include "palette.h" #include "pokemon.h" #include "strbuf.h" #include "string_template.h" #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_0200C440.h" #include "unk_0200C6E4.h" #include "unk_0201D15C.h" diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index ce981eb0b..5869a6d17 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -52,6 +52,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "render_text.h" @@ -61,7 +62,6 @@ #include "sys_task_manager.h" #include "text.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 4e5c51703..b77f81b82 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -14,7 +14,6 @@ #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -55,6 +54,7 @@ #include "heap.h" #include "item.h" #include "message.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "poketch_data.h" @@ -64,7 +64,6 @@ #include "text.h" #include "trainer_data.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200F174.h" diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index 57de02bbe..d39efe87e 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -14,7 +14,7 @@ #include "battle/struct_ov16_02268520.h" #include "narc.h" -#include "unk_02002F38.h" +#include "palette.h" #include "unk_0200C6E4.h" static const SpriteTemplate Unk_ov16_022700CC[] = { diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index da520c581..72970062d 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -5,7 +5,6 @@ #include "struct_decls/battle_system.h" #include "struct_decls/font_oam.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -42,6 +41,7 @@ #include "message.h" #include "message_util.h" #include "move_table.h" +#include "palette.h" #include "pokemon.h" #include "pokemon_icon.h" #include "render_text.h" @@ -51,7 +51,6 @@ #include "sys_task_manager.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" diff --git a/src/battle/ov16_0226DB7C.c b/src/battle/ov16_0226DB7C.c index 74a94be84..d7b0c5f3e 100644 --- a/src/battle/ov16_0226DB7C.c +++ b/src/battle/ov16_0226DB7C.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -12,6 +11,7 @@ #include "heap.h" #include "narc.h" +#include "palette.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_0200C6E4.h" diff --git a/src/battle/ov16_0226DE44.c b/src/battle/ov16_0226DE44.c index 58f3d4aad..0c92255b6 100644 --- a/src/battle/ov16_0226DE44.c +++ b/src/battle/ov16_0226DE44.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -12,6 +11,7 @@ #include "heap.h" #include "narc.h" +#include "palette.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_0200C6E4.h" diff --git a/src/battle/party_gauge.c b/src/battle/party_gauge.c index f53e8e9d8..0d3001110 100644 --- a/src/battle/party_gauge.c +++ b/src/battle/party_gauge.c @@ -7,7 +7,6 @@ #include "constants/palette.h" #include "consts/sdat.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -22,6 +21,7 @@ #include "enums.h" #include "heap.h" #include "narc.h" +#include "palette.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02005474.h" diff --git a/src/meson.build b/src/meson.build index 9008d5388..be673eee9 100644 --- a/src/meson.build +++ b/src/meson.build @@ -20,7 +20,7 @@ pokeplatinum_c = files( 'unk_020021B0.c', 'render_text.c', 'font.c', - 'unk_02002F38.c', + 'palette.c', 'unk_02003B60.c', 'unk_020041CC.c', 'unk_02005474.c', diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c index 212778f15..ad7e0a971 100644 --- a/src/overlay005/encounter_effect.c +++ b/src/overlay005/encounter_effect.c @@ -33,11 +33,11 @@ #include "gx_layers.h" #include "heap.h" #include "narc.h" +#include "palette.h" #include "pokemon.h" #include "sprite_resource.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_0200679C.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" diff --git a/src/overlay005/ov5_021F007C.c b/src/overlay005/ov5_021F007C.c index 03d6fec50..2d4cc1646 100644 --- a/src/overlay005/ov5_021F007C.c +++ b/src/overlay005/ov5_021F007C.c @@ -17,9 +17,9 @@ #include "gx_layers.h" #include "heap.h" #include "map_header.h" +#include "palette.h" #include "player_avatar.h" #include "script_manager.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_020508D4.h" diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 5ffcfbe28..9e183cb3b 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -5,7 +5,6 @@ #include "struct_decls/font_oam.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -40,6 +39,7 @@ #include "map_header.h" #include "message.h" #include "narc.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "pokemon_icon.h" @@ -51,7 +51,6 @@ #include "trainer_data.h" #include "trainer_info.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200679C.h" #include "unk_02006E3C.h" diff --git a/src/overlay011/ov11_0221F800.c b/src/overlay011/ov11_0221F800.c index cc08affec..182ef40bd 100644 --- a/src/overlay011/ov11_0221F800.c +++ b/src/overlay011/ov11_0221F800.c @@ -3,9 +3,7 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" - -#include "unk_02002F38.h" +#include "palette.h" __attribute__((aligned(4))) const u16 Unk_ov11_0221F94C[] = { 0x75CD, diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index f9e7ea31f..e2e4dcc3c 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -5,7 +5,6 @@ #include "struct_decls/battle_system.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -42,11 +41,11 @@ #include "heap.h" #include "inlines.h" #include "narc.h" +#include "palette.h" #include "pokemon.h" #include "spl.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" diff --git a/src/overlay012/ov12_02225864.c b/src/overlay012/ov12_02225864.c index 955516fde..56a4aac37 100644 --- a/src/overlay012/ov12_02225864.c +++ b/src/overlay012/ov12_02225864.c @@ -4,7 +4,6 @@ #include #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_defs/struct_0200D0F4.h" #include "overlay012/funcptr_ov12_02226274.h" @@ -20,10 +19,10 @@ #include "cell_actor.h" #include "heap.h" #include "inlines.h" +#include "palette.h" #include "screen_scroll_manager.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" #include "unk_0201F834.h" diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c index bddfcf014..369a71530 100644 --- a/src/overlay012/ov12_02226B84.c +++ b/src/overlay012/ov12_02226B84.c @@ -4,7 +4,6 @@ #include #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" @@ -28,9 +27,9 @@ #include "cell_actor.h" #include "heap.h" #include "inlines.h" +#include "palette.h" #include "spl.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" diff --git a/src/overlay012/ov12_0222AC70.c b/src/overlay012/ov12_0222AC70.c index 80fd02856..34e8ee796 100644 --- a/src/overlay012/ov12_0222AC70.c +++ b/src/overlay012/ov12_0222AC70.c @@ -4,7 +4,6 @@ #include #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/sprite_template.h" @@ -26,8 +25,8 @@ #include "bg_window.h" #include "cell_actor.h" #include "heap.h" +#include "palette.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" #include "unk_0201F834.h" diff --git a/src/overlay012/ov12_0222E91C.c b/src/overlay012/ov12_0222E91C.c index 9382593be..aee930236 100644 --- a/src/overlay012/ov12_0222E91C.c +++ b/src/overlay012/ov12_0222E91C.c @@ -25,9 +25,9 @@ #include "bg_window.h" #include "cell_actor.h" #include "heap.h" +#include "palette.h" #include "pokemon.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" #include "unk_0201F834.h" diff --git a/src/overlay012/ov12_0222F700.c b/src/overlay012/ov12_0222F700.c index 90df1f3fb..7288dc3ea 100644 --- a/src/overlay012/ov12_0222F700.c +++ b/src/overlay012/ov12_0222F700.c @@ -4,7 +4,6 @@ #include #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/sprite_template.h" @@ -25,8 +24,8 @@ #include "cell_actor.h" #include "enums.h" #include "heap.h" +#include "palette.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_0200762C.h" #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" diff --git a/src/overlay012/ov12_02234E44.c b/src/overlay012/ov12_02234E44.c index 4b3a3c49f..ced38c68e 100644 --- a/src/overlay012/ov12_02234E44.c +++ b/src/overlay012/ov12_02234E44.c @@ -11,8 +11,8 @@ #include "overlay012/struct_ov12_0223595C.h" #include "bg_window.h" +#include "palette.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c index 052f1abe7..1b820785f 100644 --- a/src/overlay012/ov12_02235E94.c +++ b/src/overlay012/ov12_02235E94.c @@ -28,11 +28,11 @@ #include "heap.h" #include "narc.h" +#include "palette.h" #include "pokemon.h" #include "spl.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_0200C6E4.h" diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index 3a906e8db..20fa70a13 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -26,6 +26,7 @@ #include "message.h" #include "move_table.h" #include "narc.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "pokemon_summary_app.h" @@ -34,7 +35,6 @@ #include "sys_task_manager.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200679C.h" #include "unk_02006E3C.h" diff --git a/src/overlay013/ov13_02225710.c b/src/overlay013/ov13_02225710.c index a10f7a00f..6bc8ec3f2 100644 --- a/src/overlay013/ov13_02225710.c +++ b/src/overlay013/ov13_02225710.c @@ -8,7 +8,7 @@ #include "bg_window.h" #include "heap.h" -#include "unk_02002F38.h" +#include "palette.h" #include "unk_0200C6E4.h" typedef struct { diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index e73de5c60..222e2a598 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -28,6 +28,7 @@ #include "item.h" #include "message.h" #include "narc.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "strbuf.h" @@ -35,7 +36,6 @@ #include "sys_task_manager.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200679C.h" #include "unk_02006E3C.h" diff --git a/src/overlay013/ov13_02227BDC.c b/src/overlay013/ov13_02227BDC.c index d3790cf04..6dc38c7aa 100644 --- a/src/overlay013/ov13_02227BDC.c +++ b/src/overlay013/ov13_02227BDC.c @@ -22,7 +22,7 @@ #include "gx_layers.h" #include "item.h" #include "narc.h" -#include "unk_02002F38.h" +#include "palette.h" #include "unk_0200C6E4.h" static void ov13_02227C08(UnkStruct_ov13_02227244 *param0); diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index a0b18105f..b1024e677 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -35,12 +35,12 @@ #include "move_table.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "pokemon.h" #include "strbuf.h" #include "string_template.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index d1a9eb995..4d7aa6ca7 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -27,11 +27,11 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index 2478b3e27..e4e5f740a 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -34,12 +34,12 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "pokemon.h" #include "strbuf.h" #include "string_template.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index 2beddc00f..d1943d2bc 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -5,7 +5,6 @@ #include #include "struct_decls/font_oam.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" @@ -27,6 +26,7 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "pokemon.h" #include "strbuf.h" #include "sys_task.h" diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index 17afc1ba0..96bc790ed 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -4,7 +4,6 @@ #include #include "struct_decls/font_oam.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -33,13 +32,13 @@ #include "message_util.h" #include "move_table.h" #include "narc.h" +#include "palette.h" #include "pokemon.h" #include "strbuf.h" #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index 07a549054..e422f66f5 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -32,13 +31,13 @@ #include "heap.h" #include "inlines.h" #include "message.h" +#include "palette.h" #include "pokemon.h" #include "strbuf.h" #include "string_template.h" #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" diff --git a/src/overlay017/ov17_02247A48.c b/src/overlay017/ov17_02247A48.c index b80eceea0..afb8d14ac 100644 --- a/src/overlay017/ov17_02247A48.c +++ b/src/overlay017/ov17_02247A48.c @@ -37,11 +37,11 @@ #include "bg_window.h" #include "core_sys.h" #include "heap.h" +#include "palette.h" #include "pokemon.h" #include "spl.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index 04907b9ba..eebfd34fe 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -19,12 +19,12 @@ #include "font.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c index 5297b5d6c..16d9be0a3 100644 --- a/src/overlay017/ov17_0224A0FC.c +++ b/src/overlay017/ov17_0224A0FC.c @@ -42,6 +42,7 @@ #include "heap.h" #include "inlines.h" #include "message.h" +#include "palette.h" #include "pokemon.h" #include "spl.h" #include "strbuf.h" @@ -49,7 +50,6 @@ #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" diff --git a/src/overlay017/ov17_0224CFB8.c b/src/overlay017/ov17_0224CFB8.c index 8107183c9..f85bb2a2d 100644 --- a/src/overlay017/ov17_0224CFB8.c +++ b/src/overlay017/ov17_0224CFB8.c @@ -37,10 +37,10 @@ #include "bg_window.h" #include "communication_system.h" #include "heap.h" +#include "palette.h" #include "pokemon.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02094EDC.h" diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index 42e2c823d..5bbe3c214 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -23,11 +23,11 @@ #include "heap.h" #include "message.h" #include "overlay_manager.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index ff9edcd88..e853c5ebf 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -22,6 +22,7 @@ #include "heap.h" #include "message.h" #include "narc.h" +#include "palette.h" #include "pokemon.h" #include "pokemon_icon.h" #include "strbuf.h" @@ -29,7 +30,6 @@ #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" diff --git a/src/overlay017/ov17_02252AB0.c b/src/overlay017/ov17_02252AB0.c index 302c61444..0833cba98 100644 --- a/src/overlay017/ov17_02252AB0.c +++ b/src/overlay017/ov17_02252AB0.c @@ -3,13 +3,13 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "heap.h" +#include "palette.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_0200C6E4.h" diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c index 7a4acd1a1..e2de80599 100644 --- a/src/overlay021/ov21_021E737C.c +++ b/src/overlay021/ov21_021E737C.c @@ -29,6 +29,7 @@ #include "message.h" #include "message_util.h" #include "narc.h" +#include "palette.h" #include "pokedex_data_index.h" #include "pokedex_heightweight.h" #include "pokemon_icon.h" @@ -37,7 +38,6 @@ #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_02015064.h" diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 420bf4797..941f45a44 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -4,7 +4,6 @@ #include #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_defs/archived_sprite.h" @@ -29,6 +28,7 @@ #include "heap.h" #include "message.h" #include "narc.h" +#include "palette.h" #include "pokedex_data_index.h" #include "pokemon.h" #include "sprite_resource.h" @@ -36,7 +36,6 @@ #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index 7dcc1beb9..a946dd0dc 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -22,10 +22,10 @@ #include "heap.h" #include "message.h" #include "narc.h" +#include "palette.h" #include "render_text.h" #include "savedata_misc.h" #include "sys_task.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200762C.h" #include "unk_020093B4.h" diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c index 94464c5a5..32712f933 100644 --- a/src/overlay062/ov62_022300D8.c +++ b/src/overlay062/ov62_022300D8.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -23,12 +22,12 @@ #include "bg_window.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index 93e10a041..beb85ff56 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -42,6 +41,7 @@ #include "heap.h" #include "message.h" #include "narc.h" +#include "palette.h" #include "pokemon_icon.h" #include "savedata_misc.h" #include "strbuf.h" @@ -50,7 +50,6 @@ #include "sys_task_manager.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c index db99ac437..9cfe942db 100644 --- a/src/overlay062/ov62_02234A10.c +++ b/src/overlay062/ov62_02234A10.c @@ -15,10 +15,10 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" diff --git a/src/overlay062/ov62_02235278.c b/src/overlay062/ov62_02235278.c index d15a8e62f..eb239d28b 100644 --- a/src/overlay062/ov62_02235278.c +++ b/src/overlay062/ov62_02235278.c @@ -15,10 +15,10 @@ #include "gx_layers.h" #include "heap.h" +#include "palette.h" #include "sys_task.h" #include "sys_task_manager.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c index 5401655d4..a121eebc4 100644 --- a/src/overlay062/ov62_02235E64.c +++ b/src/overlay062/ov62_02235E64.c @@ -17,11 +17,11 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "savedata.h" #include "strbuf.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" diff --git a/src/overlay062/ov62_02236CBC.c b/src/overlay062/ov62_02236CBC.c index 721ee30b9..6d6e89b53 100644 --- a/src/overlay062/ov62_02236CBC.c +++ b/src/overlay062/ov62_02236CBC.c @@ -1,7 +1,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -19,8 +18,8 @@ #include "bg_window.h" #include "gx_layers.h" #include "heap.h" +#include "palette.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index 11dfda611..0dedcff1e 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -35,11 +35,11 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index e5c7566a6..0806948c5 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -6,7 +6,6 @@ #include "constants/species.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02023FCC_decl.h" @@ -38,6 +37,7 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "pokemon.h" #include "pokemon_icon.h" #include "savedata.h" @@ -45,7 +45,6 @@ #include "string_template.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index f046762e9..50279a4fe 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -27,13 +27,13 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "play_time.h" #include "save_player.h" #include "strbuf.h" #include "string_template.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c index c803e574b..460872207 100644 --- a/src/overlay062/ov62_0223DFA8.c +++ b/src/overlay062/ov62_0223DFA8.c @@ -29,11 +29,11 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index b99536366..563ed02e9 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -38,12 +38,12 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "save_player.h" #include "strbuf.h" #include "string_template.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c index f8e0dacc1..2f17b247b 100644 --- a/src/overlay062/ov62_02246B00.c +++ b/src/overlay062/ov62_02246B00.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -18,6 +17,7 @@ #include "game_options.h" #include "heap.h" #include "inlines.h" +#include "palette.h" #include "strbuf.h" #include "unk_02005474.h" #include "unk_02006E3C.h" diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c index 9f38009e3..95860e4c1 100644 --- a/src/overlay062/ov62_02247D74.c +++ b/src/overlay062/ov62_02247D74.c @@ -13,11 +13,11 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_02030A80.h" diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c index 8254c8394..462ebfd0e 100644 --- a/src/overlay063/ov63_0222AE60.c +++ b/src/overlay063/ov63_0222AE60.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "overlay064/struct_ov64_022302EC.h" @@ -11,8 +10,8 @@ #include "cell_actor.h" #include "heap.h" #include "narc.h" +#include "palette.h" #include "sprite_resource.h" -#include "unk_02002F38.h" #include "unk_020093B4.h" #include "unk_0200A328.h" diff --git a/src/overlay063/ov63_0222CCE4.c b/src/overlay063/ov63_0222CCE4.c index 2c07a80c5..79265c958 100644 --- a/src/overlay063/ov63_0222CCE4.c +++ b/src/overlay063/ov63_0222CCE4.c @@ -3,8 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" - #include "overlay063/ov63_0222AE60.h" #include "overlay063/ov63_0222BE18.h" #include "overlay063/struct_ov63_0222BB38_decl.h" @@ -16,6 +14,7 @@ #include "cell_actor.h" #include "heap.h" +#include "palette.h" static BOOL ov63_0222D07C(const UnkStruct_ov63_0222CE44 *param0); static UnkStruct_ov63_0222CE44 *ov63_0222D08C(UnkStruct_ov63_0222CD2C *param0); diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index 1bdb6a2af..21f264951 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -22,6 +22,7 @@ #include "heap.h" #include "message.h" #include "overlay_manager.h" +#include "palette.h" #include "pokemon.h" #include "render_text.h" #include "save_player.h" @@ -34,7 +35,6 @@ #include "trainer_info.h" #include "unk_02000C88.h" #include "unk_0200112C.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" diff --git a/src/overlay073/ov73_021D3250.c b/src/overlay073/ov73_021D3250.c index 0c2ab848e..86848372f 100644 --- a/src/overlay073/ov73_021D3250.c +++ b/src/overlay073/ov73_021D3250.c @@ -10,9 +10,9 @@ #include "heap.h" #include "message.h" #include "overlay_manager.h" +#include "palette.h" #include "strbuf.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02006E3C.h" #include "unk_0200F174.h" diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index 728893c60..fcf0a5897 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -27,6 +26,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "pokemon_icon.h" #include "render_text.h" #include "strbuf.h" @@ -34,7 +34,6 @@ #include "sys_task_manager.h" #include "text.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200A784.h" #include "unk_0200C6E4.h" diff --git a/src/overlay076/ov76_0223B140.c b/src/overlay076/ov76_0223B140.c index 3f05b7bc2..591a29577 100644 --- a/src/overlay076/ov76_0223B140.c +++ b/src/overlay076/ov76_0223B140.c @@ -4,7 +4,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/sprite_template.h" @@ -17,6 +16,7 @@ #include "core_sys.h" #include "game_overlay.h" +#include "palette.h" #include "touch_screen.h" #include "unk_0200C6E4.h" #include "unk_0202C9F4.h" diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index 5c6fad409..1191c0262 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -31,6 +30,7 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "pokemon.h" #include "pokemon_icon.h" #include "strbuf.h" @@ -39,7 +39,6 @@ #include "text.h" #include "touch_screen.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index 83f24aeb6..ad3750ac3 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -31,12 +31,12 @@ #include "gx_layers.h" #include "heap.h" #include "narc.h" +#include "palette.h" #include "pokemon.h" #include "sys_task.h" #include "sys_task_manager.h" #include "touch_screen.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c index 936c2f94b..0db863891 100644 --- a/src/overlay099/ov99_021D0D80.c +++ b/src/overlay099/ov99_021D0D80.c @@ -25,9 +25,9 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_020093B4.h" #include "unk_0200A9DC.h" diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c index 4063be4f7..4ae564863 100644 --- a/src/overlay099/ov99_021D1A54.c +++ b/src/overlay099/ov99_021D1A54.c @@ -26,9 +26,9 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" diff --git a/src/overlay099/ov99_021D2E28.c b/src/overlay099/ov99_021D2E28.c index 0272b2b81..b79b71155 100644 --- a/src/overlay099/ov99_021D2E28.c +++ b/src/overlay099/ov99_021D2E28.c @@ -12,7 +12,7 @@ #include "overlay099/struct_ov99_021D3A40.h" #include "bg_window.h" -#include "unk_02002F38.h" +#include "palette.h" #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" #include "unk_0201D15C.h" diff --git a/src/overlay099/ov99_021D340C.c b/src/overlay099/ov99_021D340C.c index 7f8230e73..fc90b0933 100644 --- a/src/overlay099/ov99_021D340C.c +++ b/src/overlay099/ov99_021D340C.c @@ -12,7 +12,7 @@ #include "overlay099/struct_ov99_021D35E8.h" #include "overlay099/struct_ov99_021D3A40.h" -#include "unk_02002F38.h" +#include "palette.h" #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" #include "unk_0201D15C.h" diff --git a/src/overlay099/ov99_021D4134.c b/src/overlay099/ov99_021D4134.c index 8ecc9627f..9c8928a2e 100644 --- a/src/overlay099/ov99_021D4134.c +++ b/src/overlay099/ov99_021D4134.c @@ -12,7 +12,7 @@ #include "cell_actor.h" #include "easy3d_object.h" #include "heap.h" -#include "unk_02002F38.h" +#include "palette.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_0201D15C.h" diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index c9a8381f5..3b7fb3098 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -24,7 +24,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" -#include "unk_02002F38.h" +#include "palette.h" #include "unk_020041CC.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" diff --git a/src/overlay100/ov100_021D13E4.c b/src/overlay100/ov100_021D13E4.c index 4e680b6ea..540e7c342 100644 --- a/src/overlay100/ov100_021D13E4.c +++ b/src/overlay100/ov100_021D13E4.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -22,8 +21,8 @@ #include "easy3d_object.h" #include "gx_layers.h" #include "heap.h" +#include "palette.h" #include "sys_task.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" diff --git a/src/overlay100/ov100_021D1C44.c b/src/overlay100/ov100_021D1C44.c index 93925ceef..2c336bf80 100644 --- a/src/overlay100/ov100_021D1C44.c +++ b/src/overlay100/ov100_021D1C44.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -22,10 +21,10 @@ #include "camera.h" #include "easy3d_object.h" #include "heap.h" +#include "palette.h" #include "sys_task.h" #include "text.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" diff --git a/src/overlay100/ov100_021D2F0C.c b/src/overlay100/ov100_021D2F0C.c index ad6d0d767..10e5857f1 100644 --- a/src/overlay100/ov100_021D2F0C.c +++ b/src/overlay100/ov100_021D2F0C.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -21,11 +20,11 @@ #include "camera.h" #include "easy3d_object.h" #include "heap.h" +#include "palette.h" #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index 79e6d6471..b6c33c333 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -20,11 +20,11 @@ #include "game_options.h" #include "gx_layers.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "string_template.h" #include "text.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_0200DA60.h" int ov100_021D46C8(UnkStruct_ov100_021D46C8 *param0, UnkStruct_020985E4 *param1, int param2) diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index 4bcac71d9..9ec90aa2d 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -5,7 +5,6 @@ #include "consts/game_records.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -71,6 +70,7 @@ #include "heap.h" #include "message.h" #include "narc.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "save_player.h" @@ -82,7 +82,6 @@ #include "text.h" #include "trainer_info.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index 3473d1a2f..8fa16688a 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -44,6 +43,7 @@ #include "heap.h" #include "message.h" #include "narc.h" +#include "palette.h" #include "pokemon.h" #include "pokemon_icon.h" #include "render_text.h" @@ -55,7 +55,6 @@ #include "text.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c index eb21891e3..b638544b6 100644 --- a/src/overlay104/ov104_02237378.c +++ b/src/overlay104/ov104_02237378.c @@ -32,6 +32,7 @@ #include "communication_information.h" #include "gx_layers.h" #include "heap.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "save_player.h" @@ -39,7 +40,6 @@ #include "strbuf.h" #include "string_template.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_02014000.h" #include "unk_02030494.h" #include "unk_02051D8C.h" diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c index 6016818bb..2447d6d82 100644 --- a/src/overlay104/ov104_02237DD8.c +++ b/src/overlay104/ov104_02237DD8.c @@ -25,10 +25,10 @@ #include "gx_layers.h" #include "heap.h" #include "narc.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "savedata.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0201D15C.h" #include "unk_02030494.h" diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index febecc2b8..e3bd1d9ac 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -43,12 +43,12 @@ #include "gx_layers.h" #include "heap.h" #include "narc.h" +#include "palette.h" #include "render_text.h" #include "save_player.h" #include "sys_task.h" #include "sys_task_manager.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" diff --git a/src/overlay104/ov104_0223D768.c b/src/overlay104/ov104_0223D768.c index 292dc7642..4eeb531e5 100644 --- a/src/overlay104/ov104_0223D768.c +++ b/src/overlay104/ov104_0223D768.c @@ -3,13 +3,13 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" +#include "palette.h" #include "unk_0200C6E4.h" static const SpriteTemplate Unk_ov104_022417D8[] = { diff --git a/src/overlay104/ov104_0223D9E4.c b/src/overlay104/ov104_0223D9E4.c index 87166019d..1b71d04b5 100644 --- a/src/overlay104/ov104_0223D9E4.c +++ b/src/overlay104/ov104_0223D9E4.c @@ -3,16 +3,15 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "bg_window.h" #include "enums.h" #include "heap.h" #include "narc.h" +#include "palette.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" typedef struct { diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c index f1eae8b50..95eace1d9 100644 --- a/src/overlay104/ov104_0223DC7C.c +++ b/src/overlay104/ov104_0223DC7C.c @@ -2,7 +2,6 @@ #include #include "struct_decls/font_oam.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -18,11 +17,11 @@ #include "heap.h" #include "message.h" #include "narc.h" +#include "palette.h" #include "strbuf.h" #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_0200679C.h" #include "unk_02006E3C.h" #include "unk_0200A9DC.h" diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 5b304c812..633f882a0 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -5,7 +5,6 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02013A04_decl.h" @@ -44,6 +43,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "pokemon_summary_app.h" @@ -54,7 +54,6 @@ #include "text.h" #include "trainer_info.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index 070875282..b79e9c1d3 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02013A04_decl.h" @@ -36,6 +35,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "pokemon_summary_app.h" @@ -46,7 +46,6 @@ #include "text.h" #include "trainer_info.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index 0d754581f..30bd686fa 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02013A04_decl.h" @@ -42,6 +41,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "save_player.h" @@ -52,7 +52,6 @@ #include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index a7bde6c66..609c5fb99 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02013A04_decl.h" @@ -42,6 +41,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "save_player.h" @@ -52,7 +52,6 @@ #include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index c65a253ba..43418ac64 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_020304A0_decl.h" @@ -36,6 +35,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "save_player.h" @@ -44,7 +44,6 @@ #include "string_template.h" #include "touch_screen.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index feab59b1a..58e4bc882 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -5,7 +5,6 @@ #include "consts/game_records.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -43,6 +42,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "strbuf.h" @@ -51,7 +51,6 @@ #include "sys_task_manager.h" #include "text.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_020093B4.h" diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index 6e8b3a577..4dec40ce5 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0202D750_decl.h" #include "struct_decls/struct_0203068C_decl.h" @@ -22,12 +21,12 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "save_player.h" #include "savedata.h" #include "strbuf.h" #include "string_template.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_02017728.h" diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index 3ade770ce..613161df5 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02015920_decl.h" @@ -29,13 +28,13 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "save_player.h" #include "savedata.h" #include "strbuf.h" #include "string_template.h" #include "text.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index 37fedea6b..c0f028685 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -27,10 +27,10 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "sprite_resource.h" #include "strbuf.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index daf88c889..c0888c396 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -7,7 +7,6 @@ #include "constants/species.h" #include "struct_decls/font_oam.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -52,6 +51,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "render_text.h" @@ -62,7 +62,6 @@ #include "sys_task.h" #include "sys_task_manager.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c index 21ef2aad6..256edfc49 100644 --- a/src/overlay116/ov116_022604C4.c +++ b/src/overlay116/ov116_022604C4.c @@ -33,7 +33,7 @@ #include "heap.h" #include "narc.h" #include "overlay_manager.h" -#include "unk_02002F38.h" +#include "palette.h" #include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_0200C6E4.h" diff --git a/src/overlay116/ov116_02261870.c b/src/overlay116/ov116_02261870.c index 7f6d742a5..32650ff70 100644 --- a/src/overlay116/ov116_02261870.c +++ b/src/overlay116/ov116_02261870.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -23,10 +22,10 @@ #include "inlines.h" #include "message.h" #include "narc.h" +#include "palette.h" #include "strbuf.h" #include "text.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" diff --git a/src/overlay116/ov116_0226432C.c b/src/overlay116/ov116_0226432C.c index 43317e725..0808d4ecc 100644 --- a/src/overlay116/ov116_0226432C.c +++ b/src/overlay116/ov116_0226432C.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_defs/struct_0200D0F4.h" #include "overlay116/ov116_02261870.h" @@ -25,9 +24,9 @@ #include "easy3d_object.h" #include "heap.h" #include "inlines.h" +#include "palette.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index 3caf4580a..f83d6b8f1 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -36,6 +36,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "render_text.h" #include "strbuf.h" #include "string_template.h" @@ -43,7 +44,6 @@ #include "sys_task_manager.h" #include "text.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" diff --git a/src/overlay117/ov117_022626B0.c b/src/overlay117/ov117_022626B0.c index 1528cc215..fae52b891 100644 --- a/src/overlay117/ov117_022626B0.c +++ b/src/overlay117/ov117_022626B0.c @@ -17,7 +17,7 @@ #include "heap.h" #include "inlines.h" #include "narc.h" -#include "unk_02002F38.h" +#include "palette.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" diff --git a/src/overlay117/ov117_02263AF0.c b/src/overlay117/ov117_02263AF0.c index c6dcc4ec4..02b2bf2aa 100644 --- a/src/overlay117/ov117_02263AF0.c +++ b/src/overlay117/ov117_02263AF0.c @@ -38,9 +38,9 @@ #include "font.h" #include "message.h" #include "narc.h" +#include "palette.h" #include "strbuf.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index b88f83a57..f462a36ee 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" @@ -28,13 +27,13 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "palette.h" #include "pokemon.h" #include "spl.h" #include "strbuf.h" #include "string_template.h" #include "text.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" diff --git a/src/overlay119/ov119_021D191C.c b/src/overlay119/ov119_021D191C.c index 72e57f6bf..f41e6ea38 100644 --- a/src/overlay119/ov119_021D191C.c +++ b/src/overlay119/ov119_021D191C.c @@ -11,10 +11,10 @@ #include "cell_actor.h" #include "gx_layers.h" +#include "palette.h" #include "pokemon.h" #include "text.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200762C.h" diff --git a/src/unk_02002F38.c b/src/palette.c similarity index 97% rename from src/unk_02002F38.c rename to src/palette.c index 85b0c638c..26ba76eb2 100644 --- a/src/unk_02002F38.c +++ b/src/palette.c @@ -1,35 +1,14 @@ -#include "unk_02002F38.h" +#include "palette.h" #include #include -#include "struct_defs/struct_020032D0.h" -#include "struct_defs/struct_0200330C.h" - #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02006E3C.h" #include "unk_020241F0.h" -typedef struct UnkStruct_02002F38_t { - UnkStruct_020032D0 unk_00[14]; - u16 unk_118_0 : 2; - u16 unk_118_2 : 14; - u16 unk_11A_0 : 14; - u16 unk_11A_14 : 1; - u16 unk_11A_15 : 1; - u8 unk_11C; - u8 unk_11D[3]; -} PaletteData; - -typedef struct { - u16 unk_00_0 : 5; - u16 unk_00_5 : 5; - u16 unk_00_10 : 5; - u16 unk_00_15 : 1; -} UnkStruct_0200393C; - static u8 sub_0200327C(u16 param0, u16 param1); static void sub_02003290(PaletteData *param0, u16 param1); static void sub_020032D0(int param0, UnkStruct_020032D0 *param1, u16 *param2); diff --git a/src/pokemon.c b/src/pokemon.c index 98bf07724..ef802e54f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -15,7 +15,6 @@ #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/sprite_decl.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -43,6 +42,7 @@ #include "message_util.h" #include "move_table.h" #include "narc.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "rtc.h" diff --git a/src/unk_0200762C.c b/src/unk_0200762C.c index 328cd5d07..6bbb76a29 100644 --- a/src/unk_0200762C.c +++ b/src/unk_0200762C.c @@ -14,7 +14,7 @@ #include "heap.h" #include "inlines.h" #include "narc.h" -#include "unk_02002F38.h" +#include "palette.h" typedef struct { u8 unk_00; diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c index 1b9023670..ed897e43a 100644 --- a/src/unk_0200C6E4.c +++ b/src/unk_0200C6E4.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_02009508.h" @@ -19,8 +18,8 @@ #include "cell_actor.h" #include "heap.h" +#include "palette.h" #include "sprite_resource.h" -#include "unk_02002F38.h" #include "unk_020093B4.h" #include "unk_0200A328.h" #include "unk_0200A784.h" diff --git a/src/unk_0201567C.c b/src/unk_0201567C.c index 59a451122..5659da1c7 100644 --- a/src/unk_0201567C.c +++ b/src/unk_0201567C.c @@ -3,11 +3,9 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" - #include "bg_window.h" +#include "palette.h" #include "sys_task_manager.h" -#include "unk_02002F38.h" #include "unk_0200679C.h" #include "unk_020241F0.h" diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 58644b8ab..c26afb1e5 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -27,6 +27,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "pokemon_summary_app.h" @@ -38,7 +39,6 @@ #include "sys_task_manager.h" #include "text.h" #include "unk_02001AF4.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" diff --git a/src/unk_0207C908.c b/src/unk_0207C908.c index 4590adab7..8588f4344 100644 --- a/src/unk_0207C908.c +++ b/src/unk_0207C908.c @@ -3,12 +3,12 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" +#include "palette.h" #include "unk_0200C6E4.h" __attribute__((aligned(4))) static const u32 Unk_020F0AF0[] = { diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c index 06589c442..43ac769ef 100644 --- a/src/unk_020890F4.c +++ b/src/unk_020890F4.c @@ -15,8 +15,8 @@ #include "heap.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "strbuf.h" -#include "unk_02002F38.h" #include "unk_0200C6E4.h" #include "unk_02017728.h" #include "unk_0201DBEC.h" diff --git a/src/unk_02089604.c b/src/unk_02089604.c index 305039c9b..a0d310e21 100644 --- a/src/unk_02089604.c +++ b/src/unk_02089604.c @@ -7,9 +7,9 @@ #include "core_sys.h" #include "heap.h" +#include "palette.h" #include "strbuf.h" #include "touch_screen.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index df45c17b9..8382f373c 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -4,7 +4,6 @@ #include #include "struct_decls/font_oam.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -23,9 +22,9 @@ #include "game_options.h" #include "inlines.h" #include "message.h" +#include "palette.h" #include "strbuf.h" #include "text.h" -#include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" diff --git a/src/unk_0208B284.c b/src/unk_0208B284.c index c1a3297e0..e73aca819 100644 --- a/src/unk_0208B284.c +++ b/src/unk_0208B284.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -13,6 +12,7 @@ #include "heap.h" #include "narc.h" +#include "palette.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_0200C6E4.h" diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index dc2a34de6..7e08a3638 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -25,11 +25,11 @@ #include "heap.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "party.h" #include "pokemon.h" #include "save_player.h" #include "savedata.h" -#include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_0200762C.h" #include "unk_0200F174.h" diff --git a/src/unk_02098218.c b/src/unk_02098218.c index e4f9829b7..639e99dc3 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -24,10 +24,10 @@ #include "map_header.h" #include "narc.h" #include "overlay_manager.h" +#include "palette.h" #include "pokemon.h" #include "save_player.h" #include "trainer_info.h" -#include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200762C.h" #include "unk_0200F174.h"