diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-01-10 23:15:38 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-10 20:15:38 -0800 |
| commit | 6b0268e0c0fb98014cb72f8a918a33c0645162d2 (patch) | |
| tree | 740321923e585db283aaed0c60e46786a01dbb48 /include/rom4.h | |
| parent | 61988bc5ba15fdf1dbc990ec6f2a2d7c5392da00 (diff) | |
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
Diffstat (limited to 'include/rom4.h')
| -rw-r--r-- | include/rom4.h | 13 |
1 files changed, 7 insertions, 6 deletions
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); |