Merge branch 'master' into tilemap-docs

5 files changed, 10 insertions, 10 deletions

diff --git a/src/manager/minishPortalManager.c b/src/manager/minishPortalManager.c
index ea3ae958..aa7fc1a5 100644
--- a/src/manager/minishPortalManager.c
+++ b/src/manager/minishPortalManager.c
@@ -33,7 +33,7 @@ void MinishPortalManager_Main(MinishPortalManager* this) {
         gArea.portal_type = super->type;
         if (!CheckGlobalFlag(EZERO_1ST)) {
             gArea.portal_mode = 1;
-            gArea.portal_type = 5;
+            gArea.portal_type = PT_5;
         } else {
             if ((gPlayerState.flags & PL_USE_PORTAL) && gPlayerState.jump_status == 0) {
                 gArea.portal_mode = 2;
@@ -82,7 +82,7 @@ void CreateMagicSparkles(u32 baseX, u32 baseY, u32 layer) {
 }
 
 bool32 PortalReadyForMinish(void) {
-    if ((gPlayerState.flags & PL_MINISH) && gPlayerState.attachedBeetleCount == 0 && (gArea.portal_type != 0x6) &&
+    if ((gPlayerState.flags & PL_MINISH) && gPlayerState.attachedBeetleCount == 0 && (gArea.portal_type != PT_TOD) &&
         (gPlayerState.heldObject == 0)) {
         switch (gPlayerState.framestate) {
             case PL_STATE_IDLE:
diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c
index e73bb714..a25aa3e5 100644
--- a/src/manager/miscManager.c
+++ b/src/manager/miscManager.c
@@ -434,6 +434,6 @@ void MiscManager_TypeF(MiscManager* this) {
     if (gPlayerEntity.action == PLAYER_TALKEZLO) {
         DeleteThisEntity();
     }
-    gInput.heldKeys |= 0x4;
+    gInput.heldKeys |= SELECT_BUTTON;
 }
 #endif
diff --git a/src/manager/rollingBarrelManager.c b/src/manager/rollingBarrelManager.c
index 0a1cab7e..ec215c34 100644
--- a/src/manager/rollingBarrelManager.c
+++ b/src/manager/rollingBarrelManager.c
@@ -191,7 +191,7 @@ void sub_08058B5C(RollingBarrelManager* this, u32 unk1) {
     gRoomTransition.player_status.start_anim = unk1 & 1 ? 4 : 0;
     gRoomTransition.player_status.start_pos_x = gUnk_081082E8[unk1 * 3];
     gRoomTransition.player_status.start_pos_y = gUnk_081082E8[unk1 * 3 + 1];
-    gSave.unk7 = gUnk_081082E8[unk1 * 3 + 2];
+    gSave.dws_barrel_state = gUnk_081082E8[unk1 * 3 + 2];
     SoundReq(SFX_STAIRS);
 }
 
diff --git a/src/manager/vaati3StartManager.c b/src/manager/vaati3StartManager.c
index c53528d8..6d1c666d 100644
--- a/src/manager/vaati3StartManager.c
+++ b/src/manager/vaati3StartManager.c
@@ -54,7 +54,7 @@ void Vaati3StartManager_Type0_Init(Vaati3StartManager* this) {
     *(u8*)&gRoomTransition.field_0x3a = 0x20;
     *((u8*)&gRoomTransition.field_0x3a + 1) = 0x20;
 #if !defined(EU) && !defined(JP)
-    gSave.timers[3] = 0x1194;
+    gSave.vaati_timer = 0x1194;
 #endif
 }
 
@@ -71,7 +71,7 @@ void Vaati3StartManager_Type0_Action1(Vaati3StartManager* this) {
         super->timer = 120;
         SetPlayerControl(2);
         sub_08078B48();
-        object = CreateObject(THUNDERBOLD, 0, 0);
+        object = CreateObject(THUNDERBOLT, 0, 0);
         if (object != NULL) {
             object->x.HALF.HI = gRoomControls.origin_x + 0x88;
             object->y.HALF.HI = gRoomControls.origin_y + 0x48;
diff --git a/src/manager/vaatiAppearingManager.c b/src/manager/vaatiAppearingManager.c
index 9e349cb1..6eabadd8 100644
--- a/src/manager/vaatiAppearingManager.c
+++ b/src/manager/vaatiAppearingManager.c
@@ -138,16 +138,16 @@ void VaatiAppearingManager_Action2(VaatiAppearingManager* this) {
 }
 
 void VaatiAppearingManager_Action3(VaatiAppearingManager* this) {
-    if ((gInput.heldKeys & 0x40) != 0) {
+    if ((gInput.heldKeys & DPAD_UP) != 0) {
         this->field_0x20--;
     }
-    if ((gInput.heldKeys & 0x80) != 0) {
+    if ((gInput.heldKeys & DPAD_DOWN) != 0) {
         this->field_0x20++;
     }
-    if ((gInput.heldKeys & 0x20) != 0) {
+    if ((gInput.heldKeys & DPAD_LEFT) != 0) {
         this->field_0x28--;
     }
-    if ((gInput.heldKeys & 0x10) != 0) {
+    if ((gInput.heldKeys & DPAD_RIGHT) != 0) {
         this->field_0x28++;
     }
 }