replace ScreenTransitionData with Transition

the struct did exist twice

5 files changed, 41 insertions, 54 deletions

diff --git a/include/functions.h b/include/functions.h
index d0eace75..de36bf0b 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -92,7 +92,7 @@ extern u32* sub_0805F25C(u32);
 extern void sub_0805F8E4(u32 r0, WStruct* r1);
 extern void sub_0806D0B0(Entity*);
 extern bool32 sub_080806BC(u32, u32, u32, u32);
-extern void sub_0808091C(const ScreenTransitionData* screenTransition, u32 transitionType);
+extern void sub_0808091C(const Transition* screenTransition, u32 transitionType);
 extern void sub_080809D4(void);
 extern void sub_08080CB4(Entity*);
 extern u32 sub_0808288C(Entity*, u32, u32, u32);
diff --git a/include/room.h b/include/room.h
index 09d2b2fb..c05a7b82 100644
--- a/include/room.h
+++ b/include/room.h
@@ -4,6 +4,7 @@
 #include "entity.h"
 #include "droptables.h"
 #include "map.h"
+#include "transitions.h"
 
 enum RoomTransition {
     TRANSITION_DEFAULT,
@@ -189,20 +190,6 @@ static_assert(sizeof(RoomTransition) == 0xB0);
 extern RoomTransition gRoomTransition;
 
 typedef struct {
-    u16 type;
-    u8 field_0x2[4];
-    s16 playerXPos;
-    s16 playerYPos;
-    u8 field_0xa;
-    u8 area;
-    u8 room;
-    u8 playerLayer;
-    u8 spawn_type;
-    u8 playerState;
-    u16 transitionSFX;
-} ScreenTransitionData;
-
-typedef struct {
     u8 type;
     u8 localFlag;
     u8 _2;
@@ -251,6 +238,6 @@ void UnloadGFXSlots(Entity*);
 void LoadSmallChestTile2(TileEntity*);
 void sub_0804B0B0(u32 arg0, u32 arg1);
 
-void DoExitTransition(const ScreenTransitionData* data);
+void DoExitTransition(const Transition* data);
 
 #endif // ROOM_H
diff --git a/include/screenTransitions.h b/include/screenTransitions.h
index fa1d98b5..2abbba93 100644
--- a/include/screenTransitions.h
+++ b/include/screenTransitions.h
@@ -3,35 +3,35 @@
 
 #include "room.h"
 
-extern const ScreenTransitionData* const gWallMasterScreenTransitions[];
-extern const ScreenTransitionData gUnk_0813AB58;
-extern const ScreenTransitionData gUnk_0813AB6C;
-extern const ScreenTransitionData gUnk_0813AB80;
-extern const ScreenTransitionData gUnk_0813AB94;
-extern const ScreenTransitionData gUnk_0813ABA8;
-extern const ScreenTransitionData gUnk_0813ABBC;
-extern const ScreenTransitionData gUnk_0813ABD0;
-extern const ScreenTransitionData gUnk_0813ABE4;
-extern const ScreenTransitionData gUnk_0813ABF8;
-extern const ScreenTransitionData gUnk_0813AC0C;
-extern const ScreenTransitionData gUnk_0813AC20;
-extern const ScreenTransitionData gUnk_0813AC34;
-extern const ScreenTransitionData gUnk_0813AC48;
-extern const ScreenTransitionData gUnk_0813AC5C;
-extern const ScreenTransitionData gUnk_0813AC70;
-extern const ScreenTransitionData gUnk_0813AC84;
-extern const ScreenTransitionData gUnk_0813AC98;
-extern const ScreenTransitionData gUnk_0813ACAC;
-extern const ScreenTransitionData gUnk_0813ACC0;
-extern const ScreenTransitionData gUnk_0813ACD4;
-extern const ScreenTransitionData gUnk_0813ACE8;
-extern const ScreenTransitionData gUnk_0813ACFC;
-extern const ScreenTransitionData gUnk_0813AD10; // w
-extern const ScreenTransitionData gUnk_0813AD24; // m
-extern const ScreenTransitionData gUnk_0813AD38; // l
-extern const ScreenTransitionData gUnk_0813AD4C;
-extern const ScreenTransitionData gUnk_0813AD60;
-extern const ScreenTransitionData gUnk_0813AD74;
-extern const ScreenTransitionData gUnk_0813AD88[];
-extern const ScreenTransitionData gUnk_0813ADEC[];
+extern const Transition* const gWallMasterScreenTransitions[];
+extern const Transition gUnk_0813AB58;
+extern const Transition gUnk_0813AB6C;
+extern const Transition gUnk_0813AB80;
+extern const Transition gUnk_0813AB94;
+extern const Transition gUnk_0813ABA8;
+extern const Transition gUnk_0813ABBC;
+extern const Transition gUnk_0813ABD0;
+extern const Transition gUnk_0813ABE4;
+extern const Transition gUnk_0813ABF8;
+extern const Transition gUnk_0813AC0C;
+extern const Transition gUnk_0813AC20;
+extern const Transition gUnk_0813AC34;
+extern const Transition gUnk_0813AC48;
+extern const Transition gUnk_0813AC5C;
+extern const Transition gUnk_0813AC70;
+extern const Transition gUnk_0813AC84;
+extern const Transition gUnk_0813AC98;
+extern const Transition gUnk_0813ACAC;
+extern const Transition gUnk_0813ACC0;
+extern const Transition gUnk_0813ACD4;
+extern const Transition gUnk_0813ACE8;
+extern const Transition gUnk_0813ACFC;
+extern const Transition gUnk_0813AD10; // w
+extern const Transition gUnk_0813AD24; // m
+extern const Transition gUnk_0813AD38; // l
+extern const Transition gUnk_0813AD4C;
+extern const Transition gUnk_0813AD60;
+extern const Transition gUnk_0813AD74;
+extern const Transition gUnk_0813AD88[];
+extern const Transition gUnk_0813ADEC[];
 #endif // SCREENTRANSITIONS_H
diff --git a/include/subtask.h b/include/subtask.h
index e1d98a16..90ba9f05 100644
--- a/include/subtask.h
+++ b/include/subtask.h
@@ -95,7 +95,7 @@ u32 sub_080A6F40();
 s32 sub_080A69E0();
 const OverworldLocation* GetOverworldLocation(u32 x, u32 y);
 void sub_080A6498(void);
-void sub_080A71F4(const ScreenTransitionData* exitTransition);
+void sub_080A71F4(const Transition* exitTransition);
 void sub_080A6F6C(u32 textIndexOrPtr);
 
 typedef struct {
diff --git a/include/transitions.h b/include/transitions.h
index 3da9d77e..a338202c 100644
--- a/include/transitions.h
+++ b/include/transitions.h
@@ -7,7 +7,9 @@
 typedef enum {
     WARP_TYPE_BORDER,
     WARP_TYPE_AREA,
-    WARP_TYPE_END_OF_LIST = -1,
+    WARP_TYPE_UNK2,
+    WARP_TYPE_UNK3,
+    WARP_TYPE_END_OF_LIST = 0xffff,
 } WarpType;
 
 typedef enum {
@@ -27,8 +29,7 @@ typedef enum {
 } TransitionType;
 
 typedef struct Transition {
-    WarpType warp_type : 8;
-    u8 subtype;
+    u16 warp_type; /**< @see WarpType */
     u16 startX;
     u16 startY;
     u16 endX;
@@ -36,11 +37,10 @@ typedef struct Transition {
     u8 shape;
     u8 area;
     RoomID room : 8;
-    u8 height;
+    u8 layer;
     TransitionType transition_type : 8;
     u8 facing_direction; // 0-4
-    u8 unk0;
-    u8 unk1;
+    u16 transitionSFX;
     u8 unk2;
     u8 unk3;
 } Transition;