diff --git a/include/common_structs.h b/include/common_structs.h
index 8bda978a65..35fd4b4494 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -1579,7 +1579,7 @@ typedef struct ActorPart {
     /* 0x78 */ u32* defenseTable;
     /* 0x7C */ s32 eventFlags;
     /* 0x80 */ s32 partFlags3;
-    /* 0x84 */ s32 unk_84;
+    /* 0x84 */ s32 spriteInstanceID;
     /* 0x88 */ u32 currentAnimation;
     /* 0x8C */ s32 animNotifyValue;
     /* 0x90 */ f32 animationRate;
@@ -1702,7 +1702,7 @@ typedef struct DecorationTable {
     /* 0x7D9 */ s8 unk_7D9;
     /* 0x7DA */ char unk_7DA;
     /* 0x7DB */ s8 unk_7DB;
-    /* 0x7DC */ s16 scale[16];
+    /* 0x7DC */ s16 yaw[16];
     /* 0x7FC */ s16 posX[16];
     /* 0x81C */ s16 posY[16];
     /* 0x83C */ s16 posZ[16];
diff --git a/include/macros.h b/include/macros.h
index 0bd121111a..1f1e356ae2 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -37,7 +37,7 @@
 
 // standardized padding macros for map overlays
 #define MAP_RODATA_PAD(n,name) const s32 N(rodata_pad_##name)[n] = {};
-#define MAP_STATIC_PAD(n,name) static s32 N(static_pad_##name)[n];
+#define MAP_STATIC_PAD(n,name) BSS s32 N(static_pad_##name)[n];
 
 // standardized macro for reseting data section after a INCLUDE_ASM
 //TODO these should all be removed after map decomp is done
@@ -183,4 +183,10 @@
 
 #define INTEGER_LOG2(x) ((x) <= 2 ? 1 : (x) <= 4 ? 2 : (x) <= 8 ? 3 : (x) <= 16 ? 4 : (x) <= 32 ? 5 : (x) <= 64 ? 6 : (x) <= 128 ? 7 : (x) <= 256 ? 8 : (x) <= 512 ? 9 : 10)
 
+#define FOLIAGE_MODEL_LIST(names...) \
+{ \
+    .count = __NARG__(names), \
+    .models = {  names } \
+}
+
 #endif
diff --git a/src/16c8e0.c b/src/16c8e0.c
index 07bca1e498..a61ba939cf 100644
--- a/src/16c8e0.c
+++ b/src/16c8e0.c
@@ -1132,9 +1132,9 @@ void btl_delete_actor(Actor* actor) {
         }
 
         if (partsTable->idleAnimations != NULL) {
-            func_802DE894(partsTable->unk_84, 0, 0, 0, 0, 0, 0);
+            func_802DE894(partsTable->spriteInstanceID, 0, 0, 0, 0, 0, 0);
 
-            ASSERT(spr_free_sprite(partsTable->unk_84) == 0);
+            ASSERT(spr_free_sprite(partsTable->spriteInstanceID) == 0);
 
             if (!(partsTable->flags & 0x80000000)) {
                 heap_free(partsTable->movement);
diff --git a/src/182B30.c b/src/182B30.c
index f765ce45d5..b0ce451583 100644
--- a/src/182B30.c
+++ b/src/182B30.c
@@ -115,7 +115,7 @@ void enable_actor_blur(Actor* actor) {
                 decorationTable->posX[j] = partsTable->currentPos.x;
                 decorationTable->posY[j] = partsTable->currentPos.y;
                 decorationTable->posZ[j] = partsTable->currentPos.z;
-                decorationTable->scale[j] = actor->yaw;
+                decorationTable->yaw[j] = actor->yaw;
                 decorationTable->rotationPivotOffsetX[j] = (s32)(actor->rotationPivotOffset.x * actor->scalingFactor);
                 decorationTable->rotationPivotOffsetY[j] = (s32)(actor->rotationPivotOffset.y * actor->scalingFactor);
 
@@ -202,7 +202,7 @@ void enable_player_blur(void) {
         decorationTable->posX[i] = partsTable->currentPos.x;
         decorationTable->posY[i] = partsTable->currentPos.y;
         decorationTable->posZ[i] = partsTable->currentPos.z;
-        decorationTable->scale[i] = playerActor->yaw;
+        decorationTable->yaw[i] = playerActor->yaw;
         decorationTable->rotationPivotOffsetX[i] = playerActor->rotationPivotOffset.x * playerActor->scalingFactor;
         decorationTable->rotationPivotOffsetY[i] = playerActor->rotationPivotOffset.y * playerActor->scalingFactor;
 
@@ -262,10 +262,10 @@ void func_802549F4(Actor* actor) {
         decorationTable->posX[i] = partsTable->currentPos.x;
         decorationTable->posY[i] = partsTable->currentPos.y;
         decorationTable->posZ[i] = partsTable->currentPos.z;
-        decorationTable->scale[i] = actor->yaw;
+        decorationTable->yaw[i] = actor->yaw;
 
-        decorationTable->rotationPivotOffsetX[i] = (s32)(actor->rotationPivotOffset.x * actor->scalingFactor);
-        decorationTable->rotationPivotOffsetY[i] = (s32)(actor->rotationPivotOffset.y * actor->scalingFactor);
+        decorationTable->rotationPivotOffsetX[i] = actor->rotationPivotOffset.x * actor->scalingFactor;
+        decorationTable->rotationPivotOffsetY[i] = actor->rotationPivotOffset.y * actor->scalingFactor;
 
         decorationTable->rotX[i] = clamp_angle(actor->rotation.x) * 0.5f;
         decorationTable->rotY[i] = clamp_angle(actor->rotation.y) * 0.5f;
@@ -286,7 +286,7 @@ void appendGfx_player_actor_blur(Actor* actor) {
     Matrix4f mtxTransform, mtxTemp;
     s32 delay;
     s32 num;
-    s32 scale;
+    s32 yaw;
     ActorPart* partTable;
     DecorationTable* decorationTable;
     f32 rotX, rotY, rotZ;
@@ -336,7 +336,7 @@ void appendGfx_player_actor_blur(Actor* actor) {
                 y = decorationTable->posY[bufPos];
                 z = decorationTable->posZ[bufPos];
 
-                scale = decorationTable->scale[bufPos];
+                yaw = decorationTable->yaw[bufPos];
 
                 pivotOffsetX = decorationTable->rotationPivotOffsetX[bufPos];
                 pivotOffsetY = decorationTable->rotationPivotOffsetY[bufPos];
@@ -375,7 +375,7 @@ void appendGfx_player_actor_blur(Actor* actor) {
                 guMtxCatF(mtxTemp, mtxTranslate, mtxTransform);
                 prevOpacity = partTable->opacity;
                 partTable->opacity = newOpacityBase - (num * newOpacityModulus);
-                func_802591EC(0, partTable, clamp_angle(scale + 180), mtxTransform, 1);
+                func_802591EC(0, partTable, clamp_angle(yaw + 180), mtxTransform, 1);
                 partTable->opacity = prevOpacity;
             }
         }
@@ -398,7 +398,7 @@ void func_802550BC(s32 arg0, Actor* actor) {
             decorationTable->posX[j] = partsTable->currentPos.x;
             decorationTable->posY[j] = partsTable->currentPos.y;
             decorationTable->posZ[j] = partsTable->currentPos.z;
-            decorationTable->scale[j] = actor->yaw;
+            decorationTable->yaw[j] = actor->yaw;
 
             decorationTable->rotationPivotOffsetX[j] = actor->rotationPivotOffset.x;
             decorationTable->rotationPivotOffsetY[j] = actor->rotationPivotOffset.y;
@@ -428,7 +428,7 @@ void func_802552EC(s32 arg0, Actor* actor) {
     s32 i, j, k, l;
     f32 x, y, z;
     f32 rotX, rotY, rotZ;
-    s32 scale;
+    s32 yaw;
     s32 opacity;
     s32 pivotX;
     s32 pivotY;
@@ -507,7 +507,7 @@ void func_802552EC(s32 arg0, Actor* actor) {
             y = decorationTable->posY[j];
             z = decorationTable->posZ[j];
 
-            scale = decorationTable->scale[j];
+            yaw = decorationTable->yaw[j];
 
             pivotX = decorationTable->rotationPivotOffsetX[j];
             pivotY = decorationTable->rotationPivotOffsetY[j];
@@ -558,9 +558,9 @@ void func_802552EC(s32 arg0, Actor* actor) {
             flags = ACTOR_PART_FLAG_80000000;
             temp = phi_fp - l * phi_s6;
             if (arg0 == 0) {
-                spr_draw_npc_sprite(partTable->unk_84 | flags, scale, temp, 0, mtxTransform);
+                spr_draw_npc_sprite(partTable->spriteInstanceID | flags, yaw, temp, 0, mtxTransform);
             } else {
-                spr_draw_npc_sprite(partTable->unk_84 | flags, clamp_angle(scale + 0xB4), temp, 0, mtxTransform);
+                spr_draw_npc_sprite(partTable->spriteInstanceID | flags, clamp_angle(yaw + 180), temp, 0, mtxTransform);
             }
         }
     }
@@ -623,10 +623,10 @@ void update_actor_shadow(s32 arg0, Actor* actor) {
 
             for (i = 0; i < numParts; i++) {
                 if (!(actorPart->flags & ACTOR_PART_FLAG_INVISIBLE) && actorPart->idleAnimations != NULL) {
-                    spriteID = actorPart->unk_84;
+                    spriteID = actorPart->spriteInstanceID;
                     if (spriteID >= 0) {
                         spr_update_sprite(spriteID, actorPart->currentAnimation, actorPart->animationRate);
-                        actorPart->animNotifyValue = spr_get_notify_value(actorPart->unk_84);
+                        actorPart->animNotifyValue = spr_get_notify_value(actorPart->spriteInstanceID);
                     }
 
                     if (!(actorPart->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) {
@@ -903,7 +903,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
                 do {
                     if (actor->koStatus == 0) {
                         part->currentAnimation = func_80265CE8(part->idleAnimations, STATUS_TURN_DONE);
-                        spr_update_sprite(part->unk_84, part->currentAnimation, part->animationRate);
+                        spr_update_sprite(part->spriteInstanceID, part->currentAnimation, part->animationRate);
                         animChanged = TRUE;
                     }
                 } while (0); // required to match
@@ -1062,10 +1062,10 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
             enable_status_transparent(actor->hudElementDataIndex);
             enable_status_chill_out(actor->hudElementDataIndex);
         }
-        if (part->unk_84 >= 0) {
+        if (part->spriteInstanceID >= 0) {
             if (lastAnim != part->currentAnimation) {
-                spr_update_sprite(part->unk_84, part->currentAnimation, part->animationRate);
-                part->animNotifyValue = spr_get_notify_value(part->unk_84);
+                spr_update_sprite(part->spriteInstanceID, part->currentAnimation, part->animationRate);
+                part->animNotifyValue = spr_get_notify_value(part->spriteInstanceID);
             }
         }
         if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
@@ -1112,7 +1112,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
         part->currentPos.y = partPosY + part->unkOffset[1];
         part->currentPos.z = partPosZ;
 
-        if (part->unk_84 >= 0) {
+        if (part->spriteInstanceID >= 0) {
             if (!isPartner) {
                 func_8025C840(1, part, partYaw, 0);
                 func_8025CCC8(1, part, partYaw, 0);
@@ -1301,7 +1301,7 @@ void update_player_actor_shadow(void) {
     Shadow* shadow;
     f32 x, y, z, distance;
 
-    parts->animNotifyValue = spr_update_player_sprite(0, parts->currentAnimation, parts->animationRate);
+    parts->animNotifyValue = spr_update_player_sprite(PLAYER_SPRITE_MAIN, parts->currentAnimation, parts->animationRate);
 
     if (player->flags & ACTOR_FLAG_BLUR_ENABLED) {
         func_802549F4(player);
@@ -1538,7 +1538,7 @@ void appendGfx_player_actor(void* arg0) {
                     } else {
                         playerParts->currentAnimation = func_80265D44(0x12);
                     }
-                    spr_update_player_sprite(0, playerParts->currentAnimation, playerParts->animationRate);
+                    spr_update_player_sprite(PLAYER_SPRITE_MAIN, playerParts->currentAnimation, playerParts->animationRate);
                     cond1 = TRUE;
                 }
             }
@@ -1557,7 +1557,7 @@ void appendGfx_player_actor(void* arg0) {
 
     if (player->stoneStatus == STATUS_STONE) {
         playerParts->currentAnimation = func_80265D44(0xC);
-        spr_update_player_sprite(0, playerParts->currentAnimation, playerParts->animationRate);
+        spr_update_player_sprite(PLAYER_SPRITE_MAIN, playerParts->currentAnimation, playerParts->animationRate);
         cond1 = TRUE;
 
         if (!cond2) {
@@ -1783,7 +1783,7 @@ end:
     guMtxCatF(mtxTemp, mtxTranslate, mtxTransform);
 
     if (lastAnim != playerParts->currentAnimation) {
-        spr_update_player_sprite(0, playerParts->currentAnimation, playerParts->animationRate);
+        spr_update_player_sprite(PLAYER_SPRITE_MAIN, playerParts->currentAnimation, playerParts->animationRate);
     }
     func_8025C840(0, playerParts, clamp_angle(playerYaw + 180.0f), 0);
     func_8025CCC8(0, playerParts, clamp_angle(playerYaw + 180.0f), 0);
@@ -1842,30 +1842,30 @@ void appendGfx_player_actor_reflection(void* arg0) {
 
 s32 func_802591EC(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     s32 opacity;
-    s32 sprMask;
+    s32 sprDrawOpts;
 
     if (part->flags & ACTOR_PART_FLAG_2) {
         opacity = 255;
-        sprMask = 0;
+        sprDrawOpts = 0;
         if (part->opacity < 255) {
-            sprMask = 0x80000000;
+            sprDrawOpts = DRAW_SPRITE_OVERRIDE_ALPHA;
             opacity = part->opacity;
         }
         if (part->flags & ACTOR_PART_FLAG_100) {
             opacity = opacity * 120 / 255;
-            sprMask = 0x80000000;
+            sprDrawOpts = DRAW_SPRITE_OVERRIDE_ALPHA;
         }
         if (arg0 == 0) {
             if (opacity == 255) {
-                spr_draw_player_sprite(0, yaw, 0, NULL, mtx);
+                spr_draw_player_sprite(PLAYER_SPRITE_MAIN, yaw, 0, NULL, mtx);
             } else {
-                spr_draw_player_sprite(sprMask, yaw, opacity, NULL, mtx);
+                spr_draw_player_sprite(PLAYER_SPRITE_MAIN | sprDrawOpts, yaw, opacity, NULL, mtx);
             }
         } else {
             if (opacity == 255) {
-                spr_draw_npc_sprite(part->unk_84, yaw, 0, NULL, mtx);
+                spr_draw_npc_sprite(part->spriteInstanceID, yaw, 0, NULL, mtx);
             } else {
-                spr_draw_npc_sprite(part->unk_84 | sprMask, yaw, opacity, NULL, mtx);
+                spr_draw_npc_sprite(part->spriteInstanceID | sprDrawOpts, yaw, opacity, NULL, mtx);
             }
         }
         return 0;
@@ -1922,8 +1922,8 @@ s32 func_802591EC(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
 
 void func_80259494(ActorPart* part) {
     DecorationTable* decor = part->decorationTable;
-    u16* src;
-    u16* dest;
+    PAL_PTR src;
+    PAL_PTR dest;
     s32 i, j;
 
     for (i = 0; i < decor->numSpritePalettes; i++) {
@@ -1931,7 +1931,7 @@ void func_80259494(ActorPart* part) {
             src = decor->unk_6D4[i];
             dest = decor->copiedPalettes[1][i];
 
-            for (j = 0; j < 0x10; j++) {
+            for (j = 0; j < ARRAY_COUNT(decor->copiedPalettes[1][i]); j++) {
                 *dest = *src | 0xFFFE;
                 src++;
                 dest++;
@@ -1946,16 +1946,16 @@ void func_8025950C(ActorPart* part, s32 yaw, Matrix4f mtx) {
     DecorationTable* decor = part->decorationTable;
     s32 opacity = 255;
     s32 idMask = 0;
-    s32 ii, jj;
-    u16* dest;
-    u16* src;
+    PAL_PTR dest;
+    PAL_PTR src;
+    s32 i, j;
 
-    if (part->opacity < 0xFF) {
-        idMask = 0x80000000;
+    if (part->opacity < 255) {
+        idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
         opacity = part->opacity;
     }
-    if (part->flags & 0x100) {
-        idMask = 0x80000000;
+    if (part->flags & ACTOR_PART_FLAG_100) {
+        idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
         opacity = (opacity * 120) / 255;
     }
 
@@ -1966,11 +1966,11 @@ void func_8025950C(ActorPart* part, s32 yaw, Matrix4f mtx) {
             decor->numSpritePalettes++;
         }
 
-        for (ii = 0; ii < decor->numSpritePalettes; ii++) {
-            src = decor->spritePalettes[ii];
-            dest = decor->copiedPalettes[0][ii];
+        for (i = 0; i < decor->numSpritePalettes; i++) {
+            src = decor->spritePalettes[i];
+            dest = decor->copiedPalettes[0][i];
             if (src != NULL) {
-                for (jj = 0; jj < 16; jj++) {
+                for (j = 0; j < ARRAY_COUNT(decor->copiedPalettes[0][i]); j++) {
                     *dest = *src;
                     src++;
                     dest++;
@@ -1978,13 +1978,13 @@ void func_8025950C(ActorPart* part, s32 yaw, Matrix4f mtx) {
             }
         }
 
-        for (ii = 0; ii < decor->numSpritePalettes; ii++) {
-            decor->unk_6D4[ii] = decor->copiedPalettes[0][ii];
+        for (i = 0; i < decor->numSpritePalettes; i++) {
+            decor->unk_6D4[i] = decor->copiedPalettes[0][i];
         }
 
         func_802596C0(part, yaw, mtx);
     } else {
-        spr_draw_npc_sprite(part->unk_84 | idMask, yaw, opacity, NULL, mtx);
+        spr_draw_npc_sprite(part->spriteInstanceID | idMask, yaw, opacity, NULL, mtx);
     }
 }
 
@@ -1994,20 +1994,20 @@ void func_802596C0(ActorPart* part, s32 yaw, Matrix4f mtx) {
     s32 idMask = 0;
 
     if (part->opacity < 255) {
-        idMask = 0x80000000;
+        idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
         opacity = part->opacity;
     }
 
     if (part->flags & ACTOR_PART_FLAG_100) {
-        idMask = 0x80000000;
+        idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
         opacity = (opacity * 120) / 255;
     }
 
     if (decorationTable->unk_768 != 0) {
         func_80259494(part);
-        spr_draw_npc_sprite(part->unk_84 | 0x20000000 | idMask, yaw, opacity, decorationTable->unk_76C, mtx);
+        spr_draw_npc_sprite(part->spriteInstanceID | DRAW_SPRITE_OVERRIDE_PALETTES | idMask, yaw, opacity, decorationTable->unk_76C, mtx);
     } else {
-        spr_draw_npc_sprite(part->unk_84 | 0x20000000 | idMask, yaw, opacity, decorationTable->unk_6D4, mtx);
+        spr_draw_npc_sprite(part->spriteInstanceID | DRAW_SPRITE_OVERRIDE_PALETTES | idMask, yaw, opacity, decorationTable->unk_6D4, mtx);
     }
 }
 
@@ -2015,16 +2015,16 @@ void func_802597B0(ActorPart* part, s32 yaw, Matrix4f mtx) {
     DecorationTable* decor = part->decorationTable;
     s32 opacity = 255;
     s32 idMask = 0;
-    s32 i, j;
     PAL_PTR src;
     PAL_PTR dest;
+    s32 i, j;
 
     if (part->opacity < 255) {
-        idMask = 0x80000000;
+        idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
         opacity = part->opacity;
     }
-    if (part->flags & 0x100) {
-        idMask = 0x80000000;
+    if (part->flags & ACTOR_PART_FLAG_100) {
+        idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
         opacity = (opacity * 120) / 255;
     }
 
@@ -2040,7 +2040,7 @@ void func_802597B0(ActorPart* part, s32 yaw, Matrix4f mtx) {
             src = decor->spritePalettes[i];
             dest = decor->copiedPalettes[0][i];
             if (decor->spritePalettes[i] != NULL) {
-                for (j = 0; j < 16; j++) {
+                for (j = 0; j < ARRAY_COUNT(decor->copiedPalettes[0][i]); j++) {
                     *dest = *src;
                     dest++;
                     src++;
@@ -2052,7 +2052,7 @@ void func_802597B0(ActorPart* part, s32 yaw, Matrix4f mtx) {
         }
         func_8025995C(part, yaw, mtx);
     } else {
-        spr_draw_player_sprite(idMask, yaw, opacity, NULL, mtx);
+        spr_draw_player_sprite(PLAYER_SPRITE_MAIN | idMask, yaw, opacity, NULL, mtx);
     }
 }
 
@@ -2062,25 +2062,25 @@ void func_8025995C(ActorPart* part, s32 yaw, Matrix4f mtx) {
     s32 idMask = 0;
 
     if (part->opacity < 255) {
-        idMask = 0x80000000;
+        idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
         opacity = part->opacity;
     }
-    if (part->flags & 0x100) {
-        idMask = 0x80000000;
+    if (part->flags & ACTOR_PART_FLAG_100) {
+        idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
         opacity = (opacity * 120) / 255;
     }
 
     if (decorationTable->unk_768 != 0) {
         func_80259494(part);
-        idMask |= 0x20000000;
-        spr_draw_player_sprite(idMask, yaw, opacity, decorationTable->unk_76C, mtx);
+        idMask |= DRAW_SPRITE_OVERRIDE_PALETTES;
+        spr_draw_player_sprite(PLAYER_SPRITE_MAIN | idMask, yaw, opacity, decorationTable->unk_76C, mtx);
     } else {
-        idMask |= 0x20000000;
-        spr_draw_player_sprite(idMask, yaw, opacity, decorationTable->unk_6D4, mtx);
+        idMask |= DRAW_SPRITE_OVERRIDE_PALETTES;
+        spr_draw_player_sprite(PLAYER_SPRITE_MAIN | idMask, yaw, opacity, decorationTable->unk_6D4, mtx);
     }
 }
 
-void func_80259A48(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
+void func_80259A48(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     DecorationTable* decorationTable = part->decorationTable;
 
     if (decorationTable->unk_6C1 != 0) {
@@ -2089,19 +2089,19 @@ void func_80259A48(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
         part->unkOffset[1] = 0;
         decorationTable->unk_6C1 = 0;
     }
-    if (arg0 == 0) {
+    if (isNpcSprite == SPRITE_MODE_PLAYER) {
         func_802597B0(part, yaw, mtx);
     } else {
         func_8025950C(part, yaw, mtx);
     }
 }
 
-void func_80259AAC(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
+void func_80259AAC(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     DecorationTable* decorationTable = part->decorationTable;
     s32 i, j;
 
     if (decorationTable->unk_6C1 != 0) {
-        if (arg0 == 0) {
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
             decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
             decorationTable->numSpritePalettes = 0;
             while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@@ -2141,7 +2141,7 @@ void func_80259AAC(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     switch (decorationTable->unk_6C2) {
         case 0:
         case 1:
-            if (arg0 == 0) {
+            if (isNpcSprite == SPRITE_MODE_PLAYER) {
                 func_8025995C(part, yaw, mtx);
             } else {
                 func_802596C0(part, yaw, mtx);
@@ -2150,7 +2150,7 @@ void func_80259AAC(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     }
 }
 
-void func_80259D9C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
+void func_80259D9C(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     DecorationTable* decorationTable = part->decorationTable;
     u16* palIn;
     u16* palOut;
@@ -2158,7 +2158,7 @@ void func_80259D9C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     s32 temp;
 
     if (decorationTable->unk_6C1 != 0) {
-        if (arg0 == 0) {
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
             decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
             decorationTable->numSpritePalettes = 0;
             while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@@ -2252,7 +2252,7 @@ void func_80259D9C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
         decorationTable->unk_6D4[i] = decorationTable->copiedPalettes[0][i];
     }
 
-    if (arg0 == 0) {
+    if (isNpcSprite == SPRITE_MODE_PLAYER) {
         func_8025995C(part, yaw, mtx);
     } else {
         func_802596C0(part, yaw, mtx);
@@ -2263,7 +2263,7 @@ void func_80259D9C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     }
 }
 
-void func_8025A2C4(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
+void func_8025A2C4(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     DecorationTable* decorationTable = part->decorationTable;
     u16* palIn;
     u16* palOut;
@@ -2271,7 +2271,7 @@ void func_8025A2C4(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     s32 temp;
 
     if (decorationTable->unk_6C1 != 0) {
-        if (arg0 == 0) {
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
             decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
             decorationTable->numSpritePalettes = 2;
             while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@@ -2319,21 +2319,21 @@ void func_8025A2C4(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
         decorationTable->unk_6C8--;
     }
 
-    if (arg0 == 0) {
+    if (isNpcSprite == SPRITE_MODE_PLAYER) {
         func_8025995C(part, yaw, mtx);
     } else {
         func_802596C0(part, yaw, mtx);
     }
 }
 
-void func_8025A50C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
+void func_8025A50C(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     DecorationTable* decorationTable = part->decorationTable;
     u16* palIn;
     u16* palOut;
     s32 i, j;
 
     if (decorationTable->unk_6C1 != 0) {
-        if (arg0 == 0) {
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
             decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
             decorationTable->numSpritePalettes = 0;
             while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@@ -2377,21 +2377,21 @@ void func_8025A50C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
         decorationTable->unk_6D4[i] = decorationTable->copiedPalettes[0][i];
     }
 
-    if (arg0 == 0) {
+    if (isNpcSprite == SPRITE_MODE_PLAYER) {
         func_8025995C(part, yaw, mtx);
     } else {
         func_802596C0(part, yaw, mtx);
     }
 }
 
-void func_8025A74C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
+void func_8025A74C(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     DecorationTable* decorationTable = part->decorationTable;
     u16* palIn;
     u16* palOut;
     s32 i, j;
 
     if (decorationTable->unk_6C1 != 0) {
-        if (arg0 == 0) {
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
             decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
             decorationTable->numSpritePalettes = 0;
             while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@@ -2460,7 +2460,7 @@ void func_8025A74C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
             switch (decorationTable->unk_6CA) {
                 case 10:
                 case 12:
-                    if (arg0 == 0) {
+                    if (isNpcSprite == SPRITE_MODE_PLAYER) {
                         func_8025995C(part, yaw, mtx);
                     } else {
                         func_802596C0(part, yaw, mtx);
@@ -2470,7 +2470,7 @@ void func_8025A74C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
                     decorationTable->unk_6CA = 0;
                     // fallthrough
                 default:
-                    if (arg0 == 0) {
+                    if (isNpcSprite == SPRITE_MODE_PLAYER) {
                         func_802597B0(part, yaw, mtx);
                     } else {
                         func_8025950C(part, yaw, mtx);
@@ -2485,12 +2485,12 @@ void func_8025A74C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     }
 }
 
-void func_8025AA80(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
+void func_8025AA80(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     DecorationTable* decorationTable = part->decorationTable;
     s32 i, j;
 
     if (decorationTable->unk_6C1 != 0) {
-        if (arg0 == 0) {
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
             decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
             decorationTable->numSpritePalettes = 0;
             while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@@ -2534,14 +2534,14 @@ void func_8025AA80(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
         decorationTable->unk_6D4[i] = decorationTable->copiedPalettes[0][i];
     }
 
-    if (arg0 == 0) {
+    if (isNpcSprite == SPRITE_MODE_PLAYER) {
         func_8025995C(part, yaw, mtx);
     } else {
         func_802596C0(part, yaw, mtx);
     }
 }
 
-void func_8025AD90(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
+void func_8025AD90(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     DecorationTable* decorationTable = part->decorationTable;
     PAL_PTR palIn;
     PAL_PTR palOut;
@@ -2549,7 +2549,7 @@ void func_8025AD90(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     s32 temp;
 
     if (decorationTable->unk_6C1 != 0) {
-        if (arg0 == 0) {
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
             decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
             decorationTable->numSpritePalettes = 0;
             while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@@ -2633,7 +2633,7 @@ void func_8025AD90(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
         decorationTable->unk_6D4[i] = decorationTable->copiedPalettes[0][i];
     }
 
-    if (arg0 == 0) {
+    if (isNpcSprite == SPRITE_MODE_PLAYER) {
         func_8025995C(part, yaw, mtx);
     } else {
         func_802596C0(part, yaw, mtx);
@@ -2644,7 +2644,7 @@ void func_8025AD90(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     }
 }
 
-void func_8025B1A8(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
+void func_8025B1A8(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     DecorationTable* decorationTable = part->decorationTable;
     u16* palIn;
     u16* palOut;
@@ -2652,7 +2652,7 @@ void func_8025B1A8(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     s32 temp;
 
     if (decorationTable->unk_6C1 != 0) {
-        if (arg0 == 0) {
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
             decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
             decorationTable->numSpritePalettes = 0;
             while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@@ -2736,7 +2736,7 @@ void func_8025B1A8(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
         decorationTable->unk_6D4[i] = decorationTable->copiedPalettes[0][i];
     }
 
-    if (arg0 == 0) {
+    if (isNpcSprite == SPRITE_MODE_PLAYER) {
         func_8025995C(part, yaw, mtx);
     } else {
         func_802596C0(part, yaw, mtx);
@@ -2747,7 +2747,7 @@ void func_8025B1A8(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     }
 }
 
-void func_8025B5C0(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4, s32 arg5) {
+void func_8025B5C0(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4, s32 arg5) {
     DecorationTable* decorationTable = part->decorationTable;
     PAL_PTR color2;
     PAL_PTR color1;
@@ -2756,7 +2756,7 @@ void func_8025B5C0(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4, s
     u8 alpha;
 
     if (decorationTable->unk_6C1 != 0) {
-        if (arg0 == 0) {
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
             decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
             decorationTable->numSpritePalettes = 0;
             while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@@ -2863,7 +2863,7 @@ void func_8025B5C0(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4, s
     switch (decorationTable->unk_6C2) {
         case 0:
         case 1:
-            if (arg0 == 0) {
+            if (isNpcSprite == SPRITE_MODE_PLAYER) {
                 func_8025995C(part, yaw, mtx);
             } else {
                 func_802596C0(part, yaw, mtx);
@@ -2872,7 +2872,7 @@ void func_8025B5C0(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4, s
     }
 }
 
-void func_8025BAA0(s32 arg0, ActorPart* part, s32 yaw, s32 arg3, Matrix4f mtx, s32 arg5) {
+void func_8025BAA0(s32 isNpcSprite, ActorPart* part, s32 yaw, s32 arg3, Matrix4f mtx, s32 arg5) {
     DecorationTable* decor = part->decorationTable;
     PAL_PTR color1;
     PAL_PTR color2;
@@ -2883,7 +2883,7 @@ void func_8025BAA0(s32 arg0, ActorPart* part, s32 yaw, s32 arg3, Matrix4f mtx, s
     u8 r1, g1, b1;
 
     if (decor->unk_6C1 != 0) {
-        if (arg0 == 0) {
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
             decor->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
             decor->numSpritePalettes = 0;
             while ((s32)decor->spritePalettes[decor->numSpritePalettes] != -1) {
@@ -3030,7 +3030,7 @@ void func_8025BAA0(s32 arg0, ActorPart* part, s32 yaw, s32 arg3, Matrix4f mtx, s
         case 1:
         case 2:
         case 3:
-            if (arg0 == 0) {
+            if (isNpcSprite == SPRITE_MODE_PLAYER) {
                 func_8025995C(part, yaw, mtx);
             } else {
                 func_802596C0(part, yaw, mtx);
@@ -3039,7 +3039,7 @@ void func_8025BAA0(s32 arg0, ActorPart* part, s32 yaw, s32 arg3, Matrix4f mtx, s
     }
 }
 
-void func_8025C120(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
+void func_8025C120(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     DecorationTable* decor = part->decorationTable;
     PAL_PTR color1;
     PAL_PTR color2;
@@ -3050,7 +3050,7 @@ void func_8025C120(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
     u8 r1, g1, b1;
 
     if (decor->unk_6C1 != 0) {
-        if (arg0 == 0) {
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
             decor->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
             decor->numSpritePalettes = 0;
             while (decor->spritePalettes[decor->numSpritePalettes] != (PAL_PTR) -1) {
@@ -3196,7 +3196,7 @@ void func_8025C120(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
         case 1:
         case 2:
         case 3:
-            if (arg0 == 0) {
+            if (isNpcSprite == SPRITE_MODE_PLAYER) {
                 func_8025995C(part, yaw, mtx);
             } else {
                 func_802596C0(part, yaw, mtx);
@@ -3206,7 +3206,7 @@ void func_8025C120(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
 }
 
 s32 func_8025C840(s32 arg0, ActorPart* part, s32 yaw, s32 arg3) {
-    if (!(part->flags & 2)) {
+    if (!(part->flags & ACTOR_PART_FLAG_2)) {
         switch (part->decorationTable->unk_750) {
             case 0:
                 func_8025C8A0(arg0, part, yaw, arg3);
@@ -3219,18 +3219,18 @@ s32 func_8025C840(s32 arg0, ActorPart* part, s32 yaw, s32 arg3) {
     return 0;
 }
 
-void func_8025C8A0(s32 arg0, ActorPart* part, s32 yaw, s32 arg3) {
+void func_8025C8A0(s32 isNpcSprite, ActorPart* part, s32 yaw, s32 arg3) {
     if (part->decorationTable->unk_751 != 0) {
         part->decorationTable->unk_751 = 0;
-        if (arg0 == 0) {
-            func_802DDFF8(0, 0, 0, 0, 0, 0, 0);
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
+            func_802DDFF8(PLAYER_SPRITE_MAIN, 0, 0, 0, 0, 0, 0);
         } else {
-            func_802DE894(part->unk_84, 0, 0, 0, 0, 0, 0);
+            func_802DE894(part->spriteInstanceID, 0, 0, 0, 0, 0, 0);
         }
     }
 }
 
-void func_8025C918(s32 arg0, ActorPart* part, s32 yaw, s32 arg3) {
+void func_8025C918(s32 isNpcSprite, ActorPart* part, s32 yaw, s32 arg3) {
     DecorationTable* decor = part->decorationTable;
     u8 rbuf[20];
     u8 gbuf[20];
@@ -3245,10 +3245,10 @@ void func_8025C918(s32 arg0, ActorPart* part, s32 yaw, s32 arg3) {
         decor->unk75A = 0;
         decor->unk_751 = 0;
         decor->unk758 = 0;
-        if (arg0 == 0) {
-            func_802DDFF8(0, 0x11, 0x14, 0, 0, 0xFF, 0);
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
+            func_802DDFF8(0, FOLD_TYPE_11, 0x14, 0, 0, 0xFF, 0);
         } else {
-            func_802DE894(part->unk_84, 0x11, 0x14, 0, 0, 0xFF, 0);
+            func_802DE894(part->spriteInstanceID, FOLD_TYPE_11, 0x14, 0, 0, 0xFF, 0);
         }
     }
 
@@ -3275,10 +3275,10 @@ void func_8025C918(s32 arg0, ActorPart* part, s32 yaw, s32 arg3) {
 
     for (i = 0; i < ARRAY_COUNT(rbuf); i++) {
         color = (rbuf[i] << 0x18) | (gbuf[i] << 0x10) | (bbuf[i] << 8) | alpha;
-        if (arg0 == 0) {
-            func_802DDFF8(0, 0xC, i, color, 0, 0xFF, 0);
+        if (isNpcSprite == SPRITE_MODE_PLAYER) {
+            func_802DDFF8(PLAYER_SPRITE_MAIN, 0xC, i, color, 0, 0xFF, 0);
         } else {
-            func_802DE894(part->unk_84, 0xC, i, color, 0, 0xFF, 0);
+            func_802DE894(part->spriteInstanceID, 0xC, i, color, 0, 0xFF, 0);
         }
     }
 
diff --git a/src/190B20.c b/src/190B20.c
index b29da412ce..e636f9637f 100644
--- a/src/190B20.c
+++ b/src/190B20.c
@@ -977,7 +977,7 @@ void set_animation(s32 actorID, s32 partIdx, s32 animationIndex) {
                 part = &actor->partsTable[0];
                 if (part->currentAnimation != animationIndex) {
                     part->currentAnimation = animationIndex;
-                    spr_update_player_sprite(0, animationIndex, part->animationRate);
+                    spr_update_player_sprite(PLAYER_SPRITE_MAIN, animationIndex, part->animationRate);
                 }
                 break;
             case ACTOR_CLASS_PARTNER:
@@ -993,16 +993,16 @@ void set_animation(s32 actorID, s32 partIdx, s32 animationIndex) {
 
                 if (part->currentAnimation != animationIndex) {
                     part->currentAnimation = animationIndex;
-                    spr_update_sprite(part->unk_84, animationIndex, part->animationRate);
-                    part->animNotifyValue = spr_get_notify_value(part->unk_84);
+                    spr_update_sprite(part->spriteInstanceID, animationIndex, part->animationRate);
+                    part->animNotifyValue = spr_get_notify_value(part->spriteInstanceID);
                 }
                 break;
             case ACTOR_CLASS_ENEMY:
                 part = get_actor_part(actor, partIdx);
                 if (part->currentAnimation != animationIndex) {
                     part->currentAnimation = animationIndex;
-                    spr_update_sprite(part->unk_84, animationIndex, part->animationRate);
-                    part->animNotifyValue = spr_get_notify_value(part->unk_84);
+                    spr_update_sprite(part->spriteInstanceID, animationIndex, part->animationRate);
+                    part->animNotifyValue = spr_get_notify_value(part->spriteInstanceID);
                 }
                 break;
         }
@@ -1015,15 +1015,15 @@ void func_80263E08(Actor* actor, ActorPart* part, s32 anim) {
             case ACTOR_CLASS_PLAYER:
                 if (part->currentAnimation != anim) {
                     part->currentAnimation = anim;
-                    spr_update_player_sprite(0, anim, part->animationRate);
+                    spr_update_player_sprite(PLAYER_SPRITE_MAIN, anim, part->animationRate);
                 }
                 break;
             case ACTOR_CLASS_PARTNER:
             case ACTOR_CLASS_ENEMY:
                 if (part->currentAnimation != anim) {
                     part->currentAnimation = anim;
-                    spr_update_sprite(part->unk_84, anim, part->animationRate);
-                    part->animNotifyValue = spr_get_notify_value(part->unk_84);
+                    spr_update_sprite(part->spriteInstanceID, anim, part->animationRate);
+                    part->animNotifyValue = spr_get_notify_value(part->spriteInstanceID);
                 }
                 break;
         }
@@ -1605,11 +1605,11 @@ void load_partner_actor(void) {
 
             part->animationRate = 1.0f;
             part->currentAnimation = 0;
-            part->unk_84 = -1;
+            part->spriteInstanceID = -1;
 
             if (part->idleAnimations != NULL) {
                 part->currentAnimation = func_80265CE8(part->idleAnimations, 1);
-                part->unk_84 = spr_load_npc_sprite(part->currentAnimation | SPRITE_ID_TAIL_ALLOCATE, NULL);
+                part->spriteInstanceID = spr_load_npc_sprite(part->currentAnimation | SPRITE_ID_TAIL_ALLOCATE, NULL);
             }
 
             if (i + 1 >= partCount) {
@@ -1872,11 +1872,11 @@ Actor* create_actor(Formation formation) {
 
         part->animationRate = 1.0f;
         part->currentAnimation = 0;
-        part->unk_84 = -1;
+        part->spriteInstanceID = -1;
 
         if (part->idleAnimations != NULL) {
             part->currentAnimation = func_80265CE8(part->idleAnimations, 1) & ~SPRITE_ID_TAIL_ALLOCATE;
-            part->unk_84 = spr_load_npc_sprite(part->currentAnimation, NULL);
+            part->spriteInstanceID = spr_load_npc_sprite(part->currentAnimation, NULL);
         }
 
         if (j + 1 >= partCount) {
diff --git a/src/1A5830.c b/src/1A5830.c
index 9b42aaf1fc..e6c3e49e5e 100644
--- a/src/1A5830.c
+++ b/src/1A5830.c
@@ -3267,7 +3267,7 @@ ApiStatus EnableActorGlow(Evt* script, s32 isInitialCall) {
 
         while (it != NULL) {
             if (it->idleAnimations != NULL) {
-                func_802DE894(it->unk_84, 0, 0, 0, 0, 0, 0);
+                func_802DE894(it->spriteInstanceID, 0, 0, 0, 0, 0, 0);
             }
             it = it->nextPart;
         }
diff --git a/src/77480.c b/src/77480.c
index e02e4bc76b..d8cff99c1e 100644
--- a/src/77480.c
+++ b/src/77480.c
@@ -1386,7 +1386,7 @@ void player_sprite_behaviour(void) {
     if (playerStatus->flags & PS_FLAG_TIME_STOPPED) {
         timescale = 0.0f;
     }
-    playerStatus->animNotifyValue = spr_update_player_sprite(0, playerStatus->trueAnimation, timescale);
+    playerStatus->animNotifyValue = spr_update_player_sprite(PLAYER_SPRITE_MAIN, playerStatus->trueAnimation, timescale);
     playerStatus->flags |= PS_FLAG_SPRITE_REDRAW;
 }
 
@@ -1465,11 +1465,11 @@ void render_player_model(void) {
                     }
 
                     playerStatus->renderMode = renderModeTemp;
-                    func_802DDEE4(0, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
+                    func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
 
                 } else {
                     playerStatus->renderMode = RENDER_MODE_ALPHATEST;
-                    func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0);
+                    func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0);
                 }
             }
 
@@ -1504,7 +1504,7 @@ void appendGfx_player(void* data) {
     PlayerStatus* playerStatus = &gPlayerStatus;
     Matrix4f sp20, sp60, spA0, spE0;
     f32 temp_f0 = -gCameras[gCurrentCamID].currentYaw;
-    s32 flags;
+    s32 spriteIdx;
 
     if (playerStatus->actionState == ACTION_STATE_SLIDING) {
         guScaleF(spE0, SPRITE_WORLD_SCALE_D, SPRITE_WORLD_SCALE_D, SPRITE_WORLD_SCALE_D);
@@ -1514,7 +1514,7 @@ void appendGfx_player(void* data) {
         guMtxCatF(sp20, spA0, sp20);
         guTranslateF(sp60, playerStatus->position.x, playerStatus->position.y - 1.0f, playerStatus->position.z);
         guMtxCatF(sp20, sp60, sp20);
-        spr_draw_player_sprite(0, 0, 0, 0, sp20);
+        spr_draw_player_sprite(PLAYER_SPRITE_MAIN, 0, 0, 0, sp20);
     } else {
         guRotateF(spA0, temp_f0, 0.0f, -1.0f, 0.0f);
         guRotateF(sp20, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f);
@@ -1535,24 +1535,24 @@ void appendGfx_player(void* data) {
         if (playerStatus->animFlags & PA_FLAG_SHIVERING) {
             playerStatus->animFlags = playerStatus->animFlags & ~PA_FLAG_SHIVERING;
             playerStatus->shiverTime = 22;
-            func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0);
+            func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0);
             func_802DDFF8(playerStatus->anim, 5, 1, 1, 1, 0, 0);
         }
 
         if (playerStatus->shiverTime != 0) {
             playerStatus->shiverTime--;
             if (playerStatus->shiverTime == 0) {
-                func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0);
+                func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0);
             }
         }
 
         if (playerStatus->spriteFacingAngle >= 90.0f && playerStatus->spriteFacingAngle < 270.0f) {
-            flags = 0x10000000;
+            spriteIdx = PLAYER_SPRITE_MAIN | DRAW_SPRITE_UPSIDE_DOWN;
         } else {
-            flags = 0;
+            spriteIdx = PLAYER_SPRITE_MAIN;
         }
 
-        spr_draw_player_sprite(flags, 0, 0, 0, sp20);
+        spr_draw_player_sprite(spriteIdx, 0, 0, 0, sp20);
     }
 
     D_800F7B4C++;
@@ -1575,7 +1575,7 @@ void appendGfx_player_spin(void* data) {
     f32 px, py, pz;
     s32 x, y, z;
     s32 i;
-    s32 flags;
+    s32 spriteIdx;
 
     for (i = 0; i < 2; i++) {
         yaw = -gCameras[gCurrentCamID].currentYaw;
@@ -1599,7 +1599,7 @@ void appendGfx_player_spin(void* data) {
                 tint = 100;
             }
 
-            func_802DDFF8(0, 6, tint, tint, tint, 255, 0);
+            func_802DDFF8(0, FOLD_TYPE_6, tint, tint, tint, 255, 0);
 
             guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f);
             guRotateF(mtx, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f);
@@ -1618,7 +1618,7 @@ void appendGfx_player_spin(void* data) {
 
             px = playerStatus->position.x;
             pz = playerStatus->position.z;
-            func_802DDEE4(0, -1, 7, 0, 0, 0, 64, 0);
+            func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 7, 0, 0, 0, 64, 0);
             guRotateF(mtx, yaw, 0.0f, -1.0f, 0.0f);
             guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f);
             guRotateF(mtx, blurAngle, 0.0f, 1.0f, 0.0f);
@@ -1639,12 +1639,12 @@ void appendGfx_player_spin(void* data) {
         guMtxCatF(mtx, translation, mtx);
 
         if (playerStatus->spriteFacingAngle >= 90.0f && playerStatus->spriteFacingAngle < 270.0f) {
-            flags = 0x10000000;
+            spriteIdx = PLAYER_SPRITE_MAIN | DRAW_SPRITE_UPSIDE_DOWN;
         } else {
-            flags = 0;
+            spriteIdx = PLAYER_SPRITE_MAIN;
         }
 
-        spr_draw_player_sprite(flags, 0, 0, 0, mtx);
+        spr_draw_player_sprite(spriteIdx, 0, 0, 0, mtx);
     }
 }
 
diff --git a/src/7fd10_len_b40.c b/src/7fd10_len_b40.c
index 4c53111d74..1c2b31018c 100644
--- a/src/7fd10_len_b40.c
+++ b/src/7fd10_len_b40.c
@@ -30,7 +30,7 @@ void func_800E6860(void) {
     if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE && gPartnerActionStatus.actingPartner == PARTNER_BOW) {
         Npc* partner = get_npc_unsafe(NPC_PARTNER);
 
-        func_802DDEE4(0, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
+        func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
         func_8003D624(partner, 7, playerStatus->alpha1, 0, 0, 0, 0);
         playerStatus->alpha2 = 0;
     }
diff --git a/src/C50A0.c b/src/C50A0.c
index cbbb258254..a30b644751 100644
--- a/src/C50A0.c
+++ b/src/C50A0.c
@@ -922,7 +922,7 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic
     ItemEntitiesCreated++;
     ASSERT(itemEntity != NULL);
 
-    itemEntity->renderGroup = ((u32)itemID >> 0x10) & 0xF;
+    itemEntity->renderGroup = (itemID & 0xF0000) >> 16;
     if (itemEntity->renderGroup == VIS_GROUP_5) {
         itemEntity->renderGroup = -1;
     }
diff --git a/src/actor_api.c b/src/actor_api.c
index e6c5236058..6132ee994a 100644
--- a/src/actor_api.c
+++ b/src/actor_api.c
@@ -2137,7 +2137,7 @@ ApiStatus func_8026DEF0(Evt* script, s32 isInitialCall) {
         actorID = script->owner1.actorID;
     }
 
-    evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->unk_84);
+    evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->spriteInstanceID);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/area_arn/stage/arn_01.c b/src/battle/area_arn/stage/arn_01.c
index b443499561..6ba4425bc5 100644
--- a/src/battle/area_arn/stage/arn_01.c
+++ b/src/battle/area_arn/stage/arn_01.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_arn_arn_01
 
 EvtScript N(beforeBattle_802278F0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_arn/stage/arn_02.c b/src/battle/area_arn/stage/arn_02.c
index 7d40807e48..42692f838e 100644
--- a/src/battle/area_arn/stage/arn_02.c
+++ b/src/battle/area_arn/stage/arn_02.c
@@ -20,7 +20,7 @@ EvtScript N(80227960) = {
 };
 
 EvtScript N(beforeBattle_80227A0C) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 8)
     EVT_EXEC_WAIT(N(80227960))
     EVT_RETURN
diff --git a/src/battle/area_arn/stage/arn_03.c b/src/battle/area_arn/stage/arn_03.c
index 6fb69f9fa1..4e6d510f74 100644
--- a/src/battle/area_arn/stage/arn_03.c
+++ b/src/battle/area_arn/stage/arn_03.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_arn_arn_03
 
 EvtScript N(beforeBattle_80227A90) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_arn/stage/arn_04.c b/src/battle/area_arn/stage/arn_04.c
index 79533b74d2..30f2438345 100644
--- a/src/battle/area_arn/stage/arn_04.c
+++ b/src/battle/area_arn/stage/arn_04.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_arn_arn_04
 
 EvtScript N(beforeBattle_80227B00) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_arn/stage/arn_05.c b/src/battle/area_arn/stage/arn_05.c
index db6b2b78e8..1efe8ae008 100644
--- a/src/battle/area_arn/stage/arn_05.c
+++ b/src/battle/area_arn/stage/arn_05.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_arn_arn_05
 
 EvtScript N(beforeBattle_80227B80) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_arn/stage/arn_06.c b/src/battle/area_arn/stage/arn_06.c
index 13430a4f0b..3aede165d4 100644
--- a/src/battle/area_arn/stage/arn_06.c
+++ b/src/battle/area_arn/stage/arn_06.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_arn_arn_06
 
 EvtScript N(beforeBattle_80227C00) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_dgb/stage/dgb_01.c b/src/battle/area_dgb/stage/dgb_01.c
index efc45e6370..26d2c95bfe 100644
--- a/src/battle/area_dgb/stage/dgb_01.c
+++ b/src/battle/area_dgb/stage/dgb_01.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_dgb_dgb_01
 
 EvtScript N(beforeBattle_8021B050) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_dgb/stage/dgb_02.c b/src/battle/area_dgb/stage/dgb_02.c
index b4d2f08442..876340d75b 100644
--- a/src/battle/area_dgb/stage/dgb_02.c
+++ b/src/battle/area_dgb/stage/dgb_02.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_dgb_dgb_02
 
 EvtScript N(beforeBattle_8021B0B0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_dgb/stage/dgb_03.c b/src/battle/area_dgb/stage/dgb_03.c
index a3e086c582..9cb516dd71 100644
--- a/src/battle/area_dgb/stage/dgb_03.c
+++ b/src/battle/area_dgb/stage/dgb_03.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_dgb_dgb_03
 
 EvtScript N(beforeBattle_8021B110) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_dgb/stage/dgb_04.c b/src/battle/area_dgb/stage/dgb_04.c
index 8091dd51b5..d155ca04bb 100644
--- a/src/battle/area_dgb/stage/dgb_04.c
+++ b/src/battle/area_dgb/stage/dgb_04.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_dgb_dgb_04
 
 EvtScript N(beforeBattle_8021B170) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_dgb/stage/dgb_05.c b/src/battle/area_dgb/stage/dgb_05.c
index 3875b1b589..78375a068b 100644
--- a/src/battle/area_dgb/stage/dgb_05.c
+++ b/src/battle/area_dgb/stage/dgb_05.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_dgb_dgb_05
 
 EvtScript N(beforeBattle_8021B1D0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_dig/stage/dig_01.c b/src/battle/area_dig/stage/dig_01.c
index 695a3a8b4d..bd49c5956b 100644
--- a/src/battle/area_dig/stage/dig_01.c
+++ b/src/battle/area_dig/stage/dig_01.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_dig_dig_01
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_dig/stage/dig_02.c b/src/battle/area_dig/stage/dig_02.c
index 5016a207fd..dc6cc9b234 100644
--- a/src/battle/area_dig/stage/dig_02.c
+++ b/src/battle/area_dig/stage/dig_02.c
@@ -6,7 +6,7 @@
 #define NAMESPACE b_area_dig_dig_02
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetGroupEnabled, MODEL_a, FALSE)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_dig/stage/dig_03.c b/src/battle/area_dig/stage/dig_03.c
index c67b9ae36f..9e428c7c3e 100644
--- a/src/battle/area_dig/stage/dig_03.c
+++ b/src/battle/area_dig/stage/dig_03.c
@@ -29,7 +29,7 @@ EvtScript N(updateModels) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, MODEL_g60)
     EVT_SET(LVar1, 0)
     EVT_EXEC(N(updateModels))
diff --git a/src/battle/area_dig/stage/dig_04.c b/src/battle/area_dig/stage/dig_04.c
index 37b6d2c7da..1d5994c331 100644
--- a/src/battle/area_dig/stage/dig_04.c
+++ b/src/battle/area_dig/stage/dig_04.c
@@ -10,7 +10,7 @@ extern ActorBlueprint N(slot_machine_stop);
 extern ActorBlueprint N(slot_machine_start);
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetTexPanner, 29, TEX_PANNER_A)
     EVT_THREAD
diff --git a/src/battle/area_dig/stage/dig_05.c b/src/battle/area_dig/stage/dig_05.c
index dc32dde365..b4c4d158ae 100644
--- a/src/battle/area_dig/stage/dig_05.c
+++ b/src/battle/area_dig/stage/dig_05.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_dig_dig_05
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_flo/stage/flo_01.c b/src/battle/area_flo/stage/flo_01.c
index 6fda53ed7d..df14197aee 100644
--- a/src/battle/area_flo/stage/flo_01.c
+++ b/src/battle/area_flo/stage/flo_01.c
@@ -62,7 +62,7 @@ EvtScript N(802310C0) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 37, 1)
     EVT_CALL(SetGroupEnabled, 28, 0)
diff --git a/src/battle/area_flo/stage/flo_01b.c b/src/battle/area_flo/stage/flo_01b.c
index 54649d171f..59ada80400 100644
--- a/src/battle/area_flo/stage/flo_01b.c
+++ b/src/battle/area_flo/stage/flo_01b.c
@@ -62,7 +62,7 @@ EvtScript N(80231560) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 37, 0)
     EVT_CALL(SetGroupEnabled, 28, 1)
diff --git a/src/battle/area_flo/stage/flo_01c.c b/src/battle/area_flo/stage/flo_01c.c
index 68c94ff0c2..a47589422c 100644
--- a/src/battle/area_flo/stage/flo_01c.c
+++ b/src/battle/area_flo/stage/flo_01c.c
@@ -62,7 +62,7 @@ EvtScript N(802319F0) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 37, 0)
     EVT_CALL(SetGroupEnabled, 28, 0)
diff --git a/src/battle/area_flo/stage/flo_02.c b/src/battle/area_flo/stage/flo_02.c
index 4ad5305a23..ec3cc8157b 100644
--- a/src/battle/area_flo/stage/flo_02.c
+++ b/src/battle/area_flo/stage/flo_02.c
@@ -62,7 +62,7 @@ EvtScript N(80231E90) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 35, 1)
     EVT_CALL(SetGroupEnabled, 47, 0)
diff --git a/src/battle/area_flo/stage/flo_02b.c b/src/battle/area_flo/stage/flo_02b.c
index 498f4735ee..7ceb7ef343 100644
--- a/src/battle/area_flo/stage/flo_02b.c
+++ b/src/battle/area_flo/stage/flo_02b.c
@@ -62,7 +62,7 @@ EvtScript N(80232310) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 35, 0)
     EVT_CALL(SetGroupEnabled, 47, 1)
diff --git a/src/battle/area_flo/stage/flo_02c.c b/src/battle/area_flo/stage/flo_02c.c
index 2f980b6dc8..c48de22e0e 100644
--- a/src/battle/area_flo/stage/flo_02c.c
+++ b/src/battle/area_flo/stage/flo_02c.c
@@ -62,7 +62,7 @@ EvtScript N(802327C0) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 35, 1)
     EVT_CALL(SetGroupEnabled, 47, 0)
diff --git a/src/battle/area_flo/stage/flo_03.c b/src/battle/area_flo/stage/flo_03.c
index e9e62a3fb9..89f44cae6c 100644
--- a/src/battle/area_flo/stage/flo_03.c
+++ b/src/battle/area_flo/stage/flo_03.c
@@ -78,7 +78,7 @@ s32 N(modelList)[] = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, N(modelList))
     EVT_EXEC(N(80232A30))
diff --git a/src/battle/area_flo/stage/flo_04.c b/src/battle/area_flo/stage/flo_04.c
index c74d478811..ef4988a4ca 100644
--- a/src/battle/area_flo/stage/flo_04.c
+++ b/src/battle/area_flo/stage/flo_04.c
@@ -26,7 +26,7 @@ EvtScript N(80233470) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 14)
     EVT_EXEC(N(80233470))
diff --git a/src/battle/area_flo/stage/flo_05.c b/src/battle/area_flo/stage/flo_05.c
index f1333fa7f1..27fdcb3c21 100644
--- a/src/battle/area_flo/stage/flo_05.c
+++ b/src/battle/area_flo/stage/flo_05.c
@@ -6,7 +6,7 @@
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_EXEC_WAIT(N(MakeSun))
     EVT_RETURN
diff --git a/src/battle/area_flo/stage/flo_06.c b/src/battle/area_flo/stage/flo_06.c
index c845bac2e9..a00575e413 100644
--- a/src/battle/area_flo/stage/flo_06.c
+++ b/src/battle/area_flo/stage/flo_06.c
@@ -6,7 +6,7 @@
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_EXEC_WAIT(N(MakeSun))
     EVT_RETURN
diff --git a/src/battle/area_flo2/stage/flo_01.c b/src/battle/area_flo2/stage/flo_01.c
index 639d91c035..c3a7dd4750 100644
--- a/src/battle/area_flo2/stage/flo_01.c
+++ b/src/battle/area_flo2/stage/flo_01.c
@@ -62,7 +62,7 @@ EvtScript N(802310C0) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 37, 1)
     EVT_CALL(SetGroupEnabled, 28, 0)
diff --git a/src/battle/area_flo2/stage/flo_01b.c b/src/battle/area_flo2/stage/flo_01b.c
index 95274ed56a..c6587ca7b5 100644
--- a/src/battle/area_flo2/stage/flo_01b.c
+++ b/src/battle/area_flo2/stage/flo_01b.c
@@ -62,7 +62,7 @@ EvtScript N(80231560) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 37, 0)
     EVT_CALL(SetGroupEnabled, 28, 1)
diff --git a/src/battle/area_flo2/stage/flo_01c.c b/src/battle/area_flo2/stage/flo_01c.c
index 436708cc13..dbcb4a0cb5 100644
--- a/src/battle/area_flo2/stage/flo_01c.c
+++ b/src/battle/area_flo2/stage/flo_01c.c
@@ -62,7 +62,7 @@ EvtScript N(802319F0) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 37, 0)
     EVT_CALL(SetGroupEnabled, 28, 0)
diff --git a/src/battle/area_flo2/stage/flo_02.c b/src/battle/area_flo2/stage/flo_02.c
index 4d5ca517f8..661a7201df 100644
--- a/src/battle/area_flo2/stage/flo_02.c
+++ b/src/battle/area_flo2/stage/flo_02.c
@@ -62,7 +62,7 @@ EvtScript N(80231E90) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 35, 1)
     EVT_CALL(SetGroupEnabled, 47, 0)
diff --git a/src/battle/area_flo2/stage/flo_02b.c b/src/battle/area_flo2/stage/flo_02b.c
index 61b24a1fb9..8756c537df 100644
--- a/src/battle/area_flo2/stage/flo_02b.c
+++ b/src/battle/area_flo2/stage/flo_02b.c
@@ -62,7 +62,7 @@ EvtScript N(80232310) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 35, 0)
     EVT_CALL(SetGroupEnabled, 47, 1)
diff --git a/src/battle/area_flo2/stage/flo_02c.c b/src/battle/area_flo2/stage/flo_02c.c
index 60b9d6d826..03756934e6 100644
--- a/src/battle/area_flo2/stage/flo_02c.c
+++ b/src/battle/area_flo2/stage/flo_02c.c
@@ -62,7 +62,7 @@ EvtScript N(802327C0) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 35, 1)
     EVT_CALL(SetGroupEnabled, 47, 0)
diff --git a/src/battle/area_flo2/stage/flo_03.c b/src/battle/area_flo2/stage/flo_03.c
index e479f135db..2a1c441287 100644
--- a/src/battle/area_flo2/stage/flo_03.c
+++ b/src/battle/area_flo2/stage/flo_03.c
@@ -78,7 +78,7 @@ s32 N(modelList)[] = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, N(modelList))
     EVT_EXEC(N(80232A30))
diff --git a/src/battle/area_flo2/stage/flo_04.c b/src/battle/area_flo2/stage/flo_04.c
index fae23130a1..d03fb8d7f8 100644
--- a/src/battle/area_flo2/stage/flo_04.c
+++ b/src/battle/area_flo2/stage/flo_04.c
@@ -26,7 +26,7 @@ EvtScript N(80233470) = {
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 14)
     EVT_EXEC(N(80233470))
diff --git a/src/battle/area_flo2/stage/flo_05.c b/src/battle/area_flo2/stage/flo_05.c
index 2f086cd934..0cff3375a6 100644
--- a/src/battle/area_flo2/stage/flo_05.c
+++ b/src/battle/area_flo2/stage/flo_05.c
@@ -6,7 +6,7 @@
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_EXEC_WAIT(N(MakeSun))
     EVT_RETURN
diff --git a/src/battle/area_flo2/stage/flo_06.c b/src/battle/area_flo2/stage/flo_06.c
index 9a8b618f92..cdacb8525b 100644
--- a/src/battle/area_flo2/stage/flo_06.c
+++ b/src/battle/area_flo2/stage/flo_06.c
@@ -6,7 +6,7 @@
 #include "common/MakeSun.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_EXEC_WAIT(N(MakeSun))
     EVT_RETURN
diff --git a/src/battle/area_hos/stage/hos_00.c b/src/battle/area_hos/stage/hos_00.c
index 2184a9092a..6b723c2c84 100644
--- a/src/battle/area_hos/stage/hos_00.c
+++ b/src/battle/area_hos/stage/hos_00.c
@@ -25,7 +25,7 @@ EvtScript N(802255E0) = {
 };
 
 EvtScript N(beforeBattle_802256E8) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_THREAD
         EVT_SET(LVar0, MODEL_h1)
         EVT_EXEC(N(802255E0))
diff --git a/src/battle/area_hos/stage/hos_01.c b/src/battle/area_hos/stage/hos_01.c
index ddb5731133..2dfa422a9d 100644
--- a/src/battle/area_hos/stage/hos_01.c
+++ b/src/battle/area_hos/stage/hos_01.c
@@ -104,7 +104,7 @@ void func_80218CEC_47FD9C(s32 arg0) {
 }
 
 EvtScript N(beforeBattle_80224BD0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
 
     EVT_CALL(MakeLocalVertexCopy, VTX_COPY_0, MODEL_o345, TRUE)
     EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_1, EVT_PTR(func_802184C0_47F570), 0)
diff --git a/src/battle/area_isk_part_1/stage/isk_00.c b/src/battle/area_isk_part_1/stage/isk_00.c
index df657a3a6b..abae3a94d2 100644
--- a/src/battle/area_isk_part_1/stage/isk_00.c
+++ b/src/battle/area_isk_part_1/stage/isk_00.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_isk_part_1_isk_00
 
 EvtScript N(beforeBattle_802238B0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_isk_part_1/stage/isk_01.c b/src/battle/area_isk_part_1/stage/isk_01.c
index 969930cec9..508f0b4939 100644
--- a/src/battle/area_isk_part_1/stage/isk_01.c
+++ b/src/battle/area_isk_part_1/stage/isk_01.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_isk_part_1_isk_01
 
 EvtScript N(beforeBattle_80223930) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_isk_part_1/stage/isk_02b.c b/src/battle/area_isk_part_1/stage/isk_02b.c
index b4f0dbf6d0..e3d8df2304 100644
--- a/src/battle/area_isk_part_1/stage/isk_02b.c
+++ b/src/battle/area_isk_part_1/stage/isk_02b.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_isk_part_1_isk_02b
 
 EvtScript N(beforeBattle_80223D90) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
     EVT_CALL(EnableModel, MODEL_o365, FALSE)
     EVT_CALL(EnableModel, MODEL_o366, FALSE)
diff --git a/src/battle/area_isk_part_1/stage/isk_02c.c b/src/battle/area_isk_part_1/stage/isk_02c.c
index 0e65bf02ba..35ae3cbf51 100644
--- a/src/battle/area_isk_part_1/stage/isk_02c.c
+++ b/src/battle/area_isk_part_1/stage/isk_02c.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_isk_part_1_isk_02c
 
 EvtScript N(beforeBattle_80223E90) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
     EVT_CALL(EnableModel, MODEL_kai2, 0)
     EVT_CALL(EnableModel, MODEL_kai1, 0)
diff --git a/src/battle/area_isk_part_1/stage/isk_03.c b/src/battle/area_isk_part_1/stage/isk_03.c
index 48e71c8df0..7b8c07181f 100644
--- a/src/battle/area_isk_part_1/stage/isk_03.c
+++ b/src/battle/area_isk_part_1/stage/isk_03.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_isk_part_1_isk_03
 
 EvtScript N(beforeBattle_80223A40) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_isk_part_1/stage/isk_03b.c b/src/battle/area_isk_part_1/stage/isk_03b.c
index 30a9210e46..4cb03a4e2c 100644
--- a/src/battle/area_isk_part_1/stage/isk_03b.c
+++ b/src/battle/area_isk_part_1/stage/isk_03b.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_isk_part_1_isk_03b
 
 EvtScript N(beforeBattle_80223D10) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_isk_part_1/stage/isk_04.c b/src/battle/area_isk_part_1/stage/isk_04.c
index da5564be1a..e365ac8a55 100644
--- a/src/battle/area_isk_part_1/stage/isk_04.c
+++ b/src/battle/area_isk_part_1/stage/isk_04.c
@@ -21,7 +21,7 @@ ApiStatus N(DeleteTorchFX)(Evt* script, s32 isInitialCall) {
 }
 
 EvtScript N(beforeBattle_80223AC0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
     EVT_CALL(N(CreateTorchFX))
     EVT_RETURN
diff --git a/src/battle/area_isk_part_1/stage/isk_05.c b/src/battle/area_isk_part_1/stage/isk_05.c
index 858c6e2b4f..d1366a4d2a 100644
--- a/src/battle/area_isk_part_1/stage/isk_05.c
+++ b/src/battle/area_isk_part_1/stage/isk_05.c
@@ -20,7 +20,7 @@ ApiStatus N(DeleteTorchFX)(Evt* script, s32 isInitialCall) {
 }
 
 EvtScript N(beforeBattle_80223B60) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(N(CreateTorchFX))
     EVT_RETURN
diff --git a/src/battle/area_isk_part_1/stage/isk_06.c b/src/battle/area_isk_part_1/stage/isk_06.c
index 37aeb8cba6..9971dc8601 100644
--- a/src/battle/area_isk_part_1/stage/isk_06.c
+++ b/src/battle/area_isk_part_1/stage/isk_06.c
@@ -17,7 +17,7 @@ ApiStatus func_80218A98_4E31D8(Evt* script, s32 isInitialCall) {
 }
 
 EvtScript N(beforeBattle_80223BF0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(func_80218A50_4E3190)
     EVT_RETURN
diff --git a/src/battle/area_isk_part_1/stage/isk_06b.c b/src/battle/area_isk_part_1/stage/isk_06b.c
index 90707d3d27..a86764f155 100644
--- a/src/battle/area_isk_part_1/stage/isk_06b.c
+++ b/src/battle/area_isk_part_1/stage/isk_06b.c
@@ -18,7 +18,7 @@ ApiStatus func_80218B78_4E32B8(Evt* script, s32 isInitialCall) {
 }
 
 EvtScript N(beforeBattle_80223F40) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
     EVT_CALL(func_80218B30_4E3270)
     EVT_CALL(EnableModel, MODEL_kesu, FALSE)
diff --git a/src/battle/area_isk_part_1/stage/isk_07.c b/src/battle/area_isk_part_1/stage/isk_07.c
index 9d626eef5e..8c71be9f22 100644
--- a/src/battle/area_isk_part_1/stage/isk_07.c
+++ b/src/battle/area_isk_part_1/stage/isk_07.c
@@ -17,7 +17,7 @@ ApiStatus func_80218B08_4E3248(Evt* script, s32 isInitialCall) {
 }
 
 EvtScript N(beforeBattle_80223C80) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(func_80218AC0_4E3200)
     EVT_RETURN
diff --git a/src/battle/area_isk_part_1/stage/isk_08.c b/src/battle/area_isk_part_1/stage/isk_08.c
index 54e0feffc5..be270eba44 100644
--- a/src/battle/area_isk_part_1/stage/isk_08.c
+++ b/src/battle/area_isk_part_1/stage/isk_08.c
@@ -17,7 +17,7 @@ ApiStatus func_80218BE8_4E3328(Evt* script, s32 isInitialCall) {
 }
 
 EvtScript N(beforeBattle_80223FE0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(func_80218BA0_4E32E0)
     EVT_RETURN
diff --git a/src/battle/area_isk_part_2/stage/isk_00.c b/src/battle/area_isk_part_2/stage/isk_00.c
index e7dd2aaa30..d1d9126017 100644
--- a/src/battle/area_isk_part_2/stage/isk_00.c
+++ b/src/battle/area_isk_part_2/stage/isk_00.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_isk_part_2_isk_00
 
 EvtScript N(beforeBattle_8021FCF0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_isk_part_2/stage/isk_01.c b/src/battle/area_isk_part_2/stage/isk_01.c
index d80ebe7e1f..ef0bccc2ac 100644
--- a/src/battle/area_isk_part_2/stage/isk_01.c
+++ b/src/battle/area_isk_part_2/stage/isk_01.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_isk_part_2_isk_01
 
 EvtScript N(beforeBattle_8021FD70) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_isk_part_2/stage/isk_02b.c b/src/battle/area_isk_part_2/stage/isk_02b.c
index 2c744dfa72..9a31e8dac2 100644
--- a/src/battle/area_isk_part_2/stage/isk_02b.c
+++ b/src/battle/area_isk_part_2/stage/isk_02b.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_isk_part_2_isk_02b
 
 EvtScript N(beforeBattle_8021FE80) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
     EVT_CALL(EnableModel, MODEL_o365, FALSE)
     EVT_CALL(EnableModel, MODEL_o366, FALSE)
diff --git a/src/battle/area_isk_part_2/stage/isk_02c.c b/src/battle/area_isk_part_2/stage/isk_02c.c
index a4a77b892b..493fdc0b64 100644
--- a/src/battle/area_isk_part_2/stage/isk_02c.c
+++ b/src/battle/area_isk_part_2/stage/isk_02c.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_isk_part_2_isk_02c
 
 EvtScript N(beforeBattle_8021FF80) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
     EVT_CALL(EnableModel, MODEL_kai2, 0)
     EVT_CALL(EnableModel, MODEL_kai1, 0)
diff --git a/src/battle/area_isk_part_2/stage/isk_03.c b/src/battle/area_isk_part_2/stage/isk_03.c
index 4676f959d9..c11902bf48 100644
--- a/src/battle/area_isk_part_2/stage/isk_03.c
+++ b/src/battle/area_isk_part_2/stage/isk_03.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_isk_part_2_isk_03
 
 EvtScript N(beforeBattle_80220030) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_isk_part_2/stage/isk_03b.c b/src/battle/area_isk_part_2/stage/isk_03b.c
index 733e8bc12e..b51ab1d5f9 100644
--- a/src/battle/area_isk_part_2/stage/isk_03b.c
+++ b/src/battle/area_isk_part_2/stage/isk_03b.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_isk_part_2_isk_03b
 
 EvtScript N(beforeBattle_802200B0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_isk_part_2/stage/isk_04.c b/src/battle/area_isk_part_2/stage/isk_04.c
index e109f739b1..ba48b89cd6 100644
--- a/src/battle/area_isk_part_2/stage/isk_04.c
+++ b/src/battle/area_isk_part_2/stage/isk_04.c
@@ -21,7 +21,7 @@ ApiStatus func_802188E4_4EFD84(Evt* script, s32 isInitialCall) {
 }
 
 EvtScript N(beforeBattle_80220130) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(func_80218850_4EFCF0)
     EVT_RETURN
diff --git a/src/battle/area_isk_part_2/stage/isk_05.c b/src/battle/area_isk_part_2/stage/isk_05.c
index acf18f56e3..cc0ec9e172 100644
--- a/src/battle/area_isk_part_2/stage/isk_05.c
+++ b/src/battle/area_isk_part_2/stage/isk_05.c
@@ -20,7 +20,7 @@ ApiStatus func_802189B0_4EFE50(Evt* script, s32 isInitialCall) {
 }
 
 EvtScript N(beforeBattle_802201D0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(func_80218920_4EFDC0)
     EVT_RETURN
diff --git a/src/battle/area_isk_part_2/stage/isk_06.c b/src/battle/area_isk_part_2/stage/isk_06.c
index d0b1c10607..c18c4681c3 100644
--- a/src/battle/area_isk_part_2/stage/isk_06.c
+++ b/src/battle/area_isk_part_2/stage/isk_06.c
@@ -17,7 +17,7 @@ ApiStatus func_80218A38_4EFED8(Evt* script, s32 isInitialCall) {
 }
 
 EvtScript N(beforeBattle_80220260) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(func_802189F0_4EFE90)
     EVT_RETURN
diff --git a/src/battle/area_isk_part_2/stage/isk_06b.c b/src/battle/area_isk_part_2/stage/isk_06b.c
index 1138d947bb..a14ea2fbc4 100644
--- a/src/battle/area_isk_part_2/stage/isk_06b.c
+++ b/src/battle/area_isk_part_2/stage/isk_06b.c
@@ -18,7 +18,7 @@ ApiStatus func_80218AA8_4EFF48(Evt* script, s32 isInitialCall) {
 }
 
 EvtScript N(beforeBattle_802202F0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
     EVT_CALL(func_80218A60_4EFF00)
     EVT_CALL(EnableModel, MODEL_kesu, FALSE)
diff --git a/src/battle/area_isk_part_2/stage/isk_07.c b/src/battle/area_isk_part_2/stage/isk_07.c
index 5ff90baf63..997a326249 100644
--- a/src/battle/area_isk_part_2/stage/isk_07.c
+++ b/src/battle/area_isk_part_2/stage/isk_07.c
@@ -17,7 +17,7 @@ ApiStatus func_80218B18_4EFFB8(Evt* script, s32 isInitialCall) {
 }
 
 EvtScript N(beforeBattle_80220390) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(func_80218AD0_4EFF70)
     EVT_RETURN
diff --git a/src/battle/area_iwa/stage/iwa_01.c b/src/battle/area_iwa/stage/iwa_01.c
index 0757ea28fa..ac0da9fd7e 100644
--- a/src/battle/area_iwa/stage/iwa_01.c
+++ b/src/battle/area_iwa/stage/iwa_01.c
@@ -10,7 +10,7 @@ extern ActorBlueprint N(whacka);
 extern Formation N(specialFormation_802208E4);
 
 EvtScript N(beforeBattle_80220860) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetGroupEnabled, MODEL_b, FALSE)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_iwa/stage/iwa_01b.c b/src/battle/area_iwa/stage/iwa_01b.c
index b9e7a2344c..ada0ae518f 100644
--- a/src/battle/area_iwa/stage/iwa_01b.c
+++ b/src/battle/area_iwa/stage/iwa_01b.c
@@ -6,7 +6,7 @@
 #define NAMESPACE b_area_iwa_iwa_01b
 
 EvtScript N(beforeBattle_80221510) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetGroupEnabled, MODEL_a, FALSE)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_iwa/stage/iwa_02.c b/src/battle/area_iwa/stage/iwa_02.c
index 63fae9e042..2dc1bfaeab 100644
--- a/src/battle/area_iwa/stage/iwa_02.c
+++ b/src/battle/area_iwa/stage/iwa_02.c
@@ -9,7 +9,7 @@
 extern ActorBlueprint N(whacka);
 
 EvtScript N(beforeBattle_80221590) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_jan/stage/jan_00.c b/src/battle/area_jan/stage/jan_00.c
index dee581ec17..2c3e36ac0a 100644
--- a/src/battle/area_jan/stage/jan_00.c
+++ b/src/battle/area_jan/stage/jan_00.c
@@ -102,7 +102,7 @@ EvtScript N(80226C18) = {
 };
 
 EvtScript N(beforeBattle_802271C4) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 32)
     EVT_EXEC(N(80226B00))
diff --git a/src/battle/area_jan/stage/jan_01.c b/src/battle/area_jan/stage/jan_01.c
index 2773598f29..00326527c2 100644
--- a/src/battle/area_jan/stage/jan_01.c
+++ b/src/battle/area_jan/stage/jan_01.c
@@ -101,7 +101,7 @@ EvtScript N(802273E8) = {
 };
 
 EvtScript N(beforeBattle_80227994) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 63, 0)
     EVT_THREAD
diff --git a/src/battle/area_jan/stage/jan_01b.c b/src/battle/area_jan/stage/jan_01b.c
index d493222be2..c7b279503a 100644
--- a/src/battle/area_jan/stage/jan_01b.c
+++ b/src/battle/area_jan/stage/jan_01b.c
@@ -101,7 +101,7 @@ EvtScript N(80227BC8) = {
 };
 
 EvtScript N(beforeBattle_80228174) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 40, 0)
     EVT_THREAD
diff --git a/src/battle/area_jan/stage/jan_02.c b/src/battle/area_jan/stage/jan_02.c
index 98636b841c..13df990fc0 100644
--- a/src/battle/area_jan/stage/jan_02.c
+++ b/src/battle/area_jan/stage/jan_02.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_jan_jan_02
 
 EvtScript N(beforeBattle_80228290) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_jan/stage/jan_03.c b/src/battle/area_jan/stage/jan_03.c
index e348f24a1e..06059caaf9 100644
--- a/src/battle/area_jan/stage/jan_03.c
+++ b/src/battle/area_jan/stage/jan_03.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_jan_jan_03
 
 EvtScript N(beforeBattle_80228320) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 22, 0)
     EVT_RETURN
diff --git a/src/battle/area_jan/stage/jan_03b.c b/src/battle/area_jan/stage/jan_03b.c
index d306524d38..d03d0fdc09 100644
--- a/src/battle/area_jan/stage/jan_03b.c
+++ b/src/battle/area_jan/stage/jan_03b.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_jan_jan_03b
 
 EvtScript N(beforeBattle_802283C0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 66, 0)
     EVT_RETURN
diff --git a/src/battle/area_jan/stage/jan_04.c b/src/battle/area_jan/stage/jan_04.c
index 604c29b39c..b5117b684f 100644
--- a/src/battle/area_jan/stage/jan_04.c
+++ b/src/battle/area_jan/stage/jan_04.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_jan_jan_04
 
 EvtScript N(beforeBattle_80228460) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 65, 0)
     EVT_RETURN
diff --git a/src/battle/area_jan/stage/jan_04b.c b/src/battle/area_jan/stage/jan_04b.c
index ebf71fd78a..6b41700fea 100644
--- a/src/battle/area_jan/stage/jan_04b.c
+++ b/src/battle/area_jan/stage/jan_04b.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_jan_jan_04b
 
 EvtScript N(beforeBattle_802284F0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 33, 0)
     EVT_RETURN
diff --git a/src/battle/area_jan2/stage/jan_00.c b/src/battle/area_jan2/stage/jan_00.c
index 3526931a9c..7d372edc5f 100644
--- a/src/battle/area_jan2/stage/jan_00.c
+++ b/src/battle/area_jan2/stage/jan_00.c
@@ -102,7 +102,7 @@ EvtScript N(8021DC48) = {
 };
 
 EvtScript N(beforeBattle_8021E1F4) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 32)
     EVT_EXEC(N(8021DB30))
diff --git a/src/battle/area_jan2/stage/jan_01.c b/src/battle/area_jan2/stage/jan_01.c
index 91fc783b6d..598633e63e 100644
--- a/src/battle/area_jan2/stage/jan_01.c
+++ b/src/battle/area_jan2/stage/jan_01.c
@@ -101,7 +101,7 @@ EvtScript N(8021E418) = {
 };
 
 EvtScript N(beforeBattle_8021E9C4) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 63, 0)
     EVT_THREAD
diff --git a/src/battle/area_jan2/stage/jan_01b.c b/src/battle/area_jan2/stage/jan_01b.c
index cf03c6e74c..aca8b4a84f 100644
--- a/src/battle/area_jan2/stage/jan_01b.c
+++ b/src/battle/area_jan2/stage/jan_01b.c
@@ -101,7 +101,7 @@ EvtScript N(8021EBF8) = {
 };
 
 EvtScript N(beforeBattle_8021F1A4) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 40, 0)
     EVT_THREAD
diff --git a/src/battle/area_jan2/stage/jan_02.c b/src/battle/area_jan2/stage/jan_02.c
index ac63fa8137..3f5d848447 100644
--- a/src/battle/area_jan2/stage/jan_02.c
+++ b/src/battle/area_jan2/stage/jan_02.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_jan2_jan_02
 
 EvtScript N(beforeBattle_8021F2C0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_jan2/stage/jan_03.c b/src/battle/area_jan2/stage/jan_03.c
index 126ddcc4fe..092a6b6277 100644
--- a/src/battle/area_jan2/stage/jan_03.c
+++ b/src/battle/area_jan2/stage/jan_03.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_jan2_jan_03
 
 EvtScript N(beforeBattle_8021F350) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 22, 0)
     EVT_RETURN
diff --git a/src/battle/area_jan2/stage/jan_03b.c b/src/battle/area_jan2/stage/jan_03b.c
index b8eb5fca82..8ed81756ef 100644
--- a/src/battle/area_jan2/stage/jan_03b.c
+++ b/src/battle/area_jan2/stage/jan_03b.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_jan2_jan_03b
 
 EvtScript N(beforeBattle_8021F3F0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 66, 0)
     EVT_RETURN
diff --git a/src/battle/area_jan2/stage/jan_04.c b/src/battle/area_jan2/stage/jan_04.c
index 50b0dfb4f8..683bf4c4c7 100644
--- a/src/battle/area_jan2/stage/jan_04.c
+++ b/src/battle/area_jan2/stage/jan_04.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_jan2_jan_04
 
 EvtScript N(beforeBattle_8021F490) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 65, 0)
     EVT_RETURN
diff --git a/src/battle/area_jan2/stage/jan_04b.c b/src/battle/area_jan2/stage/jan_04b.c
index 5a138acd14..f49a6dcad2 100644
--- a/src/battle/area_jan2/stage/jan_04b.c
+++ b/src/battle/area_jan2/stage/jan_04b.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_jan2_jan_04b
 
 EvtScript N(beforeBattle_8021F520) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 33, 0)
     EVT_RETURN
diff --git a/src/battle/area_kgr/stage/kgr_01.c b/src/battle/area_kgr/stage/kgr_01.c
index 2df3bc6ce6..3ef0034e26 100644
--- a/src/battle/area_kgr/stage/kgr_01.c
+++ b/src/battle/area_kgr/stage/kgr_01.c
@@ -6,7 +6,7 @@
 #include "common/UnkModelStuff2.inc.c"
 
 EvtScript N(beforeBattle_8021D3B4) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_THREAD
         EVT_SET(LVar0, 19)
diff --git a/src/battle/area_kkj/stage/kpa_05.c b/src/battle/area_kkj/stage/kpa_05.c
index 89ae6ef599..0ceaae591e 100644
--- a/src/battle/area_kkj/stage/kpa_05.c
+++ b/src/battle/area_kkj/stage/kpa_05.c
@@ -52,7 +52,7 @@ EvtScript N(createLightnings2) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_EXEC(N(createLightnings1))
     EVT_EXEC(N(createLightnings2))
     EVT_RETURN
diff --git a/src/battle/area_kmr_part_1/stage/kmr_02.c b/src/battle/area_kmr_part_1/stage/kmr_02.c
index 58429b5ffb..5806687cae 100644
--- a/src/battle/area_kmr_part_1/stage/kmr_02.c
+++ b/src/battle/area_kmr_part_1/stage/kmr_02.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_kmr_part_1_kmr_02
 
 EvtScript N(beforeBattle_8021FDA0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_kmr_part_1/stage/kmr_03.c b/src/battle/area_kmr_part_1/stage/kmr_03.c
index c535387248..8d071816c8 100644
--- a/src/battle/area_kmr_part_1/stage/kmr_03.c
+++ b/src/battle/area_kmr_part_1/stage/kmr_03.c
@@ -6,7 +6,7 @@
 #include "world/common/todo/clouds.inc.c"
 
 EvtScript N(beforeBattle_80220188) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 1)
     EVT_SET(LVar2, 0)
     EVT_EXEC(N(clouds1))
diff --git a/src/battle/area_kmr_part_1/stage/kmr_04.c b/src/battle/area_kmr_part_1/stage/kmr_04.c
index 469ce6a71e..678bf91cf0 100644
--- a/src/battle/area_kmr_part_1/stage/kmr_04.c
+++ b/src/battle/area_kmr_part_1/stage/kmr_04.c
@@ -6,7 +6,7 @@
 #include "world/common/todo/clouds.inc.c"
 
 EvtScript N(beforeBattle_802205D8) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 1)
     EVT_SET(LVar2, 0)
     EVT_EXEC(N(clouds1))
diff --git a/src/battle/area_kmr_part_1/stage/kmr_05.c b/src/battle/area_kmr_part_1/stage/kmr_05.c
index dc64cf00e0..9a627e32e2 100644
--- a/src/battle/area_kmr_part_1/stage/kmr_05.c
+++ b/src/battle/area_kmr_part_1/stage/kmr_05.c
@@ -6,7 +6,7 @@
 #include "world/common/todo/clouds.inc.c"
 
 EvtScript N(beforeBattle_80220A28) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(EnableModel, 27, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kmr_part_1/stage/kmr_06.c b/src/battle/area_kmr_part_1/stage/kmr_06.c
index 09f7889a19..f4997fada3 100644
--- a/src/battle/area_kmr_part_1/stage/kmr_06.c
+++ b/src/battle/area_kmr_part_1/stage/kmr_06.c
@@ -7,7 +7,7 @@
 #include "common/UnkFogFunc.inc.c"
 
 EvtScript N(beforeBattle_80220E28) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(N(UnkFogFunc))
     EVT_SET(LVar0, 1)
     EVT_SET(LVar2, 0)
diff --git a/src/battle/area_kmr_part_2/actor/goomnut_tree.c b/src/battle/area_kmr_part_2/actor/goomnut_tree.c
index 5bb746eeb2..4e94f72c01 100644
--- a/src/battle/area_kmr_part_2/actor/goomnut_tree.c
+++ b/src/battle/area_kmr_part_2/actor/goomnut_tree.c
@@ -306,15 +306,8 @@ EvtScript N(EVS_ShakeTree) = {
     EVT_END
 };
 
-FoliageModelList N(tree_leaves) = {
-    .count = 2,
-    .models = { 33, 36 }
-};
-
-FoliageModelList N(tree_trunk) = {
-    .count = 3,
-    .models = { 38, 39, 40 }
-};
+FoliageModelList N(tree_leaves) = FOLIAGE_MODEL_LIST(33, 36 );
+FoliageModelList N(tree_trunk) = FOLIAGE_MODEL_LIST(38, 39, 40 );
 
 FoliageVectorList N(D_80223D60_41D7F0) = {
     .count = 2,
diff --git a/src/battle/area_kmr_part_2/stage/kmr_02.c b/src/battle/area_kmr_part_2/stage/kmr_02.c
index 4e6f8f8de9..893d51627e 100644
--- a/src/battle/area_kmr_part_2/stage/kmr_02.c
+++ b/src/battle/area_kmr_part_2/stage/kmr_02.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_kmr_part_2_kmr_02
 
 EvtScript N(beforeBattle_80224700) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_kmr_part_2/stage/kmr_03.c b/src/battle/area_kmr_part_2/stage/kmr_03.c
index 4cd3373134..6f70c49a6d 100644
--- a/src/battle/area_kmr_part_2/stage/kmr_03.c
+++ b/src/battle/area_kmr_part_2/stage/kmr_03.c
@@ -6,7 +6,7 @@
 #include "world/common/todo/clouds.inc.c"
 
 EvtScript N(beforeBattle_80224AE8) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 1)
     EVT_SET(LVar2, 0)
     EVT_EXEC(N(clouds1))
diff --git a/src/battle/area_kmr_part_2/stage/kmr_04.c b/src/battle/area_kmr_part_2/stage/kmr_04.c
index d67dadf6dd..43490db2bd 100644
--- a/src/battle/area_kmr_part_2/stage/kmr_04.c
+++ b/src/battle/area_kmr_part_2/stage/kmr_04.c
@@ -6,7 +6,7 @@
 #include "world/common/todo/clouds.inc.c"
 
 EvtScript N(beforeBattle_80224F38) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 1)
     EVT_SET(LVar2, 0)
     EVT_EXEC(N(clouds1))
diff --git a/src/battle/area_kmr_part_2/stage/kmr_05.c b/src/battle/area_kmr_part_2/stage/kmr_05.c
index 3496adc671..0596ea7ea7 100644
--- a/src/battle/area_kmr_part_2/stage/kmr_05.c
+++ b/src/battle/area_kmr_part_2/stage/kmr_05.c
@@ -6,7 +6,7 @@
 #include "world/common/todo/clouds.inc.c"
 
 EvtScript N(beforeBattle_80225388) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(EnableModel, 27, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kmr_part_2/stage/kmr_06.c b/src/battle/area_kmr_part_2/stage/kmr_06.c
index 5419b1e31a..369474b74d 100644
--- a/src/battle/area_kmr_part_2/stage/kmr_06.c
+++ b/src/battle/area_kmr_part_2/stage/kmr_06.c
@@ -8,7 +8,7 @@
 #include "common/UnkFogFunc.inc.c"
 
 EvtScript N(beforeBattle_80225788) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(N(UnkFogFunc))
     EVT_SET(LVar0, 1)
     EVT_SET(LVar2, 0)
diff --git a/src/battle/area_kmr_part_3/stage/kmr_02.c b/src/battle/area_kmr_part_3/stage/kmr_02.c
index f90f642132..ad3f027c05 100644
--- a/src/battle/area_kmr_part_3/stage/kmr_02.c
+++ b/src/battle/area_kmr_part_3/stage/kmr_02.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_kmr_part_3_kmr_02
 
 EvtScript N(beforeBattle_802322D0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_kmr_part_3/stage/kmr_03.c b/src/battle/area_kmr_part_3/stage/kmr_03.c
index c6330980ff..64adbbb47d 100644
--- a/src/battle/area_kmr_part_3/stage/kmr_03.c
+++ b/src/battle/area_kmr_part_3/stage/kmr_03.c
@@ -6,7 +6,7 @@
 #include "world/common/todo/clouds.inc.c"
 
 EvtScript N(beforeBattle_802326B8) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 1)
     EVT_SET(LVar2, 0)
     EVT_EXEC(N(clouds1))
diff --git a/src/battle/area_kmr_part_3/stage/kmr_04.c b/src/battle/area_kmr_part_3/stage/kmr_04.c
index 5cb5cd7f2a..60f6ac9684 100644
--- a/src/battle/area_kmr_part_3/stage/kmr_04.c
+++ b/src/battle/area_kmr_part_3/stage/kmr_04.c
@@ -6,7 +6,7 @@
 #include "world/common/todo/clouds.inc.c"
 
 EvtScript N(beforeBattle_80232B08) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 1)
     EVT_SET(LVar2, 0)
     EVT_EXEC(N(clouds1))
diff --git a/src/battle/area_kmr_part_3/stage/kmr_05.c b/src/battle/area_kmr_part_3/stage/kmr_05.c
index ccdbf0ce92..52e4e8d765 100644
--- a/src/battle/area_kmr_part_3/stage/kmr_05.c
+++ b/src/battle/area_kmr_part_3/stage/kmr_05.c
@@ -6,7 +6,7 @@
 #include "world/common/todo/clouds.inc.c"
 
 EvtScript N(beforeBattle_80232F58) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(EnableModel, 26, 0)
     EVT_CALL(EnableModel, 29, 0)
     EVT_RETURN
diff --git a/src/battle/area_kmr_part_3/stage/kmr_06.c b/src/battle/area_kmr_part_3/stage/kmr_06.c
index 297a879fe5..4e92ab164f 100644
--- a/src/battle/area_kmr_part_3/stage/kmr_06.c
+++ b/src/battle/area_kmr_part_3/stage/kmr_06.c
@@ -8,7 +8,7 @@
 #include "common/UnkFogFunc.inc.c"
 
 EvtScript N(beforeBattle_80233378) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(N(UnkFogFunc))
     EVT_SET(LVar0, 1)
     EVT_SET(LVar2, 0)
diff --git a/src/battle/area_kmr_part_3/stage/kpa_01.c b/src/battle/area_kmr_part_3/stage/kpa_01.c
index d249c1fb6f..de03cacd87 100644
--- a/src/battle/area_kmr_part_3/stage/kpa_01.c
+++ b/src/battle/area_kmr_part_3/stage/kpa_01.c
@@ -19,7 +19,7 @@ EvtScript N(80234CB0) = {
 };
 
 EvtScript N(beforeBattle_80234D60) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kmr_part_3/stage/mac_01.c b/src/battle/area_kmr_part_3/stage/mac_01.c
index 04ad37bd02..e4b1ebebe4 100644
--- a/src/battle/area_kmr_part_3/stage/mac_01.c
+++ b/src/battle/area_kmr_part_3/stage/mac_01.c
@@ -6,7 +6,7 @@
 #include "common/UnkModelStuff2.inc.c"
 
 EvtScript N(beforeBattle_80234B74) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_THREAD
         EVT_SET(LVar0, 44)
diff --git a/src/battle/area_kmr_part_3/stage/mim_01.c b/src/battle/area_kmr_part_3/stage/mim_01.c
index 93ef301d3e..bf47554a25 100644
--- a/src/battle/area_kmr_part_3/stage/mim_01.c
+++ b/src/battle/area_kmr_part_3/stage/mim_01.c
@@ -6,7 +6,7 @@
 #include "common/UnkFogFunc2.inc.c"
 
 EvtScript N(beforeBattle_80233670) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(N(UnkFogFunc2))
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kmr_part_3/stage/nok_01.c b/src/battle/area_kmr_part_3/stage/nok_01.c
index 1d2747d960..214a7ade45 100644
--- a/src/battle/area_kmr_part_3/stage/nok_01.c
+++ b/src/battle/area_kmr_part_3/stage/nok_01.c
@@ -23,7 +23,7 @@ EvtScript N(80233450) = {
 };
 
 EvtScript N(beforeBattle_80233558) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 19)
     EVT_EXEC(N(80233450))
     EVT_SET(LVar0, 20)
diff --git a/src/battle/area_kmr_part_3/stage/sam_01.c b/src/battle/area_kmr_part_3/stage/sam_01.c
index 81f334076b..8a42eee845 100644
--- a/src/battle/area_kmr_part_3/stage/sam_01.c
+++ b/src/battle/area_kmr_part_3/stage/sam_01.c
@@ -6,7 +6,7 @@
 #include "common/UnkModelStuff.inc.c"
 
 EvtScript N(beforeBattle_80233998) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_EXEC(N(UnkModelStuffScript1))
     EVT_THREAD
         EVT_SET(LVar0, 22)
diff --git a/src/battle/area_kpa/stage/kpa_01.c b/src/battle/area_kpa/stage/kpa_01.c
index 6af4c8af45..c83b43eec7 100644
--- a/src/battle/area_kpa/stage/kpa_01.c
+++ b/src/battle/area_kpa/stage/kpa_01.c
@@ -20,7 +20,7 @@ EvtScript N(8022EFE0) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 36, 0)
     EVT_THREAD
diff --git a/src/battle/area_kpa/stage/kpa_01b.c b/src/battle/area_kpa/stage/kpa_01b.c
index 5d9e77e514..e2e2977823 100644
--- a/src/battle/area_kpa/stage/kpa_01b.c
+++ b/src/battle/area_kpa/stage/kpa_01b.c
@@ -20,7 +20,7 @@ EvtScript N(8022F180) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 25, 0)
     EVT_SET(LVar0, 37)
diff --git a/src/battle/area_kpa/stage/kpa_02.c b/src/battle/area_kpa/stage/kpa_02.c
index 7c6d14d81c..27d80f7d59 100644
--- a/src/battle/area_kpa/stage/kpa_02.c
+++ b/src/battle/area_kpa/stage/kpa_02.c
@@ -58,7 +58,7 @@ EvtScript N(8022F4BC) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 16)
     EVT_SET(LVar1, 1)
diff --git a/src/battle/area_kpa/stage/kpa_04.c b/src/battle/area_kpa/stage/kpa_04.c
index aa5b41b9d7..86c38cbe61 100644
--- a/src/battle/area_kpa/stage/kpa_04.c
+++ b/src/battle/area_kpa/stage/kpa_04.c
@@ -19,7 +19,7 @@ EvtScript N(8022F7F0) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 15, 0)
     EVT_CALL(SetGroupEnabled, 17, 0)
diff --git a/src/battle/area_kpa/stage/kpa_04b.c b/src/battle/area_kpa/stage/kpa_04b.c
index 3aa9f8b1aa..2f8aedecc5 100644
--- a/src/battle/area_kpa/stage/kpa_04b.c
+++ b/src/battle/area_kpa/stage/kpa_04b.c
@@ -19,7 +19,7 @@ EvtScript N(8022FA10) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 13, 0)
     EVT_CALL(SetGroupEnabled, 17, 0)
diff --git a/src/battle/area_kpa/stage/kpa_04c.c b/src/battle/area_kpa/stage/kpa_04c.c
index 0872af2ff7..38cb46a15b 100644
--- a/src/battle/area_kpa/stage/kpa_04c.c
+++ b/src/battle/area_kpa/stage/kpa_04c.c
@@ -19,7 +19,7 @@ EvtScript N(8022FC20) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 30, 0)
     EVT_CALL(SetGroupEnabled, 39, 0)
diff --git a/src/battle/area_kpa/stage/kpa_05.c b/src/battle/area_kpa/stage/kpa_05.c
index c0f768003c..93ab680aca 100644
--- a/src/battle/area_kpa/stage/kpa_05.c
+++ b/src/battle/area_kpa/stage/kpa_05.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_kpa_kpa_05
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kpa/stage/kpa_07.c b/src/battle/area_kpa/stage/kpa_07.c
index f3b66d7660..344138e6e0 100644
--- a/src/battle/area_kpa/stage/kpa_07.c
+++ b/src/battle/area_kpa/stage/kpa_07.c
@@ -58,7 +58,7 @@ EvtScript N(8023006C) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 16)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_kpa/stage/kpa_08.c b/src/battle/area_kpa/stage/kpa_08.c
index 83cb7f5cf9..dec7d78a45 100644
--- a/src/battle/area_kpa/stage/kpa_08.c
+++ b/src/battle/area_kpa/stage/kpa_08.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_kpa_kpa_08
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kpa/stage/kpa_09.c b/src/battle/area_kpa/stage/kpa_09.c
index 25c55cb5cc..fe18a916ac 100644
--- a/src/battle/area_kpa/stage/kpa_09.c
+++ b/src/battle/area_kpa/stage/kpa_09.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_kpa_kpa_09
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kpa/stage/kpa_11.c b/src/battle/area_kpa/stage/kpa_11.c
index 7baff2bbd9..7558f7489a 100644
--- a/src/battle/area_kpa/stage/kpa_11.c
+++ b/src/battle/area_kpa/stage/kpa_11.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_kpa_kpa_11
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kpa/stage/kpa_13.c b/src/battle/area_kpa/stage/kpa_13.c
index 8785ab41e3..8101b75c76 100644
--- a/src/battle/area_kpa/stage/kpa_13.c
+++ b/src/battle/area_kpa/stage/kpa_13.c
@@ -19,7 +19,7 @@ EvtScript N(80230440) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kpa/stage/kpa_14.c b/src/battle/area_kpa/stage/kpa_14.c
index bf0ecc6831..5e932f1b87 100644
--- a/src/battle/area_kpa/stage/kpa_14.c
+++ b/src/battle/area_kpa/stage/kpa_14.c
@@ -19,7 +19,7 @@ EvtScript N(80230570) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kpa2/stage/kpa_01.c b/src/battle/area_kpa2/stage/kpa_01.c
index 73dfaa489f..e1ffba5727 100644
--- a/src/battle/area_kpa2/stage/kpa_01.c
+++ b/src/battle/area_kpa2/stage/kpa_01.c
@@ -20,7 +20,7 @@ EvtScript N(8022EFE0) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 36, 0)
     EVT_THREAD
diff --git a/src/battle/area_kpa2/stage/kpa_02.c b/src/battle/area_kpa2/stage/kpa_02.c
index 5ce31c0308..68abb1a495 100644
--- a/src/battle/area_kpa2/stage/kpa_02.c
+++ b/src/battle/area_kpa2/stage/kpa_02.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_kpa2_kpa_02
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_kpa2/stage/kpa_03.c b/src/battle/area_kpa2/stage/kpa_03.c
index cf7d680893..bd5b758038 100644
--- a/src/battle/area_kpa2/stage/kpa_03.c
+++ b/src/battle/area_kpa2/stage/kpa_03.c
@@ -52,7 +52,7 @@ EvtScript N(createLightnings2) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_EXEC(N(createLightnings1))
     EVT_EXEC(N(createLightnings2))
     EVT_RETURN
diff --git a/src/battle/area_kpa3/stage/kpa_01.c b/src/battle/area_kpa3/stage/kpa_01.c
index 37bca5ece3..18ee48fc80 100644
--- a/src/battle/area_kpa3/stage/kpa_01.c
+++ b/src/battle/area_kpa3/stage/kpa_01.c
@@ -20,7 +20,7 @@ EvtScript N(8022EFE0) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 36, 0)
     EVT_THREAD
diff --git a/src/battle/area_kpa4/stage/kpa_01.c b/src/battle/area_kpa4/stage/kpa_01.c
index dbf593a19a..23899a400e 100644
--- a/src/battle/area_kpa4/stage/kpa_01.c
+++ b/src/battle/area_kpa4/stage/kpa_01.c
@@ -20,7 +20,7 @@ EvtScript N(8022EFE0) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 36, 0)
     EVT_THREAD
diff --git a/src/battle/area_kpa4/stage/kpa_01b.c b/src/battle/area_kpa4/stage/kpa_01b.c
index 4e84a2a0ed..1037a8393b 100644
--- a/src/battle/area_kpa4/stage/kpa_01b.c
+++ b/src/battle/area_kpa4/stage/kpa_01b.c
@@ -20,7 +20,7 @@ EvtScript N(8022F180) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 25, 0)
     EVT_SET(LVar0, 37)
diff --git a/src/battle/area_kpa4/stage/kpa_02.c b/src/battle/area_kpa4/stage/kpa_02.c
index c015b70cf6..b232817fb7 100644
--- a/src/battle/area_kpa4/stage/kpa_02.c
+++ b/src/battle/area_kpa4/stage/kpa_02.c
@@ -58,7 +58,7 @@ EvtScript N(8022F4BC) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 16)
     EVT_SET(LVar1, 1)
diff --git a/src/battle/area_kpa4/stage/kpa_04.c b/src/battle/area_kpa4/stage/kpa_04.c
index 415301e164..f947188549 100644
--- a/src/battle/area_kpa4/stage/kpa_04.c
+++ b/src/battle/area_kpa4/stage/kpa_04.c
@@ -19,7 +19,7 @@ EvtScript N(8022F7F0) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 15, 0)
     EVT_CALL(SetGroupEnabled, 17, 0)
diff --git a/src/battle/area_kpa4/stage/kpa_04b.c b/src/battle/area_kpa4/stage/kpa_04b.c
index bdf89f3ab2..b6775ceb13 100644
--- a/src/battle/area_kpa4/stage/kpa_04b.c
+++ b/src/battle/area_kpa4/stage/kpa_04b.c
@@ -19,7 +19,7 @@ EvtScript N(8022FA10) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 13, 0)
     EVT_CALL(SetGroupEnabled, 17, 0)
diff --git a/src/battle/area_kpa4/stage/kpa_04c.c b/src/battle/area_kpa4/stage/kpa_04c.c
index b66d16a4aa..dbad38ae26 100644
--- a/src/battle/area_kpa4/stage/kpa_04c.c
+++ b/src/battle/area_kpa4/stage/kpa_04c.c
@@ -19,7 +19,7 @@ EvtScript N(8022FC20) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 30, 0)
     EVT_CALL(SetGroupEnabled, 39, 0)
diff --git a/src/battle/area_kpa4/stage/kpa_05.c b/src/battle/area_kpa4/stage/kpa_05.c
index 8c0f928ec0..578bed0a9c 100644
--- a/src/battle/area_kpa4/stage/kpa_05.c
+++ b/src/battle/area_kpa4/stage/kpa_05.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_kpa4_kpa_05
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kpa4/stage/kpa_07.c b/src/battle/area_kpa4/stage/kpa_07.c
index d199305e9e..07bfbb43cf 100644
--- a/src/battle/area_kpa4/stage/kpa_07.c
+++ b/src/battle/area_kpa4/stage/kpa_07.c
@@ -58,7 +58,7 @@ EvtScript N(8023006C) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 16)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_kpa4/stage/kpa_08.c b/src/battle/area_kpa4/stage/kpa_08.c
index 5bc5f9de4b..c46aaf9fba 100644
--- a/src/battle/area_kpa4/stage/kpa_08.c
+++ b/src/battle/area_kpa4/stage/kpa_08.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_kpa4_kpa_08
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kpa4/stage/kpa_09.c b/src/battle/area_kpa4/stage/kpa_09.c
index e82f9d96da..3472eaf465 100644
--- a/src/battle/area_kpa4/stage/kpa_09.c
+++ b/src/battle/area_kpa4/stage/kpa_09.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_kpa4_kpa_09
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kpa4/stage/kpa_11.c b/src/battle/area_kpa4/stage/kpa_11.c
index 819845813d..2d88ea3a4f 100644
--- a/src/battle/area_kpa4/stage/kpa_11.c
+++ b/src/battle/area_kpa4/stage/kpa_11.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_kpa4_kpa_11
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kpa4/stage/kpa_13.c b/src/battle/area_kpa4/stage/kpa_13.c
index d3b2d932d4..c96f84e1e0 100644
--- a/src/battle/area_kpa4/stage/kpa_13.c
+++ b/src/battle/area_kpa4/stage/kpa_13.c
@@ -19,7 +19,7 @@ EvtScript N(80230440) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kpa4/stage/kpa_14.c b/src/battle/area_kpa4/stage/kpa_14.c
index 3cdf9ca5e6..6bcfbc30dc 100644
--- a/src/battle/area_kpa4/stage/kpa_14.c
+++ b/src/battle/area_kpa4/stage/kpa_14.c
@@ -19,7 +19,7 @@ EvtScript N(80230570) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kzn/stage/kzn_01.c b/src/battle/area_kzn/stage/kzn_01.c
index 3a1d6c89d3..195918fd0a 100644
--- a/src/battle/area_kzn/stage/kzn_01.c
+++ b/src/battle/area_kzn/stage/kzn_01.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_kzn_kzn_01
 
 EvtScript N(beforeBattle_80227780) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 17, 0)
     EVT_RETURN
diff --git a/src/battle/area_kzn/stage/kzn_01b.c b/src/battle/area_kzn/stage/kzn_01b.c
index bb31076624..05000e07cf 100644
--- a/src/battle/area_kzn/stage/kzn_01b.c
+++ b/src/battle/area_kzn/stage/kzn_01b.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_kzn_kzn_01b
 
 EvtScript N(beforeBattle_80227820) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kzn/stage/kzn_02.c b/src/battle/area_kzn/stage/kzn_02.c
index b703ab19fe..c85f115465 100644
--- a/src/battle/area_kzn/stage/kzn_02.c
+++ b/src/battle/area_kzn/stage/kzn_02.c
@@ -68,7 +68,7 @@ EvtScript N(80227A2C) = {
 };
 
 EvtScript N(beforeBattle_80227BDC) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 25)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_kzn/stage/kzn_04.c b/src/battle/area_kzn/stage/kzn_04.c
index 0a61205f16..f79e0bc9b7 100644
--- a/src/battle/area_kzn/stage/kzn_04.c
+++ b/src/battle/area_kzn/stage/kzn_04.c
@@ -68,7 +68,7 @@ EvtScript N(80227F5C) = {
 };
 
 EvtScript N(beforeBattle_8022810C) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 30, 0)
     EVT_CALL(SetGroupEnabled, 44, 0)
diff --git a/src/battle/area_kzn/stage/kzn_04b.c b/src/battle/area_kzn/stage/kzn_04b.c
index 579f2931f5..5b8e569e77 100644
--- a/src/battle/area_kzn/stage/kzn_04b.c
+++ b/src/battle/area_kzn/stage/kzn_04b.c
@@ -68,7 +68,7 @@ EvtScript N(802284EC) = {
 };
 
 EvtScript N(beforeBattle_8022869C) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 39, 0)
     EVT_CALL(SetGroupEnabled, 44, 0)
diff --git a/src/battle/area_kzn/stage/kzn_04c.c b/src/battle/area_kzn/stage/kzn_04c.c
index 077e551105..ac719201e5 100644
--- a/src/battle/area_kzn/stage/kzn_04c.c
+++ b/src/battle/area_kzn/stage/kzn_04c.c
@@ -68,7 +68,7 @@ EvtScript N(80228A7C) = {
 };
 
 EvtScript N(beforeBattle_80228C2C) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 39, 0)
     EVT_CALL(SetGroupEnabled, 30, 0)
diff --git a/src/battle/area_kzn/stage/kzn_05.c b/src/battle/area_kzn/stage/kzn_05.c
index ed7c2b4a2c..452b82c4c4 100644
--- a/src/battle/area_kzn/stage/kzn_05.c
+++ b/src/battle/area_kzn/stage/kzn_05.c
@@ -68,7 +68,7 @@ EvtScript N(80228FBC) = {
 };
 
 EvtScript N(beforeBattle_8022916C) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 17)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_kzn2/stage/kzn_01.c b/src/battle/area_kzn2/stage/kzn_01.c
index 1be5df157b..1162d9e123 100644
--- a/src/battle/area_kzn2/stage/kzn_01.c
+++ b/src/battle/area_kzn2/stage/kzn_01.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_kzn2_kzn_01
 
 EvtScript N(beforeBattle_80227780) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 17, 0)
     EVT_RETURN
diff --git a/src/battle/area_kzn2/stage/kzn_01b.c b/src/battle/area_kzn2/stage/kzn_01b.c
index ce3af7bd3e..ef205a86b2 100644
--- a/src/battle/area_kzn2/stage/kzn_01b.c
+++ b/src/battle/area_kzn2/stage/kzn_01b.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_kzn2_kzn_01b
 
 EvtScript N(beforeBattle_80227820) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_kzn2/stage/kzn_02.c b/src/battle/area_kzn2/stage/kzn_02.c
index 01fc2c5469..69661736bc 100644
--- a/src/battle/area_kzn2/stage/kzn_02.c
+++ b/src/battle/area_kzn2/stage/kzn_02.c
@@ -68,7 +68,7 @@ EvtScript N(80227A2C) = {
 };
 
 EvtScript N(beforeBattle_80227BDC) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 25)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_kzn2/stage/kzn_04.c b/src/battle/area_kzn2/stage/kzn_04.c
index 3c34b345f0..7659107020 100644
--- a/src/battle/area_kzn2/stage/kzn_04.c
+++ b/src/battle/area_kzn2/stage/kzn_04.c
@@ -68,7 +68,7 @@ EvtScript N(80227F5C) = {
 };
 
 EvtScript N(beforeBattle_8022810C) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 30, 0)
     EVT_CALL(SetGroupEnabled, 44, 0)
diff --git a/src/battle/area_kzn2/stage/kzn_04b.c b/src/battle/area_kzn2/stage/kzn_04b.c
index f8686ac8ae..a952fc738c 100644
--- a/src/battle/area_kzn2/stage/kzn_04b.c
+++ b/src/battle/area_kzn2/stage/kzn_04b.c
@@ -68,7 +68,7 @@ EvtScript N(802284EC) = {
 };
 
 EvtScript N(beforeBattle_8022869C) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 39, 0)
     EVT_CALL(SetGroupEnabled, 44, 0)
diff --git a/src/battle/area_kzn2/stage/kzn_04c.c b/src/battle/area_kzn2/stage/kzn_04c.c
index 048f1145b9..8e02b67d3c 100644
--- a/src/battle/area_kzn2/stage/kzn_04c.c
+++ b/src/battle/area_kzn2/stage/kzn_04c.c
@@ -68,7 +68,7 @@ EvtScript N(80228A7C) = {
 };
 
 EvtScript N(beforeBattle_80228C2C) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 39, 0)
     EVT_CALL(SetGroupEnabled, 30, 0)
diff --git a/src/battle/area_kzn2/stage/kzn_05.c b/src/battle/area_kzn2/stage/kzn_05.c
index 779cf2f482..b75b690649 100644
--- a/src/battle/area_kzn2/stage/kzn_05.c
+++ b/src/battle/area_kzn2/stage/kzn_05.c
@@ -68,7 +68,7 @@ EvtScript N(80228FBC) = {
 };
 
 EvtScript N(beforeBattle_8022916C) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 17)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_mac/stage/mac_01.c b/src/battle/area_mac/stage/mac_01.c
index ecea44c48d..1b6984bf18 100644
--- a/src/battle/area_mac/stage/mac_01.c
+++ b/src/battle/area_mac/stage/mac_01.c
@@ -6,7 +6,7 @@
 #include "common/UnkModelStuff2.inc.c"
 
 EvtScript N(beforeBattle_802327F4) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_THREAD
         EVT_SET(LVar0, 44)
diff --git a/src/battle/area_mim/stage/mim_01.c b/src/battle/area_mim/stage/mim_01.c
index 1679f750b4..ad38c685e5 100644
--- a/src/battle/area_mim/stage/mim_01.c
+++ b/src/battle/area_mim/stage/mim_01.c
@@ -6,7 +6,7 @@
 #include "common/UnkFogFunc2.inc.c"
 
 EvtScript N(beforeBattle_8021E450) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(N(UnkFogFunc2))
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_nok/stage/nok_01.c b/src/battle/area_nok/stage/nok_01.c
index 7c70fa3e58..1b1f691aef 100644
--- a/src/battle/area_nok/stage/nok_01.c
+++ b/src/battle/area_nok/stage/nok_01.c
@@ -23,7 +23,7 @@ EvtScript N(8022B5F0) = {
 };
 
 EvtScript N(beforeBattle_8022B6F8) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 19)
     EVT_EXEC(N(8022B5F0))
     EVT_SET(LVar0, 20)
diff --git a/src/battle/area_nok/stage/nok_02.c b/src/battle/area_nok/stage/nok_02.c
index 6d0ee81911..28fcbca678 100644
--- a/src/battle/area_nok/stage/nok_02.c
+++ b/src/battle/area_nok/stage/nok_02.c
@@ -23,7 +23,7 @@ EvtScript N(8022B810) = {
 };
 
 EvtScript N(beforeBattle_8022B918) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_THREAD
         EVT_SET(LVar0, 19)
         EVT_EXEC(N(8022B810))
diff --git a/src/battle/area_nok/stage/nok_03.c b/src/battle/area_nok/stage/nok_03.c
index 3f3d76fdf2..5e87d52e23 100644
--- a/src/battle/area_nok/stage/nok_03.c
+++ b/src/battle/area_nok/stage/nok_03.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_nok_nok_03
 
 EvtScript N(beforeBattle_8022BB20) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_nok/stage/nok_04.c b/src/battle/area_nok/stage/nok_04.c
index 6001ccbf2a..c40ace80db 100644
--- a/src/battle/area_nok/stage/nok_04.c
+++ b/src/battle/area_nok/stage/nok_04.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_nok_nok_04
 
 EvtScript N(beforeBattle_8022BB90) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_omo/stage/omo_01.c b/src/battle/area_omo/stage/omo_01.c
index bef73c707c..0ee517ef0c 100644
--- a/src/battle/area_omo/stage/omo_01.c
+++ b/src/battle/area_omo/stage/omo_01.c
@@ -68,7 +68,7 @@ EvtScript N(updateModels) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_THREAD
         EVT_SETF(LVar0, EVT_FLOAT(0.0))
diff --git a/src/battle/area_omo/stage/omo_02.c b/src/battle/area_omo/stage/omo_02.c
index 8c20236967..e7170c0a3b 100644
--- a/src/battle/area_omo/stage/omo_02.c
+++ b/src/battle/area_omo/stage/omo_02.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_omo_omo_02
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_omo/stage/omo_03.c b/src/battle/area_omo/stage/omo_03.c
index ce815deb32..e65f939732 100644
--- a/src/battle/area_omo/stage/omo_03.c
+++ b/src/battle/area_omo/stage/omo_03.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_omo_omo_03
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 18, 0)
     EVT_RETURN
diff --git a/src/battle/area_omo/stage/omo_03b.c b/src/battle/area_omo/stage/omo_03b.c
index bf106a0430..c070fe1c98 100644
--- a/src/battle/area_omo/stage/omo_03b.c
+++ b/src/battle/area_omo/stage/omo_03b.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_omo_omo_03b
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_omo/stage/omo_04.c b/src/battle/area_omo/stage/omo_04.c
index 37594c045a..fce20fc738 100644
--- a/src/battle/area_omo/stage/omo_04.c
+++ b/src/battle/area_omo/stage/omo_04.c
@@ -10,7 +10,7 @@ extern ActorBlueprint N(slot_machine_stop);
 extern ActorBlueprint N(slot_machine_start);
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetTexPanner, 29, TEX_PANNER_A)
     EVT_THREAD
diff --git a/src/battle/area_omo/stage/omo_05.c b/src/battle/area_omo/stage/omo_05.c
index 3b75e49e80..1d9dd28bea 100644
--- a/src/battle/area_omo/stage/omo_05.c
+++ b/src/battle/area_omo/stage/omo_05.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_omo_omo_05
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 24, 0)
     EVT_CALL(SetGroupEnabled, 28, 0)
diff --git a/src/battle/area_omo/stage/omo_05b.c b/src/battle/area_omo/stage/omo_05b.c
index 8d628621ad..ab506182ef 100644
--- a/src/battle/area_omo/stage/omo_05b.c
+++ b/src/battle/area_omo/stage/omo_05b.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_omo_omo_05b
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 35, 0)
     EVT_CALL(SetGroupEnabled, 45, 0)
diff --git a/src/battle/area_omo/stage/omo_06.c b/src/battle/area_omo/stage/omo_06.c
index 1b5a58d29c..534b75917d 100644
--- a/src/battle/area_omo/stage/omo_06.c
+++ b/src/battle/area_omo/stage/omo_06.c
@@ -33,7 +33,7 @@ EvtScript N(updateModels) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_THREAD
         EVT_SET(LVar0, 26)
diff --git a/src/battle/area_omo/stage/omo_07.c b/src/battle/area_omo/stage/omo_07.c
index 1983b58d05..6217fc5ee1 100644
--- a/src/battle/area_omo/stage/omo_07.c
+++ b/src/battle/area_omo/stage/omo_07.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_omo_omo_07
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_omo2/stage/omo_07.c b/src/battle/area_omo2/stage/omo_07.c
index b34b74ff2e..ed9454afdd 100644
--- a/src/battle/area_omo2/stage/omo_07.c
+++ b/src/battle/area_omo2/stage/omo_07.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_omo2_omo_07
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_omo3/actor/big_lantern_ghost.c b/src/battle/area_omo3/actor/big_lantern_ghost.c
index 81a5449e9e..691ce75b7d 100644
--- a/src/battle/area_omo3/actor/big_lantern_ghost.c
+++ b/src/battle/area_omo3/actor/big_lantern_ghost.c
@@ -201,9 +201,9 @@ ApiStatus N(update_effect)(Evt* script, s32 isInitialCall) {
 
     actorPart = get_actor_part(actor, 1);
     if (actorPart->currentAnimation == ANIM_BigLanternGhost_Anim0C) {
-        func_802DE8DC(actor->partsTable->unk_84, 0, &partX, &partY, &partZ);
+        func_802DE8DC(actor->partsTable->spriteInstanceID, 0, &partX, &partY, &partZ);
     } else {
-        func_802DE8DC(actor->partsTable->unk_84, 1, &partX, &partY, &partZ);
+        func_802DE8DC(actor->partsTable->spriteInstanceID, 1, &partX, &partY, &partZ);
     }
 
 
diff --git a/src/battle/area_omo3/stage/omo_01.c b/src/battle/area_omo3/stage/omo_01.c
index d2e52bfefc..019cc151ba 100644
--- a/src/battle/area_omo3/stage/omo_01.c
+++ b/src/battle/area_omo3/stage/omo_01.c
@@ -68,7 +68,7 @@ EvtScript N(updateModels) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_THREAD
         EVT_SETF(LVar0, EVT_FLOAT(0.0))
diff --git a/src/battle/area_omo3/stage/omo_02.c b/src/battle/area_omo3/stage/omo_02.c
index ca431e7d13..1bec5f1813 100644
--- a/src/battle/area_omo3/stage/omo_02.c
+++ b/src/battle/area_omo3/stage/omo_02.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_omo3_omo_02
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_omo3/stage/omo_03.c b/src/battle/area_omo3/stage/omo_03.c
index cd1e20abf4..e869ca376c 100644
--- a/src/battle/area_omo3/stage/omo_03.c
+++ b/src/battle/area_omo3/stage/omo_03.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_omo3_omo_03
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 18, 0)
     EVT_RETURN
diff --git a/src/battle/area_omo3/stage/omo_03b.c b/src/battle/area_omo3/stage/omo_03b.c
index 57b35450cf..be31f41cec 100644
--- a/src/battle/area_omo3/stage/omo_03b.c
+++ b/src/battle/area_omo3/stage/omo_03b.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_omo3_omo_03b
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_omo3/stage/omo_04.c b/src/battle/area_omo3/stage/omo_04.c
index 1f198e7654..fda3f4a34a 100644
--- a/src/battle/area_omo3/stage/omo_04.c
+++ b/src/battle/area_omo3/stage/omo_04.c
@@ -10,7 +10,7 @@ extern ActorBlueprint N(slot_machine_stop);
 extern ActorBlueprint N(slot_machine_start);
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetTexPanner, 29, TEX_PANNER_A)
     EVT_THREAD
diff --git a/src/battle/area_omo3/stage/omo_05.c b/src/battle/area_omo3/stage/omo_05.c
index 3efc266864..54385be9c0 100644
--- a/src/battle/area_omo3/stage/omo_05.c
+++ b/src/battle/area_omo3/stage/omo_05.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_omo3_omo_05
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 24, 0)
     EVT_CALL(SetGroupEnabled, 28, 0)
diff --git a/src/battle/area_omo3/stage/omo_05b.c b/src/battle/area_omo3/stage/omo_05b.c
index 2b18a188e8..1822d6a6bc 100644
--- a/src/battle/area_omo3/stage/omo_05b.c
+++ b/src/battle/area_omo3/stage/omo_05b.c
@@ -5,7 +5,7 @@
 #define NAMESPACE b_area_omo3_omo_05b
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 35, 0)
     EVT_CALL(SetGroupEnabled, 45, 0)
diff --git a/src/battle/area_omo3/stage/omo_06.c b/src/battle/area_omo3/stage/omo_06.c
index ddb0b95199..9d9ff64a8c 100644
--- a/src/battle/area_omo3/stage/omo_06.c
+++ b/src/battle/area_omo3/stage/omo_06.c
@@ -33,7 +33,7 @@ EvtScript N(updateModels) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_THREAD
         EVT_SET(LVar0, 26)
diff --git a/src/battle/area_omo3/stage/omo_07.c b/src/battle/area_omo3/stage/omo_07.c
index 93852c0b72..0e89403708 100644
--- a/src/battle/area_omo3/stage/omo_07.c
+++ b/src/battle/area_omo3/stage/omo_07.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_omo3_omo_07
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_pra/stage/pra_01.c b/src/battle/area_pra/stage/pra_01.c
index 3c032d2f6d..6db7da08ad 100644
--- a/src/battle/area_pra/stage/pra_01.c
+++ b/src/battle/area_pra/stage/pra_01.c
@@ -6,7 +6,7 @@
 #define NAMESPACE b_area_pra_pra_01
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableBattleFloorReflections, TRUE)
     EVT_RETURN
diff --git a/src/battle/area_pra/stage/pra_02.c b/src/battle/area_pra/stage/pra_02.c
index e72d99b4f4..683a76c7be 100644
--- a/src/battle/area_pra/stage/pra_02.c
+++ b/src/battle/area_pra/stage/pra_02.c
@@ -59,7 +59,7 @@ EvtScript N(80231CFC) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableBattleFloorReflections, TRUE)
     EVT_SET(LVar0, 17)
diff --git a/src/battle/area_pra/stage/pra_03.c b/src/battle/area_pra/stage/pra_03.c
index df815c4aba..3e283f31d6 100644
--- a/src/battle/area_pra/stage/pra_03.c
+++ b/src/battle/area_pra/stage/pra_03.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_pra_pra_03
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_pra/stage/pra_03b.c b/src/battle/area_pra/stage/pra_03b.c
index 2cea914e0a..16b0242c3a 100644
--- a/src/battle/area_pra/stage/pra_03b.c
+++ b/src/battle/area_pra/stage/pra_03b.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_pra_pra_03b
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 33, 0)
     EVT_RETURN
diff --git a/src/battle/area_pra/stage/pra_03c.c b/src/battle/area_pra/stage/pra_03c.c
index da161cf7eb..42003dd67b 100644
--- a/src/battle/area_pra/stage/pra_03c.c
+++ b/src/battle/area_pra/stage/pra_03c.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_pra_pra_03c
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 33, 0)
     EVT_CALL(SetGroupEnabled, 38, 0)
diff --git a/src/battle/area_pra/stage/pra_04.c b/src/battle/area_pra/stage/pra_04.c
index 546541986c..ceea623109 100644
--- a/src/battle/area_pra/stage/pra_04.c
+++ b/src/battle/area_pra/stage/pra_04.c
@@ -58,7 +58,7 @@ EvtScript N(8023228C) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 1)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_pra2/stage/sam_04.c b/src/battle/area_pra2/stage/sam_04.c
index 50053ebc3a..a62fa00e74 100644
--- a/src/battle/area_pra2/stage/sam_04.c
+++ b/src/battle/area_pra2/stage/sam_04.c
@@ -11,7 +11,7 @@ void func_802189E0_661130(void) {
 
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_EXEC(N(UnkModelStuffScript1))
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_pra3/stage/pra_01.c b/src/battle/area_pra3/stage/pra_01.c
index 738de2e3fc..dc4d8cd6c1 100644
--- a/src/battle/area_pra3/stage/pra_01.c
+++ b/src/battle/area_pra3/stage/pra_01.c
@@ -6,7 +6,7 @@
 #define NAMESPACE b_area_pra3_pra_01
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableBattleFloorReflections, TRUE)
     EVT_RETURN
diff --git a/src/battle/area_pra3/stage/pra_02.c b/src/battle/area_pra3/stage/pra_02.c
index 875d1bbc2e..c6bc4d63da 100644
--- a/src/battle/area_pra3/stage/pra_02.c
+++ b/src/battle/area_pra3/stage/pra_02.c
@@ -59,7 +59,7 @@ EvtScript N(80231CFC) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableBattleFloorReflections, TRUE)
     EVT_SET(LVar0, 17)
diff --git a/src/battle/area_pra3/stage/pra_03.c b/src/battle/area_pra3/stage/pra_03.c
index f9ce4aed97..26aa7ebda4 100644
--- a/src/battle/area_pra3/stage/pra_03.c
+++ b/src/battle/area_pra3/stage/pra_03.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_pra3_pra_03
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_pra3/stage/pra_03b.c b/src/battle/area_pra3/stage/pra_03b.c
index 3a9798ce47..e631f76e8d 100644
--- a/src/battle/area_pra3/stage/pra_03b.c
+++ b/src/battle/area_pra3/stage/pra_03b.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_pra3_pra_03b
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 33, 0)
     EVT_RETURN
diff --git a/src/battle/area_pra3/stage/pra_03c.c b/src/battle/area_pra3/stage/pra_03c.c
index af4ce8bffc..9f6ceb1910 100644
--- a/src/battle/area_pra3/stage/pra_03c.c
+++ b/src/battle/area_pra3/stage/pra_03c.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_pra3_pra_03c
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetGroupEnabled, 33, 0)
     EVT_CALL(SetGroupEnabled, 38, 0)
diff --git a/src/battle/area_pra3/stage/pra_04.c b/src/battle/area_pra3/stage/pra_04.c
index fe306d8651..71c9532264 100644
--- a/src/battle/area_pra3/stage/pra_04.c
+++ b/src/battle/area_pra3/stage/pra_04.c
@@ -58,7 +58,7 @@ EvtScript N(8023228C) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 1)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_sam/stage/sam_01.c b/src/battle/area_sam/stage/sam_01.c
index 1fe87b63c0..64639de523 100644
--- a/src/battle/area_sam/stage/sam_01.c
+++ b/src/battle/area_sam/stage/sam_01.c
@@ -8,7 +8,7 @@
 #include "common/UnkModelStuff.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_EXEC(N(UnkModelStuffScript1))
     EVT_THREAD
         EVT_SET(LVar0, 22)
diff --git a/src/battle/area_sam/stage/sam_02.c b/src/battle/area_sam/stage/sam_02.c
index 4ec26a81f7..bdbc8466be 100644
--- a/src/battle/area_sam/stage/sam_02.c
+++ b/src/battle/area_sam/stage/sam_02.c
@@ -8,7 +8,7 @@
 #include "common/UnkModelStuff.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetGroupEnabled, 10, 0)
     EVT_CALL(SetGroupEnabled, 12, 0)
     EVT_THREAD
diff --git a/src/battle/area_sam/stage/sam_02b.c b/src/battle/area_sam/stage/sam_02b.c
index 0aa3a1f97c..fa31142698 100644
--- a/src/battle/area_sam/stage/sam_02b.c
+++ b/src/battle/area_sam/stage/sam_02b.c
@@ -8,7 +8,7 @@
 #include "common/UnkModelStuff.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetGroupEnabled, 3, 0)
     EVT_CALL(SetGroupEnabled, 26, 0)
     EVT_EXEC(N(UnkModelStuffScript1))
diff --git a/src/battle/area_sam/stage/sam_02c.c b/src/battle/area_sam/stage/sam_02c.c
index fe068c657e..af0b47c6e1 100644
--- a/src/battle/area_sam/stage/sam_02c.c
+++ b/src/battle/area_sam/stage/sam_02c.c
@@ -8,7 +8,7 @@
 #include "common/UnkModelStuff.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetGroupEnabled, 3, 0)
     EVT_CALL(SetGroupEnabled, 10, 0)
     EVT_CALL(SetGroupEnabled, 26, 0)
diff --git a/src/battle/area_sam/stage/sam_02d.c b/src/battle/area_sam/stage/sam_02d.c
index 48de4f6d74..0f5004e336 100644
--- a/src/battle/area_sam/stage/sam_02d.c
+++ b/src/battle/area_sam/stage/sam_02d.c
@@ -8,7 +8,7 @@
 #include "common/UnkModelStuff.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetGroupEnabled, 3, 0)
     EVT_CALL(SetGroupEnabled, 10, 0)
     EVT_CALL(SetGroupEnabled, 12, 0)
diff --git a/src/battle/area_sam/stage/sam_03.c b/src/battle/area_sam/stage/sam_03.c
index b4a0f4ef1c..95d03c2c1f 100644
--- a/src/battle/area_sam/stage/sam_03.c
+++ b/src/battle/area_sam/stage/sam_03.c
@@ -12,7 +12,7 @@ void func_8021AE70_626A10(void) {
 }
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_THREAD
         EVT_SET(LVar0, 16)
         EVT_SET(LVar1, 0)
diff --git a/src/battle/area_sam2/actor/monstar.c b/src/battle/area_sam2/actor/monstar.c
index fa4e1550f9..148fb2feb5 100644
--- a/src/battle/area_sam2/actor/monstar.c
+++ b/src/battle/area_sam2/actor/monstar.c
@@ -160,10 +160,10 @@ ApiStatus func_80218000_63D1E0(Evt* script, s32 isInitialCall) {
         script->functionTemp[1] = 0;
         script->functionTemp[2] = 0;
         script->functionTemp[0] = 0;
-        func_802DE780(part->unk_84, 0, 17, 20, 0, 0, 255, 0);
+        func_802DE780(part->spriteInstanceID, 0, 17, 20, 0, 0, 255, 0);
     }
 
-    func_802DE780(part->unk_84, 1, 15, (s32)&D_8021A2B8_63F498, 255, 0, 255, 0);
+    func_802DE780(part->spriteInstanceID, 1, 15, (s32)&D_8021A2B8_63F498, 255, 0, 255, 0);
     script->functionTemp[1] += 10;
     if (script->functionTemp[1] >= 360) {
         script->functionTemp[1] %= 360;
@@ -176,7 +176,7 @@ ApiStatus func_80218000_63D1E0(Evt* script, s32 isInitialCall) {
     }
 
     for (i = 0; i < 20; i++) {
-        func_802DE780(part->unk_84, 0, 12, i, sp20[i] << 0x18 | sp38[i] << 0x10 | sp50[i] << 8 | 0xFF, 0, 255, 0);
+        func_802DE780(part->spriteInstanceID, 0, 12, i, sp20[i] << 0x18 | sp38[i] << 0x10 | sp50[i] << 8 | 0xFF, 0, 255, 0);
     }
 
     return ApiStatus_BLOCK;
diff --git a/src/battle/area_sam2/stage/sam_01.c b/src/battle/area_sam2/stage/sam_01.c
index b127b8d75b..08b58c7038 100644
--- a/src/battle/area_sam2/stage/sam_01.c
+++ b/src/battle/area_sam2/stage/sam_01.c
@@ -8,7 +8,7 @@
 #include "common/UnkModelStuff.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_EXEC(N(UnkModelStuffScript1))
     EVT_THREAD
         EVT_SET(LVar0, 22)
diff --git a/src/battle/area_sam2/stage/sam_02.c b/src/battle/area_sam2/stage/sam_02.c
index b10eaad8a2..aa11aee6bc 100644
--- a/src/battle/area_sam2/stage/sam_02.c
+++ b/src/battle/area_sam2/stage/sam_02.c
@@ -8,7 +8,7 @@
 #include "common/UnkModelStuff.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetGroupEnabled, 10, 0)
     EVT_CALL(SetGroupEnabled, 12, 0)
     EVT_THREAD
diff --git a/src/battle/area_sam2/stage/sam_02b.c b/src/battle/area_sam2/stage/sam_02b.c
index e1ea32a3d9..49ef4455af 100644
--- a/src/battle/area_sam2/stage/sam_02b.c
+++ b/src/battle/area_sam2/stage/sam_02b.c
@@ -8,7 +8,7 @@
 #include "common/UnkModelStuff.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetGroupEnabled, 3, 0)
     EVT_CALL(SetGroupEnabled, 26, 0)
     EVT_EXEC(N(UnkModelStuffScript1))
diff --git a/src/battle/area_sam2/stage/sam_02c.c b/src/battle/area_sam2/stage/sam_02c.c
index 699da2b954..d2450cdc7a 100644
--- a/src/battle/area_sam2/stage/sam_02c.c
+++ b/src/battle/area_sam2/stage/sam_02c.c
@@ -8,7 +8,7 @@
 #include "common/UnkModelStuff.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetGroupEnabled, 3, 0)
     EVT_CALL(SetGroupEnabled, 10, 0)
     EVT_CALL(SetGroupEnabled, 26, 0)
diff --git a/src/battle/area_sam2/stage/sam_02d.c b/src/battle/area_sam2/stage/sam_02d.c
index cc99b9ecf4..c298b2ece2 100644
--- a/src/battle/area_sam2/stage/sam_02d.c
+++ b/src/battle/area_sam2/stage/sam_02d.c
@@ -8,7 +8,7 @@
 #include "common/UnkModelStuff.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetGroupEnabled, 3, 0)
     EVT_CALL(SetGroupEnabled, 10, 0)
     EVT_CALL(SetGroupEnabled, 12, 0)
diff --git a/src/battle/area_sam2/stage/sam_03.c b/src/battle/area_sam2/stage/sam_03.c
index bfa7412b06..d4635590a0 100644
--- a/src/battle/area_sam2/stage/sam_03.c
+++ b/src/battle/area_sam2/stage/sam_03.c
@@ -12,7 +12,7 @@ void func_80219E40_63F020(void) {
 }
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_THREAD
         EVT_SET(LVar0, 16)
         EVT_SET(LVar1, 0)
diff --git a/src/battle/area_sbk/stage/sbk_02.c b/src/battle/area_sbk/stage/sbk_02.c
index 489a87e40c..c432a71123 100644
--- a/src/battle/area_sbk/stage/sbk_02.c
+++ b/src/battle/area_sbk/stage/sbk_02.c
@@ -28,7 +28,7 @@ EvtScript N(8021F720) = {
 };
 
 EvtScript N(beforeBattle_8021F800) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 1)
     EVT_SET(LVar1, 0)
     EVT_EXEC(N(8021F720))
diff --git a/src/battle/area_tik/stage/tik_01.c b/src/battle/area_tik/stage/tik_01.c
index 7970f3cb7c..d1f624ea7b 100644
--- a/src/battle/area_tik/stage/tik_01.c
+++ b/src/battle/area_tik/stage/tik_01.c
@@ -200,7 +200,7 @@ s32 N(80230CEC)[] = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 13)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_tik/stage/tik_02.c b/src/battle/area_tik/stage/tik_02.c
index 43e9d0c5d9..de12f9838e 100644
--- a/src/battle/area_tik/stage/tik_02.c
+++ b/src/battle/area_tik/stage/tik_02.c
@@ -200,7 +200,7 @@ s32 N(802318EC)[] = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, N(802318EC))
     EVT_EXEC(N(80231730))
diff --git a/src/battle/area_tik/stage/tik_03.c b/src/battle/area_tik/stage/tik_03.c
index 7c5fd25247..01a21e8b54 100644
--- a/src/battle/area_tik/stage/tik_03.c
+++ b/src/battle/area_tik/stage/tik_03.c
@@ -147,7 +147,7 @@ s32 N(80232244)[] = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, N(80232244))
     EVT_EXEC(N(80232088))
diff --git a/src/battle/area_tik/stage/tik_04.c b/src/battle/area_tik/stage/tik_04.c
index 3ed23d490b..c0b90d2645 100644
--- a/src/battle/area_tik/stage/tik_04.c
+++ b/src/battle/area_tik/stage/tik_04.c
@@ -6,7 +6,7 @@
 #include "common/UnkModelStuff2.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_THREAD
         EVT_SET(LVar0, 15)
diff --git a/src/battle/area_tik/stage/tik_05.c b/src/battle/area_tik/stage/tik_05.c
index a2ad324c9d..781e1dc472 100644
--- a/src/battle/area_tik/stage/tik_05.c
+++ b/src/battle/area_tik/stage/tik_05.c
@@ -24,7 +24,7 @@ EvtScript N(80233540) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetTexPanner, 15, TEX_PANNER_1)
     EVT_CALL(EnableTexPanning, 15, 1)
diff --git a/src/battle/area_tik2/stage/tik_01.c b/src/battle/area_tik2/stage/tik_01.c
index c56e45b2ed..efb16c8e91 100644
--- a/src/battle/area_tik2/stage/tik_01.c
+++ b/src/battle/area_tik2/stage/tik_01.c
@@ -200,7 +200,7 @@ s32 N(80230CEC)[] = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 13)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_tik2/stage/tik_02.c b/src/battle/area_tik2/stage/tik_02.c
index 384e589d3f..fea4aa9bd7 100644
--- a/src/battle/area_tik2/stage/tik_02.c
+++ b/src/battle/area_tik2/stage/tik_02.c
@@ -200,7 +200,7 @@ s32 N(802318EC)[] = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, N(802318EC))
     EVT_EXEC(N(80231730))
diff --git a/src/battle/area_tik2/stage/tik_03.c b/src/battle/area_tik2/stage/tik_03.c
index ea0353d44c..57ec6c3569 100644
--- a/src/battle/area_tik2/stage/tik_03.c
+++ b/src/battle/area_tik2/stage/tik_03.c
@@ -147,7 +147,7 @@ s32 N(80232244)[] = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, N(80232244))
     EVT_EXEC(N(80232088))
diff --git a/src/battle/area_tik2/stage/tik_04.c b/src/battle/area_tik2/stage/tik_04.c
index 2ec2e69db7..fafb5490ec 100644
--- a/src/battle/area_tik2/stage/tik_04.c
+++ b/src/battle/area_tik2/stage/tik_04.c
@@ -6,7 +6,7 @@
 #include "common/UnkModelStuff2.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_THREAD
         EVT_SET(LVar0, 15)
diff --git a/src/battle/area_tik2/stage/tik_05.c b/src/battle/area_tik2/stage/tik_05.c
index 0f2bc60f6f..897035c82c 100644
--- a/src/battle/area_tik2/stage/tik_05.c
+++ b/src/battle/area_tik2/stage/tik_05.c
@@ -24,7 +24,7 @@ EvtScript N(80233540) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetTexPanner, 15, TEX_PANNER_1)
     EVT_CALL(EnableTexPanning, 15, 1)
diff --git a/src/battle/area_tik3/stage/tik_01.c b/src/battle/area_tik3/stage/tik_01.c
index 24bc8a0eb8..a5cf07e7e6 100644
--- a/src/battle/area_tik3/stage/tik_01.c
+++ b/src/battle/area_tik3/stage/tik_01.c
@@ -200,7 +200,7 @@ s32 N(80230CEC)[] = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 13)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_tik3/stage/tik_02.c b/src/battle/area_tik3/stage/tik_02.c
index 94a2e161eb..25de47b51e 100644
--- a/src/battle/area_tik3/stage/tik_02.c
+++ b/src/battle/area_tik3/stage/tik_02.c
@@ -200,7 +200,7 @@ s32 N(802318EC)[] = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, N(802318EC))
     EVT_EXEC(N(80231730))
diff --git a/src/battle/area_tik3/stage/tik_03.c b/src/battle/area_tik3/stage/tik_03.c
index 049bfa1eff..d64fee274a 100644
--- a/src/battle/area_tik3/stage/tik_03.c
+++ b/src/battle/area_tik3/stage/tik_03.c
@@ -147,7 +147,7 @@ s32 N(80232244)[] = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, N(80232244))
     EVT_EXEC(N(80232088))
diff --git a/src/battle/area_tik3/stage/tik_04.c b/src/battle/area_tik3/stage/tik_04.c
index b5c3468baf..e862a8315a 100644
--- a/src/battle/area_tik3/stage/tik_04.c
+++ b/src/battle/area_tik3/stage/tik_04.c
@@ -6,7 +6,7 @@
 #include "common/UnkModelStuff2.inc.c"
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_THREAD
         EVT_SET(LVar0, 15)
diff --git a/src/battle/area_tik3/stage/tik_05.c b/src/battle/area_tik3/stage/tik_05.c
index 24a4e4d55a..7f12743456 100644
--- a/src/battle/area_tik3/stage/tik_05.c
+++ b/src/battle/area_tik3/stage/tik_05.c
@@ -24,7 +24,7 @@ EvtScript N(80233540) = {
 };
 
 EvtScript N(beforeBattle) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(SetTexPanner, 15, TEX_PANNER_1)
     EVT_CALL(EnableTexPanning, 15, 1)
diff --git a/src/battle/area_trd_part_1/stage/trd_00.c b/src/battle/area_trd_part_1/stage/trd_00.c
index 0f5b6e7449..d4a531bfa6 100644
--- a/src/battle/area_trd_part_1/stage/trd_00.c
+++ b/src/battle/area_trd_part_1/stage/trd_00.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_trd_part_1_trd_00
 
 EvtScript N(beforeBattle_80224B70) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_trd_part_1/stage/trd_01.c b/src/battle/area_trd_part_1/stage/trd_01.c
index 7c17839c0b..2584ccd861 100644
--- a/src/battle/area_trd_part_1/stage/trd_01.c
+++ b/src/battle/area_trd_part_1/stage/trd_01.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_trd_part_1_trd_01
 
 EvtScript N(beforeBattle_80222AE0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_trd_part_1/stage/trd_02.c b/src/battle/area_trd_part_1/stage/trd_02.c
index 5c319835b0..677909fe52 100644
--- a/src/battle/area_trd_part_1/stage/trd_02.c
+++ b/src/battle/area_trd_part_1/stage/trd_02.c
@@ -101,7 +101,7 @@ EvtScript N(80222C78) = {
 };
 
 EvtScript N(beforeBattle_80223224) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 12, 0)
     EVT_THREAD
diff --git a/src/battle/area_trd_part_1/stage/trd_02b.c b/src/battle/area_trd_part_1/stage/trd_02b.c
index 724f6f796e..bc198c3ee4 100644
--- a/src/battle/area_trd_part_1/stage/trd_02b.c
+++ b/src/battle/area_trd_part_1/stage/trd_02b.c
@@ -101,7 +101,7 @@ EvtScript N(80223478) = {
 };
 
 EvtScript N(beforeBattle_80223A24) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 22, 0)
     EVT_CALL(EnableModel, 9, 0)
diff --git a/src/battle/area_trd_part_1/stage/trd_02c.c b/src/battle/area_trd_part_1/stage/trd_02c.c
index 20d8e89e56..5e01d3f1d9 100644
--- a/src/battle/area_trd_part_1/stage/trd_02c.c
+++ b/src/battle/area_trd_part_1/stage/trd_02c.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_trd_part_1_trd_02c
 
 EvtScript N(beforeBattle_80224BF0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 26, 0)
     EVT_CALL(EnableModel, 2, 0)
diff --git a/src/battle/area_trd_part_1/stage/trd_02d.c b/src/battle/area_trd_part_1/stage/trd_02d.c
index 9cf429542c..01d9dfbe2e 100644
--- a/src/battle/area_trd_part_1/stage/trd_02d.c
+++ b/src/battle/area_trd_part_1/stage/trd_02d.c
@@ -101,7 +101,7 @@ EvtScript N(80224DB8) = {
 };
 
 EvtScript N(beforeBattle_80225364) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 19, 0)
     EVT_CALL(EnableModel, 17, 0)
diff --git a/src/battle/area_trd_part_1/stage/trd_03.c b/src/battle/area_trd_part_1/stage/trd_03.c
index fc441f4a5f..cd7e370a09 100644
--- a/src/battle/area_trd_part_1/stage/trd_03.c
+++ b/src/battle/area_trd_part_1/stage/trd_03.c
@@ -6,7 +6,7 @@
 #include "world/common/todo/clouds.inc.c"
 
 EvtScript N(beforeBattle_80223F08) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 4)
     EVT_SET(LVar2, 0)
     EVT_EXEC(N(clouds1))
diff --git a/src/battle/area_trd_part_1/stage/trd_04.c b/src/battle/area_trd_part_1/stage/trd_04.c
index caa6a6555c..e0ea8eea57 100644
--- a/src/battle/area_trd_part_1/stage/trd_04.c
+++ b/src/battle/area_trd_part_1/stage/trd_04.c
@@ -57,7 +57,7 @@ EvtScript N(802241AC) = {
 };
 
 EvtScript N(beforeBattle_80224298) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 13)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_trd_part_1/stage/trd_05.c b/src/battle/area_trd_part_1/stage/trd_05.c
index 43b9d24a34..6843004acc 100644
--- a/src/battle/area_trd_part_1/stage/trd_05.c
+++ b/src/battle/area_trd_part_1/stage/trd_05.c
@@ -101,7 +101,7 @@ EvtScript N(80224478) = {
 };
 
 EvtScript N(beforeBattle_80224A24) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_THREAD
         EVT_SET(LVar0, 27)
diff --git a/src/battle/area_trd_part_1/stage/trd_05b.c b/src/battle/area_trd_part_1/stage/trd_05b.c
index cc303a9800..8565ca998a 100644
--- a/src/battle/area_trd_part_1/stage/trd_05b.c
+++ b/src/battle/area_trd_part_1/stage/trd_05b.c
@@ -101,7 +101,7 @@ EvtScript N(80225578) = {
 };
 
 EvtScript N(beforeBattle_80225B24) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 16, 0)
     EVT_CALL(EnableModel, 17, 0)
diff --git a/src/battle/area_trd_part_1/stage/trd_05c.c b/src/battle/area_trd_part_1/stage/trd_05c.c
index 6d52ca8b27..e1054e9c30 100644
--- a/src/battle/area_trd_part_1/stage/trd_05c.c
+++ b/src/battle/area_trd_part_1/stage/trd_05c.c
@@ -101,7 +101,7 @@ EvtScript N(80225D78) = {
 };
 
 EvtScript N(beforeBattle_80226324) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 10, 0)
     EVT_CALL(EnableModel, 15, 0)
diff --git a/src/battle/area_trd_part_1/stage/trd_05d.c b/src/battle/area_trd_part_1/stage/trd_05d.c
index 7b1e1829b9..55e031ccb1 100644
--- a/src/battle/area_trd_part_1/stage/trd_05d.c
+++ b/src/battle/area_trd_part_1/stage/trd_05d.c
@@ -101,7 +101,7 @@ EvtScript N(802265C8) = {
 };
 
 EvtScript N(beforeBattle_80226B74) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 10, 0)
     EVT_CALL(EnableModel, 15, 0)
diff --git a/src/battle/area_trd_part_1/stage/trd_05e.c b/src/battle/area_trd_part_1/stage/trd_05e.c
index a29ecfef56..4b8e0fae30 100644
--- a/src/battle/area_trd_part_1/stage/trd_05e.c
+++ b/src/battle/area_trd_part_1/stage/trd_05e.c
@@ -101,7 +101,7 @@ EvtScript N(80226E08) = {
 };
 
 EvtScript N(beforeBattle_802273B4) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 27, 0)
     EVT_CALL(EnableModel, 2, 0)
diff --git a/src/battle/area_trd_part_1/stage/trd_05f.c b/src/battle/area_trd_part_1/stage/trd_05f.c
index 3d617fc284..f3613adf39 100644
--- a/src/battle/area_trd_part_1/stage/trd_05f.c
+++ b/src/battle/area_trd_part_1/stage/trd_05f.c
@@ -101,7 +101,7 @@ EvtScript N(802275E8) = {
 };
 
 EvtScript N(beforeBattle_80227B94) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 27)
     EVT_EXEC(N(802275E8))
diff --git a/src/battle/area_trd_part_2/stage/trd_00.c b/src/battle/area_trd_part_2/stage/trd_00.c
index 930253e97b..adaa203ab4 100644
--- a/src/battle/area_trd_part_2/stage/trd_00.c
+++ b/src/battle/area_trd_part_2/stage/trd_00.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_trd_part_2_trd_00
 
 EvtScript N(beforeBattle_802313E0) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_trd_part_2/stage/trd_01.c b/src/battle/area_trd_part_2/stage/trd_01.c
index 6e802842c8..218705672d 100644
--- a/src/battle/area_trd_part_2/stage/trd_01.c
+++ b/src/battle/area_trd_part_2/stage/trd_01.c
@@ -4,7 +4,7 @@
 #define NAMESPACE b_area_trd_part_2_trd_01
 
 EvtScript N(beforeBattle_80231460) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_RETURN
     EVT_END
diff --git a/src/battle/area_trd_part_2/stage/trd_02.c b/src/battle/area_trd_part_2/stage/trd_02.c
index 5ac9036f77..502a34a28e 100644
--- a/src/battle/area_trd_part_2/stage/trd_02.c
+++ b/src/battle/area_trd_part_2/stage/trd_02.c
@@ -101,7 +101,7 @@ EvtScript N(802315F8) = {
 };
 
 EvtScript N(beforeBattle_80231BA4) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 12, 0)
     EVT_THREAD
diff --git a/src/battle/area_trd_part_2/stage/trd_02b.c b/src/battle/area_trd_part_2/stage/trd_02b.c
index 481ea06452..754a5c4613 100644
--- a/src/battle/area_trd_part_2/stage/trd_02b.c
+++ b/src/battle/area_trd_part_2/stage/trd_02b.c
@@ -101,7 +101,7 @@ EvtScript N(80231DF8) = {
 };
 
 EvtScript N(beforeBattle_802323A4) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 22, 0)
     EVT_CALL(EnableModel, 9, 0)
diff --git a/src/battle/area_trd_part_2/stage/trd_03.c b/src/battle/area_trd_part_2/stage/trd_03.c
index 5e8d88cae4..92e1670b84 100644
--- a/src/battle/area_trd_part_2/stage/trd_03.c
+++ b/src/battle/area_trd_part_2/stage/trd_03.c
@@ -6,7 +6,7 @@
 #include "world/common/todo/clouds.inc.c"
 
 EvtScript N(beforeBattle_80232888) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 4)
     EVT_SET(LVar2, 0)
     EVT_EXEC(N(clouds1))
diff --git a/src/battle/area_trd_part_2/stage/trd_04.c b/src/battle/area_trd_part_2/stage/trd_04.c
index cb5cf5c9f3..bd78afaefe 100644
--- a/src/battle/area_trd_part_2/stage/trd_04.c
+++ b/src/battle/area_trd_part_2/stage/trd_04.c
@@ -57,7 +57,7 @@ EvtScript N(80232B2C) = {
 };
 
 EvtScript N(beforeBattle_80232C18) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 13)
     EVT_SET(LVar1, 0)
diff --git a/src/battle/area_trd_part_2/stage/trd_05.c b/src/battle/area_trd_part_2/stage/trd_05.c
index 6a3c493d4c..d39bbe8cb5 100644
--- a/src/battle/area_trd_part_2/stage/trd_05.c
+++ b/src/battle/area_trd_part_2/stage/trd_05.c
@@ -101,7 +101,7 @@ EvtScript N(80232DF8) = {
 };
 
 EvtScript N(beforeBattle_802333A4) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_THREAD
         EVT_SET(LVar0, 27)
diff --git a/src/battle/area_trd_part_2/stage/trd_05b.c b/src/battle/area_trd_part_2/stage/trd_05b.c
index d49c14c01f..8aeba42f6e 100644
--- a/src/battle/area_trd_part_2/stage/trd_05b.c
+++ b/src/battle/area_trd_part_2/stage/trd_05b.c
@@ -101,7 +101,7 @@ EvtScript N(80233608) = {
 };
 
 EvtScript N(beforeBattle_80233BB4) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 16, 0)
     EVT_CALL(EnableModel, 17, 0)
diff --git a/src/battle/area_trd_part_2/stage/trd_05c.c b/src/battle/area_trd_part_2/stage/trd_05c.c
index 96f6901c25..abe97d15b7 100644
--- a/src/battle/area_trd_part_2/stage/trd_05c.c
+++ b/src/battle/area_trd_part_2/stage/trd_05c.c
@@ -101,7 +101,7 @@ EvtScript N(80233E08) = {
 };
 
 EvtScript N(beforeBattle_802343B4) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 10, 0)
     EVT_CALL(EnableModel, 15, 0)
diff --git a/src/battle/area_trd_part_2/stage/trd_05d.c b/src/battle/area_trd_part_2/stage/trd_05d.c
index 5f50f88085..ee61a9ae46 100644
--- a/src/battle/area_trd_part_2/stage/trd_05d.c
+++ b/src/battle/area_trd_part_2/stage/trd_05d.c
@@ -101,7 +101,7 @@ EvtScript N(80234658) = {
 };
 
 EvtScript N(beforeBattle_80234C04) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 10, 0)
     EVT_CALL(EnableModel, 15, 0)
diff --git a/src/battle/area_trd_part_2/stage/trd_05e.c b/src/battle/area_trd_part_2/stage/trd_05e.c
index a5bb2e6d3c..11bfd23cc9 100644
--- a/src/battle/area_trd_part_2/stage/trd_05e.c
+++ b/src/battle/area_trd_part_2/stage/trd_05e.c
@@ -101,7 +101,7 @@ EvtScript N(80234E98) = {
 };
 
 EvtScript N(beforeBattle_80235444) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_CALL(EnableModel, 27, 0)
     EVT_CALL(EnableModel, 2, 0)
diff --git a/src/battle/area_trd_part_2/stage/trd_05f.c b/src/battle/area_trd_part_2/stage/trd_05f.c
index e542abc8d2..7b098e6cf9 100644
--- a/src/battle/area_trd_part_2/stage/trd_05f.c
+++ b/src/battle/area_trd_part_2/stage/trd_05f.c
@@ -101,7 +101,7 @@ EvtScript N(80235678) = {
 };
 
 EvtScript N(beforeBattle_80235C24) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
     EVT_SET(LVar0, 27)
     EVT_EXEC(N(80235678))
diff --git a/src/battle/area_trd_part_3/stage/nok_01.c b/src/battle/area_trd_part_3/stage/nok_01.c
index 6bd31eac96..ad107fdd00 100644
--- a/src/battle/area_trd_part_3/stage/nok_01.c
+++ b/src/battle/area_trd_part_3/stage/nok_01.c
@@ -23,7 +23,7 @@ EvtScript N(80218DD0) = {
 };
 
 EvtScript N(beforeBattle_80218ED8) = {
-    EVT_CALL(SetSpriteShading, -1)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
     EVT_SET(LVar0, 19)
     EVT_EXEC(N(80218DD0))
     EVT_SET(LVar0, 20)
diff --git a/src/common/UnkBowserFunc1.inc.c b/src/common/UnkBowserFunc1.inc.c
index 042dd0223f..a561e414e7 100644
--- a/src/common/UnkBowserFunc1.inc.c
+++ b/src/common/UnkBowserFunc1.inc.c
@@ -30,7 +30,7 @@ ApiStatus N(UnkBowserFunc1)(Evt* script, s32 isInitialCall) {
         script->functionTemp[0] = 0;
 
         for (i = 0; i < 10; i++) {
-            func_802DE780(part->unk_84, i, 17, 20, 0, 0, 255, 0);
+            func_802DE780(part->spriteInstanceID, i, 17, 20, 0, 0, 255, 0);
         }
     }
 
@@ -50,7 +50,7 @@ ApiStatus N(UnkBowserFunc1)(Evt* script, s32 isInitialCall) {
         for (j = 0; j < 20; j++) {
             colorRGBA = sp20[j] << 0x18 | sp38[j] << 0x10 | sp50[j] << 8 | 0xFF;
             for (i = 0; i < 10; i++) {
-                func_802DE780(part->unk_84, i, 12, j, colorRGBA, 0, 255, 0);
+                func_802DE780(part->spriteInstanceID, i, 12, j, colorRGBA, 0, 255, 0);
             }
         }
         return ApiStatus_BLOCK;
@@ -60,7 +60,7 @@ ApiStatus N(UnkBowserFunc1)(Evt* script, s32 isInitialCall) {
             colorRGBA = 255;
             for (i = 0; i < 10; i++) {
                 // TODO find better match for opacity
-                func_802DE780(part->unk_84, i, 12, j, colorRGBA, 0, opacity & 0xFFFF, 0);
+                func_802DE780(part->spriteInstanceID, i, 12, j, colorRGBA, 0, opacity & 0xFFFF, 0);
             }
         }
         script->functionTemp[1] = 0;
diff --git a/src/common/foliage.inc.c b/src/common/foliage.inc.c
index 3b0ccd5485..dc3b01f772 100644
--- a/src/common/foliage.inc.c
+++ b/src/common/foliage.inc.c
@@ -177,9 +177,3 @@ EvtScript N(EVS_ShakeTree) = {
     EVT_RETURN
     EVT_END
 };
-
-#define FOLIAGE_MODEL_LIST(names...) \
-{ \
-    .count = __NARG__(names), \
-    .models = {  names } \
-}
diff --git a/src/entity/BlueWarpPipe.c b/src/entity/BlueWarpPipe.c
index fd0bd3fd7f..0f7a0052c4 100644
--- a/src/entity/BlueWarpPipe.c
+++ b/src/entity/BlueWarpPipe.c
@@ -115,7 +115,7 @@ void entity_BlueWarpPipe_enter_pipe_init(Entity* bluePipe) {
     pipeData->timer = 25;
     playerStatus->renderMode = RENDER_MODE_ALPHATEST;
 
-    func_802DDFF8(0x10002, 5, 2, 1, 1, 0, 0);
+    func_802DDFF8(ANIM_Mario_10002, FOLD_TYPE_5, 2, 1, 1, 0, 0);
     sfx_play_sound(SOUND_ENTER_PIPE);
     disable_player_shadow();
 }
@@ -130,7 +130,7 @@ void entity_BlueWarpPipe_enter_pipe_update(Entity* entity) {
     if (pipeData->timer == -1) {
         playerStatus->renderMode = RENDER_MODE_ALPHATEST;
         playerStatus->position.y -= 50.0f;
-        func_802DDFF8(0x10002, 0, 0, 0, 0, 0, 0);
+        func_802DDFF8(ANIM_Mario_10002, 0, 0, 0, 0, 0, 0);
         exec_entity_commandlist(entity);
     }
 }
diff --git a/src/entity/jan_iwa/Plants1.c b/src/entity/jan_iwa/Plants1.c
index 9d7ac44a3d..503d0a3ccb 100644
--- a/src/entity/jan_iwa/Plants1.c
+++ b/src/entity/jan_iwa/Plants1.c
@@ -308,8 +308,8 @@ void entity_CymbalPlant_idle(Entity* entity) {
         case 2:
             if (--data->timer == 0) {
                 data->state++;
-                func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0);
-                func_802DDFF8(0x10002, 5, 19, 1, 1, 0, 0);
+                func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0);
+                func_802DDFF8(ANIM_Mario_10002, 5, 19, 1, 1, 0, 0);
             }
             break;
         case 3:
@@ -328,7 +328,7 @@ void entity_CymbalPlant_idle(Entity* entity) {
         case 5:
             if (--data->timer == 0) {
                 data->state++;
-                func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0);
+                func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0);
                 enable_player_input();
                 playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED;
             }
diff --git a/src/evt/player_api.c b/src/evt/player_api.c
index a1b056cc0f..27b9c5145f 100644
--- a/src/evt/player_api.c
+++ b/src/evt/player_api.c
@@ -637,12 +637,12 @@ ApiStatus func_802D2520(Evt* script, s32 isInitialCall) {
     s32 val = evt_get_variable(script, *args++);
     s32 a2, a3, a4, a5;
 
-    func_802DDFF8(a0, 0, 0, 0, 0, 0, 0);
+    func_802DDFF8(a0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0);
 
     switch (val) {
         case 0:
             playerStatus->renderMode = RENDER_MODE_ALPHATEST;
-            func_802DDFF8(a0, 0, 0, 0, 0, 0, D_802DB5B0);
+            func_802DDFF8(a0, FOLD_TYPE_NONE, 0, 0, 0, 0, D_802DB5B0);
             break;
         case 2:
         case 3:
@@ -655,19 +655,19 @@ ApiStatus func_802D2520(Evt* script, s32 isInitialCall) {
             a2 = evt_get_variable(script, *args++);
             a3 = evt_get_variable(script, *args++);
             a4 = evt_get_variable(script, *args++);
-            func_802DDFF8(a0, 4, a2, a3, a4, 0, D_802DB5B0);
+            func_802DDFF8(a0, FOLD_TYPE_4, a2, a3, a4, 0, D_802DB5B0);
             break;
         case 6:
             playerStatus->renderMode = RENDER_MODE_ALPHATEST;
             a2 = evt_get_variable(script, *args++);
             a3 = evt_get_variable(script, *args++);
             a4 = evt_get_variable(script, *args++);
-            func_802DDFF8(a0, 6, a2, a3, a4, 255, D_802DB5B0);
+            func_802DDFF8(a0, FOLD_TYPE_6, a2, a3, a4, 255, D_802DB5B0);
             break;
         case 7:
             playerStatus->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
             a5 = evt_get_variable(script, *args++);
-            func_802DDFF8(a0, 7, 255, 255, 255, a5, D_802DB5B0);
+            func_802DDFF8(a0, FOLD_TYPE_7, 255, 255, 255, a5, D_802DB5B0);
             break;
         case 8:
             playerStatus->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
@@ -675,14 +675,14 @@ ApiStatus func_802D2520(Evt* script, s32 isInitialCall) {
             a3 = evt_get_variable(script, *args++);
             a4 = evt_get_variable(script, *args++);
             a5 = evt_get_variable(script, *args++);
-            func_802DDFF8(a0, 8, a2, a3, a4, a5, D_802DB5B0);
+            func_802DDFF8(a0, FOLD_TYPE_8, a2, a3, a4, a5, D_802DB5B0);
             break;
         case 5:
             playerStatus->renderMode = RENDER_MODE_ALPHATEST;
             a2 = evt_get_variable(script, *args++);
             a3 = evt_get_variable(script, *args++);
             a4 = evt_get_variable(script, *args++);
-            func_802DDFF8(a0, 5, a2, a3, a4, 0, D_802DB5B0);
+            func_802DDFF8(a0, FOLD_TYPE_5, a2, a3, a4, 0, D_802DB5B0);
             break;
         case 13:
             playerStatus->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
@@ -690,7 +690,7 @@ ApiStatus func_802D2520(Evt* script, s32 isInitialCall) {
             a3 = evt_get_variable(script, *args++);
             a4 = evt_get_variable(script, *args++);
             a5 = evt_get_variable(script, *args++);
-            func_802DDFF8(a0, 13, a2, a3, a4, a5, D_802DB5B0);
+            func_802DDFF8(a0, FOLD_TYPE_D, a2, a3, a4, a5, D_802DB5B0);
             break;
     }
 
diff --git a/src/npc.c b/src/npc.c
index 68699548d3..caec4f19d6 100644
--- a/src/npc.c
+++ b/src/npc.c
@@ -583,7 +583,7 @@ void update_npcs(void) {
                             }
                         }
                     } else {
-                        spr_update_player_sprite(1, npc->currentAnim, npc->animationSpeed);
+                        spr_update_player_sprite(PLAYER_SPRITE_AUX1, npc->currentAnim, npc->animationSpeed);
                     }
 
                     if (npc->flags & NPC_FLAG_HAS_SHADOW) {
@@ -805,7 +805,7 @@ void appendGfx_npc(void* data) {
                 spr_draw_npc_sprite(npc->spriteInstanceID, renderYaw, 0, 0, mtx1);
             }
         } else {
-            spr_draw_player_sprite(1 | DRAW_SPRITE_OVERRIDE_YAW, renderYaw, 0, 0, mtx1);
+            spr_draw_player_sprite(PLAYER_SPRITE_AUX1 | DRAW_SPRITE_OVERRIDE_YAW, renderYaw, 0, 0, mtx1);
         }
     }
 
@@ -835,7 +835,7 @@ void appendGfx_npc(void* data) {
                 spr_draw_npc_sprite(npc->spriteInstanceID, renderYaw, 0, 0, mtx1);
             }
         } else {
-            spr_draw_player_sprite(1 | DRAW_SPRITE_OVERRIDE_YAW, renderYaw, 0, 0, mtx1);
+            spr_draw_player_sprite(PLAYER_SPRITE_AUX1 | DRAW_SPRITE_OVERRIDE_YAW, renderYaw, 0, 0, mtx1);
         }
     }
     npc->onRender(npc);
@@ -1096,7 +1096,7 @@ void appendGfx_npc_blur(void* data) {
                     spr_draw_npc_sprite(npc->spriteInstanceID, (s32) yaw, 0, 0, sp20);
                 }
             } else {
-                spr_draw_player_sprite(1 | DRAW_SPRITE_OVERRIDE_YAW, (s32) yaw, 0, 0, sp20);
+                spr_draw_player_sprite(PLAYER_SPRITE_AUX1 | DRAW_SPRITE_OVERRIDE_YAW, (s32) yaw, 0, 0, sp20);
             }
         }
     }
@@ -1245,7 +1245,7 @@ void npc_draw_palswap_mode_0(Npc* npc, s32 arg1, Matrix4f mtx) {
         }
         spr_draw_npc_sprite(npc->spriteInstanceID | mask, arg1, alpha, NULL, mtx);
     } else {
-        spr_draw_player_sprite(1 | DRAW_SPRITE_OVERRIDE_YAW, arg1, 0, 0, mtx);
+        spr_draw_player_sprite(PLAYER_SPRITE_AUX1 | DRAW_SPRITE_OVERRIDE_YAW, arg1, 0, 0, mtx);
     }
 }
 
diff --git a/src/sprite.c b/src/sprite.c
index c64619ff9e..086cac3567 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -447,7 +447,7 @@ void spr_draw_component(s32 drawOpts, SpriteComponent* component, SpriteAnimComp
         spr_transform_point(rotX, rotY, rotZ, inX, inY, inZ * zscale, &dx, &dy, &dz);
         cacheEntry = cache[component->currentRaster];
         paletteIdx = component->currentPalette;
-        if (drawOpts & 0x08000000) {
+        if (drawOpts & DRAW_SPRITE_USE_PLAYER_RASTERS) {
             cacheEntry->image = spr_get_player_raster(component->currentRaster & 0xFFF, D_802DF57C);
         }
         D_802DF540 = component->unk_4C;
@@ -832,13 +832,13 @@ s32 spr_update_player_sprite(s32 spriteInstanceID, s32 animID, f32 timeScale) {
     SpriteAnimComponent** animList;
     SpriteRasterCacheEntry** rasterList;
     s32 spriteId = ((animID >> 16) & 0xFF) - 1;
-    s32 i = spriteInstanceID & 0xFF;
+    s32 instanceIdx = spriteInstanceID & 0xFF;
     s32 animIndex = animID & 0xFF;
     D_802DF57C = spriteId;
 
-    if (spr_playerCurrentAnimInfo[i].componentList == NULL) {
+    if (spr_playerCurrentAnimInfo[instanceIdx].componentList == NULL) {
         compList = spr_allocate_components(spr_playerMaxComponents);
-        spr_playerCurrentAnimInfo[i].componentList = compList;
+        spr_playerCurrentAnimInfo[instanceIdx].componentList = compList;
         while (*compList != PTR_LIST_END) {
             component = *compList;
             component->unk_4C = func_8013A704(1);
@@ -847,7 +847,7 @@ s32 spr_update_player_sprite(s32 spriteInstanceID, s32 animID, f32 timeScale) {
     }
 
     spriteData = (u32*)spr_playerSprites[spriteId];
-    compList = spr_playerCurrentAnimInfo[i].componentList;
+    compList = spr_playerCurrentAnimInfo[instanceIdx].componentList;
 
     if (spriteData == NULL) {
         return 0;
@@ -859,24 +859,24 @@ s32 spr_update_player_sprite(s32 spriteInstanceID, s32 animID, f32 timeScale) {
 
     spr_set_anim_timescale(timeScale);
     if ((spriteInstanceID & DRAW_SPRITE_OVERRIDE_ALPHA) ||
-        (animID & ~0x01000000) != (spr_playerCurrentAnimInfo[i].animID & ~0x01000000))
+        (animID & ~SPRITE_ID_BACK_FACING) != (spr_playerCurrentAnimInfo[instanceIdx].animID & ~SPRITE_ID_BACK_FACING))
     {
         spr_init_anim_state(compList, animList);
-        spr_playerCurrentAnimInfo[i].notifyValue = 0;
+        spr_playerCurrentAnimInfo[instanceIdx].notifyValue = 0;
     }
 
-    spr_playerCurrentAnimInfo[i].animID = animID;
+    spr_playerCurrentAnimInfo[instanceIdx].animID = animID;
 
     if (!(spriteInstanceID & DRAW_SPRITE_OVERRIDE_YAW)) {
-        spr_playerCurrentAnimInfo[i].notifyValue = spr_component_update(spr_playerCurrentAnimInfo[i].notifyValue,
+        spr_playerCurrentAnimInfo[instanceIdx].notifyValue = spr_component_update(spr_playerCurrentAnimInfo[instanceIdx].notifyValue,
                 compList, animList, rasterList, 0);
     }
-    return spr_playerCurrentAnimInfo[i].notifyValue;
+    return spr_playerCurrentAnimInfo[instanceIdx].notifyValue;
 }
 
-s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 alphaIn, u16** paletteList, Matrix4f mtx) {
-    s32 i = spriteInstanceID & 0xFF;
-    s32 animID = spr_playerCurrentAnimInfo[i].animID;
+s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 alphaIn, PAL_PTR* paletteList, Matrix4f mtx) {
+    s32 instanceIdx = spriteInstanceID & 0xFF;
+    s32 animID = spr_playerCurrentAnimInfo[instanceIdx].animID;
     SpriteRasterCacheEntry** rasters;
     PAL_PTR* palettes;
     SpriteAnimComponent** animComponents;
@@ -952,13 +952,13 @@ s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 alphaIn, u16** pal
         alpha = 255;
     }
 
-    components = spr_playerCurrentAnimInfo[i].componentList;
+    components = spr_playerCurrentAnimInfo[instanceIdx].componentList;
     if (spriteInstanceID & DRAW_SPRITE_OVERRIDE_PALETTES) {
         palettes = paletteList;
     }
 
     while (*components != PTR_LIST_END) {
-        spr_draw_component(alpha | 0x08000000, *components++, *animComponents, rasters, palettes, zscale, mtx);
+        spr_draw_component(alpha | DRAW_SPRITE_USE_PLAYER_RASTERS, *components++, *animComponents, rasters, palettes, zscale, mtx);
         if (*animComponents != PTR_LIST_END) {
             animComponents++;
         }
@@ -971,20 +971,20 @@ s32 func_802DDEC4(s32 arg0) {
     return spr_playerCurrentAnimInfo[arg0].notifyValue;
 }
 
-void func_802DDEE4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) {
+void func_802DDEE4(s32 spriteIdx, s32 compIdx, FoldType foldType, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) {
     SpriteComponent* component;
     SpriteComponent** componentListIt;
     s32 i;
 
-    if (spr_playerCurrentAnimInfo[arg0].componentList != NULL) {
-        componentListIt = spr_playerCurrentAnimInfo[arg0].componentList;
+    if (spr_playerCurrentAnimInfo[spriteIdx].componentList != NULL) {
+        componentListIt = spr_playerCurrentAnimInfo[spriteIdx].componentList;
         i = 0;
 
         while (*componentListIt != PTR_LIST_END) {
             component = *componentListIt;
-            if (arg1 == -1 || i == arg1) {
-                fold_update(component->unk_4C & 0xFF, arg2, arg3, arg4, arg5, arg6, arg7);
-                if (arg2 != 0) {
+            if (compIdx == -1 || i == compIdx) {
+                fold_update(component->unk_4C & 0xFF, foldType, arg3, arg4, arg5, arg6, arg7);
+                if (foldType != 0) {
                     component->unk_4C |= 0x10000000;
                 } else {
                     component->unk_4C &= ~0xF0000000;
@@ -996,8 +996,8 @@ void func_802DDEE4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s
     }
 }
 
-void func_802DDFF8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) {
-    func_802DDEE4(0, -1, arg1, arg2, arg3, arg4, arg5, arg6);
+void func_802DDFF8(s32 animID, FoldType foldType, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) {
+    func_802DDEE4(PLAYER_SPRITE_MAIN, -1, foldType, arg2, arg3, arg4, arg5, arg6);
 }
 
 void spr_get_player_raster_info(SpriteRasterInfo* out, s32 playerSpriteID, s32 rasterIndex) {
@@ -1226,7 +1226,7 @@ s32 func_802DE748(s32 spriteIdx, s32 compIdx) {
     }
 }
 
-void func_802DE780(s32 spriteIdx, s32 compIdx, s32 foldType, s32 foldArg0, s32 foldArg1, s32 foldArg2, s32 foldArg3, s32 foldArg4) {
+void func_802DE780(s32 spriteIdx, s32 compIdx, FoldType foldType, s32 foldArg0, s32 foldArg1, s32 foldArg2, s32 foldArg3, s32 foldArg4) {
     SpriteInstance* sprite = &SpriteInstances[spriteIdx];
     SpriteComponent** componentList;
     s32 i;
@@ -1252,7 +1252,7 @@ void func_802DE780(s32 spriteIdx, s32 compIdx, s32 foldType, s32 foldArg0, s32 f
     }
 }
 
-void func_802DE894(s32 spriteIdx, s32 foldType, s32 foldArg0, s32 foldArg1, s32 foldArg2, s32 foldArg3, s32 foldArg4) {
+void func_802DE894(s32 spriteIdx, FoldType foldType, s32 foldArg0, s32 foldArg1, s32 foldArg2, s32 foldArg3, s32 foldArg4) {
     func_802DE780(spriteIdx, -1, foldType, foldArg0, foldArg1, foldArg2, foldArg3, foldArg4);
 }
 
diff --git a/src/sprite.h b/src/sprite.h
index 12a4bd7153..3ab65c097c 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -14,12 +14,25 @@ enum SpriteIDFields {
 };
 
 enum DrawSpriteOptions {
+    DRAW_SPRITE_USE_PLAYER_RASTERS  = 0x08000000,
     DRAW_SPRITE_UPSIDE_DOWN         = 0x10000000,
     DRAW_SPRITE_OVERRIDE_PALETTES   = 0x20000000,
     DRAW_SPRITE_OVERRIDE_YAW        = 0x40000000,
     DRAW_SPRITE_OVERRIDE_ALPHA      = 0x80000000,
 };
 
+enum {
+    PLAYER_SPRITE_MAIN      = 0,
+    PLAYER_SPRITE_AUX1      = 1,
+    PLAYER_SPRITE_AUX2      = 2,
+};
+
+//TODO this is just a boolean isNpcSprite, using a temp enum for documenting
+enum {
+    SPRITE_MODE_PLAYER  = 0,
+    SPRITE_MODE_NPC     = 1,
+};
+
 typedef struct SpriteComponent {
     /* 0x00 */ s32 initialized;
     /* 0x04 */ s32 properties; ///< AABBCCCC : AA = unused?, BB = parent, CCCC = notify value
@@ -120,9 +133,9 @@ s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 arg2, PAL_PTR* pal
 
 s32 func_802DDEC4(s32 arg0);
 
-void func_802DDEE4(s32, s32, s32, s32, s32, s32, s32, s32);
+void func_802DDEE4(s32, s32, FoldType, s32, s32, s32, s32, s32);
 
-void func_802DDFF8(s32, s32, s32, s32, s32, s32, s32);
+void func_802DDFF8(s32, FoldType, s32, s32, s32, s32, s32);
 
 IMG_PTR spr_get_player_raster(s32 rasterIndex, s32 playerSpriteID);
 
@@ -143,9 +156,9 @@ s32 spr_free_sprite(s32 spriteInstanceID);
 
 s32 func_802DE748(s32, s32); // TODO
 
-void func_802DE780(s32, s32, s32, s32, s32, s32, s32, s32);
+void func_802DE780(s32, s32, FoldType, s32, s32, s32, s32, s32);
 
-void func_802DE894(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6);
+void func_802DE894(s32 arg0, FoldType arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6);
 
 s32 func_802DE8DC(s32 spriteIdx, s32 compListIdx, s32* outX, s32* outY, s32* outZ);
 
diff --git a/src/world/area_dro/dro_01/dro_01_7_foliage.c b/src/world/area_dro/dro_01/dro_01_7_foliage.c
index 9e76f3e237..23b6d34a0d 100644
--- a/src/world/area_dro/dro_01/dro_01_7_foliage.c
+++ b/src/world/area_dro/dro_01/dro_01_7_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o799,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o800,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o799);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o800);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1, 
diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c
index ac194ff3e0..e285cff326 100644
--- a/src/world/area_dro/dro_02/npc_merlee.c
+++ b/src/world/area_dro/dro_02/npc_merlee.c
@@ -12,11 +12,11 @@ typedef struct RitualCard {
     /* 0x20 */ s32 xoffset;
 } RitualCard; // size = 0x24
 
-static Evt* N(CreatorScript);
+BSS Evt* N(CreatorScript);
 
 // this buffer is used as an array in scripts managaing the ritual scene
 // values are enumerated below
-static s32 N(RitualBuffer)[16];
+BSS s32 N(RitualBuffer)[16];
 
 enum {
     RITUAL_VAR_FOLDER_1     = ArrayVar(0),
@@ -48,8 +48,8 @@ enum {
     RITUAL_STATE_D              = 13,
 };
 
-static RitualCard N(RitualCards)[3];
-MAP_STATIC_PAD(1,merlee)
+BSS RitualCard N(RitualCards)[3];
+MAP_STATIC_PAD(1,merlee);
 
 s8 N(MerleeSpellCasts)[] = {
     20, 10, 5, 0,
diff --git a/src/world/common/atomic/Credits.h b/src/world/area_end/common/Credits.h
similarity index 100%
rename from src/world/common/atomic/Credits.h
rename to src/world/area_end/common/Credits.h
diff --git a/src/world/common/atomic/Credits.inc.c b/src/world/area_end/common/Credits.inc.c
similarity index 99%
rename from src/world/common/atomic/Credits.inc.c
rename to src/world/area_end/common/Credits.inc.c
index baf918cc9a..d399fba113 100644
--- a/src/world/common/atomic/Credits.inc.c
+++ b/src/world/area_end/common/Credits.inc.c
@@ -5,11 +5,11 @@ s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgS
 void msg_get_glyph(s32 font, s32 variation, s32 charIndex, s32 palette, MesasgeFontGlyphData* out);
 void dma_load_msg(u32 msgID, void* dest);
 
-static CreditsData N(CreditsData);
-static CreditsData* N(CreditsDataPtr);
-static s32 N(BSS_PAD_1)[2];
-static u8 N(CreditsMessageBuffers)[23][256];
-static Mtx N(CreditsProjMatrices)[2];
+BSS CreditsData N(CreditsData);
+BSS CreditsData* N(CreditsDataPtr);
+BSS s32 N(BSS_PAD_1)[2];
+BSS u8 N(CreditsMessageBuffers)[23][256];
+BSS Mtx N(CreditsProjMatrices)[2];
 
 enum {
     CREDITS_LINE_FLAG_1          = 1,
diff --git a/src/world/area_end/end_00/credits_jobs.inc.c b/src/world/area_end/end_00/credits_jobs.inc.c
index 06334b8414..7baead5d1b 100644
--- a/src/world/area_end/end_00/credits_jobs.inc.c
+++ b/src/world/area_end/end_00/credits_jobs.inc.c
@@ -1,4 +1,4 @@
-#include "world/common/atomic/Credits.h"
+#include "../common/Credits.h"
 
 CreditsEntry N(Credits_Jobs)[] = {
     {
diff --git a/src/world/area_end/end_00/credits_names.inc.c b/src/world/area_end/end_00/credits_names.inc.c
index 6ffd81a329..efb3a698e9 100644
--- a/src/world/area_end/end_00/credits_names.inc.c
+++ b/src/world/area_end/end_00/credits_names.inc.c
@@ -1,4 +1,4 @@
-#include "world/common/atomic/Credits.h"
+#include "../common/Credits.h"
 
 CreditsEntry N(Credits_Names)[] = {
     {
diff --git a/src/world/area_end/end_00/credits_title.inc.c b/src/world/area_end/end_00/credits_title.inc.c
index 2318aa000f..a14f31f39e 100644
--- a/src/world/area_end/end_00/credits_title.inc.c
+++ b/src/world/area_end/end_00/credits_title.inc.c
@@ -1,4 +1,4 @@
-#include "world/common/atomic/Credits.h"
+#include "../common/Credits.h"
 
 CreditsEntry N(Credits_Title)[] = {
     {
diff --git a/src/world/area_end/end_00/end_00_2_credits.c b/src/world/area_end/end_00/end_00_2_credits.c
index 3440933d98..9b8c3650b6 100644
--- a/src/world/area_end/end_00/end_00_2_credits.c
+++ b/src/world/area_end/end_00/end_00_2_credits.c
@@ -1,6 +1,6 @@
 #include "end_00.h"
 
-#include "world/common/atomic/Credits.inc.c"
+#include "../common/Credits.inc.c"
 
 #include "credits_title.inc.c"
 #include "credits_jobs.inc.c"
diff --git a/src/world/area_end/end_01/credits_jobs.inc.c b/src/world/area_end/end_01/credits_jobs.inc.c
index 798ae8fe55..d5a01f7624 100644
--- a/src/world/area_end/end_01/credits_jobs.inc.c
+++ b/src/world/area_end/end_01/credits_jobs.inc.c
@@ -1,4 +1,4 @@
-#include "world/common/atomic/Credits.h"
+#include "../common/Credits.h"
 
 CreditsEntry N(Credits_Jobs)[] = {
     {
diff --git a/src/world/area_end/end_01/credits_names.inc.c b/src/world/area_end/end_01/credits_names.inc.c
index 1ba7d7825a..5043d21ec8 100644
--- a/src/world/area_end/end_01/credits_names.inc.c
+++ b/src/world/area_end/end_01/credits_names.inc.c
@@ -1,4 +1,4 @@
-#include "world/common/atomic/Credits.h"
+#include "../common/Credits.h"
 
 CreditsEntry N(Credits_Names)[] = {
     {
diff --git a/src/world/area_end/end_01/end_01_2_credits.c b/src/world/area_end/end_01/end_01_2_credits.c
index 09f90aab80..d9a388df17 100644
--- a/src/world/area_end/end_01/end_01_2_credits.c
+++ b/src/world/area_end/end_01/end_01_2_credits.c
@@ -1,6 +1,6 @@
 #include "end_01.h"
 
-#include "world/common/atomic/Credits.inc.c"
+#include "../common/Credits.inc.c"
 
 #include "credits_jobs.inc.c"
 #include "credits_names.inc.c"
diff --git a/src/world/common/atomic/flo_DroppingVine.inc.c b/src/world/area_flo/common/DroppingVine.inc.c
similarity index 100%
rename from src/world/common/atomic/flo_DroppingVine.inc.c
rename to src/world/area_flo/common/DroppingVine.inc.c
diff --git a/src/world/common/atomic/flo_FlowerSpawnRegion.inc.c b/src/world/area_flo/common/FlowerSpawnRegion.inc.c
similarity index 100%
rename from src/world/common/atomic/flo_FlowerSpawnRegion.inc.c
rename to src/world/area_flo/common/FlowerSpawnRegion.inc.c
diff --git a/src/world/common/atomic/ItemChoice_FlowerGuard.inc.c b/src/world/area_flo/common/ItemChoice_FlowerGuard.inc.c
similarity index 100%
rename from src/world/common/atomic/ItemChoice_FlowerGuard.inc.c
rename to src/world/area_flo/common/ItemChoice_FlowerGuard.inc.c
diff --git a/src/world/common/atomic/flo_LogBridge.inc.c b/src/world/area_flo/common/LogBridge.inc.c
similarity index 100%
rename from src/world/common/atomic/flo_LogBridge.inc.c
rename to src/world/area_flo/common/LogBridge.inc.c
diff --git a/src/world/area_flo/flo_00/flo_00_2_main.c b/src/world/area_flo/flo_00/flo_00_2_main.c
index 26ba34dd09..134a259766 100644
--- a/src/world/area_flo/flo_00/flo_00_2_main.c
+++ b/src/world/area_flo/flo_00/flo_00_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_00.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0);
@@ -85,7 +85,7 @@ EvtScript N(EVS_ExitWalk_flo_16_0) = EVT_EXIT_WALK(60, flo_00_ENTRY_4, "flo_16",
 EvtScript N(EVS_ExitWalk_flo_09_0) = EVT_EXIT_WALK(60, flo_00_ENTRY_5, "flo_09", flo_09_ENTRY_0);
 EvtScript N(EVS_ExitWalk_flo_08_0) = EVT_EXIT_WALK(60, flo_00_ENTRY_6, "flo_08", flo_08_ENTRY_0);
 
-MAP_RODATA_PAD(1, exits)
+MAP_RODATA_PAD(1, exits);
 
 EvtScript N(EVS_BindExitTriggers) = {
     EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_flo_14_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilinw, 1, 0)
diff --git a/src/world/area_flo/flo_03/flo_03_2_main.c b/src/world/area_flo/flo_03/flo_03_2_main.c
index 5d2d6ffe93..ff00563115 100644
--- a/src/world/area_flo/flo_03/flo_03_2_main.c
+++ b/src/world/area_flo/flo_03/flo_03_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_03.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_03/flo_03_4_foliage.c b/src/world/area_flo/flo_03/flo_03_4_foliage.c
index daee487952..504f42d47c 100644
--- a/src/world/area_flo/flo_03/flo_03_4_foliage.c
+++ b/src/world/area_flo/flo_03/flo_03_4_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o170,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o157,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o170);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o157);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 2, 
diff --git a/src/world/area_flo/flo_07/flo_07_2_main.c b/src/world/area_flo/flo_07/flo_07_2_main.c
index d86155a069..024b7a5768 100644
--- a/src/world/area_flo/flo_07/flo_07_2_main.c
+++ b/src/world/area_flo/flo_07/flo_07_2_main.c
@@ -3,7 +3,7 @@
 #include "world/common/atomic/TexturePan.inc.c"
 #include "world/common/atomic/TexturePan.data.inc.c"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 #include "world/common/todo/SpawnSunEffect.inc.c"
 
diff --git a/src/world/area_flo/flo_07/flo_07_3_npc.c b/src/world/area_flo/flo_07/flo_07_3_npc.c
index 5ac5dabb1b..302ce2b047 100644
--- a/src/world/area_flo/flo_07/flo_07_3_npc.c
+++ b/src/world/area_flo/flo_07/flo_07_3_npc.c
@@ -209,21 +209,8 @@ EvtScript N(EVS_OnHit_CrystalTree) = {
     EVT_END
 };
 
-FoliageModelList N(CrystalTree_LeafModels) = {
-    .count = 3,
-    .models = {
-        MODEL_o6,
-        MODEL_o7,
-        MODEL_o8,
-    }
-};
-
-FoliageModelList N(CrystalTree_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o5,
-    }
-};
+FoliageModelList N(CrystalTree_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o6, MODEL_o7, MODEL_o8);
+FoliageModelList N(CrystalTree_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o5);
 
 ShakeTreeConfig N(ShakeTree_CrystalTree) = {
     .leaves = &N(CrystalTree_LeafModels),
diff --git a/src/world/area_flo/flo_08/flo_08_3_main.c b/src/world/area_flo/flo_08/flo_08_3_main.c
index b8029029bf..395f702294 100644
--- a/src/world/area_flo/flo_08/flo_08_3_main.c
+++ b/src/world/area_flo/flo_08/flo_08_3_main.c
@@ -1,7 +1,7 @@
 #include "flo_08.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_08/flo_08_4_npc.c b/src/world/area_flo/flo_08/flo_08_4_npc.c
index 3dbf2a7213..3f9a410fdd 100644
--- a/src/world/area_flo/flo_08/flo_08_4_npc.c
+++ b/src/world/area_flo/flo_08/flo_08_4_npc.c
@@ -6,8 +6,8 @@
 
 #include "world/common/complete/NormalItemChoice.inc.c"
 
-static s32 N(FlowerGuard_ItemChoiceList)[ITEM_NUM_CONSUMABLES + 1];
-#include "world/common/atomic/ItemChoice_FlowerGuard.inc.c"
+BSS s32 N(FlowerGuard_ItemChoiceList)[ITEM_NUM_CONSUMABLES + 1];
+#include "../common/ItemChoice_FlowerGuard.inc.c"
 
 EvtScript N(EVS_NpcInteract_GateFlower) = {
     EVT_CALL(DisablePlayerInput, TRUE)
diff --git a/src/world/area_flo/flo_08/flo_08_5_foliage.c b/src/world/area_flo/flo_08/flo_08_5_foliage.c
index e82938ec33..1fa1003cf9 100644
--- a/src/world/area_flo/flo_08/flo_08_5_foliage.c
+++ b/src/world/area_flo/flo_08/flo_08_5_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o133,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o132,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o133);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o132);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 2, 
diff --git a/src/world/area_flo/flo_08/flo_08_6_vines.c b/src/world/area_flo/flo_08/flo_08_6_vines.c
index a71a710263..d28c804c44 100644
--- a/src/world/area_flo/flo_08/flo_08_6_vines.c
+++ b/src/world/area_flo/flo_08/flo_08_6_vines.c
@@ -2,10 +2,10 @@
 
 // unused extra import for flower-spawning regions
 #define NAMESPACE flo_08_vines
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 #define NAMESPACE flo_08
 
-#include "world/common/atomic/flo_DroppingVine.inc.c"
+#include "../common/DroppingVine.inc.c"
 
 EvtScript N(EVS_SetupVines) = {
     EVT_DROPPING_VINE(ITEM_NONE, MODEL_o78, MODEL_o79, MODEL_o80, MODEL_o81)
diff --git a/src/world/area_flo/flo_09/flo_09_2_main.c b/src/world/area_flo/flo_09/flo_09_2_main.c
index 0880126ce8..7171df61df 100644
--- a/src/world/area_flo/flo_09/flo_09_2_main.c
+++ b/src/world/area_flo/flo_09/flo_09_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_09.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_09/flo_09_3_vines.c b/src/world/area_flo/flo_09/flo_09_3_vines.c
index 764f3a0e15..63c101a672 100644
--- a/src/world/area_flo/flo_09/flo_09_3_vines.c
+++ b/src/world/area_flo/flo_09/flo_09_3_vines.c
@@ -2,10 +2,10 @@
 
 // unused extra import for flower-spawning regions
 #define NAMESPACE flo_09_vines
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 #define NAMESPACE flo_09
 
-#include "world/common/atomic/flo_DroppingVine.inc.c"
+#include "../common/DroppingVine.inc.c"
 
 EvtScript N(EVS_SetupVines) = {
     EVT_DROPPING_VINE(ITEM_NONE, MODEL_o76, MODEL_o77, MODEL_o78, MODEL_o79)
diff --git a/src/world/area_flo/flo_09/flo_09_4_foliage.c b/src/world/area_flo/flo_09/flo_09_4_foliage.c
index 3d97c45632..1abb66a217 100644
--- a/src/world/area_flo/flo_09/flo_09_4_foliage.c
+++ b/src/world/area_flo/flo_09/flo_09_4_foliage.c
@@ -54,20 +54,8 @@ EvtScript N(Tree3_CallbackScript) = {
     EVT_END
 };
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 2,
-    .models = {
-        MODEL_o11,
-        MODEL_o12,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o10,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o11, MODEL_o12);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o10);
 
 ShakeTreeConfig N(ShakeTree_Tree1) = {
     .leaves = &N(Tree1_LeafModels),
@@ -80,20 +68,8 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 2,
-    .models = {
-        MODEL_o4,
-        MODEL_o5,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o3,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o4, MODEL_o5);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o3);
 
 ShakeTreeConfig N(ShakeTree_Tree2) = {
     .leaves = &N(Tree2_LeafModels),
@@ -106,20 +82,8 @@ BombTrigger N(BombPos_Tree2) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree3_LeafModels) = {
-    .count = 2,
-    .models = {
-        MODEL_o14,
-        MODEL_o15,
-    }
-};
-
-FoliageModelList N(Tree3_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o13,
-    }
-};
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o14, MODEL_o15);
+FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o13);
 
 ShakeTreeConfig N(ShakeTree_Tree3) = {
     .leaves = &N(Tree3_LeafModels),
diff --git a/src/world/area_flo/flo_10/flo_10_3_main.c b/src/world/area_flo/flo_10/flo_10_3_main.c
index 2d7cfd75a6..6604f05961 100644
--- a/src/world/area_flo/flo_10/flo_10_3_main.c
+++ b/src/world/area_flo/flo_10/flo_10_3_main.c
@@ -1,7 +1,7 @@
 #include "flo_10.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_10/flo_10_7_foliage.c b/src/world/area_flo/flo_10/flo_10_7_foliage.c
index 2c3a427d3a..845dfdc565 100644
--- a/src/world/area_flo/flo_10/flo_10_7_foliage.c
+++ b/src/world/area_flo/flo_10/flo_10_7_foliage.c
@@ -2,21 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 3,
-    .models = {
-        MODEL_o47,
-        MODEL_o48,
-        MODEL_o49,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o88,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o47, MODEL_o48, MODEL_o49);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o88);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1, 
diff --git a/src/world/area_flo/flo_11/flo_11_2_main.c b/src/world/area_flo/flo_11/flo_11_2_main.c
index e5200c3210..2c2183d6a4 100644
--- a/src/world/area_flo/flo_11/flo_11_2_main.c
+++ b/src/world/area_flo/flo_11/flo_11_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_11.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 #include "world/common/entity/Pipe.inc.c"
 #include "world/common/entity/Pipe.data.inc.c"
diff --git a/src/world/area_flo/flo_12/flo_12_2_main.c b/src/world/area_flo/flo_12/flo_12_2_main.c
index f04ac2e97b..4b1dffe5ed 100644
--- a/src/world/area_flo/flo_12/flo_12_2_main.c
+++ b/src/world/area_flo/flo_12/flo_12_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_12.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_13/flo_13_3_main.c b/src/world/area_flo/flo_13/flo_13_3_main.c
index 5b636eb3a2..a7ee2277b2 100644
--- a/src/world/area_flo/flo_13/flo_13_3_main.c
+++ b/src/world/area_flo/flo_13/flo_13_3_main.c
@@ -1,6 +1,6 @@
 #include "flo_13.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/area_flo/flo_14/flo_14_3_bubbles.c
index 189ef3bf6c..6cd26bc425 100644
--- a/src/world/area_flo/flo_14/flo_14_3_bubbles.c
+++ b/src/world/area_flo/flo_14/flo_14_3_bubbles.c
@@ -2,8 +2,8 @@
 #include "effects.h"
 #include "model.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
-#include "world/common/atomic/flo_DroppingVine.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
+#include "../common/DroppingVine.inc.c"
 
 s32 N(BlowingBubbles) = FALSE;
 
diff --git a/src/world/area_flo/flo_14/flo_14_6_logs.c b/src/world/area_flo/flo_14/flo_14_6_logs.c
index bc712337ac..3de9e5a154 100644
--- a/src/world/area_flo/flo_14/flo_14_6_logs.c
+++ b/src/world/area_flo/flo_14/flo_14_6_logs.c
@@ -1,6 +1,6 @@
 #include "flo_14.h"
 
-#include "world/common/atomic/flo_LogBridge.inc.c"
+#include "../common/LogBridge.inc.c"
 
 EvtScript N(EVS_SetupLogBridges) = {
     EVT_MAKE_LOG_BRIDGE(COLLIDER_o162, COLLIDER_o166, MODEL_o15, MODEL_o16, MV_RotAngle_Log_01, MV_RotVelocity_Log_01)
diff --git a/src/world/area_flo/flo_16/flo_16_3_vines.c b/src/world/area_flo/flo_16/flo_16_3_vines.c
index 27bc068d4a..3d60cc9bf1 100644
--- a/src/world/area_flo/flo_16/flo_16_3_vines.c
+++ b/src/world/area_flo/flo_16/flo_16_3_vines.c
@@ -1,8 +1,8 @@
 #include "flo_16.h"
 #include "entity.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
-#include "world/common/atomic/flo_DroppingVine.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
+#include "../common/DroppingVine.inc.c"
 
 EvtScript N(EVS_SetupVines) = {
     EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o214, SURFACE_TYPE_FLOWERS)
diff --git a/src/world/area_flo/flo_16/flo_16_4_entity.c b/src/world/area_flo/flo_16/flo_16_4_entity.c
index bec720effa..1105e453ed 100644
--- a/src/world/area_flo/flo_16/flo_16_4_entity.c
+++ b/src/world/area_flo/flo_16/flo_16_4_entity.c
@@ -32,7 +32,7 @@ EvtScript N(EVS_UseSpring) = {
     EVT_END
 };
 
-API_CALLABLE(N(UnkFunc44)) {
+API_CALLABLE(N(IsPlayerPounding)) {
     script->varTable[0] = FALSE;
     if (gPlayerStatus.actionState == ACTION_STATE_SPIN_POUND || gPlayerStatus.actionState == ACTION_STATE_TORNADO_POUND) {
         script->varTable[0] = TRUE;
@@ -42,7 +42,7 @@ API_CALLABLE(N(UnkFunc44)) {
 
 EvtScript N(EVS_MonitorCeilingPound) = {
     EVT_IF_EQ(AF_FLO16_FoundHiddenStarPiece, FALSE)
-        EVT_CALL(N(UnkFunc44))
+        EVT_CALL(N(IsPlayerPounding))
         EVT_IF_EQ(LVar0, 0)
             EVT_RETURN
         EVT_END_IF
diff --git a/src/world/area_flo/flo_17/flo_17_2_main.c b/src/world/area_flo/flo_17/flo_17_2_main.c
index c93bd69cd7..bde30aa15b 100644
--- a/src/world/area_flo/flo_17/flo_17_2_main.c
+++ b/src/world/area_flo/flo_17/flo_17_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_17.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_17/flo_17_3_logs.c b/src/world/area_flo/flo_17/flo_17_3_logs.c
index 7d6d059567..34aec80f5c 100644
--- a/src/world/area_flo/flo_17/flo_17_3_logs.c
+++ b/src/world/area_flo/flo_17/flo_17_3_logs.c
@@ -1,6 +1,6 @@
 #include "flo_17.h"
 
-#include "world/common/atomic/flo_LogBridge.inc.c"
+#include "../common/LogBridge.inc.c"
 
 EvtScript N(EVS_SetupLogBridges) = {
     EVT_MAKE_LOG_BRIDGE(COLLIDER_o22, COLLIDER_o138, MODEL_o19, MODEL_o20, MV_RotAngle_Log_01, MV_RotVelocity_Log_01)
diff --git a/src/world/area_flo/flo_22/flo_22_5_foliage.c b/src/world/area_flo/flo_22/flo_22_5_foliage.c
index cb155a803c..c5ad3bc2df 100644
--- a/src/world/area_flo/flo_22/flo_22_5_foliage.c
+++ b/src/world/area_flo/flo_22/flo_22_5_foliage.c
@@ -2,14 +2,7 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 3,
-    .models = {
-        MODEL_o45,
-        MODEL_o46,
-        MODEL_o48,
-    }
-};
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o45, MODEL_o46, MODEL_o48);
 
 ShakeTreeConfig N(ShakeTree_Tree1) = {
     .trunk = &N(Tree1_TrunkModels),
@@ -20,14 +13,7 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 3,
-    .models = {
-        MODEL_o52,
-        MODEL_o53,
-        MODEL_o55,
-    }
-};
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o52, MODEL_o53, MODEL_o55);
 
 ShakeTreeConfig N(ShakeTree_Tree2) = {
     .trunk = &N(Tree2_TrunkModels),
diff --git a/src/world/area_flo/flo_23/flo_23_2_main.c b/src/world/area_flo/flo_23/flo_23_2_main.c
index 25badced21..b42c9d6294 100644
--- a/src/world/area_flo/flo_23/flo_23_2_main.c
+++ b/src/world/area_flo/flo_23/flo_23_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_23.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_23/flo_23_3_npc.c b/src/world/area_flo/flo_23/flo_23_3_npc.c
index 03fa9a9a7e..7847c6918d 100644
--- a/src/world/area_flo/flo_23/flo_23_3_npc.c
+++ b/src/world/area_flo/flo_23/flo_23_3_npc.c
@@ -6,8 +6,8 @@
 
 #include "world/common/enemy/complete/Spiny.inc.c"
 
-static s32 N(FlowerGuard_ItemChoiceList)[ITEM_NUM_CONSUMABLES + 1];
-#include "world/common/atomic/ItemChoice_FlowerGuard.inc.c"
+BSS s32 N(FlowerGuard_ItemChoiceList)[ITEM_NUM_CONSUMABLES + 1];
+#include "../common/ItemChoice_FlowerGuard.inc.c"
 
 EvtScript N(EVS_NpcInteract_GateFlower) = {
     EVT_CALL(DisablePlayerInput, TRUE)
diff --git a/src/world/area_flo/flo_24/flo_24_2_main.c b/src/world/area_flo/flo_24/flo_24_2_main.c
index be8832e799..1d20c9bfbc 100644
--- a/src/world/area_flo/flo_24/flo_24_2_main.c
+++ b/src/world/area_flo/flo_24/flo_24_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_24.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_24/flo_24_3_foliage.c b/src/world/area_flo/flo_24/flo_24_3_foliage.c
index 57e0cc5984..608fb2828e 100644
--- a/src/world/area_flo/flo_24/flo_24_3_foliage.c
+++ b/src/world/area_flo/flo_24/flo_24_3_foliage.c
@@ -2,24 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 6,
-    .models = {
-        MODEL_o125,
-        MODEL_o126,
-        MODEL_o127,
-        MODEL_o128,
-        MODEL_o129,
-        MODEL_o130,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o124,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o125, MODEL_o126, MODEL_o127, MODEL_o128, MODEL_o129, MODEL_o130);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o124);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 2, 
diff --git a/src/world/area_flo/flo_25/flo_25_2_main.c b/src/world/area_flo/flo_25/flo_25_2_main.c
index 8930ca15d6..92ab7a113a 100644
--- a/src/world/area_flo/flo_25/flo_25_2_main.c
+++ b/src/world/area_flo/flo_25/flo_25_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_25.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_25/flo_25_3_npc.c b/src/world/area_flo/flo_25/flo_25_3_npc.c
index 5f3b7c51f9..c748e82647 100644
--- a/src/world/area_flo/flo_25/flo_25_3_npc.c
+++ b/src/world/area_flo/flo_25/flo_25_3_npc.c
@@ -6,8 +6,8 @@
 
 #include "world/common/complete/NormalItemChoice.inc.c"
 
-static s32 N(FlowerGuard_ItemChoiceList)[ITEM_NUM_CONSUMABLES + 1];
-#include "world/common/atomic/ItemChoice_FlowerGuard.inc.c"
+BSS s32 N(FlowerGuard_ItemChoiceList)[ITEM_NUM_CONSUMABLES + 1];
+#include "../common/ItemChoice_FlowerGuard.inc.c"
 
 EvtScript N(EVS_NpcInteract_GateFlower) = {
     EVT_CALL(DisablePlayerInput, TRUE)
diff --git a/src/world/area_flo/flo_25/flo_25_5_foliage.c b/src/world/area_flo/flo_25/flo_25_5_foliage.c
index ee33abf9c9..52be9c3793 100644
--- a/src/world/area_flo/flo_25/flo_25_5_foliage.c
+++ b/src/world/area_flo/flo_25/flo_25_5_foliage.c
@@ -2,21 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 3,
-    .models = {
-        MODEL_o43,
-        MODEL_o44,
-        MODEL_o45,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o42,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o43, MODEL_o44, MODEL_o45);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o42);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 2, 
diff --git a/src/world/area_flo/flo_25/flo_25_6_vine.c b/src/world/area_flo/flo_25/flo_25_6_vine.c
index ebed1f933d..8602872037 100644
--- a/src/world/area_flo/flo_25/flo_25_6_vine.c
+++ b/src/world/area_flo/flo_25/flo_25_6_vine.c
@@ -2,10 +2,10 @@
 
 // unused extra import for flower-spawning regions
 #define NAMESPACE flo_25_vines
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "../common/FlowerSpawnRegion.inc.c"
 #define NAMESPACE flo_25
 
-#include "world/common/atomic/flo_DroppingVine.inc.c"
+#include "../common/DroppingVine.inc.c"
 
 EvtScript N(EVS_SetupVines) = {
     EVT_DROPPING_VINE(ITEM_NONE, MODEL_o111, MODEL_o112, MODEL_o113, MODEL_o114)
diff --git a/src/world/area_isk/StoneChompFX.inc.c b/src/world/area_isk/StoneChompFX.inc.c
deleted file mode 100644
index 970c6da308..0000000000
--- a/src/world/area_isk/StoneChompFX.inc.c
+++ /dev/null
@@ -1,122 +0,0 @@
-#include "common.h"
-#include "sprite/npc/StoneChomp.h"
-
-API_CALLABLE(N(StoneChompFXA)) {
-    NpcBlueprint bp;
-    NpcBlueprint* bpPtr = &bp;
-    NpcChompBlur* blurData;
-    Npc* npc;
-    Npc* newNpc;
-    s32 i;
-
-    npc = get_npc_safe(script->owner2.npcID);
-    blurData = heap_malloc(8 * sizeof(*blurData));
-    npc->blur.chomp = blurData;
-
-    bp.flags = NPC_FLAG_8000 | NPC_FLAG_100 | NPC_FLAG_40
-        | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_2;
-    bp.initialAnim = ANIM_StoneChomp_Anim02;
-    bp.onUpdate = NULL;
-    bp.onRender = NULL;
-
-    for (i = 0; i < 8; i++, blurData++) {
-        blurData->npc = newNpc = get_npc_by_index(_create_npc_basic(bpPtr));
-        newNpc->pos.x = npc->pos.x;
-        newNpc->pos.y = npc->pos.y;
-        newNpc->pos.z = npc->pos.z;
-        newNpc->yaw = npc->yaw;
-        newNpc->verticalRenderOffset = 3;
-        disable_npc_shadow(newNpc);
-        blurData->offset.x = 0.0f;
-        blurData->offset.y = 0.0f;
-        blurData->offset.z = 0.0f;
-    }
-    return ApiStatus_DONE2;
-}
-
-API_CALLABLE(N(StoneChompFXB)) {
-    NpcChompBlur* blurData;
-    Npc* ownerNpc;
-    Npc* childNpc;
-    f32 posX, posY, posZ;
-    f32 nextX, nextY, nextZ;
-    f32 invDist;
-    f32 floorY;
-    s32 i;
-
-    floorY = (f32) script->owner1.enemy->varTable[0];
-    ownerNpc = get_npc_safe(script->owner2.npcID);
-    blurData = ownerNpc->blur.chomp;
-    posX = ownerNpc->pos.x;
-    posY = ownerNpc->pos.y + (ownerNpc->collisionHeight * 0.2f);
-    posZ = ownerNpc->pos.z;
-    add_vec2D_polar(&posX, &posZ, ownerNpc->collisionRadius * 0.3f, clamp_angle(ownerNpc->renderYaw + 180.0f));
-    
-    if (ownerNpc->flags & NPC_FLAG_2) {
-        for (i = 0; i < 8; i++, blurData++) {
-            childNpc = blurData->npc;
-            childNpc->pos.x = posX;
-            childNpc->pos.y = posY;
-            childNpc->pos.z = posZ;
-        }
-        return ApiStatus_BLOCK;
-    }
-    
-    for (i = 0; i < 8; i++, blurData++) {
-        childNpc = blurData->npc;
-        if (dist3D(childNpc->pos.x, childNpc->pos.y, childNpc->pos.z, posX, posY, posZ) >= 10.0) {
-            invDist = 10.0 / dist3D(
-                ((childNpc->pos.x - posX) * 0.8f) + posX, childNpc->pos.y, ((childNpc->pos.z - posZ) * 0.8f) + posZ,
-                posX, posY,posZ);
-
-            nextX = posX = ((childNpc->pos.x - posX) * 0.8f * invDist) + posX;
-            nextY = posY = ((childNpc->pos.y - posY) * invDist) + posY;
-            nextZ = posZ = ((childNpc->pos.z - posZ) * 0.8f * invDist) + posZ;
-
-            blurData->offset.x = (nextX - childNpc->pos.x) * 0.7f;
-            blurData->offset.y = (nextY - childNpc->pos.y) * 0.7f;
-            blurData->offset.z = (nextZ - childNpc->pos.z) * 0.7f;
-            
-            childNpc->pos.x = nextX;
-            childNpc->pos.y = nextY;
-            childNpc->pos.z = nextZ;
-            
-            if (blurData->offset.y > 10.0f) {
-                blurData->offset.y = 10.0f;
-            }
-        } else {
-            blurData->offset.x = blurData->offset.x * 0.9f;
-            blurData->offset.z = blurData->offset.z * 0.9f;
-            childNpc->pos.x += blurData->offset.x;
-            childNpc->pos.z += blurData->offset.z;
-        }
-        
-        blurData->offset.y -= 1.0f;
-        if (blurData->offset.y < -10.0f) {
-            blurData->offset.y = -10.0f;
-        }
-        childNpc->pos.y += blurData->offset.y;
-        if (childNpc->pos.y <= floorY) {
-            childNpc->pos.y = floorY;
-            blurData->offset.y = -blurData->offset.y * 0.5;
-        }
-
-        posX = childNpc->pos.x;
-        posY = childNpc->pos.y;
-        posZ = childNpc->pos.z;
-        childNpc->flags = ownerNpc->flags;
-    }
-
-    return ApiStatus_BLOCK;
-}
-
-API_CALLABLE(N(StoneChompFXC)) {
-    NpcChompBlur* blurData = get_npc_safe(script->owner2.npcID)->blur.chomp;
-    s32 i;
-    
-    for (i = 0; i < 8; i++, blurData++) {
-        free_npc(blurData->npc);
-    }
-
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/area_iwa/iwa_01/iwa_01_1_main.c b/src/world/area_iwa/iwa_01/iwa_01_1_main.c
index b936f6bdd5..27041a6756 100644
--- a/src/world/area_iwa/iwa_01/iwa_01_1_main.c
+++ b/src/world/area_iwa/iwa_01/iwa_01_1_main.c
@@ -74,4 +74,4 @@ EvtScript N(EVS_Main) = {
     EVT_END
 };
 
-MAP_RODATA_PAD(1, pad)
+MAP_RODATA_PAD(1, pad);
diff --git a/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c b/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c
index 3578fbd19b..6d11b0a049 100644
--- a/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c
+++ b/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c
@@ -2,12 +2,7 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Bush1_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_k4,
-    }
-};
+FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_k4);
 
 FoliageDropList N(Bush1_Drops) = {
     .count = 1, 
@@ -35,12 +30,7 @@ SearchBushConfig N(SearchBush_Bush1) = {
     .vectors = &N(Bush1_Effects),
 };
 
-FoliageModelList N(Bush2_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_k5,
-    }
-};
+FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_k5);
 
 FoliageDropList N(Bush2_Drops) = {
     .count = 1, 
@@ -68,12 +58,7 @@ SearchBushConfig N(SearchBush_Bush2) = {
     .vectors = &N(Bush2_Effects),
 };
 
-FoliageModelList N(Bush3_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_k6,
-    }
-};
+FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_k6);
 
 FoliageDropList N(Bush3_Drops) = {
     .count = 1, 
@@ -101,12 +86,7 @@ SearchBushConfig N(SearchBush_Bush3) = {
     .vectors = &N(Bush3_Effects),
 };
 
-FoliageModelList N(Bush4_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_k7,
-    }
-};
+FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_k7);
 
 FoliageDropList N(Bush4_Drops) = {
     .count = 1, 
diff --git a/src/world/area_jan/jan_00/jan_00.h b/src/world/area_jan/jan_00/jan_00.h
index 6fe8976a58..d4e63aca2c 100644
--- a/src/world/area_jan/jan_00/jan_00.h
+++ b/src/world/area_jan/jan_00/jan_00.h
@@ -15,7 +15,7 @@
 #include "sprite/npc/JrTroopa.h"
 
 enum {
-    NPC_Kolorado_01             = 0,
+    NPC_Whale                   = 0,
     NPC_Kolorado_02             = 1,
     NPC_JrTroopa                = 2,
     NPC_HeartPlant_01           = 3,
diff --git a/src/world/area_jan/jan_00/jan_00_2_npc.c b/src/world/area_jan/jan_00/jan_00_2_npc.c
index b16fc2f5bd..cdce391a8b 100644
--- a/src/world/area_jan/jan_00/jan_00_2_npc.c
+++ b/src/world/area_jan/jan_00/jan_00_2_npc.c
@@ -69,7 +69,7 @@ NpcSettings N(NpcSettings_HeartPlant_01) = {
     .onInteract = &N(EVS_NpcInteract_HeartPlant_01),
 };
 
-#include "world/common/atomic/LetterChoice.inc.c"
+#include "world/common/complete/LetterDelivery.inc.c"
 
 s32 N(LetterList)[] = {
     ITEM_LETTER25,
@@ -114,7 +114,7 @@ API_CALLABLE(func_80240B4C_B2108C) {
     outX = *args++;
     outY = *args++;
     outZ = *args++;
-    npc = get_npc_safe(0);
+    npc = get_npc_safe(NPC_Whale);
 
     switch (temp_s1) {
         case 0:
@@ -144,7 +144,7 @@ API_CALLABLE(func_80240B4C_B2108C) {
 
 ApiStatus func_80240CF8_B21238(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    Npc* npc0 = get_npc_safe(0);
+    Npc* npc0 = get_npc_safe(NPC_Whale);
     Npc* npc1;
     Npc* partner;
     f32 theta;
@@ -196,7 +196,7 @@ ApiStatus func_80240CF8_B21238(Evt* script, s32 isInitialCall) {
             partner->flags |= NPC_FLAG_DIRTY_SHADOW;
             break;
         case 2:
-            npc1 = get_npc_safe(1);
+            npc1 = get_npc_safe(NPC_Kolorado_02);
             npc1->pos.x = x;
             npc1->pos.y = y;
             npc1->pos.z = z;
@@ -211,7 +211,7 @@ ApiStatus func_80240CF8_B21238(Evt* script, s32 isInitialCall) {
 
 ApiStatus func_80240F14_B21454(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    Npc* npc = get_npc_safe(0);
+    Npc* npc = get_npc_safe(NPC_Whale);
 
     if (isInitialCall) {
         script->functionTemp[0] = evt_get_variable(script, *args++);
@@ -273,7 +273,7 @@ ApiStatus func_80240F14_B21454(Evt* script, s32 isInitialCall) {
 }
 
 API_CALLABLE(func_80241134_B21674) {
-    Npc* npc = get_npc_safe(2);
+    Npc* npc = get_npc_safe(NPC_JrTroopa);
     f32 x = npc->pos.x;
     f32 y = npc->pos.y;
     f32 z = npc->pos.z - 20.0f;
@@ -291,7 +291,7 @@ EvtScript N(D_80242D90_B232D0) = {
 };
 
 EvtScript N(D_80242DB0_B232F0) = {
-    EVT_CALL(GetNpcPos, NPC_Kolorado_01, LVar0, LVar1, LVar2)
+    EVT_CALL(GetNpcPos, NPC_Whale, LVar0, LVar1, LVar2)
     EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
@@ -306,12 +306,12 @@ EvtScript N(D_80242DB0_B232F0) = {
     EVT_LABEL(0)
     EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
     EVT_IF_GT(LVar0, -300)
-        EVT_CALL(GetNpcPos, NPC_Kolorado_01, LVar0, LVar1, LVar2)
+        EVT_CALL(GetNpcPos, NPC_Whale, LVar0, LVar1, LVar2)
         EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_ELSE
         EVT_SET(LVar3, LVar0)
         EVT_SUB(LVar3, -300)
-        EVT_CALL(GetNpcPos, NPC_Kolorado_01, LVar0, LVar1, LVar2)
+        EVT_CALL(GetNpcPos, NPC_Whale, LVar0, LVar1, LVar2)
         EVT_SUB(LVar0, LVar3)
         EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
     EVT_END_IF
@@ -388,11 +388,11 @@ EvtScript N(D_80242FA8_B234E8) = {
     EVT_END_IF
     EVT_CALL(NpcMoveTo, NPC_PARTNER, 230, 20, 10)
     EVT_CALL(SetNpcAnimation, NPC_PARTNER, 0x00000106)
-    EVT_CALL(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_TalkSad)
-    EVT_CALL(SetNpcJumpscale, NPC_Kolorado_01, 0)
-    EVT_CALL(NpcJump0, NPC_Kolorado_01, 158, -10, -38, 20)
+    EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_TalkSad)
+    EVT_CALL(SetNpcJumpscale, NPC_Whale, 0)
+    EVT_CALL(NpcJump0, NPC_Whale, 158, -10, -38, 20)
     EVT_CALL(InterpPlayerYaw, 270, 0)
-    EVT_CALL(SpeakToPlayer, NPC_Kolorado_01, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_CH5_0000)
+    EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_CH5_0000)
     EVT_CALL(SetMusicTrack, 0, SONG_YOSHIS_VILLAGE, 0, 8)
     EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_LAVA_LAVA_ISLAND)
         EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, 300, 15, EVT_FLOAT(-6.0))
@@ -412,7 +412,7 @@ EvtScript N(D_80242FA8_B234E8) = {
             EVT_CALL(NpcFacePlayer, NPC_Kolorado_02, 4)
         EVT_END_THREAD
         EVT_CALL(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_Panic, ANIM_Kolorado_Yell, 5, MSG_CH5_0002)
-        EVT_CALL(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_Idle)
+        EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Idle)
         EVT_CALL(SetNpcSpeed, NPC_Kolorado_02, EVT_FLOAT(6.0))
         EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Walk)
         EVT_CALL(NpcMoveTo, NPC_Kolorado_02, 330, 190, 0)
@@ -433,7 +433,7 @@ EvtScript N(D_80242FA8_B234E8) = {
 
 EvtScript N(D_802437C4_B23D04) = {
     EVT_LABEL(0)
-    EVT_CALL(GetNpcYaw, NPC_Kolorado_01, LVar0)
+    EVT_CALL(GetNpcYaw, NPC_Whale, LVar0)
     EVT_CALL(InterpPlayerYaw, LVar0, 0)
     EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVar0, 0)
     EVT_WAIT(1)
@@ -463,10 +463,10 @@ Vec3f N(D_802438E4_B23E24)[] = {
 EvtScript N(EVS_NpcInteract_Kolorado_01) = {
     EVT_CALL(DisablePlayerPhysics, TRUE)
     EVT_CALL(InterpPlayerYaw, 270, 0)
-    EVT_CALL(SpeakToPlayer, NPC_Kolorado_01, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_CH5_0003)
+    EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_CH5_0003)
     EVT_CALL(ShowChoice, MSG_Choice_0010)
     EVT_IF_EQ(LVar0, 1)
-        EVT_CALL(ContinueSpeech, NPC_Kolorado_01, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_CH5_0005)
+        EVT_CALL(ContinueSpeech, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_CH5_0005)
         EVT_CALL(DisablePlayerPhysics, FALSE)
         EVT_RETURN
     EVT_END_IF
@@ -700,7 +700,7 @@ EvtScript N(EVS_NpcInit_JrTroopa) = {
 
 StaticNpc N(D_8024488C_B24DCC)[] = {
     {
-        .id = NPC_Kolorado_01,
+        .id = NPC_Whale,
         .settings = &N(NpcSettings_Kolorado_01),
         .pos = { NPC_DISPOSE_LOCATION },
         .yaw = 90,
diff --git a/src/world/area_jan/jan_00/jan_00_4_whale.c b/src/world/area_jan/jan_00/jan_00_4_whale.c
index 474c13249e..aca969057d 100644
--- a/src/world/area_jan/jan_00/jan_00_4_whale.c
+++ b/src/world/area_jan/jan_00/jan_00_4_whale.c
@@ -239,7 +239,7 @@ EvtScript N(EVS_802467AC) = {
         EVT_CALL(TranslateModel, MODEL_o167, LVar0, LVar1, LVar2)
         EVT_CALL(TranslateModel, MODEL_o168, LVar0, LVar1, LVar2)
         EVT_CALL(TranslateGroup, MODEL_dou, LVar0, LVar1, LVar2)
-        EVT_CALL(GetNpcYaw, NPC_Kolorado_01, LVar0)
+        EVT_CALL(GetNpcYaw, NPC_Whale, LVar0)
         EVT_MULF(LVar0, -1)
         EVT_ADDF(LVar0, -90)
         EVT_CALL(TranslateModel, MODEL_bero, -100, 0, 0)
@@ -275,7 +275,7 @@ EvtScript N(EVS_802467AC) = {
         EVT_CALL(TranslateModel, MODEL_o167, 100, 0, 0)
         EVT_CALL(TranslateModel, MODEL_o168, 100, 0, 0)
         EVT_CALL(TranslateGroup, MODEL_dou, 100, 0, 0)
-        EVT_CALL(GetNpcAnimation, NPC_Kolorado_01, LVar0)
+        EVT_CALL(GetNpcAnimation, NPC_Whale, LVar0)
         EVT_IF_NE(LVar0, LVarB)
             EVT_SET(LVarB, LVar0)
             EVT_SET(LVarC, 0)
@@ -326,7 +326,7 @@ EvtScript N(EVS_802467AC) = {
 };
 
 EvtScript N(EVS_80247040) = {
-    EVT_CALL(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_IdleSad)
+    EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_IdleSad)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/world/area_jan/jan_00/jan_00_5_foliage.c b/src/world/area_jan/jan_00/jan_00_5_foliage.c
index eaaee95953..3cace04600 100644
--- a/src/world/area_jan/jan_00/jan_00_5_foliage.c
+++ b/src/world/area_jan/jan_00/jan_00_5_foliage.c
@@ -3,20 +3,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 2,
-    .models = {
-        MODEL_o241,
-        MODEL_o242,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o240,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o241, MODEL_o242);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o240);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1, 
diff --git a/src/world/area_kmr/kmr_02/kmr_02_8_foliage.c b/src/world/area_kmr/kmr_02/kmr_02_8_foliage.c
index a2fbe844cf..a69806bed5 100644
--- a/src/world/area_kmr/kmr_02/kmr_02_8_foliage.c
+++ b/src/world/area_kmr/kmr_02/kmr_02_8_foliage.c
@@ -58,7 +58,7 @@ SearchBushConfig N(SearchBush_Bush3) = {
     .vectors = &N(Bush3_Effects),
 };
 
-FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_midori);
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_midori);
 FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_kiki);
 
 FoliageDropList N(Tree1_Drops) = {
diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c
index 635da0a4b6..72e957dfcb 100644
--- a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c
+++ b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c
@@ -5,7 +5,7 @@
 #include "world/common/todo/CheckPartnerFlags1000.inc.c"
 
 API_CALLABLE(N(func_802401B0_8C8140)) {
-    Npc* npc = get_npc_unsafe(0);
+    Npc* npc = get_npc_unsafe(NPC_Goompa);
 
     script->varTable[1] = get_xz_dist_to_player(npc->pos.x, npc->pos.z) / npc->moveSpeed * 0.8f;
     return ApiStatus_DONE2;
diff --git a/src/world/area_kmr/kmr_03/kmr_03_5_foliage.c b/src/world/area_kmr/kmr_03/kmr_03_5_foliage.c
index ff011f77b8..558d8e9316 100644
--- a/src/world/area_kmr/kmr_03/kmr_03_5_foliage.c
+++ b/src/world/area_kmr/kmr_03/kmr_03_5_foliage.c
@@ -2,12 +2,7 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Bush1_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_km,
-    }
-};
+FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_km);
 
 FoliageVectorList N(Bush1_Effects) = {
     .count = 1,
@@ -21,19 +16,8 @@ SearchBushConfig N(SearchBush_Bush1) = {
     .vectors = &N(Bush1_Effects),
 };
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_ue,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_sita,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_ue);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_sita);
 
 FoliageVectorList N(Tree1_Effects) = {
     .count = 2,
diff --git a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c
index 6338a135b8..db685d4685 100644
--- a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c
+++ b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c
@@ -131,12 +131,7 @@ EvtScript N(Bush8_CallbackScript) = {
     EVT_END
 };
 
-FoliageModelList N(Bush1_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o181,
-    }
-};
+FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o181);
 
 FoliageDropList N(Bush1_Drops) = {
     .count = 1, 
@@ -164,12 +159,7 @@ SearchBushConfig N(SearchBush_Bush1) = {
     .vectors = &N(Bush1_Effects),
 };
 
-FoliageModelList N(Bush2_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o212,
-    }
-};
+FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o212);
 
 FoliageDropList N(Bush2_Drops) = {
     .count = 1, 
@@ -197,12 +187,7 @@ SearchBushConfig N(SearchBush_Bush2) = {
     .vectors = &N(Bush2_Effects),
 };
 
-FoliageModelList N(Bush3_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o235,
-    }
-};
+FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o235);
 
 FoliageDropList N(Bush3_Drops) = {
     .count = 2, 
@@ -237,12 +222,7 @@ SearchBushConfig N(SearchBush_Bush3) = {
     .vectors = &N(Bush3_Effects),
 };
 
-FoliageModelList N(Bush4_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o182,
-    }
-};
+FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o182);
 
 FoliageDropList N(Bush4_Drops) = {
     .count = 1, 
@@ -270,12 +250,7 @@ SearchBushConfig N(SearchBush_Bush4) = {
     .vectors = &N(Bush4_Effects),
 };
 
-FoliageModelList N(Bush5_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o205,
-    }
-};
+FoliageModelList N(Bush5_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o205);
 
 FoliageDropList N(Bush5_Drops) = {
     .count = 1, 
@@ -303,12 +278,7 @@ SearchBushConfig N(SearchBush_Bush5) = {
     .vectors = &N(Bush5_Effects),
 };
 
-FoliageModelList N(Bush8_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o213,
-    }
-};
+FoliageModelList N(Bush8_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o213);
 
 FoliageVectorList N(Bush8_Effects) = {
     .count = 1,
@@ -329,12 +299,7 @@ SearchBushConfig N(SearchBush_Bush8) = {
     .callback = &N(Bush8_CallbackScript),
 };
 
-FoliageModelList N(Bush6_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o213,
-    }
-};
+FoliageModelList N(Bush6_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o213);
 
 FoliageVectorList N(Bush6_Effects) = {
     .count = 1,
@@ -348,12 +313,7 @@ SearchBushConfig N(SearchBush_Bush6) = {
     .vectors = &N(Bush6_Effects),
 };
 
-FoliageModelList N(Bush9_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o239,
-    }
-};
+FoliageModelList N(Bush9_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o239);
 
 FoliageVectorList N(Bush9_Effects) = {
     .count = 1,
@@ -367,19 +327,8 @@ SearchBushConfig N(SearchBush_Bush9) = {
     .vectors = &N(Bush9_Effects),
 };
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o237,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o236,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o237);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o236);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1, 
@@ -413,19 +362,8 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o194,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o193,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o194);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o193);
 
 FoliageDropList N(Tree2_Drops) = {
     .count = 1, 
@@ -490,19 +428,8 @@ EvtScript N(Tree3_CallbackScript) = {
     EVT_END
 };
 
-FoliageModelList N(Tree3_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o192,
-    }
-};
-
-FoliageModelList N(Tree3_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o191,
-    }
-};
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o192);
+FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o191);
 
 FoliageVectorList N(Tree3_Effects) = {
     .count = 2,
diff --git a/src/world/area_kmr/kmr_05/kmr_05_5_foliage.c b/src/world/area_kmr/kmr_05/kmr_05_5_foliage.c
index 192145060f..c3a4f27a37 100644
--- a/src/world/area_kmr/kmr_05/kmr_05_5_foliage.c
+++ b/src/world/area_kmr/kmr_05/kmr_05_5_foliage.c
@@ -22,23 +22,8 @@ EvtScript N(EVS_80243234) = {
     EVT_END
 };
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 3,
-    .models = {
-        MODEL_ha2_1,
-        MODEL_ha2_2,
-        MODEL_ha2_3,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 3,
-    .models = {
-        MODEL_o1065,
-        MODEL_miki2_1,
-        MODEL_miki2_2,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_ha2_1, MODEL_ha2_2, MODEL_ha2_3);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o1065, MODEL_miki2_1, MODEL_miki2_2);
 
 FoliageVectorList N(Tree1_Effects) = {
     .count = 2,
diff --git a/src/world/area_kmr/kmr_10/kmr_10_5_foliage.c b/src/world/area_kmr/kmr_10/kmr_10_5_foliage.c
index 764b2029da..612f4c3d8b 100644
--- a/src/world/area_kmr/kmr_10/kmr_10_5_foliage.c
+++ b/src/world/area_kmr/kmr_10/kmr_10_5_foliage.c
@@ -2,12 +2,7 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Bush1_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o1056,
-    }
-};
+FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o1056);
 
 FoliageVectorList N(Bush1_Effects) = {
     .count = 1,
@@ -21,23 +16,8 @@ SearchBushConfig N(SearchBush_Bush1) = {
     .vectors = &N(Bush1_Effects),
 };
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 3,
-    .models = {
-        MODEL_ha1_1,
-        MODEL_ha1_2,
-        MODEL_ha1_3,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 3,
-    .models = {
-        MODEL_o1066,
-        MODEL_miki1_1,
-        MODEL_miki1_2,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_ha1_1, MODEL_ha1_2, MODEL_ha1_3);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o1066, MODEL_miki1_1, MODEL_miki1_2);
 
 FoliageVectorList N(Tree1_Effects) = {
     .count = 2,
diff --git a/src/world/area_kmr/kmr_11/kmr_11_2_main.c b/src/world/area_kmr/kmr_11/kmr_11_2_main.c
index e5b23b6388..c987530e50 100644
--- a/src/world/area_kmr/kmr_11/kmr_11_2_main.c
+++ b/src/world/area_kmr/kmr_11/kmr_11_2_main.c
@@ -68,7 +68,7 @@ EvtScript N(EVS_ExitWalk_kmr_10_0) = {
     EVT_END
 };
 
-MAP_RODATA_PAD(1,exits)
+MAP_RODATA_PAD(1,exits);
 
 EvtScript N(EVS_BindExitTriggers) = {
     EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kmr_12_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0)
diff --git a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c
index 08369859a1..d57e3bb383 100644
--- a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c
+++ b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c
@@ -329,4 +329,4 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = {
     EVT_END
 };
 
-MAP_RODATA_PAD(1,unk)
+MAP_RODATA_PAD(1,unk);
diff --git a/src/world/area_kmr/kmr_20/kmr_20_6_trees.c b/src/world/area_kmr/kmr_20/kmr_20_6_trees.c
index 4dd4376b2b..55dcce53ac 100644
--- a/src/world/area_kmr/kmr_20/kmr_20_6_trees.c
+++ b/src/world/area_kmr/kmr_20/kmr_20_6_trees.c
@@ -4,7 +4,7 @@
 #include "common/foliage.inc.c"
 #define NAME_SUFFIX
 
-FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o325);
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o325);
 FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o326);
 
 FoliageVectorList N(Tree1_Effects) = {
diff --git a/src/world/area_kmr/kmr_22/kmr_22_2_npc.c b/src/world/area_kmr/kmr_22/kmr_22_2_npc.c
index 2b5c1f989f..b23dc5cdea 100644
--- a/src/world/area_kmr/kmr_22/kmr_22_2_npc.c
+++ b/src/world/area_kmr/kmr_22/kmr_22_2_npc.c
@@ -4,7 +4,7 @@
 #include "world/common/npc/KoopaBros.h"
 #include "world/common/enemy/complete/ShyGuy.h"
 
-MAP_RODATA_PAD(1,npc)
+MAP_RODATA_PAD(1,npc);
 
 NpcSettings N(NpcSettings_Dummy) = {
     .height = 24,
diff --git a/src/world/common/atomic/LavaGlowLighting.inc.c b/src/world/area_kzn/common/LavaGlowLighting.inc.c
similarity index 100%
rename from src/world/common/atomic/LavaGlowLighting.inc.c
rename to src/world/area_kzn/common/LavaGlowLighting.inc.c
diff --git a/src/world/common/atomic/kzn_SmokeTexPanners.inc.c b/src/world/area_kzn/common/SmokeTexPanners.inc.c
similarity index 100%
rename from src/world/common/atomic/kzn_SmokeTexPanners.inc.c
rename to src/world/area_kzn/common/SmokeTexPanners.inc.c
diff --git a/src/world/common/atomic/kzn_SpinyTromp.inc.c b/src/world/area_kzn/common/SpinyTromp.inc.c
similarity index 100%
rename from src/world/common/atomic/kzn_SpinyTromp.inc.c
rename to src/world/area_kzn/common/SpinyTromp.inc.c
diff --git a/src/world/area_kzn/kzn_01/kzn_01_1_main.c b/src/world/area_kzn/kzn_01/kzn_01_1_main.c
index 61d34e5bb2..ef1f538b77 100644
--- a/src/world/area_kzn/kzn_01/kzn_01_1_main.c
+++ b/src/world/area_kzn/kzn_01/kzn_01_1_main.c
@@ -1,6 +1,6 @@
 #include "kzn_01.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "../common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_jan_22_2) = EVT_EXIT_WALK(60, kzn_01_ENTRY_0, "jan_22", jan_22_ENTRY_2);
 EvtScript N(EVS_ExitWalk_kzn_02_0) = EVT_EXIT_WALK(60, kzn_01_ENTRY_1, "kzn_02", kzn_02_ENTRY_0);
diff --git a/src/world/area_kzn/kzn_03/kzn_03_1_main.c b/src/world/area_kzn/kzn_03/kzn_03_1_main.c
index ce79f3c945..c7c4256442 100644
--- a/src/world/area_kzn/kzn_03/kzn_03_1_main.c
+++ b/src/world/area_kzn/kzn_03/kzn_03_1_main.c
@@ -1,7 +1,7 @@
 #include "kzn_03.h"
 #include "entity.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "../common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_kzn_02_1) = EVT_EXIT_WALK(60, kzn_03_ENTRY_0, "kzn_02", kzn_02_ENTRY_1);
 EvtScript N(EVS_ExitWalk_kzn_04_0) = EVT_EXIT_WALK(60, kzn_03_ENTRY_1, "kzn_04", kzn_04_ENTRY_0);
diff --git a/src/world/area_kzn/kzn_04/kzn_04_1_main.c b/src/world/area_kzn/kzn_04/kzn_04_1_main.c
index 7412ba0a5c..65a65c510d 100644
--- a/src/world/area_kzn/kzn_04/kzn_04_1_main.c
+++ b/src/world/area_kzn/kzn_04/kzn_04_1_main.c
@@ -1,6 +1,6 @@
 #include "kzn_04.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "../common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_kzn_03_1) = EVT_EXIT_WALK(60, kzn_04_ENTRY_0, "kzn_03", kzn_03_ENTRY_1);
 
diff --git a/src/world/area_kzn/kzn_05/kzn_05_1_main.c b/src/world/area_kzn/kzn_05/kzn_05_1_main.c
index cab9636306..e4e5b40a0e 100644
--- a/src/world/area_kzn/kzn_05/kzn_05_1_main.c
+++ b/src/world/area_kzn/kzn_05/kzn_05_1_main.c
@@ -1,6 +1,6 @@
 #include "kzn_05.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "../common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_kzn_06_0) = EVT_EXIT_WALK(60, kzn_05_ENTRY_0, "kzn_06", kzn_06_ENTRY_0);
 EvtScript N(EVS_ExitWalk_kzn_03_1) = EVT_EXIT_WALK(60, kzn_05_ENTRY_1, "kzn_03", kzn_03_ENTRY_3);
diff --git a/src/world/area_kzn/kzn_06/kzn_06_1_main.c b/src/world/area_kzn/kzn_06/kzn_06_1_main.c
index 21687632a9..de7a4e71df 100644
--- a/src/world/area_kzn/kzn_06/kzn_06_1_main.c
+++ b/src/world/area_kzn/kzn_06/kzn_06_1_main.c
@@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = {
     EVT_END
 };
 
-MAP_RODATA_PAD(1, unk) // can be fixed with subalign 16 for this map
+MAP_RODATA_PAD(1, unk); // can be fixed with subalign 16 for this map
 
 EvtScript N(EVS_StartTexPanners) = {
     EVT_SET_GROUP(EVT_GROUP_00)
diff --git a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c
index 94a9c53d6a..4563914ef6 100644
--- a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c
+++ b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c
@@ -1,7 +1,7 @@
 #include "kzn_06.h"
 #include "model.h"
 
-#include "world/common/atomic/LavaGlowLighting.inc.c"
+#include "../common/LavaGlowLighting.inc.c"
 
 API_CALLABLE(N(AdjustFog)) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_kzn/kzn_07/kzn_07_2_main.c b/src/world/area_kzn/kzn_07/kzn_07_2_main.c
index c66e878c56..3e7ce84e9e 100644
--- a/src/world/area_kzn/kzn_07/kzn_07_2_main.c
+++ b/src/world/area_kzn/kzn_07/kzn_07_2_main.c
@@ -1,7 +1,7 @@
 #include "kzn_07.h"
 #include "model.h"
 
-#include "world/common/atomic/LavaGlowLighting.inc.c"
+#include "../common/LavaGlowLighting.inc.c"
 
 #include "world/common/atomic/TexturePan.inc.c"
 #include "world/common/atomic/TexturePan.data.inc.c"
diff --git a/src/world/area_kzn/kzn_08/kzn_08_1_main.c b/src/world/area_kzn/kzn_08/kzn_08_1_main.c
index da0cec54e9..585f03d46b 100644
--- a/src/world/area_kzn/kzn_08/kzn_08_1_main.c
+++ b/src/world/area_kzn/kzn_08/kzn_08_1_main.c
@@ -1,7 +1,7 @@
 #include "kzn_08.h"
 #include "model.h"
 
-#include "world/common/atomic/LavaGlowLighting.inc.c"
+#include "../common/LavaGlowLighting.inc.c"
 
 #include "world/common/atomic/TexturePan.inc.c"
 #include "world/common/atomic/TexturePan.data.inc.c"
diff --git a/src/world/area_kzn/kzn_10/kzn_10_1_main.c b/src/world/area_kzn/kzn_10/kzn_10_1_main.c
index 999d74129d..72d9313446 100644
--- a/src/world/area_kzn/kzn_10/kzn_10_1_main.c
+++ b/src/world/area_kzn/kzn_10/kzn_10_1_main.c
@@ -1,6 +1,6 @@
 #include "kzn_10.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "../common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_kzn_09_1) = EVT_EXIT_WALK(60, kzn_10_ENTRY_0, "kzn_09", kzn_09_ENTRY_1);
 EvtScript N(EVS_ExitWalk_kzn_11_0) = EVT_EXIT_WALK(60, kzn_10_ENTRY_1, "kzn_11", kzn_11_ENTRY_0);
diff --git a/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c b/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c
index d9de0a72d8..da6b253458 100644
--- a/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c
+++ b/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c
@@ -4,7 +4,7 @@
 #define UNK_FUNC_50_LVar1 -469.0
 #define UNK_FUNC_50_LVar2 46.0
 
-#include "world/common/atomic/kzn_SpinyTromp.inc.c"
+#include "../common/SpinyTromp.inc.c"
 
 EvtScript N(EVS_SpinyTromp_ManageCamera) = {
     EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5)
diff --git a/src/world/area_kzn/kzn_11/kzn_11_1_main.c b/src/world/area_kzn/kzn_11/kzn_11_1_main.c
index 308cc0107e..7137fd432a 100644
--- a/src/world/area_kzn/kzn_11/kzn_11_1_main.c
+++ b/src/world/area_kzn/kzn_11/kzn_11_1_main.c
@@ -1,6 +1,6 @@
 #include "kzn_11.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "../common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_kzn_10_1) = EVT_EXIT_WALK(60, kzn_11_ENTRY_0, "kzn_10", kzn_10_ENTRY_1);
 EvtScript N(EVS_ExitWalk_kzn_17_0) = EVT_EXIT_WALK(60, kzn_11_ENTRY_1, "kzn_17", kzn_17_ENTRY_0);
diff --git a/src/world/area_kzn/kzn_17/kzn_17_1_main.c b/src/world/area_kzn/kzn_17/kzn_17_1_main.c
index 392c282698..ee732ae700 100644
--- a/src/world/area_kzn/kzn_17/kzn_17_1_main.c
+++ b/src/world/area_kzn/kzn_17/kzn_17_1_main.c
@@ -1,6 +1,6 @@
 #include "kzn_17.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "../common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_kzn_11_1) = EVT_EXIT_WALK(60, kzn_17_ENTRY_0, "kzn_11", kzn_11_ENTRY_1);
 EvtScript N(EVS_ExitWalk_kzn_18_0) = EVT_EXIT_WALK(60, kzn_17_ENTRY_1, "kzn_18", kzn_18_ENTRY_0);
diff --git a/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c b/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c
index ce6a7353d7..3f6ea89b2d 100644
--- a/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c
+++ b/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c
@@ -4,7 +4,7 @@
 #define UNK_FUNC_50_LVar1 -583.0
 #define UNK_FUNC_50_LVar2 165.0
 
-#include "world/common/atomic/kzn_SpinyTromp.inc.c"
+#include "../common/SpinyTromp.inc.c"
 
 EvtScript N(EVS_SpinyTromp_ManageCamera) = {
     EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5)
diff --git a/src/world/area_kzn/kzn_18/kzn_18_1_main.c b/src/world/area_kzn/kzn_18/kzn_18_1_main.c
index 426d7c16b0..b36f8fa5f7 100644
--- a/src/world/area_kzn/kzn_18/kzn_18_1_main.c
+++ b/src/world/area_kzn/kzn_18/kzn_18_1_main.c
@@ -3,7 +3,7 @@
 extern EvtScript N(EVS_MakeEntities);
 extern NpcGroupList N(DefaultNPCs);
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "../common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_kzn_17_1) = EVT_EXIT_WALK(60, kzn_18_ENTRY_0, "kzn_17", kzn_17_ENTRY_1);
 EvtScript N(EVS_ExitWalk_kzn_19_0) = EVT_EXIT_WALK(60, kzn_18_ENTRY_1, "kzn_19", kzn_19_ENTRY_0);
diff --git a/src/world/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/area_kzn/kzn_19/kzn_19_2_main.c
index bbc9cbae0b..ca1f75bed4 100644
--- a/src/world/area_kzn/kzn_19/kzn_19_2_main.c
+++ b/src/world/area_kzn/kzn_19/kzn_19_2_main.c
@@ -1,6 +1,6 @@
 #include "kzn_19.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "../common/SmokeTexPanners.inc.c"
 
 #include "world/common/todo/StarSpiritEffectFunc.inc.c"
 
diff --git a/src/world/area_kzn/kzn_22/kzn_22_2_main.c b/src/world/area_kzn/kzn_22/kzn_22_2_main.c
index f755ddc398..9ad55e09d3 100644
--- a/src/world/area_kzn/kzn_22/kzn_22_2_main.c
+++ b/src/world/area_kzn/kzn_22/kzn_22_2_main.c
@@ -1,6 +1,6 @@
 #include "kzn_22.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "../common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_kzn_20_1) = EVT_EXIT_WALK_FIXED(60, kzn_22_ENTRY_0, "kzn_20", kzn_20_ENTRY_1);
 
diff --git a/src/world/area_kzn/kzn_23/kzn_23_2_main.c b/src/world/area_kzn/kzn_23/kzn_23_2_main.c
index 3e26d056f1..81e24d14fd 100644
--- a/src/world/area_kzn/kzn_23/kzn_23_2_main.c
+++ b/src/world/area_kzn/kzn_23/kzn_23_2_main.c
@@ -1,6 +1,6 @@
 #include "kzn_23.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "../common/SmokeTexPanners.inc.c"
 
 // should add to zero over a full cycle
 s32 N(LavaFluctuationOffsets)[] = {
diff --git a/src/world/area_mac/mac_00/mac_00_9_water_gfx.c b/src/world/area_mac/mac_00/mac_00_9_water_gfx.c
index a71a71a1b8..45b9eb0fae 100644
--- a/src/world/area_mac/mac_00/mac_00_9_water_gfx.c
+++ b/src/world/area_mac/mac_00/mac_00_9_water_gfx.c
@@ -1,7 +1,7 @@
 #include "mac_00.h"
 #include "model.h"
 
-MAP_RODATA_PAD(1,unk)
+MAP_RODATA_PAD(1,unk);
 
 void N(gfx_build_water)(void) {
     Model* model;
diff --git a/src/world/area_mac/mac_01/mac_01_13_foliage.c b/src/world/area_mac/mac_01/mac_01_13_foliage.c
index 457a9d52d2..12d2a0d05b 100644
--- a/src/world/area_mac/mac_01/mac_01_13_foliage.c
+++ b/src/world/area_mac/mac_01/mac_01_13_foliage.c
@@ -15,7 +15,7 @@ FoliageDropList N(Tree1_Drops) = {
     }
 };
 
-FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o362);
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o362);
 FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o365);
 
 FoliageVectorList N(Tree1_Effects) = {
@@ -38,7 +38,7 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o115);
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o115);
 FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o116);
 
 FoliageVectorList N(Tree2_Effects) = {
diff --git a/src/world/area_mac/mac_02/mac_02_4_foliage.c b/src/world/area_mac/mac_02/mac_02_4_foliage.c
index 96c7fc68ac..bb693de28b 100644
--- a/src/world/area_mac/mac_02/mac_02_4_foliage.c
+++ b/src/world/area_mac/mac_02/mac_02_4_foliage.c
@@ -2,7 +2,7 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o417);
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o417);
 FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o213);
 
 FoliageVectorList N(Tree1_Effects) = {
@@ -24,7 +24,7 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o115);
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o115);
 FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o423);
 
 FoliageVectorList N(Tree2_Effects) = {
@@ -46,7 +46,7 @@ BombTrigger N(BombPos_Tree2) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o415);
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o415);
 FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o420);
 
 FoliageVectorList N(Tree3_Effects) = {
@@ -68,7 +68,7 @@ BombTrigger N(BombPos_Tree3) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(UnusedTree_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o419);
+FoliageModelList N(UnusedTree_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o419);
 FoliageModelList N(UnusedTree_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o116);
 
 FoliageVectorList N(UnusedTree_Effects) = {
@@ -90,7 +90,7 @@ BombTrigger N(BombPos_UnusedTree) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree4_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o414);
+FoliageModelList N(Tree4_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o414);
 FoliageModelList N(Tree4_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o421);
 
 FoliageVectorList N(Tree4_Effects) = {
diff --git a/src/world/area_mac/mac_03/mac_03_6_foliage.c b/src/world/area_mac/mac_03/mac_03_6_foliage.c
index f3598c55fe..a6c93e30aa 100644
--- a/src/world/area_mac/mac_03/mac_03_6_foliage.c
+++ b/src/world/area_mac/mac_03/mac_03_6_foliage.c
@@ -41,7 +41,7 @@ EvtScript N(Tree3_CallbackScript) = {
     EVT_END
 };
 
-FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o240);
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o240);
 FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o128);
 
 FoliageVectorList N(Tree1_Effects) = {
@@ -63,7 +63,7 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o238);
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o238);
 FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o130);
 
 FoliageVectorList N(Tree2_Effects) = {
@@ -85,7 +85,7 @@ BombTrigger N(BombPos_Tree2) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o239);
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o239);
 FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o126);
 
 FoliageVectorList N(Tree3_Effects) = {
diff --git a/src/world/area_mac/mac_04/mac_04_4_foliage.c b/src/world/area_mac/mac_04/mac_04_4_foliage.c
index c586c70f53..5cf7376a5a 100644
--- a/src/world/area_mac/mac_04/mac_04_4_foliage.c
+++ b/src/world/area_mac/mac_04/mac_04_4_foliage.c
@@ -2,7 +2,7 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o287);
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o287);
 FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o286);
 
 FoliageVectorList N(Tree1_Effects) = {
@@ -24,7 +24,7 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o290);
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o290);
 FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o291);
 
 FoliageVectorList N(Tree2_Effects) = {
@@ -46,7 +46,7 @@ BombTrigger N(BombPos_Tree2) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o288);
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o288);
 FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o289);
 
 FoliageVectorList N(Tree3_Effects) = {
diff --git a/src/world/area_mac/mac_04/mac_04_8_entity.c b/src/world/area_mac/mac_04/mac_04_8_entity.c
index 6ee5f56f8b..19a82e55c1 100644
--- a/src/world/area_mac/mac_04/mac_04_8_entity.c
+++ b/src/world/area_mac/mac_04/mac_04_8_entity.c
@@ -49,8 +49,8 @@ void N(appendGfx_shrunk_player)(void* data) {
     guMtxCatF(transformMtx, tempMtx, transformMtx);
     guTranslateF(tempMtx, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z);
     guMtxCatF(transformMtx, tempMtx, transformMtx);
-    playerStatus->animNotifyValue = spr_update_player_sprite(0, playerStatus->trueAnimation, 1.0f);
-    spr_draw_player_sprite(0, 0, 0, NULL, transformMtx);
+    playerStatus->animNotifyValue = spr_update_player_sprite(PLAYER_SPRITE_MAIN, playerStatus->trueAnimation, 1.0f);
+    spr_draw_player_sprite(PLAYER_SPRITE_MAIN, 0, 0, NULL, transformMtx);
 }
 
 EvtScript N(EVS_ShrinkPlayer) = {
diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/mac_05_4_npc.c
index 5bb67a9b57..c39d06b7d3 100644
--- a/src/world/area_mac/mac_05/mac_05_4_npc.c
+++ b/src/world/area_mac/mac_05/mac_05_4_npc.c
@@ -231,7 +231,7 @@ API_CALLABLE(N(func_80242C78_854DE8)) {
             partner->flags |= NPC_FLAG_DIRTY_SHADOW;
             break;
         case 2:
-            npc1 = get_npc_safe(1);
+            npc1 = get_npc_safe(NPC_Kolorado);
             npc1->pos.x = x;
             npc1->pos.y = y;
             npc1->pos.z = z;
@@ -247,7 +247,7 @@ API_CALLABLE(N(func_80242C78_854DE8)) {
 
 API_CALLABLE(N(func_80242E84_854FF4)) {
     Bytecode* args = script->ptrReadPos;
-    Npc* npc = get_npc_safe(0);
+    Npc* npc = get_npc_safe(NPC_Whale);
 
     if (isInitialCall) {
         script->functionTemp[0] = evt_get_variable(script, *args++);
@@ -1181,7 +1181,7 @@ EvtScript N(EVS_NpcInit_Kolorado) = {
 };
 
 API_CALLABLE(N(func_802431B0_855320)) {
-    Npc* npc = get_npc_safe(4);
+    Npc* npc = get_npc_safe(NPC_JrTroopa_01);
     f32 x = npc->pos.x + 20.0f;
     f32 y = npc->pos.y;
     f32 z = npc->pos.z - 15.0f;
diff --git a/src/world/area_mim/gates/animate.inc.c b/src/world/area_mim/common/AnimateGates.inc.c
similarity index 100%
rename from src/world/area_mim/gates/animate.inc.c
rename to src/world/area_mim/common/AnimateGates.inc.c
diff --git a/src/world/area_mim/gates/setup.inc.c b/src/world/area_mim/common/SetupGates.inc.c
similarity index 100%
rename from src/world/area_mim/gates/setup.inc.c
rename to src/world/area_mim/common/SetupGates.inc.c
diff --git a/src/world/area_mim/gates/support.inc.c b/src/world/area_mim/common/SupportGates.inc.c
similarity index 100%
rename from src/world/area_mim/gates/support.inc.c
rename to src/world/area_mim/common/SupportGates.inc.c
diff --git a/src/world/area_mim/gates/use.inc.c b/src/world/area_mim/common/UseGates.inc.c
similarity index 100%
rename from src/world/area_mim/gates/use.inc.c
rename to src/world/area_mim/common/UseGates.inc.c
diff --git a/src/world/area_mim/mim_01/mim_01_5_gate.c b/src/world/area_mim/mim_01/mim_01_5_gate.c
index 9a770b35d9..de2bb0cb3e 100644
--- a/src/world/area_mim/mim_01/mim_01_5_gate.c
+++ b/src/world/area_mim/mim_01/mim_01_5_gate.c
@@ -290,4 +290,4 @@ EvtScript N(EVS_UseGate_West) = {
     EVT_END
 };
 
-#include "../gates/setup.inc.c"
+#include "../common/SetupGates.inc.c"
diff --git a/src/world/area_mim/mim_02/mim_02_4_gate.c b/src/world/area_mim/mim_02/mim_02_4_gate.c
index 9f238618be..805b1e58d7 100644
--- a/src/world/area_mim/mim_02/mim_02_4_gate.c
+++ b/src/world/area_mim/mim_02/mim_02_4_gate.c
@@ -1,8 +1,8 @@
 #include "mim_02.h"
 
-#include "../gates/support.inc.c"
+#include "../common/SupportGates.inc.c"
 
-#include "../gates/animate.inc.c"
+#include "../common/AnimateGates.inc.c"
 
 EvtScript N(EVS_UseGate_North) = {
     EVT_CALL(DisablePlayerInput, TRUE)
diff --git a/src/world/area_mim/mim_03/mim_03_5_gate.c b/src/world/area_mim/mim_03/mim_03_5_gate.c
index bb883ae6af..81ce52aeff 100644
--- a/src/world/area_mim/mim_03/mim_03_5_gate.c
+++ b/src/world/area_mim/mim_03/mim_03_5_gate.c
@@ -1,6 +1,6 @@
 #include "mim_03.h"
 
-#include "../gates/support.inc.c"
-#include "../gates/animate.inc.c"
-#include "../gates/use.inc.c"
-#include "../gates/setup.inc.c"
+#include "../common/SupportGates.inc.c"
+#include "../common/AnimateGates.inc.c"
+#include "../common/UseGates.inc.c"
+#include "../common/SetupGates.inc.c"
diff --git a/src/world/area_mim/mim_04/mim_04_5_gate.c b/src/world/area_mim/mim_04/mim_04_5_gate.c
index 7a5e9298a6..8044728afe 100644
--- a/src/world/area_mim/mim_04/mim_04_5_gate.c
+++ b/src/world/area_mim/mim_04/mim_04_5_gate.c
@@ -1,6 +1,6 @@
 #include "mim_04.h"
 
-#include "../gates/support.inc.c"
-#include "../gates/animate.inc.c"
-#include "../gates/use.inc.c"
-#include "../gates/setup.inc.c"
+#include "../common/SupportGates.inc.c"
+#include "../common/AnimateGates.inc.c"
+#include "../common/UseGates.inc.c"
+#include "../common/SetupGates.inc.c"
diff --git a/src/world/area_mim/mim_05/mim_05_5_gate.c b/src/world/area_mim/mim_05/mim_05_5_gate.c
index 2466e8ce4f..9a6214438f 100644
--- a/src/world/area_mim/mim_05/mim_05_5_gate.c
+++ b/src/world/area_mim/mim_05/mim_05_5_gate.c
@@ -1,6 +1,6 @@
 #include "mim_05.h"
 
-#include "../gates/support.inc.c"
-#include "../gates/animate.inc.c"
-#include "../gates/use.inc.c"
-#include "../gates/setup.inc.c"
+#include "../common/SupportGates.inc.c"
+#include "../common/AnimateGates.inc.c"
+#include "../common/UseGates.inc.c"
+#include "../common/SetupGates.inc.c"
diff --git a/src/world/area_mim/mim_06/mim_06_5_gate.c b/src/world/area_mim/mim_06/mim_06_5_gate.c
index bcc17c1310..f86ff385b2 100644
--- a/src/world/area_mim/mim_06/mim_06_5_gate.c
+++ b/src/world/area_mim/mim_06/mim_06_5_gate.c
@@ -1,6 +1,6 @@
 #include "mim_06.h"
 
-#include "../gates/support.inc.c"
-#include "../gates/animate.inc.c"
-#include "../gates/use.inc.c"
-#include "../gates/setup.inc.c"
+#include "../common/SupportGates.inc.c"
+#include "../common/AnimateGates.inc.c"
+#include "../common/UseGates.inc.c"
+#include "../common/SetupGates.inc.c"
diff --git a/src/world/area_mim/mim_08/mim_08_4_gate.c b/src/world/area_mim/mim_08/mim_08_4_gate.c
index c5af353917..98b38d8860 100644
--- a/src/world/area_mim/mim_08/mim_08_4_gate.c
+++ b/src/world/area_mim/mim_08/mim_08_4_gate.c
@@ -1,6 +1,6 @@
 #include "mim_08.h"
 
-#include "../gates/support.inc.c"
-#include "../gates/animate.inc.c"
-#include "../gates/use.inc.c"
-#include "../gates/setup.inc.c"
+#include "../common/SupportGates.inc.c"
+#include "../common/AnimateGates.inc.c"
+#include "../common/UseGates.inc.c"
+#include "../common/SetupGates.inc.c"
diff --git a/src/world/area_mim/mim_09/mim_09_5_gate.c b/src/world/area_mim/mim_09/mim_09_5_gate.c
index 280edd3c01..19bdc75ab4 100644
--- a/src/world/area_mim/mim_09/mim_09_5_gate.c
+++ b/src/world/area_mim/mim_09/mim_09_5_gate.c
@@ -1,6 +1,6 @@
 #include "mim_09.h"
 
-#include "../gates/support.inc.c"
-#include "../gates/animate.inc.c"
-#include "../gates/use.inc.c"
-#include "../gates/setup.inc.c"
+#include "../common/SupportGates.inc.c"
+#include "../common/AnimateGates.inc.c"
+#include "../common/UseGates.inc.c"
+#include "../common/SetupGates.inc.c"
diff --git a/src/world/area_mim/mim_11/mim_11_6_foliage.c b/src/world/area_mim/mim_11/mim_11_6_foliage.c
index e4411871f5..adef447592 100644
--- a/src/world/area_mim/mim_11/mim_11_6_foliage.c
+++ b/src/world/area_mim/mim_11/mim_11_6_foliage.c
@@ -2,12 +2,7 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Bush1_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o182,
-    }
-};
+FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o182);
 
 FoliageDropList N(Bush1_Drops) = {
     .count = 1, 
@@ -26,34 +21,19 @@ SearchBushConfig N(SearchBush_Bush1) = {
     .drops = &N(Bush1_Drops),
 };
 
-FoliageModelList N(Bush2_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o183,
-    }
-};
+FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o183);
 
 SearchBushConfig N(SearchBush_Bush2) = {
     .bush = &N(Bush2_BushModels),
 };
 
-FoliageModelList N(Bush3_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o184,
-    }
-};
+FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o184);
 
 SearchBushConfig N(SearchBush_Bush3) = {
     .bush = &N(Bush3_BushModels),
 };
 
-FoliageModelList N(Bush4_BushModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o185,
-    }
-};
+FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o185);
 
 SearchBushConfig N(SearchBush_Bush4) = {
     .bush = &N(Bush4_BushModels),
diff --git a/src/world/area_nok/nok_15/nok_15_2_main.c b/src/world/area_nok/nok_15/nok_15_2_main.c
index a2d9d0227a..c51367a2e7 100644
--- a/src/world/area_nok/nok_15/nok_15_2_main.c
+++ b/src/world/area_nok/nok_15/nok_15_2_main.c
@@ -39,7 +39,7 @@ BombTrigger N(BombPos_Wall) = {
     .radius = 0.0f
 };
 
-EvtScript N(EVS_Blast_Wall) = {
+EvtScript N(EVS_BlastWall) = {
     EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 60, 61, 1, 10, 30)
     EVT_SET(GF_NOK15_BombedWall, TRUE)
     EVT_CALL(EnableModel, MODEL_bomb_ato, TRUE)
@@ -132,7 +132,7 @@ EvtScript N(EVS_Main) = {
     EVT_EXEC(N(EVS_TexPan_Water))
     EVT_IF_EQ(GF_NOK15_BombedWall, FALSE)
         EVT_CALL(EnableModel, MODEL_bomb_ato, FALSE)
-        EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Blast_Wall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0)
+        EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BlastWall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0)
     EVT_ELSE
         EVT_CALL(EnableModel, MODEL_bomb_1, FALSE)
         EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK)
diff --git a/src/world/area_nok/nok_15/nok_15_5_foliage.c b/src/world/area_nok/nok_15/nok_15_5_foliage.c
index 344150dfe3..1cd810e0db 100644
--- a/src/world/area_nok/nok_15/nok_15_5_foliage.c
+++ b/src/world/area_nok/nok_15/nok_15_5_foliage.c
@@ -2,7 +2,7 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_ha);
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_ha);
 FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_moku);
 
 FoliageDropList N(Tree1_Drops) = {
diff --git a/src/world/area_obk/RockingChair.inc.c b/src/world/area_obk/common/RockingChair.inc.c
similarity index 100%
rename from src/world/area_obk/RockingChair.inc.c
rename to src/world/area_obk/common/RockingChair.inc.c
diff --git a/src/world/area_obk/TrafficBoos.inc.c b/src/world/area_obk/common/TrafficBoos.inc.c
similarity index 100%
rename from src/world/area_obk/TrafficBoos.inc.c
rename to src/world/area_obk/common/TrafficBoos.inc.c
diff --git a/src/world/area_obk/obk_02/obk_02_3_npc.c b/src/world/area_obk/obk_02/obk_02_3_npc.c
index 702825ede4..891a257158 100644
--- a/src/world/area_obk/obk_02/obk_02_3_npc.c
+++ b/src/world/area_obk/obk_02/obk_02_3_npc.c
@@ -4,7 +4,7 @@
 
 #define TRAFFIC_BOO_START_Y 80.0f
 #define TRAFFIC_BOO_START_Z -300.0f
-#include "../TrafficBoos.inc.c"
+#include "../common/TrafficBoos.inc.c"
 
 EvtScript N(EVS_NpcInit_TrafficBoo1) = {
     EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TrafficBoo)))
diff --git a/src/world/area_obk/obk_03/obk_03_7_rocking_chair.c b/src/world/area_obk/obk_03/obk_03_7_rocking_chair.c
index a9ff199ddc..e1d582a334 100644
--- a/src/world/area_obk/obk_03/obk_03_7_rocking_chair.c
+++ b/src/world/area_obk/obk_03/obk_03_7_rocking_chair.c
@@ -1,7 +1,7 @@
 #include "obk_03.h"
 
 #define ROCKING_CHAIR_CENTER_X -170.0
-#include "../RockingChair.inc.c"
+#include "../common/RockingChair.inc.c"
 
 EvtScript N(EVS_SetupRockingChair) = {
     EVT_CALL(ParentColliderToModel, COLLIDER_i1, MODEL_i1)
diff --git a/src/world/area_obk/obk_05/obk_05_3_rocking_chair.c b/src/world/area_obk/obk_05/obk_05_3_rocking_chair.c
index 04a0efd6ee..78467ed207 100644
--- a/src/world/area_obk/obk_05/obk_05_3_rocking_chair.c
+++ b/src/world/area_obk/obk_05/obk_05_3_rocking_chair.c
@@ -4,7 +4,7 @@
 extern EvtScript N(EVS_SetupRockingChair);
 
 #define ROCKING_CHAIR_CENTER_X 0.0
-#include "../RockingChair.inc.c"
+#include "../common/RockingChair.inc.c"
 
 EvtScript N(EVS_SetupRockingChairs) = {
     EVT_EXEC(N(EVS_SetupRockingChair))
diff --git a/src/world/area_obk/obk_05/obk_05_5_npc.c b/src/world/area_obk/obk_05/obk_05_5_npc.c
index 93e0925985..7ceb33dce3 100644
--- a/src/world/area_obk/obk_05/obk_05_5_npc.c
+++ b/src/world/area_obk/obk_05/obk_05_5_npc.c
@@ -4,7 +4,7 @@
 
 #define TRAFFIC_BOO_START_Y 40.0f
 #define TRAFFIC_BOO_START_Z -430.0f
-#include "../TrafficBoos.inc.c"
+#include "../common/TrafficBoos.inc.c"
 
 EvtScript N(EVS_NpcInit_TrafficBoo1) = {
     EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TrafficBoo)))
diff --git a/src/world/area_obk/obk_07/obk_07_5_npc.c b/src/world/area_obk/obk_07/obk_07_5_npc.c
index a33a13de22..7a898545e0 100644
--- a/src/world/area_obk/obk_07/obk_07_5_npc.c
+++ b/src/world/area_obk/obk_07/obk_07_5_npc.c
@@ -4,7 +4,7 @@
 
 #define TRAFFIC_BOO_START_Y 80.0f
 #define TRAFFIC_BOO_START_Z -300.0f
-#include "../TrafficBoos.inc.c"
+#include "../common/TrafficBoos.inc.c"
 
 EvtScript N(EVS_NpcInit_TrafficBoo1) = {
     EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TrafficBoo)))
diff --git a/src/world/area_obk/obk_08/obk_08_5_npc.c b/src/world/area_obk/obk_08/obk_08_5_npc.c
index 4ec3d44d1b..df1a56610b 100644
--- a/src/world/area_obk/obk_08/obk_08_5_npc.c
+++ b/src/world/area_obk/obk_08/obk_08_5_npc.c
@@ -547,7 +547,7 @@ StaticNpc N(NpcData_KeepAwayBoo8) = {
 
 #define TRAFFIC_BOO_START_Y 40.0f
 #define TRAFFIC_BOO_START_Z -430.0f
-#include "../TrafficBoos.inc.c"
+#include "../common/TrafficBoos.inc.c"
 
 EvtScript N(EVS_NpcInit_TrafficBoo1) = {
     EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TrafficBoo)))
diff --git a/src/world/area_omo/omo_04/omo_04_2_main.c b/src/world/area_omo/omo_04/omo_04_2_main.c
index d2f5fe2fa8..29818495f9 100644
--- a/src/world/area_omo/omo_04/omo_04_2_main.c
+++ b/src/world/area_omo/omo_04/omo_04_2_main.c
@@ -2,7 +2,7 @@
 
 EvtScript N(EVS_ExitWalk_omo_03_1) = EVT_EXIT_WALK(60, omo_04_ENTRY_0, "omo_03", omo_03_ENTRY_1);
 
-MAP_RODATA_PAD(1, exits)
+MAP_RODATA_PAD(1, exits);
 
 EvtScript N(EVS_BindExitTriggers) = {
     EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_03_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0)
diff --git a/src/world/area_pra/common/GlassShimmer.inc.c b/src/world/area_pra/common/GlassShimmer.inc.c
new file mode 100644
index 0000000000..5423d2810c
--- /dev/null
+++ b/src/world/area_pra/common/GlassShimmer.inc.c
@@ -0,0 +1,24 @@
+#include "common.h"
+
+// LVar0 wall model ID
+// LVar1 door model ID
+// LVar2 tex panner ID
+EvtScript N(EVS_GlassShimmer) = {
+    EVT_CALL(SetTexPanner, LVar0, LVar2)
+    EVT_CALL(SetTexPanner, LVar1, LVar2)
+    EVT_LOOP(0)
+        EVT_CALL(EnableModel, LVar0, TRUE)
+        EVT_CALL(EnableModel, LVar1, TRUE)
+        EVT_SET(LVarA, 0)
+        EVT_LOOP(20)
+            EVT_CALL(SetTexPanOffset, LVar2, 0, LVarA, 0)
+            EVT_ADD(LVarA, 3000)
+            EVT_WAIT(1)
+        EVT_END_LOOP
+        EVT_CALL(EnableModel, LVar0, FALSE)
+        EVT_CALL(EnableModel, LVar1, FALSE)
+        EVT_WAIT(160)
+    EVT_END_LOOP
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/common/atomic/Reflection.data.inc.c b/src/world/area_pra/common/Reflection.data.inc.c
similarity index 51%
rename from src/world/common/atomic/Reflection.data.inc.c
rename to src/world/area_pra/common/Reflection.data.inc.c
index f2f2d65d7d..a017861e2a 100644
--- a/src/world/common/atomic/Reflection.data.inc.c
+++ b/src/world/area_pra/common/Reflection.data.inc.c
@@ -1,37 +1,40 @@
 #include "common.h"
 
-EvtScript N(EVS_Reflection_UnkA) = {
+EvtScript N(EVS_Reflection_Unk) = {
     EVT_CALL(GetEntryID, LVarA)
     EVT_IF_EQ(LVarA, LVar1)
-        EVT_SET(LVar0, 2)
+        EVT_SET(LVar0, REFLECTION_WALL_ONLY)
     EVT_END_IF
     EVT_IF_EQ(LVarA, LVar2)
-        EVT_SET(LVar0, 2)
+        EVT_SET(LVar0, REFLECTION_WALL_ONLY)
     EVT_END_IF
     EVT_IF_EQ(LVarA, LVar3)
-        EVT_SET(LVar0, 2)
+        EVT_SET(LVar0, REFLECTION_WALL_ONLY)
     EVT_END_IF
     EVT_IF_EQ(LVarA, LVar4)
-        EVT_SET(LVar0, 2)
+        EVT_SET(LVar0, REFLECTION_WALL_ONLY)
     EVT_END_IF
     EVT_IF_EQ(LVarA, LVar5)
-        EVT_SET(LVar0, 2)
+        EVT_SET(LVar0, REFLECTION_WALL_ONLY)
     EVT_END_IF
     EVT_IF_EQ(LVarA, LVar6)
-        EVT_SET(LVar0, 2)
+        EVT_SET(LVar0, REFLECTION_WALL_ONLY)
     EVT_END_IF
     EVT_RETURN
     EVT_END
 };
 
-EvtScript N(EVS_Reflection_UnkB) = {
+// LVar0 mode
+// LVar1 disable wall flag (reflections wont show if false)
+EvtScript N(EVS_SetupReflections) = {
     EVT_MALLOC_ARRAY(16, LVarA)
-    EVT_IF_EQ(LVar1, 0)
+    EVT_IF_EQ(LVar1, FALSE)
         EVT_SWITCH(LVar0)
-            EVT_CASE_EQ(0)
+            EVT_CASE_EQ(REFLECTION_FLOOR_WALL)
                 EVT_CALL(N(EnableWallReflection))
-            EVT_CASE_EQ(1)
-            EVT_CASE_EQ(2)
+            EVT_CASE_EQ(REFLECTION_FLOOR_ONLY)
+                // do nothing
+            EVT_CASE_EQ(REFLECTION_WALL_ONLY)
                 EVT_CALL(N(EnableWallReflection))
         EVT_END_SWITCH
     EVT_END_IF
diff --git a/src/world/common/atomic/Reflection.inc.c b/src/world/area_pra/common/Reflection.inc.c
similarity index 88%
rename from src/world/common/atomic/Reflection.inc.c
rename to src/world/area_pra/common/Reflection.inc.c
index ba7bc35c00..aa4dc089b9 100644
--- a/src/world/common/atomic/Reflection.inc.c
+++ b/src/world/area_pra/common/Reflection.inc.c
@@ -8,10 +8,10 @@
 #include "npc.h"
 #include "sprite.h"
 
-enum Reflection {
-    REFLECTION_FLOOR_WALL,
-    REFLECTION_FLOOR,
-    REFLECTION_WALL,
+enum ReflectMode {
+    REFLECTION_FLOOR_WALL   = 0,
+    REFLECTION_FLOOR_ONLY   = 1,
+    REFLECTION_WALL_ONLY    = 2,
 };
 
 void N(worker_reflect_player_wall)(void);
@@ -26,6 +26,7 @@ void N(worker_reflect_partner_wall)(void);
 s32 N(reflection_unk_resolve_anim)(s32 playerAnim) {
     AnimID temp;
 
+    //TODO write with sensibile logic based on spriteIDs
     playerAnim &= ~SPRITE_ID_BACK_FACING;
     temp = playerAnim + ~ANIM_Mario_6000B;
     if (temp < 16 && temp & 1) {
@@ -90,16 +91,16 @@ void N(worker_reflect_player_wall)(void) {
             anim = N(reflection_unk_change_anim_facing)(anim);
         }
 
-        spr_update_player_sprite(2, anim, 1.0f);
+        spr_update_player_sprite(PLAYER_SPRITE_AUX2, anim, 1.0f);
 
         if (!(playerStatus->flags & PS_FLAG_SPINNING)) {
             if (playerStatus->alpha1 != D_802D9D70) {
                 if (playerStatus->alpha1 < 254) {
                     renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
-                    func_802DDEE4(2, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
+                    func_802DDEE4(PLAYER_SPRITE_AUX2, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
                 } else {
                     renderMode = RENDER_MODE_ALPHATEST;
-                    func_802DDEE4(2, -1, 0, 0, 0, 0, 0, 0);
+                    func_802DDEE4(PLAYER_SPRITE_AUX2, -1, 0, 0, 0, 0, 0, 0);
                 }
             }
             D_802D9D70 = playerStatus->alpha1;
@@ -134,17 +135,17 @@ void N(appendGfx_reflect_player_wall)(PlayerStatus* playerStatus) {
     guMtxCatF(main, scale, main);
     guTranslateF(translation, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z - 3.0f);
     guMtxCatF(main, translation, main);
-    spr_draw_player_sprite(2, 0, 0, NULL, main);
+    spr_draw_player_sprite(PLAYER_SPRITE_AUX2, 0, 0, NULL, main);
 }
 
 API_CALLABLE(N(EnableFloorReflection)){
     switch (script->varTable[0]) {
         case REFLECTION_FLOOR_WALL:
-        case REFLECTION_FLOOR:
+        case REFLECTION_FLOOR_ONLY:
             script->array[0] = create_worker_world(NULL, N(worker_reflect_player_floor));
             gOverrideFlags |= GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION;
             break;
-        case REFLECTION_WALL:
+        case REFLECTION_WALL_ONLY:
             break;
     }
 
@@ -165,16 +166,16 @@ void N(worker_reflect_player_floor)(void) {
         get_screen_coords(gCurrentCamID, playerStatus->position.x, -playerStatus->position.y, playerStatus->position.z,
                           &screenX, &screenY, &screenZ);
 
-        spr_update_player_sprite(1, playerStatus->trueAnimation, 1.0f);
+        spr_update_player_sprite(PLAYER_SPRITE_AUX1, playerStatus->trueAnimation, 1.0f);
 
         if (!(playerStatus->flags & PS_FLAG_SPINNING)) {
             if (playerStatus->alpha1 != D_802D9D71) {
                 if (playerStatus->alpha1 < 254) {
                     renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
-                    func_802DDEE4(1, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
+                    func_802DDEE4(PLAYER_SPRITE_AUX1, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
                 } else {
                     renderMode = RENDER_MODE_ALPHATEST;
-                    func_802DDEE4(1, -1, 0, 0, 0, 0, 0, 0);
+                    func_802DDEE4(PLAYER_SPRITE_AUX1, -1, 0, 0, 0, 0, 0, 0);
                 }
             }
             D_802D9D71 = playerStatus->alpha1;
@@ -201,7 +202,7 @@ void N(appendGfx_reflect_player_floor_basic)(PlayerStatus* playerStatus) {
     Matrix4f translation;
     Matrix4f rotation;
     Matrix4f scale;
-    s32 flags;
+    s32 spriteIdx;
 
     guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f);
     guRotateF(main, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f);
@@ -216,12 +217,12 @@ void N(appendGfx_reflect_player_floor_basic)(PlayerStatus* playerStatus) {
     guMtxCatF(main, translation, main);
 
     if (playerStatus->spriteFacingAngle >= 90.0f && playerStatus->spriteFacingAngle < 270.0f) {
-        flags = 0x10000001;
+        spriteIdx = PLAYER_SPRITE_AUX1 | DRAW_SPRITE_UPSIDE_DOWN;
     } else {
-        flags = 1;
+        spriteIdx = PLAYER_SPRITE_AUX1;
     }
 
-    spr_draw_player_sprite(flags, 0, 0, NULL, main);
+    spr_draw_player_sprite(spriteIdx, 0, 0, NULL, main);
 }
 
 void N(appendGfx_reflect_player_floor_fancy)(PlayerStatus* playerStatus) {
@@ -239,7 +240,7 @@ void N(appendGfx_reflect_player_floor_fancy)(PlayerStatus* playerStatus) {
     s32 y;
     s32 z;
     s32 i;
-    s32 flags;
+    s32 spriteIdx;
 
     for (i = 0; i < 2; i++) {
         yaw = -gCameras[gCurrentCamID].currentYaw;
@@ -263,7 +264,7 @@ void N(appendGfx_reflect_player_floor_fancy)(PlayerStatus* playerStatus) {
                 tint = 100;
             }
 
-            func_802DDEE4(1, -1, 6, tint, tint, tint, 255, 0);
+            func_802DDEE4(PLAYER_SPRITE_AUX1, -1, 6, tint, tint, tint, 255, 0);
 
             guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f);
             guRotateF(mtx, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f);
@@ -273,7 +274,6 @@ void N(appendGfx_reflect_player_floor_fancy)(PlayerStatus* playerStatus) {
             pz = playerStatus->position.z;
         } else {
             // Spinning blur animation
-
             blurAngle = phys_get_spin_history(i, &x, &y, &z);
 
             if (y == 0x80000000) {
@@ -284,7 +284,7 @@ void N(appendGfx_reflect_player_floor_fancy)(PlayerStatus* playerStatus) {
 
             px = playerStatus->position.x;
             pz = playerStatus->position.z;
-            func_802DDEE4(1, -1, 7, 0, 0, 0, 0x40, 0);
+            func_802DDEE4(PLAYER_SPRITE_AUX1, -1, 7, 0, 0, 0, 64, 0);
             guRotateF(mtx, yaw, 0.0f, -1.0f, 0.0f);
             guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f);
             guRotateF(mtx, blurAngle, 0.0f, 1.0f, 0.0f);
@@ -304,12 +304,13 @@ void N(appendGfx_reflect_player_floor_fancy)(PlayerStatus* playerStatus) {
         guTranslateF(translation, px, -py, pz);
         guMtxCatF(mtx, translation, mtx);
 
-        flags = 1;
         if (playerStatus->spriteFacingAngle >= 90.0f && playerStatus->spriteFacingAngle < 270.0f) {
-            flags |= DRAW_SPRITE_UPSIDE_DOWN;
+            spriteIdx = PLAYER_SPRITE_AUX1 | DRAW_SPRITE_UPSIDE_DOWN;
+        } else {
+            spriteIdx = PLAYER_SPRITE_AUX1;
         }
 
-        spr_draw_player_sprite(flags, 0, 0, NULL, mtx);
+        spr_draw_player_sprite(spriteIdx, 0, 0, NULL, mtx);
     }
 }
 
@@ -323,20 +324,20 @@ API_CALLABLE(N(EnablePartnerReflection)){
             case REFLECTION_FLOOR_WALL:
                 script->array[1] = create_worker_world(N(worker_reflect_partner_all), NULL);
                 break;
-            case REFLECTION_FLOOR:
+            case REFLECTION_FLOOR_ONLY:
                 script->array[1] = create_worker_world(N(worker_reflect_partner_floor), NULL);
                 break;
-            case REFLECTION_WALL:
+            case REFLECTION_WALL_ONLY:
                 script->array[1] = create_worker_world(N(worker_reflect_partner_wall), NULL);
                 break;
         }
     } else {
         switch (script->varTable[0]) {
             case REFLECTION_FLOOR_WALL:
-            case REFLECTION_FLOOR:
+            case REFLECTION_FLOOR_ONLY:
                 script->array[1] = create_worker_world(N(worker_reflect_partner_floor), NULL);
                 break;
-            case REFLECTION_WALL:
+            case REFLECTION_WALL_ONLY:
                 break;
         }
     }
@@ -352,20 +353,20 @@ API_CALLABLE(N(EnablePartnerReflection)){
             case REFLECTION_FLOOR_WALL:
                 partner->flags |= NPC_FLAG_REFLECT_WALL | NPC_FLAG_REFLECT_FLOOR;
                 break;
-            case REFLECTION_FLOOR:
+            case REFLECTION_FLOOR_ONLY:
                 partner->flags |= NPC_FLAG_REFLECT_FLOOR;
                 break;
-            case REFLECTION_WALL:
+            case REFLECTION_WALL_ONLY:
                 partner->flags |= NPC_FLAG_REFLECT_WALL;
                 break;
         }
     } else {
         switch (script->varTable[0]) {
             case REFLECTION_FLOOR_WALL:
-            case REFLECTION_FLOOR:
+            case REFLECTION_FLOOR_ONLY:
                 partner->flags |= NPC_FLAG_REFLECT_FLOOR;
                 break;
-            case REFLECTION_WALL:
+            case REFLECTION_WALL_ONLY:
                 break;
         }
     }
diff --git a/src/world/area_pra/pra.h b/src/world/area_pra/pra.h
index 62b572eae7..c809a9e0d6 100644
--- a/src/world/area_pra/pra.h
+++ b/src/world/area_pra/pra.h
@@ -20,6 +20,10 @@ enum {
     AB_PRA_Unused_F     = AreaByte(15),
 };
 
+enum {
+    AF_PRA33_FlippingWall           = AreaFlag(3),
+};
+
 extern MapSettings pra_01_settings;
 extern MapSettings pra_02_settings;
 extern MapSettings pra_03_settings;
diff --git a/src/world/area_pra/pra_01/D4D040.c b/src/world/area_pra/pra_01/D4D040.c
deleted file mode 100644
index c27c2a30d4..0000000000
--- a/src/world/area_pra/pra_01/D4D040.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "pra_01.h"
-
-static char* N(exit_str_0) = "sam_10";
-static char* N(exit_str_1) = "pra_15";
-static char* N(exit_str_2) = "pra_02";
-static char* N(exit_str_3) = "";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c
deleted file mode 100644
index db383639ab..0000000000
--- a/src/world/area_pra/pra_01/D4D060.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "pra_01.h"
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "common/UnkFogFunc.inc.c"
-
-ApiStatus func_80240F60_D4DFA0(Evt* script, s32 isInitialCall) {
-    gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION;
-    return ApiStatus_DONE2;
-}
-
-#include "world/common/todo/GetNpcCollisionHeight.inc.c"
-
-#include "world/common/todo/AddPlayerHandsOffset.inc.c"
-
-extern s32 N(ItemChoice_HasSelectedItem);
-extern s32 N(ItemChoice_SelectedItemID);
-#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
-
-ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
-    N(ItemChoice_HasSelectedItem) = TRUE;
-    return ApiStatus_DONE2;
-}
-
-BSS s32 D_80242FB0[114];
-BSS s32 pra_01_80243178[92];
-
-ApiStatus func_80241238_D4E278(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = (s32*) evt_get_variable(script, *args++);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            D_80242FB0[i] = ptr[i];
-        }
-        D_80242FB0[i] = 0;
-    } else {
-        for (i = 0; i < 112; i++) {
-            D_80242FB0[i] = i + 16;
-            D_80242FB0[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_802412D4_D4E314(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = (s32*) evt_get_variable(script, *args++);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            pra_01_80243178[i] = ptr[i];
-        }
-        pra_01_80243178[i] = 0;
-    } else {
-        for (i = 0; i < 91; i++) {
-            pra_01_80243178[i] = i + 128;
-            pra_01_80243178[91] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-
-ApiStatus PostChapter7StatUpdate(Evt* script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-
-    set_max_SP(7);
-    playerData->curHP = playerData->curMaxHP;
-    playerData->curFP = playerData->curMaxFP;
-    sync_status_menu();
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/area_pra/pra_01/pra_01.h b/src/world/area_pra/pra_01/pra_01.h
index af07a68ef6..7617558607 100644
--- a/src/world/area_pra/pra_01/pra_01.h
+++ b/src/world/area_pra/pra_01/pra_01.h
@@ -2,8 +2,22 @@
 /// @brief Crystal Palace - Entrance
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_01_shape.h"
+#include "mapfs/pra_01_hit.h"
+
+#include "sprite/npc/WorldKalmar.h"
+
+enum {
+	NPC_Kalmar      = 0,
+};
+
 #define NAMESPACE pra_01
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_MakeEntities);
+extern NpcGroupList N(DefaultNPCs);
diff --git a/src/world/area_pra/pra_01/pra_01_0_header.c b/src/world/area_pra/pra_01/pra_01_0_header.c
new file mode 100644
index 0000000000..6b7c75c853
--- /dev/null
+++ b/src/world/area_pra/pra_01/pra_01_0_header.c
@@ -0,0 +1,19 @@
+#include "pra_01.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_01_ENTRY_0]    {  519.0,  -60.0,  105.0,   90.0 },
+    [pra_01_ENTRY_1]    {  977.0,    0.0,   70.0,  270.0 },
+    [pra_01_ENTRY_2]    {  977.0,    0.0,  -78.0,  270.0 },
+    [pra_01_ENTRY_3]    {  519.0,  -60.0, -100.0,   90.0 },
+    [pra_01_ENTRY_4]    {  774.0,  -30.0,   85.0,  270.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_MapTattle_pra_01 },
+};
diff --git a/src/world/area_pra/pra_01/pra_01_1_music.c b/src/world/area_pra/pra_01/pra_01_1_music.c
new file mode 100644
index 0000000000..a228e19d8d
--- /dev/null
+++ b/src/world/area_pra/pra_01/pra_01_1_music.c
@@ -0,0 +1,12 @@
+#include "pra_01.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_IF_EQ(GB_StoryProgress, STORY_CH7_BEGAN_PEACH_MISSION)
+        EVT_CALL(SetMusicTrack, 0, SONG_STAR_SPIRIT_THEME, 1, 8)
+    EVT_ELSE
+        EVT_CALL(SetMusicTrack, 0, SONG_SHIVER_MOUNTAIN, 0, 8)
+    EVT_END_IF
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_01/pra_01_2_main.c b/src/world/area_pra/pra_01/pra_01_2_main.c
new file mode 100644
index 0000000000..d6f6e51a84
--- /dev/null
+++ b/src/world/area_pra/pra_01/pra_01_2_main.c
@@ -0,0 +1,147 @@
+#include "pra_01.h"
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+#include "../common/GlassShimmer.inc.c"
+
+s32 N(NearDoorModelsL)[] = { MODEL_o946, -1 };
+s32 N(NearDoorModelsR)[] = { MODEL_o948, -1 };
+s32 N(FarDoorModelsL)[]  = { MODEL_o952, -1 };
+s32 N(FarDoorModelsR)[]  = { MODEL_o950, -1 };
+s32 N(BothDoorModelsL)[] = { MODEL_o946, MODEL_o952, -1 };
+s32 N(BothDoorModelsR)[] = { MODEL_o948, MODEL_o950, -1 };
+
+EvtScript N(EVS_ExitWalk_sam_10_1) = EVT_EXIT_WALK(60, pra_01_ENTRY_0, "sam_10", sam_10_ENTRY_1);
+EvtScript N(EVS_ExitWalk_pra_15_0) = EVT_EXIT_WALK(60, pra_01_ENTRY_3, "pra_15", pra_15_ENTRY_0);
+
+EvtScript N(EVS_ExitDoor_pra_02_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_01_ENTRY_1)
+    EVT_SET(LVar1, COLLIDER_deilittse)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(NearDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(NearDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_02"), pra_02_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoor_pra_02_5) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_01_ENTRY_2)
+    EVT_SET(LVar1, COLLIDER_deilittse)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(FarDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(FarDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_02"), pra_02_ENTRY_5)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sam_10_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilisw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_pra_15_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilinw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_pra_02_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_pra_02_5)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_01_ENTRY_0)
+            EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers)))
+            EVT_EXEC(EnterWalk)
+        EVT_CASE_EQ(pra_01_ENTRY_1)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(BothDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(BothDoorModelsR)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(NearDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(NearDoorModelsR)))
+            EVT_END_IF
+            EVT_EXEC_WAIT(BaseEnterDoor)
+            EVT_EXEC(N(EVS_BindExitTriggers))
+        EVT_CASE_EQ(pra_01_ENTRY_2)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(BothDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(BothDoorModelsR)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(FarDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(FarDoorModelsR)))
+            EVT_END_IF
+            EVT_EXEC_WAIT(BaseEnterDoor)
+            EVT_EXEC(N(EVS_BindExitTriggers))
+        EVT_CASE_EQ(pra_01_ENTRY_3)
+            EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers)))
+            EVT_EXEC(EnterWalk)
+        EVT_CASE_EQ(pra_01_ENTRY_4)
+            EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_END_SWITCH
+    EVT_RETURN
+    EVT_END
+};
+
+#include "common/UnkFogFunc.inc.c"
+
+API_CALLABLE(N(DisableFloorReflection)) {
+    gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION;
+    return ApiStatus_DONE2;
+}
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_SHIVER_MOUNTAIN)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_SETUP_CAMERA_ALT_NO_LEAD()
+    EVT_SET(GF_MAP_CrystalPalace, TRUE)
+    EVT_IF_EQ(GB_StoryProgress, STORY_CH7_BEGAN_PEACH_MISSION)
+        EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))
+    EVT_END_IF
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_EXEC_WAIT(N(EVS_SetupMusic))
+    EVT_CALL(N(UnkFogFunc))
+    EVT_CALL(N(DisableFloorReflection))
+    EVT_SET(LVar0, MODEL_o549)
+    EVT_SET(LVar1, MODEL_o549)
+    EVT_SET(LVar2, TEX_PANNER_0)
+    EVT_EXEC(N(EVS_GlassShimmer))
+    EVT_SET(LVar0, REFLECTION_WALL_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilisw, SURFACE_TYPE_SNOW)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1328, SURFACE_TYPE_SNOW)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1368, SURFACE_TYPE_SNOW)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1338, SURFACE_TYPE_SNOW)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1389, SURFACE_TYPE_SNOW)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilinw, SURFACE_TYPE_SNOW)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1327, SURFACE_TYPE_SNOW)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1373, SURFACE_TYPE_SNOW)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1337, SURFACE_TYPE_SNOW)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1386, SURFACE_TYPE_SNOW)
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_IF_EQ(LVar0, pra_01_ENTRY_4)
+        EVT_WAIT(65)
+    EVT_ELSE
+        EVT_WAIT(1)
+    EVT_END_IF
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_01/pra_01_3_npc.c b/src/world/area_pra/pra_01/pra_01_3_npc.c
new file mode 100644
index 0000000000..060531cdf0
--- /dev/null
+++ b/src/world/area_pra/pra_01/pra_01_3_npc.c
@@ -0,0 +1,194 @@
+#include "pra_01.h"
+#include "effects.h"
+
+#include "world/common/npc/StarSpirit.inc.c"
+
+#include "world/common/complete/KeyItemChoice.inc.c"
+MAP_STATIC_PAD(1,key_item);
+#include "world/common/complete/NormalItemChoice.inc.c"
+
+API_CALLABLE(N(UpgradeStarPowerCh7)) {
+    set_max_SP(7);
+    gPlayerData.curHP = gPlayerData.curMaxHP;
+    gPlayerData.curFP = gPlayerData.curMaxFP;
+    sync_status_menu();
+    return ApiStatus_DONE2;
+}
+
+EvtScript N(EVS_NpcIdle_Kalmar) = {
+    EVT_LOOP(0)
+        EVT_LOOP(10)
+            EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
+            EVT_SUB(LVar1, 1)
+            EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
+            EVT_WAIT(1)
+        EVT_END_LOOP
+        EVT_LOOP(10)
+            EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
+            EVT_ADD(LVar1, 1)
+            EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
+            EVT_WAIT(1)
+        EVT_END_LOOP
+    EVT_END_LOOP
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Scene_RescuedKalmar) = {
+    EVT_CALL(DisablePartnerAI, 0)
+    EVT_CALL(func_802CF56C, 2)
+    EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+    EVT_SET(LVar3, LVar0)
+    EVT_ADD(LVar3, -50)
+    EVT_SET(LVar4, LVar1)
+    EVT_ADD(LVar4, 26)
+    EVT_CALL(SetNpcPos, NPC_Kalmar, LVar3, LVar4, LVar2)
+    EVT_CALL(PlayerFaceNpc, NPC_Kalmar, FALSE)
+    EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Kalmar, 0)
+    EVT_ADD(LVar0, -25)
+    EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
+    EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
+    EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(575.0))
+    EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, -5)
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
+    EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
+    EVT_WAIT(1)
+    EVT_CALL(WaitForPlayerInputEnabled)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_WAIT(40)
+    EVT_CALL(SpeakToPlayer, NPC_Kalmar, ANIM_WorldKalmar_Talk, ANIM_WorldKalmar_Idle, 512, MSG_CH7_016D)
+    EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0))
+    EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, -6)
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
+    EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR)
+    EVT_LOOP(0)
+        EVT_CALL(UpdateLerp)
+        EVT_CALL(SetNpcRotation, NPC_Kalmar, 0, LVar0, 0)
+        EVT_WAIT(1)
+        EVT_IF_EQ(LVar1, 0)
+            EVT_BREAK_LOOP
+        EVT_END_IF
+    EVT_END_LOOP
+    EVT_CALL(EnableNpcAI, NPC_Kalmar, FALSE)
+    EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Leap)
+    EVT_WAIT(20)
+    EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem)
+    EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0)
+    EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+    EVT_SET(LVar3, LVar1)
+    EVT_ADD(LVar1, 50)
+    EVT_ADD(LVar2, 10)
+    EVT_ADD(LVar3, 30)
+    EVT_LOOP(5)
+        EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20)
+        EVT_WAIT(6)
+        EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20)
+        EVT_WAIT(6)
+    EVT_END_LOOP
+    EVT_WAIT(20)
+    EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0)
+    EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+    EVT_ADD(LVar1, 20)
+    EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30)
+    EVT_WAIT(30)
+    EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002)
+    EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Idle)
+    EVT_CALL(EnableNpcAI, NPC_Kalmar, TRUE)
+    EVT_CALL(N(UpgradeStarPowerCh7))
+    EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0197, 160, 40)
+    EVT_WAIT(10)
+    EVT_CALL(GetNpcPos, NPC_Kalmar, LVar0, LVar1, LVar2)
+    EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
+    EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0))
+    EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
+    EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_WAIT(10)
+    EVT_CALL(SpeakToPlayer, NPC_Kalmar, ANIM_WorldKalmar_Talk, ANIM_WorldKalmar_Idle, 512, MSG_CH7_016E)
+    EVT_WAIT(10)
+    EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+    EVT_ADD(LVar0, -25)
+    EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
+    EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0))
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
+    EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
+    EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_WAIT(10)
+    EVT_CALL(SpeakToPlayer, NPC_Kalmar, ANIM_WorldKalmar_Talk, ANIM_WorldKalmar_Idle, 512, MSG_CH7_016F)
+    EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_40000, TRUE)
+    EVT_THREAD
+        EVT_LOOP(25)
+            EVT_CALL(GetNpcPos, NPC_Kalmar, LVar0, LVar1, LVar2)
+            EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20)
+            EVT_WAIT(4)
+        EVT_END_LOOP
+    EVT_END_THREAD
+    EVT_THREAD
+        EVT_SET(LVar2, 0)
+        EVT_SET(LVar3, 1800)
+        EVT_CALL(MakeLerp, LVar2, LVar3, 100, EASING_CUBIC_IN)
+        EVT_LOOP(0)
+            EVT_CALL(UpdateLerp)
+            EVT_CALL(SetNpcRotation, NPC_Kalmar, 0, LVar0, 0)
+            EVT_WAIT(1)
+            EVT_IF_EQ(LVar1, 0)
+                EVT_BREAK_LOOP
+            EVT_END_IF
+        EVT_END_LOOP
+    EVT_END_THREAD
+    EVT_THREAD
+        EVT_CALL(GetNpcPos, NPC_Kalmar, LVar2, LVar3, LVar4)
+        EVT_SET(LVar5, LVar3)
+        EVT_ADD(LVar5, 180)
+        EVT_CALL(MakeLerp, LVar3, LVar5, 100, EASING_CUBIC_IN)
+        EVT_LOOP(0)
+            EVT_CALL(UpdateLerp)
+            EVT_CALL(SetNpcPos, NPC_Kalmar, LVar2, LVar0, LVar4)
+            EVT_WAIT(1)
+            EVT_IF_EQ(LVar1, 0)
+                EVT_BREAK_LOOP
+            EVT_END_IF
+        EVT_END_LOOP
+        EVT_CALL(SetNpcPos, NPC_Kalmar, NPC_DISPOSE_LOCATION)
+    EVT_END_THREAD
+    EVT_THREAD
+        EVT_WAIT(15)
+        EVT_CALL(PlaySoundAtNpc, NPC_Kalmar, SOUND_2045, 0)
+    EVT_END_THREAD
+    EVT_WAIT(10)
+    EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A)
+    EVT_WAIT(90)
+    EVT_CALL(ResetCam, CAM_DEFAULT, 3)
+    EVT_WAIT(20)
+    EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002)
+    EVT_SET(GB_StoryProgress, STORY_CH7_STAR_SPRIT_DEPARTED)
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_CALL(EnablePartnerAI)
+    EVT_CALL(DisablePlayerInput, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_Kalmar) = {
+    EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kalmar)))
+    EVT_EXEC(N(EVS_Scene_RescuedKalmar))
+    EVT_RETURN
+    EVT_END
+};
+
+StaticNpc N(NpcData_Kalmar) = {
+    .id = NPC_Kalmar,
+    .settings = &N(NpcSettings_StarSpirit),
+    .pos = { NPC_DISPOSE_LOCATION },
+    .yaw = 90,
+    .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000,
+    .init = &N(EVS_NpcInit_Kalmar),
+    .drops = NPC_NO_DROPS,
+    .animations = KALMAR_ANIMS,
+};
+
+NpcGroupList N(DefaultNPCs) = {
+    NPC_GROUP(N(NpcData_Kalmar), BTL_PRA3_FORMATION_01, BTL_PRA3_STAGE_00),
+    {}
+};
diff --git a/src/world/area_pra/pra_01/pra_01_4_entity.c b/src/world/area_pra/pra_01/pra_01_4_entity.c
new file mode 100644
index 0000000000..664597407c
--- /dev/null
+++ b/src/world/area_pra/pra_01/pra_01_4_entity.c
@@ -0,0 +1,7 @@
+#include "pra_01.h"
+#include "entity.h"
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_02/D4FFF0.c b/src/world/area_pra/pra_02/D4FFF0.c
deleted file mode 100644
index 392d9c2188..0000000000
--- a/src/world/area_pra/pra_02/D4FFF0.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "pra_02.h"
-
-static char* N(exit_str_0) = "pra_01";
-static char* N(exit_str_1) = "pra_03";
-static char* N(exit_str_2) = "pra_16";
-static char* N(exit_str_3) = "pra_13";
-static char* N(exit_str_4) = "pra_04";
-static char* N(exit_str_5) = "";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c
deleted file mode 100644
index a3e55347e3..0000000000
--- a/src/world/area_pra/pra_02/D50010.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "pra_02.h"
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "world/common/todo/GetNpcCollisionHeight.inc.c"
-
-#include "world/common/todo/AddPlayerHandsOffset.inc.c"
-
-extern s32 N(ItemChoice_HasSelectedItem);
-extern s32 N(ItemChoice_SelectedItemID);
-#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
-
-ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
-    N(ItemChoice_HasSelectedItem) = TRUE;
-    return ApiStatus_DONE2;
-}
-
-BSS s32 pra_02_D_80243CC0[114];
-BSS s32 pra_02_80243E88[92];
-
-ApiStatus func_802411D8_D511C8(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = (s32*) evt_get_variable(script, *args++);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            pra_02_D_80243CC0[i] = ptr[i];
-        }
-        pra_02_D_80243CC0[i] = 0;
-    } else {
-        for (i = 0; i < 112; i++) {
-            pra_02_D_80243CC0[i] = i + 16;
-            pra_02_D_80243CC0[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_80241274_D51264(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = (s32*) evt_get_variable(script, *args++);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            pra_02_80243E88[i] = ptr[i];
-        }
-        pra_02_80243E88[i] = 0;
-    } else {
-        for (i = 0; i < 91; i++) {
-            pra_02_80243E88[i] = i + 128;
-            pra_02_80243E88[91] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-
-#include "world/common/todo/SetEntityPositionF.inc.c"
-
-#include "world/common/todo/GetEntityPosition.inc.c"
-
-#include "world/common/todo/UnkFunc44.inc.c"
-
-ApiStatus func_802414A8_D51498(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32 entityIdx = evt_get_variable(script, *args++);
-    f32 x = evt_get_float_variable(script, *args++);
-    f32 y = evt_get_float_variable(script, *args++);
-    f32 z = evt_get_float_variable(script, *args++);
-    f32 temp = evt_get_float_variable(script, MapVar(0));
-    Entity* entity;
-
-    if (entityIdx == -1) {
-        return ApiStatus_DONE2;
-    }
-
-    entity = get_entity_by_index(entityIdx);
-    entity->position.x = x;
-    entity->position.y = y + temp;
-    entity->position.z = z;
-    return ApiStatus_DONE2;
-}
-
-#include "world/common/todo/RemovePadlock.inc.c"
-
-#define NAMESPACE dup_pra_02
-#include "world/common/todo/GetEntityPosition.inc.c"
-#define NAMESPACE pra_02
diff --git a/src/world/area_pra/pra_02/pra_02.h b/src/world/area_pra/pra_02/pra_02.h
index 5d5c8635e6..bebbb58c09 100644
--- a/src/world/area_pra/pra_02/pra_02.h
+++ b/src/world/area_pra/pra_02/pra_02.h
@@ -2,8 +2,29 @@
 /// @brief Crystal Palace - Entry Hall
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_02_shape.h"
+#include "mapfs/pra_02_hit.h"
+
+enum {
+    MV_WallPosOffset    = MapVar(0),
+    MV_NearRedPadlock   = MapVar(1),
+    MV_FarRedPadlock    = MapVar(2),
+    MV_NearBluePadlock  = MapVar(3),
+    MV_FarBluePadlock   = MapVar(4),
+};
+
 #define NAMESPACE pra_02
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_ManagePoundableSwitch);
+extern EvtScript N(EVS_UpdateShiftingWallPos);
+extern EvtScript N(EVS_ExitDoors_pra_16_0);
+extern EvtScript N(EVS_ExitDoors_pra_16_3);
+extern EvtScript N(EVS_ExitDoors_pra_13_0);
+extern EvtScript N(EVS_ExitDoors_pra_13_3);
+extern EvtScript N(EVS_MakeEntities);
diff --git a/src/world/area_pra/pra_02/pra_02_0_header.c b/src/world/area_pra/pra_02/pra_02_0_header.c
new file mode 100644
index 0000000000..06e5bc9b9e
--- /dev/null
+++ b/src/world/area_pra/pra_02/pra_02_0_header.c
@@ -0,0 +1,19 @@
+#include "pra_02.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_02_ENTRY_0]    {   13.0,    0.0,   77.0,   90.0 },
+    [pra_02_ENTRY_1]    {  500.0,    0.0,  212.0,    0.0 },
+    [pra_02_ENTRY_2]    {  960.0,    0.0,   80.0,  270.0 },
+    [pra_02_ENTRY_3]    {  960.0,    0.0,  -80.0,  270.0 },
+    [pra_02_ENTRY_4]    {  500.0,    0.0, -212.0,  180.0 },
+    [pra_02_ENTRY_5]    {   13.0,    0.0,  -77.0,   90.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_02 },
+};
diff --git a/src/world/area_pra/pra_02/pra_02_1_music.c b/src/world/area_pra/pra_02/pra_02_1_music.c
new file mode 100644
index 0000000000..49b8cd19f6
--- /dev/null
+++ b/src/world/area_pra/pra_02/pra_02_1_music.c
@@ -0,0 +1,7 @@
+#include "pra_02.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_02/pra_02_2_main.c b/src/world/area_pra/pra_02/pra_02_2_main.c
new file mode 100644
index 0000000000..09e80c8307
--- /dev/null
+++ b/src/world/area_pra/pra_02/pra_02_2_main.c
@@ -0,0 +1,351 @@
+#include "pra_02.h"
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+#include "../common/GlassShimmer.inc.c"
+
+EvtScript N(EVS_UpdateShiftingWallPos) = {
+    EVT_CALL(TranslateGroup, MODEL_g293, 0, 250, 0)
+    EVT_CALL(TranslateGroup, MODEL_g291, 0, MV_WallPosOffset, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+s32 N(NearLeftDoorModelsL)[] = { MODEL_o772, MODEL_o844, -1 };
+s32 N(NearLeftDoorModelsR)[] = { MODEL_o768, MODEL_o846, -1 };
+s32 N(FarLeftDoorModelsL)[] = { MODEL_o859, -1 };
+s32 N(FarLeftDoorModelsR)[] = { MODEL_o861, -1 };
+s32 N(BothLeftDoorModelsL)[] = { MODEL_o772, MODEL_o844, MODEL_o859, -1 };
+s32 N(BothLeftDoorModelsR)[] = { MODEL_o768, MODEL_o846, MODEL_o861, -1 };
+
+s32 N(FarBlueDoorModelsL)[] = { MODEL_o1162, -1 };
+s32 N(FarBlueDoorModelsR)[] = { MODEL_o1160, -1 };
+s32 N(FarRedDoorModelsL)[] = { MODEL_o952, -1 };
+s32 N(FarRedDoorModelsR)[] = { MODEL_o950, -1 };
+
+s32 N(NearBlueDoorModelsL)[] = { MODEL_o1156, -1 };
+s32 N(NearBlueDoorModelsR)[] = { MODEL_o1158, -1 };
+s32 N(NearRedDoorModelsL)[] = { MODEL_o946, -1 };
+s32 N(NearRedDoorModelsR)[] = { MODEL_o948, -1 };
+
+s32 N(BothBlueDoorModelsL)[] = { MODEL_o1156, MODEL_o1162, -1 };
+s32 N(BothBlueDoorModelsR)[] = { MODEL_o1158, MODEL_o1160, -1 };
+s32 N(BothRedDoorModelsL)[] = { MODEL_o946, MODEL_o952, -1 };
+s32 N(BothRedDoorModelsR)[] = { MODEL_o948, MODEL_o950, -1 };
+
+s32 N(NearCenterDoorModels)[] = { MODEL_o847, -1 };
+s32 N(FarCenterDoorModels)[] = { MODEL_o774, -1 };
+s32 N(EmptyModelList)[] = { -1 };
+
+EvtScript N(EVS_ExitDoors_pra_01_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_SET(LVar0, pra_02_ENTRY_0)
+    EVT_SET(LVar1, 24)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothLeftDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothLeftDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(NearLeftDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(NearLeftDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_01"), pra_01_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_03_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_SET(LVar0, pra_02_ENTRY_1)
+    EVT_SET(LVar1, 56)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(NearCenterDoorModels)))
+        EVT_SET(LVar3, EVT_PTR(N(FarCenterDoorModels)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(NearCenterDoorModels)))
+        EVT_SET(LVar3, EVT_PTR(N(EmptyModelList)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_03"), pra_03_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_16_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_CREAKY)
+    EVT_SET(LVar0, pra_02_ENTRY_2)
+    EVT_SET(LVar1, 36)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothRedDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothRedDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(NearRedDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(NearRedDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_16"), pra_16_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_13_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_CREAKY)
+    EVT_SET(LVar0, pra_02_ENTRY_2)
+    EVT_SET(LVar1, 36)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothBlueDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothBlueDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(NearBlueDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(NearBlueDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_13"), pra_13_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_16_3) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_CREAKY)
+    EVT_SET(LVar0, pra_02_ENTRY_3)
+    EVT_SET(LVar1, 32)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothRedDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothRedDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(FarRedDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(FarRedDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_16"), pra_16_ENTRY_3)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_13_3) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_CREAKY)
+    EVT_SET(LVar0, pra_02_ENTRY_3)
+    EVT_SET(LVar1, 32)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothBlueDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothBlueDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(FarBlueDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(FarBlueDoorModelsR)))
+    EVT_END_IF
+EVT_END_IF
+EVT_EXEC(BaseExitDoor)
+EVT_WAIT(17)
+EVT_CALL(GotoMap, EVT_PTR("pra_13"), pra_13_ENTRY_3)
+EVT_WAIT(100)
+EVT_RETURN
+EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_04_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_SET(LVar0, pra_02_ENTRY_4)
+    EVT_SET(LVar1, 51)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(NearCenterDoorModels)))
+        EVT_SET(LVar3, EVT_PTR(N(FarCenterDoorModels)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(EmptyModelList)))
+        EVT_SET(LVar3, EVT_PTR(N(FarCenterDoorModels)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_04"), pra_04_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_01_2) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_SET(LVar0, pra_02_ENTRY_5)
+    EVT_SET(LVar1, COLLIDER_deilittnw)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothLeftDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothLeftDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(FarLeftDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(FarLeftDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_01"), pra_01_ENTRY_2)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_01_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_03_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittssw, 1, 0)
+    EVT_IF_EQ(GF_PRA02_DoorColorToggle, FALSE)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittse2, COLLIDER_FLAGS_UPPER_MASK)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne2, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_ELSE
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittse, COLLIDER_FLAGS_UPPER_MASK)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_END_IF
+    EVT_IF_EQ(GF_PRA02_UnlockedRedDoor, TRUE)
+        EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_16_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+        EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_16_3)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne, 1, 0)
+    EVT_END_IF
+    EVT_IF_EQ(GF_PRA02_UnlockedBlueDoor, TRUE)
+        EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_13_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse2, 1, 0)
+        EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_13_3)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne2, 1, 0)
+    EVT_END_IF
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_04_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittnnw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_01_2)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittnw, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_02_ENTRY_0)
+            EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+            EVT_IF_EQ(GF_PRA02_Visited, FALSE)
+                EVT_SET(GF_PRA02_Visited, TRUE)
+                EVT_SET(GB_StoryProgress, STORY_CH7_ARRIVED_AT_CRYSTAL_PALACE)
+            EVT_END_IF
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(BothLeftDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(BothLeftDoorModelsR)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(NearLeftDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(NearLeftDoorModelsR)))
+            EVT_END_IF
+        EVT_CASE_EQ(pra_02_ENTRY_1)
+            EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(NearCenterDoorModels)))
+                EVT_SET(LVar3, EVT_PTR(N(FarCenterDoorModels)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(NearCenterDoorModels)))
+                EVT_SET(LVar3, EVT_PTR(N(EmptyModelList)))
+            EVT_END_IF
+        EVT_CASE_EQ(pra_02_ENTRY_2)
+            EVT_CALL(UseDoorSounds, DOOR_SOUNDS_CREAKY)
+            EVT_IF_EQ(GF_PRA02_DoorColorToggle, FALSE)
+                EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                    EVT_SET(LVar2, EVT_PTR(N(BothRedDoorModelsL)))
+                    EVT_SET(LVar3, EVT_PTR(N(BothRedDoorModelsR)))
+                EVT_ELSE
+                    EVT_SET(LVar2, EVT_PTR(N(NearRedDoorModelsL)))
+                    EVT_SET(LVar3, EVT_PTR(N(NearRedDoorModelsR)))
+                EVT_END_IF
+            EVT_ELSE
+                EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                    EVT_SET(LVar2, EVT_PTR(N(BothBlueDoorModelsL)))
+                    EVT_SET(LVar3, EVT_PTR(N(BothBlueDoorModelsR)))
+                EVT_ELSE
+                    EVT_SET(LVar2, EVT_PTR(N(NearBlueDoorModelsL)))
+                    EVT_SET(LVar3, EVT_PTR(N(NearBlueDoorModelsR)))
+                EVT_END_IF
+            EVT_END_IF
+        EVT_CASE_EQ(pra_02_ENTRY_3)
+            EVT_CALL(UseDoorSounds, DOOR_SOUNDS_CREAKY)
+            EVT_IF_EQ(GF_PRA02_DoorColorToggle, FALSE)
+                EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                    EVT_SET(LVar2, EVT_PTR(N(BothRedDoorModelsL)))
+                    EVT_SET(LVar3, EVT_PTR(N(BothRedDoorModelsR)))
+                EVT_ELSE
+                    EVT_SET(LVar2, EVT_PTR(N(FarRedDoorModelsL)))
+                    EVT_SET(LVar3, EVT_PTR(N(FarRedDoorModelsR)))
+                EVT_END_IF
+            EVT_ELSE
+                EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                    EVT_SET(LVar2, EVT_PTR(N(BothBlueDoorModelsL)))
+                    EVT_SET(LVar3, EVT_PTR(N(BothBlueDoorModelsR)))
+                EVT_ELSE
+                    EVT_SET(LVar2, EVT_PTR(N(FarBlueDoorModelsL)))
+                    EVT_SET(LVar3, EVT_PTR(N(FarBlueDoorModelsR)))
+                EVT_END_IF
+            EVT_END_IF
+        EVT_CASE_EQ(pra_02_ENTRY_4)
+            EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(NearCenterDoorModels)))
+                EVT_SET(LVar3, EVT_PTR(N(FarCenterDoorModels)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(EmptyModelList)))
+                EVT_SET(LVar3, EVT_PTR(N(FarCenterDoorModels)))
+            EVT_END_IF
+        EVT_CASE_EQ(pra_02_ENTRY_5)
+            EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(BothLeftDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(BothLeftDoorModelsR)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(FarLeftDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(FarLeftDoorModelsR)))
+            EVT_END_IF
+    EVT_END_SWITCH
+    EVT_EXEC_WAIT(BaseEnterDoor)
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_IF_EQ(GF_PRA02_DoorColorToggle, FALSE)
+        EVT_SET(MV_WallPosOffset, 0)
+        EVT_CALL(SetGroupEnabled, MODEL_g308, 0)
+    EVT_ELSE
+        EVT_SET(MV_WallPosOffset, -250)
+        EVT_CALL(SetGroupEnabled, MODEL_g307, 0)
+    EVT_END_IF
+    EVT_EXEC(N(EVS_UpdateShiftingWallPos))
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ManagePoundableSwitch)), TRIGGER_FLOOR_TOUCH, COLLIDER_o1342, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ManagePoundableSwitch)), TRIGGER_FLOOR_TOUCH, COLLIDER_o1344, 1, 0)
+    EVT_SET(LVar0, MODEL_o549)
+    EVT_SET(LVar1, MODEL_o549)
+    EVT_SET(LVar2, TEX_PANNER_0)
+    EVT_EXEC(N(EVS_GlassShimmer))
+    EVT_SET(LVar0, REFLECTION_WALL_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_02/pra_02_3_npc.c b/src/world/area_pra/pra_02/pra_02_3_npc.c
new file mode 100644
index 0000000000..89655e9326
--- /dev/null
+++ b/src/world/area_pra/pra_02/pra_02_3_npc.c
@@ -0,0 +1,17 @@
+#include "pra_02.h"
+
+EvtScript N(EVS_NpcAuxAI_Unused) = {
+    EVT_RETURN
+    EVT_END
+};
+
+NpcSettings N(NpcSettings_Unused) = {
+    .height = 70,
+    .radius = 25,
+    .level = 99,
+    .otherAI = &N(EVS_NpcAuxAI_Unused),
+};
+
+#include "world/common/complete/KeyItemChoice.inc.c"
+MAP_STATIC_PAD(1,key_item);
+#include "world/common/complete/NormalItemChoice.inc.c"
diff --git a/src/world/area_pra/pra_02/pra_02_4_entity.c b/src/world/area_pra/pra_02/pra_02_4_entity.c
new file mode 100644
index 0000000000..c4de6753a7
--- /dev/null
+++ b/src/world/area_pra/pra_02/pra_02_4_entity.c
@@ -0,0 +1,277 @@
+#include "pra_02.h"
+#include "entity.h"
+#include "effects.h"
+
+#define NAME_SUFFIX _Unused
+#include "world/common/todo/SetEntityPositionF.inc.c"
+#include "world/common/todo/GetEntityPosition.inc.c"
+#define NAME_SUFFIX
+
+s32 N(RedKeyList)[] = {
+    ITEM_RED_KEY,
+    ITEM_NONE
+};
+
+s32 N(BlueKeyList)[] = {
+    ITEM_BLUE_KEY,
+    ITEM_NONE
+};
+
+EvtScript N(EVS_RaisePoundableSwitch) = {
+    EVT_CALL(MakeLerp, -10, 0, 10, EASING_LINEAR)
+    EVT_LOOP(0)
+        EVT_CALL(UpdateLerp)
+        EVT_CALL(TranslateGroup, MODEL_g307, 0, LVar0, 0)
+        EVT_CALL(TranslateGroup, MODEL_g308, 0, LVar0, 0)
+        EVT_CALL(UpdateColliderTransform, COLLIDER_o1342)
+        EVT_CALL(UpdateColliderTransform, COLLIDER_o1344)
+        EVT_WAIT(1)
+        EVT_IF_EQ(LVar1, 0)
+            EVT_BREAK_LOOP
+        EVT_END_IF
+    EVT_END_LOOP
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_LowerPoundableSwitch) = {
+    EVT_CALL(PlaySoundAtCollider, COLLIDER_o1344, SOUND_208B, 0)
+    EVT_CALL(MakeLerp, 0, -10, 10, EASING_LINEAR)
+    EVT_LOOP(0)
+        EVT_CALL(UpdateLerp)
+        EVT_CALL(TranslateGroup, MODEL_g307, 0, LVar0, 0)
+        EVT_CALL(TranslateGroup, MODEL_g308, 0, LVar0, 0)
+        EVT_CALL(UpdateColliderTransform, COLLIDER_o1342)
+        EVT_CALL(UpdateColliderTransform, COLLIDER_o1344)
+        EVT_WAIT(1)
+        EVT_IF_EQ(LVar1, 0)
+            EVT_BREAK_LOOP
+        EVT_END_IF
+    EVT_END_LOOP
+    EVT_RETURN
+    EVT_END
+};
+
+#include "world/common/todo/IsPlayerPounding.inc.c"
+
+API_CALLABLE(N(UpdatePadlockPosition)) {
+    Bytecode* args = script->ptrReadPos;
+    s32 entityIdx = evt_get_variable(script, *args++);
+    f32 x = evt_get_float_variable(script, *args++);
+    f32 y = evt_get_float_variable(script, *args++);
+    f32 z = evt_get_float_variable(script, *args++);
+    f32 offset = evt_get_float_variable(script, MV_WallPosOffset);
+    Entity* entity;
+
+    if (entityIdx == -1) {
+        return ApiStatus_DONE2;
+    }
+
+    entity = get_entity_by_index(entityIdx);
+    entity->position.x = x;
+    entity->position.y = y + offset;
+    entity->position.z = z;
+    return ApiStatus_DONE2;
+}
+
+EvtScript N(EVS_ManagePoundableSwitch) = {
+    EVT_CALL(N(IsPlayerPounding))
+    EVT_IF_EQ(LVar0, FALSE)
+        EVT_RETURN
+    EVT_END_IF
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_IF_EQ(GF_PRA02_DoorColorToggle, FALSE)
+        EVT_CALL(MakeLerp, 0, -250, 250, EASING_LINEAR)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittse, COLLIDER_FLAGS_UPPER_MASK)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_UPPER_MASK)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilittse2, COLLIDER_FLAGS_UPPER_MASK)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilittne2, COLLIDER_FLAGS_UPPER_MASK)
+        EVT_SET(GF_PRA02_DoorColorToggle, TRUE)
+        EVT_EXEC(N(EVS_LowerPoundableSwitch))
+    EVT_ELSE
+        EVT_CALL(MakeLerp, -250, 0, 250, EASING_LINEAR)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittse2, COLLIDER_FLAGS_UPPER_MASK)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne2, COLLIDER_FLAGS_UPPER_MASK)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilittse, COLLIDER_FLAGS_UPPER_MASK)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_UPPER_MASK)
+        EVT_SET(GF_PRA02_DoorColorToggle, FALSE)
+        EVT_EXEC(N(EVS_LowerPoundableSwitch))
+    EVT_END_IF
+    EVT_WAIT(30)
+    EVT_THREAD
+        EVT_PLAY_EFFECT(EFFECT_DUST, 0, 1000, 250, 60, 50)
+        EVT_PLAY_EFFECT(EFFECT_DUST, 0, 1000, 250, 120, 50)
+        EVT_PLAY_EFFECT(EFFECT_DUST, 0, 1000, 250, 180, 50)
+        EVT_PLAY_EFFECT(EFFECT_DUST, 0, 1000, 250, -60, 50)
+        EVT_PLAY_EFFECT(EFFECT_DUST, 0, 1000, 250, -120, 50)
+        EVT_PLAY_EFFECT(EFFECT_DUST, 0, 1000, 250, -180, 50)
+    EVT_END_THREAD
+    EVT_THREAD
+        EVT_CALL(PlaySound, SOUND_3F)
+        EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 250, EVT_FLOAT(0.5))
+        EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.5))
+        EVT_CALL(PlaySound, SOUND_40)
+    EVT_END_THREAD
+    EVT_LABEL(0)
+        EVT_CALL(UpdateLerp)
+        EVT_SET(MV_WallPosOffset, LVar0)
+        EVT_EXEC_WAIT(N(EVS_UpdateShiftingWallPos))
+        EVT_IF_EQ(LVar1, 1)
+            EVT_GOTO(0)
+        EVT_END_IF
+    EVT_WAIT(10)
+    EVT_IF_EQ(GF_PRA02_DoorColorToggle, TRUE)
+        EVT_CALL(SetGroupEnabled, MODEL_g307, 0)
+        EVT_CALL(SetGroupEnabled, MODEL_g308, 1)
+        EVT_EXEC_WAIT(N(EVS_RaisePoundableSwitch))
+    EVT_ELSE
+        EVT_CALL(SetGroupEnabled, MODEL_g307, 1)
+        EVT_CALL(SetGroupEnabled, MODEL_g308, 0)
+        EVT_EXEC_WAIT(N(EVS_RaisePoundableSwitch))
+    EVT_END_IF
+    EVT_CALL(DisablePlayerInput, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_DoNothing) = {
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_UsePadlock_Dummy) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_DoNothing)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_DoNothing)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_UpdatePadlockPositions) = {
+    EVT_LOOP(0)
+        EVT_CALL(N(UpdatePadlockPosition), MV_NearRedPadlock, 987, 8, 84)
+        EVT_CALL(N(UpdatePadlockPosition), MV_FarRedPadlock, 987, 8, -84)
+        EVT_CALL(N(UpdatePadlockPosition), MV_NearBluePadlock, 987, 258, 84)
+        EVT_CALL(N(UpdatePadlockPosition), MV_FarBluePadlock, 987, 258, -84)
+        EVT_WAIT(1)
+    EVT_END_LOOP
+    EVT_RETURN
+    EVT_END
+};
+
+#include "world/common/todo/RemovePadlock.inc.c"
+#include "world/common/todo/GetEntityPosition.inc.c"
+
+EvtScript N(EVS_ItemPrompt_RedPadlock) = {
+    EVT_SET_GROUP(EVT_GROUP_00)
+    EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL)
+    EVT_CALL(ShowKeyChoicePopup)
+    EVT_IF_EQ(LVar0, 0)
+        EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40)
+        EVT_CALL(CloseChoicePopup)
+        EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL)
+        EVT_RETURN
+    EVT_END_IF
+    EVT_IF_EQ(LVar0, -1)
+        EVT_CALL(CloseChoicePopup)
+        EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL)
+        EVT_RETURN
+    EVT_END_IF
+    EVT_CALL(FindKeyItem, ITEM_RED_KEY, LVar0)
+    EVT_CALL(RemoveKeyItemAt, LVar0)
+    EVT_CALL(CloseChoicePopup)
+    EVT_SET(GF_PRA02_UnlockedRedDoor, TRUE)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_16_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_16_3)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne, 1, 0)
+    EVT_CALL(N(GetEntityPosition), MV_NearRedPadlock, LVar0, LVar1, LVar2)
+    EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2)
+    EVT_CALL(N(GetEntityPosition), MV_FarRedPadlock, LVar0, LVar1, LVar2)
+    EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2)
+    EVT_SET(LVar0, MV_NearRedPadlock)
+    EVT_SET(MV_NearRedPadlock, -1)
+    EVT_CALL(N(RemovePadlock))
+    EVT_SET(LVar0, MV_FarRedPadlock)
+    EVT_SET(MV_FarRedPadlock, -1)
+    EVT_CALL(N(RemovePadlock))
+    EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL)
+    EVT_UNBIND
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ItemPrompt_BluePadlock) = {
+    EVT_SET_GROUP(EVT_GROUP_00)
+    EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL)
+    EVT_CALL(ShowKeyChoicePopup)
+    EVT_IF_EQ(LVar0, 0)
+        EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40)
+        EVT_CALL(CloseChoicePopup)
+        EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL)
+        EVT_RETURN
+    EVT_END_IF
+    EVT_IF_EQ(LVar0, -1)
+        EVT_CALL(CloseChoicePopup)
+        EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL)
+        EVT_RETURN
+    EVT_END_IF
+    EVT_CALL(FindKeyItem, ITEM_BLUE_KEY, LVar0)
+    EVT_CALL(RemoveKeyItemAt, LVar0)
+    EVT_CALL(CloseChoicePopup)
+    EVT_SET(GF_PRA02_UnlockedBlueDoor, TRUE)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_13_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse2, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_13_3)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne2, 1, 0)
+    EVT_CALL(N(GetEntityPosition), MV_NearBluePadlock, LVar0, LVar1, LVar2)
+    EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2)
+    EVT_CALL(N(GetEntityPosition), MV_FarBluePadlock, LVar0, LVar1, LVar2)
+    EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2)
+    EVT_SET(LVar0, MV_NearBluePadlock)
+    EVT_SET(MV_NearBluePadlock, -1)
+    EVT_CALL(N(RemovePadlock))
+    EVT_SET(LVar0, MV_FarBluePadlock)
+    EVT_SET(MV_FarBluePadlock, -1)
+    EVT_CALL(N(RemovePadlock))
+    EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL)
+    EVT_UNBIND
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_SET(MV_NearRedPadlock, -1)
+    EVT_SET(MV_FarRedPadlock, -1)
+    EVT_SET(MV_NearBluePadlock, -1)
+    EVT_SET(MV_FarBluePadlock, -1)
+    EVT_SET(LVar2, COLLISION_WITH_ENTITY_BIT)
+    EVT_IF_EQ(GF_PRA02_UnlockedRedDoor, FALSE)
+        EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 987, 8, 84, -80, MAKE_ENTITY_END)
+        EVT_CALL(AssignScript, EVT_PTR(N(EVS_UsePadlock_Dummy)))
+        EVT_SET(MV_NearRedPadlock, LVar0)
+        EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_RedPadlock)), TRIGGER_WALL_PRESS_A, LVar2, EVT_PTR(N(RedKeyList)), 0, 1)
+        EVT_ADD(LVar2, 1)
+        EVT_CALL(UseDynamicShadow, TRUE)
+        EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 987, 8, -84, -80, MAKE_ENTITY_END)
+        EVT_CALL(AssignScript, EVT_PTR(N(EVS_UsePadlock_Dummy)))
+        EVT_SET(MV_FarRedPadlock, LVar0)
+        EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_RedPadlock)), TRIGGER_WALL_PRESS_A, LVar2, EVT_PTR(N(RedKeyList)), 0, 1)
+        EVT_ADD(LVar2, 1)
+        EVT_CALL(UseDynamicShadow, TRUE)
+    EVT_END_IF
+    EVT_IF_EQ(GF_PRA02_UnlockedBlueDoor, FALSE)
+        EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 987, 258, 84, -80, MAKE_ENTITY_END)
+        EVT_CALL(AssignScript, EVT_PTR(N(EVS_UsePadlock_Dummy)))
+        EVT_SET(MV_NearBluePadlock, LVar0)
+        EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_BluePadlock)), TRIGGER_WALL_PRESS_A, LVar2, EVT_PTR(N(BlueKeyList)), 0, 1)
+        EVT_ADD(LVar2, 1)
+        EVT_CALL(UseDynamicShadow, TRUE)
+        EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 987, 258, -84, -80, MAKE_ENTITY_END)
+        EVT_CALL(AssignScript, EVT_PTR(N(EVS_UsePadlock_Dummy)))
+        EVT_SET(MV_FarBluePadlock, LVar0)
+        EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_BluePadlock)), TRIGGER_WALL_PRESS_A, LVar2, EVT_PTR(N(BlueKeyList)), 0, 1)
+        EVT_ADD(LVar2, 1)
+        EVT_CALL(UseDynamicShadow, TRUE)
+    EVT_END_IF
+    EVT_EXEC(N(EVS_UpdatePadlockPositions))
+    EVT_CALL(ParentColliderToModel, COLLIDER_o1344, MODEL_o1222)
+    EVT_CALL(ParentColliderToModel, COLLIDER_o1342, MODEL_o1228)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_03/D53CB0.c b/src/world/area_pra/pra_03/D53CB0.c
deleted file mode 100644
index 7d761a4968..0000000000
--- a/src/world/area_pra/pra_03/D53CB0.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "pra_03.h"
-
-static char* N(exit_str_0) = "pra_02";
-static char* N(exit_str_1) = "pra_38";
-static char* N(exit_str_2) = "pra_09";
-static char* N(exit_str_3) = "";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_03/D53CD0.c b/src/world/area_pra/pra_03/D53CD0.c
deleted file mode 100644
index f4350868d8..0000000000
--- a/src/world/area_pra/pra_03/D53CD0.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "pra_03.h"
-
-ApiStatus func_80240020_D53CD0(Evt* script, s32 isInitialCall) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-
-    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
-        script->varTable[0] = 150;
-    }
-    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
-        script->varTable[0] = 95;
-    }
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_802400AC_D53D5C(Evt* script, s32 isInitialCall) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-
-    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
-        script->varTable[0] = 165;
-    }
-    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
-        script->varTable[0] = 70;
-    }
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_80240138_D53DE8(Evt* script, s32 isInitialCall) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-
-    if (playerStatus->lastGoodPosition.y == 0) {
-        evt_set_variable(script, MapVar(0), 0);
-    }
-    if (playerStatus->lastGoodPosition.y == -200) {
-        evt_set_variable(script, MapVar(0), 1);
-    }
-    return ApiStatus_BLOCK;
-}
diff --git a/src/world/area_pra/pra_03/pra_03.h b/src/world/area_pra/pra_03/pra_03.h
index 8f7a97ca01..bee5c2614a 100644
--- a/src/world/area_pra/pra_03/pra_03.h
+++ b/src/world/area_pra/pra_03/pra_03.h
@@ -2,8 +2,19 @@
 /// @brief Crystal Palace - Save Room
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_03_shape.h"
+#include "mapfs/pra_03_hit.h"
+
+enum {
+    MV_PlayerFloor  = MapVar(0),
+};
+
 #define NAMESPACE pra_03
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_MakeEntities);
diff --git a/src/world/area_pra/pra_03/pra_03_0_header.c b/src/world/area_pra/pra_03/pra_03_0_header.c
new file mode 100644
index 0000000000..d14de9f0a8
--- /dev/null
+++ b/src/world/area_pra/pra_03/pra_03_0_header.c
@@ -0,0 +1,16 @@
+#include "pra_03.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_03_ENTRY_0]    { -128.0,    0.0, -137.0,  180.0 },
+    [pra_03_ENTRY_1]    {  237.0,    0.0,  -70.0,  270.0 },
+    [pra_03_ENTRY_2]    {  237.0, -200.0,  -70.0,  270.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_03 },
+};
diff --git a/src/world/area_pra/pra_03/pra_03_1_music.c b/src/world/area_pra/pra_03/pra_03_1_music.c
new file mode 100644
index 0000000000..f3f23971ad
--- /dev/null
+++ b/src/world/area_pra/pra_03/pra_03_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_03.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_03/pra_03_2_main.c b/src/world/area_pra/pra_03/pra_03_2_main.c
new file mode 100644
index 0000000000..a9c0108f5c
--- /dev/null
+++ b/src/world/area_pra/pra_03/pra_03_2_main.c
@@ -0,0 +1,75 @@
+#include "pra_03.h"
+
+EvtScript N(EVS_ExitDoors_pra_02_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_03_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittnnw)
+    EVT_SET(LVar2, MODEL_o774)
+    EVT_SET(LVar3, DOOR_SWING_IN)
+    EVT_EXEC(ExitSingleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_02"), pra_02_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_38_0) = EVT_EXIT_DOUBLE_DOOR(pra_03_ENTRY_1, "pra_38", pra_38_ENTRY_0, COLLIDER_deilittne, MODEL_o880, MODEL_o878);
+EvtScript N(EVS_ExitDoors_pra_09_0) = EVT_EXIT_DOUBLE_DOOR(pra_03_ENTRY_2, "pra_09", pra_09_ENTRY_0, COLLIDER_deilittnne, MODEL_o989, MODEL_o988);
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_02_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittnnw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_38_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_09_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittnne, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetLoadType, LVar1)
+    EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT)
+        EVT_EXEC(EnterSavePoint)
+        EVT_EXEC(N(EVS_BindExitTriggers))
+        EVT_RETURN
+    EVT_END_IF
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_03_ENTRY_0)
+            EVT_SET(LVar2, MODEL_o774)
+            EVT_SET(LVar3, DOOR_SWING_IN)
+            EVT_EXEC_WAIT(EnterSingleDoor)
+        EVT_CASE_EQ(pra_03_ENTRY_1)
+            EVT_SET(LVar2, MODEL_o880)
+            EVT_SET(LVar3, MODEL_o878)
+            EVT_EXEC_WAIT(EnterDoubleDoor)
+        EVT_CASE_EQ(pra_03_ENTRY_2)
+            EVT_SET(LVar2, MODEL_o989)
+            EVT_SET(LVar3, MODEL_o988)
+            EVT_EXEC_WAIT(EnterDoubleDoor)
+    EVT_END_SWITCH
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_IF_EQ(GF_PRA04_BoardedFloor, TRUE)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK)
+        EVT_CALL(EnableModel, MODEL_g286, FALSE)
+    EVT_ELSE
+        EVT_CALL(EnableModel, MODEL_o998, FALSE)
+    EVT_END_IF
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_03/pra_03_3_entity.c b/src/world/area_pra/pra_03/pra_03_3_entity.c
new file mode 100644
index 0000000000..9ee73d8dee
--- /dev/null
+++ b/src/world/area_pra/pra_03/pra_03_3_entity.c
@@ -0,0 +1,92 @@
+#include "pra_03.h"
+#include "entity.h"
+
+API_CALLABLE(N(GetTargetPosXForSpring_Floor1)) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
+        script->varTable[0] = 150;
+    }
+    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
+        script->varTable[0] = 95;
+    }
+    return ApiStatus_DONE2;
+}
+
+API_CALLABLE(N(GetTargetPosXForSpring_Floor0)) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
+        script->varTable[0] = 165;
+    }
+    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
+        script->varTable[0] = 70;
+    }
+    return ApiStatus_DONE2;
+}
+
+API_CALLABLE(N(MonitorPlayerFloor)) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->lastGoodPosition.y == 0) {
+        evt_set_variable(script, MV_PlayerFloor, 0);
+    }
+    if (playerStatus->lastGoodPosition.y == -200) {
+        evt_set_variable(script, MV_PlayerFloor, 1);
+    }
+    return ApiStatus_BLOCK;
+}
+
+EvtScript N(EVS_TetherCamToPlayerWithCeiling) = {
+    EVT_LABEL(0)
+        EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+        EVT_IF_GE(LVar1, LVar3)
+            EVT_SET(LVar1, LVar3)
+        EVT_END_IF
+        EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
+        EVT_WAIT(1)
+    EVT_GOTO(0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_UseSpring) = {
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(DisablePlayerPhysics, TRUE)
+    EVT_CALL(SetPlayerActionState, ACTION_STATE_LAUNCH)
+    EVT_CALL(GetPlayerPos, LVar7, LVar8, LVar9)
+    EVT_IF_EQ(MV_PlayerFloor, 0)
+        EVT_SET(LVar3, -175)
+        EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayerWithCeiling), LVarA)
+        EVT_CALL(N(GetTargetPosXForSpring_Floor0))
+        EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0))
+        EVT_SET(LVar1, -200)
+        EVT_SET(LVar2, 15)
+    EVT_ELSE
+        EVT_SET(LVar3, 0)
+        EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayerWithCeiling), LVarA)
+        EVT_CALL(N(GetTargetPosXForSpring_Floor1))
+        EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7))
+        EVT_SET(LVar1, 0)
+        EVT_SET(LVar2, 35)
+    EVT_END_IF
+    EVT_CALL(PlayerJump, LVar0, LVar1, LVar9, LVar2)
+    EVT_KILL_THREAD(LVarA)
+    EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE)
+    EVT_WAIT(2)
+    EVT_CALL(DisablePlayerPhysics, FALSE)
+    EVT_CALL(DisablePlayerInput, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_THREAD
+        EVT_CALL(N(MonitorPlayerFloor))
+    EVT_END_THREAD
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), 124, -200, -75, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignScript, EVT_PTR(N(EVS_UseSpring)))
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -200, 60, -75, 0, MAKE_ENTITY_END)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_04/D54690.c b/src/world/area_pra/pra_04/D54690.c
deleted file mode 100644
index 9cf41ce90e..0000000000
--- a/src/world/area_pra/pra_04/D54690.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "pra_04.h"
-
-static char* N(exit_str_0) = "pra_02";
-static char* N(exit_str_1) = "pra_39";
-static char* N(exit_str_2) = "pra_10";
-static char* N(exit_str_3) = "";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_04/D546B0.c b/src/world/area_pra/pra_04/D546B0.c
deleted file mode 100644
index fde15fd5c7..0000000000
--- a/src/world/area_pra/pra_04/D546B0.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "pra_04.h"
-
-ApiStatus func_80240020_D546B0(Evt* script, s32 isInitialCall) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-
-    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
-        script->varTable[0] = 150;
-    }
-    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
-        script->varTable[0] = 95;
-    }
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_802400AC_D5473C(Evt* script, s32 isInitialCall) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-
-    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
-        script->varTable[0] = 165;
-    }
-    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
-        script->varTable[0] = 70;
-    }
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_80240138_D547C8(Evt* script, s32 isInitialCall) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-
-    if (playerStatus->lastGoodPosition.y == 0) {
-        evt_set_variable(script, MapVar(0), 0);
-    }
-    if (playerStatus->lastGoodPosition.y == -200) {
-        evt_set_variable(script, MapVar(0), 1);
-    }
-    return ApiStatus_BLOCK;
-}
diff --git a/src/world/area_pra/pra_04/D54840.c b/src/world/area_pra/pra_04/D54840.c
deleted file mode 100644
index c190a28acf..0000000000
--- a/src/world/area_pra/pra_04/D54840.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "pra_04.h"
-
-#include "world/common/todo/UnkFunc001.inc.c"
diff --git a/src/world/area_pra/pra_04/pra_04.h b/src/world/area_pra/pra_04/pra_04.h
index e9a6161343..342cf87f08 100644
--- a/src/world/area_pra/pra_04/pra_04.h
+++ b/src/world/area_pra/pra_04/pra_04.h
@@ -2,8 +2,24 @@
 /// @brief Crystal Palace - Reflected Save Room
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_04_shape.h"
+#include "mapfs/pra_04_hit.h"
+
+enum {
+	NPC_Swoopula    = 0,
+};
+
+enum {
+    MV_PlayerFloor  = MapVar(0),
+};
+
 #define NAMESPACE pra_04
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_MakeEntities);
+extern NpcGroupList N(DefaultNPCs);
diff --git a/src/world/area_pra/pra_04/pra_04_0_header.c b/src/world/area_pra/pra_04/pra_04_0_header.c
new file mode 100644
index 0000000000..12a4fdfc90
--- /dev/null
+++ b/src/world/area_pra/pra_04/pra_04_0_header.c
@@ -0,0 +1,16 @@
+#include "pra_04.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_04_ENTRY_0]    { -128.0,    0.0,  157.0,    0.0 },
+    [pra_04_ENTRY_1]    {  237.0,    0.0,   78.0,  270.0 },
+    [pra_04_ENTRY_2]    {  237.0, -200.0,   78.0,  270.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_04 },
+};
diff --git a/src/world/area_pra/pra_04/pra_04_1_music.c b/src/world/area_pra/pra_04/pra_04_1_music.c
new file mode 100644
index 0000000000..ed17463775
--- /dev/null
+++ b/src/world/area_pra/pra_04/pra_04_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_04.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_04/pra_04_2_main.c b/src/world/area_pra/pra_04/pra_04_2_main.c
new file mode 100644
index 0000000000..2a9a00c305
--- /dev/null
+++ b/src/world/area_pra/pra_04/pra_04_2_main.c
@@ -0,0 +1,70 @@
+#include "pra_04.h"
+
+EvtScript N(EVS_ExitDoor_pra_02_4) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_04_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittssw)
+    EVT_SET(LVar2, MODEL_o847)
+    EVT_SET(LVar3, DOOR_SWING_OUT)
+    EVT_EXEC(ExitSingleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_02"), pra_02_ENTRY_4)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_39_0) = EVT_EXIT_DOUBLE_DOOR(pra_04_ENTRY_1, "pra_39", pra_39_ENTRY_0, COLLIDER_deilittse, MODEL_o874, MODEL_o876);
+EvtScript N(EVS_ExitDoors_pra_10_0) = EVT_EXIT_DOUBLE_DOOR(pra_04_ENTRY_2, "pra_10", pra_10_ENTRY_0, COLLIDER_deilittsse, MODEL_o986, MODEL_o987);
+
+MAP_RODATA_PAD(1, exits);
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_pra_02_4)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittssw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_39_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_10_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsse, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_04_ENTRY_0)
+            EVT_SET(LVar2, MODEL_o847)
+            EVT_SET(LVar3, DOOR_SWING_OUT)
+            EVT_EXEC_WAIT(EnterSingleDoor)
+        EVT_CASE_EQ(pra_04_ENTRY_1)
+            EVT_SET(LVar2, MODEL_o874)
+            EVT_SET(LVar3, MODEL_o876)
+            EVT_EXEC_WAIT(EnterDoubleDoor)
+        EVT_CASE_EQ(pra_04_ENTRY_2)
+            EVT_SET(LVar2, MODEL_o986)
+            EVT_SET(LVar3, MODEL_o987)
+            EVT_EXEC_WAIT(EnterDoubleDoor)
+    EVT_END_SWITCH
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_IF_EQ(GF_PRA04_BoardedFloor, TRUE)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitts, COLLIDER_FLAGS_UPPER_MASK)
+        EVT_CALL(EnableModel, MODEL_o994, FALSE)
+    EVT_END_IF
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_04/pra_04_3_entity.c b/src/world/area_pra/pra_04/pra_04_3_entity.c
new file mode 100644
index 0000000000..314cdbc8f5
--- /dev/null
+++ b/src/world/area_pra/pra_04/pra_04_3_entity.c
@@ -0,0 +1,105 @@
+#include "pra_04.h"
+#include "entity.h"
+
+API_CALLABLE(N(GetTargetPosXForSpring_Floor1)) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
+        script->varTable[0] = 150;
+    }
+    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
+        script->varTable[0] = 95;
+    }
+    return ApiStatus_DONE2;
+}
+
+API_CALLABLE(N(GetTargetPosXForSpring_Floor0)) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
+        script->varTable[0] = 165;
+    }
+    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
+        script->varTable[0] = 70;
+    }
+    return ApiStatus_DONE2;
+}
+
+API_CALLABLE(N(MonitorPlayerFloor)) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->lastGoodPosition.y == 0) {
+        evt_set_variable(script, MV_PlayerFloor, 0);
+    }
+    if (playerStatus->lastGoodPosition.y == -200) {
+        evt_set_variable(script, MV_PlayerFloor, 1);
+    }
+    return ApiStatus_BLOCK;
+}
+
+EvtScript N(EVS_TetherCamToPlayerWithCeiling) = {
+    EVT_LABEL(0)
+        EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+        EVT_IF_GE(LVar1, LVar3)
+            EVT_SET(LVar1, LVar3)
+        EVT_END_IF
+        EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
+        EVT_WAIT(1)
+        EVT_GOTO(0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_UseSpring) = {
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(DisablePlayerPhysics, TRUE)
+    EVT_CALL(SetPlayerActionState, ACTION_STATE_LAUNCH)
+    EVT_CALL(GetPlayerPos, LVar7, LVar8, LVar9)
+    EVT_IF_EQ(MV_PlayerFloor, 0)
+        EVT_SET(LVar3, -175)
+        EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayerWithCeiling), LVarA)
+        EVT_CALL(N(GetTargetPosXForSpring_Floor0))
+        EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0))
+        EVT_SET(LVar1, -200)
+        EVT_SET(LVar2, 15)
+    EVT_ELSE
+        EVT_SET(LVar3, 0)
+        EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayerWithCeiling), LVarA)
+        EVT_CALL(N(GetTargetPosXForSpring_Floor1))
+        EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7))
+        EVT_SET(LVar1, 0)
+        EVT_SET(LVar2, 35)
+    EVT_END_IF
+    EVT_CALL(PlayerJump, LVar0, LVar1, LVar9, LVar2)
+    EVT_KILL_THREAD(LVarA)
+    EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE)
+    EVT_WAIT(2)
+    EVT_CALL(DisablePlayerPhysics, FALSE)
+    EVT_CALL(DisablePlayerInput, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BreakFloor) = {
+    EVT_SET(GF_PRA04_BoardedFloor, TRUE)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitts, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_CALL(EnableModel, MODEL_o994, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_THREAD
+        EVT_CALL(N(MonitorPlayerFloor))
+    EVT_END_THREAD
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), 124, -200, 80, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignScript, EVT_PTR(N(EVS_UseSpring)))
+    EVT_IF_EQ(GF_PRA04_BoardedFloor, FALSE)
+        EVT_CALL(MakeEntity, EVT_PTR(Entity_BoardedFloor), 124, 0, 80, 0, MAKE_ENTITY_END)
+        EVT_CALL(AssignScript, EVT_PTR(N(EVS_BreakFloor)))
+    EVT_END_IF
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -200, 60, 75, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END)
+    EVT_CALL(AssignBlockFlag, GF_PRA04_ItemBlock_SuperShroom)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_04/pra_04_4_npc.c b/src/world/area_pra/pra_04/pra_04_4_npc.c
new file mode 100644
index 0000000000..39561bbf68
--- /dev/null
+++ b/src/world/area_pra/pra_04/pra_04_4_npc.c
@@ -0,0 +1,30 @@
+#include "pra_04.h"
+
+#include "world/common/enemy/complete/Swooper.inc.c"
+
+StaticNpc N(NpcData_Swoopula) = {
+    .id = NPC_Swoopula,
+    .settings = &N(NpcSettings_Swoopula),
+    .pos = { 50.0f, 130.0f, 75.0f },
+    .yaw = 90,
+    .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
+    .drops = SWOOPULA_DROPS,
+    .territory = {
+        .wander = {
+            .isFlying = TRUE,
+            .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED,
+            .wanderShape = SHAPE_CYLINDER,
+            .centerPos  = { 50, 130, 75 },
+            .wanderSize = { 0 },
+            .detectShape = SHAPE_CYLINDER,
+            .detectPos  = { 50, 130, 75 },
+            .detectSize = { 200 },
+        }
+    },
+    .animations = SWOOPULA_ANIMS,
+};
+
+NpcGroupList N(DefaultNPCs) = {
+    NPC_GROUP(N(NpcData_Swoopula), BTL_PRA3_FORMATION_00, BTL_PRA3_STAGE_00),
+    {}
+};
diff --git a/src/world/area_pra/pra_05/D55BB0.c b/src/world/area_pra/pra_05/D55BB0.c
deleted file mode 100644
index 88b0773723..0000000000
--- a/src/world/area_pra/pra_05/D55BB0.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "pra_05.h"
-
-static char* N(exit_str_0) = "pra_38";
-static char* N(exit_str_1) = "";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c
deleted file mode 100644
index 0355b3a1d5..0000000000
--- a/src/world/area_pra/pra_05/D55BD0.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "pra_05.h"
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "world/common/todo/StashVars.inc.c"
-
-#include "world/common/todo/GetItemName.inc.c"
-
-#include "world/common/todo/SomeItemEntityFunc.inc.c"
-
-#include "world/common/todo/IsItemBadge.inc.c"
diff --git a/src/world/area_pra/pra_05/pra_05.h b/src/world/area_pra/pra_05/pra_05.h
index fb20663803..b1afa71261 100644
--- a/src/world/area_pra/pra_05/pra_05.h
+++ b/src/world/area_pra/pra_05/pra_05.h
@@ -2,8 +2,15 @@
 /// @brief Crystal Palace - Blue Key Room
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_05_shape.h"
+#include "mapfs/pra_05_hit.h"
+
 #define NAMESPACE pra_05
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_MakeEntities);
diff --git a/src/world/area_pra/pra_05/pra_05_0_header.c b/src/world/area_pra/pra_05/pra_05_0_header.c
new file mode 100644
index 0000000000..a482bb16d8
--- /dev/null
+++ b/src/world/area_pra/pra_05/pra_05_0_header.c
@@ -0,0 +1,14 @@
+#include "pra_05.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_05_ENTRY_0]    {   13.0,    0.0,   75.0,   90.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_05 },
+};
diff --git a/src/world/area_pra/pra_05/pra_05_1_music.c b/src/world/area_pra/pra_05/pra_05_1_music.c
new file mode 100644
index 0000000000..03059ca6e4
--- /dev/null
+++ b/src/world/area_pra/pra_05/pra_05_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_05.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_05/pra_05_2_main.c b/src/world/area_pra/pra_05/pra_05_2_main.c
new file mode 100644
index 0000000000..766da64597
--- /dev/null
+++ b/src/world/area_pra/pra_05/pra_05_2_main.c
@@ -0,0 +1,57 @@
+#include "pra_05.h"
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+
+EvtScript N(EVS_ExitDoors_pra_38_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_05_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittsw)
+    EVT_SET(LVar2, MODEL_o772)
+    EVT_SET(LVar3, MODEL_o768)
+    EVT_SET(LVar4, MODEL_o844)
+    EVT_SET(LVar5, MODEL_o846)
+    EVT_EXEC(ExitSplitDoubleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_38"), pra_38_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_38_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_SET(LVar0, pra_05_ENTRY_0)
+    EVT_SET(LVar2, MODEL_o772)
+    EVT_SET(LVar3, MODEL_o768)
+    EVT_SET(LVar4, MODEL_o844)
+    EVT_SET(LVar5, MODEL_o846)
+    EVT_EXEC_WAIT(EnterSplitDoubleDoor)
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_SET(LVar0, REFLECTION_FLOOR_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_05/pra_05_3_entity.c b/src/world/area_pra/pra_05/pra_05_3_entity.c
new file mode 100644
index 0000000000..d0041dd224
--- /dev/null
+++ b/src/world/area_pra/pra_05/pra_05_3_entity.c
@@ -0,0 +1,14 @@
+#include "pra_05.h"
+#include "entity.h"
+
+#include "world/common/atomic/Chest.inc.c"
+
+EvtScript N(EVS_OpenChest_BlueKey) = EVT_OPEN_CHEST_KEY(ITEM_BLUE_KEY, GF_PRA05_Chest_BlueKey);
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 200, 20, 94, 0, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignChestFlag, GF_PRA05_Chest_BlueKey)
+    EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_BlueKey)))
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_06/pra_06_2_main.c b/src/world/area_pra/pra_06/pra_06_2_main.c
index 945e604497..6f10c90538 100644
--- a/src/world/area_pra/pra_06/pra_06_2_main.c
+++ b/src/world/area_pra/pra_06/pra_06_2_main.c
@@ -7,8 +7,8 @@ s32 N(map_init)(void) {
     return FALSE;
 }
 
-#include "world/common/atomic/Reflection.inc.c"
-#include "world/common/atomic/Reflection.data.inc.c"
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
 
 EvtScript N(EVS_ExitDoors_pra_39_1) = {
     EVT_SET_GROUP(EVT_GROUP_1B)
@@ -54,9 +54,9 @@ EvtScript N(EVS_Main) = {
     EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
     EVT_EXEC_WAIT(N(EVS_MakeEntities))
     EVT_EXEC(N(EVS_SetupMusic))
-    EVT_SET(LVar0, 1)
+    EVT_SET(LVar0, REFLECTION_FLOOR_ONLY)
     EVT_SET(LVar1, GF_PRA_BrokeIllusion)
-    EVT_EXEC(N(EVS_Reflection_UnkB))
+    EVT_EXEC(N(EVS_SetupReflections))
     EVT_EXEC(N(EVS_EnterDoors_0))
     EVT_WAIT(1)
     EVT_RETURN
diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c
index a05ed35f01..3243fa9afd 100644
--- a/src/world/area_pra/pra_09/D588B0.c
+++ b/src/world/area_pra/pra_09/D588B0.c
@@ -1,7 +1,7 @@
 #include "pra_09.h"
 #include "effects.h"
 
-#include "world/common/atomic/Reflection.inc.c"
+#include "../common/Reflection.inc.c"
 
 #include "world/common/todo/GetNpcCollisionHeight.inc.c"
 
diff --git a/src/world/area_pra/pra_10/D5F2B0.c b/src/world/area_pra/pra_10/D5F2B0.c
deleted file mode 100644
index ac751aef44..0000000000
--- a/src/world/area_pra/pra_10/D5F2B0.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "pra_10.h"
-
-static char* N(exit_str_0) = "pra_04";
-static char* N(exit_str_1) = "pra_12";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_10/D5F2D0.c b/src/world/area_pra/pra_10/D5F2D0.c
deleted file mode 100644
index 8c3f8272a9..0000000000
--- a/src/world/area_pra/pra_10/D5F2D0.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "pra_10.h"
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "world/common/todo/UnkFunc001.inc.c"
diff --git a/src/world/area_pra/pra_10/pra_10.h b/src/world/area_pra/pra_10/pra_10.h
index 086255cf12..911debfb53 100644
--- a/src/world/area_pra/pra_10/pra_10.h
+++ b/src/world/area_pra/pra_10/pra_10.h
@@ -2,8 +2,20 @@
 /// @brief Crystal Palace - P-Down, D-Up Hall
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_10_shape.h"
+#include "mapfs/pra_10_hit.h"
+
+enum {
+	NPC_Swoopula_01     = 0,
+	NPC_Swoopula_02     = 1,
+};
+
 #define NAMESPACE pra_10
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern NpcGroupList N(DefaultNPCs);
diff --git a/src/world/area_pra/pra_10/pra_10_0_header.c b/src/world/area_pra/pra_10/pra_10_0_header.c
new file mode 100644
index 0000000000..cefe586735
--- /dev/null
+++ b/src/world/area_pra/pra_10/pra_10_0_header.c
@@ -0,0 +1,15 @@
+#include "pra_10.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_10_ENTRY_0]    {   13.0,    0.0,   70.0,   90.0 },
+    [pra_10_ENTRY_1]    {  487.0,    0.0,   70.0,  270.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_10 },
+};
diff --git a/src/world/area_pra/pra_10/pra_10_1_music.c b/src/world/area_pra/pra_10/pra_10_1_music.c
new file mode 100644
index 0000000000..207070c652
--- /dev/null
+++ b/src/world/area_pra/pra_10/pra_10_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_10.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_10/pra_10_2_main.c b/src/world/area_pra/pra_10/pra_10_2_main.c
new file mode 100644
index 0000000000..16b95f265b
--- /dev/null
+++ b/src/world/area_pra/pra_10/pra_10_2_main.c
@@ -0,0 +1,81 @@
+#include "pra_10.h"
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+
+EvtScript N(EVS_ExitDoors_pra_04_2) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_10_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittsw)
+    EVT_SET(LVar2, MODEL_o772)
+    EVT_SET(LVar3, MODEL_o768)
+    EVT_SET(LVar4, MODEL_o844)
+    EVT_SET(LVar5, MODEL_o846)
+    EVT_EXEC(ExitSplitDoubleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_04"), pra_04_ENTRY_2)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_12_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_10_ENTRY_1)
+    EVT_SET(LVar1, COLLIDER_deilittse)
+    EVT_SET(LVar2, MODEL_o1019)
+    EVT_SET(LVar3, MODEL_o1021)
+    EVT_SET(LVar4, MODEL_o1020)
+    EVT_SET(LVar5, MODEL_o1022)
+    EVT_EXEC(ExitSplitDoubleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_12"), pra_12_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_04_2)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_12_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_10_ENTRY_0)
+            EVT_SET(LVar2, MODEL_o772)
+            EVT_SET(LVar3, MODEL_o768)
+            EVT_SET(LVar4, MODEL_o844)
+            EVT_SET(LVar5, MODEL_o846)
+            EVT_EXEC_WAIT(EnterSplitDoubleDoor)
+        EVT_CASE_EQ(pra_10_ENTRY_1)
+            EVT_SET(LVar2, MODEL_o1019)
+            EVT_SET(LVar3, MODEL_o1021)
+            EVT_SET(LVar4, MODEL_o1020)
+            EVT_SET(LVar5, MODEL_o1022)
+            EVT_EXEC_WAIT(EnterSplitDoubleDoor)
+    EVT_END_SWITCH
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_SETUP_CAMERA_ALT_NO_LEAD()
+    EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_SET(LVar0, REFLECTION_FLOOR_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_10/pra_10_3_npc.c b/src/world/area_pra/pra_10/pra_10_3_npc.c
new file mode 100644
index 0000000000..1cea4338eb
--- /dev/null
+++ b/src/world/area_pra/pra_10/pra_10_3_npc.c
@@ -0,0 +1,61 @@
+#include "pra_10.h"
+
+#include "world/common/enemy/complete/Swooper.inc.c"
+
+EvtScript N(EVS_NpcInit_Swoopula) = {
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+StaticNpc N(NpcData_Swoopula_01) = {
+    .id = NPC_Swoopula_01,
+    .settings = &N(NpcSettings_Swoopula),
+    .pos = { 166.0f, 130.0f, 90.0f },
+    .yaw = 270,
+    .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
+    .init = &N(EVS_NpcInit_Swoopula),
+    .drops = SWOOPULA_DROPS,
+    .territory = {
+        .wander = {
+            .isFlying = TRUE,
+            .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED,
+            .wanderShape = SHAPE_CYLINDER,
+            .centerPos  = { 166, 130, 90 },
+            .wanderSize = { 0 },
+            .detectShape = SHAPE_CYLINDER,
+            .detectPos  = { 166, 130, 90 },
+            .detectSize = { 250 },
+        }
+    },
+    .animations = SWOOPULA_ANIMS,
+};
+
+StaticNpc N(NpcData_Swoopula_02) = {
+    .id = NPC_Swoopula_02,
+    .settings = &N(NpcSettings_Swoopula),
+    .pos = { 358.0f, 130.0f, 75.0f },
+    .yaw = 270,
+    .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
+    .init = &N(EVS_NpcInit_Swoopula),
+    .drops = SWOOPULA_DROPS,
+    .territory = {
+        .wander = {
+            .isFlying = TRUE,
+            .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED,
+            .wanderShape = SHAPE_CYLINDER,
+            .centerPos  = { 358, 130, 75 },
+            .wanderSize = { 0 },
+            .detectShape = SHAPE_CYLINDER,
+            .detectPos  = { 358, 130, 75 },
+            .detectSize = { 250 },
+        }
+    },
+    .animations = SWOOPULA_ANIMS,
+};
+
+NpcGroupList N(DefaultNPCs) = {
+    NPC_GROUP(N(NpcData_Swoopula_01), BTL_PRA_FORMATION_01, BTL_PRA_STAGE_00),
+    NPC_GROUP(N(NpcData_Swoopula_02), BTL_PRA_FORMATION_03, BTL_PRA_STAGE_00),
+    {}
+};
diff --git a/src/world/area_pra/pra_11/D61500.c b/src/world/area_pra/pra_11/D61500.c
deleted file mode 100644
index 5992616c17..0000000000
--- a/src/world/area_pra/pra_11/D61500.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "pra_11.h"
-
-static char* N(exit_str_0) = "pra_09";
-static char* N(exit_str_1) = "";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c
deleted file mode 100644
index 9ce2ae9509..0000000000
--- a/src/world/area_pra/pra_11/D61520.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "pra_11.h"
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "world/common/todo/StashVars.inc.c"
-
-#include "world/common/todo/GetItemName.inc.c"
-
-#include "world/common/todo/SomeItemEntityFunc.inc.c"
-
-#include "world/common/todo/IsItemBadge.inc.c"
diff --git a/src/world/area_pra/pra_11/pra_11.h b/src/world/area_pra/pra_11/pra_11.h
index 118d512ed7..beee710f4c 100644
--- a/src/world/area_pra/pra_11/pra_11.h
+++ b/src/world/area_pra/pra_11/pra_11.h
@@ -2,8 +2,15 @@
 /// @brief Crystal Palace - Red Key Room
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_11_shape.h"
+#include "mapfs/pra_11_hit.h"
+
 #define NAMESPACE pra_11
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_MakeEntities);
diff --git a/src/world/area_pra/pra_11/pra_11_0_header.c b/src/world/area_pra/pra_11/pra_11_0_header.c
new file mode 100644
index 0000000000..8eac0f6ea2
--- /dev/null
+++ b/src/world/area_pra/pra_11/pra_11_0_header.c
@@ -0,0 +1,14 @@
+#include "pra_11.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_11_ENTRY_0]    {   23.0,    0.0,   81.0,   90.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_11 },
+};
diff --git a/src/world/area_pra/pra_11/pra_11_1_music.c b/src/world/area_pra/pra_11/pra_11_1_music.c
new file mode 100644
index 0000000000..83f1dd1666
--- /dev/null
+++ b/src/world/area_pra/pra_11/pra_11_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_11.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_11/pra_11_2_main.c b/src/world/area_pra/pra_11/pra_11_2_main.c
new file mode 100644
index 0000000000..2dda6bc7bc
--- /dev/null
+++ b/src/world/area_pra/pra_11/pra_11_2_main.c
@@ -0,0 +1,40 @@
+#include "pra_11.h"
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+
+EvtScript N(EVS_ExitWalk_pra_09_1) = EVT_EXIT_WALK(60, pra_11_ENTRY_0, "pra_09", pra_09_ENTRY_1);
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_pra_09_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilisw, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers)))
+    EVT_EXEC(EnterWalk)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_CALL(EnableModel, MODEL_g270, FALSE)
+    EVT_CALL(EnableModel, MODEL_g271, FALSE)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittsw, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_SET(LVar0, REFLECTION_FLOOR_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_11/pra_11_3_entity.c b/src/world/area_pra/pra_11/pra_11_3_entity.c
new file mode 100644
index 0000000000..930177cf9e
--- /dev/null
+++ b/src/world/area_pra/pra_11/pra_11_3_entity.c
@@ -0,0 +1,14 @@
+#include "pra_11.h"
+#include "entity.h"
+
+#include "world/common/atomic/Chest.inc.c"
+
+EvtScript N(EVS_OpenChest_RedKey) = EVT_OPEN_CHEST_KEY(ITEM_RED_KEY, GF_PRA11_Chest_RedKey);
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 200, 20, 94, 0, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignChestFlag, GF_PRA11_Chest_RedKey)
+    EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_RedKey)))
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c
deleted file mode 100644
index 914274ecbb..0000000000
--- a/src/world/area_pra/pra_12/D62D10.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "pra_12.h"
-
-ApiStatus func_80240000_D62D10(Evt* script, s32 isInitialCall) {
-    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
-    sprintf(wMapShapeName, "pra_05_shape");
-    sprintf(wMapHitName, "pra_05_hit");
-    return ApiStatus_BLOCK;
-}
-
-const char N(exit_str_0)[] = "pra_10";
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "world/common/todo/StashVars.inc.c"
-
-#include "world/common/todo/GetItemName.inc.c"
-
-#include "world/common/todo/SomeItemEntityFunc.inc.c"
-
-#include "world/common/todo/IsItemBadge.inc.c"
diff --git a/src/world/area_pra/pra_12/pra_12.h b/src/world/area_pra/pra_12/pra_12.h
index e037ea5e6d..39dc3a7bad 100644
--- a/src/world/area_pra/pra_12/pra_12.h
+++ b/src/world/area_pra/pra_12/pra_12.h
@@ -2,8 +2,15 @@
 /// @brief Crystal Palace - P-Down, D-Up Room
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_05_shape.h"
+#include "mapfs/pra_05_hit.h"
+
 #define NAMESPACE pra_12
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_MakeEntities);
diff --git a/src/world/area_pra/pra_12/pra_12_0_header.c b/src/world/area_pra/pra_12/pra_12_0_header.c
new file mode 100644
index 0000000000..cbbb60773f
--- /dev/null
+++ b/src/world/area_pra/pra_12/pra_12_0_header.c
@@ -0,0 +1,12 @@
+#include "pra_12.h"
+
+EntryList N(Entrances) = {
+    [pra_12_ENTRY_0]    {   13.0,    0.0,   70.0,   90.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_12 },
+};
diff --git a/src/world/area_pra/pra_12/pra_12_1_music.c b/src/world/area_pra/pra_12/pra_12_1_music.c
new file mode 100644
index 0000000000..d5cee786fd
--- /dev/null
+++ b/src/world/area_pra/pra_12/pra_12_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_12.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_12/pra_12_2_main.c b/src/world/area_pra/pra_12/pra_12_2_main.c
new file mode 100644
index 0000000000..329f91a508
--- /dev/null
+++ b/src/world/area_pra/pra_12/pra_12_2_main.c
@@ -0,0 +1,64 @@
+#include "pra_12.h"
+
+s32 N(map_init)(void) {
+    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
+    sprintf(wMapShapeName, "pra_05_shape");
+    sprintf(wMapHitName, "pra_05_hit");
+    return FALSE;
+}
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+
+EvtScript N(EVS_ExitDoors_pra_10_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_12_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittsw)
+    EVT_SET(LVar2, MODEL_o772)
+    EVT_SET(LVar3, MODEL_o768)
+    EVT_SET(LVar4, MODEL_o844)
+    EVT_SET(LVar5, MODEL_o846)
+    EVT_EXEC(ExitSplitDoubleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_10"), pra_10_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_10_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_SET(LVar0, pra_12_ENTRY_0)
+    EVT_SET(LVar2, MODEL_o772)
+    EVT_SET(LVar3, MODEL_o768)
+    EVT_SET(LVar4, MODEL_o844)
+    EVT_SET(LVar5, MODEL_o846)
+    EVT_EXEC_WAIT(EnterSplitDoubleDoor)
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_SET(LVar0, REFLECTION_FLOOR_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_12/pra_12_3_entity.c b/src/world/area_pra/pra_12/pra_12_3_entity.c
new file mode 100644
index 0000000000..dfe889c940
--- /dev/null
+++ b/src/world/area_pra/pra_12/pra_12_3_entity.c
@@ -0,0 +1,14 @@
+#include "pra_12.h"
+#include "entity.h"
+
+#include "world/common/atomic/Chest.inc.c"
+
+EvtScript N(EVS_OpenChest_PDownDUp) = EVT_OPEN_CHEST_BADGE(ITEM_P_DOWN_D_UP, GF_PRA12_Chest_PDownDUp);
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 200, 20, 94, 0, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignChestFlag, GF_PRA12_Chest_PDownDUp)
+    EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_PDownDUp)))
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c
index 24d0c29d16..8a1e42dced 100644
--- a/src/world/area_pra/pra_13/D64600.c
+++ b/src/world/area_pra/pra_13/D64600.c
@@ -1,6 +1,6 @@
 #include "pra_13.h"
 
-#include "world/common/atomic/Reflection.inc.c"
+#include "../common/Reflection.inc.c"
 
 #include "world/common/todo/GetNpcCollisionHeight.inc.c"
 
@@ -103,6 +103,6 @@ void func_802414BC_D65A9C(void* data) {
     guMtxCatF(sp18, spD8, sp18);
     guTranslateF(sp58, npc->pos.x, npc->pos.y, npc->pos.z);
     guMtxCatF(sp18, sp58, sp18);
-    spr_update_player_sprite(2, npc->currentAnim, 1.0f);
-    spr_draw_player_sprite(2, 0, 0, 0, sp18);
+    spr_update_player_sprite(PLAYER_SPRITE_AUX2, npc->currentAnim, 1.0f);
+    spr_draw_player_sprite(PLAYER_SPRITE_AUX2, 0, 0, 0, sp18);
 }
diff --git a/src/world/area_pra/pra_14/D67D00.c b/src/world/area_pra/pra_14/D67D00.c
deleted file mode 100644
index 6d3e52d7cc..0000000000
--- a/src/world/area_pra/pra_14/D67D00.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "pra_14.h"
-
-static char* N(exit_str_0) = "pra_13";
-static char* N(exit_str_1) = "";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c
deleted file mode 100644
index ced531618e..0000000000
--- a/src/world/area_pra/pra_14/D67D20.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "pra_14.h"
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "world/common/todo/StashVars.inc.c"
-
-#include "world/common/todo/GetItemName.inc.c"
-
-#include "world/common/todo/SomeItemEntityFunc.inc.c"
-
-#include "world/common/todo/IsItemBadge.inc.c"
diff --git a/src/world/area_pra/pra_14/pra_14.h b/src/world/area_pra/pra_14/pra_14.h
index fd3bc4fa4d..237942f8ba 100644
--- a/src/world/area_pra/pra_14/pra_14.h
+++ b/src/world/area_pra/pra_14/pra_14.h
@@ -2,8 +2,15 @@
 /// @brief Crystal Palace - Blue Mirror Hall 2
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_14_shape.h"
+#include "mapfs/pra_14_hit.h"
+
 #define NAMESPACE pra_14
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_MakeEntities);
diff --git a/src/world/area_pra/pra_14/pra_14_0_header.c b/src/world/area_pra/pra_14/pra_14_0_header.c
new file mode 100644
index 0000000000..5ca26dddab
--- /dev/null
+++ b/src/world/area_pra/pra_14/pra_14_0_header.c
@@ -0,0 +1,15 @@
+#include "pra_14.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_14_ENTRY_0]    {   13.0,    0.0,   70.0,   90.0 },
+    [pra_14_ENTRY_1]    {   13.0,    0.0,  -70.0,   90.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_14 },
+};
diff --git a/src/world/area_pra/pra_14/pra_14_1_music.c b/src/world/area_pra/pra_14/pra_14_1_music.c
new file mode 100644
index 0000000000..ee974e2845
--- /dev/null
+++ b/src/world/area_pra/pra_14/pra_14_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_14.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_14/pra_14_2_main.c b/src/world/area_pra/pra_14/pra_14_2_main.c
new file mode 100644
index 0000000000..488f31d735
--- /dev/null
+++ b/src/world/area_pra/pra_14/pra_14_2_main.c
@@ -0,0 +1,84 @@
+#include "pra_14.h"
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+#include "../common/GlassShimmer.inc.c"
+
+EvtScript N(EVS_ExitWalk_pra_13_1) = EVT_EXIT_WALK(60, pra_14_ENTRY_0, "pra_13", pra_13_ENTRY_1);
+EvtScript N(EVS_ExitWalk_pra_13_2) = EVT_EXIT_WALK(60, pra_14_ENTRY_1, "pra_13", pra_13_ENTRY_2);
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_pra_13_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilisw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_pra_13_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilinw, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers)))
+    EVT_EXEC(EnterWalk)
+    EVT_RETURN
+    EVT_END
+};
+
+BombTrigger N(BombPos_WallA) = {
+    .pos = { 13.0f, 0.0f, 70.0f },
+    .radius = 0.0f
+};
+
+BombTrigger N(BombPos_WallB) = {
+    .pos = { 13.0f, 0.0f, -70.0f },
+    .radius = 0.0f
+};
+
+EvtScript N(EVS_BlastWallA) = {
+    EVT_CALL(EnableModel, MODEL_g289, FALSE)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittsw, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_SET(GF_PRA13_BombedWallA, TRUE)
+    EVT_UNBIND
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BlastWallB) = {
+    EVT_CALL(EnableModel, MODEL_g260, FALSE)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittnw, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_SET(GF_PRA13_BombedWallB, TRUE)
+    EVT_UNBIND
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_SET(LVar0, 40)
+    EVT_SET(LVar1, 40)
+    EVT_SET(LVar2, TEX_PANNER_0)
+    EVT_EXEC(N(EVS_GlassShimmer))
+    EVT_SET(LVar0, REFLECTION_WALL_ONLY)
+    EVT_SET(LVar1, TRUE) // always disable reflections in this room
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_IF_EQ(GF_PRA13_BombedWallA, FALSE)
+        EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BlastWallA)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_WallA)), 1, 0)
+    EVT_ELSE
+        EVT_CALL(EnableModel, MODEL_g289, FALSE)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittsw, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_END_IF
+    EVT_IF_EQ(GF_PRA13_BombedWallB, FALSE)
+        EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BlastWallB)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_WallB)), 1, 0)
+    EVT_ELSE
+        EVT_CALL(EnableModel, MODEL_g260, FALSE)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittnw, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_END_IF
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_14/pra_14_3_entity.c b/src/world/area_pra/pra_14/pra_14_3_entity.c
new file mode 100644
index 0000000000..e1db35e783
--- /dev/null
+++ b/src/world/area_pra/pra_14/pra_14_3_entity.c
@@ -0,0 +1,13 @@
+#include "pra_14.h"
+#include "entity.h"
+
+#include "world/common/atomic/Chest.inc.c"
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 445, 60, 80, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignBlockFlag, GF_PRA14_MultiCoinBrickA)
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 445, 60, -80, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignBlockFlag, GF_PRA14_MultiCoinBrickB)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_16/D69B20.c b/src/world/area_pra/pra_16/D69B20.c
deleted file mode 100644
index eeba1d03f1..0000000000
--- a/src/world/area_pra/pra_16/D69B20.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "pra_16.h"
-
-static char* N(exit_str_0) = "pra_02";
-static char* N(exit_str_1) = "pra_18";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_16/D69B40.c b/src/world/area_pra/pra_16/D69B40.c
deleted file mode 100644
index 6bc2ddf01e..0000000000
--- a/src/world/area_pra/pra_16/D69B40.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "pra_16.h"
-
-#include "world/common/atomic/Reflection.inc.c"
diff --git a/src/world/area_pra/pra_16/pra_16.h b/src/world/area_pra/pra_16/pra_16.h
index 910efab34f..30d0ff593e 100644
--- a/src/world/area_pra/pra_16/pra_16.h
+++ b/src/world/area_pra/pra_16/pra_16.h
@@ -2,8 +2,14 @@
 /// @brief Crystal Palace - Red Mirror Hall
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_16_shape.h"
+#include "mapfs/pra_16_hit.h"
+
 #define NAMESPACE pra_16
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
diff --git a/src/world/area_pra/pra_16/pra_16_0_header.c b/src/world/area_pra/pra_16/pra_16_0_header.c
new file mode 100644
index 0000000000..14188d073f
--- /dev/null
+++ b/src/world/area_pra/pra_16/pra_16_0_header.c
@@ -0,0 +1,17 @@
+#include "pra_16.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_16_ENTRY_0]    {   13.0,    0.0,   70.0,   90.0 },
+    [pra_16_ENTRY_1]    {  487.0,    0.0,   70.0,  270.0 },
+    [pra_16_ENTRY_2]    {  487.0,    0.0,  -70.0,  270.0 },
+    [pra_16_ENTRY_3]    {   13.0,    0.0,  -70.0,   90.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_16 },
+};
diff --git a/src/world/area_pra/pra_16/pra_16_1_music.c b/src/world/area_pra/pra_16/pra_16_1_music.c
new file mode 100644
index 0000000000..c62875db85
--- /dev/null
+++ b/src/world/area_pra/pra_16/pra_16_1_music.c
@@ -0,0 +1,7 @@
+#include "pra_16.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_16/pra_16_2_main.c b/src/world/area_pra/pra_16/pra_16_2_main.c
new file mode 100644
index 0000000000..0b86fdb37d
--- /dev/null
+++ b/src/world/area_pra/pra_16/pra_16_2_main.c
@@ -0,0 +1,181 @@
+#include "pra_16.h"
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+#include "../common/GlassShimmer.inc.c"
+
+// doors on right wall
+s32 N(NearRightDoorModelsL)[] = { MODEL_o772, MODEL_o844, -1 };
+s32 N(NearRightDoorModelsR)[] = { MODEL_o768, MODEL_o846, -1 };
+s32 N(FarRightDoorModelsL)[]  = { MODEL_o859, MODEL_o860, -1 };
+s32 N(FarRightDoorModelsR)[]  = { MODEL_o861, MODEL_o862, -1 };
+s32 N(BothRightDoorModelsL)[] = { MODEL_o772, MODEL_o844, MODEL_o859, MODEL_o860, -1 };
+s32 N(BothRightDoorModelsR)[] = { MODEL_o768, MODEL_o846, MODEL_o861, MODEL_o862, -1 };
+
+// doors on left wall
+s32 N(NearLeftDoorModelsL)[] = { MODEL_o874, MODEL_o875, -1 };
+s32 N(NearLeftDoorModelsR)[] = { MODEL_o876, MODEL_o877, -1 };
+s32 N(FarLeftDoorModelsL)[]  = { MODEL_o880, MODEL_o881, -1 };
+s32 N(FarLeftDoorModelsR)[]  = { MODEL_o878, MODEL_o879, -1 };
+s32 N(BothLeftDoorModelsL)[] = { MODEL_o874, MODEL_o875, MODEL_o880, MODEL_o881, -1 };
+s32 N(BothLeftDoorModelsR)[] = { MODEL_o876, MODEL_o877, MODEL_o878, MODEL_o879, -1 };
+
+EvtScript N(EVS_ExitDoors_pra_02_2) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_CREAKY)
+    EVT_SET(LVar0, pra_16_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittsw)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothRightDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothRightDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(NearRightDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(NearRightDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_02"), pra_02_ENTRY_2)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_18_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_SET(LVar0, pra_16_ENTRY_1)
+    EVT_SET(LVar1, COLLIDER_deilittse)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothLeftDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothLeftDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(NearLeftDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(NearLeftDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_18"), pra_18_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_18_2) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_SET(LVar0, pra_16_ENTRY_2)
+    EVT_SET(LVar1, COLLIDER_deilittne)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothLeftDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothLeftDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(FarLeftDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(FarLeftDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_18"), pra_18_ENTRY_2)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_02_3) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_CREAKY)
+    EVT_SET(LVar0, pra_16_ENTRY_3)
+    EVT_SET(LVar1, COLLIDER_deilittnw)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothRightDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothRightDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(FarRightDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(FarRightDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_02"), pra_02_ENTRY_3)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_02_2)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_18_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_18_2)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_02_3)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittnw, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_16_ENTRY_0)
+            EVT_CALL(UseDoorSounds, DOOR_SOUNDS_CREAKY)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(BothRightDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(BothRightDoorModelsR)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(NearRightDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(NearRightDoorModelsR)))
+            EVT_END_IF
+        EVT_CASE_EQ(pra_16_ENTRY_1)
+            EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(BothLeftDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(BothLeftDoorModelsR)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(NearLeftDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(NearLeftDoorModelsR)))
+            EVT_END_IF
+        EVT_CASE_EQ(pra_16_ENTRY_2)
+            EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(BothLeftDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(BothLeftDoorModelsR)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(FarLeftDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(FarLeftDoorModelsR)))
+            EVT_END_IF
+        EVT_CASE_EQ(pra_16_ENTRY_3)
+            EVT_CALL(UseDoorSounds, DOOR_SOUNDS_CREAKY)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(BothRightDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(BothRightDoorModelsR)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(FarRightDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(FarRightDoorModelsR)))
+            EVT_END_IF
+    EVT_END_SWITCH
+    EVT_EXEC_WAIT(BaseEnterDoor)
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_SET(LVar0, MODEL_o945)
+    EVT_SET(LVar1, MODEL_o947)
+    EVT_SET(LVar2, TEX_PANNER_0)
+    EVT_EXEC(N(EVS_GlassShimmer))
+    EVT_SET(LVar0, REFLECTION_FLOOR_WALL)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_18/D6B640.c b/src/world/area_pra/pra_18/D6B640.c
index a2502f539e..2ef3bbd646 100644
--- a/src/world/area_pra/pra_18/D6B640.c
+++ b/src/world/area_pra/pra_18/D6B640.c
@@ -1,3 +1,3 @@
 #include "pra_18.h"
 
-#include "world/common/atomic/Reflection.inc.c"
+#include "../common/Reflection.inc.c"
diff --git a/src/world/area_pra/pra_19/D6E9B0.c b/src/world/area_pra/pra_19/D6E9B0.c
deleted file mode 100644
index 60b1343ea9..0000000000
--- a/src/world/area_pra/pra_19/D6E9B0.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "pra_19.h"
-
-static char* N(exit_str_0) = "pra_35";
-static char* N(exit_str_1) = "pra_20";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c
deleted file mode 100644
index 662c055d2e..0000000000
--- a/src/world/area_pra/pra_19/D6E9D0.c
+++ /dev/null
@@ -1,223 +0,0 @@
-#include "pra_19.h"
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "world/common/todo/GetNpcCollisionHeight.inc.c"
-
-#include "world/common/todo/AddPlayerHandsOffset.inc.c"
-
-extern s32 N(ItemChoice_HasSelectedItem);
-extern s32 N(ItemChoice_SelectedItemID);
-#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
-
-ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
-    N(ItemChoice_HasSelectedItem) = TRUE;
-    return ApiStatus_DONE2;
-}
-
-BSS s32 D_802479F0[114];
-BSS s32 D_80247BB8_pra_19[92];
-
-ApiStatus func_802411D8_D6FB88(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = (s32*) evt_get_variable(script, *args++);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            D_802479F0[i] = ptr[i];
-        }
-        D_802479F0[i] = 0;
-    } else {
-        for (i = 0; i < 112; i++) {
-            D_802479F0[i] = i + 16;
-            D_802479F0[112] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_80241274_D6FC24(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* ptr = (s32*) evt_get_variable(script, *args++);
-    s32 i;
-
-    if (ptr != NULL) {
-        for (i = 0; ptr[i] != 0; i++) {
-            D_80247BB8_pra_19[i] = ptr[i];
-        }
-        D_80247BB8_pra_19[i] = 0;
-    } else {
-        for (i = 0; i < 91; i++) {
-            D_80247BB8_pra_19[i] = i + 128;
-            D_80247BB8_pra_19[91] = 0;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-
-#include "world/common/todo/PlayBigSmokePuff.inc.c"
-
-ApiStatus func_802413A4_D6FD54(Evt* script, s32 isInitialCall) {
-    EncounterStatus* currentEncounter = &gCurrentEncounter;
-    Bytecode* args = script->ptrReadPos;
-    Enemy* enemy = script->owner1.enemy;
-    s32 var_s1 = evt_get_variable(script, *args++) == 0;
-    Encounter* encounter;
-
-    if (evt_get_variable(script, *args++) == 0) {
-        var_s1 += 1;
-    }
-    if (evt_get_variable(script, *args++) == 0) {
-        var_s1 += 1;
-    }
-    if (evt_get_variable(script, *args++) == 0) {
-        var_s1 += 1;
-    }
-
-    switch (var_s1) {
-        case 1:
-            encounter = currentEncounter->encounterList[enemy->encounterIndex];
-            encounter->battle = 0x2101;
-            break;
-        case 2:
-            encounter = currentEncounter->encounterList[enemy->encounterIndex];
-            encounter->battle = 0x2102;
-            break;
-        case 3:
-            encounter = currentEncounter->encounterList[enemy->encounterIndex];
-            encounter->battle = 0x2103;
-            break;
-        case 4:
-            encounter = currentEncounter->encounterList[enemy->encounterIndex];
-            encounter->battle = 0x2104;
-            break;
-    }
-    return ApiStatus_DONE2;
-}
-
-void func_802415E0_D6FF90(void* data);
-void func_80241530_D6FEE0(void);
-
-ApiStatus func_802414F4_D6FEA4(Evt* script, s32 isInitialCall) {
-    script->array[0] = create_worker_world(0, func_80241530_D6FEE0);
-    return ApiStatus_DONE2;
-}
-
-void func_80241530_D6FEE0(void) {
-    RenderTask rt;
-    RenderTask* rtPtr = &rt;
-    Npc* npc = get_npc_safe(5);
-
-    if (gPlayerStatusPtr->flags & PS_FLAG_HAS_REFLECTION) {
-        s32 x, y, z;
-
-        get_screen_coords(gCurrentCamID, npc->pos.x, npc->pos.y, -npc->pos.z, &x, &y, &z);
-        rtPtr->renderMode = npc->renderMode;
-        rtPtr->distance = -z;
-        rtPtr->appendGfxArg = npc;
-        rtPtr->appendGfx = func_802415E0_D6FF90;
-        queue_render_task(rtPtr);
-    }
-}
-
-void func_802415E0_D6FF90(void* data) {
-    Npc* npc = data;
-    Matrix4f sp18, sp58, sp98;
-
-    npc_get_render_yaw(npc);
-    guRotateF(sp18, npc->renderYaw + gCameras[gCurrentCamID].currentYaw, 0.0f, 1.0f, 0.0f);
-    guScaleF(sp98, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_F);
-    guMtxCatF(sp18, sp98, sp18);
-    guTranslateF(sp58, npc->pos.x, npc->pos.y, npc->pos.z);
-    guMtxCatF(sp18, sp58, sp18);
-    spr_update_player_sprite(2, npc->currentAnim, 1.0f);
-    spr_draw_player_sprite(2, 0, 0, 0, sp18);
-}
-
-ApiStatus func_802416F8_D700A8(Evt* script, s32 isInitialCall) {
-    gPlayerStatus.spriteFacingAngle = script->varTable[0];
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_80241710_D700C0(Evt* script, s32 isInitialCall) {
-    Npc* npc1 = resolve_npc(script, script->varTable[3]);
-    Npc* npc2 = resolve_npc(script, script->varTable[4]);
-
-    npc1->collisionRadius = npc2->collisionRadius;
-    npc1->collisionHeight = npc2->collisionHeight;
-    return ApiStatus_DONE2;
-}
-
-
-ApiStatus func_8024175C_D7010C(Evt* script, s32 isInitialCall) {
-    Npc* npc0 = get_npc_unsafe(0);
-    Npc* npc1 = get_npc_unsafe(1);
-    Npc* npc2 = get_npc_unsafe(2);
-    Npc* npc3 = get_npc_unsafe(3);
-    Npc* npc4 = get_npc_unsafe(4);
-    f32 playerX = gPlayerStatus.position.x;
-
-    if (npc0->pos.x < playerX) {
-        return ApiStatus_DONE2;
-    }
-    if (npc1->pos.x < playerX) {
-        return ApiStatus_DONE2;
-    }
-    if (npc2->pos.x < playerX) {
-        return ApiStatus_DONE2;
-    }
-    if (npc3->pos.x < playerX) {
-        return ApiStatus_DONE2;
-    }
-    if (npc4->pos.x < playerX) {
-        return ApiStatus_DONE2;
-    }
-    return ApiStatus_BLOCK;
-}
-
-ApiStatus func_80241838_D701E8(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    Npc* npc = get_npc_unsafe(evt_get_variable(script, *args++));
-
-    if (isInitialCall) {
-        script->varTable[10] = evt_get_variable(script, *args++);
-        script->varTable[11] = 8;
-        script->varTable[12] = evt_get_variable(script, *args++);
-        if (npc->pos.x < script->varTable[10]) {
-            script->varTable[13] = 0;
-        } else {
-            script->varTable[13] = 1;
-        }
-    }
-
-    if (script->varTable[13] == 0) {
-        if (npc->pos.x >= script->varTable[10]) {
-            npc->pos.x = script->varTable[10];
-            return ApiStatus_DONE2;
-        }
-        npc->pos.x += script->varTable[11];
-    } else {
-        if (npc->pos.x <= script->varTable[10]) {
-            npc->pos.x = script->varTable[10];
-            return ApiStatus_DONE2;
-        }
-        npc->pos.x -= script->varTable[11];
-    }
-
-    if (script->varTable[12] == 0) {
-        script->varTable[11] += 2;
-        if (script->varTable[11] >= 14) {
-            script->varTable[11] = 14;
-        }
-    } else {
-        script->varTable[11] -= 2;
-        if (script->varTable[11] <= 8) {
-            script->varTable[11] = 8;
-        }
-    }
-    return ApiStatus_BLOCK;
-}
diff --git a/src/world/area_pra/pra_19/pra_19.h b/src/world/area_pra/pra_19/pra_19.h
index 6983992e96..ba7073ba6e 100644
--- a/src/world/area_pra/pra_19/pra_19.h
+++ b/src/world/area_pra/pra_19/pra_19.h
@@ -2,8 +2,56 @@
 /// @brief Crystal Palace - Reflection Mimic Room
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_19_shape.h"
+#include "mapfs/pra_19_hit.h"
+
+#include "sprite/npc/Duplighost.h"
+#include "sprite/npc/WorldKooper.h"
+#include "sprite/npc/WorldGoombario.h"
+#include "sprite/npc/Kolorado.h"
+#include "sprite/npc/Goompa.h"
+#include "sprite/npc/KoopaKoot.h"
+#include "sprite/npc/Luigi.h"
+
+enum {
+	// passive NPC for each imposter than can be interacted with
+    NPC_FakeKooper              = 0,
+    NPC_FakeGoompa              = 1,
+    NPC_FakeLuigi               = 2,
+    NPC_FakeKoopaKoot           = 3,
+    NPC_FakeKolorado            = 4,
+	// mario and partner in the mirror showing what to do
+    NPC_ExamplePlayer           = 5,
+    NPC_ExampleKooper           = 6,
+	// duplighosts for each imposter
+    NPC_GoompaGhost             = 7,
+    NPC_LuigiGhost              = 8,
+    NPC_KoopaKootGhost          = 9,
+    NPC_KoloradoGhost           = 10,
+    NPC_Duplighost_Controller   = 11, // controls the scene
+	// second set of NPCs for each imposter which detect hammer hits
+    NPC_TargetKooper			= 12,
+    NPC_TargetGoompa			= 13,
+    NPC_TargetLuigi				= 14,
+    NPC_TargetKoopaKoot			= 15,
+    NPC_TargetKolorado			= 16,
+};
+
+enum {
+    MV_UnmaskingState           = MapVar(0),
+    MV_RevealedFakeGoompa       = MapVar(2),
+    MV_RevealedFakeLuigi        = MapVar(3),
+    MV_RevealedFakeKoopaKoot    = MapVar(4),
+    MV_RevealedFakeKolorado     = MapVar(5),
+};
+
 #define NAMESPACE pra_19
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_ExitWalk_pra_20_0);
+extern NpcGroupList N(DefaultNPCs);
diff --git a/src/world/area_pra/pra_19/pra_19_0_header.c b/src/world/area_pra/pra_19/pra_19_0_header.c
new file mode 100644
index 0000000000..d168e4d54c
--- /dev/null
+++ b/src/world/area_pra/pra_19/pra_19_0_header.c
@@ -0,0 +1,15 @@
+#include "pra_19.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_19_ENTRY_0]    {   13.0,    0.0,   70.0,   90.0 },
+    [pra_19_ENTRY_1]    {  487.0,    0.0,   70.0,  270.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_19 },
+};
diff --git a/src/world/area_pra/pra_19/pra_19_1_music.c b/src/world/area_pra/pra_19/pra_19_1_music.c
new file mode 100644
index 0000000000..1f3cc9c6ef
--- /dev/null
+++ b/src/world/area_pra/pra_19/pra_19_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_19.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_19/pra_19_2_main.c b/src/world/area_pra/pra_19/pra_19_2_main.c
new file mode 100644
index 0000000000..d894a5de3e
--- /dev/null
+++ b/src/world/area_pra/pra_19/pra_19_2_main.c
@@ -0,0 +1,78 @@
+#include "pra_19.h"
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+#include "../common/GlassShimmer.inc.c"
+
+s32 N(DoorModelsL)[] = { MODEL_o772, MODEL_o844, -1 };
+s32 N(DoorModelsR)[] = { MODEL_o768, MODEL_o846, -1 };
+
+EvtScript N(EVS_ExitDoor_pra_35_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_19_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittsw)
+    EVT_SET(LVar2, EVT_PTR(N(DoorModelsL)))
+    EVT_SET(LVar3, EVT_PTR(N(DoorModelsR)))
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_35"), pra_35_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitWalk_pra_20_0) = EVT_EXIT_WALK(60, pra_19_ENTRY_1, "pra_20", pra_20_ENTRY_0);
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_pra_35_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0)
+    EVT_IF_GE(GB_StoryProgress, STORY_CH7_DEFEATED_KOOPER_DUPLIGHOSTS)
+        EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_pra_20_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilise, 1, 0)
+    EVT_END_IF
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_19_ENTRY_0)
+            EVT_SET(LVar2, EVT_PTR(N(DoorModelsL)))
+            EVT_SET(LVar3, EVT_PTR(N(DoorModelsR)))
+            EVT_EXEC_WAIT(BaseEnterDoor)
+            EVT_EXEC(N(EVS_BindExitTriggers))
+        EVT_CASE_EQ(pra_19_ENTRY_1)
+            EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers)))
+            EVT_EXEC(EnterWalk)
+    EVT_END_SWITCH
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_IF_GE(GB_StoryProgress, STORY_CH7_DEFEATED_KOOPER_DUPLIGHOSTS)
+        EVT_CALL(EnableModel, MODEL_o1024, FALSE)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1054, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_ELSE
+        EVT_CALL(EnableModel, MODEL_o1026, FALSE)
+    EVT_END_IF
+    EVT_SET(LVar0, MODEL_o945)
+    EVT_SET(LVar1, MODEL_o947)
+    EVT_SET(LVar2, TEX_PANNER_0)
+    EVT_EXEC(N(EVS_GlassShimmer))
+    EVT_SET(LVar0, REFLECTION_FLOOR_WALL)
+    EVT_SET(LVar1, TRUE) // disable reflections in this room
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_19/pra_19_3_npc.c b/src/world/area_pra/pra_19/pra_19_3_npc.c
new file mode 100644
index 0000000000..9d847a9df9
--- /dev/null
+++ b/src/world/area_pra/pra_19/pra_19_3_npc.c
@@ -0,0 +1,1601 @@
+#include "pra_19.h"
+#include "sprite.h"
+
+NpcSettings N(NpcSettings_Kooper) = {
+    .height = 35,
+    .radius = 24,
+    .level = 6,
+    .onHit = &EnemyNpcHit,
+    .onDefeat = &EnemyNpcDefeat,
+};
+
+NpcSettings N(NpcSettings_Goompa) = {
+    .height = 22,
+    .radius = 24,
+    .level = 99,
+    .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER,
+};
+
+NpcSettings N(NpcSettings_KoopaKoot) = {
+    .height = 32,
+    .radius = 24,
+    .level = 99,
+};
+
+#include "world/common/npc/Kolorado.inc.c"
+
+NpcSettings N(NpcSettings_Duplighost) = {
+    .height = 30,
+    .radius = 45,
+    .level = 99,
+};
+
+#include "world/common/npc/Luigi.h"
+
+#include "world/common/complete/KeyItemChoice.inc.c"
+MAP_STATIC_PAD(1,item_choice);
+#include "world/common/complete/NormalItemChoice.inc.c"
+
+#include "world/common/todo/PlayBigSmokePuff.inc.c"
+
+API_CALLABLE(N(ChooseImposterBattleFormation)) {
+    EncounterStatus* currentEncounter = &gCurrentEncounter;
+    Bytecode* args = script->ptrReadPos;
+    Enemy* enemy = script->owner1.enemy;
+    Encounter* encounter;
+    s32 unmaskedCount = 0;
+    
+    if (evt_get_variable(script, *args++) == 0) {
+        unmaskedCount++;
+    }
+    if (evt_get_variable(script, *args++) == 0) {
+        unmaskedCount++;
+    }
+    if (evt_get_variable(script, *args++) == 0) {
+        unmaskedCount++;
+    }
+    if (evt_get_variable(script, *args++) == 0) {
+        unmaskedCount++;
+    }
+
+    switch (unmaskedCount) {
+        case 1:
+            encounter = currentEncounter->encounterList[enemy->encounterIndex];
+            encounter->battle = BTL_PRA3_FORMATION_01;
+            break;
+        case 2:
+            encounter = currentEncounter->encounterList[enemy->encounterIndex];
+            encounter->battle = BTL_PRA3_FORMATION_02;
+            break;
+        case 3:
+            encounter = currentEncounter->encounterList[enemy->encounterIndex];
+            encounter->battle = BTL_PRA3_FORMATION_03;
+            break;
+        case 4:
+            encounter = currentEncounter->encounterList[enemy->encounterIndex];
+            encounter->battle = BTL_PRA3_FORMATION_04;
+            break;
+    }
+    return ApiStatus_DONE2;
+}
+
+void N(appendGfx_example_player)(void* data);
+void N(worker_draw_example_player)(void);
+
+API_CALLABLE(N(CreateExamplePlayerWorker)) {
+    script->array[0] = create_worker_world(NULL, N(worker_draw_example_player));
+    return ApiStatus_DONE2;
+}
+
+void N(worker_draw_example_player)(void) {
+    RenderTask rt;
+    RenderTask* rtPtr = &rt;
+    Npc* npc = get_npc_safe(NPC_ExamplePlayer);
+
+    if (gPlayerStatusPtr->flags & PS_FLAG_HAS_REFLECTION) {
+        s32 x, y, z;
+
+        get_screen_coords(gCurrentCamID, npc->pos.x, npc->pos.y, -npc->pos.z, &x, &y, &z);
+        rtPtr->renderMode = npc->renderMode;
+        rtPtr->distance = -z;
+        rtPtr->appendGfxArg = npc;
+        rtPtr->appendGfx = N(appendGfx_example_player);
+        queue_render_task(rtPtr);
+    }
+}
+
+void N(appendGfx_example_player)(void* data) {
+    Npc* npc = data;
+    Matrix4f mtxTransform, mtxTranslate, mtxScale;
+
+    npc_get_render_yaw(npc);
+    guRotateF(mtxTransform, npc->renderYaw + gCameras[gCurrentCamID].currentYaw, 0.0f, 1.0f, 0.0f);
+    guScaleF(mtxScale, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_F);
+    guMtxCatF(mtxTransform, mtxScale, mtxTransform);
+    guTranslateF(mtxTranslate, npc->pos.x, npc->pos.y, npc->pos.z);
+    guMtxCatF(mtxTransform, mtxTranslate, mtxTransform);
+    spr_update_player_sprite(PLAYER_SPRITE_AUX2, npc->currentAnim, 1.0f);
+    spr_draw_player_sprite(PLAYER_SPRITE_AUX2, 0, 0, 0, mtxTransform);
+}
+
+API_CALLABLE(N(SetPlayerFacingAngle)) {
+    gPlayerStatus.spriteFacingAngle = script->varTable[0];
+    return ApiStatus_DONE2;
+}
+
+API_CALLABLE(N(ChangeNpcCollisionRadius)) {
+    Npc* npc1 = resolve_npc(script, script->varTable[3]);
+    Npc* npc2 = resolve_npc(script, script->varTable[4]);
+
+    npc1->collisionRadius = npc2->collisionRadius;
+    npc1->collisionHeight = npc2->collisionHeight;
+    return ApiStatus_DONE2;
+}
+
+API_CALLABLE(N(AwaitImposterHitPlayer)) {
+    Npc* npc0 = get_npc_unsafe(NPC_FakeKooper);
+    Npc* npc1 = get_npc_unsafe(NPC_FakeGoompa);
+    Npc* npc2 = get_npc_unsafe(NPC_FakeLuigi);
+    Npc* npc3 = get_npc_unsafe(NPC_FakeKoopaKoot);
+    Npc* npc4 = get_npc_unsafe(NPC_FakeKolorado);
+    f32 playerX = gPlayerStatus.position.x;
+
+    if (npc0->pos.x < playerX) {
+        return ApiStatus_DONE2;
+    }
+    if (npc1->pos.x < playerX) {
+        return ApiStatus_DONE2;
+    }
+    if (npc2->pos.x < playerX) {
+        return ApiStatus_DONE2;
+    }
+    if (npc3->pos.x < playerX) {
+        return ApiStatus_DONE2;
+    }
+    if (npc4->pos.x < playerX) {
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
+
+API_CALLABLE(N(UpdateExampleKooperMotion)) {
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc = get_npc_unsafe(evt_get_variable(script, *args++));
+
+    if (isInitialCall) {
+        script->varTable[10] = evt_get_variable(script, *args++);
+        script->varTable[11] = 8;
+        script->varTable[12] = evt_get_variable(script, *args++);
+        if (npc->pos.x < script->varTable[10]) {
+            script->varTable[13] = 0;
+        } else {
+            script->varTable[13] = 1;
+        }
+    }
+
+    if (script->varTable[13] == 0) {
+        if (npc->pos.x >= script->varTable[10]) {
+            npc->pos.x = script->varTable[10];
+            return ApiStatus_DONE2;
+        }
+        npc->pos.x += script->varTable[11];
+    } else {
+        if (npc->pos.x <= script->varTable[10]) {
+            npc->pos.x = script->varTable[10];
+            return ApiStatus_DONE2;
+        }
+        npc->pos.x -= script->varTable[11];
+    }
+
+    if (script->varTable[12] == 0) {
+        // move forward
+        script->varTable[11] += 2;
+        if (script->varTable[11] >= 14) {
+            script->varTable[11] = 14;
+        }
+    } else {
+        // return to player
+        script->varTable[11] -= 2;
+        if (script->varTable[11] <= 8) {
+            script->varTable[11] = 8;
+        }
+    }
+    return ApiStatus_BLOCK;
+}
+
+
+EvtScript N(EVS_FocusCam_OnPosition) = {
+    EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, LVarA)
+    EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0))
+    EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(12.0), EVT_FLOAT(-5.5))
+    EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(500.0), EVT_FLOAT(20.0))
+    EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
+    EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
+    EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_FocusCam_StartBattle) = {
+    EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+    EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(6.0))
+    EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0))
+    EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(386.0), EVT_FLOAT(20.0))
+    EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
+    EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
+    EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_FocusCam_OnPlayer) = {
+    EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+    EVT_IF_GT(LVar0, 386)
+        EVT_SET(LVar0, 386)
+    EVT_END_IF
+    EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
+    EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(6.0))
+    EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0))
+    EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(500.0), EVT_FLOAT(20.0))
+    EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
+    EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
+    EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
+    EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Imposter_Unmask) = {
+    EVT_CALL(N(ChangeNpcCollisionRadius))
+    EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, TRUE)
+    EVT_CALL(SpeakToPlayer, LVar3, LVar6, LVar7, 0, LVar5)
+    EVT_CALL(GetNpcPos, LVar3, LVar0, LVar1, LVar2)
+    EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2)
+    EVT_CALL(SetNpcPos, LVar3, NPC_DISPOSE_LOCATION)
+    EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, FALSE)
+    EVT_CALL(SetNpcPos, LVar4, LVar0, LVar1, LVar2)
+    EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_SMOKE_BURST, 0)
+    EVT_CALL(MakeLerp, 0, 8 * 360, 40, EASING_QUADRATIC_OUT)
+    EVT_LABEL(1)
+        EVT_CALL(UpdateLerp)
+        EVT_CALL(SetNpcRotation, LVar4, 0, LVar0, 0)
+        EVT_WAIT(1)
+        EVT_IF_EQ(LVar1, 1)
+            EVT_GOTO(1)
+        EVT_END_IF
+    EVT_CALL(EndSpeech, LVar4, ANIM_Duplighost_Anim05, ANIM_Duplighost_Anim02, 0)
+    EVT_EXEC_WAIT(N(EVS_FocusCam_OnPlayer))
+    EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
+    EVT_THREAD
+        EVT_CALL(SetNpcAnimation, LVar4, ANIM_Duplighost_Anim04)
+        EVT_CALL(InterpNpcYaw, LVar4, 90, 0)
+        EVT_CALL(SetNpcSpeed, LVar4, EVT_FLOAT(6.5))
+        EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2CB, 0)
+        EVT_CALL(NpcMoveTo, LVar4, 0, LVar2, 0)
+        EVT_CALL(SetNpcPos, LVar4, NPC_DISPOSE_LOCATION)
+    EVT_END_THREAD
+    EVT_WAIT(15)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Imposter_HopTwice) = {
+    EVT_CALL(SetNpcJumpscale, LVar3, EVT_FLOAT(1.0))
+    EVT_CALL(GetNpcPos, LVar3, LVar0, LVar1, LVar2)
+    EVT_CALL(NpcJump0, LVar3, LVar0, LVar1, LVar2, 10)
+    EVT_CALL(GetNpcPos, LVar3, LVar0, LVar1, LVar2)
+    EVT_CALL(NpcJump0, LVar3, LVar0, LVar1, LVar2, 10)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_RevealEveryImposter) = {
+    EVT_IF_EQ(MV_RevealedFakeGoompa, 0)
+        EVT_THREAD
+            EVT_CALL(GetNpcPos, NPC_FakeGoompa, LVar0, LVar1, LVar2)
+            EVT_CALL(SetNpcPos, NPC_FakeGoompa, NPC_DISPOSE_LOCATION)
+            EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2)
+            EVT_CALL(SetNpcPos, NPC_GoompaGhost, LVar0, LVar1, LVar2)
+            EVT_CALL(PlaySoundAtNpc, NPC_GoompaGhost, SOUND_SMOKE_BURST, 0)
+            EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+            EVT_CALL(NpcMoveTo, NPC_GoompaGhost, LVar0, LVar2, 30)
+        EVT_END_THREAD
+    EVT_END_IF
+    EVT_IF_EQ(MV_RevealedFakeLuigi, 0)
+        EVT_THREAD
+            EVT_CALL(GetNpcPos, NPC_FakeLuigi, LVar0, LVar1, LVar2)
+            EVT_CALL(SetNpcPos, NPC_FakeLuigi, NPC_DISPOSE_LOCATION)
+            EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2)
+            EVT_CALL(SetNpcPos, NPC_LuigiGhost, LVar0, LVar1, LVar2)
+            EVT_CALL(PlaySoundAtNpc, NPC_LuigiGhost, SOUND_SMOKE_BURST, 0)
+            EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+            EVT_CALL(NpcMoveTo, NPC_LuigiGhost, LVar0, LVar2, 30)
+        EVT_END_THREAD
+    EVT_END_IF
+    EVT_IF_EQ(MV_RevealedFakeKoopaKoot, 0)
+        EVT_THREAD
+            EVT_CALL(GetNpcPos, NPC_FakeKoopaKoot, LVar0, LVar1, LVar2)
+            EVT_CALL(SetNpcPos, NPC_FakeKoopaKoot, NPC_DISPOSE_LOCATION)
+            EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2)
+            EVT_CALL(SetNpcPos, NPC_KoopaKootGhost, LVar0, LVar1, LVar2)
+            EVT_CALL(PlaySoundAtNpc, NPC_KoopaKootGhost, SOUND_SMOKE_BURST, 0)
+            EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+            EVT_CALL(NpcMoveTo, NPC_KoopaKootGhost, LVar0, LVar2, 30)
+        EVT_END_THREAD
+    EVT_END_IF
+    EVT_IF_EQ(MV_RevealedFakeKolorado, 0)
+        EVT_THREAD
+            EVT_CALL(GetNpcPos, NPC_FakeKolorado, LVar0, LVar1, LVar2)
+            EVT_CALL(SetNpcPos, NPC_FakeKolorado, NPC_DISPOSE_LOCATION)
+            EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2)
+            EVT_CALL(SetNpcPos, NPC_KoloradoGhost, LVar0, LVar1, LVar2)
+            EVT_CALL(PlaySoundAtNpc, NPC_KoloradoGhost, SOUND_SMOKE_BURST, 0)
+            EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+            EVT_CALL(NpcMoveTo, NPC_KoloradoGhost, LVar0, LVar2, 30)
+        EVT_END_THREAD
+    EVT_END_IF
+    EVT_WAIT(20)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Imposter_ChaseDownPlayer) = {
+    EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, TRUE)
+    EVT_CALL(SetNpcAnimation, LVar3, LVar4)
+    EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+    EVT_CALL(NpcMoveTo, LVar3, LVar0, LVar2, 30)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Imposter_CarryPlayerBack) = {
+    EVT_CALL(InterpNpcYaw, LVar3, LVar9, 0)
+    EVT_LOOP(30)
+        EVT_CALL(GetNpcPos, NPC_FakeKooper, LVar0, LVar1, LVar2)
+        EVT_ADD(LVar0, LVar4)
+        EVT_ADD(LVar1, LVar5)
+        EVT_ADD(LVar2, LVar6)
+        EVT_CALL(SetNpcPos, LVar3, LVar0, LVar1, LVar2)
+        EVT_WAIT(1)
+    EVT_END_LOOP
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Imposter_ReturnToStation) = {
+    EVT_CALL(NpcMoveTo, LVar3, LVar0, LVar2, 20)
+    EVT_CALL(SetNpcAnimation, LVar3, LVar4)
+    EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, FALSE)
+    EVT_CALL(InterpNpcYaw, LVar3, 90, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_PreventPlayerLeaving) = {
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_LOOP(0)
+        EVT_WAIT(1)
+        EVT_CALL(GetPlayerActionState, LVar0)
+        EVT_IF_EQ(LVar0, ACTION_STATE_IDLE)
+            EVT_BREAK_LOOP
+        EVT_END_IF
+    EVT_END_LOOP
+    EVT_CALL(DisablePlayerPhysics, TRUE)
+    EVT_IF_EQ(MV_RevealedFakeGoompa, 0)
+        EVT_SET(LVar3, NPC_FakeGoompa)
+        EVT_SET(LVar4, ANIM_Goompa_Run)
+        EVT_EXEC(N(EVS_Imposter_ChaseDownPlayer))
+    EVT_END_IF
+    EVT_IF_EQ(MV_RevealedFakeLuigi, 0)
+        EVT_SET(LVar3, NPC_FakeLuigi)
+        EVT_SET(LVar4, ANIM_Luigi_Run)
+        EVT_EXEC(N(EVS_Imposter_ChaseDownPlayer))
+    EVT_END_IF
+    EVT_IF_EQ(MV_RevealedFakeKoopaKoot, 0)
+        EVT_SET(LVar3, NPC_FakeKoopaKoot)
+        EVT_SET(LVar4, ANIM_KoopaKoot_Run)
+        EVT_EXEC(N(EVS_Imposter_ChaseDownPlayer))
+    EVT_END_IF
+    EVT_IF_EQ(MV_RevealedFakeKolorado, 0)
+        EVT_SET(LVar3, NPC_FakeKolorado)
+        EVT_SET(LVar4, ANIM_Kolorado_Run)
+        EVT_EXEC(N(EVS_Imposter_ChaseDownPlayer))
+    EVT_END_IF
+    EVT_SET(LVar3, NPC_FakeKooper)
+    EVT_SET(LVar4, ANIM_WorldKooper_Run)
+    EVT_EXEC_WAIT(N(EVS_Imposter_ChaseDownPlayer))
+    EVT_CALL(InterpPlayerYaw, 90, 3)
+    EVT_CALL(SetPlayerAnimation, ANIM_Mario_80009)
+    EVT_CALL(GetNpcPos, NPC_FakeKooper, LVar0, LVar1, LVar2)
+    EVT_ADD(LVar1, 30)
+    EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
+    EVT_WAIT(10)
+    EVT_THREAD
+        EVT_LOOP(35)
+            EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+            EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2)
+            EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2)
+            EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
+            EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
+            EVT_WAIT(1)
+        EVT_END_LOOP
+        EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
+    EVT_END_THREAD
+    EVT_THREAD
+        EVT_LOOP(30)
+            EVT_CALL(GetNpcPos, NPC_FakeKooper, LVar0, LVar1, LVar2)
+            EVT_ADD(LVar1, 30)
+            EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
+            EVT_WAIT(1)
+        EVT_END_LOOP
+    EVT_END_THREAD
+    EVT_IF_EQ(MV_RevealedFakeGoompa, 0)
+        EVT_SET(LVar3, NPC_FakeGoompa)
+        EVT_SET(LVar4, 0)
+        EVT_SET(LVar5, 0)
+        EVT_SET(LVar6, 10)
+        EVT_EXEC(N(EVS_Imposter_CarryPlayerBack))
+    EVT_END_IF
+    EVT_IF_EQ(MV_RevealedFakeLuigi, 0)
+        EVT_SET(LVar3, NPC_FakeLuigi)
+        EVT_SET(LVar4, -20)
+        EVT_SET(LVar5, 0)
+        EVT_SET(LVar6, 0)
+        EVT_EXEC(N(EVS_Imposter_CarryPlayerBack))
+    EVT_END_IF
+    EVT_IF_EQ(MV_RevealedFakeKoopaKoot, 0)
+        EVT_SET(LVar3, NPC_FakeKoopaKoot)
+        EVT_SET(LVar4, -20)
+        EVT_SET(LVar5, 0)
+        EVT_SET(LVar6, 10)
+        EVT_EXEC(N(EVS_Imposter_CarryPlayerBack))
+    EVT_END_IF
+    EVT_IF_EQ(MV_RevealedFakeKolorado, 0)
+        EVT_SET(LVar3, NPC_FakeKolorado)
+        EVT_SET(LVar4, -20)
+        EVT_SET(LVar5, 0)
+        EVT_SET(LVar6, 20)
+        EVT_EXEC(N(EVS_Imposter_CarryPlayerBack))
+    EVT_END_IF
+    EVT_CALL(NpcMoveTo, NPC_FakeKooper, 370, 73, 30)
+    EVT_CALL(DisablePlayerPhysics, FALSE)
+    EVT_IF_EQ(MV_RevealedFakeGoompa, 0)
+        EVT_SET(LVar3, NPC_FakeGoompa)
+        EVT_SET(LVar4, ANIM_Goompa_Idle)
+        EVT_SET(LVar0, 350)
+        EVT_SET(LVar2, 90)
+        EVT_EXEC(N(EVS_Imposter_ReturnToStation))
+    EVT_END_IF
+    EVT_IF_EQ(MV_RevealedFakeLuigi, 0)
+        EVT_SET(LVar3, NPC_FakeLuigi)
+        EVT_SET(LVar4, ANIM_Luigi_Idle)
+        EVT_SET(LVar0, 280)
+        EVT_SET(LVar2, 90)
+        EVT_EXEC(N(EVS_Imposter_ReturnToStation))
+    EVT_END_IF
+    EVT_IF_EQ(MV_RevealedFakeKoopaKoot, 0)
+        EVT_SET(LVar3, NPC_FakeKoopaKoot)
+        EVT_SET(LVar4, ANIM_KoopaKoot_Idle)
+        EVT_SET(LVar0, 420)
+        EVT_SET(LVar2, 60)
+        EVT_EXEC(N(EVS_Imposter_ReturnToStation))
+    EVT_END_IF
+    EVT_IF_EQ(MV_RevealedFakeKolorado, 0)
+        EVT_SET(LVar3, NPC_FakeKolorado)
+        EVT_SET(LVar4, ANIM_Kolorado_Idle)
+        EVT_SET(LVar0, 315)
+        EVT_SET(LVar2, 55)
+        EVT_EXEC(N(EVS_Imposter_ReturnToStation))
+    EVT_END_IF
+    EVT_SET(LVar3, NPC_FakeKooper)
+    EVT_SET(LVar4, ANIM_WorldKooper_Idle)
+    EVT_SET(LVar0, 385)
+    EVT_SET(LVar2, 120)
+    EVT_EXEC_WAIT(N(EVS_Imposter_ReturnToStation))
+    EVT_CALL(ShowMessageAtScreenPos, MSG_CH7_0165, 160, 40)
+    EVT_CALL(DisablePlayerInput, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Example_UseKooper) = {
+    EVT_CALL(GetNpcPos, NPC_ExamplePlayer, LVar3, LVar4, LVar5)
+    EVT_THREAD
+        EVT_CALL(GetNpcPos, NPC_ExamplePlayer, LVar0, LVar1, LVar2)
+        EVT_ADD(LVar0, 10)
+        EVT_CALL(NpcMoveTo, NPC_ExampleKooper, LVar0, LVar2, 4)
+        EVT_WAIT(2)
+        EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_EnterShell)
+        EVT_WAIT(2)
+        EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_SpinShell)
+    EVT_END_THREAD
+    EVT_THREAD
+        EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_AnimMidairStill)
+        EVT_WAIT(10)
+        EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_10009)
+    EVT_END_THREAD
+    EVT_CALL(SetNpcJumpscale, NPC_ExamplePlayer, EVT_FLOAT(2.0))
+    EVT_CALL(GetNpcPos, NPC_ExamplePlayer, LVar0, LVar1, LVar2)
+    EVT_CALL(NpcJump0, NPC_ExamplePlayer, LVar0, LVar1, LVar2, 10)
+    EVT_LABEL(10)
+        EVT_CALL(GetNpcPos, NPC_ExamplePlayer, LVar0, LVar1, LVar2)
+        EVT_CALL(SetNpcPos, NPC_ExampleKooper, LVar0, LVar1, LVar2)
+        EVT_SET(LVar3, LVar0)
+        EVT_ADD(LVar3, 140)
+        EVT_CALL(N(UpdateExampleKooperMotion), NPC_ExampleKooper, LVar3, 0)
+        EVT_CALL(N(UpdateExampleKooperMotion), NPC_ExampleKooper, LVar0, 1)
+        EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_StillShell)
+        EVT_THREAD
+            EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_AnimMidairStill)
+            EVT_WAIT(10)
+            EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_10009)
+        EVT_END_THREAD
+        EVT_CALL(SetNpcJumpscale, NPC_ExamplePlayer, EVT_FLOAT(2.0))
+        EVT_CALL(GetNpcPos, NPC_ExamplePlayer, LVar0, LVar1, LVar2)
+        EVT_CALL(NpcJump0, NPC_ExamplePlayer, LVar0, LVar1, LVar2, 10)
+        EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_SpinShell)
+        EVT_GOTO(10)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Imposter_BurstFromWall) = {
+    EVT_CALL(SetNpcPos, LVar3, 533, 0, 77)
+    EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, TRUE)
+    EVT_CALL(SetNpcSpeed, LVar3, EVT_FLOAT(6.0))
+    EVT_CALL(SetNpcAnimation, LVar3, LVar4)
+    EVT_CALL(NpcMoveTo, LVar3, LVar0, LVar2, 0)
+    EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, FALSE)
+    EVT_CALL(SetNpcAnimation, LVar3, LVar5)
+    EVT_CALL(InterpNpcYaw, LVar3, 90, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ManageImpostersScene) = {
+    EVT_IF_GE(GB_StoryProgress, STORY_CH7_DEFEATED_KOOPER_DUPLIGHOSTS)
+        EVT_GOTO(30)
+    EVT_END_IF
+    EVT_IF_EQ(GB_PRA19_TutorialState, 0)
+        EVT_GOTO(0)
+    EVT_END_IF
+    EVT_IF_EQ(GB_PRA19_TutorialState, 1)
+        EVT_GOTO(10)
+    EVT_END_IF
+    EVT_IF_EQ(GB_PRA19_TutorialState, 2)
+        EVT_GOTO(20)
+    EVT_END_IF
+    EVT_LABEL(0)
+        EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_10002)
+        EVT_CALL(SetNpcPos, NPC_ExamplePlayer, 53, 0, -75)
+        EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_Idle)
+        EVT_CALL(SetNpcPos, NPC_ExampleKooper, 23, 0, -75)
+        EVT_LABEL(1)
+            EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+            EVT_WAIT(1)
+            EVT_IF_LT(LVar0, 110)
+                EVT_GOTO(1)
+            EVT_END_IF
+        EVT_CALL(SetNpcSpeed, NPC_ExamplePlayer, EVT_FLOAT(3.0))
+        EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_Walking)
+        EVT_THREAD
+            EVT_CALL(SetNpcSpeed, NPC_ExampleKooper, EVT_FLOAT(3.0))
+            EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_Walk)
+            EVT_CALL(NpcMoveTo, NPC_ExampleKooper, 385, -75, 0)
+            EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_Idle)
+        EVT_END_THREAD
+        EVT_CALL(NpcMoveTo, NPC_ExamplePlayer, 415, -75, 0)
+        EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_10002)
+        EVT_SET(GB_PRA19_TutorialState, 1)
+        EVT_GOTO(11)
+    EVT_LABEL(10)
+        EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_10002)
+        EVT_CALL(SetNpcPos, NPC_ExamplePlayer, 415, 0, -75)
+        EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_Idle)
+        EVT_CALL(SetNpcPos, NPC_ExampleKooper, 385, 0, -75)
+        EVT_LABEL(11)
+            EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+            EVT_WAIT(1)
+            EVT_IF_LT(LVar0, 380)
+                EVT_GOTO(11)
+            EVT_END_IF
+        EVT_EXEC(N(EVS_Example_UseKooper))
+        EVT_SET(GB_PRA19_TutorialState, 2)
+        EVT_GOTO(21)
+    EVT_LABEL(20)
+    EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_10002)
+    EVT_CALL(SetNpcPos, NPC_ExamplePlayer, 415, 0, -75)
+    EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_Idle)
+    EVT_CALL(SetNpcPos, NPC_ExampleKooper, 385, 0, -75)
+    EVT_EXEC(N(EVS_Example_UseKooper))
+    EVT_LABEL(21)
+        EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2)
+        EVT_WAIT(1)
+        EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5)
+        EVT_IF_LT(LVar0, 510)
+            EVT_GOTO(21)
+        EVT_END_IF
+        EVT_IF_LT(LVar3, LVar0)
+            EVT_GOTO(21)
+        EVT_END_IF
+    EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2 | NPC_FLAG_100, TRUE)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(DisablePartnerAI, 0)
+    EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE)
+    EVT_WAIT(60)
+    EVT_CALL(SetPlayerAnimation, ANIM_Mario_Question)
+    EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0)
+    EVT_CALL(ShowEmote, NPC_FakeKooper, EMOTE_QUESTION, 0, 30, FALSE, 0, 0, 0, 0)
+    EVT_WAIT(35)
+    EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B)
+    EVT_CALL(PlaySoundAtCollider, COLLIDER_o1054, SOUND_1E4, 0)
+    EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 34, 22, 1, 10, 30)
+    EVT_CALL(EnableModel, MODEL_o1024, FALSE)
+    EVT_CALL(EnableModel, MODEL_o1026, TRUE)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1054, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_SET(LVar3, NPC_FakeGoompa)
+    EVT_SET(LVar4, ANIM_Goompa_Run)
+    EVT_SET(LVar5, ANIM_Goompa_Idle)
+    EVT_SET(LVar0, 350)
+    EVT_SET(LVar2, 90)
+    EVT_EXEC(N(EVS_Imposter_BurstFromWall))
+    EVT_SET(LVar3, NPC_FakeLuigi)
+    EVT_SET(LVar4, ANIM_Luigi_Run)
+    EVT_SET(LVar5, ANIM_Luigi_Idle)
+    EVT_SET(LVar0, 280)
+    EVT_SET(LVar2, 90)
+    EVT_EXEC(N(EVS_Imposter_BurstFromWall))
+    EVT_SET(LVar3, NPC_FakeKoopaKoot)
+    EVT_SET(LVar4, ANIM_KoopaKoot_Run)
+    EVT_SET(LVar5, ANIM_KoopaKoot_Idle)
+    EVT_SET(LVar0, 420)
+    EVT_SET(LVar2, 60)
+    EVT_EXEC(N(EVS_Imposter_BurstFromWall))
+    EVT_SET(LVar3, NPC_FakeKolorado)
+    EVT_SET(LVar4, ANIM_Kolorado_Run)
+    EVT_SET(LVar5, ANIM_Kolorado_Idle)
+    EVT_SET(LVar0, 315)
+    EVT_SET(LVar2, 55)
+    EVT_EXEC(N(EVS_Imposter_BurstFromWall))
+    EVT_SET(LVar3, NPC_FakeKooper)
+    EVT_SET(LVar4, ANIM_WorldKooper_Run)
+    EVT_SET(LVar5, ANIM_WorldKooper_Idle)
+    EVT_SET(LVar0, 385)
+    EVT_SET(LVar2, 120)
+    EVT_EXEC(N(EVS_Imposter_BurstFromWall))
+    EVT_THREAD
+        EVT_WAIT(2)
+        EVT_CALL(N(AwaitImposterHitPlayer))
+        EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_ROTATION_LOCKED | PS_FLAG_FACE_FORWARDS, TRUE)
+        EVT_CALL(MakeLerp, 0, 11 * 180, 30, EASING_QUADRATIC_OUT)
+        EVT_LOOP(0)
+            EVT_CALL(UpdateLerp)
+            EVT_CALL(InterpPlayerYaw, LVar0, 0)
+            EVT_CALL(N(SetPlayerFacingAngle))
+            EVT_WAIT(1)
+            EVT_IF_EQ(LVar1, 0)
+                EVT_BREAK_LOOP
+            EVT_END_IF
+        EVT_END_LOOP
+        EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_ROTATION_LOCKED | PS_FLAG_FACE_FORWARDS, FALSE)
+    EVT_END_THREAD
+    EVT_WAIT(60)
+    EVT_CALL(InterpPlayerYaw, 270, 0)
+    EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002)
+    EVT_WAIT(10)
+    // kolorado imposter speaks
+    EVT_CALL(GetNpcPos, NPC_FakeKolorado, LVar0, LVar1, LVar2)
+    EVT_SETF(LVarA, EVT_FLOAT(3.0))
+    EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+    EVT_SET(LVar3, NPC_FakeKolorado)
+    EVT_EXEC(N(EVS_Imposter_HopTwice))
+    EVT_CALL(SpeakToPlayer, NPC_FakeKolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH7_0153)
+    // goomba imposter speaks
+    EVT_CALL(GetNpcPos, NPC_FakeGoompa, LVar0, LVar1, LVar2)
+    EVT_SETF(LVarA, EVT_FLOAT(3.0))
+    EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+    EVT_SET(LVar3, NPC_FakeGoompa)
+    EVT_EXEC(N(EVS_Imposter_HopTwice))
+    EVT_CALL(SpeakToPlayer, NPC_FakeGoompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH7_0154)
+     // goomba imposter speaks
+    EVT_CALL(GetNpcPos, NPC_FakeKooper, LVar0, LVar1, LVar2)
+    EVT_SETF(LVarA, EVT_FLOAT(3.0))
+    EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+    EVT_SET(LVar3, NPC_FakeKooper)
+    EVT_EXEC(N(EVS_Imposter_HopTwice))
+    EVT_CALL(SpeakToPlayer, NPC_FakeKooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_0155)
+     // goomba imposter speaks
+    EVT_CALL(GetNpcPos, NPC_FakeKoopaKoot, LVar0, LVar1, LVar2)
+    EVT_SETF(LVarA, EVT_FLOAT(3.0))
+    EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+    EVT_SET(LVar3, NPC_FakeKoopaKoot)
+    EVT_EXEC(N(EVS_Imposter_HopTwice))
+    EVT_CALL(SpeakToPlayer, NPC_FakeKoopaKoot, ANIM_KoopaKoot_Talk, ANIM_KoopaKoot_Idle, 0, MSG_CH7_0156)
+     // luigi imposter speaks
+    EVT_CALL(GetNpcPos, NPC_FakeLuigi, LVar0, LVar1, LVar2)
+    EVT_SETF(LVarA, EVT_FLOAT(3.0))
+    EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+    EVT_SET(LVar3, NPC_FakeLuigi)
+    EVT_EXEC(N(EVS_Imposter_HopTwice))
+    EVT_CALL(SpeakToPlayer, NPC_FakeLuigi, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH7_0157)
+     // follow-up dialogue
+    EVT_CALL(GetNpcPos, NPC_FakeKolorado, LVar0, LVar1, LVar2)
+    EVT_SETF(LVarA, EVT_FLOAT(3.0))
+    EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+    EVT_CALL(SpeakToPlayer, NPC_FakeKolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH7_0158)
+    EVT_CALL(GetNpcPos, NPC_FakeGoompa, LVar0, LVar1, LVar2)
+    EVT_SETF(LVarA, EVT_FLOAT(3.0))
+    EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+    EVT_CALL(SpeakToPlayer, NPC_FakeGoompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH7_0159)
+    EVT_CALL(GetNpcPos, NPC_FakeLuigi, LVar0, LVar1, LVar2)
+    EVT_SETF(LVarA, EVT_FLOAT(3.0))
+    EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+    EVT_CALL(SpeakToPlayer, NPC_FakeLuigi, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH7_015A)
+    EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0))
+    EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
+    EVT_CALL(DisablePlayerInput, FALSE)
+    EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE)
+    EVT_LOOP(0)
+        EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+        EVT_IF_GT(LVar0, 490)
+            EVT_SET(LVar9, 270)
+            EVT_EXEC_WAIT(N(EVS_PreventPlayerLeaving))
+        EVT_END_IF
+        EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+        EVT_IF_LT(LVar0, 190)
+            EVT_SET(LVar9, 90)
+            EVT_EXEC_WAIT(N(EVS_PreventPlayerLeaving))
+        EVT_END_IF
+        EVT_IF_EQ(MV_RevealedFakeGoompa, 1)
+            EVT_IF_EQ(MV_RevealedFakeLuigi, 1)
+                EVT_IF_EQ(MV_RevealedFakeKoopaKoot, 1)
+                    EVT_IF_EQ(MV_RevealedFakeKolorado, 1)
+                        EVT_CALL(DisablePlayerInput, TRUE)
+                        EVT_CALL(DisablePartnerAI, 0)
+                        EVT_CALL(GetNpcPos, NPC_FakeKooper, LVar0, LVar1, LVar2)
+                        EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2)
+                        EVT_CALL(SetNpcPos, NPC_FakeKooper, NPC_DISPOSE_LOCATION)
+                        EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2, FALSE)
+                        EVT_CALL(GetAngleToNPC, NPC_PARTNER, LVarA)
+                        EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+                        EVT_IF_LE(LVarA, 180)
+                            EVT_ADD(LVar0, 50)
+                        EVT_ELSE
+                            EVT_ADD(LVar0, -50)
+                        EVT_END_IF
+                        EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldKooper_Walk)
+                        EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE)
+                        EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 20)
+                        EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldKooper_Idle)
+                        EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_0166)
+                        EVT_WAIT(10)
+                        EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, FALSE)
+                        EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, FALSE)
+                        EVT_CALL(EnablePartnerAI)
+                        EVT_CALL(DisablePlayerInput, FALSE)
+                        EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_pra_20_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilise, 1, 0)
+                        EVT_SET(GB_StoryProgress, STORY_CH7_DEFEATED_KOOPER_DUPLIGHOSTS)
+                        EVT_BREAK_LOOP
+                    EVT_END_IF
+                EVT_END_IF
+            EVT_END_IF
+        EVT_END_IF
+        EVT_SWITCH(MV_UnmaskingState)
+            EVT_CASE_EQ(0)
+                EVT_WAIT(1)
+            EVT_CASE_EQ(NPC_FakeKooper + 1)
+                EVT_CALL(DisablePlayerInput, TRUE)
+                EVT_CALL(SetNpcAnimation, NPC_FakeKooper, ANIM_WorldKooper_Hurt)
+                EVT_CALL(GetNpcPos, NPC_FakeKooper, LVar0, LVar1, LVar2)
+                EVT_SETF(LVarA, EVT_FLOAT(6.0))
+                EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+                EVT_CALL(SpeakToPlayer, NPC_FakeKooper, ANIM_WorldKooper_Hurt, ANIM_WorldKooper_Hurt, 0, MSG_CH7_0162)
+                EVT_EXEC_WAIT(N(EVS_FocusCam_StartBattle))
+                EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B)
+                EVT_EXEC_WAIT(N(EVS_RevealEveryImposter))
+                EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+                EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
+                EVT_CALL(N(ChooseImposterBattleFormation), MV_RevealedFakeGoompa, MV_RevealedFakeLuigi, MV_RevealedFakeKoopaKoot, MV_RevealedFakeKolorado)
+                EVT_CALL(DisablePlayerInput, FALSE)
+                EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE)
+                EVT_BREAK_LOOP
+            EVT_CASE_EQ(NPC_FakeGoompa + 1)
+                EVT_CALL(DisablePlayerInput, TRUE)
+                EVT_CALL(GetNpcPos, NPC_FakeGoompa, LVar0, LVar1, LVar2)
+                EVT_SETF(LVarA, EVT_FLOAT(6.0))
+                EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+                EVT_SET(LVar3, NPC_FakeGoompa)
+                EVT_SET(LVar4, NPC_GoompaGhost)
+                EVT_SET(LVar5, MSG_CH7_0161)
+                EVT_SET(LVar6, ANIM_Goompa_Talk)
+                EVT_SET(LVar7, ANIM_Goompa_Idle)
+                EVT_EXEC_WAIT(N(EVS_Imposter_Unmask))
+                EVT_SET(MV_UnmaskingState, 0)
+                EVT_SET(MV_RevealedFakeGoompa, 1)
+                EVT_CALL(DisablePlayerInput, FALSE)
+            EVT_CASE_EQ(NPC_FakeLuigi + 1)
+                EVT_CALL(DisablePlayerInput, TRUE)
+                EVT_CALL(GetNpcPos, NPC_FakeLuigi, LVar0, LVar1, LVar2)
+                EVT_SETF(LVarA, EVT_FLOAT(6.0))
+                EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+                EVT_SET(LVar3, NPC_FakeLuigi)
+                EVT_SET(LVar4, NPC_LuigiGhost)
+                EVT_SET(LVar5, MSG_CH7_0164)
+                EVT_SET(LVar6, ANIM_Luigi_Talk)
+                EVT_SET(LVar7, ANIM_Luigi_Idle)
+                EVT_EXEC_WAIT(N(EVS_Imposter_Unmask))
+                EVT_SET(MV_UnmaskingState, 0)
+                EVT_SET(MV_RevealedFakeLuigi, 1)
+                EVT_CALL(DisablePlayerInput, FALSE)
+            EVT_CASE_EQ(NPC_FakeKoopaKoot + 1)
+                EVT_CALL(DisablePlayerInput, TRUE)
+                EVT_CALL(GetNpcPos, NPC_FakeKoopaKoot, LVar0, LVar1, LVar2)
+                EVT_SETF(LVarA, EVT_FLOAT(6.0))
+                EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+                EVT_SET(LVar3, NPC_FakeKoopaKoot)
+                EVT_SET(LVar4, NPC_KoopaKootGhost)
+                EVT_SET(LVar5, MSG_CH7_0163)
+                EVT_SET(LVar6, ANIM_KoopaKoot_Talk)
+                EVT_SET(LVar7, ANIM_KoopaKoot_Idle)
+                EVT_EXEC_WAIT(N(EVS_Imposter_Unmask))
+                EVT_SET(MV_UnmaskingState, 0)
+                EVT_SET(MV_RevealedFakeKoopaKoot, 1)
+                EVT_CALL(DisablePlayerInput, FALSE)
+            EVT_CASE_EQ(NPC_FakeKolorado + 1)
+                EVT_CALL(DisablePlayerInput, TRUE)
+                EVT_CALL(GetNpcPos, NPC_FakeKolorado, LVar0, LVar1, LVar2)
+                EVT_SETF(LVarA, EVT_FLOAT(6.0))
+                EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition))
+                EVT_SET(LVar3, NPC_FakeKolorado)
+                EVT_SET(LVar4, NPC_KoloradoGhost)
+                EVT_SET(LVar5, MSG_CH7_0160)
+                EVT_SET(LVar6, ANIM_Kolorado_Talk)
+                EVT_SET(LVar7, ANIM_Kolorado_Idle)
+                EVT_EXEC_WAIT(N(EVS_Imposter_Unmask))
+                EVT_WAIT(1)
+                EVT_SET(MV_UnmaskingState, 0)
+                EVT_SET(MV_RevealedFakeKolorado, 1)
+                EVT_CALL(DisablePlayerInput, FALSE)
+        EVT_END_SWITCH
+    EVT_END_LOOP
+    EVT_LABEL(30)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Scene_DefeatMiniboss) = {
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(GetNpcPos, NPC_FakeKooper, LVar0, LVar1, LVar2)
+    EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2)
+    EVT_CALL(SetNpcPos, NPC_FakeKooper, NPC_DISPOSE_LOCATION)
+    EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2 | NPC_FLAG_100, FALSE)
+    EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, FALSE)
+    EVT_CALL(EnablePartnerAI)
+    EVT_CALL(DisablePlayerInput, FALSE)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_pra_20_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilise, 1, 0)
+    EVT_SET(GB_StoryProgress, STORY_CH7_DEFEATED_KOOPER_DUPLIGHOSTS)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInteract_FakeKooper) = {
+    EVT_CALL(SpeakToPlayer, NPC_FakeKooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_015D)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInteract_FakeGoompa) = {
+    EVT_CALL(SpeakToPlayer, NPC_FakeGoompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH7_015C)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInteract_FakeLuigi) = {
+    EVT_CALL(SpeakToPlayer, NPC_FakeLuigi, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH7_015F)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInteract_FakeKoopaKoot) = {
+    EVT_CALL(SpeakToPlayer, NPC_FakeKoopaKoot, ANIM_KoopaKoot_Talk, ANIM_KoopaKoot_Idle, 0, MSG_CH7_015E)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInteract_FakeKolorado) = {
+    EVT_CALL(SpeakToPlayer, NPC_FakeKolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH7_015B)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_Duplighost_Controller) = {
+    EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_Scene_DefeatMiniboss)))
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_100 | NPC_FLAG_10000000, TRUE)
+    EVT_EXEC(N(EVS_ManageImpostersScene))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_FakeKooper) = {
+    EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_FakeKooper)))
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE)
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_FakeGoompa) = {
+    EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_FakeGoompa)))
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE)
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_FakeLuigi) = {
+    EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_FakeLuigi)))
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE)
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_FakeKoopaKoot) = {
+    EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_FakeKoopaKoot)))
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE)
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_FakeKolorado) = {
+    EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_FakeKolorado)))
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE)
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_ExamplePlayer) = {
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE)
+    EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mario_10002)
+    EVT_MALLOC_ARRAY(16, LVarA)
+    EVT_CALL(N(CreateExamplePlayerWorker))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_ExampleKooper) = {
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_Duplighost_Goompa) = {
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_Duplighost_Luigi) = {
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_Duplighost_KoopaKoot) = {
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_Duplighost_Kolorado) = {
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+s32 N(ExtraAnims_Goompa)[] = {
+    ANIM_Goompa_Idle,
+    ANIM_Goompa_Walk,
+    ANIM_Goompa_Talk,
+    ANIM_Goompa_Run,
+    -1
+};
+
+s32 N(ExtraAnims_Luigi)[] = {
+    ANIM_Luigi_Idle,
+    ANIM_Luigi_Walk,
+    ANIM_Luigi_Talk,
+    ANIM_Luigi_Run,
+    -1
+};
+
+s32 N(ExtraAnims_KoopaKoot)[] = {
+    ANIM_KoopaKoot_Idle,
+    ANIM_KoopaKoot_Walk,
+    ANIM_KoopaKoot_Talk,
+    ANIM_KoopaKoot_Run,
+    -1
+};
+
+s32 N(ExtraAnims_Kolorado)[] = {
+    ANIM_Kolorado_Idle,
+    ANIM_Kolorado_Walk,
+    ANIM_Kolorado_Talk,
+    ANIM_Kolorado_Run,
+    -1
+};
+
+s32 N(ExtraAnims_Duplighost)[] = {
+    ANIM_Duplighost_Anim02,
+    ANIM_Duplighost_Anim03,
+    ANIM_Duplighost_Anim05,
+    ANIM_Duplighost_Anim04,
+    -1
+};
+
+StaticNpc N(NpcData_Imposters)[] = {
+    {
+        .id = NPC_FakeKooper,
+        .settings = &N(NpcSettings_Kooper),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
+        .init = &N(EVS_NpcInit_FakeKooper),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_WorldKooper_Idle,
+            .walk   = ANIM_WorldKooper_Walk,
+            .run    = ANIM_WorldKooper_Walk,
+            .chase  = ANIM_WorldKooper_Walk,
+            .anim_4 = ANIM_WorldKooper_Walk,
+            .anim_5 = ANIM_WorldKooper_Walk,
+            .death  = ANIM_WorldKooper_Still,
+            .hit    = ANIM_WorldKooper_Still,
+            .anim_8 = ANIM_WorldKooper_Still,
+            .anim_9 = ANIM_WorldKooper_Still,
+            .anim_A = ANIM_WorldKooper_Still,
+            .anim_B = ANIM_WorldKooper_Still,
+            .anim_C = ANIM_WorldKooper_Still,
+            .anim_D = ANIM_WorldKooper_Still,
+            .anim_E = ANIM_WorldKooper_Still,
+            .anim_F = ANIM_WorldKooper_Still,
+        },
+    },
+    {
+        .id = NPC_FakeGoompa,
+        .settings = &N(NpcSettings_Goompa),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
+        .init = &N(EVS_NpcInit_FakeGoompa),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_Goompa_Idle,
+            .walk   = ANIM_Goompa_Walk,
+            .run    = ANIM_Goompa_Run,
+            .chase  = ANIM_Goompa_Run,
+            .anim_4 = ANIM_Goompa_Idle,
+            .anim_5 = ANIM_Goompa_Idle,
+            .death  = ANIM_Goompa_Still,
+            .hit    = ANIM_Goompa_Still,
+            .anim_8 = ANIM_Goompa_Run,
+            .anim_9 = ANIM_Goompa_Run,
+            .anim_A = ANIM_Goompa_Run,
+            .anim_B = ANIM_Goompa_Run,
+            .anim_C = ANIM_Goompa_Run,
+            .anim_D = ANIM_Goompa_Run,
+            .anim_E = ANIM_Goompa_Run,
+            .anim_F = ANIM_Goompa_Run,
+        },
+        .extraAnimations = N(ExtraAnims_Goompa),
+    },
+    {
+        .id = NPC_FakeLuigi,
+        .settings = &N(NpcSettings_Kooper),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
+        .init = &N(EVS_NpcInit_FakeLuigi),
+        .drops = NPC_NO_DROPS,
+        .animations = LUIGI_ANIMS,
+        .extraAnimations = N(ExtraAnims_Luigi),
+    },
+    {
+        .id = NPC_FakeKoopaKoot,
+        .settings = &N(NpcSettings_KoopaKoot),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
+        .init = &N(EVS_NpcInit_FakeKoopaKoot),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_KoopaKoot_Idle,
+            .walk   = ANIM_KoopaKoot_Idle,
+            .run    = ANIM_KoopaKoot_Idle,
+            .chase  = ANIM_KoopaKoot_Idle,
+            .anim_4 = ANIM_KoopaKoot_Idle,
+            .anim_5 = ANIM_KoopaKoot_Idle,
+            .death  = ANIM_KoopaKoot_Idle,
+            .hit    = ANIM_KoopaKoot_Idle,
+            .anim_8 = ANIM_KoopaKoot_Idle,
+            .anim_9 = ANIM_KoopaKoot_Idle,
+            .anim_A = ANIM_KoopaKoot_Idle,
+            .anim_B = ANIM_KoopaKoot_Idle,
+            .anim_C = ANIM_KoopaKoot_Idle,
+            .anim_D = ANIM_KoopaKoot_Idle,
+            .anim_E = ANIM_KoopaKoot_Idle,
+            .anim_F = ANIM_KoopaKoot_Idle,
+        },
+        .extraAnimations = N(ExtraAnims_KoopaKoot),
+    },
+    {
+        .id = NPC_FakeKolorado,
+        .settings = &N(NpcSettings_Kolorado),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
+        .init = &N(EVS_NpcInit_FakeKolorado),
+        .drops = NPC_NO_DROPS,
+        .animations = KOLORADO_ANIMS,
+        .extraAnimations = N(ExtraAnims_Kolorado),
+    },
+    {
+        .id = NPC_ExamplePlayer,
+        .settings = &N(NpcSettings_Duplighost),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
+        .init = &N(EVS_NpcInit_ExamplePlayer),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_Duplighost_Anim02,
+            .walk   = ANIM_Duplighost_Anim03,
+            .run    = ANIM_Duplighost_Anim04,
+            .chase  = ANIM_Duplighost_Anim04,
+            .anim_4 = ANIM_Duplighost_Anim02,
+            .anim_5 = ANIM_Duplighost_Anim02,
+            .death  = ANIM_Duplighost_Anim0A,
+            .hit    = ANIM_Duplighost_Anim0A,
+            .anim_8 = ANIM_Duplighost_Anim02,
+            .anim_9 = ANIM_Duplighost_Anim02,
+            .anim_A = ANIM_Duplighost_Anim02,
+            .anim_B = ANIM_Duplighost_Anim02,
+            .anim_C = ANIM_Duplighost_Anim02,
+            .anim_D = ANIM_Duplighost_Anim02,
+            .anim_E = ANIM_Duplighost_Anim02,
+            .anim_F = ANIM_Duplighost_Anim02,
+        },
+        .extraAnimations = N(ExtraAnims_Duplighost),
+    },
+    {
+        .id = NPC_ExampleKooper,
+        .settings = &N(NpcSettings_Kooper),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
+        .init = &N(EVS_NpcInit_ExampleKooper),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_WorldKooper_Idle,
+            .walk   = ANIM_WorldKooper_Walk,
+            .run    = ANIM_WorldKooper_Walk,
+            .chase  = ANIM_WorldKooper_Walk,
+            .anim_4 = ANIM_WorldKooper_Walk,
+            .anim_5 = ANIM_WorldKooper_Walk,
+            .death  = ANIM_WorldKooper_Still,
+            .hit    = ANIM_WorldKooper_Still,
+            .anim_8 = ANIM_WorldKooper_Still,
+            .anim_9 = ANIM_WorldKooper_Still,
+            .anim_A = ANIM_WorldKooper_Still,
+            .anim_B = ANIM_WorldKooper_Still,
+            .anim_C = ANIM_WorldKooper_Still,
+            .anim_D = ANIM_WorldKooper_Still,
+            .anim_E = ANIM_WorldKooper_Still,
+            .anim_F = ANIM_WorldKooper_Still,
+        },
+    },
+};
+
+StaticNpc N(NpcData_Duplighosts)[] = {
+    {
+        .id = NPC_GoompaGhost,
+        .settings = &N(NpcSettings_Duplighost),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000,
+        .init = &N(EVS_NpcInit_Duplighost_Goompa),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_Duplighost_Anim02,
+            .walk   = ANIM_Duplighost_Anim03,
+            .run    = ANIM_Duplighost_Anim04,
+            .chase  = ANIM_Duplighost_Anim04,
+            .anim_4 = ANIM_Duplighost_Anim02,
+            .anim_5 = ANIM_Duplighost_Anim02,
+            .death  = ANIM_Duplighost_Anim0A,
+            .hit    = ANIM_Duplighost_Anim0A,
+            .anim_8 = ANIM_Duplighost_Anim02,
+            .anim_9 = ANIM_Duplighost_Anim02,
+            .anim_A = ANIM_Duplighost_Anim02,
+            .anim_B = ANIM_Duplighost_Anim02,
+            .anim_C = ANIM_Duplighost_Anim02,
+            .anim_D = ANIM_Duplighost_Anim02,
+            .anim_E = ANIM_Duplighost_Anim02,
+            .anim_F = ANIM_Duplighost_Anim02,
+        },
+        .extraAnimations = N(ExtraAnims_Duplighost),
+    },
+    {
+        .id = NPC_LuigiGhost,
+        .settings = &N(NpcSettings_Duplighost),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000,
+        .init = &N(EVS_NpcInit_Duplighost_Luigi),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_Duplighost_Anim02,
+            .walk   = ANIM_Duplighost_Anim03,
+            .run    = ANIM_Duplighost_Anim04,
+            .chase  = ANIM_Duplighost_Anim04,
+            .anim_4 = ANIM_Duplighost_Anim02,
+            .anim_5 = ANIM_Duplighost_Anim02,
+            .death  = ANIM_Duplighost_Anim0A,
+            .hit    = ANIM_Duplighost_Anim0A,
+            .anim_8 = ANIM_Duplighost_Anim02,
+            .anim_9 = ANIM_Duplighost_Anim02,
+            .anim_A = ANIM_Duplighost_Anim02,
+            .anim_B = ANIM_Duplighost_Anim02,
+            .anim_C = ANIM_Duplighost_Anim02,
+            .anim_D = ANIM_Duplighost_Anim02,
+            .anim_E = ANIM_Duplighost_Anim02,
+            .anim_F = ANIM_Duplighost_Anim02,
+        },
+        .extraAnimations = N(ExtraAnims_Duplighost),
+    },
+    {
+        .id = NPC_KoopaKootGhost,
+        .settings = &N(NpcSettings_Duplighost),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000,
+        .init = &N(EVS_NpcInit_Duplighost_KoopaKoot),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_Duplighost_Anim02,
+            .walk   = ANIM_Duplighost_Anim03,
+            .run    = ANIM_Duplighost_Anim04,
+            .chase  = ANIM_Duplighost_Anim04,
+            .anim_4 = ANIM_Duplighost_Anim02,
+            .anim_5 = ANIM_Duplighost_Anim02,
+            .death  = ANIM_Duplighost_Anim0A,
+            .hit    = ANIM_Duplighost_Anim0A,
+            .anim_8 = ANIM_Duplighost_Anim02,
+            .anim_9 = ANIM_Duplighost_Anim02,
+            .anim_A = ANIM_Duplighost_Anim02,
+            .anim_B = ANIM_Duplighost_Anim02,
+            .anim_C = ANIM_Duplighost_Anim02,
+            .anim_D = ANIM_Duplighost_Anim02,
+            .anim_E = ANIM_Duplighost_Anim02,
+            .anim_F = ANIM_Duplighost_Anim02,
+        },
+        .extraAnimations = N(ExtraAnims_Duplighost),
+    },
+    {
+        .id = NPC_KoloradoGhost,
+        .settings = &N(NpcSettings_Duplighost),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000,
+        .init = &N(EVS_NpcInit_Duplighost_Kolorado),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_Duplighost_Anim02,
+            .walk   = ANIM_Duplighost_Anim03,
+            .run    = ANIM_Duplighost_Anim04,
+            .chase  = ANIM_Duplighost_Anim04,
+            .anim_4 = ANIM_Duplighost_Anim02,
+            .anim_5 = ANIM_Duplighost_Anim02,
+            .death  = ANIM_Duplighost_Anim0A,
+            .hit    = ANIM_Duplighost_Anim0A,
+            .anim_8 = ANIM_Duplighost_Anim02,
+            .anim_9 = ANIM_Duplighost_Anim02,
+            .anim_A = ANIM_Duplighost_Anim02,
+            .anim_B = ANIM_Duplighost_Anim02,
+            .anim_C = ANIM_Duplighost_Anim02,
+            .anim_D = ANIM_Duplighost_Anim02,
+            .anim_E = ANIM_Duplighost_Anim02,
+            .anim_F = ANIM_Duplighost_Anim02,
+        },
+        .extraAnimations = N(ExtraAnims_Duplighost),
+    },
+    {
+        .id = NPC_Duplighost_Controller,
+        .settings = &N(NpcSettings_Duplighost),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000,
+        .init = &N(EVS_NpcInit_Duplighost_Controller),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_Duplighost_Anim02,
+            .walk   = ANIM_Duplighost_Anim03,
+            .run    = ANIM_Duplighost_Anim04,
+            .chase  = ANIM_Duplighost_Anim04,
+            .anim_4 = ANIM_Duplighost_Anim02,
+            .anim_5 = ANIM_Duplighost_Anim02,
+            .death  = ANIM_Duplighost_Anim0A,
+            .hit    = ANIM_Duplighost_Anim0A,
+            .anim_8 = ANIM_Duplighost_Anim02,
+            .anim_9 = ANIM_Duplighost_Anim02,
+            .anim_A = ANIM_Duplighost_Anim02,
+            .anim_B = ANIM_Duplighost_Anim02,
+            .anim_C = ANIM_Duplighost_Anim02,
+            .anim_D = ANIM_Duplighost_Anim02,
+            .anim_E = ANIM_Duplighost_Anim02,
+            .anim_F = ANIM_Duplighost_Anim02,
+        },
+        .extraAnimations = N(ExtraAnims_Duplighost),
+    },
+};
+
+EvtScript N(EVS_NpcIdle_TargetKooper) = {
+    EVT_LOOP(0)
+        EVT_CALL(GetNpcPos, NPC_FakeKooper, LVar0, LVar1, LVar2)
+        EVT_CALL(SetNpcPos, NPC_TargetKooper, LVar0, LVar1, LVar2)
+        EVT_WAIT(1)
+    EVT_END_LOOP
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcIdle_TargetGoompa) = {
+    EVT_LOOP(0)
+        EVT_CALL(GetNpcPos, NPC_FakeGoompa, LVar0, LVar1, LVar2)
+        EVT_CALL(SetNpcPos, NPC_TargetGoompa, LVar0, LVar1, LVar2)
+        EVT_WAIT(1)
+    EVT_END_LOOP
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcIdle_TargetLuigi) = {
+    EVT_LOOP(0)
+        EVT_CALL(GetNpcPos, NPC_FakeLuigi, LVar0, LVar1, LVar2)
+        EVT_CALL(SetNpcPos, NPC_TargetLuigi, LVar0, LVar1, LVar2)
+        EVT_WAIT(1)
+    EVT_END_LOOP
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcIdle_TargetKoopaKoot) = {
+    EVT_LOOP(0)
+        EVT_CALL(GetNpcPos, NPC_FakeKoopaKoot, LVar0, LVar1, LVar2)
+        EVT_CALL(SetNpcPos, NPC_TargetKoopaKoot, LVar0, LVar1, LVar2)
+        EVT_WAIT(1)
+    EVT_END_LOOP
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcIdle_TargetKolorado) = {
+    EVT_LOOP(0)
+        EVT_CALL(GetNpcPos, NPC_FakeKolorado, LVar0, LVar1, LVar2)
+        EVT_CALL(SetNpcPos, NPC_TargetKolorado, LVar0, LVar1, LVar2)
+        EVT_WAIT(1)
+    EVT_END_LOOP
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcHit_TargetKooper) = {
+    EVT_CALL(GetOwnerEncounterTrigger, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(ENCOUNTER_TRIGGER_HAMMER)
+            EVT_SET(MV_UnmaskingState, NPC_FakeKooper + 1)
+    EVT_END_SWITCH
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcHit_TargetGoompa) = {
+    EVT_CALL(GetOwnerEncounterTrigger, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(ENCOUNTER_TRIGGER_HAMMER)
+            EVT_SET(MV_UnmaskingState, NPC_FakeGoompa + 1)
+    EVT_END_SWITCH
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcHit_TargetLuigi) = {
+    EVT_CALL(GetOwnerEncounterTrigger, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(ENCOUNTER_TRIGGER_HAMMER)
+            EVT_SET(MV_UnmaskingState, NPC_FakeLuigi + 1)
+    EVT_END_SWITCH
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcHit_TargetKoopaKoot) = {
+    EVT_CALL(GetOwnerEncounterTrigger, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(ENCOUNTER_TRIGGER_HAMMER)
+            EVT_SET(MV_UnmaskingState, NPC_FakeKoopaKoot + 1)
+    EVT_END_SWITCH
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcHit_TargetKolorado) = {
+    EVT_CALL(GetOwnerEncounterTrigger, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(ENCOUNTER_TRIGGER_HAMMER)
+            EVT_SET(MV_UnmaskingState, NPC_FakeKolorado + 1)
+    EVT_END_SWITCH
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_TargetKooper) = {
+    EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetKooper)))
+    EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetKooper)))
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_TargetGoompa) = {
+    EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetGoompa)))
+    EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetGoompa)))
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_TargetLuigi) = {
+    EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetLuigi)))
+    EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetLuigi)))
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_TargetKoopaKoot) = {
+    EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetKoopaKoot)))
+    EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetKoopaKoot)))
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_NpcInit_TargetKolorado) = {
+    EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetKolorado)))
+    EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetKolorado)))
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+StaticNpc N(NpcData_Targets)[] = {
+    {
+        .id = NPC_TargetKooper,
+        .settings = &N(NpcSettings_Kooper),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
+        .init = &N(EVS_NpcInit_TargetKooper),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_WorldKooper_Idle,
+            .walk   = ANIM_WorldKooper_Walk,
+            .run    = ANIM_WorldKooper_Walk,
+            .chase  = ANIM_WorldKooper_Walk,
+            .anim_4 = ANIM_WorldKooper_Walk,
+            .anim_5 = ANIM_WorldKooper_Walk,
+            .death  = ANIM_WorldKooper_Still,
+            .hit    = ANIM_WorldKooper_Still,
+            .anim_8 = ANIM_WorldKooper_Still,
+            .anim_9 = ANIM_WorldKooper_Still,
+            .anim_A = ANIM_WorldKooper_Still,
+            .anim_B = ANIM_WorldKooper_Still,
+            .anim_C = ANIM_WorldKooper_Still,
+            .anim_D = ANIM_WorldKooper_Still,
+            .anim_E = ANIM_WorldKooper_Still,
+            .anim_F = ANIM_WorldKooper_Still,
+        },
+    },
+    {
+        .id = NPC_TargetGoompa,
+        .settings = &N(NpcSettings_Goompa),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
+        .init = &N(EVS_NpcInit_TargetGoompa),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_Goompa_Idle,
+            .walk   = ANIM_Goompa_Walk,
+            .run    = ANIM_Goompa_Run,
+            .chase  = ANIM_Goompa_Run,
+            .anim_4 = ANIM_Goompa_Idle,
+            .anim_5 = ANIM_Goompa_Idle,
+            .death  = ANIM_Goompa_Still,
+            .hit    = ANIM_Goompa_Still,
+            .anim_8 = ANIM_Goompa_Run,
+            .anim_9 = ANIM_Goompa_Run,
+            .anim_A = ANIM_Goompa_Run,
+            .anim_B = ANIM_Goompa_Run,
+            .anim_C = ANIM_Goompa_Run,
+            .anim_D = ANIM_Goompa_Run,
+            .anim_E = ANIM_Goompa_Run,
+            .anim_F = ANIM_Goompa_Run,
+        },
+        .extraAnimations = N(ExtraAnims_Goompa),
+    },
+    {
+        .id = NPC_TargetLuigi,
+        .settings = &N(NpcSettings_Kooper),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
+        .init = &N(EVS_NpcInit_TargetLuigi),
+        .drops = NPC_NO_DROPS,
+        .animations = LUIGI_ANIMS,
+        .extraAnimations = N(ExtraAnims_Luigi),
+    },
+    {
+        .id = NPC_TargetKoopaKoot,
+        .settings = &N(NpcSettings_KoopaKoot),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
+        .init = &N(EVS_NpcInit_TargetKoopaKoot),
+        .drops = NPC_NO_DROPS,
+        .animations = {
+            .idle   = ANIM_KoopaKoot_Idle,
+            .walk   = ANIM_KoopaKoot_Idle,
+            .run    = ANIM_KoopaKoot_Idle,
+            .chase  = ANIM_KoopaKoot_Idle,
+            .anim_4 = ANIM_KoopaKoot_Idle,
+            .anim_5 = ANIM_KoopaKoot_Idle,
+            .death  = ANIM_KoopaKoot_Idle,
+            .hit    = ANIM_KoopaKoot_Idle,
+            .anim_8 = ANIM_KoopaKoot_Idle,
+            .anim_9 = ANIM_KoopaKoot_Idle,
+            .anim_A = ANIM_KoopaKoot_Idle,
+            .anim_B = ANIM_KoopaKoot_Idle,
+            .anim_C = ANIM_KoopaKoot_Idle,
+            .anim_D = ANIM_KoopaKoot_Idle,
+            .anim_E = ANIM_KoopaKoot_Idle,
+            .anim_F = ANIM_KoopaKoot_Idle,
+        },
+        .extraAnimations = N(ExtraAnims_KoopaKoot),
+    },
+    {
+        .id = NPC_TargetKolorado,
+        .settings = &N(NpcSettings_Kolorado),
+        .pos = { NPC_DISPOSE_LOCATION },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
+        .init = &N(EVS_NpcInit_TargetKolorado),
+        .drops = NPC_NO_DROPS,
+        .animations = KOLORADO_ANIMS,
+        .extraAnimations = N(ExtraAnims_Kolorado),
+    },
+};
+
+NpcGroupList N(DefaultNPCs) = {
+    NPC_GROUP(N(NpcData_Imposters), BTL_PRA3_FORMATION_01, BTL_PRA3_STAGE_01),
+    NPC_GROUP(N(NpcData_Duplighosts), BTL_PRA3_FORMATION_01, BTL_PRA3_STAGE_01),
+    NPC_GROUP(N(NpcData_Targets), BTL_PRA3_FORMATION_01, BTL_PRA3_STAGE_01),
+    {}
+};
+
diff --git a/src/world/area_pra/pra_20/D763A0.c b/src/world/area_pra/pra_20/D763A0.c
deleted file mode 100644
index d29f968dac..0000000000
--- a/src/world/area_pra/pra_20/D763A0.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "pra_20.h"
-
-static char* N(exit_str_0) = "pra_19";
-static char* N(exit_str_1) = "pra_21";
-static char* N(exit_str_2) = "pra_29";
-static char* N(exit_str_3) = "pra_22";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_20/D763C0.c b/src/world/area_pra/pra_20/D763C0.c
deleted file mode 100644
index 853d2c4d4b..0000000000
--- a/src/world/area_pra/pra_20/D763C0.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "pra_20.h"
-
-#include "world/common/atomic/Reflection.inc.c"
diff --git a/src/world/area_pra/pra_20/pra_20.h b/src/world/area_pra/pra_20/pra_20.h
index 41c4495422..282a1f8740 100644
--- a/src/world/area_pra/pra_20/pra_20.h
+++ b/src/world/area_pra/pra_20/pra_20.h
@@ -2,8 +2,14 @@
 /// @brief Crystal Palace - Mirrored Door Room
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_20_shape.h"
+#include "mapfs/pra_20_hit.h"
+
 #define NAMESPACE pra_20
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
diff --git a/src/world/area_pra/pra_20/pra_20_0_header.c b/src/world/area_pra/pra_20/pra_20_0_header.c
new file mode 100644
index 0000000000..05bb74c6fe
--- /dev/null
+++ b/src/world/area_pra/pra_20/pra_20_0_header.c
@@ -0,0 +1,18 @@
+#include "pra_20.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_20_ENTRY_0]    {   13.0,    0.0,   70.0,   90.0 },
+    [pra_20_ENTRY_1]    {  126.0,    0.0,  137.0,    0.0 },
+    [pra_20_ENTRY_2]    {  237.0,    0.0,   70.0,  270.0 },
+    [pra_20_ENTRY_3]    {  237.0,    0.0,  -70.0,  270.0 },
+    [pra_20_ENTRY_4]    {  126.0,    0.0, -137.0,  180.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_20 },
+};
diff --git a/src/world/area_pra/pra_20/pra_20_1_music.c b/src/world/area_pra/pra_20/pra_20_1_music.c
new file mode 100644
index 0000000000..0ee04c2ed8
--- /dev/null
+++ b/src/world/area_pra/pra_20/pra_20_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_20.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_20/pra_20_2_main.c b/src/world/area_pra/pra_20/pra_20_2_main.c
new file mode 100644
index 0000000000..adf8d56ea5
--- /dev/null
+++ b/src/world/area_pra/pra_20/pra_20_2_main.c
@@ -0,0 +1,185 @@
+#include "pra_20.h"
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+#include "../common/GlassShimmer.inc.c"
+
+s32 N(NearSingleDoorModels)[] = { MODEL_o999, MODEL_o1000, -1 };
+s32 N(FarSingleDoorModels)[]  = { MODEL_o997, MODEL_o998, -1 };
+
+s32 N(NearRightDoorModelsL)[] = { MODEL_o874, MODEL_o875, -1 };
+s32 N(NearRightDoorModelsR)[] = { MODEL_o876, MODEL_o877, -1 };
+
+s32 N(BackRightDoorModelsL)[] = { MODEL_o880, MODEL_o881, -1 };
+s32 N(BackRightDoorModelsR)[] = { MODEL_o878, MODEL_o879, -1 };
+
+s32 N(BothRightDoorModelsL)[] = { MODEL_o874, MODEL_o875, MODEL_o880, MODEL_o881, -1 };
+s32 N(BothRightDoorModelsR)[] = { MODEL_o876, MODEL_o877, MODEL_o878, MODEL_o879, -1 };
+
+s32 N(ModelListNone)[] = { -1 };
+
+EvtScript N(EVS_ExitWalk_pra_19_1) = EVT_EXIT_WALK(60, pra_20_ENTRY_0, "pra_19", pra_19_ENTRY_1);
+
+EvtScript N(EVS_ExitDoor_pra_21_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_20_ENTRY_1)
+    EVT_SET(LVar1, COLLIDER_deilittssw)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(NearSingleDoorModels)))
+        EVT_SET(LVar3, EVT_PTR(N(FarSingleDoorModels)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(NearSingleDoorModels)))
+        EVT_SET(LVar3, EVT_PTR(N(ModelListNone)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_21"), pra_21_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_29_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_20_ENTRY_2)
+    EVT_SET(LVar1, COLLIDER_deilittse)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothRightDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothRightDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(NearRightDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(NearRightDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_29"), pra_29_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_29_3) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_20_ENTRY_3)
+    EVT_SET(LVar1, COLLIDER_deilittne)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(BothRightDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BothRightDoorModelsR)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(BackRightDoorModelsL)))
+        EVT_SET(LVar3, EVT_PTR(N(BackRightDoorModelsR)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_29"), pra_29_ENTRY_3)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoor_pra_22_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_20_ENTRY_4)
+    EVT_SET(LVar1, COLLIDER_deilittnnw)
+    EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+        EVT_SET(LVar2, EVT_PTR(N(NearSingleDoorModels)))
+        EVT_SET(LVar3, EVT_PTR(N(FarSingleDoorModels)))
+    EVT_ELSE
+        EVT_SET(LVar2, EVT_PTR(N(ModelListNone)))
+        EVT_SET(LVar3, EVT_PTR(N(FarSingleDoorModels)))
+    EVT_END_IF
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_22"), pra_22_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_pra_19_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilisw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_pra_21_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittssw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_29_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_29_3)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_pra_22_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittnnw, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_20_ENTRY_0)
+            EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers)))
+            EVT_EXEC(EnterWalk)
+        EVT_CASE_EQ(pra_20_ENTRY_1)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(NearSingleDoorModels)))
+                EVT_SET(LVar3, EVT_PTR(N(FarSingleDoorModels)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(NearSingleDoorModels)))
+                EVT_SET(LVar3, EVT_PTR(N(ModelListNone)))
+            EVT_END_IF
+            EVT_EXEC_WAIT(BaseEnterDoor)
+            EVT_EXEC(N(EVS_BindExitTriggers))
+        EVT_CASE_EQ(pra_20_ENTRY_2)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(BothRightDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(BothRightDoorModelsR)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(NearRightDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(NearRightDoorModelsR)))
+            EVT_END_IF
+            EVT_EXEC_WAIT(BaseEnterDoor)
+            EVT_EXEC(N(EVS_BindExitTriggers))
+        EVT_CASE_EQ(pra_20_ENTRY_3)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(BothRightDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(BothRightDoorModelsR)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(BackRightDoorModelsL)))
+                EVT_SET(LVar3, EVT_PTR(N(BackRightDoorModelsR)))
+            EVT_END_IF
+            EVT_EXEC_WAIT(BaseEnterDoor)
+            EVT_EXEC(N(EVS_BindExitTriggers))
+        EVT_CASE_EQ(pra_20_ENTRY_4)
+            EVT_IF_EQ(GF_PRA_BrokeIllusion, FALSE)
+                EVT_SET(LVar2, EVT_PTR(N(NearSingleDoorModels)))
+                EVT_SET(LVar3, EVT_PTR(N(FarSingleDoorModels)))
+            EVT_ELSE
+                EVT_SET(LVar2, EVT_PTR(N(FarSingleDoorModels)))
+                EVT_SET(LVar3, EVT_PTR(N(ModelListNone)))
+            EVT_END_IF
+            EVT_EXEC_WAIT(BaseEnterDoor)
+            EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_END_SWITCH
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_CALL(EnableModel, MODEL_o981, FALSE)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1019, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_SET(LVar0, MODEL_o945)
+    EVT_SET(LVar1, MODEL_o947)
+    EVT_SET(LVar2, TEX_PANNER_0)
+    EVT_EXEC(N(EVS_GlassShimmer))
+    EVT_SET(LVar0, REFLECTION_FLOOR_WALL)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_21/D77F20.c b/src/world/area_pra/pra_21/D77F20.c
deleted file mode 100644
index baf2aa683a..0000000000
--- a/src/world/area_pra/pra_21/D77F20.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "pra_21.h"
-
-static char* N(exit_str_0) = "pra_20";
-static char* N(exit_str_1) = "pra_36";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_21/D77F40.c b/src/world/area_pra/pra_21/D77F40.c
deleted file mode 100644
index 3a2417cace..0000000000
--- a/src/world/area_pra/pra_21/D77F40.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "pra_21.h"
-
-ApiStatus func_80240020_D77F40(Evt* script, s32 isInitialCall) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-
-    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
-        script->varTable[0] = 425;
-    }
-    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
-        script->varTable[0] = 325;
-    }
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_802400AC_D77FCC(Evt* script, s32 isInitialCall) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-
-    if (playerStatus->lastGoodPosition.y == 0) {
-        evt_set_variable(script, MapVar(0), 0);
-    }
-    if (playerStatus->lastGoodPosition.y == -200) {
-        evt_set_variable(script, MapVar(0), 1);
-    }
-    return ApiStatus_BLOCK;
-}
diff --git a/src/world/area_pra/pra_21/pra_21.h b/src/world/area_pra/pra_21/pra_21.h
index 75003e354a..e17cdac973 100644
--- a/src/world/area_pra/pra_21/pra_21.h
+++ b/src/world/area_pra/pra_21/pra_21.h
@@ -2,8 +2,19 @@
 /// @brief Crystal Palace - Huge Statue Room
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_21_shape.h"
+#include "mapfs/pra_21_hit.h"
+
+enum {
+    MV_PlayerFloor  = MapVar(0),
+};
+
 #define NAMESPACE pra_21
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_MakeEntities);
diff --git a/src/world/area_pra/pra_21/pra_21_0_header.c b/src/world/area_pra/pra_21/pra_21_0_header.c
new file mode 100644
index 0000000000..c7c334fcac
--- /dev/null
+++ b/src/world/area_pra/pra_21/pra_21_0_header.c
@@ -0,0 +1,15 @@
+#include "pra_21.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_21_ENTRY_0]    {  126.0,    0.0, -137.0,  180.0 },
+    [pra_21_ENTRY_1]    {  487.0, -200.0,  -70.0,  270.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_21 },
+};
diff --git a/src/world/area_pra/pra_21/pra_21_1_music.c b/src/world/area_pra/pra_21/pra_21_1_music.c
new file mode 100644
index 0000000000..cf5707e096
--- /dev/null
+++ b/src/world/area_pra/pra_21/pra_21_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_21.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_21/pra_21_2_main.c b/src/world/area_pra/pra_21/pra_21_2_main.c
new file mode 100644
index 0000000000..faefa98d8c
--- /dev/null
+++ b/src/world/area_pra/pra_21/pra_21_2_main.c
@@ -0,0 +1,92 @@
+#include "pra_21.h"
+
+s32 N(DoorModelsL)[] = { MODEL_o977, -1 };
+s32 N(DoorModelsR)[] = { MODEL_o976, -1 };
+
+EvtScript N(EVS_ExitDoor_pra_20_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_21_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittnnw)
+    EVT_SET(LVar2, MODEL_o774)
+    EVT_SET(LVar3, DOOR_SWING_IN)
+    EVT_EXEC(ExitSingleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_20"), pra_20_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_36_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_21_ENTRY_1)
+    EVT_SET(LVar1, COLLIDER_deilittnne)
+    EVT_SET(LVar2, EVT_PTR(N(DoorModelsL)))
+    EVT_SET(LVar3, EVT_PTR(N(DoorModelsR)))
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_36"), pra_36_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_pra_20_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittnnw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_36_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittnne, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_21_ENTRY_0)
+            EVT_SET(LVar2, MODEL_o774)
+            EVT_SET(LVar3, DOOR_SWING_IN)
+            EVT_EXEC_WAIT(EnterSingleDoor)
+        EVT_CASE_EQ(pra_21_ENTRY_1)
+            EVT_SET(LVar2, EVT_PTR(N(DoorModelsL)))
+            EVT_SET(LVar3, EVT_PTR(N(DoorModelsR)))
+            EVT_EXEC_WAIT(BaseEnterDoor)
+    EVT_END_SWITCH
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_IF_LT(GB_StoryProgress, STORY_CH7_FOUND_HIDDEN_ROOM_UNDER_STATUE)
+        EVT_SET(LVar0, 0)
+    EVT_ELSE
+        EVT_SWITCH(GB_PRA_TwinStatueState)
+            EVT_CASE_EQ(0)
+                EVT_SET(LVar0, -50)
+            EVT_CASE_EQ(1)
+                EVT_SET(LVar0, -50)
+            EVT_CASE_EQ(2)
+                EVT_SET(LVar0, 50)
+        EVT_END_SWITCH
+    EVT_END_IF
+    EVT_CALL(ParentColliderToModel, COLLIDER_o1063, MODEL_o980)
+    EVT_CALL(TranslateModel, MODEL_o980, LVar0, 0, 0)
+    EVT_CALL(TranslateModel, MODEL_o981, LVar0, 0, 0)
+    EVT_CALL(TranslateModel, MODEL_o982, LVar0, 0, 0)
+    EVT_CALL(TranslateModel, MODEL_o983, LVar0, 0, 0)
+    EVT_CALL(TranslateModel, MODEL_o984, LVar0, 0, 0)
+    EVT_CALL(UpdateColliderTransform, COLLIDER_o1063)
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_21/pra_21_3_entity.c b/src/world/area_pra/pra_21/pra_21_3_entity.c
new file mode 100644
index 0000000000..a1a9e6cec3
--- /dev/null
+++ b/src/world/area_pra/pra_21/pra_21_3_entity.c
@@ -0,0 +1,87 @@
+#include "pra_21.h"
+#include "entity.h"
+
+API_CALLABLE(N(GetTargetPosXForSpring)) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
+        script->varTable[0] = 425;
+    }
+    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
+        script->varTable[0] = 325;
+    }
+    return ApiStatus_DONE2;
+}
+
+API_CALLABLE(N(MonitorPlayerFloor)) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->lastGoodPosition.y == 0) {
+        evt_set_variable(script, MV_PlayerFloor, 0);
+    }
+    if (playerStatus->lastGoodPosition.y == -200) {
+        evt_set_variable(script, MV_PlayerFloor, 1);
+    }
+    return ApiStatus_BLOCK;
+}
+
+EvtScript N(EVS_TetherCamToPlayer) = {
+    EVT_LABEL(0)
+        EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+        EVT_IF_GE(LVar1, LVar3)
+            EVT_SET(LVar1, LVar3)
+        EVT_END_IF
+        EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
+        EVT_WAIT(1)
+        EVT_GOTO(0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_UseSpring) = {
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(DisablePlayerPhysics, TRUE)
+    EVT_CALL(SetPlayerActionState, ACTION_STATE_LAUNCH)
+    EVT_CALL(GetPlayerPos, LVar7, LVar8, LVar9)
+    EVT_IF_EQ(MV_PlayerFloor, 0)
+        EVT_SET(LVar3, -175)
+        EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayer), LVarA)
+        EVT_CALL(N(GetTargetPosXForSpring))
+        EVT_SET(LVar1, -200)
+        EVT_SET(LVar2, 15)
+        EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0))
+    EVT_ELSE
+        EVT_SET(LVar3, 0)
+        EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayer), LVarA)
+        EVT_IF_EQ(GB_PRA_TwinStatueState, 2)
+            EVT_SET(LVar0, 340)
+        EVT_ELSE
+            EVT_SET(LVar0, 410)
+        EVT_END_IF
+        EVT_SET(LVar1, 0)
+        EVT_SET(LVar2, 35)
+        EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7))
+    EVT_END_IF
+    EVT_CALL(PlayerJump, LVar0, LVar1, LVar9, LVar2)
+    EVT_KILL_THREAD(LVarA)
+    EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE)
+    EVT_WAIT(2)
+    EVT_CALL(DisablePlayerPhysics, FALSE)
+    EVT_CALL(DisablePlayerInput, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_THREAD
+        EVT_CALL(N(MonitorPlayerFloor))
+    EVT_END_THREAD
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), 366, -200, -80, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignScript, EVT_PTR(N(EVS_UseSpring)))
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 55, 80, -75, 0, ITEM_MAPLE_SYRUP, MAKE_ENTITY_END)
+    EVT_CALL(AssignBlockFlag, GF_PRA21_ItemBlock_MapleSyrup)
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 50, 0, -75, 0, MODEL_o961, MAKE_ENTITY_END)
+    EVT_CALL(AssignPanelFlag, GF_PRA21_HiddenPanel)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_22/D78880.c b/src/world/area_pra/pra_22/D78880.c
deleted file mode 100644
index 979ee6f3c7..0000000000
--- a/src/world/area_pra/pra_22/D78880.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "pra_22.h"
-
-static char* N(exit_str_0) = "pra_20";
-static char* N(exit_str_1) = "pra_37";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_22/D788A0.c b/src/world/area_pra/pra_22/D788A0.c
deleted file mode 100644
index f4759e9225..0000000000
--- a/src/world/area_pra/pra_22/D788A0.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "pra_22.h"
-
-#include "world/common/todo/UnkFunc11.inc.c"
-
-ApiStatus func_802400DC_D7895C(Evt* script, s32 isInitialCall) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-    f32 x, y, z, hitDepth;
-
-    playerStatus->position.x = script->varTable[0];
-    x = playerStatus->position.x;
-    y = playerStatus->position.y + 10.0f;
-    z = playerStatus->position.z;
-    hitDepth = 300.0f;
-    npc_raycast_down_around(0, &x, &y, &z, &hitDepth, 270.0f, playerStatus->colliderDiameter);
-    playerStatus->position.x = x;
-    playerStatus->position.z = z;
-    script->varTable[10] = 0;
-    if (playerStatus->position.y != y) {
-        playerStatus->position.y = 0.0f;
-        script->varTable[3]++;
-        if (script->varTable[3] >= 30) {
-            script->varTable[10] = 1;
-        }
-    }
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_802401D0_D78A50(Evt* script, s32 isInitialCall) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-
-    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
-        script->varTable[0] = 425;
-    }
-    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
-        script->varTable[0] = 325;
-    }
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_8024025C_D78ADC(Evt* script, s32 isInitialCall) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-
-    if (playerStatus->lastGoodPosition.y == 0) {
-        evt_set_variable(script, MapVar(0), 0);
-    }
-    if (playerStatus->lastGoodPosition.y == -200) {
-        evt_set_variable(script, MapVar(0), 1);
-    }
-    return ApiStatus_BLOCK;
-}
diff --git a/src/world/area_pra/pra_22/pra_22.h b/src/world/area_pra/pra_22/pra_22.h
index c741f1df63..25b64ba588 100644
--- a/src/world/area_pra/pra_22/pra_22.h
+++ b/src/world/area_pra/pra_22/pra_22.h
@@ -2,8 +2,19 @@
 /// @brief Crystal Palace - Small Statue Room
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_22_shape.h"
+#include "mapfs/pra_22_hit.h"
+
+enum {
+    MV_PlayerFloor  = MapVar(0),
+};
+
 #define NAMESPACE pra_22
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_MakeEntities);
diff --git a/src/world/area_pra/pra_22/pra_22_0_header.c b/src/world/area_pra/pra_22/pra_22_0_header.c
new file mode 100644
index 0000000000..bc171fe5b5
--- /dev/null
+++ b/src/world/area_pra/pra_22/pra_22_0_header.c
@@ -0,0 +1,15 @@
+#include "pra_22.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_22_ENTRY_0]    {  126.0,    0.0,  137.0,    0.0 },
+    [pra_22_ENTRY_1]    {  487.0, -200.0,   70.0,  270.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_22 },
+};
diff --git a/src/world/area_pra/pra_22/pra_22_1_music.c b/src/world/area_pra/pra_22/pra_22_1_music.c
new file mode 100644
index 0000000000..0c8cc77d46
--- /dev/null
+++ b/src/world/area_pra/pra_22/pra_22_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_22.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_22/pra_22_2_main.c b/src/world/area_pra/pra_22/pra_22_2_main.c
new file mode 100644
index 0000000000..686eda9cc7
--- /dev/null
+++ b/src/world/area_pra/pra_22/pra_22_2_main.c
@@ -0,0 +1,240 @@
+#include "pra_22.h"
+
+#include "world/common/todo/UnkFunc11.inc.c"
+
+API_CALLABLE(N(PreventFalling)) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    f32 x, y, z, hitDepth;
+
+    playerStatus->position.x = script->varTable[0];
+    x = playerStatus->position.x;
+    y = playerStatus->position.y + 10.0f;
+    z = playerStatus->position.z;
+    hitDepth = 300.0f;
+    npc_raycast_down_around(0, &x, &y, &z, &hitDepth, 270.0f, playerStatus->colliderDiameter);
+
+    playerStatus->position.x = x;
+    playerStatus->position.z = z;
+    script->varTable[10] = FALSE;
+    if (playerStatus->position.y != y) {
+        playerStatus->position.y = 0.0f;
+        script->varTable[3]++;
+        if (script->varTable[3] >= 30) {
+            // player may now fall
+            script->varTable[10] = TRUE;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+s32 N(DoorModelsL)[] = { MODEL_o1001, -1 };
+s32 N(DoorModelsR)[] = { MODEL_o1002, -1 };
+
+EvtScript N(EVS_ExitDoors_pra_20_4) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_22_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittssw)
+    EVT_SET(LVar2, MODEL_o1085)
+    EVT_SET(LVar3, DOOR_SWING_OUT)
+    EVT_EXEC(ExitSingleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_20"), pra_20_ENTRY_4)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_37_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_22_ENTRY_1)
+    EVT_SET(LVar1, COLLIDER_deilittsse)
+    EVT_SET(LVar2, EVT_PTR(N(DoorModelsL)))
+    EVT_SET(LVar3, EVT_PTR(N(DoorModelsR)))
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_37"), pra_37_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_20_4)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittssw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_37_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsse, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetLoadType, LVar1)
+    EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT)
+        EVT_EXEC(EnterSavePoint)
+        EVT_EXEC(N(EVS_BindExitTriggers))
+        EVT_RETURN
+    EVT_END_IF
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_22_ENTRY_0)
+            EVT_SET(LVar2, MODEL_o1085)
+            EVT_SET(LVar3, DOOR_SWING_OUT)
+            EVT_EXEC_WAIT(EnterSingleDoor)
+        EVT_CASE_EQ(pra_22_ENTRY_1)
+            EVT_SET(LVar2, EVT_PTR(N(DoorModelsL)))
+            EVT_SET(LVar3, EVT_PTR(N(DoorModelsR)))
+            EVT_EXEC_WAIT(BaseEnterDoor)
+    EVT_END_SWITCH
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_PushRightStatue_Impl) = {
+    EVT_LOOP(30)
+        EVT_CALL(GetPartnerInUse, LVarA)
+        EVT_IF_NE(LVarA, PARTNER_NONE)
+            EVT_SET(LVar8, -1)
+            EVT_RETURN
+        EVT_END_IF
+        EVT_CALL(N(UnkFunc11), LVar9)
+        EVT_IF_EQ(LVar0, 0)
+            EVT_SET(LVar8, -1)
+            EVT_RETURN
+        EVT_ELSE
+            EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK)
+        EVT_END_IF
+        EVT_WAIT(1)
+    EVT_END_LOOP
+    EVT_CALL(GetPartnerInUse, LVarA)
+    EVT_IF_NE(LVarA, PARTNER_NONE)
+        EVT_SET(LVar8, -1)
+        EVT_RETURN
+    EVT_END_IF
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_THREAD
+        EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100, EVT_FLOAT(0.6))
+    EVT_END_THREAD
+    EVT_THREAD
+        EVT_IF_GE(LVar6, LVar7)
+            EVT_CALL(InterpPlayerYaw, 270, 0)
+        EVT_ELSE
+            EVT_CALL(InterpPlayerYaw, 90, 0)
+        EVT_END_IF
+        EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK)
+        EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+        EVT_SET(LVar1, LVar0)
+        EVT_SET(LVar2, LVar7)
+        EVT_SUB(LVar2, LVar6)
+        EVT_ADD(LVar1, LVar2)
+        EVT_CALL(MakeLerp, LVar0, LVar1, 100, EASING_LINEAR)
+        EVT_SET(LVar3, 0)
+        EVT_LOOP(0)
+            EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK)
+            EVT_CALL(UpdateLerp)
+            EVT_CALL(N(PreventFalling))
+            EVT_IF_EQ(LVarA, TRUE)
+                EVT_BREAK_LOOP
+            EVT_END_IF
+            EVT_WAIT(1)
+            EVT_IF_EQ(LVar1, 0)
+                EVT_BREAK_LOOP
+            EVT_END_IF
+        EVT_END_LOOP
+        EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE)
+        EVT_WAIT(1)
+        EVT_IF_EQ(LVarA, 1)
+            EVT_CALL(DisablePlayerPhysics, TRUE)
+            EVT_WAIT(1)
+            EVT_CALL(SetPlayerAnimation, ANIM_Mario_80002)
+            EVT_WAIT(15)
+            EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002)
+            EVT_WAIT(1)
+            EVT_CALL(DisablePlayerPhysics, FALSE)
+            EVT_CALL(SetPlayerActionState, ACTION_STATE_FALLING)
+            EVT_WAIT(1)
+        EVT_END_IF
+        EVT_CALL(DisablePlayerInput, FALSE)
+    EVT_END_THREAD
+    EVT_CALL(MakeLerp, LVar6, LVar7, 100, EASING_LINEAR)
+    EVT_CALL(PlaySoundAtCollider, COLLIDER_o1064, SOUND_80000010, 0)
+    EVT_LOOP(0)
+        EVT_CALL(UpdateLerp)
+        EVT_CALL(TranslateModel, MODEL_o1005, LVar0, 0, 0)
+        EVT_CALL(TranslateModel, MODEL_o1006, LVar0, 0, 0)
+        EVT_CALL(TranslateModel, MODEL_o1007, LVar0, 0, 0)
+        EVT_CALL(TranslateModel, MODEL_o1008, LVar0, 0, 0)
+        EVT_CALL(TranslateModel, MODEL_o1009, LVar0, 0, 0)
+        EVT_CALL(UpdateColliderTransform, COLLIDER_o1064)
+        EVT_WAIT(1)
+        EVT_IF_EQ(LVar1, 0)
+            EVT_BREAK_LOOP
+        EVT_END_IF
+    EVT_END_LOOP
+    EVT_CALL(StopSound, SOUND_80000010)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_PushStatue) = {
+    EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+    EVT_IF_LE(LVar0, 337)
+        EVT_SET(LVar6, 0)
+        EVT_SET(LVar7, 50)
+        EVT_SET(LVar8, 2)
+    EVT_END_IF
+    EVT_IF_GE(LVar0, 413)
+        EVT_SET(LVar6, 0)
+        EVT_SET(LVar7, -50)
+        EVT_SET(LVar8, 1)
+    EVT_ELSE
+        EVT_RETURN
+    EVT_END_IF
+    EVT_SET(LVar9, COLLIDER_o1064)
+    EVT_EXEC_WAIT(N(EVS_PushRightStatue_Impl))
+    EVT_IF_NE(LVar8, -1)
+        EVT_SET(GB_StoryProgress, STORY_CH7_FOUND_HIDDEN_ROOM_UNDER_STATUE)
+        EVT_SET(GB_PRA_TwinStatueState, LVar8)
+        EVT_THREAD
+            EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0))
+        EVT_END_THREAD
+        EVT_UNBIND
+    EVT_END_IF
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_IF_LT(GB_StoryProgress, STORY_CH7_FOUND_HIDDEN_ROOM_UNDER_STATUE)
+        EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PushStatue)), TRIGGER_WALL_PUSH, COLLIDER_o1064, 1, 0)
+        EVT_SET(LVar0, 0)
+    EVT_ELSE
+        EVT_SWITCH(GB_PRA_TwinStatueState)
+            EVT_CASE_EQ(0)
+                EVT_SET(LVar0, -50)
+            EVT_CASE_EQ(1)
+                EVT_SET(LVar0, -50)
+            EVT_CASE_EQ(2)
+                EVT_SET(LVar0, 50)
+        EVT_END_SWITCH
+    EVT_END_IF
+    EVT_CALL(ParentColliderToModel, COLLIDER_o1064, MODEL_o1005)
+    EVT_CALL(TranslateModel, MODEL_o1005, LVar0, 0, 0)
+    EVT_CALL(TranslateModel, MODEL_o1006, LVar0, 0, 0)
+    EVT_CALL(TranslateModel, MODEL_o1007, LVar0, 0, 0)
+    EVT_CALL(TranslateModel, MODEL_o1008, LVar0, 0, 0)
+    EVT_CALL(TranslateModel, MODEL_o1009, LVar0, 0, 0)
+    EVT_CALL(UpdateColliderTransform, COLLIDER_o1064)
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_22/pra_22_3_entity.c b/src/world/area_pra/pra_22/pra_22_3_entity.c
new file mode 100644
index 0000000000..15bf28cf2a
--- /dev/null
+++ b/src/world/area_pra/pra_22/pra_22_3_entity.c
@@ -0,0 +1,87 @@
+#include "pra_22.h"
+#include "entity.h"
+
+API_CALLABLE(N(GetTargetPosXForSpring)) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
+        script->varTable[0] = 425;
+    }
+    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
+        script->varTable[0] = 325;
+    }
+    return ApiStatus_DONE2;
+}
+
+API_CALLABLE(N(MonitorPlayerFloor)) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->lastGoodPosition.y == 0) {
+        evt_set_variable(script, MV_PlayerFloor, 0);
+    }
+    if (playerStatus->lastGoodPosition.y == -200) {
+        evt_set_variable(script, MV_PlayerFloor, 1);
+    }
+    return ApiStatus_BLOCK;
+}
+
+EvtScript N(EVS_TetherCamToPlayer) = {
+    EVT_LABEL(0)
+        EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
+        EVT_IF_GE(LVar1, LVar3)
+            EVT_SET(LVar1, LVar3)
+        EVT_END_IF
+        EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2)
+        EVT_WAIT(1)
+        EVT_GOTO(0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_UseSpring) = {
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_CALL(DisablePlayerPhysics, TRUE)
+    EVT_CALL(SetPlayerActionState, ACTION_STATE_LAUNCH)
+    EVT_CALL(GetPlayerPos, LVar7, LVar8, LVar9)
+    EVT_IF_EQ(MV_PlayerFloor, 0)
+        EVT_SET(LVar3, -175)
+        EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayer), LVarA)
+        EVT_CALL(N(GetTargetPosXForSpring))
+        EVT_SET(LVar1, -200)
+        EVT_SET(LVar2, 15)
+        EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0))
+    EVT_ELSE
+        EVT_SET(LVar3, 0)
+        EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayer), LVarA)
+        EVT_IF_EQ(GB_PRA_TwinStatueState, 2)
+            EVT_SET(LVar0, 340)
+        EVT_ELSE
+            EVT_SET(LVar0, 410)
+        EVT_END_IF
+        EVT_SET(LVar1, 0)
+        EVT_SET(LVar2, 35)
+        EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7))
+    EVT_END_IF
+    EVT_CALL(PlayerJump, LVar0, LVar1, LVar9, LVar2)
+    EVT_KILL_THREAD(LVarA)
+    EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE)
+    EVT_WAIT(2)
+    EVT_CALL(DisablePlayerPhysics, FALSE)
+    EVT_CALL(DisablePlayerInput, FALSE)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_THREAD
+        EVT_CALL(N(MonitorPlayerFloor))
+    EVT_END_THREAD
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), 366, -200, 80, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignScript, EVT_PTR(N(EVS_UseSpring)))
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 55, 80, 75, 0, ITEM_JAMMIN_JELLY, MAKE_ENTITY_END)
+    EVT_CALL(AssignBlockFlag, GF_PRA22_HiddenItem_JamminJelly)
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 50, 0, 75, 0, MODEL_o1088, MAKE_ENTITY_END)
+    EVT_CALL(AssignPanelFlag, GF_PRA22_HiddenPanel)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c
deleted file mode 100644
index b2661a9fd2..0000000000
--- a/src/world/area_pra/pra_27/D799F0.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "pra_27.h"
-
-ApiStatus func_80240000_D799F0(Evt* script, s32 isInitialCall) {
-    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
-    sprintf(wMapShapeName, "pra_05_shape");
-    sprintf(wMapHitName, "pra_05_hit");
-    return ApiStatus_BLOCK;
-}
-
-const char N(exit_str_0)[] = "pra_36";
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "world/common/todo/StashVars.inc.c"
-
-#include "world/common/todo/GetItemName.inc.c"
-
-#include "world/common/todo/SomeItemEntityFunc.inc.c"
-
-#include "world/common/todo/IsItemBadge.inc.c"
diff --git a/src/world/area_pra/pra_27/pra_27.h b/src/world/area_pra/pra_27/pra_27.h
index 608ea07632..ba2ac11b13 100644
--- a/src/world/area_pra/pra_27/pra_27.h
+++ b/src/world/area_pra/pra_27/pra_27.h
@@ -2,8 +2,15 @@
 /// @brief Crystal Palace - Palace Key Room
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_05_shape.h"
+#include "mapfs/pra_05_hit.h"
+
 #define NAMESPACE pra_27
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_MakeEntities);
diff --git a/src/world/area_pra/pra_27/pra_27_0_header.c b/src/world/area_pra/pra_27/pra_27_0_header.c
new file mode 100644
index 0000000000..6b6e92af49
--- /dev/null
+++ b/src/world/area_pra/pra_27/pra_27_0_header.c
@@ -0,0 +1,12 @@
+#include "pra_27.h"
+
+EntryList N(Entrances) = {
+    [pra_27_ENTRY_0]    {   23.0,    0.0,   70.0,   90.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_27 },
+};
diff --git a/src/world/area_pra/pra_27/pra_27_1_music.c b/src/world/area_pra/pra_27/pra_27_1_music.c
new file mode 100644
index 0000000000..5f0f230f77
--- /dev/null
+++ b/src/world/area_pra/pra_27/pra_27_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_27.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_27/pra_27_2_main.c b/src/world/area_pra/pra_27/pra_27_2_main.c
new file mode 100644
index 0000000000..bfb5da81c7
--- /dev/null
+++ b/src/world/area_pra/pra_27/pra_27_2_main.c
@@ -0,0 +1,63 @@
+#include "pra_27.h"
+
+s32 N(map_init)(void) {
+    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
+    sprintf(wMapShapeName, "pra_05_shape");
+    sprintf(wMapHitName, "pra_05_hit");
+    return FALSE;
+}
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+
+s32 N(DoorModelsL)[] = { MODEL_o772, MODEL_o844, -1 };
+s32 N(DoorModelsR)[] = { MODEL_o768, MODEL_o846, -1 };
+
+EvtScript N(EVS_ExitDoors_pra_36_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_27_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittsw)
+    EVT_SET(LVar2, EVT_PTR(N(DoorModelsL)))
+    EVT_SET(LVar3, EVT_PTR(N(DoorModelsR)))
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_36"), pra_36_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_36_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_SET(LVar0, pra_27_ENTRY_0)
+    EVT_SET(LVar2, EVT_PTR(N(DoorModelsL)))
+    EVT_SET(LVar3, EVT_PTR(N(DoorModelsR)))
+    EVT_EXEC_WAIT(BaseEnterDoor)
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_SET(LVar0, REFLECTION_FLOOR_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_27/pra_27_3_entity.c b/src/world/area_pra/pra_27/pra_27_3_entity.c
new file mode 100644
index 0000000000..d40d194f93
--- /dev/null
+++ b/src/world/area_pra/pra_27/pra_27_3_entity.c
@@ -0,0 +1,14 @@
+#include "pra_27.h"
+#include "entity.h"
+
+#include "world/common/atomic/Chest.inc.c"
+
+EvtScript N(EVS_OpenChest_PalaceKey) = EVT_OPEN_CHEST_KEY(ITEM_CRYSTAL_PALACE_KEY, GF_PRA27_Chest_PalaceKey);
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 200, 20, 94, 0, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignChestFlag, GF_PRA27_Chest_PalaceKey)
+    EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_PalaceKey)))
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c
deleted file mode 100644
index 0105479f9e..0000000000
--- a/src/world/area_pra/pra_28/D7B2A0.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "pra_28.h"
-
-ApiStatus func_80240000_D7B2A0(Evt* script, s32 isInitialCall) {
-    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
-    sprintf(wMapShapeName, "pra_05_shape");
-    sprintf(wMapHitName, "pra_05_hit");
-    return ApiStatus_BLOCK;
-}
-
-const char N(exit_str_0)[] = "pra_37";
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "world/common/todo/StashVars.inc.c"
-
-#include "world/common/todo/GetItemName.inc.c"
-
-#include "world/common/todo/SomeItemEntityFunc.inc.c"
-
-#include "world/common/todo/IsItemBadge.inc.c"
diff --git a/src/world/area_pra/pra_28/pra_28.h b/src/world/area_pra/pra_28/pra_28.h
index a888e2d3f2..10d6842081 100644
--- a/src/world/area_pra/pra_28/pra_28.h
+++ b/src/world/area_pra/pra_28/pra_28.h
@@ -2,8 +2,15 @@
 /// @brief Crystal Palace - P-Up, D-Down Room
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_05_shape.h"
+#include "mapfs/pra_05_hit.h"
+
 #define NAMESPACE pra_28
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_MakeEntities);
diff --git a/src/world/area_pra/pra_28/pra_28_0_header.c b/src/world/area_pra/pra_28/pra_28_0_header.c
new file mode 100644
index 0000000000..25fa04606a
--- /dev/null
+++ b/src/world/area_pra/pra_28/pra_28_0_header.c
@@ -0,0 +1,12 @@
+#include "pra_28.h"
+
+EntryList N(Entrances) = {
+    [pra_28_ENTRY_0]    {   23.0,    0.0,   70.0,   90.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_28 },
+};
diff --git a/src/world/area_pra/pra_28/pra_28_1_music.c b/src/world/area_pra/pra_28/pra_28_1_music.c
new file mode 100644
index 0000000000..34bb62ed42
--- /dev/null
+++ b/src/world/area_pra/pra_28/pra_28_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_28.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_28/pra_28_2_main.c b/src/world/area_pra/pra_28/pra_28_2_main.c
new file mode 100644
index 0000000000..6ee379bfc2
--- /dev/null
+++ b/src/world/area_pra/pra_28/pra_28_2_main.c
@@ -0,0 +1,63 @@
+#include "pra_28.h"
+
+s32 N(map_init)(void) {
+    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
+    sprintf(wMapShapeName, "pra_05_shape");
+    sprintf(wMapHitName, "pra_05_hit");
+    return FALSE;
+}
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+
+s32 N(DoorModelsL)[] = { MODEL_o772, MODEL_o844, -1 };
+s32 N(DoorModelsR)[] = { MODEL_o768, MODEL_o846, -1 };
+
+EvtScript N(EVS_ExitDoors_pra_37_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_28_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittsw)
+    EVT_SET(LVar2, EVT_PTR(N(DoorModelsL)))
+    EVT_SET(LVar3, EVT_PTR(N(DoorModelsR)))
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_37"), pra_37_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_37_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_SET(LVar0, pra_28_ENTRY_0)
+    EVT_SET(LVar2, EVT_PTR(N(DoorModelsL)))
+    EVT_SET(LVar3, EVT_PTR(N(DoorModelsR)))
+    EVT_EXEC_WAIT(BaseEnterDoor)
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_SET(LVar0, REFLECTION_FLOOR_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_28/pra_28_3_entity.c b/src/world/area_pra/pra_28/pra_28_3_entity.c
new file mode 100644
index 0000000000..5268ca1cf2
--- /dev/null
+++ b/src/world/area_pra/pra_28/pra_28_3_entity.c
@@ -0,0 +1,14 @@
+#include "pra_28.h"
+#include "entity.h"
+
+#include "world/common/atomic/Chest.inc.c"
+
+EvtScript N(EVS_OpenChest_PUpDDown) = EVT_OPEN_CHEST_BADGE(ITEM_P_UP_D_DOWN, GF_PRA28_Chest_PUpDDown);
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 200, 20, 94, 0, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignChestFlag, GF_PRA28_Chest_PUpDDown)
+    EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_PUpDDown)))
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_29/D7CB70.c b/src/world/area_pra/pra_29/D7CB70.c
index 9fe651b205..4a4a4c1797 100644
--- a/src/world/area_pra/pra_29/D7CB70.c
+++ b/src/world/area_pra/pra_29/D7CB70.c
@@ -1,6 +1,6 @@
 #include "pra_29.h"
 
-#include "world/common/atomic/Reflection.inc.c"
+#include "../common/Reflection.inc.c"
 
 void func_80240F20_D7DA70(Vtx* arg0, Vtx* arg1, Vtx* arg2, s32 numVerticies, s32 arg4) {
     s32 temp_t3;
diff --git a/src/world/area_pra/pra_33/D896E0.c b/src/world/area_pra/pra_33/D896E0.c
deleted file mode 100644
index 0ee60867d5..0000000000
--- a/src/world/area_pra/pra_33/D896E0.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "pra_33.h"
-
-static char* N(exit_str_0) = "pra_35";
-static char* N(exit_str_1) = "pra_18";
-
-#include "../common/MapInit_EnableFloorReflection.inc.c"
diff --git a/src/world/area_pra/pra_33/D89700.c b/src/world/area_pra/pra_33/D89700.c
deleted file mode 100644
index b3a6dd4001..0000000000
--- a/src/world/area_pra/pra_33/D89700.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "pra_33.h"
-#include "mapfs/pra_33_hit.h"
-
-#include "world/common/atomic/Reflection.inc.c"
-
-ApiStatus func_80240F20_D8A600(Evt* script, s32 isInitialCall) {
-    script->varTable[10] = 0;
-    if (gCollisionStatus.currentFloor == COLLIDER_o1045) {
-        script->varTable[10] = 1;
-    }
-    if (gCollisionStatus.lastTouchedFloor == COLLIDER_o1045) {
-        script->varTable[10] = 1;
-    }
-    return ApiStatus_DONE2;
-}
-
-
-ApiStatus func_80240F58_D8A638(Evt* script, s32 isInitialCall) {
-    script->varTable[6] = dist2D(200.0f, 0.0f, gPlayerStatus.position.x, gPlayerStatus.position.z);
-    script->varTable[7] = atan2(200.0f, 0.0f, gPlayerStatus.position.x, gPlayerStatus.position.z);
-    script->varTable[7] = clamp_angle(script->varTable[7]);
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_80241000_D8A6E0(Evt* script, s32 isInitialCall) {
-    f32 sinTheta, cosTheta;
-
-    sin_cos_deg(script->varTable[7], &sinTheta, &cosTheta);
-    gPlayerStatus.position.x = (script->varTable[6] * sinTheta) + 200.0f;
-    gPlayerStatus.position.z = (script->varTable[6] * -cosTheta) + 0.0f;
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/area_pra/pra_33/pra_33.h b/src/world/area_pra/pra_33/pra_33.h
index 831138e51e..54d6e08464 100644
--- a/src/world/area_pra/pra_33/pra_33.h
+++ b/src/world/area_pra/pra_33/pra_33.h
@@ -2,8 +2,19 @@
 /// @brief Crystal Palace - Turnstyle Room
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_33_shape.h"
+#include "mapfs/pra_33_hit.h"
+
+enum {
+    MV_WallFlipped  = MapVar(0),
+};
+
 #define NAMESPACE pra_33
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern EvtScript N(EVS_MakeEntities);
diff --git a/src/world/area_pra/pra_33/pra_33_0_header.c b/src/world/area_pra/pra_33/pra_33_0_header.c
new file mode 100644
index 0000000000..d1894603fa
--- /dev/null
+++ b/src/world/area_pra/pra_33/pra_33_0_header.c
@@ -0,0 +1,16 @@
+#include "pra_33.h"
+
+#include "../common/MapInit_EnableFloorReflection.inc.c"
+
+EntryList N(Entrances) = {
+    [pra_33_ENTRY_0]    {  487.0,    0.0,   70.0,  270.0 },
+    [pra_33_ENTRY_1]    {   13.0,    0.0,  -70.0,   90.0 },
+    [pra_33_ENTRY_2]    {  487.0,    0.0,  -70.0,  270.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_33 },
+};
diff --git a/src/world/area_pra/pra_33/pra_33_1_music.c b/src/world/area_pra/pra_33/pra_33_1_music.c
new file mode 100644
index 0000000000..029799bc02
--- /dev/null
+++ b/src/world/area_pra/pra_33/pra_33_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_33.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_33/pra_33_2_main.c b/src/world/area_pra/pra_33/pra_33_2_main.c
new file mode 100644
index 0000000000..8a2474ff87
--- /dev/null
+++ b/src/world/area_pra/pra_33/pra_33_2_main.c
@@ -0,0 +1,123 @@
+#include "pra_33.h"
+#include "effects.h"
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+#include "../common/GlassShimmer.inc.c"
+
+s32 N(RightDoorModelsL)[] = { MODEL_o874, -1 };
+s32 N(RightDoorModelsR)[] = { MODEL_o876, -1 };
+
+s32 N(LeftDoorModelsL)[] = { MODEL_o859, -1 };
+s32 N(LeftDoorModelsR)[] = { MODEL_o861, -1 };
+
+EvtScript N(EVS_ExitDoors_pra_35_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_33_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittse)
+    EVT_SET(LVar2, EVT_PTR(N(RightDoorModelsL)))
+    EVT_SET(LVar3, EVT_PTR(N(RightDoorModelsR)))
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_35"), pra_35_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_18_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_33_ENTRY_1)
+    EVT_SET(LVar1, COLLIDER_deilittnw)
+    EVT_SET(LVar2, EVT_PTR(N(LeftDoorModelsL)))
+    EVT_SET(LVar3, EVT_PTR(N(LeftDoorModelsR)))
+    EVT_EXEC(BaseExitDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_18"), pra_18_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitWalk_pra_35_2) = EVT_EXIT_WALK(60, pra_33_ENTRY_2, "pra_35", pra_35_ENTRY_2);
+
+EvtScript N(EVS_Unused) = {
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_35_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_18_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittnw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_pra_35_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_33_ENTRY_0)
+            EVT_SET(LVar2, EVT_PTR(N(RightDoorModelsL)))
+            EVT_SET(LVar3, EVT_PTR(N(RightDoorModelsR)))
+            EVT_EXEC_WAIT(BaseEnterDoor)
+            EVT_EXEC(N(EVS_BindExitTriggers))
+        EVT_CASE_EQ(pra_33_ENTRY_1)
+            EVT_SET(LVar2, EVT_PTR(N(LeftDoorModelsL)))
+            EVT_SET(LVar3, EVT_PTR(N(LeftDoorModelsR)))
+            EVT_EXEC_WAIT(BaseEnterDoor)
+            EVT_EXEC(N(EVS_BindExitTriggers))
+        EVT_CASE_EQ(pra_33_ENTRY_2)
+            EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers)))
+            EVT_EXEC(EnterWalk)
+    EVT_END_SWITCH
+    EVT_RETURN
+    EVT_END
+};
+
+BombTrigger N(BombPos_Wall) = {
+    .pos = { 487.0f, 0.0f, -80.0f },
+    .radius = 0.0f
+};
+
+EvtScript N(EVS_BlastWall) = {
+    EVT_SET(GF_PRA33_BombedWall, TRUE)
+    EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 2, 34, 1, 10, 30)
+    EVT_CALL(EnableGroup, MODEL_g267, FALSE)
+    EVT_CALL(EnableGroup, MODEL_g270, TRUE)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_UNBIND
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_EXEC_WAIT(N(EVS_MakeEntities))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_IF_EQ(GF_PRA33_BombedWall, FALSE)
+        EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BlastWall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0)
+        EVT_CALL(EnableGroup, MODEL_g270, FALSE)
+    EVT_ELSE
+        EVT_CALL(EnableGroup, MODEL_g267, FALSE)
+        EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_END_IF
+    EVT_SET(LVar0, MODEL_o945)
+    EVT_SET(LVar1, MODEL_o987)
+    EVT_SET(LVar2, TEX_PANNER_0)
+    EVT_EXEC(N(EVS_GlassShimmer))
+    EVT_SET(LVar0, REFLECTION_WALL_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_33/pra_33_3_entity.c b/src/world/area_pra/pra_33/pra_33_3_entity.c
new file mode 100644
index 0000000000..10c7aa225a
--- /dev/null
+++ b/src/world/area_pra/pra_33/pra_33_3_entity.c
@@ -0,0 +1,91 @@
+#include "pra_33.h"
+#include "entity.h"
+
+API_CALLABLE(N(CheckPlayerOnDais)) {
+    script->varTable[10] = 0;
+    if (gCollisionStatus.currentFloor == COLLIDER_o1045) {
+        script->varTable[10] = 1;
+    }
+    if (gCollisionStatus.lastTouchedFloor == COLLIDER_o1045) {
+        script->varTable[10] = 1;
+    }
+    return ApiStatus_DONE2;
+}
+
+API_CALLABLE(N(GetDaisRelativePlayerPos)) {
+    script->varTable[6] = dist2D(200.0f, 0.0f, gPlayerStatus.position.x, gPlayerStatus.position.z);
+    script->varTable[7] = atan2(200.0f, 0.0f, gPlayerStatus.position.x, gPlayerStatus.position.z);
+    script->varTable[7] = clamp_angle(script->varTable[7]);
+    return ApiStatus_DONE2;
+}
+
+API_CALLABLE(N(UpdateDaisPlayerPos)) {
+    f32 sinTheta, cosTheta;
+
+    sin_cos_deg(script->varTable[7], &sinTheta, &cosTheta);
+    gPlayerStatus.position.x = (script->varTable[6] * sinTheta) + 200.0f;
+    gPlayerStatus.position.z = (script->varTable[6] * -cosTheta) + 0.0f;
+    return ApiStatus_DONE2;
+}
+
+EvtScript N(EVS_ActivateSwitch) = {
+    EVT_IF_EQ(AF_PRA33_FlippingWall, TRUE)
+        EVT_RETURN
+    EVT_END_IF
+    EVT_SET(AF_PRA33_FlippingWall, TRUE)
+    // set wall orientation
+    EVT_IF_EQ(MV_WallFlipped, FALSE)
+        EVT_SET(MV_WallFlipped, TRUE)
+    EVT_ELSE
+        EVT_SET(MV_WallFlipped, FALSE)
+    EVT_END_IF
+    EVT_CALL(PlaySoundAtCollider, COLLIDER_o1063, SOUND_2E, 0)
+    EVT_CALL(N(CheckPlayerOnDais))
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1063, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_CALL(N(GetDaisRelativePlayerPos))
+    // prepare the lerp
+    EVT_IF_EQ(MV_WallFlipped, FALSE)
+        EVT_SET(LVar2, 180)
+        EVT_CALL(MakeLerp, 180, 360, 15, EASING_LINEAR)
+    EVT_ELSE
+        EVT_SET(LVar2, 0)
+        EVT_CALL(MakeLerp, 0, 180, 15, EASING_LINEAR)
+    EVT_END_IF
+    // spin the dais and move the player if necessary
+    EVT_LOOP(0)
+        EVT_CALL(UpdateLerp)
+        EVT_CALL(RotateGroup, MODEL_g260, LVar0, 0, 1, 0)
+        EVT_CALL(UpdateColliderTransform, COLLIDER_o1045)
+        EVT_CALL(N(CheckPlayerOnDais))
+        EVT_IF_EQ(LVarA, TRUE)
+            EVT_SET(LVar3, LVar2)
+            EVT_SUB(LVar3, LVar0)
+            EVT_SET(LVar2, LVar0)
+            EVT_ADD(LVar7, LVar3)
+            EVT_CALL(N(UpdateDaisPlayerPos))
+        EVT_END_IF
+        EVT_WAIT(1)
+        EVT_IF_EQ(LVar1, 0)
+            EVT_BREAK_LOOP
+        EVT_END_IF
+    EVT_END_LOOP
+    EVT_SET(AF_PRA33_FlippingWall, FALSE)
+    EVT_CALL(N(CheckPlayerOnDais))
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1063, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_MakeEntities) = {
+    EVT_SET(GF_PRA33_Unused, FALSE)
+    EVT_SET(AF_PRA33_FlippingWall, FALSE)
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_RedSwitch), 310, 0, 110, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignScript, EVT_PTR(N(EVS_ActivateSwitch)))
+    EVT_CALL(MakeEntity, EVT_PTR(Entity_RedSwitch), 310, 0, -110, 0, MAKE_ENTITY_END)
+    EVT_CALL(AssignScript, EVT_PTR(N(EVS_ActivateSwitch)))
+    EVT_CALL(ParentColliderToModel, COLLIDER_o1045, MODEL_o990)
+    EVT_CALL(ParentColliderToModel, COLLIDER_o1063, MODEL_o990)
+    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1063, COLLIDER_FLAGS_UPPER_MASK)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c
index 2118fba0f9..19209acf61 100644
--- a/src/world/area_pra/pra_34/D8B3D0.c
+++ b/src/world/area_pra/pra_34/D8B3D0.c
@@ -1,6 +1,6 @@
 #include "pra_34.h"
 
-#include "world/common/atomic/Reflection.inc.c"
+#include "../common/Reflection.inc.c"
 
 #include "world/common/todo/RemovePadlock.inc.c"
 
diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c
index 13652b00ad..f0ef7e0370 100644
--- a/src/world/area_pra/pra_35/D8D270.c
+++ b/src/world/area_pra/pra_35/D8D270.c
@@ -1,6 +1,6 @@
 #include "pra_35.h"
 
-#include "world/common/atomic/Reflection.inc.c"
+#include "../common/Reflection.inc.c"
 
 #include "world/common/enemy/ai/PatrolNoAttackAI.inc.c"
 
diff --git a/src/world/area_pra/pra_36/D91700.c b/src/world/area_pra/pra_36/D91700.c
deleted file mode 100644
index f0bd0d9ba3..0000000000
--- a/src/world/area_pra/pra_36/D91700.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "pra_36.h"
-
-ApiStatus func_80240000_D91700(Evt* script, s32 isInitialCall) {
-    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
-    sprintf(wMapShapeName, "pra_10_shape");
-    sprintf(wMapHitName, "pra_10_hit");
-    return ApiStatus_BLOCK;
-}
-
-const char* N(exit_str_0) = "pra_21\0\0pra_27";
-
-#include "world/common/atomic/Reflection.inc.c"
diff --git a/src/world/area_pra/pra_36/pra_36.h b/src/world/area_pra/pra_36/pra_36.h
index ec0a98b859..569bdc31cd 100644
--- a/src/world/area_pra/pra_36/pra_36.h
+++ b/src/world/area_pra/pra_36/pra_36.h
@@ -2,8 +2,21 @@
 /// @brief Crystal Palace - Palace Key Hall
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_10_shape.h"
+#include "mapfs/pra_10_hit.h"
+
+#include "sprite/npc/Duplighost.h"
+
+enum {
+	NPC_Duplighost  = 0,
+};
+
 #define NAMESPACE pra_36
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern NpcGroupList N(DefaultNPCs);
diff --git a/src/world/area_pra/pra_36/pra_36_0_header.c b/src/world/area_pra/pra_36/pra_36_0_header.c
new file mode 100644
index 0000000000..69d5376d74
--- /dev/null
+++ b/src/world/area_pra/pra_36/pra_36_0_header.c
@@ -0,0 +1,13 @@
+#include "pra_36.h"
+
+EntryList N(Entrances) = {
+    [pra_36_ENTRY_0]    {   13.0,    0.0,   70.0,   90.0 },
+    [pra_36_ENTRY_1]    {  487.0,    0.0,   70.0,  270.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_36 },
+};
diff --git a/src/world/area_pra/pra_36/pra_36_1_music.c b/src/world/area_pra/pra_36/pra_36_1_music.c
new file mode 100644
index 0000000000..93d97123d6
--- /dev/null
+++ b/src/world/area_pra/pra_36/pra_36_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_36.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_36/pra_36_2_main.c b/src/world/area_pra/pra_36/pra_36_2_main.c
new file mode 100644
index 0000000000..544a9f41fa
--- /dev/null
+++ b/src/world/area_pra/pra_36/pra_36_2_main.c
@@ -0,0 +1,91 @@
+#include "pra_36.h"
+
+s32 N(map_init)(void) {
+    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
+    sprintf(wMapShapeName, "pra_10_shape");
+    sprintf(wMapHitName, "pra_10_hit");
+    return FALSE;
+}
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+
+EvtScript N(EVS_ExitDoors_pra_21_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_36_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittsw)
+    EVT_SET(LVar2, MODEL_o772)
+    EVT_SET(LVar3, MODEL_o768)
+    EVT_SET(LVar4, MODEL_o844)
+    EVT_SET(LVar5, MODEL_o846)
+    EVT_EXEC(ExitSplitDoubleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_21"), pra_21_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_27_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_36_ENTRY_1)
+    EVT_SET(LVar1, COLLIDER_deilittse)
+    EVT_SET(LVar2, MODEL_o1019)
+    EVT_SET(LVar3, MODEL_o1021)
+    EVT_SET(LVar4, MODEL_o1020)
+    EVT_SET(LVar5, MODEL_o1022)
+    EVT_EXEC(ExitSplitDoubleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_27"), pra_27_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_21_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_27_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_36_ENTRY_0)
+            EVT_SET(LVar2, MODEL_o772)
+            EVT_SET(LVar3, MODEL_o768)
+            EVT_SET(LVar4, MODEL_o844)
+            EVT_SET(LVar5, MODEL_o846)
+            EVT_EXEC_WAIT(EnterSplitDoubleDoor)
+        EVT_CASE_EQ(pra_36_ENTRY_1)
+            EVT_SET(LVar2, MODEL_o1019)
+            EVT_SET(LVar3, MODEL_o1021)
+            EVT_SET(LVar4, MODEL_o1020)
+            EVT_SET(LVar5, MODEL_o1022)
+            EVT_EXEC_WAIT(EnterSplitDoubleDoor)
+    EVT_END_SWITCH
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_SET(LVar0, REFLECTION_FLOOR_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_36/pra_36_3_npc.c b/src/world/area_pra/pra_36/pra_36_3_npc.c
new file mode 100644
index 0000000000..0591539818
--- /dev/null
+++ b/src/world/area_pra/pra_36/pra_36_3_npc.c
@@ -0,0 +1,38 @@
+#include "pra_36.h"
+
+#include "world/common/enemy/complete/Duplighost_Wander.inc.c"
+
+EvtScript N(EVS_NpcInit_Duplighost) = {
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+StaticNpc N(NpcData_Duplighost) = {
+    .id = NPC_Duplighost,
+    .settings = &N(NpcSettings_Duplighost_Wander),
+    .pos = { 250.0f, 0.0f, 75.0f },
+    .yaw = 90,
+    .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
+    .init = &N(EVS_NpcInit_Duplighost),
+    .drops = DUPLIGHOST_DROPS,
+    .territory = {
+        .wander = {
+            .isFlying = TRUE,
+            .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED,
+            .wanderShape = SHAPE_CYLINDER,
+            .centerPos  = { 250, 0, 75 },
+            .wanderSize = { 30 },
+            .detectShape = SHAPE_CYLINDER,
+            .detectPos  = { 250, 0, 75 },
+            .detectSize = { 200 },
+        }
+    },
+    .animations = DUPLIGHOST_ANIMS,
+    .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION,
+};
+
+NpcGroupList N(DefaultNPCs) = {
+    NPC_GROUP(N(NpcData_Duplighost), BTL_PRA3_FORMATION_0A, BTL_PRA3_STAGE_00),
+    {}
+};
diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c
deleted file mode 100644
index d1ecd084c0..0000000000
--- a/src/world/area_pra/pra_37/D92F40.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "pra_37.h"
-
-ApiStatus func_80240000_D92F40(Evt* script, s32 isInitialCall) {
-    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
-    sprintf(wMapShapeName, "pra_10_shape");
-    sprintf(wMapHitName, "pra_10_hit");
-    return ApiStatus_BLOCK;
-}
-
-const char* N(exit_str_0) = "pra_22\0\0pra_28";
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "world/common/enemy/ai/MeleeHitbox.inc.c"
-
-#include "world/common/enemy/ai/WanderMeleeAI.inc.c"
diff --git a/src/world/area_pra/pra_37/pra_37.h b/src/world/area_pra/pra_37/pra_37.h
index 836218e1d2..45d9ed2834 100644
--- a/src/world/area_pra/pra_37/pra_37.h
+++ b/src/world/area_pra/pra_37/pra_37.h
@@ -2,8 +2,20 @@
 /// @brief Crystal Palace - P-Up, D-Down Hall
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_10_shape.h"
+#include "mapfs/pra_10_hit.h"
+
+enum {
+    NPC_FrostClubba         = 0,
+    NPC_FrostClubba_Hitbox  = 1,
+};
+
 #define NAMESPACE pra_37
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern NpcGroupList N(DefaultNPCs);
diff --git a/src/world/area_pra/pra_37/pra_37_0_header.c b/src/world/area_pra/pra_37/pra_37_0_header.c
new file mode 100644
index 0000000000..12389abf19
--- /dev/null
+++ b/src/world/area_pra/pra_37/pra_37_0_header.c
@@ -0,0 +1,13 @@
+#include "pra_37.h"
+
+EntryList N(Entrances) = {
+    [pra_37_ENTRY_0]    {   13.0,    0.0,   70.0,   90.0 },
+    [pra_37_ENTRY_1]    {  487.0,    0.0,   70.0,  270.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_37 },
+};
diff --git a/src/world/area_pra/pra_37/pra_37_1_music.c b/src/world/area_pra/pra_37/pra_37_1_music.c
new file mode 100644
index 0000000000..51af2ae18c
--- /dev/null
+++ b/src/world/area_pra/pra_37/pra_37_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_37.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_37/pra_37_2_main.c b/src/world/area_pra/pra_37/pra_37_2_main.c
new file mode 100644
index 0000000000..e03ba71021
--- /dev/null
+++ b/src/world/area_pra/pra_37/pra_37_2_main.c
@@ -0,0 +1,91 @@
+#include "pra_37.h"
+
+s32 N(map_init)(void) {
+    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
+    sprintf(wMapShapeName, "pra_10_shape");
+    sprintf(wMapHitName, "pra_10_hit");
+    return FALSE;
+}
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+
+EvtScript N(EVS_ExitDoors_pra_22_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_37_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittsw)
+    EVT_SET(LVar2, MODEL_o772)
+    EVT_SET(LVar3, MODEL_o768)
+    EVT_SET(LVar4, MODEL_o844)
+    EVT_SET(LVar5, MODEL_o846)
+    EVT_EXEC(ExitSplitDoubleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_22"), pra_22_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_28_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_37_ENTRY_1)
+    EVT_SET(LVar1, COLLIDER_deilittse)
+    EVT_SET(LVar2, MODEL_o1019)
+    EVT_SET(LVar3, MODEL_o1021)
+    EVT_SET(LVar4, MODEL_o1020)
+    EVT_SET(LVar5, MODEL_o1022)
+    EVT_EXEC(ExitSplitDoubleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_28"), pra_28_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_22_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_28_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_37_ENTRY_0)
+            EVT_SET(LVar2, MODEL_o772)
+            EVT_SET(LVar3, MODEL_o768)
+            EVT_SET(LVar4, MODEL_o844)
+            EVT_SET(LVar5, MODEL_o846)
+            EVT_EXEC_WAIT(EnterSplitDoubleDoor)
+        EVT_CASE_EQ(pra_37_ENTRY_1)
+            EVT_SET(LVar2, MODEL_o1019)
+            EVT_SET(LVar3, MODEL_o1021)
+            EVT_SET(LVar4, MODEL_o1020)
+            EVT_SET(LVar5, MODEL_o1022)
+            EVT_EXEC_WAIT(EnterSplitDoubleDoor)
+    EVT_END_SWITCH
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_SET(LVar0, REFLECTION_FLOOR_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_37/pra_37_3_npc.c b/src/world/area_pra/pra_37/pra_37_3_npc.c
new file mode 100644
index 0000000000..aaf334945e
--- /dev/null
+++ b/src/world/area_pra/pra_37/pra_37_3_npc.c
@@ -0,0 +1,41 @@
+#include "pra_37.h"
+
+#include "world/common/enemy/complete/FrostClubba_Wander.inc.c"
+
+EvtScript N(EVS_NpcInit_FrostClubba) = {
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+StaticNpc N(NpcData_FrostClubba)[] = {
+    {
+        .id = NPC_FrostClubba,
+        .settings = &N(NpcSettings_FrostClubba_Wander),
+        .pos = { 175.0f, 0.0f, 75.0f },
+        .yaw = 90,
+        .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800,
+        .init = &N(EVS_NpcInit_FrostClubba),
+        .drops = FROST_CLUBBA_DROPS,
+        .territory = {
+            .wander = {
+                .isFlying = TRUE,
+                .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED,
+                .wanderShape = SHAPE_CYLINDER,
+                .centerPos  = { 175, 0, 75 },
+                .wanderSize = { 30 },
+                .detectShape = SHAPE_CYLINDER,
+                .detectPos  = { 175, 0, 75 },
+                .detectSize = { 200 },
+            }
+        },
+        .animations = FROST_CLUBBA_ANIMS,
+        .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION,
+    },
+    FROST_CLUBBA_MACE_HITBOX(NPC_FrostClubba_Hitbox),
+};
+
+NpcGroupList N(DefaultNPCs) = {
+    NPC_GROUP(N(NpcData_FrostClubba), BTL_PRA_FORMATION_0D, BTL_PRA_STAGE_00),
+    {}
+};
diff --git a/src/world/area_pra/pra_38/D955F0.c b/src/world/area_pra/pra_38/D955F0.c
deleted file mode 100644
index 588e6ac466..0000000000
--- a/src/world/area_pra/pra_38/D955F0.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "pra_38.h"
-
-ApiStatus func_80240000_D955F0(Evt* script, s32 isInitialCall) {
-    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
-    sprintf(wMapShapeName, "pra_10_shape");
-    sprintf(wMapHitName, "pra_10_hit");
-    return ApiStatus_BLOCK;
-}
-
-const char* N(exit_str_0) = "pra_03\0\0pra_05";
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "world/common/todo/UnkFunc001.inc.c"
diff --git a/src/world/area_pra/pra_38/pra_38.h b/src/world/area_pra/pra_38/pra_38.h
index a3b162f30b..62cac8fa24 100644
--- a/src/world/area_pra/pra_38/pra_38.h
+++ b/src/world/area_pra/pra_38/pra_38.h
@@ -2,8 +2,20 @@
 /// @brief Crystal Palace - Blue Key Hall
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_10_shape.h"
+#include "mapfs/pra_10_hit.h"
+
+enum {
+    NPC_Swoopula_01     = 0,
+    NPC_Swoopula_02     = 1,
+};
+
 #define NAMESPACE pra_38
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern NpcGroupList N(DefaultNPCs);
diff --git a/src/world/area_pra/pra_38/pra_38_0_header.c b/src/world/area_pra/pra_38/pra_38_0_header.c
new file mode 100644
index 0000000000..44faaf78f7
--- /dev/null
+++ b/src/world/area_pra/pra_38/pra_38_0_header.c
@@ -0,0 +1,13 @@
+#include "pra_38.h"
+
+EntryList N(Entrances) = {
+    [pra_38_ENTRY_0]    {   13.0,    0.0,   70.0,   90.0 },
+    [pra_38_ENTRY_1]    {  487.0,    0.0,   70.0,  270.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_38 },
+};
diff --git a/src/world/area_pra/pra_38/pra_38_1_music.c b/src/world/area_pra/pra_38/pra_38_1_music.c
new file mode 100644
index 0000000000..6e469007af
--- /dev/null
+++ b/src/world/area_pra/pra_38/pra_38_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_38.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_38/pra_38_2_main.c b/src/world/area_pra/pra_38/pra_38_2_main.c
new file mode 100644
index 0000000000..ed4d3aa6d0
--- /dev/null
+++ b/src/world/area_pra/pra_38/pra_38_2_main.c
@@ -0,0 +1,91 @@
+#include "pra_38.h"
+
+s32 N(map_init)(void) {
+    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
+    sprintf(wMapShapeName, "pra_10_shape");
+    sprintf(wMapHitName, "pra_10_hit");
+    return FALSE;
+}
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+
+EvtScript N(EVS_ExitDoors_pra_03_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_38_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittsw)
+    EVT_SET(LVar2, MODEL_o772)
+    EVT_SET(LVar3, MODEL_o768)
+    EVT_SET(LVar4, MODEL_o844)
+    EVT_SET(LVar5, MODEL_o846)
+    EVT_EXEC(ExitSplitDoubleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_03"), pra_03_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_05_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_38_ENTRY_1)
+    EVT_SET(LVar1, COLLIDER_deilittse)
+    EVT_SET(LVar2, MODEL_o1019)
+    EVT_SET(LVar3, MODEL_o1021)
+    EVT_SET(LVar4, MODEL_o1020)
+    EVT_SET(LVar5, MODEL_o1022)
+    EVT_EXEC(ExitSplitDoubleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_05"), pra_05_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_03_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_05_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_38_ENTRY_0)
+            EVT_SET(LVar2, MODEL_o772)
+            EVT_SET(LVar3, MODEL_o768)
+            EVT_SET(LVar4, MODEL_o844)
+            EVT_SET(LVar5, MODEL_o846)
+            EVT_EXEC_WAIT(EnterSplitDoubleDoor)
+        EVT_CASE_EQ(pra_38_ENTRY_1)
+            EVT_SET(LVar2, MODEL_o1019)
+            EVT_SET(LVar3, MODEL_o1021)
+            EVT_SET(LVar4, MODEL_o1020)
+            EVT_SET(LVar5, MODEL_o1022)
+            EVT_EXEC_WAIT(EnterSplitDoubleDoor)
+    EVT_END_SWITCH
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_SET(LVar0, REFLECTION_FLOOR_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_38/pra_38_3_npc.c b/src/world/area_pra/pra_38/pra_38_3_npc.c
new file mode 100644
index 0000000000..4f85ba81aa
--- /dev/null
+++ b/src/world/area_pra/pra_38/pra_38_3_npc.c
@@ -0,0 +1,63 @@
+#include "pra_38.h"
+
+#include "world/common/enemy/complete/Swooper.inc.c"
+
+EvtScript N(EVS_NpcInit_Swoopula) = {
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+StaticNpc N(NpcData_Swoopula_01) = {
+    .id = NPC_Swoopula_01,
+    .settings = &N(NpcSettings_Swoopula),
+    .pos = { 175.0f, 130.0f, 75.0f },
+    .yaw = 270,
+    .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
+    .init = &N(EVS_NpcInit_Swoopula),
+    .drops = SWOOPULA_DROPS,
+    .territory = {
+        .wander = {
+            .isFlying = TRUE,
+            .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED,
+            .wanderShape = SHAPE_CYLINDER,
+            .centerPos  = { 175, 130, 75 },
+            .wanderSize = { 0 },
+            .detectShape = SHAPE_CYLINDER,
+            .detectPos  = { 175, 130, 75 },
+            .detectSize = { 200 },
+        }
+    },
+    .animations = SWOOPULA_ANIMS,
+    .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION,
+};
+
+StaticNpc N(NpcData_Swoopula_02) = {
+    .id = NPC_Swoopula_02,
+    .settings = &N(NpcSettings_Swoopula),
+    .pos = { 325.0f, 130.0f, 75.0f },
+    .yaw = 270,
+    .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
+    .init = &N(EVS_NpcInit_Swoopula),
+    .drops = SWOOPULA_DROPS,
+    .territory = {
+        .wander = {
+            .isFlying = TRUE,
+            .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED,
+            .wanderShape = SHAPE_CYLINDER,
+            .centerPos  = { 325, 130, 75 },
+            .wanderSize = { 0 },
+            .detectShape = SHAPE_CYLINDER,
+            .detectPos  = { 325, 130, 75 },
+            .detectSize = { 200 },
+        }
+    },
+    .animations = SWOOPULA_ANIMS,
+    .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION,
+};
+
+NpcGroupList N(DefaultNPCs) = {
+    NPC_GROUP(N(NpcData_Swoopula_01), BTL_PRA_FORMATION_01, BTL_PRA_STAGE_00),
+    NPC_GROUP(N(NpcData_Swoopula_02), BTL_PRA_FORMATION_02, BTL_PRA_STAGE_00),
+    {}
+};
diff --git a/src/world/area_pra/pra_39/D97890.c b/src/world/area_pra/pra_39/D97890.c
deleted file mode 100644
index 78cf628534..0000000000
--- a/src/world/area_pra/pra_39/D97890.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "pra_39.h"
-
-ApiStatus func_80240000_D97890(Evt* script, s32 isInitialCall) {
-    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
-    sprintf(wMapShapeName, "pra_10_shape");
-    sprintf(wMapHitName, "pra_10_hit");
-    return ApiStatus_BLOCK;
-}
-
-const char* N(exit_str_0) = "pra_04\0\0pra_06";
-
-#include "world/common/atomic/Reflection.inc.c"
-
-#include "world/common/todo/UnkFunc001.inc.c"
diff --git a/src/world/area_pra/pra_39/pra_39.h b/src/world/area_pra/pra_39/pra_39.h
index 3a2c1b7871..8fd5079397 100644
--- a/src/world/area_pra/pra_39/pra_39.h
+++ b/src/world/area_pra/pra_39/pra_39.h
@@ -2,8 +2,21 @@
 /// @brief Crystal Palace - Shooting Star Hall
 
 #include "common.h"
-#include "../pra.h"
 #include "message_ids.h"
 #include "map.h"
 
+#include "../pra.h"
+#include "mapfs/pra_10_shape.h"
+#include "mapfs/pra_10_hit.h"
+
+#include "sprite/npc/Duplighost.h"
+
+enum {
+	NPC_Duplighost      = 0,
+};
+
 #define NAMESPACE pra_39
+
+extern EvtScript N(EVS_Main);
+extern EvtScript N(EVS_SetupMusic);
+extern NpcGroupList N(DefaultNPCs);
diff --git a/src/world/area_pra/pra_39/pra_39_0_header.c b/src/world/area_pra/pra_39/pra_39_0_header.c
new file mode 100644
index 0000000000..5e4ffec27f
--- /dev/null
+++ b/src/world/area_pra/pra_39/pra_39_0_header.c
@@ -0,0 +1,13 @@
+#include "pra_39.h"
+
+EntryList N(Entrances) = {
+    [pra_39_ENTRY_0]    {   13.0,    0.0,   70.0,   90.0 },
+    [pra_39_ENTRY_1]    {  487.0,    0.0,   70.0,  270.0 },
+};
+
+MapSettings N(settings) = {
+    .main = &N(EVS_Main),
+    .entryList = &N(Entrances),
+    .entryCount = ENTRY_COUNT(N(Entrances)),
+    .tattle = { MSG_MapTattle_pra_39 },
+};
diff --git a/src/world/area_pra/pra_39/pra_39_1_music.c b/src/world/area_pra/pra_39/pra_39_1_music.c
new file mode 100644
index 0000000000..e8adfd0e03
--- /dev/null
+++ b/src/world/area_pra/pra_39/pra_39_1_music.c
@@ -0,0 +1,8 @@
+#include "pra_39.h"
+
+EvtScript N(EVS_SetupMusic) = {
+    EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8)
+    EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_39/pra_39_2_main.c b/src/world/area_pra/pra_39/pra_39_2_main.c
new file mode 100644
index 0000000000..316eb2078b
--- /dev/null
+++ b/src/world/area_pra/pra_39/pra_39_2_main.c
@@ -0,0 +1,91 @@
+#include "pra_39.h"
+
+s32 N(map_init)(void) {
+    gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR;
+    sprintf(wMapShapeName, "pra_10_shape");
+    sprintf(wMapHitName, "pra_10_hit");
+    return FALSE;
+}
+
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
+
+EvtScript N(EVS_ExitDoors_pra_04_1) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_39_ENTRY_0)
+    EVT_SET(LVar1, COLLIDER_deilittsw)
+    EVT_SET(LVar2, MODEL_o772)
+    EVT_SET(LVar3, MODEL_o768)
+    EVT_SET(LVar4, MODEL_o844)
+    EVT_SET(LVar5, MODEL_o846)
+    EVT_EXEC(ExitSplitDoubleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_04"), pra_04_ENTRY_1)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_ExitDoors_pra_06_0) = {
+    EVT_SET_GROUP(EVT_GROUP_1B)
+    EVT_CALL(DisablePlayerInput, TRUE)
+    EVT_SET(LVar0, pra_39_ENTRY_1)
+    EVT_SET(LVar1, COLLIDER_deilittse)
+    EVT_SET(LVar2, MODEL_o1019)
+    EVT_SET(LVar3, MODEL_o1021)
+    EVT_SET(LVar4, MODEL_o1020)
+    EVT_SET(LVar5, MODEL_o1022)
+    EVT_EXEC(ExitSplitDoubleDoor)
+    EVT_WAIT(17)
+    EVT_CALL(GotoMap, EVT_PTR("pra_06"), pra_06_ENTRY_0)
+    EVT_WAIT(100)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_BindExitTriggers) = {
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_04_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0)
+    EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_06_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0)
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_EnterMap) = {
+    EVT_CALL(GetEntryID, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(pra_39_ENTRY_0)
+            EVT_SET(LVar2, MODEL_o772)
+            EVT_SET(LVar3, MODEL_o768)
+            EVT_SET(LVar4, MODEL_o844)
+            EVT_SET(LVar5, MODEL_o846)
+            EVT_EXEC_WAIT(EnterSplitDoubleDoor)
+        EVT_CASE_EQ(pra_39_ENTRY_1)
+            EVT_SET(LVar2, MODEL_o1019)
+            EVT_SET(LVar3, MODEL_o1021)
+            EVT_SET(LVar4, MODEL_o1020)
+            EVT_SET(LVar5, MODEL_o1022)
+            EVT_EXEC_WAIT(EnterSplitDoubleDoor)
+    EVT_END_SWITCH
+    EVT_EXEC(N(EVS_BindExitTriggers))
+    EVT_RETURN
+    EVT_END
+};
+
+EvtScript N(EVS_Main) = {
+    EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE)
+    EVT_CALL(SetSpriteShading, SHADING_NONE)
+    EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096)
+    EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40)
+    EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE)
+    EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
+    EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs)))
+    EVT_EXEC(N(EVS_SetupMusic))
+    EVT_SET(LVar0, REFLECTION_FLOOR_ONLY)
+    EVT_SET(LVar1, GF_PRA_BrokeIllusion)
+    EVT_EXEC(N(EVS_SetupReflections))
+    EVT_EXEC(N(EVS_EnterMap))
+    EVT_WAIT(1)
+    EVT_RETURN
+    EVT_END
+};
diff --git a/src/world/area_pra/pra_39/pra_39_3_npc.c b/src/world/area_pra/pra_39/pra_39_3_npc.c
new file mode 100644
index 0000000000..0a5cf5185c
--- /dev/null
+++ b/src/world/area_pra/pra_39/pra_39_3_npc.c
@@ -0,0 +1,39 @@
+#include "pra_39.h"
+
+#include "world/common/enemy/complete/Swooper.inc.c"
+#include "world/common/enemy/complete/Duplighost_Wander.inc.c"
+
+EvtScript N(EVS_NpcInit_Duplighost) = {
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE)
+    EVT_RETURN
+    EVT_END
+};
+
+StaticNpc N(NpcData_Duplighost) = {
+    .id = NPC_Duplighost,
+    .settings = &N(NpcSettings_Duplighost_Wander),
+    .pos = { 250.0f, 0.0f, 75.0f },
+    .yaw = 90,
+    .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
+    .init = &N(EVS_NpcInit_Duplighost),
+    .drops = DUPLIGHOST_DROPS,
+    .territory = {
+        .wander = {
+            .isFlying = TRUE,
+            .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED,
+            .wanderShape = SHAPE_CYLINDER,
+            .centerPos  = { 250, 0, 75 },
+            .wanderSize = { 30 },
+            .detectShape = SHAPE_CYLINDER,
+            .detectPos  = { 250, 0, 75 },
+            .detectSize = { 200 },
+        }
+    },
+    .animations = DUPLIGHOST_ANIMS,
+    .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION,
+};
+
+NpcGroupList N(DefaultNPCs) = {
+    NPC_GROUP(N(NpcData_Duplighost), BTL_PRA3_FORMATION_08, BTL_PRA3_STAGE_00),
+    {}
+};
diff --git a/src/world/area_pra/pra_40/pra_40_2_main.c b/src/world/area_pra/pra_40/pra_40_2_main.c
index 693974a5a3..750639270d 100644
--- a/src/world/area_pra/pra_40/pra_40_2_main.c
+++ b/src/world/area_pra/pra_40/pra_40_2_main.c
@@ -1,7 +1,7 @@
 #include "pra_40.h"
 
-#include "world/common/atomic/Reflection.inc.c"
-#include "world/common/atomic/Reflection.data.inc.c"
+#include "../common/Reflection.inc.c"
+#include "../common/Reflection.data.inc.c"
 
 EvtScript N(EVS_ExitDoors_pra_31_1) = EVT_EXIT_DOUBLE_DOOR(pra_40_ENTRY_0, "pra_31", pra_31_ENTRY_1, COLLIDER_deilitt1, MODEL_o1055, MODEL_o1053);
 EvtScript N(EVS_ExitDoors_pra_32_0) = EVT_EXIT_DOUBLE_DOOR(pra_40_ENTRY_1, "pra_32", pra_32_ENTRY_0, COLLIDER_deilitt2, MODEL_o880, MODEL_o878);
diff --git a/src/world/area_sam/sam_06/sam_06_2_main.c b/src/world/area_sam/sam_06/sam_06_2_main.c
index f159512aab..bc2a8f3bb0 100644
--- a/src/world/area_sam/sam_06/sam_06_2_main.c
+++ b/src/world/area_sam/sam_06/sam_06_2_main.c
@@ -6,19 +6,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_ki2,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_miki2,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_ki2);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_miki2);
 
 ShakeTreeConfig N(ShakeTree_Tree1) = {
     .leaves = &N(Tree1_LeafModels),
@@ -30,19 +19,8 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_ki3,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_miki3,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_ki3);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_miki3);
 
 ShakeTreeConfig N(ShakeTree_Tree2) = {
     .leaves = &N(Tree2_LeafModels),
@@ -54,19 +32,8 @@ BombTrigger N(BombPos_Tree2) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree3_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_ki5b,
-    }
-};
-
-FoliageModelList N(Tree3_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_muki5,
-    }
-};
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_ki5b);
+FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_muki5);
 
 ShakeTreeConfig N(ShakeTree_Tree3) = {
     .leaves = &N(Tree3_LeafModels),
@@ -78,19 +45,8 @@ BombTrigger N(BombPos_Tree3) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree4_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_ki6b,
-    }
-};
-
-FoliageModelList N(Tree4_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_miki6,
-    }
-};
+FoliageModelList N(Tree4_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_ki6b);
+FoliageModelList N(Tree4_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_miki6);
 
 ShakeTreeConfig N(ShakeTree_Tree4) = {
     .leaves = &N(Tree4_LeafModels),
@@ -102,19 +58,8 @@ BombTrigger N(BombPos_Tree4) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree5_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_ki10,
-    }
-};
-
-FoliageModelList N(Tree5_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_miki10,
-    }
-};
+FoliageModelList N(Tree5_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_ki10);
+FoliageModelList N(Tree5_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_miki10);
 
 ShakeTreeConfig N(ShakeTree_Tree5) = {
     .leaves = &N(Tree5_LeafModels),
diff --git a/src/world/area_sbk/sbk_06/sbk_06_3_foliage.c b/src/world/area_sbk/sbk_06/sbk_06_3_foliage.c
index c5c4f95b77..7a97b9a760 100644
--- a/src/world/area_sbk/sbk_06/sbk_06_3_foliage.c
+++ b/src/world/area_sbk/sbk_06/sbk_06_3_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o58,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o57,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o58);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o57);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1,
diff --git a/src/world/area_sbk/sbk_16/sbk_16_2_foliage.c b/src/world/area_sbk/sbk_16/sbk_16_2_foliage.c
index b6969c4d12..86ccc50d4e 100644
--- a/src/world/area_sbk/sbk_16/sbk_16_2_foliage.c
+++ b/src/world/area_sbk/sbk_16/sbk_16_2_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o56,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o55,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o56);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o55);
 
 ShakeTreeConfig N(ShakeTree_Tree1) = {
     .leaves = &N(Tree1_LeafModels),
@@ -26,19 +15,8 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o58,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o57,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o58);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o57);
 
 ShakeTreeConfig N(ShakeTree_Tree2) = {
     .leaves = &N(Tree2_LeafModels),
diff --git a/src/world/area_sbk/sbk_24/sbk_24_4_foliage.c b/src/world/area_sbk/sbk_24/sbk_24_4_foliage.c
index 676fae0efd..841a9386fd 100644
--- a/src/world/area_sbk/sbk_24/sbk_24_4_foliage.c
+++ b/src/world/area_sbk/sbk_24/sbk_24_4_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o50,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o49,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o50);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o49);
 
 ShakeTreeConfig N(ShakeTree_Tree1) = {
     .leaves = &N(Tree1_LeafModels),
@@ -26,19 +15,8 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o56,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o55,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o56);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o55);
 
 ShakeTreeConfig N(ShakeTree_Tree2) = {
     .leaves = &N(Tree2_LeafModels),
@@ -50,19 +28,8 @@ BombTrigger N(BombPos_Tree2) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree3_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o58,
-    }
-};
-
-FoliageModelList N(Tree3_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o57,
-    }
-};
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o58);
+FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o57);
 
 ShakeTreeConfig N(ShakeTree_Tree3) = {
     .leaves = &N(Tree3_LeafModels),
diff --git a/src/world/area_sbk/sbk_25/sbk_25_3_foliage.c b/src/world/area_sbk/sbk_25/sbk_25_3_foliage.c
index c08b7a7a98..0c49ab77e4 100644
--- a/src/world/area_sbk/sbk_25/sbk_25_3_foliage.c
+++ b/src/world/area_sbk/sbk_25/sbk_25_3_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o58,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o57,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o58);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o57);
 
 ShakeTreeConfig N(ShakeTree_Tree1) = {
     .leaves = &N(Tree1_LeafModels),
@@ -26,19 +15,8 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o60,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o59,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o60);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o59);
 
 ShakeTreeConfig N(ShakeTree_Tree2) = {
     .leaves = &N(Tree2_LeafModels),
diff --git a/src/world/area_sbk/sbk_26/sbk_26_3_foliage.c b/src/world/area_sbk/sbk_26/sbk_26_3_foliage.c
index 422b04e565..0315af3a12 100644
--- a/src/world/area_sbk/sbk_26/sbk_26_3_foliage.c
+++ b/src/world/area_sbk/sbk_26/sbk_26_3_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o60,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o59,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o60);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o59);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1,
diff --git a/src/world/area_sbk/sbk_30/sbk_30_2_main.c b/src/world/area_sbk/sbk_30/sbk_30_2_main.c
index 59e0243813..a45d458f8f 100644
--- a/src/world/area_sbk/sbk_30/sbk_30_2_main.c
+++ b/src/world/area_sbk/sbk_30/sbk_30_2_main.c
@@ -65,7 +65,7 @@ EvtScript N(EVS_Scene_RuinsRising) = {
     EVT_END
 };
 
-MAP_RODATA_PAD(1, unk) // can be fixed with subalign 16 for this map
+MAP_RODATA_PAD(1, exits); // can be fixed with subalign 16 for this map
 
 EvtScript N(EVS_Main) = {
     EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT)
diff --git a/src/world/area_sbk/sbk_30/sbk_30_3_npc.c b/src/world/area_sbk/sbk_30/sbk_30_3_npc.c
index bcf3e02b85..b57008098c 100644
--- a/src/world/area_sbk/sbk_30/sbk_30_3_npc.c
+++ b/src/world/area_sbk/sbk_30/sbk_30_3_npc.c
@@ -26,7 +26,7 @@ NpcSettings N(NpcSettings_Archeologist_01) = {
 MAP_STATIC_PAD(1,normal_item);
 #include "world/common/complete/NormalItemChoice.inc.c"
 
-#include "world/common/atomic/LetterChoice.inc.c"
+#include "world/common/complete/LetterDelivery.inc.c"
 
 s32 N(LetterList)[] = {
     ITEM_LETTER25,
diff --git a/src/world/area_sbk/sbk_30/sbk_30_4_foliage.c b/src/world/area_sbk/sbk_30/sbk_30_4_foliage.c
index 45528e271b..1706974c5b 100644
--- a/src/world/area_sbk/sbk_30/sbk_30_4_foliage.c
+++ b/src/world/area_sbk/sbk_30/sbk_30_4_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_ki_ha,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_ki_miki,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_ki_ha);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_ki_miki);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1,
diff --git a/src/world/area_sbk/sbk_34/sbk_34_2_npc.c b/src/world/area_sbk/sbk_34/sbk_34_2_npc.c
index 3fd33ffd84..73a4794186 100644
--- a/src/world/area_sbk/sbk_34/sbk_34_2_npc.c
+++ b/src/world/area_sbk/sbk_34/sbk_34_2_npc.c
@@ -6,7 +6,7 @@ NpcSettings N(NpcSettings_Nomadimouse) = {
     .level = 99,
 };
 
-#include "world/common/atomic/LetterChoice.inc.c"
+#include "world/common/complete/LetterDelivery.inc.c"
 
 s32 N(D_802416A8_947578)[] = {
     ITEM_LETTER08,
diff --git a/src/world/area_sbk/sbk_34/sbk_34_3_foliage.c b/src/world/area_sbk/sbk_34/sbk_34_3_foliage.c
index db26e41097..a6491c72b4 100644
--- a/src/world/area_sbk/sbk_34/sbk_34_3_foliage.c
+++ b/src/world/area_sbk/sbk_34/sbk_34_3_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o63,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o62,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o63);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o62);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1,
diff --git a/src/world/area_sbk/sbk_35/sbk_35_3_foliage.c b/src/world/area_sbk/sbk_35/sbk_35_3_foliage.c
index 48068a37ec..05e3b54cbc 100644
--- a/src/world/area_sbk/sbk_35/sbk_35_3_foliage.c
+++ b/src/world/area_sbk/sbk_35/sbk_35_3_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o57,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o56,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o57);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o56);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1,
@@ -39,19 +28,8 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o59,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o58,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o59);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o58);
 
 ShakeTreeConfig N(ShakeTree_Tree2) = {
     .leaves = &N(Tree2_LeafModels),
@@ -63,19 +41,8 @@ BombTrigger N(BombPos_Tree2) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree3_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o61,
-    }
-};
-
-FoliageModelList N(Tree3_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o60,
-    }
-};
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o61);
+FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o60);
 
 ShakeTreeConfig N(ShakeTree_Tree3) = {
     .leaves = &N(Tree3_LeafModels),
diff --git a/src/world/area_sbk/sbk_36/sbk_36_2_foliage.c b/src/world/area_sbk/sbk_36/sbk_36_2_foliage.c
index 7e6e03de36..030290cd27 100644
--- a/src/world/area_sbk/sbk_36/sbk_36_2_foliage.c
+++ b/src/world/area_sbk/sbk_36/sbk_36_2_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o73,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o72,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o73);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o72);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1,
@@ -39,19 +28,8 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o71,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o70,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o71);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o70);
 
 FoliageDropList N(Tree2_Drops) = {
     .count = 1,
@@ -76,19 +54,8 @@ BombTrigger N(BombPos_Tree2) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree3_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o75,
-    }
-};
-
-FoliageModelList N(Tree3_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o74,
-    }
-};
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o75);
+FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o74);
 
 ShakeTreeConfig N(ShakeTree_Tree3) = {
     .leaves = &N(Tree3_LeafModels),
@@ -100,19 +67,8 @@ BombTrigger N(BombPos_Tree3) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree4_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o69,
-    }
-};
-
-FoliageModelList N(Tree4_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o68,
-    }
-};
+FoliageModelList N(Tree4_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o69);
+FoliageModelList N(Tree4_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o68);
 
 ShakeTreeConfig N(ShakeTree_Tree4) = {
     .leaves = &N(Tree4_LeafModels),
@@ -124,19 +80,8 @@ BombTrigger N(BombPos_Tree4) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree5_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o57,
-    }
-};
-
-FoliageModelList N(Tree5_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o56,
-    }
-};
+FoliageModelList N(Tree5_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o57);
+FoliageModelList N(Tree5_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o56);
 
 ShakeTreeConfig N(ShakeTree_Tree5) = {
     .leaves = &N(Tree5_LeafModels),
@@ -148,19 +93,8 @@ BombTrigger N(BombPos_Tree5) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree6_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o59,
-    }
-};
-
-FoliageModelList N(Tree6_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o58,
-    }
-};
+FoliageModelList N(Tree6_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o59);
+FoliageModelList N(Tree6_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o58);
 
 FoliageDropList N(Tree6_Drops) = {
     .count = 1,
@@ -185,19 +119,8 @@ BombTrigger N(BombPos_Tree6) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree7_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o67,
-    }
-};
-
-FoliageModelList N(Tree7_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o66,
-    }
-};
+FoliageModelList N(Tree7_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o67);
+FoliageModelList N(Tree7_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o66);
 
 ShakeTreeConfig N(ShakeTree_Tree7) = {
     .leaves = &N(Tree7_LeafModels),
@@ -209,19 +132,8 @@ BombTrigger N(BombPos_Tree7) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree8_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o63,
-    }
-};
-
-FoliageModelList N(Tree8_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o62,
-    }
-};
+FoliageModelList N(Tree8_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o63);
+FoliageModelList N(Tree8_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o62);
 
 ShakeTreeConfig N(ShakeTree_Tree8) = {
     .leaves = &N(Tree8_LeafModels),
@@ -233,19 +145,8 @@ BombTrigger N(BombPos_Tree8) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree9_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o65,
-    }
-};
-
-FoliageModelList N(Tree9_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o64,
-    }
-};
+FoliageModelList N(Tree9_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o65);
+FoliageModelList N(Tree9_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o64);
 
 FoliageDropList N(Tree9_Drops) = {
     .count = 1,
diff --git a/src/world/area_sbk/sbk_46/sbk_46_3_foliage.c b/src/world/area_sbk/sbk_46/sbk_46_3_foliage.c
index d359f58020..64457d20cb 100644
--- a/src/world/area_sbk/sbk_46/sbk_46_3_foliage.c
+++ b/src/world/area_sbk/sbk_46/sbk_46_3_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o62,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o61,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o62);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o61);
 
 ShakeTreeConfig N(ShakeTree_Tree1) = {
     .leaves = &N(Tree1_LeafModels),
@@ -26,19 +15,8 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o64,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o63,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o64);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o63);
 
 FoliageDropList N(Tree2_Drops) = {
     .count = 1,
@@ -63,19 +41,8 @@ BombTrigger N(BombPos_Tree2) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree3_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o60,
-    }
-};
-
-FoliageModelList N(Tree3_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o59,
-    }
-};
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o60);
+FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o59);
 
 ShakeTreeConfig N(ShakeTree_Tree3) = {
     .leaves = &N(Tree3_LeafModels),
diff --git a/src/world/area_sbk/sbk_55/sbk_55_3_foliage.c b/src/world/area_sbk/sbk_55/sbk_55_3_foliage.c
index 958b939b27..8ca4578f2d 100644
--- a/src/world/area_sbk/sbk_55/sbk_55_3_foliage.c
+++ b/src/world/area_sbk/sbk_55/sbk_55_3_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o56,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o55,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o56);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o55);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1,
diff --git a/src/world/area_sbk/sbk_56/sbk_56_3_foliage.c b/src/world/area_sbk/sbk_56/sbk_56_3_foliage.c
index 30212c453a..da2883feb6 100644
--- a/src/world/area_sbk/sbk_56/sbk_56_3_foliage.c
+++ b/src/world/area_sbk/sbk_56/sbk_56_3_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_ki,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_miki,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_ki);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_miki);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1,
@@ -40,19 +29,8 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_ki,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_miki,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_ki);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_miki);
 
 FoliageDropList N(Tree2_Drops) = {
     .count = 1,
@@ -78,19 +56,8 @@ BombTrigger N(BombPos_Tree2) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree3_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o52,
-    }
-};
-
-FoliageModelList N(Tree3_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_y_miki,
-    }
-};
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o52);
+FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_y_miki);
 
 FoliageDropList N(Tree3_Drops) = {
     .count = 1,
@@ -115,19 +82,8 @@ BombTrigger N(BombPos_Tree3) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree4_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_y_ha,
-    }
-};
-
-FoliageModelList N(Tree4_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o51,
-    }
-};
+FoliageModelList N(Tree4_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_y_ha);
+FoliageModelList N(Tree4_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o51);
 
 ShakeTreeConfig N(ShakeTree_Tree4) = {
     .leaves = &N(Tree4_LeafModels),
@@ -139,19 +95,8 @@ BombTrigger N(BombPos_Tree4) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree5_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o54,
-    }
-};
-
-FoliageModelList N(Tree5_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o53,
-    }
-};
+FoliageModelList N(Tree5_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o54);
+FoliageModelList N(Tree5_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o53);
 
 ShakeTreeConfig N(ShakeTree_Tree5) = {
     .leaves = &N(Tree5_LeafModels),
@@ -163,19 +108,8 @@ BombTrigger N(BombPos_Tree5) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree6_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o56,
-    }
-};
-
-FoliageModelList N(Tree6_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o55,
-    }
-};
+FoliageModelList N(Tree6_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o56);
+FoliageModelList N(Tree6_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o55);
 
 ShakeTreeConfig N(ShakeTree_Tree6) = {
     .leaves = &N(Tree6_LeafModels),
@@ -187,19 +121,8 @@ BombTrigger N(BombPos_Tree6) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree7_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o58,
-    }
-};
-
-FoliageModelList N(Tree7_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o57,
-    }
-};
+FoliageModelList N(Tree7_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o58);
+FoliageModelList N(Tree7_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o57);
 
 ShakeTreeConfig N(ShakeTree_Tree7) = {
     .leaves = &N(Tree7_LeafModels),
@@ -211,19 +134,8 @@ BombTrigger N(BombPos_Tree7) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree8_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o60,
-    }
-};
-
-FoliageModelList N(Tree8_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o59,
-    }
-};
+FoliageModelList N(Tree8_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o60);
+FoliageModelList N(Tree8_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o59);
 
 ShakeTreeConfig N(ShakeTree_Tree8) = {
     .leaves = &N(Tree8_LeafModels),
@@ -235,19 +147,8 @@ BombTrigger N(BombPos_Tree8) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree9_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o62,
-    }
-};
-
-FoliageModelList N(Tree9_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o61,
-    }
-};
+FoliageModelList N(Tree9_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o62);
+FoliageModelList N(Tree9_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o61);
 
 FoliageDropList N(Tree9_Drops) = {
     .count = 1,
@@ -272,19 +173,8 @@ BombTrigger N(BombPos_Tree9) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree10_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o64,
-    }
-};
-
-FoliageModelList N(Tree10_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o63,
-    }
-};
+FoliageModelList N(Tree10_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o64);
+FoliageModelList N(Tree10_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o63);
 
 ShakeTreeConfig N(ShakeTree_Tree10) = {
     .leaves = &N(Tree10_LeafModels),
diff --git a/src/world/area_sbk/sbk_66/sbk_66_3_foliage.c b/src/world/area_sbk/sbk_66/sbk_66_3_foliage.c
index d1b353b227..3db3f6b20d 100644
--- a/src/world/area_sbk/sbk_66/sbk_66_3_foliage.c
+++ b/src/world/area_sbk/sbk_66/sbk_66_3_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o62,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o61,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o62);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o61);
 
 ShakeTreeConfig N(ShakeTree_Tree1) = {
     .leaves = &N(Tree1_LeafModels),
@@ -26,19 +15,8 @@ BombTrigger N(BombTrigger_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o58,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o57,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o58);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o57);
 
 ShakeTreeConfig N(ShakeTree_Tree2) = {
     .leaves = &N(Tree2_LeafModels),
@@ -50,19 +28,8 @@ BombTrigger N(BombTrigger_Tree2) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree3_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o56,
-    }
-};
-
-FoliageModelList N(Tree3_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o55,
-    }
-};
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o56);
+FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o55);
 
 FoliageDropList N(Tree3_Drops) = {
     .count = 1,
diff --git a/src/world/common/atomic/tik_DripVolumes.inc.c b/src/world/area_tik/common/DripVolumes.inc.c
similarity index 100%
rename from src/world/common/atomic/tik_DripVolumes.inc.c
rename to src/world/area_tik/common/DripVolumes.inc.c
diff --git a/src/world/common/atomic/tik_Flotsam.inc.c b/src/world/area_tik/common/Flotsam.inc.c
similarity index 100%
rename from src/world/common/atomic/tik_Flotsam.inc.c
rename to src/world/area_tik/common/Flotsam.inc.c
diff --git a/src/world/area_tik/tik_01/tik_01_3_drips.c b/src/world/area_tik/tik_01/tik_01_3_drips.c
index b471901ab8..aef8c320d8 100644
--- a/src/world/area_tik/tik_01/tik_01_3_drips.c
+++ b/src/world/area_tik/tik_01/tik_01_3_drips.c
@@ -1,6 +1,6 @@
 #include "tik_01.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 1,
diff --git a/src/world/area_tik/tik_02/tik_02_4_drips.c b/src/world/area_tik/tik_02/tik_02_4_drips.c
index baac5656ff..f154c40556 100644
--- a/src/world/area_tik/tik_02/tik_02_4_drips.c
+++ b/src/world/area_tik/tik_02/tik_02_4_drips.c
@@ -1,6 +1,6 @@
 #include "tik_02.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 2,
diff --git a/src/world/area_tik/tik_03/tik_03_3_drips.c b/src/world/area_tik/tik_03/tik_03_3_drips.c
index ecdeec91d4..bc4302296d 100644
--- a/src/world/area_tik/tik_03/tik_03_3_drips.c
+++ b/src/world/area_tik/tik_03/tik_03_3_drips.c
@@ -1,6 +1,6 @@
 #include "tik_03.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 2,
diff --git a/src/world/area_tik/tik_04/tik_04_3_drips.c b/src/world/area_tik/tik_04/tik_04_3_drips.c
index 340af81bf8..b05e48bb2f 100644
--- a/src/world/area_tik/tik_04/tik_04_3_drips.c
+++ b/src/world/area_tik/tik_04/tik_04_3_drips.c
@@ -1,6 +1,6 @@
 #include "tik_04.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 2,
diff --git a/src/world/area_tik/tik_05/tik_05_3_drips.c b/src/world/area_tik/tik_05/tik_05_3_drips.c
index 2e50e3212f..2bba01fbc1 100644
--- a/src/world/area_tik/tik_05/tik_05_3_drips.c
+++ b/src/world/area_tik/tik_05/tik_05_3_drips.c
@@ -1,6 +1,6 @@
 #include "tik_05.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 1,
diff --git a/src/world/area_tik/tik_06/tik_06_3_drips.c b/src/world/area_tik/tik_06/tik_06_3_drips.c
index f638d5bfda..7939d33565 100644
--- a/src/world/area_tik/tik_06/tik_06_3_drips.c
+++ b/src/world/area_tik/tik_06/tik_06_3_drips.c
@@ -1,6 +1,6 @@
 #include "tik_06.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 2,
diff --git a/src/world/area_tik/tik_07/tik_07_4_drips.c b/src/world/area_tik/tik_07/tik_07_4_drips.c
index 08e167f8b4..91d73e793a 100644
--- a/src/world/area_tik/tik_07/tik_07_4_drips.c
+++ b/src/world/area_tik/tik_07/tik_07_4_drips.c
@@ -1,6 +1,6 @@
 #include "tik_07.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 3,
diff --git a/src/world/area_tik/tik_08/tik_08_3_drips.c b/src/world/area_tik/tik_08/tik_08_3_drips.c
index 811e971a7d..1d59abd783 100644
--- a/src/world/area_tik/tik_08/tik_08_3_drips.c
+++ b/src/world/area_tik/tik_08/tik_08_3_drips.c
@@ -1,6 +1,6 @@
 #include "tik_08.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 2,
diff --git a/src/world/area_tik/tik_09/tik_09_2_main.c b/src/world/area_tik/tik_09/tik_09_2_main.c
index fdb7e493e7..541845bb49 100644
--- a/src/world/area_tik/tik_09/tik_09_2_main.c
+++ b/src/world/area_tik/tik_09/tik_09_2_main.c
@@ -60,7 +60,7 @@ EvtScript N(EVS_EnterMap) = {
     EVT_END
 };
 
-#include "world/common/atomic/tik_Flotsam.inc.c"
+#include "../common/Flotsam.inc.c"
 
 EvtScript N(EVS_Main) = {
     EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS)
diff --git a/src/world/area_tik/tik_09/tik_09_3_drips.c b/src/world/area_tik/tik_09/tik_09_3_drips.c
index e6843d2f6b..66d45daf93 100644
--- a/src/world/area_tik/tik_09/tik_09_3_drips.c
+++ b/src/world/area_tik/tik_09/tik_09_3_drips.c
@@ -1,6 +1,6 @@
 #include "tik_09.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 1,
diff --git a/src/world/area_tik/tik_09/tik_09_4_entity.c b/src/world/area_tik/tik_09/tik_09_4_entity.c
index 1c9c3da3cb..7e97022583 100644
--- a/src/world/area_tik/tik_09/tik_09_4_entity.c
+++ b/src/world/area_tik/tik_09/tik_09_4_entity.c
@@ -71,4 +71,4 @@ EvtScript N(EVS_MakeEntities) = {
     EVT_END
 };
 
-MAP_RODATA_PAD(1,entity)
+MAP_RODATA_PAD(1,entity);
diff --git a/src/world/area_tik/tik_10/tik_10_3_drips.c b/src/world/area_tik/tik_10/tik_10_3_drips.c
index 69ac57d7aa..cb3adf0523 100644
--- a/src/world/area_tik/tik_10/tik_10_3_drips.c
+++ b/src/world/area_tik/tik_10/tik_10_3_drips.c
@@ -1,6 +1,6 @@
 #include "tik_10.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 2,
diff --git a/src/world/area_tik/tik_12/tik_12_3_drips.c b/src/world/area_tik/tik_12/tik_12_3_drips.c
index d8a6032daa..ba84303132 100644
--- a/src/world/area_tik/tik_12/tik_12_3_drips.c
+++ b/src/world/area_tik/tik_12/tik_12_3_drips.c
@@ -1,6 +1,6 @@
 #include "tik_12.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 1,
diff --git a/src/world/area_tik/tik_12/tik_12_4_entity.c b/src/world/area_tik/tik_12/tik_12_4_entity.c
index 0a1826d132..113c5b51e2 100644
--- a/src/world/area_tik/tik_12/tik_12_4_entity.c
+++ b/src/world/area_tik/tik_12/tik_12_4_entity.c
@@ -22,7 +22,7 @@ EvtScript N(EVS_Chest_ShowGotItem) = {
     EVT_END
 };
 
-MAP_RODATA_PAD(1,unk)
+MAP_RODATA_PAD(1,unk);
 
 // end incomplete Chest include
 
diff --git a/src/world/area_tik/tik_14/tik_14_3_drips.c b/src/world/area_tik/tik_14/tik_14_3_drips.c
index cbba8d5e59..f44534b195 100644
--- a/src/world/area_tik/tik_14/tik_14_3_drips.c
+++ b/src/world/area_tik/tik_14/tik_14_3_drips.c
@@ -1,6 +1,6 @@
 #include "tik_14.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 1,
diff --git a/src/world/area_tik/tik_15/tik_15_4_drips.c b/src/world/area_tik/tik_15/tik_15_4_drips.c
index b7b80aa217..e30c470902 100644
--- a/src/world/area_tik/tik_15/tik_15_4_drips.c
+++ b/src/world/area_tik/tik_15/tik_15_4_drips.c
@@ -1,6 +1,6 @@
 #include "tik_15.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 1,
diff --git a/src/world/area_tik/tik_18/tik_18_3_drips.c b/src/world/area_tik/tik_18/tik_18_3_drips.c
index 7d28c365dc..d6f9e15320 100644
--- a/src/world/area_tik/tik_18/tik_18_3_drips.c
+++ b/src/world/area_tik/tik_18/tik_18_3_drips.c
@@ -1,6 +1,6 @@
 #include "tik_18.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 1,
diff --git a/src/world/area_tik/tik_20/tik_20_2_main.c b/src/world/area_tik/tik_20/tik_20_2_main.c
index 1d58a33e9b..d264538c7a 100644
--- a/src/world/area_tik/tik_20/tik_20_2_main.c
+++ b/src/world/area_tik/tik_20/tik_20_2_main.c
@@ -32,7 +32,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = -1 }
 };
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 2,
@@ -63,9 +63,9 @@ EvtScript N(EVS_SetupDrips) = {
     EVT_END
 };
 
-MAP_RODATA_PAD(1,unk)
+MAP_RODATA_PAD(1,unk);
 
-#include "world/common/atomic/tik_Flotsam.inc.c"
+#include "../common/Flotsam.inc.c"
 
 EvtScript N(EVS_Main) = {
     EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS)
diff --git a/src/world/area_tik/tik_21/tik_21_2_main.c b/src/world/area_tik/tik_21/tik_21_2_main.c
index 7a8544dfe6..c0a53b4ab1 100644
--- a/src/world/area_tik/tik_21/tik_21_2_main.c
+++ b/src/world/area_tik/tik_21/tik_21_2_main.c
@@ -72,7 +72,7 @@ EvtScript N(EVS_EnterMap) = {
     EVT_END
 };
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 2,
diff --git a/src/world/area_tik/tik_22/tik_22_2_main.c b/src/world/area_tik/tik_22/tik_22_2_main.c
index 7e945432e4..3698163340 100644
--- a/src/world/area_tik/tik_22/tik_22_2_main.c
+++ b/src/world/area_tik/tik_22/tik_22_2_main.c
@@ -59,7 +59,7 @@ EvtScript N(EVS_EnterMap) = {
     EVT_END
 };
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 2,
diff --git a/src/world/area_tik/tik_23/tik_23_2_main.c b/src/world/area_tik/tik_23/tik_23_2_main.c
index 451a222ad2..d13b8435c5 100644
--- a/src/world/area_tik/tik_23/tik_23_2_main.c
+++ b/src/world/area_tik/tik_23/tik_23_2_main.c
@@ -24,7 +24,7 @@ EvtScript N(EVS_BindExitTriggers) = {
     EVT_END
 };
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 2,
@@ -55,7 +55,7 @@ EvtScript N(EVS_SetupDrips) = {
     EVT_END
 };
 
-#include "world/common/atomic/tik_Flotsam.inc.c"
+#include "../common/Flotsam.inc.c"
 
 EvtScript N(EVS_Main) = {
     EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS)
diff --git a/src/world/area_tik/tik_24/tik_24_3_drips.c b/src/world/area_tik/tik_24/tik_24_3_drips.c
index a408ae4e1b..c00bf6a861 100644
--- a/src/world/area_tik/tik_24/tik_24_3_drips.c
+++ b/src/world/area_tik/tik_24/tik_24_3_drips.c
@@ -1,6 +1,6 @@
 #include "tik_24.h"
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 1,
diff --git a/src/world/area_tik/tik_25/tik_25_2_main.c b/src/world/area_tik/tik_25/tik_25_2_main.c
index 7f415d1503..cade7c7c4c 100644
--- a/src/world/area_tik/tik_25/tik_25_2_main.c
+++ b/src/world/area_tik/tik_25/tik_25_2_main.c
@@ -11,7 +11,7 @@ EvtScript N(EVS_BindExitTriggers) = {
     EVT_END
 };
 
-#include "world/common/atomic/tik_DripVolumes.inc.c"
+#include "../common/DripVolumes.inc.c"
 
 DripVolumeList N(DripVolumes) = {
     .count = 2,
diff --git a/src/world/area_trd/trd_06/trd_06_1_main.c b/src/world/area_trd/trd_06/trd_06_1_main.c
index 44f1f3ff3d..ac08bac35a 100644
--- a/src/world/area_trd/trd_06/trd_06_1_main.c
+++ b/src/world/area_trd/trd_06/trd_06_1_main.c
@@ -15,7 +15,7 @@ extern EvtScript N(EVS_Scene_ImprisonedKoopaBros);
 EvtScript N(EVS_ExitDoors_trd_04_5) = EVT_EXIT_DOUBLE_DOOR(trd_06_ENTRY_1, "trd_04", trd_04_ENTRY_5,
     COLLIDER_ttw, MODEL_o93, MODEL_o94);
 
-MAP_RODATA_PAD(1,unk) // fixed if map uses subalign 16
+MAP_RODATA_PAD(1,unk); // fixed if map uses subalign 16
 
 EvtScript N(EVS_EnterMap) = {
     EVT_CALL(GetEntryID, LVar0)
diff --git a/src/world/area_tst/tst_04/tst_04_3_reflection.c b/src/world/area_tst/tst_04/tst_04_3_reflection.c
index 259a3fadd5..338a7a7ce0 100644
--- a/src/world/area_tst/tst_04/tst_04_3_reflection.c
+++ b/src/world/area_tst/tst_04/tst_04_3_reflection.c
@@ -57,8 +57,8 @@ void N(appendGfx_test_player_reflection)(void* data) {
     guMtxCatF(main, scale, main);
     guTranslateF(translation, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z);
     guMtxCatF(main, translation, main);
-    spr_update_player_sprite(1, playerStatus->trueAnimation, 1.0f);
-    spr_draw_player_sprite(1, 0, 0, NULL, main);
+    spr_update_player_sprite(PLAYER_SPRITE_AUX1, playerStatus->trueAnimation, 1.0f);
+    spr_draw_player_sprite(PLAYER_SPRITE_AUX1, 0, 0, NULL, main);
 }
 
 API_CALLABLE(N(EnablePartnerReflection)) {
diff --git a/src/world/area_tst/tst_11/tst_11_2_extra.c b/src/world/area_tst/tst_11/tst_11_2_extra.c
index 04fdc415dc..ab5c172801 100644
--- a/src/world/area_tst/tst_11/tst_11_2_extra.c
+++ b/src/world/area_tst/tst_11/tst_11_2_extra.c
@@ -56,8 +56,8 @@ void N(appendGfx_test_reflection_wall)(void* data) {
     guTranslateF(translation, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z);
     guMtxCatF(main, translation, main);
     // draw sprite is handled differently in final version
-    spr_update_player_sprite(1, playerStatus->trueAnimation ^ SPRITE_ID_BACK_FACING, 1.0f);
-    spr_draw_player_sprite(1, 0, 0, NULL, main);
+    spr_update_player_sprite(PLAYER_SPRITE_AUX1, playerStatus->trueAnimation ^ SPRITE_ID_BACK_FACING, 1.0f);
+    spr_draw_player_sprite(PLAYER_SPRITE_AUX1, 0, 0, NULL, main);
 }
 
 API_CALLABLE(N(EnableFloorReflectionTest)) {
@@ -107,7 +107,7 @@ void N(appendGfx_test_reflection_floor)(void* data) {
     guMtxCatF(sp20, spE0, sp20);
     guTranslateF(sp60, playerStatus->position.x, -playerStatus->position.y, playerStatus->position.z);
     guMtxCatF(sp20, sp60, sp20);
-    spr_draw_player_sprite(1, 0, 0, 0, sp20);
+    spr_draw_player_sprite(PLAYER_SPRITE_AUX1, 0, 0, 0, sp20);
     guRotateF(spA0, yaw, 0.0f, -1.0f, 0.0f);
     guRotateF(sp20, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f);
     guMtxCatF(spA0, sp20, sp20);
@@ -121,7 +121,7 @@ void N(appendGfx_test_reflection_floor)(void* data) {
     guMtxCatF(sp20, sp60, sp20);
     trueAnimation = playerStatus->trueAnimation;
     func_802DDFF8(trueAnimation, 7, 255, 255, 255, 20, 0);
-    spr_draw_player_sprite(1, 0, 0, 0, sp20);
+    spr_draw_player_sprite(PLAYER_SPRITE_AUX1, 0, 0, 0, sp20);
     func_802DDFF8(trueAnimation, 0, 0, 0, 0, 0, 0);
 }
 
diff --git a/src/world/common/atomic/LetterChoice.inc.c b/src/world/common/atomic/LetterChoice.inc.c
deleted file mode 100644
index da1b0f1720..0000000000
--- a/src/world/common/atomic/LetterChoice.inc.c
+++ /dev/null
@@ -1,206 +0,0 @@
-#include "common.h"
-
-//TODO this should be static, but causes wierd padding issues in sbk_30
-extern s32 N(LetterDelivery_SavedNpcAnim);
-
-#include "world/common/complete/GiveReward.inc.c"
-
-#include "world/common/complete/KeyItemChoice.inc.c"
-
-API_CALLABLE(N(LetterDelivery_Init)) {
-    Bytecode* args = script->ptrReadPos;
-
-    script->varTable[2] = evt_get_variable(script, *args++);
-    script->varTable[3] = evt_get_variable(script, *args++);
-    script->varTable[4] = evt_get_variable(script, *args++);
-    script->varTable[5] = evt_get_variable(script, *args++);
-    script->varTable[6] = evt_get_variable(script, *args++);
-    script->varTable[7] = evt_get_variable(script, *args++);
-    script->varTable[8] = evt_get_variable(script, *args++);
-    script->varTable[9] = evt_get_variable(script, *args++);
-    script->varTable[10] = evt_get_variable(script, *args++);
-    script->varTable[11] = evt_get_variable(script, *args++);
-    return ApiStatus_DONE2;
-}
-
-API_CALLABLE(N(LetterDelivery_CalcLetterPos)) {
-    Bytecode* args = script->ptrReadPos;
-    s32 varX = *args++;
-    f32 x = evt_get_variable(script, varX);
-    s32 varY = *args++;
-    f32 y = evt_get_variable(script, varY);
-    s32 varZ = *args++;
-    f32 z = evt_get_variable(script, varZ);
-    Npc* partner = get_npc_unsafe(NPC_PARTNER);
-    f32 currentCamYaw = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f);
-
-    add_vec2D_polar(&x, &z, 15.0f, partner->yaw);
-    add_vec2D_polar(&x, &z, 10.0f, currentCamYaw);
-
-    evt_set_variable(script, varX, x);
-    evt_set_variable(script, varY, y);
-    evt_set_variable(script, varZ, z);
-
-    return ApiStatus_DONE2;
-}
-
-API_CALLABLE(N(LetterDelivery_SaveNpcAnim)) {
-    Npc* npc = get_npc_unsafe(script->varTable[2]);
-
-    N(LetterDelivery_SavedNpcAnim) = npc->currentAnim;
-    npc->currentAnim = script->varTable[4];
-    return ApiStatus_DONE2;
-}
-
-API_CALLABLE(N(LetterDelivery_RestoreNpcAnim)) {
-    Npc* npc = get_npc_unsafe(script->varTable[2]);
-
-    npc->currentAnim = N(LetterDelivery_SavedNpcAnim);
-    return ApiStatus_DONE2;
-}
-
-EvtScript N(D_80245450_C7C130) = {
-    EVT_LOOP(0)
-        EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5)
-        EVT_CALL(N(LetterDelivery_CalcLetterPos), LVar3, LVar4, LVar5)
-        EVT_CALL(SetItemPos, LVar0, LVar3, LVar4, LVar5)
-        EVT_WAIT(1)
-    EVT_END_LOOP
-    EVT_RETURN
-    EVT_END
-};
-
-EvtScript N(D_802454D0_C7C1B0) = {
-    EVT_SET(LVar9, LVar1)
-    EVT_CALL(ShowKeyChoicePopup)
-    EVT_SET(LVarA, LVar0)
-    EVT_SWITCH(LVar0)
-        EVT_CASE_EQ(0)
-        EVT_CASE_EQ(-1)
-        EVT_CASE_DEFAULT
-            EVT_CALL(RemoveKeyItemAt, LVar1)
-            EVT_CALL(DisablePartnerAI, 0)
-            EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5)
-            EVT_CALL(N(LetterDelivery_CalcLetterPos), LVar3, LVar4, LVar5)
-            EVT_BITWISE_OR_CONST(LVar0, 0x00050000)
-            EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, ITEM_SPAWN_MODE_DECORATION, 0)
-            EVT_EXEC_GET_TID(N(D_80245450_C7C130), LVarA)
-            EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldParakarry_Walk)
-            EVT_CALL(GetAngleBetweenNPCs, LVar9, NPC_PARTNER, LVarB)
-            EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5)
-            EVT_CALL(GetNpcPos, LVar9, LVar6, LVar7, LVar8)
-            EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE)
-            EVT_IF_LE(LVarB, 180)
-                EVT_ADD(LVar6, 20)
-            EVT_ELSE
-                EVT_ADD(LVar6, -20)
-            EVT_END_IF
-            EVT_ADD(LVar7, 10)
-            EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0))
-            EVT_CALL(NpcJump1, NPC_PARTNER, LVar6, LVar7, LVar8, 20)
-            EVT_KILL_THREAD(LVarA)
-            EVT_CALL(RemoveItemEntity, LVar0)
-            EVT_WAIT(20)
-            EVT_CALL(GetNpcYaw, NPC_PARTNER, LVarA)
-            EVT_ADD(LVarA, 180)
-            EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVarA, 0)
-            EVT_WAIT(5)
-            EVT_CALL(NpcJump1, NPC_PARTNER, LVar3, LVar4, LVar5, 20)
-            EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldParakarry_Idle)
-            EVT_CALL(NpcFaceNpc, NPC_PARTNER, LVar9, 0)
-            EVT_WAIT(5)
-            EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, FALSE)
-            EVT_CALL(EnablePartnerAI)
-            EVT_WAIT(5)
-    EVT_END_SWITCH
-    EVT_CALL(N(ItemChoice_SaveSelected), LVarA)
-    EVT_CALL(CloseChoicePopup)
-    EVT_UNBIND
-    EVT_RETURN
-    EVT_END
-};
-
-EvtScript N(EVS_ShowLetterChoice) = {
-    EVT_SET(LVar0, LVarB)
-    EVT_SET(LVar1, LVar2)
-    EVT_CALL(N(BuildKeyItemChoiceList), LVar0)
-    EVT_BIND_PADLOCK(N(D_802454D0_C7C1B0), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1)
-    EVT_CALL(N(ItemChoice_WaitForSelection), LVar0)
-    EVT_RETURN
-    EVT_END
-};
-
-EvtScript N(EVS_DoLetterDelivery) = {
-    EVT_SET(LVarC, 0)
-    EVT_IF_LT(GB_StoryProgress, STORY_CH2_PARAKARRY_JOINED_PARTY)
-        EVT_RETURN
-    EVT_END_IF
-    EVT_CALL(N(LetterDelivery_SaveNpcAnim))
-    EVT_CALL(GetCurrentPartnerID, LVar0)
-    EVT_CALL(FindKeyItem, LVar5, LVar1)
-    EVT_IF_EQ(LVar0, PARTNER_PARAKARRY)
-        EVT_IF_NE(LVar1, -1)
-            EVT_CALL(DisablePartnerAI, 0)
-            EVT_CALL(PlayerFaceNpc, LVar2, FALSE)
-            EVT_WAIT(1)
-            EVT_CALL(GetNpcPos, LVar2, LVarD, LVar0, LVarE)
-            EVT_CALL(GetNpcPos, NPC_PARTNER, LVarD, LVarE, LVarF)
-            EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0))
-            EVT_ADD(LVar0, 10)
-            EVT_CALL(NpcJump1, NPC_PARTNER, LVarD, LVar0, LVarF, 10)
-            EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, LVar2, LVar7)
-            EVT_CALL(EnablePartnerAI)
-            EVT_EXEC_WAIT(N(EVS_ShowLetterChoice))
-            EVT_SWITCH(LVar0)
-                EVT_CASE_EQ(-1)
-                    EVT_CALL(DisablePartnerAI, 0)
-                    EVT_WAIT(1)
-                    EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, LVar8)
-                    EVT_CALL(EnablePartnerAI)
-                    EVT_SET(LVarC, 1)
-                EVT_CASE_DEFAULT
-                    EVT_CALL(DisablePartnerAI, 0)
-                    EVT_WAIT(1)
-                    EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, LVar9)
-                    EVT_IF_NE(LVarA, 0)
-                        EVT_CALL(SpeakToPlayer, LVar2, LVar3, LVar4, 0, LVarA)
-                    EVT_END_IF
-                    EVT_CALL(EnablePartnerAI)
-                    EVT_IF_NE(LVar6, 0)
-                        EVT_SET(LVar0, LVar6)
-                        EVT_SET(LVar1, ITEM_TYPE_KEY)
-                        EVT_EXEC_WAIT(N(GiveKeyReward))
-                        EVT_CALL(AddKeyItem, LVar6)
-                    EVT_END_IF
-                    EVT_SET(LVarC, 2)
-            EVT_END_SWITCH
-        EVT_END_IF
-    EVT_END_IF
-    EVT_CALL(N(LetterDelivery_RestoreNpcAnim))
-    EVT_RETURN
-    EVT_END
-};
-
-#define EVT_LETTER_PROMPT(npcName, npcID, animTalk, animIdle, msg1, msg2, ms3, msg4, itemID, itemList) \
-    EvtScript N(EVS_##npcName##_LetterDelivery) = { \
-        EVT_CALL(N(LetterDelivery_Init), \
-            npcID, animTalk, animIdle, \
-            itemID, ITEM_NONE, \
-            msg1, msg2, ms3, msg4, \
-            EVT_PTR(itemList)) \
-        EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) \
-        EVT_RETURN \
-        EVT_END \
-    }
-
-#define EVT_LETTER_REWARD(npcName) \
-    EvtScript N(EVS_##npcName##_LetterReward) = { \
-        EVT_IF_EQ(LVarC, 2) \
-            EVT_SET(LVar0, ITEM_STAR_PIECE) \
-            EVT_SET(LVar1, 3) \
-            EVT_EXEC_WAIT(N(GiveKeyReward)) \
-            EVT_CALL(AddStarPieces, 1) \
-        EVT_END_IF \
-        EVT_RETURN \
-        EVT_END \
-    }
diff --git a/src/world/common/atomic/WhaleAnim.inc.c b/src/world/common/atomic/WhaleAnim.inc.c
index 0f6c552a01..862c8272bf 100644
--- a/src/world/common/atomic/WhaleAnim.inc.c
+++ b/src/world/common/atomic/WhaleAnim.inc.c
@@ -54,7 +54,7 @@ void N(unkVtxFunc001)(Vtx* firstVertex, Vtx* copiedVertices, s32 numVertices, s3
     s32 offset;
     
     wagPhase = *wagPhasePtr;
-    switch (get_npc_safe(0)->currentAnim) {
+    switch (get_npc_safe(NPC_Whale)->currentAnim) {
         case ANIM_Kolorado_Still:
         case ANIM_Kolorado_Yell:
         case ANIM_Kolorado_IdleSad:
diff --git a/src/world/common/complete/LetterDelivery.inc.c b/src/world/common/complete/LetterDelivery.inc.c
index 35016960c2..fcc44c0486 100644
--- a/src/world/common/complete/LetterDelivery.inc.c
+++ b/src/world/common/complete/LetterDelivery.inc.c
@@ -2,10 +2,9 @@
 #include "sprite/npc/WorldParakarry.h"
 
 #include "world/common/complete/GiveReward.inc.c"
-
 #include "world/common/complete/KeyItemChoice.inc.c"
 
-static s32 N(LetterDelivery_SavedNpcAnim);
+BSS s32 N(LetterDelivery_SavedNpcAnim);
 
 API_CALLABLE(N(LetterDelivery_Init)) {
     Bytecode* args = script->ptrReadPos;
@@ -59,7 +58,7 @@ API_CALLABLE(N(LetterDelivery_RestoreNpcAnim)) {
     return ApiStatus_DONE2;
 }
 
-EvtScript N(D_80245450_C7C130) = {
+EvtScript N(EVS_LetterDelivery_CarryLetter) = {
     EVT_LOOP(0)
         EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5)
         EVT_CALL(N(LetterDelivery_CalcLetterPos), LVar3, LVar4, LVar5)
@@ -70,7 +69,7 @@ EvtScript N(D_80245450_C7C130) = {
     EVT_END
 };
 
-EvtScript N(D_802454D0_C7C1B0) = {
+EvtScript N(EVS_LetterDelivery_ItemPrompt) = {
     EVT_SET(LVar9, LVar1)
     EVT_CALL(ShowKeyChoicePopup)
     EVT_SET(LVarA, LVar0)
@@ -82,9 +81,9 @@ EvtScript N(D_802454D0_C7C1B0) = {
             EVT_CALL(DisablePartnerAI, 0)
             EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5)
             EVT_CALL(N(LetterDelivery_CalcLetterPos), LVar3, LVar4, LVar5)
-            EVT_BITWISE_OR_CONST(LVar0, 0x00050000)
+            EVT_BITWISE_OR_CONST(LVar0, VIS_GROUP_5 << 16)
             EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, ITEM_SPAWN_MODE_DECORATION, 0)
-            EVT_EXEC_GET_TID(N(D_80245450_C7C130), LVarA)
+            EVT_EXEC_GET_TID(N(EVS_LetterDelivery_CarryLetter), LVarA)
             EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldParakarry_Walk)
             EVT_CALL(GetAngleBetweenNPCs, LVar9, NPC_PARTNER, LVarB)
             EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5)
@@ -124,7 +123,7 @@ EvtScript N(EVS_ShowLetterChoice) = {
     EVT_SET(LVar0, LVarB)
     EVT_SET(LVar1, LVar2)
     EVT_CALL(N(BuildKeyItemChoiceList), LVar0)
-    EVT_BIND_PADLOCK(N(D_802454D0_C7C1B0), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1)
+    EVT_BIND_PADLOCK(N(EVS_LetterDelivery_ItemPrompt), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1)
     EVT_CALL(N(ItemChoice_WaitForSelection), LVar0)
     EVT_RETURN
     EVT_END
diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c
index a4399305ca..eba2f9c4cd 100644
--- a/src/world/common/complete/Quizmo.inc.c
+++ b/src/world/common/complete/Quizmo.inc.c
@@ -41,10 +41,10 @@ extern s16 MessageSingular;
 BSS s32 N(Quizmo_Worker);
 // needed for kmr_02
 #ifndef QUIZMO_PRE_STATIC_PAD
-MAP_STATIC_PAD(1,quizmo_pre_array)
+MAP_STATIC_PAD(1,quizmo_pre_array);
 #endif
 BSS s32 N(Quizmo_ScriptArray)[5];
-MAP_STATIC_PAD(1,quizmo_post_array)
+MAP_STATIC_PAD(1,quizmo_post_array);
 BSS EffectInstance* N(Quizmo_StageEffect);
 BSS EffectInstance* N(Quizmo_AudienceEffect);
 BSS EffectInstance* N(Quizmo_VannaTEffect);
diff --git a/src/world/common/todo/UnkFunc001.inc.c b/src/world/common/enemy/ai/SwooperAI.inc.c
similarity index 98%
rename from src/world/common/todo/UnkFunc001.inc.c
rename to src/world/common/enemy/ai/SwooperAI.inc.c
index 1772911406..4bd24967a4 100644
--- a/src/world/common/todo/UnkFunc001.inc.c
+++ b/src/world/common/enemy/ai/SwooperAI.inc.c
@@ -1,7 +1,7 @@
 #include "common.h"
 #include "npc.h"
 
-ApiStatus N(UnkFunc001)(Evt* script, s32 isInitialCall) {
+API_CALLABLE(N(SwooperAI_Main)) {
     EnemyDetectVolume detectVolume;
     PlayerStatus* playerStatus = &gPlayerStatus;
     EnemyDetectVolume* detectVolumePtr = &detectVolume;
@@ -53,7 +53,7 @@ ApiStatus N(UnkFunc001)(Evt* script, s32 isInitialCall) {
                 if (script->functionTemp[1] <= 0) {
                     script->functionTemp[1] = aiSettings->playerSearchInterval;
                     if (basic_ai_check_player_dist(detectVolumePtr, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0) != 0) {
-                        ai_enemy_play_sound(npc, SOUND_2F4, 0x200000);
+                        ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET);
                         script->functionTemp[0] = 10;
                     }
                 }
diff --git a/src/world/common/enemy/complete/Duplighost.h b/src/world/common/enemy/complete/Duplighost.h
new file mode 100644
index 0000000000..149b3a3fc4
--- /dev/null
+++ b/src/world/common/enemy/complete/Duplighost.h
@@ -0,0 +1,35 @@
+#include "common.h"
+#include "sprite/npc/Duplighost.h"
+
+#define DUPLIGHOST_DROPS \
+{ \
+    .dropFlags = NPC_DROP_FLAG_80, \
+    .itemDropChance = 5, \
+    .itemDrops = { \
+        { ITEM_MYSTERY, 10, 0 }, \
+    }, \
+    .heartDrops  = STANDARD_HEART_DROPS(2), \
+    .flowerDrops = STANDARD_FLOWER_DROPS(3), \
+    .minCoinBonus = 0, \
+    .maxCoinBonus = 2, \
+}
+
+#define DUPLIGHOST_ANIMS \
+{ \
+    .idle   = ANIM_Duplighost_Anim02, \
+    .walk   = ANIM_Duplighost_Anim03, \
+    .run    = ANIM_Duplighost_Anim04, \
+    .chase  = ANIM_Duplighost_Anim04, \
+    .anim_4 = ANIM_Duplighost_Anim02, \
+    .anim_5 = ANIM_Duplighost_Anim02, \
+    .death  = ANIM_Duplighost_Anim0A, \
+    .hit    = ANIM_Duplighost_Anim0A, \
+    .anim_8 = ANIM_Duplighost_Anim02, \
+    .anim_9 = ANIM_Duplighost_Anim02, \
+    .anim_A = ANIM_Duplighost_Anim02, \
+    .anim_B = ANIM_Duplighost_Anim02, \
+    .anim_C = ANIM_Duplighost_Anim02, \
+    .anim_D = ANIM_Duplighost_Anim02, \
+    .anim_E = ANIM_Duplighost_Anim02, \
+    .anim_F = ANIM_Duplighost_Anim02, \
+}
diff --git a/src/world/common/enemy/complete/Duplighost_Wander.inc.c b/src/world/common/enemy/complete/Duplighost_Wander.inc.c
new file mode 100644
index 0000000000..1870694cc2
--- /dev/null
+++ b/src/world/common/enemy/complete/Duplighost_Wander.inc.c
@@ -0,0 +1,29 @@
+#include "Duplighost.h"
+
+MobileAISettings N(AISettings_Duplighost_Wander) = {
+    .moveSpeed = 2.0f,
+    .moveTime = 60,
+    .waitTime = 15,
+    .alertRadius = 100.0f,
+    .playerSearchInterval = 4,
+    .chaseSpeed = 3.5f,
+    .chaseTurnRate = 30,
+    .chaseUpdateInterval = 3,
+    .chaseRadius = 150.0f,
+    .unk_AI_2C = 1,
+};
+
+EvtScript N(EVS_NpcAI_Duplighost_Wander) = {
+    EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_Duplighost_Wander)))
+    EVT_RETURN
+    EVT_END
+};
+
+NpcSettings N(NpcSettings_Duplighost_Wander) = {
+    .height = 30,
+    .radius = 30,
+    .level = 23,
+    .ai = &N(EVS_NpcAI_Duplighost_Wander),
+    .onHit = &EnemyNpcHit,
+    .onDefeat = &EnemyNpcDefeat,
+};
diff --git a/src/world/common/enemy/complete/FrostClubba.h b/src/world/common/enemy/complete/FrostClubba.h
new file mode 100644
index 0000000000..b8820e6078
--- /dev/null
+++ b/src/world/common/enemy/complete/FrostClubba.h
@@ -0,0 +1,47 @@
+#include "common.h"
+#include "sprite/npc/WorldClubba.h"
+
+#define FROST_CLUBBA_DROPS \
+{ \
+    .dropFlags = NPC_DROP_FLAG_80, \
+    .itemDropChance = 5, \
+    .itemDrops = { \
+        { ITEM_SUPER_SHROOM, 10, 0 }, \
+    }, \
+    .heartDrops  = STANDARD_HEART_DROPS(2), \
+    .flowerDrops = STANDARD_FLOWER_DROPS(2), \
+    .minCoinBonus = 0, \
+    .maxCoinBonus = 3, \
+}
+
+#define FROST_CLUBBA_ANIMS \
+{ \
+    .idle   = ANIM_WorldClubba_Frost_Anim02, \
+    .walk   = ANIM_WorldClubba_Frost_Anim03, \
+    .run    = ANIM_WorldClubba_Frost_Anim04, \
+    .chase  = ANIM_WorldClubba_Frost_Anim04, \
+    .anim_4 = ANIM_WorldClubba_Frost_Anim02, \
+    .anim_5 = ANIM_WorldClubba_Frost_Anim02, \
+    .death  = ANIM_WorldClubba_Frost_Anim0C, \
+    .hit    = ANIM_WorldClubba_Frost_Anim0C, \
+    .anim_8 = ANIM_WorldClubba_Frost_Anim11, \
+    .anim_9 = ANIM_WorldClubba_Frost_Anim12, \
+    .anim_A = ANIM_WorldClubba_Frost_Anim07, \
+    .anim_B = ANIM_WorldClubba_Frost_Anim08, \
+    .anim_C = ANIM_WorldClubba_Frost_Anim02, \
+    .anim_D = ANIM_WorldClubba_Frost_Anim02, \
+    .anim_E = ANIM_WorldClubba_Frost_Anim02, \
+    .anim_F = ANIM_WorldClubba_Frost_Anim02, \
+}
+
+#define FROST_CLUBBA_MACE_HITBOX(npcID) \
+{ \
+    .id = npcID, \
+    .settings = &N(NpcSettings_FrostClubba_Hitbox), \
+    .pos = { NPC_DISPOSE_LOCATION }, \
+    .yaw = 0, \
+    .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_800000, \
+    .drops = NPC_NO_DROPS, \
+    .animations = FROST_CLUBBA_ANIMS, \
+    .extraAnimations = N(ExtraAnims_FrostClubba_Hitbox), \
+}
diff --git a/src/world/common/enemy/complete/FrostClubba_Wander.inc.c b/src/world/common/enemy/complete/FrostClubba_Wander.inc.c
new file mode 100644
index 0000000000..710d802ed4
--- /dev/null
+++ b/src/world/common/enemy/complete/FrostClubba_Wander.inc.c
@@ -0,0 +1,93 @@
+#include "FrostClubba.h"
+
+#include "world/common/enemy/ai/WanderMeleeAI.inc.c"
+
+EvtScript N(EVS_NpcDefeat_FrostClubba) = {
+    EVT_CALL(GetBattleOutcome, LVar0)
+    EVT_SWITCH(LVar0)
+        EVT_CASE_EQ(OUTCOME_PLAYER_WON)
+            EVT_CALL(RemoveNpc, NPC_SELF)
+        EVT_CASE_EQ(OUTCOME_PLAYER_FLED)
+            EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION)
+            EVT_CALL(OnPlayerFled, 1)
+        EVT_CASE_EQ(OUTCOME_ENEMY_FLED)
+            EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1)
+            EVT_CALL(RemoveNpc, NPC_SELF)
+    EVT_END_SWITCH
+    EVT_RETURN
+    EVT_END
+};
+
+s32 N(ExtraAnims_FrostClubba)[] = {
+    ANIM_WorldClubba_Anim00,
+    ANIM_WorldClubba_Anim02,
+    ANIM_WorldClubba_Anim03,
+    ANIM_WorldClubba_Anim04,
+    ANIM_WorldClubba_Anim0C,
+    ANIM_WorldClubba_Anim07,
+    ANIM_WorldClubba_Anim08,
+    ANIM_WorldClubba_Anim11,
+    ANIM_WorldClubba_Anim12,
+    -1
+};
+
+s32 N(ExtraAnims_FrostClubba_Hitbox)[] = {
+    ANIM_WorldClubba_Anim00,
+    -1
+};
+
+MobileAISettings N(AISettings_FrostClubba_Wander) = {
+    .moveSpeed = 1.5f,
+    .moveTime = 120,
+    .waitTime = 30,
+    .alertRadius = 100.0f,
+    .alertOffsetDist = 40.0f,
+    .playerSearchInterval = 7,
+    .chaseSpeed = 3.8f,
+    .chaseTurnRate = 90,
+    .chaseUpdateInterval = 15,
+    .chaseRadius = 200.0f,
+    .chaseOffsetDist = 160.0f,
+    .unk_AI_2C = 1,
+};
+
+EvtScript N(EVS_NpcAI_FrostClubba_Wander) = {
+    EVT_CALL(SetSelfVar, 0, 0)
+    EVT_CALL(SetSelfVar, 1, 3)
+    EVT_CALL(SetSelfVar, 2, 7)
+    EVT_CALL(SetSelfVar, 3, 6)
+    EVT_CALL(N(WanderMeleeAI_Main), EVT_PTR(N(AISettings_FrostClubba_Wander)))
+    EVT_RETURN
+    EVT_END
+};
+
+NpcSettings N(NpcSettings_FrostClubba_Wander) = {
+    .height = 36,
+    .radius = 34,
+    .level = 23,
+    .ai = &N(EVS_NpcAI_FrostClubba_Wander),
+    .onHit = &EnemyNpcHit,
+    .onDefeat = &EnemyNpcDefeat,
+};
+
+EvtScript N(EVS_NpcAI_FrostClubba_Hitbox) = {
+    EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE)
+    EVT_CALL(SetSelfVar, 0, 4)
+    EVT_CALL(SetSelfVar, 1, 32)
+    EVT_CALL(SetSelfVar, 2, 48)
+    EVT_CALL(SetSelfVar, 3, 30)
+    EVT_CALL(SetSelfVar, 4, 3)
+    EVT_CALL(SetSelfVar, 15, SOUND_20C5)
+    EVT_CALL(N(MeleeHitbox_Main))
+    EVT_RETURN
+    EVT_END
+};
+
+NpcSettings N(NpcSettings_FrostClubba_Hitbox) = {
+    .height = 14,
+    .radius = 16,
+    .level = 23,
+    .ai = &N(EVS_NpcAI_FrostClubba_Hitbox),
+    .onDefeat = &N(EVS_NpcDefeat_FrostClubba),
+    .actionFlags = AI_ACTION_08,
+};
diff --git a/src/world/common/enemy/complete/StoneChomp.inc.c b/src/world/common/enemy/complete/StoneChomp.inc.c
index 017db2c606..cb40b49002 100644
--- a/src/world/common/enemy/complete/StoneChomp.inc.c
+++ b/src/world/common/enemy/complete/StoneChomp.inc.c
@@ -2,7 +2,126 @@
 #include "StoneChomp.h"
 
 #include "world/common/enemy/ai/StoneChompAI.inc.c"
-#include "world/area_isk/StoneChompFX.inc.c"
+
+API_CALLABLE(N(StoneChompFXA)) {
+    NpcBlueprint bp;
+    NpcBlueprint* bpPtr = &bp;
+    NpcChompBlur* blurData;
+    Npc* npc;
+    Npc* newNpc;
+    s32 i;
+
+    npc = get_npc_safe(script->owner2.npcID);
+    blurData = heap_malloc(8 * sizeof(*blurData));
+    npc->blur.chomp = blurData;
+
+    bp.flags = NPC_FLAG_8000 | NPC_FLAG_100 | NPC_FLAG_40
+        | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_2;
+    bp.initialAnim = ANIM_StoneChomp_Anim02;
+    bp.onUpdate = NULL;
+    bp.onRender = NULL;
+
+    for (i = 0; i < 8; i++, blurData++) {
+        blurData->npc = newNpc = get_npc_by_index(_create_npc_basic(bpPtr));
+        newNpc->pos.x = npc->pos.x;
+        newNpc->pos.y = npc->pos.y;
+        newNpc->pos.z = npc->pos.z;
+        newNpc->yaw = npc->yaw;
+        newNpc->verticalRenderOffset = 3;
+        disable_npc_shadow(newNpc);
+        blurData->offset.x = 0.0f;
+        blurData->offset.y = 0.0f;
+        blurData->offset.z = 0.0f;
+    }
+    return ApiStatus_DONE2;
+}
+
+API_CALLABLE(N(StoneChompFXB)) {
+    NpcChompBlur* blurData;
+    Npc* ownerNpc;
+    Npc* childNpc;
+    f32 posX, posY, posZ;
+    f32 nextX, nextY, nextZ;
+    f32 invDist;
+    f32 floorY;
+    s32 i;
+
+    floorY = (f32) script->owner1.enemy->varTable[0];
+    ownerNpc = get_npc_safe(script->owner2.npcID);
+    blurData = ownerNpc->blur.chomp;
+    posX = ownerNpc->pos.x;
+    posY = ownerNpc->pos.y + (ownerNpc->collisionHeight * 0.2f);
+    posZ = ownerNpc->pos.z;
+    add_vec2D_polar(&posX, &posZ, ownerNpc->collisionRadius * 0.3f, clamp_angle(ownerNpc->renderYaw + 180.0f));
+    
+    if (ownerNpc->flags & NPC_FLAG_2) {
+        for (i = 0; i < 8; i++, blurData++) {
+            childNpc = blurData->npc;
+            childNpc->pos.x = posX;
+            childNpc->pos.y = posY;
+            childNpc->pos.z = posZ;
+        }
+        return ApiStatus_BLOCK;
+    }
+    
+    for (i = 0; i < 8; i++, blurData++) {
+        childNpc = blurData->npc;
+        if (dist3D(childNpc->pos.x, childNpc->pos.y, childNpc->pos.z, posX, posY, posZ) >= 10.0) {
+            invDist = 10.0 / dist3D(
+                ((childNpc->pos.x - posX) * 0.8f) + posX, childNpc->pos.y, ((childNpc->pos.z - posZ) * 0.8f) + posZ,
+                posX, posY,posZ);
+
+            nextX = posX = ((childNpc->pos.x - posX) * 0.8f * invDist) + posX;
+            nextY = posY = ((childNpc->pos.y - posY) * invDist) + posY;
+            nextZ = posZ = ((childNpc->pos.z - posZ) * 0.8f * invDist) + posZ;
+
+            blurData->offset.x = (nextX - childNpc->pos.x) * 0.7f;
+            blurData->offset.y = (nextY - childNpc->pos.y) * 0.7f;
+            blurData->offset.z = (nextZ - childNpc->pos.z) * 0.7f;
+            
+            childNpc->pos.x = nextX;
+            childNpc->pos.y = nextY;
+            childNpc->pos.z = nextZ;
+            
+            if (blurData->offset.y > 10.0f) {
+                blurData->offset.y = 10.0f;
+            }
+        } else {
+            blurData->offset.x = blurData->offset.x * 0.9f;
+            blurData->offset.z = blurData->offset.z * 0.9f;
+            childNpc->pos.x += blurData->offset.x;
+            childNpc->pos.z += blurData->offset.z;
+        }
+        
+        blurData->offset.y -= 1.0f;
+        if (blurData->offset.y < -10.0f) {
+            blurData->offset.y = -10.0f;
+        }
+        childNpc->pos.y += blurData->offset.y;
+        if (childNpc->pos.y <= floorY) {
+            childNpc->pos.y = floorY;
+            blurData->offset.y = -blurData->offset.y * 0.5;
+        }
+
+        posX = childNpc->pos.x;
+        posY = childNpc->pos.y;
+        posZ = childNpc->pos.z;
+        childNpc->flags = ownerNpc->flags;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+API_CALLABLE(N(StoneChompFXC)) {
+    NpcChompBlur* blurData = get_npc_safe(script->owner2.npcID)->blur.chomp;
+    s32 i;
+    
+    for (i = 0; i < 8; i++, blurData++) {
+        free_npc(blurData->npc);
+    }
+
+    return ApiStatus_DONE2;
+}
 
 EvtScript N(EVS_NpcAuxAI_StoneChomp) = {
     EVT_CALL(N(StoneChompFXA))
diff --git a/src/world/common/enemy/complete/Swooper.h b/src/world/common/enemy/complete/Swooper.h
new file mode 100644
index 0000000000..822603cce7
--- /dev/null
+++ b/src/world/common/enemy/complete/Swooper.h
@@ -0,0 +1,35 @@
+#include "common.h"
+#include "sprite/npc/Swooper.h"
+
+#define SWOOPULA_DROPS \
+{ \
+    .dropFlags = NPC_DROP_FLAG_80, \
+    .itemDropChance = 5, \
+    .itemDrops = { \
+        { ITEM_VOLT_SHROOM, 10, 0 }, \
+    }, \
+    .heartDrops  = STANDARD_HEART_DROPS(2), \
+    .flowerDrops = STANDARD_FLOWER_DROPS(2), \
+    .minCoinBonus = 0, \
+    .maxCoinBonus = 4, \
+}
+
+#define SWOOPULA_ANIMS \
+{ \
+    .idle   = ANIM_Swooper_Gray_Anim1B, \
+    .walk   = ANIM_Swooper_Gray_Anim02, \
+    .run    = ANIM_Swooper_Gray_Anim02, \
+    .chase  = ANIM_Swooper_Gray_Anim02, \
+    .anim_4 = ANIM_Swooper_Gray_Anim1B, \
+    .anim_5 = ANIM_Swooper_Gray_Anim1B, \
+    .death  = ANIM_Swooper_Gray_Anim04, \
+    .hit    = ANIM_Swooper_Gray_Anim15, \
+    .anim_8 = ANIM_Swooper_Gray_Anim00, \
+    .anim_9 = ANIM_Swooper_Gray_Anim00, \
+    .anim_A = ANIM_Swooper_Gray_Anim01, \
+    .anim_B = ANIM_Swooper_Gray_Anim01, \
+    .anim_C = ANIM_Swooper_Gray_Anim01, \
+    .anim_D = ANIM_Swooper_Gray_Anim01, \
+    .anim_E = ANIM_Swooper_Gray_Anim01, \
+    .anim_F = ANIM_Swooper_Gray_Anim01, \
+}
diff --git a/src/world/common/enemy/complete/Swooper.inc.c b/src/world/common/enemy/complete/Swooper.inc.c
new file mode 100644
index 0000000000..c9dc936bef
--- /dev/null
+++ b/src/world/common/enemy/complete/Swooper.inc.c
@@ -0,0 +1,61 @@
+#include "Swooper.h"
+
+#include "world/common/enemy/ai/SwooperAI.inc.c"
+
+MobileAISettings N(AISettings_Swooper) = {
+    .moveSpeed = 1.6f,
+    .moveTime = 60,
+    .waitTime = 30,
+    .alertRadius = 80.0f,
+    .playerSearchInterval = 5,
+    .chaseSpeed = 2.2f,
+    .chaseTurnRate = 60,
+    .chaseUpdateInterval = 15,
+    .chaseRadius = 100.0f,
+    .unk_AI_2C = 1,
+};
+
+EvtScript N(EVS_NpcAI_Swooper) = {
+    EVT_CALL(N(SwooperAI_Main), EVT_PTR(N(AISettings_Swooper)))
+    EVT_RETURN
+    EVT_END
+};
+
+MobileAISettings N(AISettings_Swoopula) = {
+    .moveSpeed = 1.6f,
+    .moveTime = 60,
+    .waitTime = 30,
+    .alertRadius = 80.0f,
+    .playerSearchInterval = 5,
+    .chaseSpeed = 2.2f,
+    .chaseTurnRate = 60,
+    .chaseUpdateInterval = 15,
+    .chaseRadius = 100.0f,
+    .unk_AI_2C = 1,
+};
+
+EvtScript N(EVS_NpcAI_Swoopula) = {
+    EVT_CALL(N(SwooperAI_Main), EVT_PTR(N(AISettings_Swoopula)))
+    EVT_RETURN
+    EVT_END
+};
+
+NpcSettings N(NpcSettings_Swooper) = {
+    .height = 20,
+    .radius = 20,
+    .level = 10,
+    .ai = &N(EVS_NpcAI_Swooper),
+    .onHit = &EnemyNpcHit,
+    .onDefeat = &EnemyNpcDefeat,
+    .flags = ENEMY_FLAG_800,
+};
+
+NpcSettings N(NpcSettings_Swoopula) = {
+    .height = 20,
+    .radius = 20,
+    .level = 22,
+    .ai = &N(EVS_NpcAI_Swoopula),
+    .onHit = &EnemyNpcHit,
+    .onDefeat = &EnemyNpcDefeat,
+    .flags = ENEMY_FLAG_800,
+};
diff --git a/src/world/common/entity/PipeData.inc.c b/src/world/common/entity/PipeData.inc.c
deleted file mode 100644
index a4a7d244b2..0000000000
--- a/src/world/common/entity/PipeData.inc.c
+++ /dev/null
@@ -1,239 +0,0 @@
-#include "common.h"
-#include "Pipe.inc.h"
-
-EvtScript N(Pipe_EnterVertical) = {
-    EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_CALL(DisablePlayerPhysics, TRUE)
-    EVT_CALL(DisablePartnerAI, 0)
-    EVT_CALL(HidePlayerShadow, TRUE)
-    EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill)
-    EVT_CALL(GetCurrentPartnerID, LVar0)
-    EVT_IF_NE(LVar0, PARTNER_NONE)
-        EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE)
-        EVT_CALL(SetNpcPos, NPC_PARTNER, 0, -1000, 0)
-    EVT_END_IF
-    EVT_CALL(GetEntryID, LVar0)
-    EVT_CALL(N(Pipe_GetEntryPos))
-    EVT_SUB(LVar2, 40)
-    EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3)
-    EVT_CALL(InterpPlayerYaw, LVar4, 0)
-    EVT_CALL(PlaySound, SOUND_ENTER_PIPE)
-    EVT_CALL(func_802D286C, 0x100)
-    EVT_CALL(func_802D2520, ANIM_Mario_StandStill, 5, 2, 1, 1, 0)
-    EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
-    EVT_LOOP(40)
-        EVT_ADD(LVar1, 1)
-        EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
-        EVT_WAIT(1)
-    EVT_END_LOOP
-    EVT_WAIT(3)
-    EVT_CALL(GetCurrentPartnerID, LVar0)
-    EVT_IF_NE(LVar0, 0)
-        EVT_THREAD
-            EVT_CALL(DisablePartnerAI, 0)
-            EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
-            EVT_SUB(LVar2, 3)
-            EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2)
-            EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_2)), FALSE)
-            EVT_CALL(EnablePartnerAI)
-            EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE)
-        EVT_END_THREAD
-    EVT_END_IF
-    EVT_WAIT(2)
-    EVT_CALL(func_802D2520, ANIM_Mario_StandStill, 0, 0, 0, 0, 0)
-    EVT_WAIT(1)
-    EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002)
-    EVT_CALL(DisablePlayerPhysics, FALSE)
-    EVT_CALL(DisablePlayerInput, FALSE)
-    EVT_CALL(HidePlayerShadow, FALSE)
-    EVT_LABEL(0)
-    EVT_CALL(N(Pipe_GetCurrentFloor))
-    EVT_WAIT(1)
-    EVT_IF_NE(LVar0, -1)
-        EVT_GOTO(0)
-    EVT_END_IF
-    EVT_EXEC(LVarA)
-    EVT_RETURN
-    EVT_END
-};
-
-EvtScript N(Pipe_EnterHorizontal) = {
-    EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_CALL(DisablePlayerPhysics, TRUE)
-    EVT_CALL(HidePlayerShadow, TRUE)
-    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, 0x7FFFFE00)
-    EVT_CALL(GetEntryID, LVar0)
-    EVT_CALL(N(Pipe_GetEntryPos))
-    EVT_SET(LVar5, LVar1)
-    EVT_SET(LVar6, LVar2)
-    EVT_SET(LVar7, LVar3)
-    EVT_ADD(LVar2, 2)
-    EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3)
-    EVT_CALL(InterpPlayerYaw, LVar4, 0)
-    EVT_IF_EQ(LVar4, 90)
-        EVT_ADD(LVar5, 40)
-    EVT_ELSE
-        EVT_SUB(LVar5, 40)
-    EVT_END_IF
-    EVT_CALL(UseSettingsFrom, 0, LVar5, LVar6, LVar7)
-    EVT_CALL(SetPanTarget, 0, LVar5, LVar6, LVar7)
-    EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(90.0))
-    EVT_CALL(PanToTarget, 0, 0, 1)
-    EVT_CALL(GetCurrentPartnerID, LVar0)
-    EVT_IF_NE(LVar0, PARTNER_NONE)
-        EVT_CALL(DisablePartnerAI, 0)
-        EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE)
-        EVT_CALL(SetNpcPos, NPC_PARTNER, 0, -1000, 0)
-        EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVar0, 0)
-    EVT_END_IF
-    EVT_WAIT(1)
-    EVT_CALL(PlaySound, SOUND_ENTER_PIPE)
-    EVT_THREAD
-        EVT_WAIT(25)
-        EVT_CALL(HidePlayerShadow, FALSE)
-    EVT_END_THREAD
-    EVT_CALL(func_802D286C, 0x900)
-    EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 3, 1, 1, 0)
-    EVT_LOOP(40)
-        EVT_CALL(N(Pipe_GetPointAheadOfPlayer), EVT_FLOAT(1.0))
-        EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
-        EVT_WAIT(1)
-    EVT_END_LOOP
-    EVT_CALL(GetCurrentPartnerID, LVar0)
-    EVT_IF_NE(LVar0, PARTNER_NONE)
-        EVT_THREAD
-            EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
-            EVT_SUB(LVar2, 3)
-            EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2)
-            EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE)
-            EVT_CALL(EnablePartnerAI)
-        EVT_END_THREAD
-    EVT_END_IF
-    EVT_WAIT(5)
-    EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0)
-    EVT_CALL(ModifyColliderFlags, 1, LVarB, 0x7FFFFE00)
-    EVT_CALL(DisablePlayerInput, FALSE)
-    EVT_CALL(DisablePlayerPhysics, FALSE)
-    EVT_CALL(PanToTarget, 0, 0, 0)
-    EVT_EXEC(LVarA)
-    EVT_RETURN
-    EVT_END
-};
-
-EvtScript N(Pipe_ExitVertical) = {
-    EVT_CALL(N(Pipe_AwaitDownInput))
-    EVT_IF_EQ(LVar0, 0)
-        EVT_RETURN
-    EVT_END_IF
-    EVT_CALL(GetPartnerInUse, LVar0)
-    EVT_IF_NE(LVar0, 0)
-        EVT_CALL(GetCurrentPartnerID, LVar1)
-        EVT_IF_NE(LVar1, PARTNER_WATT)
-            EVT_RETURN
-        EVT_ELSE
-            EVT_CALL(InterruptUsePartner)
-            EVT_CALL(DisablePlayerInput, TRUE)
-        EVT_END_IF
-    EVT_ELSE
-        EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_END_IF
-    EVT_EXEC_WAIT(N(Pipe_ScriptD))
-    EVT_RETURN
-    EVT_END
-};
-
-EvtScript N(Pipe_ScriptD) = {
-    EVT_CALL(N(Pipe_SetAnimFlag))
-    EVT_SET_GROUP(EVT_GROUP_1B)
-    EVT_CALL(DisablePlayerPhysics, TRUE)
-    EVT_CALL(HidePlayerShadow, TRUE)
-    EVT_SET(LVar0, LVarA)
-    EVT_CALL(N(Pipe_GetEntryPos))
-    EVT_CALL(PlayerMoveTo, LVar1, LVar3, 3)
-    EVT_SET(LVar0, LVarA)
-    EVT_CALL(N(Pipe_GetEntryPos))
-    EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3)
-    EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE)
-    EVT_CALL(N(Pipe_GetCameraYaw))
-    EVT_CALL(InterpPlayerYaw, LVar0, 0)
-    EVT_WAIT(2)
-    EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE)
-    EVT_CALL(PlaySound, SOUND_ENTER_PIPE)
-    EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
-    EVT_THREAD
-        EVT_WAIT(4)
-        EVT_LOOP(40)
-            EVT_SUB(LVar1, 1)
-            EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
-            EVT_WAIT(1)
-        EVT_END_LOOP
-    EVT_END_THREAD
-    EVT_CALL(func_802D286C, 0x800)
-    EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 2, 1, 1, 0)
-    EVT_WAIT(25)
-    EVT_EXEC_WAIT(LVarC)
-    EVT_RETURN
-    EVT_END
-};
-
-EvtScript N(Pipe_ExitHorizontal) = {
-    EVT_CALL(IsPlayerOnValidFloor, LVar0)
-    EVT_IF_EQ(LVar0, 0)
-        EVT_RETURN
-    EVT_END_IF
-    EVT_CALL(GetPlayerActionState, LVar0)
-    EVT_IF_EQ(LVar0, ACTION_STATE_SPIN)
-        EVT_RETURN
-    EVT_END_IF
-    EVT_CALL(GetPartnerInUse, LVar0)
-    EVT_IF_NE(LVar0, 0)
-        EVT_CALL(GetCurrentPartnerID, LVar1)
-        EVT_IF_NE(LVar1, PARTNER_WATT)
-            EVT_RETURN
-        EVT_ELSE
-            EVT_CALL(InterruptUsePartner)
-            EVT_CALL(DisablePlayerInput, TRUE)
-        EVT_END_IF
-    EVT_ELSE
-        EVT_CALL(DisablePlayerInput, TRUE)
-    EVT_END_IF
-    EVT_SET_GROUP(EVT_GROUP_1B)
-    EVT_CALL(N(Pipe_SetAnimFlag))
-    EVT_CALL(DisablePlayerPhysics, TRUE)
-    EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, 0x7FFFFE00)
-    EVT_SET(LVar0, LVarA)
-    EVT_CALL(N(Pipe_GetEntryPos))
-    EVT_SET(LVar5, LVar1)
-    EVT_SET(LVar6, LVar2)
-    EVT_ADD(LVar6, 2)
-    EVT_SET(LVar7, LVar3)
-    EVT_SET(LVar8, LVar4)
-    EVT_ADD(LVar8, 180)
-    EVT_IF_GE(LVar4, 360)
-        EVT_SUB(LVar4, 360)
-    EVT_END_IF
-    EVT_CALL(InterpPlayerYaw, LVar8, 1)
-    EVT_WAIT(1)
-    EVT_CALL(PlaySound, SOUND_ENTER_PIPE)
-    EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
-    EVT_CALL(SetPlayerPos, LVar0, LVar6, LVar7)
-    EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill)
-    EVT_CALL(func_802D286C, 0x800)
-    EVT_CALL(func_802D2520, ANIM_Mario_StandStill, 5, 3, 1, 1, 0)
-    EVT_THREAD
-        EVT_WAIT(8)
-        EVT_CALL(HidePlayerShadow, TRUE)
-    EVT_END_THREAD
-    EVT_THREAD
-        EVT_WAIT(3)
-        EVT_LOOP(40)
-            EVT_CALL(N(Pipe_GetPointAheadOfPlayer), EVT_FLOAT(1.0))
-            EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
-            EVT_WAIT(1)
-        EVT_END_LOOP
-    EVT_END_THREAD
-    EVT_WAIT(25)
-    EVT_EXEC_WAIT(LVarC)
-    EVT_RETURN
-    EVT_END
-};
diff --git a/src/world/common/todo/UnkFunc44.inc.c b/src/world/common/todo/IsPlayerPounding.inc.c
similarity index 88%
rename from src/world/common/todo/UnkFunc44.inc.c
rename to src/world/common/todo/IsPlayerPounding.inc.c
index bf6a45b684..8d60e336e0 100644
--- a/src/world/common/todo/UnkFunc44.inc.c
+++ b/src/world/common/todo/IsPlayerPounding.inc.c
@@ -1,7 +1,7 @@
 #include "common.h"
 #include "npc.h"
 
-API_CALLABLE(N(UnkFunc44)) {
+API_CALLABLE(N(IsPlayerPounding)) {
     script->varTable[0] = FALSE;
     if (gPlayerStatus.actionState == ACTION_STATE_SPIN_POUND || gPlayerStatus.actionState == ACTION_STATE_TORNADO_POUND) {
         script->varTable[0] = TRUE;
diff --git a/src/world/common/todo/clouds.inc.c b/src/world/common/todo/clouds.inc.c
index 8bddaa8699..0b2ba2040d 100644
--- a/src/world/common/todo/clouds.inc.c
+++ b/src/world/common/todo/clouds.inc.c
@@ -5,15 +5,15 @@ EvtScript N(clouds1) = {
     EVT_SET(LVar7, LVar2)
     EVT_MUL(LVar7, 10)
     EVT_LABEL(0)
-    EVT_ADD(LVar7, 4)
-    EVT_IF_GT(LVar7, 3599)
-        EVT_SUB(LVar7, 3600)
-    EVT_END_IF
-    EVT_CALL(N(UnkAngleFunc2), LVar7, LVar0, LVar1, LVar2, LVar3)
-    EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2)
-    EVT_CALL(RotateModel, LVarA, LVar3, 0, 1, 0)
-    EVT_WAIT(1)
-    EVT_GOTO(0)
+        EVT_ADD(LVar7, 4)
+        EVT_IF_GT(LVar7, 3599)
+            EVT_SUB(LVar7, 3600)
+        EVT_END_IF
+        EVT_CALL(N(UnkAngleFunc2), LVar7, LVar0, LVar1, LVar2, LVar3)
+        EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2)
+        EVT_CALL(RotateModel, LVarA, LVar3, 0, 1, 0)
+        EVT_WAIT(1)
+        EVT_GOTO(0)
     EVT_RETURN
     EVT_END
 };
@@ -25,17 +25,17 @@ EvtScript N(clouds2) = {
     EVT_SET(LVar7, LVar2)
     EVT_MUL(LVar7, 10)
     EVT_LABEL(0)
-    EVT_ADD(LVar7, 4)
-    EVT_IF_GT(LVar7, 3599)
-        EVT_SUB(LVar7, 3600)
-    EVT_END_IF
-    EVT_CALL(N(UnkAngleFunc2), LVar7, LVar0, LVar1, LVar2, LVar3)
-    EVT_ADDF(LVar1, LVarB)
-    EVT_ADDF(LVar2, LVarC)
-    EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2)
-    EVT_CALL(RotateModel, LVarA, LVar3, 0, 1, 0)
-    EVT_WAIT(1)
-    EVT_GOTO(0)
+        EVT_ADD(LVar7, 4)
+        EVT_IF_GT(LVar7, 3599)
+            EVT_SUB(LVar7, 3600)
+        EVT_END_IF
+        EVT_CALL(N(UnkAngleFunc2), LVar7, LVar0, LVar1, LVar2, LVar3)
+        EVT_ADDF(LVar1, LVarB)
+        EVT_ADDF(LVar2, LVarC)
+        EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2)
+        EVT_CALL(RotateModel, LVarA, LVar3, 0, 1, 0)
+        EVT_WAIT(1)
+        EVT_GOTO(0)
     EVT_RETURN
     EVT_END
 };
@@ -48,18 +48,18 @@ EvtScript N(clouds3) = {
     EVT_SET(LVar7, LVar2)
     EVT_MUL(LVar7, 10)
     EVT_LABEL(0)
-    EVT_ADD(LVar7, 4)
-    EVT_IF_GT(LVar7, 3599)
-        EVT_SUB(LVar7, 3600)
-    EVT_END_IF
-    EVT_CALL(N(UnkAngleFunc2), LVar7, LVar0, LVar1, LVar2, LVar3)
-    EVT_ADDF(LVar0, LVarB)
-    EVT_ADDF(LVar1, LVarC)
-    EVT_ADDF(LVar2, LVarD)
-    EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2)
-    EVT_CALL(RotateModel, LVarA, LVar3, 0, 1, 0)
-    EVT_WAIT(1)
-    EVT_GOTO(0)
+        EVT_ADD(LVar7, 4)
+        EVT_IF_GT(LVar7, 3599)
+            EVT_SUB(LVar7, 3600)
+        EVT_END_IF
+        EVT_CALL(N(UnkAngleFunc2), LVar7, LVar0, LVar1, LVar2, LVar3)
+        EVT_ADDF(LVar0, LVarB)
+        EVT_ADDF(LVar1, LVarC)
+        EVT_ADDF(LVar2, LVarD)
+        EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2)
+        EVT_CALL(RotateModel, LVarA, LVar3, 0, 1, 0)
+        EVT_WAIT(1)
+        EVT_GOTO(0)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/world/dead/area_flo/flo_00/flo_00_2_main.c b/src/world/dead/area_flo/flo_00/flo_00_2_main.c
index 26ba34dd09..d2eeddb74e 100644
--- a/src/world/dead/area_flo/flo_00/flo_00_2_main.c
+++ b/src/world/dead/area_flo/flo_00/flo_00_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_00.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0);
@@ -85,7 +85,7 @@ EvtScript N(EVS_ExitWalk_flo_16_0) = EVT_EXIT_WALK(60, flo_00_ENTRY_4, "flo_16",
 EvtScript N(EVS_ExitWalk_flo_09_0) = EVT_EXIT_WALK(60, flo_00_ENTRY_5, "flo_09", flo_09_ENTRY_0);
 EvtScript N(EVS_ExitWalk_flo_08_0) = EVT_EXIT_WALK(60, flo_00_ENTRY_6, "flo_08", flo_08_ENTRY_0);
 
-MAP_RODATA_PAD(1, exits)
+MAP_RODATA_PAD(1, exits);
 
 EvtScript N(EVS_BindExitTriggers) = {
     EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_flo_14_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilinw, 1, 0)
diff --git a/src/world/dead/area_flo/flo_03/flo_03_2_main.c b/src/world/dead/area_flo/flo_03/flo_03_2_main.c
index 5d2d6ffe93..081f622d37 100644
--- a/src/world/dead/area_flo/flo_03/flo_03_2_main.c
+++ b/src/world/dead/area_flo/flo_03/flo_03_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_03.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0);
diff --git a/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c b/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c
index daee487952..504f42d47c 100644
--- a/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c
+++ b/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o170,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o157,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o170);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o157);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 2, 
diff --git a/src/world/dead/area_flo/flo_07/flo_07_2_main.c b/src/world/dead/area_flo/flo_07/flo_07_2_main.c
index d86155a069..ed2c94d07e 100644
--- a/src/world/dead/area_flo/flo_07/flo_07_2_main.c
+++ b/src/world/dead/area_flo/flo_07/flo_07_2_main.c
@@ -3,7 +3,7 @@
 #include "world/common/atomic/TexturePan.inc.c"
 #include "world/common/atomic/TexturePan.data.inc.c"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
 
 #include "world/common/todo/SpawnSunEffect.inc.c"
 
diff --git a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c
index 5ac5dabb1b..302ce2b047 100644
--- a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c
+++ b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c
@@ -209,21 +209,8 @@ EvtScript N(EVS_OnHit_CrystalTree) = {
     EVT_END
 };
 
-FoliageModelList N(CrystalTree_LeafModels) = {
-    .count = 3,
-    .models = {
-        MODEL_o6,
-        MODEL_o7,
-        MODEL_o8,
-    }
-};
-
-FoliageModelList N(CrystalTree_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o5,
-    }
-};
+FoliageModelList N(CrystalTree_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o6, MODEL_o7, MODEL_o8);
+FoliageModelList N(CrystalTree_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o5);
 
 ShakeTreeConfig N(ShakeTree_CrystalTree) = {
     .leaves = &N(CrystalTree_LeafModels),
diff --git a/src/world/dead/area_flo/flo_08/flo_08_3_main.c b/src/world/dead/area_flo/flo_08/flo_08_3_main.c
index b8029029bf..7cb2e7b346 100644
--- a/src/world/dead/area_flo/flo_08/flo_08_3_main.c
+++ b/src/world/dead/area_flo/flo_08/flo_08_3_main.c
@@ -1,7 +1,7 @@
 #include "flo_08.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0);
diff --git a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c b/src/world/dead/area_flo/flo_08/flo_08_4_npc.c
index a6327bc725..8a9adc2df3 100644
--- a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c
+++ b/src/world/dead/area_flo/flo_08/flo_08_4_npc.c
@@ -7,7 +7,7 @@
 #include "world/common/complete/NormalItemChoice.inc.c"
 
 static s32 N(FlowerGuard_ItemChoiceList)[ITEM_NUM_CONSUMABLES + 1];
-#include "world/common/atomic/ItemChoice_FlowerGuard.inc.c"
+#include "world/area_flo/common/ItemChoice_FlowerGuard.inc.c"
 
 EvtScript N(EVS_NpcInteract_GateFlower) = {
     EVT_CALL(DisablePlayerInput, TRUE)
diff --git a/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c b/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c
index e82938ec33..1fa1003cf9 100644
--- a/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c
+++ b/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c
@@ -2,19 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o133,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o132,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o133);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o132);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 2, 
diff --git a/src/world/dead/area_flo/flo_08/flo_08_6_vines.c b/src/world/dead/area_flo/flo_08/flo_08_6_vines.c
index 29aec5b719..f4237b91cc 100644
--- a/src/world/dead/area_flo/flo_08/flo_08_6_vines.c
+++ b/src/world/dead/area_flo/flo_08/flo_08_6_vines.c
@@ -2,10 +2,10 @@
 
 // unused extra import for flower-spawning regions
 #define NAMESPACE dead_flo_08_vines
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
 #define NAMESPACE dead_flo_08
 
-#include "world/common/atomic/flo_DroppingVine.inc.c"
+#include "world/area_flo/common/DroppingVine.inc.c"
 
 EvtScript N(EVS_SetupVines) = {
     EVT_DROPPING_VINE(ITEM_NONE, MODEL_o78, MODEL_o79, MODEL_o80, MODEL_o81)
diff --git a/src/world/dead/area_flo/flo_09/flo_09_2_main.c b/src/world/dead/area_flo/flo_09/flo_09_2_main.c
index 0880126ce8..147ff98037 100644
--- a/src/world/dead/area_flo/flo_09/flo_09_2_main.c
+++ b/src/world/dead/area_flo/flo_09/flo_09_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_09.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0);
diff --git a/src/world/dead/area_flo/flo_09/flo_09_3_vines.c b/src/world/dead/area_flo/flo_09/flo_09_3_vines.c
index efbf8dcc3a..e06ef05222 100644
--- a/src/world/dead/area_flo/flo_09/flo_09_3_vines.c
+++ b/src/world/dead/area_flo/flo_09/flo_09_3_vines.c
@@ -2,10 +2,10 @@
 
 // unused extra import for flower-spawning regions
 #define NAMESPACE dead_flo_09_vines
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
 #define NAMESPACE dead_flo_09
 
-#include "world/common/atomic/flo_DroppingVine.inc.c"
+#include "world/area_flo/common/DroppingVine.inc.c"
 
 EvtScript N(EVS_SetupVines) = {
     EVT_DROPPING_VINE(ITEM_NONE, MODEL_o76, MODEL_o77, MODEL_o78, MODEL_o79)
diff --git a/src/world/dead/area_flo/flo_09/flo_09_4_foliage.c b/src/world/dead/area_flo/flo_09/flo_09_4_foliage.c
index 3d97c45632..1abb66a217 100644
--- a/src/world/dead/area_flo/flo_09/flo_09_4_foliage.c
+++ b/src/world/dead/area_flo/flo_09/flo_09_4_foliage.c
@@ -54,20 +54,8 @@ EvtScript N(Tree3_CallbackScript) = {
     EVT_END
 };
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 2,
-    .models = {
-        MODEL_o11,
-        MODEL_o12,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o10,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o11, MODEL_o12);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o10);
 
 ShakeTreeConfig N(ShakeTree_Tree1) = {
     .leaves = &N(Tree1_LeafModels),
@@ -80,20 +68,8 @@ BombTrigger N(BombPos_Tree1) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree2_LeafModels) = {
-    .count = 2,
-    .models = {
-        MODEL_o4,
-        MODEL_o5,
-    }
-};
-
-FoliageModelList N(Tree2_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o3,
-    }
-};
+FoliageModelList N(Tree2_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o4, MODEL_o5);
+FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o3);
 
 ShakeTreeConfig N(ShakeTree_Tree2) = {
     .leaves = &N(Tree2_LeafModels),
@@ -106,20 +82,8 @@ BombTrigger N(BombPos_Tree2) = {
     .radius = 0.0f
 };
 
-FoliageModelList N(Tree3_LeafModels) = {
-    .count = 2,
-    .models = {
-        MODEL_o14,
-        MODEL_o15,
-    }
-};
-
-FoliageModelList N(Tree3_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o13,
-    }
-};
+FoliageModelList N(Tree3_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o14, MODEL_o15);
+FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o13);
 
 ShakeTreeConfig N(ShakeTree_Tree3) = {
     .leaves = &N(Tree3_LeafModels),
diff --git a/src/world/dead/area_flo/flo_10/flo_10_3_main.c b/src/world/dead/area_flo/flo_10/flo_10_3_main.c
index 2d7cfd75a6..e5c253b061 100644
--- a/src/world/dead/area_flo/flo_10/flo_10_3_main.c
+++ b/src/world/dead/area_flo/flo_10/flo_10_3_main.c
@@ -1,7 +1,7 @@
 #include "flo_10.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0);
diff --git a/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c b/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c
index 2c3a427d3a..845dfdc565 100644
--- a/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c
+++ b/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c
@@ -2,21 +2,8 @@
 
 #include "common/foliage.inc.c"
 
-FoliageModelList N(Tree1_LeafModels) = {
-    .count = 3,
-    .models = {
-        MODEL_o47,
-        MODEL_o48,
-        MODEL_o49,
-    }
-};
-
-FoliageModelList N(Tree1_TrunkModels) = {
-    .count = 1,
-    .models = {
-        MODEL_o88,
-    }
-};
+FoliageModelList N(Tree1_LeafModels)  = FOLIAGE_MODEL_LIST(MODEL_o47, MODEL_o48, MODEL_o49);
+FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o88);
 
 FoliageDropList N(Tree1_Drops) = {
     .count = 1, 
diff --git a/src/world/dead/area_flo/flo_11/flo_11_2_main.c b/src/world/dead/area_flo/flo_11/flo_11_2_main.c
index ac978f9916..55dadbb27a 100644
--- a/src/world/dead/area_flo/flo_11/flo_11_2_main.c
+++ b/src/world/dead/area_flo/flo_11/flo_11_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_11.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
 
 #include "world/common/entity/Pipe.inc.c"
 #include "world/common/entity/Pipe.data.inc.c"
diff --git a/src/world/dead/area_flo/flo_12/flo_12_2_main.c b/src/world/dead/area_flo/flo_12/flo_12_2_main.c
index f04ac2e97b..529ca96df4 100644
--- a/src/world/dead/area_flo/flo_12/flo_12_2_main.c
+++ b/src/world/dead/area_flo/flo_12/flo_12_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_12.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0);
diff --git a/src/world/dead/area_flo/flo_13/flo_13_3_main.c b/src/world/dead/area_flo/flo_13/flo_13_3_main.c
index 5b636eb3a2..342dcdddf3 100644
--- a/src/world/dead/area_flo/flo_13/flo_13_3_main.c
+++ b/src/world/dead/area_flo/flo_13/flo_13_3_main.c
@@ -1,6 +1,6 @@
 #include "flo_13.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0);
diff --git a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c
index f80ce483aa..c1d9c7f9ed 100644
--- a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c
+++ b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c
@@ -2,8 +2,8 @@
 #include "effects.h"
 #include "model.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
-#include "world/common/atomic/flo_DroppingVine.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/DroppingVine.inc.c"
 
 s32 N(BlowingBubbles) = FALSE;
 
diff --git a/src/world/dead/area_flo/flo_14/flo_14_6_logs.c b/src/world/dead/area_flo/flo_14/flo_14_6_logs.c
index bc712337ac..dd376b0b88 100644
--- a/src/world/dead/area_flo/flo_14/flo_14_6_logs.c
+++ b/src/world/dead/area_flo/flo_14/flo_14_6_logs.c
@@ -1,6 +1,6 @@
 #include "flo_14.h"
 
-#include "world/common/atomic/flo_LogBridge.inc.c"
+#include "world/area_flo/common/LogBridge.inc.c"
 
 EvtScript N(EVS_SetupLogBridges) = {
     EVT_MAKE_LOG_BRIDGE(COLLIDER_o162, COLLIDER_o166, MODEL_o15, MODEL_o16, MV_RotAngle_Log_01, MV_RotVelocity_Log_01)
diff --git a/src/world/dead/area_flo/flo_16/flo_16_3_vines.c b/src/world/dead/area_flo/flo_16/flo_16_3_vines.c
index 27bc068d4a..c82feafbb3 100644
--- a/src/world/dead/area_flo/flo_16/flo_16_3_vines.c
+++ b/src/world/dead/area_flo/flo_16/flo_16_3_vines.c
@@ -1,8 +1,8 @@
 #include "flo_16.h"
 #include "entity.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
-#include "world/common/atomic/flo_DroppingVine.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/DroppingVine.inc.c"
 
 EvtScript N(EVS_SetupVines) = {
     EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o214, SURFACE_TYPE_FLOWERS)
diff --git a/src/world/dead/area_flo/flo_16/flo_16_4_entity.c b/src/world/dead/area_flo/flo_16/flo_16_4_entity.c
index bec720effa..1105e453ed 100644
--- a/src/world/dead/area_flo/flo_16/flo_16_4_entity.c
+++ b/src/world/dead/area_flo/flo_16/flo_16_4_entity.c
@@ -32,7 +32,7 @@ EvtScript N(EVS_UseSpring) = {
     EVT_END
 };
 
-API_CALLABLE(N(UnkFunc44)) {
+API_CALLABLE(N(IsPlayerPounding)) {
     script->varTable[0] = FALSE;
     if (gPlayerStatus.actionState == ACTION_STATE_SPIN_POUND || gPlayerStatus.actionState == ACTION_STATE_TORNADO_POUND) {
         script->varTable[0] = TRUE;
@@ -42,7 +42,7 @@ API_CALLABLE(N(UnkFunc44)) {
 
 EvtScript N(EVS_MonitorCeilingPound) = {
     EVT_IF_EQ(AF_FLO16_FoundHiddenStarPiece, FALSE)
-        EVT_CALL(N(UnkFunc44))
+        EVT_CALL(N(IsPlayerPounding))
         EVT_IF_EQ(LVar0, 0)
             EVT_RETURN
         EVT_END_IF
diff --git a/src/world/dead/area_flo/flo_17/flo_17_2_main.c b/src/world/dead/area_flo/flo_17/flo_17_2_main.c
index c93bd69cd7..653361d1f0 100644
--- a/src/world/dead/area_flo/flo_17/flo_17_2_main.c
+++ b/src/world/dead/area_flo/flo_17/flo_17_2_main.c
@@ -1,7 +1,7 @@
 #include "flo_17.h"
 #include "effects.h"
 
-#include "world/common/atomic/flo_FlowerSpawnRegion.inc.c"
+#include "world/area_flo/common/FlowerSpawnRegion.inc.c"
 
 API_CALLABLE(N(SpawnSunEffect)) {
     fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0);
diff --git a/src/world/dead/area_flo/flo_17/flo_17_3_logs.c b/src/world/dead/area_flo/flo_17/flo_17_3_logs.c
index 7d6d059567..673b60e047 100644
--- a/src/world/dead/area_flo/flo_17/flo_17_3_logs.c
+++ b/src/world/dead/area_flo/flo_17/flo_17_3_logs.c
@@ -1,6 +1,6 @@
 #include "flo_17.h"
 
-#include "world/common/atomic/flo_LogBridge.inc.c"
+#include "world/area_flo/common/LogBridge.inc.c"
 
 EvtScript N(EVS_SetupLogBridges) = {
     EVT_MAKE_LOG_BRIDGE(COLLIDER_o22, COLLIDER_o138, MODEL_o19, MODEL_o20, MV_RotAngle_Log_01, MV_RotVelocity_Log_01)
diff --git a/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c b/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c
index 308cc0107e..05429b13f2 100644
--- a/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c
+++ b/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c
@@ -1,6 +1,6 @@
 #include "kzn_11.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "world/area_kzn/common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_kzn_10_1) = EVT_EXIT_WALK(60, kzn_11_ENTRY_0, "kzn_10", kzn_10_ENTRY_1);
 EvtScript N(EVS_ExitWalk_kzn_17_0) = EVT_EXIT_WALK(60, kzn_11_ENTRY_1, "kzn_17", kzn_17_ENTRY_0);
diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c b/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c
index 392c282698..ff1087e1ba 100644
--- a/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c
+++ b/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c
@@ -1,6 +1,6 @@
 #include "kzn_17.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "world/area_kzn/common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_kzn_11_1) = EVT_EXIT_WALK(60, kzn_17_ENTRY_0, "kzn_11", kzn_11_ENTRY_1);
 EvtScript N(EVS_ExitWalk_kzn_18_0) = EVT_EXIT_WALK(60, kzn_17_ENTRY_1, "kzn_18", kzn_18_ENTRY_0);
diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c b/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c
index ce6a7353d7..d15239dfd7 100644
--- a/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c
+++ b/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c
@@ -4,7 +4,7 @@
 #define UNK_FUNC_50_LVar1 -583.0
 #define UNK_FUNC_50_LVar2 165.0
 
-#include "world/common/atomic/kzn_SpinyTromp.inc.c"
+#include "world/area_kzn/common/SpinyTromp.inc.c"
 
 EvtScript N(EVS_SpinyTromp_ManageCamera) = {
     EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5)
diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c b/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c
index 426d7c16b0..afdcaa7e6b 100644
--- a/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c
+++ b/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c
@@ -3,7 +3,7 @@
 extern EvtScript N(EVS_MakeEntities);
 extern NpcGroupList N(DefaultNPCs);
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "world/area_kzn/common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_kzn_17_1) = EVT_EXIT_WALK(60, kzn_18_ENTRY_0, "kzn_17", kzn_17_ENTRY_1);
 EvtScript N(EVS_ExitWalk_kzn_19_0) = EVT_EXIT_WALK(60, kzn_18_ENTRY_1, "kzn_19", kzn_19_ENTRY_0);
diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c
index 8adac649e6..f0ae396e33 100644
--- a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c
+++ b/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c
@@ -1,6 +1,6 @@
 #include "kzn_19.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "world/area_kzn/common/SmokeTexPanners.inc.c"
 
 #include "world/common/todo/StarSpiritEffectFunc.inc.c"
 
diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_2_main.c b/src/world/dead/area_kzn/kzn_22/kzn_22_2_main.c
index f755ddc398..fd15252b4f 100644
--- a/src/world/dead/area_kzn/kzn_22/kzn_22_2_main.c
+++ b/src/world/dead/area_kzn/kzn_22/kzn_22_2_main.c
@@ -1,6 +1,6 @@
 #include "kzn_22.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "world/area_kzn/common/SmokeTexPanners.inc.c"
 
 EvtScript N(EVS_ExitWalk_kzn_20_1) = EVT_EXIT_WALK_FIXED(60, kzn_22_ENTRY_0, "kzn_20", kzn_20_ENTRY_1);
 
diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_2_main.c b/src/world/dead/area_kzn/kzn_23/kzn_23_2_main.c
index 3e26d056f1..eefb3ce317 100644
--- a/src/world/dead/area_kzn/kzn_23/kzn_23_2_main.c
+++ b/src/world/dead/area_kzn/kzn_23/kzn_23_2_main.c
@@ -1,6 +1,6 @@
 #include "kzn_23.h"
 
-#include "world/common/atomic/kzn_SmokeTexPanners.inc.c"
+#include "world/area_kzn/common/SmokeTexPanners.inc.c"
 
 // should add to zero over a full cycle
 s32 N(LavaFluctuationOffsets)[] = {
diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c
index 7ee156cdad..1e7d0de988 100644
--- a/src/world/partner/sushie.c
+++ b/src/world/partner/sushie.c
@@ -188,7 +188,7 @@ void func_802BD414_31E184(Npc* npc) {
                                                npc->collisionRadius) != 0)
         {
             collisionStatus->pushingAgainstWall = D_8010C978;
-            if ((get_collider_flags(D_8010C978) & 0xFF) == 4) {
+            if ((get_collider_flags(D_8010C978) & COLLIDER_FLAGS_SURFACE_TYPE_MASK) == SURFACE_TYPE_DOCK_WALL) {
                 bss_802BFEF0++;
             } else {
                 bss_802BFEF0 = 0;
@@ -260,16 +260,16 @@ void func_802BD414_31E184(Npc* npc) {
         }
         if (bss_802BFEE8 == 1) {
             suggest_player_anim_setUnkFlag(ANIM_Mario_80010);
-            npc->currentAnim = 0x7000A;
+            npc->currentAnim = ANIM_WorldSushie_Ride;
         }
         if (bss_802BFEF4 == 0 && (playerStatus->position.y + (playerStatus->colliderHeight * 0.5f) < OriginalPlayerY)) {
             bss_802BFEF4 = 1;
-            playerStatus->renderMode = 0xD;
+            playerStatus->renderMode = RENDER_MODE_ALPHATEST;
             func_802DDFF8(playerStatus->trueAnimation, 4, 2, 0, 0, 0, 0);
             func_8003D624(npc, 4, 2, 0, 0, 0, 0);
         }
         if (bss_802BFEE8 >= 10 && (!(partnerActionStatus->currentButtons & BUTTON_C_DOWN) || bss_802BFEE8 >= 30)) {
-            npc->currentAnim = 0x7000C;
+            npc->currentAnim = ANIM_WorldSushie_Rise;
             sfx_play_sound_at_npc(SOUND_694, 0, NPC_PARTNER);
             bss_802BFEE4 = 3;
         }
@@ -298,11 +298,11 @@ void func_802BD414_31E184(Npc* npc) {
         if ((OriginalPlayerY - npc->moveToPos.y) - (npc->collisionHeight * 0.5f) <= 0.0f) {
             if (bss_802BFEF4 != 0) {
                 bss_802BFEF4 = 0;
-                func_802DDFF8(0x10002, 0, 0, 0, 0, 0, 0);
+                func_802DDFF8(ANIM_Mario_10002, 0, 0, 0, 0, 0, 0);
                 func_8003D624(npc, 0, 0, 0, 0, 0, 0);
             }
             bss_802BFEE4 = 0;
-            npc->currentAnim = 0x7000A;
+            npc->currentAnim = ANIM_WorldSushie_Ride;
             npc->moveToPos.y = OriginalPlayerY - (npc->collisionHeight * 0.5f);
             suggest_player_anim_setUnkFlag(ANIM_Mario_8000F);
         }
@@ -316,7 +316,7 @@ s32 func_802BE280_31EFF0(s32 arg0, f32* x, f32* y, f32* z, f32 length, f32 radiu
     sin_cos_rad(DEG_TO_RAD(*yaw), &sinAngle, &cosAngle);
     cosAngle = -cosAngle;
     totalLength = radius + length;
-    hitResult = test_ray_colliders(0x10000, *x, *y, *z, sinAngle, 0.0f, cosAngle, &hitX, &hitY, &hitZ, &totalLength, &hitNx, &hitNy, &hitNz);
+    hitResult = test_ray_colliders(COLLISION_CHANNEL_10000, *x, *y, *z, sinAngle, 0.0f, cosAngle, &hitX, &hitY, &hitZ, &totalLength, &hitNx, &hitNy, &hitNz);
 
     if (hitResult >= 0) {
         *yaw = atan2(0.0f, 0.0f, hitNx, hitNz);
@@ -360,8 +360,8 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) {
         case 0:
             if (!gGameStatusPtr->keepUsingPartnerOnMapChange) {
                 collider = collisionStatus->currentWall;
-                if (collider >= 0 && !(collider & 0x4000)) {
-                    collider = get_collider_flags(collider) & 0xFF;
+                if (collider >= 0 && (collider & COLLISION_WITH_ENTITY_BIT) == 0) {
+                    collider = get_collider_flags(collider) & COLLIDER_FLAGS_SURFACE_TYPE_MASK;
                     if (collider != SURFACE_TYPE_DOCK_WALL) {
                         return ApiStatus_DONE1;
                     }
@@ -380,7 +380,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) {
             disable_player_shadow();
             disable_npc_shadow(npc);
             func_8003D624(npc, 4, 2, 0, 0, 0, 0);
-            npc->currentAnim = 0x7000A;
+            npc->currentAnim = ANIM_WorldSushie_Ride;
             npc->moveSpeed = playerStatus->runSpeed;
             npc->jumpScale = 0.0f;
             partnerActionStatus->partnerActionState = PARTNER_ACTION_USE;
@@ -402,7 +402,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) {
                                                 2.0f * playerStatus->colliderDiameter, &angle);
                 colliderFlags = -1;
                 if (collider >= 0) {
-                    colliderFlags = get_collider_flags(collider) & 0xFF;
+                    colliderFlags = get_collider_flags(collider) & COLLIDER_FLAGS_SURFACE_TYPE_MASK;
                 }
                 if (colliderFlags == SURFACE_TYPE_DOCK_WALL) {
                     bss_802BFEEC = 1;
@@ -423,7 +423,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) {
                     dist = 100.0f;
                     collider = npc_raycast_down_around(npc->collisionChannel, &x, &y, &z, &dist,
                                                        npc->yaw, npc->collisionRadius);
-                    npc->currentAnim = 0x70003;
+                    npc->currentAnim = ANIM_WorldSushie_Run;
                     npc->duration = 12;
                     npc->moveToPos.y = y - (npc->collisionHeight * 0.5f);
                     suggest_player_anim_clearUnkFlag(ANIM_Mario_10002);
@@ -449,7 +449,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) {
             npc->flags &= ~(NPC_FLAG_GRAVITY | NPC_FLAG_40);
             disable_npc_shadow(npc);
             func_8003D624(npc, 4, 2, 0, 0, 0, 0);
-            npc->currentAnim = 0x7000A;
+            npc->currentAnim = ANIM_WorldSushie_Ride;
             playerStatus->flags |= PS_FLAG_MOVEMENT_LOCKED;
             dist = dist2D(playerStatus->position.x, playerStatus->position.z, npc->moveToPos.x, npc->moveToPos.z);
             npc->jumpVelocity = 5.0f;
@@ -561,10 +561,14 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) {
                         collisionStatus->pushingAgainstWall = -1;
                     }
 
-                    if (npc->currentWall < 0 ||
-                        (npc->currentWall & 0x4000) ||
-                        (collider = get_collider_flags(npc->currentWall) & 0xFF, (collider != SURFACE_TYPE_DOCK_WALL)))
-                    {
+                    if (npc->currentWall < 0 || npc->currentWall & COLLISION_WITH_ENTITY_BIT) {
+                        if (bss_802BFEE4 == 2 && bss_802BFEE8 == 1) {
+                            sfx_play_sound_at_npc(SOUND_294, 0, NPC_PARTNER);
+                        }
+                        break;
+                    }
+                    collider = get_collider_flags(npc->currentWall) & COLLIDER_FLAGS_SURFACE_TYPE_MASK;
+                    if (collider != SURFACE_TYPE_DOCK_WALL) {
                         if (bss_802BFEE4 == 2 && bss_802BFEE8 == 1) {
                             sfx_play_sound_at_npc(SOUND_294, 0, NPC_PARTNER);
                         }
@@ -668,7 +672,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) {
                 gGameStatusPtr->keepUsingPartnerOnMapChange = FALSE;
                 partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE;
                 partnerActionStatus->actingPartner = 0;
-                func_802DDFF8(0x10002, 0, 0, 0, 0, 0, 0);
+                func_802DDFF8(ANIM_Mario_10002, 0, 0, 0, 0, 0, 0);
                 func_8003D624(npc, 0, 0, 0, 0, 0, 0);
                 return ApiStatus_DONE1;
             }
diff --git a/src/world/world.c b/src/world/world.c
index ca28ed7cd2..7c36d17133 100644
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -757,37 +757,37 @@ MapConfig sam_maps[] = {
 /// Crystal Palace
 #include "area_pra/pra.h"
 MapConfig pra_maps[] = {
-    { MAP_UNSPLIT(pra_01, 0x80241400), .bgName = "yki_bg", .sfxReverb = 1, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_02, 0x802416C0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_03, 0x802401E0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_04, 0x80240970), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_05, 0x802411F0), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 },
+    { MAP_WITH_INIT(pra_01), .bgName = "yki_bg", .sfxReverb = 1 },
+    { MAP_WITH_INIT(pra_02), .songVariation = 1, .sfxReverb = 2 },
+    { MAP_WITH_INIT(pra_03), .songVariation = 1, .sfxReverb = 2 },
+    { MAP_WITH_INIT(pra_04), .songVariation = 1, .sfxReverb = 2 },
+    { MAP_WITH_INIT(pra_05), .songVariation = 1, .sfxReverb = 1 },
     { MAP_WITH_INIT(pra_06), .songVariation = 1, .sfxReverb = 1 },
     { MAP_UNSPLIT(pra_09, 0x80241670), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_10, 0x802416D0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_11, 0x802411F0), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_12, 0x80241220), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 },
+    { MAP_WITH_INIT(pra_10), .songVariation = 1, .sfxReverb = 2 },
+    { MAP_WITH_INIT(pra_11), .songVariation = 1, .sfxReverb = 1 },
+    { MAP_WITH_INIT(pra_12), .songVariation = 1, .sfxReverb = 1 },
     { MAP_UNSPLIT(pra_13, 0x80241620), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_14, 0x80241200), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
+    { MAP_WITH_INIT(pra_14), .songVariation = 1, .sfxReverb = 2 },
     { MAP_WITH_INIT(pra_15), .bgName = "yki_bg", .songVariation = 1, .sfxReverb = 1 },
-    { MAP_UNSPLIT(pra_16, 0x80240F60), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
+    { MAP_WITH_INIT(pra_16), .songVariation = 1, .sfxReverb = 2 },
     { MAP_UNSPLIT(pra_18, 0x80240F50), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_19, 0x802419D0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_20, 0x80240F70), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_21, 0x80240140), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_22, 0x802402F0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_27, 0x80241220), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_28, 0x80241220), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 },
+    { MAP_WITH_INIT(pra_19), .songVariation = 1, .sfxReverb = 2 },
+    { MAP_WITH_INIT(pra_20), .songVariation = 1, .sfxReverb = 1 },
+    { MAP_WITH_INIT(pra_21), .songVariation = 1, .sfxReverb = 2 },
+    { MAP_WITH_INIT(pra_22), .songVariation = 1, .sfxReverb = 2 },
+    { MAP_WITH_INIT(pra_27), .songVariation = 1, .sfxReverb = 1 },
+    { MAP_WITH_INIT(pra_28), .songVariation = 1, .sfxReverb = 1 },
     { MAP_UNSPLIT(pra_29, 0x802412C0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
     { MAP_UNSPLIT(pra_31, 0x802410E0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_32, 0x80240850), .bgName = "sam_bg", .init = (MapInit)0x80240000, .songVariation = 1, .sfxReverb = 1 },
-    { MAP_UNSPLIT(pra_33, 0x802410C0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
+    { MAP_UNSPLIT(pra_32, 0x80240850), .bgName = "sam_bg", .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 },
+    { MAP_WITH_INIT(pra_33), .songVariation = 1, .sfxReverb = 2 },
     { MAP_UNSPLIT(pra_34, 0x80241040), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 },
     { MAP_UNSPLIT(pra_35, 0x80242C40), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_36, 0x80240F70), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_37, 0x80241840), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_38, 0x80241700), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
-    { MAP_UNSPLIT(pra_39, 0x80241700), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 },
+    { MAP_WITH_INIT(pra_36), .songVariation = 1, .sfxReverb = 2 },
+    { MAP_WITH_INIT(pra_37), .songVariation = 1, .sfxReverb = 2 },
+    { MAP_WITH_INIT(pra_38), .songVariation = 1, .sfxReverb = 2 },
+    { MAP_WITH_INIT(pra_39), .songVariation = 1, .sfxReverb = 2 },
     { MAP_WITH_INIT(pra_40), .songVariation = 1, .sfxReverb = 1 },
 };
 
diff --git a/ver/us/asm/data/world/area_pra/pra_01/D4E3F0.data.s b/ver/us/asm/data/world/area_pra/pra_01/D4E3F0.data.s
deleted file mode 100644
index 9e231ba911..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_01/D4E3F0.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802413B0_D4E3F0
-.word 0x4401C000, 0xC2700000, 0x42D20000, 0x42B40000, 0x44744000, 0x00000000, 0x428C0000, 0x43870000, 0x44744000, 0x00000000, 0xC29C0000, 0x43870000, 0x4401C000, 0xC2700000, 0xC2C80000, 0x42B40000, 0x44418000, 0xC1F00000, 0x42AA0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241C58, D_802413B0_D4E3F0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190136, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000058, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000001, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_01/D4E500.data.s b/ver/us/asm/data/world/area_pra/pra_01/D4E500.data.s
deleted file mode 100644
index a281942cf1..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_01/D4E500.data.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802414C0_D4E500
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802415D0_D4E610
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_01_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_01_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_01_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_01_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241678_D4E6B8
-.word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024177C_D4E7BC
-.word 0x00000033, 0xFFFFFFFF
-
-dlabel D_80241784_D4E7C4
-.word 0x00000035, 0xFFFFFFFF
-
-dlabel D_8024178C_D4E7CC
-.word 0x00000013, 0xFFFFFFFF
-
-dlabel D_80241794_D4E7D4
-.word 0x00000011, 0xFFFFFFFF
-
-dlabel D_8024179C_D4E7DC
-.word 0x00000033, 0x00000013, 0xFFFFFFFF
-
-dlabel D_802417A8_D4E7E8
-.word 0x00000035, 0x00000011, 0xFFFFFFFF
-
-dlabel D_802417B4_D4E7F4
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242F90, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241810_D4E850
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242F98, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024186C_D4E8AC
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024179C_D4E7DC, 0x00000024, 0x00000002, 0xFE363C83, D_802417A8_D4E7E8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024177C_D4E7BC, 0x00000024, 0x00000002, 0xFE363C83, D_80241784_D4E7C4, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242FA0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241950_D4E990
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024179C_D4E7DC, 0x00000024, 0x00000002, 0xFE363C83, D_802417A8_D4E7E8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024178C_D4E7CC, 0x00000024, 0x00000002, 0xFE363C83, D_80241794_D4E7D4, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242FA0, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241A34_D4EA74
-.word 0x00000047, 0x00000005, D_802417B4_D4E7F4, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241810_D4E850, 0x00080000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024186C_D4E8AC, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241950_D4E990, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241AB4_D4EAF4
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241A34_D4EA74, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024179C_D4E7DC, 0x00000024, 0x00000002, 0xFE363C83, D_802417A8_D4E7E8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024177C_D4E7BC, 0x00000024, 0x00000002, 0xFE363C83, D_80241784_D4E7C4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_80241A34_D4EA74, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024179C_D4E7DC, 0x00000024, 0x00000002, 0xFE363C83, D_802417A8_D4E7E8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024178C_D4E7CC, 0x00000024, 0x00000002, 0xFE363C83, D_80241794_D4E7D4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_80241A34_D4EA74, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, D_80241A34_D4EA74, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_80241A34_D4EA74, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000002B, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406346, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000058, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242F60, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242F80, 0x00000046, 0x00000001, 0x80241440, 0x00000043, 0x00000001, pra_01_UnkFogFunc, 0x00000043, 0x00000001, func_80240F60_D4DFA0, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000044, 0x00000001, D_80241678_D4E6B8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_802415D0_D4E610, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000010, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000018, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000021, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001A, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001D, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000013, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000017, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000024, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000019, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001F, 0x00000008, 0x00000044, 0x00000001, D_80241AB4_D4EAF4, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000008, 0x00000001, 0x00000041, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_01/D4EF50.data.s b/ver/us/asm/data/world/area_pra/pra_01/D4EF50.data.s
deleted file mode 100644
index 44dd5aa29c..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_01/D4EF50.data.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241F10_D4EF50
-.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
-
-dlabel pra_01_ItemChoice_HasSelectedItem
-.word 0x00000000
-
-dlabel pra_01_ItemChoice_SelectedItemID
-.word 0x00000000
-
-dlabel D_80241F9C_D4EFDC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241238_D4E278, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F9C_D4EFDC, 0x00000010, 0x00000000, D_80242FB0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, pra_01_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242130_D4F170
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802412D4_D4E314, 0xFE363C80, 0x0000004E, 0x00000006, D_80242130_D4F170, 0x00000010, 0x00000000, pra_01_80243178, 0x00000000, 0x00000001, 0x00000043, 0x00000002, pra_01_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802422B4_D4F2F4
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802423A8_D4F3E8
-.word 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001A, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2537680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000012, 0xFFFFFFFB, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00180002, 0x00180001, 0x00000200, 0x0012016D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000012, 0xFFFFFFFA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00180003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001F, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000139, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000188, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00180001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000000, 0x00000001, 0x00000043, 0x00000001, PostChapter7StatUpdate, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0197, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00180002, 0x00180001, 0x00000200, 0x0012016E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00180002, 0x00180001, 0x00000200, 0x0012016F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00040000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000708, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C85, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002045, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000059, 0x00000044, 0x00000001, 0x80241440, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242D40_D4FD80
-.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802422B4_D4F2F4, 0x00000044, 0x00000001, D_802423A8_D4F3E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242D70_D4FDB0
-.word 0x00000000, D_80241F10_D4EF50, 0x00000000, 0xC47A0000, 0x00000000, 0x00600D09, D_80242D40_D4FD80, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180000, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242D70_D4FDB0, 0x21010001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_01/D4FFC0.data.s b/ver/us/asm/data/world/area_pra/pra_01/D4FFC0.data.s
deleted file mode 100644
index 1cd336a5b2..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_01/D4FFC0.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80242F80_D4FFC0
-.word 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_02/D51650.data.s b/ver/us/asm/data/world/area_pra/pra_02/D51650.data.s
deleted file mode 100644
index 7f9383fcee..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_02/D51650.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241660_D51650
-.word 0x41500000, 0x00000000, 0x429A0000, 0x42B40000, 0x43FA0000, 0x00000000, 0x43540000, 0x00000000, 0x44700000, 0x00000000, 0x42A00000, 0x43870000, 0x44700000, 0x00000000, 0xC2A00000, 0x43870000, 0x43FA0000, 0x00000000, 0xC3540000, 0x43340000, 0x41500000, 0x00000000, 0xC29A0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802428B4, D_80241660_D51650, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190137, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_02/D51720.data.s b/ver/us/asm/data/world/area_pra/pra_02/D51720.data.s
deleted file mode 100644
index 170cc43690..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_02/D51720.data.s
+++ /dev/null
@@ -1,108 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241730_D51720
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241840_D51830
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_02_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_02_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_02_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_02_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802418E8_D518D8
-.word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802419EC_D519DC
-.word 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0x00000000, 0x000000FA, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000006B, 0x00000000, 0xFD050F80, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241A34_D51A24
-.word 0x0000006C, 0x0000006D, 0xFFFFFFFF
-
-dlabel D_80241A40_D51A30
-.word 0x0000006F, 0x00000070, 0xFFFFFFFF
-
-dlabel D_80241A4C_D51A3C
-.word 0x0000000D, 0xFFFFFFFF
-
-dlabel D_80241A54_D51A44
-.word 0x0000000F, 0xFFFFFFFF
-
-dlabel D_80241A5C_D51A4C
-.word 0x0000006C, 0x0000006D, 0x0000000D, 0xFFFFFFFF
-
-dlabel D_80241A6C_D51A5C
-.word 0x0000006F, 0x00000070, 0x0000000F, 0xFFFFFFFF
-
-dlabel D_80241A7C_D51A6C
-.word 0x00000061, 0xFFFFFFFF
-
-dlabel D_80241A84_D51A74
-.word 0x0000005F, 0xFFFFFFFF
-
-dlabel D_80241A8C_D51A7C
-.word 0x00000048, 0xFFFFFFFF
-
-dlabel D_80241A94_D51A84
-.word 0x00000046, 0xFFFFFFFF
-
-dlabel D_80241A9C_D51A8C
-.word 0x0000005B, 0xFFFFFFFF
-
-dlabel D_80241AA4_D51A94
-.word 0x0000005D, 0xFFFFFFFF
-
-dlabel D_80241AAC_D51A9C
-.word 0x00000042, 0xFFFFFFFF
-
-dlabel D_80241AB4_D51AA4
-.word 0x00000044, 0xFFFFFFFF
-
-dlabel D_80241ABC_D51AAC
-.word 0x0000005B, 0x00000061, 0xFFFFFFFF
-
-dlabel D_80241AC8_D51AB8
-.word 0x0000005D, 0x0000005F, 0xFFFFFFFF
-
-dlabel D_80241AD4_D51AC4
-.word 0x00000042, 0x00000048, 0xFFFFFFFF
-
-dlabel D_80241AE0_D51AD0
-.word 0x00000044, 0x00000046, 0xFFFFFFFF
-
-dlabel D_80241AEC_D51ADC
-.word 0x00000072, 0xFFFFFFFF
-
-dlabel D_80241AF4_D51AE4
-.word 0x00000011, 0xFFFFFFFF
-
-dlabel D_80241AFC_D51AEC
-.word 0xFFFFFFFF
-
-dlabel D_80241B00_D51AF0
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000018, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A5C_D51A4C, 0x00000024, 0x00000002, 0xFE363C83, D_80241A6C_D51A5C, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A34_D51A24, 0x00000024, 0x00000002, 0xFE363C83, D_80241A40_D51A30, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243C90, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241BF4_D51BE4
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000038, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AEC_D51ADC, 0x00000024, 0x00000002, 0xFE363C83, D_80241AF4_D51AE4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AEC_D51ADC, 0x00000024, 0x00000002, 0xFE363C83, D_80241AFC_D51AEC, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243C98, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241CE8_D51CD8
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000024, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AD4_D51AC4, 0x00000024, 0x00000002, 0xFE363C83, D_80241AE0_D51AD0, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AAC_D51A9C, 0x00000024, 0x00000002, 0xFE363C83, D_80241AB4_D51AA4, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243CA0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241DDC_D51DCC
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000024, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241ABC_D51AAC, 0x00000024, 0x00000002, 0xFE363C83, D_80241AC8_D51AB8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A9C_D51A8C, 0x00000024, 0x00000002, 0xFE363C83, D_80241AA4_D51A94, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243CA8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241ED0_D51EC0
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000020, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AD4_D51AC4, 0x00000024, 0x00000002, 0xFE363C83, D_80241AE0_D51AD0, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A8C_D51A7C, 0x00000024, 0x00000002, 0xFE363C83, D_80241A94_D51A84, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243CA0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241FC4_D51FB4
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000020, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241ABC_D51AAC, 0x00000024, 0x00000002, 0xFE363C83, D_80241AC8_D51AB8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A7C_D51A6C, 0x00000024, 0x00000002, 0xFE363C83, D_80241A84_D51A74, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243CA8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802420C0_D520B0
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000033, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AEC_D51ADC, 0x00000024, 0x00000002, 0xFE363C83, D_80241AF4_D51AE4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AFC_D51AEC, 0x00000024, 0x00000002, 0xFE363C83, D_80241AF4_D51AE4, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243CB0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802421B4_D521A4
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001C, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A5C_D51A4C, 0x00000024, 0x00000002, 0xFE363C83, D_80241A6C_D51A5C, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A4C_D51A3C, 0x00000024, 0x00000002, 0xFE363C83, D_80241A54_D51A44, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243C90, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802422A8_D52298
-.word 0x00000047, 0x00000005, D_80241B00_D51AF0, 0x00000100, 0x00000018, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241BF4_D51BE4, 0x00000100, 0x00000038, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406153, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000024, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406157, 0x00000001, 0x00000047, 0x00000005, D_80241CE8_D51CD8, 0x00000100, 0x00000024, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241ED0_D51EC0, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406158, 0x00000001, 0x00000047, 0x00000005, D_80241DDC_D51DCC, 0x00000100, 0x0000002D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241FC4_D51FB4, 0x00000100, 0x00000029, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_802420C0_D520B0, 0x00000100, 0x00000033, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802421B4_D521A4, 0x00000100, 0x0000001C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242448_D52438
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x0000000A, 0x00000002, 0xF8406156, 0x00000000, 0x00000024, 0x00000002, 0xF8406156, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000004E, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A5C_D51A4C, 0x00000024, 0x00000002, 0xFE363C83, D_80241A6C_D51A5C, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A34_D51A24, 0x00000024, 0x00000002, 0xFE363C83, D_80241A40_D51A30, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AEC_D51ADC, 0x00000024, 0x00000002, 0xFE363C83, D_80241AF4_D51AE4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AEC_D51ADC, 0x00000024, 0x00000002, 0xFE363C83, D_80241AFC_D51AEC, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, UseDoorSounds, 0x00000003, 0x0000000A, 0x00000002, 0xF8406153, 0x00000000, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AD4_D51AC4, 0x00000024, 0x00000002, 0xFE363C83, D_80241AE0_D51AD0, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AAC_D51A9C, 0x00000024, 0x00000002, 0xFE363C83, D_80241AB4_D51AA4, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241ABC_D51AAC, 0x00000024, 0x00000002, 0xFE363C83, D_80241AC8_D51AB8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A9C_D51A8C, 0x00000024, 0x00000002, 0xFE363C83, D_80241AA4_D51A94, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, UseDoorSounds, 0x00000003, 0x0000000A, 0x00000002, 0xF8406153, 0x00000000, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AD4_D51AC4, 0x00000024, 0x00000002, 0xFE363C83, D_80241AE0_D51AD0, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A8C_D51A7C, 0x00000024, 0x00000002, 0xFE363C83, D_80241A94_D51A84, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241ABC_D51AAC, 0x00000024, 0x00000002, 0xFE363C83, D_80241AC8_D51AB8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A7C_D51A6C, 0x00000024, 0x00000002, 0xFE363C83, D_80241A84_D51A74, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AEC_D51ADC, 0x00000024, 0x00000002, 0xFE363C83, D_80241AF4_D51AE4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241AFC_D51AEC, 0x00000024, 0x00000002, 0xFE363C83, D_80241AF4_D51AE4, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A5C_D51A4C, 0x00000024, 0x00000002, 0xFE363C83, D_80241A6C_D51A5C, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241A4C_D51A3C, 0x00000024, 0x00000002, 0xFE363C83, D_80241A54_D51A44, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_802422A8_D52298, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x802439B4, 0x0000000A, 0x00000002, 0xF8406153, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000038, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFFFFFF06, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000031, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802419EC_D519DC, 0x00000047, 0x00000005, 0x80242FB8, 0x00000080, 0x0000003D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242FB8, 0x00000080, 0x0000003E, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000014, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000044, 0x00000001, D_802418E8_D518D8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_80241840_D51830, 0x00000044, 0x00000001, D_80242448_D52438, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241700, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_02/D52A80.data.s b/ver/us/asm/data/world/area_pra/pra_02/D52A80.data.s
deleted file mode 100644
index a0b853d074..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_02/D52A80.data.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80242A90_D52A80
-.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00460019, D_80242A90_D52A80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
-
-dlabel pra_02_ItemChoice_HasSelectedItem
-.word 0x00000000
-
-dlabel pra_02_ItemChoice_SelectedItemID
-.word 0x00000000
-
-dlabel D_80242AD4_D52AC4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D511C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80242AD4_D52AC4, 0x00000010, 0x00000000, func_80243CC0_A2DF00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, pra_02_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242C68_D52C58
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D51264, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C68_D52C58, 0x00000010, 0x00000000, pra_02_80243E88, 0x00000000, 0x00000001, 0x00000043, 0x00000002, pra_02_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_02/D52DE0.data.s b/ver/us/asm/data/world/area_pra/pra_02/D52DE0.data.s
deleted file mode 100644
index fd5339e52e..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_02/D52DE0.data.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80242DF0_D52DE0
-.word 0x00000033, 0x00000000
-
-dlabel D_80242DF8_D52DE8
-.word 0x00000034, 0x00000000
-
-dlabel D_80242E00_D52DF0
-.word 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000031, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000038, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242ED0_D52EC0
-.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000003E, 0x0000208B, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000031, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000038, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_02_UnkFunc44, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF8406153, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF06, 0x000000FA, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000024, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000029, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8406153, 0x00000001, 0x00000044, 0x00000001, D_80242ED0_D52EC0, 0x00000012, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF06, 0x00000000, 0x000000FA, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000024, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000020, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8406153, 0x00000000, 0x00000044, 0x00000001, D_80242ED0_D52EC0, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0x0000003C, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0x00000078, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0x000000B4, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0xFFFFFFC4, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0xFFFFFF88, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0xFFFFFF4C, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000003F, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x000000FA, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8080, 0x00000043, 0x00000002, PlaySound, 0x00000040, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000046, 0x00000001, D_802419EC_D519DC, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8406153, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000031, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000038, 0x00000001, 0x00000046, 0x00000001, D_80242E00_D52DF0, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000031, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000038, 0x00000000, 0x00000046, 0x00000001, D_80242E00_D52DF0, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024346C_D5345C
-.word 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024347C_D5346C
-.word 0x00000047, 0x00000005, D_8024346C_D5345C, 0x00000100, 0x00000024, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024346C_D5345C, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802434C4_D534B4
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, func_802414A8_D51498, 0xFD050F81, 0x000003DB, 0x00000008, 0x00000054, 0x00000043, 0x00000005, func_802414A8_D51498, 0xFD050F82, 0x000003DB, 0x00000008, 0xFFFFFFAC, 0x00000043, 0x00000005, func_802414A8_D51498, 0xFD050F83, 0x000003DB, 0x00000102, 0x00000054, 0x00000043, 0x00000005, func_802414A8_D51498, 0xFD050F84, 0x000003DB, 0x00000102, 0xFFFFFFAC, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80243564_D53554
-.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000033, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8406157, 0x00000001, 0x00000047, 0x00000005, D_80241CE8_D51CD8, 0x00000100, 0x00000024, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241ED0_D51EC0, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000043, 0x00000005, dup_pra_02_GetEntityPosition, 0xFD050F81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, dup_pra_02_GetEntityPosition, 0xFD050F82, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000024, 0x00000002, 0xFD050F81, 0xFFFFFFFF, 0x00000043, 0x00000001, pra_02_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F82, 0x00000024, 0x00000002, 0xFD050F82, 0xFFFFFFFF, 0x00000043, 0x00000001, pra_02_RemovePadlock, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024378C_D5377C
-.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000034, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8406158, 0x00000001, 0x00000047, 0x00000005, D_80241DDC_D51DCC, 0x00000100, 0x0000002D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241FC4_D51FB4, 0x00000100, 0x00000029, 0x00000001, 0x00000000, 0x00000043, 0x00000005, dup_pra_02_GetEntityPosition, 0xFD050F83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, dup_pra_02_GetEntityPosition, 0xFD050F84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000024, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000043, 0x00000001, pra_02_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F84, 0x00000024, 0x00000002, 0xFD050F84, 0xFFFFFFFF, 0x00000043, 0x00000001, pra_02_RemovePadlock, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F82, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F84, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C82, 0x00004000, 0x0000000A, 0x00000002, 0xF8406157, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000003DB, 0x00000008, 0x00000054, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024347C_D5346C, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_80243564_D53554, 0x00000100, 0xFE363C82, D_80242DF0_D52DE0, 0x00000000, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000003DB, 0x00000008, 0xFFFFFFAC, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024347C_D5346C, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x0000004E, 0x00000006, D_80243564_D53554, 0x00000100, 0xFE363C82, D_80242DF0_D52DE0, 0x00000000, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406158, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000003DB, 0x00000102, 0x00000054, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024347C_D5346C, 0x00000024, 0x00000002, 0xFD050F83, 0xFE363C80, 0x0000004E, 0x00000006, D_8024378C_D5377C, 0x00000100, 0xFE363C82, D_80242DF8_D52DE8, 0x00000000, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000003DB, 0x00000102, 0xFFFFFFAC, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024347C_D5346C, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C80, 0x0000004E, 0x00000006, D_8024378C_D5377C, 0x00000100, 0xFE363C82, D_80242DF8_D52DE8, 0x00000000, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802434C4_D534B4, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003E, 0x0000002B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003D, 0x00000032, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_03/D53E60.data.s b/ver/us/asm/data/world/area_pra/pra_03/D53E60.data.s
deleted file mode 100644
index 861c7e5da9..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_03/D53E60.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802401B0_D53E60
-.word 0xC3000000, 0x00000000, 0xC3090000, 0x43340000, 0x436D0000, 0x00000000, 0xC28C0000, 0x43870000, 0x436D0000, 0xC3480000, 0xC28C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802405E0, D_802401B0_D53E60, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190138, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_03/D53F10.data.s b/ver/us/asm/data/world/area_pra/pra_03/D53F10.data.s
deleted file mode 100644
index 124c512a37..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_03/D53F10.data.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240260_D53F10
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802409C0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240304_D53FB4
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000012, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802409C8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802403A8_D54058
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000024, 0x00000024, 0x00000002, 0xFE363C82, 0x00000037, 0x00000024, 0x00000002, 0xFE363C83, 0x00000035, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802409D0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024044C_D540FC
-.word 0x00000047, 0x00000005, D_80240260_D53F10, 0x00000100, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240304_D53FB4, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802403A8_D54058, 0x00000100, 0x00000024, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802404B0_D54160
-.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_8024044C_D540FC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000012, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000037, 0x00000024, 0x00000002, 0xFE363C83, 0x00000035, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_8024044C_D540FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80240934, 0x00000044, 0x00000001, 0x80240220, 0x0000000A, 0x00000002, 0xF8406159, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000001E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000019, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802404B0_D54160, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_03/D543C0.data.s b/ver/us/asm/data/world/area_pra/pra_03/D543C0.data.s
deleted file mode 100644
index b82010b0b6..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_03/D543C0.data.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240710_D543C0
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802407A0_D54450
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240710_D543C0, 0xFE363C8A, 0x00000043, 0x00000001, func_802400AC_D53D5C, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240710_D543C0, 0xFE363C8A, 0x00000043, 0x00000001, func_80240020_D53CD0, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240138_D53DE8, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x0000007C, 0xFFFFFF38, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802407A0_D54450, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF38, 0x0000003C, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_04/D54FD0.data.s b/ver/us/asm/data/world/area_pra/pra_04/D54FD0.data.s
deleted file mode 100644
index adea74ee45..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_04/D54FD0.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240940_D54FD0
-.word 0xC3000000, 0x00000000, 0x431D0000, 0x00000000, 0x436D0000, 0x00000000, 0x429C0000, 0x43870000, 0x436D0000, 0xC3480000, 0x429C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240D28, D_80240940_D54FD0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190139, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_04/D55080.data.s b/ver/us/asm/data/world/area_pra/pra_04/D55080.data.s
deleted file mode 100644
index de0b7b394f..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_04/D55080.data.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802409F0_D55080
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802414B0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240A94_D55124
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000012, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802414B8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240B38_D551C8
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000022, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000002E, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802414C0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240BDC_D5526C
-.word 0x00000047, 0x00000005, D_802409F0_D55080, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240A94_D55124, 0x00000100, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240B38_D551C8, 0x00000100, 0x00000022, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240C40_D552D0
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000012, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000002E, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80240BDC_D5526C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80241498, 0x00000046, 0x00000001, 0x802410C0, 0x00000044, 0x00000001, 0x802409B0, 0x0000000A, 0x00000002, 0xF8406159, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000000A, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240C40_D552D0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_04/D554E0.data.s b/ver/us/asm/data/world/area_pra/pra_04/D554E0.data.s
deleted file mode 100644
index 305daa6394..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_04/D554E0.data.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240E50_D554E0
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240EE0_D55570
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240E50_D554E0, 0xFE363C8A, 0x00000043, 0x00000001, func_802400AC_D5473C, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240E50_D554E0, 0xFE363C8A, 0x00000043, 0x00000001, func_80240020_D546B0, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241074_D55704
-.word 0x00000024, 0x00000002, 0xF8406159, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000000A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240138_D547C8, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x0000007C, 0xFFFFFF38, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240EE0_D55570, 0x0000000A, 0x00000002, 0xF8406159, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BoardedFloor, 0x0000007C, 0x00000000, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241074_D55704, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF38, 0x0000003C, 0x0000004B, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840615A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_04/D55840.data.s b/ver/us/asm/data/world/area_pra/pra_04/D55840.data.s
deleted file mode 100644
index 9da3e749d0..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_04/D55840.data.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802411B0_D55840
-.word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001
-
-dlabel D_802411E0_D55870
-.word 0x00000043, 0x00000002, pra_04_UnkFunc001, D_802411B0_D55840, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241200_D55890
-.word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001
-
-dlabel D_80241230_D558C0
-.word 0x00000043, 0x00000002, pra_04_UnkFunc001, D_80241200_D55890, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, D_802411E0_D55870, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000800, 0x00000000, 0x000A0000
-
-dlabel D_8024127C_D5590C
-.word 0x00000000, 0x00140014, 0x00000000, 0x00000000, D_80241230_D558C0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000800, 0x00000000, 0x00160000
-
-dlabel D_802412A8_D55938
-.word 0x00000000, D_8024127C_D5590C, 0x42480000, 0x43020000, 0x42960000, 0x00200C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008B, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x00000032, 0x00000082, 0x0000004B, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000032, 0x00000082, 0x0000004B, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0034011B, 0x00340102, 0x00340102, 0x00340102, 0x0034011B, 0x0034011B, 0x00340104, 0x00340115, 0x00340100, 0x00340100, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802412A8_D55938, 0x21000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_05/D56D90.data.s b/ver/us/asm/data/world/area_pra/pra_05/D56D90.data.s
deleted file mode 100644
index d76b386ea7..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_05/D56D90.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802411E0_D56D90
-.word 0x41500000, 0x00000000, 0x42960000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241590, D_802411E0_D56D90, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019013A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s b/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s
deleted file mode 100644
index 6199e939d2..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241270_D56E20
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241380_D56F30
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_05_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_05_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_05_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_05_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241428_D56FD8
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000017, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241870, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802414EC_D5709C
-.word 0x00000047, 0x00000005, D_80241428_D56FD8, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241518_D570C8
-.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000017, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000046, 0x00000001, 0x80285EC4, 0x00000044, 0x00000001, D_802414EC_D5709C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80241818_D573C8, 0x00000044, 0x00000001, 0x80241230, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_80241380_D56F30, 0x00000044, 0x00000001, D_80241518_D570C8, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel pra_05_varStash
-.word 0x00000000
-
-dlabel D_80241684_D57234
-.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802416EC_D5729C
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241684_D57234, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802417CC_D5737C
-.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000034, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406155, 0x00000001, 0x00000046, 0x00000001, D_802416EC_D5729C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241818_D573C8
-.word 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406155, 0x00000043, 0x00000002, AssignScript, D_802417CC_D5737C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_06/D58380.data.s b/ver/us/asm/data/world/area_pra/pra_06/D58380.data.s
deleted file mode 100644
index 76877e91ac..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_06/D58380.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240F50_D58380
-.word 0x41500000, 0x00000000, 0x42960000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241300, D_80240F50_D58380, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019013B, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_06/D58410.data.s b/ver/us/asm/data/world/area_pra/pra_06/D58410.data.s
deleted file mode 100644
index 4d0862dc02..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_06/D58410.data.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240FE0_D58410
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802410F0_D58520
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_06_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_06_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_06_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_06_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241198_D585C8
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000017, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024144C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024125C_D5868C
-.word 0x00000047, 0x00000005, D_80241198_D585C8, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241288_D586B8
-.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000017, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000046, 0x00000001, 0x80285EC4, 0x00000044, 0x00000001, D_8024125C_D5868C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_802413F0_D58820, 0x00000044, 0x00000001, 0x80240FA0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_802410F0_D58520, 0x00000044, 0x00000001, D_80241288_D586B8, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802413F0_D58820
-.word 0x00000043, 0x00000007, MakeItemEntity, 0x00000083, 0x000000C8, 0x00000014, 0x0000005E, 0x00000011, 0xF840615B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_10/D60960.data.s b/ver/us/asm/data/world/area_pra/pra_10/D60960.data.s
deleted file mode 100644
index 5b64261efd..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_10/D60960.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802416B0_D60960
-.word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x43F38000, 0x00000000, 0x428C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241BC8, D_802416B0_D60960, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019013D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_10/D60A00.data.s b/ver/us/asm/data/world/area_pra/pra_10/D60A00.data.s
deleted file mode 100644
index 1ede4fd945..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_10/D60A00.data.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241750_D60A00
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241860_D60B10
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_10_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_10_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_10_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_10_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241908_D60BB8
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802421F0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802419CC_D60C7C
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802421F8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241A90_D60D40
-.word 0x00000047, 0x00000005, D_80241908_D60BB8, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802419CC_D60C7C, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241AD8_D60D88
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000046, 0x00000001, 0x80285EC4, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000046, 0x00000001, 0x80285EC4, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80241A90_D60D40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, D_802421C0_D61470, 0x00000044, 0x00000001, 0x80241710, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_80241860_D60B10, 0x00000044, 0x00000001, D_80241AD8_D60D88, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241CC0_D60F70
-.word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001
-
-dlabel D_80241CF0_D60FA0
-.word 0x00000043, 0x00000002, pra_10_UnkFunc001, D_80241CC0_D60F70, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241D10_D60FC0
-.word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001
-
-dlabel D_80241D40_D60FF0
-.word 0x00000043, 0x00000002, pra_10_UnkFunc001, D_80241D10_D60FC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, D_80241CF0_D60FA0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000800, 0x00000000, 0x000A0000
-
-dlabel D_80241D8C_D6103C
-.word 0x00000000, 0x00140014, 0x00000000, 0x00000000, D_80241D40_D60FF0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000800, 0x00000000, 0x00160000
-
-dlabel D_80241DB8_D61068
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241DE0_D61090
-.word 0x00000000, D_80241D8C_D6103C, 0x43260000, 0x43020000, 0x42B40000, 0x00200C00, D_80241DB8_D61068, 0x00000000, 0x00000000, 0x0000010E, 0x8005008B, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x000000A6, 0x00000082, 0x0000005A, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000A6, 0x00000082, 0x0000005A, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0034011B, 0x00340102, 0x00340102, 0x00340102, 0x0034011B, 0x0034011B, 0x00340104, 0x00340115, 0x00340100, 0x00340100, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00000000, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_80241FD0_D61280
-.word 0x00000001, D_80241D8C_D6103C, 0x43B30000, 0x43020000, 0x42960000, 0x00200C00, D_80241DB8_D61068, 0x00000000, 0x00000000, 0x0000010E, 0x8005008B, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x00000166, 0x00000082, 0x0000004B, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000166, 0x00000082, 0x0000004B, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0034011B, 0x00340102, 0x00340102, 0x00340102, 0x0034011B, 0x0034011B, 0x00340104, 0x00340115, 0x00340100, 0x00340100, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00000000, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_802421C0_D61470
-.word 0x00000001, D_80241DE0_D61090, 0x1F010001, 0x00000001, D_80241FD0_D61280, 0x1F030001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_11/D626E0.data.s b/ver/us/asm/data/world/area_pra/pra_11/D626E0.data.s
deleted file mode 100644
index d993bee1c5..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_11/D626E0.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802411E0_D626E0
-.word 0x41B80000, 0x00000000, 0x42A20000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802414DC, D_802411E0_D626E0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019013E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_11/D62770.data.s b/ver/us/asm/data/world/area_pra/pra_11/D62770.data.s
deleted file mode 100644
index d66c9d0c9d..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_11/D62770.data.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241270_D62770
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241380_D62880
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_11_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_11_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_11_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_11_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241428_D62928
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241800, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241484_D62984
-.word 0x00000047, 0x00000005, D_80241428_D62928, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802414B0_D629B0
-.word 0x00000024, 0x00000002, 0xFE363C80, D_80241484_D62984, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x802417A8, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000017, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFFFE00, 0x00000044, 0x00000001, 0x80241230, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_80241380_D62880, 0x00000044, 0x00000001, D_802414B0_D629B0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s b/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s
deleted file mode 100644
index 3eba463aa3..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel pra_11_varStash
-.word 0x00000000
-
-dlabel D_80241614_D62B14
-.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024167C_D62B7C
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241614_D62B14, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024175C_D62C5C
-.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000033, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406154, 0x00000001, 0x00000046, 0x00000001, D_8024167C_D62B7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406154, 0x00000043, 0x00000002, AssignScript, D_8024175C_D62C5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_12/D63F20.data.s b/ver/us/asm/data/world/area_pra/pra_12/D63F20.data.s
deleted file mode 100644
index 309aefbaf5..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_12/D63F20.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241210_D63F20
-.word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802415C0, D_80241210_D63F20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019013F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s b/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s
deleted file mode 100644
index e3ac11768c..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802412A0_D63FB0
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802413B0_D640C0
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_12_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_12_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_12_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_12_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241458_D64168
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000017, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802418BC, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024151C_D6422C
-.word 0x00000047, 0x00000005, D_80241458_D64168, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241548_D64258
-.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000017, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000046, 0x00000001, 0x80285EC4, 0x00000044, 0x00000001, D_8024151C_D6422C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80241848_D64558, 0x00000044, 0x00000001, 0x80241260, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_802413B0_D640C0, 0x00000044, 0x00000001, D_80241548_D64258, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel pra_12_varStash
-.word 0x00000000
-
-dlabel D_802416B4_D643C4
-.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024171C_D6442C
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_802416B4_D643C4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802417FC_D6450C
-.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000116, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840615D, 0x00000001, 0x00000046, 0x00000001, D_8024171C_D6442C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241848_D64558
-.word 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840615D, 0x00000043, 0x00000002, AssignScript, D_802417FC_D6450C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_14/D68EE0.data.s b/ver/us/asm/data/world/area_pra/pra_14/D68EE0.data.s
deleted file mode 100644
index 1638cb5a3d..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_14/D68EE0.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802411E0_D68EE0
-.word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x41500000, 0x00000000, 0xC28C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241730, D_802411E0_D68EE0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190141, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_14/D68F80.data.s b/ver/us/asm/data/world/area_pra/pra_14/D68F80.data.s
deleted file mode 100644
index e3fe10fe4b..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_14/D68F80.data.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241280_D68F80
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241390_D69090
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_14_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_14_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_14_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_14_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241438_D69138
-.word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024153C_D6923C
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241B00, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241598_D69298
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241B00, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802415F4_D692F4
-.word 0x00000047, 0x00000005, D_8024153C_D6923C, 0x00080000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241598_D69298, 0x00080000, 0x00000015, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024163C_D6933C
-.word 0x00000024, 0x00000002, 0xFE363C80, D_802415F4_D692F4, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241668_D69368
-.word 0x41500000, 0x00000000, 0x428C0000, 0x00000000
-
-dlabel D_80241678_D69378
-.word 0x41500000, 0x00000000, 0xC28C0000, 0x00000000
-
-dlabel D_80241688_D69388
-.word 0x00000043, 0x00000003, EnableModel, 0x0000000F, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001F, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF840615E, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802416DC_D693DC
-.word 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000021, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF840615F, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80241A7C, 0x00000044, 0x00000001, 0x80241240, 0x00000024, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000044, 0x00000001, D_80241438_D69138, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80241390_D69090, 0x00000044, 0x00000001, D_8024163C_D6933C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF840615E, 0x00000000, 0x00000047, 0x00000005, D_80241688_D69388, 0x00100000, D_80241668_D69368, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000F, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001F, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF840615F, 0x00000000, 0x00000047, 0x00000005, D_802416DC_D693DC, 0x00100000, D_80241678_D69378, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000021, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_14/D69630.data.s b/ver/us/asm/data/world/area_pra/pra_14/D69630.data.s
deleted file mode 100644
index 69ba467884..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_14/D69630.data.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel pra_14_varStash
-.word 0x00000000
-
-dlabel D_80241934_D69634
-.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241934_D69634, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x000001BD, 0x0000003C, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406160, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x000001BD, 0x0000003C, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406161, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_16/D6AA40.data.s b/ver/us/asm/data/world/area_pra/pra_16/D6AA40.data.s
deleted file mode 100644
index d8b2b7b3bc..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_16/D6AA40.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240F20_D6AA40
-.word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x43F38000, 0x00000000, 0x428C0000, 0x43870000, 0x43F38000, 0x00000000, 0xC28C0000, 0x43870000, 0x41500000, 0x00000000, 0xC28C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802419C8, D_80240F20_D6AA40, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190143, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_16/D6AAF0.data.s b/ver/us/asm/data/world/area_pra/pra_16/D6AAF0.data.s
deleted file mode 100644
index 1f1c016e5f..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_16/D6AAF0.data.s
+++ /dev/null
@@ -1,66 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240FD0_D6AAF0
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802410E0_D6AC00
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_16_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_16_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_16_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_16_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241188_D6ACA8
-.word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024128C_D6ADAC
-.word 0x00000021, 0x00000022, 0xFFFFFFFF
-
-dlabel D_80241298_D6ADB8
-.word 0x0000001E, 0x0000001F, 0xFFFFFFFF
-
-dlabel D_802412A4_D6ADC4
-.word 0x00000024, 0x00000025, 0xFFFFFFFF
-
-dlabel D_802412B0_D6ADD0
-.word 0x00000027, 0x00000028, 0xFFFFFFFF
-
-dlabel D_802412BC_D6ADDC
-.word 0x00000021, 0x00000022, 0x00000024, 0x00000025, 0xFFFFFFFF
-
-dlabel D_802412D0_D6ADF0
-.word 0x0000001E, 0x0000001F, 0x00000027, 0x00000028, 0xFFFFFFFF
-
-dlabel D_802412E4_D6AE04
-.word 0x0000002B, 0x0000002C, 0xFFFFFFFF
-
-dlabel D_802412F0_D6AE10
-.word 0x0000002E, 0x0000002F, 0xFFFFFFFF
-
-dlabel D_802412FC_D6AE1C
-.word 0x00000034, 0x00000035, 0xFFFFFFFF
-
-dlabel D_80241308_D6AE28
-.word 0x00000031, 0x00000032, 0xFFFFFFFF
-
-dlabel D_80241314_D6AE34
-.word 0x0000002B, 0x0000002C, 0x00000034, 0x00000035, 0xFFFFFFFF
-
-dlabel D_80241328_D6AE48
-.word 0x0000002E, 0x0000002F, 0x00000031, 0x00000032, 0xFFFFFFFF
-
-dlabel D_8024133C_D6AE5C
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000015, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412BC_D6ADDC, 0x00000024, 0x00000002, 0xFE363C83, D_802412D0_D6ADF0, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024128C_D6ADAC, 0x00000024, 0x00000002, 0xFE363C83, D_80241298_D6ADB8, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241AF0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241430_D6AF50
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001D, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241314_D6AE34, 0x00000024, 0x00000002, 0xFE363C83, D_80241328_D6AE48, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412E4_D6AE04, 0x00000024, 0x00000002, 0xFE363C83, D_802412F0_D6AE10, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241AF8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241524_D6B044
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000021, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241314_D6AE34, 0x00000024, 0x00000002, 0xFE363C83, D_80241328_D6AE48, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412FC_D6AE1C, 0x00000024, 0x00000002, 0xFE363C83, D_80241308_D6AE28, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241AF8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241618_D6B138
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412BC_D6ADDC, 0x00000024, 0x00000002, 0xFE363C83, D_802412D0_D6ADF0, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412A4_D6ADC4, 0x00000024, 0x00000002, 0xFE363C83, D_802412B0_D6ADD0, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241AF0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024170C_D6B22C
-.word 0x00000047, 0x00000005, D_8024133C_D6AE5C, 0x00000100, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241430_D6AF50, 0x00000100, 0x0000001D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241524_D6B044, 0x00000100, 0x00000021, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241618_D6B138, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024178C_D6B2AC
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000003, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412BC_D6ADDC, 0x00000024, 0x00000002, 0xFE363C83, D_802412D0_D6ADF0, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024128C_D6ADAC, 0x00000024, 0x00000002, 0xFE363C83, D_80241298_D6ADB8, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241314_D6AE34, 0x00000024, 0x00000002, 0xFE363C83, D_80241328_D6AE48, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412E4_D6AE04, 0x00000024, 0x00000002, 0xFE363C83, D_802412F0_D6AE10, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241314_D6AE34, 0x00000024, 0x00000002, 0xFE363C83, D_80241328_D6AE48, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412FC_D6AE1C, 0x00000024, 0x00000002, 0xFE363C83, D_80241308_D6AE28, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, UseDoorSounds, 0x00000003, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412BC_D6ADDC, 0x00000024, 0x00000002, 0xFE363C83, D_802412D0_D6ADF0, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412A4_D6ADC4, 0x00000024, 0x00000002, 0xFE363C83, D_802412B0_D6ADD0, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_8024170C_D6B22C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000044, 0x00000001, 0x80240FA0, 0x00000024, 0x00000002, 0xFE363C80, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000044, 0x00000001, D_80241188_D6ACA8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_802410E0_D6AC00, 0x00000044, 0x00000001, D_8024178C_D6B2AC, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_19/D70360.data.s b/ver/us/asm/data/world/area_pra/pra_19/D70360.data.s
deleted file mode 100644
index 77daed8a7a..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_19/D70360.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802419B0_D70360
-.word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x43F38000, 0x00000000, 0x428C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241F24, D_802419B0_D70360, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190145, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_19/D70400.data.s b/ver/us/asm/data/world/area_pra/pra_19/D70400.data.s
deleted file mode 100644
index 2585a968a5..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_19/D70400.data.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241A50_D70400
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241B60_D70510
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_19_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_19_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_19_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_19_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241C08_D705B8
-.word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241D0C_D706BC
-.word 0x0000002E, 0x0000002F, 0xFFFFFFFF
-
-dlabel D_80241D18_D706C8
-.word 0x0000002B, 0x0000002C, 0xFFFFFFFF
-
-dlabel D_80241D24_D706D4
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000024, 0x00000002, 0xFE363C82, D_80241D0C_D706BC, 0x00000024, 0x00000002, 0xFE363C83, D_80241D18_D706C8, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802479E0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241DC8_D70778
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802479E8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241E24_D707D4
-.word 0x00000047, 0x00000005, D_80241D24_D706D4, 0x00000100, 0x00000013, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000052, 0x00000047, 0x00000005, D_80241DC8_D70778, 0x00080000, 0x00000019, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241E84_D70834
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241D0C_D706BC, 0x00000024, 0x00000002, 0xFE363C83, D_80241D18_D706C8, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_80241E24_D707D4, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80241E24_D707D4, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802479AC, 0x00000044, 0x00000001, 0x80241A10, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000052, 0x00000043, 0x00000003, EnableModel, 0x00000022, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000021, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000024, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000044, 0x00000001, D_80241C08_D705B8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80241B60_D70510, 0x00000044, 0x00000001, D_80241E84_D70834, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s b/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s
deleted file mode 100644
index 6e439655e4..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s
+++ /dev/null
@@ -1,192 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802420C0_D70A70
-.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000
-
-dlabel D_802420EC_D70A9C
-.word 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010
-
-dlabel D_80242118_D70AC8
-.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
-
-dlabel D_80242144_D70AF4
-.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
-
-dlabel D_80242170_D70B20
-.word 0x00000000, 0x001E002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
-
-dlabel pra_19_ItemChoice_HasSelectedItem
-.word 0x00000000
-
-dlabel pra_19_ItemChoice_SelectedItemID
-.word 0x00000000
-
-dlabel D_802421A4_D70B54
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D6FB88, 0xFE363C80, 0x0000004E, 0x00000006, D_802421A4_D70B54, 0x00000010, 0x00000000, D_802479F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, pra_19_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242338_D70CE8
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D6FC24, 0xFE363C80, 0x0000004E, 0x00000006, D_80242338_D70CE8, 0x00000010, 0x00000000, D_80247BB8_pra_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, pra_19_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802424BC_D70E6C
-.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A6480, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24ACA80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242588_D70F38
-.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A9280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2508280, 0xF24ACA80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024266C_D7101C
-.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000182, 0x00000024, 0x00000002, 0xFE363C80, 0x00000182, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A9280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24ACA80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242778_D71128
-.word 0x00000043, 0x00000001, func_80241710_D700C0, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C83, 0xFE363C86, 0xFE363C87, 0x00000000, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, pra_19_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C83, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C84, 0x000002CD, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C84, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFE363C84, 0x004E0005, 0x004E0002, 0x00000000, 0x00000046, 0x00000001, D_8024266C_D7101C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C84, 0x004E0004, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C84, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C84, 0xF24A9480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C84, 0x000002CB, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C84, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C84, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802429D4_D71384
-.word 0x00000043, 0x00000003, SetNpcJumpscale, 0xFE363C83, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242A70_D71420
-.word 0x0000000A, 0x00000002, 0xFD050F82, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_19_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F83, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_19_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000008, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000008, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F84, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_19_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_19_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242E0C_D717BC
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242E7C_D7182C
-.word 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C83, 0xFE363C89, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242F2C_D718DC
-.word 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C83, 0x0000005A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242F9C_D7194C
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x009D0003, 0x00000044, 0x00000001, D_80242E0C_D717BC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x00000024, 0x00000002, 0xFE363C84, 0x0082000A, 0x00000044, 0x00000001, D_80242E0C_D717BC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C84, 0x00B50003, 0x00000044, 0x00000001, D_80242E0C_D717BC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000024, 0x00000002, 0xFE363C84, 0x00B60006, 0x00000044, 0x00000001, D_80242E0C_D717BC, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00020005, 0x00000046, 0x00000001, D_80242E0C_D717BC, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080009, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000023, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x0000000A, 0x00000044, 0x00000001, D_80242E7C_D7182C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000044, 0x00000001, D_80242E7C_D7182C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x0000000A, 0x00000044, 0x00000001, D_80242E7C_D7182C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000044, 0x00000001, D_80242E7C_D7182C, 0x00000013, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000172, 0x00000049, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x009D0001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000044, 0x00000001, D_80242F2C_D718DC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x00000024, 0x00000002, 0xFE363C84, 0x00820004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000118, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000044, 0x00000001, D_80242F2C_D718DC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C84, 0x00B50001, 0x00000024, 0x00000002, 0xFE363C80, 0x000001A4, 0x00000024, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000044, 0x00000001, D_80242F2C_D718DC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000024, 0x00000002, 0xFE363C84, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000013B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000037, 0x00000044, 0x00000001, D_80242F2C_D718DC, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00020003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000181, 0x00000024, 0x00000002, 0xFE363C82, 0x00000078, 0x00000046, 0x00000001, D_80242F2C_D718DC, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00120165, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802436C4_D72074
-.word 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFE363C80, 0xFE363C82, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x0002000A, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020009, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00010007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00010009, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0x0000008C, 0x00000043, 0x00000004, func_80241838_D701E8, 0x00000006, 0xFE363C83, 0x00000000, 0x00000043, 0x00000004, func_80241838_D701E8, 0x00000006, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020008, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00010007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00010009, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020009, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80243978_D72328
-.word 0x00000043, 0x00000005, SetNpcPos, 0xFE363C83, 0x00000215, 0x00000000, 0x0000004D, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C83, 0xF24A9280, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C83, 0xFE363C85, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C83, 0x0000005A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80243A44_D723F4
-.word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000052, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE029D, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE029D, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE029D, 0x00000002, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00010002, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000035, 0x00000000, 0xFFFFFFB5, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000017, 0x00000000, 0xFFFFFFB5, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000006E, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00010004, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000006, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0x00000181, 0xFFFFFFB5, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000019F, 0xFFFFFFB5, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00010002, 0x00000024, 0x00000002, 0xF5DE029D, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00010002, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x0000019F, 0x00000000, 0xFFFFFFB5, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000181, 0x00000000, 0xFFFFFFB5, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000017C, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802436C4_D72074, 0x00000024, 0x00000002, 0xF5DE029D, 0x00000002, 0x00000004, 0x00000001, 0x00000015, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00010002, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x0000019F, 0x00000000, 0xFFFFFFB5, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000181, 0x00000000, 0xFFFFFFB5, 0x00000044, 0x00000001, D_802436C4_D72074, 0x00000003, 0x00000001, 0x00000015, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C80, 0x000001FE, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000102, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x000000C0, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000021, 0x000001E4, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x00000022, 0x00000016, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000022, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000024, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000021, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x009D0003, 0x00000024, 0x00000002, 0xFE363C85, 0x009D0001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000044, 0x00000001, D_80243978_D72328, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x00000024, 0x00000002, 0xFE363C84, 0x0082000A, 0x00000024, 0x00000002, 0xFE363C85, 0x00820004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000118, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000044, 0x00000001, D_80243978_D72328, 0x00000024, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C84, 0x00B50003, 0x00000024, 0x00000002, 0xFE363C85, 0x00B50001, 0x00000024, 0x00000002, 0xFE363C80, 0x000001A4, 0x00000024, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000044, 0x00000001, D_80243978_D72328, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000024, 0x00000002, 0xFE363C84, 0x00B60006, 0x00000024, 0x00000002, 0xFE363C85, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000013B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000037, 0x00000044, 0x00000001, D_80243978_D72328, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00020005, 0x00000024, 0x00000002, 0xFE363C85, 0x00020003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000181, 0x00000024, 0x00000002, 0xFE363C82, 0x00000078, 0x00000044, 0x00000001, D_80243978_D72328, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000001, func_8024175C_D7010C, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x10101000, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000007BC, 0x0000001E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802416F8_D700A8, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x10101000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A8680, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000044, 0x00000001, D_802429D4_D71384, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00B60008, 0x00B60001, 0x00000000, 0x00120153, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A8680, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, D_802429D4_D71384, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009D0008, 0x009D0001, 0x00000000, 0x00120154, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A8680, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000044, 0x00000001, D_802429D4_D71384, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120155, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A8680, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000003, 0x00000044, 0x00000001, D_802429D4_D71384, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00B50004, 0x00B50001, 0x00000000, 0x00120156, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A8680, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x00000044, 0x00000001, D_802429D4_D71384, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00820014, 0x00820004, 0x00000000, 0x00120157, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A8680, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00B60008, 0x00B60001, 0x00000000, 0x00120158, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A8680, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009D0008, 0x009D0001, 0x00000000, 0x00120159, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A8680, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00820014, 0x00820004, 0x00000000, 0x0012015A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x000000C0, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000001EA, 0x00000024, 0x00000002, 0xFE363C89, 0x0000010E, 0x00000046, 0x00000001, D_80242F9C_D7194C, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000BE, 0x00000024, 0x00000002, 0xFE363C89, 0x0000005A, 0x00000046, 0x00000001, D_80242F9C_D7194C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F82, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F83, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F84, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000003, GetAngleToNPC, 0xFFFFFFFC, 0xFE363C8A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00020004, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00020003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000000, 0x00120166, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x000000C0, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000047, 0x00000005, D_80241DC8_D70778, 0x00080000, 0x00000019, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000052, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0002000C, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A9280, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000C, 0x0002000C, 0x00000000, 0x00120162, 0x00000046, 0x00000001, D_80242588_D70F38, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000046, 0x00000001, D_80242A70_D71420, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802413A4_D6FD54, 0xFD050F82, 0xFD050F83, 0xFD050F84, 0xFD050F85, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000007, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A9280, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000007, 0x00000024, 0x00000002, 0xFE363C85, 0x00120161, 0x00000024, 0x00000002, 0xFE363C86, 0x009D0008, 0x00000024, 0x00000002, 0xFE363C87, 0x009D0001, 0x00000046, 0x00000001, D_80242778_D71128, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A9280, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x00000024, 0x00000002, 0xFE363C84, 0x00000008, 0x00000024, 0x00000002, 0xFE363C85, 0x00120164, 0x00000024, 0x00000002, 0xFE363C86, 0x00820014, 0x00000024, 0x00000002, 0xFE363C87, 0x00820004, 0x00000046, 0x00000001, D_80242778_D71128, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A9280, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C84, 0x00000009, 0x00000024, 0x00000002, 0xFE363C85, 0x00120163, 0x00000024, 0x00000002, 0xFE363C86, 0x00B50004, 0x00000024, 0x00000002, 0xFE363C87, 0x00B50001, 0x00000046, 0x00000001, D_80242778_D71128, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F84, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A9280, 0x00000046, 0x00000001, D_802424BC_D70E6C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000024, 0x00000002, 0xFE363C84, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C85, 0x00120160, 0x00000024, 0x00000002, 0xFE363C86, 0x00B60008, 0x00000024, 0x00000002, 0xFE363C87, 0x00B60001, 0x00000046, 0x00000001, D_80242778_D71128, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000023, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80244E4C_D737FC
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000102, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x000000C0, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000047, 0x00000005, D_80241DC8_D70778, 0x00080000, 0x00000019, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000052, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80244F34_D738E4
-.word 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x0012015D, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80244F64_D73914
-.word 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009D0008, 0x009D0001, 0x00000000, 0x0012015C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80244F94_D73944
-.word 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00820014, 0x00820004, 0x00000000, 0x0012015F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80244FC4_D73974
-.word 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00B50004, 0x00B50001, 0x00000000, 0x0012015E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80244FF4_D739A4
-.word 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00B60008, 0x00B60001, 0x00000000, 0x0012015B, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80245024_D739D4
-.word 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80244E4C_D737FC, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10000102, 0x00000001, 0x00000044, 0x00000001, D_80243A44_D723F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024506C_D73A1C
-.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244F34_D738E4, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802450C0_D73A70
-.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244F64_D73914, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80245114_D73AC4
-.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244F94_D73944, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80245168_D73B18
-.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244FC4_D73974, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802451BC_D73B6C
-.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244FF4_D739A4, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80245210_D73BC0
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00010002, 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x00000043, 0x00000001, func_802414F4_D6FEA4, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80245268_D73C18
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80245290_D73C40
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802452B8_D73C68
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802452E0_D73C90
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80245308_D73CB8
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80245330_D73CE0
-.word 0x009D0001, 0x009D0002, 0x009D0008, 0x009D0003, 0xFFFFFFFF
-
-dlabel D_80245344_D73CF4
-.word 0x00820004, 0x00820008, 0x00820014, 0x0082000A, 0xFFFFFFFF
-
-dlabel D_80245358_D73D08
-.word 0x00B50001, 0x00B50002, 0x00B50004, 0x00B50003, 0xFFFFFFFF
-
-dlabel D_8024536C_D73D1C
-.word 0x00B60001, 0x00B60004, 0x00B60008, 0x00B60006, 0xFFFFFFFF
-
-dlabel D_80245380_D73D30
-.word 0x004E0002, 0x004E0003, 0x004E0005, 0x004E0004, 0xFFFFFFFF
-
-dlabel D_80245394_D73D44
-.word 0x00000000, D_802420C0_D70A70, 0x00000000, 0xC47A0000, 0x00000000, 0x03D40D09, D_8024506C_D73A1C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802420EC_D70A9C, 0x00000000, 0xC47A0000, 0x00000000, 0x03D40D09, D_802450C0_D73A70, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x009D0001, 0x009D0002, 0x009D0003, 0x009D0003, 0x009D0001, 0x009D0001, 0x009D0000, 0x009D0000, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x00000000, 0x00000000, D_80245330_D73CE0, 0x00000000, 0x00000002, D_802420C0_D70A70, 0x00000000, 0xC47A0000, 0x00000000, 0x03D40D09, D_80245114_D73AC4, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, D_80245344_D73CF4, 0x00000000, 0x00000003, D_80242118_D70AC8, 0x00000000, 0xC47A0000, 0x00000000, 0x03D40D09, D_80245168_D73B18, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00000000, 0x00000000, D_80245358_D73D08, 0x00000000, 0x00000004, D_80242144_D70AF4, 0x00000000, 0xC47A0000, 0x00000000, 0x03D40D09, D_802451BC_D73B6C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, D_8024536C_D73D1C, 0x00000000, 0x00000005, D_80242170_D70B20, 0x00000000, 0xC47A0000, 0x00000000, 0x03D44D08, D_80245210_D73BC0, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000000, 0x00000000, D_80245380_D73D30, 0x00000000, 0x00000006, D_802420C0_D70A70, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40D08, D_80245268_D73C18, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_80246124_D74AD4
-.word 0x00000007, D_80242170_D70B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00D40D00, D_80245290_D73C40, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000000, 0x00000000, D_80245380_D73D30, 0x00000000, 0x00000008, D_80242170_D70B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00D40D00, D_802452B8_D73C68, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000000, 0x00000000, D_80245380_D73D30, 0x00000000, 0x00000009, D_80242170_D70B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00D40D00, D_802452E0_D73C90, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000000, 0x00000000, D_80245380_D73D30, 0x00000000, 0x0000000A, D_80242170_D70B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00D40D00, D_80245308_D73CB8, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000000, 0x00000000, D_80245380_D73D30, 0x00000000, 0x0000000B, D_80242170_D70B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00E44D00, D_80245024_D739D4, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000000, 0x00000000, D_80245380_D73D30, 0x00000000
-
-dlabel D_80246AD4_D75484
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246B3C_D754EC
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246BA4_D75554
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246C0C_D755BC
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246C74_D75624
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246CDC_D7568C
-.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246D2C_D756DC
-.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246D7C_D7572C
-.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0x00000003, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246DCC_D7577C
-.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0x00000004, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246E1C_D757CC
-.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0x00000005, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246E6C_D7581C
-.word 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_80246CDC_D7568C, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80246AD4_D75484, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246EBC_D7586C
-.word 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_80246D2C_D756DC, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80246B3C_D754EC, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246F0C_D758BC
-.word 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_80246D7C_D7572C, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80246BA4_D75554, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246F5C_D7590C
-.word 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_80246DCC_D7577C, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80246C0C_D755BC, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246FAC_D7595C
-.word 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_80246E1C_D757CC, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80246C74_D75624, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80246FFC_D759AC
-.word 0x0000000C, D_802420C0_D70A70, 0x00000000, 0xC47A0000, 0x00000000, 0x03F44D08, D_80246E6C_D7581C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000D, D_802420EC_D70A9C, 0x00000000, 0xC47A0000, 0x00000000, 0x03F44D08, D_80246EBC_D7586C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x009D0001, 0x009D0002, 0x009D0003, 0x009D0003, 0x009D0001, 0x009D0001, 0x009D0000, 0x009D0000, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x00000000, 0x00000000, D_80245330_D73CE0, 0x00000000, 0x0000000E, D_802420C0_D70A70, 0x00000000, 0xC47A0000, 0x00000000, 0x03F44D08, D_80246F0C_D758BC, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, D_80245344_D73CF4, 0x00000000, 0x0000000F, D_80242118_D70AC8, 0x00000000, 0xC47A0000, 0x00000000, 0x03F44D08, D_80246F5C_D7590C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00B50001, 0x00000000, 0x00000000, D_80245358_D73D08, 0x00000000, 0x00000010, D_80242144_D70AF4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F44D08, D_80246FAC_D7595C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, D_8024536C_D73D1C, 0x00000000, 0x00000007, D_80245394_D73D44, 0x21010002, 0x00000005, D_80246124_D74AD4, 0x21010002, 0x00000005, D_80246FFC_D759AC, 0x21010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_20/D772C0.data.s b/ver/us/asm/data/world/area_pra/pra_20/D772C0.data.s
deleted file mode 100644
index cccafebae6..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_20/D772C0.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240F20_D772C0
-.word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x42FC0000, 0x00000000, 0x43090000, 0x00000000, 0x436D0000, 0x00000000, 0x428C0000, 0x43870000, 0x436D0000, 0x00000000, 0xC28C0000, 0x43870000, 0x42FC0000, 0x00000000, 0xC3090000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241A14, D_80240F20_D772C0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190146, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_20/D77390.data.s b/ver/us/asm/data/world/area_pra/pra_20/D77390.data.s
deleted file mode 100644
index 9234a0584e..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_20/D77390.data.s
+++ /dev/null
@@ -1,60 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240FF0_D77390
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241100_D774A0
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_20_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_20_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_20_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_20_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802411A8_D77548
-.word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802412AC_D7764C
-.word 0x0000003C, 0x0000003D, 0xFFFFFFFF
-
-dlabel D_802412B8_D77658
-.word 0x00000000, 0x00000001, 0xFFFFFFFF
-
-dlabel D_802412C4_D77664
-.word 0x0000002A, 0x0000002B, 0xFFFFFFFF
-
-dlabel D_802412D0_D77670
-.word 0x0000002D, 0x0000002E, 0xFFFFFFFF
-
-dlabel D_802412DC_D7767C
-.word 0x00000014, 0x00000015, 0xFFFFFFFF
-
-dlabel D_802412E8_D77688
-.word 0x00000011, 0x00000012, 0xFFFFFFFF
-
-dlabel D_802412F4_D77694
-.word 0x0000002A, 0x0000002B, 0x00000014, 0x00000015, 0xFFFFFFFF
-
-dlabel D_80241308_D776A8
-.word 0x0000002D, 0x0000002E, 0x00000011, 0x00000012, 0xFFFFFFFF
-
-dlabel D_8024131C_D776BC
-.word 0xFFFFFFFF
-
-dlabel D_80241320_D776C0
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241B60, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024137C_D7771C
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000020, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412AC_D7764C, 0x00000024, 0x00000002, 0xFE363C83, D_802412B8_D77658, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412AC_D7764C, 0x00000024, 0x00000002, 0xFE363C83, D_8024131C_D776BC, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241B68, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241460_D77800
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412F4_D77694, 0x00000024, 0x00000002, 0xFE363C83, D_80241308_D776A8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412C4_D77664, 0x00000024, 0x00000002, 0xFE363C83, D_802412D0_D77670, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241B70, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241544_D778E4
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000017, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412F4_D77694, 0x00000024, 0x00000002, 0xFE363C83, D_80241308_D776A8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412DC_D7767C, 0x00000024, 0x00000002, 0xFE363C83, D_802412E8_D77688, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241B70, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241628_D779C8
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001C, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412AC_D7764C, 0x00000024, 0x00000002, 0xFE363C83, D_802412B8_D77658, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024131C_D776BC, 0x00000024, 0x00000002, 0xFE363C83, D_802412B8_D77658, 0x00000013, 0x00000000, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241B78, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024170C_D77AAC
-.word 0x00000047, 0x00000005, D_80241320_D776C0, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024137C_D7771C, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241460_D77800, 0x00000100, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241544_D778E4, 0x00000100, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241628_D779C8, 0x00000100, 0x0000001C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802417A8_D77B48
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024170C_D77AAC, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412AC_D7764C, 0x00000024, 0x00000002, 0xFE363C83, D_802412B8_D77658, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412AC_D7764C, 0x00000024, 0x00000002, 0xFE363C83, D_8024131C_D776BC, 0x00000013, 0x00000000, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_8024170C_D77AAC, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412F4_D77694, 0x00000024, 0x00000002, 0xFE363C83, D_80241308_D776A8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412C4_D77664, 0x00000024, 0x00000002, 0xFE363C83, D_802412D0_D77670, 0x00000013, 0x00000000, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_8024170C_D77AAC, 0x00000016, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412F4_D77694, 0x00000024, 0x00000002, 0xFE363C83, D_80241308_D776A8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412DC_D7767C, 0x00000024, 0x00000002, 0xFE363C83, D_802412E8_D77688, 0x00000013, 0x00000000, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_8024170C_D77AAC, 0x00000016, 0x00000001, 0x00000004, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412AC_D7764C, 0x00000024, 0x00000002, 0xFE363C83, D_802412B8_D77658, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802412B8_D77658, 0x00000024, 0x00000002, 0xFE363C83, D_8024131C_D776BC, 0x00000013, 0x00000000, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_8024170C_D77AAC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000044, 0x00000001, 0x80240FB0, 0x00000043, 0x00000003, EnableModel, 0x00000034, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x00000019, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000044, 0x00000001, D_802411A8_D77548, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_80241100_D774A0, 0x00000044, 0x00000001, D_802417A8_D77B48, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_21/D78040.data.s b/ver/us/asm/data/world/area_pra/pra_21/D78040.data.s
deleted file mode 100644
index 45e8987d38..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_21/D78040.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240120_D78040
-.word 0x42FC0000, 0x00000000, 0xC3090000, 0x43340000, 0x43F38000, 0xC3480000, 0xC28C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240410, D_80240120_D78040, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190147, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_21/D780E0.data.s b/ver/us/asm/data/world/area_pra/pra_21/D780E0.data.s
deleted file mode 100644
index 8c93ff38cb..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_21/D780E0.data.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802401C0_D780E0
-.word 0x00000031, 0xFFFFFFFF
-
-dlabel D_802401C8_D780E8
-.word 0x0000002F, 0xFFFFFFFF
-
-dlabel D_802401D0_D780F0
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240950, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240274_D78194
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000020, 0x00000024, 0x00000002, 0xFE363C82, D_802401C0_D780E0, 0x00000024, 0x00000002, 0xFE363C83, D_802401C8_D780E8, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240958, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240318_D78238
-.word 0x00000047, 0x00000005, D_802401D0_D780F0, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240274_D78194, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240360_D78280
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, D_802401C0_D780E0, 0x00000024, 0x00000002, 0xFE363C83, D_802401C8_D780E8, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80240318_D78238, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80240878, 0x00000044, 0x00000001, 0x80240180, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE029E, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000032, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000026, 0x00000022, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000025, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000027, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000026, 0x00000044, 0x00000001, D_80240360_D78280, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_21/D78540.data.s b/ver/us/asm/data/world/area_pra/pra_21/D78540.data.s
deleted file mode 100644
index ac9654338a..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_21/D78540.data.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240620_D78540
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802406B0_D785D0
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240620_D78540, 0xFE363C8A, 0x00000043, 0x00000001, func_80240020_D77F40, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240620_D78540, 0xFE363C8A, 0x0000000A, 0x00000002, 0xF5DE029E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000154, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000019A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802400AC_D77FCC, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x0000016E, 0xFFFFFF38, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802406B0_D785D0, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000037, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406165, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000032, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x00000011, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406166, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_22/D78B50.data.s b/ver/us/asm/data/world/area_pra/pra_22/D78B50.data.s
deleted file mode 100644
index 20eae0492c..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_22/D78B50.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802402D0_D78B50
-.word 0x42FC0000, 0x00000000, 0x43090000, 0x00000000, 0x43F38000, 0xC3480000, 0x428C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240C00, D_802402D0_D78B50, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190148, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s b/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s
deleted file mode 100644
index 1a40c243cb..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240370_D78BF0
-.word 0x0000002D, 0xFFFFFFFF
-
-dlabel D_80240378_D78BF8
-.word 0x0000002F, 0xFFFFFFFF
-
-dlabel D_80240380_D78C00
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241160, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240424_D78CA4
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000024, 0x00000002, 0xFE363C82, D_80240370_D78BF0, 0x00000024, 0x00000002, 0xFE363C83, D_80240378_D78BF8, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241168, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802404C8_D78D48
-.word 0x00000047, 0x00000005, D_80240380_D78C00, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240424_D78CA4, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240510_D78D90
-.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_802404C8_D78D48, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, D_80240370_D78BF0, 0x00000024, 0x00000002, 0xFE363C83, D_80240378_D78BF8, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_802404C8_D78D48, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240608_D78E88
-.word 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_22_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400DC_D7895C, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080002, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001C, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240AB0_D79330
-.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000151, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x0000019D, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000046, 0x00000001, D_80240608_D78E88, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000024, 0x00000002, 0xF5DE029E, 0xFE363C88, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80241088, 0x00000044, 0x00000001, 0x80240330, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000047, 0x00000005, D_80240AB0_D79330, 0x00000040, 0x0000001C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE029E, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000032, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000021, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000044, 0x00000001, D_80240510_D78D90, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_22/D796B0.data.s b/ver/us/asm/data/world/area_pra/pra_22/D796B0.data.s
deleted file mode 100644
index 3adee6f8c1..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_22/D796B0.data.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240E30_D796B0
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80240EC0_D79740
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240E30_D796B0, 0xFE363C8A, 0x00000043, 0x00000001, func_802401D0_D78A50, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240E30_D796B0, 0xFE363C8A, 0x0000000A, 0x00000002, 0xF5DE029E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000154, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000019A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_8024025C_D78ADC, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x0000016E, 0xFFFFFF38, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240EC0_D79740, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000037, 0x00000050, 0x0000004B, 0x00000000, 0x000000A2, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406167, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000032, 0x00000000, 0x0000004B, 0x00000000, 0x00000037, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406168, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_27/D7AC00.data.s b/ver/us/asm/data/world/area_pra/pra_27/D7AC00.data.s
deleted file mode 100644
index aefdd1dd2b..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_27/D7AC00.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241210_D7AC00
-.word 0x41B80000, 0x00000000, 0x428C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241598, D_80241210_D7AC00, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190149, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_27/D7AC90.data.s b/ver/us/asm/data/world/area_pra/pra_27/D7AC90.data.s
deleted file mode 100644
index 6a0ebd1729..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_27/D7AC90.data.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802412A0_D7AC90
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802413B0_D7ADA0
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_27_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_27_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_27_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_27_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241458_D7AE48
-.word 0x00000016, 0x00000017, 0xFFFFFFFF
-
-dlabel D_80241464_D7AE54
-.word 0x00000013, 0x00000014, 0xFFFFFFFF
-
-dlabel D_80241470_D7AE60
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, D_80241458_D7AE48, 0x00000024, 0x00000002, 0xFE363C83, D_80241464_D7AE54, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024189C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241514_D7AF04
-.word 0x00000047, 0x00000005, D_80241470_D7AE60, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241540_D7AF30
-.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241458_D7AE48, 0x00000024, 0x00000002, 0xFE363C83, D_80241464_D7AE54, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_80241514_D7AF04, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80241828, 0x00000044, 0x00000001, 0x80241260, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_802413B0_D7ADA0, 0x00000044, 0x00000001, D_80241540_D7AF30, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s b/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s
deleted file mode 100644
index 2ee7725818..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel pra_27_varStash
-.word 0x00000000
-
-dlabel D_80241694_D7B084
-.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802416FC_D7B0EC
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241694_D7B084, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802417DC_D7B1CC
-.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000014, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406169, 0x00000001, 0x00000046, 0x00000001, D_802416FC_D7B0EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406169, 0x00000043, 0x00000002, AssignScript, D_802417DC_D7B1CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_28/D7C4B0.data.s b/ver/us/asm/data/world/area_pra/pra_28/D7C4B0.data.s
deleted file mode 100644
index 6857b7601f..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_28/D7C4B0.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241210_D7C4B0
-.word 0x41B80000, 0x00000000, 0x428C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241598, D_80241210_D7C4B0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019014A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_28/D7C540.data.s b/ver/us/asm/data/world/area_pra/pra_28/D7C540.data.s
deleted file mode 100644
index 717793f30b..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_28/D7C540.data.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802412A0_D7C540
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802413B0_D7C650
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_28_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_28_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_28_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_28_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241458_D7C6F8
-.word 0x00000016, 0x00000017, 0xFFFFFFFF
-
-dlabel D_80241464_D7C704
-.word 0x00000013, 0x00000014, 0xFFFFFFFF
-
-dlabel D_80241470_D7C710
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, D_80241458_D7C6F8, 0x00000024, 0x00000002, 0xFE363C83, D_80241464_D7C704, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024189C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241514_D7C7B4
-.word 0x00000047, 0x00000005, D_80241470_D7C710, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241540_D7C7E0
-.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_80241458_D7C6F8, 0x00000024, 0x00000002, 0xFE363C83, D_80241464_D7C704, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_80241514_D7C7B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80241828, 0x00000044, 0x00000001, 0x80241260, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_802413B0_D7C650, 0x00000044, 0x00000001, D_80241540_D7C7E0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s b/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s
deleted file mode 100644
index 13ad5d7598..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel pra_28_varStash
-.word 0x00000000
-
-dlabel D_80241694_D7C934
-.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802416FC_D7C99C
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241694_D7C934, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802417DC_D7CA7C
-.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000113, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840616A, 0x00000001, 0x00000046, 0x00000001, D_802416FC_D7C99C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840616A, 0x00000043, 0x00000002, AssignScript, D_802417DC_D7CA7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_33/D8A770.data.s b/ver/us/asm/data/world/area_pra/pra_33/D8A770.data.s
deleted file mode 100644
index f5e3d6b89f..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_33/D8A770.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241090_D8A770
-.word 0x43F38000, 0x00000000, 0x428C0000, 0x43870000, 0x41500000, 0x00000000, 0xC28C0000, 0x42B40000, 0x43F38000, 0x00000000, 0xC28C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802417D4, D_80241090_D8A770, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019014E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_33/D8A820.data.s b/ver/us/asm/data/world/area_pra/pra_33/D8A820.data.s
deleted file mode 100644
index 98e690589e..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_33/D8A820.data.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241140_D8A820
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241250_D8A930
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_33_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_33_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_33_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_33_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802412F8_D8A9D8
-.word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802413FC_D8AADC
-.word 0x00000028, 0xFFFFFFFF
-
-dlabel D_80241404_D8AAE4
-.word 0x0000002A, 0xFFFFFFFF
-
-dlabel D_8024140C_D8AAEC
-.word 0x00000012, 0xFFFFFFFF
-
-dlabel D_80241414_D8AAF4
-.word 0x00000014, 0xFFFFFFFF
-
-dlabel D_8024141C_D8AAFC
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000015, 0x00000024, 0x00000002, 0xFE363C82, D_802413FC_D8AADC, 0x00000024, 0x00000002, 0xFE363C83, D_80241404_D8AAE4, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241CC0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802414C0_D8ABA0
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000024, 0x00000002, 0xFE363C82, D_8024140C_D8AAEC, 0x00000024, 0x00000002, 0xFE363C83, D_80241414_D8AAF4, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241CC8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241564_D8AC44
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241CC0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802415D0_D8ACB0
-.word 0x00000047, 0x00000005, D_8024141C_D8AAFC, 0x00000100, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802414C0_D8ABA0, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241564_D8AC44, 0x00080000, 0x00000017, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241634_D8AD14
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_802413FC_D8AADC, 0x00000024, 0x00000002, 0xFE363C83, D_80241404_D8AAE4, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_802415D0_D8ACB0, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, D_8024140C_D8AAEC, 0x00000024, 0x00000002, 0xFE363C83, D_80241414_D8AAF4, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_802415D0_D8ACB0, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_802415D0_D8ACB0, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241718_D8ADF8
-.word 0x43F38000, 0x00000000, 0xC2A00000, 0x00000000
-
-dlabel D_80241728_D8AE08
-.word 0x00000024, 0x00000002, 0xF840616C, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x00000002, 0x00000022, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000007, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80241BE0, 0x00000044, 0x00000001, 0x80241100, 0x0000000A, 0x00000002, 0xF840616C, 0x00000000, 0x00000047, 0x00000005, D_80241728_D8AE08, 0x00100000, D_80241718_D8ADF8, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000007, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000002, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C81, 0x00000034, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000044, 0x00000001, D_802412F8_D8A9D8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_80241250_D8A930, 0x00000044, 0x00000001, D_80241634_D8AD14, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_33/D8B060.data.s b/ver/us/asm/data/world/area_pra/pra_33/D8B060.data.s
deleted file mode 100644
index 2640671a2f..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_33/D8B060.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241980_D8B060
-.word 0x0000000A, 0x00000002, 0xF9718883, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001D, 0x0000002E, 0x00000000, 0x00000043, 0x00000001, func_80240F20_D8A600, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001D, 0x7FFFFE00, 0x00000043, 0x00000001, func_80240F58_D8A638, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0x000000B4, 0x00000168, 0x0000000F, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x0000000F, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000033, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000001, func_80240F20_D8A600, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000043, 0x00000001, func_80241000_D8A6E0, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, func_80240F20_D8A600, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001D, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF840616B, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x00000136, 0x00000000, 0x0000006E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241980_D8B060, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x00000136, 0x00000000, 0xFFFFFF92, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241980_D8B060, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000031, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000031, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001D, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_36/D92650.data.s b/ver/us/asm/data/world/area_pra/pra_36/D92650.data.s
deleted file mode 100644
index d8c9a16b86..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_36/D92650.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240F50_D92650
-.word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x43F38000, 0x00000000, 0x428C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241468, D_80240F50_D92650, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190151, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_36/D926F0.data.s b/ver/us/asm/data/world/area_pra/pra_36/D926F0.data.s
deleted file mode 100644
index ff4523955f..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_36/D926F0.data.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80240FF0_D926F0
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241100_D92800
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_36_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_36_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_36_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_36_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802411A8_D928A8
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024182C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_8024126C_D9296C
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241834, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241330_D92A30
-.word 0x00000047, 0x00000005, D_802411A8_D928A8, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024126C_D9296C, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241378_D92A78
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000046, 0x00000001, 0x80285EC4, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000046, 0x00000001, 0x80285EC4, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80241330_D92A30, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, D_802417F4_D92EF4, 0x00000044, 0x00000001, 0x80240FB0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_80241100_D92800, 0x00000044, 0x00000001, D_80241378_D92A78, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241560_D92C60
-.word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000004, 0x40600000, 0x0000001E, 0x00000003, 0x43160000, 0x00000000, 0x00000001
-
-dlabel D_80241590_D92C90
-.word 0x00000043, 0x00000002, BasicAI_Main, D_80241560_D92C60, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802415B0_D92CB0
-.word 0x00000000, 0x001E001E, 0x00000000, 0x00000000, D_80241590_D92C90, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000
-
-dlabel D_802415DC_D92CDC
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241604_D92D04
-.word 0x00000000, D_802415B0_D92CB0, 0x437A0000, 0x00000000, 0x42960000, 0x00200C00, D_802415DC_D92CDC, 0x00000000, 0x00000000, 0x0000005A, 0x80050096, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x000000FA, 0x00000000, 0x0000004B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000FA, 0x00000000, 0x0000004B, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000002, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_802417F4_D92EF4
-.word 0x00000001, D_80241604_D92D04, 0x210A0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_37/D94760.data.s b/ver/us/asm/data/world/area_pra/pra_37/D94760.data.s
deleted file mode 100644
index 66fa3f48d1..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_37/D94760.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241820_D94760
-.word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x43F38000, 0x00000000, 0x428C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241D38, D_80241820_D94760, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190152, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s b/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s
deleted file mode 100644
index 0c21bd71d6..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s
+++ /dev/null
@@ -1,51 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802418C0_D94800
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802419D0_D94910
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_37_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_37_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_37_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_37_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241A78_D949B8
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802424FC, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241B3C_D94A7C
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242504, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241C00_D94B40
-.word 0x00000047, 0x00000005, D_80241A78_D949B8, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241B3C_D94A7C, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241C48_D94B88
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000046, 0x00000001, 0x80285EC4, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000046, 0x00000001, 0x80285EC4, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80241C00_D94B40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, D_802424C4_D95404, 0x00000044, 0x00000001, 0x80241880, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_802419D0_D94910, 0x00000044, 0x00000001, D_80241C48_D94B88, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241E30_D94D70
-.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF
-
-dlabel D_80241F14_D94E54
-.word 0x00390000, 0xFFFFFFFF
-
-dlabel D_80241F1C_D94E5C
-.word 0x3FC00000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001
-
-dlabel D_80241F4C_D94E8C
-.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, pra_37_WanderMeleeAI_Main, D_80241F1C_D94E5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241FBC_D94EFC
-.word 0x00000000, 0x00240022, 0x00000000, 0x00000000, D_80241F4C_D94E8C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000
-
-dlabel D_80241FE8_D94F28
-.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, pra_37_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80242090_D94FD0
-.word 0x00000000, 0x000E0010, 0x00000000, 0x00000000, D_80241FE8_D94F28, 0x00000000, 0x00000000, D_80241E30_D94D70, 0x00000000, 0x00000000, 0x00170008
-
-dlabel D_802420BC_D94FFC
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802420E4_D95024
-.word 0x00000000, D_80241FBC_D94EFC, 0x432F0000, 0x00000000, 0x42960000, 0x00000C00, D_802420BC_D94FFC, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000AF, 0x00000000, 0x0000004B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000AF, 0x00000000, 0x0000004B, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242090_D94FD0, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000000, 0x00000000, D_80241F14_D94E54, 0x00000000
-
-dlabel D_802424C4_D95404
-.word 0x00000002, D_802420E4_D95024, 0x1F0D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_38/D96CD0.data.s b/ver/us/asm/data/world/area_pra/pra_38/D96CD0.data.s
deleted file mode 100644
index 6c8b62a2b1..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_38/D96CD0.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802416E0_D96CD0
-.word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x43F38000, 0x00000000, 0x428C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241BF8, D_802416E0_D96CD0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190153, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_38/D96D70.data.s b/ver/us/asm/data/world/area_pra/pra_38/D96D70.data.s
deleted file mode 100644
index 1125850b25..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_38/D96D70.data.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241780_D96D70
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241890_D96E80
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_38_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_38_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_38_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_38_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241938_D96F28
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024223C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802419FC_D96FEC
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242244, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241AC0_D970B0
-.word 0x00000047, 0x00000005, D_80241938_D96F28, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802419FC_D96FEC, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241B08_D970F8
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000046, 0x00000001, 0x80285EC4, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000046, 0x00000001, 0x80285EC4, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80241AC0_D970B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, D_802421F0_D977E0, 0x00000044, 0x00000001, 0x80241740, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_80241890_D96E80, 0x00000044, 0x00000001, D_80241B08_D970F8, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241CF0_D972E0
-.word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001
-
-dlabel D_80241D20_D97310
-.word 0x00000043, 0x00000002, pra_38_UnkFunc001, D_80241CF0_D972E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241D40_D97330
-.word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001
-
-dlabel D_80241D70_D97360
-.word 0x00000043, 0x00000002, pra_38_UnkFunc001, D_80241D40_D97330, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, D_80241D20_D97310, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000800, 0x00000000, 0x000A0000
-
-dlabel D_80241DBC_D973AC
-.word 0x00000000, 0x00140014, 0x00000000, 0x00000000, D_80241D70_D97360, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000800, 0x00000000, 0x00160000
-
-dlabel D_80241DE8_D973D8
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241E10_D97400
-.word 0x00000000, D_80241DBC_D973AC, 0x432F0000, 0x43020000, 0x42960000, 0x00200C00, D_80241DE8_D973D8, 0x00000000, 0x00000000, 0x0000010E, 0x8005008B, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x000000AF, 0x00000082, 0x0000004B, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000AF, 0x00000082, 0x0000004B, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0034011B, 0x00340102, 0x00340102, 0x00340102, 0x0034011B, 0x0034011B, 0x00340104, 0x00340115, 0x00340100, 0x00340100, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00000002, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_80242000_D975F0
-.word 0x00000001, D_80241DBC_D973AC, 0x43A28000, 0x43020000, 0x42960000, 0x00200C00, D_80241DE8_D973D8, 0x00000000, 0x00000000, 0x0000010E, 0x8005008B, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x00000145, 0x00000082, 0x0000004B, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000145, 0x00000082, 0x0000004B, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0034011B, 0x00340102, 0x00340102, 0x00340102, 0x0034011B, 0x0034011B, 0x00340104, 0x00340115, 0x00340100, 0x00340100, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00340101, 0x00000002, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_802421F0_D977E0
-.word 0x00000001, D_80241E10_D97400, 0x1F010001, 0x00000001, D_80242000_D975F0, 0x1F020001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_39/D98F70.data.s b/ver/us/asm/data/world/area_pra/pra_39/D98F70.data.s
deleted file mode 100644
index 71c2162402..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_39/D98F70.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_802416E0_D98F70
-.word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x43F38000, 0x00000000, 0x428C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241BF8, D_802416E0_D98F70, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190154, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_39/D99010.data.s b/ver/us/asm/data/world/area_pra/pra_39/D99010.data.s
deleted file mode 100644
index 2a4e8de069..0000000000
--- a/ver/us/asm/data/world/area_pra/pra_39/D99010.data.s
+++ /dev/null
@@ -1,51 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_80241780_D99010
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241890_D99120
-.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_39_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_39_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_39_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_39_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241938_D991C8
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802420BC, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_802419FC_D9928C
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802420C4, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241AC0_D99350
-.word 0x00000047, 0x00000005, D_80241938_D991C8, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802419FC_D9928C, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241B08_D99398
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000046, 0x00000001, 0x80285EC4, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000046, 0x00000001, 0x80285EC4, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80241AC0_D99350, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, D_8024207C_D9990C, 0x00000044, 0x00000001, 0x80241740, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_80241890_D99120, 0x00000044, 0x00000001, D_80241B08_D99398, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241CF0_D99580
-.word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001
-
-dlabel D_80241D20_D995B0
-.word 0x00000043, 0x00000002, pra_39_UnkFunc001, D_80241CF0_D99580, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241D40_D995D0
-.word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001
-
-dlabel D_80241D70_D99600
-.word 0x00000043, 0x00000002, pra_39_UnkFunc001, D_80241D40_D995D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, D_80241D20_D995B0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000800, 0x00000000, 0x000A0000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, D_80241D70_D99600, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000800, 0x00000000, 0x00160000
-
-dlabel D_80241DE8_D99678
-.word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000004, 0x40600000, 0x0000001E, 0x00000003, 0x43160000, 0x00000000, 0x00000001
-
-dlabel D_80241E18_D996A8
-.word 0x00000043, 0x00000002, BasicAI_Main, D_80241DE8_D99678, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241E38_D996C8
-.word 0x00000000, 0x001E001E, 0x00000000, 0x00000000, D_80241E18_D996A8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000
-
-dlabel D_80241E64_D996F4
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
-
-dlabel D_80241E8C_D9971C
-.word 0x00000000, D_80241E38_D996C8, 0x437A0000, 0x00000000, 0x42960000, 0x00200C00, D_80241E64_D996F4, 0x00000000, 0x00000000, 0x0000005A, 0x80050096, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x000000FA, 0x00000000, 0x0000004B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000FA, 0x00000000, 0x0000004B, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000002, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_8024207C_D9990C
-.word 0x00000001, D_80241E8C_D9971C, 0x21080001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 86ffcbd456..217d04b909 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -14056,63 +14056,58 @@ segments:
     start: 0xD4D040
     vram: 0x80240000
     subsegments:
-    - [0xD4D040, c]
-    - [0xD4D060, c]
-    - [0xD4E3F0, data]
-    - [0xD4E500, data]
-    - [0xD4EF50, data]
-    - [0xD4FFC0, data]
-    - [0xD4FFD0]
+    - [0xD4D040, c, pra_01_0_header]
+    - [0xD4D060, c, pra_01_1_music]
+    - [0xD4D060, c, pra_01_2_main]
+    - [0xD4DFC0, c, pra_01_3_npc]
+    - [0xD4E3F0, c, pra_01_4_entity]
+    - [0xD4E3F0]
   - name: pra_02
     dir: world/area_pra/pra_02
     type: code
     start: 0xD4FFF0
     vram: 0x80240000
     subsegments:
-    - [0xD4FFF0, c]
-    - [0xD50010, c]
-    - [0xD51650, data]
-    - [0xD51720, data]
-    - [0xD52A80, data]
-    - [0xD52DE0, data]
-    - [0xD53C80]
+    - [0xD4FFF0, c, pra_02_0_header]
+    - [0xD50010, c, pra_02_1_music]
+    - [0xD50010, c, pra_02_2_main]
+    - [0xD50F10, c, pra_02_3_npc]
+    - [0xD51300, c, pra_02_4_entity]
+    - [0xD51650]
   - name: pra_03
     dir: world/area_pra/pra_03
     type: code
     start: 0xD53CB0
     vram: 0x80240000
     subsegments:
-    - [0xD53CB0, c]
-    - [0xD53CD0, c]
-    - [0xD53E60, data]
-    - [0xD53F10, data]
-    - [0xD543C0, data]
-    - [0xD54670]
+    - [0xD53CB0, c, pra_03_0_header]
+    - [0xD53CD0, c, pra_03_1_music]
+    - [0xD53CD0, c, pra_03_2_main]
+    - [0xD53CD0, c, pra_03_3_entity]
+    - [0xD53E60]
   - name: pra_04
     dir: world/area_pra/pra_04
     type: code
     start: 0xD54690
     vram: 0x80240000
     subsegments:
-    - [0xD54690, c]
-    - [0xD546B0, c]
-    - [0xD54840, c]
-    - [0xD54FD0, data]
-    - [0xD55080, data]
-    - [0xD554E0, data]
-    - [0xD55840, data]
-    - [0xD55B40]
+    - [0xD54690, c, pra_04_0_header]
+    - [0xD546B0, c, pra_04_1_music]
+    - [0xD546B0, c, pra_04_2_main]
+    - [0xD546B0, c, pra_04_3_entity]
+    - [0xD54840, c, pra_04_4_npc]
+    - [0xD54FD0]
   - name: pra_05
     dir: world/area_pra/pra_05
     type: code
     start: 0xD55BB0
     vram: 0x80240000
     subsegments:
-    - [0xD55BB0, c]
-    - [0xD55BD0, c]
-    - [0xD56D90, data]
-    - [0xD56E20, data]
-    - [0xD57420]
+    - [0xD55BB0, c, pra_05_0_header]
+    - [0xD55BD0, c, pra_05_1_music]
+    - [0xD55BD0, c, pra_05_2_main]
+    - [0xD56AD0, c, pra_05_3_entity]
+    - [0xD56D90]
   - name: pra_06
     dir: world/area_pra/pra_06
     type: code
@@ -14141,33 +14136,33 @@ segments:
     start: 0xD5F2B0
     vram: 0x80240000
     subsegments:
-    - [0xD5F2B0, c]
-    - [0xD5F2D0, c]
-    - [0xD60960, data]
-    - [0xD60A00, data]
-    - [0xD614A0]
+    - [0xD5F2B0, c, pra_10_0_header]
+    - [0xD5F2D0, c, pra_10_1_music]
+    - [0xD5F2D0, c, pra_10_2_main]
+    - [0xD601D0, c, pra_10_3_npc]
+    - [0xD60960]
   - name: pra_11
     dir: world/area_pra/pra_11
     type: code
     start: 0xD61500
     vram: 0x80240000
     subsegments:
-    - [0xD61500, c]
-    - [0xD61520, c]
-    - [0xD626E0, data]
-    - [0xD62770, data]
-    - [0xD62B10, data]
-    - [0xD62D00]
+    - [0xD61500, c, pra_11_0_header]
+    - [0xD61520, c, pra_11_1_music]
+    - [0xD61520, c, pra_11_2_main]
+    - [0xD62420, c, pra_11_3_entity]
+    - [0xD626E0]
   - name: pra_12
     dir: world/area_pra/pra_12
     type: code
     start: 0xD62D10
     vram: 0x80240000
     subsegments:
-    - [0xD62D10, c]
-    - [0xD63F20, data]
-    - [0xD63FB0, data]
-    - [0xD645B0]
+    - [0xD62D10, c, pra_12_0_header]
+    - [0xD62D10, c, pra_12_1_music]
+    - [0xD62D10, c, pra_12_2_main]
+    - [0xD63C60, c, pra_12_3_entity]
+    - [0xD63F20]
   - name: pra_13
     dir: world/area_pra/pra_13
     type: code
@@ -14186,12 +14181,11 @@ segments:
     start: 0xD67D00
     vram: 0x80240000
     subsegments:
-    - [0xD67D00, c]
-    - [0xD67D20, c]
-    - [0xD68EE0, data]
-    - [0xD68F80, data]
-    - [0xD69630, data]
-    - [0xD69800]
+    - [0xD67D00, c, pra_14_0_header]
+    - [0xD67D20, c, pra_14_1_music]
+    - [0xD67D20, c, pra_14_2_main]
+    - [0xD68C20, c, pra_14_3_entity]
+    - [0xD68EE0]
   - name: pra_15
     dir: world/area_pra/pra_15
     type: code
@@ -14209,11 +14203,10 @@ segments:
     start: 0xD69B20
     vram: 0x80240000
     subsegments:
-    - [0xD69B20, c]
-    - [0xD69B40, c]
-    - [0xD6AA40, data]
-    - [0xD6AAF0, data]
-    - [0xD6B610]
+    - [0xD69B20, c, pra_16_0_header]
+    - [0xD69B40, c, pra_16_1_music]
+    - [0xD69B40, c, pra_16_2_main]
+    - [0xD6AA40]
   - name: pra_18
     dir: world/area_pra/pra_18
     type: code
@@ -14232,69 +14225,65 @@ segments:
     start: 0xD6E9B0
     vram: 0x80240000
     subsegments:
-    - [0xD6E9B0, c]
-    - [0xD6E9D0, c]
-    - [0xD70360, data]
-    - [0xD70400, data]
-    - [0xD70A70, data]
-    - [0xD76390]
+    - [0xD6E9B0, c, pra_19_0_header]
+    - [0xD6E9D0, c, pra_19_1_music]
+    - [0xD6E9D0, c, pra_19_2_main]
+    - [0xD6F8D0, c, pra_19_3_npc]
+    - [0xD70360]
   - name: pra_20
     dir: world/area_pra/pra_20
     type: code
     start: 0xD763A0
     vram: 0x80240000
     subsegments:
-    - [0xD763A0, c]
-    - [0xD763C0, c]
-    - [0xD772C0, data]
-    - [0xD77390, data]
-    - [0xD77F00]
+    - [0xD763A0, c, pra_20_0_header]
+    - [0xD763C0, c, pra_20_1_music]
+    - [0xD763C0, c, pra_20_2_main]
+    - [0xD772C0]
   - name: pra_21
     dir: world/area_pra/pra_21
     type: code
     start: 0xD77F20
     vram: 0x80240000
     subsegments:
-    - [0xD77F20, c]
-    - [0xD77F40, c]
-    - [0xD78040, data]
-    - [0xD780E0, data]
-    - [0xD78540, data]
-    - [0xD78870]
+    - [0xD77F20, c, pra_21_0_header]
+    - [0xD77F40, c, pra_21_1_music]
+    - [0xD77F40, c, pra_21_2_main]
+    - [0xD77F40, c, pra_21_3_entity]
+    - [0xD78040]
   - name: pra_22
     dir: world/area_pra/pra_22
     type: code
     start: 0xD78880
     vram: 0x80240000
     subsegments:
-    - [0xD78880, c]
-    - [0xD788A0, c]
-    - [0xD78B50, data]
-    - [0xD78BF0, data]
-    - [0xD796B0, data]
-    - [0xD799E0]
+    - [0xD78880, c, pra_22_0_header]
+    - [0xD788A0, c, pra_22_1_music]
+    - [0xD788A0, c, pra_22_2_main]
+    - [0xD78A50, c, pra_22_3_entity]
+    - [0xD78B50]
   - name: pra_27
     dir: world/area_pra/pra_27
     type: code
     start: 0xD799F0
     vram: 0x80240000
     subsegments:
-    - [0xD799F0, c]
-    - [0xD7AC00, data]
-    - [0xD7AC90, data]
-    - [0xD7B080, data]
-    - [0xD7B270]
+    - [0xD799F0, c, pra_27_0_header]
+    - [0xD799F0, c, pra_27_1_music]
+    - [0xD799F0, c, pra_27_2_main]
+    - [0xD7A940, c, pra_27_3_entity]
+    - [0xD7AC00]
   - name: pra_28
     dir: world/area_pra/pra_28
     type: code
     start: 0xD7B2A0
     vram: 0x80240000
     subsegments:
-    - [0xD7B2A0, c]
-    - [0xD7C4B0, data]
-    - [0xD7C540, data]
-    - [0xD7C930, data]
-    - [0xD7CB20]
+    - [0xD7B2A0, c, pra_28_0_header]
+    - [0xD7B2A0, c, pra_28_1_music]
+    - [0xD7B2A0, c, pra_28_2_main]
+    - [0xD7C1F0, c, pra_28_3_entity]
+    - [0xD7C4B0]
   - name: pra_29
     dir: world/area_pra/pra_29
     type: code
@@ -14338,12 +14327,11 @@ segments:
     start: 0xD896E0
     vram: 0x80240000
     subsegments:
-    - [0xD896E0, c]
-    - [0xD89700, c]
-    - [0xD8A770, data]
-    - [0xD8A820, data]
-    - [0xD8B060, data]
-    - [0xD8B3A0]
+    - [0xD896E0, c, pra_33_0_header]
+    - [0xD89700, c, pra_33_1_music]
+    - [0xD89700, c, pra_33_2_main]
+    - [0xD8A600, c, pra_33_3_entity]
+    - [0xD8A770]
   - name: pra_34
     dir: world/area_pra/pra_34
     type: code
@@ -14376,40 +14364,44 @@ segments:
     start: 0xD91700
     vram: 0x80240000
     subsegments:
-    - [0xD91700, c]
-    - [0xD92650, data]
-    - [0xD926F0, data]
-    - [0xD92F10]
+    - [0xD91700, c, pra_36_0_header]
+    - [0xD91700, c, pra_36_1_music]
+    - [0xD91700, c, pra_36_2_main]
+    - [0xD92650, c, pra_36_3_npc]
+    - [0xD92650]
   - name: pra_37
     dir: world/area_pra/pra_37
     type: code
     start: 0xD92F40
     vram: 0x80240000
     subsegments:
-    - [0xD92F40, c]
-    - [0xD94760, data]
-    - [0xD94800, data]
-    - [0xD95420]
+    - [0xD92F40, c, pra_37_0_header]
+    - [0xD92F40, c, pra_37_1_music]
+    - [0xD92F40, c, pra_37_2_main]
+    - [0xD93E90, c, pra_37_3_npc]
+    - [0xD94760]
   - name: pra_38
     dir: world/area_pra/pra_38
     type: code
     start: 0xD955F0
     vram: 0x80240000
     subsegments:
-    - [0xD955F0, c]
-    - [0xD96CD0, data]
-    - [0xD96D70, data]
-    - [0xD97810]
+    - [0xD955F0, c, pra_38_0_header]
+    - [0xD955F0, c, pra_38_1_music]
+    - [0xD955F0, c, pra_38_2_main]
+    - [0xD96540, c, pra_38_3_npc]
+    - [0xD96CD0]
   - name: pra_39
     dir: world/area_pra/pra_39
     type: code
     start: 0xD97890
     vram: 0x80240000
     subsegments:
-    - [0xD97890, c]
-    - [0xD98F70, data]
-    - [0xD99010, data]
-    - [0xD99930]
+    - [0xD97890, c, pra_39_0_header]
+    - [0xD97890, c, pra_39_1_music]
+    - [0xD97890, c, pra_39_2_main]
+    - [0xD987E0, c, pra_39_3_npc]
+    - [0xD98F70]
   - name: pra_40
     dir: world/area_pra/pra_40
     type: code
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index d63a8c8317..9b714b43a7 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -23168,7 +23168,7 @@ flo_16_SuperBlock_WhiteScreenFlash = 0x80240C18; // type:func rom:0xCD2A48
 flo_16_SuperBlock_PartnerSparkles2 = 0x80240D58; // type:func rom:0xCD2B88
 flo_16_SuperBlock_PartnerSparkles4 = 0x80240DA0; // type:func rom:0xCD2BD0
 flo_16_SuperBlock_WaitForPlayerToLand = 0x80240DE8; // type:func rom:0xCD2C18
-flo_16_UnkFunc44 = 0x80240E18; // type:func rom:0xCD2C48
+flo_16_IsPlayerPounding = 0x80240E18; // type:func rom:0xCD2C48
 flo_16_FlyingAI_WanderInit = 0x80240E50; // type:func rom:0xCD2C80
 flo_16_FlyingAI_Wander = 0x80241000; // type:func rom:0xCD2E30
 flo_16_FlyingAI_LoiterInit = 0x80241628; // type:func rom:0xCD3458
@@ -23994,7 +23994,7 @@ func_802411D8_D511C8 = 0x802411D8; // type:func rom:0xD511C8
 func_80241274_D51264 = 0x80241274; // type:func rom:0xD51264
 pra_02_SetEntityPositionF = 0x80241310; // type:func rom:0xD51300
 pra_02_GetEntityPosition = 0x802413D8; // type:func rom:0xD513C8
-pra_02_UnkFunc44 = 0x80241478; // type:func rom:0xD51468
+pra_02_IsPlayerPounding = 0x80241478; // type:func rom:0xD51468
 func_802414A8_D51498 = 0x802414A8; // type:func rom:0xD51498
 pra_02_RemovePadlock = 0x80241588; // type:func rom:0xD51578
 dup_pra_02_GetEntityPosition = 0x802415BC; // type:func rom:0xD515AC
@@ -24008,7 +24008,7 @@ pra_04_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD54690
 func_80240020_D546B0 = 0x80240020; // type:func rom:0xD546B0
 func_802400AC_D5473C = 0x802400AC; // type:func rom:0xD5473C
 func_80240138_D547C8 = 0x80240138; // type:func rom:0xD547C8
-pra_04_UnkFunc001 = 0x802401B0; // type:func rom:0xD54840
+pra_04_SwooperAI_Main = 0x802401B0; // type:func rom:0xD54840
 D_80241510_D55BA0 = 0x80241510; // type:data rom:0xD55BA0
 D_80241518_D55BA8 = 0x80241518; // type:data rom:0xD55BA8
 pra_05_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD55BB0
@@ -24086,7 +24086,7 @@ pra_10_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD5FFEC
 pra_10_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD60134
 pra_10_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD60168
 pra_10_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD6019C
-pra_10_UnkFunc001 = 0x80240F20; // type:func rom:0xD601D0
+pra_10_SwooperAI_Main = 0x80240F20; // type:func rom:0xD601D0
 D_80242240_D614F0 = 0x80242240; // type:data rom:0xD614F0
 D_80242248_D614F8 = 0x80242248; // type:data rom:0xD614F8
 pra_11_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD61500
@@ -24480,7 +24480,7 @@ pra_38_EnablePartnerReflection = 0x80240D6C; // type:func rom:0xD9635C
 pra_38_worker_reflect_partner_all = 0x80240EB4; // type:func rom:0xD964A4
 pra_38_worker_reflect_partner_floor = 0x80240EE8; // type:func rom:0xD964D8
 pra_38_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD9650C
-pra_38_UnkFunc001 = 0x80240F50; // type:func rom:0xD96540
+pra_38_SwooperAI_Main = 0x80240F50; // type:func rom:0xD96540
 D_80242220_D97810 = 0x80242220; // type:data rom:0xD97810
 D_80242230_D97820 = 0x80242230; // type:data rom:0xD97820
 D_80242290_D97880 = 0x80242290; // type:data rom:0xD97880
@@ -24499,7 +24499,7 @@ pra_39_EnablePartnerReflection = 0x80240D6C; // type:func rom:0xD985FC
 pra_39_worker_reflect_partner_all = 0x80240EB4; // type:func rom:0xD98744
 pra_39_worker_reflect_partner_floor = 0x80240EE8; // type:func rom:0xD98778
 pra_39_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD987AC
-pra_39_UnkFunc001 = 0x80240F50; // type:func rom:0xD987E0
+pra_39_SwooperAI_Main = 0x80240F50; // type:func rom:0xD987E0
 D_802420A0_D99930 = 0x802420A0; // type:data rom:0xD99930
 D_802420B0_D99940 = 0x802420B0; // type:data rom:0xD99940
 D_80242110_D999A0 = 0x80242110; // type:data rom:0xD999A0
@@ -25748,7 +25748,7 @@ dead_flo_16_SuperBlock_WhiteScreenFlash = 0x80240C18; // type:func rom:0xEEDD18
 dead_flo_16_SuperBlock_PartnerSparkles2 = 0x80240D58; // type:func rom:0xEEDE58
 dead_flo_16_SuperBlock_PartnerSparkles4 = 0x80240DA0; // type:func rom:0xEEDEA0
 dead_flo_16_SuperBlock_WaitForPlayerToLand = 0x80240DE8; // type:func rom:0xEEDEE8
-dead_flo_16_UnkFunc44 = 0x80240E18; // type:func rom:0xEEDF18
+dead_flo_16_IsPlayerPounding = 0x80240E18; // type:func rom:0xEEDF18
 dead_flo_16_FlyingAI_WanderInit = 0x80240E50; // type:func rom:0xEEDF50
 dead_flo_16_FlyingAI_Wander = 0x80241000; // type:func rom:0xEEE100
 dead_flo_16_FlyingAI_LoiterInit = 0x80241628; // type:func rom:0xEEE728
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index 7e5812f5ab..e3d7346a28 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -36,12 +36,9 @@ heap_battleHead = 0x803DA800;
 hos_06_LetterDelivery_SavedNpcAnim = 0x80246424;
 nok_01_LetterDelivery_SavedNpcAnim = 0x80251E34;
 nok_02_LetterDelivery_SavedNpcAnim = 0x80254B94;
-jan_00_LetterDelivery_SavedNpcAnim = 0x80247CB4;
 jan_03_LetterDelivery_SavedNpcAnim = 0x8024FF04;
 sam_01_LetterDelivery_SavedNpcAnim = 0x8024DF24;
 sam_06_LetterDelivery_SavedNpcAnim = 0x8024C1D8;
-sbk_30_LetterDelivery_SavedNpcAnim = 0x80244D88;
-sbk_34_LetterDelivery_SavedNpcAnim = 0x802429A4;
 
 // Quizmo BSS
 jan_02_Quizmo_Worker = 0x80248924;