Merge branch 'master' into m4a

1 files changed, 6 insertions, 7 deletions

diff --git a/src/code_0804AA84.c b/src/code_0804AA84.c
index 59485d74..cdc00c3f 100644
--- a/src/code_0804AA84.c
+++ b/src/code_0804AA84.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "area.h"
 #include "main.h"
+#include "utils.h"
 #include "functions.h"
 #include "screen.h"
 
@@ -10,15 +11,13 @@ typedef struct {
     u32 unk;
 } struct_02018EB0;
 
-extern void sub_0805E5A8();
-
 extern void (*const gUnk_080D4120[])();
 extern void (*const gUnk_080D412C[])();
 
 extern struct_02018EB0 gUnk_02018EB0;
 
 u32 sub_0804AA84(void) {
-    if (gArea.fadeOut != 0) {
+    if (gArea.playShrinkSeq) {
         gMain.transition = 4;
         gArea.filler[8] = 0;
         gArea.filler[9] = 0;
@@ -26,8 +25,8 @@ u32 sub_0804AA84(void) {
         sub_0805E5A8();
         return 1;
     } else {
-        gArea.filler[18] = gArea.fadeOut;
-        *(vu8*)&gArea.fadeOut = gArea.fadeOut;
+        gArea.filler[18] = gArea.playShrinkSeq;
+        *(vu8*)&gArea.playShrinkSeq = gArea.playShrinkSeq;
         return 0;
     }
 }
@@ -37,10 +36,10 @@ void sub_0804AAB8(void) {
 }
 
 void sub_0804AAD4(void) {
-    MemClear32((void*)&gUnk_02018EB0, 0x28);
+    MemClear(&gUnk_02018EB0, 0x28);
     gUnk_02018EB0.unk = 0;
     EraseAllEntities();
-    CreateObject(0x3d, gArea.field_0x17, 0);
+    CreateObject(0x3d, gArea.curPortalType, 0);
     gArea.filler[8]++;
 }