From 326143afcc27491f6fca042826de18957eeb351e Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Sat, 29 Jan 2022 15:51:23 +0200
Subject: [PATCH] Use PlayerSpawnType enum in a few places

---
 src/manager/manager1A.c | 6 +++---
 src/manager/manager2C.c | 2 +-
 src/manager/managerC.c  | 2 +-
 src/object/warpPoint.c  | 2 +-
 src/roomInit.c          | 2 +-
 src/sub_0807CA18.c      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/manager/manager1A.c b/src/manager/manager1A.c
index 9aea4722..cb8c6eeb 100644
--- a/src/manager/manager1A.c
+++ b/src/manager/manager1A.c
@@ -155,9 +155,9 @@ void sub_0805B210(Manager1A* this) {
     gRoomTransition.player_status.room_next = tmp->unk_02;
     gRoomTransition.player_status.layer = tmp->unk_03;
     if (gPlayerState.flags & PL_MINISH) {
-        gRoomTransition.player_status.spawn_type = 6;
+        gRoomTransition.player_status.spawn_type = PL_SPAWN_DROP_MINISH;
     } else {
-        gRoomTransition.player_status.spawn_type = 2;
+        gRoomTransition.player_status.spawn_type = PL_SPAWN_DROP;
     }
     switch (tmp->unk_00) {
         case 0:
@@ -171,7 +171,7 @@ void sub_0805B210(Manager1A* this) {
         case 2:
             gRoomTransition.player_status.start_pos_x = tmp->unk_04;
             gRoomTransition.player_status.start_pos_y = tmp->unk_06;
-            gRoomTransition.player_status.spawn_type = 6;
+            gRoomTransition.player_status.spawn_type = PL_SPAWN_DROP_MINISH;
             break;
     }
 }
diff --git a/src/manager/manager2C.c b/src/manager/manager2C.c
index 3ad27242..83601282 100644
--- a/src/manager/manager2C.c
+++ b/src/manager/manager2C.c
@@ -25,7 +25,7 @@ void Manager2C_Main(Manager2C* manager) {
         MemClear(&gRoomTransition.player_status, 0x20);
         gRoomTransition.transitioningOut = 1;
         gRoomTransition.type = TRANSITION_DEFAULT;
-        gRoomTransition.player_status.spawn_type = 0xb;
+        gRoomTransition.player_status.spawn_type = PL_SPAWN_PARACHUTE_UP;
         gRoomTransition.player_status.area_next = manager->manager.unk_0b;
         gRoomTransition.player_status.room_next = manager->manager.unk_0e;
         gRoomTransition.player_status.start_anim = manager->field_0x37;
diff --git a/src/manager/managerC.c b/src/manager/managerC.c
index 5bc20a62..c3fdaa8a 100644
--- a/src/manager/managerC.c
+++ b/src/manager/managerC.c
@@ -206,7 +206,7 @@ const u16 gUnk_081082E8[0xC] = { 0xB8, 0x80, 0x0, 0xB8, 0x110, 0x2, 0x118, 0x80,
 void sub_08058B5C(ManagerC* this, u32 unk1) {
     gRoomTransition.transitioningOut = 1;
     gRoomTransition.type = TRANSITION_DEFAULT;
-    gRoomTransition.player_status.spawn_type = 4;
+    gRoomTransition.player_status.spawn_type = PL_SPAWN_STEP_IN;
     gRoomTransition.player_status.area_next = gRoomControls.area;
     gRoomTransition.player_status.room_next = 6;
     gRoomTransition.player_status.start_anim = unk1 & 1 ? 4 : 0;
diff --git a/src/object/warpPoint.c b/src/object/warpPoint.c
index 02b73a9a..b28fafca 100644
--- a/src/object/warpPoint.c
+++ b/src/object/warpPoint.c
@@ -152,7 +152,7 @@ void sub_0808B684(Entity* this) {
         gRoomTransition.player_status.start_pos_y = ((this->cutsceneBeh.HWORD & 0xfc0) >> 2) + 8;
         gRoomTransition.player_status.layer = 0;
         gRoomTransition.player_status.start_anim = 4;
-        gRoomTransition.player_status.spawn_type = 0;
+        gRoomTransition.player_status.spawn_type = PL_SPAWN_DEFAULT;
         if (this->type == 2) {
             gRoomTransition.type = TRANSITION_FADE_WHITE_SLOW;
         }
diff --git a/src/roomInit.c b/src/roomInit.c
index 3cb07870..baaadce7 100644
--- a/src/roomInit.c
+++ b/src/roomInit.c
@@ -5313,7 +5313,7 @@ void sub_StateChange_HouseInteriors3_Bakery(void) {
 
 u32 sub_unk3_HouseInteriors3_Simon(void) {
     if (CheckGlobalFlag(MAROYA_WAKEUP)) {
-        gRoomTransition.player_status.spawn_type = 5;
+        gRoomTransition.player_status.spawn_type = PL_SPAWN_SPECIAL;
     }
     return 1;
 }
diff --git a/src/sub_0807CA18.c b/src/sub_0807CA18.c
index d8e9db7a..675fa831 100644
--- a/src/sub_0807CA18.c
+++ b/src/sub_0807CA18.c
@@ -49,7 +49,7 @@ u32 FinalizeSave(void) {
         gSave.saved_status.area_next = 0x22;
         gSave.saved_status.room_next = 0x15; // links room
         gSave.saved_status.start_anim = 0;
-        gSave.saved_status.spawn_type = 0;
+        gSave.saved_status.spawn_type = PL_SPAWN_DEFAULT;
         gSave.saved_status.layer = 1;
         gSave.saved_status.start_pos_x = 0x90;
         gSave.saved_status.start_pos_y = 0x38;