Rename managers

include/area.h

@@ -240,4 +240,4 @@ typedef enum {
     AREA_98,
 } AreaID;
 
-#endif
+#endif // AREA_H

include/beanstalkSubtask.h

@@ -1,5 +1,5 @@
-#ifndef BEANSTALK_SUBTASK_H
-#define BEANSTALK_SUBTASK_H
+#ifndef BEANSTALKSUBTASK_H
+#define BEANSTALKSUBTASK_H
 
 #include "global.h"
 
@@ -33,4 +33,4 @@ typedef struct {
 #define MAX_BG_ANIMATIONS 8
 extern BgAnimation gBgAnimations[MAX_BG_ANIMATIONS];
 
-#endif // BEANSTALK_SUBTASK_H
+#endif // BEANSTALKSUBTASK_H

include/collision.h

@@ -1,4 +1,3 @@
-
 #ifndef COLLISION_H
 #define COLLISION_H
 
@@ -32,4 +31,4 @@ bool32 IsCollidingPlayer(Entity*);
 void CalculateEntityTileCollisions(Entity*, u32, u32);
 bool32 ProcessMovementInternal(Entity*, s32, s32, u32);
 
-#endif
+#endif // COLLISION_H

include/definitions.h

@@ -1,5 +1,5 @@
-#ifndef SPRITEDATA_H
-#define SPRITEDATA_H
+#ifndef DEFINITIONS_H
+#define DEFINITIONS_H
 
 #include "gba/types.h"
 #include "entity.h"
@@ -436,7 +436,7 @@ typedef enum {
     SPRITE_FILESCREENOBJECTS,
     SPRITE_OBJECTA2,
     SPRITE_OBJECT6A_10,
-    SPRITE_VAATI_1,
-
+    SPRITE_VAATI_1
 } Sprites;
-#endif
+
+#endif // DEFINITIONS_H

include/droptables.h

@@ -1,5 +1,5 @@
-#ifndef TMC_DROPTABLES_H
-#define TMC_DROPTABLES_H
+#ifndef DROPTABLES_H
+#define DROPTABLES_H
 
 #include "global.h"
 
@@ -37,4 +37,4 @@ enum {
 };
 extern const Droptable gDroptableModifiers[];
 
-#endif // TMC_DROPTABLES_H
+#endif // DROPTABLES_H

include/effects.h

@@ -112,7 +112,7 @@ typedef enum {
     FX_69,
     FX_6A,
     FX_6B,
-    FX_6C,
+    FX_6C
 } Effect;
 
 #endif // EFFECTS_H

include/enemy.h

@@ -253,4 +253,4 @@ void Enemy66(Entity*);
 
 extern void (*const gUnk_080012C8[])(Entity*);
 
-#endif
+#endif // ENEMY_H

include/entity.h

@@ -526,6 +526,8 @@ extern u8 gManagerCount;
 /** @name Tile Macros */ /// @{
 #define TILE(x, y) (((((x)-gRoomControls.origin_x) >> 4) & 0x3F) | ((((y)-gRoomControls.origin_y) >> 4) & 0x3F) << 6)
 #define TILE_POS(x, y) (x + (y << 6))
+#define TILE_POS_X_COMPONENT 0x3f
+#define TILE_POS_Y_COMPONENT 0xfc0
 #define COORD_TO_TILE(entity) TILE((entity)->x.HALF.HI, (entity)->y.HALF.HI)
 #define COORD_TO_TILE_OFFSET(entity, xOff, yOff) TILE((entity)->x.HALF.HI - (xOff), (entity)->y.HALF.HI - (yOff))
 /// @}

include/fileselect.h

@@ -72,4 +72,4 @@ extern u32 gUsedPalettes;
 extern u8 gTextGfxBuffer[];
 extern u8 gUnk_02022030;
 
-#endif
+#endif // FILESELECT_H

include/flags.h

@@ -1741,4 +1741,4 @@ typedef enum {
     END_12,
 } LocalFlags12;
 
-#endif
+#endif // FLAGS_H

include/functions.h

@@ -1,4 +1,3 @@
-
 #ifndef FUNCTIONS_H
 #define FUNCTIONS_H
 
@@ -112,4 +111,5 @@ extern void sub_080A57F4(void);
 extern void sub_080A71C4(u32, u32, u32, u32);
 extern void sub_080ADD70(void);
 extern void sub_080AF284(void);
-#endif
+
+#endif // FUNCTIONS_H

include/gba/syscall.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_GBA_SYSCALL_H
-#define GUARD_GBA_SYSCALL_H
+#ifndef SYSCALL_H
+#define SYSCALL_H
 
 #include "types.h"
 
@@ -62,4 +62,4 @@ int MultiBoot(struct MultiBootParam* mp);
 
 s32 Div(s32 num, s32 denom);
 
-#endif // GUARD_GBA_SYSCALL_H
+#endif // SYSCALL_H

include/global.h

@@ -1,12 +1,14 @@
-#ifndef GUARD_GLOBAL_H
-#define GUARD_GLOBAL_H
+#ifndef GLOBAL_H
+#define GLOBAL_H
 
 /**
  * @defgroup Tasks Tasks
  * @defgroup Subtasks Subtasks
  */
 
-/** @defgroup Entities Entities */
+/**
+ * @defgroup Entities Entities
+ */
 ///@{
 /**
  * @defgroup Player Player
@@ -16,6 +18,7 @@
  * @defgroup NPCs NPCs
  * @defgroup Items Items
  * @defgroup Managers Managers
+ * @brief Entities with a smaller footprint of 0x40 bytes
  */
 ///@}
 
@@ -122,4 +125,4 @@ union SplitHWord {
 /* forward decls */
 struct Entity_;
 
-#endif // GUARD_GLOBAL_H
+#endif // GLOBAL_H

include/hitbox.h

@@ -137,4 +137,5 @@ extern const Hitbox gUnk_080FD580;
 extern const Hitbox gUnk_080FD588;
 
 extern const Hitbox gPlayerHitbox;
-#endif
+
+#endif // HITBOX_H

include/item.h

@@ -151,4 +151,4 @@ typedef enum {
     ITEM_ENEMY_BEETLE
 } Item;
 
-#endif
+#endif // ITEM_H

include/itemMetaData.h

@@ -1,5 +1,5 @@
-#ifndef TMC_ITEMMETADATA_H
-#define TMC_ITEMMETADATA_H
+#ifndef ITEMMETADATA_H
+#define ITEMMETADATA_H
 
 #include "global.h"
 
@@ -38,4 +38,4 @@ typedef struct ItemMetaData {
 
 extern const ItemMetaData gItemMetaData[];
 
-#endif // TMC_ITEMMETADATA_H
+#endif // ITEMMETADATA_H

include/main.h

@@ -5,6 +5,7 @@
 #include "structures.h"
 #include "room.h"
 #include "script.h"
+#include "screen.h"
 
 /** File signature */
 #define SIGNATURE 'MCZ3'
@@ -86,8 +87,8 @@ typedef struct {
     /*0x00E*/ u8 unk_e;
     /*0x00F*/ u8 unk_f;
     /*0x010*/ void** currentRoomProperties;
-    /*0x014*/ u16* mapBottomBgControlPtr;
-    /*0x018*/ u16* mapTopBgControlPtr;
+    /*0x014*/ BgSettings* mapBottomBgSettings;
+    /*0x018*/ BgSettings* mapTopBgSettings;
     /*0x01C*/ RoomControls roomControls;
     /*0x054*/ GfxSlotList gfxSlotList;
     /*0x268*/ Palette palettes[0x10];
@@ -126,7 +127,7 @@ void DoSoftReset(void);
  */
 void SetSleepMode(void);
 
-extern void sub_0805622C(void* a1, u32 a2, u32 a3);
+extern void sub_0805622C(struct BgAffineDstData* a1, u32 a2, u32 a3);
 extern void sub_08056208(void);
 extern void ResetPalettes(void);
 extern void VBlankIntrWait();
@@ -151,7 +152,9 @@ extern void DemoTask(void);
 #endif
 /// @}
 
-extern u8 gUnk_03003DE4;
+extern u8 gUnk_03003DE4[0xC];
 extern u16 gPaletteBuffer[];
 
-#endif
+extern u32 CheckRegionsOnScreen(const u16* arr);
+
+#endif // MAIN_H

include/manager.h

@@ -12,224 +12,143 @@ union SplitSHWord {
 } PACKED;
 
 typedef struct Manager {
-    /*0x00*/ struct Manager* prev;
-    /*0x00*/ struct Manager* next;
-    /*0x08*/ u8 type;
-    /*0x09*/ u8 subtype;
-    /*0x0a*/ u8 unk_0a;
-    /*0x0b*/ u8 unk_0b;
-    /*0x0c*/ u8 action;
-    /*0x0d*/ u8 unk_0d;
-    /*0x0e*/ u8 unk_0e;
-    /*0x0f*/ u8 unk_0f;
-    /*0x10*/ u8 unk_10;
-    /*0x11*/ u8 unk_11[3];
-    /*0x14*/ struct Manager* parent;
-    /*0x18*/ u8 unk_18[0x8];
-    // union SplitHWord y;
-    // u16 unk_22;
-    // u16 unk_24;
-    // u16 unk_26;
-    // u8 unk_28[0x0D];
-    // u8 unk_35;
-    // u16 unk_36;
-    // union SplitSHWord unk_38;
-    // union SplitSHWord unk_3a;
-    // u16 unk_3c;
-    // u16 unk_3e;
+    /*0x00*/ struct Manager* prev; /**< previous Manager */
+    /*0x00*/ struct Manager* next; /**< next Manager */
+    /*0x08*/ u8 kind;              /**< @see EntityKind */
+    /*0x09*/ u8 id;                /**< Manager id. @see Managers */
+    /*0x0a*/ u8 type;              /**< For use internally to allow different variations. */
+    /*0x0b*/ u8 type2;             /**< For use internally. */
+    /*0x0c*/ u8 action;            /**< Current action. Usually used to index a function table. */
+    /*0x0d*/ u8 subAction;         /**< Optional sub-action. */
+    /*0x0e*/ u8 timer;             /**< General purpose timer. */
+    /*0x0f*/ u8 subtimer;          /**< General purpose timer. */
+    /*0x10*/ u8 flags;             /**< @see EntityFlags */
+    /*0x11*/ u8 unused[3];         /**< Not used by any manager. */
+    /*0x14*/ Entity* parent;       /**< Parent Entity. */
+    /*0x18*/ Entity* child;        /**< Child Entity. */
+    /*0x1c*/ u8 unused2[0x4];      /**< Not used by any manager. */
 } Manager;
 
-typedef struct {
-    u16 posX;
-    u16 posY;
-    u8 width;
-    u8 height;
-    u8 unk_06;
-    union {
-        u8 all;
-        struct {
-            u8 layer : 2;
-            u8 unk1 : 2;
-            u8 unk2 : 1;
-            u8 unk3 : 3;
-        } PACKED b;
-    } PACKED unk_07;
-} Manager6WarpData;
+typedef enum {
+    MANAGER_NONE,
+    LIGHT_RAY_MANAGER,
+    VERTICAL_MINISH_PATH_BACKGROUND_MANAGER,
+    MINISH_PORTAL_MANAGER,
+    DIGGING_CAVE_ENTRANCE_MANAGER,
+    BRIDGE_MANAGER,
+    SPECIAL_WARP_MANAGER,
+    MINISH_VILLAGE_MANAGER,
+    HORIZONTAL_MINISH_PATH_BACKGROUND_MANAGER,
+    MINISH_RAFTERS_BACKGROUND_MANAGER,
+    EZLO_HINT_MANAGER,
+    FIGHT_MANAGER,
+    ROLLING_BARREL_MANAGER,
+    TILE_CHANGE_OBSERVE_MANAGER,
+    ENTITY_SPAWN_MANAGER,
+    MISC_MANAGER,
+    WEATHER_CHANGE_MANAGER,
+    FLAG_AND_OPERATOR_MANAGER,
+    HYRULE_TOWN_TILESET_MANAGER,
+    HOUSE_SIGN_MANAGER,
+    STEAM_OVERLAY_MANAGER,
+    TEMPLE_OF_DROPLETS_MANAGER,
+    DELAYED_ENTITY_LOAD_MANAGER,
+    FALLING_ITEM_MANAGER,
+    CLOUD_OVERLAY_MANAGER,
+    POW_BACKGROUND_MANAGER,
+    HOLE_MANAGER,
+    STATIC_BACKGROUND_MANAGER,
+    RAINFALL_MANAGER,
+    ANIMATED_BACKGROUND_MANAGER,
+    REGION_TRIGGER_MANAGER,
+    RAIL_INTERSECTION_MANAGER,
+    MOVEABLE_OBJECT_MANAGER,
+    MINISH_SIZED_ENTRANCE_MANAGER,
+    LIGHT_MANAGER,
+    LIGHT_LEVEL_SET_MANAGER,
+    BOMBABLE_WALL_MANAGER,
+    FLAME_MANAGER,
+    PUSHABLE_FURNITURE_MANAGER,
+    ARMOS_INTERIOR_MANAGER,
+    ENEMY_INTERACTION_MANAGER,
+    MANAGER_29,
+    DESTRUCTIBLE_TILE_OBSERVE_MANAGER,
+    ANGRY_STATUE_MANAGER,
+    CLOUD_STAIRCASE_TRANSITION_MANAGER,
+    WATERFALL_BOTTOM_MANAGER,
+    SECRET_MANAGER,
+    VAATI3_BACKGROUND_MANAGER,
+    TILE_PUZZLE_MANAGER,
+    GORON_MERCHANT_SHOP_MANAGER,
+    VAATI_APPARATE_MANAGER,
+    HYRULE_TOWN_BELL_MANAGER,
+    VAATI3_INSIDE_ARM_MANAGER,
+    CAMERA_TARGET_MANAGER,
+    REPEATED_SOUND_MANAGER,
+    VAATI3_START_MANAGER,
+    FLOATING_PLATFORM_MANAGER,
+    ENTER_ROOM_TEXTBOX_MANAGER
+} Managers;
 
-typedef struct {
-    Manager manager;
-    Manager6WarpData* warpList;
-} Manager6;
-
-typedef struct {
-    Manager manager;
-    u16 x;
-    u16 y;
-    u16 rx;
-    u16 ry;
-    u8 unk_28[13];
-    u8 msg_height;
-    u16 msg_idx;
-    u8 x_raw;
-    u8 y_raw;
-    u8 rx_raw;
-    u8 ry_raw;
-    u16 flag1;
-    u16 flag2;
-} ManagerA;
-
-typedef struct {
-    Manager manager;
-    u8 unk_20;
-    u8 unk_21[0x14];
-    u8 unk_35;
-    u8 unk_36[0x4];
-    u16 unk_3a;
-    u16 unk_3c;
-    u16 unk_3e;
-} ManagerB;
-
-typedef struct {
-    Manager manager;
-    Entity* enemies[8];
-} ManagerBHelper;
-
-typedef struct {
-    Manager manager;
-    u8 unk_20[0x18];
-    s16 unk_38;
-    s16 unk_3a;
-    u16 unk_3c;
-    u16 unk_3e;
-} ManagerE;
-
-typedef struct {
-    Manager manager;
-    u8 unk_20[0x18];
-    s16 unk_38;
-    s16 unk_3a;
-    u16 unk_3c;
-    u16 unk_3e;
-} ManagerF;
-
-typedef struct {
-    Manager manager;
-    u8 unk_20;
-    u8 unk_21;
-    u8 unk_22;
-    u8 unk_23;
-    u8 filler_0x24[0x1C];
-} Manager10;
-
-typedef struct Manager11 {
-    Manager manager;
-    u8 unk_20[0x1C];
-    u16 unk_3c;
-    u16 unk_3e;
-} Manager11;
-
-typedef struct {
-    u16 unk_00;
-    u8 source_room;
-    u8 unk_03;
-    u8 target_area;
-    u8 target_room;
-    u16 unk_06;
-} DiggingCaveEntrance;
-
-typedef struct {
-    const DiggingCaveEntrance* unk_00;
-    u16 unk_04;
-    u16 unk_06;
-    u8 isDiggingCave;
-    u8 unk_09;
-    u8 unk_0a;
-    u8 unk_0b;
-} struct_03004030;
-extern struct_03004030 gUnk_03004030;
-
-extern const DiggingCaveEntrance* const diggingCaveEntrances[];
-
-typedef struct {
-    Manager manager;
-    u8 field_0x20[0x15];
-    u8 field_0x35;
-    u8 field_0x36;
-    u8 field_0x37;
-    s16 x;
-    u16 y;
-    u16 tile;
-    u16 field_0x3e;
-} Manager24;
-
-typedef struct {
-    u8 unk_00;
-    u8 unk_01;
-    u8 unk_02;
-    u8 unk_03;
-    u16 unk_04;
-    u16 unk_06;
-} UnkManager26HelperStruct;
-
-extern void Manager1_Main();
-extern void Manager2_Main();
-extern void Manager3_Main();
-extern void Manager4_Main();
-extern void Manager5_Main();
-extern void Manager6_Main();
-extern void Manager7_Main();
-extern void Manager8_Main();
-extern void Manager9_Main();
-extern void ManagerA_Main();
-extern void ManagerB_Main();
-extern void ManagerC_Main();
-extern void ManagerD_Main();
-extern void ManagerE_Main();
-extern void sub_08058ECC(ManagerF*);
-extern void Manager10_Main(Manager10*);
-extern void Manager11_Main(Manager11*);
-extern void Manager12_Main();
-extern void Manager13_Main();
-extern void Manager14_Main();
-extern void Manager15_Main();
-extern void Manager16_Main();
-extern void Manager17_Main();
-extern void Manager18_Main();
-extern void Manager19_Main();
-extern void Manager1A_Main();
-extern void Manager1B_Main();
-extern void Manager1C_Main(Manager*);
-extern void Manager1D_Main();
-extern void Manager1E_Main();
-extern void Manager1F_Main();
-extern void Manager20_Main();
-extern void Manager21_Main();
-extern void Manager22_Main();
-extern void Manager23_Main();
-extern void Manager24_Main();
-extern void Manager25_Main();
-extern void Manager26_Main();
-extern void Manager27_Main();
-extern void Manager28_Main();
+extern void LightRayManager_Main();
+extern void VerticalMinishPathBackgroundManager_Main();
+extern void MinishPortalManager_Main();
+extern void DiggingCaveEntranceManager_Main();
+extern void BridgeManager_Main();
+extern void SpecialWarpManager_Main();
+extern void MinishVillageTilesetManager_Main();
+extern void HorizontalMinishPathBackgroundManager_Main();
+extern void MinishRaftersBackgroundManager_Main();
+extern void EzloHintManager_Main();
+extern void FightManager_Main();
+extern void RollingBarrelManager_Main();
+extern void TileChangeObserveManager_Main();
+extern void EntitySpawnManager_Main();
+extern void MiscManager_Main();
+extern void WeatherChangeManager_Main();
+extern void FlagAndOperatorManager_Main();
+extern void HyruleTownTilesetManager_Main();
+extern void HouseSignManager_Main();
+extern void SteamOverlayManager_Main();
+extern void TempleOfDropletsManager_Main();
+extern void DelayedEntityLoadManager_Main();
+extern void FallingItemManager_Main();
+extern void CloudOverlayManager_Main();
+extern void PowBackgroundManager_Main();
+extern void HoleManager_Main();
+extern void StaticBackgroundManager_Main();
+extern void RainfallManager_Main();
+extern void AnimatedBackgroundManager_Main();
+extern void RegionTriggerManager_Main();
+extern void RailIntersectionManager_Main();
+extern void MoveableObjectManager_Main();
+extern void MinishSizedEntranceManager_Main();
+extern void LightManager_Main();
+extern void LightLevelSetManager_Main();
+extern void BombableWallManager_Main();
+extern void FlameManager_Main();
+extern void PushableFurnitureManager_Main();
+extern void ArmosInteriorManager_Main();
+extern void EnemyInteractionManager_Main();
 extern void Manager29_Main();
-extern void Manager2A_Main(Manager*);
-extern void Manager2B_Main();
-extern void Manager2C_Main();
-extern void Manager2D_Main(Entity*);
-extern void Manager2E_Main();
-extern void Manager2F_Main();
-extern void Manager30_Main();
-extern void Manager31_Main();
-extern void Manager32_Main();
-extern void Manager33_Main();
-extern void Manager34_Main();
-extern void Manager35_Main();
-extern void Manager36_Main(Manager*);
-extern void Manager37_Main();
-extern void Manager38_Main(Entity*);
-extern void Manager39_Main();
+extern void DestructibleTileObserveManager_Main();
+extern void AngryStatueManager_Main();
+extern void CloudStaircaseTransitionManager_Main();
+extern void WaterfallBottomManager_Main();
+extern void SecretManager_Main();
+extern void Vaati3BackgroundManager_Main();
+extern void TilePuzzleManager_Main();
+extern void GoronMerchantShopManager_Main();
+extern void VaatiAppearingManager_Main();
+extern void HyruleTownBellManager_Main();
+extern void Vaati3InsideArmManager_Main();
+extern void CameraTargetManager_Main();
+extern void RepeatedSoundManager_Main();
+extern void Vaati3StartManager_Main();
+extern void FloatingPlatformManager_Main();
+extern void EnterRoomTextboxManager_Main();
 
-extern void (*const gManagerFunctions[58])();
+extern void (*const gMiscManagerunctions[58])();
 
 Manager* GetEmptyManager(void);
 
@@ -242,4 +161,4 @@ extern u32 sub_0805ACC0(Entity*);
 extern void sub_0801855C(void);
 extern void sub_080186C0(u32);
 
-#endif
+#endif // MANAGER_H

include/manager/angryStatueManager.h

@@ -0,0 +1,26 @@
+#ifndef ANGRYSTATUEMANAGER_H
+#define ANGRYSTATUEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    Entity* field_0x20[4];
+    u8 field_0x30;
+    u8 field_0x31;
+    u8 field_0x32;
+    u8 field_0x33;
+    u8 field_0x34;
+    u8 field_0x35;
+    u8 field_0x36;
+    u8 field_0x37;
+    u8 field_0x38;
+    u8 field_0x39;
+    u8 field_0x3a;
+    u8 field_0x3b;
+    u8 field_0x3c;
+    u8 field_0x3d;
+    u16 field_0x3e;
+} AngryStatueManager;
+
+#endif // ANGRYSTATUEMANAGER_H

include/manager/animatedBackgroundManager.h

@@ -0,0 +1,10 @@
+#ifndef ANIMATEDBACKGROUNDMANAGER_H
+#define ANIMATEDBACKGROUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} AnimatedBackgroundManager;
+
+#endif // ANIMATEDBACKGROUNDMANAGER_H

include/manager/armosInteriorManager.h

@@ -0,0 +1,10 @@
+#ifndef ARMOSINTERIORMANAGER_H
+#define ARMOSINTERIORMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} ArmosInteriorManager;
+
+#endif // ARMOSINTERIORMANAGER_H

include/manager/bombableWallManager.h

@@ -0,0 +1,18 @@
+#ifndef BOMBABLEWALLMANAGER_H
+#define BOMBABLEWALLMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20[0x15];
+    u8 field_0x35;
+    u8 field_0x36;
+    u8 field_0x37;
+    s16 x;
+    u16 y;
+    u16 tile;
+    u16 field_0x3e;
+} BombableWallManager;
+
+#endif // BOMBABLEWALLMANAGER_H

include/manager/bridgeManager.h

@@ -0,0 +1,22 @@
+#ifndef BRIDGEMANAGER_H
+#define BRIDGEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x08];
+    u16 unk_28;
+    u16 unk_2a;
+    u16 unk_2c;
+    u16 unk_2e;
+    u16 unk_30;
+    u16 unk_32;
+    u8 unk_34[0x04];
+    s16 x;
+    s16 y;
+    u16 unk_3c;
+    u16 flags;
+} BridgeManager;
+
+#endif // BRIDGEMANAGER_H

include/manager/cameraTargetManager.h

@@ -0,0 +1,18 @@
+#ifndef CAMERATARGETMANAGER_H
+#define CAMERATARGETMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20[0x15];
+    u8 field_0x35;
+    u8 field_0x36;
+    u8 field_0x37;
+    s16 field_0x38;
+    s16 field_0x3a;
+    u16 field_0x3c;
+    u16 field_0x3e;
+} CameraTargetManager;
+
+#endif // CAMERATARGETMANAGER_H

include/manager/cloudOverlayManager.h

@@ -0,0 +1,11 @@
+#ifndef CLOUDOVERLAYMANAGER_H
+#define CLOUDOVERLAYMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u16 field_0x20;
+} CloudOverlayManager;
+
+#endif // CLOUDOVERLAYMANAGER_H

include/manager/cloudStaircaseTransitionManager.h

@@ -0,0 +1,17 @@
+#ifndef CLOUDSTAIRCASETRANSITIONMANAGER_H
+#define CLOUDSTAIRCASETRANSITIONMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    struct Manager base;
+    u8 field_0x20[0x16];
+    u8 field_0x36;
+    u8 field_0x37;
+    s16 x;
+    s16 y;
+    u16 field_0x3c;
+    u16 field_0x3e;
+} CloudStaircaseTransitionManager;
+
+#endif // CLOUDSTAIRCASETRANSITIONMANAGER_H

include/manager/delayedEntityLoadManager.h

@@ -0,0 +1,6 @@
+#ifndef DELAYEDENTITYLOADMANAGER_H
+#define DELAYEDENTITYLOADMANAGER_H
+
+#include "manager.h"
+
+#endif // DELAYEDENTITYLOADMANAGER_H

include/manager/destructibleTileObserveManager.h

@@ -0,0 +1,18 @@
+#ifndef DESTRUCTIBLETILEOBSERVEMANAGER_H
+#define DESTRUCTIBLETILEOBSERVEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} DestructibleTileObserveManager;
+
+typedef struct {
+    u8 field_0x0;
+    u8 tileLayer;
+    u16 flag;
+    u16 tilePos;
+    u16 tileType;                     // If the tile type at tilePos, tileLayer is tileType, set the local flag.
+} DestructibleTileObserveManager_unk; // TODO result of GetCurrentRoomProperty(3)?
+
+#endif // DESTRUCTIBLETILEOBSERVEMANAGER_H

include/manager/diggingCaveEntranceManager.h

@@ -0,0 +1,32 @@
+#ifndef DIGGINGCAVEENTRANCEMANAGER_H
+#define DIGGINGCAVEENTRANCEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} DiggingCaveEntranceManager;
+
+typedef struct {
+    u16 sourceTilePosition; /**< Tile position for the entrance in the source room. */
+    u8 sourceRoom;
+    u8 type; // TODO some sort of type that is used to index gUnk_08109194
+    u8 targetArea;
+    u8 targetRoom;
+    u16 targetTilePosition; /**< Tile position for the entrance in the target room. */
+} DiggingCaveEntrance;
+
+typedef struct {
+    const DiggingCaveEntrance* entrance;
+    u16 offsetX; /**< X offset from the player to the entrance. */
+    u16 offsetY; /**< Y offset from the player to the entrance. */
+    bool8 isDiggingCave;
+    u8 currentArea;  /**< Area the player was in before the transition. */
+    u8 previousArea; /**< Previous value of currentArea. */
+    u8 targetRoom;   /**< targetRoom | 0x80 ? */
+} DiggingCaveEntranceTransition;
+extern DiggingCaveEntranceTransition gDiggingCaveEntranceTransition;
+
+extern const DiggingCaveEntrance* const diggingCaveEntrances[];
+
+#endif // DIGGINGCAVEENTRANCEMANAGER_H

include/manager/enemyInteractionManager.h

@@ -0,0 +1,13 @@
+#ifndef ENEMYINTERACTIONMANAGER_H
+#define ENEMYINTERACTIONMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    struct {
+        Entity* enemies[8];
+    } d;
+} EnemyInteractionManager;
+
+#endif // ENEMYINTERACTIONMANAGER_H

include/manager/enterRoomTextboxManager.h

@@ -0,0 +1,18 @@
+#ifndef ENTERROOMTEXTBOXMANAGER_H
+#define ENTERROOMTEXTBOXMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;       // unused
+    u8 unk_21[0x13]; // unused
+    u16 unk_34;      // unused
+    u16 unk_36;      // unused
+    s16 unk_38;      // unused
+    s16 unk_3A;      // unused
+    u16 unk_3C;      // unused
+    u16 unk_3E;      // unused
+} EnterRoomTextboxManager;
+
+#endif // ENTERROOMTEXTBOXMANAGER_H

include/manager/entitySpawnManager.h

@@ -0,0 +1,15 @@
+#ifndef ENTITYSPAWNMANAGER_H
+#define ENTITYSPAWNMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x18];
+    s16 sound;
+    s16 spawnTimer; /**< Timer until the entity list is loaded. */
+    u16 unk_3c;
+    u16 flag;
+} EntitySpawnManager;
+
+#endif // ENTITYSPAWNMANAGER_H

include/manager/ezloHintManager.h

@@ -0,0 +1,23 @@
+#ifndef EZLOHINTMANAGER_H
+#define EZLOHINTMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u16 x;
+    u16 y;
+    u16 rx;
+    u16 ry;
+    u8 unk_28[13];
+    u8 msg_height;
+    u16 msg_idx;
+    u8 x_raw;
+    u8 y_raw;
+    u8 rx_raw;
+    u8 ry_raw;
+    u16 flag1;
+    u16 flag2;
+} EzloHintManager;
+
+#endif // EZLOHINTMANAGER_H

include/manager/fallingItemManager.h

@@ -0,0 +1,18 @@
+#ifndef FALLINGITEMMANAGER_H
+#define FALLINGITEMMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20[0x15];
+    u8 field_0x35;
+    u8 field_0x36;
+    u8 field_0x37;
+    s16 field_0x38;
+    s16 field_0x3a;
+    u16 field_0x3c;
+    u16 field_0x3e;
+} FallingItemManager;
+
+#endif // FALLINGITEMMANAGER_H

include/manager/fightManager.h

@@ -0,0 +1,22 @@
+#ifndef FIGHTMANAGER_H
+#define FIGHTMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;
+    u8 unk_21[0x14];
+    u8 unk_35;
+    u8 unk_36[0x4];
+    u16 unk_3a;
+    u16 fightStartFlag;
+    u16 fightCompletedFlag;
+} FightManager;
+
+typedef struct {
+    Manager base;
+    Entity* enemies[8];
+} FightManagerHelper;
+
+#endif // FIGHTMANAGER_H

include/manager/flagAndOperatorManager.h

@@ -0,0 +1,13 @@
+#ifndef FLAGANDOPERATORMANAGER_H
+#define FLAGANDOPERATORMANAGER_H
+
+#include "manager.h"
+
+typedef struct FlagAndOperatorManager {
+    Manager base;
+    u8 unk_20[0x1C];
+    u16 unk_3c;
+    u16 unk_3e;
+} FlagAndOperatorManager;
+
+#endif // FLAGANDOPERATORMANAGER_H

include/manager/flameManager.h

@@ -0,0 +1,13 @@
+#ifndef FLAMEMANAGER_H
+#define FLAMEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    struct Manager base;
+    u8 field_0x20[0x18];
+    s16 field_0x38;
+    s16 field_0x3a;
+} FlameManager;
+
+#endif // FLAMEMANAGER_H

include/manager/floatingPlatformManager.h

@@ -0,0 +1,10 @@
+#ifndef FLOATINGPLATFORMMANAGER_H
+#define FLOATINGPLATFORMMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} FloatingPlatformManager;
+
+#endif // FLOATINGPLATFORMMANAGER_H

include/manager/goronMerchantShopManager.h

@@ -0,0 +1,11 @@
+#ifndef GORONMERCHANTSHOPMANAGER_H
+#define GORONMERCHANTSHOPMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 itemActive[3];
+} GoronMerchantShopManager;
+
+#endif // GORONMERCHANTSHOPMANAGER_H

include/manager/holeManager.h

@@ -0,0 +1,21 @@
+#ifndef HOLEMANAGER_H
+#define HOLEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    s16 unk_20;
+    s16 unk_22;
+    u16 unk_24;
+    u16 unk_26;
+    u8 unk_28[8];
+    u16 unk_30;
+    u16 unk_32;
+    u16 unk_34;
+    u16 unk_36;
+    u8 unk_38[7];
+    u8 unk_3f;
+} HoleManager;
+
+#endif // HOLEMANAGER_H

include/manager/horizontalMinishPathBackgroundManager.h

@@ -0,0 +1,14 @@
+#ifndef HORIZONTALMINISHPATHBACKGROUNDMANAGER_H
+#define HORIZONTALMINISHPATHBACKGROUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;
+    u8 unk_21[0x17];
+    u32 unk_38;
+    u32 unk_3c;
+} HorizontalMinishPathBackgroundManager;
+
+#endif // HORIZONTALMINISHPATHBACKGROUNDMANAGER_H

include/manager/houseSignManager.h

@@ -0,0 +1,11 @@
+#ifndef HOUSESIGNMANAGER_H
+#define HOUSESIGNMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u32 bitfield;
+} HouseSignManager;
+
+#endif // HOUSESIGNMANAGER_H

include/manager/hyruleTownBellManager.h

@@ -0,0 +1,10 @@
+#ifndef HYRULETOWNBELLMANAGER_H
+#define HYRULETOWNBELLMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} HyruleTownBellManager;
+
+#endif // HYRULETOWNBELLMANAGER_H

include/manager/hyruleTownTilesetManager.h

@@ -0,0 +1,13 @@
+#ifndef HYRULETOWNTILESETMANAGER_H
+#define HYRULETOWNTILESETMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20;
+    u8 field_0x21;
+    u8 field_0x22;
+} HyruleTownTilesetManager;
+
+#endif // HYRULETOWNTILESETMANAGER_H

include/manager/lightLevelSetManager.h

@@ -0,0 +1,19 @@
+#ifndef LIGHTLEVELSETMANAGER_H
+#define LIGHTLEVELSETMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u16 field_0x20;
+    u16 field_0x22;
+    u8 field_0x24[0x12];
+    u8 field_0x36;
+    u8 field_0x37;
+    u16 field_0x38;
+    u16 field_0x3a;
+    u16 field_0x3c;
+    u16 field_0x3e;
+} LightLevelSetManager;
+
+#endif // LIGHTLEVELSETMANAGER_H

include/manager/lightManager.h

@@ -0,0 +1,11 @@
+#ifndef LIGHTMANAGER_H
+#define LIGHTMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    s32 unk20;
+} LightManager;
+
+#endif // LIGHTMANAGER_H

include/manager/lightRayManager.h

@@ -0,0 +1,17 @@
+#ifndef LIGHTRAYMANAGER_H
+#define LIGHTRAYMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;
+    u8 unk_21;
+    u8 unk_22;
+    u8 unk_23;
+    u8 unk_24;
+    u8 unk_25[15];
+    void* unk_34;
+} LightRayManager;
+
+#endif // LIGHTRAYMANAGER_H

include/manager/manager29.h

@@ -0,0 +1,22 @@
+#ifndef MANAGER29_H
+#define MANAGER29_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x8];
+    u16* unk_28;
+    u16* unk_2c;
+    u8 filler[0x4];
+    u8 unk_34;
+    u8 unk_35;
+    u8 unk_36;
+    u8 unk_37;
+    s16 unk_38;
+    u16 unk_3a;
+    u16 unk_3c;
+    u16 unk_3e;
+} Manager29;
+
+#endif // MANAGER29_H

include/manager/minishPortalManager.h

@@ -0,0 +1,20 @@
+#ifndef MINISHPORTALMANAGER_H
+#define MINISHPORTALMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u32 unk_20;
+    u32 unk_24;
+    u8 unk_28[0xC];
+    u8 unk_34;
+    u8 unk_35;
+    u16 unk_36;
+    u16 unk_38;
+    u16 unk_3a;
+    u16 unk_3c;
+    u16 unk_3e;
+} MinishPortalManager;
+
+#endif // MINISHPORTALMANAGER_H

include/manager/minishRaftersBackgroundManager.h

@@ -0,0 +1,12 @@
+#ifndef MINISHRAFTERSBACKGROUNDMANAGER_H
+#define MINISHRAFTERSBACKGROUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_00[0x1C];
+    u32 unk_3c;
+} MinishRaftersBackgroundManager;
+
+#endif // MINISHRAFTERSBACKGROUNDMANAGER_H

include/manager/minishSizedEntranceManager.h

@@ -0,0 +1,11 @@
+#ifndef MINISHSIZEDENTRANCEMANAGER_H
+#define MINISHSIZEDENTRANCEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u32 field_0x20;
+} MinishSizedEntranceManager;
+
+#endif // MINISHSIZEDENTRANCEMANAGER_H

include/manager/minishVillageTilesetManager.h

@@ -0,0 +1,12 @@
+#ifndef MINISHVILLAGETILESETMANAGER_H
+#define MINISHVILLAGETILESETMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;
+    u8 unk_21[0x1F];
+} MinishVillageTilesetManager;
+
+#endif // MINISHVILLAGETILESETMANAGER_H

include/manager/miscManager.h

@@ -0,0 +1,15 @@
+#ifndef MISCMANAGER_H
+#define MISCMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x18];
+    s16 unk_38;
+    s16 unk_3a;
+    u16 unk_3c;
+    u16 unk_3e;
+} MiscManager;
+
+#endif // MISCMANAGER_H

include/manager/moveableObjectManager.h

@@ -0,0 +1,19 @@
+#ifndef MOVEABLEOBJECTMANAGER_H
+#define MOVEABLEOBJECTMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x12];
+    u16 unk_32;
+    u8 unk_34[2];
+    u8 unk_36;
+    u8 unk_37;
+    u16 unk_38;
+    u16 unk_3a;
+    u16 unk_3c;
+    u16 flags;
+} MoveableObjectManager;
+
+#endif // MOVEABLEOBJECTMANAGER_H

include/manager/powBackgroundManager.h

@@ -0,0 +1,10 @@
+#ifndef POWBACKGROUNDMANAGER_H
+#define POWBACKGROUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} PowBackgroundManager;
+
+#endif // POWBACKGROUNDMANAGER_H

include/manager/pushableFurnitureManager.h

@@ -0,0 +1,23 @@
+#ifndef PUSHABLEFURNITUREMANAGER_H
+#define PUSHABLEFURNITUREMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x8];
+    u8 unk_28;
+    u8 unk_29;
+    u16 unk_2a;
+} PushableFurnitureManager;
+
+typedef struct {
+    u8 unk_00;
+    u8 unk_01;
+    u8 unk_02;
+    u8 unk_03;
+    u16 unk_04;
+    u16 unk_06;
+} UnkPushableFurnitureManagerHelperStruct;
+
+#endif // PUSHABLEFURNITUREMANAGER_H

include/manager/railIntersectionManager.h

@@ -0,0 +1,18 @@
+#ifndef RAILINTERSECTIONMANAGER_H
+#define RAILINTERSECTIONMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20[0x16];
+    u8 field_0x36;
+    u8 field_0x37;
+    s16 field_0x38;
+    u16 field_0x3a;
+    u8 field_0x3c;
+    u8 field_0x3d;
+    u16 flags;
+} RailIntersectionManager;
+
+#endif // RAILINTERSECTIONMANAGER_H

include/manager/rainfallManager.h

@@ -0,0 +1,10 @@
+#ifndef RAINFALLMANAGER_H
+#define RAINFALLMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} RainfallManager;
+
+#endif // RAINFALLMANAGER_H

include/manager/regionTriggerManager.h

@@ -0,0 +1,17 @@
+#ifndef REGIONTRIGGERMANAGER_H
+#define REGIONTRIGGERMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x14]; // unused
+    u16 radiusX;
+    u16 radiusY;
+    s16 posX;
+    s16 posY;
+    u8 unk_3c[2]; // unused
+    u16 playerInRegionFlag;
+} RegionTriggerManager;
+
+#endif // REGIONTRIGGERMANAGER_H

include/manager/repeatedSoundManager.h

@@ -0,0 +1,10 @@
+#ifndef REPEATEDSOUNDMANAGER_H
+#define REPEATEDSOUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} RepeatedSoundManager;
+
+#endif // REPEATEDSOUNDMANAGER_H

include/manager/rollingBarrelManager.h

@@ -0,0 +1,22 @@
+#ifndef ROLLINGBARRELMANAGER_H
+#define ROLLINGBARRELMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    s32 unk_20;
+    union SplitWord unk_24;
+    u32 unk_28;
+    u32 unk_2c;
+    u8 unk_30[0x10];
+} RollingBarrelManager;
+
+typedef struct {
+    u16 unk_0;
+    u16 unk_2;
+    u16 unk_4;
+    u16 unk_6;
+} struct_08108228;
+
+#endif // ROLLINGBARRELMANAGER_H

include/manager/secretManager.h

@@ -0,0 +1,16 @@
+#ifndef SECRETMANAGER_H
+#define SECRETMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20[0x18];
+    s16 field_0x38;
+    u8 field_0x3a;
+    u8 field_0x3b;
+    u16 field_0x3c;
+    u16 field_0x3e;
+} SecretManager;
+
+#endif // SECRETMANAGER_H

include/manager/specialWarpManager.h

@@ -0,0 +1,28 @@
+#ifndef SPECIALWARPMANAGER_H
+#define SPECIALWARPMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    u16 posX;
+    u16 posY;
+    u8 width;
+    u8 height;
+    u8 roomProperty;
+    union {
+        u8 all;
+        struct {
+            u8 layer : 2;
+            u8 unk1 : 2;
+            u8 unk2 : 1;
+            u8 unk3 : 3;
+        } PACKED b;
+    } PACKED unk_07;
+} SpecialWarpManagerWarpData;
+
+typedef struct {
+    Manager base;
+    SpecialWarpManagerWarpData* warpList;
+} SpecialWarpManager;
+
+#endif // SPECIALWARPMANAGER_H

include/manager/staticBackgroundManager.h

@@ -0,0 +1,11 @@
+#ifndef STATICBACKGROUNDMANAGER_H
+#define STATICBACKGROUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u32 field_0x20;
+} StaticBackgroundManager;
+
+#endif // STATICBACKGROUNDMANAGER_H

include/manager/steamOverlayManager.h

@@ -0,0 +1,15 @@
+#ifndef STEAMOVERLAYMANAGER_H
+#define STEAMOVERLAYMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u16 unk_20;
+    u8 unk_22;
+    u8 unk_23[1];
+    u8 unk_24;
+    u8 unk_25[0x1b];
+} SteamOverlayManager;
+
+#endif // STEAMOVERLAYMANAGER_H

include/manager/templeOfDropletsManager.h

@@ -0,0 +1,25 @@
+#ifndef TEMPLEOFDROPLETSMANAGER_H
+#define TEMPLEOFDROPLETSMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;
+    u8 unk_21;
+    u8 unk_22;
+    u8 unk_23; // used
+    u16 unk_24;
+    u16 unk_26;
+    void* unk_28;
+    u16 unk_2c;
+    u8 unk_2e[0x6];
+    s16 unk_34;
+    s16 unk_36;
+    s16 unk_38;
+    s16 unk_3a;
+    u16 unk_3c;
+    u16 unk_3e; // used
+} TempleOfDropletsManager;
+
+#endif // TEMPLEOFDROPLETSMANAGER_H

include/manager/tileChangeObserveManager.h

@@ -0,0 +1,35 @@
+#ifndef TILECHANGEOBSERVEMANAGER_H
+#define TILECHANGEOBSERVEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20;
+    u8 field_0x21;
+    u8 field_0x22;
+    u8 field_0x23;
+    u8 field_0x24;
+    u8 field_0x25;
+    u8 field_0x26;
+    u8 field_0x27;
+    u16 initialTile;
+    u8 field_0x2a;
+    u8 field_0x2b;
+    u8 field_0x2c;
+    u8 field_0x2d;
+    u8 field_0x2e;
+    u8 field_0x2f;
+    u16* observedTile;
+    u8 field_0x34;
+    u8 field_0x35;
+    u8 field_0x36;
+    u8 field_0x37;
+    u16 tilePosition;
+    u16 field_0x3a;
+    u8 field_0x3c;
+    u8 field_0x3d;
+    u16 flag;
+} TileChangeObserveManager;
+
+#endif // TILECHANGEOBSERVEMANAGER_H

include/manager/tilePuzzleManager.h

@@ -0,0 +1,22 @@
+#ifndef TILEPUZZLEMANAGER_H
+#define TILEPUZZLEMANAGER_H
+
+#include "manager.h"
+
+typedef struct TilePuzzleManager {
+    Manager base;
+    u8 unk_20[8]; // unused
+    u16 own_tile;
+    u8 unk_2a[0x2]; // unused
+    u16 player_previous_tile;
+    u16 player_current_tile;
+    u8 unk_30[0x6]; // unused
+    u8 width;
+    u8 height;
+    s16 x;
+    s16 y;
+    u16 flag_succeeded;
+    u16 flag_reset;
+} TilePuzzleManager;
+
+#endif // TILEPUZZLEMANAGER_H

include/manager/vaati3BackgroundManager.h

@@ -0,0 +1,10 @@
+#ifndef VAATI3BACKGROUNDMANAGER_H
+#define VAATI3BACKGROUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} Vaati3BackgroundManager;
+
+#endif // VAATI3BACKGROUNDMANAGER_H

include/manager/vaati3InsideArmManager.h

@@ -0,0 +1,11 @@
+#ifndef VAATI3INSIDEARMMANAGER_H
+#define VAATI3INSIDEARMMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u16 field_0x20;
+} Vaati3InsideArmManager;
+
+#endif // VAATI3INSIDEARMMANAGER_H

include/manager/vaati3StartManager.h

@@ -0,0 +1,10 @@
+#ifndef VAATI3STARTMANAGER_H
+#define VAATI3STARTMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} Vaati3StartManager;
+
+#endif // VAATI3STARTMANAGER_H

include/manager/vaatiAppearingManager.h

@@ -0,0 +1,13 @@
+#ifndef VAATIAPPEARINGMANAGER_H
+#define VAATIAPPEARINGMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u32 field_0x20;
+    u32 field_0x24;
+    u32 field_0x28;
+} VaatiAppearingManager;
+
+#endif // VAATIAPPEARINGMANAGER_H

include/manager/verticalMinishPathBackgroundManager.h

@@ -0,0 +1,13 @@
+#ifndef VERTICALMINISHPATHBACKGROUNDMANAGER_H
+#define VERTICALMINISHPATHBACKGROUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u32 field_0x20[0x6];
+    void* field_0x38;
+    void* field_0x3c;
+} VerticalMinishPathBackgroundManager;
+
+#endif // VERTICALMINISHPATHBACKGROUNDMANAGER_H

include/manager/waterfallBottomManager.h

@@ -0,0 +1,10 @@
+#ifndef WATERFALLBOTTOMMANAGER_H
+#define WATERFALLBOTTOMMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} WaterfallBottomManager;
+
+#endif // WATERFALLBOTTOMMANAGER_H

include/manager/weatherChangeManager.h

@@ -0,0 +1,15 @@
+#ifndef WEATHERCHANGEMANAGER_H
+#define WEATHERCHANGEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;
+    u8 unk_21;
+    u8 unk_22;
+    u8 unk_23;
+    u8 filler_0x24[0x1C];
+} WeatherChangeManager;
+
+#endif // WEATHERCHANGEMANAGER_H

include/map.h

@@ -2,9 +2,10 @@
 #define MAP_H
 
 #include "global.h"
+#include "screen.h"
 
 typedef struct {
-    /*0x0000*/ u16* bgControlPtr;        // Points to the BgSettings.control field for the bg belonging to this layer?
+    /*0x0000*/ BgSettings* bgSettings;
     /*0x0004*/ u16 mapData[0x1000];      // tilemap data? <-- gMapDataTop / gMapDataBottom
     /*0x2004*/ u8 collisionData[0x1000]; // more tilemap data? <-- gUnk_0200D654 / gUnk_02027EB4
     /*0x3004*/ u16 mapDataClone[0x1000]; // more tilemap data? <-- gUnk_0200E654 / gUnk_02028EB4
@@ -19,4 +20,4 @@ extern LayerStruct gMapBottom;
 
 LayerStruct* GetLayerByIndex(u32);
 
-#endif // MAP_H
+#endif // MAP_H

include/menu.h

@@ -125,4 +125,4 @@ extern Menu gMenu;
 #define gFigurineMenu (*(FigurineMenu*)&gMenu)
 #define gPauseMenu (*(PauseMenu*)&gMenu)
 
-#endif
+#endif // MENU_H

include/new_player.h

@@ -23,4 +23,4 @@ typedef struct {
 
 #define gNewPlayerEntity (*(PlayerEntity*)&gPlayerEntity)
 
-#endif
+#endif // NEW_PLAYER_H

include/npc.h

@@ -372,4 +372,4 @@ void NPC58_Head(Entity*);
 
 extern void (*const gNPCFunctions[128][3])(Entity*);
 
-#endif
+#endif // NPC_H

include/object.h

@@ -427,4 +427,4 @@ void ObjectC1();
 
 extern void (*const gObjectFunctions[194])(Entity*);
 
-#endif
+#endif // OBJECT_H

include/object/deathFx.h

@@ -1,5 +1,5 @@
-#ifndef TMC_DEATHFX_H
-#define TMC_DEATHFX_H
+#ifndef DEATHFX_H
+#define DEATHFX_H
 
 #ifndef NENT_DEPRECATED
 #error "deathFx.h requires new entities"
@@ -14,4 +14,4 @@ typedef struct {
     u8 item;
 } DeathFxObject;
 
-#endif // TMC_DEATHFX_H
+#endif // DEATHFX_H

include/physics.h

@@ -1,5 +1,5 @@
-#ifndef POSITION_H
-#define POSITION_H
+#ifndef PHYSICS_H
+#define PHYSICS_H
 
 #include "global.h"
 #include "entity.h"
@@ -55,4 +55,5 @@ extern bool32 ProcessMovementInternal(Entity*, s32, s32, u32);
 
 extern const s16 gSineTable[64];
 extern const s16 gCosineTable[256];
-#endif
+
+#endif // PHYSICS_H

include/player.h

@@ -480,4 +480,4 @@ void SetZeldaFollowTarget(Entity*);
 
 #define COPY_FLAG_FROM_TO(base, src, dest) (base) = ((base) & ~(dest)) | (((dest) * ((base) & (src))) / src)
 
-#endif
+#endif // PLAYER_H

include/playeritem.h

@@ -29,4 +29,4 @@ typedef enum {
     PLAYER_ITEM_CELL_OVERWRITE_SET2,
 } PlayerItem;
 
-#endif
+#endif // PLAYERITEM_H

include/projectile.h

@@ -84,4 +84,4 @@ typedef enum {
     /*24*/ V3_TENNIS_BALL_PROJECTILE,
 } Projectile;
 
-#endif
+#endif // PROJECTILE_H

include/projectile/winder.h

@@ -1,5 +1,5 @@
-#ifndef PROJECTILE_WINDER_H
-#define PROJECTILE_WINDER_H
+#ifndef WINDER_H
+#define WINDER_H
 #include "enemy.h"
 
 #define WINDER_NUM_SEGMENTS 8
@@ -9,4 +9,4 @@ typedef struct {
     s16 positions[2 * WINDER_NUM_SEGMENTS];
 } WinderEntity;
 
-#endif
+#endif // WINDER_H

include/room.h

@@ -238,4 +238,4 @@ void sub_0804B0B0(u32 arg0, u32 arg1);
 
 void DoExitTransition(const ScreenTransitionData* data);
 
-#endif
+#endif // ROOM_H

include/roomid.h

@@ -1,5 +1,5 @@
-#ifndef TMC_ROOMID_H
-#define TMC_ROOMID_H
+#ifndef ROOMID_H
+#define ROOMID_H
 
 typedef enum {
     // AREA_MINISH_WOODS
@@ -990,4 +990,4 @@ typedef enum {
     ROOM_8F_0 = 0,
 } RoomID;
 
-#endif // TMC_ROOMID_H
+#endif // ROOMID_H

include/save.h

@@ -135,4 +135,4 @@ extern const u8* const demoPointers[];
 extern const u8 demoUnknown1[];
 #endif
 
-#endif
+#endif // SAVE_H

include/screen.h

@@ -1,5 +1,5 @@
-#ifndef BG_H
-#define BG_H
+#ifndef SCREEN_H
+#define SCREEN_H
 
 #include "global.h"
 #include "fade.h"
@@ -80,4 +80,4 @@ extern OAMCommand gOamCmd;
 
 extern void sub_080ADA04(OAMCommand*, void*);
 
-#endif
+#endif // SCREEN_H

include/script.h

@@ -49,4 +49,5 @@ void ExecuteScriptForEntity(Entity* entity, void (*postScriptCallback)(Entity*,
 void HandlePostScriptActions(Entity* entity, ScriptExecutionContext* context);
 void HandleEntity0x82Actions(Entity* entity);
 void sub_0807DD94(Entity*, void (*function)(Entity*, ScriptExecutionContext*));
-#endif
+
+#endif // SCRIPT_H

include/scroll.h

@@ -0,0 +1,9 @@
+#ifndef SCROLL_H
+#define SCROLL_H
+
+#include "global.h"
+
+void UpdateIsDiggingCave(void);
+void sub_08080930(u32);
+
+#endif // SCROLL_H

include/sprite.h

@@ -35,4 +35,4 @@ typedef struct {
     u8 unk;
 } SpriteLoadData;
 
-#endif
+#endif // SPRITE_H

include/structures.h

@@ -324,4 +324,4 @@ typedef struct {
     s16 position;
 } TileData;
 
-#endif
+#endif // STRUCTURES_H

include/transitions.h

@@ -1,5 +1,6 @@
-#ifndef TMC_TRANSITIONS_H
-#define TMC_TRANSITIONS_H
+#ifndef TRANSITIONS_H
+#define TRANSITIONS_H
+
 #include "global.h"
 #include "roomid.h"
 
@@ -51,4 +52,4 @@ extern const Transition gUnk_08135190[];
 extern const Transition gUnk_0813A76C[];
 extern const Transition* const* const gExitLists[];
 
-#endif // TMC_TRANSITIONS_H
+#endif // TRANSITIONS_H

include/ui.h

@@ -12,4 +12,4 @@ extern void InitUI(bool32);
 extern void RefreshUI(void);
 extern void RecoverUI(u32 bottomPt, u32 topPt);
 
-#endif
+#endif // UI_H