summaryrefslogtreecommitdiff
path: root/include/map_header.h
diff options
context:
space:
mode:
authorThomas <doodrabbit@hotmail.com>2021-12-17 20:57:03 -0500
committerGitHub <noreply@github.com>2021-12-17 20:57:03 -0500
commitaf67eaffa7ab1a347a6f0e59ed7f1e107749d15a (patch)
treeb9f90f7b047b3dc5a411dbf65117bf07b237a37d /include/map_header.h
parent3ab18655ca1311019212b3a2a9dbe32e5fbee55d (diff)
parent44cd7753b5dde323d1e8274b2dc8a5599729e83f (diff)
Merge pull request #463 from PikalaxALT/pikalax_workHEADmaster
Real-match math_util.c
Diffstat (limited to 'include/map_header.h')
-rw-r--r--include/map_header.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/map_header.h b/include/map_header.h
index 60c8baaf..cb2c3dae 100644
--- a/include/map_header.h
+++ b/include/map_header.h
@@ -4,7 +4,7 @@
struct MapHeader
{
u8 area_data_bank;
- u8 unk1;
+ u8 move_model_bank;
u16 matrix_id;
u16 scripts_bank;
u16 level_scripts_bank;
@@ -16,7 +16,7 @@ struct MapHeader
u16 mapsec;
u8 weather_type;
u8 camera_type;
- u8 unk16;
+ u8 map_type;
u8 battle_bg:4;
u8 is_bike_allowed:1;
u8 is_running_allowed:1; // unused
@@ -25,7 +25,7 @@ struct MapHeader
};
u8 MapHeader_GetAreaDataBank(u32 mapno);
-u8 MapHeader_GetField1(u32 mapno);
+u8 MapHeader_GetMoveModelBank(u32 mapno);
u16 MapHeader_GetMatrixId(u32 mapno);
u16 MapHeader_GetMsgBank(u32 mapno);
u16 MapHeader_GetScriptsBank(u32 mapno);
@@ -42,14 +42,14 @@ u8 MapHeader_GetBattleBg(u32 mapno);
u8 MapHeader_IsEscapeRopeAllowed(u32 mapno);
u8 MapHeader_IsFlyAllowed(u32 mapno);
u8 MapHeader_IsBikeAllowed(u32 mapno);
-u8 MapHeader_GetField16(u32 mapno);
-BOOL FUN_020348E4(u32 mapno);
+u8 MapHeader_GetMapType(u32 mapno);
+BOOL MapHeader_IsOutdoorNotTown(u32 mapno);
BOOL MapHeader_MapIsOnMainMatrix(u32 mapno);
-BOOL FUN_0203491C(u32 mapno);
-BOOL FUN_02034930(u32 mapno);
-BOOL FUN_02034944(u32 mapno);
-BOOL FUN_02034964(u32 mapno);
-BOOL FUN_02034984(u32 mapno);
+BOOL MapHeader_IsPokemonCenter(u32 mapno);
+BOOL MapHeader_IsCave(u32 mapno);
+BOOL MapHeader_IsBuilding(u32 mapno);
+BOOL MapHeader_IsOutdoor(u32 mapno);
+BOOL MapHeader_MapIsPokemonCenter(u32 mapno);
BOOL MapHeader_MapIsUnionRoom(u32 mapno);
BOOL MapHeader_MapIsMtCoronetFeebasRoom(u32 mapno);
BOOL MapHeader_MapIsTrophyGarden(u32 mapno);