diff --git a/actor/Actor.h b/actor/Actor.h
index 43c3758d..7da2bd15 100644
--- a/actor/Actor.h
+++ b/actor/Actor.h
@@ -1,20 +1,22 @@
 #pragma once
 
 #include <actor/ActorBase.h>
-#include <actor/ActorCullRange.h>
+#include <actor/ActorCulling.h>
 #include <collision/ActorCollisionCheck.h>
 #include <effect/EffectID.h>
+#include <fukidashi/FukidashiType.h>
+#include <map/WaveType.h>
 #include <utility/Angle3.h>
 #include <utility/Direction.h>
 
-constexpr f32 ACTOR_DEFAULT_GRAVITY =           -0.1875f;
-constexpr f32 ACTOR_DEFAULT_MAX_FALL_SPEED =    -4.0f;
+#define ACTOR_DEFAULT_GRAVITY                   -0.1875f
+#define ACTOR_DEFAULT_MAX_FALL_SPEED            -4.0f
 
 class ActorBgCollisionCheck;
 class BgCollision;
 class ChibiYoshiAwaData;
-class ChibiYoshiEatData;
-class EatData;
+class ChibiEatCallback;
+class EatCallback;
 class PropelParts;
 
 // vtbl Address: 0x10000268
@@ -45,34 +47,34 @@ class Actor : public ActorBase
     };
     
     /**
-     * @brief Flags to pass to `screenOutCheck` to skip checks or actions during the evaluation.
+     * @brief Flags to pass to `actorExecCullCheck` to skip checks or actions during the evaluation.
      */
-    enum ScreenOutFlag : u16
+    enum ExecCullFlag : u16
     {
-        cScreenOutFlag_SkipNone           = 0,      ///< Perform all checks and delete the actor if they pass.
-        cScreenOutFlag_SkipDeletion       = 1 << 1, ///< Skip deleting the actor if the checks do pass. 
-        cScreenOutFlag_SkipCameraCheck    = 1 << 2, ///< Skip checking if the actor is outside of the visible camera.
-        cScreenOutFlag_SkipRideCheck      = 1 << 3, ///< Skip checking if the actor is riding another actor/platform.
-        cScreenOutFlag_SkipTottenCheck    = 1 << 4  ///< Skip checking if Nabbit has passed to the right of the actor's visible range.
+        cExecCullFlag_SkipNone           = 0,      ///< Perform all checks and delete the actor if they pass.
+        cExecCullFlag_SkipDeletion       = 1 << 1, ///< Skip deleting the actor if the checks do pass. 
+        cExecCullFlag_SkipCameraCheck    = 1 << 2, ///< Skip checking if the actor is outside of the visible camera.
+        cExecCullFlag_SkipRideCheck      = 1 << 3, ///< Skip checking if the actor is riding another actor/platform.
+        cExecCullFlag_SkipTottenCheck    = 1 << 4  ///< Skip checking if Nabbit has passed to the right of the actor's visible range.
     };
 
 public:
-    virtual void setPlayerNo(s8 id)
+    virtual void setPlrNo(s32 id)
     {
         mPlayerNo = id;
     }
 
-    s8 getPlayerNo() const
+    s8 getPlrNo() const
     {
         return mPlayerNo;
     }
 
     // Address: 0x020002CC
-    virtual void removeCollisionCheck();
+    virtual void removeCc();
     // Address: 0x02000328
-    virtual void reviveCollisionCheck();
+    virtual void reviveCc();
 
-    virtual ActorBgCollisionCheck* getBgCheck()
+    virtual const ActorBgCollisionCheck* getBcConstPtr() const
     {
         return nullptr;
     }
@@ -81,7 +83,7 @@ class Actor : public ActorBase
     {
     }
 
-    virtual bool isSpinLiftUpEnable()
+    virtual bool isSpinLiftUpEnable() const
     {
         return true;
     }
@@ -93,19 +95,19 @@ class Actor : public ActorBase
     /**
      * @brief Called by Group Controller when "activating" the target group.
      */
-    virtual void groupActivate()
+    virtual void startGroupid()
     {
     }
 
     /**
      * @brief Called by Group Controller when "deactivating" the target group.
      */
-    virtual void groupDeactivate()
+    virtual void stopGroupid()
     {
     }
 
     // Address: 0x02000394
-    bool checkCarried(s32* player_no);
+    bool checkCarried(s32* player_no) const;
 
     s32 getComboCnt() const
     {
@@ -121,26 +123,26 @@ class Actor : public ActorBase
     void slideComboSE(s32 combo_cnt, bool combo_type_2);
 
     // Address: 0x020005A4
-    s32 searchNearPlayer(sead::Vector2f& out); // Returns -1 if no player found
+    s32 searchNearPlayer(sead::Vector2f* out) const; // Returns -1 if no player found
 
     // Address: 0x020005EC
-    DirType getPlayerDirLR(const sead::Vector3f& position);
+    DirType getDir2PlayerLR(const sead::Vector3f& position) const;
     // Address: 0x020006B4
-    DirType getPlayerDirUD(const sead::Vector3f& position);
+    DirType getDir2PlayerUD(const sead::Vector3f& position) const;
 
-    DirType getPlayerDirLR()
+    DirType getDir2PlayerLR()
     {
-        return getPlayerDirLR(mPos);
+        return getDir2PlayerLR(mPos);
     }
 
-    DirType getPlayerDirUD()
+    DirType getDir2PlayerUD()
     {
-        return getPlayerDirUD(mPos);
+        return getDir2PlayerUD(mPos);
     }
     
     /**
      * @brief Checks if the actor is out of gameplay and optionally deletes it.
-     * @param flag Specify checks to skip, and whether to delete the actor if they all passed.
+     * @param flag Specify checks to skip, and whether to delete the actor if they all passed. See @c ExecCullFlag
      * @return Whether the actor is out of gameplay.
      * @details The actor is considered "out of gameplay" if:
      * * It has not been eaten.
@@ -149,7 +151,7 @@ class Actor : public ActorBase
      * * The actor is out of the zone bounds OR the actor is outside of the visible camera.
      * @par Address: 0x020007A0
      */
-    bool screenOutCheck(ScreenOutFlag flag);
+    bool actorExecCullCheck(u16 flag);
 
     // Address: 0x02002AD8
     virtual void allEnemyDeathEffSet(); // Spawn burst effect at instances where all enemies die (such as touching goal pole or defeating boss), called if profile flag bit 4, 5 or 7 is set
@@ -163,17 +165,17 @@ class Actor : public ActorBase
     virtual void poisonSplashEffect(const sead::Vector3f& pos);
 
     // Address: 0x02000970
-    f32 getEffectZPos() const;
+    f32 getEffectZpos_() const;
 
     // Address: 0x02000A70
-    bool checkEat() const;
+    bool checkEatenYoshi() const;
 
     /**
      * @brief Schedule this actor for deletion on the next frame.
      * @param manual_deleted Prevents respawning.
      * @par Address: 0x02000774
      */
-    void deleteActor(bool manual_deleted);
+    void deleteActor_(bool manual_deleted);
 
 public:
     ActorCollisionCheck& getCollisionCheck()
@@ -429,7 +431,7 @@ class Actor : public ActorBase
 
 protected:
     // Address: 0x02000AC8
-    Actor(const ActorCreateParam& param);
+    Actor(const ActorCreateParameter& param);
     // Address: 0x02000F18
     ~Actor() override;
 
@@ -446,14 +448,14 @@ class Actor : public ActorBase
     bool preDraw() override;
 
     // Address: 0x02001254
-    virtual bool drawCullCheck_();
+    virtual bool actorDrawCullCheck();
 
-    virtual void blockHitInit_()
+    virtual void blockHitInit()
     {
     }
 
     // Address: 0x02001304
-    void splashEffect_(const sead::Vector3f& pos, EffectID effect_id, u8 wave_scale, const char* sound_label);
+    void waterSplashCommon_(const sead::Vector3f& pos, s32 effect_id, WaveType wave_type, const char* sound_label);
 
     // Address: 0x020013D4
     void setAreaNo_();
@@ -487,54 +489,61 @@ class Actor : public ActorBase
     }
 
     // Address: 0x02001A28
-    void carryFukidashiCheck_(s32 action);
+    void carryFukidashiCheck_(FukidashiType action);
     // Address: 0x02001490
-    void carryFukidashiCheck_(s32 action, const sead::Vector2f& range);
+    void carryFukidashiCheck_(FukidashiType action, const sead::Vector2f& range);
     // Address: 0x02001A64
-    void carryFukidashiCancel_(s32 action, s32 player_no);
+    void carryFukidashiCancel_(FukidashiType action, s32 player_no);
 
     // Address: 0x02001DC4
-    bool isEnablePressLR_(const ActorBgCollisionCheck& bc);
+    bool checkPressBgLR_(const ActorBgCollisionCheck& bc);
     // Address: 0x0200222C
-    bool isEnablePressUD_(const ActorBgCollisionCheck& bc);
+    bool checkPressBgUD_(const ActorBgCollisionCheck& bc);
 
     // Address: 0x02002594
-    bool setPressBreakLR_(const ActorBgCollisionCheck& bc);
+    bool setBreakPressObjBgLR_(const ActorBgCollisionCheck& bc);
     // Address: 0x02002664
-    bool setPressBreakUD_(const ActorBgCollisionCheck& bc);
+    bool setBreakPressObjBgUD_(const ActorBgCollisionCheck& bc);
 
     // Address: 0x0200272C
-    bool setPressIceHeadBreak_(const ActorBgCollisionCheck& bc);
+    bool checkInternalIceBlock_(const ActorBgCollisionCheck& bc);
 
     // Address: 0x02002390
-    bool setPressBreakIce_(const BgCollision* bg_collision);
+    bool setEnemyIceBreakReq_(const BgCollision* bg_collision);
     // Address: 0x020024E0
-    bool setPressBreakBlockDRC_(const BgCollision* bg_collision);
+    bool setDrcBlockBreakReq_(const BgCollision* bg_collision);
 
-private:
-    inline Actor* searchCarryFukidashiPlayer_(s32 action);
+    void setPosSuddenly_(const sead::Vector3f& position)
+    {
+        mPos.set(position);
+        mPosPrev.set(position);
+        mPosPrev2.set(position);
+    }
+
+protected:
+    Actor* searchCarryFukidashiPlayer_(FukidashiType action) const;
 
     // Address: 0x02001AF4
-    bool canPress_(const BgCollision* bg_collision);
+    bool isEnablePressObjBg_(const BgCollision* bg_collision) const;
 
     // Address: 0x02001C08
-    bool checkPressLR_(const ActorBgCollisionCheck& bc, DirType direction);
+    bool checkPressBgWall_(const ActorBgCollisionCheck& bc, DirType direction) const;
     // Address: 0x02002098
-    bool checkPressU_(const ActorBgCollisionCheck& bc);
+    bool checkPressBgHead_(const ActorBgCollisionCheck& bc) const;
     // Address: 0x02001F04
-    bool checkPressD_(const ActorBgCollisionCheck& bc);
+    bool checkPressBgFoot_(const ActorBgCollisionCheck& bc) const;
 
     // Address: 0x02001B2C
-    bool canPressIfApproaching_(const BgCollision* bgcol_approaching_side, const BgCollision* bgcol_fixed_side);
+    bool isBreakPressObjBg_(const BgCollision* bgcol_approaching_side, const BgCollision* bgcol_fixed_side) const;
 
     // Address: 0x02000720
-    u32 calcTottenToSrcDir_(const sead::BoundBox2f& src_range) const;
+    u32 checkAvailableCullCheckOnQuest(const sead::BoundBox2f& src_range);
 
 protected:
     DirType                 mDirection;
     s8                      mPlayerNo;
     s8                      mControllerLytPlayerNo;
-    u8                      mLayer;                     // Inited to ActorCreateParam::layer
+    u8                      mLayer;                     // Inited to ActorCreateParameter::layer
     sead::BitFlag8          mCollisionMask;
     f32                     mSpeedF;                    // Horizontal speed
     f32                     mMaxSpeedF;                 // Maximum horizontal speed
@@ -549,13 +558,13 @@ class Actor : public ActorBase
     Angle3                  mAnglePrev;
     sead::Vector2f          mPosDelta;                  // At start of every frame
     ActorCollisionCheck     mCollisionCheck;
-    sead::Vector2f          mVisibleAreaOffset;         // Inited to ActorCreateInfo::spawn_range.offset
-    sead::Vector2f          mVisibleAreaSize;           // Inited to ActorCreateInfo::spawn_range.half_size * 2
+    sead::Vector2f          mVisibleAreaOffset;         // Inited to ActorData::spawn_range.offset
+    sead::Vector2f          mVisibleAreaSize;           // Inited to ActorData::spawn_range.half_size * 2
     sead::Vector2f          mSize;
-    ActorCullRange          mCullLimit;                 // Inited to { 256.0 + ActorCreateInfo::cull_range.up,
-                                                        //             256.0 + ActorCreateInfo::cull_range.down,
-                                                        //              80.0 + ActorCreateInfo::cull_range.left,
-                                                        //              80.0 + ActorCreateInfo::cull_range.right }
+    ActorCulling::ActorCullUsable mCullLimit;           // Inited to { 256.0 + ActorData::cull_range.up,
+                                                        //             256.0 + ActorData::cull_range.down,
+                                                        //              80.0 + ActorData::cull_range.left,
+                                                        //              80.0 + ActorData::cull_range.right }
     u8                      mAreaNo;
     u8                      mActorKind;                 // ActorKind
     bool                    mIsExecEnable;
@@ -565,7 +574,7 @@ class Actor : public ActorBase
     u8                      mCarryFlag;                 // CarryFlag
     u8                      mSwitchFlag0;
     u8                      mSwitchFlag1;
-    u16                     mCreateFlag;                // Inited to ActorCreateInfo::flag
+    u16                     mCreateFlag;                // Inited to ActorData::flag
     u32                     mBlockHitTimer;
     DirType                 mBlockHitDirection;
     u8                      _220;
@@ -577,16 +586,11 @@ class Actor : public ActorBase
     sead::Vector3f          mPosPrev;                   // At frame start
     sead::Vector3f          mPosPrevPostExec;
     sead::Vector3f          mPosPrev2;                  // At frame end
-    EatData*                mEatDataPtr;
-    ChibiYoshiEatData*      mChibiYoshiEatDataPtr;
+    EatCallback*            mEatCallbackPtr;
+    ChibiEatCallback*       mChibiEatCallbackPtr;
     PropelParts*            mPropelParts;
-    u8*                     _270;                       // Inited to ActorCreateParam::_28
+    u8*                     _270;                       // Inited to ActorCreateParameter::_28
     f32                     mAddSpeedF;
     ChibiYoshiAwaData*      mChibiYoshiAwaDataPtr;
-
-    // Address: 0x10000B64
-    static const f32 cCullXLimit;
-    // Address: 0x10000B68
-    static const f32 cCullYLimit;
 };
-static_assert(sizeof(Actor) == 0x27C);
+static_assert(sizeof(Actor) == 0x27C, "Actor size mismatch");
diff --git a/actor/ActorAdditionalHeap.h b/actor/ActorAdditionalHeap.h
index aea4b437..a029ecf4 100644
--- a/actor/ActorAdditionalHeap.h
+++ b/actor/ActorAdditionalHeap.h
@@ -13,13 +13,13 @@ class ActorAdditionalHeap : public sead::IDisposer
 
     virtual ~ActorAdditionalHeap()
     {
-        destroy();
+        destroyHeap();
     }
 
     // Address: 0x02002C70
-    void create();
+    void createHeap();
     // Address: 0x02002C54
-    void destroy();
+    void destroyHeap();
 
     sead::Heap* getHeap() const
     {
@@ -29,4 +29,4 @@ class ActorAdditionalHeap : public sead::IDisposer
 protected:
     sead::Heap* mHeap;
 };
-static_assert(sizeof(ActorAdditionalHeap) == 0x14);
+static_assert(sizeof(ActorAdditionalHeap) == 0x14, "ActorAdditionalHeap size mismatch");
diff --git a/actor/ActorBase.h b/actor/ActorBase.h
index 645af7e7..7f37fd77 100644
--- a/actor/ActorBase.h
+++ b/actor/ActorBase.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <actor/ActorCreateParam.h>
+#include <actor/ActorCreateParameter.h>
 
 #include <container/seadOffsetList.h>
 #include <heap/seadHeap.h>
 #include <prim/seadBitFlag.h>
 #include <prim/seadRuntimeTypeInfo.h>
+#include <audio/GameAudio.h>
 
 class ActorMgr;
 
@@ -83,9 +84,9 @@ class ActorBase
     /**
      * @brief The unique identifier handle for this actor.
      */
-    ActorUniqueID getActorUniqueID() const
+    UniqueID getUniqueID() const
     {
-        return mActorUniqueID;
+        return mUniqueID;
     }
 
     /**
@@ -137,7 +138,7 @@ class ActorBase
     /**
      * @brief Extra level designer configuration. Also known as "nybbles" or "spritedata".
      */
-    ActorParamEx1 getParamEx() const
+    ActorParameterEx1 getParamEx() const
     {
         return mParamEx;
     }
@@ -183,20 +184,33 @@ class ActorBase
      */
     void removeChild(ActorBase* child);
 
-protected:
+    /**
+     * @brief Plays the coin-get sound.
+     * @param player_no The target player whose controller's speaker to broadcast the sound from.
+     * @param position The spatial position from which to emit the sound.
+     */
+    void getCoinSE(s32 player_no, const sead::Vector3f& position)
+    {
+        GameAudio::getAudioObjMap()->startSound(
+            "SE_OBJ_GET_COIN",
+            position,
+            GameAudio::getRemotePlayer(player_no)
+        );
+    }
+
+public:
     /**
      * @brief Constructs an actor from configuration data.
      * @param param Parameters and user configuration to pass to the actor.
      * @par Address: 0x02002CE0
      */
-    ActorBase(const ActorCreateParam& param);
+    ActorBase(const ActorCreateParameter& param);
     /**
      * @brief Destroys the actor and orphans all of its children.
      * @par Address: 0x02002E68
      */
     virtual ~ActorBase();
 
-protected:
     /**
      * @brief Callback invoked before the @c create operation.
      * @return Whether to continue to the main @c create callback, rather than skip to @c postExecute().
@@ -243,7 +257,7 @@ class ActorBase
      * @details The actor must subscribe to the @c finalUpdate signal on a per-frame basis via @c ActorMgr::addToFinalUpdate().
      * @par Address: 0x02002F94
      */
-    virtual void finalUpdate();
+    virtual void lastExecute();
 
     /**
      * @brief Callback invoked before the @c draw operation.
@@ -273,21 +287,21 @@ class ActorBase
      * @details Returns @c true by default.
      * @par Address: 0x02002FA8
      */
-    virtual bool preDelete();
+    virtual bool preDestroy();
     /**
      * @brief Main deletion callback for the actor.
      * @return A signal for how to handle the operation.
      * @details @c Failure and @c Success both result in deletion. Only @c Wait results in a stall.
      * @par Address: 0x02002FB0
      */
-    virtual Result doDelete();
+    virtual Result destroy();
     /**
      * @brief Unconditionally called callback for after the @c delete operation.
      * @param state The signal which @c doDelete() returned, or @c cState_None if @c preDelete() skipped it.
      * @note The actor has still technically not been deleted yet at this point, that occurs right after this call.
      * @par Address: 0x02002F3C
      */
-    virtual void postDelete(MainState state);
+    virtual void postDestroy(MainState state);
 
 protected:
     void setActive_(bool active)
@@ -296,29 +310,29 @@ class ActorBase
     }
 
 protected:
-    sead::Heap*     mActorHeap;             ///< Personal heap for this actor of type @c sead::FrameHeap. Capacity of @c 0x20200, but profiles in the player whitelist get @c 0x1A0200.
-    ActorUniqueID   mActorUniqueID;         ///< The unique identifier handle for this actor.
-    Profile*        mActorProfile;          ///< The specific profile which this actor was instantiated from.
-    bool            mCreatedImmediately;    ///< Whether the actor was created with @c ActorMgr::createImmediately(), rather than deferred with @c ActorMgr::createLater().
-    bool            mIsMapActor;            ///< Whether the actor was spawned from the level with @c ActorCreateMgr, rather than dynamically spawned by another actor.
-    bool            mIsActive;              ///< Whether the @c create operation has completed and the actor is executing.
-    bool            mDeleteRequestFlag;     ///< Whether to delete this actor on the next frame.
-    u32             mParam0;                ///< Level designer configuration. Also known as "nybbles" or "spritedata".
-    u32             mParam1;                ///< Level designer configuration. Also known as "nybbles" or "spritedata".
-    ActorParamEx1   mParamEx;               ///< Extra level designer configuration. Also known as "nybbles" or "spritedata".
-    List            mChildList;             ///< @c sead::OffsetList used for holding child actors spawned by this actor. Managed automatically if @c param.parent_id is set when spawning.
-    sead::ListNode  mChildNode;             ///< Implementation detail. Used to track our position in the parent's @c mChildList.
-    ActorBase*      mParent;                ///< The parent actor if this actor is a child. Automatically set to @c nullptr if orphaned.
-    sead::ListNode  mExecuteNode;           ///< Implementation detail. Used to track our position in @c ActorMgr lists.
-    sead::ListNode  mDrawNode;              ///< Implementation detail. Used to track our position in @c ActorMgr `mDrawManage` list.
-    sead::BitFlag32 mFlag;                  ///< Properties which control execution policy during events. See @c ActorBase::Flag enum.
+    sead::Heap*         mActorHeap;             ///< Personal heap for this actor of type @c sead::FrameHeap. Capacity of @c 0x20200, but profiles in the player whitelist get @c 0x1A0200.
+    UniqueID            mUniqueID;              ///< The unique identifier handle for this actor.
+    Profile*            mActorProfile;          ///< The specific profile which this actor was instantiated from.
+    bool                mCreatedImmediately;    ///< Whether the actor was created with @c ActorMgr::createImmediately(), rather than deferred with @c ActorMgr::createLater().
+    bool                mIsMapActor;            ///< Whether the actor was spawned from the level with @c ActorCreateMgr, rather than dynamically spawned by another actor.
+    bool                mIsActive;              ///< Whether the @c create operation has completed and the actor is executing.
+    bool                mDeleteRequestFlag;     ///< Whether to delete this actor on the next frame.
+    u32                 mParam0;                ///< Level designer configuration. Also known as "nybbles" or "spritedata".
+    u32                 mParam1;                ///< Level designer configuration. Also known as "nybbles" or "spritedata".
+    ActorParameterEx1   mParamEx;               ///< Extra level designer configuration. Also known as "nybbles" or "spritedata".
+    List                mChildList;             ///< @c sead::OffsetList used for holding child actors spawned by this actor. Managed automatically if @c param.parent_id is set when spawning.
+    sead::ListNode      mChildNode;             ///< Implementation detail. Used to track our position in the parent's @c mChildList.
+    ActorBase*          mParent;                ///< The parent actor if this actor is a child. Automatically set to @c nullptr if orphaned.
+    sead::ListNode      mExecuteNode;           ///< Implementation detail. Used to track our position in @c ActorMgr lists.
+    sead::ListNode      mDrawNode;              ///< Implementation detail. Used to track our position in @c ActorMgr `mDrawManage` list.
+    sead::BitFlag32     mFlag;                  ///< Properties which control execution policy during events. See @c ActorBase::Flag enum.
 
     friend class ActorMgr;
 };
-static_assert(sizeof(ActorBase) == 0x50);
+static_assert(sizeof(ActorBase) == 0x50, "ActorBase size mismatch");
 
 template <typename T>
-ActorBase* TActorFactory(const ActorCreateParam& param)
+ActorBase* TActorFactory(const ActorCreateParameter& param)
 {
     return new T(param);
 }
diff --git a/actor/ActorCollision.h b/actor/ActorCollision.h
index cd61c8e6..dc4ab0e2 100644
--- a/actor/ActorCollision.h
+++ b/actor/ActorCollision.h
@@ -35,6 +35,22 @@ class ActorCollision : public Actor
         cQuakeType_Small        // Used in NSMB2, but NSMBU no longer uses it
     };
 
+    /**
+     * @brief -0.0625f
+     * @par Address: 0x1000081C
+     */
+    static const f32 cWaterGravity;
+    /**
+     * @brief 1.5f
+     * @par Address: 0x10000814
+     */
+    static const f32 cWaterSpeedYMax;
+    /**
+     * @brief -1.5f
+     * @par Address: 0x10000818
+     */
+    static const f32 cWaterFallSpeedMax;
+
 protected:
     friend BgCheckFlag operator|(const BgCheckFlag& lhs, const BgCheckFlag& rhs)
     {
@@ -49,7 +65,7 @@ class ActorCollision : public Actor
 
 protected:
     // Address: 0x02002FB8
-    ActorCollision(const ActorCreateParam& param);
+    ActorCollision(const ActorCreateParameter& param);
 
     // Address: 0x0200354C
     void postCreate(MainState state) override;
@@ -60,18 +76,18 @@ class ActorCollision : public Actor
     void postExecute(MainState state) override;
 
     // Address: 0x02003724
-    Result doDelete() override;
+    Result destroy() override;
 
 public:
-    virtual void setWaterFunsui(bool enable)
+    virtual void setFunsuiFlag(bool enable)
     {
-        mIsWaterFunsui = enable;
+        mFunsuiFlag = enable;
     }
 
     // Address: Deleted
-    virtual bool isWaterFunsui() const
+    virtual bool getFunsuiFlag() const
     {
-        return mIsWaterFunsui;
+        return mFunsuiFlag;
     }
 
     virtual void beginFunsui()
@@ -88,12 +104,12 @@ class ActorCollision : public Actor
     }
 
     // Address: Deleted
-    virtual void vf134(f32 speed)
+    virtual void setFunsuiJump(f32 speed)
     {
         mSpeed.y = speed;
     }
 
-    ActorBgCollisionCheck* getBgCheck() override
+    const ActorBgCollisionCheck* getBcConstPtr() const override
     {
         return &mBgCheckObj;
     }
@@ -104,20 +120,20 @@ class ActorCollision : public Actor
      * @details Returns @c false by default.
      * @par Address: 0x02004008
      */
-    virtual bool isQuakeEnable_();
+    virtual bool isReactQuake();
     // Address: 0x0200375C
-    virtual void setQuake_(QuakeType type);
+    virtual void reactQuake(QuakeType type);
 
     // Address: 0x02003760
-    virtual void setSmokeDamage_(Actor* actor);
+    virtual void setDeathInfoSmoke(const Actor* actor);
 
-    virtual bool setTouchDrcDamage_(const sead::Vector3f& pos)
+    virtual bool setDrcTouchActorDeath(const sead::Vector3f& pos)
     {
         return false;
     }
 
 public:
-    virtual void setFunsuiPos(sead::Vector2f dst)
+    virtual void setFunsuiPos(const sead::Vector2f& dst)
     {
         getPos2D() = dst;
     }
@@ -128,36 +144,36 @@ class ActorCollision : public Actor
     }
 
 protected:
-    virtual bool smokeDamageEnable_Yogan_(f32 surface_pos_y)
+    virtual bool checkLavaDamage_(f32 surface_pos_y)
     {
         return true;
     }
 
-    virtual bool smokeDamageEnable_Poison_(f32 surface_pos_y)
+    virtual bool checkPoisonDamage_(f32 surface_pos_y)
     {
         return false;
     }
 
-    virtual void getBox_(sead::BoundBox2f& box)
+    virtual void getDrawRange(sead::BoundBox2f* box)
     {
-        box.set(
+        box->set(
             mPos.x - 16.0f, mPos.y,
             mPos.x + 16.0f, mPos.y + 32.0f
         );
     }
 
     // Address: 0x020037F4
-    BgCheckFlag bgCheck_();
+    BgCheckFlag actorBgNormalCheck();
     // Address: 0x02003764
-    bool bgCheckFoot_() const;   // Must call checkBg() of mBgCheckObj before calling this, or just use bgCheck_()
+    bool actorBgNormalCheckFoot() const;   // Must call checkBg() of mBgCheckObj before calling this, or just use bgCheck_()
     // Address: 0x02003770
-    bool bgCheckWall_() const;   // ^^^
+    bool actorBgNormalCheckWall() const;   // ^^^
 
     // Address: 0x02003878
-    void clampMoveDistance_(BgCollision& bg_collision);
+    void resetObjBgPos(BgCollision& bg_collision);
 
     // Address: 0x020038D8
-    bool isHitBgCollision_(const BgCollision& bg_collision) const;
+    bool checkRideActor(const BgCollision& bg_collision) const;
 
     // Address: 0x020039AC
     void calcSpeedY_();
@@ -166,25 +182,25 @@ class ActorCollision : public Actor
     // Address: 0x02003AE4
     void posMove_();
     // Address: 0x02003A70
-    void posMoveCalcJump_();
+    void calcLiftSpeed();
     // Address: 0x02003C10
-    void calcJumpSpeedF_();
+    void checkLiftSpeed();
 
     // Address: 0x02003C58
-    WaterType checkWater_(f32* surface_pos_y);
+    WaterType checkWaterByWaterCheckPos(f32* surface_pos_y);
     // Address: 0x02003120
-    void enterWater_();
+    void onWaterFlag();
 
     // Address: 0x02003C9C
-    bool hasamareBgCheck_();
+    bool checkPressBg_();
 
     // Address: 0x02003E58
-    void checkSnapToGround_(f32 y_check_distance, const ActorBgCollisionCheck::Sensor& foot_sensor);
+    void landFoot(f32 y_check_distance, const ActorBgCollisionCheck::Sensor* foot_sensor);
     // Address: 0x02003EA0
-    void snapToGround_(f32 y_check_distance, const ActorBgCollisionCheck::Sensor& foot_sensor, bool extended, bool force);
+    void landFootSimple(f32 y_check_distance, const ActorBgCollisionCheck::Sensor* foot_sensor, bool extended, bool force);
 
     // Address: 0x02003EA4
-    void registerInGamescene_();
+    void registerAlphaCheckAreaHUD();
 
     bool checkForSuitableGround_(const sead::Vector2f& offset) const
     {
@@ -202,24 +218,24 @@ class ActorCollision : public Actor
 
 private:
     // Address: 0x0200339C
-    void calcWater_();
+    void calcWaterCheck();
 
     // Address: 0x02003148
-    WaterType checkEnterWater_(f32* surface_pos_y, const sead::Vector3f& check_pos);
+    WaterType waterLineProc(f32* surface_pos_y, const sead::Vector3f& check_pos/*, f32 unused? */);
     // Address: 0x020030F4
-    void clampWaterSpeedY_();
+    void adjustSpeedYInWater();
 
     // Address: 0x02003590
-    void calcBgSpeed_();
+    void calcBGBeltSpeed();
 
     // Address: 0x02003A34
-    f32 chaseZero_(f32 value, f32 step) const;
+    f32 generalXSpeedCalc(f32 value, f32 step) const;
 
     // Address: 0x02003BDC
-    bool isJump_() const;
+    bool checkLiftFoot() const;
 
     // Address: 0x02003D14
-    void snapToGroundImpl_(f32 y_check_distance, const ActorBgCollisionCheck::Sensor& foot_sensor, bool extended, bool force);
+    void landFoot_(f32 y_check_distance, const ActorBgCollisionCheck::Sensor* foot_sensor, bool extended, bool force);
 
 protected:
   //u32                         _27c[4 / sizeof(u32)];  // Alignment???
@@ -241,8 +257,8 @@ class ActorCollision : public Actor
     bool                        mNoWaterCalc;
     u8                          mWaterCalcType;
     u8                          mNoLavaSplashTimer;
-    bool                        mIsWaterFunsui;
+    bool                        mFunsuiFlag;
     bool                        mIsOnGround;
     u32                         mJumpFrame;
 };
-static_assert(sizeof(ActorCollision) == 0x17A0);
+static_assert(sizeof(ActorCollision) == 0x17A0, "ActorCollision size mismatch");
diff --git a/actor/ActorCreateMgr.h b/actor/ActorCreateMgr.h
new file mode 100644
index 00000000..e80338e2
--- /dev/null
+++ b/actor/ActorCreateMgr.h
@@ -0,0 +1,177 @@
+#pragma once
+
+#include <container/seadPtrArray.h>
+#include <heap/seadDisposer.h>
+#include <math/seadBoundBox.h>
+
+#include <actor/UniqueID.h>
+#include <actor/Profile.h>
+#include <system/SaveMgr.h>
+#include <utility/Direction.h>
+
+struct ActorInitDat;
+
+class ActorCreateMgr
+{
+    // createInstance()                             Address: 0x020043F0
+    // deleteInstance()                             Address: Deleted
+    // sInstance                                    Address: 0x101C30C0
+    // SingletonDisposer_::~SingletonDisposer_()    Address: 0x02008724
+    // SingletonDisposer_::sStaticDisposer          Address: 0x101C30C4
+    // SingletonDisposer_::vtbl                     Address: 0x10000B50
+    SEAD_SINGLETON_DISPOSER(ActorCreateMgr)
+
+public:
+    struct LiftBufferInfo
+    {
+        u8* _0;
+        ActorInitDat* init_data;
+        ActorData* actor_data;
+    };
+    static_assert(sizeof(LiftBufferInfo) == 0xC, "ActorCreateMgr::LiftBufferInfo size mismatch");
+
+    typedef sead::FixedPtrArray<LiftBufferInfo, 80> JouchuLiftBufferInfo;
+    typedef sead::FixedPtrArray<LiftBufferInfo, 100> GroupLiftBufferInfo;
+
+public:
+    // Address: 0x0200417C
+    ActorCreateMgr();
+
+    // Address: 0x0200684C
+    void initialCorseInActorCreate();
+    // Address: 0x02004880
+    void clearEditCoinAreaNo();
+    // Address: 0x0200550C
+    void setActorGroup2Create(GroupLiftBufferInfo&, u8);
+    // Address: 0x02005734
+    void setActorJouchu2Create(JouchuLiftBufferInfo&, u8);
+    // Address: 0x02006F18
+    void initialAreaInActorCreate();
+    // Address: 0x020086FC
+    void setEditCoinAreaNo(u8 area_no);
+    // Address: 0x0200862C
+    bool setAreaGroupNoCreate(ProfileID profile_id, UniqueID actor_id, u8 movement_id);
+    // Address: 0x0200595C
+    u8 getSaveFileNo();
+    // Address: 0x020048D8
+    void waiteUnitToge(f32 x_pos, f32 y_pos);
+    // Address: 0x02004470
+    s32 checkActorCoinCount(u32 range_no, u8 coin_mask);
+    // Address: 0x02007FC0
+    s32 getAreaAllCoinCount();
+    // Address: 0x020081B8
+    s32 getSerchActorCount(s32);
+    // Address: 0x020083A0
+    s32 getSearchRengaCount();
+    // Address: 0x02008590
+    s32 getAreaAllEditCoinCount();
+    // Address: Deleted
+    s32 getAreaAllEditStarCoinCount();
+    // Address: 0x020046C0
+    void checkDrcBlockBox(sead::BoundBox2f& box);
+    // Address: 0x02007294
+    void checkDrcBlockPos(const ActorInitDat* init_data);
+    // Address: 0x02007A5C
+    void scrollActorCreateCheck();
+    // Address: 0x02004C0C
+    void incLayer1EnemyZposCount();
+    // Address: 0x02004B94
+    void incLayer2EnemyZposCount();
+    // Address: 0x02004B1C
+    void incLayer1MapObjZposCount();
+    // Address: Deleted
+    void incLayer2MapObjZposCount();
+    // Address: 0x02004C28
+    f32 getLayer1EnemyZpos();
+    // Address: 0x02004BB0
+    f32 getLayer2EnemyZpos();
+    // Address: 0x02004B38
+    f32 getLayer1MapObjZpos();
+    // Address: Deleted
+    f32 getLayer2MapObjZpos();
+
+public:
+    /**
+    * @brief 48.0f
+    * @par Address: Deleted
+    */
+    static const f32 cCreateXLow;
+    /**
+    * @brief 48.0f
+    * @par Address: Deleted
+    */
+    static const f32 cCreateXHigh;
+    /**
+    * @brief 16.0f
+    * @par Address: Deleted
+    */
+    static const f32 cCreateYLow;
+    /**
+    * @brief 32.0f
+    * @par Address: Deleted
+    */
+    static const f32 cCreateYHigh;
+    /**
+    * @brief 16.0f
+    * @par Address: Deleted
+    */
+    static const f32 cCreateOverPos;
+    /**
+    * @brief 16.0f
+    * @par Address: Deleted
+    */
+    static const f32 cSpacingZposEnemy;
+    /**
+    * @brief 8.0f
+    * @par Address: Deleted
+    */
+    static const f32 cSpacingZposMapObj;
+
+protected:
+    // Address: 0x02004EC4
+    void initialActorCreateCheck_(u8*, const ActorInitDat* init_data, u32, u8, JouchuLiftBufferInfo&, LiftBufferInfo*, GroupLiftBufferInfo&, LiftBufferInfo*);
+    // Address: 0x02005978
+    void checkEditCoin_(u8);
+    // Address: 0x02005B7C
+    void initialEditCoinWrite_();
+    // Address: 0x0200613C
+    void initialEditCoinCreateCheck_(u32 actor_count);
+    // Address: 0x02006B28
+    void initialAreaInEditCoinWrite_();
+    // Address: 0x02004C84
+    void createActor_(u8*, const ActorInitDat* init_data, const ActorData* actor_data, UniqueID id);
+    // Address: 0x020048C8
+    bool groupIdCheck_(u32 group_id);
+    // Address: 0x02004924
+    void goalPoleCheck_(const ActorInitDat* init_data, u8 area_no);
+    // Address: 0x02005F54
+    void createCoinActor_(u8*, f32 pos_x, f32 pos_y);
+    // Address: 0x02006040
+    void createStarCoinActor_(u8*, f32 pos_x, f32 pos_y, s32);
+    // Address: 0x02007204
+    DirType getScrollDirX_();
+    // Address: 0x0200724c
+    DirType getScrollDirY_();
+    // Address: 0x02007350
+    void scrollEditCoinCreateCheck_(u32 actor_count);
+
+protected:
+    s32 mLayer1EnemyZPosCnt;
+    s32 mLayer2EnemyZPosCnt;
+    s32 mLayer1MapObjZPosCnt;
+    s32 mLayer2MapObjZPosCnt;
+    u32 mGroupedActorCnt;
+    u32 _24;                                    // Jouchu related?
+    u32 _28;                                    // Jouchu related?
+    u32 mEditCoin1Cnt;                          // TODO: better name
+    u8 mEditCoin1[1000];                        // TODO: better name
+    u16 _418;                                   ///< Unused.
+    u32 mActorCnt;
+    u16 mEditCoin2Cnt;                          // TODO: better name, bg related?
+    SaveData::CoinEditCoin mEditCoin2[300];     // TODO: better name, bg related? also not 100% sure about this type
+    JouchuLiftBufferInfo mJouchuLiftBufferInfo;
+    GroupLiftBufferInfo mGroupLiftBufferInfo;
+    s8 _1360[256];                              // still coin edit related
+    GroupLiftBufferInfo mGroupLiftBufferInfo2;  // TODO: better name
+};
+static_assert(sizeof(ActorCreateMgr) == 0x15FC, "ActorCreateMgr size mismatch");
diff --git a/actor/ActorCreateParam.h b/actor/ActorCreateParameter.h
similarity index 65%
rename from actor/ActorCreateParam.h
rename to actor/ActorCreateParameter.h
index 483468b1..b4e8cb1a 100644
--- a/actor/ActorCreateParam.h
+++ b/actor/ActorCreateParameter.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 #include <utility/Angle.h>
 
 #include <math/seadVector.h>
 #include <prim/seadMemUtil.h>
 
-struct ActorParamEx0
+struct ActorParameterEx0
 {
     // It is a mystery whether this struct/union originally existed or not,
     // but it would be quite difficult to manage this data without it.
@@ -33,18 +33,18 @@ struct ActorParamEx0
         }   course_select;
     };
 
-    ActorParamEx0()
+    ActorParameterEx0()
     {
     }
 
-    ActorParamEx0(const ActorParamEx0& param)
+    ActorParameterEx0(const ActorParameterEx0& param)
     {
         general._0 = param.general._0;
         general._1 = param.general._1;
         general._2 = param.general._2;
     }
 
-    ActorParamEx0& operator=(const ActorParamEx0& param)
+    ActorParameterEx0& operator=(const ActorParameterEx0& param)
     {
         general._0 = param.general._0;
         general._1 = param.general._1;
@@ -52,9 +52,9 @@ struct ActorParamEx0
         return *this;
     }
 };
-static_assert(sizeof(ActorParamEx0) == 3);
+static_assert(sizeof(ActorParameterEx0) == 3);
 
-struct ActorParamEx1
+struct ActorParameterEx1
 {
     // It is a mystery whether this struct/union originally existed or not,
     // but it would be quite difficult to manage this data without it.
@@ -81,18 +81,18 @@ struct ActorParamEx1
         }   course_select;
     };
 
-    ActorParamEx1()
+    ActorParameterEx1()
     {
     }
 
-    ActorParamEx1(const ActorParamEx1& param)
+    ActorParameterEx1(const ActorParameterEx1& param)
     {
         general._0 = param.general._0;
         general._1 = param.general._1;
         general._2 = param.general._2;
     }
 
-    ActorParamEx1& operator=(const ActorParamEx1& param)
+    ActorParameterEx1& operator=(const ActorParameterEx1& param)
     {
         general._0 = param.general._0;
         general._1 = param.general._1;
@@ -100,27 +100,22 @@ struct ActorParamEx1
         return *this;
     }
 };
-static_assert(sizeof(ActorParamEx1) == 3);
+static_assert(sizeof(ActorParameterEx1) == 3);
 
 class Profile;
 
-struct ActorCreateParam
+struct ActorCreateParameter
 {
-    u32             param_0;
-    u32             param_1;
-    ActorUniqueID   parent_id;
-    Profile*        profile;
-    sead::Vector3f  position;
-    Angle           angle;
-    ActorParamEx0   param_ex_0;
-    u8              _pad1[1];
-    ActorParamEx1   param_ex_1;
-    u8              _pad2[1];
-    u8*             _28;
-
-    ActorCreateParam()
-    {
-        sead::MemUtil::fillZero(this, sizeof(ActorCreateParam));
-    }
+    u32                 param_0;
+    u32                 param_1;
+    UniqueID            parent_id;
+    Profile*            profile;
+    sead::Vector3f      position;
+    Angle               angle;
+    ActorParameterEx0   param_ex_0;
+    u8                  _pad1[1];
+    ActorParameterEx1   param_ex_1;
+    u8                  _pad2[1];
+    u8*                 _28;
 };
-static_assert(sizeof(ActorCreateParam) == 0x2C);
+static_assert(sizeof(ActorCreateParameter) == 0x2C, "ActorCreateParameter size mismatch");
diff --git a/actor/ActorCullRange.h b/actor/ActorCullRange.h
deleted file mode 100644
index 1aafdd5a..00000000
--- a/actor/ActorCullRange.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include <basis/seadTypes.h>
-
-struct ActorCullRange
-{
-    f32 up;
-    f32 down;
-    f32 left;
-    f32 right;
-};
-static_assert(sizeof(ActorCullRange) == 0x10);
diff --git a/actor/ActorCullUtil.h b/actor/ActorCullUtil.h
deleted file mode 100644
index ff74f9f7..00000000
--- a/actor/ActorCullUtil.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <actor/ActorCullRange.h>
-
-#include <math/seadBoundBox.h>
-
-class ActorCullUtil
-{
-public:
-    // Address: 0x02008838
-    static bool screenCullCheck(const sead::BoundBox2f& range, const ActorCullRange& cull_range);
-    // Address: 0x02008918
-    static bool screenCullCheck(const sead::BoundBox2f& range);
-    // Address: 0x0200897C
-    static bool areaCullCheck(const sead::BoundBox2f& range, u8 area_no);
-};
diff --git a/actor/ActorCulling.h b/actor/ActorCulling.h
new file mode 100644
index 00000000..fd0aa259
--- /dev/null
+++ b/actor/ActorCulling.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <math/seadBoundBox.h>
+
+class ActorCulling
+{
+public:
+    struct ActorCullUsable
+    {
+        f32 up;
+        f32 down;
+        f32 left;
+        f32 right;
+    };
+    static_assert(sizeof(ActorCullUsable) == 0x10, "ActorCulling::ActorCullUsable size mismatch");
+    
+public:
+    /**
+      * @brief 80.0f
+      * @par Address: 0x10000B64
+      */
+    static const f32 cCullUsableX;
+    /**
+     * @brief 256.0f
+     * @par Address: 0x10000B68
+     */
+    static const f32 cCullUsableY;
+
+public:
+    // Address: 0x02008838
+    static bool executeCullCheck(const sead::BoundBox2f& range, const ActorCullUsable& cull_range);
+    // Address: 0x02008918
+    static bool drawCullCheck(const sead::BoundBox2f& range);
+    // Address: 0x0200897C
+    static bool areaCullCheck(const sead::BoundBox2f& range, u8 area_no);
+};
diff --git a/actor/ActorFindFunc.h b/actor/ActorFindFunc.h
index 5e9428fc..cfd05fa8 100644
--- a/actor/ActorFindFunc.h
+++ b/actor/ActorFindFunc.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 
 #include <basis/seadAssert.h>
 #include <basis/seadTypes.h>
@@ -12,7 +12,7 @@ class ActorFindFunc
 public:
     virtual bool operator()(const ActorBase& actor) = 0;
 };
-static_assert(sizeof(ActorFindFunc) == 4);
+static_assert(sizeof(ActorFindFunc) == 4, "ActorFindFunc size mismatch");
 
 // vtbl Address: 0x10000B6C
 class ActorProfileFindFunc : public ActorFindFunc
@@ -29,7 +29,7 @@ class ActorProfileFindFunc : public ActorFindFunc
 private:
     s32 mProfID;
 };
-static_assert(sizeof(ActorProfileFindFunc) == 8);
+static_assert(sizeof(ActorProfileFindFunc) == 8, "ActorProfileFindFunc size mismatch");
 
 // vtbl Address: 0x10000B7C
 class ActorCreateIndexFindFunc : public ActorFindFunc
@@ -38,12 +38,12 @@ class ActorCreateIndexFindFunc : public ActorFindFunc
     ActorCreateIndexFindFunc(u32 i_create_index)
         : mCreateIndex(i_create_index)
     {
-        SEAD_ASSERT(i_create_index <= ActorUniqueID::cCreateIndexMax);
+        SEAD_ASSERT(i_create_index <= UniqueID::cCreateIndexMax);
     }
 
     void setCreateIndex(u32 i_create_index)
     {
-        SEAD_ASSERT(i_create_index <= ActorUniqueID::cCreateIndexMax);
+        SEAD_ASSERT(i_create_index <= UniqueID::cCreateIndexMax);
         mCreateIndex = i_create_index;
     }
 
@@ -53,4 +53,4 @@ class ActorCreateIndexFindFunc : public ActorFindFunc
 private:
     u32 mCreateIndex;
 };
-static_assert(sizeof(ActorCreateIndexFindFunc) == 8);
+static_assert(sizeof(ActorCreateIndexFindFunc) == 8, "ActorCreateIndexFindFunc size mismatch");
diff --git a/actor/ActorMgr.h b/actor/ActorMgr.h
index 7af59721..11d867d6 100644
--- a/actor/ActorMgr.h
+++ b/actor/ActorMgr.h
@@ -8,6 +8,7 @@
 #include <container/seadRingBuffer.h>
 #include <heap/seadDisposer.h>
 #include <heap/seadUnitHeap.h>
+#include <heap/seadFrameHeap.h>
 
 class ActorMgr
 {
@@ -20,12 +21,12 @@ class ActorMgr
     SEAD_SINGLETON_DISPOSER(ActorMgr)
 
 public:
-    enum CreateOption
+    enum ImmediatelyType
     {
-        cCreateOption_ActiveLater = 0,
-        cCreateOption_ActiveImmediately,
+        cImmediatelyType_ActiveLater = 0,
+        cImmediatelyType_ActiveImmediately,
         // Anything else other than above:
-      //cCreateOption_Independent (most likely unintentional)
+      //cImmediatelyType_Independent (most likely unintentional)
     };
 
 public:
@@ -41,42 +42,42 @@ class ActorMgr
 
 private:
     // Address: 0x020090CC
-    ActorBase* doConstructActor_(const ActorCreateParam& param, bool create_immediately);
+    ActorBase* constructActor_(const ActorCreateParameter& param, bool create_immediately);
     // Address: 0x02009218
-    ActorBase::MainState doCreate_(ActorBase* actor);
+    ActorBase::MainState createActor_(ActorBase* actor);
 
     // Address: 0x0200932C
     static void delete_(ActorBase* actor);
     // Address: 0x02009338
-    void doDelete_(ActorBase* actor);
+    void moveActorToDestroyList_(ActorBase* actor);
 
     // Address: 0x0200940C
-    void pushExecuteAndDrawList_(ActorBase* actor);
+    void insertToExecuteAndDrawList_(ActorBase* actor);
 
     // Address: 0x02009590
-    bool deleteNotRequested_(ActorBase* actor);
+    bool isValidExec_(const ActorBase& actor);
 
     // Address: 0x02008D34
-    void moveActorOnCreateListToDestoryList_();
+    void moveCreateToDestroyList_();
     // Address: 0x02008DC8
-    void doDeleteActors_(bool destroy);
+    void procDestroy_(bool destroy);
 
 public:
     // Address: 0x0200959C
-    void initialize(sead::Heap* heap);
+    void prepare(sead::Heap* heap);
 
     // Address: 0x02009648
-    void createAdditionalHeap(sead::Heap** heap);
+    void createAdditionalHeap(sead::FrameHeap** heap);
     // Address: 0x020096B0
-    void destroyAdditionalHeap(sead::Heap** heap);
+    void destroyAdditionalHeap(sead::FrameHeap** heap);
 
     // Address: 0x020098A8
-    void destroy();
+    void areaOut();
 
     // Address: 0x02009954
-    void createLater(const ActorCreateParam& param);
+    void createLater(const ActorCreateParameter& param);
     // Address: 0x02009A58
-    ActorBase* createImmediately(const ActorCreateParam& param, CreateOption option = cCreateOption_ActiveLater);
+    ActorBase* createImmediately(const ActorCreateParameter& param, ImmediatelyType option = cImmediatelyType_ActiveLater);
 
 public:
     // Address: 0x02009B6C
@@ -89,12 +90,12 @@ class ActorMgr
     // Address: 0x02009BA4
     u32 count(s32 i_profile_id) const;
 
-    iterator find(ActorFindFunc* io_find_func, iterator it_begin) const
+    iterator find(ActorFindFunc& io_find_func, iterator it_begin) const
     {
         return mActorPtrCache.find(io_find_func, it_begin);
     }
 
-    iterator find(ActorFindFunc* io_find_func) const
+    iterator find(ActorFindFunc& io_find_func) const
     {
         return mActorPtrCache.find(io_find_func);
     }
@@ -109,18 +110,18 @@ class ActorMgr
         return mActorPtrCache.getActorEnd();
     }
 
-    ActorBase* getActorPtr(ActorUniqueID id) const
+    ActorBase* getActorPtr(UniqueID id) const
     {
         return mActorPtrCache.getActorPtr(id);
     }
 
     template <typename T>
-    T* getActorPtr(ActorUniqueID id) const
+    T* getActorPtr(UniqueID id) const
     {
         return static_cast<T*>(mActorPtrCache.getActorPtr(id));
     }
 
-    u32 count(ActorFindFunc* io_find_func) const
+    u32 count(ActorFindFunc& io_find_func) const
     {
         return mActorPtrCache.count(io_find_func);
     }
@@ -132,22 +133,23 @@ class ActorMgr
 
 private:
     // Address: 0x02009BDC
-    void calcCreateDelete_();
+    void calcCreate();
+    // procCreate_() is inlined into the above in NSMBU
 
 public:
     // Address: 0x02009D58
-    void execute();
+    void calc();
 
     // Address: 0x02009EA0
-    void addToFinalUpdate(ActorBase* actor);
+    void entryLastExecute(ActorBase* actor);
 
     // Address: 0x02009ECC
-    void draw();
+    void draw(/* const agl::lyr::RenderInfo* renderInfo */);
 
 private:
     sead::UnitHeap*                                 mPlayerUnitHeap;
     sead::UnitHeap*                                 mActorUnitHeap;
-    sead::FixedRingBuffer<ActorCreateParam, 520>    mDeferredActorCreate;
+    sead::FixedRingBuffer<ActorCreateParameter, 520> mDeferredActorCreate;
     ActorBase::List                                 mCreateManage;
     ActorBase::List                                 mDeleteManage;
     ActorBase::List                                 mExecuteManage;
@@ -155,7 +157,7 @@ class ActorMgr
     sead::FixedPtrArray<sead::Heap, 520>            mActorDeleteHeap;
     sead::FixedPtrArray<ActorBase, 520>             mActorFinalUpdate;
     ActorPtrCache                                   mActorPtrCache;
-    ActorUniqueID                                   mActorCreateID;
+    UniqueID                                        mActorCreateID;
     bool                                            mActorCreateImmediately;
     u8                                              _6a3d[3];
     bool                                            mActorDrawDone;
@@ -163,4 +165,4 @@ class ActorMgr
 
     friend class ActorBase;
 };
-static_assert(sizeof(ActorMgr) == 0x6A44);
+static_assert(sizeof(ActorMgr) == 0x6A44, "ActorMgr size mismatch");
diff --git a/actor/ActorPtrCache.h b/actor/ActorPtrCache.h
index 20e106cc..5f312b5d 100644
--- a/actor/ActorPtrCache.h
+++ b/actor/ActorPtrCache.h
@@ -7,7 +7,7 @@
 
 class ActorBase;
 class ActorFindFunc;
-class ActorUniqueID;
+class UniqueID;
 
 class ActorPtrCache
 {
@@ -23,8 +23,8 @@ class ActorPtrCache
     ~ActorPtrCache();
 
     // Address: 0x0200A300
-    iterator find(ActorFindFunc* io_find_func, iterator it_begin) const;
-    iterator find(ActorFindFunc* io_find_func) const
+    iterator find(ActorFindFunc& io_find_func, iterator it_begin) const;
+    iterator find(ActorFindFunc& io_find_func) const
     {
         return find(io_find_func, getActorBegin());
     }
@@ -45,16 +45,19 @@ class ActorPtrCache
     // Address: 0x0200A550
     void popActor(const ActorBase* i_actor);
     // Address: 0x0200A5C8
-    ActorBase* getActorPtr(ActorUniqueID id) const;
+    ActorBase* getActorPtr(UniqueID id) const;
     // Address: Deleted
-    ActorBase* getActorPtrIncludingAboutToBeErased(ActorUniqueID id) const;
+    ActorBase* getActorPtrIncludingAboutToBeErased(UniqueID id) const;
 
     // Address: 0x0200A608
-    u32 count(ActorFindFunc* io_find_func) const;
+    u32 count(ActorFindFunc& io_find_func) const;
 
     // Address: 0x0200A6AC
     void forEach(ActorForEachCallback callback, ActorForEachParam param) const;
 
+    // Address: Deleted
+    void forEachPtr(ActorForEachCallback callback, ActorForEachParam param) const;
+
     u32 getEmptyHeadIndex() const
     {
         return mEmptyHeadIndex;
@@ -72,4 +75,4 @@ class ActorPtrCache
     u32                         mNextCreateIndex;
     bool                        mCreateIndexOverflow;
 };
-static_assert(sizeof(ActorPtrCache) == 0x18);
+static_assert(sizeof(ActorPtrCache) == 0x18, "ActorPtrCache size mismatch");
diff --git a/actor/ActorResLoader.h b/actor/ActorResLoader.h
index 4cecc7f7..4e62bd8d 100644
--- a/actor/ActorResLoader.h
+++ b/actor/ActorResLoader.h
@@ -4,9 +4,18 @@
 
 class ActorResLoader
 {
+public:
+    enum ResType
+    {
+        cResType_Boot = 0,
+        cResType_Course,
+        cResType_CourseSelect,
+        cResType_Num
+    };
+
 public:
     // Address: 0x0200A738
-    static void load(s32 prof_res_type, sead::Heap* heap);
+    static void load(ResType prof_res_type, sead::Heap* heap);
     // Address: 0x0200A930
-    static void unload(s32 prof_res_type);
+    static void unload(ResType prof_res_type);
 };
diff --git a/actor/ActorState.h b/actor/ActorState.h
index 2bed9d31..39fcce1f 100644
--- a/actor/ActorState.h
+++ b/actor/ActorState.h
@@ -13,7 +13,7 @@ class ActorState : public ActorCollision
 
 public:
     // Address: 0x0200A9C0
-    ActorState(const ActorCreateParam& param);
+    ActorState(const ActorCreateParameter& param);
     ~ActorState() override { }
 
     void executeState()
@@ -45,7 +45,7 @@ class ActorState : public ActorCollision
     FStateMgr<ActorState>   mStateMgr;
   //u32                     _17c4[4 / sizeof(u32)]; // Alignment???
 };
-static_assert(sizeof(ActorState) == 0x17C8);
+static_assert(sizeof(ActorState) == 0x17C8, "ActorState size mismatch");
 
 // vtbl Address: 0x10001048
 class ActorMultiState : public ActorCollision
@@ -56,7 +56,7 @@ class ActorMultiState : public ActorCollision
 
 public:
     // Address: 0x0200AA8C
-    ActorMultiState(const ActorCreateParam& param);
+    ActorMultiState(const ActorCreateParameter& param);
     ~ActorMultiState() override { }
 
     void executeState()
@@ -87,4 +87,4 @@ class ActorMultiState : public ActorCollision
 protected:
     FStateStateMgr<ActorMultiState> mStateMgr;
 };
-static_assert(sizeof(ActorMultiState) == 0x17C8);
+static_assert(sizeof(ActorMultiState) == 0x17C8, "ActorMultiState size mismatch");
diff --git a/actor/ActorStatus.h b/actor/ActorSubMgr.h
similarity index 52%
rename from actor/ActorStatus.h
rename to actor/ActorSubMgr.h
index f95763b6..412163cb 100644
--- a/actor/ActorStatus.h
+++ b/actor/ActorSubMgr.h
@@ -2,7 +2,9 @@
 
 #include <heap/seadDisposer.h>
 
-class ActorStatus
+class Actor;
+
+class ActorSubMgr
 {
     // createInstance()                             Address: 0x0200C154
     // deleteInstance()                             Address: Deleted
@@ -10,7 +12,7 @@ class ActorStatus
     // SingletonDisposer_::~SingletonDisposer_()    Address: 0x0200C1D4
     // SingletonDisposer_::sStaticDisposer          Address: 0x101C30D4
     // SingletonDisposer_::vtbl                     Address: 0x100012F4
-    SEAD_SINGLETON_DISPOSER(ActorStatus)
+    SEAD_SINGLETON_DISPOSER(ActorSubMgr)
 
 public:
     void incKuribo()
@@ -50,9 +52,57 @@ class ActorStatus
         return mQuakeComboCount;
     }
 
+    // Address: 0x0200BC34
+    void reset_();
+
+    // Address: 0x0200B7E8
+    void clearKillerCount();
+
+    // Address: Deleted
+    void clearKotonCount();
+
+    // Address: 0x0200B6CC
+    void update();
+
+    // Address: 0x0200B6D0
+    void killOldestFireBall(s32 player_no);
+
+    // Address: 0x0200B318
+    void calcJimenPakkunZpos();
+
+    // Address: 0x0200B7F8
+    f32 getZposAndCountWakiMagnumSearchKiller();
+
+    // Address: 0x0200B854
+    f32 getZposBigTeresa();
+
+    // Address: 0x0200B8B0
+    f32 getZposCloudEffect();
+
     // Address: 0x0200B904
     void incQuakeComboCount(s32 = 0);
 
+    // Address: 0x0200B95C
+    s32 getChorobonArrayIndex() const;
+
+    // Address: 0x0200B7A4
+    s32 getIgaKuriboArrayIndex() const;
+
+    // Address: 0x0200B9FC
+    s32 getKotonCount() const;
+
+    // Address: 0x0200B9A0
+    void calcSanboMikanTime();
+    
+    // Address: 0x0200B9A8
+    void setTotalCollectionCount();
+
+    // Address: 0x0200BA98
+    void deathAriaInCheck(const Actor*);
+
+    // Address: 0x0200BAF4
+    void allEnemyDeathCheck();
+
 protected:
     u32 _10[(0xAC - 0x10) / sizeof(u32)];
     s32 mKuriboNum;
@@ -61,4 +111,4 @@ class ActorStatus
     s32 mQuakeComboCount;
     u32 _f4[(0x9F4 - 0xF4) / sizeof(u32)];
 };
-static_assert(sizeof(ActorStatus) == 0x9F4);
+static_assert(sizeof(ActorSubMgr) == 0x9F4, "ActorSubMgr size mismatch");
diff --git a/actor/ActorUtil.h b/actor/ActorUtil.h
index 5b1f7d49..167bafe8 100644
--- a/actor/ActorUtil.h
+++ b/actor/ActorUtil.h
@@ -1,19 +1,40 @@
 #pragma once
 
+#include <actor/Profile.h>
 #include <utility/Direction.h>
 
 #include <math/seadVector.h>
 
+class ActorBase;
 class Actor;
 
 class ActorUtil
 {
-public:
+protected:
     // Address: 0x0200C67C
-    static s32 searchNearPlayer_Main(sead::Vector2f& player_pos, const sead::Vector2f& src_pos);
+    static s32 searchMain_(sead::Vector2f* player_pos, const sead::Vector2f& src_pos);
 
+public:
     // Address: 0x0200C7E4
     static DirType getTrgToSrcDir(const Actor& src, const Actor& trg);
     // Address: 0x0200C800
     static DirType getSrcToTrgDir(const Actor& src, const Actor& trg);
+
+    // Address: 0x0200C81C
+    static void createBlockOutIvy(const sead::Vector3f& pos);
+
+    // Address: 0x0200C8C0
+    static void calcDestPosSpeed(sead::Vector2f* speed, const sead::Vector2f& pos, s32 frame_cnt, Actor* actor);
+
+    // Address: Deleted
+    static void setAndCalcDestPosSpeed(const sead::Vector2f& pos, s32 frame_cnt, Actor* actor);
+    
+    // Address: 0x0200C98C
+    static bool isGoalPoleProfileID(const ProfileID& id);
+
+    // Address: 0x0200C9E0
+    static bool isGoalPoleActor(const ActorBase& actor);
+
+    // Address: 0x0200CA0C
+    static ActorBase* searchGoalPole();
 };
diff --git a/actor/AttentionLookat.h b/actor/AttentionInfo.h
similarity index 54%
rename from actor/AttentionLookat.h
rename to actor/AttentionInfo.h
index 613c1377..dfd70c56 100644
--- a/actor/AttentionLookat.h
+++ b/actor/AttentionInfo.h
@@ -1,34 +1,37 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 
 #include <container/seadListImpl.h>
 #include <heap/seadDisposer.h>
 #include <math/seadVector.h>
 #include <prim/seadBitFlag.h>
 
-class AttentionMgr;
-
 // vtbl Address: 0x10001340
-class AttentionLookat : public sead::IDisposer
+class AttentionInfo : public sead::IDisposer
 {
 public:
-    enum DistanceType
+    enum DistType
     {
         cDistance_10_blocks = 0,
         cDistance_15_blocks,
-        cDistance_32_blocks,        // The maximum of all values
+        cDistance_32_blocks,
         cDistance_16_blocks,
         cDistance_Num
     };
 
 public:
     // Address: 0x0200CA58
-    AttentionLookat(ActorUniqueID id);
+    AttentionInfo(UniqueID owner_id);
+    // Address: Deleted
+    AttentionInfo(UniqueID owner_id, sead::Vector2f pos, DistType max_dist_type, sead::BitFlag32 flag);
     // Address: 0x0200CB10
-    ~AttentionLookat() override;
+    ~AttentionInfo() override;
+
+    // Address: Deleted
+    bool operator()(const AttentionInfo&);
 
-    const ActorUniqueID& getOwnerID() const
+    const UniqueID& getOwnerID() const
     {
         return mOwnerID;
     }
@@ -43,14 +46,14 @@ class AttentionLookat : public sead::IDisposer
         return mPos;
     }
 
-    void setMaxDistanceType(DistanceType distance)
+    void setMaxDistType(DistType distance)
     {
-        mMaxDistanceType = distance;
+        mMaxDistType = distance;
     }
 
-    DistanceType getMaxDistanceType() const
+    DistType getMaxDistType() const
     {
-        return mMaxDistanceType;
+        return mMaxDistType;
     }
 
     // TODO: Figure out flags and do this properly
@@ -65,12 +68,12 @@ class AttentionLookat : public sead::IDisposer
     }
 
 protected:
-    ActorUniqueID   mOwnerID;
+    UniqueID        mOwnerID;
     sead::Vector2f  mPos;
-    DistanceType    mMaxDistanceType;   // Maximum distance to catch player's attention
+    DistType        mMaxDistType; ///< Maximum distance to catch player's attention
     sead::BitFlag32 mFlag;
     sead::ListNode  mListNode;
 
     friend class AttentionMgr;
 };
-static_assert(sizeof(AttentionLookat) == 0x2C);
+static_assert(sizeof(AttentionInfo) == 0x2C, "AttentionInfo size mismatch");
diff --git a/actor/AttentionMgr.h b/actor/AttentionMgr.h
index 6c564a1c..9eb64709 100644
--- a/actor/AttentionMgr.h
+++ b/actor/AttentionMgr.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <actor/AttentionLookat.h>
+#include <actor/AttentionInfo.h>
 
 #include <container/seadOffsetList.h>
 
-class ActorBase;
+class Actor;
 
 // vtbl Address: 0x10001364
 class AttentionMgr
@@ -26,22 +26,24 @@ class AttentionMgr
     }
 
     // Address: 0x0200CC8C
-    void entry(const AttentionLookat& lookat);
+    void entry(AttentionInfo* info);
     // Address: 0x0200CCD0
-    void release(const AttentionLookat& lookat);
+    void release(AttentionInfo* info);
 
     // Address: 0x0200CD2C
-    const AttentionLookat* search(const ActorBase& actor_self, const sead::Vector2f& pos_self);
+    const AttentionInfo* searchActor(const Actor* actor_self, const sead::Vector2f& pos_self) const;
 
 protected:
-    sead::OffsetList<AttentionLookat>   mLookatList;
+    sead::OffsetList<AttentionInfo>   mLookatList;
 
     /**
      * @brief Square of maximum possible value of all max-distances (square of 32 blocks = 262144 sq units)
+     * @details 262144.0f
      * @par Address: 0x10001350
      */
     static const f32 cMaxDistanceSqMax;
+
     // Address: 0x101C30D8
-    static f32 sMaxDistanceSq[AttentionLookat::cDistance_Num];
+    static f32 sMaxDistanceSq[AttentionInfo::cDistance_Num];
 };
-static_assert(sizeof(AttentionMgr) == 0x24);
+static_assert(sizeof(AttentionMgr) == 0x24, "AttentionMgr size mismatch");
diff --git a/actor/BgActorBase.h b/actor/BgActorBase.h
deleted file mode 100644
index 4e7c070f..00000000
--- a/actor/BgActorBase.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#pragma once
-
-#include <actor/ActorState.h>
-#include <graphics/AnimModel.h>
-#include <collision/ActorBoxBgCollision.h>
-#include <map_obj/Wave.h>
-
-// vtbl Address: 0x100FCF48
-class BgActorBase : public ActorMultiState
-{
-public:
-    // Address: 0x026F0A88
-    BgActorBase(const ActorCreateParam& param);
-    // Address: 0x026F36E8
-    ~BgActorBase() override;
-
-protected:
-    // Address: 0x026F0E9C
-    bool execute() override;
-
-public:
-    const Wave& getWave() const
-    {
-        return mWave;
-    }
-
-    Wave& getWave()
-    {
-        return mWave;
-    }
-
-    void setOnlyRenderWaves(bool only_render)
-    {
-        mOnlyRenderWaves = only_render;
-    }
-
-protected:
-    AnimModel*               mModel;
-    u8                       _17cc[4]; // Unknown values
-    sead::Vector3f           _17d0;
-    sead::Vector3f           _17dc;
-    ActorBoxBgCollision      mCollider;
-    BgCollision::LineInitArg mColliderInfo;
-    sead::Vector2f           _1a9c;
-    u32                      _1aa4;
-    u32                      _1aa8;
-    f32                      _1aac;
-    f32                      _1ab0;
-    f32                      _1ab4; // used to call it mWidth
-    f32                      _1ab8; // used to call it mBaselineHeight
-    f32                      _1abc; // used to call it mEffectiveHeight
-    f32                      _1ac0;
-    f32                      _1ac4;
-    f32                      _1ac8;
-    f32                      _1acc;
-    u32                      _1ad0;
-    u32                      _1ad4;
-    u16                      _1ad8;
-    u16                      _1ada;
-    bool                     mOnlyRenderWaves;
-    u8                       _1add;
-    u8                       _1ade;
-    u8                       _1adf;
-    u32                      _1ae0;
-    Wave                     mWave;
-    sead::IDisposer          _11a30;
-    u32                      _11a40;
-    u8                       _11a44[4]; // Unknown values
-    u32                      _11a48;
-    u32                      _11a4c;
-    u32                      _11a50;
-    u32                      _11a54;
-    u32                      _11a58;
-    u32                      _11a5c;
-    u32                      _11a60;
-    f32                      _11a64;
-    f32                      _11a68;
-    u32                      _11a6c;
-    u16                      _11a70;
-    u8                       _11a72;
-    u8                       _11a73;
-    u8                       _11a74[4]; // Unknown values
-};
-static_assert(sizeof(BgActorBase) == 0x11A78, "BgActorBase size mismatch");
diff --git a/actor/ChibiYoshiEatData.h b/actor/ChibiEatCallback.h
similarity index 65%
rename from actor/ChibiYoshiEatData.h
rename to actor/ChibiEatCallback.h
index 67ffbdd2..f63d081d 100644
--- a/actor/ChibiYoshiEatData.h
+++ b/actor/ChibiEatCallback.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 
 #include <math/seadVector.h>
 
 class Actor;
 
 // vtbl Address: 0x1000145C
-class ChibiYoshiEatData
+class ChibiEatCallback
 {
 public:
     enum State
@@ -17,14 +17,14 @@ class ChibiYoshiEatData
         cState_EatMouth,
         // ...?
     };
-    static_assert(sizeof(State) == 4);
+    static_assert(sizeof(State) == 4, "ChibiEatCallback::State size mismatch");
 
     enum EatType
     {
         cEatType_None = 0,  ///< Damages the player when trying to eat
         cEatType_Drink,     ///< Swallow the food
     };
-    static_assert(sizeof(EatType) == 4);
+    static_assert(sizeof(EatType) == 4, "ChibiEatCallback::EatType size mismatch");
 
     enum ScoreType
     {
@@ -32,25 +32,28 @@ class ChibiYoshiEatData
         cScoreType_Point_1000,
         cScoreType_None,
     };
-    static_assert(sizeof(ScoreType) == 4);
+    static_assert(sizeof(ScoreType) == 4, "ChibiEatCallback::ScoreType size mismatch");
 
     // Address: 0x0200CF1C
-    ChibiYoshiEatData(ActorUniqueID owner_id);
+    ChibiEatCallback(UniqueID owner_id);
+
+    // Address: Deleted
+    Actor* getParentActorPtr_() const;
 
     // Address: 0x0200D308
-    virtual u32 vf0C();
+    virtual bool isEatEnable();
     // Address: 0x0200D034
-    virtual void* vf14(void*);
+    virtual void* setEatIn(Actor* chibi_yoshi);
     // Address: 0x0200D094
-    virtual void* vf1C(void*);
+    virtual void* eatMove(Actor* chibi_yoshi);
     // Address: 0x0200D310
-    virtual void vf24();
+    virtual void setEatMouth(Actor* chibi_yoshi);
     // Address: 0x0200D314
     virtual void setEatSpitOut(Actor* chibi_yoshi);
     // Address: 0x0200D1B4
-    virtual bool handleEaten(Actor* chibi_yoshi);
+    virtual bool setEatGlupDown(Actor* chibi_yoshi);
     // Address: 0x0200D318
-    virtual void vf3C();
+    virtual void replaceEatActor();
 
     State getState() const
     {
@@ -93,11 +96,11 @@ class ChibiYoshiEatData
     }
 
 protected:
-    ActorUniqueID   mOwnerID;
+    UniqueID        mOwnerID;
     u32             mYoshiChibiID;
     sead::Vector3f  mScale;
     State           mState;
     EatType         mEatType;
     ScoreType       mScoreType;
 };
-static_assert(sizeof(ChibiYoshiEatData) == 0x24);
+static_assert(sizeof(ChibiEatCallback) == 0x24, "ChibiEatCallback size mismatch");
diff --git a/actor/EatData.h b/actor/EatCallback.h
similarity index 78%
rename from actor/EatData.h
rename to actor/EatCallback.h
index ead4ae95..220329ca 100644
--- a/actor/EatData.h
+++ b/actor/EatCallback.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 
 #include <math/seadVector.h>
 
 class Actor;
 
 // vtbl Address: 0x10001594
-class EatData
+class EatCallback
 {
 public:
     enum State
@@ -18,7 +18,7 @@ class EatData
         cState_DamageSpitOut,
         cState_SpitOut
     };
-    static_assert(sizeof(State) == 4);
+    static_assert(sizeof(State) == 0x4, "EatCallback::State size mismatch");
 
     enum EatType
     {
@@ -30,7 +30,7 @@ class EatData
         cEatType_YoshiFire,     ///< Hold the food in Yoshi's mouth, turns into fire when spat
         cEatType_YoshiFire_Ice  ///< Hold the food in Yoshi's mouth, turns into ice when spat
     };
-    static_assert(sizeof(EatType) == 4);
+    static_assert(sizeof(EatType) == 0x4, "EatCallback::EatType size mismatch");
 
     enum ScoreType
     {
@@ -38,10 +38,15 @@ class EatData
         cScoreType_Point_1000,
         cScoreType_None,
     };
-    static_assert(sizeof(ScoreType) == 4);
+    static_assert(sizeof(ScoreType) == 0x4, "EatCallback::ScoreType size mismatch");
 
     // Address: 0x0200D6C4
-    EatData(ActorUniqueID owner_id);
+    EatCallback(UniqueID owner_id);
+
+    // Address: Deleted
+    Actor* getParentActorConstPtr_() const;
+    // Address: Deleted
+    Actor* getParentActorPtr_();
 
     // Address: 0x0200D4B8
     virtual void setAfterEatScale();
@@ -52,7 +57,7 @@ class EatData
     // Address: 0x0200D76C
     virtual void eatMove(Actor* yoshi);
     // Address: 0x0200DA8C
-    virtual void vf2C();
+    virtual void replaceEatActor(Actor* yoshi);
     // Address: 0x0200D830
     virtual bool setEatTongue(Actor* yoshi);
     // Address: 0x0200DA90
@@ -66,7 +71,7 @@ class EatData
     // Address: 0x0200D9AC
     virtual void calcEatInScale(Actor* yoshi);
 
-    const ActorUniqueID& getYoshiID() const
+    const UniqueID& getYoshiID() const
     {
         return mYoshiID;
     }
@@ -112,11 +117,11 @@ class EatData
     }
 
 protected:
-    ActorUniqueID   mOwnerID;
-    ActorUniqueID   mYoshiID;
+    UniqueID        mOwnerID;
+    UniqueID        mYoshiID;
     State           mState;
     EatType         mEatType;
     sead::Vector3f  mScale;
     ScoreType       mScoreType;
 };
-static_assert(sizeof(EatData) == 0x24);
+static_assert(sizeof(EatCallback) == 0x24, "EatCallback size mismatch");
diff --git a/actor/LineManager.h b/actor/LineManager.h
new file mode 100644
index 00000000..c24222f0
--- /dev/null
+++ b/actor/LineManager.h
@@ -0,0 +1,352 @@
+#pragma once
+
+#include <state/FStateMgr.h>
+#include <utility/Angle.h>
+#include <utility/Direction.h>
+#include <prim/seadSafeString.h>
+#include <container/seadSafeArray.h>
+#include <math/seadVector.h>
+
+class LineManager
+{
+public:
+    // Address: 0x0200DC14
+    LineManager();
+
+    /**
+     * @param stop_at_end Whether to stop when reaching the end as opposed to reversing.
+     * @param dir_left Whether to move left instead of right.
+     * @par Address: 0x0200DF60
+     */
+    void initialize(const sead::Vector2f& pos, u32 layer, f32 base_speed = 0.0f, bool stop_at_end = false, bool dir_left = false);
+
+    // Address: Deleted
+    void initTermCheckPos();
+
+    // Address: 0x0200DF44
+    void changeDirection();
+
+    // Address: 0x0200E0C0
+    void setBaseSpeed(f32 speed);
+
+    // Address: 0x0200E0D8
+    Angle acmAngle() const;
+
+    // Address: 0x0200E0FC
+    u32 getLineUnitNo(f32 x, f32 y) const;
+
+    // Address: 0x0200E178
+    void startLineMove(bool exec_fall_down = false);
+
+    // Address: 0x0200E354
+    f32 calcAdjustPosY(f32, f32);
+
+    // Address: Deleted
+    void printInitState(const sead::SafeString&) const;
+
+    // Address: 0x0200E49C
+    bool isUnitCircle2x2(u32);
+
+    // Address: 0x0200E4D0
+    bool isUnitCircle4x4(u32);
+
+    // Address: 0x0200E504
+    bool lineCrossSlopeCheck(f32*, f32*, const sead::Vector2f&, const sead::Vector2f&);
+
+    // Address: 0x0200E580
+    bool lineCrossRangeCheck(f32, f32, f32);
+
+    // Address: 0x0200E5C0
+    static bool slopeCrossCheck(sead::Vector2f*, f32, f32, const sead::Vector2f&, sead::Vector2f, sead::Vector2f);
+
+    // Address: 0x0200E740
+    static bool verticalCrossCheck(f32*, f32, const sead::Vector2f&, sead::Vector2f, sead::Vector2f);
+    
+    // Address: 0x0200E868
+    static bool circleCrossCheck(f32, const sead::Vector2f&, const sead::Vector2f&);
+    
+    // Address: 0x0200E8C8
+    bool slopeCrossSetIfCan(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&, f32, f32);
+
+    // Address: 0x0200E960
+    bool heightCrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+
+    // Address: 0x0200EA6C
+    bool widthCrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+
+    // Address: 0x0200EABC
+    void circleNextPosSet(const sead::Vector3f& pos, f32);
+
+    // Address: 0x0200EB58
+    bool checkTerm();
+
+    // Address: 0x0200ECE8
+    void moveOnCircleSpeedSet(f32, f32);
+
+    // Address: 0x0200EE78
+    void correctPosXUnitOver();
+
+    // Address: 0x0200EEB8
+    void correctPosYUnitOver();
+
+    // Address: 0x0200EEF4
+    Angle acmRotDeltaU2UPrev(Angle);
+
+    // Address: 0x0200EF18
+    Angle acmRotDeltaU2URev(Angle);
+
+    // Address: 0x0200EF38
+    void calcRotateToCircleRev(Angle, bool);
+
+    // Address: 0x0200EF80
+    void calcRotateToCirclePrev(Angle, bool);
+
+    // Address: 0x0200EFC8
+    bool line0CrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F048
+    bool line1CrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F0AC
+    bool line3HCrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F0FC
+    bool line3VCrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F14C
+    bool line4CrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F19C
+    bool line5CrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F1EC
+    bool line7CrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F26C
+    bool line8CrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F2F4
+    bool line9CrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F358
+    bool lineACrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F3E0
+    bool lineBCrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F474
+    bool lineCCrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F4FC
+    bool lineDCrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F57C
+    bool lineECrossCheck(const sead::Vector2f&, const sead::Vector2f&, const sead::Vector2f&);
+    // Address: 0x0200F5E0
+    bool lineFCrossCheck(const sead::Vector2f&, sead::Vector2f, sead::Vector2f);
+
+    // Address: 0x0200F8DC
+    bool circleUL2CrossCheck(const sead::Vector2f&, sead::Vector2f, sead::Vector2f);
+    // Address: 0x0200FBD4
+    bool circleUR2CrossCheck(const sead::Vector2f&, sead::Vector2f, sead::Vector2f);
+    // Address: 0x0200FEB4
+    bool circleDL2CrossCheck(const sead::Vector2f&, sead::Vector2f, sead::Vector2f);
+    // Address: 0x02010194
+    bool circleDR2CrossCheck(const sead::Vector2f&, sead::Vector2f, sead::Vector2f);
+
+    // Address: 0x0201044C
+    bool lineRHURCrossCheck(const sead::Vector2f&, sead::Vector2f, sead::Vector2f);
+    // Address: 0x0201072C
+    bool lineRHULCrossCheck(const sead::Vector2f&, sead::Vector2f, sead::Vector2f);
+    // Address: 0x02010A24
+    bool lineRHLLCrossCheck(const sead::Vector2f&, sead::Vector2f, sead::Vector2f);
+    // Address: 0x02010D04
+    bool lineRHLRCrossCheck(const sead::Vector2f&, sead::Vector2f, sead::Vector2f);
+
+    // Address: 0x02010FBC
+    void fallOnLineCheck();
+
+    // Address: 0x0201214C
+    bool moveToRightUpper(u32, const sead::Vector2f&, bool);
+    // Address: 0x02011D88
+    bool moveToRightLower(u32, const sead::Vector2f&, bool);
+    // Address: 0x02011904
+    bool moveToLeftUpper(u32, const sead::Vector2f&, bool);
+    // Address: 0x020125EC
+    bool moveToLeftLower(u32, const sead::Vector2f&, bool);
+
+    // Address: 0x02012A90
+    void moveFromRightUpper(const sead::Vector2f&, bool);
+    // Address: 0x02012BC0
+    void moveFromHeightUpper(const sead::Vector2f&);
+    // Address: 0x02012CC0
+    void moveFromLeftLower(const sead::Vector2f&, bool);
+    // Address: 0x02012DD0
+    void moveFromRightLower(const sead::Vector2f&, bool);
+    // Address: 0x02012F00
+    void moveFromHeightLower(const sead::Vector2f&);
+    // Address: 0x02013000
+    void moveFromLeftUpper(const sead::Vector2f&, bool);
+
+    // Address: 0x02013110
+    void moveOnCircle1(f32, f32);
+    // Address: 0x02013288
+    void moveOnCircle2(f32, f32);
+    // Address: 0x02013418
+    void moveOnCircle3(f32, f32);
+    // Address: 0x02013594
+    void moveOnCircle4(f32, f32);
+
+    void execute()
+    {
+        mStateMgr.executeState();
+    }
+
+    const sead::Vector2f& getPos() const
+    {
+        return mPos;
+    }
+
+    bool isState(const StateID& state_id) const
+    {
+        return *mStateMgr.getStateID() == state_id;
+    }
+
+    bool isDirLeft() const
+    {
+        return mDirLeft;
+    }
+
+    bool isDirRight() const
+    {
+        return !mDirLeft;
+    }
+
+public:
+    // StateID_Idle                     Address: Deleted
+    // initializeState_Idle             Address: Deleted
+    // executeState_Idle                Address: Deleted
+    // finalizeState_Idle               Address: Deleted
+    DECLARE_STATE_ID(LineManager, Idle)
+    // StateID_FallDown                 Address: 0x101ECA8C
+    // initializeState_FallDown         Address: 0x0201371C
+    // executeState_FallDown            Address: 0x02013730
+    // finalizeState_FallDown           Address: 0x020170F4
+    DECLARE_STATE_ID(LineManager, FallDown)
+    // StateID_Left45			        Address: 0x101ECAAC
+    // initializeState_Left45	        Address: 0x020137B4
+    // executeState_Left45		        Address: 0x02013800
+    // finalizeState_Left45		        Address: 0x020170F8
+    DECLARE_STATE_ID(LineManager, Left45)
+    // StateID_Right45			        Address: 0x101ECACC
+    // initializeState_Right45	        Address: 0x02013960
+    // executeState_Right45		        Address: 0x020139A0
+    // finalizeState_Right45	        Address: 0x020170FC
+    DECLARE_STATE_ID(LineManager, Right45)
+    // StateID_Side				        Address: 0x101ECAEC
+    // initializeState_Side		        Address: 0x02013AE0
+    // executeState_Side			    Address: 0x02013B1C
+    // finalizeState_Side		        Address: 0x02017100
+    DECLARE_STATE_ID(LineManager, Side)
+    // StateID_Height			        Address: 0x101ECB0C
+    // initializeState_Height	        Address: 0x02013CE0
+    // executeState_Height	            Address: 0x02013D1C
+    // finalizeState_Height		        Address: 0x02017104
+    DECLARE_STATE_ID(LineManager, Height)
+    // StateID_CornerHeightLine		    Address: 0x101ECB2C
+    // initializeState_CornerHeightLine	Address: 0x02013E30
+    // executeState_CornerHeightLine    Address: 0x02013E6C
+    // finalizeState_CornerHeightLine   Address: 0x02017108
+    DECLARE_STATE_ID(LineManager, CornerHeightLine)
+    // StateID_CornerSideLine		    Address: Deleted
+    // initializeState_CornerSideLine	Address: Deleted
+    // executeState_CornerSideLine      Address: Deleted
+    // finalizeState_CornerSideLine     Address: Deleted
+    DECLARE_STATE_ID(LineManager, CornerSideLine)
+    // StateID_Left30Left               Address: 0x101ECB6C
+    // initializeState_Left30Left       Address: 0x020140DC
+    // executeState_Left30Left          Address: 0x0201413C
+    // finalizeState_Left30Left         Address: 0x02017110
+    DECLARE_STATE_ID(LineManager, Left30Left)
+    // StateID_Left30Right              Address: 0x101ECB8C
+    // initializeState_Left30Right      Address: 0x0201438C
+    // executeState_Left30Right         Address: 0x020143EC
+    // finalizeState_Left30Right        Address: 0x02017114
+    DECLARE_STATE_ID(LineManager, Left30Right)
+    // StateID_Right30Left              Address: 0x101ECBAC
+    // initializeState_Right30Left      Address: 0x02014610
+    // executeState_Right30Left         Address: 0x02014668
+    // finalizeState_Right30Left        Address: 0x02017118
+    DECLARE_STATE_ID(LineManager, Right30Left)
+    // StateID_Right30Right             Address: 0x101ECBCC
+    // initializeState_Right30Right     Address: 0x02014894
+    // executeState_Right30Right        Address: 0x020148EC
+    // finalizeState_Right30Right       Address: 0x0201711C
+    DECLARE_STATE_ID(LineManager, Right30Right)
+    // StateID_Left60Up                 Address: 0x101ECBEC
+    // initializeState_Left60Up         Address: 0x02014B20
+    // executeState_Left60Up            Address: 0x02014B80
+    // finalizeState_Left60Up           Address: 0x02017120
+    DECLARE_STATE_ID(LineManager, Left60Up)
+    // StateID_Left60Down               Address: 0x101ECC0C
+    // initializeState_Left60Down       Address: 0x02014DE0
+    // executeState_Left60Down          Address: 0x02014E40
+    // finalizeState_Left60Down         Address: 0x02017124
+    DECLARE_STATE_ID(LineManager, Left60Down)
+    // StateID_Right60Down              Address: 0x101ECC2C
+    // initializeState_Right60Down      Address: 0x02015074
+    // executeState_Right60Down         Address: 0x020150D4
+    // finalizeState_Right60Down        Address: 0x02017128
+    DECLARE_STATE_ID(LineManager, Right60Down)
+    // StateID_Right60Up                Address: 0x101ECC4C
+    // initializeState_Right60Up        Address: 0x02015314
+    // executeState_Right60Up           Address: 0x0201536C
+    // finalizeState_Right60Up          Address: 0x0201712C
+    DECLARE_STATE_ID(LineManager, Right60Up)
+    // StateID_Circle                   Address: 0x101ECC6C
+    // initializeState_Circle           Address: 0x0201559C
+    // executeState_Circle              Address: 0x020155D8
+    // finalizeState_Circle             Address: 0x02017130
+    DECLARE_STATE_ID(LineManager, Circle)
+    // StateID_Circle2x2LeftUp          Address: 0x101ECC8C
+    // initializeState_Circle2x2LeftUp  Address: 0x02015668
+    // executeState_Circle2x2LeftUp     Address: 0x020156A4
+    // finalizeState_Circle2x2LeftUp    Address: 0x02017134
+    DECLARE_STATE_ID(LineManager, Circle2x2LeftUp)
+    // StateID_Circle2x2RightUp         Address: 0x101ECCAC
+    // initializeState_Circle2x2RightUp Address: 0x020156B8
+    // executeState_Circle2x2RightUp    Address: 0x020156FC
+    // finalizeState_Circle2x2RightUp   Address: 0x02017138
+    DECLARE_STATE_ID(LineManager, Circle2x2RightUp)
+    // StateID_Circle2x2LeftDown        Address: 0x101ECCCC
+    // initializeState_LeftDown         Address: 0x02015710
+    // executeState_LeftDown            Address: 0x0201574C
+    // finalizeState_LeftDown           Address: 0x0201713C
+    DECLARE_STATE_ID(LineManager, Circle2x2LeftDown)
+    // StateID_Circle2x2RightDown       Address: 0x101ECCEC
+    // initializeState_RightDown        Address: 0x02015760
+    // executeState_RightDown           Address: 0x0201579C
+    // finalizeState_RightDown          Address: 0x02017140
+    DECLARE_STATE_ID(LineManager, Circle2x2RightDown)
+    // StateID_Circle4x4RightUp         Address: 0x101ECD0C
+    // initializeState_Circle4x4RightUp Address: 0x020157B0
+    // executeState_Circle4x4RightUp    Address: 0x020157F4
+    // finalizeState_Circle4x4RightUp   Address: 0x02017144
+    DECLARE_STATE_ID(LineManager, Circle4x4RightUp)
+
+public:
+    /**
+     * @brief 16.0f
+     * @par Address: 0x10001740
+     */
+    static f32 cUnitSizeX;
+
+    /**
+     * @brief 16.0f
+     * @par Address: Deleted
+     */
+    static f32 cUnitSizeY;
+
+protected:
+    FStateMgr<LineManager>                  mStateMgr;
+    sead::UnsafeArray<sead::Vector2f, 7>    _24;
+    sead::Vector2f                          mSpeed;
+    sead::Vector2f                          mPos;
+    sead::Vector2f                          mPosPrev;
+    sead::Vector2f                          mPosBlock;
+    sead::Vector2f                          _7c;
+    Angle                                   mAngle;
+    f32                                     mBaseSpeed;
+    bool                                    mStopAtEnd;
+    u8                                      mLayer;
+    bool                                    mDirLeft;
+    bool                                    _8f;            // Set, but never read
+};
+static_assert(sizeof(LineManager) == 0x90, "LineManager size mismatch");
diff --git a/actor/LineMgr.h b/actor/LineMgr.h
deleted file mode 100644
index 7d826302..00000000
--- a/actor/LineMgr.h
+++ /dev/null
@@ -1,169 +0,0 @@
-#pragma once
-
-#include <state/FStateMgr.h>
-#include <utility/Angle.h>
-#include <utility/Direction.h>
-
-#include <container/seadSafeArray.h>
-#include <math/seadVector.h>
-
-class LineMgr
-{
-public:
-    enum Type
-    {
-        cType_ReverseAtEnd = 0, // i.e., Two-way
-        cType_StopAtEnd         // i.e., One-way
-    };
-
-public:
-    // Address: 0x0200DC14
-    LineMgr();
-
-    // Address: 0x0200DF60
-    void init(const sead::Vector2f& pos, u8 layer, f32 base_speed = 0.0f, Type type = cType_ReverseAtEnd, u8 dir_x = cDirType_Right);
-
-    // Address: 0x0200E0C0
-    void setBaseSpeed(f32 speed);
-
-    // Address: 0x0200E178
-    void startLineMove(bool exec_fall_down = false);
-
-    void execute()
-    {
-        mStateMgr.executeState();
-    }
-
-    const sead::Vector2f& getPos() const
-    {
-        return mPos;
-    }
-
-    bool isState(const StateID& state_id) const
-    {
-        return *mStateMgr.getStateID() == state_id;
-    }
-
-    u8 getDir() const
-    {
-        return mDir;
-    }
-
-public:
-    // StateID_FallDown                 Address: 0x101ECA8C
-    // initializeState_FallDown         Address: 0x0201371C
-    // executeState_FallDown            Address: 0x02013730
-    // finalizeState_FallDown           Address: 0x020170F4
-    DECLARE_STATE_ID(LineMgr, FallDown)
-    // StateID_Left45			        Address: 0x101ECAAC
-    // initializeState_Left45	        Address: 0x020137B4
-    // executeState_Left45		        Address: 0x02013800
-    // finalizeState_Left45		        Address: 0x020170F8
-    DECLARE_STATE_ID(LineMgr, Left45)
-    // StateID_Right45			        Address: 0x101ECACC
-    // initializeState_Right45	        Address: 0x02013960
-    // executeState_Right45		        Address: 0x020139A0
-    // finalizeState_Right45	        Address: 0x020170FC
-    DECLARE_STATE_ID(LineMgr, Right45)
-    // StateID_Side				        Address: 0x101ECAEC
-    // initializeState_Side		        Address: 0x02013AE0
-    // executeState_Side			    Address: 0x02013B1C
-    // finalizeState_Side		        Address: 0x02017100
-    DECLARE_STATE_ID(LineMgr, Side)
-    // StateID_Height			        Address: 0x101ECB0C
-    // initializeState_Height	        Address: 0x02013CE0
-    // executeState_Height	            Address: 0x02013D1C
-    // finalizeState_Height		        Address: 0x02017104
-    DECLARE_STATE_ID(LineMgr, Height)
-    // StateID_CornerHeightLine		    Address: 0x101ECB2C
-    // initializeState_CornerHeightLine	Address: 0x02013E30
-    // executeState_CornerHeightLine    Address: 0x02013E6C
-    // finalizeState_CornerHeightLine   Address: 0x02017108
-    DECLARE_STATE_ID(LineMgr, CornerHeightLine)
-    // StateID_Left30Left               Address: 0x101ECB6C
-    // initializeState_Left30Left       Address: 0x020140DC
-    // executeState_Left30Left          Address: 0x0201413C
-    // finalizeState_Left30Left         Address: 0x02017110
-    DECLARE_STATE_ID(LineMgr, Left30Left)
-    // StateID_Left30Right              Address: 0x101ECB8C
-    // initializeState_Left30Right      Address: 0x0201438C
-    // executeState_Left30Right         Address: 0x020143EC
-    // finalizeState_Left30Right        Address: 0x02017114
-    DECLARE_STATE_ID(LineMgr, Left30Right)
-    // StateID_Right30Left              Address: 0x101ECBAC
-    // initializeState_Right30Left      Address: 0x02014610
-    // executeState_Right30Left         Address: 0x02014668
-    // finalizeState_Right30Left        Address: 0x02017118
-    DECLARE_STATE_ID(LineMgr, Right30Left)
-    // StateID_Right30Right             Address: 0x101ECBCC
-    // initializeState_Right30Right     Address: 0x02014894
-    // executeState_Right30Right        Address: 0x020148EC
-    // finalizeState_Right30Right       Address: 0x0201711C
-    DECLARE_STATE_ID(LineMgr, Right30Right)
-    // StateID_Left60Up                 Address: 0x101ECBEC
-    // initializeState_Left60Up         Address: 0x02014B20
-    // executeState_Left60Up            Address: 0x02014B80
-    // finalizeState_Left60Up           Address: 0x02017120
-    DECLARE_STATE_ID(LineMgr, Left60Up)
-    // StateID_Left60Down               Address: 0x101ECC0C
-    // initializeState_Left60Down       Address: 0x02014DE0
-    // executeState_Left60Down          Address: 0x02014E40
-    // finalizeState_Left60Down         Address: 0x02017124
-    DECLARE_STATE_ID(LineMgr, Left60Down)
-    // StateID_Right60Down              Address: 0x101ECC2C
-    // initializeState_Right60Down      Address: 0x02015074
-    // executeState_Right60Down         Address: 0x020150D4
-    // finalizeState_Right60Down        Address: 0x02017128
-    DECLARE_STATE_ID(LineMgr, Right60Down)
-    // StateID_Right60Up                Address: 0x101ECC4C
-    // initializeState_Right60Up        Address: 0x02015314
-    // executeState_Right60Up           Address: 0x0201536C
-    // finalizeState_Right60Up          Address: 0x0201712C
-    DECLARE_STATE_ID(LineMgr, Right60Up)
-    // StateID_Circle                   Address: 0x101ECC6C
-    // initializeState_Circle           Address: 0x0201559C
-    // executeState_Circle              Address: 0x020155D8
-    // finalizeState_Circle             Address: 0x02017130
-    DECLARE_STATE_ID(LineMgr, Circle)
-    // StateID_Circle2x2LeftUp          Address: 0x101ECC8C
-    // initializeState_Circle2x2LeftUp  Address: 0x02015668
-    // executeState_Circle2x2LeftUp     Address: 0x020156A4
-    // finalizeState_Circle2x2LeftUp    Address: 0x02017134
-    DECLARE_STATE_ID(LineMgr, Circle2x2LeftUp)
-    // StateID_Circle2x2RightUp         Address: 0x101ECCAC
-    // initializeState_Circle2x2RightUp Address: 0x020156B8
-    // executeState_Circle2x2RightUp    Address: 0x020156FC
-    // finalizeState_Circle2x2RightUp   Address: 0x02017138
-    DECLARE_STATE_ID(LineMgr, Circle2x2RightUp)
-    // StateID_Circle2x2LeftDown        Address: 0x101ECCCC
-    // initializeState_LeftDown         Address: 0x02015710
-    // executeState_LeftDown            Address: 0x0201574C
-    // finalizeState_LeftDown           Address: 0x0201713C
-    DECLARE_STATE_ID(LineMgr, Circle2x2LeftDown)
-    // StateID_Circle2x2RightDown       Address: 0x101ECCEC
-    // initializeState_RightDown        Address: 0x02015760
-    // executeState_RightDown           Address: 0x0201579C
-    // finalizeState_RightDown          Address: 0x02017140
-    DECLARE_STATE_ID(LineMgr, Circle2x2RightDown)
-    // StateID_Circle4x4RightUp         Address: 0x101ECD0C
-    // initializeState_Circle4x4RightUp Address: 0x020157B0
-    // executeState_Circle4x4RightUp    Address: 0x020157F4
-    // finalizeState_Circle4x4RightUp   Address: 0x02017144
-    DECLARE_STATE_ID(LineMgr, Circle4x4RightUp)
-
-protected:
-    FStateMgr<LineMgr>                      mStateMgr;
-    sead::UnsafeArray<sead::Vector2f, 7>    _24;
-    sead::Vector2f                          mSpeed;
-    sead::Vector2f                          mPos;
-    sead::Vector2f                          mPosPrev;
-    sead::Vector2f                          mPosBlock;
-    sead::Vector2f                          _7c;
-    Angle                                   mAngle;
-    f32                                     mBaseSpeed;
-    u8                                      mType;          // See Type
-    u8                                      mLayer;
-    u8                                      mDir;
-    bool                                    _8f;            // Set, but never read
-};
-static_assert(sizeof(LineMgr) == 0x90);
diff --git a/actor/MapActor.h b/actor/MapActor.h
deleted file mode 100644
index 1e780c31..00000000
--- a/actor/MapActor.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <basis/seadTypes.h>
-
-class MapActor
-{
-public:
-    class Profile
-    {
-    public:
-        Profile(s32 id)
-            : mID(id)
-        {
-        }
-
-        operator s32() const
-        {
-            return mID;
-        }
-
-    protected:
-        s32 mID;
-    };
-
-public:
-    // Address: 0x101ECD8C
-    static const Profile    cProfileID[];
-};
diff --git a/actor/MapObj.h b/actor/MapObj.h
new file mode 100644
index 00000000..be3303a9
--- /dev/null
+++ b/actor/MapObj.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <basis/seadTypes.h>
+
+// Address: 0x101ECD8C
+extern s32 cMapObjLabel2ProfileID[];
diff --git a/actor/Profile.h b/actor/Profile.h
index d851d7f5..16cb62f6 100644
--- a/actor/Profile.h
+++ b/actor/Profile.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#include <actor/ProfileInfo.h>
-
 #include <basis/seadAssert.h>
 #include <container/seadSafeArray.h>
 #include <heap/seadHeap.h>
 #include <math/seadVector.h>
 
-struct ActorCreateInfo
+struct ActorData
 {
     enum Flag : u16
     {
@@ -21,7 +19,7 @@ struct ActorCreateInfo
         cFlag_CoinBlock                  = 1 << 8,  ///< Participates in coin-block counting routines, but only if nybble 20 is 0 and nybble 13 & 1 is 0 (aka mParam1 & 0x1000000F)
         cFlag_PakkunBlack                = 1 << 9,  ///< Spawns as a muncher tile instead of constructing an Actor instance.
         cFlag_ManagedChildTemplate       = 1 << 10, ///< Treats creation of the map actor as a reusable operation from an external manager actor.
-        cFlag_GroupedScrollSetupDeferred = 1 << 11, ///< Both @c cFlag_ScrollSetupDeferred and @c cFlag_Grouped
+        cFlag_Jouchu                     = 1 << 11, ///< Both @c cFlag_ScrollSetupDeferred and @c cFlag_Grouped
 
         cFlag_None = 0
     };
@@ -50,15 +48,17 @@ struct ActorCreateInfo
     Flag flag;
 
     // Address: 0x100018F4
-    static const ActorCreateInfo cDefault;
+    static const ActorData cDefault;
 };
-static_assert(sizeof(ActorCreateInfo) == 0x24, "ActorCreateInfo size mismatch");
+static_assert(sizeof(ActorData) == 0x24, "ActorData size mismatch");
 
 class ActorBase;
-struct ActorCreateParam;
+struct ActorCreateParameter;
 class ModelResource;
 
-typedef ActorBase* (*ActorFactory)(const ActorCreateParam&);
+typedef ActorBase* (*ActorFactory)(const ActorCreateParameter&);
+
+typedef s32 ProfileID;
 
 class Profile
 {
@@ -85,6 +85,12 @@ class Profile
     };
     static_assert(sizeof(Flag) == 4);
 
+public:
+    enum
+    {
+        cProfileID_Max = 913 // Profiles 910, 911 and 912 are extra (samples)
+    };
+
 public:
     friend Flag operator|(const Flag& lhs, const Flag& rhs)
     {
@@ -114,7 +120,7 @@ class Profile
     }
 
 public:
-    Profile(ActorFactory factory, s32 id, const sead::SafeString& name, const ActorCreateInfo* create_info = nullptr, Flag flag = cFlag_None);
+    Profile(ActorFactory factory, ProfileID id, const sead::SafeString& name, const ActorData* create_info = nullptr, u32 flag = cFlag_None, void (*)(sead::hostio::Context*) = nullptr);
 
     ActorFactory getActorFactory() const
     {
@@ -122,12 +128,12 @@ class Profile
         return mFactory;
     }
 
-    s32 getID() const
+    ProfileID getID() const
     {
         return mID;
     }
 
-    const ActorCreateInfo& getActorCreateInfo() const
+    const ActorData& getActorCreateInfo() const
     {
         return *mActorCreateInfo;
     }
@@ -145,23 +151,23 @@ class Profile
     // Address: 0x020195FC
     void loadResource(sead::Heap* heap);
     // Address: 0x020196CC
-    void unloadResource(sead::Heap* heap);
+    void unloadResource();
     // Address: 0x020196E4
-    ModelResource* getResource(u32 index) const;
+    ModelResource* getMdlResource(u32 index) const;
 
-    static Profile* get(s32 id);
+    static Profile* getProfile(ProfileID id);
 
 protected:
     ActorFactory            mFactory;
-    s32                     mID;
-    const ActorCreateInfo*  mActorCreateInfo;
+    ProfileID               mID;
+    const ActorData*  mActorCreateInfo;
     bool                    mIsResLoaded;
     Flag                    mFlag;
 
     // Address: 0x101ED8DC
     static sead::SafeArray<
         Profile*,
-        ProfileInfo::cProfileID_Max
+        cProfileID_Max
     >   sProfileList;
 };
 static_assert(sizeof(Profile) == 0x14, "Profile size mismatch");
diff --git a/actor/ProfileInfo.h b/actor/ProfileInfo.h
index cc33a446..2102ead7 100644
--- a/actor/ProfileInfo.h
+++ b/actor/ProfileInfo.h
@@ -1,1083 +1,1072 @@
 #pragma once
 
+#include <actor/Profile.h>
+#include <actor/ActorResLoader.h>
+
 #include <prim/seadSafeString.h>
 
 class ProfileInfo
 {
-public:
-    enum
-    {
-        cProfileID_Max = 913    // Profiles 910, 911 and 912 are extra
-    };
-
-    enum ResType
-    {
-        cResType_Boot = 0,
-        cResType_Course,
-        cResType_CourseSelect,
-        cResType_Num
-    };
-
 public:
     // Address: 0x02019988
-    static s16 getDrawPriority(s32 id);
+    static s16 getDrawPriority(ProfileID id);
     // Address: 0x020199A8
-    static ResType getResType(s32 id);
+    static ActorResLoader::ResType getResType(ProfileID id);
     // Address: 0x020199CC
-    static u32 getResNum(s32 id);
+    static u32 getResNum(ProfileID id);
     // Address: 0x020199EC
-    static const sead::SafeString* getResList(s32 id);
+    static const sead::SafeString* getResName(ProfileID id);
 
 protected:
     enum DrawPriority
     {
-        cDrawPriority_1B9                                       =   0,
-        cDrawPriority_PlayerObject                              =   1,
-        cDrawPriority_TottenPlayer                              =   2,
-        cDrawPriority_Yoshi                                     =   3,
-        cDrawPriority_1BD                                       =   4,
-        cDrawPriority_Kuribo                                    =   5,
-        cDrawPriority_Kakibo                                    =   6,
-        cDrawPriority_PataKuribo                                =   7,
-        cDrawPriority_1D6                                       =   8,
-        cDrawPriority_1D7                                       =   9,
-        cDrawPriority_1D8                                       =  10,
-        cDrawPriority_1D9                                       =  11,
-        cDrawPriority_IceBall                                   =  12,
-        cDrawPriority_IceBallPakkun                             =  13,
-        cDrawPriority_FireBallPlayer                            =  14,
-        cDrawPriority_FireBallPakkun                            =  15,
-        cDrawPriority_YoshiFire                                 =  16,
-        cDrawPriority_1DF                                       =  17,
-        cDrawPriority_1E0                                       =  18,
-        cDrawPriority_1E1                                       =  19,
-        cDrawPriority_1E2                                       =  20,
-        cDrawPriority_305                                       =  21,
-        cDrawPriority_306                                       =  22,
-        cDrawPriority_307                                       =  23,
-        cDrawPriority_308                                       =  24,
-        cDrawPriority_309                                       =  25,
-        cDrawPriority_1E3                                       =  26,
-        cDrawPriority_1E4                                       =  27,
-        cDrawPriority_1E5                                       =  28,
-        cDrawPriority_1E6                                       =  29,
-        cDrawPriority_1E7                                       =  30,
-        cDrawPriority_1E8                                       =  31,
-        cDrawPriority_1E9                                       =  32,
-        cDrawPriority_1EA                                       =  33,
-        cDrawPriority_1EB                                       =  34,
-        cDrawPriority_1EC                                       =  35,
-        cDrawPriority_1ED                                       =  36,
-        cDrawPriority_1EE                                       =  37,
-        cDrawPriority_1EF                                       =  38,
-        cDrawPriority_1F0                                       =  39,
-        cDrawPriority_1F1                                       =  40,
-        cDrawPriority_1F2                                       =  41,
-        cDrawPriority_1F3                                       =  42,
-        cDrawPriority_1F4                                       =  43,
-        cDrawPriority_1F5                                       =  44,
-        cDrawPriority_1F6                                       =  45,
-        cDrawPriority_1F7                                       =  46,
-        cDrawPriority_11B                                       =  47,
-        cDrawPriority_14D                                       =  48,
-        cDrawPriority_14E                                       =  49,
-        cDrawPriority_14F                                       =  50,
-        cDrawPriority_ObjPipeDown                               =  51,
-        cDrawPriority_151                                       =  52,
-        cDrawPriority_152                                       =  53,
-        cDrawPriority_153                                       =  54,
-        cDrawPriority_ObjPipeDownGroup                          =  55,
-        cDrawPriority_082                                       =  56,
-        cDrawPriority_083                                       =  57,
-        cDrawPriority_084                                       =  58,
-        cDrawPriority_085                                       =  59,
-        cDrawPriority_155                                       =  60,
-        cDrawPriority_156                                       =  61,
-        cDrawPriority_157                                       =  62,
-        cDrawPriority_ObjPipeDownNG                             =  63,
-        cDrawPriority_087                                       =  64,
-        cDrawPriority_088                                       =  65,
-        cDrawPriority_089                                       =  66,
-        cDrawPriority_08A                                       =  67,
-        cDrawPriority_08B                                       =  68,
-        cDrawPriority_08C                                       =  69,
-        cDrawPriority_08D                                       =  70,
-        cDrawPriority_08E                                       =  71,
-        cDrawPriority_05F                                       =  72,
-        cDrawPriority_060                                       =  73,
-        cDrawPriority_061                                       =  74,
-        cDrawPriority_102                                       =  75,
-        cDrawPriority_08F                                       =  76,
-        cDrawPriority_090                                       =  77,
-        cDrawPriority_062                                       =  78,
-        cDrawPriority_063                                       =  79,
-        cDrawPriority_05C                                       =  80,
-        cDrawPriority_05D                                       =  81,
-        cDrawPriority_05E                                       =  82,
-        cDrawPriority_064                                       =  83,
-        cDrawPriority_091                                       =  84,
-        cDrawPriority_092                                       =  85,
-        cDrawPriority_1FF                                       =  86,
-        cDrawPriority_Nokonoko                                  =  87,
-        cDrawPriority_201                                       =  88,
-        cDrawPriority_202                                       =  89,
-        cDrawPriority_203                                       =  90,
-        cDrawPriority_204                                       =  91,
-        cDrawPriority_17D                                       =  92,
-        cDrawPriority_17E                                       =  93,
-        cDrawPriority_205                                       =  94,
-        cDrawPriority_206                                       =  95,
-        cDrawPriority_208                                       =  96,
-        cDrawPriority_207                                       =  97,
-        cDrawPriority_209                                       =  98,
-        cDrawPriority_20A                                       =  99,
-        cDrawPriority_20B                                       = 100,
-        cDrawPriority_MechaKoopa                                = 101,
-        cDrawPriority_20D                                       = 102,
-        cDrawPriority_20E                                       = 103,
-        cDrawPriority_PentaroIce                                = 104,
-        cDrawPriority_210                                       = 105,
-        cDrawPriority_211                                       = 106,
-        cDrawPriority_212                                       = 107,
-        cDrawPriority_213                                       = 108,
-        cDrawPriority_214                                       = 109,
-        cDrawPriority_215                                       = 110,
-        cDrawPriority_216                                       = 111,
-        cDrawPriority_217                                       = 112,
-        cDrawPriority_218                                       = 113,
-        cDrawPriority_219                                       = 114,
-        cDrawPriority_21A                                       = 115,
-        cDrawPriority_21B                                       = 116,
-        cDrawPriority_21C                                       = 117,
-        cDrawPriority_21D                                       = 118,
-        cDrawPriority_224                                       = 119,
-        cDrawPriority_17F                                       = 120,
-        cDrawPriority_180                                       = 121,
-        cDrawPriority_181                                       = 122,
-        cDrawPriority_182                                       = 123,
-        cDrawPriority_225                                       = 124,
-        cDrawPriority_226                                       = 125,
-        cDrawPriority_229                                       = 126,
-        cDrawPriority_22A                                       = 127,
-        cDrawPriority_FireBar                                   = 128,
-        cDrawPriority_FireBarSync                               = 129,
-        cDrawPriority_179                                       = 130,
-        cDrawPriority_17A                                       = 131,
-        cDrawPriority_Burner                                    = 132,
-        cDrawPriority_0E1                                       = 133,
-        cDrawPriority_0E2                                       = 134,
-        cDrawPriority_0E3                                       = 135,
-        cDrawPriority_0EB                                       = 136,
-        cDrawPriority_22C                                       = 137,
-        cDrawPriority_22D                                       = 138,
-        cDrawPriority_FireBallKeronpa                           = 139,
-        cDrawPriority_FireBallKeronpaRDash                      = 140,
-        cDrawPriority_FireSnake                                 = 141,
-        cDrawPriority_27D                                       = 142,
-        cDrawPriority_27E                                       = 143,
-        cDrawPriority_27F                                       = 144,
-        cDrawPriority_GabonRock                                 = 145,
-        cDrawPriority_281                                       = 146,
-        cDrawPriority_282                                       = 147,
-        cDrawPriority_RockGabonRock                             = 148,
-        cDrawPriority_284                                       = 149,
-        cDrawPriority_SeichanSnowBall                           = 150,
-        cDrawPriority_286                                       = 151,
-        cDrawPriority_232                                       = 152,
-        cDrawPriority_233                                       = 153,
-        cDrawPriority_234                                       = 154,
-        cDrawPriority_236                                       = 155,
-        cDrawPriority_237                                       = 156,
-        cDrawPriority_238                                       = 157,
-        cDrawPriority_239                                       = 158,
-        cDrawPriority_23A                                       = 159,
-        cDrawPriority_23B                                       = 160,
-        cDrawPriority_23C                                       = 161,
-        cDrawPriority_23D                                       = 162,
-        cDrawPriority_Kazandan                                  = 163,
-        cDrawPriority_Bun                                       = 164,
-        cDrawPriority_BunW2                                     = 165,
-        cDrawPriority_BunW3                                     = 166,
-        cDrawPriority_BunW4                                     = 167,
-        cDrawPriority_BunW5                                     = 168,
-        cDrawPriority_BunW6                                     = 169,
-        cDrawPriority_BunDemoKameck                             = 170,
-        cDrawPriority_LemmyBomb                                 = 171,
-        cDrawPriority_Lemmy                                     = 172,
-        cDrawPriority_LemmyBall                                 = 173,
-        cDrawPriority_Morton                                    = 174,
-        cDrawPriority_MortonSanbo                               = 175,
-        cDrawPriority_MortonSanboParts                          = 176,
-        cDrawPriority_Wendy                                     = 177,
-        cDrawPriority_WendyRing                                 = 178,
-        cDrawPriority_WendyIcicle                               = 179,
-        cDrawPriority_WendyFloor                                = 180,
-        cDrawPriority_Larry                                     = 181,
-        cDrawPriority_KokoopaSearchFire                         = 182,
-        cDrawPriority_Ludwig                                    = 183,
-        cDrawPriority_LudwigAlterEgo                            = 184,
-        cDrawPriority_Iggy                                      = 185,
-        cDrawPriority_IggyMagic                                 = 186,
-        cDrawPriority_IggyRoom                                  = 187,
-        cDrawPriority_Woogan                                    = 188,
-        cDrawPriority_Roy                                       = 189,
-        cDrawPriority_BossKK                                    = 190,
-        cDrawPriority_BossKKThunder                             = 191,
-        cDrawPriority_BossKKDemoKameck                          = 192,
-        cDrawPriority_BossKKDemoKK                              = 193,
-        cDrawPriority_Kameck                                    = 194,
-        cDrawPriority_KameckIce                                 = 195,
-        cDrawPriority_KameckMagic                               = 196,
-        cDrawPriority_PeachFinalCastleKoopaJr                   = 197,
-        cDrawPriority_PeachFinalCastleKoopaJrClown              = 198,
-        cDrawPriority_PeachFinalCastleKoopaJrLift               = 199,
-        cDrawPriority_PeachFinalCastleKoopaJrLiftHmove          = 200,
-        cDrawPriority_PeachFinalCastleKoopaJrLiftPairObj        = 201,
-        cDrawPriority_RoyLiftWakiStep                           = 202,
-        cDrawPriority_Koopa                                     = 203,
-        cDrawPriority_KoopaFire                                 = 204,
-        cDrawPriority_KoopaShutter                              = 205,
-        cDrawPriority_DemoKoopaJr                               = 206,
-        cDrawPriority_DemoKoopaJrClown                          = 207,
-        cDrawPriority_KoopaDemoKameck                           = 208,
-        cDrawPriority_FinalKoopa                                = 209,
-        cDrawPriority_FinalKoopaFire                            = 210,
-        cDrawPriority_FinalKoopaJr                              = 211,
-        cDrawPriority_FinalKoopaJrClown                         = 212,
-        cDrawPriority_FinalKoopaJrFire                          = 213,
-        cDrawPriority_FinalBomhei                               = 214,
-        cDrawPriority_KinokoLift                                = 215,
-        cDrawPriority_KinokoLiftColor                           = 216,
-        cDrawPriority_LiftZenStar                               = 217,
-        cDrawPriority_033                                       = 218,
-        cDrawPriority_0AD                                       = 219,
-        cDrawPriority_0AE                                       = 220,
-        cDrawPriority_0AF                                       = 221,
-        cDrawPriority_0B0                                       = 222,
-        cDrawPriority_0B1                                       = 223,
-        cDrawPriority_050                                       = 224,
-        cDrawPriority_17C                                       = 225,
-        cDrawPriority_051                                       = 226,
-        cDrawPriority_235                                       = 227,
-        cDrawPriority_16D                                       = 228,
-        cDrawPriority_Block                                     = 229,
-        cDrawPriority_1BE                                       = 230,
-        cDrawPriority_1BF                                       = 231,
-        cDrawPriority_1C4                                       = 232,
-        cDrawPriority_1C3                                       = 233,
-        cDrawPriority_1C0                                       = 234,
-        cDrawPriority_1C1                                       = 235,
-        cDrawPriority_1C2                                       = 236,
-        cDrawPriority_1C7                                       = 237,
-        cDrawPriority_1C8                                       = 238,
-        cDrawPriority_1C9                                       = 239,
-        cDrawPriority_1CA                                       = 240,
-        cDrawPriority_1CB                                       = 241,
-        cDrawPriority_1CC                                       = 242,
-        cDrawPriority_1CD                                       = 243,
-        cDrawPriority_1CE                                       = 244,
-        cDrawPriority_QuestPrizeItem                            = 245,
-        cDrawPriority_1D0                                       = 246,
-        cDrawPriority_1D1                                       = 247,
-        cDrawPriority_183                                       = 248,
-        cDrawPriority_184                                       = 249,
-        cDrawPriority_185                                       = 250,
-        cDrawPriority_186                                       = 251,
-        cDrawPriority_22B                                       = 252,
-        cDrawPriority_187                                       = 253,
-        cDrawPriority_Kinoko                                    = 254,
-        cDrawPriority_FireFlower                                = 255,
-        cDrawPriority_RealizeFeverStar                          = 256,
-        cDrawPriority_Star                                      = 257,
-        cDrawPriority_MameKinoko                                = 258,
-        cDrawPriority_IceFlower                                 = 259,
-        cDrawPriority_Propeller                                 = 260,
-        cDrawPriority_Penguin                                   = 261,
-        cDrawPriority_OneUpKinoko                               = 262,
-        cDrawPriority_Musasabi                                  = 263,
-        cDrawPriority_SuperMoon                                 = 264,
-        cDrawPriority_TitleDemoItem                             = 265,
-        cDrawPriority_097                                       = 266,
-        cDrawPriority_036                                       = 267,
-        cDrawPriority_037                                       = 268,
-        cDrawPriority_038                                       = 269,
-        cDrawPriority_039                                       = 270,
-        cDrawPriority_03A                                       = 271,
-        cDrawPriority_03B                                       = 272,
-        cDrawPriority_PairObjChild                              = 273,
-        cDrawPriority_03D                                       = 274,
-        cDrawPriority_03E                                       = 275,
-        cDrawPriority_03F                                       = 276,
-        cDrawPriority_040                                       = 277,
-        cDrawPriority_041                                       = 278,
-        cDrawPriority_042                                       = 279,
-        cDrawPriority_043                                       = 280,
-        cDrawPriority_044                                       = 281,
-        cDrawPriority_045                                       = 282,
-        cDrawPriority_046                                       = 283,
-        cDrawPriority_047                                       = 284,
-        cDrawPriority_048                                       = 285,
-        cDrawPriority_049                                       = 286,
-        cDrawPriority_04A                                       = 287,
-        cDrawPriority_04B                                       = 288,
-        cDrawPriority_04C                                       = 289,
-        cDrawPriority_188                                       = 290,
-        cDrawPriority_113                                       = 291,
-        cDrawPriority_114                                       = 292,
-        cDrawPriority_115                                       = 293,
-        cDrawPriority_116                                       = 294,
-        cDrawPriority_2E4                                       = 295,
-        cDrawPriority_2E5                                       = 296,
-        cDrawPriority_2E6                                       = 297,
-        cDrawPriority_2E7                                       = 298,
-        cDrawPriority_2E8                                       = 299,
-        cDrawPriority_2E9                                       = 300,
-        cDrawPriority_2EA                                       = 301,
-        cDrawPriority_259                                       = 302,
-        cDrawPriority_2EE                                       = 303,
-        cDrawPriority_2EF                                       = 304,
-        cDrawPriority_2F0                                       = 305,
-        cDrawPriority_2F1                                       = 306,
-        cDrawPriority_2F2                                       = 307,
-        cDrawPriority_02B                                       = 308,
-        cDrawPriority_02C                                       = 309,
-        cDrawPriority_25A                                       = 310,
-        cDrawPriority_25B                                       = 311,
-        cDrawPriority_25C                                       = 312,
-        cDrawPriority_25D                                       = 313,
-        cDrawPriority_25E                                       = 314,
-        cDrawPriority_25F                                       = 315,
-        cDrawPriority_260                                       = 316,
-        cDrawPriority_261                                       = 317,
-        cDrawPriority_1AA                                       = 318,
-        cDrawPriority_1AB                                       = 319,
-        cDrawPriority_1AC                                       = 320,
-        cDrawPriority_1AD                                       = 321,
-        cDrawPriority_1AE                                       = 322,
-        cDrawPriority_1AF                                       = 323,
-        cDrawPriority_1B0                                       = 324,
-        cDrawPriority_1B1                                       = 325,
-        cDrawPriority_1B2                                       = 326,
-        cDrawPriority_1B3                                       = 327,
-        cDrawPriority_076                                       = 328,
-        cDrawPriority_077                                       = 329,
-        cDrawPriority_078                                       = 330,
-        cDrawPriority_1B5                                       = 331,
-        cDrawPriority_1B4                                       = 332,
-        cDrawPriority_262                                       = 333,
-        cDrawPriority_263                                       = 334,
-        cDrawPriority_2F3                                       = 335,
-        cDrawPriority_0BF                                       = 336,
-        cDrawPriority_0C0                                       = 337,
-        cDrawPriority_0C1                                       = 338,
-        cDrawPriority_Hammer                                    = 339,
-        cDrawPriority_2F5                                       = 340,
-        cDrawPriority_Boomerang                                 = 341,
-        cDrawPriority_2F7                                       = 342,
-        cDrawPriority_FireBallBros                              = 343,
-        cDrawPriority_2F9                                       = 344,
-        cDrawPriority_IceBallBros                               = 345,
-        cDrawPriority_2FB                                       = 346,
-        cDrawPriority_MegaHammer                                = 347,
-        cDrawPriority_2FD                                       = 348,
-        cDrawPriority_2FF                                       = 349,
-        cDrawPriority_300                                       = 350,
-        cDrawPriority_301                                       = 351,
-        cDrawPriority_121                                       = 352,
-        cDrawPriority_122                                       = 353,
-        cDrawPriority_ActorBlockRenga                           = 354,
-        cDrawPriority_124                                       = 355,
-        cDrawPriority_125                                       = 356,
-        cDrawPriority_126                                       = 357,
-        cDrawPriority_127                                       = 358,
-        cDrawPriority_128                                       = 359,
-        cDrawPriority_129                                       = 360,
-        cDrawPriority_12A                                       = 361,
-        cDrawPriority_12B                                       = 362,
-        cDrawPriority_12C                                       = 363,
-        cDrawPriority_12D                                       = 364,
-        cDrawPriority_12E                                       = 365,
-        cDrawPriority_12F                                       = 366,
-        cDrawPriority_130                                       = 367,
-        cDrawPriority_131                                       = 368,
-        cDrawPriority_132                                       = 369,
-        cDrawPriority_133                                       = 370,
-        cDrawPriority_134                                       = 371,
-        cDrawPriority_13F                                       = 372,
-        cDrawPriority_140                                       = 373,
-        cDrawPriority_ActorBlockMakeDRC                         = 374,
-        cDrawPriority_136                                       = 375,
-        cDrawPriority_137                                       = 376,
-        cDrawPriority_138                                       = 377,
-        cDrawPriority_13A                                       = 378,
-        cDrawPriority_13B                                       = 379,
-        cDrawPriority_0E4                                       = 380,
-        cDrawPriority_0F5                                       = 381,
-        cDrawPriority_0F6                                       = 382,
-        cDrawPriority_0F7                                       = 383,
-        cDrawPriority_0F8                                       = 384,
-        cDrawPriority_0F9                                       = 385,
-        cDrawPriority_139                                       = 386,
-        cDrawPriority_13C                                       = 387,
-        cDrawPriority_13D                                       = 388,
-        cDrawPriority_13E                                       = 389,
-        cDrawPriority_141                                       = 390,
-        cDrawPriority_142                                       = 391,
-        cDrawPriority_143                                       = 392,
-        cDrawPriority_14B                                       = 393,
-        cDrawPriority_ActorCoin                                 = 394,
-        cDrawPriority_18C                                       = 395,
-        cDrawPriority_18D                                       = 396,
-        cDrawPriority_18E                                       = 397,
-        cDrawPriority_18F                                       = 398,
-        cDrawPriority_190                                       = 399,
-        cDrawPriority_191                                       = 400,
-        cDrawPriority_192                                       = 401,
-        cDrawPriority_193                                       = 402,
-        cDrawPriority_194                                       = 403,
-        cDrawPriority_195                                       = 404,
-        cDrawPriority_196                                       = 405,
-        cDrawPriority_197                                       = 406,
-        cDrawPriority_198                                       = 407,
-        cDrawPriority_199                                       = 408,
-        cDrawPriority_19A                                       = 409,
-        cDrawPriority_19B                                       = 410,
-        cDrawPriority_19C                                       = 411,
-        cDrawPriority_19D                                       = 412,
-        cDrawPriority_19E                                       = 413,
-        cDrawPriority_1A0                                       = 414,
-        cDrawPriority_19F                                       = 415,
-        cDrawPriority_032                                       = 416,
-        cDrawPriority_1A1                                       = 417,
-        cDrawPriority_1A2                                       = 418,
-        cDrawPriority_1A3                                       = 419,
-        cDrawPriority_1A4                                       = 420,
-        cDrawPriority_1A5                                       = 421,
-        cDrawPriority_1A6                                       = 422,
-        cDrawPriority_1A7                                       = 423,
-        cDrawPriority_1A8                                       = 424,
-        cDrawPriority_BlueCoin                                  = 425,
-        cDrawPriority_264                                       = 426,
-        cDrawPriority_1F9                                       = 427,
-        cDrawPriority_1FA                                       = 428,
-        cDrawPriority_1FB                                       = 429,
-        cDrawPriority_1FC                                       = 430,
-        cDrawPriority_1FD                                       = 431,
-        cDrawPriority_1FE                                       = 432,
-        cDrawPriority_311                                       = 433,
-        cDrawPriority_312                                       = 434,
-        cDrawPriority_052                                       = 435,
-        cDrawPriority_053                                       = 436,
-        cDrawPriority_0C5                                       = 437,
-        cDrawPriority_0C6                                       = 438,
-        cDrawPriority_265                                       = 439,
-        cDrawPriority_KillerHoudai                              = 440,
-        cDrawPriority_StretchKillerHoudai                       = 441,
-        cDrawPriority_MagnumKillerHoudai                        = 442,
-        cDrawPriority_MagnumKillerHoudaiDown                    = 443,
-        cDrawPriority_SearchKillerHoudai                        = 444,
-        cDrawPriority_SearchMagnumKillerHoudai                  = 445,
-        cDrawPriority_SearchMagnumKillerHoudaiDown              = 446,
-        cDrawPriority_MagnumKillerHoudaiRDash                   = 447,
-        cDrawPriority_MagnumKillerHoudaiDownRDash               = 448,
-        cDrawPriority_SearchMagnumKillerHoudaiRDash             = 449,
-        cDrawPriority_SearchMagnumKillerHoudaiDownRDash         = 450,
-        cDrawPriority_070                                       = 451,
-        cDrawPriority_071                                       = 452,
-        cDrawPriority_072                                       = 453,
-        cDrawPriority_073                                       = 454,
-        cDrawPriority_074                                       = 455,
-        cDrawPriority_273                                       = 456,
-        cDrawPriority_075                                       = 457,
-        cDrawPriority_274                                       = 458,
-        cDrawPriority_275                                       = 459,
-        cDrawPriority_SearchKiller                              = 460,
-        cDrawPriority_277                                       = 461,
-        cDrawPriority_278                                       = 462,
-        cDrawPriority_279                                       = 463,
-        cDrawPriority_27B                                       = 464,
-        cDrawPriority_27C                                       = 465,
-        cDrawPriority_SwitchHatenaButton                        = 466,
-        cDrawPriority_SwitchPbutton                             = 467,
-        cDrawPriority_SwitchPbuttonRDash                        = 468,
-        cDrawPriority_SwitchPbuttonNoWallKick                   = 469,
-        cDrawPriority_15C                                       = 470,
-        cDrawPriority_15D                                       = 471,
-        cDrawPriority_313                                       = 472,
-        cDrawPriority_314                                       = 473,
-        cDrawPriority_315                                       = 474,
-        cDrawPriority_316                                       = 475,
-        cDrawPriority_317                                       = 476,
-        cDrawPriority_318                                       = 477,
-        cDrawPriority_319                                       = 478,
-        cDrawPriority_TarzanIvy                                 = 479,
-        cDrawPriority_0EF                                       = 480,
-        cDrawPriority_0F0                                       = 481,
-        cDrawPriority_SnakeBlock                                = 482,
-        cDrawPriority_0C3                                       = 483,
-        cDrawPriority_0C4                                       = 484,
-        cDrawPriority_0C8                                       = 485,
-        cDrawPriority_31E                                       = 486,
-        cDrawPriority_31D                                       = 487,
-        cDrawPriority_0C7                                       = 488,
-        cDrawPriority_0E5                                       = 489,
-        cDrawPriority_117                                       = 490,
-        cDrawPriority_31F                                       = 491,
-        cDrawPriority_166                                       = 492,
-        cDrawPriority_2F4                                       = 493,
-        cDrawPriority_303                                       = 494,
-        cDrawPriority_304                                       = 495,
-        cDrawPriority_Intermittent                              = 496,
-        cDrawPriority_IntermittentPermanent                     = 497,
-        cDrawPriority_WaterIntermittent                         = 498,
-        cDrawPriority_WaterIntermittentPermanent                = 499,
-        cDrawPriority_WaterIntermittentPermanentRD3_3           = 500,
-        cDrawPriority_07E                                       = 501,
-        cDrawPriority_WaterIntermittentBossChild                = 502,
-        cDrawPriority_YoganIntermittent                         = 503,
-        cDrawPriority_Woochan                                   = 504,
-        cDrawPriority_268                                       = 505,
-        cDrawPriority_Spanner                                   = 506,
-        cDrawPriority_26A                                       = 507,
-        cDrawPriority_26B                                       = 508,
-        cDrawPriority_26C                                       = 509,
-        cDrawPriority_26D                                       = 510,
-        cDrawPriority_26E                                       = 511,
-        cDrawPriority_26F                                       = 512,
-        cDrawPriority_270                                       = 513,
-        cDrawPriority_0B2                                       = 514,
-        cDrawPriority_100                                       = 515,
-        cDrawPriority_101                                       = 516,
-        cDrawPriority_0B3                                       = 517,
-        cDrawPriority_16B                                       = 518,
-        cDrawPriority_16C                                       = 519,
-        cDrawPriority_0B4                                       = 520,
-        cDrawPriority_0B5                                       = 521,
-        cDrawPriority_0B6                                       = 522,
-        cDrawPriority_0B7                                       = 523,
-        cDrawPriority_LineSpinLift                              = 524,
-        cDrawPriority_LineSpinLiftParentRDash                   = 525,
-        cDrawPriority_LineSpinLiftChildRDash                    = 526,
-        cDrawPriority_0BC                                       = 527,
-        cDrawPriority_081                                       = 528,
-        cDrawPriority_093                                       = 529,
-        cDrawPriority_094                                       = 530,
-        cDrawPriority_095                                       = 531,
-        cDrawPriority_096                                       = 532,
-        cDrawPriority_ElasticKinokoParent                       = 533,
-        cDrawPriority_0CB                                       = 534,
-        cDrawPriority_0CC                                       = 535,
-        cDrawPriority_0E7                                       = 536,
-        cDrawPriority_0E8                                       = 537,
-        cDrawPriority_0E6                                       = 538,
-        cDrawPriority_0EA                                       = 539,
-        cDrawPriority_287                                       = 540,
-        cDrawPriority_288                                       = 541,
-        cDrawPriority_289                                       = 542,
-        cDrawPriority_28B                                       = 543,
-        cDrawPriority_28C                                       = 544,
-        cDrawPriority_28D                                       = 545,
-        cDrawPriority_098                                       = 546,
-        cDrawPriority_099                                       = 547,
-        cDrawPriority_09A                                       = 548,
-        cDrawPriority_09B                                       = 549,
-        cDrawPriority_09C                                       = 550,
-        cDrawPriority_09D                                       = 551,
-        cDrawPriority_09E                                       = 552,
-        cDrawPriority_09F                                       = 553,
-        cDrawPriority_0A1                                       = 554,
-        cDrawPriority_0A2                                       = 555,
-        cDrawPriority_0A3                                       = 556,
-        cDrawPriority_0A4                                       = 557,
-        cDrawPriority_0A5                                       = 558,
-        cDrawPriority_0A6                                       = 559,
-        cDrawPriority_0A0                                       = 560,
-        cDrawPriority_0A7                                       = 561,
-        cDrawPriority_0A8                                       = 562,
-        cDrawPriority_0A9                                       = 563,
-        cDrawPriority_0AA                                       = 564,
-        cDrawPriority_0AB                                       = 565,
-        cDrawPriority_0AC                                       = 566,
-        cDrawPriority_0BE                                       = 567,
-        cDrawPriority_0BD                                       = 568,
-        cDrawPriority_0BB                                       = 569,
-        cDrawPriority_320                                       = 570,
-        cDrawPriority_0D3                                       = 571,
-        cDrawPriority_0D6                                       = 572,
-        cDrawPriority_0D4                                       = 573,
-        cDrawPriority_0D5                                       = 574,
-        cDrawPriority_0D7                                       = 575,
-        cDrawPriority_0D8                                       = 576,
-        cDrawPriority_0D9                                       = 577,
-        cDrawPriority_0DA                                       = 578,
-        cDrawPriority_0DB                                       = 579,
-        cDrawPriority_103                                       = 580,
-        cDrawPriority_0DC                                       = 581,
-        cDrawPriority_0DD                                       = 582,
-        cDrawPriority_0FA                                       = 583,
-        cDrawPriority_0FB                                       = 584,
-        cDrawPriority_162                                       = 585,
-        cDrawPriority_29F                                       = 586,
-        cDrawPriority_0E9                                       = 587,
-        cDrawPriority_29E                                       = 588,
-        cDrawPriority_2A1                                       = 589,
-        cDrawPriority_2A2                                       = 590,
-        cDrawPriority_1F8                                       = 591,
-        cDrawPriority_2A3                                       = 592,
-        cDrawPriority_104                                       = 593,
-        cDrawPriority_16E                                       = 594,
-        cDrawPriority_16F                                       = 595,
-        cDrawPriority_29D                                       = 596,
-        cDrawPriority_30A                                       = 597,
-        cDrawPriority_IcicleBig                                 = 598,
-        cDrawPriority_30B                                       = 599,
-        cDrawPriority_30C                                       = 600,
-        cDrawPriority_30D                                       = 601,
-        cDrawPriority_30E                                       = 602,
-        cDrawPriority_30F                                       = 603,
-        cDrawPriority_310                                       = 604,
-        cDrawPriority_163                                       = 605,
-        cDrawPriority_164                                       = 606,
-        cDrawPriority_165                                       = 607,
-        cDrawPriority_11D                                       = 608,
-        cDrawPriority_11E                                       = 609,
-        cDrawPriority_Maruta                                    = 610,
-        cDrawPriority_0DF                                       = 611,
-        cDrawPriority_0EC                                       = 612,
-        cDrawPriority_FloorGyration                             = 613,
-        cDrawPriority_FloorHoleDokan                            = 614,
-        cDrawPriority_0D0                                       = 615,
-        cDrawPriority_0D1                                       = 616,
-        cDrawPriority_0C9                                       = 617,
-        cDrawPriority_0CA                                       = 618,
-        cDrawPriority_107                                       = 619,
-        cDrawPriority_0CD                                       = 620,
-        cDrawPriority_0CE                                       = 621,
-        cDrawPriority_0CF                                       = 622,
-        cDrawPriority_Bubble                                    = 623,
-        cDrawPriority_BubbleSync                                = 624,
-        cDrawPriority_BubbleRDash                               = 625,
-        cDrawPriority_BubbleSyncRDash                           = 626,
-        cDrawPriority_292                                       = 627,
-        cDrawPriority_293                                       = 628,
-        cDrawPriority_294                                       = 629,
-        cDrawPriority_295                                       = 630,
-        cDrawPriority_298                                       = 631,
-        cDrawPriority_299                                       = 632,
-        cDrawPriority_29A                                       = 633,
-        cDrawPriority_29B                                       = 634,
-        cDrawPriority_29C                                       = 635,
-        cDrawPriority_161                                       = 636,
-        cDrawPriority_168                                       = 637,
-        cDrawPriority_169                                       = 638,
-        cDrawPriority_0F3                                       = 639,
-        cDrawPriority_0F4                                       = 640,
-        cDrawPriority_322                                       = 641,
-        cDrawPriority_323                                       = 642,
-        cDrawPriority_324                                       = 643,
-        cDrawPriority_325                                       = 644,
-        cDrawPriority_PlayerIce                                 = 645,
-        cDrawPriority_326                                       = 646,
-        cDrawPriority_144                                       = 647,
-        cDrawPriority_145                                       = 648,
-        cDrawPriority_146                                       = 649,
-        cDrawPriority_147                                       = 650,
-        cDrawPriority_0F1                                       = 651,
-        cDrawPriority_0F2                                       = 652,
-        cDrawPriority_327                                       = 653,
-        cDrawPriority_328                                       = 654,
-        cDrawPriority_BattleItem                                = 655,
-        cDrawPriority_VsBattleItem                              = 656,
-        cDrawPriority_2A4                                       = 657,
-        cDrawPriority_2A5                                       = 658,
-        cDrawPriority_321                                       = 659,
-        cDrawPriority_32C                                       = 660,
-        cDrawPriority_32D                                       = 661,
-        cDrawPriority_32F                                       = 662,
-        cDrawPriority_330                                       = 663,
-        cDrawPriority_331                                       = 664,
-        cDrawPriority_32A                                       = 665,
-        cDrawPriority_KokoopaShipLemmy                          = 666,
-        cDrawPriority_KokoopaShipMorton                         = 667,
-        cDrawPriority_KokoopaShipLarry                          = 668,
-        cDrawPriority_KokoopaShipWendy                          = 669,
-        cDrawPriority_KokoopaShipIggy                           = 670,
-        cDrawPriority_KokoopaShipRoy                            = 671,
-        cDrawPriority_KokoopaShipLudwig                         = 672,
-        cDrawPriority_KokoopaShipWarpCannon                     = 673,
-        cDrawPriority_Peach                                     = 674,
-        cDrawPriority_2E0                                       = 675,
-        cDrawPriority_FinalDVPeach                              = 676,
-        cDrawPriority_FinalDVShutter                            = 677,
-        cDrawPriority_2E3                                       = 678,
-        cDrawPriority_1D2                                       = 679,
-        cDrawPriority_148                                       = 680,
-        cDrawPriority_149                                       = 681,
-        cDrawPriority_14A                                       = 682,
-        cDrawPriority_119                                       = 683,
-        cDrawPriority_11A                                       = 684,
-        cDrawPriority_108                                       = 685,
-        cDrawPriority_KoopaJrFire                               = 686,
-        cDrawPriority_KoopaJrBall                               = 687,
-        cDrawPriority_174                                       = 688,
-        cDrawPriority_025                                       = 689,
-        cDrawPriority_UnderwaterKoopaJr                         = 690,
-        cDrawPriority_UnderwaterKoopaJrClown                    = 691,
-        cDrawPriority_UnderwaterKoopaJrRetreatPos               = 692,
-        cDrawPriority_BoxingKoopaJr                             = 693,
-        cDrawPriority_BoxingKoopaJrClown                        = 694,
-        cDrawPriority_BoxingKoopaJrPostBattleDemo               = 695,
-        cDrawPriority_BoxingKoopaJrClownPostBattleDemo          = 696,
-        cDrawPriority_054                                       = 697,
-        cDrawPriority_055                                       = 698,
-        cDrawPriority_056                                       = 699,
-        cDrawPriority_057                                       = 700,
-        cDrawPriority_058                                       = 701,
-        cDrawPriority_059                                       = 702,
-        cDrawPriority_BgActorYukaMario                          = 703,
-        cDrawPriority_05B                                       = 704,
-        cDrawPriority_0FC                                       = 705,
-        cDrawPriority_0FD                                       = 706,
-        cDrawPriority_0FE                                       = 707,
-        cDrawPriority_0FF                                       = 708,
-        cDrawPriority_SlotChibiYoshi                            = 709,
-        cDrawPriority_MiniGamePanelItem                         = 710,
-        cDrawPriority_SlotItem                                  = 711,
-        cDrawPriority_ShuffleBlock                              = 712,
-        cDrawPriority_CoinmakiCoin                              = 713,
-        cDrawPriority_CoinmakiItem                              = 714,
-        cDrawPriority_CoinmakiCannon                            = 715,
-        cDrawPriority_MiniGameKinopio                           = 716,
-        cDrawPriority_33F                                       = 717,
-        cDrawPriority_340                                       = 718,
-        cDrawPriority_341                                       = 719,
-        cDrawPriority_342                                       = 720,
-        cDrawPriority_10A                                       = 721,
-        cDrawPriority_10B                                       = 722,
-        cDrawPriority_10C                                       = 723,
-        cDrawPriority_118                                       = 724,
-        cDrawPriority_17B                                       = 725,
-        cDrawPriority_350                                       = 726,
-        cDrawPriority_StaffRollMgr                              = 727,
-        cDrawPriority_StaffRollMgrRDash                         = 728,
-        cDrawPriority_StaffRollChibiYoshiChar                   = 729,
-        cDrawPriority_StaffRollChibiYoshiBalloon                = 730,
-        cDrawPriority_StaffRollChibiYoshiBalloonCheer           = 731,
-        cDrawPriority_StaffRollChibiYoshiLight                  = 732,
-        cDrawPriority_StaffRollChibiYoshiLightCheer             = 733,
-        cDrawPriority_StaffRollAwaChar                          = 734,
-        cDrawPriority_StaffRollAwaCoin                          = 735,
-        cDrawPriority_StaffRollTottenKun                        = 736,
-        cDrawPriority_CourseSelectPlayer                        = 737,
-        cDrawPriority_CourseSelectPlayer2PSub                   = 738,
-        cDrawPriority_CourseSelectChibiYoshi                    = 739,
-        cDrawPriority_CourseSelectCamera                        = 740,
-        cDrawPriority_CourseSelectCastle                        = 741,
-        cDrawPriority_CourseSelectToride                        = 742,
-        cDrawPriority_CourseSelectKinokoHouse1up                = 743,
-        cDrawPriority_CourseSelectKinokoHouseShuffle            = 744,
-        cDrawPriority_CourseSelectKinokoHouseSlot               = 745,
-        cDrawPriority_CourseSelectPeachGates1st                 = 746,
-        cDrawPriority_CourseSelectPeachGates2nd                 = 747,
-        cDrawPriority_CourseSelectCoursePoint                   = 748,
-        cDrawPriority_CourseSelectWorldMoveDokan                = 749,
-        cDrawPriority_CourseSelectGhost                         = 750,
-        cDrawPriority_CourseSelectW8Cloud                       = 751,
-        cDrawPriority_CourseSelectW2Bros                        = 752,
-        cDrawPriority_CourseSelectEventAssistant                = 753,
-        cDrawPriority_CourseSelectShipW1                        = 754,
-        cDrawPriority_CourseSelectShipW2                        = 755,
-        cDrawPriority_CourseSelectShipW3                        = 756,
-        cDrawPriority_CourseSelectShipW4                        = 757,
-        cDrawPriority_CourseSelectShipW5                        = 758,
-        cDrawPriority_CourseSelectShipW6                        = 759,
-        cDrawPriority_CourseSelectShipW7                        = 760,
-        cDrawPriority_CourseSelectShipW8                        = 761,
-        cDrawPriority_CourseSelectShipW8Broken                  = 762,
-        cDrawPriority_CourseSelectSurrender                     = 763,
-        cDrawPriority_CourseSelectSwitchA                       = 764,
-        cDrawPriority_CourseSelectSwitchB                       = 765,
-        cDrawPriority_CourseSelectTeresa                        = 766,
-        cDrawPriority_CourseSelectOpeningKameck                 = 767,
-        cDrawPriority_CourseSelectTorideBoss                    = 768,
-        cDrawPriority_CourseSelectPakkun                        = 769,
-        cDrawPriority_CourseSelectShadowFirstDemoKinopio        = 770,
-        cDrawPriority_CourseSelectTobiPuku                      = 771,
-        cDrawPriority_CourseSelectChorobon                      = 772,
-        cDrawPriority_CourseSelectW7Item                        = 773,
-        cDrawPriority_CourseSelectW5Teresa                      = 774,
-        cDrawPriority_CourseSelectFlag                          = 775,
-        cDrawPriority_CourseSelectMusasabi                      = 777,
-        cDrawPriority_CourseSelectWPillar                       = 778,
-        cDrawPriority_CourseSelectW7Bridge                      = 779,
-        cDrawPriority_CourseSelectMiiBalloon                    = 780,
-        cDrawPriority_CourseSelectPenguin                       = 781,
-        cDrawPriority_CourseSelectW4Item                        = 782,
-        cDrawPriority_CourseSelectW2Kuribo                      = 783,
-        cDrawPriority_CourseSelectPakkunBig                     = 784,
-        cDrawPriority_CourseSelectShadowKunIcon                 = 785,
-        cDrawPriority_CourseSelectDekaUnira                     = 786,
-        cDrawPriority_CourseSelectTomb                          = 787,
-        cDrawPriority_CourseSelectShadowFirstDemoShadowKun      = 788,
-        cDrawPriority_CourseSelectKotsuCoaster                  = 789,
-        cDrawPriority_CourseSelectKoopaJr                       = 790,
-        cDrawPriority_CourseSelectPeach                         = 791,
-        cDrawPriority_CourseSelectW1Item                        = 792,
-        cDrawPriority_CourseSelectStarGate                      = 793,
-        cDrawPriority_38E                                       = 794,
-        cDrawPriority_38F                                       = 795,
+        cDrawPriority_Balloon = 0,
+        cDrawPriority_PlayerObject = 1,
+        cDrawPriority_PlayerTotten = 2,
+        cDrawPriority_Yoshi = 3,
+        cDrawPriority_GoalDemoKinopio = 4,
+        cDrawPriority_Kuribo = 5,
+        cDrawPriority_Kakibo = 6,
+        cDrawPriority_PataKuribo = 7,
+        cDrawPriority_IgaKuribo = 8,
+        cDrawPriority_BeansKuribo = 9,
+        cDrawPriority_MiddleKuribo = 10,
+        cDrawPriority_LargeKuribo = 11,
+        cDrawPriority_IceBall = 12,
+        cDrawPriority_IceBallPakkun = 13,
+        cDrawPriority_FireBallPlayer = 14,
+        cDrawPriority_FireBallPakkun = 15,
+        cDrawPriority_YoshiFire = 16,
+        cDrawPriority_DokanPakkunUp = 17,
+        cDrawPriority_DokanPakkunDown = 18,
+        cDrawPriority_DokanPakkunLeft = 19,
+        cDrawPriority_DokanPakkunRight = 20,
+        cDrawPriority_RotDokanFirePakkun = 21,
+        cDrawPriority_RotDokanPakkunUp = 22,
+        cDrawPriority_RotDokanPakkunDown = 23,
+        cDrawPriority_RotDokanPakkunLeft = 24,
+        cDrawPriority_RotDokanPakkunRight = 25,
+        cDrawPriority_DokanFirePakkunUp = 26,
+        cDrawPriority_DokanFirePakkunDown = 27,
+        cDrawPriority_DokanFirePakkunLeft = 28,
+        cDrawPriority_DokanFirePakkunRight = 29,
+        cDrawPriority_DokanIcePakkunUp = 30,
+        cDrawPriority_DokanIcePakkunDown = 31,
+        cDrawPriority_DokanIcePakkunLeft = 32,
+        cDrawPriority_DokanIcePakkunRight = 33,
+        cDrawPriority_DokanPakkunBig = 34,
+        cDrawPriority_JimenPakkun = 35,
+        cDrawPriority_JimenPakkunRDash = 36,
+        cDrawPriority_JimenPakkunR33 = 37,
+        cDrawPriority_JimenFirePakkun = 38,
+        cDrawPriority_JimenIcePakkun = 39,
+        cDrawPriority_JimenBigPakkun = 40,
+        cDrawPriority_JimenBigFirePakkun = 41,
+        cDrawPriority_WalkPakkun = 42,
+        cDrawPriority_WaterPakkun = 43,
+        cDrawPriority_WaterPakkunRDash = 44,
+        cDrawPriority_BlackPakkun = 45,
+        cDrawPriority_BlackPakkunOBJ = 46,
+        cDrawPriority_11B = 47,
+        cDrawPriority_ObjPipeRight = 48,
+        cDrawPriority_ObjPipeLeft = 49,
+        cDrawPriority_ObjPipeUp = 50,
+        cDrawPriority_ObjPipeDown = 51,
+        cDrawPriority_GroupObjPipeRight = 52,
+        cDrawPriority_GroupObjPipeLeft = 53,
+        cDrawPriority_GroupObjPipeUp = 54,
+        cDrawPriority_GroupObjPipeDown = 55,
+        cDrawPriority_ObjMamePipeRight = 56,
+        cDrawPriority_ObjMamePipeLeft = 57,
+        cDrawPriority_ObjMamePipeUp = 58,
+        cDrawPriority_ObjMamePipeDown = 59,
+        cDrawPriority_ObjPipeRightNG = 60,
+        cDrawPriority_ObjPipeLeftNG = 61,
+        cDrawPriority_ObjPipeUpNG = 62,
+        cDrawPriority_ObjPipeDownNG = 63,
+        cDrawPriority_CoinBattlePipeUp = 64,
+        cDrawPriority_CoinBattlePipeDown = 65,
+        cDrawPriority_CoinBattlePipeLeft = 66,
+        cDrawPriority_CoinBattlePipeRight = 67,
+        cDrawPriority_ZoomPipeRight = 68,
+        cDrawPriority_ZoomPipeLeft = 69,
+        cDrawPriority_ZoomPipe = 70,
+        cDrawPriority_ZoomPipeDown = 71,
+        cDrawPriority_LiftRotHalfRev = 72,
+        cDrawPriority_LiftRotHalfRevRDash = 73,
+        cDrawPriority_LiftHanRotateLight = 74,
+        cDrawPriority_RotHalf = 75,
+        cDrawPriority_RotPipe = 76,
+        cDrawPriority_RotPipeRDash = 77,
+        cDrawPriority_LiftHurikoYogan = 78,
+        cDrawPriority_LiftHurikoYoganRDash = 79,
+        cDrawPriority_LineSpinLift = 80,
+        cDrawPriority_LineKinokoBlock = 81,
+        cDrawPriority_GroupLineKinokoBlock = 82,
+        cDrawPriority_RailPolygon = 83,
+        cDrawPriority_CannonPipe = 84,
+        cDrawPriority_CannonPipeRDash = 85,
+        cDrawPriority_FooBall = 86,
+        cDrawPriority_Nokonoko = 87,
+        cDrawPriority_NokonokoHeight = 88,
+        cDrawPriority_NokonokoBig = 89,
+        cDrawPriority_Patapata = 90,
+        cDrawPriority_PatapataGroup = 91,
+        cDrawPriority_Met = 92,
+        cDrawPriority_MetMiddle = 93,
+        cDrawPriority_Togezo = 94,
+        cDrawPriority_ReverseTogezo = 95,
+        cDrawPriority_Kanitama = 96,
+        cDrawPriority_Kanibo = 97,
+        cDrawPriority_Bombhei = 98,
+        cDrawPriority_BombheiPara = 99,
+        cDrawPriority_BombheiParaRDash = 100,
+        cDrawPriority_MechaKoopa = 101,
+        cDrawPriority_Pentaro = 102,
+        cDrawPriority_PentaroGlass = 103,
+        cDrawPriority_PentaroIce = 104,
+        cDrawPriority_HoneMet = 105,
+        cDrawPriority_HoneMetHead = 106,
+        cDrawPriority_Pukupuku = 107,
+        cDrawPriority_PukupukuGroup = 108,
+        cDrawPriority_PukupukuMiddle = 109,
+        cDrawPriority_PukupukuMiddleGroup = 110,
+        cDrawPriority_PukupukuSearch = 111,
+        cDrawPriority_PukupukuSearchMiddle = 112,
+        cDrawPriority_PukupukuEscape = 113,
+        cDrawPriority_PukupukuEscapeMiddle = 114,
+        cDrawPriority_PukupukuMecha = 115,
+        cDrawPriority_PukupukuToge = 116,
+        cDrawPriority_Tobipuku = 117,
+        cDrawPriority_TobipukuMecha = 118,
+        cDrawPriority_FishBone = 119,
+        cDrawPriority_Unira = 120,
+        cDrawPriority_UniraRDashNarrowBC = 121,
+        cDrawPriority_DekaUnira = 122,
+        cDrawPriority_UniraRDash = 123,
+        cDrawPriority_Fugumannen = 124,
+        cDrawPriority_FugumannenBig = 125,
+        cDrawPriority_JellyFish = 126,
+        cDrawPriority_ChochinAnkoh = 127,
+        cDrawPriority_FireBar = 128,
+        cDrawPriority_FireBarSync = 129,
+        cDrawPriority_FireBar2 = 130,
+        cDrawPriority_RotFireBar = 131,
+        cDrawPriority_Barnar = 132,
+        cDrawPriority_BarnarLarge = 133,
+        cDrawPriority_BarnarSync = 134,
+        cDrawPriority_BarnarRot = 135,
+        cDrawPriority_IceLump = 136,
+        cDrawPriority_Keronpa = 137,
+        cDrawPriority_KeronpaRDash = 138,
+        cDrawPriority_FireBallKeronpa = 139,
+        cDrawPriority_FireBallKeronpaRDash = 140,
+        cDrawPriority_FireSnake = 141,
+        cDrawPriority_Gabon = 142,
+        cDrawPriority_GabonRDash = 143,
+        cDrawPriority_GabonJochu = 144,
+        cDrawPriority_GabonBall = 145,
+        cDrawPriority_RockGabon = 146,
+        cDrawPriority_RockGabonJochu = 147,
+        cDrawPriority_RockGabonBall = 148,
+        cDrawPriority_Seichan = 149,
+        cDrawPriority_SeichanSnowBall = 150,
+        cDrawPriority_SnowBall = 151,
+        cDrawPriority_Gorogoro = 152,
+        cDrawPriority_GorogoroBig = 153,
+        cDrawPriority_GorogoroBigRDash = 154,
+        cDrawPriority_BigPileUnder = 155,
+        cDrawPriority_BigPileUpper = 156,
+        cDrawPriority_BigPileRight = 157,
+        cDrawPriority_BigPileLeft = 158,
+        cDrawPriority_SuperBigPileRight = 159,
+        cDrawPriority_SuperBigPileLeft = 160,
+        cDrawPriority_KazandanMgr = 161,
+        cDrawPriority_WakiKazandan = 162,
+        cDrawPriority_Kazandan = 163,
+        cDrawPriority_Bunbun = 164,
+        cDrawPriority_BunbunW2 = 165,
+        cDrawPriority_BunbunW3 = 166,
+        cDrawPriority_BunbunW4 = 167,
+        cDrawPriority_BunbunW5 = 168,
+        cDrawPriority_BunbunW6 = 169,
+        cDrawPriority_BunbunDemoKameck = 170,
+        cDrawPriority_LemmyBomb = 171,
+        cDrawPriority_Lemmy = 172,
+        cDrawPriority_LemmyBall = 173,
+        cDrawPriority_Morton = 174,
+        cDrawPriority_MortonSanbo = 175,
+        cDrawPriority_MortonSanboEl = 176,
+        cDrawPriority_Wendy = 177,
+        cDrawPriority_WendyRing = 178,
+        cDrawPriority_WendyIcicle = 179,
+        cDrawPriority_WendyFloor = 180,
+        cDrawPriority_Larry = 181,
+        cDrawPriority_KokoopaFire = 182,
+        cDrawPriority_Ludwig = 183,
+        cDrawPriority_LudwigCopy = 184,
+        cDrawPriority_Iggy = 185,
+        cDrawPriority_IggyMagic = 186,
+        cDrawPriority_IggyRoom = 187,
+        cDrawPriority_Woogan = 188,
+        cDrawPriority_Roy = 189,
+        cDrawPriority_BossKK = 190,
+        cDrawPriority_BossKKThunder = 191,
+        cDrawPriority_BossKKDemoKameck = 192,
+        cDrawPriority_BossKKDemoKK = 193,
+        cDrawPriority_Kameck = 194,
+        cDrawPriority_KameckIcicle = 195,
+        cDrawPriority_KameckMagic = 196,
+        cDrawPriority_QuakeKoopaJr = 197,
+        cDrawPriority_QuakeKoopaJrClown = 198,
+        cDrawPriority_QuakeKoopaJrLiftV = 199,
+        cDrawPriority_QuakeKoopaJrLiftH = 200,
+        cDrawPriority_QuakeKoopaJrLiftPairObjChild = 201,
+        cDrawPriority_RoyLiftStep = 202,
+        cDrawPriority_Koopa = 203,
+        cDrawPriority_KoopaFire = 204,
+        cDrawPriority_KoopaShutter = 205,
+        cDrawPriority_DemoKoopaJr = 206,
+        cDrawPriority_DemoKoopaJrClown = 207,
+        cDrawPriority_KoopaDemoKameck = 208,
+        cDrawPriority_FinalKoopa = 209,
+        cDrawPriority_FinalKoopaFire = 210,
+        cDrawPriority_FinalKoopaJr = 211,
+        cDrawPriority_FinalKoopaJrClown = 212,
+        cDrawPriority_FinalKoopaJrFire = 213,
+        cDrawPriority_FinalBomhei = 214,
+        cDrawPriority_KinokoLift = 215,
+        cDrawPriority_KinokoLiftColor = 216,
+        cDrawPriority_LiftZenStar = 217,
+        cDrawPriority_ObjSpinParent = 218,
+        cDrawPriority_ObjSpinChild = 219,
+        cDrawPriority_ObjSpinChildPyramid = 220,
+        cDrawPriority_ObjSpinChildPyramidJochu = 221,
+        cDrawPriority_ObjSpinAshiba = 222,
+        cDrawPriority_SpinWire = 223,
+        cDrawPriority_ObjKinoko = 224,
+        cDrawPriority_TamanoriLift = 225,
+        cDrawPriority_FlyingKinoko = 226,
+        cDrawPriority_CheckPointFlag = 227,
+        cDrawPriority_HardIceBlock = 228,
+        cDrawPriority_Block = 229,
+        cDrawPriority_ChibiYoshiEgg = 230,
+        cDrawPriority_BubbleYoshi = 231,
+        cDrawPriority_FruitCookie = 232,
+        cDrawPriority_ChibiBubble = 233,
+        cDrawPriority_BalloonYoshi = 234,
+        cDrawPriority_LightYoshi = 235,
+        cDrawPriority_CloudYoshi = 236,
+        cDrawPriority_DokanNextGotoAddTimeTag = 237,
+        cDrawPriority_QuestActorTag = 238,
+        cDrawPriority_QuestDemoLocationTag = 239,
+        cDrawPriority_QuestEscapeTag = 240,
+        cDrawPriority_Shadowkun = 241,
+        cDrawPriority_ShadowkunNoFukuro = 242,
+        cDrawPriority_QuestKey = 243,
+        cDrawPriority_QuestKinopio = 244,
+        cDrawPriority_QuestPrizeItem = 245,
+        cDrawPriority_EnemyCourseShadowkun = 246,
+        cDrawPriority_TitleShadowkun = 247,
+        cDrawPriority_PowBlock = 248,
+        cDrawPriority_LightBlock = 249,
+        cDrawPriority_PropBlock = 250,
+        cDrawPriority_SlideBlock = 251,
+        cDrawPriority_Jumpdai = 252,
+        cDrawPriority_CarryBlockTaru = 253,
+        cDrawPriority_Kinoko = 254,
+        cDrawPriority_FireFlower = 255,
+        cDrawPriority_FeverStar = 256,
+        cDrawPriority_Star = 257,
+        cDrawPriority_MameKinoko = 258,
+        cDrawPriority_IceFlower = 259,
+        cDrawPriority_Propeller = 260,
+        cDrawPriority_Penguin = 261,
+        cDrawPriority_OneUpKinoko = 262,
+        cDrawPriority_Musasabi = 263,
+        cDrawPriority_ThreeUpMoon = 264,
+        cDrawPriority_TitleDemoItem = 265,
+        cDrawPriority_RailPolyChild = 266,
+        cDrawPriority_ObjPol = 267,
+        cDrawPriority_ObjPolToride = 268,
+        cDrawPriority_ObjPolNohara = 269,
+        cDrawPriority_ObjPolKougen = 270,
+        cDrawPriority_ObjPolScroll = 271,
+        cDrawPriority_LiftZenKaihei = 272,
+        cDrawPriority_PairObjChild = 273,
+        cDrawPriority_PairObjChildToride = 274,
+        cDrawPriority_PairObjChildIwa = 275,
+        cDrawPriority_PairObjChildIron = 276,
+        cDrawPriority_PairObjChildNohara = 277,
+        cDrawPriority_PairObjChildKougen = 278,
+        cDrawPriority_LiftZenKumiawase = 279,
+        cDrawPriority_LiftZenTagaichigai = 280,
+        cDrawPriority_LiftZenTagaichigaiGear = 281,
+        cDrawPriority_LiftZenShiroYogan = 282,
+        cDrawPriority_PairObjChildSabakuIseki = 283,
+        cDrawPriority_PairObjChildTorideRock = 284,
+        cDrawPriority_PairObjChildTorideRockRDash = 285,
+        cDrawPriority_LiftZenShiro = 286,
+        cDrawPriority_PairObjChildWarning = 287,
+        cDrawPriority_PairObjChildNoharaHan = 288,
+        cDrawPriority_PairObjChildKinoko = 289,
+        cDrawPriority_Ice = 290,
+        cDrawPriority_GoalPole = 291,
+        cDrawPriority_GoalPolePicStage = 292,
+        cDrawPriority_GoalPoleRDash = 293,
+        cDrawPriority_GoalPolePicStageRDash = 294,
+        cDrawPriority_KanbanArrow = 295,
+        cDrawPriority_KanbanArrowRDash = 296,
+        cDrawPriority_KanbanArrowRDashEx = 297,
+        cDrawPriority_LuigiKanban = 298,
+        cDrawPriority_LuigiKanbanNine = 299,
+        cDrawPriority_MovingFlower = 300,
+        cDrawPriority_DvputFlower = 301,
+        cDrawPriority_SeaWeed = 302,
+        cDrawPriority_RedRing = 303,
+        cDrawPriority_GreenRing = 304,
+        cDrawPriority_PurpleRing = 305,
+        cDrawPriority_BlueRing = 306,
+        cDrawPriority_GoalRing = 307,
+        cDrawPriority_RotGuruguru = 308,
+        cDrawPriority_RotGuruguruRDash = 309,
+        cDrawPriority_DoorNormal = 310,
+        cDrawPriority_DoorObake = 311,
+        cDrawPriority_DoorToride = 312,
+        cDrawPriority_DoorTorideRDash = 313,
+        cDrawPriority_DoorCastle = 314,
+        cDrawPriority_DoorCastleRDash = 315,
+        cDrawPriority_DoorKoopa = 316,
+        cDrawPriority_DoorKoopaRDash = 317,
+        cDrawPriority_CollectionCoin = 318,
+        cDrawPriority_CollectionCoinLine = 319,
+        cDrawPriority_CollectionCoinLineGroup = 320,
+        cDrawPriority_CollectionCoinVolt = 321,
+        cDrawPriority_CollectionCoinParent = 322,
+        cDrawPriority_CollectionCoinParentRDash = 323,
+        cDrawPriority_CollectionCoinParentRDashEx = 324,
+        cDrawPriority_CollectionCoinParentR6C = 325,
+        cDrawPriority_CollectionCoinSnake = 326,
+        cDrawPriority_CollectionCoinRotAppear = 327,
+        cDrawPriority_RedCoin = 328,
+        cDrawPriority_GreenCoin = 329,
+        cDrawPriority_GreenCoinChild = 330,
+        cDrawPriority_CoinWiperChild = 331,
+        cDrawPriority_CoinWiperParent = 332,
+        cDrawPriority_Choropu = 333,
+        cDrawPriority_ChoropooHole = 334,
+        cDrawPriority_Fruit = 335,
+        cDrawPriority_IronBallHole = 336,
+        cDrawPriority_IronBallHoleRDash = 337,
+        cDrawPriority_WakiDokanTogeTekkyu = 338,
+        cDrawPriority_Hammer = 339,
+        cDrawPriority_HammerBros = 340,
+        cDrawPriority_Boomerang = 341,
+        cDrawPriority_BoomerangBros = 342,
+        cDrawPriority_FireBallBros = 343,
+        cDrawPriority_FireBros = 344,
+        cDrawPriority_IceBallBros = 345,
+        cDrawPriority_IceBros = 346,
+        cDrawPriority_MegaHammer = 347,
+        cDrawPriority_HimanBros = 348,
+        cDrawPriority_Birikyu = 349,
+        cDrawPriority_ElectricKoopa = 350,
+        cDrawPriority_ElectricSingleKoopa = 351,
+        cDrawPriority_ActorBlockHatena = 352,
+        cDrawPriority_ActorBlockHatenaRDash = 353,
+        cDrawPriority_ActorBlockRenga = 354,
+        cDrawPriority_ActorBlockRengaRDash = 355,
+        cDrawPriority_ActorBlockRengaRailV = 356,
+        cDrawPriority_ActorBlockClarity = 357,
+        cDrawPriority_ActorBlockClarityRDash = 358,
+        cDrawPriority_ActorBlockHatenaLine = 359,
+        cDrawPriority_ActorBlockRengaLine = 360,
+        cDrawPriority_ActorBlockGroupHatenaLine = 361,
+        cDrawPriority_ActorBlockGroupRengaLine = 362,
+        cDrawPriority_ActorBlockHatenaAngle = 363,
+        cDrawPriority_ActorBlockHatenaAngleR99 = 364,
+        cDrawPriority_ActorBlockRengaAngle = 365,
+        cDrawPriority_ActorBlockRengaAngleRDash = 366,
+        cDrawPriority_ActorBlockRengaAngleR99 = 367,
+        cDrawPriority_ActorBlockHatenaRotAppear = 368,
+        cDrawPriority_ActorBlockRengaRotAppear = 369,
+        cDrawPriority_ActorBlockHatenaFollowDisp = 370,
+        cDrawPriority_ActorBlockRengaFollowDisp = 371,
+        cDrawPriority_ActorBlockHatenaEnemyCourse = 372,
+        cDrawPriority_ActorBlockPataEnemyCourse = 373,
+        cDrawPriority_ActorBlockOutDrc = 374,
+        cDrawPriority_ActorBlockPata = 375,
+        cDrawPriority_ActorBlockWater = 376,
+        cDrawPriority_ActorBlockCloud = 377,
+        cDrawPriority_ActorBlockSwitch = 378,
+        cDrawPriority_ActorBlockPSwitch = 379,
+        cDrawPriority_ActorBlockJump = 380,
+        cDrawPriority_ActorBlockStone = 381,
+        cDrawPriority_ActorBlockHard = 382,
+        cDrawPriority_ActorBlockWood = 383,
+        cDrawPriority_ActorBlockHelp = 384,
+        cDrawPriority_RDashLuigiBlock = 385,
+        cDrawPriority_ActorBlockSnake = 386,
+        cDrawPriority_ActorBlockYoshiChild = 387,
+        cDrawPriority_ActorBlockBigRenga = 388,
+        cDrawPriority_ActorBlockBigHatena = 389,
+        cDrawPriority_RouletBlock = 390,
+        cDrawPriority_ChikuwaBlock = 391,
+        cDrawPriority_KameckBlock = 392,
+        cDrawPriority_DrcHideBlock = 393,
+        cDrawPriority_ActorCoin = 394,
+        cDrawPriority_ActorCoinRDash = 395,
+        cDrawPriority_ActorCoinFreezer = 396,
+        cDrawPriority_ActorCoinObjpol = 397,
+        cDrawPriority_ActorCoinDemoJump = 398,
+        cDrawPriority_ActorCoinHopJump = 399,
+        cDrawPriority_ActorCoinJump = 400,
+        cDrawPriority_ActorCoinBattleJump = 401,
+        cDrawPriority_ActorCoinTatsunonJump = 402,
+        cDrawPriority_ActorCoinShowerJump = 403,
+        cDrawPriority_ActorCoinAngle = 404,
+        cDrawPriority_ActorCoinAngleBoard = 405,
+        cDrawPriority_ActorCoinWater = 406,
+        cDrawPriority_ActorCoinFollowDisp = 407,
+        cDrawPriority_ActorCoinBubble = 408,
+        cDrawPriority_ActorCoinJugem = 409,
+        cDrawPriority_ActorCoinPass = 410,
+        cDrawPriority_ActorCoinAkoya = 411,
+        cDrawPriority_ActorCoinRotAppear = 412,
+        cDrawPriority_ActorCoinPassRotAppear = 413,
+        cDrawPriority_ActorCoinRotateFloor = 414,
+        cDrawPriority_ActorCoinVolt = 415,
+        cDrawPriority_ActorCoinParachuteParent = 416,
+        cDrawPriority_ActorCoinParachute = 417,
+        cDrawPriority_ActorCoinSnake = 418,
+        cDrawPriority_ActorCoinKinokoLift = 419,
+        cDrawPriority_ActorCoinBalloon = 420,
+        cDrawPriority_ActorCoinGravity = 421,
+        cDrawPriority_ActorCoinUnitPowBlock = 422,
+        cDrawPriority_ActorCoinOutDrc = 423,
+        cDrawPriority_ActorCoinEat = 424,
+        cDrawPriority_BlueCoin = 425,
+        cDrawPriority_Basabasa = 426,
+        cDrawPriority_Sanbo = 427,
+        cDrawPriority_SanboDeadEl = 428,
+        cDrawPriority_WakiBigHanachan = 429,
+        cDrawPriority_Hanachan = 430,
+        cDrawPriority_HanachanRDash = 431,
+        cDrawPriority_BigHanachan = 432,
+        cDrawPriority_Kirifuki = 433,
+        cDrawPriority_KirifukiRDash = 434,
+        cDrawPriority_TrplnCloud = 435,
+        cDrawPriority_TrplnCloudRideOn = 436,
+        cDrawPriority_LiftSpinRotation = 437,
+        cDrawPriority_LiftSpinRotationSync = 438,
+        cDrawPriority_TorchLight = 439,
+        cDrawPriority_KillerHoudai = 440,
+        cDrawPriority_KillerHoudaiSlide = 441,
+        cDrawPriority_MagnumKillerHoudai = 442,
+        cDrawPriority_MagnumKillerHoudaiDown = 443,
+        cDrawPriority_KillerHoudaiSearch = 444,
+        cDrawPriority_MagnumKillerHoudaiSearch = 445,
+        cDrawPriority_MagnumKillerHoudaiDownSearch = 446,
+        cDrawPriority_MagnumKillerHoudaiRDash = 447,
+        cDrawPriority_MagnumKillerHoudaiDownRDash = 448,
+        cDrawPriority_MagnumKillerHoudaiSearchRDash = 449,
+        cDrawPriority_MagnumKillerHoudaiDownSearchRDash = 450,
+        cDrawPriority_KaitenHoudai = 451,
+        cDrawPriority_ManyGunHoudai = 452,
+        cDrawPriority_ShipCannon = 453,
+        cDrawPriority_RotCannon = 454,
+        cDrawPriority_RotBigCannon = 455,
+        cDrawPriority_CannonBullet = 456,
+        cDrawPriority_DokanCannon = 457,
+        cDrawPriority_Killer = 458,
+        cDrawPriority_MagnumKiller = 459,
+        cDrawPriority_SearchKiller = 460,
+        cDrawPriority_MagnumSearchKiller = 461,
+        cDrawPriority_KingKiller = 462,
+        cDrawPriority_KingKillerRDash = 463,
+        cDrawPriority_Dossun = 464,
+        cDrawPriority_BigDossun = 465,
+        cDrawPriority_SwitchHatenaButton = 466,
+        cDrawPriority_SwitchPbutton = 467,
+        cDrawPriority_SwitchPbuttonRDash = 468,
+        cDrawPriority_SwitchPbuttonDisSlide = 469,
+        cDrawPriority_SwitchBossKoopaButton = 470,
+        cDrawPriority_SwitchBossKoopaOnoButton = 471,
+        cDrawPriority_Cloud = 472,
+        cDrawPriority_DarkCloud = 473,
+        cDrawPriority_CloudLt = 474,
+        cDrawPriority_BubbleControl = 475,
+        cDrawPriority_ObjSnow = 476,
+        cDrawPriority_ObjSpark = 477,
+        cDrawPriority_TagWind = 478,
+        cDrawPriority_TarzanIvy = 479,
+        cDrawPriority_TarzanChain = 480,
+        cDrawPriority_Ladder = 481,
+        cDrawPriority_SnakeBlock = 482,
+        cDrawPriority_SnakeBlockR76 = 483,
+        cDrawPriority_SnakeBlockRDash = 484,
+        cDrawPriority_BlockLight = 485,
+        cDrawPriority_CircleLight = 486,
+        cDrawPriority_LightWater = 487,
+        cDrawPriority_RotObjObake = 488,
+        cDrawPriority_NoboribouObake = 489,
+        cDrawPriority_WaterStream = 490,
+        cDrawPriority_BigShell = 491,
+        cDrawPriority_LiftWaterWheel = 492,
+        cDrawPriority_FruitTree = 493,
+        cDrawPriority_Koton = 494,
+        cDrawPriority_GroupKoton = 495,
+        cDrawPriority_Intermittent = 496,
+        cDrawPriority_IntermittentJochu = 497,
+        cDrawPriority_WaterIntermittent = 498,
+        cDrawPriority_WaterIntermittentJochu = 499,
+        cDrawPriority_WaterIntermittentJochuRD33 = 500,
+        cDrawPriority_WaterIntermittentBoss = 501,
+        cDrawPriority_WaterIntermittentBossAct = 502,
+        cDrawPriority_YoganIntermittent = 503,
+        cDrawPriority_Woochan = 504,
+        cDrawPriority_ManholePuu = 505,
+        cDrawPriority_Spana = 506,
+        cDrawPriority_Manhole = 507,
+        cDrawPriority_JugemThrowActor = 508,
+        cDrawPriority_JugemCloud = 509,
+        cDrawPriority_JugemCloudCoin = 510,
+        cDrawPriority_JugemCloudMultiPlay = 511,
+        cDrawPriority_JugemBody = 512,
+        cDrawPriority_JugemBodyMultiPlay = 513,
+        cDrawPriority_LiftMoveOn = 514,
+        cDrawPriority_LiftRideMove = 515,
+        cDrawPriority_LiftRideMoveSky = 516,
+        cDrawPriority_ObjMoveOnGhost = 517,
+        cDrawPriority_LiftMoveOnNormal = 518,
+        cDrawPriority_LiftChangeDirByRideOn = 519,
+        cDrawPriority_LiftRideOffYougan = 520,
+        cDrawPriority_BlockChallenge = 521,
+        cDrawPriority_BlockOdai = 522,
+        cDrawPriority_QuestBlock = 523,
+        cDrawPriority_LineTrain = 524,
+        cDrawPriority_LineTrainParentRDash = 525,
+        cDrawPriority_LineTrainChildRDash = 526,
+        cDrawPriority_BlockAppearByLight = 527,
+        cDrawPriority_LiftZenKaitenita = 528,
+        cDrawPriority_LiftZenHanebashiArm = 529,
+        cDrawPriority_LiftZenHanebashiSupport = 530,
+        cDrawPriority_LiftZenHanebashiTomegu = 531,
+        cDrawPriority_LiftZenYoko = 532,
+        cDrawPriority_ElasticKinokoParent = 533,
+        cDrawPriority_ElasticKinoko = 534,
+        cDrawPriority_ElasticLiftV = 535,
+        cDrawPriority_LiftScales = 536,
+        cDrawPriority_LiftScalesBack = 537,
+        cDrawPriority_LiftScalesStep = 538,
+        cDrawPriority_WireMove = 539,
+        cDrawPriority_KaronHead = 540,
+        cDrawPriority_Karon = 541,
+        cDrawPriority_BigKaron = 542,
+        cDrawPriority_Mouse = 543,
+        cDrawPriority_Chorobon = 544,
+        cDrawPriority_GroupChorobon = 545,
+        cDrawPriority_LiftRotationFull = 546,
+        cDrawPriority_RotBlockChika = 547,
+        cDrawPriority_RotBlockKinoko = 548,
+        cDrawPriority_RotBlockWood = 549,
+        cDrawPriority_RotBlockWoodRDash = 550,
+        cDrawPriority_RotBlockStone = 551,
+        cDrawPriority_RotBlockGhost = 552,
+        cDrawPriority_RotBlockGhostRD4Obake = 553,
+        cDrawPriority_LiftObakeChikeiHeya = 554,
+        cDrawPriority_RotBlockColor = 555,
+        cDrawPriority_RotBlockIron = 556,
+        cDrawPriority_RotBlockIronRDash = 557,
+        cDrawPriority_RotBlockIronRDash2 = 558,
+        cDrawPriority_RotBlockGhostShip = 559,
+        cDrawPriority_ObjPolygonObake = 560,
+        cDrawPriority_LiftZenHammer = 561,
+        cDrawPriority_Moai = 562,
+        cDrawPriority_MoaiRD24 = 563,
+        cDrawPriority_MoaiDown = 564,
+        cDrawPriority_MoaiDownRD24 = 565,
+        cDrawPriority_MoaiRD55 = 566,
+        cDrawPriority_PalmTree = 567,
+        cDrawPriority_BlockOutIvy = 568,
+        cDrawPriority_HandLight = 569,
+        cDrawPriority_LiftZenYokoTomegu = 570,
+        cDrawPriority_LiftRideVmove = 571,
+        cDrawPriority_GroupLiftRideVmove = 572,
+        cDrawPriority_LiftRideHmove = 573,
+        cDrawPriority_GroupLiftRideHmove = 574,
+        cDrawPriority_LiftWaki = 575,
+        cDrawPriority_LiftWakiStep = 576,
+        cDrawPriority_LiftLine = 577,
+        cDrawPriority_GroupLiftLine = 578,
+        cDrawPriority_LiftLineRDash = 579,
+        cDrawPriority_LiftWheel = 580,
+        cDrawPriority_LiftSeeSaw = 581,
+        cDrawPriority_LiftSeeSawRDash = 582,
+        cDrawPriority_LiftObjBgHmove = 583,
+        cDrawPriority_LiftObjBgVmove = 584,
+        cDrawPriority_IceCube = 585,
+        cDrawPriority_Stand = 586,
+        cDrawPriority_GuraRock = 587,
+        cDrawPriority_Polter = 588,
+        cDrawPriority_Bakubaku = 589,
+        cDrawPriority_Ibaramushi = 590,
+        cDrawPriority_NiseMusa = 591,
+        cDrawPriority_Crow = 592,
+        cDrawPriority_LiftLeaf = 593,
+        cDrawPriority_WanwanPile = 594,
+        cDrawPriority_WanwanPileRDash = 595,
+        cDrawPriority_Wanwan = 596,
+        cDrawPriority_Icicle = 597,
+        cDrawPriority_IcicleBig = 598,
+        cDrawPriority_IcicleFixed = 599,
+        cDrawPriority_Teresa = 600,
+        cDrawPriority_TeresaBig = 601,
+        cDrawPriority_TeresaRot = 602,
+        cDrawPriority_TeresaRotParent = 603,
+        cDrawPriority_TeresaRotParentRDash = 604,
+        cDrawPriority_IceAshiba = 605,
+        cDrawPriority_IceAshibaWater = 606,
+        cDrawPriority_IceAshibaRail = 607,
+        cDrawPriority_FloatBox = 608,
+        cDrawPriority_FloatBoxBig = 609,
+        cDrawPriority_Maruta = 610,
+        cDrawPriority_Barrel = 611,
+        cDrawPriority_WaterMove = 612,
+        cDrawPriority_FloorGyration = 613,
+        cDrawPriority_FloorHoleDokan = 614,
+        cDrawPriority_GearGyration = 615,
+        cDrawPriority_GearGyrationRDash = 616,
+        cDrawPriority_LiftSlideKinoko = 617,
+        cDrawPriority_LiftSlideKinokoResident = 618,
+        cDrawPriority_LiftSlideRamage = 619,
+        cDrawPriority_PataMet = 620,
+        cDrawPriority_PataMetBig = 621,
+        cDrawPriority_PataMetRDash = 622,
+        cDrawPriority_Bubble = 623,
+        cDrawPriority_BubbleSync = 624,
+        cDrawPriority_BubbleRDash = 625,
+        cDrawPriority_BubbleSyncRDash = 626,
+        cDrawPriority_Crasher = 627,
+        cDrawPriority_Unabon = 628,
+        cDrawPriority_UnabonCheckPoint = 629,
+        cDrawPriority_UnabonDokan = 630,
+        cDrawPriority_UnabonRDash = 631,
+        cDrawPriority_KK = 632,
+        cDrawPriority_KKJochu = 633,
+        cDrawPriority_KKLift = 634,
+        cDrawPriority_KKThunder = 635,
+        cDrawPriority_AkoyaShellFish = 636,
+        cDrawPriority_LiftRemoconBalanceRideOff = 637,
+        cDrawPriority_LiftRemoconBalanceRideOffRDash = 638,
+        cDrawPriority_LiftRemoconSeesaw = 639,
+        cDrawPriority_LiftRemoconXline = 640,
+        cDrawPriority_Guruguru = 641,
+        cDrawPriority_Gesso = 642,
+        cDrawPriority_GessoChild = 643,
+        cDrawPriority_BaramakiGesso = 644,
+        cDrawPriority_PlayerIce = 645,
+        cDrawPriority_Nut = 646,
+        cDrawPriority_WoodBox = 647,
+        cDrawPriority_IronBox = 648,
+        cDrawPriority_IronBoxRDash = 649,
+        cDrawPriority_IronBoxShortCreate = 650,
+        cDrawPriority_WakiWoodBox = 651,
+        cDrawPriority_WakiIronBox = 652,
+        cDrawPriority_StrongBox = 653,
+        cDrawPriority_StrongBoxKey = 654,
+        cDrawPriority_BattleItem = 655,
+        cDrawPriority_TottenGoalItem = 656,
+        cDrawPriority_TogeMet = 657,
+        cDrawPriority_GroupTogeMet = 658,
+        cDrawPriority_LiftHurikoYoganCenter = 659,
+        cDrawPriority_TorpedoBase = 660,
+        cDrawPriority_SearchTorpedoBase = 661,
+        cDrawPriority_NormalTorpedo = 662,
+        cDrawPriority_GroupTorpedo = 663,
+        cDrawPriority_SearchTorpedo = 664,
+        cDrawPriority_YoshiEgg = 665,
+        cDrawPriority_KokoopaShipLemmy = 666,
+        cDrawPriority_KokoopaShipMorton = 667,
+        cDrawPriority_KokoopaShipLarry = 668,
+        cDrawPriority_KokoopaShipWendy = 669,
+        cDrawPriority_KokoopaShipIggy = 670,
+        cDrawPriority_KokoopaShipRoy = 671,
+        cDrawPriority_KokoopaShipLudwig = 672,
+        cDrawPriority_KokoopaShipWarpCannon = 673,
+        cDrawPriority_Peach = 674,
+        cDrawPriority_PeachDemoShadowkun = 675,
+        cDrawPriority_FinalDVPeach = 676,
+        cDrawPriority_FinalDVPeachShutter = 677,
+        cDrawPriority_SpModeResDemoPeach = 678,
+        cDrawPriority_BalloonHangingActor = 679,
+        cDrawPriority_MagicHandPaa = 680,
+        cDrawPriority_MagicHandGoo = 681,
+        cDrawPriority_MagicHandGooRDash = 682,
+        cDrawPriority_MagicHandW5 = 683,
+        cDrawPriority_MagicHandW7 = 684,
+        cDrawPriority_BossKoopaFootHold = 685,
+        cDrawPriority_KoopaJrFire = 686,
+        cDrawPriority_KoopaJrBall = 687,
+        cDrawPriority_KoopaJrFloor = 688,
+        cDrawPriority_KoopaJrFloorMgr = 689,
+        cDrawPriority_WaterKoopaJr = 690,
+        cDrawPriority_WaterKoopaJrClown = 691,
+        cDrawPriority_WaterKoopaJrPos = 692,
+        cDrawPriority_BoxingKoopaJr = 693,
+        cDrawPriority_BoxingKoopaJrClown = 694,
+        cDrawPriority_DemoBoxingKoopaJr = 695,
+        cDrawPriority_DemoBoxingKoopaJrClown = 696,
+        cDrawPriority_BgActorWater = 697,
+        cDrawPriority_BgActorLava = 698,
+        cDrawPriority_BgActorPoison = 699,
+        cDrawPriority_BgActorSand = 700,
+        cDrawPriority_BgActorCloud = 701,
+        cDrawPriority_BgActorMist = 702,
+        cDrawPriority_BgActorBrosFloor = 703,
+        cDrawPriority_BgActorAtackFloor = 704,
+        cDrawPriority_YoganJimen = 705,
+        cDrawPriority_YoganJimenRDash = 706,
+        cDrawPriority_MonorailBlock = 707,
+        cDrawPriority_MonorailBlockRail = 708,
+        cDrawPriority_SlotChibiYoshi = 709,
+        cDrawPriority_MiniGamePanel = 710,
+        cDrawPriority_SlotItem = 711,
+        cDrawPriority_ShuffleBlock = 712,
+        cDrawPriority_CoinMakiCoin = 713,
+        cDrawPriority_CoinMakiItem = 714,
+        cDrawPriority_CoinMakiCannon = 715,
+        cDrawPriority_MiniGameKinopio = 716,
+        cDrawPriority_PeaPlant = 717,
+        cDrawPriority_DokanJoint = 718,
+        cDrawPriority_DokanJointMame = 719,
+        cDrawPriority_GoalKinokoHouse = 720,
+        cDrawPriority_AirShipBottom = 721,
+        cDrawPriority_AirShipBottomWaku = 722,
+        cDrawPriority_AirShipBottomRDash = 723,
+        cDrawPriority_Cookie = 724,
+        cDrawPriority_Gattan = 725,
+        cDrawPriority_DrcTouchLight = 726,
+        cDrawPriority_StaffRollMgr = 727,
+        cDrawPriority_StaffRollMgrRDash = 728,
+        cDrawPriority_StaffRollChibiYoshiBubble = 729,
+        cDrawPriority_StaffRollChibiYoshiBalloon = 730,
+        cDrawPriority_StaffRollChibiYoshiBalloonEndGlad = 731,
+        cDrawPriority_StaffRollChibiYoshiLight = 732,
+        cDrawPriority_StaffRollChibiYoshiLightEndGlad = 733,
+        cDrawPriority_StaffRollChibiBubbleLetter = 734,
+        cDrawPriority_StaffRollChibiBubbleExtra = 735,
+        cDrawPriority_StaffRollShadowkun = 736,
+        cDrawPriority_CourseSelectPlayer = 737,
+        cDrawPriority_CourseSelectPlayer2P = 738,
+        cDrawPriority_CourseSelectPlayerEgg = 739,
+        cDrawPriority_CourseSelectCamera = 740,
+        cDrawPriority_CourseSelectCastle = 741,
+        cDrawPriority_CourseSelectToride = 742,
+        cDrawPriority_CourseSelectKinokoHouse1up = 743,
+        cDrawPriority_CourseSelectKinokoHouseShuffle = 744,
+        cDrawPriority_CourseSelectKinokoHouseSlot = 745,
+        cDrawPriority_CourseSelectPeachGates1st = 746,
+        cDrawPriority_CourseSelectPeachGates2nd = 747,
+        cDrawPriority_CourseSelectCoursePoint = 748,
+        cDrawPriority_CourseSelectWarpCannon = 749,
+        cDrawPriority_CourseSelectGhostHouse = 750,
+        cDrawPriority_CourseSelectW8DarkCloud = 751,
+        cDrawPriority_CourseSelectW2Bros = 752,
+        cDrawPriority_CourseSelectEventAssistant = 753,
+        cDrawPriority_CourseSelectShipLemmy = 754,
+        cDrawPriority_CourseSelectShipMorton = 755,
+        cDrawPriority_CourseSelectShipLarry = 756,
+        cDrawPriority_CourseSelectShipWendy = 757,
+        cDrawPriority_CourseSelectShipIggy = 758,
+        cDrawPriority_CourseSelectShipRoy = 759,
+        cDrawPriority_CourseSelectShipLudwig = 760,
+        cDrawPriority_CourseSelectShipKoopaJr = 761,
+        cDrawPriority_CourseSelectShipBoroKoopaJr = 762,
+        cDrawPriority_CourseSelectSurrender = 763,
+        cDrawPriority_CourseSelectSwitchA = 764,
+        cDrawPriority_CourseSelectSwitchB = 765,
+        cDrawPriority_CourseSelectTeresa = 766,
+        cDrawPriority_CourseSelectOpeningKameck = 767,
+        cDrawPriority_CourseSelectTorideBoss = 768,
+        cDrawPriority_CourseSelectPakkun = 769,
+        cDrawPriority_CourseSelectReportKinopio = 770,
+        cDrawPriority_CourseSelectTobipuku = 771,
+        cDrawPriority_CourseSelectChorobon = 772,
+        cDrawPriority_CourseSelectW7Item = 773,
+        cDrawPriority_CourseSelectW5Teresa = 774,
+        cDrawPriority_CourseSelectFlagPeach = 775,
+        cDrawPriority_CourseSelectMusasabi = 777,
+        cDrawPriority_CourseSelectWaterPillar = 778,
+        cDrawPriority_CourseSelectW7Bridge = 779,
+        cDrawPriority_CourseSelectMiiBalloon = 780,
+        cDrawPriority_CourseSelectPentaro = 781,
+        cDrawPriority_CourseSelectW4Item = 782,
+        cDrawPriority_CourseSelectW2Kuribo = 783,
+        cDrawPriority_CourseSelectPakkunBig = 784,
+        cDrawPriority_CourseSelectShadowIcon = 785,
+        cDrawPriority_CourseSelectDekaUnira = 786,
+        cDrawPriority_CourseSelectTomb = 787,
+        cDrawPriority_CourseSelectShadowkun = 788,
+        cDrawPriority_CourseSelectLineTrain = 789,
+        cDrawPriority_CourseSelectKoopaJr = 790,
+        cDrawPriority_CourseSelectPeach = 791,
+        cDrawPriority_CourseSelectW1Item = 792,
+        cDrawPriority_CourseSelectStarGate = 793,
+        cDrawPriority_SampleActor = 794,
+        cDrawPriority_SampleChildActor = 795,
 
         // No Draw
-        cDrawPriority_390                                       =   0 - 0x3ff,
-        cDrawPriority_120                                       =   1 - 0x3ff,
-        cDrawPriority_23F                                       =   2 - 0x3ff,
-        cDrawPriority_240                                       =   3 - 0x3ff,
-        cDrawPriority_241                                       =   4 - 0x3ff,
-        cDrawPriority_242                                       =   5 - 0x3ff,
-        cDrawPriority_243                                       =   6 - 0x3ff,
-        cDrawPriority_244                                       =   7 - 0x3ff,
-        cDrawPriority_245                                       =   8 - 0x3ff,
-        cDrawPriority_246                                       =   9 - 0x3ff,
-        cDrawPriority_247                                       =  10 - 0x3ff,
-        cDrawPriority_248                                       =  11 - 0x3ff,
-        cDrawPriority_249                                       =  12 - 0x3ff,
-        cDrawPriority_24A                                       =  13 - 0x3ff,
-        cDrawPriority_BgCenter                                  =  14 - 0x3ff,
-        cDrawPriority_24C                                       =  15 - 0x3ff,
-        cDrawPriority_24E                                       =  16 - 0x3ff,
-        cDrawPriority_000                                       =  17 - 0x3ff,
-        cDrawPriority_001                                       =  18 - 0x3ff,
-        cDrawPriority_002                                       =  19 - 0x3ff,
-        cDrawPriority_003                                       =  20 - 0x3ff,
-        cDrawPriority_004                                       =  21 - 0x3ff,
-        cDrawPriority_005                                       =  22 - 0x3ff,
-        cDrawPriority_006                                       =  23 - 0x3ff,
-        cDrawPriority_007                                       =  24 - 0x3ff,
-        cDrawPriority_008                                       =  25 - 0x3ff,
-        cDrawPriority_009                                       =  26 - 0x3ff,
-        cDrawPriority_00B                                       =  27 - 0x3ff,
-        cDrawPriority_00C                                       =  28 - 0x3ff,
-        cDrawPriority_00D                                       =  29 - 0x3ff,
-        cDrawPriority_027                                       =  30 - 0x3ff,
-        cDrawPriority_028                                       =  31 - 0x3ff,
-        cDrawPriority_029                                       =  32 - 0x3ff,
-        cDrawPriority_02A                                       =  33 - 0x3ff,
-        cDrawPriority_189                                       =  34 - 0x3ff,
-        cDrawPriority_18A                                       =  35 - 0x3ff,
-        cDrawPriority_267                                       =  36 - 0x3ff,
-        cDrawPriority_266                                       =  37 - 0x3ff,
-        cDrawPriority_21E                                       =  38 - 0x3ff,
-        cDrawPriority_21F                                       =  39 - 0x3ff,
-        cDrawPriority_220                                       =  40 - 0x3ff,
-        cDrawPriority_026                                       =  41 - 0x3ff,
-        cDrawPriority_223                                       =  42 - 0x3ff,
-        cDrawPriority_2EB                                       =  43 - 0x3ff,
-        cDrawPriority_271                                       =  44 - 0x3ff,
-        cDrawPriority_272                                       =  45 - 0x3ff,
-        cDrawPriority_221                                       =  46 - 0x3ff,
-        cDrawPriority_222                                       =  47 - 0x3ff,
-        cDrawPriority_20F                                       =  48 - 0x3ff,
-        cDrawPriority_02D                                       =  49 - 0x3ff,
-        cDrawPriority_02E                                       =  50 - 0x3ff,
-        cDrawPriority_00E                                       =  51 - 0x3ff,
-        cDrawPriority_00F                                       =  52 - 0x3ff,
-        cDrawPriority_010                                       =  53 - 0x3ff,
-        cDrawPriority_BunDemo                                   =  54 - 0x3ff,
-        cDrawPriority_KokoopaDemo                               =  55 - 0x3ff,
-        cDrawPriority_KoopaJrDemo                               =  56 - 0x3ff,
-        cDrawPriority_KameckDemo                                =  57 - 0x3ff,
-        cDrawPriority_BossKKDemo                                =  58 - 0x3ff,
-        cDrawPriority_PeachFinalCastleKoopaJrDemo               =  59 - 0x3ff,
-        cDrawPriority_KoopaDemo                                 =  60 - 0x3ff,
-        cDrawPriority_FinalKoopaDemo                            =  61 - 0x3ff,
-        cDrawPriority_PeachDemo                                 =  62 - 0x3ff,
-        cDrawPriority_KameckIceConfig                           =  63 - 0x3ff,
-        cDrawPriority_KameckWarpPos                             =  64 - 0x3ff,
-        cDrawPriority_011                                       =  65 - 0x3ff,
-        cDrawPriority_012                                       =  66 - 0x3ff,
-        cDrawPriority_02F                                       =  67 - 0x3ff,
-        cDrawPriority_030                                       =  68 - 0x3ff,
-        cDrawPriority_2EC                                       =  69 - 0x3ff,
-        cDrawPriority_2ED                                       =  70 - 0x3ff,
-        cDrawPriority_00A                                       =  71 - 0x3ff,
-        cDrawPriority_014                                       =  72 - 0x3ff,
-        cDrawPriority_031                                       =  73 - 0x3ff,
-        cDrawPriority_167                                       =  74 - 0x3ff,
-        cDrawPriority_015                                       =  75 - 0x3ff,
-        cDrawPriority_016                                       =  76 - 0x3ff,
-        cDrawPriority_017                                       =  77 - 0x3ff,
-        cDrawPriority_MiniGameMgr                               =  78 - 0x3ff,
-        cDrawPriority_MiniGameMgrRDash                          =  79 - 0x3ff,
-        cDrawPriority_ShuffleBlockMgr                           =  80 - 0x3ff,
-        cDrawPriority_SlotMgr                                   =  81 - 0x3ff,
-        cDrawPriority_CoinmakiMgr                               =  82 - 0x3ff,
-        cDrawPriority_1C6                                       =  83 - 0x3ff,
-        cDrawPriority_WakiSearchMagKiller                       =  84 - 0x3ff,
-        cDrawPriority_32E                                       =  85 - 0x3ff,
-        cDrawPriority_01D                                       =  86 - 0x3ff,
-        cDrawPriority_01E                                       =  87 - 0x3ff,
-        cDrawPriority_01F                                       =  88 - 0x3ff,
-        cDrawPriority_KoopaFireWaki                             =  89 - 0x3ff,
-        cDrawPriority_31A                                       =  90 - 0x3ff,
-        cDrawPriority_020                                       =  91 - 0x3ff,
-        cDrawPriority_013                                       =  92 - 0x3ff,
-        cDrawPriority_31B                                       =  93 - 0x3ff,
-        cDrawPriority_31C                                       =  94 - 0x3ff,
-        cDrawPriority_ShootingStar                              =  95 - 0x3ff,
-        cDrawPriority_302                                       =  96 - 0x3ff,
-        cDrawPriority_227                                       =  97 - 0x3ff,
-        cDrawPriority_228                                       =  98 - 0x3ff,
-        cDrawPriority_343                                       =  99 - 0x3ff,
-        cDrawPriority_344                                       = 100 - 0x3ff,
-        cDrawPriority_345                                       = 101 - 0x3ff,
-        cDrawPriority_RoyLiftWaki                               = 102 - 0x3ff,
-        cDrawPriority_2A0                                       = 103 - 0x3ff,
-        cDrawPriority_346                                       = 104 - 0x3ff,
-        cDrawPriority_024                                       = 105 - 0x3ff,
-        cDrawPriority_24D                                       = 106 - 0x3ff,
-        cDrawPriority_230                                       = 107 - 0x3ff,
-        cDrawPriority_296                                       = 108 - 0x3ff,
-        cDrawPriority_297                                       = 109 - 0x3ff,
-        cDrawPriority_351                                       = 110 - 0x3ff,
-        cDrawPriority_11C                                       = 111 - 0x3ff,
-        cDrawPriority_1B8                                       = 112 - 0x3ff,
-        cDrawPriority_352                                       = 113 - 0x3ff,
-        cDrawPriority_353                                       = 114 - 0x3ff,
-        cDrawPriority_14C                                       = 115 - 0x3ff,
-        cDrawPriority_347                                       = 116 - 0x3ff,
-        cDrawPriority_1B7                                       = 117 - 0x3ff
+        cDrawPriority_SampleTag = 0 - 0x3FF,
+        cDrawPriority_BreakBlock = 1 - 0x3FF,
+        cDrawPriority_ZoomKun = 2 - 0x3FF,
+        cDrawPriority_ZoomKunRDash = 3 - 0x3FF,
+        cDrawPriority_LimitSpeedKun = 4 - 0x3FF,
+        cDrawPriority_MaxUeLeft = 5 - 0x3FF,
+        cDrawPriority_MaxUeRight = 6 - 0x3FF,
+        cDrawPriority_LrStopUp = 7 - 0x3FF,
+        cDrawPriority_LrStopDw = 8 - 0x3FF,
+        cDrawPriority_HyperMaxUeLeft = 9 - 0x3FF,
+        cDrawPriority_HyperMaxUeRight = 10 - 0x3FF,
+        cDrawPriority_AutoScrollTag = 11 - 0x3FF,
+        cDrawPriority_ScrollTag = 12 - 0x3FF,
+        cDrawPriority_KoopaAreaObj = 13 - 0x3FF,
+        cDrawPriority_BgCenter = 14 - 0x3FF,
+        cDrawPriority_EnvTag = 15 - 0x3FF,
+        cDrawPriority_EnvSoundTag = 16 - 0x3FF,
+        cDrawPriority_FlagSwitchTag = 17 - 0x3FF,
+        cDrawPriority_FlagSwitchAnd = 18 - 0x3FF,
+        cDrawPriority_FlagSwitchOr = 19 - 0x3FF,
+        cDrawPriority_FlagSwitchRandom = 20 - 0x3FF,
+        cDrawPriority_FlagSwitchChange = 21 - 0x3FF,
+        cDrawPriority_FlagSwitchIf = 22 - 0x3FF,
+        cDrawPriority_FlagSwitchIfRDash = 23 - 0x3FF,
+        cDrawPriority_FlagSwitchIfR63 = 24 - 0x3FF,
+        cDrawPriority_FlagSwitchContinue = 25 - 0x3FF,
+        cDrawPriority_FlagSwitchCycle = 26 - 0x3FF,
+        cDrawPriority_PairObjParent = 27 - 0x3FF,
+        cDrawPriority_RDashPairObjParent = 28 - 0x3FF,
+        cDrawPriority_RailPolyParent = 29 - 0x3FF,
+        cDrawPriority_CenterSwing = 30 - 0x3FF,
+        cDrawPriority_CenterRotation = 31 - 0x3FF,
+        cDrawPriority_CenterSwingRail = 32 - 0x3FF,
+        cDrawPriority_CenterRotationRail = 33 - 0x3FF,
+        cDrawPriority_ActorCoinWaki = 34 - 0x3FF,
+        cDrawPriority_ActorCoinWakiFunsuiTag = 35 - 0x3FF,
+        cDrawPriority_FlyingKinokoWaki = 36 - 0x3FF,
+        cDrawPriority_WakiDokan = 37 - 0x3FF,
+        cDrawPriority_WakiPukupuku = 38 - 0x3FF,
+        cDrawPriority_WakiPukupukuSearch = 39 - 0x3FF,
+        cDrawPriority_WakiPukupukuEscape = 40 - 0x3FF,
+        cDrawPriority_PukupukuGroupTag = 41 - 0x3FF,
+        cDrawPriority_PukupukuParent = 42 - 0x3FF,
+        cDrawPriority_NextGotoBlock = 43 - 0x3FF,
+        cDrawPriority_WakiJugem = 44 - 0x3FF,
+        cDrawPriority_WakiJugemMultiPlay = 45 - 0x3FF,
+        cDrawPriority_WakiTobipuku = 46 - 0x3FF,
+        cDrawPriority_WakiTobipukuMecha = 47 - 0x3FF,
+        cDrawPriority_WakiPentaro = 48 - 0x3FF,
+        cDrawPriority_CoinCenterParent = 49 - 0x3FF,
+        cDrawPriority_PassCoinCenterParent = 50 - 0x3FF,
+        cDrawPriority_NiceCoinEspial = 51 - 0x3FF,
+        cDrawPriority_NiceCoinEspialRegular = 52 - 0x3FF,
+        cDrawPriority_NiceCoinAreaEspial = 53 - 0x3FF,
+        cDrawPriority_BunbunDemo = 54 - 0x3FF,
+        cDrawPriority_KokoopaDemo = 55 - 0x3FF,
+        cDrawPriority_KoopaJrDemo = 56 - 0x3FF,
+        cDrawPriority_KameckDemo = 57 - 0x3FF,
+        cDrawPriority_BossKKDemo = 58 - 0x3FF,
+        cDrawPriority_QuakeKoopaJrDemo = 59 - 0x3FF,
+        cDrawPriority_KoopaDemo = 60 - 0x3FF,
+        cDrawPriority_FinalKoopaDemo = 61 - 0x3FF,
+        cDrawPriority_PeachDemo = 62 - 0x3FF,
+        cDrawPriority_KameckIciclePos = 63 - 0x3FF,
+        cDrawPriority_KameckPos = 64 - 0x3FF,
+        cDrawPriority_GroupId = 65 - 0x3FF,
+        cDrawPriority_GroupIdTogeMet = 66 - 0x3FF,
+        cDrawPriority_RotateAppear = 67 - 0x3FF,
+        cDrawPriority_IfFlagRotateAppear = 68 - 0x3FF,
+        cDrawPriority_ChangeBlock = 69 - 0x3FF,
+        cDrawPriority_ChangeBlockRDash = 70 - 0x3FF,
+        cDrawPriority_ActorTouchDrc = 71 - 0x3FF,
+        cDrawPriority_BarnarSyncMgr = 72 - 0x3FF,
+        cDrawPriority_KinokoLiftParent = 73 - 0x3FF,
+        cDrawPriority_LiftRemoconBalanceClinch = 74 - 0x3FF,
+        cDrawPriority_WakiCoinParachute = 75 - 0x3FF,
+        cDrawPriority_SnakeCoinParent = 76 - 0x3FF,
+        cDrawPriority_ChoropuCoinMgr = 77 - 0x3FF,
+        cDrawPriority_MiniGameMgr = 78 - 0x3FF,
+        cDrawPriority_MiniGameMgrRDash = 79 - 0x3FF,
+        cDrawPriority_ShuffleBlockMgr = 80 - 0x3FF,
+        cDrawPriority_SlotMgr = 81 - 0x3FF,
+        cDrawPriority_CoinMakiMgr = 82 - 0x3FF,
+        cDrawPriority_WakiHipAttackActor = 83 - 0x3FF,
+        cDrawPriority_WakiSearchMagKiller = 84 - 0x3FF,
+        cDrawPriority_TorpedoTag = 85 - 0x3FF,
+        cDrawPriority_MagicHandTag = 86 - 0x3FF,
+        cDrawPriority_MagicHandTagGoo = 87 - 0x3FF,
+        cDrawPriority_MagicHandTagGooFast = 88 - 0x3FF,
+        cDrawPriority_WakiKoopaFire = 89 - 0x3FF,
+        cDrawPriority_TagFrame = 90 - 0x3FF,
+        cDrawPriority_WaterBubbleTag = 91 - 0x3FF,
+        cDrawPriority_ElectricKoopaTag = 92 - 0x3FF,
+        cDrawPriority_ShadowHouseReadTag = 93 - 0x3FF,
+        cDrawPriority_TitleDemoTag = 94 - 0x3FF,
+        cDrawPriority_ShootingStar = 95 - 0x3FF,
+        cDrawPriority_ElectricShock = 96 - 0x3FF,
+        cDrawPriority_WakiFugumannen = 97 - 0x3FF,
+        cDrawPriority_WakiFugumannenBig = 98 - 0x3FF,
+        cDrawPriority_WaterEffectFilter = 99 - 0x3FF,
+        cDrawPriority_WaterEffectFilterRDash = 100 - 0x3FF,
+        cDrawPriority_WaterBubble = 101 - 0x3FF,
+        cDrawPriority_RoyLift = 102 - 0x3FF,
+        cDrawPriority_WakiBakubaku = 103 - 0x3FF,
+        cDrawPriority_FlyingPlayerReferTag = 104 - 0x3FF,
+        cDrawPriority_SpModeResDemoTag = 105 - 0x3FF,
+        cDrawPriority_FlowerKindTag = 106 - 0x3FF,
+        cDrawPriority_WakiKeronpa = 107 - 0x3FF,
+        cDrawPriority_WakiUnabon = 108 - 0x3FF,
+        cDrawPriority_WakiUnabonRDash = 109 - 0x3FF,
+        cDrawPriority_TouchNonActor = 110 - 0x3FF,
+        cDrawPriority_PmusaBlock = 111 - 0x3FF,
+        cDrawPriority_BalloonProtectAreaTag = 112 - 0x3FF,
+        cDrawPriority_EditCoinActorSetTag = 113 - 0x3FF,
+        cDrawPriority_FeverEffectActor = 114 - 0x3FF,
+        cDrawPriority_RailCreateEffectBlock = 115 - 0x3FF,
+        cDrawPriority_PlayerSidePressTag = 116 - 0x3FF,
+        cDrawPriority_FastLookCameraTag = 117 - 0x3FF
     };
 
     // Address: 0x10001940
-    static const s16               cDrawPriority[cProfileID_Max];
+    static const s16               cDrawPriority[Profile::cProfileID_Max];
     // Address: 0x10002064
-    static const s8                cResType[cProfileID_Max];
+    static const s8                cResType[Profile::cProfileID_Max];
     // Address: 0x100023F8
-    static const u8                cResNum[cProfileID_Max];
+    static const u8                cResNum[Profile::cProfileID_Max];
     // Address: 0x101C321C
-    static const sead::SafeString* cResList[cProfileID_Max];
+    static const sead::SafeString* cResList[Profile::cProfileID_Max];
 
 public:
     /**
      * @brief 0
      * @par Address: 0x10003D54
      */
-    static const s32 cProfileID_000;
+    static const s32 cProfileID_FlagSwitchTag;
     /**
      * @brief 1
      * @par Address: 0x10003D58
      */
-    static const s32 cProfileID_001;
+    static const s32 cProfileID_FlagSwitchAnd;
     /**
      * @brief 2
      * @par Address: 0x10003D5C
      */
-    static const s32 cProfileID_002;
+    static const s32 cProfileID_FlagSwitchOr;
     /**
      * @brief 3
      * @par Address: 0x10003D60
      */
-    static const s32 cProfileID_003;
+    static const s32 cProfileID_FlagSwitchRandom;
     /**
      * @brief 4
      * @par Address: 0x10003D64
      */
-    static const s32 cProfileID_004;
+    static const s32 cProfileID_FlagSwitchChange;
     /**
      * @brief 5
      * @par Address: 0x10003D68
      */
-    static const s32 cProfileID_005;
+    static const s32 cProfileID_FlagSwitchIf;
     /**
      * @brief 6
      * @par Address: 0x10003D6C
      */
-    static const s32 cProfileID_006;
+    static const s32 cProfileID_FlagSwitchIfRDash;
     /**
      * @brief 7
      * @par Address: 0x10003D70
      */
-    static const s32 cProfileID_007;
+    static const s32 cProfileID_FlagSwitchIfR63;
     /**
      * @brief 8
      * @par Address: 0x10003D74
      */
-    static const s32 cProfileID_008;
+    static const s32 cProfileID_FlagSwitchContinue;
     /**
      * @brief 9
      * @par Address: 0x10003D78
      */
-    static const s32 cProfileID_009;
+    static const s32 cProfileID_FlagSwitchCycle;
     /**
      * @brief 10
      * @par Address: 0x10003D7C
      */
-    static const s32 cProfileID_00A;
+    static const s32 cProfileID_ActorTouchDrc;
     /**
      * @brief 11
      * @par Address: 0x10003D80
      */
-    static const s32 cProfileID_00B;
+    static const s32 cProfileID_PairObjParent;
     /**
      * @brief 12
      * @par Address: 0x10003D84
      */
-    static const s32 cProfileID_00C;
+    static const s32 cProfileID_RDashPairObjParent;
     /**
      * @brief 13
      * @par Address: 0x10003D88
      */
-    static const s32 cProfileID_00D;
+    static const s32 cProfileID_RailPolyParent;
     /**
      * @brief 14
      * @par Address: 0x10003D8C
      */
-    static const s32 cProfileID_00E;
+    static const s32 cProfileID_NiceCoinEspial;
     /**
      * @brief 15
      * @par Address: 0x10003D90
      */
-    static const s32 cProfileID_00F;
+    static const s32 cProfileID_NiceCoinEspialRegular;
     /**
      * @brief 16
      * @par Address: 0x10003D94
      */
-    static const s32 cProfileID_010;
+    static const s32 cProfileID_NiceCoinAreaEspial;
     /**
      * @brief 17
      * @par Address: 0x10003D98
      */
-    static const s32 cProfileID_011;
+    static const s32 cProfileID_GroupId;
     /**
      * @brief 18
      * @par Address: 0x10003D9C
      */
-    static const s32 cProfileID_012;
+    static const s32 cProfileID_GroupIdTogeMet;
     /**
      * @brief 19
      * @par Address: 0x10003DA0
      */
-    static const s32 cProfileID_013;
+    static const s32 cProfileID_ElectricKoopaTag;
     /**
      * @brief 20
      * @par Address: 0x10003DA4
      */
-    static const s32 cProfileID_014;
+    static const s32 cProfileID_BarnarSyncMgr;
     /**
      * @brief 21
      * @par Address: 0x10003DA8
      */
-    static const s32 cProfileID_015;
+    static const s32 cProfileID_WakiCoinParachute;
     /**
      * @brief 22
      * @par Address: 0x10003DAC
      */
-    static const s32 cProfileID_016;
+    static const s32 cProfileID_SnakeCoinParent;
     /**
      * @brief 23
      * @par Address: 0x10003DB0
      */
-    static const s32 cProfileID_017;
+    static const s32 cProfileID_ChoropuCoinMgr;
     /**
      * @brief 24
      * @par Address: 0x10003DB4
@@ -1102,27 +1091,27 @@ class ProfileInfo
      * @brief 28
      * @par Address: 0x10003DC4
      */
-    static const s32 cProfileID_CoinmakiMgr;
+    static const s32 cProfileID_CoinMakiMgr;
     /**
      * @brief 29
      * @par Address: 0x10003DC8
      */
-    static const s32 cProfileID_01D;
+    static const s32 cProfileID_MagicHandTag;
     /**
      * @brief 30
      * @par Address: 0x10003DCC
      */
-    static const s32 cProfileID_01E;
+    static const s32 cProfileID_MagicHandTagGoo;
     /**
      * @brief 31
      * @par Address: 0x10003DD0
      */
-    static const s32 cProfileID_01F;
+    static const s32 cProfileID_MagicHandTagGooFast;
     /**
      * @brief 32
      * @par Address: 0x10003DD4
      */
-    static const s32 cProfileID_020;
+    static const s32 cProfileID_WaterBubbleTag;
     /**
      * @brief 33
      * @par Address: 0x10003DD8
@@ -1142,82 +1131,82 @@ class ProfileInfo
      * @brief 36
      * @par Address: 0x10003DE4
      */
-    static const s32 cProfileID_024;
+    static const s32 cProfileID_SpModeResDemoTag;
     /**
      * @brief 37
      * @par Address: 0x10003DE8
      */
-    static const s32 cProfileID_025;
+    static const s32 cProfileID_KoopaJrFloorMgr;
     /**
      * @brief 38
      * @par Address: 0x10003DEC
      */
-    static const s32 cProfileID_026;
+    static const s32 cProfileID_PukupukuGroupTag;
     /**
      * @brief 39
      * @par Address: 0x10003DF0
      */
-    static const s32 cProfileID_027;
+    static const s32 cProfileID_CenterSwing;
     /**
      * @brief 40
      * @par Address: 0x10003DF4
      */
-    static const s32 cProfileID_028;
+    static const s32 cProfileID_CenterRotation;
     /**
      * @brief 41
      * @par Address: 0x10003DF8
      */
-    static const s32 cProfileID_029;
+    static const s32 cProfileID_CenterSwingRail;
     /**
      * @brief 42
      * @par Address: 0x10003DFC
      */
-    static const s32 cProfileID_02A;
+    static const s32 cProfileID_CenterRotationRail;
     /**
      * @brief 43
      * @par Address: 0x10003E00
      */
-    static const s32 cProfileID_02B;
+    static const s32 cProfileID_RotGuruguru;
     /**
      * @brief 44
      * @par Address: 0x10003E04
      */
-    static const s32 cProfileID_02C;
+    static const s32 cProfileID_RotGuruguruRDash;
     /**
      * @brief 45
      * @par Address: 0x10003E08
      */
-    static const s32 cProfileID_02D;
+    static const s32 cProfileID_CoinCenterParent;
     /**
      * @brief 46
      * @par Address: 0x10003E0C
      */
-    static const s32 cProfileID_02E;
+    static const s32 cProfileID_PassCoinCenterParent;
     /**
      * @brief 47
      * @par Address: 0x10003E10
      */
-    static const s32 cProfileID_02F;
+    static const s32 cProfileID_RotateAppear;
     /**
      * @brief 48
      * @par Address: 0x10003E14
      */
-    static const s32 cProfileID_030;
+    static const s32 cProfileID_IfFlagRotateAppear;
     /**
      * @brief 49
      * @par Address: 0x10003E18
      */
-    static const s32 cProfileID_031;
+    static const s32 cProfileID_KinokoLiftParent;
     /**
      * @brief 50
      * @par Address: 0x10003E1C
      */
-    static const s32 cProfileID_032;
+    static const s32 cProfileID_ActorCoinParachuteParent;
     /**
      * @brief 51
      * @par Address: 0x10003E20
      */
-    static const s32 cProfileID_033;
+    static const s32 cProfileID_ObjSpinParent;
     /**
      * @brief 52
      * @par Address: 0x10003E24
@@ -1232,32 +1221,32 @@ class ProfileInfo
      * @brief 54
      * @par Address: 0x10003E2C
      */
-    static const s32 cProfileID_036;
+    static const s32 cProfileID_ObjPol;
     /**
      * @brief 55
      * @par Address: 0x10003E30
      */
-    static const s32 cProfileID_037;
+    static const s32 cProfileID_ObjPolToride;
     /**
      * @brief 56
      * @par Address: 0x10003E34
      */
-    static const s32 cProfileID_038;
+    static const s32 cProfileID_ObjPolNohara;
     /**
      * @brief 57
      * @par Address: 0x10003E38
      */
-    static const s32 cProfileID_039;
+    static const s32 cProfileID_ObjPolKougen;
     /**
      * @brief 58
      * @par Address: 0x10003E3C
      */
-    static const s32 cProfileID_03A;
+    static const s32 cProfileID_ObjPolScroll;
     /**
      * @brief 59
      * @par Address: 0x10003E40
      */
-    static const s32 cProfileID_03B;
+    static const s32 cProfileID_LiftZenKaihei;
     /**
      * @brief 60
      * @par Address: 0x10003E44
@@ -1267,82 +1256,82 @@ class ProfileInfo
      * @brief 61
      * @par Address: 0x10003E48
      */
-    static const s32 cProfileID_03D;
+    static const s32 cProfileID_PairObjChildToride;
     /**
      * @brief 62
      * @par Address: 0x10003E4C
      */
-    static const s32 cProfileID_03E;
+    static const s32 cProfileID_PairObjChildIwa;
     /**
      * @brief 63
      * @par Address: 0x10003E50
      */
-    static const s32 cProfileID_03F;
+    static const s32 cProfileID_PairObjChildIron;
     /**
      * @brief 64
      * @par Address: 0x10003E54
      */
-    static const s32 cProfileID_040;
+    static const s32 cProfileID_PairObjChildNohara;
     /**
      * @brief 65
      * @par Address: 0x10003E58
      */
-    static const s32 cProfileID_041;
+    static const s32 cProfileID_PairObjChildKougen;
     /**
      * @brief 66
      * @par Address: 0x10003E5C
      */
-    static const s32 cProfileID_042;
+    static const s32 cProfileID_LiftZenKumiawase;
     /**
      * @brief 67
      * @par Address: 0x10003E60
      */
-    static const s32 cProfileID_043;
+    static const s32 cProfileID_LiftZenTagaichigai;
     /**
      * @brief 68
      * @par Address: 0x10003E64
      */
-    static const s32 cProfileID_044;
+    static const s32 cProfileID_LiftZenTagaichigaiGear;
     /**
      * @brief 69
      * @par Address: 0x10003E68
      */
-    static const s32 cProfileID_045;
+    static const s32 cProfileID_LiftZenShiroYogan;
     /**
      * @brief 70
      * @par Address: 0x10003E6C
      */
-    static const s32 cProfileID_046;
+    static const s32 cProfileID_PairObjChildSabakuIseki;
     /**
      * @brief 71
      * @par Address: 0x10003E70
      */
-    static const s32 cProfileID_047;
+    static const s32 cProfileID_PairObjChildTorideRock;
     /**
      * @brief 72
      * @par Address: 0x10003E74
      */
-    static const s32 cProfileID_048;
+    static const s32 cProfileID_PairObjChildTorideRockRDash;
     /**
      * @brief 73
      * @par Address: 0x10003E78
      */
-    static const s32 cProfileID_049;
+    static const s32 cProfileID_LiftZenShiro;
     /**
      * @brief 74
      * @par Address: 0x10003E7C
      */
-    static const s32 cProfileID_04A;
+    static const s32 cProfileID_PairObjChildWarning;
     /**
      * @brief 75
      * @par Address: 0x10003E80
      */
-    static const s32 cProfileID_04B;
+    static const s32 cProfileID_PairObjChildNoharaHan;
     /**
      * @brief 76
      * @par Address: 0x10003E84
      */
-    static const s32 cProfileID_04C;
+    static const s32 cProfileID_PairObjChildKinoko;
     /**
      * @brief 77
      * @par Address: 0x10003E88
@@ -1362,107 +1351,107 @@ class ProfileInfo
      * @brief 80
      * @par Address: 0x10003E94
      */
-    static const s32 cProfileID_050;
+    static const s32 cProfileID_ObjKinoko;
     /**
      * @brief 81
      * @par Address: 0x10003E98
      */
-    static const s32 cProfileID_051;
+    static const s32 cProfileID_FlyingKinoko;
     /**
      * @brief 82
      * @par Address: 0x10003E9C
      */
-    static const s32 cProfileID_052;
+    static const s32 cProfileID_TrplnCloud;
     /**
      * @brief 83
      * @par Address: 0x10003EA0
      */
-    static const s32 cProfileID_053;
+    static const s32 cProfileID_TrplnCloudRideOn;
     /**
      * @brief 84
      * @par Address: 0x10003EA4
      */
-    static const s32 cProfileID_054;
+    static const s32 cProfileID_BgActorWater;
     /**
      * @brief 85
      * @par Address: 0x10003EA8
      */
-    static const s32 cProfileID_055;
+    static const s32 cProfileID_BgActorLava;
     /**
      * @brief 86
      * @par Address: 0x10003EAC
      */
-    static const s32 cProfileID_056;
+    static const s32 cProfileID_BgActorPoison;
     /**
      * @brief 87
      * @par Address: 0x10003EB0
      */
-    static const s32 cProfileID_057;
+    static const s32 cProfileID_BgActorSand;
     /**
      * @brief 88
      * @par Address: 0x10003EB4
      */
-    static const s32 cProfileID_058;
+    static const s32 cProfileID_BgActorCloud;
     /**
      * @brief 89
      * @par Address: 0x10003EB8
      */
-    static const s32 cProfileID_059;
+    static const s32 cProfileID_BgActorMist;
     /**
      * @brief 90
      * @par Address: 0x10003EBC
      */
-    static const s32 cProfileID_BgActorYukaMario;
+    static const s32 cProfileID_BgActorBrosFloor;
     /**
      * @brief 91
      * @par Address: 0x10003EC0
      */
-    static const s32 cProfileID_05B;
+    static const s32 cProfileID_BgActorAtackFloor;
     /**
      * @brief 92
      * @par Address: 0x10003EC4
      */
-    static const s32 cProfileID_05C;
+    static const s32 cProfileID_LineSpinLift;
     /**
      * @brief 93
      * @par Address: 0x10003EC8
      */
-    static const s32 cProfileID_05D;
+    static const s32 cProfileID_LineKinokoBlock;
     /**
      * @brief 94
      * @par Address: 0x10003ECC
      */
-    static const s32 cProfileID_05E;
+    static const s32 cProfileID_GroupLineKinokoBlock;
     /**
      * @brief 95
      * @par Address: 0x10003ED0
      */
-    static const s32 cProfileID_05F;
+    static const s32 cProfileID_LiftRotHalfRev;
     /**
      * @brief 96
      * @par Address: 0x10003ED4
      */
-    static const s32 cProfileID_060;
+    static const s32 cProfileID_LiftRotHalfRevRDash;
     /**
      * @brief 97
      * @par Address: 0x10003ED8
      */
-    static const s32 cProfileID_061;
+    static const s32 cProfileID_LiftHanRotateLight;
     /**
      * @brief 98
      * @par Address: 0x10003EDC
      */
-    static const s32 cProfileID_062;
+    static const s32 cProfileID_LiftHurikoYogan;
     /**
      * @brief 99
      * @par Address: 0x10003EE0
      */
-    static const s32 cProfileID_063;
+    static const s32 cProfileID_LiftHurikoYoganRDash;
     /**
      * @brief 100
      * @par Address: 0x10003EE4
      */
-    static const s32 cProfileID_064;
+    static const s32 cProfileID_RailPolygon;
     /**
      * @brief 101
      * @par Address: 0x10003EE8
@@ -1472,7 +1461,7 @@ class ProfileInfo
      * @brief 102
      * @par Address: 0x10003EEC
      */
-    static const s32 cProfileID_StretchKillerHoudai;
+    static const s32 cProfileID_KillerHoudaiSlide;
     /**
      * @brief 103
      * @par Address: 0x10003EF0
@@ -1487,17 +1476,17 @@ class ProfileInfo
      * @brief 105
      * @par Address: 0x10003EF8
      */
-    static const s32 cProfileID_SearchKillerHoudai;
+    static const s32 cProfileID_KillerHoudaiSearch;
     /**
      * @brief 106
      * @par Address: 0x10003EFC
      */
-    static const s32 cProfileID_SearchMagnumKillerHoudai;
+    static const s32 cProfileID_MagnumKillerHoudaiSearch;
     /**
      * @brief 107
      * @par Address: 0x10003F00
      */
-    static const s32 cProfileID_SearchMagnumKillerHoudaiDown;
+    static const s32 cProfileID_MagnumKillerHoudaiDownSearch;
     /**
      * @brief 108
      * @par Address: 0x10003F04
@@ -1512,57 +1501,57 @@ class ProfileInfo
      * @brief 110
      * @par Address: 0x10003F0C
      */
-    static const s32 cProfileID_SearchMagnumKillerHoudaiRDash;
+    static const s32 cProfileID_MagnumKillerHoudaiSearchRDash;
     /**
      * @brief 111
      * @par Address: 0x10003F10
      */
-    static const s32 cProfileID_SearchMagnumKillerHoudaiDownRDash;
+    static const s32 cProfileID_MagnumKillerHoudaiDownSearchRDash;
     /**
      * @brief 112
      * @par Address: 0x10003F14
      */
-    static const s32 cProfileID_070;
+    static const s32 cProfileID_KaitenHoudai;
     /**
      * @brief 113
      * @par Address: 0x10003F18
      */
-    static const s32 cProfileID_071;
+    static const s32 cProfileID_ManyGunHoudai;
     /**
      * @brief 114
      * @par Address: 0x10003F1C
      */
-    static const s32 cProfileID_072;
+    static const s32 cProfileID_ShipCannon;
     /**
      * @brief 115
      * @par Address: 0x10003F20
      */
-    static const s32 cProfileID_073;
+    static const s32 cProfileID_RotCannon;
     /**
      * @brief 116
      * @par Address: 0x10003F24
      */
-    static const s32 cProfileID_074;
+    static const s32 cProfileID_RotBigCannon;
     /**
      * @brief 117
      * @par Address: 0x10003F28
      */
-    static const s32 cProfileID_075;
+    static const s32 cProfileID_DokanCannon;
     /**
      * @brief 118
      * @par Address: 0x10003F2C
      */
-    static const s32 cProfileID_076;
+    static const s32 cProfileID_RedCoin;
     /**
      * @brief 119
      * @par Address: 0x10003F30
      */
-    static const s32 cProfileID_077;
+    static const s32 cProfileID_GreenCoin;
     /**
      * @brief 120
      * @par Address: 0x10003F34
      */
-    static const s32 cProfileID_078;
+    static const s32 cProfileID_GreenCoinChild;
     /**
      * @brief 121
      * @par Address: 0x10003F38
@@ -1572,7 +1561,7 @@ class ProfileInfo
      * @brief 122
      * @par Address: 0x10003F3C
      */
-    static const s32 cProfileID_IntermittentPermanent;
+    static const s32 cProfileID_IntermittentJochu;
     /**
      * @brief 123
      * @par Address: 0x10003F40
@@ -1582,22 +1571,22 @@ class ProfileInfo
      * @brief 124
      * @par Address: 0x10003F44
      */
-    static const s32 cProfileID_WaterIntermittentPermanent;
+    static const s32 cProfileID_WaterIntermittentJochu;
     /**
      * @brief 125
      * @par Address: 0x10003F48
      */
-    static const s32 cProfileID_WaterIntermittentPermanentRD3_3;
+    static const s32 cProfileID_WaterIntermittentJochuRD33;
     /**
      * @brief 126
      * @par Address: 0x10003F4C
      */
-    static const s32 cProfileID_07E;
+    static const s32 cProfileID_WaterIntermittentBoss;
     /**
      * @brief 127
      * @par Address: 0x10003F50
      */
-    static const s32 cProfileID_WaterIntermittentBossChild;
+    static const s32 cProfileID_WaterIntermittentBossAct;
     /**
      * @brief 128
      * @par Address: 0x10003F54
@@ -1607,27 +1596,27 @@ class ProfileInfo
      * @brief 129
      * @par Address: 0x10003F58
      */
-    static const s32 cProfileID_081;
+    static const s32 cProfileID_LiftZenKaitenita;
     /**
      * @brief 130
      * @par Address: 0x10003F5C
      */
-    static const s32 cProfileID_082;
+    static const s32 cProfileID_ObjMamePipeRight;
     /**
      * @brief 131
      * @par Address: 0x10003F60
      */
-    static const s32 cProfileID_083;
+    static const s32 cProfileID_ObjMamePipeLeft;
     /**
      * @brief 132
      * @par Address: 0x10003F64
      */
-    static const s32 cProfileID_084;
+    static const s32 cProfileID_ObjMamePipeUp;
     /**
      * @brief 133
      * @par Address: 0x10003F68
      */
-    static const s32 cProfileID_085;
+    static const s32 cProfileID_ObjMamePipeDown;
     /**
      * @brief 134
      * @par Address: 0x10003F6C
@@ -1637,297 +1626,297 @@ class ProfileInfo
      * @brief 135
      * @par Address: 0x10003F70
      */
-    static const s32 cProfileID_087;
+    static const s32 cProfileID_CoinBattlePipeUp;
     /**
      * @brief 136
      * @par Address: 0x10003F74
      */
-    static const s32 cProfileID_088;
+    static const s32 cProfileID_CoinBattlePipeDown;
     /**
      * @brief 137
      * @par Address: 0x10003F78
      */
-    static const s32 cProfileID_089;
+    static const s32 cProfileID_CoinBattlePipeLeft;
     /**
      * @brief 138
      * @par Address: 0x10003F7C
      */
-    static const s32 cProfileID_08A;
+    static const s32 cProfileID_CoinBattlePipeRight;
     /**
      * @brief 139
      * @par Address: 0x10003F80
      */
-    static const s32 cProfileID_08B;
+    static const s32 cProfileID_ZoomPipeRight;
     /**
      * @brief 140
      * @par Address: 0x10003F84
      */
-    static const s32 cProfileID_08C;
+    static const s32 cProfileID_ZoomPipeLeft;
     /**
      * @brief 141
      * @par Address: 0x10003F88
      */
-    static const s32 cProfileID_08D;
+    static const s32 cProfileID_ZoomPipe;
     /**
      * @brief 142
      * @par Address: 0x10003F8C
      */
-    static const s32 cProfileID_08E;
+    static const s32 cProfileID_ZoomPipeDown;
     /**
      * @brief 143
      * @par Address: 0x10003F90
      */
-    static const s32 cProfileID_08F;
+    static const s32 cProfileID_RotPipe;
     /**
      * @brief 144
      * @par Address: 0x10003F94
      */
-    static const s32 cProfileID_090;
+    static const s32 cProfileID_RotPipeRDash;
     /**
      * @brief 145
      * @par Address: 0x10003F98
      */
-    static const s32 cProfileID_091;
+    static const s32 cProfileID_CannonPipe;
     /**
      * @brief 146
      * @par Address: 0x10003F9C
      */
-    static const s32 cProfileID_092;
+    static const s32 cProfileID_CannonPipeRDash;
     /**
      * @brief 147
      * @par Address: 0x10003FA0
      */
-    static const s32 cProfileID_093;
+    static const s32 cProfileID_LiftZenHanebashiArm;
     /**
      * @brief 148
      * @par Address: 0x10003FA4
      */
-    static const s32 cProfileID_094;
+    static const s32 cProfileID_LiftZenHanebashiSupport;
     /**
      * @brief 149
      * @par Address: 0x10003FA8
      */
-    static const s32 cProfileID_095;
+    static const s32 cProfileID_LiftZenHanebashiTomegu;
     /**
      * @brief 150
      * @par Address: 0x10003FAC
      */
-    static const s32 cProfileID_096;
+    static const s32 cProfileID_LiftZenYoko;
     /**
      * @brief 151
      * @par Address: 0x10003FB0
      */
-    static const s32 cProfileID_097;
+    static const s32 cProfileID_RailPolyChild;
     /**
      * @brief 152
      * @par Address: 0x10003FB4
      */
-    static const s32 cProfileID_098;
+    static const s32 cProfileID_LiftRotationFull;
     /**
      * @brief 153
      * @par Address: 0x10003FB8
      */
-    static const s32 cProfileID_099;
+    static const s32 cProfileID_RotBlockChika;
     /**
      * @brief 154
      * @par Address: 0x10003FBC
      */
-    static const s32 cProfileID_09A;
+    static const s32 cProfileID_RotBlockKinoko;
     /**
      * @brief 155
      * @par Address: 0x10003FC0
      */
-    static const s32 cProfileID_09B;
+    static const s32 cProfileID_RotBlockWood;
     /**
      * @brief 156
      * @par Address: 0x10003FC4
      */
-    static const s32 cProfileID_09C;
+    static const s32 cProfileID_RotBlockWoodRDash;
     /**
      * @brief 157
      * @par Address: 0x10003FC8
      */
-    static const s32 cProfileID_09D;
+    static const s32 cProfileID_RotBlockStone;
     /**
      * @brief 158
      * @par Address: 0x10003FCC
      */
-    static const s32 cProfileID_09E;
+    static const s32 cProfileID_RotBlockGhost;
     /**
      * @brief 159
      * @par Address: 0x10003FD0
      */
-    static const s32 cProfileID_09F;
+    static const s32 cProfileID_RotBlockGhostRD4Obake;
     /**
      * @brief 160
      * @par Address: 0x10003FD4
      */
-    static const s32 cProfileID_0A0;
+    static const s32 cProfileID_ObjPolygonObake;
     /**
      * @brief 161
      * @par Address: 0x10003FD8
      */
-    static const s32 cProfileID_0A1;
+    static const s32 cProfileID_LiftObakeChikeiHeya;
     /**
      * @brief 162
      * @par Address: 0x10003FDC
      */
-    static const s32 cProfileID_0A2;
+    static const s32 cProfileID_RotBlockColor;
     /**
      * @brief 163
      * @par Address: 0x10003FE0
      */
-    static const s32 cProfileID_0A3;
+    static const s32 cProfileID_RotBlockIron;
     /**
      * @brief 164
      * @par Address: 0x10003FE4
      */
-    static const s32 cProfileID_0A4;
+    static const s32 cProfileID_RotBlockIronRDash;
     /**
      * @brief 165
      * @par Address: 0x10003FE8
      */
-    static const s32 cProfileID_0A5;
+    static const s32 cProfileID_RotBlockIronRDash2;
     /**
      * @brief 166
      * @par Address: 0x10003FEC
      */
-    static const s32 cProfileID_0A6;
+    static const s32 cProfileID_RotBlockGhostShip;
     /**
      * @brief 167
      * @par Address: 0x10003FF0
      */
-    static const s32 cProfileID_0A7;
+    static const s32 cProfileID_LiftZenHammer;
     /**
      * @brief 168
      * @par Address: 0x10003FF4
      */
-    static const s32 cProfileID_0A8;
+    static const s32 cProfileID_Moai;
     /**
      * @brief 169
      * @par Address: 0x10003FF8
      */
-    static const s32 cProfileID_0A9;
+    static const s32 cProfileID_MoaiRD24;
     /**
      * @brief 170
      * @par Address: 0x10003FFC
      */
-    static const s32 cProfileID_0AA;
+    static const s32 cProfileID_MoaiDown;
     /**
      * @brief 171
      * @par Address: 0x10004000
      */
-    static const s32 cProfileID_0AB;
+    static const s32 cProfileID_MoaiDownRD24;
     /**
      * @brief 172
      * @par Address: 0x10004004
      */
-    static const s32 cProfileID_0AC;
+    static const s32 cProfileID_MoaiRD55;
     /**
      * @brief 173
      * @par Address: 0x10004008
      */
-    static const s32 cProfileID_0AD;
+    static const s32 cProfileID_ObjSpinChild;
     /**
      * @brief 174
      * @par Address: 0x1000400C
      */
-    static const s32 cProfileID_0AE;
+    static const s32 cProfileID_ObjSpinChildPyramid;
     /**
      * @brief 175
      * @par Address: 0x10004010
      */
-    static const s32 cProfileID_0AF;
+    static const s32 cProfileID_ObjSpinChildPyramidJochu;
     /**
      * @brief 176
      * @par Address: 0x10004014
      */
-    static const s32 cProfileID_0B0;
+    static const s32 cProfileID_ObjSpinAshiba;
     /**
      * @brief 177
      * @par Address: 0x10004018
      */
-    static const s32 cProfileID_0B1;
+    static const s32 cProfileID_SpinWire;
     /**
      * @brief 178
      * @par Address: 0x1000401C
      */
-    static const s32 cProfileID_0B2;
+    static const s32 cProfileID_LiftMoveOn;
     /**
      * @brief 179
      * @par Address: 0x10004020
      */
-    static const s32 cProfileID_0B3;
+    static const s32 cProfileID_ObjMoveOnGhost;
     /**
      * @brief 180
      * @par Address: 0x10004024
      */
-    static const s32 cProfileID_0B4;
+    static const s32 cProfileID_LiftRideOffYougan;
     /**
      * @brief 181
      * @par Address: 0x10004028
      */
-    static const s32 cProfileID_0B5;
+    static const s32 cProfileID_BlockChallenge;
     /**
      * @brief 182
      * @par Address: 0x1000402C
      */
-    static const s32 cProfileID_0B6;
+    static const s32 cProfileID_BlockOdai;
     /**
      * @brief 183
      * @par Address: 0x10004030
      */
-    static const s32 cProfileID_0B7;
+    static const s32 cProfileID_QuestBlock;
     /**
      * @brief 184
      * @par Address: 0x10004034
      */
-    static const s32 cProfileID_LineSpinLift;
+    static const s32 cProfileID_LineTrain;
     /**
      * @brief 185
      * @par Address: 0x10004038
      */
-    static const s32 cProfileID_LineSpinLiftParentRDash;
+    static const s32 cProfileID_LineTrainParentRDash;
     /**
      * @brief 186
      * @par Address: 0x1000403C
      */
-    static const s32 cProfileID_LineSpinLiftChildRDash;
+    static const s32 cProfileID_LineTrainChildRDash;
     /**
      * @brief 187
      * @par Address: 0x10004040
      */
-    static const s32 cProfileID_0BB;
+    static const s32 cProfileID_HandLight;
     /**
      * @brief 188
      * @par Address: 0x10004044
      */
-    static const s32 cProfileID_0BC;
+    static const s32 cProfileID_BlockAppearByLight;
     /**
      * @brief 189
      * @par Address: 0x10004048
      */
-    static const s32 cProfileID_0BD;
+    static const s32 cProfileID_BlockOutIvy;
     /**
      * @brief 190
      * @par Address: 0x1000404C
      */
-    static const s32 cProfileID_0BE;
+    static const s32 cProfileID_PalmTree;
     /**
      * @brief 191
      * @par Address: 0x10004050
      */
-    static const s32 cProfileID_0BF;
+    static const s32 cProfileID_IronBallHole;
     /**
      * @brief 192
      * @par Address: 0x10004054
      */
-    static const s32 cProfileID_0C0;
+    static const s32 cProfileID_IronBallHoleRDash;
     /**
      * @brief 193
      * @par Address: 0x10004058
      */
-    static const s32 cProfileID_0C1;
+    static const s32 cProfileID_WakiDokanTogeTekkyu;
     /**
      * @brief 194
      * @par Address: 0x1000405C
@@ -1937,77 +1926,77 @@ class ProfileInfo
      * @brief 195
      * @par Address: 0x10004060
      */
-    static const s32 cProfileID_0C3;
+    static const s32 cProfileID_SnakeBlockR76;
     /**
      * @brief 196
      * @par Address: 0x10004064
      */
-    static const s32 cProfileID_0C4;
+    static const s32 cProfileID_SnakeBlockRDash;
     /**
      * @brief 197
      * @par Address: 0x10004068
      */
-    static const s32 cProfileID_0C5;
+    static const s32 cProfileID_LiftSpinRotation;
     /**
      * @brief 198
      * @par Address: 0x1000406C
      */
-    static const s32 cProfileID_0C6;
+    static const s32 cProfileID_LiftSpinRotationSync;
     /**
      * @brief 199
      * @par Address: 0x10004070
      */
-    static const s32 cProfileID_0C7;
+    static const s32 cProfileID_RotObjObake;
     /**
      * @brief 200
      * @par Address: 0x10004074
      */
-    static const s32 cProfileID_0C8;
+    static const s32 cProfileID_BlockLight;
     /**
      * @brief 201
      * @par Address: 0x10004078
      */
-    static const s32 cProfileID_0C9;
+    static const s32 cProfileID_LiftSlideKinoko;
     /**
      * @brief 202
      * @par Address: 0x1000407C
      */
-    static const s32 cProfileID_0CA;
+    static const s32 cProfileID_LiftSlideKinokoResident;
     /**
      * @brief 203
      * @par Address: 0x10004080
      */
-    static const s32 cProfileID_0CB;
+    static const s32 cProfileID_ElasticKinoko;
     /**
      * @brief 204
      * @par Address: 0x10004084
      */
-    static const s32 cProfileID_0CC;
+    static const s32 cProfileID_ElasticLiftV;
     /**
      * @brief 205
      * @par Address: 0x10004088
      */
-    static const s32 cProfileID_0CD;
+    static const s32 cProfileID_PataMet;
     /**
      * @brief 206
      * @par Address: 0x1000408C
      */
-    static const s32 cProfileID_0CE;
+    static const s32 cProfileID_PataMetBig;
     /**
      * @brief 207
      * @par Address: 0x10004090
      */
-    static const s32 cProfileID_0CF;
+    static const s32 cProfileID_PataMetRDash;
     /**
      * @brief 208
      * @par Address: 0x10004094
      */
-    static const s32 cProfileID_0D0;
+    static const s32 cProfileID_GearGyration;
     /**
      * @brief 209
      * @par Address: 0x10004098
      */
-    static const s32 cProfileID_0D1;
+    static const s32 cProfileID_GearGyrationRDash;
     /**
      * @brief 210
      * @par Address: 0x1000409C
@@ -2017,57 +2006,57 @@ class ProfileInfo
      * @brief 211
      * @par Address: 0x100040A0
      */
-    static const s32 cProfileID_0D3;
+    static const s32 cProfileID_LiftRideVmove;
     /**
      * @brief 212
      * @par Address: 0x100040A4
      */
-    static const s32 cProfileID_0D4;
+    static const s32 cProfileID_LiftRideHmove;
     /**
      * @brief 213
      * @par Address: 0x100040A8
      */
-    static const s32 cProfileID_0D5;
+    static const s32 cProfileID_GroupLiftRideHmove;
     /**
      * @brief 214
      * @par Address: 0x100040AC
      */
-    static const s32 cProfileID_0D6;
+    static const s32 cProfileID_GroupLiftRideVmove;
     /**
      * @brief 215
      * @par Address: 0x100040B0
      */
-    static const s32 cProfileID_0D7;
+    static const s32 cProfileID_LiftWaki;
     /**
      * @brief 216
      * @par Address: 0x100040B4
      */
-    static const s32 cProfileID_0D8;
+    static const s32 cProfileID_LiftWakiStep;
     /**
      * @brief 217
      * @par Address: 0x100040B8
      */
-    static const s32 cProfileID_0D9;
+    static const s32 cProfileID_LiftLine;
     /**
      * @brief 218
      * @par Address: 0x100040BC
      */
-    static const s32 cProfileID_0DA;
+    static const s32 cProfileID_GroupLiftLine;
     /**
      * @brief 219
      * @par Address: 0x100040C0
      */
-    static const s32 cProfileID_0DB;
+    static const s32 cProfileID_LiftLineRDash;
     /**
      * @brief 220
      * @par Address: 0x100040C4
      */
-    static const s32 cProfileID_0DC;
+    static const s32 cProfileID_LiftSeeSaw;
     /**
      * @brief 221
      * @par Address: 0x100040C8
      */
-    static const s32 cProfileID_0DD;
+    static const s32 cProfileID_LiftSeeSawRDash;
     /**
      * @brief 222
      * @par Address: 0x100040CC
@@ -2077,72 +2066,72 @@ class ProfileInfo
      * @brief 223
      * @par Address: 0x100040D0
      */
-    static const s32 cProfileID_0DF;
+    static const s32 cProfileID_Barrel;
     /**
      * @brief 224
      * @par Address: 0x100040D4
      */
-    static const s32 cProfileID_Burner;
+    static const s32 cProfileID_Barnar;
     /**
      * @brief 225
      * @par Address: 0x100040D8
      */
-    static const s32 cProfileID_0E1;
+    static const s32 cProfileID_BarnarLarge;
     /**
      * @brief 226
      * @par Address: 0x100040DC
      */
-    static const s32 cProfileID_0E2;
+    static const s32 cProfileID_BarnarSync;
     /**
      * @brief 227
      * @par Address: 0x100040E0
      */
-    static const s32 cProfileID_0E3;
+    static const s32 cProfileID_BarnarRot;
     /**
      * @brief 228
      * @par Address: 0x100040E4
      */
-    static const s32 cProfileID_0E4;
+    static const s32 cProfileID_ActorBlockJump;
     /**
      * @brief 229
      * @par Address: 0x100040E8
      */
-    static const s32 cProfileID_0E5;
+    static const s32 cProfileID_NoboribouObake;
     /**
      * @brief 230
      * @par Address: 0x100040EC
      */
-    static const s32 cProfileID_0E6;
+    static const s32 cProfileID_LiftScalesStep;
     /**
      * @brief 231
      * @par Address: 0x100040F0
      */
-    static const s32 cProfileID_0E7;
+    static const s32 cProfileID_LiftScales;
     /**
      * @brief 232
      * @par Address: 0x100040F4
      */
-    static const s32 cProfileID_0E8;
+    static const s32 cProfileID_LiftScalesBack;
     /**
      * @brief 233
      * @par Address: 0x100040F8
      */
-    static const s32 cProfileID_0E9;
+    static const s32 cProfileID_GuraRock;
     /**
      * @brief 234
      * @par Address: 0x100040FC
      */
-    static const s32 cProfileID_0EA;
+    static const s32 cProfileID_WireMove;
     /**
      * @brief 235
      * @par Address: 0x10004100
      */
-    static const s32 cProfileID_0EB;
+    static const s32 cProfileID_IceLump;
     /**
      * @brief 236
      * @par Address: 0x10004104
      */
-    static const s32 cProfileID_0EC;
+    static const s32 cProfileID_WaterMove;
     /**
      * @brief 237
      * @par Address: 0x10004108
@@ -2157,112 +2146,112 @@ class ProfileInfo
      * @brief 239
      * @par Address: 0x10004110
      */
-    static const s32 cProfileID_0EF;
+    static const s32 cProfileID_TarzanChain;
     /**
      * @brief 240
      * @par Address: 0x10004114
      */
-    static const s32 cProfileID_0F0;
+    static const s32 cProfileID_Ladder;
     /**
      * @brief 241
      * @par Address: 0x10004118
      */
-    static const s32 cProfileID_0F1;
+    static const s32 cProfileID_WakiWoodBox;
     /**
      * @brief 242
      * @par Address: 0x1000411C
      */
-    static const s32 cProfileID_0F2;
+    static const s32 cProfileID_WakiIronBox;
     /**
      * @brief 243
      * @par Address: 0x10004120
      */
-    static const s32 cProfileID_0F3;
+    static const s32 cProfileID_LiftRemoconSeesaw;
     /**
      * @brief 244
      * @par Address: 0x10004124
      */
-    static const s32 cProfileID_0F4;
+    static const s32 cProfileID_LiftRemoconXline;
     /**
      * @brief 245
      * @par Address: 0x10004128
      */
-    static const s32 cProfileID_0F5;
+    static const s32 cProfileID_ActorBlockStone;
     /**
      * @brief 246
      * @par Address: 0x1000412C
      */
-    static const s32 cProfileID_0F6;
+    static const s32 cProfileID_ActorBlockHard;
     /**
      * @brief 247
      * @par Address: 0x10004130
      */
-    static const s32 cProfileID_0F7;
+    static const s32 cProfileID_ActorBlockWood;
     /**
      * @brief 248
      * @par Address: 0x10004134
      */
-    static const s32 cProfileID_0F8;
+    static const s32 cProfileID_ActorBlockHelp;
     /**
      * @brief 249
      * @par Address: 0x10004138
      */
-    static const s32 cProfileID_0F9;
+    static const s32 cProfileID_RDashLuigiBlock;
     /**
      * @brief 250
      * @par Address: 0x1000413C
      */
-    static const s32 cProfileID_0FA;
+    static const s32 cProfileID_LiftObjBgHmove;
     /**
      * @brief 251
      * @par Address: 0x10004140
      */
-    static const s32 cProfileID_0FB;
+    static const s32 cProfileID_LiftObjBgVmove;
     /**
      * @brief 252
      * @par Address: 0x10004144
      */
-    static const s32 cProfileID_0FC;
+    static const s32 cProfileID_YoganJimen;
     /**
      * @brief 253
      * @par Address: 0x10004148
      */
-    static const s32 cProfileID_0FD;
+    static const s32 cProfileID_YoganJimenRDash;
     /**
      * @brief 254
      * @par Address: 0x1000414C
      */
-    static const s32 cProfileID_0FE;
+    static const s32 cProfileID_MonorailBlock;
     /**
      * @brief 255
      * @par Address: 0x10004150
      */
-    static const s32 cProfileID_0FF;
+    static const s32 cProfileID_MonorailBlockRail;
     /**
      * @brief 256
      * @par Address: 0x10004154
      */
-    static const s32 cProfileID_100;
+    static const s32 cProfileID_LiftRideMove;
     /**
      * @brief 257
      * @par Address: 0x10004158
      */
-    static const s32 cProfileID_101;
+    static const s32 cProfileID_LiftRideMoveSky;
     /**
      * @brief 258
      * @par Address: 0x1000415C
      */
-    static const s32 cProfileID_102;
+    static const s32 cProfileID_RotHalf;
     /**
      * @brief 259
      * @par Address: 0x10004160
      */
-    static const s32 cProfileID_103;
+    static const s32 cProfileID_LiftWheel;
     /**
      * @brief 260
      * @par Address: 0x10004164
      */
-    static const s32 cProfileID_104;
+    static const s32 cProfileID_LiftLeaf;
     /**
      * @brief 261
      * @par Address: 0x10004168
@@ -2277,12 +2266,12 @@ class ProfileInfo
      * @brief 263
      * @par Address: 0x10004170
      */
-    static const s32 cProfileID_107;
+    static const s32 cProfileID_LiftSlideRamage;
     /**
      * @brief 264
      * @par Address: 0x10004174
      */
-    static const s32 cProfileID_108;
+    static const s32 cProfileID_BossKoopaFootHold;
     /**
      * @brief 265
      * @par Address: 0x10004178
@@ -2292,37 +2281,37 @@ class ProfileInfo
      * @brief 266
      * @par Address: 0x1000417C
      */
-    static const s32 cProfileID_10A;
+    static const s32 cProfileID_AirShipBottom;
     /**
      * @brief 267
      * @par Address: 0x10004180
      */
-    static const s32 cProfileID_10B;
+    static const s32 cProfileID_AirShipBottomWaku;
     /**
      * @brief 268
      * @par Address: 0x10004184
      */
-    static const s32 cProfileID_10C;
+    static const s32 cProfileID_AirShipBottomRDash;
     /**
      * @brief 269
      * @par Address: 0x10004188
      */
-    static const s32 cProfileID_PeachFinalCastleKoopaJrLift;
+    static const s32 cProfileID_QuakeKoopaJrLiftV;
     /**
      * @brief 270
      * @par Address: 0x1000418C
      */
-    static const s32 cProfileID_PeachFinalCastleKoopaJrLiftHmove;
+    static const s32 cProfileID_QuakeKoopaJrLiftH;
     /**
      * @brief 271
      * @par Address: 0x10004190
      */
-    static const s32 cProfileID_PeachFinalCastleKoopaJrLiftPairObj;
+    static const s32 cProfileID_QuakeKoopaJrLiftPairObjChild;
     /**
      * @brief 272
      * @par Address: 0x10004194
      */
-    static const s32 cProfileID_RoyLiftWakiStep;
+    static const s32 cProfileID_RoyLiftStep;
     /**
      * @brief 273
      * @par Address: 0x10004198
@@ -2337,42 +2326,42 @@ class ProfileInfo
      * @brief 275
      * @par Address: 0x100041A0
      */
-    static const s32 cProfileID_113;
+    static const s32 cProfileID_GoalPole;
     /**
      * @brief 276
      * @par Address: 0x100041A4
      */
-    static const s32 cProfileID_114;
+    static const s32 cProfileID_GoalPolePicStage;
     /**
      * @brief 277
      * @par Address: 0x100041A8
      */
-    static const s32 cProfileID_115;
+    static const s32 cProfileID_GoalPoleRDash;
     /**
      * @brief 278
      * @par Address: 0x100041AC
      */
-    static const s32 cProfileID_116;
+    static const s32 cProfileID_GoalPolePicStageRDash;
     /**
      * @brief 279
      * @par Address: 0x100041B0
      */
-    static const s32 cProfileID_117;
+    static const s32 cProfileID_WaterStream;
     /**
      * @brief 280
      * @par Address: 0x100041B4
      */
-    static const s32 cProfileID_118;
+    static const s32 cProfileID_Cookie;
     /**
      * @brief 281
      * @par Address: 0x100041B8
      */
-    static const s32 cProfileID_119;
+    static const s32 cProfileID_MagicHandW5;
     /**
      * @brief 282
      * @par Address: 0x100041BC
      */
-    static const s32 cProfileID_11A;
+    static const s32 cProfileID_MagicHandW7;
     /**
      * @brief 283
      * @par Address: 0x100041C0
@@ -2382,17 +2371,17 @@ class ProfileInfo
      * @brief 284
      * @par Address: 0x100041C4
      */
-    static const s32 cProfileID_11C;
+    static const s32 cProfileID_PmusaBlock;
     /**
      * @brief 285
      * @par Address: 0x100041C8
      */
-    static const s32 cProfileID_11D;
+    static const s32 cProfileID_FloatBox;
     /**
      * @brief 286
      * @par Address: 0x100041CC
      */
-    static const s32 cProfileID_11E;
+    static const s32 cProfileID_FloatBoxBig;
     /**
      * @brief 287
      * @par Address: 0x100041D0
@@ -2402,17 +2391,17 @@ class ProfileInfo
      * @brief 288
      * @par Address: 0x100041D4
      */
-    static const s32 cProfileID_120;
+    static const s32 cProfileID_BreakBlock;
     /**
      * @brief 289
      * @par Address: 0x100041D8
      */
-    static const s32 cProfileID_121;
+    static const s32 cProfileID_ActorBlockHatena;
     /**
      * @brief 290
      * @par Address: 0x100041DC
      */
-    static const s32 cProfileID_122;
+    static const s32 cProfileID_ActorBlockHatenaRDash;
     /**
      * @brief 291
      * @par Address: 0x100041E0
@@ -2422,222 +2411,222 @@ class ProfileInfo
      * @brief 292
      * @par Address: 0x100041E4
      */
-    static const s32 cProfileID_124;
+    static const s32 cProfileID_ActorBlockRengaRDash;
     /**
      * @brief 293
      * @par Address: 0x100041E8
      */
-    static const s32 cProfileID_125;
+    static const s32 cProfileID_ActorBlockRengaRailV;
     /**
      * @brief 294
      * @par Address: 0x100041EC
      */
-    static const s32 cProfileID_126;
+    static const s32 cProfileID_ActorBlockClarity;
     /**
      * @brief 295
      * @par Address: 0x100041F0
      */
-    static const s32 cProfileID_127;
+    static const s32 cProfileID_ActorBlockClarityRDash;
     /**
      * @brief 296
      * @par Address: 0x100041F4
      */
-    static const s32 cProfileID_128;
+    static const s32 cProfileID_ActorBlockHatenaLine;
     /**
      * @brief 297
      * @par Address: 0x100041F8
      */
-    static const s32 cProfileID_129;
+    static const s32 cProfileID_ActorBlockRengaLine;
     /**
      * @brief 298
      * @par Address: 0x100041FC
      */
-    static const s32 cProfileID_12A;
+    static const s32 cProfileID_ActorBlockGroupHatenaLine;
     /**
      * @brief 299
      * @par Address: 0x10004200
      */
-    static const s32 cProfileID_12B;
+    static const s32 cProfileID_ActorBlockGroupRengaLine;
     /**
      * @brief 300
      * @par Address: 0x10004204
      */
-    static const s32 cProfileID_12C;
+    static const s32 cProfileID_ActorBlockHatenaAngle;
     /**
      * @brief 301
      * @par Address: 0x10004208
      */
-    static const s32 cProfileID_12D;
+    static const s32 cProfileID_ActorBlockHatenaAngleR99;
     /**
      * @brief 302
      * @par Address: 0x1000420C
      */
-    static const s32 cProfileID_12E;
+    static const s32 cProfileID_ActorBlockRengaAngle;
     /**
      * @brief 303
      * @par Address: 0x10004210
      */
-    static const s32 cProfileID_12F;
+    static const s32 cProfileID_ActorBlockRengaAngleRDash;
     /**
      * @brief 304
      * @par Address: 0x10004214
      */
-    static const s32 cProfileID_130;
+    static const s32 cProfileID_ActorBlockRengaAngleR99;
     /**
      * @brief 305
      * @par Address: 0x10004218
      */
-    static const s32 cProfileID_131;
+    static const s32 cProfileID_ActorBlockHatenaRotAppear;
     /**
      * @brief 306
      * @par Address: 0x1000421C
      */
-    static const s32 cProfileID_132;
+    static const s32 cProfileID_ActorBlockRengaRotAppear;
     /**
      * @brief 307
      * @par Address: 0x10004220
      */
-    static const s32 cProfileID_133;
+    static const s32 cProfileID_ActorBlockHatenaFollowDisp;
     /**
      * @brief 308
      * @par Address: 0x10004224
      */
-    static const s32 cProfileID_134;
+    static const s32 cProfileID_ActorBlockRengaFollowDisp;
     /**
      * @brief 309
      * @par Address: 0x10004228
      */
-    static const s32 cProfileID_ActorBlockMakeDRC;
+    static const s32 cProfileID_ActorBlockOutDrc;
     /**
      * @brief 310
      * @par Address: 0x1000422C
      */
-    static const s32 cProfileID_136;
+    static const s32 cProfileID_ActorBlockPata;
     /**
      * @brief 311
      * @par Address: 0x10004230
      */
-    static const s32 cProfileID_137;
+    static const s32 cProfileID_ActorBlockWater;
     /**
      * @brief 312
      * @par Address: 0x10004234
      */
-    static const s32 cProfileID_138;
+    static const s32 cProfileID_ActorBlockCloud;
     /**
      * @brief 313
      * @par Address: 0x10004238
      */
-    static const s32 cProfileID_139;
+    static const s32 cProfileID_ActorBlockSnake;
     /**
      * @brief 314
      * @par Address: 0x1000423C
      */
-    static const s32 cProfileID_13A;
+    static const s32 cProfileID_ActorBlockSwitch;
     /**
      * @brief 315
      * @par Address: 0x10004240
      */
-    static const s32 cProfileID_13B;
+    static const s32 cProfileID_ActorBlockPSwitch;
     /**
      * @brief 316
      * @par Address: 0x10004244
      */
-    static const s32 cProfileID_13C;
+    static const s32 cProfileID_ActorBlockYoshiChild;
     /**
      * @brief 317
      * @par Address: 0x10004248
      */
-    static const s32 cProfileID_13D;
+    static const s32 cProfileID_ActorBlockBigRenga;
     /**
      * @brief 318
      * @par Address: 0x1000424C
      */
-    static const s32 cProfileID_13E;
+    static const s32 cProfileID_ActorBlockBigHatena;
     /**
      * @brief 319
      * @par Address: 0x10004250
      */
-    static const s32 cProfileID_13F;
+    static const s32 cProfileID_ActorBlockHatenaEnemyCourse;
     /**
      * @brief 320
      * @par Address: 0x10004254
      */
-    static const s32 cProfileID_140;
+    static const s32 cProfileID_ActorBlockPataEnemyCourse;
     /**
      * @brief 321
      * @par Address: 0x10004258
      */
-    static const s32 cProfileID_141;
+    static const s32 cProfileID_RouletBlock;
     /**
      * @brief 322
      * @par Address: 0x1000425C
      */
-    static const s32 cProfileID_142;
+    static const s32 cProfileID_ChikuwaBlock;
     /**
      * @brief 323
      * @par Address: 0x10004260
      */
-    static const s32 cProfileID_143;
+    static const s32 cProfileID_KameckBlock;
     /**
      * @brief 324
      * @par Address: 0x10004264
      */
-    static const s32 cProfileID_144;
+    static const s32 cProfileID_WoodBox;
     /**
      * @brief 325
      * @par Address: 0x10004268
      */
-    static const s32 cProfileID_145;
+    static const s32 cProfileID_IronBox;
     /**
      * @brief 326
      * @par Address: 0x1000426C
      */
-    static const s32 cProfileID_146;
+    static const s32 cProfileID_IronBoxRDash;
     /**
      * @brief 327
      * @par Address: 0x10004270
      */
-    static const s32 cProfileID_147;
+    static const s32 cProfileID_IronBoxShortCreate;
     /**
      * @brief 328
      * @par Address: 0x10004274
      */
-    static const s32 cProfileID_148;
+    static const s32 cProfileID_MagicHandPaa;
     /**
      * @brief 329
      * @par Address: 0x10004278
      */
-    static const s32 cProfileID_149;
+    static const s32 cProfileID_MagicHandGoo;
     /**
      * @brief 330
      * @par Address: 0x1000427C
      */
-    static const s32 cProfileID_14A;
+    static const s32 cProfileID_MagicHandGooRDash;
     /**
      * @brief 331
      * @par Address: 0x10004280
      */
-    static const s32 cProfileID_14B;
+    static const s32 cProfileID_DrcHideBlock;
     /**
      * @brief 332
      * @par Address: 0x10004284
      */
-    static const s32 cProfileID_14C;
+    static const s32 cProfileID_RailCreateEffectBlock;
     /**
      * @brief 333
      * @par Address: 0x10004288
      */
-    static const s32 cProfileID_14D;
+    static const s32 cProfileID_ObjPipeRight;
     /**
      * @brief 334
      * @par Address: 0x1000428C
      */
-    static const s32 cProfileID_14E;
+    static const s32 cProfileID_ObjPipeLeft;
     /**
      * @brief 335
      * @par Address: 0x10004290
      */
-    static const s32 cProfileID_14F;
+    static const s32 cProfileID_ObjPipeUp;
     /**
      * @brief 336
      * @par Address: 0x10004294
@@ -2647,37 +2636,37 @@ class ProfileInfo
      * @brief 337
      * @par Address: 0x10004298
      */
-    static const s32 cProfileID_151;
+    static const s32 cProfileID_GroupObjPipeRight;
     /**
      * @brief 338
      * @par Address: 0x1000429C
      */
-    static const s32 cProfileID_152;
+    static const s32 cProfileID_GroupObjPipeLeft;
     /**
      * @brief 339
      * @par Address: 0x100042A0
      */
-    static const s32 cProfileID_153;
+    static const s32 cProfileID_GroupObjPipeUp;
     /**
      * @brief 340
      * @par Address: 0x100042A4
      */
-    static const s32 cProfileID_ObjPipeDownGroup;
+    static const s32 cProfileID_GroupObjPipeDown;
     /**
      * @brief 341
      * @par Address: 0x100042A8
      */
-    static const s32 cProfileID_155;
+    static const s32 cProfileID_ObjPipeRightNG;
     /**
      * @brief 342
      * @par Address: 0x100042AC
      */
-    static const s32 cProfileID_156;
+    static const s32 cProfileID_ObjPipeLeftNG;
     /**
      * @brief 343
      * @par Address: 0x100042B0
      */
-    static const s32 cProfileID_157;
+    static const s32 cProfileID_ObjPipeUpNG;
     /**
      * @brief 344
      * @par Address: 0x100042B4
@@ -2697,17 +2686,17 @@ class ProfileInfo
      * @brief 347
      * @par Address: 0x100042C0
      */
-    static const s32 cProfileID_SwitchPbuttonNoWallKick;
+    static const s32 cProfileID_SwitchPbuttonDisSlide;
     /**
      * @brief 348
      * @par Address: 0x100042C4
      */
-    static const s32 cProfileID_15C;
+    static const s32 cProfileID_SwitchBossKoopaButton;
     /**
      * @brief 349
      * @par Address: 0x100042C8
      */
-    static const s32 cProfileID_15D;
+    static const s32 cProfileID_SwitchBossKoopaOnoButton;
     /**
      * @brief 350
      * @par Address: 0x100042CC
@@ -2727,47 +2716,47 @@ class ProfileInfo
      * @brief 353
      * @par Address: 0x100042D8
      */
-    static const s32 cProfileID_161;
+    static const s32 cProfileID_AkoyaShellFish;
     /**
      * @brief 354
      * @par Address: 0x100042DC
      */
-    static const s32 cProfileID_162;
+    static const s32 cProfileID_IceCube;
     /**
      * @brief 355
      * @par Address: 0x100042E0
      */
-    static const s32 cProfileID_163;
+    static const s32 cProfileID_IceAshiba;
     /**
      * @brief 356
      * @par Address: 0x100042E4
      */
-    static const s32 cProfileID_164;
+    static const s32 cProfileID_IceAshibaWater;
     /**
      * @brief 357
      * @par Address: 0x100042E8
      */
-    static const s32 cProfileID_165;
+    static const s32 cProfileID_IceAshibaRail;
     /**
      * @brief 358
      * @par Address: 0x100042EC
      */
-    static const s32 cProfileID_166;
+    static const s32 cProfileID_LiftWaterWheel;
     /**
      * @brief 359
      * @par Address: 0x100042F0
      */
-    static const s32 cProfileID_167;
+    static const s32 cProfileID_LiftRemoconBalanceClinch;
     /**
      * @brief 360
      * @par Address: 0x100042F4
      */
-    static const s32 cProfileID_168;
+    static const s32 cProfileID_LiftRemoconBalanceRideOff;
     /**
      * @brief 361
      * @par Address: 0x100042F8
      */
-    static const s32 cProfileID_169;
+    static const s32 cProfileID_LiftRemoconBalanceRideOffRDash;
     /**
      * @brief 362
      * @par Address: 0x100042FC
@@ -2777,32 +2766,32 @@ class ProfileInfo
      * @brief 363
      * @par Address: 0x10004300
      */
-    static const s32 cProfileID_16B;
+    static const s32 cProfileID_LiftMoveOnNormal;
     /**
      * @brief 364
      * @par Address: 0x10004304
      */
-    static const s32 cProfileID_16C;
+    static const s32 cProfileID_LiftChangeDirByRideOn;
     /**
      * @brief 365
      * @par Address: 0x10004308
      */
-    static const s32 cProfileID_16D;
+    static const s32 cProfileID_HardIceBlock;
     /**
      * @brief 366
      * @par Address: 0x1000430C
      */
-    static const s32 cProfileID_16E;
+    static const s32 cProfileID_WanwanPile;
     /**
      * @brief 367
      * @par Address: 0x10004310
      */
-    static const s32 cProfileID_16F;
+    static const s32 cProfileID_WanwanPileRDash;
     /**
      * @brief 368
      * @par Address: 0x10004314
      */
-    static const s32 cProfileID_KameckIce;
+    static const s32 cProfileID_KameckIcicle;
     /**
      * @brief 369
      * @par Address: 0x10004318
@@ -2812,7 +2801,7 @@ class ProfileInfo
      * @brief 370
      * @par Address: 0x1000431C
      */
-    static const s32 cProfileID_PeachFinalCastleKoopaJrClown;
+    static const s32 cProfileID_QuakeKoopaJrClown;
     /**
      * @brief 371
      * @par Address: 0x10004320
@@ -2822,7 +2811,7 @@ class ProfileInfo
      * @brief 372
      * @par Address: 0x10004324
      */
-    static const s32 cProfileID_174;
+    static const s32 cProfileID_KoopaJrFloor;
     /**
      * @brief 373
      * @par Address: 0x10004328
@@ -2847,92 +2836,92 @@ class ProfileInfo
      * @brief 377
      * @par Address: 0x10004338
      */
-    static const s32 cProfileID_179;
+    static const s32 cProfileID_FireBar2;
     /**
      * @brief 378
      * @par Address: 0x1000433C
      */
-    static const s32 cProfileID_17A;
+    static const s32 cProfileID_RotFireBar;
     /**
      * @brief 379
      * @par Address: 0x10004340
      */
-    static const s32 cProfileID_17B;
+    static const s32 cProfileID_Gattan;
     /**
      * @brief 380
      * @par Address: 0x10004344
      */
-    static const s32 cProfileID_17C;
+    static const s32 cProfileID_TamanoriLift;
     /**
      * @brief 381
      * @par Address: 0x10004348
      */
-    static const s32 cProfileID_17D;
+    static const s32 cProfileID_Met;
     /**
      * @brief 382
      * @par Address: 0x1000434C
      */
-    static const s32 cProfileID_17E;
+    static const s32 cProfileID_MetMiddle;
     /**
      * @brief 383
      * @par Address: 0x10004350
      */
-    static const s32 cProfileID_17F;
+    static const s32 cProfileID_Unira;
     /**
      * @brief 384
      * @par Address: 0x10004354
      */
-    static const s32 cProfileID_180;
+    static const s32 cProfileID_UniraRDashNarrowBC;
     /**
      * @brief 385
      * @par Address: 0x10004358
      */
-    static const s32 cProfileID_181;
+    static const s32 cProfileID_DekaUnira;
     /**
      * @brief 386
      * @par Address: 0x1000435C
      */
-    static const s32 cProfileID_182;
+    static const s32 cProfileID_UniraRDash;
     /**
      * @brief 387
      * @par Address: 0x10004360
      */
-    static const s32 cProfileID_183;
+    static const s32 cProfileID_PowBlock;
     /**
      * @brief 388
      * @par Address: 0x10004364
      */
-    static const s32 cProfileID_184;
+    static const s32 cProfileID_LightBlock;
     /**
      * @brief 389
      * @par Address: 0x10004368
      */
-    static const s32 cProfileID_185;
+    static const s32 cProfileID_PropBlock;
     /**
      * @brief 390
      * @par Address: 0x1000436C
      */
-    static const s32 cProfileID_186;
+    static const s32 cProfileID_SlideBlock;
     /**
      * @brief 391
      * @par Address: 0x10004370
      */
-    static const s32 cProfileID_187;
+    static const s32 cProfileID_CarryBlockTaru;
     /**
      * @brief 392
      * @par Address: 0x10004374
      */
-    static const s32 cProfileID_188;
+    static const s32 cProfileID_Ice;
     /**
      * @brief 393
      * @par Address: 0x10004378
      */
-    static const s32 cProfileID_189;
+    static const s32 cProfileID_ActorCoinWaki;
     /**
      * @brief 394
      * @par Address: 0x1000437C
      */
-    static const s32 cProfileID_18A;
+    static const s32 cProfileID_ActorCoinWakiFunsuiTag;
     /**
      * @brief 395
      * @par Address: 0x10004380
@@ -2942,147 +2931,147 @@ class ProfileInfo
      * @brief 396
      * @par Address: 0x10004384
      */
-    static const s32 cProfileID_18C;
+    static const s32 cProfileID_ActorCoinRDash;
     /**
      * @brief 397
      * @par Address: 0x10004388
      */
-    static const s32 cProfileID_18D;
+    static const s32 cProfileID_ActorCoinFreezer;
     /**
      * @brief 398
      * @par Address: 0x1000438C
      */
-    static const s32 cProfileID_18E;
+    static const s32 cProfileID_ActorCoinObjpol;
     /**
      * @brief 399
      * @par Address: 0x10004390
      */
-    static const s32 cProfileID_18F;
+    static const s32 cProfileID_ActorCoinDemoJump;
     /**
      * @brief 400
      * @par Address: 0x10004394
      */
-    static const s32 cProfileID_190;
+    static const s32 cProfileID_ActorCoinHopJump;
     /**
      * @brief 401
      * @par Address: 0x10004398
      */
-    static const s32 cProfileID_191;
+    static const s32 cProfileID_ActorCoinJump;
     /**
      * @brief 402
      * @par Address: 0x1000439C
      */
-    static const s32 cProfileID_192;
+    static const s32 cProfileID_ActorCoinBattleJump;
     /**
      * @brief 403
      * @par Address: 0x100043A0
      */
-    static const s32 cProfileID_193;
+    static const s32 cProfileID_ActorCoinTatsunonJump;
     /**
      * @brief 404
      * @par Address: 0x100043A4
      */
-    static const s32 cProfileID_194;
+    static const s32 cProfileID_ActorCoinShowerJump;
     /**
      * @brief 405
      * @par Address: 0x100043A8
      */
-    static const s32 cProfileID_195;
+    static const s32 cProfileID_ActorCoinAngle;
     /**
      * @brief 406
      * @par Address: 0x100043AC
      */
-    static const s32 cProfileID_196;
+    static const s32 cProfileID_ActorCoinAngleBoard;
     /**
      * @brief 407
      * @par Address: 0x100043B0
      */
-    static const s32 cProfileID_197;
+    static const s32 cProfileID_ActorCoinWater;
     /**
      * @brief 408
      * @par Address: 0x100043B4
      */
-    static const s32 cProfileID_198;
+    static const s32 cProfileID_ActorCoinFollowDisp;
     /**
      * @brief 409
      * @par Address: 0x100043B8
      */
-    static const s32 cProfileID_199;
+    static const s32 cProfileID_ActorCoinBubble;
     /**
      * @brief 410
      * @par Address: 0x100043BC
      */
-    static const s32 cProfileID_19A;
+    static const s32 cProfileID_ActorCoinJugem;
     /**
      * @brief 411
      * @par Address: 0x100043C0
      */
-    static const s32 cProfileID_19B;
+    static const s32 cProfileID_ActorCoinPass;
     /**
      * @brief 412
      * @par Address: 0x100043C4
      */
-    static const s32 cProfileID_19C;
+    static const s32 cProfileID_ActorCoinAkoya;
     /**
      * @brief 413
      * @par Address: 0x100043C8
      */
-    static const s32 cProfileID_19D;
+    static const s32 cProfileID_ActorCoinRotAppear;
     /**
      * @brief 414
      * @par Address: 0x100043CC
      */
-    static const s32 cProfileID_19E;
+    static const s32 cProfileID_ActorCoinPassRotAppear;
     /**
      * @brief 415
      * @par Address: 0x100043D0
      */
-    static const s32 cProfileID_19F;
+    static const s32 cProfileID_ActorCoinVolt;
     /**
      * @brief 416
      * @par Address: 0x100043D4
      */
-    static const s32 cProfileID_1A0;
+    static const s32 cProfileID_ActorCoinRotateFloor;
     /**
      * @brief 417
      * @par Address: 0x100043D8
      */
-    static const s32 cProfileID_1A1;
+    static const s32 cProfileID_ActorCoinParachute;
     /**
      * @brief 418
      * @par Address: 0x100043DC
      */
-    static const s32 cProfileID_1A2;
+    static const s32 cProfileID_ActorCoinSnake;
     /**
      * @brief 419
      * @par Address: 0x100043E0
      */
-    static const s32 cProfileID_1A3;
+    static const s32 cProfileID_ActorCoinKinokoLift;
     /**
      * @brief 420
      * @par Address: 0x100043E4
      */
-    static const s32 cProfileID_1A4;
+    static const s32 cProfileID_ActorCoinBalloon;
     /**
      * @brief 421
      * @par Address: 0x100043E8
      */
-    static const s32 cProfileID_1A5;
+    static const s32 cProfileID_ActorCoinGravity;
     /**
      * @brief 422
      * @par Address: 0x100043EC
      */
-    static const s32 cProfileID_1A6;
+    static const s32 cProfileID_ActorCoinUnitPowBlock;
     /**
      * @brief 423
      * @par Address: 0x100043F0
      */
-    static const s32 cProfileID_1A7;
+    static const s32 cProfileID_ActorCoinOutDrc;
     /**
      * @brief 424
      * @par Address: 0x100043F4
      */
-    static const s32 cProfileID_1A8;
+    static const s32 cProfileID_ActorCoinEat;
     /**
      * @brief 425
      * @par Address: 0x100043F8
@@ -3092,82 +3081,82 @@ class ProfileInfo
      * @brief 426
      * @par Address: 0x100043FC
      */
-    static const s32 cProfileID_1AA;
+    static const s32 cProfileID_CollectionCoin;
     /**
      * @brief 427
      * @par Address: 0x10004400
      */
-    static const s32 cProfileID_1AB;
+    static const s32 cProfileID_CollectionCoinLine;
     /**
      * @brief 428
      * @par Address: 0x10004404
      */
-    static const s32 cProfileID_1AC;
+    static const s32 cProfileID_CollectionCoinLineGroup;
     /**
      * @brief 429
      * @par Address: 0x10004408
      */
-    static const s32 cProfileID_1AD;
+    static const s32 cProfileID_CollectionCoinVolt;
     /**
      * @brief 430
      * @par Address: 0x1000440C
      */
-    static const s32 cProfileID_1AE;
+    static const s32 cProfileID_CollectionCoinParent;
     /**
      * @brief 431
      * @par Address: 0x10004410
      */
-    static const s32 cProfileID_1AF;
+    static const s32 cProfileID_CollectionCoinParentRDash;
     /**
      * @brief 432
      * @par Address: 0x10004414
      */
-    static const s32 cProfileID_1B0;
+    static const s32 cProfileID_CollectionCoinParentRDashEx;
     /**
      * @brief 433
      * @par Address: 0x10004418
      */
-    static const s32 cProfileID_1B1;
+    static const s32 cProfileID_CollectionCoinParentR6C;
     /**
      * @brief 434
      * @par Address: 0x1000441C
      */
-    static const s32 cProfileID_1B2;
+    static const s32 cProfileID_CollectionCoinSnake;
     /**
      * @brief 435
      * @par Address: 0x10004420
      */
-    static const s32 cProfileID_1B3;
+    static const s32 cProfileID_CollectionCoinRotAppear;
     /**
      * @brief 436
      * @par Address: 0x10004424
      */
-    static const s32 cProfileID_1B4;
+    static const s32 cProfileID_CoinWiperParent;
     /**
      * @brief 437
      * @par Address: 0x10004428
      */
-    static const s32 cProfileID_1B5;
+    static const s32 cProfileID_CoinWiperChild;
     /**
      * @brief 438
      * @par Address: 0x1000442C
      */
-    static const s32 cProfileID_CoinmakiCoin;
+    static const s32 cProfileID_CoinMakiCoin;
     /**
      * @brief 439
      * @par Address: 0x10004430
      */
-    static const s32 cProfileID_1B7;
+    static const s32 cProfileID_FastLookCameraTag;
     /**
      * @brief 440
      * @par Address: 0x10004434
      */
-    static const s32 cProfileID_1B8;
+    static const s32 cProfileID_BalloonProtectAreaTag;
     /**
      * @brief 441
      * @par Address: 0x10004438
      */
-    static const s32 cProfileID_1B9;
+    static const s32 cProfileID_Balloon;
     /**
      * @brief 442
      * @par Address: 0x1000443C
@@ -3177,7 +3166,7 @@ class ProfileInfo
      * @brief 443
      * @par Address: 0x10004440
      */
-    static const s32 cProfileID_TottenPlayer;
+    static const s32 cProfileID_PlayerTotten;
     /**
      * @brief 444
      * @par Address: 0x10004444
@@ -3187,42 +3176,42 @@ class ProfileInfo
      * @brief 445
      * @par Address: 0x10004448
      */
-    static const s32 cProfileID_1BD;
+    static const s32 cProfileID_GoalDemoKinopio;
     /**
      * @brief 446
      * @par Address: 0x1000444C
      */
-    static const s32 cProfileID_1BE;
+    static const s32 cProfileID_ChibiYoshiEgg;
     /**
      * @brief 447
      * @par Address: 0x10004450
      */
-    static const s32 cProfileID_1BF;
+    static const s32 cProfileID_BubbleYoshi;
     /**
      * @brief 448
      * @par Address: 0x10004454
      */
-    static const s32 cProfileID_1C0;
+    static const s32 cProfileID_BalloonYoshi;
     /**
      * @brief 449
      * @par Address: 0x10004458
      */
-    static const s32 cProfileID_1C1;
+    static const s32 cProfileID_LightYoshi;
     /**
      * @brief 450
      * @par Address: 0x1000445C
      */
-    static const s32 cProfileID_1C2;
+    static const s32 cProfileID_CloudYoshi;
     /**
      * @brief 451
      * @par Address: 0x10004460
      */
-    static const s32 cProfileID_1C3;
+    static const s32 cProfileID_ChibiBubble;
     /**
      * @brief 452
      * @par Address: 0x10004464
      */
-    static const s32 cProfileID_1C4;
+    static const s32 cProfileID_FruitCookie;
     /**
      * @brief 453
      * @par Address: 0x10004468
@@ -3232,47 +3221,47 @@ class ProfileInfo
      * @brief 454
      * @par Address: 0x1000446C
      */
-    static const s32 cProfileID_1C6;
+    static const s32 cProfileID_WakiHipAttackActor;
     /**
      * @brief 455
      * @par Address: 0x10004470
      */
-    static const s32 cProfileID_1C7;
+    static const s32 cProfileID_DokanNextGotoAddTimeTag;
     /**
      * @brief 456
      * @par Address: 0x10004474
      */
-    static const s32 cProfileID_1C8;
+    static const s32 cProfileID_QuestActorTag;
     /**
      * @brief 457
      * @par Address: 0x10004478
      */
-    static const s32 cProfileID_1C9;
+    static const s32 cProfileID_QuestDemoLocationTag;
     /**
      * @brief 458
      * @par Address: 0x1000447C
      */
-    static const s32 cProfileID_1CA;
+    static const s32 cProfileID_QuestEscapeTag;
     /**
      * @brief 459
      * @par Address: 0x10004480
      */
-    static const s32 cProfileID_1CB;
+    static const s32 cProfileID_Shadowkun;
     /**
      * @brief 460
      * @par Address: 0x10004484
      */
-    static const s32 cProfileID_1CC;
+    static const s32 cProfileID_ShadowkunNoFukuro;
     /**
      * @brief 461
      * @par Address: 0x10004488
      */
-    static const s32 cProfileID_1CD;
+    static const s32 cProfileID_QuestKey;
     /**
      * @brief 462
      * @par Address: 0x1000448C
      */
-    static const s32 cProfileID_1CE;
+    static const s32 cProfileID_QuestKinopio;
     /**
      * @brief 463
      * @par Address: 0x10004490
@@ -3282,17 +3271,17 @@ class ProfileInfo
      * @brief 464
      * @par Address: 0x10004494
      */
-    static const s32 cProfileID_1D0;
+    static const s32 cProfileID_EnemyCourseShadowkun;
     /**
      * @brief 465
      * @par Address: 0x10004498
      */
-    static const s32 cProfileID_1D1;
+    static const s32 cProfileID_TitleShadowkun;
     /**
      * @brief 466
      * @par Address: 0x1000449C
      */
-    static const s32 cProfileID_1D2;
+    static const s32 cProfileID_BalloonHangingActor;
     /**
      * @brief 467
      * @par Address: 0x100044A0
@@ -3312,22 +3301,22 @@ class ProfileInfo
      * @brief 470
      * @par Address: 0x100044AC
      */
-    static const s32 cProfileID_1D6;
+    static const s32 cProfileID_IgaKuribo;
     /**
      * @brief 471
      * @par Address: 0x100044B0
      */
-    static const s32 cProfileID_1D7;
+    static const s32 cProfileID_BeansKuribo;
     /**
      * @brief 472
      * @par Address: 0x100044B4
      */
-    static const s32 cProfileID_1D8;
+    static const s32 cProfileID_MiddleKuribo;
     /**
      * @brief 473
      * @par Address: 0x100044B8
      */
-    static const s32 cProfileID_1D9;
+    static const s32 cProfileID_LargeKuribo;
     /**
      * @brief 474
      * @par Address: 0x100044BC
@@ -3357,167 +3346,167 @@ class ProfileInfo
      * @brief 479
      * @par Address: 0x100044D0
      */
-    static const s32 cProfileID_1DF;
+    static const s32 cProfileID_DokanPakkunUp;
     /**
      * @brief 480
      * @par Address: 0x100044D4
      */
-    static const s32 cProfileID_1E0;
+    static const s32 cProfileID_DokanPakkunDown;
     /**
      * @brief 481
      * @par Address: 0x100044D8
      */
-    static const s32 cProfileID_1E1;
+    static const s32 cProfileID_DokanPakkunLeft;
     /**
      * @brief 482
      * @par Address: 0x100044DC
      */
-    static const s32 cProfileID_1E2;
+    static const s32 cProfileID_DokanPakkunRight;
     /**
      * @brief 483
      * @par Address: 0x100044E0
      */
-    static const s32 cProfileID_1E3;
+    static const s32 cProfileID_DokanFirePakkunUp;
     /**
      * @brief 484
      * @par Address: 0x100044E4
      */
-    static const s32 cProfileID_1E4;
+    static const s32 cProfileID_DokanFirePakkunDown;
     /**
      * @brief 485
      * @par Address: 0x100044E8
      */
-    static const s32 cProfileID_1E5;
+    static const s32 cProfileID_DokanFirePakkunLeft;
     /**
      * @brief 486
      * @par Address: 0x100044EC
      */
-    static const s32 cProfileID_1E6;
+    static const s32 cProfileID_DokanFirePakkunRight;
     /**
      * @brief 487
      * @par Address: 0x100044F0
      */
-    static const s32 cProfileID_1E7;
+    static const s32 cProfileID_DokanIcePakkunUp;
     /**
      * @brief 488
      * @par Address: 0x100044F4
      */
-    static const s32 cProfileID_1E8;
+    static const s32 cProfileID_DokanIcePakkunDown;
     /**
      * @brief 489
      * @par Address: 0x100044F8
      */
-    static const s32 cProfileID_1E9;
+    static const s32 cProfileID_DokanIcePakkunLeft;
     /**
      * @brief 490
      * @par Address: 0x100044FC
      */
-    static const s32 cProfileID_1EA;
+    static const s32 cProfileID_DokanIcePakkunRight;
     /**
      * @brief 491
      * @par Address: 0x10004500
      */
-    static const s32 cProfileID_1EB;
+    static const s32 cProfileID_DokanPakkunBig;
     /**
      * @brief 492
      * @par Address: 0x10004504
      */
-    static const s32 cProfileID_1EC;
+    static const s32 cProfileID_JimenPakkun;
     /**
      * @brief 493
      * @par Address: 0x10004508
      */
-    static const s32 cProfileID_1ED;
+    static const s32 cProfileID_JimenPakkunRDash;
     /**
      * @brief 494
      * @par Address: 0x1000450C
      */
-    static const s32 cProfileID_1EE;
+    static const s32 cProfileID_JimenPakkunR33;
     /**
      * @brief 495
      * @par Address: 0x10004510
      */
-    static const s32 cProfileID_1EF;
+    static const s32 cProfileID_JimenFirePakkun;
     /**
      * @brief 496
      * @par Address: 0x10004514
      */
-    static const s32 cProfileID_1F0;
+    static const s32 cProfileID_JimenIcePakkun;
     /**
      * @brief 497
      * @par Address: 0x10004518
      */
-    static const s32 cProfileID_1F1;
+    static const s32 cProfileID_JimenBigPakkun;
     /**
      * @brief 498
      * @par Address: 0x1000451C
      */
-    static const s32 cProfileID_1F2;
+    static const s32 cProfileID_JimenBigFirePakkun;
     /**
      * @brief 499
      * @par Address: 0x10004520
      */
-    static const s32 cProfileID_1F3;
+    static const s32 cProfileID_WalkPakkun;
     /**
      * @brief 500
      * @par Address: 0x10004524
      */
-    static const s32 cProfileID_1F4;
+    static const s32 cProfileID_WaterPakkun;
     /**
      * @brief 501
      * @par Address: 0x10004528
      */
-    static const s32 cProfileID_1F5;
+    static const s32 cProfileID_WaterPakkunRDash;
     /**
      * @brief 502
      * @par Address: 0x1000452C
      */
-    static const s32 cProfileID_1F6;
+    static const s32 cProfileID_BlackPakkun;
     /**
      * @brief 503
      * @par Address: 0x10004530
      */
-    static const s32 cProfileID_1F7;
+    static const s32 cProfileID_BlackPakkunOBJ;
     /**
      * @brief 504
      * @par Address: 0x10004534
      */
-    static const s32 cProfileID_1F8;
+    static const s32 cProfileID_NiseMusa;
     /**
      * @brief 505
      * @par Address: 0x10004538
      */
-    static const s32 cProfileID_1F9;
+    static const s32 cProfileID_Sanbo;
     /**
      * @brief 506
      * @par Address: 0x1000453C
      */
-    static const s32 cProfileID_1FA;
+    static const s32 cProfileID_SanboDeadEl;
     /**
      * @brief 507
      * @par Address: 0x10004540
      */
-    static const s32 cProfileID_1FB;
+    static const s32 cProfileID_WakiBigHanachan;
     /**
      * @brief 508
      * @par Address: 0x10004544
      */
-    static const s32 cProfileID_1FC;
+    static const s32 cProfileID_Hanachan;
     /**
      * @brief 509
      * @par Address: 0x10004548
      */
-    static const s32 cProfileID_1FD;
+    static const s32 cProfileID_HanachanRDash;
     /**
      * @brief 510
      * @par Address: 0x1000454C
      */
-    static const s32 cProfileID_1FE;
+    static const s32 cProfileID_BigHanachan;
     /**
      * @brief 511
      * @par Address: 0x10004550
      */
-    static const s32 cProfileID_1FF;
+    static const s32 cProfileID_FooBall;
     /**
      * @brief 512
      * @par Address: 0x10004554
@@ -3527,57 +3516,57 @@ class ProfileInfo
      * @brief 513
      * @par Address: 0x10004558
      */
-    static const s32 cProfileID_201;
+    static const s32 cProfileID_NokonokoHeight;
     /**
      * @brief 514
      * @par Address: 0x1000455C
      */
-    static const s32 cProfileID_202;
+    static const s32 cProfileID_NokonokoBig;
     /**
      * @brief 515
      * @par Address: 0x10004560
      */
-    static const s32 cProfileID_203;
+    static const s32 cProfileID_Patapata;
     /**
      * @brief 516
      * @par Address: 0x10004564
      */
-    static const s32 cProfileID_204;
+    static const s32 cProfileID_PatapataGroup;
     /**
      * @brief 517
      * @par Address: 0x10004568
      */
-    static const s32 cProfileID_205;
+    static const s32 cProfileID_Togezo;
     /**
      * @brief 518
      * @par Address: 0x1000456C
      */
-    static const s32 cProfileID_206;
+    static const s32 cProfileID_ReverseTogezo;
     /**
      * @brief 519
      * @par Address: 0x10004570
      */
-    static const s32 cProfileID_207;
+    static const s32 cProfileID_Kanibo;
     /**
      * @brief 520
      * @par Address: 0x10004574
      */
-    static const s32 cProfileID_208;
+    static const s32 cProfileID_Kanitama;
     /**
      * @brief 521
      * @par Address: 0x10004578
      */
-    static const s32 cProfileID_209;
+    static const s32 cProfileID_Bombhei;
     /**
      * @brief 522
      * @par Address: 0x1000457C
      */
-    static const s32 cProfileID_20A;
+    static const s32 cProfileID_BombheiPara;
     /**
      * @brief 523
      * @par Address: 0x10004580
      */
-    static const s32 cProfileID_20B;
+    static const s32 cProfileID_BombheiParaRDash;
     /**
      * @brief 524
      * @par Address: 0x10004584
@@ -3587,167 +3576,167 @@ class ProfileInfo
      * @brief 525
      * @par Address: 0x10004588
      */
-    static const s32 cProfileID_20D;
+    static const s32 cProfileID_Pentaro;
     /**
      * @brief 526
      * @par Address: 0x1000458C
      */
-    static const s32 cProfileID_20E;
+    static const s32 cProfileID_PentaroGlass;
     /**
      * @brief 527
      * @par Address: 0x10004590
      */
-    static const s32 cProfileID_20F;
+    static const s32 cProfileID_WakiPentaro;
     /**
      * @brief 528
      * @par Address: 0x10004594
      */
-    static const s32 cProfileID_210;
+    static const s32 cProfileID_HoneMet;
     /**
      * @brief 529
      * @par Address: 0x10004598
      */
-    static const s32 cProfileID_211;
+    static const s32 cProfileID_HoneMetHead;
     /**
      * @brief 530
      * @par Address: 0x1000459C
      */
-    static const s32 cProfileID_212;
+    static const s32 cProfileID_Pukupuku;
     /**
      * @brief 531
      * @par Address: 0x100045A0
      */
-    static const s32 cProfileID_213;
+    static const s32 cProfileID_PukupukuGroup;
     /**
      * @brief 532
      * @par Address: 0x100045A4
      */
-    static const s32 cProfileID_214;
+    static const s32 cProfileID_PukupukuMiddle;
     /**
      * @brief 533
      * @par Address: 0x100045A8
      */
-    static const s32 cProfileID_215;
+    static const s32 cProfileID_PukupukuMiddleGroup;
     /**
      * @brief 534
      * @par Address: 0x100045AC
      */
-    static const s32 cProfileID_216;
+    static const s32 cProfileID_PukupukuSearch;
     /**
      * @brief 535
      * @par Address: 0x100045B0
      */
-    static const s32 cProfileID_217;
+    static const s32 cProfileID_PukupukuSearchMiddle;
     /**
      * @brief 536
      * @par Address: 0x100045B4
      */
-    static const s32 cProfileID_218;
+    static const s32 cProfileID_PukupukuEscape;
     /**
      * @brief 537
      * @par Address: 0x100045B8
      */
-    static const s32 cProfileID_219;
+    static const s32 cProfileID_PukupukuEscapeMiddle;
     /**
      * @brief 538
      * @par Address: 0x100045BC
      */
-    static const s32 cProfileID_21A;
+    static const s32 cProfileID_PukupukuMecha;
     /**
      * @brief 539
      * @par Address: 0x100045C0
      */
-    static const s32 cProfileID_21B;
+    static const s32 cProfileID_PukupukuToge;
     /**
      * @brief 540
      * @par Address: 0x100045C4
      */
-    static const s32 cProfileID_21C;
+    static const s32 cProfileID_Tobipuku;
     /**
      * @brief 541
      * @par Address: 0x100045C8
      */
-    static const s32 cProfileID_21D;
+    static const s32 cProfileID_TobipukuMecha;
     /**
      * @brief 542
      * @par Address: 0x100045CC
      */
-    static const s32 cProfileID_21E;
+    static const s32 cProfileID_WakiPukupuku;
     /**
      * @brief 543
      * @par Address: 0x100045D0
      */
-    static const s32 cProfileID_21F;
+    static const s32 cProfileID_WakiPukupukuSearch;
     /**
      * @brief 544
      * @par Address: 0x100045D4
      */
-    static const s32 cProfileID_220;
+    static const s32 cProfileID_WakiPukupukuEscape;
     /**
      * @brief 545
      * @par Address: 0x100045D8
      */
-    static const s32 cProfileID_221;
+    static const s32 cProfileID_WakiTobipuku;
     /**
      * @brief 546
      * @par Address: 0x100045DC
      */
-    static const s32 cProfileID_222;
+    static const s32 cProfileID_WakiTobipukuMecha;
     /**
      * @brief 547
      * @par Address: 0x100045E0
      */
-    static const s32 cProfileID_223;
+    static const s32 cProfileID_PukupukuParent;
     /**
      * @brief 548
      * @par Address: 0x100045E4
      */
-    static const s32 cProfileID_224;
+    static const s32 cProfileID_FishBone;
     /**
      * @brief 549
      * @par Address: 0x100045E8
      */
-    static const s32 cProfileID_225;
+    static const s32 cProfileID_Fugumannen;
     /**
      * @brief 550
      * @par Address: 0x100045EC
      */
-    static const s32 cProfileID_226;
+    static const s32 cProfileID_FugumannenBig;
     /**
      * @brief 551
      * @par Address: 0x100045F0
      */
-    static const s32 cProfileID_227;
+    static const s32 cProfileID_WakiFugumannen;
     /**
      * @brief 552
      * @par Address: 0x100045F4
      */
-    static const s32 cProfileID_228;
+    static const s32 cProfileID_WakiFugumannenBig;
     /**
      * @brief 553
      * @par Address: 0x100045F8
      */
-    static const s32 cProfileID_229;
+    static const s32 cProfileID_JellyFish;
     /**
      * @brief 554
      * @par Address: 0x100045FC
      */
-    static const s32 cProfileID_22A;
+    static const s32 cProfileID_ChochinAnkoh;
     /**
      * @brief 555
      * @par Address: 0x10004600
      */
-    static const s32 cProfileID_22B;
+    static const s32 cProfileID_Jumpdai;
     /**
      * @brief 556
      * @par Address: 0x10004604
      */
-    static const s32 cProfileID_22C;
+    static const s32 cProfileID_Keronpa;
     /**
      * @brief 557
      * @par Address: 0x10004608
      */
-    static const s32 cProfileID_22D;
+    static const s32 cProfileID_KeronpaRDash;
     /**
      * @brief 558
      * @par Address: 0x1000460C
@@ -3762,7 +3751,7 @@ class ProfileInfo
      * @brief 560
      * @par Address: 0x10004614
      */
-    static const s32 cProfileID_230;
+    static const s32 cProfileID_WakiKeronpa;
     /**
      * @brief 561
      * @par Address: 0x10004618
@@ -3772,62 +3761,62 @@ class ProfileInfo
      * @brief 562
      * @par Address: 0x1000461C
      */
-    static const s32 cProfileID_Grrrol;
+    static const s32 cProfileID_Gorogoro;
     /**
      * @brief 563
      * @par Address: 0x10004620
      */
-    static const s32 cProfileID_BigGrrrol;
+    static const s32 cProfileID_GorogoroBig;
     /**
      * @brief 564
      * @par Address: 0x10004624
      */
-    static const s32 cProfileID_BigGrrrolRDash;
+    static const s32 cProfileID_GorogoroBigRDash;
     /**
      * @brief 565
      * @par Address: 0x10004628
      */
-    static const s32 cProfileID_235;
+    static const s32 cProfileID_CheckPointFlag;
     /**
      * @brief 566
      * @par Address: 0x1000462C
      */
-    static const s32 cProfileID_236;
+    static const s32 cProfileID_BigPileUnder;
     /**
      * @brief 567
      * @par Address: 0x10004630
      */
-    static const s32 cProfileID_237;
+    static const s32 cProfileID_BigPileUpper;
     /**
      * @brief 568
      * @par Address: 0x10004634
      */
-    static const s32 cProfileID_238;
+    static const s32 cProfileID_BigPileRight;
     /**
      * @brief 569
      * @par Address: 0x10004638
      */
-    static const s32 cProfileID_239;
+    static const s32 cProfileID_BigPileLeft;
     /**
      * @brief 570
      * @par Address: 0x1000463C
      */
-    static const s32 cProfileID_23A;
+    static const s32 cProfileID_SuperBigPileRight;
     /**
      * @brief 571
      * @par Address: 0x10004640
      */
-    static const s32 cProfileID_23B;
+    static const s32 cProfileID_SuperBigPileLeft;
     /**
      * @brief 572
      * @par Address: 0x10004644
      */
-    static const s32 cProfileID_23C;
+    static const s32 cProfileID_KazandanMgr;
     /**
      * @brief 573
      * @par Address: 0x10004648
      */
-    static const s32 cProfileID_23D;
+    static const s32 cProfileID_WakiKazandan;
     /**
      * @brief 574
      * @par Address: 0x1000464C
@@ -3837,62 +3826,62 @@ class ProfileInfo
      * @brief 575
      * @par Address: 0x10004650
      */
-    static const s32 cProfileID_23F;
+    static const s32 cProfileID_ZoomKun;
     /**
      * @brief 576
      * @par Address: 0x10004654
      */
-    static const s32 cProfileID_240;
+    static const s32 cProfileID_ZoomKunRDash;
     /**
      * @brief 577
      * @par Address: 0x10004658
      */
-    static const s32 cProfileID_241;
+    static const s32 cProfileID_LimitSpeedKun;
     /**
      * @brief 578
      * @par Address: 0x1000465C
      */
-    static const s32 cProfileID_242;
+    static const s32 cProfileID_MaxUeLeft;
     /**
      * @brief 579
      * @par Address: 0x10004660
      */
-    static const s32 cProfileID_243;
+    static const s32 cProfileID_MaxUeRight;
     /**
      * @brief 580
      * @par Address: 0x10004664
      */
-    static const s32 cProfileID_244;
+    static const s32 cProfileID_LrStopUp;
     /**
      * @brief 581
      * @par Address: 0x10004668
      */
-    static const s32 cProfileID_245;
+    static const s32 cProfileID_LrStopDw;
     /**
      * @brief 582
      * @par Address: 0x1000466C
      */
-    static const s32 cProfileID_246;
+    static const s32 cProfileID_HyperMaxUeLeft;
     /**
      * @brief 583
      * @par Address: 0x10004670
      */
-    static const s32 cProfileID_247;
+    static const s32 cProfileID_HyperMaxUeRight;
     /**
      * @brief 584
      * @par Address: 0x10004674
      */
-    static const s32 cProfileID_248;
+    static const s32 cProfileID_AutoScrollTag;
     /**
      * @brief 585
      * @par Address: 0x10004678
      */
-    static const s32 cProfileID_249;
+    static const s32 cProfileID_ScrollTag;
     /**
      * @brief 586
      * @par Address: 0x1000467C
      */
-    static const s32 cProfileID_24A;
+    static const s32 cProfileID_KoopaAreaObj;
     /**
      * @brief 587
      * @par Address: 0x10004680
@@ -3902,17 +3891,17 @@ class ProfileInfo
      * @brief 588
      * @par Address: 0x10004684
      */
-    static const s32 cProfileID_24C;
+    static const s32 cProfileID_EnvTag;
     /**
      * @brief 589
      * @par Address: 0x10004688
      */
-    static const s32 cProfileID_24D;
+    static const s32 cProfileID_FlowerKindTag;
     /**
      * @brief 590
      * @par Address: 0x1000468C
      */
-    static const s32 cProfileID_24E;
+    static const s32 cProfileID_EnvSoundTag;
     /**
      * @brief 591
      * @par Address: 0x10004690
@@ -3957,7 +3946,7 @@ class ProfileInfo
      * @brief 599
      * @par Address: 0x100046B0
      */
-    static const s32 cProfileID_SuperMoon;
+    static const s32 cProfileID_ThreeUpMoon;
     /**
      * @brief 600
      * @par Address: 0x100046B4
@@ -3967,147 +3956,147 @@ class ProfileInfo
      * @brief 601
      * @par Address: 0x100046B8
      */
-    static const s32 cProfileID_259;
+    static const s32 cProfileID_SeaWeed;
     /**
      * @brief 602
      * @par Address: 0x100046BC
      */
-    static const s32 cProfileID_25A;
+    static const s32 cProfileID_DoorNormal;
     /**
      * @brief 603
      * @par Address: 0x100046C0
      */
-    static const s32 cProfileID_25B;
+    static const s32 cProfileID_DoorObake;
     /**
      * @brief 604
      * @par Address: 0x100046C4
      */
-    static const s32 cProfileID_25C;
+    static const s32 cProfileID_DoorToride;
     /**
      * @brief 605
      * @par Address: 0x100046C8
      */
-    static const s32 cProfileID_25D;
+    static const s32 cProfileID_DoorTorideRDash;
     /**
      * @brief 606
      * @par Address: 0x100046CC
      */
-    static const s32 cProfileID_25E;
+    static const s32 cProfileID_DoorCastle;
     /**
      * @brief 607
      * @par Address: 0x100046D0
      */
-    static const s32 cProfileID_25F;
+    static const s32 cProfileID_DoorCastleRDash;
     /**
      * @brief 608
      * @par Address: 0x100046D4
      */
-    static const s32 cProfileID_260;
+    static const s32 cProfileID_DoorKoopa;
     /**
      * @brief 609
      * @par Address: 0x100046D8
      */
-    static const s32 cProfileID_261;
+    static const s32 cProfileID_DoorKoopaRDash;
     /**
      * @brief 610
      * @par Address: 0x100046DC
      */
-    static const s32 cProfileID_262;
+    static const s32 cProfileID_Choropu;
     /**
      * @brief 611
      * @par Address: 0x100046E0
      */
-    static const s32 cProfileID_263;
+    static const s32 cProfileID_ChoropooHole;
     /**
      * @brief 612
      * @par Address: 0x100046E4
      */
-    static const s32 cProfileID_264;
+    static const s32 cProfileID_Basabasa;
     /**
      * @brief 613
      * @par Address: 0x100046E8
      */
-    static const s32 cProfileID_265;
+    static const s32 cProfileID_TorchLight;
     /**
      * @brief 614
      * @par Address: 0x100046EC
      */
-    static const s32 cProfileID_266;
+    static const s32 cProfileID_WakiDokan;
     /**
      * @brief 615
      * @par Address: 0x100046F0
      */
-    static const s32 cProfileID_267;
+    static const s32 cProfileID_FlyingKinokoWaki;
     /**
      * @brief 616
      * @par Address: 0x100046F4
      */
-    static const s32 cProfileID_268;
+    static const s32 cProfileID_ManholePuu;
     /**
      * @brief 617
      * @par Address: 0x100046F8
      */
-    static const s32 cProfileID_Spanner;
+    static const s32 cProfileID_Spana;
     /**
      * @brief 618
      * @par Address: 0x100046FC
      */
-    static const s32 cProfileID_26A;
+    static const s32 cProfileID_Manhole;
     /**
      * @brief 619
      * @par Address: 0x10004700
      */
-    static const s32 cProfileID_26B;
+    static const s32 cProfileID_JugemThrowActor;
     /**
      * @brief 620
      * @par Address: 0x10004704
      */
-    static const s32 cProfileID_26C;
+    static const s32 cProfileID_JugemCloud;
     /**
      * @brief 621
      * @par Address: 0x10004708
      */
-    static const s32 cProfileID_26D;
+    static const s32 cProfileID_JugemCloudCoin;
     /**
      * @brief 622
      * @par Address: 0x1000470C
      */
-    static const s32 cProfileID_26E;
+    static const s32 cProfileID_JugemCloudMultiPlay;
     /**
      * @brief 623
      * @par Address: 0x10004710
      */
-    static const s32 cProfileID_26F;
+    static const s32 cProfileID_JugemBody;
     /**
      * @brief 624
      * @par Address: 0x10004714
      */
-    static const s32 cProfileID_270;
+    static const s32 cProfileID_JugemBodyMultiPlay;
     /**
      * @brief 625
      * @par Address: 0x10004718
      */
-    static const s32 cProfileID_271;
+    static const s32 cProfileID_WakiJugem;
     /**
      * @brief 626
      * @par Address: 0x1000471C
      */
-    static const s32 cProfileID_272;
+    static const s32 cProfileID_WakiJugemMultiPlay;
     /**
      * @brief 627
      * @par Address: 0x10004720
      */
-    static const s32 cProfileID_273;
+    static const s32 cProfileID_CannonBullet;
     /**
      * @brief 628
      * @par Address: 0x10004724
      */
-    static const s32 cProfileID_274;
+    static const s32 cProfileID_Killer;
     /**
      * @brief 629
      * @par Address: 0x10004728
      */
-    static const s32 cProfileID_275;
+    static const s32 cProfileID_MagnumKiller;
     /**
      * @brief 630
      * @par Address: 0x1000472C
@@ -4117,17 +4106,17 @@ class ProfileInfo
      * @brief 631
      * @par Address: 0x10004730
      */
-    static const s32 cProfileID_277;
+    static const s32 cProfileID_MagnumSearchKiller;
     /**
      * @brief 632
      * @par Address: 0x10004734
      */
-    static const s32 cProfileID_278;
+    static const s32 cProfileID_KingKiller;
     /**
      * @brief 633
      * @par Address: 0x10004738
      */
-    static const s32 cProfileID_279;
+    static const s32 cProfileID_KingKillerRDash;
     /**
      * @brief 634
      * @par Address: 0x1000473C
@@ -4137,52 +4126,52 @@ class ProfileInfo
      * @brief 635
      * @par Address: 0x10004740
      */
-    static const s32 cProfileID_27B;
+    static const s32 cProfileID_Dossun;
     /**
      * @brief 636
      * @par Address: 0x10004744
      */
-    static const s32 cProfileID_27C;
+    static const s32 cProfileID_BigDossun;
     /**
      * @brief 637
      * @par Address: 0x10004748
      */
-    static const s32 cProfileID_27D;
+    static const s32 cProfileID_Gabon;
     /**
      * @brief 638
      * @par Address: 0x1000474C
      */
-    static const s32 cProfileID_27E;
+    static const s32 cProfileID_GabonRDash;
     /**
      * @brief 639
      * @par Address: 0x10004750
      */
-    static const s32 cProfileID_27F;
+    static const s32 cProfileID_GabonJochu;
     /**
      * @brief 640
      * @par Address: 0x10004754
      */
-    static const s32 cProfileID_GabonRock;
+    static const s32 cProfileID_GabonBall;
     /**
      * @brief 641
      * @par Address: 0x10004758
      */
-    static const s32 cProfileID_281;
+    static const s32 cProfileID_RockGabon;
     /**
      * @brief 642
      * @par Address: 0x1000475C
      */
-    static const s32 cProfileID_282;
+    static const s32 cProfileID_RockGabonJochu;
     /**
      * @brief 643
      * @par Address: 0x10004760
      */
-    static const s32 cProfileID_RockGabonRock;
+    static const s32 cProfileID_RockGabonBall;
     /**
      * @brief 644
      * @par Address: 0x10004764
      */
-    static const s32 cProfileID_284;
+    static const s32 cProfileID_Seichan;
     /**
      * @brief 645
      * @par Address: 0x10004768
@@ -4192,22 +4181,22 @@ class ProfileInfo
      * @brief 646
      * @par Address: 0x1000476C
      */
-    static const s32 cProfileID_286;
+    static const s32 cProfileID_SnowBall;
     /**
      * @brief 647
      * @par Address: 0x10004770
      */
-    static const s32 cProfileID_287;
+    static const s32 cProfileID_KaronHead;
     /**
      * @brief 648
      * @par Address: 0x10004774
      */
-    static const s32 cProfileID_288;
+    static const s32 cProfileID_Karon;
     /**
      * @brief 649
      * @par Address: 0x10004778
      */
-    static const s32 cProfileID_289;
+    static const s32 cProfileID_BigKaron;
     /**
      * @brief 650
      * @par Address: 0x1000477C
@@ -4217,17 +4206,17 @@ class ProfileInfo
      * @brief 651
      * @par Address: 0x10004780
      */
-    static const s32 cProfileID_28B;
+    static const s32 cProfileID_Mouse;
     /**
      * @brief 652
      * @par Address: 0x10004784
      */
-    static const s32 cProfileID_28C;
+    static const s32 cProfileID_Chorobon;
     /**
      * @brief 653
      * @par Address: 0x10004788
      */
-    static const s32 cProfileID_28D;
+    static const s32 cProfileID_GroupChorobon;
     /**
      * @brief 654
      * @par Address: 0x1000478C
@@ -4252,137 +4241,137 @@ class ProfileInfo
      * @brief 658
      * @par Address: 0x1000479C
      */
-    static const s32 cProfileID_292;
+    static const s32 cProfileID_Crasher;
     /**
      * @brief 659
      * @par Address: 0x100047A0
      */
-    static const s32 cProfileID_293;
+    static const s32 cProfileID_Unabon;
     /**
      * @brief 660
      * @par Address: 0x100047A4
      */
-    static const s32 cProfileID_294;
+    static const s32 cProfileID_UnabonCheckPoint;
     /**
      * @brief 661
      * @par Address: 0x100047A8
      */
-    static const s32 cProfileID_295;
+    static const s32 cProfileID_UnabonDokan;
     /**
      * @brief 662
      * @par Address: 0x100047AC
      */
-    static const s32 cProfileID_296;
+    static const s32 cProfileID_WakiUnabon;
     /**
      * @brief 663
      * @par Address: 0x100047B0
      */
-    static const s32 cProfileID_297;
+    static const s32 cProfileID_WakiUnabonRDash;
     /**
      * @brief 664
      * @par Address: 0x100047B4
      */
-    static const s32 cProfileID_298;
+    static const s32 cProfileID_UnabonRDash;
     /**
      * @brief 665
      * @par Address: 0x100047B8
      */
-    static const s32 cProfileID_299;
+    static const s32 cProfileID_KK;
     /**
      * @brief 666
      * @par Address: 0x100047BC
      */
-    static const s32 cProfileID_29A;
+    static const s32 cProfileID_KKJochu;
     /**
      * @brief 667
      * @par Address: 0x100047C0
      */
-    static const s32 cProfileID_29B;
+    static const s32 cProfileID_KKLift;
     /**
      * @brief 668
      * @par Address: 0x100047C4
      */
-    static const s32 cProfileID_29C;
+    static const s32 cProfileID_KKThunder;
     /**
      * @brief 669
      * @par Address: 0x100047C8
      */
-    static const s32 cProfileID_29D;
+    static const s32 cProfileID_Wanwan;
     /**
      * @brief 670
      * @par Address: 0x100047CC
      */
-    static const s32 cProfileID_29E;
+    static const s32 cProfileID_Polter;
     /**
      * @brief 671
      * @par Address: 0x100047D0
      */
-    static const s32 cProfileID_29F;
+    static const s32 cProfileID_Stand;
     /**
      * @brief 672
      * @par Address: 0x100047D4
      */
-    static const s32 cProfileID_2A0;
+    static const s32 cProfileID_WakiBakubaku;
     /**
      * @brief 673
      * @par Address: 0x100047D8
      */
-    static const s32 cProfileID_2A1;
+    static const s32 cProfileID_Bakubaku;
     /**
      * @brief 674
      * @par Address: 0x100047DC
      */
-    static const s32 cProfileID_2A2;
+    static const s32 cProfileID_Ibaramushi;
     /**
      * @brief 675
      * @par Address: 0x100047E0
      */
-    static const s32 cProfileID_2A3;
+    static const s32 cProfileID_Crow;
     /**
      * @brief 676
      * @par Address: 0x100047E4
      */
-    static const s32 cProfileID_2A4;
+    static const s32 cProfileID_TogeMet;
     /**
      * @brief 677
      * @par Address: 0x100047E8
      */
-    static const s32 cProfileID_2A5;
+    static const s32 cProfileID_GroupTogeMet;
     /**
      * @brief 678
      * @par Address: 0x100047EC
      */
-    static const s32 cProfileID_Bun;
+    static const s32 cProfileID_Bunbun;
     /**
      * @brief 679
      * @par Address: 0x100047F0
      */
-    static const s32 cProfileID_BunW2;
+    static const s32 cProfileID_BunbunW2;
     /**
      * @brief 680
      * @par Address: 0x100047F4
      */
-    static const s32 cProfileID_BunW3;
+    static const s32 cProfileID_BunbunW3;
     /**
      * @brief 681
      * @par Address: 0x100047F8
      */
-    static const s32 cProfileID_BunW4;
+    static const s32 cProfileID_BunbunW4;
     /**
      * @brief 682
      * @par Address: 0x100047FC
      */
-    static const s32 cProfileID_BunW5;
+    static const s32 cProfileID_BunbunW5;
     /**
      * @brief 683
      * @par Address: 0x10004800
      */
-    static const s32 cProfileID_BunW6;
+    static const s32 cProfileID_BunbunW6;
     /**
      * @brief 684
      * @par Address: 0x10004804
      */
-    static const s32 cProfileID_BunDemo;
+    static const s32 cProfileID_BunbunDemo;
     /**
      * @brief 685
      * @par Address: 0x10004808
@@ -4407,7 +4396,7 @@ class ProfileInfo
      * @brief 689
      * @par Address: 0x10004818
      */
-    static const s32 cProfileID_PeachFinalCastleKoopaJrDemo;
+    static const s32 cProfileID_QuakeKoopaJrDemo;
     /**
      * @brief 690
      * @par Address: 0x1000481C
@@ -4432,7 +4421,7 @@ class ProfileInfo
      * @brief 694
      * @par Address: 0x1000482C
      */
-    static const s32 cProfileID_KokoopaSearchFire;
+    static const s32 cProfileID_KokoopaFire;
     /**
      * @brief 695
      * @par Address: 0x10004830
@@ -4452,7 +4441,7 @@ class ProfileInfo
      * @brief 698
      * @par Address: 0x1000483C
      */
-    static const s32 cProfileID_MortonSanboParts;
+    static const s32 cProfileID_MortonSanboEl;
     /**
      * @brief 699
      * @par Address: 0x10004840
@@ -4472,7 +4461,7 @@ class ProfileInfo
      * @brief 702
      * @par Address: 0x1000484C
      */
-    static const s32 cProfileID_LudwigAlterEgo;
+    static const s32 cProfileID_LudwigCopy;
     /**
      * @brief 703
      * @par Address: 0x10004850
@@ -4497,7 +4486,7 @@ class ProfileInfo
      * @brief 707
      * @par Address: 0x10004860
      */
-    static const s32 cProfileID_RoyLiftWaki;
+    static const s32 cProfileID_RoyLift;
     /**
      * @brief 708
      * @par Address: 0x10004864
@@ -4517,12 +4506,12 @@ class ProfileInfo
      * @brief 711
      * @par Address: 0x10004870
      */
-    static const s32 cProfileID_KameckIceConfig;
+    static const s32 cProfileID_KameckIciclePos;
     /**
      * @brief 712
      * @par Address: 0x10004874
      */
-    static const s32 cProfileID_KameckWarpPos;
+    static const s32 cProfileID_KameckPos;
     /**
      * @brief 713
      * @par Address: 0x10004878
@@ -4532,7 +4521,7 @@ class ProfileInfo
      * @brief 714
      * @par Address: 0x1000487C
      */
-    static const s32 cProfileID_PeachFinalCastleKoopaJr;
+    static const s32 cProfileID_QuakeKoopaJr;
     /**
      * @brief 715
      * @par Address: 0x10004880
@@ -4542,7 +4531,7 @@ class ProfileInfo
      * @brief 716
      * @par Address: 0x10004884
      */
-    static const s32 cProfileID_KoopaFireWaki;
+    static const s32 cProfileID_WakiKoopaFire;
     /**
      * @brief 717
      * @par Address: 0x10004888
@@ -4562,7 +4551,7 @@ class ProfileInfo
      * @brief 720
      * @par Address: 0x10004894
      */
-    static const s32 cProfileID_BunDemoKameck;
+    static const s32 cProfileID_BunbunDemoKameck;
     /**
      * @brief 721
      * @par Address: 0x10004898
@@ -4642,7 +4631,7 @@ class ProfileInfo
      * @brief 736
      * @par Address: 0x100048D4
      */
-    static const s32 cProfileID_2E0;
+    static const s32 cProfileID_PeachDemoShadowkun;
     /**
      * @brief 737
      * @par Address: 0x100048D8
@@ -4652,102 +4641,102 @@ class ProfileInfo
      * @brief 738
      * @par Address: 0x100048DC
      */
-    static const s32 cProfileID_FinalDVShutter;
+    static const s32 cProfileID_FinalDVPeachShutter;
     /**
      * @brief 739
      * @par Address: 0x100048E0
      */
-    static const s32 cProfileID_2E3;
+    static const s32 cProfileID_SpModeResDemoPeach;
     /**
      * @brief 740
      * @par Address: 0x100048E4
      */
-    static const s32 cProfileID_2E4;
+    static const s32 cProfileID_KanbanArrow;
     /**
      * @brief 741
      * @par Address: 0x100048E8
      */
-    static const s32 cProfileID_2E5;
+    static const s32 cProfileID_KanbanArrowRDash;
     /**
      * @brief 742
      * @par Address: 0x100048EC
      */
-    static const s32 cProfileID_2E6;
+    static const s32 cProfileID_KanbanArrowRDashEx;
     /**
      * @brief 743
      * @par Address: 0x100048F0
      */
-    static const s32 cProfileID_2E7;
+    static const s32 cProfileID_LuigiKanban;
     /**
      * @brief 744
      * @par Address: 0x100048F4
      */
-    static const s32 cProfileID_2E8;
+    static const s32 cProfileID_LuigiKanbanNine;
     /**
      * @brief 745
      * @par Address: 0x100048F8
      */
-    static const s32 cProfileID_2E9;
+    static const s32 cProfileID_MovingFlower;
     /**
      * @brief 746
      * @par Address: 0x100048FC
      */
-    static const s32 cProfileID_2EA;
+    static const s32 cProfileID_DvputFlower;
     /**
      * @brief 747
      * @par Address: 0x10004900
      */
-    static const s32 cProfileID_2EB;
+    static const s32 cProfileID_NextGotoBlock;
     /**
      * @brief 748
      * @par Address: 0x10004904
      */
-    static const s32 cProfileID_2EC;
+    static const s32 cProfileID_ChangeBlock;
     /**
      * @brief 749
      * @par Address: 0x10004908
      */
-    static const s32 cProfileID_2ED;
+    static const s32 cProfileID_ChangeBlockRDash;
     /**
      * @brief 750
      * @par Address: 0x1000490C
      */
-    static const s32 cProfileID_2EE;
+    static const s32 cProfileID_RedRing;
     /**
      * @brief 751
      * @par Address: 0x10004910
      */
-    static const s32 cProfileID_2EF;
+    static const s32 cProfileID_GreenRing;
     /**
      * @brief 752
      * @par Address: 0x10004914
      */
-    static const s32 cProfileID_2F0;
+    static const s32 cProfileID_PurpleRing;
     /**
      * @brief 753
      * @par Address: 0x10004918
      */
-    static const s32 cProfileID_2F1;
+    static const s32 cProfileID_BlueRing;
     /**
      * @brief 754
      * @par Address: 0x1000491C
      */
-    static const s32 cProfileID_2F2;
+    static const s32 cProfileID_GoalRing;
     /**
      * @brief 755
      * @par Address: 0x10004920
      */
-    static const s32 cProfileID_2F3;
+    static const s32 cProfileID_Fruit;
     /**
      * @brief 756
      * @par Address: 0x10004924
      */
-    static const s32 cProfileID_2F4;
+    static const s32 cProfileID_FruitTree;
     /**
      * @brief 757
      * @par Address: 0x10004928
      */
-    static const s32 cProfileID_2F5;
+    static const s32 cProfileID_HammerBros;
     /**
      * @brief 758
      * @par Address: 0x1000492C
@@ -4757,7 +4746,7 @@ class ProfileInfo
      * @brief 759
      * @par Address: 0x10004930
      */
-    static const s32 cProfileID_2F7;
+    static const s32 cProfileID_BoomerangBros;
     /**
      * @brief 760
      * @par Address: 0x10004934
@@ -4767,7 +4756,7 @@ class ProfileInfo
      * @brief 761
      * @par Address: 0x10004938
      */
-    static const s32 cProfileID_2F9;
+    static const s32 cProfileID_FireBros;
     /**
      * @brief 762
      * @par Address: 0x1000493C
@@ -4777,7 +4766,7 @@ class ProfileInfo
      * @brief 763
      * @par Address: 0x10004940
      */
-    static const s32 cProfileID_2FB;
+    static const s32 cProfileID_IceBros;
     /**
      * @brief 764
      * @par Address: 0x10004944
@@ -4787,7 +4776,7 @@ class ProfileInfo
      * @brief 765
      * @par Address: 0x10004948
      */
-    static const s32 cProfileID_2FD;
+    static const s32 cProfileID_HimanBros;
     /**
      * @brief 766
      * @par Address: 0x1000494C
@@ -4797,212 +4786,212 @@ class ProfileInfo
      * @brief 767
      * @par Address: 0x10004950
      */
-    static const s32 cProfileID_2FF;
+    static const s32 cProfileID_Birikyu;
     /**
      * @brief 768
      * @par Address: 0x10004954
      */
-    static const s32 cProfileID_300;
+    static const s32 cProfileID_ElectricKoopa;
     /**
      * @brief 769
      * @par Address: 0x10004958
      */
-    static const s32 cProfileID_301;
+    static const s32 cProfileID_ElectricSingleKoopa;
     /**
      * @brief 770
      * @par Address: 0x1000495C
      */
-    static const s32 cProfileID_302;
+    static const s32 cProfileID_ElectricShock;
     /**
      * @brief 771
      * @par Address: 0x10004960
      */
-    static const s32 cProfileID_303;
+    static const s32 cProfileID_Koton;
     /**
      * @brief 772
      * @par Address: 0x10004964
      */
-    static const s32 cProfileID_304;
+    static const s32 cProfileID_GroupKoton;
     /**
      * @brief 773
      * @par Address: 0x10004968
      */
-    static const s32 cProfileID_305;
+    static const s32 cProfileID_RotDokanFirePakkun;
     /**
      * @brief 774
      * @par Address: 0x1000496C
      */
-    static const s32 cProfileID_306;
+    static const s32 cProfileID_RotDokanPakkunUp;
     /**
      * @brief 775
      * @par Address: 0x10004970
      */
-    static const s32 cProfileID_307;
+    static const s32 cProfileID_RotDokanPakkunDown;
     /**
      * @brief 776
      * @par Address: 0x10004974
      */
-    static const s32 cProfileID_308;
+    static const s32 cProfileID_RotDokanPakkunLeft;
     /**
      * @brief 777
      * @par Address: 0x10004978
      */
-    static const s32 cProfileID_309;
+    static const s32 cProfileID_RotDokanPakkunRight;
     /**
      * @brief 778
      * @par Address: 0x1000497C
      */
-    static const s32 cProfileID_30A;
+    static const s32 cProfileID_Icicle;
     /**
      * @brief 779
      * @par Address: 0x10004980
      */
-    static const s32 cProfileID_30B;
+    static const s32 cProfileID_IcicleFixed;
     /**
      * @brief 780
      * @par Address: 0x10004984
      */
-    static const s32 cProfileID_30C;
+    static const s32 cProfileID_Teresa;
     /**
      * @brief 781
      * @par Address: 0x10004988
      */
-    static const s32 cProfileID_30D;
+    static const s32 cProfileID_TeresaBig;
     /**
      * @brief 782
      * @par Address: 0x1000498C
      */
-    static const s32 cProfileID_30E;
+    static const s32 cProfileID_TeresaRot;
     /**
      * @brief 783
      * @par Address: 0x10004990
      */
-    static const s32 cProfileID_30F;
+    static const s32 cProfileID_TeresaRotParent;
     /**
      * @brief 784
      * @par Address: 0x10004994
      */
-    static const s32 cProfileID_310;
+    static const s32 cProfileID_TeresaRotParentRDash;
     /**
      * @brief 785
      * @par Address: 0x10004998
      */
-    static const s32 cProfileID_311;
+    static const s32 cProfileID_Kirifuki;
     /**
      * @brief 786
      * @par Address: 0x1000499C
      */
-    static const s32 cProfileID_312;
+    static const s32 cProfileID_KirifukiRDash;
     /**
      * @brief 787
      * @par Address: 0x100049A0
      */
-    static const s32 cProfileID_313;
+    static const s32 cProfileID_Cloud;
     /**
      * @brief 788
      * @par Address: 0x100049A4
      */
-    static const s32 cProfileID_314;
+    static const s32 cProfileID_DarkCloud;
     /**
      * @brief 789
      * @par Address: 0x100049A8
      */
-    static const s32 cProfileID_315;
+    static const s32 cProfileID_CloudLt;
     /**
      * @brief 790
      * @par Address: 0x100049AC
      */
-    static const s32 cProfileID_316;
+    static const s32 cProfileID_BubbleControl;
     /**
      * @brief 791
      * @par Address: 0x100049B0
      */
-    static const s32 cProfileID_317;
+    static const s32 cProfileID_ObjSnow;
     /**
      * @brief 792
      * @par Address: 0x100049B4
      */
-    static const s32 cProfileID_318;
+    static const s32 cProfileID_ObjSpark;
     /**
      * @brief 793
      * @par Address: 0x100049B8
      */
-    static const s32 cProfileID_319;
+    static const s32 cProfileID_TagWind;
     /**
      * @brief 794
      * @par Address: 0x100049BC
      */
-    static const s32 cProfileID_31A;
+    static const s32 cProfileID_TagFrame;
     /**
      * @brief 795
      * @par Address: 0x100049C0
      */
-    static const s32 cProfileID_31B;
+    static const s32 cProfileID_ShadowHouseReadTag;
     /**
      * @brief 796
      * @par Address: 0x100049C4
      */
-    static const s32 cProfileID_31C;
+    static const s32 cProfileID_TitleDemoTag;
     /**
      * @brief 797
      * @par Address: 0x100049C8
      */
-    static const s32 cProfileID_31D;
+    static const s32 cProfileID_LightWater;
     /**
      * @brief 798
      * @par Address: 0x100049CC
      */
-    static const s32 cProfileID_31E;
+    static const s32 cProfileID_CircleLight;
     /**
      * @brief 799
      * @par Address: 0x100049D0
      */
-    static const s32 cProfileID_31F;
+    static const s32 cProfileID_BigShell;
     /**
      * @brief 800
      * @par Address: 0x100049D4
      */
-    static const s32 cProfileID_320;
+    static const s32 cProfileID_LiftZenYokoTomegu;
     /**
      * @brief 801
      * @par Address: 0x100049D8
      */
-    static const s32 cProfileID_321;
+    static const s32 cProfileID_LiftHurikoYoganCenter;
     /**
      * @brief 802
      * @par Address: 0x100049DC
      */
-    static const s32 cProfileID_322;
+    static const s32 cProfileID_Guruguru;
     /**
      * @brief 803
      * @par Address: 0x100049E0
      */
-    static const s32 cProfileID_323;
+    static const s32 cProfileID_Gesso;
     /**
      * @brief 804
      * @par Address: 0x100049E4
      */
-    static const s32 cProfileID_324;
+    static const s32 cProfileID_GessoChild;
     /**
      * @brief 805
      * @par Address: 0x100049E8
      */
-    static const s32 cProfileID_325;
+    static const s32 cProfileID_BaramakiGesso;
     /**
      * @brief 806
      * @par Address: 0x100049EC
      */
-    static const s32 cProfileID_326;
+    static const s32 cProfileID_Nut;
     /**
      * @brief 807
      * @par Address: 0x100049F0
      */
-    static const s32 cProfileID_327;
+    static const s32 cProfileID_StrongBox;
     /**
      * @brief 808
      * @par Address: 0x100049F4
      */
-    static const s32 cProfileID_328;
+    static const s32 cProfileID_StrongBoxKey;
     /**
      * @brief 809
      * @par Address: 0x100049F8
@@ -5012,42 +5001,42 @@ class ProfileInfo
      * @brief 810
      * @par Address: 0x100049FC
      */
-    static const s32 cProfileID_32A;
+    static const s32 cProfileID_YoshiEgg;
     /**
      * @brief 811
      * @par Address: 0x10004A00
      */
-    static const s32 cProfileID_VsBattleItem;
+    static const s32 cProfileID_TottenGoalItem;
     /**
      * @brief 812
      * @par Address: 0x10004A04
      */
-    static const s32 cProfileID_32C;
+    static const s32 cProfileID_TorpedoBase;
     /**
      * @brief 813
      * @par Address: 0x10004A08
      */
-    static const s32 cProfileID_32D;
+    static const s32 cProfileID_SearchTorpedoBase;
     /**
      * @brief 814
      * @par Address: 0x10004A0C
      */
-    static const s32 cProfileID_32E;
+    static const s32 cProfileID_TorpedoTag;
     /**
      * @brief 815
      * @par Address: 0x10004A10
      */
-    static const s32 cProfileID_32F;
+    static const s32 cProfileID_NormalTorpedo;
     /**
      * @brief 816
      * @par Address: 0x10004A14
      */
-    static const s32 cProfileID_330;
+    static const s32 cProfileID_GroupTorpedo;
     /**
      * @brief 817
      * @par Address: 0x10004A18
      */
-    static const s32 cProfileID_331;
+    static const s32 cProfileID_SearchTorpedo;
     /**
      * @brief 818
      * @par Address: 0x10004A1C
@@ -5062,17 +5051,17 @@ class ProfileInfo
      * @brief 820
      * @par Address: 0x10004A24
      */
-    static const s32 cProfileID_UnderwaterKoopaJr;
+    static const s32 cProfileID_WaterKoopaJr;
     /**
      * @brief 821
      * @par Address: 0x10004A28
      */
-    static const s32 cProfileID_UnderwaterKoopaJrClown;
+    static const s32 cProfileID_WaterKoopaJrClown;
     /**
      * @brief 822
      * @par Address: 0x10004A2C
      */
-    static const s32 cProfileID_UnderwaterKoopaJrRetreatPos;
+    static const s32 cProfileID_WaterKoopaJrPos;
     /**
      * @brief 823
      * @par Address: 0x10004A30
@@ -5082,17 +5071,17 @@ class ProfileInfo
      * @brief 824
      * @par Address: 0x10004A34
      */
-    static const s32 cProfileID_BoxingKoopaJrPostBattleDemo;
+    static const s32 cProfileID_DemoBoxingKoopaJr;
     /**
      * @brief 825
      * @par Address: 0x10004A38
      */
-    static const s32 cProfileID_BoxingKoopaJrClownPostBattleDemo;
+    static const s32 cProfileID_DemoBoxingKoopaJrClown;
     /**
      * @brief 826
      * @par Address: 0x10004A3C
      */
-    static const s32 cProfileID_MiniGamePanelItem;
+    static const s32 cProfileID_MiniGamePanel;
     /**
      * @brief 827
      * @par Address: 0x10004A40
@@ -5102,12 +5091,12 @@ class ProfileInfo
      * @brief 828
      * @par Address: 0x10004A44
      */
-    static const s32 cProfileID_CoinmakiCannon;
+    static const s32 cProfileID_CoinMakiCannon;
     /**
      * @brief 829
      * @par Address: 0x10004A48
      */
-    static const s32 cProfileID_CoinmakiItem;
+    static const s32 cProfileID_CoinMakiItem;
     /**
      * @brief 830
      * @par Address: 0x10004A4C
@@ -5117,52 +5106,52 @@ class ProfileInfo
      * @brief 831
      * @par Address: 0x10004A50
      */
-    static const s32 cProfileID_33F;
+    static const s32 cProfileID_PeaPlant;
     /**
      * @brief 832
      * @par Address: 0x10004A54
      */
-    static const s32 cProfileID_340;
+    static const s32 cProfileID_DokanJoint;
     /**
      * @brief 833
      * @par Address: 0x10004A58
      */
-    static const s32 cProfileID_341;
+    static const s32 cProfileID_DokanJointMame;
     /**
      * @brief 834
      * @par Address: 0x10004A5C
      */
-    static const s32 cProfileID_342;
+    static const s32 cProfileID_GoalKinokoHouse;
     /**
      * @brief 835
      * @par Address: 0x10004A60
      */
-    static const s32 cProfileID_343;
+    static const s32 cProfileID_WaterEffectFilter;
     /**
      * @brief 836
      * @par Address: 0x10004A64
      */
-    static const s32 cProfileID_344;
+    static const s32 cProfileID_WaterEffectFilterRDash;
     /**
      * @brief 837
      * @par Address: 0x10004A68
      */
-    static const s32 cProfileID_345;
+    static const s32 cProfileID_WaterBubble;
     /**
      * @brief 838
      * @par Address: 0x10004A6C
      */
-    static const s32 cProfileID_346;
+    static const s32 cProfileID_FlyingPlayerReferTag;
     /**
      * @brief 839
      * @par Address: 0x10004A70
      */
-    static const s32 cProfileID_347;
+    static const s32 cProfileID_PlayerSidePressTag;
     /**
      * @brief 840
      * @par Address: 0x10004A74
      */
-    static const s32 cProfileID_StaffRollChibiYoshiChar;
+    static const s32 cProfileID_StaffRollChibiYoshiBubble;
     /**
      * @brief 841
      * @par Address: 0x10004A78
@@ -5172,7 +5161,7 @@ class ProfileInfo
      * @brief 842
      * @par Address: 0x10004A7C
      */
-    static const s32 cProfileID_StaffRollChibiYoshiBalloonCheer;
+    static const s32 cProfileID_StaffRollChibiYoshiBalloonEndGlad;
     /**
      * @brief 843
      * @par Address: 0x10004A80
@@ -5182,47 +5171,47 @@ class ProfileInfo
      * @brief 844
      * @par Address: 0x10004A84
      */
-    static const s32 cProfileID_StaffRollChibiYoshiLightCheer;
+    static const s32 cProfileID_StaffRollChibiYoshiLightEndGlad;
     /**
      * @brief 845
      * @par Address: 0x10004A88
      */
-    static const s32 cProfileID_StaffRollAwaChar;
+    static const s32 cProfileID_StaffRollChibiBubbleLetter;
     /**
      * @brief 846
      * @par Address: 0x10004A8C
      */
-    static const s32 cProfileID_StaffRollAwaCoin;
+    static const s32 cProfileID_StaffRollChibiBubbleExtra;
     /**
      * @brief 847
      * @par Address: 0x10004A90
      */
-    static const s32 cProfileID_StaffRollTottenKun;
+    static const s32 cProfileID_StaffRollShadowkun;
     /**
      * @brief 848
      * @par Address: 0x10004A94
      */
-    static const s32 cProfileID_350;
+    static const s32 cProfileID_DrcTouchLight;
     /**
      * @brief 849
      * @par Address: 0x10004A98
      */
-    static const s32 cProfileID_351;
+    static const s32 cProfileID_TouchNonActor;
     /**
      * @brief 850
      * @par Address: 0x10004A9C
      */
-    static const s32 cProfileID_352;
+    static const s32 cProfileID_EditCoinActorSetTag;
     /**
      * @brief 851
      * @par Address: 0x10004AA0
      */
-    static const s32 cProfileID_353;
+    static const s32 cProfileID_FeverEffectActor;
     /**
      * @brief 852
      * @par Address: 0x10004AA4
      */
-    static const s32 cProfileID_RealizeFeverStar;
+    static const s32 cProfileID_FeverStar;
     /**
      * @brief 853
      * @par Address: 0x10004AA8
@@ -5237,12 +5226,12 @@ class ProfileInfo
      * @brief 855 (CS Player 2, 3 or 4)
      * @par Address: 0x10004AB0
      */
-    static const s32 cProfileID_CourseSelectPlayer2PSub;
+    static const s32 cProfileID_CourseSelectPlayer2P;
     /**
      * @brief 856
      * @par Address: 0x10004AB4
      */
-    static const s32 cProfileID_CourseSelectChibiYoshi;
+    static const s32 cProfileID_CourseSelectPlayerEgg;
     /**
      * @brief 857
      * @par Address: 0x10004AB8
@@ -5292,17 +5281,17 @@ class ProfileInfo
      * @brief 866
      * @par Address: 0x10004ADC
      */
-    static const s32 cProfileID_CourseSelectWorldMoveDokan;
+    static const s32 cProfileID_CourseSelectWarpCannon;
     /**
      * @brief 867
      * @par Address: 0x10004AE0
      */
-    static const s32 cProfileID_CourseSelectW8Cloud;
+    static const s32 cProfileID_CourseSelectW8DarkCloud;
     /**
      * @brief 868
      * @par Address: 0x10004AE4
      */
-    static const s32 cProfileID_CourseSelectGhost;
+    static const s32 cProfileID_CourseSelectGhostHouse;
     /**
      * @brief 869 (The Japanese Profile name says "Hammer Bros" LOL)
      * @par Address: 0x10004AE8
@@ -5312,47 +5301,47 @@ class ProfileInfo
      * @brief 870
      * @par Address: 0x10004AEC
      */
-    static const s32 cProfileID_CourseSelectShipW1;
+    static const s32 cProfileID_CourseSelectShipLemmy;
     /**
      * @brief 871
      * @par Address: 0x10004AF0
      */
-    static const s32 cProfileID_CourseSelectShipW2;
+    static const s32 cProfileID_CourseSelectShipMorton;
     /**
      * @brief 872
      * @par Address: 0x10004AF4
      */
-    static const s32 cProfileID_CourseSelectShipW3;
+    static const s32 cProfileID_CourseSelectShipLarry;
     /**
      * @brief 873
      * @par Address: 0x10004AF8
      */
-    static const s32 cProfileID_CourseSelectShipW4;
+    static const s32 cProfileID_CourseSelectShipWendy;
     /**
      * @brief 874
      * @par Address: 0x10004AFC
      */
-    static const s32 cProfileID_CourseSelectShipW5;
+    static const s32 cProfileID_CourseSelectShipIggy;
     /**
      * @brief 875
      * @par Address: 0x10004B00
      */
-    static const s32 cProfileID_CourseSelectShipW6;
+    static const s32 cProfileID_CourseSelectShipRoy;
     /**
      * @brief 876
      * @par Address: 0x10004B04
      */
-    static const s32 cProfileID_CourseSelectShipW7;
+    static const s32 cProfileID_CourseSelectShipLudwig;
     /**
      * @brief 877
      * @par Address: 0x10004B08
      */
-    static const s32 cProfileID_CourseSelectShipW8;
+    static const s32 cProfileID_CourseSelectShipKoopaJr;
     /**
      * @brief 878
      * @par Address: 0x10004B0C
      */
-    static const s32 cProfileID_CourseSelectShipW8Broken;
+    static const s32 cProfileID_CourseSelectShipBoroKoopaJr;
     /**
      * @brief 879
      * @par Address: 0x10004B10
@@ -5392,12 +5381,12 @@ class ProfileInfo
      * @brief 886
      * @par Address: 0x10004B2C
      */
-    static const s32 cProfileID_CourseSelectShadowFirstDemoKinopio;
+    static const s32 cProfileID_CourseSelectReportKinopio;
     /**
      * @brief 887
      * @par Address: 0x10004B30
      */
-    static const s32 cProfileID_CourseSelectTobiPuku;
+    static const s32 cProfileID_CourseSelectTobipuku;
     /**
      * @brief 888
      * @par Address: 0x10004B34
@@ -5417,7 +5406,7 @@ class ProfileInfo
      * @brief 891
      * @par Address: 0x10004B40
      */
-    static const s32 cProfileID_CourseSelectFlag;
+    static const s32 cProfileID_CourseSelectFlagPeach;
     /**
      * @brief 892
      * @par Address: 0x10004B44
@@ -5427,7 +5416,7 @@ class ProfileInfo
      * @brief 893
      * @par Address: 0x10004B48
      */
-    static const s32 cProfileID_CourseSelectWPillar;
+    static const s32 cProfileID_CourseSelectWaterPillar;
     /**
      * @brief 894
      * @par Address: 0x10004B4C
@@ -5442,7 +5431,7 @@ class ProfileInfo
      * @brief 896
      * @par Address: 0x10004B54
      */
-    static const s32 cProfileID_CourseSelectPenguin;
+    static const s32 cProfileID_CourseSelectPentaro;
     /**
      * @brief 897
      * @par Address: 0x10004B58
@@ -5462,7 +5451,7 @@ class ProfileInfo
      * @brief 900
      * @par Address: 0x10004B64
      */
-    static const s32 cProfileID_CourseSelectShadowKunIcon;
+    static const s32 cProfileID_CourseSelectShadowIcon;
     /**
      * @brief 901
      * @par Address: 0x10004B68
@@ -5477,12 +5466,12 @@ class ProfileInfo
      * @brief 903
      * @par Address: 0x10004B70
      */
-    static const s32 cProfileID_CourseSelectShadowFirstDemoShadowKun;
+    static const s32 cProfileID_CourseSelectShadowkun;
     /**
      * @brief 904
      * @par Address: 0x10004B74
      */
-    static const s32 cProfileID_CourseSelectKotsuCoaster;
+    static const s32 cProfileID_CourseSelectLineTrain;
     /**
      * @brief 905
      * @par Address: 0x10004B78
@@ -5508,4 +5497,19 @@ class ProfileInfo
      * @par Address: 0x10004B88
      */
     static const s32 cProfileID_CourseSelectEventAssistant;
+    /**
+     * @brief 910
+     * @par Address: Deleted
+     */
+    static const s32 cProfileID_SampleActor;
+    /**
+     * @brief 911
+     * @par Address: Deleted
+     */
+    static const s32 cProfileID_SampleChildActor;
+    /**
+     * @brief 912
+     * @par Address: Deleted
+     */
+    static const s32 cProfileID_SampleTag;
 };
diff --git a/actor/PropelParts.h b/actor/PropelParts.h
index 1ab11e4d..52c22bde 100644
--- a/actor/PropelParts.h
+++ b/actor/PropelParts.h
@@ -10,11 +10,24 @@ class Actor;
 class PropelParts
 {
 public:
-    class Part
+    class PropelEffect
     {
     public:
+        enum EffectType
+        {
+        };
+
         // Address: 0x020271B8
-        Part();
+        PropelEffect();
+
+        // Address: 0x020272CC
+        void initialize(EffectType type, bool is_player, s32 player_no);
+
+        // Address: 0x02027660
+        void createEffect();
+
+        // Address: 0x0202766C
+        void update(const sead::Vector3f& position);
 
     private:
         s32         mIndex;
@@ -24,15 +37,14 @@ class PropelParts
         bool        mIsForPlayer;
         u8          _75;
     };
-    static_assert(sizeof(Part) == 0x78);
+    static_assert(sizeof(PropelEffect) == 0x78);
 
+public:
     enum Mode
     {
         cMode_Num = 7
     };
-    static_assert(sizeof(Mode) == 4);
 
-public:
     // Address: 0x0202722C
     PropelParts();
 
@@ -43,14 +55,23 @@ class PropelParts
     // Address: 0x020272DC
     void create(Actor* owner);
 
+    // Address: 0x02027390
+    void update();
+
     // Address: 0x02027790
-    void setSpinEffect(const sead::Matrixf& mtx);
+    void updateEffect(const sead::Matrixf& mtx);
+
+    // Address: 0x02027868
+    bool isMode(Mode mode);
+
+    // Address: 0x0202787C
+    void finalizePropelFly(Angle angle);
 
 private:
-    Actor*                      mOwner;
-    Mode                        mMode;
-    Angle                       mRollSpeed;
-    f32                         mScale;
-    sead::SafeArray<Part, 3>    mParts;
+    Actor*                              mOwner;
+    Mode                                mMode;
+    Angle                               mRollSpeed;
+    f32                                 mScale;
+    sead::SafeArray<PropelEffect, 3>    mPropelEffect;
 };
-static_assert(sizeof(PropelParts) == 0x17C);
+static_assert(sizeof(PropelParts) == 0x17C, "PropelParts size mismatch");
diff --git a/actor/ScoreMgr.h b/actor/ScoreMgr.h
index fa54dbd2..d4a5eb6a 100644
--- a/actor/ScoreMgr.h
+++ b/actor/ScoreMgr.h
@@ -93,31 +93,53 @@ class ScoreMgr
      * @brief 0.0f
      * @par Address: 0x10004E20
      */
-    static const f32 cScoreX;
+    static const f32 cScoreDispXPos;
     /**
      * @brief 24.0f
      * @par Address: 0x10004E24
      */
-    static const f32 cScoreY;
+    static const f32 cScoreDispYPos;
 
 public:
     // Address: 0x020279E0
     ScoreMgr();
 
+    // Address: Deleted
+    void allOneUpSmallScore(const sead::Vector3f& pos);
+    // Address: 0x02027A8C
+    void addPlayerRest(s32 player_no, s32, bool sound);
     // Address: 0x02027BD8
-    void incRestAll(bool sound);
+    void setAllOneUp(bool sound);
+    // Address: 0x0202821C
+    void setEntryAllPlayerOneUp(bool sound);
+    // Address: Deleted
+    void setEntryPlayerOneUp_(s32 player_no, bool sound);
+    // Address: 0x02028140
+    void playerScoreSet(u32 type, s32 player_no, bool sound);
+    // Address: 0x0202839C
+    void setAllPlayerOneUpForZorome(f32 small_score_offset_y, bool sound);
+    // Address: 0x020282E0
+    void setPlayerOneUpForZorome_(s32 player_no, f32*, bool sound);
+    // Address: Deleted
+    void baloonPlayerSetOneUpForZorome_(s32 player_no, f32, bool sound);
     // Address: 0x02027C80
-    void ScoreSet(const sead::Vector3f& small_score_pos, ScoreType type, s32 player_no, bool rest_sound = true);
+    void scoreSet(const sead::Vector3f& pos, u32 type, s32 player_no, bool);
     // Address: 0x02027DA8
-    void ScoreSet(Actor* actor_for_small_score_pos, ScoreType type, s32 player_no, f32 small_score_offset_x = cScoreX, f32 small_score_offset_y = cScoreY);
+    void chengePosScoreSet(Actor* actor_for_small_score_pos, u32 type, s32 player_no, f32 small_score_offset_x = cScoreDispXPos, f32 small_score_offset_y = cScoreDispYPos);
     // Address: 0x02027DF4
-    void ScoreSet2(const sead::Vector3f& small_score_pos, ScoreType type, s32 player_no);
+    void comboScoreSet(const sead::Vector3f& small_score_pos, u32 type, s32 player_no);
     // Address: 0x02027EBC
-    void ScoreSet2(Actor* actor_for_small_score_pos, ScoreType type, s32 player_no, f32 small_score_offset_x = cScoreX, f32 small_score_offset_y = cScoreY);
+    void chengePosComboScoreSet(const Actor* actor_for_small_score_pos, u32 type, s32 player_no, f32 small_score_offset_x = cScoreDispXPos, f32 small_score_offset_y = cScoreDispYPos);
     // Address: 0x02027F04
-    void UnKnownScoreCreate(const sead::Vector3f& small_score_pos, ScoreType type);
+    void unKnownScoreSet(const sead::Vector3f& small_score_pos, u32 type);
     // Address: 0x02027FCC
-    void UnKnownScoreSet(Actor* actor_for_small_score_pos, ScoreType type, f32 small_score_offset_x = 0.0f, f32 small_score_offset_y = 24.0f);
-    // Address: 0x0202821C
-    void incRestAllWithSmallScore(bool sound);
+    void chengePosUnKnownScoreSet(const Actor* actor_for_small_score_pos, u32 type, f32 small_score_offset_x = 0.0f, f32 small_score_offset_y = 24.0f);
+    // Address: Deleted
+    void miniGameScoreSet(const sead::Vector3f&, u32 type, s32 player_no);
+    // Address: 0x02028014
+    bool getScorePlayerHeadPos(sead::Vector3f& pos, s32 player_no);
+    // Address: Deleted
+    void goalComboScoreSet(sead::Vector3f& pos, u32 type, s32 player_no);
+    // Address: Deleted
+    void chengePosGoalComboScoreSet(const Actor*, u32 type, s32 player_no, f32, f32);
 };
diff --git a/actor/ActorUniqueID.h b/actor/UniqueID.h
similarity index 76%
rename from actor/ActorUniqueID.h
rename to actor/UniqueID.h
index 0792dfb8..bfcee205 100644
--- a/actor/ActorUniqueID.h
+++ b/actor/UniqueID.h
@@ -9,40 +9,40 @@
  *          counter. This ensures that recycled array slots are never misidentified
  *          as the original actor.
  */
-class ActorUniqueID
+class UniqueID
 {
 public:
     /// Represents an invalid or uninitialized ID.
     static const u32 cInvalidID         = 0;
     /// The maximum allowed array index (10 bits; 1023).
-    static const u32 cArrayIndexMax     = 0x3ff;
+    static const u32 cArrayIndexMax     = 0x3FF;
     /// The maximum allowed global create index (22 bits; 4,194,303)
-    static const u32 cCreateIndexMax    = 0x3fffff;
+    static const u32 cCreateIndexMax    = 0x3FFFFF;
 
 public:
     /**
-     * @brief Constructs an invalid ActorUniqueID.
+     * @brief Constructs an invalid UniqueID.
      */
-    ActorUniqueID()
+    UniqueID()
     {
         setValue(cInvalidID);
     }
 
     /**
-     * @brief Constructs an ActorUniqueID from a raw 32-bit packed value containing both the array index and create index.
+     * @brief Constructs an UniqueID from a raw 32-bit packed value containing both the array index and create index.
      * @param id The raw 32-bit representation of the desired ID to create.
      */
-    explicit ActorUniqueID(u32 id)
+    explicit UniqueID(u32 id)
     {
         setValue(id);
     }
 
     /**
-     * @brief Constructs an ActorUniqueID by packing a physical index and a global generation index.
+     * @brief Constructs an UniqueID by packing a physical index and a global generation index.
      * @param i_array_index The 10-bit physical index in the ActorPtrCache array.
      * @param i_create_index The 22-bit global generation counter.
      */
-    ActorUniqueID(u32 i_array_index, u32 i_create_index)
+    UniqueID(u32 i_array_index, u32 i_create_index)
     {
         setValue(i_array_index, i_create_index);
     }
@@ -111,23 +111,22 @@ class ActorUniqueID
     }
 
     /**
-     * @brief Compares two ActorUniqueIDs for equality.
+     * @brief Compares two UniqueIDs for equality.
      */
-    friend bool operator==(const ActorUniqueID& lhs, const ActorUniqueID& rhs)
+    friend bool operator==(const UniqueID& lhs, const UniqueID& rhs)
     {
         return lhs.mValue == rhs.mValue;
     }
 
     /**
-    * @brief Compares two ActorUniqueIDs for inequality.
+    * @brief Compares two UniqueIDs for inequality.
     */
-    friend bool operator!=(const ActorUniqueID& lhs, const ActorUniqueID& rhs)
+    friend bool operator!=(const UniqueID& lhs, const UniqueID& rhs)
     {
         return lhs.mValue != rhs.mValue;
     }
 
 private:
-    /// The raw 32-bit packed value containing both the array index and create index.
-    u32 mValue;
+    u32 mValue; ///< The raw 32-bit packed value containing both the array index and create index.
 };
-static_assert(sizeof(ActorUniqueID) == 4);
+static_assert(sizeof(UniqueID) == 0x4, "UniqueID size mismatch");
diff --git a/ami/AmiUtil.h b/actor/ZposPriority.h
similarity index 53%
rename from ami/AmiUtil.h
rename to actor/ZposPriority.h
index f9d9167b..8e9f9bbe 100644
--- a/ami/AmiUtil.h
+++ b/actor/ZposPriority.h
@@ -2,9 +2,9 @@
 
 #include <prim/seadBitFlag.h>
 
-class AmiUtil
+class ZposPriority
 {
 public:
     // Address: 0x0202852C
-    static f32 getZpos(const sead::BitFlag8& flag);
+    static f32 getWireZpos(const sead::BitFlag8& flag);
 };
diff --git a/boss/Boss.h b/boss/Boss.h
index bc9810a2..c81b1c52 100644
--- a/boss/Boss.h
+++ b/boss/Boss.h
@@ -25,7 +25,7 @@ class Boss : public Enemy
 
 public:
     // Address: 0x0202B968
-    Boss(const ActorCreateParam& param);
+    Boss(const ActorCreateParameter& param);
 
 protected:
     // Address: 0x0202BB68
@@ -573,7 +573,7 @@ class Boss : public Enemy
     >                           _1890;
     GameAudio::AudioObjctEmy    mAudioObj;
     s16                         mAudioObjSeqVar;
-    AttentionLookat             mAttentionLookat;
+    AttentionInfo             mAttentionLookat;
     EnemyBoyoMgr                mBoyoMgr;
     ActorCollisionCheck         mCollisionCheckDrcTouch;    // Maybe?
     BossDrcTouchCB              mDrcTouchCallback;
diff --git a/boss/BossDemo.h b/boss/BossDemo.h
index 827dbef0..c90cbebf 100644
--- a/boss/BossDemo.h
+++ b/boss/BossDemo.h
@@ -13,7 +13,7 @@ class BossDemo : public ActorState
 
 public:
     // Address: 0x0202E448
-    BossDemo(const ActorCreateParam& param);
+    BossDemo(const ActorCreateParameter& param);
     ~BossDemo() override { }
 
 protected:
@@ -101,7 +101,7 @@ class BossDemo : public ActorState
     u8              mIsClear;
     u32             _17cc;
     u32             mBattleEdDemoState;
-    ActorUniqueID   mBossID;
+    UniqueID   mBossID;
     s32             mIdleTimer;         // A counter value that can be used freely in executeState_BattleStDemo and/or executeState_BattleEdDemo
     bool            _17dc;
     bool            mSkipKameckAtSt;    // Encountering the boss with this set to true will skip the Kameck laugh cutscene (useful when re-encountering the boss after dying mid-fight)
diff --git a/bullet/FireBallBase.h b/bullet/FireBallBase.h
index 6e1bd7ac..670d052c 100644
--- a/bullet/FireBallBase.h
+++ b/bullet/FireBallBase.h
@@ -6,8 +6,8 @@
 #include <audio/GameAudio.h>
 #include <collision/BgCollisionCheckHitResult.h>
 #include <map_obj/MaskDraw.h>
-#include <actor/EatData.h>
-#include <actor/ChibiYoshiEatData.h>
+#include <actor/EatCallback.h>
+#include <actor/ChibiEatCallback.h>
 #include <effect/EffectObj.h>
 #include <graphics/Light.h>
 
@@ -32,7 +32,7 @@ class FireBallBase : public ActorState
 
 public:
     // Address: 0x0216FED0
-    FireBallBase(const ActorCreateParam& param);
+    FireBallBase(const ActorCreateParameter& param);
     ~FireBallBase() override { }
 
     // Address: 0x0217001C
@@ -153,8 +153,8 @@ class FireBallBase : public ActorState
 protected:
     CircleLightMask             mLightMask;
     f32                         mLightRadius;
-    EatData                     mEatData;
-    ChibiYoshiEatData           mChibiEatData;
+    EatCallback                     mEatData;
+    ChibiEatCallback           mChibiEatData;
     sead::Vector3f              _183c;
     sead::Vector3f              _1848;
     bool                        mIsKill;
diff --git a/bullet/FireBallBros.h b/bullet/FireBallBros.h
index e66b61ec..d7440546 100644
--- a/bullet/FireBallBros.h
+++ b/bullet/FireBallBros.h
@@ -13,7 +13,7 @@ class FireBallBros : public FireBallBase
 
 public:
     // Address: 0x021719B4
-    FireBallBros(const ActorCreateParam& param);
+    FireBallBros(const ActorCreateParameter& param);
 
     // Address: 0x02171A34
     static void collcheck(ActorCollisionCheck* cc_self, ActorCollisionCheck* cc_other);
diff --git a/bullet/IceBallBase.h b/bullet/IceBallBase.h
index 6a1042e2..50f9a853 100644
--- a/bullet/IceBallBase.h
+++ b/bullet/IceBallBase.h
@@ -4,8 +4,8 @@
 #include <collision/ActorCollisionDrcTouchCallback.h>
 #include <state/FStateVirtualID.h>
 #include <audio/GameAudio.h>
-#include <actor/EatData.h>
-#include <actor/ChibiYoshiEatData.h>
+#include <actor/EatCallback.h>
+#include <actor/ChibiEatCallback.h>
 #include <map_obj/MaskDraw.h>
 #include <effect/EffectObj.h>
 #include <graphics/Light.h>
@@ -31,7 +31,7 @@ class IceBallBase : public ActorState
 
 public:
     // Address: 0x0217FA5C
-    IceBallBase(const ActorCreateParam& param);
+    IceBallBase(const ActorCreateParameter& param);
     ~IceBallBase() override { }
 
     // Address: 0x0217FB8C
@@ -120,8 +120,8 @@ class IceBallBase : public ActorState
     u32                         _17cc;
     sead::Vector3f              _17d0;
     u32                         mKillTimer;
-    EatData                     mEatData;
-    ChibiYoshiEatData           mChibiEatData;
+    EatCallback                     mEatData;
+    ChibiEatCallback           mChibiEatData;
     CircleLightMask             mLightMask;
     f32                         mLightRadius;
     Angle3                      mEffectAngle;
diff --git a/bullet/IceBallBros.h b/bullet/IceBallBros.h
index d43fae3d..2779a77d 100644
--- a/bullet/IceBallBros.h
+++ b/bullet/IceBallBros.h
@@ -13,7 +13,7 @@ class IceBallBros : public IceBallBase
 
 public:
     // Address: 0x02180EEC
-    IceBallBros(const ActorCreateParam& param);
+    IceBallBros(const ActorCreateParameter& param);
 
     // Address: 0x02180F70
     static void collcheck(ActorCollisionCheck* cc_self, ActorCollisionCheck* cc_other);
diff --git a/bullet/IceBallPakkun.h b/bullet/IceBallPakkun.h
index 4ad729be..d864dc79 100644
--- a/bullet/IceBallPakkun.h
+++ b/bullet/IceBallPakkun.h
@@ -5,19 +5,19 @@
 class IceBallPakkun : public IceBallBase
 {
 public:
-    void setExludeActor(const ActorUniqueID& id)
+    void setExludeActor(const UniqueID& id)
     {
         mExcludeActor = id;
     }
 
-    const ActorUniqueID& getExcludeActor() const
+    const UniqueID& getExcludeActor() const
     {
         return mExcludeActor;
     }
 
 protected:
     u8              _1a40;
-    ActorUniqueID   mExcludeActor;
+    UniqueID   mExcludeActor;
     u32             _1a48[(0x1A50 - 0x1A48) / sizeof(u32)];
 };
 static_assert(sizeof(IceBallPakkun) == 0x1A50);
diff --git a/collision/ActorBgCollisionCheck.h b/collision/ActorBgCollisionCheck.h
index c59e7ce0..481f76f8 100644
--- a/collision/ActorBgCollisionCheck.h
+++ b/collision/ActorBgCollisionCheck.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 #include <collision/ActorBgHitCheckCallback.h>
 #include <collision/BasicBgCollisionCheck.h>
 #include <collision/BgCollisionCat.h>
@@ -43,7 +43,7 @@ class ActorBgCollisionCheckResult
     Angle           mAngle;
     sead::Vector2f  _c;
     sead::Vector2f  _14;
-    ActorUniqueID   mActorUniqueID;
+    UniqueID   mActorUniqueID;
     BgCollision*    mOwner;
   //u32             _24[4 / sizeof(u32)];   // Alignment???
     u64             mBgCheckData;           // See BgUnitCode
diff --git a/course_select/CourseSelectActor.h b/course_select/CourseSelectActor.h
index b35b90c5..79f5b5b9 100644
--- a/course_select/CourseSelectActor.h
+++ b/course_select/CourseSelectActor.h
@@ -44,7 +44,7 @@ class CourseSelectActor : public ActorBase
 
 protected:
     // Address: 0x021B2310
-    CourseSelectActor(const ActorCreateParam& param);
+    CourseSelectActor(const ActorCreateParameter& param);
     // Address: 0x021B35A4
     ~CourseSelectActor() override;
     
diff --git a/course_select/CourseSelectCollisionCheck.h b/course_select/CourseSelectCollisionCheck.h
index c0cb0ff6..84c5baff 100644
--- a/course_select/CourseSelectCollisionCheck.h
+++ b/course_select/CourseSelectCollisionCheck.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 #include <math/seadVector.h>
 
 class CourseSelectActor; // TODO: This might be CourseSelectEnemy instead
@@ -32,12 +32,12 @@ class CourseSelectCollisionCheck
     // Address: //!!!
     void set(CourseSelectActor* owner, const CollisionData& collision_data);
 
-    ActorUniqueID& getOwnerID()
+    UniqueID& getOwnerID()
     {
         return mOwnerID;
     }
     
-    const ActorUniqueID& getOwnerID() const
+    const UniqueID& getOwnerID() const
     {
         return mOwnerID;
     }
@@ -79,7 +79,7 @@ class CourseSelectCollisionCheck
     }
     
 private:
-    ActorUniqueID mOwnerID;
+    UniqueID mOwnerID;
     u32 _4;
     CollisionData mCollisionData;
 };
diff --git a/course_select/CourseSelectCoursePoint.h b/course_select/CourseSelectCoursePoint.h
index 56f04042..9177ffb0 100644
--- a/course_select/CourseSelectCoursePoint.h
+++ b/course_select/CourseSelectCoursePoint.h
@@ -23,7 +23,7 @@ class CourseSelectCoursePoint : public CourseSelectObjActor
 
 protected:
     // Address: 0x021C9900
-    CourseSelectCoursePoint(const ActorCreateParam& param);
+    CourseSelectCoursePoint(const ActorCreateParameter& param);
     // Address: 0x021CC17C
     ~CourseSelectCoursePoint() override;
 
diff --git a/course_select/CourseSelectDemoActor.h b/course_select/CourseSelectDemoActor.h
index 773631b8..f4d65da3 100644
--- a/course_select/CourseSelectDemoActor.h
+++ b/course_select/CourseSelectDemoActor.h
@@ -21,7 +21,7 @@ class CourseSelectDemoActor : public CourseSelectActor
 
 protected:
     // Address: 0x021D4CB4
-    CourseSelectDemoActor(const ActorCreateParam& param);
+    CourseSelectDemoActor(const ActorCreateParameter& param);
     // Address: 0x021D5838
     ~CourseSelectDemoActor() override;
 
diff --git a/course_select/CourseSelectObjActor.h b/course_select/CourseSelectObjActor.h
index 295342c9..bf87cf13 100644
--- a/course_select/CourseSelectObjActor.h
+++ b/course_select/CourseSelectObjActor.h
@@ -10,7 +10,7 @@ class CourseSelectObjActor : public CourseSelectDemoActor   // vtbl: Address: 0x
 
 protected:
     // Address: 0x02201C04
-    CourseSelectObjActor(const ActorCreateParam& param);
+    CourseSelectObjActor(const ActorCreateParameter& param);
     // Address: 0x02201D08
     ~CourseSelectObjActor() override;
 
diff --git a/enemy/Birikyu.h b/enemy/Birikyu.h
index d40f1790..bc3fad1d 100644
--- a/enemy/Birikyu.h
+++ b/enemy/Birikyu.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <actor/ChibiYoshiEatData.h>
-#include <actor/EatData.h>
+#include <actor/ChibiEatCallback.h>
+#include <actor/EatCallback.h>
 #include <actor/Profile.h>
 #include <collision/ActorCollisionDrcTouchCallback.h>
 #include <effect/EffectObj.h>
@@ -27,10 +27,10 @@ class Birikyu : public Enemy
 {
 public:
     // Address: 0x1005CC30
-    static const ActorCreateInfo cActorCreateInfo;
+    static const ActorData cActorCreateInfo;
 
 public:
-    Birikyu(const ActorCreateParam& param)
+    Birikyu(const ActorCreateParameter& param)
         : Enemy(param)
         , _18fc(0)
         , _1900(0.0f)
@@ -115,8 +115,8 @@ class Birikyu : public Enemy
     s32                 mAttackTimer;
     u32                 _18fc;
     f32                 _1900;
-    EatData             mEatData;
-    ChibiYoshiEatData   mChibiYoshiEatData;
+    EatCallback             mEatData;
+    ChibiEatCallback   mChibiYoshiEatData;
     Light               mLight;
     u8                  _1994; // bool?
     ActorCollisionCheck mCollisionCheck2;
diff --git a/enemy/Bomhei.h b/enemy/Bomhei.h
index 7eba8360..b501ac45 100644
--- a/enemy/Bomhei.h
+++ b/enemy/Bomhei.h
@@ -41,11 +41,11 @@ class Bomhei : public CarryEnemy
 
 public:
     // Address: 0x1005D49C
-    static const ActorCreateInfo cActorCreateInfo;
+    static const ActorData cActorCreateInfo;
 
 public:
     // Address: 0x022D0334
-    Bomhei(const ActorCreateParam& param);
+    Bomhei(const ActorCreateParameter& param);
     virtual ~Bomhei() { }
 
 protected:
diff --git a/enemy/BrosBase.h b/enemy/BrosBase.h
index c775b7eb..834a9525 100644
--- a/enemy/BrosBase.h
+++ b/enemy/BrosBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <actor/EatData.h>
+#include <actor/EatCallback.h>
 #include <collision/ActorBgCollisionEnemyCheck.h>
 #include <collision/ActorCollisionDrcTouchCallback.h>
 #include <effect/EffectObj.h>
@@ -31,7 +31,7 @@ class BrosBase : public Enemy
 
 public:
     // Address: 0x022DA0AC
-    BrosBase(const ActorCreateParam& param);
+    BrosBase(const ActorCreateParameter& param);
 
     ~BrosBase() override
     {
@@ -272,10 +272,10 @@ class BrosBase : public Enemy
     u32                         _19a0;
     sead::Vector3f              mStartPos;
     u8                          mMoveDir;
-    ActorUniqueID               mWeaponID;              // I think?
+    UniqueID               mWeaponID;              // I think?
     bool                        _19b8;
     EffectObj                   mEffect;
-    EatData                     mEatData;
+    EatCallback                     mEatData;
     u32                         _1a48;
     ActorBgCollisionEnemyCheck  mBgCheckEnemy;
     u32                         _2f30;
diff --git a/enemy/CarryEnemy.h b/enemy/CarryEnemy.h
index 27824273..106a3a1f 100644
--- a/enemy/CarryEnemy.h
+++ b/enemy/CarryEnemy.h
@@ -18,7 +18,7 @@ class CarryEnemy : public Enemy
 
 public:
     // Address: 0x022EB09C
-    CarryEnemy(const ActorCreateParam& param);
+    CarryEnemy(const ActorCreateParameter& param);
 
 protected:
     // Address: 0x022EB18C
@@ -157,7 +157,7 @@ class CarryEnemy : public Enemy
     u32                         _18a0;                      // Unused
     u32                         _18a4;                      // ^^^
     s8                          mCarryPlayerNo;
-    ActorUniqueID               mCarryPlayerID;
+    UniqueID               mCarryPlayerID;
     bool                        mForceSetShellDamageEffect;
     bool                        mIsLiftUp;
 };
diff --git a/enemy/Enemy.h b/enemy/Enemy.h
index bcf502f5..bc7b091d 100644
--- a/enemy/Enemy.h
+++ b/enemy/Enemy.h
@@ -244,7 +244,7 @@ class Enemy : public ActorMultiState
 
 public:
     // Address: 0x02328494
-    Enemy(const ActorCreateParam& param);
+    Enemy(const ActorCreateParameter& param);
 
 protected:
     // Address: 0x02328644
diff --git a/enemy/EnemyChibiYoshiEatData.h b/enemy/EnemyChibiYoshiEatData.h
index 8cc4516e..5b75b279 100644
--- a/enemy/EnemyChibiYoshiEatData.h
+++ b/enemy/EnemyChibiYoshiEatData.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <actor/ChibiYoshiEatData.h>
+#include <actor/ChibiEatCallback.h>
 
 class Enemy;
 
 // vtbl Address: 0x10072738
-class EnemyChibiYoshiEatData : public ChibiYoshiEatData
+class EnemyChibiYoshiEatData : public ChibiEatCallback
 {
 public:
     // Address: 0x0232ADAC
-    EnemyChibiYoshiEatData(ActorUniqueID owner_id);
+    EnemyChibiYoshiEatData(UniqueID owner_id);
 
     // Address: 0x0232AEAC
     u32 vf0C() override;
@@ -22,4 +22,4 @@ class EnemyChibiYoshiEatData : public ChibiYoshiEatData
     // Address: 0x0232AE14
     Enemy* getOwner_() const;
 };
-static_assert(sizeof(EnemyChibiYoshiEatData) == sizeof(ChibiYoshiEatData));
+static_assert(sizeof(EnemyChibiYoshiEatData) == sizeof(ChibiEatCallback));
diff --git a/enemy/EnemyEatData.h b/enemy/EnemyEatData.h
index d7b29e02..17bf71a3 100644
--- a/enemy/EnemyEatData.h
+++ b/enemy/EnemyEatData.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <actor/EatData.h>
+#include <actor/EatCallback.h>
 
 class Enemy;
 
 // vtbl Address: 0x10072F9C
-class EnemyEatData : public EatData
+class EnemyEatData : public EatCallback
 {
 public:
     // Address: 0x0232F00C
-    EnemyEatData(ActorUniqueID owner_id);
+    EnemyEatData(UniqueID owner_id);
 
     // Address: 0x0232F124
     bool setEatTongue(Actor* yoshi) override;
@@ -22,4 +22,4 @@ class EnemyEatData : public EatData
     // Address: 0x0232F074
     Enemy* getOwner_() const;
 };
-static_assert(sizeof(EnemyEatData) == sizeof(EatData));
+static_assert(sizeof(EnemyEatData) == sizeof(EatCallback));
diff --git a/enemy/IceMgr.h b/enemy/IceMgr.h
index 3babf5ec..e977a7c9 100644
--- a/enemy/IceMgr.h
+++ b/enemy/IceMgr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 
 #include <container/seadSafeArray.h>
 #include <math/seadVector.h>
@@ -171,7 +171,7 @@ class IceMgr
 
 protected:
     u8                                          mIceNum;
-    sead::SafeArray<ActorUniqueID, cIceMaxNum>  mIceID;
+    sead::SafeArray<UniqueID, cIceMaxNum>  mIceID;
     IceStatus                                   mIceStatus;
     TimeInfo*                                   mTimeInfo;
     Enemy*                                      mOwner;
diff --git a/enemy/KillerHoudai.h b/enemy/KillerHoudai.h
index 994fecf6..8b26b2c5 100644
--- a/enemy/KillerHoudai.h
+++ b/enemy/KillerHoudai.h
@@ -15,13 +15,13 @@ class KillerHoudai : public ActorState
 
 public:
     // Address: 0x1008C03C
-    static const ActorCreateInfo cActorCreateInfo;
+    static const ActorData cActorCreateInfo;
     // Address: 0x1008C060
-    static const ActorCreateInfo cActorCreateInfoMagnum;
+    static const ActorData cActorCreateInfoMagnum;
 
 public:
     // Address: 0x023BCC74
-    KillerHoudai(const ActorCreateParam& param);
+    KillerHoudai(const ActorCreateParameter& param);
     virtual ~KillerHoudai() { }
 
 protected:
diff --git a/enemy/Koton.h b/enemy/Koton.h
index 5d54b08f..cbd39d77 100644
--- a/enemy/Koton.h
+++ b/enemy/Koton.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <actor/EatData.h>
+#include <actor/EatCallback.h>
 #include <actor/Profile.h>
 #include <collision/ActorCollisionDrcTouchCallback.h>
 #include <effect/EffectObj.h>
@@ -26,10 +26,10 @@ class Koton : public Enemy
 {
 public:
     // Address: 0x100904E0
-    static const ActorCreateInfo cActorCreateInfo;
+    static const ActorData cActorCreateInfo;
 
 public:
-    Koton(const ActorCreateParam& param)
+    Koton(const ActorCreateParameter& param)
         : Enemy(param)
         , mEatData(mActorUniqueID)
         , mChibiYoshiEatData(mActorUniqueID)
@@ -87,7 +87,7 @@ class Koton : public Enemy
     u8                      _188d;
     f32                     _1890;
     f32                     _1894;
-    EatData                 mEatData;
+    EatCallback                 mEatData;
     EnemyChibiYoshiEatData  mChibiYoshiEatData;
     u32                     _18e0;
     sead::Vector3f          _18e4;
diff --git a/enemy/Kuribo.h b/enemy/Kuribo.h
index 94daa461..62e3bef8 100644
--- a/enemy/Kuribo.h
+++ b/enemy/Kuribo.h
@@ -38,7 +38,7 @@ class Kuribo : public KuriboBase
 
 public:
     // Address: 0x023D60C8
-    Kuribo(const ActorCreateParam& param);
+    Kuribo(const ActorCreateParameter& param);
 
     // Address: 0x023D66F0
     void initialize() override;
@@ -259,7 +259,7 @@ class Kuribo : public KuriboBase
     f32                             mPreFunsuiSpeedX;
     f32                             mGroundDistance;    // When Kuribo is set to spawn on ground
     BalloonHangActor*               mpBalloon;
-    ActorUniqueID                   mBalloonID;
+    UniqueID                   mBalloonID;
 
     /**
      * @brief 0.5f, -0.5f
diff --git a/enemy/KuriboBase.h b/enemy/KuriboBase.h
index 0453e66c..68e34d4d 100644
--- a/enemy/KuriboBase.h
+++ b/enemy/KuriboBase.h
@@ -41,7 +41,7 @@ class KuriboBase : public Enemy
 
 public:
     // Address: 0x023DAF04
-    KuriboBase(const ActorCreateParam& param);
+    KuriboBase(const ActorCreateParameter& param);
 
 protected:
     // Address: 0x023DB070
@@ -311,7 +311,7 @@ class KuriboBase : public Enemy
     static const f32 cMaxSpeedY;
 
     // Address: 0x10091660
-    static const ActorCreateInfo cActorCreateInfo;
+    static const ActorData cActorCreateInfo;
 
     // Address: 0x10091684
     static const ActorCollisionCheck::CollisionData cCcData_Normal;
diff --git a/enemy/MechaKoopa.h b/enemy/MechaKoopa.h
index 4d49877c..92ca593e 100644
--- a/enemy/MechaKoopa.h
+++ b/enemy/MechaKoopa.h
@@ -28,11 +28,11 @@ class MechaKoopa : public CarryEnemy
 
 public:
     // Address: 0x10093DD4
-    static const ActorCreateInfo cActorCreateInfo;
+    static const ActorData cActorCreateInfo;
 
 public:
     // Address: 0x023E8A00
-    MechaKoopa(const ActorCreateParam& param);
+    MechaKoopa(const ActorCreateParameter& param);
 
 protected:
     // Address: 0x023E92E0
diff --git a/enemy/PataKuribo.h b/enemy/PataKuribo.h
index 69e51106..df073b98 100644
--- a/enemy/PataKuribo.h
+++ b/enemy/PataKuribo.h
@@ -11,7 +11,7 @@ class PataKuribo : public KuriboBase
 
 public:
     // Address: 0x0240A0B4
-    PataKuribo(const ActorCreateParam& param);
+    PataKuribo(const ActorCreateParameter& param);
 
     // Address: 0x0240AD78
     bool createIceActor() override;
diff --git a/enemy/Shell.h b/enemy/Shell.h
index dff3ac5c..51b3b2e2 100644
--- a/enemy/Shell.h
+++ b/enemy/Shell.h
@@ -2,7 +2,7 @@
 
 #include <collision/ActorCollisionDrcTouchCallback.h>
 #include <enemy/EnemyBoyoMgr.h>
-#include <actor/EatData.h>
+#include <actor/EatCallback.h>
 #include <effect/EffectObj.h>
 #include <enemy/CarryEnemy.h>
 #include <enemy/EnemyChibiYoshiEatData.h>
@@ -53,7 +53,7 @@ class Shell : public CarryEnemy
 
 public:
     // Address: 0x024521A0
-    Shell(const ActorCreateParam& param);
+    Shell(const ActorCreateParameter& param);
     // Address: 0x02459724
     virtual ~Shell();
 
@@ -269,7 +269,7 @@ class Shell : public CarryEnemy
     u8          	       _18e2;
     u8                     _18e3;
     f32                    _18e4;
-    ActorUniqueID          _18e8;
+    UniqueID          _18e8;
     u32                    _18ec;
     bool                   _18f0;
     u8                     _18f1;
@@ -283,7 +283,7 @@ class Shell : public CarryEnemy
     u32                    _1908;
     u32                    _190c;
     u32                    _1910;
-    EatData                mYoshiEatData;
+    EatCallback                mYoshiEatData;
     EnemyChibiYoshiEatData mChibiYoshiEatData;
     DrcTouchCB             mDrcTouchCallback;
     EnemyBoyoMgr           mBoyoMgr;
diff --git a/enemy/SnakeBlock.h b/enemy/SnakeBlock.h
index 1c2c9f81..56283350 100644
--- a/enemy/SnakeBlock.h
+++ b/enemy/SnakeBlock.h
@@ -132,7 +132,7 @@ class SnakeBlock : public Enemy
     static_assert(sizeof(EdgePiece) == 0x318, "SnakeBlock::EdgePiece size mismatch");
 
 public:
-    SnakeBlock(const ActorCreateParam& param)
+    SnakeBlock(const ActorCreateParameter& param)
         : Enemy(param)
         , mEdgePiece()
         , mMiddlePiece()
diff --git a/fragment/BigBlockFragment.h b/fragment/BigBlockFragment.h
new file mode 100644
index 00000000..e69de29b
diff --git a/fragment/BlockFragment.h b/fragment/BlockFragment.h
new file mode 100644
index 00000000..e69de29b
diff --git a/fragment/ChainFragment.h b/fragment/ChainFragment.h
new file mode 100644
index 00000000..e69de29b
diff --git a/fragment/Fragment.h b/fragment/Fragment.h
new file mode 100644
index 00000000..df91d539
--- /dev/null
+++ b/fragment/Fragment.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <heap/seadHeap.h>
+#include <container/seadListImpl.h>
+
+class Fragment
+{
+protected:
+    Fragment(sead::Heap* heap)
+        : mHeap(heap)
+        , mDeleteRequestFlag(false)
+    { }
+
+    // Address: Deleted
+    virtual void create();
+
+    virtual void execute() { }
+    virtual void draw() { }
+    virtual void doDelete() { }
+
+protected:
+    sead::ListNode mNode;
+    sead::Heap* mHeap;
+    bool mDeleteRequestFlag; // TODO: verify
+
+    friend class FragmentMgr;
+};
+static_assert(sizeof(Fragment) == 0x14, "Fragment size mismatch");
diff --git a/fragment/FragmentMgr.h b/fragment/FragmentMgr.h
index 7465c849..59a3e96d 100644
--- a/fragment/FragmentMgr.h
+++ b/fragment/FragmentMgr.h
@@ -1,7 +1,9 @@
 #pragma once
 
 #include <heap/seadDisposer.h>
+#include <heap/seadFrameHeap.h>
 #include <math/seadVector.h>
+#include <prim/seadSafeString.h>
 
 #include <effect/EffectID.h>
 
@@ -17,8 +19,30 @@ class FragmentMgr
     SEAD_SINGLETON_DISPOSER(FragmentMgr)
 
 public:
+    // Address: 0x024B12EC
+    void createBlockFragment(const sead::Vector3f& pos, u32, s8 player_no = -1);
+    // Address: 0x024B13C8
+    void createIceFragment(const sead::Vector3f& pos, u32, const sead::Vector3f& scale = sead::Vector3f::ones, const sead::Vector3f& = sead::Vector3f::zero);
+    // Address: 0x024B14AC
+    void createIceFragment(const sead::Vector3f& pos, u32, const sead::Vector3f& scale = sead::Vector3f::ones);
     // Address: 0x024B15AC
-    void createWaterSplashEff(const sead::Vector3f& pos, u8 layer, EffectID effect_id);
+    void createWaterSplash(const sead::Vector3f& pos, u8 layer, EffectID effect_id);
+    // Address: 0x024B1688
+    void createIcicleDew(const sead::Vector3f& pos);
+    // Address: 0x024B1828
+    void createChainFragment(const sead::Vector3f& pos, s8);
     // Address: 0x024B1754
-    void createBigBlockFragEff(const sead::Vector3f& pos, s32);
+    void createBigBlockFragment(const sead::Vector3f& pos, s8);
+
+public:
+    // Address: 0x024B10B0
+    void update();
+
+protected:
+    // Address: 0x024B12A8
+    sead::FrameHeap* createHeap_(const sead::SafeString& name);
+
+protected:
+    // sead lists...
 };
+//static_assert(sizeof(FragmentMgr) == 0x3C, "FragmentMgr size mismatch");
diff --git a/fragment/IcicleDew.h b/fragment/IcicleDew.h
new file mode 100644
index 00000000..e69de29b
diff --git a/fragment/WaterSplash.h b/fragment/WaterSplash.h
new file mode 100644
index 00000000..e69de29b
diff --git a/fukidashi/FukidashiType.h b/fukidashi/FukidashiType.h
new file mode 100644
index 00000000..7d007e55
--- /dev/null
+++ b/fukidashi/FukidashiType.h
@@ -0,0 +1,5 @@
+#pragma once
+
+enum FukidashiType
+{
+};
diff --git a/game/BalloonMgr.h b/game/BalloonMgr.h
index 5e7f8d58..d11e6981 100644
--- a/game/BalloonMgr.h
+++ b/game/BalloonMgr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 
 #include <container/seadSafeArray.h>
 #include <heap/seadDisposer.h>
@@ -53,7 +53,7 @@ class BalloonMgr
     u32     _20;
     u32     _24;
     sead::SafeArray<
-        ActorUniqueID,
+        UniqueID,
         5
     >       mBalloonItemID;
 };
diff --git a/item/ItemBase.h b/item/ItemBase.h
index bfef408a..1eec8a87 100644
--- a/item/ItemBase.h
+++ b/item/ItemBase.h
@@ -3,7 +3,7 @@
 #include <actor/ActorState.h>
 #include <state/FStateVirtualID.h>
 #include <graphics/AnimModel.h>
-#include <actor/EatData.h>
+#include <actor/EatCallback.h>
 #include <collision/BgCollisionCheckHitResult.h>
 
 class Yoshi;
@@ -29,7 +29,7 @@ class ItemBase : public ActorMultiState
     };
 
 public:
-    ItemBase(const ActorCreateParam& param);
+    ItemBase(const ActorCreateParameter& param);
     virtual ~ItemBase();
 
     // Address: 0x025176EC
@@ -156,7 +156,7 @@ class ItemBase : public ActorMultiState
     u8                              _185e;                               
     bool                            mCollidedWithGiantWiggler;                 
     u8                              _1860[0x1864 - 0x1860];                  
-    EatData                         mEatData;                    
+    EatCallback                         mEatData;                    
     u8                              _1888[0x188C - 0x1888]; 
     u8                              mScaler[0x20];
     ActorCollisionCheck             mACollider2;  
diff --git a/item/ItemObj.h b/item/ItemObj.h
index e75a8adc..5fec4a2c 100644
--- a/item/ItemObj.h
+++ b/item/ItemObj.h
@@ -8,7 +8,7 @@ class ItemObj : public ItemBase
 
 public:
     // Address: 0x0251EBFC
-    ItemObj(const ActorCreateParam& param);
+    ItemObj(const ActorCreateParameter& param);
     // Address: 0x0251FE04
     virtual ~ItemObj();
 
diff --git a/layout/GamesceneBase.h b/layout/GamesceneBase.h
index 04e4124e..6e8c4b13 100644
--- a/layout/GamesceneBase.h
+++ b/layout/GamesceneBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 
 // vtbl Address: 0x100D3C2C
 class GamesceneBase
@@ -52,7 +52,7 @@ class GamesceneBase
     virtual void vf64();
 
     // Address: 0x025DA288
-    void registerActor(ActorUniqueID id);
+    void registerActor(UniqueID id);
 
 protected:
     u32 _0[0x14A0 / sizeof(u32)];
diff --git a/map/Bg.h b/map/Bg.h
index d3b556bb..46cc9c10 100644
--- a/map/Bg.h
+++ b/map/Bg.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include <map/BgDeco.h>
 #include <collision/BgUnitCode.h>
+#include <map/BgDeco.h>
+#include <map/WaveType.h>
 #include <utility/Direction.h>
 
 #include <heap/seadDisposer.h>
@@ -61,15 +62,6 @@ class Bg
     };
     static_assert(sizeof(Gust) == 0x14, "Bg::Gust size mismatch");
 
-    enum WaveType : u8
-    {
-        cWaveType_None      = 0,
-        cWaveType_Lava      = 1,
-        cWaveType_Water     = 2,
-        cWaveType_Poison    = 3,
-        cWaveType_Quicksand = 4
-    };
-
 public:
     // Address: 0x02684480
     Bg();
@@ -112,7 +104,7 @@ class Bg
     void setUnitCurrentCdFile(u16 x, u16 y, u8 layer, u16 unit);
 
     // Address: 0x0268B71C
-    void setWaterInWave(const sead::Vector2f& pos, u8 wave_scale);
+    void setWaterWave(const sead::Vector2f& pos, WaveType type);
 
     // Address: 0x0268B8E4
     u8 getNextFlowerIndex();
@@ -216,11 +208,7 @@ class Bg
     f32             _18;
     f32             mWaveSurfaceX[1280];
     f32             mWaveSurfaceY[1280];
-    union
-    {
-        bool     mHasLavaWaves;
-        WaveType mWaveType;
-    };
+    bool            mHasLavaWaves;
     bool            mHasLiquid;
     u32             _2820;
     u8              _2824[0x558];
diff --git a/map/CourseData.h b/map/CourseData.h
index 03ae171b..03df8439 100644
--- a/map/CourseData.h
+++ b/map/CourseData.h
@@ -123,10 +123,8 @@ struct NextGoto
 };
 static_assert(sizeof(NextGoto) == 0x18);
 
-struct MapActorData
+struct ActorInitDat
 {
-    // Speculated official name.
-
     u16 type;
     struct
     {
@@ -143,7 +141,7 @@ struct MapActorData
     u8  init_state;
     u8  _pad[3];
 };
-static_assert(sizeof(MapActorData) == 0x18);
+static_assert(sizeof(ActorInitDat) == 0x18);
 
 struct AreaData
 {
@@ -184,10 +182,8 @@ struct AreaData
 };
 static_assert(sizeof(AreaData) == 0x1C);
 
-struct Location
+struct Range
 {
-    // Official name not known.
-
     struct
     {
         u16 x;
@@ -201,7 +197,7 @@ struct Location
     u8  id;
     u8  _pad[3];
 };
-static_assert(sizeof(Location) == 0xC);
+static_assert(sizeof(Range) == 0xC, "Range size mismatch");
 
 struct RailInfo
 {
@@ -258,7 +254,7 @@ class CourseDataFile
         cBlock_MapActor         =   8 - 1,
         cBlock_MapActorLoadRes  =   9 - 1,
         cBlock_AreaData         =  10 - 1,
-        cBlock_Location         =  11 - 1,
+        cBlock_Range            =  11 - 1,
                                 // 12
                                 // 13
         cBlock_RailInfo         =  14 - 1,
@@ -284,10 +280,10 @@ class CourseDataFile
     // Address: 0x02699BD8
     const NextGoto* getNextGoto(u8 id) const;
     // Address: 0x02699C08
-    const MapActorData* getMapActor(u16 type, const MapActorData* start = nullptr) const;
+    const ActorInitDat* getMapActor(u16 type, const ActorInitDat* start = nullptr) const;
     const AreaData* getAreaData(u8 id, sead::BoundBox2f* box = nullptr) const;
     // Address: 0x0269A020
-    const Location* getLocation(sead::BoundBox2f* box, u8 id) const;
+    const Range* getRange(sead::BoundBox2f* box, u8 id) const;
     // Address: 0x0269A0A8
     const RailInfo* getRailInfo(u8 id) const;
     // Address: 0x0269A0F4
@@ -301,7 +297,7 @@ class CourseDataFile
     sead::SafeArray<const void*,    cBlock_Num> mBlock;
     sead::SafeArray<u32,            cBlock_Num> mBlockSize;
     sead::SafeArray<u32,            cBlock_Num> mBlockEntryNum;
-    sead::SafeArray<MapActorData*,  64>         _b8;
+    sead::SafeArray<ActorInitDat*,  64>         _b8;
     sead::SafeArray<u32,            64>         _1b8;
     sead::SafeArray<u32,            64>         _2b8;
 };
diff --git a/map/WaveType.h b/map/WaveType.h
new file mode 100644
index 00000000..22c779e9
--- /dev/null
+++ b/map/WaveType.h
@@ -0,0 +1,5 @@
+#pragma once
+
+enum WaveType
+{
+};
diff --git a/map_obj/ActorBlockAngle.h b/map_obj/ActorBlockAngle.h
index 57120ccd..b41137e4 100644
--- a/map_obj/ActorBlockAngle.h
+++ b/map_obj/ActorBlockAngle.h
@@ -7,7 +7,7 @@ class ActorBlockAngle : public ActorBlockBase
     SEAD_RTTI_OVERRIDE(ActorBlockAngle, ActorBlockBase)
 
 public:
-    ActorBlockAngle(const ActorCreateParam& param);
+    ActorBlockAngle(const ActorCreateParameter& param);
     virtual ~ActorBlockAngle() { }
 
     bool init();
diff --git a/map_obj/ActorBlockBase.h b/map_obj/ActorBlockBase.h
index 42538842..e0132d6d 100644
--- a/map_obj/ActorBlockBase.h
+++ b/map_obj/ActorBlockBase.h
@@ -21,36 +21,16 @@ class ActorBlockBase : public ChangeBlockCoinBase
     /**
      * @brief Persistent state of the block across area reloads.
      */
-    enum ActiveState
+    enum ObjBlockInfo
     {
-        cActiveState_Active           = 0,
-        cActiveState_Used             = 1,
-        cActiveState_Destroyed        = 2,
-        cActiveState_MultiCoinExpired = 3
+        cObjBlockInfo_Active           = 0,
+        cObjBlockInfo_Used             = 1,
+        cObjBlockInfo_Destroyed        = 2,
+        cObjBlockInfo_MultiCoinExpired = 3
     };
 
-    struct DestroyedParam
-    {
-        sead::Vector2f  position;
-        u8              destroy_direction;
-        u8              state_type;
-        u8              _a;
-        s8              player_no;
-        u16             fragment_idx;
-    };
-    static_assert(sizeof(DestroyedParam) == 0x10, "DestroyedParam size mismatch");
-
-    struct DestroyedParam2
-    {
-        sead::Vector2f  position;
-        u8              destroy_direction;
-        s8              player_no;
-        u16             fragment_idx;
-    };
-    static_assert(sizeof(DestroyedParam2) == 0xC, "DestroyedParam2 size mismatch");   
-
 public:
-    ActorBlockBase(const ActorCreateParam& param);
+    ActorBlockBase(const ActorCreateParameter& param);
     ~ActorBlockBase() override { }
 
     // Address: 0x0269F6C8
diff --git a/map_obj/ActorBlockHatena.h b/map_obj/ActorBlockHatena.h
index e520aabb..90b7c8ef 100644
--- a/map_obj/ActorBlockHatena.h
+++ b/map_obj/ActorBlockHatena.h
@@ -11,7 +11,7 @@ class ActorBlockHatena : public ActorBlockBase
 
 public:
     // Address: 0x026A4FAC
-    ActorBlockHatena(const ActorCreateParam& param);
+    ActorBlockHatena(const ActorCreateParameter& param);
     // Address: 0x026A58C8
     ~ActorBlockHatena() override { }
 
diff --git a/map_obj/ActorBlockRenga.h b/map_obj/ActorBlockRenga.h
index 44867b4f..ae99024e 100644
--- a/map_obj/ActorBlockRenga.h
+++ b/map_obj/ActorBlockRenga.h
@@ -11,7 +11,7 @@ class ActorBlockRenga : public ActorBlockBase
 
 public:
     // Address: 0x026B5134
-    ActorBlockRenga(const ActorCreateParam& param);
+    ActorBlockRenga(const ActorCreateParameter& param);
     // Address: 0x026B5A40
     ~ActorBlockRenga() override { }
 
diff --git a/map_obj/ActorBlockSwitch.h b/map_obj/ActorBlockSwitch.h
index 0ef22906..edc7b0db 100644
--- a/map_obj/ActorBlockSwitch.h
+++ b/map_obj/ActorBlockSwitch.h
@@ -19,7 +19,7 @@ class ActorBlockSwitch : public ActorBlockBase
 
 public:
     // Address: 0x026BA304
-    ActorBlockSwitch(const ActorCreateParam& param);
+    ActorBlockSwitch(const ActorCreateParameter& param);
     // Address: 0x026BAF80
     virtual ~ActorBlockSwitch() { }
 
@@ -50,7 +50,7 @@ class ActorBlockSwitch : public ActorBlockBase
 
 public:
     // Address: 0x100EF29C
-    static const ActorCreateInfo cCreateInfo;
+    static const ActorData cCreateInfo;
 
 protected:
     SwitchType  mSwitchType;
diff --git a/map_obj/ActorCoin.h b/map_obj/ActorCoin.h
index cdd4ef9e..b649d27e 100644
--- a/map_obj/ActorCoin.h
+++ b/map_obj/ActorCoin.h
@@ -11,7 +11,7 @@ class ActorCoin : public ActorCoinBase
 
 public:
     // Address: 0x026BC2E8
-    ActorCoin(const ActorCreateParam& param);
+    ActorCoin(const ActorCreateParameter& param);
     // Address: 0x026BCC1C
     ~ActorCoin() override { }
 
diff --git a/map_obj/ActorCoinBase.h b/map_obj/ActorCoinBase.h
index 6c105059..923e6536 100644
--- a/map_obj/ActorCoinBase.h
+++ b/map_obj/ActorCoinBase.h
@@ -2,7 +2,7 @@
 
 #include <map_obj/ChangeBlockCoinBase.h>
 #include <graphics/AnimModel.h>
-#include <actor/EatData.h>
+#include <actor/EatCallback.h>
 
 // vtbl Address: 0x100F1AF0
 class ActorCoinBase : public ChangeBlockCoinBase
@@ -13,7 +13,7 @@ class ActorCoinBase : public ChangeBlockCoinBase
 
 public:
     // Address: 0x026BF78C
-    ActorCoinBase(const ActorCreateParam& param);
+    ActorCoinBase(const ActorCreateParameter& param);
     // Address: 0x026C1DE8
     ~ActorCoinBase() override { }
 
@@ -97,7 +97,7 @@ class ActorCoinBase : public ChangeBlockCoinBase
     f32             _1ce8;
     f32             _1cec;
     u8              _1cf0;
-    EatData         mEatData;
+    EatCallback         mEatData;
     u8              _1d18;
     u8              _1d19;
     u8              _1d1a;
diff --git a/map_obj/ActorCoinDemoBase.h b/map_obj/ActorCoinDemoBase.h
index 5edbc906..644f847c 100644
--- a/map_obj/ActorCoinDemoBase.h
+++ b/map_obj/ActorCoinDemoBase.h
@@ -12,7 +12,7 @@ class ActorCoinDemoBase : public ActorMultiState
 
 public:
     // Address: 0x026C3F18
-    ActorCoinDemoBase(const ActorCreateParam& param);
+    ActorCoinDemoBase(const ActorCreateParameter& param);
     // Address: 0x026C43D4
     ~ActorCoinDemoBase() override { }
 
diff --git a/map_obj/ActorCoinDemoJump.h b/map_obj/ActorCoinDemoJump.h
index efbb6ed3..001c8fe2 100644
--- a/map_obj/ActorCoinDemoJump.h
+++ b/map_obj/ActorCoinDemoJump.h
@@ -11,7 +11,7 @@ class ActorCoinDemoJump : public ActorCoinDemoBase
 
 public:
     // Address: 0x026C3F18
-    ActorCoinDemoJump(const ActorCreateParam& param);
+    ActorCoinDemoJump(const ActorCreateParameter& param);
     // Address: 0x026C43D4
     ~ActorCoinDemoJump() override { }
 
diff --git a/map_obj/ActorCoinShowerJump.h b/map_obj/ActorCoinShowerJump.h
index bef66807..8636102e 100644
--- a/map_obj/ActorCoinShowerJump.h
+++ b/map_obj/ActorCoinShowerJump.h
@@ -13,7 +13,7 @@ class ActorCoinShowerJump : public ActorCoinBase
 
 public:
     // Address: 0x026D586C
-    ActorCoinShowerJump(const ActorCreateParam& param);
+    ActorCoinShowerJump(const ActorCreateParameter& param);
     // Address: 0x026D6590
     ~ActorCoinShowerJump() override { }
 
diff --git a/map_obj/BgActorBase.h b/map_obj/BgActorBase.h
new file mode 100644
index 00000000..36d46bf7
--- /dev/null
+++ b/map_obj/BgActorBase.h
@@ -0,0 +1,196 @@
+#pragma once
+
+#include <actor/ActorState.h>
+#include <graphics/AnimModel.h>
+#include <collision/ActorBoxBgCollision.h>
+#include <map_obj/Wave.h>
+#include <state/FStateVirtualID.h>
+
+// vtbl Address: 0x100FCF48
+class BgActorBase : public ActorMultiState
+{
+public:
+    // Address: 0x026F0A88
+    BgActorBase(const ActorCreateParameter& param);
+    // Address: 0x026F36E8
+    ~BgActorBase() override;
+
+    // StateID_NonMove                          Address: 0x1021FF98
+    // initializeState_NonMove                  Address: 0x026F36A4
+    // executeState_NonMove                     Address: 0x026F36A8
+    // finalizeState_NonMove                    Address: 0x026F36AC
+    DECLARE_STATE_ID(BgActorBase, NonMove)
+    // StateID_Switch                           Address: 0x1021FFB8
+    // initializeState_Switch                   Address: 0x026F36B0
+    // executeState_Switch                      Address: 0x026F1800
+    // finalizeState_Switch                     Address: 0x026F36B4
+    DECLARE_STATE_ID(BgActorBase, Switch)
+    // StateID_WaitAutoScroll                   Address: 0x1021FFD8
+    // initializeState_WaitAutoScroll           Address: 0x026F1914
+    // executeState_WaitAutoScroll              Address: 0x026F1938
+    // finalizeState_WaitAutoScroll             Address: 0x026F36B8
+    DECLARE_STATE_ID(BgActorBase, WaitAutoScroll)
+    // StateID_SwitchAutoScrDownWait            Address: 0x1021FFF8
+    // initializeState_SwitchAutoScrDownWait    Address: 0x026F1D18
+    // executeState_SwitchAutoScrDownWait       Address: 0x026F1E18
+    // finalizeState_SwitchAutoScrDownWait      Address: 0x026F36BC
+    DECLARE_STATE_ID(BgActorBase, SwitchAutoScrDownWait)
+    // StateID_SwitchAutoScrReserveUp           Address: 0x10220018
+    // initializeState_SwitchAutoScrReserveUp   Address: 0x026F36C0
+    // executeState_SwitchAutoScrReserveUp      Address: 0x026F1F00
+    // finalizeState_SwitchAutoScrReserveUp     Address: 0x026F36C4
+    DECLARE_STATE_ID(BgActorBase, SwitchAutoScrReserveUp)
+    // StateID_SwitchAutoScrUpMove              Address: 0x10220038
+    // initializeState_SwitchAutoScrUpMove      Address: 0x026F1F9C
+    // executeState_SwitchAutoScrUpMove         Address: 0x026F1FBC
+    // finalizeState_SwitchAutoScrUpMove        Address: 0x026F36C8
+    DECLARE_STATE_ID(BgActorBase, SwitchAutoScrUpMove)
+    // StateID_SwitchAutoScrUpWait              Address: 0x10220058
+    // initializeState_SwitchAutoScrUpWait      Address: 0x026F2074
+    // executeState_SwitchAutoScrUpWait         Address: 0x026F2130
+    // finalizeState_SwitchAutoScrUpWait        Address: 0x026F36CC
+    DECLARE_STATE_ID(BgActorBase, SwitchAutoScrUpWait)
+    // StateID_SwitchAutoScrReserveDown         Address: 0x10220078
+    // initializeState_SwitchAutoScrReserveDown Address: 0x026F36D0
+    // executeState_SwitchAutoScrReserveDown    Address: 0x026F21FC
+    // finalizeState_SwitchAutoScrReserveDown   Address: 0x026F36D4
+    DECLARE_STATE_ID(BgActorBase, SwitchAutoScrReserveDown)
+    // StateID_SwitchAutoScrDownMove            Address: 0x10220098
+    // initializeState_SwitchAutoScrDownMove    Address: 0x026F22A0
+    // executeState_SwitchAutoScrDownMove       Address: 0x026F22C0
+    // finalizeState_SwitchAutoScrDownMove      Address: 0x026F36D8
+    DECLARE_STATE_ID(BgActorBase, SwitchAutoScrDownMove)
+    // StateID_WaterDownDemo                    Address: 0x102200B8
+    // initializeState_WaterDownDemo            Address: 0x026F232C
+    // executeState_WaterDownDemo               Address: 0x026F233C
+    // finalizeState_WaterDownDemo              Address: 0x026F36DC
+    DECLARE_STATE_ID(BgActorBase, WaterDownDemo)
+
+    // Address: 0x026F106C
+    void initial();
+    // Address: 0x026F0FC4
+    void initialFixation();
+    // Address: 0x026F0D60
+    void calcModel();
+
+    // Address: 0x026F0E9C
+    bool execute() override;
+    // Address: 0x026F0F54
+    bool draw() override;
+
+    // Address: 0x026F1268
+    void createWaterFaceLineSet(f32 y_pos);
+    // Address: 0x026F1278
+    void moveWaterFaceLineSet(f32 y_pos);
+    // Address: 0x026F12C8
+    void setMotionState(u8 state);
+    // Address: 0x026F1500
+    void autoScroolSpeedSet();
+    // Address: 0x026F15AC
+    void switchBitCheck();
+    // Address: 0x026F1618
+    void autoWaveMove();
+    // Address: 0x026F1688
+    void shakeMove();
+
+    // Address: 0x026F3558
+    virtual void createVariableZposSet();
+    // Address: 0x026F355C
+    virtual void createFixationZposSet();
+    // Address: 0x026F3560
+    virtual void calcModelHeat();
+    // Address: 0x026F3564
+    virtual void drawHeat();
+
+    // StateID_AutoScroll               Address: 0x102200DC
+    // initializeState_AutoScroll       Address: 0x026F2478
+    // executeState_AutoScroll          Address: 0x026F248C
+    // finalizeState_AutoScroll         Address: 0x026F36E0
+    DECLARE_STATE_VIRTUAL_ID_BASE(BgActorBase, AutoScroll)
+    // StateID_DispSuckAround           Address: 0x10220100
+    // initializeState_DispSuckAround   Address: 0x026F24F8
+    // executeState_DispSuckAround      Address: 0x026F2504
+    // finalizeState_DispSuckAround     Address: 0x026F36E4
+    DECLARE_STATE_VIRTUAL_ID_BASE(BgActorBase, DispSuckAround)
+
+public:
+    const Wave& getWave() const
+    {
+        return mWave;
+    }
+
+    Wave& getWave()
+    {
+        return mWave;
+    }
+
+    void setOnlyRenderWaves(bool only_render)
+    {
+        mOnlyRenderWaves = only_render;
+    }
+
+public:
+    /**
+     * @brief 32.0f
+     * @par Address: 0x100FCF44
+    */
+    static const f32 cHeatYposDiffer;
+    /**
+     * @brief 45 degrees
+     * @par Address: 0x102200D8
+    */
+    static const u32 cShakeAngleAdd = 0x2000000;
+    /**
+     * @brief 8.0f
+     * @par Address: 0x100FCF3C
+     */
+    static const f32 cWaveYpos;
+
+protected:
+    AnimModel*               mModel;
+    u8                       _17cc[4]; // Unknown values
+    sead::Vector3f           _17d0;
+    sead::Vector3f           _17dc;
+    ActorBoxBgCollision      mCollider;
+    BgCollision::LineInitArg mColliderInfo;
+    sead::Vector2f           _1a9c;
+    u32                      _1aa4;
+    u32                      _1aa8;
+    f32                      _1aac;
+    f32                      _1ab0;
+    f32                      _1ab4; // used to call it mWidth
+    f32                      _1ab8; // used to call it mBaselineHeight
+    f32                      _1abc; // used to call it mEffectiveHeight
+    f32                      _1ac0;
+    f32                      _1ac4;
+    f32                      _1ac8;
+    f32                      _1acc;
+    u32                      _1ad0;
+    u32                      _1ad4;
+    u16                      _1ad8;
+    u16                      _1ada;
+    bool                     mOnlyRenderWaves;
+    u8                       _1add;
+    u8                       _1ade;
+    u8                       _1adf;
+    u32                      _1ae0;
+    Wave                     mWave;
+    sead::IDisposer          _11a30;
+    u32                      _11a40;
+    u8                       _11a44[4]; // Unknown values
+    u32                      _11a48;
+    u32                      _11a4c;
+    u32                      _11a50;
+    u32                      _11a54;
+    u32                      _11a58;
+    u32                      _11a5c;
+    u32                      _11a60;
+    f32                      _11a64;
+    f32                      _11a68;
+    u32                      _11a6c;
+    u16                      _11a70;
+    u8                       _11a72;
+    u8                       _11a73;
+    u8                       _11a74[4]; // Unknown values
+};
+static_assert(sizeof(BgActorBase) == 0x11A78, "BgActorBase size mismatch");
diff --git a/map_obj/BlockCoinBase.h b/map_obj/BlockCoinBase.h
index f8e34348..afb4b5b5 100644
--- a/map_obj/BlockCoinBase.h
+++ b/map_obj/BlockCoinBase.h
@@ -82,7 +82,7 @@ class BlockCoinBase : public ActorMultiState
     static_assert(sizeof(PlayerHit) == 0xC);
 
 public:
-    BlockCoinBase(const ActorCreateParam& param);
+    BlockCoinBase(const ActorCreateParameter& param);
     virtual ~BlockCoinBase() { }
 
     /**
diff --git a/map_obj/BlockMgr.h b/map_obj/BlockMgr.h
index 2a822728..0cf5c839 100644
--- a/map_obj/BlockMgr.h
+++ b/map_obj/BlockMgr.h
@@ -8,7 +8,7 @@
 struct BlockState
 {
     sead::Vector3f                  position;
-    ActorBlockBase::ActiveState     state;
+    ActorBlockBase::ObjBlockInfo    state;
     u16                             area_no;
     u8                              _12[2];
 };
@@ -17,12 +17,12 @@ static_assert(sizeof(BlockState) == 0x14, "BlockState size mismatch");
 class BlockMgr
 {
     // createInstance() Address: 0x0270B65C
-    // deleteInstance() Address: Deleted
+    // deleteInstance() Address: 0x0270D608
     // sInstance        Address: 0x101DB964
     SEAD_SINGLETON_DISPOSER(BlockMgr);
 
 public:
-    struct DestroyParam
+    struct BlockBreakCheckInfo
     {
         sead::Vector2f          position;
         u32                     fragment_type;
@@ -33,7 +33,7 @@ class BlockMgr
         u8                      _13;
         ActorBgCollisionCheck*  collision_check;
     };
-    static_assert(sizeof(DestroyParam) == 0x18, "DestroyParam size mismatch");
+    static_assert(sizeof(BlockBreakCheckInfo) == 0x18, "BlockBreakCheckInfo size mismatch");
 
     /**
      * @brief Content enum for cType_BreakBlock units.
@@ -79,7 +79,7 @@ class BlockMgr
         cHatenaContent_Num              = 12,
     };
 
-    struct HitParam
+    struct BlockCreateInfo
     {
         sead::Vector2f          position;
         union
@@ -98,34 +98,92 @@ class BlockMgr
         s8                      player_type;
         ActorBgCollisionCheck*  collision_check;
     };
-    static_assert(sizeof(HitParam) == 0x14, "HitParam size mismatch");
+    static_assert(sizeof(BlockCreateInfo) == 0x14, "BlockCreateInfo size mismatch");
+
+    struct BlockBreakActorCreateInfo
+    {
+        sead::Vector2f  position;
+        u8              destroy_direction;
+        u8              state_type;
+        u8              _a;
+        s8              player_no;
+        u16             fragment_idx;
+    };
+    static_assert(sizeof(BlockBreakActorCreateInfo) == 0x10, "BlockBreakActorCreateInfo size mismatch");
+
+    struct BlockBreakEffectCreateInfo
+    {
+        sead::Vector2f  position;
+        u8              destroy_direction;
+        s8              player_no;
+        u16             fragment_idx;
+    };
+    static_assert(sizeof(BlockBreakEffectCreateInfo) == 0xC, "BlockBreakEffectCreateInfo size mismatch");   
+
+    struct ItemCreateDirInfo
+    {
+        f32 _0;
+        f32 _4;
+        u8  _8;
+        u8  _9;
+    };
+    static_assert(sizeof(ItemCreateDirInfo) == 0xC, "ItemCreateDirInfo size mismatch");   
+
+    // Address: 0x1010280C
+    static const u16 cQuestionItemNo[18];
+    // Address: 0x10102830
+    static const u16 cRengaItemNo[18];
+    // Address: 0x10102854
+    static const u16 cClarityItemNo[18];
+    // Address: 0x10102804
+    static const u16 cBreakBlockColorType[4];
 
 public:
     // Address: 0x0270B90C
-    void destroy(ActorBlockBase::DestroyedParam& param, bool no_add_score);
+    void brokenBlockActorCreate(BlockBreakActorCreateInfo& info, bool no_add_score);
     // Address: 0x0270C61C
-    void destroy2(ActorBlockBase::DestroyedParam2& param, bool no_play_sound, bool no_add_score);
+    void brokenBlockEffectCreate(BlockBreakEffectCreateInfo& info, bool no_play_sound, bool no_add_score);
     // Address: 0x0270C798
-    void doDestroyAt(DestroyParam& param);
+    void blockBreakCheck(BlockBreakCheckInfo& info);
     
     // Address: 0x0270C18C
-    void feverModeBlockReact(sead::Vector2f& at);
+    void checkDrcTouchBlockCreate(sead::Vector2f& pos);
     // Address: 0x0270BBB4
-    void feverModeHitBlockAt(sead::Vector2f& at);
+    void DrcTouchBlockCreate(sead::Vector2f& pos);
     // Address: 0x0270C9D0
-    bool hitBlockAt(HitParam& hit_param);
+    bool blockCreate(BlockCreateInfo& create_info);
 
     // Address: 0x0270D2F4
-    ActorBlockBase::ActiveState getBlockActiveState(sead::Vector3f& pos_for_state, u32 area_no);
+    ActorBlockBase::ObjBlockInfo getObjBlockInfo(sead::Vector3f& pos, u32 area_no);
+
+    // Address: 0x0270D294
+    void executeTenCoin();
     // Address: 0x0270B7EC
-    ActorBlockBase::ActiveState getMultiCoinStateAt(sead::Vector3f& at);
+    ActorBlockBase::ObjBlockInfo checkTenCoin(sead::Vector3f& pos);
 
     // Address: 0x0270D420
-    void setStateForBlockAt(sead::Vector3f& at, ActorBlockBase::ActiveState state, u32 area_no);
+    void setObjBlockInfo(sead::Vector3f& pos, ActorBlockBase::ObjBlockInfo block_info, u32 area_no);
     // Address: 0x0270B6E0
-    ActorBlockBase::Type unitToType(u16 unit);
-    // Address: 0x0270D294
-    void update();
+    ActorBlockBase::Type blockPanelTypeNoChenge(u16 unit);
+
+    // Address: 0x0270C3B4
+    bool setblockBreakEffect(sead::Vector3f& pos);
+    // Address: 0x0270D130
+    void chikuwaCreateSet(const sead::Vector2f& pos);
+    // Address: 0x0270D24C
+    u32 chengeItemFromCoin(u32, BlockCoinBase::Content content); // TODO: Rename BlockCoinBase::Content to BlockInItem
+    // Address: 0x0270B89C
+    void createTouchBlockBreakCoin(sead::Vector3f& pos);
+    // Address: 0x0270BB28
+    void getYossyCount();
+    // Address: 0x0270C2F0
+    bool itemDirCheck(const ItemCreateDirInfo* dir_info);
+    // Address: 0x0270D4A0
+    void createCommonYoshiEgg(sead::Vector3f& pos, u32, u32, signed char, u32);
+    // Address: 0x0270D5FC
+    void createYoshiEgg(sead::Vector3f& pos, u32, u32, signed char);
+    // Address: 0x0270D604
+    void createSanboEatYoshiEgg(sead::Vector3f& pos, u32, u32, signed char, u32);
 
 protected:
     u8         _0[101][16];
diff --git a/map_obj/CarryBlockBase.h b/map_obj/CarryBlockBase.h
index 3ca86744..0fbe6701 100644
--- a/map_obj/CarryBlockBase.h
+++ b/map_obj/CarryBlockBase.h
@@ -11,7 +11,7 @@ class CarryBlockBase : public CarryObjBase
 
 public:
     // Address: 0x0271DB3C
-    CarryBlockBase(const ActorCreateParam& param, ActorBoxBgCollision& bg_collision, s32 fukidashi_action);
+    CarryBlockBase(const ActorCreateParameter& param, ActorBoxBgCollision& bg_collision, s32 fukidashi_action);
     // Address: 0x0271F260
     ~CarryBlockBase() override { }
 
diff --git a/map_obj/CarryObjBase.h b/map_obj/CarryObjBase.h
index 1dbab9ef..6134b0fd 100644
--- a/map_obj/CarryObjBase.h
+++ b/map_obj/CarryObjBase.h
@@ -21,7 +21,7 @@ class CarryObjBase : public ActorState
 
 public:
     // Address: 0x02721B68
-    CarryObjBase(const ActorCreateParam& param, const FukidashiInfo& fukidashi_info);
+    CarryObjBase(const ActorCreateParameter& param, const FukidashiInfo& fukidashi_info);
     // Address: 0x02722AE4
     ~CarryObjBase() override { }
 
diff --git a/map_obj/ChangeBlockCoinBase.h b/map_obj/ChangeBlockCoinBase.h
index 9b39df62..90907c67 100644
--- a/map_obj/ChangeBlockCoinBase.h
+++ b/map_obj/ChangeBlockCoinBase.h
@@ -28,7 +28,7 @@ class ChangeBlockCoinBase : public BlockCoinBase
     static_assert(sizeof(Form) == 4);
 
 public:
-    ChangeBlockCoinBase(const ActorCreateParam& param);
+    ChangeBlockCoinBase(const ActorCreateParameter& param);
     virtual ~ChangeBlockCoinBase() { }
 
     // Address: 0x02726610
diff --git a/map_obj/ChibiYoshiAwa.h b/map_obj/ChibiYoshiAwa.h
index b577a8aa..35cf3d93 100644
--- a/map_obj/ChibiYoshiAwa.h
+++ b/map_obj/ChibiYoshiAwa.h
@@ -11,7 +11,7 @@ class ChibiYoshiAwa : public Actor
 
 public:
     // Address: 0x027296B4
-    ChibiYoshiAwa(const ActorCreateParam& param);
+    ChibiYoshiAwa(const ActorCreateParameter& param);
 
     // Address: 0x0272A30C
     bool setBreak(Actor* actor = nullptr);
diff --git a/map_obj/ChibiYoshiAwaData.h b/map_obj/ChibiYoshiAwaData.h
index 9dabde0b..93b9da17 100644
--- a/map_obj/ChibiYoshiAwaData.h
+++ b/map_obj/ChibiYoshiAwaData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 
 #include <math/seadVector.h>
 
@@ -52,7 +52,7 @@ class ChibiYoshiAwaData
      * @param owner_id The ID of the actor which this data belongs to.
      * @par Address: 0x0272D5EC
      */
-    ChibiYoshiAwaData(ActorUniqueID owner_id);
+    ChibiYoshiAwaData(UniqueID owner_id);
 
     /**
      * @brief Called when a bubble hits the actor and either catches it or breaks.
@@ -140,8 +140,8 @@ class ChibiYoshiAwaData
     }
 
 protected:
-    ActorUniqueID   mOwnerID;           ///< The ID of the actor which this data belongs to.
-    ActorUniqueID   mChibiYoshiAwaID;   ///< The ID of the bubble which we are currently interacting with.
+    UniqueID   mOwnerID;           ///< The ID of the actor which this data belongs to.
+    UniqueID   mChibiYoshiAwaID;   ///< The ID of the bubble which we are currently interacting with.
     AwaType         mAwaType;           ///< The type of interaction the bubble will have upon contact with the actor.
     State           mState;             ///< Which stage of interaction we are currently in.
     ItemType        mItemType;          ///< The type of powerup item which has a chance to spawn in the bubble when caught.
diff --git a/map_obj/ChikuwaBlockBase.h b/map_obj/ChikuwaBlockBase.h
index a3a9c763..fcd892d3 100644
--- a/map_obj/ChikuwaBlockBase.h
+++ b/map_obj/ChikuwaBlockBase.h
@@ -15,7 +15,7 @@ class ChikuwaBlockBase : public ActorMultiState
 {
 public:
     // Address: 0x02747DE4
-    ChikuwaBlockBase(const ActorCreateParam& param);
+    ChikuwaBlockBase(const ActorCreateParameter& param);
     // Address: 0x02748EC4
     ~ChikuwaBlockBase() override { };
 
diff --git a/map_obj/Freezer.h b/map_obj/Freezer.h
index fb968e7b..faecefc8 100644
--- a/map_obj/Freezer.h
+++ b/map_obj/Freezer.h
@@ -12,7 +12,7 @@ class Freezer : public ActorState
 
 public:
     // Address: 0x02779968
-    Freezer(const ActorCreateParam& param);
+    Freezer(const ActorCreateParameter& param);
 
     // TODO: other methods, states
 
diff --git a/map_obj/ParentMovementMgr.h b/map_obj/ParentMovementMgr.h
index f39c8066..b8b39b05 100644
--- a/map_obj/ParentMovementMgr.h
+++ b/map_obj/ParentMovementMgr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 #include <state/FStateMgr.h>
 #include <utility/Angle.h>
 #include <utility/Direction.h>
@@ -88,7 +88,7 @@ class ParentMovementMgr
         return mPosition;
     }
 
-    ActorUniqueID getParentActorID() const
+    UniqueID getParentActorID() const
     {
         return mParentActorID;
     }
@@ -215,7 +215,7 @@ class ParentMovementMgr
     sead::Vector3f   mPivotCenter;
     u32              _30;
     u32              _34;
-    ActorUniqueID    mParentActorID;
+    UniqueID    mParentActorID;
     u32              _3c;
     u32              _40;
     u32              _44;
diff --git a/map_obj/PlayerRideUtil.h b/map_obj/PlayerRideUtil.h
index 49a0a993..fa3e286d 100644
--- a/map_obj/PlayerRideUtil.h
+++ b/map_obj/PlayerRideUtil.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <actor/ActorUniqueID.h>
+#include <actor/UniqueID.h>
 
 #include <basis/seadTypes.h>
 
-class ActorUniqueID;
+class UniqueID;
 class BgCollision;
 
 class PlayerRideUtil
@@ -14,11 +14,11 @@ class PlayerRideUtil
 
 public:
     // Address: 0x02857AF8
-    static u32 getRideFlag(ActorUniqueID* ice_actor_id_array, u32* ice_actor_id_num, const BgCollision& bg_collision);
+    static u32 getRideFlag(UniqueID* ice_actor_id_array, u32* ice_actor_id_num, const BgCollision& bg_collision);
 
     static u32 getRideFlag(const BgCollision& bg_collision)
     {
-        ActorUniqueID ice_actor_id_array[cIceActorIDArraySize];
+        UniqueID ice_actor_id_array[cIceActorIDArraySize];
         u32 ice_actor_id_num = 0;
         return getRideFlag(ice_actor_id_array, &ice_actor_id_num, bg_collision);
     }
diff --git a/map_obj/PropBlock.h b/map_obj/PropBlock.h
index b4ca7eef..5ffe3db7 100644
--- a/map_obj/PropBlock.h
+++ b/map_obj/PropBlock.h
@@ -11,7 +11,7 @@ class PropBlock : public CarryBlockBase
 
 public:
     // Address: 0x02868440
-    PropBlock(const ActorCreateParam& param);
+    PropBlock(const ActorCreateParameter& param);
 
 private:
     u32 _1800[(0x1C4C - 0x1800) / sizeof(u32)];
diff --git a/map_obj/RingBase.h b/map_obj/RingBase.h
index 41b2e75d..7b68b1fe 100644
--- a/map_obj/RingBase.h
+++ b/map_obj/RingBase.h
@@ -13,7 +13,7 @@ class RingBase : public ActorMultiState
 
 public:
     // Address: 0x02871254
-    RingBase(const ActorCreateParam& param);
+    RingBase(const ActorCreateParameter& param);
     // Address: 0x02872288
     ~RingBase() override { }
 
diff --git a/map_obj/RouletteBlock.h b/map_obj/RouletteBlock.h
index 71e49340..9d5c1050 100644
--- a/map_obj/RouletteBlock.h
+++ b/map_obj/RouletteBlock.h
@@ -23,7 +23,7 @@ class RouletteBlock : public ActorBlockBase
 
 public:
     // Address: 0x02879078
-    RouletteBlock(const ActorCreateParam& param);
+    RouletteBlock(const ActorCreateParameter& param);
     // Address: 0x0287A0FC
     ~RouletteBlock() override { }
 
@@ -87,7 +87,7 @@ class RouletteBlock : public ActorBlockBase
 
 public:
     // Address: 0x10151098
-    static const ActorCreateInfo cCreateInfo;
+    static const ActorData cCreateInfo;
 
 protected:
     AnimModel*               mModelActive;
diff --git a/map_obj/TarzanIvy.h b/map_obj/TarzanIvy.h
index 7280ffe2..70465f17 100644
--- a/map_obj/TarzanIvy.h
+++ b/map_obj/TarzanIvy.h
@@ -21,7 +21,7 @@ class TarzanIvyBase : public Actor
 
 public:
     [[clang::noinline]]
-    TarzanIvyBase(const ActorCreateParam& param)
+    TarzanIvyBase(const ActorCreateParameter& param)
         : Actor(param)
     {
         _2c4 = 0;
@@ -64,7 +64,7 @@ static_assert(sizeof(TarzanIvyBase) == 0xA08);
 class TarzanIvy : public TarzanIvyBase
 {
 public:
-    TarzanIvy(const ActorCreateParam& param)
+    TarzanIvy(const ActorCreateParameter& param)
         : TarzanIvyBase(param)
     {
         _2c4 = 0;
diff --git a/player/PlayerBase.h b/player/PlayerBase.h
index 4cc8486a..d5bc6f8d 100644
--- a/player/PlayerBase.h
+++ b/player/PlayerBase.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <actor/Actor.h>
-#include <actor/AttentionLookat.h>
+#include <actor/AttentionInfo.h>
 #include <audio/GameAudio.h>
 #include <collision/ActorBgCollisionPlayerCheck.h>
 #include <effect/EffectObj.h>
@@ -1017,7 +1017,7 @@ class PlayerBase : public Actor
     // ------------------------------------ PlayerBase.cpp (1) ------------------------------------ //
 
     // Address: 0x028F23C0
-    PlayerBase(const ActorCreateParam& param);
+    PlayerBase(const ActorCreateParameter& param);
     // Address: 0x028F2CA8
     virtual ~PlayerBase();
 
@@ -2779,7 +2779,7 @@ class PlayerBase : public Actor
     s32                                 _2a4;
     PlayerKey                           mPlayerKey;
     GameAudio::AudioObjctPly            mAudioObj;
-    AttentionLookat                     mAttentionLookat;
+    AttentionInfo                     mAttentionLookat;
     Bitfield<cStatus_MaxBitNum>         mStatus;
     f32                                 mHeight;
     u32                                 _4b8;
@@ -2831,10 +2831,10 @@ class PlayerBase : public Actor
     bool                                mIsBgDamageEnable;
     BgUnitCode::TypeInfo_Damage         mDamageBgTypeInfo;
     sead::FixedRingBuffer<
-        ActorUniqueID,
+        UniqueID,
         2
     >                                   mBgPressIDBuffer;
-    ActorUniqueID                       mLineSpinLiftID;
+    UniqueID                       mLineSpinLiftID;
     u32                                 _1b9c;
     s32                                 mNoHitObjBgTimer;
     f32                                 mAirDriftSpeedFStart;
@@ -2860,7 +2860,7 @@ class PlayerBase : public Actor
     bool                                _2084;
     bool                                _2085;
     s32                                 mNoHitPlayerTimer;
-    ActorUniqueID                       mNoHitPlayerID;
+    UniqueID                       mNoHitPlayerID;
     ReductionMode                       mReductionMode;
     u32                                 mReductionStep;
     f32                                 mReductionScale;
@@ -2881,7 +2881,7 @@ class PlayerBase : public Actor
     s32                                 mDemoSubAction;         // See DemoSubActionType
     s32                                 mDemoActionTimer;
     s32                                 _20ec;
-    ActorUniqueID                       mPlayerJumpDaiID;
+    UniqueID                       mPlayerJumpDaiID;
     s32                                 mDstNextGotoID;
     NextGotoType                        mNextGotoType;          // i.e., "Create Action"
     NextGotoBlockDelay                  mNextGotoDelay;
@@ -2919,7 +2919,7 @@ class PlayerBase : public Actor
     s32                                 mAction;                // See ActionType
     s32                                 mActionTimer;
     s32                                 mActionSubTimer;
-    ActorUniqueID                       mRideActorID;
+    UniqueID                       mRideActorID;
     s32                                 _21d8;
     u32                                 _21dc;
     s32                                 _21e0;
diff --git a/player/PlayerEatData.h b/player/PlayerEatData.h
index 65841052..548a981f 100644
--- a/player/PlayerEatData.h
+++ b/player/PlayerEatData.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <actor/EatData.h>
+#include <actor/EatCallback.h>
 
 // vtbl Address: 0x10169524
-class PlayerEatData : public EatData
+class PlayerEatData : public EatCallback
 {
 public:
     // Address: 0x02911918
-    PlayerEatData(ActorUniqueID owner_id);
+    PlayerEatData(UniqueID owner_id);
 
     // Address: 0x02911980
     void eatMove(Actor* yoshi) override;
@@ -20,4 +20,4 @@ class PlayerEatData : public EatData
     // Address: 0x02911DB4
     bool setEatSpitOut(Actor* yoshi) override;
 };
-static_assert(sizeof(PlayerEatData) == sizeof(EatData));
+static_assert(sizeof(PlayerEatData) == sizeof(EatCallback));
diff --git a/player/PlayerObject.h b/player/PlayerObject.h
index ffdef01f..33ff5522 100644
--- a/player/PlayerObject.h
+++ b/player/PlayerObject.h
@@ -155,7 +155,7 @@ class PlayerObject : public PlayerBase
     // ------------------------------------ PlayerObject.cpp ------------------------------------ //
 
     // Address: 0x02923520
-    PlayerObject(const ActorCreateParam& param);
+    PlayerObject(const ActorCreateParameter& param);
 
     virtual ~PlayerObject()
     {
@@ -886,9 +886,9 @@ class PlayerObject : public PlayerBase
     void releaseCarryActor();
 
     // Address: 0x0292C70C
-    void setCarryBase(ActorUniqueID actor_id, CarryType type);
+    void setCarryBase(UniqueID actor_id, CarryType type);
     // Address: 0x0292D060
-    void setLiftUpBase(ActorUniqueID actor_id, CarryType type);
+    void setLiftUpBase(UniqueID actor_id, CarryType type);
     // Address: 0x0292D138
     virtual bool setCarry(Actor* actor, CarryType type);
 
@@ -924,7 +924,7 @@ class PlayerObject : public PlayerBase
     // Address: 0x0292DAE8
     void calcLiftUpOffsetScale();
 
-    ActorUniqueID getCarryActorID() const
+    UniqueID getCarryActorID() const
     {
         return mCarryActorID;
     }
@@ -1178,7 +1178,7 @@ class PlayerObject : public PlayerBase
     sead::Vector2f                  _2774;
     s32                             mStarTimer;
     s32                             mStarCnt;
-    ActorUniqueID                   mCarryActorID;
+    UniqueID                   mCarryActorID;
     CarryStep                       mCarryStep;
     CarryStep                       mCarryStepPrev;
     f32                             mCarryStepTimer;
@@ -1233,7 +1233,7 @@ class PlayerObject : public PlayerBase
     s32                             mSlideAttackBgTimer;
     f32                             _2a48;
     DirType                         mWallSlideDir;
-    ActorUniqueID                   mLiftUpActorID;
+    UniqueID                   mLiftUpActorID;
     f32                             mLiftUpReserveSpeed;
     f32                             mLiftUpOffsetRatio;
     CarryType                       mCarryType;
@@ -1287,7 +1287,7 @@ class PlayerObject : public PlayerBase
     EffectObj                       mSpinHipAttackEffect;
     u32                             _2cc4;
     u32                             _2cc8;
-    ActorUniqueID                   mPlayerIceActorID;
+    UniqueID                   mPlayerIceActorID;
     QuakeMode                       mQuakeMode;
     s32                             mQuakeRumbleTimer;
     f32                             _2cd8;
@@ -1328,8 +1328,8 @@ class PlayerObject : public PlayerBase
     bool                            _2d84;
     sead::Vector2f                  mEatPosReserve;
     DirType                         _2d90;
-    ActorUniqueID                   mPlayerHangChildActorID;
-    ActorUniqueID                   mPlayerHangParentActorID;
+    UniqueID                   mPlayerHangChildActorID;
+    UniqueID                   mPlayerHangParentActorID;
     u32                             _2d9c;
     sead::Matrixf                   mJrCrownMtx;
     u32                             _2dd0;
diff --git a/system/SaveMgr.h b/system/SaveMgr.h
index fa51a8b5..e0056ac5 100644
--- a/system/SaveMgr.h
+++ b/system/SaveMgr.h
@@ -265,7 +265,7 @@ struct SaveData
         u8 file;
         u8 area;
         bool exists;
-        u8 _3;
+        u8 _3; // TODO: padding that can be removed?
         struct
         {
             u16 x;
diff --git a/tag/BgCenter.h b/tag/BgCenter.h
index 5c9059a1..ff3d9590 100644
--- a/tag/BgCenter.h
+++ b/tag/BgCenter.h
@@ -7,7 +7,7 @@ class BgCenter : public ActorBase
     SEAD_RTTI_OVERRIDE(BgCenter, ActorBase)
 
 public:
-    BgCenter(const ActorCreateParam& param);
+    BgCenter(const ActorCreateParameter& param);
     virtual ~BgCenter() { }
 
     const sead::Vector3f& getPosition() const