summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-08-06 15:21:41 +0300
committerTal Hayon <talhayon1@gmail.com>2022-08-06 15:21:41 +0300
commit18ef0d34b4ce9801ae26449e3a32ac9d985e43de (patch)
tree38faf63b8f005c8860746273cae12b101d7e8f57 /include
parent64c2f2476d3090856bfa450f06b19b87709a8170 (diff)
Document various fields and functions
Diffstat (limited to 'include')
-rw-r--r--include/player.h21
-rw-r--r--include/room.h2
-rw-r--r--include/script.h8
3 files changed, 25 insertions, 6 deletions
diff --git a/include/player.h b/include/player.h
index 044cb79a..3b117779 100644
--- a/include/player.h
+++ b/include/player.h
@@ -67,8 +67,9 @@ enum PlayerFrameState {
PL_STATE_CLIMB,
PL_STATE_PUSH,
PL_STATE_PULL,
- PL_STATE_1B,
+ PL_STATE_SINKING,
PL_STATE_STAIRS,
+ PL_STATE_1D,
};
enum PlayerSpawnType {
@@ -275,7 +276,7 @@ typedef struct {
/*0x0e*/ u8 field_0xe;
/*0x0f*/ u8 hurtBlinkSpeed;
/*0x10*/ u8 field_0x10;
- /*0x11*/ u8 field_0x11;
+ /*0x11*/ u8 surfacePositionSameTimer;
/*0x12*/ u8 floor_type;
/*0x13*/ u8 floor_type_last;
/*0x14*/ u8 field_0x14;
@@ -297,7 +298,7 @@ typedef struct {
/*0x34*/ u8 field_0x34;
/*0x35*/ u8 field_0x35;
/*0x36*/ u8 field_0x36;
- /*0x37*/ u8 field_0x37;
+ /*0x37*/ u8 surfaceTimer;
/*0x38*/ u8 field_0x38;
/*0x39*/ u8 field_0x39;
/*0x3a*/ u8 field_0x3a;
@@ -356,10 +357,20 @@ typedef struct {
/*0x1*/ u8 behaviorID;
/*0x2*/ u8 field_0x2[2];
/*0x4*/ u8 stateID;
- /*0x5*/ u8 field_0x5[10];
+ /*0x5*/ u8 field_0x5;
+ /*0x6*/ u8 field_0x6;
+ /*0x7*/ u8 timer;
+ /*0x8*/ u8 subtimer;
+ /*0x9*/ u8 field_0x9;
+ /*0xa*/ u8 playerAnimationState;
+ /*0xb*/ u8 direction;
+ /*0xc*/ u8 playerAnimIndex;
+ /*0xd*/ u8 playerFrameDuration;
+ /*0xe*/ u8 playerFrame;
/*0xf*/ u8 field_0xf;
/*0x10*/ u16 field_0x10;
- /*0x12*/ u8 field_0x12[6];
+ /*0xf*/ u8 playerFrameIndex;
+ /*0x12*/ u8 field_0x12[5];
/*0x18*/ Entity* field_0x18;
} ItemBehavior;
diff --git a/include/room.h b/include/room.h
index d1becf0b..710aab1f 100644
--- a/include/room.h
+++ b/include/room.h
@@ -183,7 +183,7 @@ typedef struct {
u8 area;
u8 room;
u8 playerLayer;
- u8 field_0xe;
+ u8 spawn_type;
u8 playerState;
u16 transitionSFX;
} ScreenTransitionData;
diff --git a/include/script.h b/include/script.h
index 0c1c4ed5..78e29963 100644
--- a/include/script.h
+++ b/include/script.h
@@ -3,6 +3,14 @@
#include "entity.h"
+enum SetMessageValueIndex {
+ SMV_DEFAULT,
+ SMV_RUPEES,
+ SMV_FIELD_0X14,
+ SMV_FIELD_0X18,
+ SMV_FIELD_0X1C,
+};
+
typedef struct ScriptExecutionContext {
/*0x00*/ u16* scriptInstructionPointer;
/*0x04*/ u32 intVariable;