diff options
| author | Henny022p <73211432+Henny022p@users.noreply.github.com> | 2026-02-08 18:32:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-08 18:32:38 +0100 |
| commit | 5ab63f00e522ff69c5bc987e379f0163943f2833 (patch) | |
| tree | 53622222ac729c6ab6dc75ef7f9bafa8031daf18 /include/room.h | |
| parent | 73901a0a012d55ebb66a4627dcb246d19737fcb5 (diff) | |
| parent | 5b2cafdc894823d57beee8f3947a391d881d91de (diff) | |
Various code cleanup changes
Diffstat (limited to 'include/room.h')
| -rw-r--r-- | include/room.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/include/room.h b/include/room.h index 09d2b2fb..1802a934 100644 --- a/include/room.h +++ b/include/room.h @@ -3,7 +3,7 @@ #include "entity.h" #include "droptables.h" -#include "map.h" +#include "transitions.h" enum RoomTransition { TRANSITION_DEFAULT, @@ -189,20 +189,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; @@ -246,11 +232,9 @@ Entity* LoadRoomEntity(const EntityData*); void LoadRoomEntityList(const EntityData* listPtr); void* GetRoomProperty(u32 area, u32 room, u32 property); -bool32 LoadFixedGFX(Entity*, u32); -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 |