diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
| commit | 4aa1b44315ee26fa60015a99ccd51f900e5597fd (patch) | |
| tree | fdcac19f28b2e4febd96a895e72fce122b9e3b15 /include/rom4.h | |
| parent | ad7a7222a538380b446f9aecde44c5222ff3b68a (diff) | |
| parent | e39f55f55080108ced3ff5cb16b2181d7fec9d92 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/rom4.h')
| -rw-r--r-- | include/rom4.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/rom4.h b/include/rom4.h index eac4d29a2..803a38162 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -23,6 +23,7 @@ struct UCoords32 }; extern struct UCoords32 gUnknown_0821664C[]; +extern void (*gFieldCallback)(void); // sub_8052F5C void flag_var_implications_of_teleport_(void); @@ -102,7 +103,7 @@ void sub_8053FB0(u16); // sub_8054034 // sub_8054044 // sub_8054050 -// sub_80540D0 +void sub_80540D0(s16 *, u16 *); void sub_8054164(void); u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum); // get_map_light_level_from_warp |