diff --git a/include/map_tile_behavior.h b/include/map_tile_behavior.h new file mode 100644 index 0000000000..d1445846dc --- /dev/null +++ b/include/map_tile_behavior.h @@ -0,0 +1,91 @@ +#ifndef POKEPLATINUM_TILE_BEHAVIOR_H +#define POKEPLATINUM_TILE_BEHAVIOR_H + +BOOL sub_0205DAC8(u8 behavior); +BOOL sub_0205DAD4(u8 behavior); +BOOL sub_0205DAE0(u8 behavior); +BOOL sub_0205DAEC(u8 behavior); +BOOL sub_0205DAF8(u8 behavior); +BOOL sub_0205DB04(u8 behavior); +BOOL sub_0205DB10(u8 behavior); +BOOL sub_0205DB1C(u8 behavior); +BOOL sub_0205DB28(u8 behavior); +BOOL sub_0205DB34(u8 behavior); +BOOL sub_0205DB40(u8 behavior); +BOOL sub_0205DB4C(u8 behavior); +BOOL sub_0205DB58(u8 behavior); +BOOL sub_0205DB6C(u8 behavior); +BOOL sub_0205DB78(u8 behavior); +BOOL sub_0205DB84(u8 behavior); +BOOL sub_0205DB90(u8 behavior); +BOOL sub_0205DB9C(u8 behavior); +BOOL sub_0205DBA8(u8 behavior); +BOOL sub_0205DBB4(u8 behavior); +BOOL sub_0205DBC0(u8 behavior); +BOOL sub_0205DBCC(u8 behavior); +BOOL sub_0205DBD8(u8 behavior); +BOOL sub_0205DBE4(u8 behavior); +BOOL sub_0205DBF0(u8 behavior); +BOOL sub_0205DBFC(u8 behavior); +BOOL sub_0205DC08(u8 behavior); +BOOL sub_0205DC14(u8 behavior); +BOOL sub_0205DC20(u8 behavior); +BOOL sub_0205DC2C(u8 behavior); +BOOL TileBehavior_IsEscalator(u8 behavior); +BOOL sub_0205DC44(u8 behavior); +BOOL sub_0205DC50(u8 behavior); +BOOL sub_0205DC5C(u8 behavior); +BOOL sub_0205DC68(u8 behavior); +BOOL sub_0205DC74(u8 behavior); +BOOL sub_0205DC80(u8 behavior); +BOOL sub_0205DC8C(u8 behavior); +BOOL sub_0205DC98(u8 behavior); +BOOL sub_0205DCA4(u8 behavior); +BOOL sub_0205DCB0(u8 behavior); +BOOL sub_0205DCBC(u8 behavior); +BOOL sub_0205DCC8(u8 behavior); +BOOL sub_0205DCD4(u8 behavior); +BOOL sub_0205DCE0(u8 behavior); +BOOL sub_0205DCF0(u8 behavior); +BOOL sub_0205DCFC(u8 behavior); +BOOL sub_0205DD0C(u8 behavior); +BOOL sub_0205DD18(u8 behavior); +BOOL sub_0205DD38(u8 behavior); +BOOL sub_0205DD44(u8 behavior); +BOOL sub_0205DD50(u8 behavior); +BOOL sub_0205DD5C(u8 behavior); +BOOL sub_0205DD68(u8 behavior); +BOOL sub_0205DD78(u8 behavior); +BOOL sub_0205DD84(u8 behavior); +BOOL sub_0205DD90(u8 behavior); +BOOL sub_0205DD9C(u8 behavior); +BOOL sub_0205DDA8(u8 behavior); +BOOL sub_0205DDB4(u8 behavior); +BOOL sub_0205DDC0(u8 behavior); +BOOL sub_0205DDCC(u8 behavior); +BOOL sub_0205DDF0(u8 behavior); +BOOL sub_0205DE14(u8 behavior); +BOOL sub_0205DE38(u8 behavior); +BOOL sub_0205DE5C(u8 behavior); +BOOL sub_0205DE6C(u8 behavior); +BOOL sub_0205DE84(u8 behavior); +BOOL sub_0205DE90(u8 behavior); +BOOL sub_0205DEB4(u8 behavior); +BOOL sub_0205DEC0(u8 behavior); +BOOL sub_0205DECC(u8 behavior); +BOOL sub_0205DED8(u8 behavior); +BOOL TileBehavior_IsWarp(u8 behavior); +BOOL sub_0205DEF0(u8 behavior); +BOOL sub_0205DEFC(u8 behavior); +BOOL sub_0205DF10(u8 behavior); +BOOL sub_0205DF34(u8 behavior); +BOOL sub_0205DF58(u8 behavior); +BOOL sub_0205DF64(u8 behavior); +BOOL sub_0205DF78(u8 behavior); +BOOL sub_0205DF8C(u8 behavior); +u8 sub_0205DF98(void); +BOOL sub_0205DF9C(u8 behavior); +BOOL sub_0205DFAC(u8 behavior); +BOOL sub_0205DFB8(u8 behavior); + +#endif // POKEPLATINUM_TILE_BEHAVIOR_H diff --git a/include/unk_0205DAC8.h b/include/unk_0205DAC8.h deleted file mode 100644 index 79dc64d394..0000000000 --- a/include/unk_0205DAC8.h +++ /dev/null @@ -1,91 +0,0 @@ -#ifndef POKEPLATINUM_UNK_0205DAC8_H -#define POKEPLATINUM_UNK_0205DAC8_H - -BOOL sub_0205DAC8(u8 param0); -BOOL sub_0205DAD4(u8 param0); -BOOL sub_0205DAE0(u8 param0); -BOOL sub_0205DAEC(u8 param0); -BOOL sub_0205DAF8(u8 param0); -BOOL sub_0205DB04(u8 param0); -BOOL sub_0205DB10(u8 param0); -BOOL sub_0205DB1C(u8 param0); -BOOL sub_0205DB28(u8 param0); -BOOL sub_0205DB34(u8 param0); -BOOL sub_0205DB40(u8 param0); -BOOL sub_0205DB4C(u8 param0); -BOOL sub_0205DB58(u8 param0); -BOOL sub_0205DB6C(u8 param0); -BOOL sub_0205DB78(u8 param0); -BOOL sub_0205DB84(u8 param0); -BOOL sub_0205DB90(u8 param0); -BOOL sub_0205DB9C(u8 param0); -BOOL sub_0205DBA8(u8 param0); -BOOL sub_0205DBB4(u8 param0); -BOOL sub_0205DBC0(u8 param0); -BOOL sub_0205DBCC(u8 param0); -BOOL sub_0205DBD8(u8 param0); -BOOL sub_0205DBE4(u8 param0); -BOOL sub_0205DBF0(u8 param0); -BOOL sub_0205DBFC(u8 param0); -BOOL sub_0205DC08(u8 param0); -BOOL sub_0205DC14(u8 param0); -BOOL sub_0205DC20(u8 param0); -BOOL sub_0205DC2C(u8 param0); -BOOL TileBehavior_IsEscalator(u8 param0); -BOOL sub_0205DC44(u8 param0); -BOOL sub_0205DC50(u8 param0); -BOOL sub_0205DC5C(u8 param0); -BOOL sub_0205DC68(u8 param0); -BOOL sub_0205DC74(u8 param0); -BOOL sub_0205DC80(u8 param0); -BOOL sub_0205DC8C(u8 param0); -BOOL sub_0205DC98(u8 param0); -BOOL sub_0205DCA4(u8 param0); -BOOL sub_0205DCB0(u8 param0); -BOOL sub_0205DCBC(u8 param0); -BOOL sub_0205DCC8(u8 param0); -BOOL sub_0205DCD4(u8 param0); -BOOL sub_0205DCE0(u8 param0); -BOOL sub_0205DCF0(u8 param0); -BOOL sub_0205DCFC(u8 param0); -BOOL sub_0205DD0C(u8 param0); -BOOL sub_0205DD18(u8 param0); -BOOL sub_0205DD38(u8 param0); -BOOL sub_0205DD44(u8 param0); -BOOL sub_0205DD50(u8 param0); -BOOL sub_0205DD5C(u8 param0); -BOOL sub_0205DD68(u8 param0); -BOOL sub_0205DD78(u8 param0); -BOOL sub_0205DD84(u8 param0); -BOOL sub_0205DD90(u8 param0); -BOOL sub_0205DD9C(u8 param0); -BOOL sub_0205DDA8(u8 param0); -BOOL sub_0205DDB4(u8 param0); -BOOL sub_0205DDC0(u8 param0); -BOOL sub_0205DDCC(u8 param0); -BOOL sub_0205DDF0(u8 param0); -BOOL sub_0205DE14(u8 param0); -BOOL sub_0205DE38(u8 param0); -BOOL sub_0205DE5C(u8 param0); -BOOL sub_0205DE6C(u8 param0); -BOOL sub_0205DE84(u8 param0); -BOOL sub_0205DE90(u8 param0); -BOOL sub_0205DEB4(u8 param0); -BOOL sub_0205DEC0(u8 param0); -BOOL sub_0205DECC(u8 param0); -BOOL sub_0205DED8(u8 param0); -BOOL TileBehavior_IsWarp(u8 param0); -BOOL sub_0205DEF0(u8 param0); -BOOL sub_0205DEFC(u8 param0); -BOOL sub_0205DF10(u8 param0); -BOOL sub_0205DF34(u8 param0); -BOOL sub_0205DF58(u8 param0); -BOOL sub_0205DF64(u8 param0); -BOOL sub_0205DF78(u8 param0); -BOOL sub_0205DF8C(u8 param0); -u8 sub_0205DF98(void); -BOOL sub_0205DF9C(u8 param0); -BOOL sub_0205DFAC(u8 param0); -BOOL sub_0205DFB8(u8 param0); - -#endif // POKEPLATINUM_UNK_0205DAC8_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 8213bf817d..1f59be7e38 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -246,7 +246,7 @@ Static main Object main.nef.p/src_unk_0205C980.c.o Object main.nef.p/src_unk_0205CA94.c.o Object main.nef.p/src_unk_0205D8CC.c.o - Object main.nef.p/src_unk_0205DAC8.c.o + Object main.nef.p/src_map_tile_behavior.c.o Object main.nef.p/src_unk_0205DFC4.c.o Object main.nef.p/src_player_avatar.c.o Object main.nef.p/src_unk_0205F180.c.o diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c index 486b5bb9ea..4460e08208 100644 --- a/src/field_battle_data_transfer.c +++ b/src/field_battle_data_transfer.c @@ -35,6 +35,7 @@ #include "heap.h" #include "journal.h" #include "map_header.h" +#include "map_tile_behavior.h" #include "message.h" #include "party.h" #include "player_avatar.h" @@ -57,7 +58,6 @@ #include "unk_02054D00.h" #include "unk_020559DC.h" #include "unk_0205C980.h" -#include "unk_0205DAC8.h" #include "unk_0206AFE0.h" #include "unk_0206CCB0.h" #include "vars_flags.h" diff --git a/src/map_object_move.c b/src/map_object_move.c index e411e4b0cb..3a6b1fd398 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -21,8 +21,8 @@ #include "overlay005/struct_ov5_021ECD10.h" #include "map_object.h" +#include "map_tile_behavior.h" #include "unk_02054D00.h" -#include "unk_0205DAC8.h" #include "unk_020655F4.h" #include "unk_020673B8.h" diff --git a/src/unk_0205DAC8.c b/src/map_tile_behavior.c similarity index 99% rename from src/unk_0205DAC8.c rename to src/map_tile_behavior.c index 4ca8c25551..125b9a8072 100644 --- a/src/unk_0205DAC8.c +++ b/src/map_tile_behavior.c @@ -1,4 +1,4 @@ -#include "unk_0205DAC8.h" +#include "map_tile_behavior.h" #include #include diff --git a/src/meson.build b/src/meson.build index 1f28a37145..0efd0df16c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -234,7 +234,7 @@ pokeplatinum_c = files( 'unk_0205C980.c', 'unk_0205CA94.c', 'unk_0205D8CC.c', - 'unk_0205DAC8.c', + 'map_tile_behavior.c', 'unk_0205DFC4.c', 'player_avatar.c', 'unk_0205F180.c', diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c index 0d53acf872..178ecb26a8 100644 --- a/src/overlay005/field_control.c +++ b/src/overlay005/field_control.c @@ -43,6 +43,7 @@ #include "map_header.h" #include "map_header_data.h" #include "map_object.h" +#include "map_tile_behavior.h" #include "party.h" #include "player_avatar.h" #include "pokemon.h" @@ -62,7 +63,6 @@ #include "unk_02056B30.h" #include "unk_0205A0D8.h" #include "unk_0205B33C.h" -#include "unk_0205DAC8.h" #include "unk_0205F180.h" #include "unk_02067A84.h" #include "unk_020683F4.h" diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c index bf95f3cc8b..eb230364a4 100644 --- a/src/overlay005/ov5_021DFB54.c +++ b/src/overlay005/ov5_021DFB54.c @@ -26,14 +26,15 @@ #include "overlay009/struct_ov9_0224F6EC_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -#include "field_battle_data_transfer.h" #include "core_sys.h" #include "encounter.h" +#include "field_battle_data_transfer.h" #include "field_task.h" #include "game_records.h" #include "heap.h" #include "map_object.h" #include "map_object_move.h" +#include "map_tile_behavior.h" #include "party.h" #include "player_avatar.h" #include "pokemon.h" @@ -41,7 +42,6 @@ #include "sys_task_manager.h" #include "unk_02005474.h" #include "unk_020553DC.h" -#include "unk_0205DAC8.h" #include "unk_0205F180.h" #include "unk_020655F4.h" #include "unk_02071B10.h" diff --git a/src/overlay005/ov5_021E1154.c b/src/overlay005/ov5_021E1154.c index accb0d690c..bfbae4e93c 100644 --- a/src/overlay005/ov5_021E1154.c +++ b/src/overlay005/ov5_021E1154.c @@ -11,9 +11,9 @@ #include "field_task.h" #include "heap.h" #include "map_object.h" +#include "map_tile_behavior.h" #include "player_avatar.h" #include "unk_02005474.h" -#include "unk_0205DAC8.h" #include "unk_0205F180.h" #include "unk_020655F4.h" diff --git a/src/overlay005/ov5_021ECE40.c b/src/overlay005/ov5_021ECE40.c index 07f4753cab..24cee6aa80 100644 --- a/src/overlay005/ov5_021ECE40.c +++ b/src/overlay005/ov5_021ECE40.c @@ -44,13 +44,13 @@ #include "heap.h" #include "map_object.h" #include "map_object_move.h" +#include "map_tile_behavior.h" #include "narc.h" #include "resource_collection.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02020AEC.h" #include "unk_0202414C.h" -#include "unk_0205DAC8.h" #include "unk_020677F4.h" #include "unk_020711EC.h" diff --git a/src/overlay005/ov5_021EE75C.c b/src/overlay005/ov5_021EE75C.c index 5fcc0fa220..eee4329613 100644 --- a/src/overlay005/ov5_021EE75C.c +++ b/src/overlay005/ov5_021EE75C.c @@ -10,9 +10,9 @@ #include "overlay005/struct_ov5_021D1BEC_decl.h" #include "overlay006/struct_ov6_0223E6EC.h" +#include "map_tile_behavior.h" #include "player_avatar.h" #include "unk_02054D00.h" -#include "unk_0205DAC8.h" typedef struct { int unk_00; diff --git a/src/overlay005/ov5_021F61BC.c b/src/overlay005/ov5_021F61BC.c index 5d2b3aa290..dda54411a6 100644 --- a/src/overlay005/ov5_021F61BC.c +++ b/src/overlay005/ov5_021F61BC.c @@ -15,9 +15,9 @@ #include "map_object.h" #include "map_object_move.h" +#include "map_tile_behavior.h" #include "player_avatar.h" #include "unk_0201E190.h" -#include "unk_0205DAC8.h" #include "unk_020711EC.h" #include "unk_02073838.h" diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index 177937e236..a7d882c753 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -26,8 +26,8 @@ #include "overlay006/ov6_022477B8.h" #include "overlay006/wild_encounters.h" -#include "field_battle_data_transfer.h" #include "encounter.h" +#include "field_battle_data_transfer.h" #include "field_overworld_state.h" #include "field_system.h" #include "field_task.h" @@ -35,6 +35,7 @@ #include "inlines.h" #include "map_header.h" #include "map_header_data.h" +#include "map_tile_behavior.h" #include "narc.h" #include "party.h" #include "player_avatar.h" @@ -52,7 +53,6 @@ #include "unk_02054884.h" #include "unk_02054D00.h" #include "unk_020559DC.h" -#include "unk_0205DAC8.h" #include "unk_0206AFE0.h" #include "vars_flags.h" diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index 9b8c8eccc7..a5a001a482 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -43,6 +43,7 @@ #include "map_header_data.h" #include "map_object.h" #include "map_object_move.h" +#include "map_tile_behavior.h" #include "message.h" #include "player_avatar.h" #include "render_window.h" @@ -58,7 +59,6 @@ #include "unk_02027F50.h" #include "unk_02054D00.h" #include "unk_0205D8CC.h" -#include "unk_0205DAC8.h" #include "unk_0205F180.h" #include "unk_020655F4.h" #include "unk_02067A84.h" diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index 7746850b92..4622ade42e 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -48,6 +48,7 @@ #include "map_header_data.h" #include "map_object.h" #include "map_object_move.h" +#include "map_tile_behavior.h" #include "narc.h" #include "player_avatar.h" #include "resource_collection.h" @@ -66,7 +67,6 @@ #include "unk_02020AEC.h" #include "unk_02027F50.h" #include "unk_02039C80.h" -#include "unk_0205DAC8.h" #include "unk_0205F180.h" #include "unk_020655F4.h" #include "unk_0206AFE0.h" diff --git a/src/pokeradar.c b/src/pokeradar.c index b4e90ebfd1..618b9eb907 100644 --- a/src/pokeradar.c +++ b/src/pokeradar.c @@ -19,6 +19,7 @@ #include "heap.h" #include "inlines.h" #include "map_object.h" +#include "map_tile_behavior.h" #include "player_avatar.h" #include "scrcmd.h" #include "script_manager.h" @@ -28,7 +29,6 @@ #include "unk_02039C80.h" #include "unk_02054D00.h" #include "unk_020553DC.h" -#include "unk_0205DAC8.h" #include "unk_020711EC.h" typedef struct { diff --git a/src/unk_0203C954.c b/src/unk_0203C954.c index 3351b11d8b..f82eaede5b 100644 --- a/src/unk_0203C954.c +++ b/src/unk_0203C954.c @@ -10,10 +10,10 @@ #include "map_header_data.h" #include "map_object.h" +#include "map_tile_behavior.h" #include "player_avatar.h" #include "script_manager.h" #include "unk_02054D00.h" -#include "unk_0205DAC8.h" static u8 sub_0203CB18(FieldSystem *fieldSystem, const BgEvent *param1); static u8 sub_0203CAEC(FieldSystem *fieldSystem, const BgEvent *param1); diff --git a/src/unk_02054D00.c b/src/unk_02054D00.c index 0c3aec4d84..7ea716f6b4 100644 --- a/src/unk_02054D00.c +++ b/src/unk_02054D00.c @@ -15,9 +15,9 @@ #include "overlay005/struct_ov5_021E8F60_decl.h" #include "overlay005/struct_ov5_021EF13C_decl.h" +#include "map_tile_behavior.h" #include "unk_02039C80.h" #include "unk_02054BD0.h" -#include "unk_0205DAC8.h" #include "unk_02068344.h" static const fx32 sub_02054D0C(const FieldSystem *fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 *param4); diff --git a/src/unk_020562F8.c b/src/unk_020562F8.c index 237bc56f8a..756a99d4b8 100644 --- a/src/unk_020562F8.c +++ b/src/unk_020562F8.c @@ -17,12 +17,12 @@ #include "game_records.h" #include "heap.h" #include "inlines.h" +#include "map_tile_behavior.h" #include "narc.h" #include "pokemon.h" #include "rtc.h" #include "unk_0202EEC0.h" #include "unk_02054D00.h" -#include "unk_0205DAC8.h" typedef struct { u16 unk_00; diff --git a/src/unk_02056B30.c b/src/unk_02056B30.c index 8cad8b7a3d..9d78d59181 100644 --- a/src/unk_02056B30.c +++ b/src/unk_02056B30.c @@ -24,13 +24,13 @@ #include "location.h" #include "map_header.h" #include "map_object.h" +#include "map_tile_behavior.h" #include "player_avatar.h" #include "unk_02005474.h" #include "unk_0200F174.h" #include "unk_02054D00.h" #include "unk_020553DC.h" #include "unk_02055808.h" -#include "unk_0205DAC8.h" #include "unk_020655F4.h" typedef struct { diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index 8ba6923ad7..b435803ca9 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -18,10 +18,10 @@ #include "inlines.h" #include "map_object.h" #include "map_object_move.h" +#include "map_tile_behavior.h" #include "player_avatar.h" #include "unk_02005474.h" #include "unk_02054D00.h" -#include "unk_0205DAC8.h" #include "unk_020655F4.h" #include "unk_02068344.h" #include "unk_02071B10.h" diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index 34eefd23f9..0ae56f180f 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -39,6 +39,7 @@ #include "map_header_data.h" #include "map_object.h" #include "map_object_move.h" +#include "map_tile_behavior.h" #include "party.h" #include "player_avatar.h" #include "pokeradar.h" @@ -56,7 +57,6 @@ #include "unk_020553DC.h" #include "unk_02055C50.h" #include "unk_0205D8CC.h" -#include "unk_0205DAC8.h" #include "unk_0205F180.h" #include "unk_0206AFE0.h" #include "unk_0206B9D8.h" diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c index 48598c39ef..cb8491b827 100644 --- a/src/unk_02069BE0.c +++ b/src/unk_02069BE0.c @@ -14,9 +14,9 @@ #include "map_object.h" #include "map_object_move.h" +#include "map_tile_behavior.h" #include "player_avatar.h" #include "unk_02054D00.h" -#include "unk_0205DAC8.h" #include "unk_020655F4.h" #include "unk_02067A84.h" diff --git a/src/unk_0207070C.c b/src/unk_0207070C.c index a1ff1cdfd4..307cd33901 100644 --- a/src/unk_0207070C.c +++ b/src/unk_0207070C.c @@ -27,6 +27,7 @@ #include "journal.h" #include "map_header.h" #include "map_object.h" +#include "map_tile_behavior.h" #include "player_avatar.h" #include "save_player.h" #include "script_manager.h" @@ -35,7 +36,6 @@ #include "unk_0203C954.h" #include "unk_0203D1B8.h" #include "unk_02054D00.h" -#include "unk_0205DAC8.h" #include "unk_0205F180.h" #include "unk_0206B70C.h" #include "unk_020711C8.h"