summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/area.h4
-rw-r--r--include/functions.h47
-rw-r--r--include/room.h7
3 files changed, 57 insertions, 1 deletions
diff --git a/include/area.h b/include/area.h
index 3717fba4..ce0b325c 100644
--- a/include/area.h
+++ b/include/area.h
@@ -3,6 +3,7 @@
#include "global.h"
+
typedef struct {
u8 areaMetadata;
u8 locationIndex;
@@ -13,6 +14,9 @@ typedef struct {
u8 filler3[7];
u8 fadeOut;
u8 filler2[14];
+ u8 filler4[0x835];
+ u32 musicIndex;
+ u32 pMusicIndex;
} Area;
extern Area gArea;
diff --git a/include/functions.h b/include/functions.h
index 1fb4b03b..36aa73c7 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -31,6 +31,9 @@ extern Entity* GetEmptyEntity(void);
extern u32 GetTileTypeByPos(s32 x, s32 y, u32 layer);
extern void _DmaZero(void* src, u32 count);
extern void EraseAllEntities(void);
+extern void SetTile(u32, u32, u32);
+extern void SetDirtTile(u32);
+extern void LoadRoomTileEntities(); //tba
// Unidentified
extern void sub_0806ED78(Entity*);
@@ -112,4 +115,48 @@ extern void sub_080575C8(u32);
extern void sub_08057688(void);
extern void sub_080580B0(u32);
extern void sub_080751E8(u32, u32, void*);
+extern void sub_08052CA4(u32, u32, u32, u32);
+extern void sub_08052878(void);
+extern void sub_0808091C(u32*, u32);
+extern void sub_0805BC4C(void);
+extern void sub_0807BB68(u32*, u32, u32);
+extern void sub_08054570(void);
+extern void sub_08059278(void);
+extern void sub_0804C128(u32);
+extern void sub_08058324(u32);
+extern void sub_0804C2F0(void);
+extern void sub_0801AFE4(void);
+extern u32 sub_08060354(void);
+extern void sub_08057E64(void);
+extern void LoadAssetAsync(void*, u32, u32);
+extern void LoadPalettesByPaletteGroupIndex(u32);
+extern void sub_0809F814(u32);
+extern void sub_080300E8(void);
+extern void sub_0801DA90(u32);
+extern void sub_08058D34(void);
+extern void sub_0807AABC(Entity*);
+extern void sub_08078A90(u32);
+extern void sub_080530C8(void);
+extern void sub_0805B4D0(u32);
+extern void sub_0804D0B4(void);
+extern void sub_0805308C(u32);
+extern void sub_0805AF60();
+extern void sub_0805D3C8(u32);
+extern void sub_080534AC();
+extern void sub_0807BA8C(u32, u32);
+extern void sub_0804D9B0();
+extern void sub_0807BB98(u32, u32, u32, u32);
+extern void sub_08059D18(void);
+extern void sub_0801D000(u32);
+extern void sub_08018C58(u32);
+extern void sub_0804E150(void);
+extern void sub_080AF284(void);
+extern void sub_080A71C4(u32, u32, u32, u32);
+extern void sub_08054564();
+extern void sub_0801DD58(u32, u32);
+extern void sub_0804ED18();
+extern void sub_080AF2E4(void);
+extern void sub_0805ADD8(u32);
+extern void sub_0804F578(void);
+extern void sub_08059994(void);
#endif
diff --git a/include/room.h b/include/room.h
index 57e7b80f..d6bc4a80 100644
--- a/include/room.h
+++ b/include/room.h
@@ -44,10 +44,15 @@ typedef struct {
u8 filler4[48];
u8 filler5[28];
u32 greatFairyState;
- u8 field_0x68[9];
+ u32* field_0x6c;
+ u32* field_0x70;
+ u32* field_0x74;
u32 field_0x78;
+ u8 field_0x79[10];
+ void* field_0x88;
} RoomVars;
+
//Packets used to store which entities to load in a room
typedef struct {
u8 entityType;