From 6b0268e0c0fb98014cb72f8a918a33c0645162d2 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 10 Jan 2017 23:15:38 -0500 Subject: finish decompiling field_control_avatar.c (#182) * start decompiling field_control_avatar.c * remove field_control_player_avatar.c * finish decompiling * cleanup * var and flag constants --- include/rom4.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'include/rom4.h') diff --git a/include/rom4.h b/include/rom4.h index 44819cbee..215c7ff17 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -9,7 +9,8 @@ struct UnkPlayerStruct u8 player_field_1; }; -struct LinkPlayerMapObject { +struct LinkPlayerMapObject +{ u8 active; u8 linkPlayerId; u8 mapObjId; @@ -35,21 +36,21 @@ void update_saveblock1_field_object_movement_behavior(u8, u8); // warp_shift // warp_set // warp_data_is_not_neg_1 -// get_mapheader_by_bank_and_number +struct MapHeader * const get_mapheader_by_bank_and_number(u16 mapGroup, u16 mapNum); // warp1_get_mapheader // set_current_map_header_from_sav1_save_old_name // sub_805338C // sub_80533CC void warp_in(void); void warp1_set(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -// warp1_set_2 +void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId); void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId); void saved_warp2_set_2(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused); // sub_8053538 void sub_8053570(void); void sub_8053588(u8); -// sub_80535C4 +void sub_80535C4(s16 a1, s16 a2); void sub_805363C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); // sub_8053678 void sub_8053690(s8, s8, s8, s8, s8); @@ -62,8 +63,8 @@ void sub_8053720(s16, s16); void gpu_sync_bg_hide(); // sub_8053818 // sub_8053850 -// sub_80538B0 -// sub_80538D0 +bool8 sub_80538B0(u16 x, u16 y); +bool8 sub_80538D0(u16 x, u16 y); // sub_80538F0 // sub_8053994 void player_avatar_init_params_reset(void); -- cgit v1.2.3 From 3f044a459b45d6e75abf4d99b736e5289a54a807 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 14 Jan 2017 18:03:33 -0800 Subject: decompile fldeff_teleport.h --- include/rom4.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/rom4.h') diff --git a/include/rom4.h b/include/rom4.h index 215c7ff17..82d6e4f38 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -19,7 +19,7 @@ struct LinkPlayerMapObject // sub_8052F5C // flag_var_implications_of_teleport_ -// new_game +void new_game(void); // sub_8053014 void sub_8053050(void); // sub_805308C @@ -102,7 +102,7 @@ u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum); u8 sav1_map_get_light_level(void); // get_map_light_from_warp0 bool8 is_light_level_1_2_3_5_or_6(u8 a1); -// is_light_level_1_2_3_or_6 +bool8 is_light_level_1_2_3_or_6(u8 a1); u8 is_light_level_8_or_9(u8); // unref_sub_8054260 u8 sav1_map_get_name(); -- cgit v1.2.3 From 50d60b4403c8f8395bb0d11f9767304a8d25b3ac Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 21 Jan 2017 04:36:36 -0500 Subject: finish decompiling bike.c (#207) * decompile first few functions of field_map_obj.c * formatting * almost finish decompiling bike.c * finish decompiling bike.c --- include/rom4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/rom4.h') diff --git a/include/rom4.h b/include/rom4.h index 82d6e4f38..bb3486c38 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -84,7 +84,7 @@ void sub_8053D14(u16); // sav1_map_get_music // warp1_target_get_music // call_map_music_set_to_zero -// sub_8053E90 +void sub_8053E90(void); void sav1_set_battle_music_maybe(u16); void sav1_reset_battle_music_maybe(void); void sub_8053F0C(void); -- cgit v1.2.3 From 6035511c139549a0291b6b3d43b9b080f792b2b6 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 18 Mar 2017 04:00:15 +0100 Subject: reorganize and add new headers for many files --- include/rom4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/rom4.h') diff --git a/include/rom4.h b/include/rom4.h index bb3486c38..5aae277a6 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -20,7 +20,7 @@ struct LinkPlayerMapObject // sub_8052F5C // flag_var_implications_of_teleport_ void new_game(void); -// sub_8053014 +void sub_8053014(void); void sub_8053050(void); // sub_805308C void ResetGameStats(void); -- cgit v1.2.3