diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-12 18:26:26 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-12 18:26:26 +0100 |
| commit | f22be4d0105304147ca982a91c239b9e3a7d31aa (patch) | |
| tree | ff54878c8066e6e60d490b1f5850f760c3d3daf5 /include | |
| parent | 382442c4c8754262c77acb50930df31c63a62355 (diff) | |
more overworld work
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/vars.h | 2 | ||||
| -rw-r--r-- | include/global.h | 4 | ||||
| -rw-r--r-- | include/overworld.h | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index c0e3313b6..be21f1730 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -184,7 +184,7 @@ #define VAR_0x40B0 0x40B0 #define VAR_0x40B1 0x40B1 #define VAR_0x40B2 0x40B2 -#define VAR_0x40B3 0x40B3 +#define VAR_WEATHER_INSTITUTE_STATE 0x40B3 #define VAR_PORTHOLE 0x40B4 #define VAR_0x40B5 0x40B5 #define VAR_0x40B6 0x40B6 diff --git a/include/global.h b/include/global.h index 8913432ba..b815e1e5f 100644 --- a/include/global.h +++ b/include/global.h @@ -620,10 +620,10 @@ struct SaveBlock1 /*0x14*/ struct WarpData warp2; /*0x1C*/ struct WarpData lastHealLocation; /*0x24*/ struct WarpData warp4; - /*0x2C*/ u16 battleMusic; + /*0x2C*/ u16 savedMusic; /*0x2E*/ u8 weather; /*0x2F*/ u8 filler_2F; - /*0x30*/ u8 flashUsed; + /*0x30*/ u8 flashLevel; /*0x32*/ u16 mapDataId; /*0x34*/ u16 mapView[0x100]; /*0x234*/ u8 playerPartyCount; diff --git a/include/overworld.h b/include/overworld.h index 904f61c8e..cedad6266 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -63,6 +63,14 @@ void sub_8084D5C(s16 a1, s16 a2); void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); // to erase later +bool32 Overworld_IsBikingAllowed(void); +u8 sub_808532C(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3); +u8 sub_808538C(struct UnkPlayerStruct *playerStruct, u8 a2, u16 a3, u8 a4); +u16 cur_mapdata_block_role_at_screen_center_acc_to_sav1(void); +bool8 Overworld_MapTypeIsIndoors(u8 mapType); +void SetDefaultFlashLevel(void); +void Overworld_ClearSavedMusic(void); +void sub_8085810(void); u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum); u8 Overworld_GetMapTypeOfSaveblockLocation(void); void Overworld_SetMapObjTemplateCoords(u8, s16, s16); |