diff options
| author | Prakxo <87568477+Prakxo@users.noreply.github.com> | 2024-09-26 16:39:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-26 07:39:38 -0700 |
| commit | bd553a1ca83a6135604920e8f073ebe29122bc5a (patch) | |
| tree | a84c34487578cfae9ddab32c4e43ea83fc932e60 /include | |
| parent | 5fb92a5079f8e2ccf67d5593236a62dff6cd3638 (diff) | |
m_player controller functions (#217)
* player work1
* m_player_controller
* format
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_actor.h | 1 | ||||
| -rw-r--r-- | include/m_common_data.h | 3 | ||||
| -rw-r--r-- | include/m_name_table.h | 9 | ||||
| -rw-r--r-- | include/m_player_lib.h | 3 |
4 files changed, 14 insertions, 2 deletions
diff --git a/include/m_actor.h b/include/m_actor.h index 819d7dc..1c17587 100644 --- a/include/m_actor.h +++ b/include/m_actor.h @@ -42,6 +42,7 @@ typedef enum ActorFootIndex { typedef enum FgNameF000 { /* 0x0 */ FGNAME_F000_0 = 0x0, /* 0x0 */ FGNAME_F000_1 = 0x1, + /* 0x4 */ FGNAME_F000_4 = 0x4, /* 0x5 */ FGNAME_F000_5 = 0x5, /* 0x8 */ FGNAME_F000_8 = 0x8, /* 0xD */ FGNAME_F000_D = 0xD, diff --git a/include/m_common_data.h b/include/m_common_data.h index fb351af..3116d8a 100644 --- a/include/m_common_data.h +++ b/include/m_common_data.h @@ -157,7 +157,8 @@ typedef struct CommonData { /* 0x10750 */ s16 moneyPower; /* 0x10752 */ s16 goodsPower; /* 0x10754 */ DoorData doorData; - /* 0x10768 */ s8 unk_10768[0x38]; + /* 0x10764 */ DoorData structureExitDoorData; + /* 0x1077C */ UNK_TYPE1 unk_1077C[0x24]; /* 0x107A0 */ DoorData famicomEmuDoorData; /* 0x107B4 */ s16 unk_107B4; /* 0x107B6 */ s16 unk_107B6; // named "demo_profile" in AC GCN decomp (though it's an array of two s16s in that game) diff --git a/include/m_name_table.h b/include/m_name_table.h index 7269003..2c037cf 100644 --- a/include/m_name_table.h +++ b/include/m_name_table.h @@ -45,6 +45,15 @@ NameTableOffsetTable* obj_hight_table_item0_nogrow(u16 item); #define ITM_FOOD_COCONUT (ITM_FOOD_CANDY + 1) #define ITM_FOOD_END 0x2808 + +#define DOOR_START 0x4000 +#define DOOR0 DOOR_START /* 0x4000 */ +#define DOOR1 (DOOR0 + 1) /* 0x4001 */ + +#define EXIT_DOOR 0x4080 +#define EXIT_DOOR1 (EXIT_DOOR + 1) /* 0x4081 */ + + /* begin environmental/nature objects */ #define ENV_START 0x0800 /* tree */ diff --git a/include/m_player_lib.h b/include/m_player_lib.h index 9cbdc99..99c7847 100644 --- a/include/m_player_lib.h +++ b/include/m_player_lib.h @@ -6,6 +6,7 @@ struct Player; struct Game_Play; struct PrivateInfo; +struct PlayerControllerData; // void func_800B1160_jp(); // void func_800B11B0_jp(); @@ -158,7 +159,7 @@ s32 func_800B5718_jp(void); // void func_800B5880_jp(); // void func_800B58C4_jp(); // void func_800B5910_jp(); -// void func_800B593C_jp(); +struct PlayerControllerData* mPlib_Get_controller_data_for_title_demo_p(void); void func_800B594C_jp(void); // void func_800B5980_jp(); // void func_800B5AA0_jp(); |