summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2022-01-03 20:16:58 -0800
committertheo3 <arisstephenson2@gmail.com>2022-01-03 20:16:58 -0800
commitf26b2e286a7f462947b395da259e185fc8ecfa7f (patch)
tree5ed071d0b27fc7b3dfa702859257999aaab4cbf8 /include
parent0698806e00d7da64f5c007e23426ed68d52c69ea (diff)
more game.c
Diffstat (limited to 'include')
-rw-r--r--include/asm.h1
-rw-r--r--include/common.h2
-rw-r--r--include/main.h3
-rw-r--r--include/player.h1
-rw-r--r--include/room.h4
5 files changed, 10 insertions, 1 deletions
diff --git a/include/asm.h b/include/asm.h
index f250ebb1..5fe8a9e0 100644
--- a/include/asm.h
+++ b/include/asm.h
@@ -9,6 +9,7 @@ extern u32 GetTileTypeByEntity(struct Entity_*);
extern u32 GetTileTypeByPos(s32 x, s32 y, u32 layer);
extern u32 GetTileType(u32 pos, u32 layer);
extern void SetTile(u32 index, u32 position, u32 layer);
+extern void sub_08000108(void);
extern u32 sub_080002D0(struct Entity_*);
extern void LoadResourceAsync(const void*, u32, u32);
extern void sub_08001242(struct Entity_*);
diff --git a/include/common.h b/include/common.h
index a971ed21..e46df918 100644
--- a/include/common.h
+++ b/include/common.h
@@ -43,6 +43,8 @@ void MemCopy(const void* src, void* dest, u32 size);
*/
void ReadKeyInput(void);
+void zMallocInit(void);
+
/**
* Allocate memory on heap.
*
diff --git a/include/main.h b/include/main.h
index eda7676c..0e830bab 100644
--- a/include/main.h
+++ b/include/main.h
@@ -55,7 +55,8 @@ typedef struct {
} Main;
typedef struct {
- /*0x00*/ u16 nextToLoad;
+ /*0x00*/ u8 nextToLoad;
+ /*0x01*/ u8 _1;
/*0x02*/ u8 lastState;
/*0x03*/ u8 field_0x3;
/*0x04*/ u8 state;
diff --git a/include/player.h b/include/player.h
index 2a09e2e2..36fd7303 100644
--- a/include/player.h
+++ b/include/player.h
@@ -280,6 +280,7 @@ extern u16 gWalletSizes[];
extern PlayerState gPlayerState;
extern Entity gPlayerEntity;
+u32 sub_080705AC(void);
void SetPlayerControl(PlayerControlMode mode);
void ResetPlayer(void);
void ResetPlayerVelocity(void);
diff --git a/include/room.h b/include/room.h
index fb2e8398..bb09730f 100644
--- a/include/room.h
+++ b/include/room.h
@@ -192,9 +192,13 @@ typedef enum {
extern void SetTileType(u32, u32, u32);
extern void InitScreenShake(u32 time, u32 magnitude);
+void sub_0804AFF4(void);
+void LoadRoom(void);
+void SetCurrentRoomPropertyList(u32 area, u32 room);
extern void* GetCurrentRoomProperty(u32);
extern void LoadRoomTileEntities();
void sub_0804B3C4(void*);
+void sub_0804B0B0(u32 arg0, u32 arg1);
#endif