misc-functions (#728)

* misc stuff

* ShowEmote

* finish fx_api + replacing sound enum values

* load_path_data

* requested fixes

* vertex data extracted

Co-authored-by: HailSanta <Hail2Santa@gmail.com>

include/effects.h

@@ -941,7 +941,7 @@ EffectInstance* fx_ring_blast(s32, f32, f32, f32, f32, s32);
 EffectInstance* fx_shockwave(s32, f32, f32, f32);
 void fx_music_note(s32, f32, f32, f32);
 EffectInstance* fx_smoke_burst(s32, f32, f32, f32, f32, s32);
-void fx_sweat(s32, f32 x, f32 y, f32 z, f32, f32, s32);
+void fx_sweat(s32, f32 x, f32 y, f32 z, f32 radius, f32 pitch, s32 duration);
 void fx_sleep_bubble(s32, f32, f32, f32, f32, f32, s32*);
 EffectInstance* fx_2A(s32, f32, f32, f32);
 EffectInstance* fx_windy_leaves(s32, f32, f32, f32);

include/enums.h

@@ -469,6 +469,11 @@ enum Emotes {
     EMOTE_INVALID            = 5,
 };
 
+enum Emoters {
+    EMOTER_PLAYER   = 0,
+    EMOTER_NPC      = 1
+};
+
 enum Easings {
     EASING_LINEAR                   = 0,
     EASING_QUADRATIC_IN             = 1,
@@ -494,6 +499,7 @@ enum SoundIDs {
     SOUND_MENU_START_TUTORIAL       = 0x00000009,
     SOUND_D                         = 0x0000000D,
     SOUND_E                         = 0x0000000E,
+    SOUND_10                        = 0x00000010,
     SOUND_43                        = 0x00000043,
     SOUND_JR_TROOPA_SPLASH          = 0x00000045,
     SOUND_JR_TROOPA_SWIM            = 0x00000046,
@@ -503,6 +509,7 @@ enum SoundIDs {
     SOUND_8A                        = 0x0000008A,
     SOUND_8B                        = 0x0000008B,
     SOUND_8F                        = 0x0000008F,
+    SOUND_92                        = 0x00000092,
     SOUND_A2                        = 0x000000A2,
     SOUND_B4                        = 0x000000B4,
     SOUND_BOO_VANISH                = 0x000000C1,
@@ -524,23 +531,33 @@ enum SoundIDs {
     SOUND_HIT_PLAYER_FIRE           = 0x000000E2,
     SOUND_HIT_PLAYER_ICE            = 0x000000E3,
     SOUND_FROZEN_SHATTER            = 0x000000E7,
+    SOUND_E8                        = 0x000000E8,
     SOUND_HIT_NORMAL                = 0x000000E9,
     SOUND_HIT_FIRE                  = 0x000000EA,
     SOUND_HIT_ICE                   = 0x000000EB,
     SOUND_F1                        = 0x000000F1,
+    SOUND_FD                        = 0x000000FD,
+    SOUND_FE                        = 0x000000FE,
     SOUND_108                       = 0x00000108,
     SOUND_IMMUNE                    = 0x0000010C,
     SOUND_HIT_BONES                 = 0x0000010D,
+    SOUND_131                       = 0x00000131,
     SOUND_133                       = 0x00000133,
     SOUND_134                       = 0x00000134,
     SOUND_STEP1                     = 0x00000141,
     SOUND_STEP2                     = 0x00000142,
     SOUND_143                       = 0x00000143,
     SOUND_144                       = 0x00000144,
+    SOUND_146                       = 0x00000146,
     SOUND_TORNADO_JUMP              = 0x00000147,
     SOUND_SOFT_LAND                 = 0x00000148,
+    SOUND_149                       = 0x00000149,
+    SOUND_14A                       = 0x0000014A,
     SOUND_LAND                      = 0x0000014B,
     SOUND_HIT_BLOCK                 = 0x0000014E,
+    SOUND_14F                       = 0x0000014F,
+    SOUND_150                       = 0x00000150,
+    SOUND_151                       = 0x00000151,
     SOUND_SEARCH_BUSH               = 0x00000153,
     SOUND_158                       = 0x00000158,
     SOUND_162                       = 0x00000162,
@@ -577,6 +594,7 @@ enum SoundIDs {
     SOUND_233                       = 0x00000233,
     SOUND_234                       = 0x00000234,
     SOUND_246                       = 0x00000246,
+    SOUND_24B                       = 0x0000024B,
     SOUND_259                       = 0x00000259,
     SOUND_25A                       = 0x0000025A,
     SOUND_25C                       = 0x0000025C,
@@ -585,6 +603,8 @@ enum SoundIDs {
     SOUND_281                       = 0x00000281,
     SOUND_282                       = 0x00000282,
     SOUND_283                       = 0x00000283,
+    SOUND_284                       = 0x00000284,
+    SOUND_286                       = 0x00000286,
     SOUND_289                       = 0x00000289,
     SOUND_BOW_SPOOK                 = 0x00000291,
     SOUND_295                       = 0x00000295,
@@ -636,9 +656,11 @@ enum SoundIDs {
     SOUND_375                       = 0x00000375,
     SOUND_376                       = 0x00000376,
     SOUND_377                       = 0x00000377,
+    SOUND_378                       = 0x00000378,
     SOUND_379                       = 0x00000379,
     SOUND_HIT_PLAYER_SHOCK          = 0x0000037A,
     SOUND_HIT_SHOCK                 = 0x0000037B,
+    SOUND_392                       = 0x00000392,
     SOUND_GENERAL_WHISTLE           = 0x00000395,
     SOUND_3AB                       = 0x000003AB,
     SOUND_3AF                       = 0x000003AF,
@@ -655,8 +677,11 @@ enum SoundIDs {
     SOUND_PERIL                     = 0x000003F2,
     SOUND_3F3                       = 0x000003F3,
     SOUND_THROW                     = 0x000003FA,
+    SOUND_3FB                       = 0x000003FB,
+    SOUND_3FC                       = 0x000003FC,
     SOUND_749                       = 0x00000749,
     SOUND_759                       = 0x00000759,
+    SOUND_791                       = 0x00000791,
     SOUND_2003                      = 0x00002003,
     SOUND_2004                      = 0x00002004,
     SOUND_2005                      = 0x00002005,
@@ -682,16 +707,20 @@ enum SoundIDs {
     SOUND_2030                      = 0x00002030,
     SOUND_INFLICT_SLEEP             = 0x00002031,
     SOUND_INFLICT_STATUS            = 0x00002032, //< Stop, poison, paralyze
+    SOUND_2033                      = 0x00002033,
     SOUND_2034                      = 0x00002034,
     SOUND_2038                      = 0x00002038,
     SOUND_2039                      = 0x00002039,
+    SOUND_2055                      = 0x00002055,
     SOUND_205B                      = 0x0000205B,
     SOUND_206D                      = 0x0000206D,
     SOUND_2072                      = 0x00002072,
     SOUND_2073                      = 0x00002073,
+    SOUND_2074                      = 0x00002074,
     SOUND_BOMB_BLAST                = 0x00002076,
     SOUND_JUMP_2081                 = 0x00002081,
     SOUND_JUMP_8BIT_MARIO           = 0x00002082,
+    SOUND_2086                      = 0x00002086,
     SOUND_208C                      = 0x0000208C,
     SOUND_208D                      = 0x0000208D,
     SOUND_208E                      = 0x0000208E,
@@ -699,6 +728,7 @@ enum SoundIDs {
     SOUND_2095                      = 0x00002095,
     SOUND_20A3                      = 0x000020A3,
     SOUND_20A4                      = 0x000020A4,
+    SOUND_20AE                      = 0x000020AE,
     SOUND_20B8                      = 0x000020B8,
     SOUND_20C1                      = 0x000020C1,
     SOUND_20C5                      = 0x000020C5,
@@ -731,9 +761,14 @@ enum SoundIDs {
     SOUND_211A                      = 0x0000211A,
     SOUND_212D                      = 0x0000212D,
     SOUND_212E                      = 0x0000212E,
+    SOUND_8161                      = 0x00008161,
+    SOUND_80000008                  = 0x80000008,
     SOUND_80000011                  = 0x80000011,
+    SOUND_8000006A                  = 0x8000006A,
     SOUND_B0000017                  = 0xB0000017,
+    SOUND_B0000016                  = 0xB0000016,
     SOUND_B0000018                  = 0xB0000018,
+    SOUND_B000001E                  = 0xB000001E,
 };
 
 enum Cams {

include/functions.h

@@ -591,8 +591,8 @@ void exec_entity_commandlist(Entity* entity);
 
 void sfx_reset_door_sounds(void);
 
-void func_802D7460(f32 x, f32 y, f32 z, s32 arg3);
+void show_start_recovery_shimmer(f32 x, f32 y, f32 z, s32 arg3);
-void func_802D74C0(f32 x, f32 y, f32 z, s32 arg3);
+void show_recovery_shimmer(f32 x, f32 y, f32 z, s32 arg3);
 
 void show_damage_popup(f32 x, f32 y, f32 z, s32 damageAmount, s32);
 void add_xz_vec3f(Vec3f* vector, f32 speed, f32 angleDeg);

include/script_api/battle.h

@@ -309,8 +309,8 @@ ApiStatus GetActionCommandResult(Evt* script, s32 isInitialCall);
 ApiStatus CreateNpc(Evt* script, s32 isInitialCall);
 ApiStatus func_802535B4(Evt* script, s32 isInitialCall);
 ApiStatus func_80276EFC(Evt* script, s32 isInitialCall);
-ApiStatus func_802D7520(Evt* script, s32 isInitialCall);
+ApiStatus ShowStartRecoveryShimmer(Evt* script, s32 isInitialCall);
-ApiStatus func_802D75D8(Evt* script, s32 isInitialCall);
+ApiStatus ShowRecoveryShimmer(Evt* script, s32 isInitialCall);
 ApiStatus func_80273444(Evt* script, s32 isInitialCall);
 ApiStatus GetActionCommandMode(Evt* script, s32 isInitialCall);
 ApiStatus SetActionCommandMode(Evt* script, s32 isInitialCall);

include/script_api/common.h

@@ -289,7 +289,7 @@ ApiStatus ModifyGlobalOverrideFlags(Evt* script, s32 isInitialCall);
 ApiStatus func_802CF56C(Evt* script, s32 isInitialCall);
 ApiStatus func_802CA988(Evt* script, s32 isInitialCall);
 ApiStatus func_802CDE68(Evt* script, s32 isInitialCall);
-ApiStatus func_802D8248(Evt* script, s32 isInitialCall);
+ApiStatus SetSleepBubbleUnk1C(Evt* script, s32 isInitialCall);
 ApiStatus func_802D286C(Evt* script, s32 isInitialCall);
 ApiStatus func_802D2520(Evt* script, s32 isInitialCall);
 ApiStatus PushSong(Evt* script, s32 isInitialCall);
@@ -303,7 +303,7 @@ ApiStatus SetNpcPaletteSwapMode(Evt* script, s32 isInitialCall);
 ApiStatus SetNpcPaletteSwapping(Evt* script, s32 isInitialCall);
 ApiStatus MakeTransformGroup(Evt* script, s32 isInitialCall);
 
-ApiStatus Spawn802D9D50(Evt* script, s32 isInitialCall);
+ApiStatus SetMotionBlurParams(Evt* script, s32 isInitialCall);
 
 extern EvtScript EnemyNpcHit;
 extern EvtScript EnemyNpcDefeat;

src/16F740.c

@@ -261,7 +261,7 @@ void btl_state_update_begin_player_turn(void) {
                     fx_water_splash(0, player->currentPos.x - 15.0f, player->currentPos.y + 32.0f, player->currentPos.z + 5.0f, 1.0f, 0x18);
                     fx_water_splash(1, player->currentPos.x + 15.0f, player->currentPos.y + 22.0f, player->currentPos.z + 5.0f, 1.0f, 0x18);
                     battleStatus->waterBlockEffect = NULL;
-                    sfx_play_sound(0x299);
+                    sfx_play_sound(SOUND_299);
                     btl_show_battle_message(0x27, 0x3C);
                     gBattleState2 = BATTLE_STATE2_UNK_2;
                 } else {
@@ -406,7 +406,7 @@ void btl_state_update_begin_player_turn(void) {
                     player->debuffDuration--;
                     if (player->debuffDuration <= 0) {
                         if (player->debuff == STATUS_FROZEN) {
-                            sfx_play_sound(0xE7);
+                            sfx_play_sound(SOUND_FROZEN_SHATTER);
                             player->icePillarEffect->flags |= 0x10;
                             player->icePillarEffect = NULL;
                             dispatch_event_player(0x32);

src/17FEB0.c

@@ -25,12 +25,12 @@ s32 calc_item_check_hit(void) {
             if (actor->transStatus == 0xE) {
                 return HIT_RESULT_MISS;
             }
-            if (actor->stoneStatus == 0xC) {
+            if (actor->stoneStatus == STATUS_STONE) {
-                sfx_play_sound_at_position(0x10C, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
+                sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
                 return HIT_RESULT_IMMUNE;
             }
             if ((battleStatus->currentAttackElement & DAMAGE_TYPE_JUMP) && (actorPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP)) {
-                sfx_play_sound_at_position(0xE9, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
+                sfx_play_sound_at_position(SOUND_HIT_NORMAL, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
                 return HIT_RESULT_LANDED_ON_SPIKE;
             }
         } else {
@@ -90,7 +90,7 @@ s32 calc_item_damage_enemy(void) {
     }
 
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE) {
-        fx_ring_blast(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 0x18);
+        fx_ring_blast(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 24);
         isFireDamage = TRUE;
     }
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_ELECTRIC) {
@@ -98,7 +98,7 @@ s32 calc_item_damage_enemy(void) {
         isElectricDamage = TRUE;
     }
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_WATER) {
-        fx_water_splash(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 0x18);
+        fx_water_splash(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 24);
     }
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_ICE) {
         fx_big_snowflakes(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f);

src/18C790.c

@@ -267,7 +267,7 @@ void btl_state_update_celebration(void) {
                 btl_cam_use_preset(BTL_CAM_PRESET_C);
                 btl_cam_move(5);
                 dma_copy(_79EF40_ROM_START, _79EF40_ROM_END, _79EF40_VRAM);
-                sfx_play_sound(0x80000008);
+                sfx_play_sound(SOUND_80000008);
                 D_8029FB84 = 0;
                 gBattleState2 = BATTLE_STATE2_UNK_5;
             }
@@ -630,7 +630,7 @@ void btl_state_update_celebration(void) {
                     sfx_play_sound(SOUND_749);
                     gBattleState2 = BATTLE_STATE2_UNK_9;
                 } else {
-                    sfx_play_sound(0x21D);
+                    sfx_play_sound(SOUND_MENU_ERROR);
                     gBattleState2 = BATTLE_STATE2_UNK_F;
                 }
                 break;

src/18F340.c

@@ -59,7 +59,7 @@ ApiStatus func_80260B70(Evt* script, s32 isInitialCall) {
     Actor* player = gBattleStatus.playerActor;
 
     func_802667F0(2, player, player->currentPos.x, player->currentPos.y + 20.0f, player->currentPos.z);
-    sfx_play_sound(0x3FC);
+    sfx_play_sound(SOUND_3FC);
     script->varTable[0] = FALSE;
     if (player->debuff == STATUS_FEAR || player->debuff == STATUS_DIZZY || player->debuff == STATUS_PARALYZE ||
         player->debuff == STATUS_SLEEP ||player->debuff == STATUS_FROZEN || player->debuff == STATUS_STOP) {
@@ -296,13 +296,13 @@ ApiStatus func_80261648(Evt* script, s32 isInitialCall) {
     Npc* merlee = get_npc_unsafe(NPC_BTL_MERLEE);
 
     if (isInitialCall) {
-        sfx_play_sound(0x24B);
+        sfx_play_sound(SOUND_24B);
         merlee->alpha = 0;
     }
 
     merlee->alpha += 17;
-    if (merlee->alpha >= 0xFF) {
+    if (merlee->alpha >= 255) {
-        merlee->alpha = 0xFF;
+        merlee->alpha = 255;
         return ApiStatus_DONE1;
     }
 
@@ -332,7 +332,7 @@ ApiStatus func_802616F4(Evt* script, s32 isInitialCall) {
         D_8029FB9C = fx_energy_orb_wave(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0);
         D_8029FBA4 = 0;
         D_8029FB90 = 12;
-        sfx_play_sound(0x2074);
+        sfx_play_sound(SOUND_2074);
     }
     merlee->pos.y = D_8029FB94 + (sin_rad((script->functionTemp[1] * TAU) / 360.0f) * 3.0f);
 

src/1AC760.c

@@ -73,7 +73,7 @@ s32 calc_partner_test_enemy(void) {
             if (!(actorPart->eventFlags & 0x20) && actor->transStatus != 0xE) {
                 if ((battleStatus->currentAttackElement & 0x80) != 0) {
                     if (actorPart->eventFlags & 0x10 && !(actor->flags2 & 0x800)) {
-                        sfx_play_sound_at_position(0x108, 0, partner->state.currentPos.x,
+                        sfx_play_sound_at_position(SOUND_108, 0, partner->state.currentPos.x,
                                                    partner->state.currentPos.y, partner->state.currentPos.z);
                         return 4;
                     }
@@ -82,7 +82,7 @@ s32 calc_partner_test_enemy(void) {
                 if (!(battleStatus->currentAttackElement & (0x10000000 | 0x80)) &&
                     (actorPart->eventFlags & 0x10000) && !(battleStatus->currentAttackEventSuppression & 4) &&
                     !(player_team_is_ability_active(state, ABILITY_SPIKE_SHIELD))) {
-                    sfx_play_sound_at_position(0x108, 0, partner->state.currentPos.x,
+                    sfx_play_sound_at_position(SOUND_108, 0, partner->state.currentPos.x,
                                                partner->state.currentPos.y, partner->state.currentPos.z);
                     dispatch_damage_event_partner_1(1, 0x2A);
                     dispatch_event_actor(actor, 0x1B);
@@ -95,7 +95,7 @@ s32 calc_partner_test_enemy(void) {
                         if (!(battleStatus->currentAttackElement & 0x10000000)) {
                             if ((actorPart->eventFlags & 0x10) && (!(actor->flags & 0x800))&&
                                 !(battleStatus->currentAttackEventSuppression & 1)) {
-                                sfx_play_sound_at_position(0x108, 0, partner->state.currentPos.x,
+                                sfx_play_sound_at_position(SOUND_108, 0, partner->state.currentPos.x,
                                                            partner->state.currentPos.y, partner->state.currentPos.z);
                                 dispatch_damage_event_partner_1(1, 0x2A);
                                 dispatch_event_actor(actor, 0x1B);
@@ -105,7 +105,7 @@ s32 calc_partner_test_enemy(void) {
                             if ((!(battleStatus->currentAttackElement & 0x10000000)) &&
                                 (actorPart->eventFlags & 0x200000) && !(actor->flags & 0x800) &&
                                 !(battleStatus->currentAttackEventSuppression & 0x80)) {
-                                sfx_play_sound_at_position(0x108, 0, partner->state.currentPos.x,
+                                sfx_play_sound_at_position(SOUND_108, 0, partner->state.currentPos.x,
                                                            partner->state.currentPos.y, partner->state.currentPos.z);
                                 dispatch_damage_event_partner_1(1, 0x2A);
                                 dispatch_event_actor(actor, 0x1B);
@@ -120,7 +120,7 @@ s32 calc_partner_test_enemy(void) {
                         if ((actor->staticStatus == 0xB || actorPart->eventFlags & 0x80) &&
                             !(battleStatus->currentAttackElement & 0x10000000) &&
                             !(battleStatus->currentAttackEventSuppression & 8)) {
-                            sfx_play_sound_at_position(0x37B, 0, partner->state.currentPos.x,
+                            sfx_play_sound_at_position(SOUND_HIT_SHOCK, 0, partner->state.currentPos.x,
                                                        partner->state.currentPos.y, partner->state.currentPos.z);
                             func_80251474(partner);
                             dispatch_damage_event_partner_1(1, 0x2F);
@@ -129,7 +129,7 @@ s32 calc_partner_test_enemy(void) {
                     }
                 }
                 //missing code here (?)
-                sfx_play_sound_at_position(0xEA, 0, partner->state.currentPos.x,
+                sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, partner->state.currentPos.x,
                                            partner->state.currentPos.y, partner->state.currentPos.z);
                 dispatch_damage_event_partner_1(1, 0x2C);
                 dispatch_event_actor(actor, 0x1C);

src/1a1f0_len_5390.c

@@ -93,7 +93,7 @@ ApiStatus FadeInMerlee(Evt* script, s32 isInitialCall) {
     Npc* npc = get_npc_unsafe(NPC_BTL_MERLEE);
 
     if (isInitialCall) {
-        sfx_play_sound(0x24B);
+        sfx_play_sound(SOUND_24B);
         npc->alpha = 0;
     }
 
@@ -130,7 +130,7 @@ ApiStatus MerleeUpdateFX(Evt* script, s32 isInitialCall) {
         D_800A0BAC = fx_energy_orb_wave(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0);
         D_800A0BB8 = 0;
         D_800A0BA0 = 12;
-        sfx_play_sound(0x2074);
+        sfx_play_sound(SOUND_2074);
     }
 
     merlee->pos.y = D_800A0BA4 + (sin_rad((script->functionTemp[1] * TAU) / 360.0f) * 3.0f);

src/3251D0.c

@@ -181,7 +181,7 @@ EvtScript D_802C05CC_32579C = {
     EVT_END_IF
     EVT_CALL(GetPlayerPos, LW(0), LW(1), LW(2))
     EVT_ADD(LW(1), 25)
-    EVT_CALL(func_802D7520, LW(0), LW(1), LW(2), LW(11))
+    EVT_CALL(ShowStartRecoveryShimmer, LW(0), LW(1), LW(2), LW(11))
     EVT_IF_NE(LW(11), 0)
         EVT_CALL(func_802C022C, LW(11))
     EVT_END_IF
@@ -196,7 +196,7 @@ EvtScript D_802C05CC_32579C = {
         EVT_WAIT_FRAMES(30)
     EVT_END_IF
     EVT_CALL(GetPlayerPos, LW(0), LW(1), LW(2))
-    EVT_CALL(func_802D75D8, LW(0), LW(1), LW(2), LW(11))
+    EVT_CALL(ShowRecoveryShimmer, LW(0), LW(1), LW(2), LW(11))
     EVT_CALL(SetPlayerAnimation, ANIM_10002)
     EVT_WAIT_FRAMES(20)
     EVT_CALL(func_802C03E8)

src/80850_len_3060.c

@@ -454,7 +454,7 @@ void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) {
     s32 iconIndex;
 
     if ((gPlayerData.coins != uiStatus->displayCoins) && ((gGameStatusPtr->frameCounter % 3) == 0)) {
-        sfx_play_sound(0x211);
+        sfx_play_sound(SOUND_211);
     }
 
     iconIndex = uiStatus->iconIndex10;
@@ -1200,7 +1200,7 @@ void add_SP(s32 amt) {
     PlayerData* playerData = &gPlayerData;
     UiStatus* uiStatus = &gUIStatus;
     s32 phi_v1;
-    s32 blah;
+    s32 maxPower;
 
     uiStatus->unk_57[0] = 1;
     uiStatus->unk_57[1] = 60;
@@ -1213,9 +1213,9 @@ void add_SP(s32 amt) {
 
     playerData->specialBarsFilled += amt;
 
-    blah = playerData->maxStarPower << 8;
+    maxPower = playerData->maxStarPower << 8;
-    if (playerData->specialBarsFilled > blah) {
+    if (playerData->specialBarsFilled > maxPower) {
-        playerData->specialBarsFilled = blah;
+        playerData->specialBarsFilled = maxPower;
     }
 
     gUIStatus.displaySP = gPlayerData.specialBarsFilled;

src/8a860_len_3f30.c

@@ -560,7 +560,7 @@ s32 popup_menu_update(void) {
                     }
 
                     if (gGameStatusPtr->pressedButtons & buttons) {
-                        sfx_play_sound(0xCA);
+                        sfx_play_sound(SOUND_MENU_BACK);
                         if (D_8010D698 != 0) {
                             if (D_8010D68E == 0) {
                                 D_8010D640 = -3;
@@ -590,7 +590,7 @@ s32 popup_menu_update(void) {
                     }
 
                     if (D_8010D68E != 0 && (gGameStatusPtr->pressedButtons & buttons)) {
-                        sfx_play_sound(0xCA);
+                        sfx_play_sound(SOUND_MENU_BACK);
                         D_8010D640 = -6;
                         break;
                     }

src/actor_api.c

@@ -3667,7 +3667,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) {
             if (script->functionTemp[3] == 0) {
                 dispatch_event_actor(actor, EVENT_SWAP_PARTNER);
                 fx_recover(0, x2, y2, z2, hpBoost);
-                func_802D7460(x1, y1, z1, hpBoost);
+                show_start_recovery_shimmer(x1, y1, z1, hpBoost);
                 script->functionTemp[3] = 30;
                 script->functionTemp[0] = 2;
             } else {
@@ -3683,7 +3683,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) {
                 if (actor->maxHP < actor->currentHP) {
                     actor->currentHP = actor->maxHP;
                 }
-                func_802D74C0(x1, y1, z1, hpBoost);
+                show_recovery_shimmer(x1, y1, z1, hpBoost);
                 script->functionTemp[3] = 15;
                 script->functionTemp[0] = 3;
             } else {

src/battle/action_cmd/tidal_wave.c

@@ -147,7 +147,7 @@ void N(update)(void) {
                 actionCommandStatus->hudElementX + ((actionCommandStatus->unk_5D - 1) * 20) + 16,
                 actionCommandStatus->hudElementY);
             hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED);
-            sfx_play_sound(0x233);
+            sfx_play_sound(SOUND_233);
             actionCommandStatus->unk_70 = 1;
             actionCommandStatus->state = 12;
             // fallthrough

src/battle/item/dizzy_dial.c

@@ -21,7 +21,7 @@ ApiStatus N(func_802A1270_727B80)(Evt* script, s32 isInitialCall) {
         case 0:
             script->functionTemp[1] = 0;
             script->functionTemp[2] = 0;
-            sfx_play_sound(0x2033);
+            sfx_play_sound(SOUND_2033);
             camera->unk_1C = 0;
             D_802A1CD0 = create_generic_entity_frontUI(NULL, func_802A123C_727B4C);
             script->functionTemp[0] = 1;

src/battle/item/dried_shroom.c

@@ -39,12 +39,12 @@ EvtScript N(main) = {
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(1), 25)
     EVT_ADD(EVT_VAR(2), 5)
-    EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1)
+    EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1)
     EVT_CALL(N(func_802A12FC_71CFDC))
     EVT_WAIT_FRAMES(30)
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(2), 5)
-    EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1)
+    EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 1)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002)
     EVT_WAIT_FRAMES(20)
     EVT_EXEC_WAIT(N(PlayerGoHome))

src/battle/item/electro_pop.c

@@ -102,13 +102,13 @@ EvtScript N(main) = {
     EVT_CALL(N(func_802A133C_7308DC), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(1), 25)
-    EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
+    EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
     EVT_CALL(N(AddFP), EVT_VAR(3))
     EVT_WAIT_FRAMES(10)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_THUMBS_UP)
     EVT_WAIT_FRAMES(30)
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
-    EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
+    EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002)
     EVT_WAIT_FRAMES(20)
     EVT_CALL(ShowMessageBox, 16, 60)

src/battle/item/food.c

@@ -149,13 +149,13 @@ EvtScript N(script6) = {
     EVT_CALL(MoveBattleCamOver, 30)
     EVT_CALL(GetActorPos, ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(1), 25)
-    EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
+    EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
     EVT_IF_GT(EVT_VAR(11), 0)
         EVT_CALL(N(func_802A12EC_7333BC), EVT_VAR(11))
     EVT_END_IF
     EVT_WAIT_FRAMES(30)
     EVT_CALL(GetActorPos, ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
-    EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
+    EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
     EVT_WAIT_FRAMES(20)
     EVT_CALL(SetActorYaw, ACTOR_PLAYER, 150)
     EVT_WAIT_FRAMES(1)
@@ -214,7 +214,7 @@ EvtScript N(main) = {
     EVT_END_IF
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(1), 25)
-    EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
+    EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
     EVT_IF_NE(EVT_VAR(11), 0)
         EVT_CALL(N(AddHP), EVT_VAR(11))
     EVT_END_IF
@@ -229,7 +229,7 @@ EvtScript N(main) = {
         EVT_WAIT_FRAMES(30)
     EVT_END_IF
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
-    EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
+    EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002)
     EVT_WAIT_FRAMES(20)
     EVT_EXEC_WAIT(N(PlayerGoHome))

src/battle/item/hustle_drink.c

@@ -43,7 +43,7 @@ EvtScript N(main) = {
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_SQUISH)
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(1), 25)
-    EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5)
+    EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5)
     EVT_CALL(N(func_802A12C4_726224))
     EVT_CALL(N(func_802A123C_72619C))
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))

src/battle/item/insecticide_herb.c

@@ -19,9 +19,9 @@ ApiStatus N(func_802A1280_72A9D0)(Evt* script, s32 isInitialCall) {
     Actor* enemy = get_actor(script->owner1.enemyID);
     Actor* target;
 
-    sfx_play_sound_at_position(0x231, 0, enemy->state.goalPos.x, enemy->state.goalPos.y, enemy->state.goalPos.z);
+    sfx_play_sound_at_position(SOUND_231, 0, enemy->state.goalPos.x, enemy->state.goalPos.y, enemy->state.goalPos.z);
     target = get_actor(enemy->targetActorID);
-    dispatch_event_actor(target, 0x39);
+    dispatch_event_actor(target, EVENT_SCARE_AWAY);
 
     return ApiStatus_DONE2;
 }

src/battle/item/life_shroom.c

@@ -138,13 +138,13 @@ EvtScript N(script6) = {
     EVT_CALL(MoveBattleCamOver, 30)
     EVT_CALL(GetActorPos, ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(1), 25)
-    EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
+    EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
     EVT_IF_GT(EVT_VAR(11), 0)
         EVT_CALL(N(func_802A12EC_72E81C), EVT_VAR(11))
     EVT_END_IF
     EVT_WAIT_FRAMES(30)
     EVT_CALL(GetActorPos, ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
-    EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
+    EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
     EVT_WAIT_FRAMES(20)
     EVT_CALL(SetActorYaw, ACTOR_PLAYER, 150)
     EVT_WAIT_FRAMES(1)
@@ -184,12 +184,12 @@ EvtScript N(main) = {
     EVT_CALL(N(func_802A1378_72E8A8), EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(1), 25)
-    EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
+    EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
     EVT_WAIT_FRAMES(10)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_THUMBS_UP)
     EVT_WAIT_FRAMES(30)
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
-    EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
+    EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002)
     EVT_WAIT_FRAMES(20)
     EVT_EXEC_WAIT(N(PlayerGoHome))

src/battle/item/mushroom.c

@@ -137,13 +137,13 @@ EvtScript N(script6) = {
     EVT_CALL(MoveBattleCamOver, 30)
     EVT_CALL(GetActorPos, ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(1), 25)
-    EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
+    EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
     EVT_IF_GT(EVT_VAR(11), 0)
         EVT_CALL(N(func_802A12EC_715B3C), EVT_VAR(11))
     EVT_END_IF
     EVT_WAIT_FRAMES(30)
     EVT_CALL(GetActorPos, ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
-    EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
+    EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
     EVT_WAIT_FRAMES(20)
     EVT_CALL(SetActorYaw, ACTOR_PLAYER, 150)
     EVT_WAIT_FRAMES(1)
@@ -192,7 +192,7 @@ EvtScript N(main) = {
     EVT_END_IF
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(1), 25)
-    EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
+    EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
     EVT_IF_NE(EVT_VAR(11), 0)
         EVT_CALL(N(AddHP), EVT_VAR(11))
     EVT_END_IF
@@ -207,7 +207,7 @@ EvtScript N(main) = {
         EVT_WAIT_FRAMES(30)
     EVT_END_IF
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
-    EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
+    EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002)
     EVT_WAIT_FRAMES(20)
     EVT_EXEC_WAIT(N(PlayerGoHome))

src/battle/item/strange_cake.c

@@ -299,13 +299,13 @@ EvtScript N(script6) = {
         EVT_CALL(battle_item_strange_cake_func_802A18D8_731BD8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
         EVT_CALL(GetActorPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
         EVT_ADD(EVT_VAR(1), 25)
-        EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
+        EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
         EVT_CALL(battle_item_strange_cake_AddFP, EVT_VAR(3))
         EVT_WAIT_FRAMES(10)
         EVT_CALL(SetAnimation, 0, 0, 65586)
         EVT_WAIT_FRAMES(30)
         EVT_CALL(GetActorPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
-        EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
+        EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3))
         EVT_CALL(SetAnimation, 0, 0, 65538)
         EVT_WAIT_FRAMES(20)
         EVT_CALL(SetAnimation, 0, 0, 65567)

src/battle/item/super_soda.c

@@ -141,13 +141,13 @@ EvtScript N(script6) = {
     EVT_CALL(MoveBattleCamOver, 30)
     EVT_CALL(GetActorPos, ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(1), 25)
-    EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
+    EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
     EVT_IF_GT(EVT_VAR(11), 0)
         EVT_CALL(N(func_802A12EC_724FCC), EVT_VAR(11))
     EVT_END_IF
     EVT_WAIT_FRAMES(30)
     EVT_CALL(GetActorPos, ACTOR_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
-    EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
+    EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(11))
     EVT_WAIT_FRAMES(20)
     EVT_CALL(SetActorYaw, ACTOR_PLAYER, 150)
     EVT_WAIT_FRAMES(1)
@@ -181,14 +181,14 @@ EvtScript N(main) = {
         EVT_CALL(N(AddFP), 5)
         EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
         EVT_ADD(EVT_VAR(1), 25)
-        EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5)
+        EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5)
         EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
         EVT_ADD(EVT_VAR(1), 20)
         EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_THUMBS_UP)
         EVT_WAIT_FRAMES(30)
         EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002)
         EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
-        EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5)
+        EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5)
         EVT_CALL(InitTargetIterator)
         EVT_CALL(GetOwnerTarget, EVT_VAR(0), EVT_VAR(1))
         EVT_CALL(N(func_802A1378_725058), 0)

src/battle/item/tasty_tonic.c

@@ -42,7 +42,7 @@ EvtScript N(main) = {
         EVT_CALL(GetActorPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
         EVT_ADD(EVT_VAR(1), 25)
         EVT_ADD(EVT_VAR(2), 5)
-        EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10)
+        EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10)
         EVT_CALL(GetActorPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
         EVT_ADD(EVT_VAR(1), 20)
         EVT_CALL(SetAnimation, 0, 0, 65586)
@@ -50,20 +50,20 @@ EvtScript N(main) = {
         EVT_CALL(SetAnimation, 0, 0, 65538)
         EVT_CALL(GetActorPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
         EVT_ADD(EVT_VAR(2), 5)
-        EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10)
+        EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10)
         EVT_CALL(battle_item_tasty_tonic_func_802A123C_72223C, 0)
         EVT_WAIT_FRAMES(20)
     EVT_ELSE
         EVT_CALL(GetActorPos, 256, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
         EVT_ADD(EVT_VAR(1), 25)
         EVT_ADD(EVT_VAR(2), 5)
-        EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5)
+        EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5)
         EVT_CALL(GetActorPos, 256, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
         EVT_ADD(EVT_VAR(1), 20)
         EVT_WAIT_FRAMES(30)
         EVT_CALL(GetActorPos, 256, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
         EVT_ADD(EVT_VAR(2), 5)
-        EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5)
+        EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 5)
         EVT_CALL(battle_item_tasty_tonic_func_802A123C_72223C, 256)
         EVT_WAIT_FRAMES(20)
     EVT_END_IF

src/battle/item/thunder_bolt.c

@@ -10,7 +10,7 @@ ApiStatus N(func_802A123C_722D7C)(Evt* script, s32 isInitialCall) {
     s32 scaleX, scaleY;
 
     if (actor != NULL) {
-        sfx_play_sound(0x366);
+        sfx_play_sound(SOUND_366);
 
         posX = actor->currentPos.x;
         posY = actor->currentPos.y + (actor->size.y / 10);

src/battle/item/thunder_rage.c

@@ -28,7 +28,7 @@ ApiStatus N(func_802A1354_71B4F4)(Evt* script, s32 isInitialCall) {
     s32 scaleX, scaleY;
 
     if (actor != NULL) {
-        sfx_play_sound(0x366);
+        sfx_play_sound(SOUND_366);
 
         posX = actor->currentPos.x;
         posY = actor->currentPos.y + (actor->size.y / 10);

src/battle/item/ultra_shroom.c

@@ -39,14 +39,14 @@ EvtScript N(main) = {
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(1), 25)
     EVT_ADD(EVT_VAR(2), 5)
-    EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10)
+    EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10)
     EVT_CALL(N(func_802A12FC_723A7C))
     EVT_WAIT_FRAMES(10)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_THUMBS_UP)
     EVT_WAIT_FRAMES(30)
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(2), 5)
-    EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10)
+    EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 10)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002)
     EVT_WAIT_FRAMES(20)
     EVT_EXEC_WAIT(N(PlayerGoHome))

src/battle/item/unknown_item.c

@@ -37,14 +37,14 @@ EvtScript N(main) = {
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(1), 25)
     EVT_ADD(EVT_VAR(2), 5)
-    EVT_CALL(func_802D7520, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 20)
+    EVT_CALL(ShowStartRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 20)
     EVT_CALL(N(func_802A12FC_72453C))
     EVT_WAIT_FRAMES(10)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_THUMBS_UP)
     EVT_WAIT_FRAMES(30)
     EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
     EVT_ADD(EVT_VAR(2), 5)
-    EVT_CALL(func_802D75D8, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 20)
+    EVT_CALL(ShowRecoveryShimmer, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 20)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002)
     EVT_WAIT_FRAMES(20)
     EVT_EXEC_WAIT(N(PlayerGoHome))

src/battle/star/refresh/78B600.c

@@ -320,7 +320,7 @@ EvtScript N(usePower) = {
     EVT_CALL(func_802A19A8_78BFA8, LW(0), LW(1), LW(2), 5)
     EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2))
     EVT_ADD(LW(1), 25)
-    EVT_CALL(func_802D7520, LW(0), LW(1), LW(2), 5)
+    EVT_CALL(ShowStartRecoveryShimmer, LW(0), LW(1), LW(2), 5)
     EVT_CALL(N(AddHP), 5)
     EVT_CALL(N(AddFP), 5)
     EVT_CALL(func_802A17D4_78BDD4)

src/battle/star/smooch/791D90.c

@@ -382,7 +382,7 @@ EvtScript N(usePower) = {
     EVT_CALL(func_802A156C_7922FC, LW(0), LW(1), LW(2), 20)
     EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2))
     EVT_ADD(LW(1), 25)
-    EVT_CALL(func_802D7520, LW(0), LW(1), LW(2), 20)
+    EVT_CALL(ShowStartRecoveryShimmer, LW(0), LW(1), LW(2), 20)
     EVT_CALL(N(AddHP), 20)
     EVT_THREAD
         EVT_CALL(N(UnkBackgroundFunc))

src/battle/star/up_and_away/7952E0.c

@@ -308,7 +308,7 @@ EvtScript N(usePower) = {
     EVT_CALL(SetNpcAnimation, 100, NPC_ANIM_battle_kalmar_Palette_00_Anim_2)
     EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
     EVT_WAIT_FRAMES(20)
-    EVT_CALL(Spawn802D9D50, 0, 0, 0, 320, 240, 128, 10)
+    EVT_CALL(SetMotionBlurParams, 0, 0, 0, 320, 240, 128, 10)
     EVT_CALL(func_802A1518_7957F8)
     EVT_CALL(PlaySound, 0x247)
     EVT_CALL(PlayEffect, 0x39, 0, 0, 20, 0, EVT_FLOAT(1.0), 90, 0, 0, 0, 0, 0, 0, 0)
@@ -318,7 +318,7 @@ EvtScript N(usePower) = {
     EVT_END_THREAD
     EVT_CALL(PlayEffect, 0x39, 0, 0, 20, 0, EVT_FLOAT(1.0), 90, 0, 0, 0, 0, 0, 0, 0)
     EVT_WAIT_FRAMES(75)
-    EVT_CALL(Spawn802D9D50, 0, 0, 0, 320, 240, 0, 10)
+    EVT_CALL(SetMotionBlurParams, 0, 0, 0, 320, 240, 0, 10)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(SetGoalToTarget, ACTOR_SELF)

src/cd180_len_38f0.c

@@ -22,26 +22,155 @@ s32 D_8014C6F4[] = { 0x00000000, 0x00000000, 0x00000000, };
 
 #include "ui/stencil/blurry_circle.png.inc.c"
 
-s32 D_8014E500[] = {  0xFF8000A9, 0x00000000, 0x00000000, 0xFFFFFF00, 0xFF34FFBB, 0x00000000, 0x00000000, 0xFFFFFF00, 0x0000FF24, 0x00000000, 0x00000000, 0xFFFFFF00, 0x008000A9, 0x00000000, 0x00000000, 0xFFFFFF00, 0xFE88007B, 0x00000000, 0x00000000, 0xFFFFFF00, 0x0000018B, 0x00000000, 0x00000000, 0xFFFFFF00, 0xFF17FEC0, 0x00000000, 0x00000000, 0xFFFFFF00, 0x00CCFFBB, 0x00000000, 0x00000000, 0xFFFFFF00, 0x00E8FEC0, 0x00000000, 0x00000000, 0xFFFFFF00, 0x0178007A, 0x00000000, 0x00000000, 0xFFFFFF00, };
+#include "vtx/stencil1.vtx.inc.c"
 
-s32 D_8014E5A0[] = {  0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001201, 0x00003000, 0xE3001402, 0x00000C00, 0xE3000C00, 0x00000000, 0xE3001801, 0x00000000, 0xE3001A01, 0x00000000, 0xFCFFE7FF, 0xFFCD92C9, 0xE200001C, 0x00504340, 0xD9000000, 0x00000000, 0xD9FFFFFF, 0x00200004, 0xDF000000, 0x00000000, };
+Gfx Gfx_LoadStencilTex_CommonParams[] = {
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPPipeSync(),
+    gsDPSetCycleType(G_CYC_1CYCLE),
+    gsDPSetTextureDetail(G_TD_CLAMP),
+    gsDPSetTextureLOD(G_TL_TILE),
+    gsDPSetTextureFilter(G_TF_AVERAGE),
+    gsDPSetTextureConvert(G_TC_FILT),
+    gsDPSetTexturePersp(G_TP_NONE),
+    gsDPSetColorDither(G_CD_MAGICSQ),
+    gsDPSetAlphaDither(G_AD_PATTERN),
+    gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 1, TEXEL0, PRIMITIVE, TEXEL0, 0, 0, 0, PRIMITIVE, 1, TEXEL0, PRIMITIVE, TEXEL0),
+    gsDPSetRenderMode(G_RM_CLD_SURF, G_RM_CLD_SURF2),
+    gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH | G_CLIPPING | 0x0040F9FA),
+    gsSPSetGeometryMode(G_SHADE | G_SHADING_SMOOTH),
+    gsSPEndDisplayList()
+};
 
-s32 D_8014E618[] = {  0xDE000000, &D_8014E5A0, 0xE3001001, 0x00000000, 0xFD88000F, ui_stencil_sharp_circle_png, 0xF5880400, 0x070D4350, 0xE6000000, 0x00000000, 0xF4000000, 0x0703E07C, 0xE7000000, 0x00000000, 0xF5800400, 0x000D4350, 0xF2000000, 0x0007C07C, 0xF2000000, 0x000FC0FC, 0xDF000000, 0x00000000, };
+Gfx Gfx_LoadStencilTex_SharpCircle[] = {
+    gsSPDisplayList(&Gfx_LoadStencilTex_CommonParams),
+    gsDPSetTextureLUT(G_TT_NONE),
+    gsDPLoadTextureTile_4b(ui_stencil_sharp_circle_png, G_IM_FMT_I, 32, 0, 0, 0, 31, 31, 0, G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x00FC),
+    gsSPEndDisplayList()
+};
 
-s32 D_8014E670[] = {  0xDE000000, &D_8014E5A0, 0xE3001001, 0x00000000, 0xFD88001F, ui_stencil_mario_png, 0xF5880800, 0x07098260, 0xE6000000, 0x00000000, 0xF4000000, 0x0707E0FC, 0xE7000000, 0x00000000, 0xF5800800, 0x00098260, 0xF2000000, 0x000FC0FC, 0xDF000000, 0x00000000, };
+Gfx Gfx_LoadStencilTex_Mario[] = {  
+    gsSPDisplayList(&Gfx_LoadStencilTex_CommonParams),
+    gsDPSetTextureLUT(G_TT_NONE),
+    gsDPLoadTextureTile_4b(ui_stencil_mario_png, G_IM_FMT_I, 64, 0, 0, 0, 63, 63, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
+    gsSPEndDisplayList()
+};
 
-s32 D_8014E6C0[] = {  0xDE000000, &D_8014E5A0, 0xE3001001, 0x00000000, 0xFD88000F, ui_stencil_star_png, 0xF5880400, 0x07098350, 0xE6000000, 0x00000000, 0xF4000000, 0x0703E0FC, 0xE7000000, 0x00000000, 0xF5800400, 0x00098350, 0xF2000000, 0x0007C0FC, 0xF2000000, 0x000FC0FC, 0xDF000000, 0x00000000, };
+Gfx Gfx_LoadStencilTex_Star[] = {  
+    gsSPDisplayList(&Gfx_LoadStencilTex_CommonParams),
+    gsDPSetTextureLUT(G_TT_NONE),
+    gsDPLoadTextureTile_4b(ui_stencil_star_png, G_IM_FMT_I, 32, 0, 0, 0, 31, 63, 0, G_TX_MIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 6, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x00FC),
+    gsSPEndDisplayList(),
+};
 
-s32 D_8014E718[] = {  0xDE000000, &D_8014E5A0, 0xE3001001, 0x00000000, 0xFD88003F, ui_stencil_blurry_circle_png, 0xF5881000, 0x070D8360, 0xE6000000, 0x00000000, 0xF4000000, 0x070FC0FC, 0xE7000000, 0x00000000, 0xF5881000, 0x000D8360, 0xF2000000, 0x000FC0FC, 0xF2000000, 0x001FC1FC, 0xDF000000, 0x00000000, };
+Gfx Gfx_LoadStencilTex_BlurryCircle[] = {
+    gsSPDisplayList(&Gfx_LoadStencilTex_CommonParams),
+    gsDPSetTextureLUT(G_TT_NONE),
+    gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_8b, 64, ui_stencil_blurry_circle_png),
+    gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 8, 0x0000, G_TX_LOADTILE, 0, G_TX_MIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_MIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
+    gsDPLoadSync(),
+    gsDPLoadTile(G_TX_LOADTILE, 0, 0, 0x00FC, 0x00FC),
+    gsDPPipeSync(),
+    gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_MIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_MIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
+    gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x00FC),
+    gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x01FC, 0x01FC),
+    gsSPEndDisplayList()
+};
 
-s32 D_8014E770[] = {  0x000000F0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x014000F0, 0x00000000, 0x28000000, 0xFFFFFFFF, 0x000000DA, 0x00000000, 0x000002C0, 0xFFFFFFFF, 0x014000DA, 0x00000000, 0x280002C0, 0xFFFFFFFF, 0x000000C4, 0x00000000, 0x00000580, 0xFFFFFFFF, 0x014000C4, 0x00000000, 0x28000580, 0xFFFFFFFF, 0x000000AE, 0x00000000, 0x00000840, 0xFFFFFFFF, 0x014000AE, 0x00000000, 0x28000840, 0xFFFFFFFF, 0x00000098, 0x00000000, 0x00000B00, 0xFFFFFFFF, 0x01400098, 0x00000000, 0x28000B00, 0xFFFFFFFF, 0x00000082, 0x00000000, 0x00000DC0, 0xFFFFFFFF, 0x01400082, 0x00000000, 0x28000DC0, 0xFFFFFFFF, 0x0000006C, 0x00000000, 0x00001080, 0xFFFFFFFF, 0x0140006C, 0x00000000, 0x28001080, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00001340, 0xFFFFFFFF, 0x01400056, 0x00000000, 0x28001340, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00001600, 0xFFFFFFFF, 0x01400040, 0x00000000, 0x28001600, 0xFFFFFFFF, 0x0000002A, 0x00000000, 0x000018C0, 0xFFFFFFFF, 0x0140002A, 0x00000000, 0x280018C0, 0xFFFFFFFF, 0x00000014, 0x00000000, 0x00001B80, 0xFFFFFFFF, 0x01400014, 0x00000000, 0x28001B80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00001E00, 0xFFFFFFFF, 0x01400000, 0x00000000, 0x28001E00, 0xFFFFFFFF, };
+#include "vtx/stencil2.vtx.inc.c"
 
-s32 D_8014E8F0[] = {  0xD7000000, 0x80008000, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE2001D00, 0x00000004, 0xEE000000, 0x00000000, 0xE200001C, 0x50504360, 0xFCFFE7FF, 0xFFCE7F3F, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xD9DDF9FF, 0x00000000, 0xD9FFFFFF, 0x00000405, 0x0100A014, D_8014E500, 0x06000204, 0x00060004, 0x06000802, 0x00060A00, 0x06020C04, 0x000E0604, 0x06100E04, 0x000E1206, 0xE7000000, 0x00000000, 0xE2001D00, 0x00000000, 0xDF000000, 0x00000000, };
+Gfx D_8014E8F0[] = {
+    gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPPipeSync(),
+    gsDPSetCycleType(G_CYC_1CYCLE),
+    gsDPSetDepthSource(G_ZS_PRIM),
+    gsDPSetPrimDepth(0, 0),
+    gsDPSetRenderMode(Z_UPD | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_MEM, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), Z_UPD | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_MEM, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)),
+    gsDPSetCombineLERP(0, 0, 0, SHADE, 1, 0, PRIMITIVE, 0, 0, 0, 0, SHADE, 1, 0, PRIMITIVE, 0),
+    gsDPSetTexturePersp(G_TP_PERSP),
+    gsDPSetTextureDetail(G_TD_CLAMP),
+    gsDPSetTextureLOD(G_TL_TILE),
+    gsDPSetTextureLUT(G_TT_NONE),
+    gsDPSetTextureFilter(G_TF_BILERP),
+    gsDPSetTextureConvert(G_TC_FILT),
+    gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING | G_SHADING_SMOOTH),
+    gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK),
+    gsSPVertex(&vtx_stencil1, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
+    gsSP2Triangles(0, 4, 1, 0, 3, 5, 0, 0),
+    gsSP2Triangles(1, 6, 2, 0, 7, 3, 2, 0),
+    gsSP2Triangles(8, 7, 2, 0, 7, 9, 3, 0),
+    gsDPPipeSync(),
+    gsDPSetDepthSource(G_ZS_PIXEL),
+    gsSPEndDisplayList()
+};
 
-s32 D_8014E9A8[] = {  0xE7000000, 0x00000000, 0xE2001D00, 0x00000004, 0xEE000000, 0x00140000, 0xE200001C, 0x00504A50, 0xFCFFE7FF, 0xFFCE7F3F, 0xD9DDF9FF, 0x00000000, 0xD9FFFFFF, 0x00000005, 0xE3001801, 0x00000000, 0xE3000A01, 0x00000000, 0xE3001201, 0x00002000, 0xE3000C00, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3000D01, 0x00000000, 0xE3001402, 0x00000C00, 0xF65003C0, 0x00000000, 0xE3001801, 0x000000C0, 0xE7000000, 0x00000000, 0xE2001D00, 0x00000000, 0xDF000000, 0x00000000, };
+Gfx D_8014E9A8[] = {
-
+    gsDPPipeSync(),
-s32 D_8014EA48[] = {  0xE2001D00, 0x00000004, 0xEE000000, 0x00140000, 0xE200001C, 0x00552210, 0xD9FDF9FF, 0x00000000, 0xD9DFFFFF, 0x00000000, 0xD7000002, 0x80008000, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0x01018030, &D_8014E770, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000000, 0x0727C02C, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000000, 0x0027C02C, 0x06000402, 0x00060204, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF400002C, 0x0727C058, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF200002C, 0x0027C058, 0x06040806, 0x000A0608, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000058, 0x0727C084, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000058, 0x0027C084, 0x06080C0A, 0x000E0A0C, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000084, 0x0727C0B0, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000084, 0x0027C0B0, 0x060C100E, 0x00120E10, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF40000B0, 0x0727C0DC, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF20000B0, 0x0027C0DC, 0x06101412, 0x00161214, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF40000DC, 0x0727C108, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF20000DC, 0x0027C108, 0x06141816, 0x001A1618, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000108, 0x0727C134, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000108, 0x0027C134, 0x06181C1A, 0x001E1A1C, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000134, 0x0727C160, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000134, 0x0027C160, 0x061C201E, 0x00221E20, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000160, 0x0727C18C, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000160, 0x0027C18C, 0x06202422, 0x00262224, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF400018C, 0x0727C1B8, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF200018C, 0x0027C1B8, 0x06242826, 0x002A2628, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF40001B8, 0x0727C1DC, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF20001B8, 0x0027C1DC, 0x06282C2A, 0x002E2A2C, 0xE7000000, 0x00000000, 0xE2001D00, 0x00000000, };
+    gsDPSetDepthSource(G_ZS_PRIM),
+    gsDPSetPrimDepth(20, 0),
+    gsDPSetRenderMode(G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2),
+    gsDPSetCombineLERP(0, 0, 0, SHADE, 1, 0, PRIMITIVE, 0, 0, 0, 0, SHADE, 1, 0, PRIMITIVE, 0),
+    gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING | G_SHADING_SMOOTH),
+    gsSPSetGeometryMode(G_ZBUFFER | G_SHADE),
+    gsDPSetColorDither(G_CD_MAGICSQ),
+    gsDPSetCycleType(G_CYC_1CYCLE),
+    gsDPSetTextureFilter(G_TF_BILERP),
+    gsDPSetTexturePersp(G_TP_NONE),
+    gsDPSetTextureLOD(G_TL_TILE),
+    gsDPSetTextureLUT(G_TT_NONE),
+    gsDPSetTextureDetail(G_TD_CLAMP),
+    gsDPSetTextureConvert(G_TC_FILT),
+    gsDPFillRectangle(0, 0, 320, 240),
+    gsDPSetColorDither(G_CD_DISABLE),
+    gsDPPipeSync(),
+    gsDPSetDepthSource(G_ZS_PIXEL),
+    gsSPEndDisplayList()
+};
 
+Gfx D_8014EA48[] = {
+    gsDPSetDepthSource(G_ZS_PRIM),
+    gsDPSetPrimDepth(20, 0),
+    gsDPSetRenderMode(Z_CMP | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), Z_CMP | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)),
+    gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING),
+    gsSPClearGeometryMode(G_SHADING_SMOOTH),
+    gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON),
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
+    gsDPSetTexturePersp(G_TP_PERSP),
+    gsDPSetTextureDetail(G_TD_CLAMP),
+    gsDPSetTextureLOD(G_TL_TILE),
+    gsDPSetTextureLUT(G_TT_NONE),
+    gsDPSetTextureFilter(G_TF_BILERP),
+    gsDPSetTextureConvert(G_TC_FILT),
+    gsSPVertex(&vtx_stencil2, 24, 0),
+    gsDPLoadTextureTile(&D_80156910, G_IM_FMT_RGBA, G_IM_SIZ_16b, 160, 0, 0, 0, 159, 11, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 8, 4, G_TX_NOLOD, G_TX_NOLOD),
+    gsSP2Triangles(0, 2, 1, 0, 3, 1, 2, 0),
+    gsDPLoadTextureTile(&D_80156910, G_IM_FMT_RGBA, G_IM_SIZ_16b, 160, 0, 0, 11, 159, 22, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 8, 4, G_TX_NOLOD, G_TX_NOLOD),
+    gsSP2Triangles(2, 4, 3, 0, 5, 3, 4, 0),
+    gsDPLoadTextureTile(&D_80156910, G_IM_FMT_RGBA, G_IM_SIZ_16b, 160, 0, 0, 22, 159, 33, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 8, 4, G_TX_NOLOD, G_TX_NOLOD),
+    gsSP2Triangles(4, 6, 5, 0, 7, 5, 6, 0),
+    gsDPLoadTextureTile(&D_80156910, G_IM_FMT_RGBA, G_IM_SIZ_16b, 160, 0, 0, 33, 159, 44, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 8, 4, G_TX_NOLOD, G_TX_NOLOD),
+    gsSP2Triangles(6, 8, 7, 0, 9, 7, 8, 0),
+    gsDPLoadTextureTile(&D_80156910, G_IM_FMT_RGBA, G_IM_SIZ_16b, 160, 0, 0, 44, 159, 55, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 8, 4, G_TX_NOLOD, G_TX_NOLOD),
+    gsSP2Triangles(8, 10, 9, 0, 11, 9, 10, 0),
+    gsDPLoadTextureTile(&D_80156910, G_IM_FMT_RGBA, G_IM_SIZ_16b, 160, 0, 0, 55, 159, 66, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 8, 4, G_TX_NOLOD, G_TX_NOLOD),
+    gsSP2Triangles(10, 12, 11, 0, 13, 11, 12, 0),
+    gsDPLoadTextureTile(&D_80156910, G_IM_FMT_RGBA, G_IM_SIZ_16b, 160, 0, 0, 66, 159, 77, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 8, 4, G_TX_NOLOD, G_TX_NOLOD),
+    gsSP2Triangles(12, 14, 13, 0, 15, 13, 14, 0),
+    gsDPLoadTextureTile(&D_80156910, G_IM_FMT_RGBA, G_IM_SIZ_16b, 160, 0, 0, 77, 159, 88, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 8, 4, G_TX_NOLOD, G_TX_NOLOD),
+    gsSP2Triangles(14, 16, 15, 0, 17, 15, 16, 0),
+    gsDPLoadTextureTile(&D_80156910, G_IM_FMT_RGBA, G_IM_SIZ_16b, 160, 0, 0, 88, 159, 99, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 8, 4, G_TX_NOLOD, G_TX_NOLOD),
+    gsSP2Triangles(16, 18, 17, 0, 19, 17, 18, 0),
+    gsDPLoadTextureTile(&D_80156910, G_IM_FMT_RGBA, G_IM_SIZ_16b, 160, 0, 0, 99, 159, 110, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 8, 4, G_TX_NOLOD, G_TX_NOLOD),
+    gsSP2Triangles(18, 20, 19, 0, 21, 19, 20, 0),
+    gsDPLoadTextureTile(&D_80156910, G_IM_FMT_RGBA, G_IM_SIZ_16b, 160, 0, 0, 110, 159, 119, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 8, 4, G_TX_NOLOD, G_TX_NOLOD),
+    gsSP2Triangles(20, 22, 21, 0, 23, 21, 22, 0),
+    gsDPPipeSync(),
+    gsDPSetDepthSource(G_ZS_PIXEL)
+};
 
 INCLUDE_ASM(void, "cd180_len_38f0", _render_transition_stencil, u8 arg0, f32 arg1, ScreenOverlay* arg2);
 

src/common/UnkBattleFunc2.inc.c

@@ -7,7 +7,7 @@ ApiStatus N(UnkBattleFunc2)(Evt* script, s32 isInitialCall) {
     s32 y = evt_get_variable(script, *args++);
     s32 z = evt_get_variable(script, *args++);
 
-    func_802D7460(x, y, z, evt_get_variable(script, *args++));
+    show_start_recovery_shimmer(x, y, z, evt_get_variable(script, *args++));
 
     return ApiStatus_DONE2;
 }
@@ -18,7 +18,7 @@ ApiStatus N(UnkBattleFunc2_2)(Evt* script, s32 isInitialCall) {
     s32 y = evt_get_variable(script, *args++);
     s32 z = evt_get_variable(script, *args++);
 
-    func_802D74C0(x, y, z, evt_get_variable(script, *args++));
+    show_recovery_shimmer(x, y, z, evt_get_variable(script, *args++));
 
     return ApiStatus_DONE2;
 }

src/effects/disable_x.c

@@ -151,7 +151,7 @@ void disable_x_update(EffectInstance* effect) {
                     data[1].unk_28 = 0;
                     data->unk_38++;
                     if (data->pos.y > -500.0f) {
-                        shim_sfx_play_sound_at_position(0x2107, 0, data->pos.x, data->pos.y, data->pos.z);
+                        shim_sfx_play_sound_at_position(SOUND_2107, 0, data->pos.x, data->pos.y, data->pos.z);
                     }
                 } else if (unk_3C < unk_38) {
                     shim_load_effect(EFFECT_DISABLE_X);

src/effects/star.c

@@ -149,7 +149,7 @@ void star_update(EffectInstance* effect) {
             landing_dust_main(0, data->unk_04, data->unk_08 - 5.0f, data->unk_0C, 0.0f);
 
             if (!gGameStatusPtr->isBattle) {
-                shim_sfx_play_sound_at_position(0xB0000016, 0, data->unk_04, data->unk_08, data->unk_0C);
+                shim_sfx_play_sound_at_position(SOUND_B0000016, 0, data->unk_04, data->unk_08, data->unk_0C);
             }
 
             data->unk_00 = 0;

src/entity/Block.c

@@ -275,7 +275,7 @@ s32 entity_block_handle_collision(Entity* entity) {
                 return 1;
             }
             set_entity_commandlist(entity, &D_802E9E80);
-            sfx_play_sound_at_position(0x14f, 0, entity->position.x, entity->position.y, entity->position.z);
+            sfx_play_sound_at_position(SOUND_14F, 0, entity->position.x, entity->position.y, entity->position.z);
             break;
         case 0x16:
         case 0x19:
@@ -290,7 +290,7 @@ s32 entity_block_handle_collision(Entity* entity) {
                 return 1;
             }
             set_entity_commandlist(entity, &D_802E9E80);
-            sfx_play_sound_at_position(0x150, 0, entity->position.x, entity->position.y, entity->position.z);
+            sfx_play_sound_at_position(SOUND_150, 0, entity->position.x, entity->position.y, entity->position.z);
             break;
         case 0x17:
         case 0x1a:
@@ -298,7 +298,7 @@ s32 entity_block_handle_collision(Entity* entity) {
                 return 1;
             }
             set_entity_commandlist(entity, &D_802E9E80);
-            sfx_play_sound_at_position(0x151, 0, entity->position.x, entity->position.y, entity->position.z);
+            sfx_play_sound_at_position(SOUND_151, 0, entity->position.x, entity->position.y, entity->position.z);
             break;
         case 0x1b:
         case 0x1c:

src/entity/HeartBlock.c

@@ -157,7 +157,7 @@ void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) {
                 data->sparkleTrailTimer = 0;
                 recover_hp(-1);
                 recover_fp(-1);
-                sfx_play_sound(0x131);
+                sfx_play_sound(SOUND_131);
             }
             data->yawBuffer[data->yawBufferPos] = entity->rotation.y;
             data->yawBufferPos++;

src/entity/SaveBlock.c

@@ -47,7 +47,7 @@ void entity_SaveBlock_save_data(void) {
 void entity_SaveBlock_show_tutorial_message(Entity* entity) {
     if (!get_global_flag(EVT_SAVE_FLAG(95))) {
         SaveBlockTutorialPrinterClosed = FALSE;
-        msg_get_printer_for_msg(0x1D0000, &SaveBlockTutorialPrinterClosed);
+        msg_get_printer_for_msg(MESSAGE_ID(0x1D, 0x0), &SaveBlockTutorialPrinterClosed);
         set_global_flag(EVT_SAVE_FLAG(95));
         return;
     }
@@ -65,13 +65,13 @@ void entity_SaveBlock_wait_for_close_tutorial(Entity* entity) {
 void entity_SaveBlock_show_choice_message(void) {
     SaveBlockTutorialPrinterClosed = FALSE;
     SaveBlockResultPrinterClosed = FALSE;
-    SaveBlockResultPrinter = msg_get_printer_for_msg(0x1D0004, &SaveBlockResultPrinterClosed);
+    SaveBlockResultPrinter = msg_get_printer_for_msg(MESSAGE_ID(0x1D, 0x4), &SaveBlockResultPrinterClosed);
-    SaveBlockTutorialPrinter = msg_get_printer_for_msg(0x1E000A, &SaveBlockTutorialPrinterClosed);
+    SaveBlockTutorialPrinter = msg_get_printer_for_msg(MESSAGE_ID(0x1E, 0xA), &SaveBlockTutorialPrinterClosed);
 }
 
 void entity_SaveBlock_show_result_message(void) {
-    msg_printer_load_msg(0x1D0005, SaveBlockResultPrinter);
+    msg_printer_load_msg(MESSAGE_ID(0x1D, 0x5), SaveBlockResultPrinter);
-    sfx_play_sound(0x10);
+    sfx_play_sound(SOUND_10);
 }
 
 void entity_SaveBlock_wait_for_close_result(Entity* entity) {

src/entity/SimpleSpring.c

@@ -19,7 +19,7 @@ void entity_SimpleSpring_idle(Entity* ent) {
         play_model_animation(ent->virtualModelIndex, 0x1E4);
         entity_start_script(ent);
         exec_entity_commandlist(ent);
-        sfx_play_sound_at_position(0x2086, 0, ent->position.x, ent->position.y, ent->position.z);
+        sfx_play_sound_at_position(SOUND_2086, 0, ent->position.x, ent->position.y, ent->position.z);
         disable_player_input();
         gPlayerStatus.currentSpeed = 0;
     }

src/entity/WoodenCrate.c

@@ -39,7 +39,7 @@ s32 entity_WoodenCrate_idle(Entity* entity) {
         entity_set_render_script(entity, &D_802EAE7C);
         entity_start_script(entity);
         exec_entity_commandlist(entity);
-        sfx_play_sound(0x20AE);
+        sfx_play_sound(SOUND_20AE);
     }
 }
 

src/entity/jan_iwa/E2D730.c

@@ -82,11 +82,11 @@ void func_802BB298_E2DBC8(Entity* entity) {
 }
 
 void func_802BB314_E2DC44(Entity* entity) {
-    sfx_play_sound_at_position(0x8000006A, 0, entity->position.x, entity->position.y, entity->position.z);
+    sfx_play_sound_at_position(SOUND_8000006A, 0, entity->position.x, entity->position.y, entity->position.z);
 }
 
 void func_802BB34C_E2DC7C(void) {
-    sfx_play_sound(0x791);
+    sfx_play_sound(SOUND_791);
     func_80149A6C(0x391, 1);
 }
 

src/entity/jan_iwa/E2E5F0.c

@@ -142,6 +142,6 @@ void func_802BC3E4_E2ED14(Entity* entity) {
         data->unk_10 -= 360.0f;
     }
     if (data->unk_10 == 96.0f) {
-        sfx_play_sound(0x392);
+        sfx_play_sound(SOUND_392);
     }
 }

src/evt/cam_api.c

@@ -187,7 +187,70 @@ ApiStatus SetCamTarget(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "evt/cam_api", func_802CB008, Evt* script, s32 isInitialCall);
+ApiStatus InterpCamTargetPos(Evt* script, s32 isInitialCall) {
+    typedef struct CamInterpData {
+        /* 0x00 */ Camera* cam;
+        /* 0x04 */ s32 useTarget;
+        /* 0x08 */ Vec3f vel;
+        /* 0x14 */ s32 time;
+    } CamInterpData; // size = 0x18
+    
+    Bytecode* args = script->ptrReadPos;
+    CamInterpData* data;
+    Camera* cam;
+
+    if (isInitialCall) {
+        s32 camID = evt_get_variable(script, *args++);
+        s32 useTarget = evt_get_variable(script, *args++);
+        s32 posX = evt_get_variable(script, *args++);
+        s32 posY = evt_get_variable(script, *args++);
+        s32 posZ = evt_get_variable(script, *args++);
+        s32 time = evt_get_variable(script, *args++);
+        
+        data = heap_malloc(sizeof(*data));
+        script->userData = data;
+        cam = &gCameras[camID];
+        data->cam = cam;
+        data->useTarget = useTarget;
+        data->time = time;
+        
+        switch (data->useTarget) {
+            case 0:
+                data->vel.x = (posX - cam->auxPos.x) / data->time;
+                data->vel.y = (posY - cam->auxPos.y) / data->time;
+                data->vel.z = (posZ - cam->auxPos.z) / data->time;
+                break;
+            case 1:
+                data->vel.x = (posX - cam->targetPos.x) / data->time;
+                data->vel.y = (posY - cam->targetPos.y) / data->time;
+                data->vel.z = (posZ - cam->targetPos.z) / data->time;
+                break;
+        }
+    }
+    
+    data = script->userData;
+    cam = data->cam;
+    switch (data->useTarget) {
+        case 0:
+            cam->auxPos.x += data->vel.x;
+            cam->auxPos.y += data->vel.y;
+            cam->auxPos.z += data->vel.z;
+            break;
+        case 1:
+            cam->targetPos.x += data->vel.x;
+            cam->targetPos.y += data->vel.y;
+            cam->targetPos.z += data->vel.z;
+            break;
+    }
+    
+    data->time--;
+    if (data->time == 0) {
+        heap_free(script->userData);
+        script->userData = NULL;
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
 
 ApiStatus ShakeCam(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;

src/evt/f8f60_len_1560.c

@@ -272,94 +272,82 @@ ApiStatus func_802D4D88(Evt* script, s32 initialCall) {
     return ApiStatus_DONE2;
 }
 
-void load_path_data(s32 numVectors, f32* arg1, Vec3f* staticVectorList, Vec3f* vectors);
+void load_path_data(s32 num, f32* normalizedLengths, Vec3f* pathPositions, Vec3f* outVectors) {
-
+    f32* lenBuf = heap_malloc(num * sizeof(f32));
-#ifdef NON_EQUIVALENT
+    Vec3f* vecBuf = heap_malloc(num * sizeof(Vec3f));
-// most likely functionally equivalent, lots of issues though.
-void load_path_data(s32 numVectors, f32* arg1, Vec3f* staticVectorList, Vec3f* vectors) {
-    struct Vec3f* temp_s4;
-    f32* temp_s7;
     s32 i;
-    f32* temp;
-    f32 new_var;
-    f32 new_var2;
 
-    temp_s7 = heap_malloc(numVectors * sizeof(f32));
+    // compute the distance of each vector along the path and map to the range [0,1]
-    temp_s4 = heap_malloc(numVectors * sizeof(Vec3f));
+    normalizedLengths[0] = 0.0f;
-    arg1[0] = 0.0f;
+    for (i = 1; i < num; i++) {
-
+        f32 dx = pathPositions[i].x - pathPositions[i-1].x;
-    for (i = 1; i < numVectors; i++) {
+        f32 dy = pathPositions[i].y - pathPositions[i-1].y;
-        f32 temp_x = SQ(staticVectorList[i].x - staticVectorList[i - 1].x);
+        f32 dz = pathPositions[i].z - pathPositions[i-1].z;
-        f32 temp_y = SQ(staticVectorList[i].y - staticVectorList[i - 1].y);
+        f32 length = sqrtf(SQ(dx) + SQ(dy) + SQ(dz));
-        f32 temp_z = SQ(staticVectorList[i].z - staticVectorList[i - 1].z);
+        normalizedLengths[i] = normalizedLengths[i-1] + length;
-        arg1[i] = arg1[i - 1] + sqrtf(temp_x + temp_y + temp_z);
+    }
+    for (i = 1; i < num; i++) {
+        normalizedLengths[i] /= normalizedLengths[num-1];
     }
 
-    for (i = 1; i < numVectors; i++) {
+    // end points
-        arg1[i] = arg1[i] / arg1[numVectors - 1];
+    outVectors[0].x = 0.0f;
+    outVectors[0].y = 0.0f;
+    outVectors[0].z = 0.0f;
+    outVectors[num-1].x = 0.0f;
+    outVectors[num-1].y = 0.0f;
+    outVectors[num-1].z = 0.0f;
+    
+    for (i = 0; i < num - 1; i++) {
+        lenBuf[i] = normalizedLengths[i+1] - normalizedLengths[i];
+        vecBuf[i+1].x = (pathPositions[i+1].x - pathPositions[i].x) / lenBuf[i];
+        vecBuf[i+1].y = (pathPositions[i+1].y - pathPositions[i].y) / lenBuf[i];
+        vecBuf[i+1].z = (pathPositions[i+1].z - pathPositions[i].z) / lenBuf[i];
     }
 
-    vectors[0].x = 0;
+    // n = 1
+    outVectors[1].x = vecBuf[2].x - vecBuf[1].x;
+    outVectors[1].y = vecBuf[2].y - vecBuf[1].y;
+    outVectors[1].z = vecBuf[2].z - vecBuf[1].z;
+    vecBuf[1].x = 2.0f * (normalizedLengths[2] - normalizedLengths[0]);
+    vecBuf[1].y = 2.0f * (normalizedLengths[2] - normalizedLengths[0]);
+    vecBuf[1].z = 2.0f * (normalizedLengths[2] - normalizedLengths[0]);
 
-    vectors[numVectors - 1].z = 0;
+    // 1 < n < N - 2
-    vectors[0].z = 0;
+    for (i = 1; i < num - 2; i++) {
-
+        f32 sx = lenBuf[i] / vecBuf[i].x;
-    vectors[numVectors - 1].x = 0;
+        f32 sy = lenBuf[i] / vecBuf[i].y;
-
+        f32 sz = lenBuf[i] / vecBuf[i].z;
-    vectors[0].y = 0;
+        outVectors[i+1].x = (vecBuf[i+2].x - vecBuf[i+1].x) - outVectors[i].x * sx;
-    vectors[numVectors - 1].y = 0;
+        outVectors[i+1].y = (vecBuf[i+2].y - vecBuf[i+1].y) - outVectors[i].y * sy;
-
+        outVectors[i+1].z = (vecBuf[i+2].z - vecBuf[i+1].z) - outVectors[i].z * sz;
-    for (i = 0; i < (numVectors - 1); i++) {
+        vecBuf[i+1].x = 2.0f * (normalizedLengths[i+2] - normalizedLengths[i]) - lenBuf[i] * sx;
-        f32 temp = temp_s7[i];
+        vecBuf[i+1].y = 2.0f * (normalizedLengths[i+2] - normalizedLengths[i]) - lenBuf[i] * sy;
-        temp_s7[i] = arg1[i + 1] - arg1[i];
+        vecBuf[i+1].z = 2.0f * (normalizedLengths[i+2] - normalizedLengths[i]) - lenBuf[i] * sz;
-        temp_s4[i + 1].x = ((staticVectorList[i + 1].x - staticVectorList[i].x) / temp_s7[i]);
-        temp_s4[i + 1].y = ((staticVectorList[i + 1].y - staticVectorList[i].y) / temp);
-        temp_s4[i + 1].z = ((staticVectorList[i + 1].z - staticVectorList[i].z) / temp);
     }
 
-    vectors[1].x = temp_s4[2].x - temp_s4[1].x;
+    // n = N - 2
-    vectors[1].y = temp_s4[2].y - temp_s4[1].y;
+    outVectors[num-2].x -= (lenBuf[num-2] * outVectors[num-1].x);
-    vectors[1].z = temp_s4[2].z - temp_s4[1].z;
+    outVectors[num-2].y -= (lenBuf[num-2] * outVectors[num-1].y);
-    temp_s4[1].x = ((arg1[2] - arg1[0]) * 2);
+    outVectors[num-2].z -= (lenBuf[num-2] * outVectors[num-1].z);
-    temp_s4[1].y = ((arg1[2] - arg1[0]) * 2);
-    temp_s4[1].z = ((arg1[2] - arg1[0]) * 2);
 
-    for (i = 1; i < numVectors - 2; i++) {
+    for (i = num - 2; i > 0; i--) {
-        f32 temp_x = temp_s7[i] / temp_s4[i].x;
+        outVectors[i].x = (outVectors[i].x - (lenBuf[i] * outVectors[i+1].x)) / vecBuf[i].x;
-        f32 temp_y = temp_s7[i] / temp_s4[i].y;
+        outVectors[i].y = (outVectors[i].y - (lenBuf[i] * outVectors[i+1].y)) / vecBuf[i].y;
-        f32 temp_z = temp_s7[i] / temp_s4[i].z;
+        outVectors[i].z = (outVectors[i].z - (lenBuf[i] * outVectors[i+1].z)) / vecBuf[i].z;
-        new_var = vectors[i].x;
-        vectors[i + 1].x = (temp_s4[i + 2].x - temp_s4[i].x) - (new_var * temp_x);
-        vectors[i + 1].y = (temp_s4[i + 2].y - temp_s4[i].y) - (new_var * temp_y);
-        vectors[i + 1].z = (temp_s4[i + 2].z - temp_s4[i].z) - (new_var * temp_z);
-        temp_s4[i].x = ((arg1[i + 2] - arg1[i]) * 2) - (temp_s7[i] * temp_x);
-        temp_s4[i].y = ((arg1[i + 2] - arg1[i]) * 2) - (temp_s7[i] * temp_y);
-        temp_s4[i].z = ((arg1[i + 2] - arg1[i]) * 2) - (temp_s7[i] * temp_z);
     }
-
+    
-    vectors[numVectors - 2].x = vectors[numVectors - 2].x - (temp_s7[numVectors - 2] * vectors[numVectors - 1].x);
+    heap_free(lenBuf);
-    vectors[numVectors - 2].y = vectors[numVectors - 2].y - (temp_s7[numVectors - 2] * vectors[numVectors - 1].y);
+    heap_free(vecBuf);
-    vectors[numVectors - 2].z = vectors[numVectors - 2].z - (temp_s7[numVectors - 2] * vectors[numVectors - 1].z);
-
-    for (i = (numVectors - 2); i > 0 ; i--) {
-        vectors[i].x = (vectors[i].x - (temp_s7[i] * vectors[i + 1].x)) / temp_s4[i].x;
-        vectors[i].y = (vectors[i].y - (temp_s7[i] * vectors[i + 1].y)) / temp_s4[i].y;
-        vectors[i].z = (vectors[i].z - (temp_s7[i] * vectors[i + 1].z)) / temp_s4[i].z;
-    }
-
-    heap_free(temp_s7);
-    heap_free(temp_s4);
 }
-#else
-INCLUDE_ASM(s32, "evt/f8f60_len_1560", load_path_data);
-#endif
 
-void get_path_position(f32 alpha, Vec3f* outPos, s32 numVectors, f32* normalizedLengths, Vec3f* staticVectors, Vec3f* vectors) {
+void get_path_position(f32 alpha, Vec3f* outPos, s32 numVectors, f32* normalizedLengths, Vec3f* pathPoints, Vec3f* vectors) {
     s32 limit = numVectors - 1;
-    f32 lenDiff;
+    f32 curLength;
-    f32 diff2;
+    f32 curProgress;
+    f32 ax, ay, az, bx, by, bz, dx, dy, dz;
     s32 i;
-
+    
     for (i = 0; i < limit;) {
         s32 temp_v1 = (i + limit) / 2;
 
@@ -373,15 +361,24 @@ void get_path_position(f32 alpha, Vec3f* outPos, s32 numVectors, f32* normalized
     if (i > 0) {
         i--;
     }
+    
+    curLength = normalizedLengths[i+1] - normalizedLengths[i];
+    curProgress = alpha - normalizedLengths[i];
 
-    lenDiff = normalizedLengths[i + 1] - normalizedLengths[i];
+    dx = (pathPoints[i+1].x - pathPoints[i].x) / curLength;
-    diff2 = alpha - normalizedLengths[i];
+    ax = (((vectors[i+1].x - vectors[i].x) * curProgress / curLength) + (3.0f * vectors[i].x)) * curProgress;
+    bx = dx - (((2.0f * vectors[i].x) + vectors[i+1].x) * curLength);
+    outPos->x = ((ax + bx) * curProgress) + pathPoints[i].x;
 
-    outPos->x = (((((((vectors[i + 1].x - vectors[i].x) * diff2) / lenDiff) + (vectors[i].x * 3.0f)) * diff2) + (((staticVectors[i + 1].x - staticVectors[i].x) / lenDiff) - (((2.0f * vectors[i].x) + vectors[i + 1].x) * lenDiff))) * diff2) + staticVectors[i].x;
+    dy = (pathPoints[i+1].y - pathPoints[i].y) / curLength;
+    ay = (((vectors[i+1].y - vectors[i].y) * curProgress / curLength) + (3.0f * vectors[i].y)) * curProgress;
+    by = dy - (((2.0f * vectors[i].y) + vectors[i+1].y) * curLength);
+    outPos->y = ((ay + by) * curProgress) + pathPoints[i].y;
 
-    outPos->y = (((((((vectors[i + 1].y - vectors[i].y) * diff2) / lenDiff) + (vectors[i].y * 3.0f)) * diff2) + (((staticVectors[i + 1].y - staticVectors[i].y) / lenDiff) - (((2.0f * vectors[i].y) + vectors[i + 1].y) * lenDiff))) * diff2) + staticVectors[i].y;
+    dz = (pathPoints[i+1].z - pathPoints[i].z) / curLength;
-
+    az = (((vectors[i+1].z - vectors[i].z) * curProgress / curLength) + (3.0f * vectors[i].z)) * curProgress;
-    outPos->z = (((((((vectors[i + 1].z - vectors[i].z) * diff2) / lenDiff) + (vectors[i].z * 3.0f)) * diff2) + (((staticVectors[i + 1].z - staticVectors[i].z) / lenDiff) - (((2.0f * vectors[i].z) + vectors[i + 1].z) * lenDiff))) * diff2) + staticVectors[i].z;
+    bz = dz - (((2.0f * vectors[i].z) + vectors[i+1].z) * curLength);
+    outPos->z = ((az + bz) * curProgress) + pathPoints[i].z;
 }
 
 s32 LoadPath(Evt* script, s32 isInitialCall) {
@@ -413,17 +410,17 @@ ApiStatus GetNextPathPos(Evt* script, s32 isInitialCall) {
     f32 diff;
 
     switch (path->easingType) {
-        case 0:
+        case EASING_LINEAR:
             alpha = 1.0f / path->timeLeft * path->timeElapsed;
             break;
-        case 1:
+        case EASING_QUADRATIC_IN:
             alpha = 1.0f / SQ(path->timeLeft) * SQ(path->timeElapsed);
             break;
-        case 4:
+        case EASING_QUADRATIC_OUT:
             diff = path->timeLeft - path->timeElapsed;
             alpha = 1.0f - (SQ(diff) / SQ(path->timeLeft));
             break;
-        case 10:
+        case EASING_COS_IN_OUT:
             alpha = (1.0f - cos_rad((PI / path->timeLeft) * path->timeElapsed)) * 0.5f;
             break;
         default:

src/evt/fx_api.c

@@ -1,35 +1,119 @@
 #include "common.h"
 #include "effects.h"
 
-INCLUDE_ASM(void, "evt/fx_api", func_802D7460, f32 x, f32 y, f32 z, s32 arg3);
+void show_start_recovery_shimmer(f32 x, f32 y, f32 z, s32 amt) {
+    fx_stars_shimmer(1, x, y, z, amt + 30, amt + 30, (amt / 2) + 10, 30);
+}
 
-INCLUDE_ASM(void, "evt/fx_api", func_802D74C0, f32 x, f32 y, f32 z, s32 arg3);
+void show_recovery_shimmer(f32 x, f32 y, f32 z, s32 amt) {
+    fx_stars_shimmer(2, x, y, z, amt + 30, amt + 30, (amt / 2) + 10, 30);
+}
 
-ApiStatus func_802D7520(Evt* script, s32 isInitialCall) {
+ApiStatus ShowStartRecoveryShimmer(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     f32 x = evt_get_float_variable(script, *args++);
     f32 y = evt_get_float_variable(script, *args++);
     f32 z = evt_get_float_variable(script, *args++);
 
-    func_802D7460(x, y, z, evt_get_variable(script, *args++));
+    show_start_recovery_shimmer(x, y, z, evt_get_variable(script, *args++));
-    sfx_play_sound_at_position(0x2055, 0, x, y, z);
+    sfx_play_sound_at_position(SOUND_2055, 0, x, y, z);
     return ApiStatus_DONE2;
 }
 
-ApiStatus func_802D75D8(Evt* script, s32 isInitialCall) {
+ApiStatus ShowRecoveryShimmer(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     f32 x = evt_get_float_variable(script, *args++);
     f32 y = evt_get_float_variable(script, *args++);
     f32 z = evt_get_float_variable(script, *args++);
 
-    func_802D74C0(x, y, z, evt_get_variable(script, *args++));
+    show_recovery_shimmer(x, y, z, evt_get_variable(script, *args++));
-    sfx_play_sound_at_position(0x378, 0, x, y, z);
+    sfx_play_sound_at_position(SOUND_378, 0, x, y, z);
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "evt/fx_api", func_802D7690);
+ApiStatus func_802D7690(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    f32 posX = evt_get_float_variable(script, *args++);
+    f32 posY = evt_get_float_variable(script, *args++);
+    f32 posZ = evt_get_float_variable(script, *args++);
+    f32 angle = evt_get_float_variable(script, *args++);
+    f32 magnitude = evt_get_float_variable(script, *args++);
+    s32 duration = evt_get_variable(script, *args++);
+    f32 offsetX, offsetY, offsetZ;
+    f32 sinA, cosA;
+    
+    if (isInitialCall) {
+        script->functionTemp[0] = 0;
+    }
+    
+    offsetX = rand_int(10) - 5;
+    offsetZ = rand_int(10) - 5;
+    offsetY = -2.0f - ((SQ(offsetX) + SQ(offsetZ)) / 5.0f);
+    sinA = sin_rad(angle * TAU / 360.0f);
+    cosA = cos_rad(angle * TAU / 360.0f);
+    fx_cloud_trail(
+        posX + ((sinA * magnitude * script->functionTemp[0]) / duration) + offsetX,
+        posY + 15.5f + offsetY,
+        posZ + ((-cosA * magnitude * script->functionTemp[0]) / duration) + offsetZ,
+        0.0f);
 
-INCLUDE_ASM(s32, "evt/fx_api", ShowEmote, Evt* script, s32 isInitialCall);
+    script->functionTemp[0]++;
+    if (script->functionTemp[0] < duration) {
+        return ApiStatus_BLOCK;
+    } else {
+        return ApiStatus_DONE2;
+    }
+}
+
+ApiStatus ShowEmote(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 npcID = evt_get_variable(script, *args++);
+    s32 emoteType = evt_get_variable(script, *args++);
+    f32 pitch = evt_get_float_variable(script, *args++);
+    s32 duration = evt_get_variable(script, *args++);
+    s32 emoterType = evt_get_variable(script, *args++);
+    f32 dX = evt_get_float_variable(script, *args++);
+    f32 dY = evt_get_float_variable(script, *args++);
+    f32 dZ = evt_get_float_variable(script, *args++);
+    f32 radius = evt_get_float_variable(script, *args++);
+
+    Npc* npc;
+    s32 emoteHandle;
+    f32 x, y, z, r;
+    
+    switch (emoterType) {
+        case EMOTER_PLAYER:
+            // show emote from player
+            npc = (Npc*)-1;
+            x = 0.0f;
+            y = (gPlayerStatus.colliderHeight * 2) / 3;
+            z = 0.0f;
+            r = gPlayerStatus.colliderHeight / 3;
+            break;
+        case EMOTER_NPC:
+            // show emote from NPC
+            npc = resolve_npc(script, npcID);
+            if (npc == NULL) {
+                return ApiStatus_DONE2;
+            }
+            x = 0.0f;
+            y = (npc->collisionHeight * 4) / 5;
+            z = 0.0f;
+            r = npc->collisionHeight / 3;
+            break;
+        default:
+            // show emote at arbitrary position
+            x = dX;
+            y = dY;
+            z = dZ;
+            r = radius;
+            npc = NULL;
+            break;
+    }
+
+    fx_emote(emoteType, npc, x, y, z, r, pitch, duration, &emoteHandle);
+    return ApiStatus_DONE2;
+}
 
 ApiStatus RemoveEffect(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -40,94 +124,187 @@ ApiStatus RemoveEffect(Evt* script, s32 isInitialCall) {
 
 ApiStatus func_802D7B10(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptrValue = (s32*) evt_get_variable(script, *args++);
+    EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++);
 
-    *ptrValue |= 0x10;
+    effect->flags |= EFFECT_INSTANCE_FLAGS_10;
     return ApiStatus_DONE2;
 }
 
+//TODO fix this!
 ApiStatus func_802D7B44(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32** ptrValue = (s32**) evt_get_variable(script, *args++);
+    EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++);
-    s32* ptrTemp = ptrValue[3];
+    ((s32*)(effect->data))[5] = 10; // offset 0x14 in GotItemOutline effect data
-
-    ptrTemp[5] = 10;
     return ApiStatus_DONE2;
 }
 
+//TODO fix this!
 ApiStatus func_802D7B74(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32** ptrValue = (s32**) evt_get_variable(script, *args++);
+    EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++);
-    s32* ptrTemp = ptrValue[3];
+    ((s32*)(effect->data))[12] = 5; // offset 0x30 in unknown effect data
-
-    ptrTemp[12] = 5;
     return ApiStatus_DONE2;
 }
 
-ApiStatus func_802D7BA4(Evt* script, s32 isInitialCall) {
+ApiStatus InterpMotionBlurParams(Evt* script, s32 isInitialCall) {
-    s32 var1 = script->varTable[1];
+    s32 centerX0 = script->varTable[1];
-    s32 var2 = script->varTable[2];
+    s32 centerY0 = script->varTable[2];
-    s32 var3 = script->varTable[3];
+    s32 centerX1 = script->varTable[3];
-    s32 var4 = script->varTable[4];
+    s32 centerY1 = script->varTable[4];
-    s32 var5 = script->varTable[5];
+    s32 finalAmt = script->varTable[5];
-    s32 var6 = script->varTable[6];
+    s32 duration = script->varTable[6];
-    s32 temp;
+    s32 delta;
-    u8 t0;
+    u8 overlayType;
-    f32 t1;
+    f32 initialAmt;
 
     if (isInitialCall) {
-        script->functionTemp[0] = var6;
+        script->functionTemp[0] = duration;
-        get_screen_overlay_params(1, &t0, &t1);
+        get_screen_overlay_params(1, &overlayType, &initialAmt);
-        script->functionTemp[1] = t1;
+        script->functionTemp[1] = initialAmt;
-        set_screen_overlay_center(1, 0, var1, var2);
+        set_screen_overlay_center(1, 0, centerX0, centerY0);
-        set_screen_overlay_center(1, 1, var3, var4);
+        set_screen_overlay_center(1, 1, centerX1, centerY1);
     }
 
-    get_screen_overlay_params(1, &t0, &t1);
+    get_screen_overlay_params(1, &overlayType, &initialAmt);
-    temp = (script->functionTemp[1] - var5) * script->functionTemp[0];
+    // lerp from initialAmt (stored in functionTemp[1]) to finalAmt (stored in varTable[5])
-    set_screen_overlay_params_back(12, (temp / var6) + var5);
+    delta = (script->functionTemp[1] - finalAmt);
+    set_screen_overlay_params_back(12, (delta * script->functionTemp[0] / duration) + finalAmt);
 
     script->functionTemp[0]--;
     if (script->functionTemp[0] < 0) {
-        set_screen_overlay_params_back(12, var5);
+        set_screen_overlay_params_back(12, finalAmt);
         return ApiStatus_DONE2;
     }
     return ApiStatus_BLOCK;
 }
 
-EvtScript D_802D9D50 = {
+EvtScript EVS_UpdateMotionBlurParams = {
-    EVT_CALL(func_802D7BA4)
+    EVT_CALL(InterpMotionBlurParams)
     EVT_RETURN
     EVT_END
 };
 
-ApiStatus Spawn802D9D50(Evt* script, s32 isInitialCall) {
+ApiStatus SetMotionBlurParams(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 var0 = evt_get_variable(script, *args++);
-    s32 var1 = evt_get_variable(script, *args++);
+    s32 centerX0 = evt_get_variable(script, *args++);
-    s32 var2 = evt_get_variable(script, *args++);
+    s32 centerY0 = evt_get_variable(script, *args++);
-    s32 var3 = evt_get_variable(script, *args++);
+    s32 centerX1 = evt_get_variable(script, *args++);
-    s32 var4 = evt_get_variable(script, *args++);
+    s32 centerY1 = evt_get_variable(script, *args++);
-    s32 var5 = evt_get_variable(script, *args++);
+    s32 finalAmt = evt_get_variable(script, *args++);
-    s32 var6 = evt_get_variable(script, *args++);
+    s32 duration = evt_get_variable(script, *args++);
 
-    Evt* newScript = start_script(&D_802D9D50, EVT_PRIORITY_1, 0);
+    Evt* blurEvt = start_script(&EVS_UpdateMotionBlurParams, EVT_PRIORITY_1, 0);
-    newScript->varTable[0] = var0;
+    blurEvt->varTable[0] = var0;
-    newScript->varTable[1] = var1;
+    blurEvt->varTable[1] = centerX0;
-    newScript->varTable[2] = var2;
+    blurEvt->varTable[2] = centerY0;
-    newScript->varTable[3] = var3;
+    blurEvt->varTable[3] = centerX1;
-    newScript->varTable[4] = var4;
+    blurEvt->varTable[4] = centerY1;
-    newScript->varTable[5] = var5;
+    blurEvt->varTable[5] = finalAmt;
-    newScript->varTable[6] = var6;
+    blurEvt->varTable[6] = duration;
 
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "evt/fx_api", func_802D7E08);
+ApiStatus ShowSweat(Evt* script) {
+    Bytecode* args = script->ptrReadPos;
+    s32 npcID = evt_get_variable(script, *args++);
+    s32 type = evt_get_variable(script, *args++);
+    f32 pitch = evt_get_float_variable(script, *args++);
+    s32 emoterType = evt_get_variable(script, *args++);
+    f32 posX = evt_get_float_variable(script, *args++);
+    f32 posY = evt_get_float_variable(script, *args++);
+    f32 posZ = evt_get_float_variable(script, *args++);
+    f32 radius = evt_get_float_variable(script, *args++);
+    s32 duration = evt_get_variable(script, *args++);
 
-INCLUDE_ASM(ApiStatus, "evt/fx_api", ShowSleepBubble, Evt* script, s32 isInitialCall);
+    Npc* npc;
+    f32 x, y, z, r;
+    
+    switch (emoterType) {
+        case EMOTER_PLAYER:
+            x = gPlayerStatus.position.x;
+            y = gPlayerStatus.position.y + (gPlayerStatus.colliderHeight * 2) / 3;
+            z = gPlayerStatus.position.z;    
+            r = gPlayerStatus.colliderHeight / 3;
+            break;
+        case EMOTER_NPC:
+            npc = resolve_npc(script, npcID);
+            if (npc == NULL) {
+                return ApiStatus_DONE2;
+            }
+            x = npc->pos.x;
+            y = npc->pos.y + (npc->collisionHeight * 2) / 3;
+            z = npc->pos.z;
+            r = npc->collisionHeight / 3;
+            break;
+        default:
+            x = posX;
+            y = posY;
+            z = posZ;
+            r = radius;
+            break;
+    }
+    
+    fx_sweat(type, x, y, z, r, pitch, duration);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(ApiStatus, "evt/fx_api", func_802D8248, Evt* script, s32 isInitialCall);
+ApiStatus ShowSleepBubble(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 npcID = evt_get_variable(script, *args++);
+    s32 type = evt_get_variable(script, *args++); 
+    f32 pitch = evt_get_float_variable(script, *args++);
+    s32 emoterType = evt_get_variable(script, *args++);
+    f32 posX = evt_get_float_variable(script, *args++);
+    f32 posY = evt_get_float_variable(script, *args++);
+    f32 posZ = evt_get_float_variable(script, *args++);
+    f32 radius = evt_get_float_variable(script, *args++);
+    s32 outVar = *args++;
+
+    Npc* npc;
+    f32 x, y, z, r;
+    s32 effectHandle;
+    
+    switch (emoterType) {
+        case EMOTER_PLAYER:
+            x = gPlayerStatus.position.x;
+            y = gPlayerStatus.position.y + (gPlayerStatus.colliderHeight * 2) / 3;
+            z = gPlayerStatus.position.z;
+            r = gPlayerStatus.colliderHeight / 3;
+            break;
+        case EMOTER_NPC:
+            npc = resolve_npc(script, npcID);
+            if (npc == NULL) {
+                return ApiStatus_DONE2;
+            }
+            x = npc->pos.x;
+            y = npc->pos.y + (npc->collisionHeight * 2) / 3;
+            z = npc->pos.z;
+            r = npc->collisionHeight / 3;
+            break;
+        default:
+            x = posX;
+            y = posY;
+            z = posZ;
+            r = radius;
+            break;
+    }
+
+    fx_sleep_bubble(type, x, y, z, r, pitch, &effectHandle);
+    evt_set_variable(script, outVar, effectHandle);
+    return ApiStatus_DONE2;
+}
+
+//TODO rename after field is identified
+ApiStatus SetSleepBubbleUnk1C(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++);
+    s32 value = evt_get_variable(script, *args++);
+
+    ((s32*)(effect->data))[7] = value; // offset 0x1C in SleepBubbleFX data
+    return ApiStatus_DONE2;
+}
 
 ApiStatus PlayEffect(Evt* script, s32 isInitialCall) {
     Bytecode* intArgs = script->ptrReadPos;

src/npc.c

@@ -1277,9 +1277,9 @@ void npc_update_decoration_sweat(Npc* npc, s32 idx) {
     switch (npc->decorationInitialised[idx]) {
         case 0:
             if (npc->yawCamOffset > 90) {
-                fx_sweat(0, npc->pos.x, npc->pos.y + npc->collisionHeight, npc->pos.z, 5.0f, 45.0f, 0x14);
+                fx_sweat(0, npc->pos.x, npc->pos.y + npc->collisionHeight, npc->pos.z, 5.0f, 45.0f, 20);
             } else {
-                fx_sweat(0, npc->pos.x, npc->pos.y + npc->collisionHeight, npc->pos.z, 5.0f, -45.0f, 0x14);
+                fx_sweat(0, npc->pos.x, npc->pos.y + npc->collisionHeight, npc->pos.z, 5.0f, -45.0f, 20);
             }
             npc->decorationUnk[idx] = 10;
             npc->decorationInitialised[idx] = 1;

src/pause/pause_map.c

@@ -510,7 +510,7 @@ void pause_map_handle_input(MenuPanel* tab) {
     }
 
     if (gPausePressedButtons & B_BUTTON) {
-        sfx_play_sound(0xCA);
+        sfx_play_sound(SOUND_MENU_BACK);
         gPauseMenuCurrentTab = 0;
         return;
     }

src/world/action/hit_lava.c

@@ -38,7 +38,7 @@ void func_802B6000_E27F40(void) {
         subtract_hp(1);
         open_status_menu_long();
         gOverrideFlags |= GLOBAL_OVERRIDES_40;
-        sfx_play_sound_at_player(0xE8, 0);
+        sfx_play_sound_at_player(SOUND_E8, 0);
     }
 
     switch (playerStatus->fallState) {
@@ -163,7 +163,7 @@ void func_802B6000_E27F40(void) {
                 start_rumble(0x100, 0x32);
                 phys_adjust_cam_on_landing();
                 gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_FLAGS_2;
-                sfx_play_sound_at_player(0x3FB, 0);
+                sfx_play_sound_at_player(SOUND_3FB, 0);
                 suggest_player_anim_setUnkFlag(0x8001A);
                 playerStatus->flags &= ~0x800;
                 playerStatus->flags &= ~8;

src/world/action/land.c

@@ -41,8 +41,8 @@ void func_802B6000_E24920(void) {
         }
 
         suggest_player_anim_clearUnkFlag(phi_a0);
-        sfx_play_sound_at_player(0x8161, 0);
+        sfx_play_sound_at_player(SOUND_8161, 0);
-        sfx_play_sound_at_player(0x148, 0);
+        sfx_play_sound_at_player(SOUND_SOFT_LAND, 0);
 
         if (!(collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT)) {
             phys_adjust_cam_on_landing();

src/world/action/sneaky_parasol.c

@@ -91,7 +91,7 @@ void func_802B6120_E2A7D0(void) {
             temp_v0 = get_npc_by_index(D_8010C96C);
             temp_v0->flags |= 0x40000;
             playerStatus->flags |= 0x100000;
-            sfx_play_sound_at_player(0xFD, 0);
+            sfx_play_sound_at_player(SOUND_FD, 0);
         }
     }
 
@@ -100,7 +100,7 @@ void func_802B6120_E2A7D0(void) {
             if (playerStatus->unk_90[CAM_DEFAULT] == 0) {
                 if (peach_disguise_check_overlaps() < 0) {
                     suggest_player_anim_clearUnkFlag(0xC0024);
-                    sfx_play_sound_at_player(0x92, 0);
+                    sfx_play_sound_at_player(SOUND_92, 0);
                     playerStatus->fallState++;
                 } else {
                     suggest_player_anim_clearUnkFlag(0xC0027);
@@ -125,7 +125,7 @@ void func_802B6120_E2A7D0(void) {
                 playerStatus->currentStateTime = 12;
                 playerStatus->flags |= 0x100000;
                 playerStatus->fallState++;
-                sfx_play_sound_at_player(0xFD, 0);
+                sfx_play_sound_at_player(SOUND_FD, 0);
             }
             break;
         case 3:
@@ -351,9 +351,9 @@ void func_802B6120_E2A7D0(void) {
         }
     }
     if (parasolStruct->unk_0C != 0) {
-        if (parasolStruct->unk_0C < 0xB) {
+        if (parasolStruct->unk_0C < 11) {
-            if (parasolStruct->unk_0C == 0xA) {
+            if (parasolStruct->unk_0C == 10) {
-                sfx_play_sound_at_player(0xFE, 0);
+                sfx_play_sound_at_player(SOUND_FE, 0);
             }
             if ((parasolStruct->unk_0C & 3) == 0) {
                 fx_stars_shimmer(4, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, 50, 50, 0x28, 0x1E);

src/world/action/super_boots.c

@@ -27,7 +27,7 @@ void func_802B6000_E26DE0(void) {
         disable_player_input();
         playerStatus->flags |= PLAYER_STATUS_FLAGS_200;
         gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAGS_1;
-        sfx_play_sound_at_player(0x146, 0);
+        sfx_play_sound_at_player(SOUND_146, 0);
     }
 
     tempCondition = 0;
@@ -123,7 +123,7 @@ void func_802B6000_E26DE0(void) {
                         playerStatus->pitch = 0.0f;
                         playerStatus->fallState++;
                         exec_ShakeCam1(0, 0, 4);
-                        sfx_play_sound_at_player(0x149, 0);
+                        sfx_play_sound_at_player(SOUND_149, 0);
                         start_rumble(0x80, 0x19);
                         tempStruct = &D_8015A578;
                         tempStruct->unk_00 = 1;

src/world/action/ultra_boots.c

@@ -110,7 +110,7 @@ void func_802B6000_E26710(void) {
                         playerStatus->flags &= ~0x00020008;
                         phys_player_land();
                         exec_ShakeCam1(0, 0, 4);
-                        sfx_play_sound_at_player(0x14A, 0);
+                        sfx_play_sound_at_player(SOUND_14A, 0);
                         start_rumble(0x100, 0x32);
 
                         D_8015A578.unk_00 = 1;
@@ -137,7 +137,7 @@ void func_802B6000_E26710(void) {
                 playerStatus->actionState = 0x10;
                 playerStatus->fallState++;
                 exec_ShakeCam1(0, 0, 4);
-                sfx_play_sound_at_player(0x14A, 0);
+                sfx_play_sound_at_player(SOUND_14A, 0);
                 start_rumble(0x100, 0x32);
 
                 D_8015A578.unk_00 = 1;

src/world/area_dgb/dgb_18/C55F40.c

@@ -334,7 +334,7 @@ EvtScript N(idle_80241654) = {
             EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, 0)
             EVT_CALL(RandInt, 10, EVT_VAR(1))
             EVT_ADD(EVT_VAR(1), 10)
-            EVT_CALL(func_802D8248, EVT_VAR(0), EVT_VAR(1))
+            EVT_CALL(SetSleepBubbleUnk1C, EVT_VAR(0), EVT_VAR(1))
             EVT_WAIT_FRAMES(30)
         EVT_END_LOOP
     EVT_END_THREAD
@@ -377,7 +377,7 @@ EvtScript N(idle_80242494) = {
             EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, 0)
             EVT_CALL(RandInt, 10, EVT_VAR(1))
             EVT_ADD(EVT_VAR(1), 10)
-            EVT_CALL(func_802D8248, EVT_VAR(0), EVT_VAR(1))
+            EVT_CALL(SetSleepBubbleUnk1C, EVT_VAR(0), EVT_VAR(1))
             EVT_WAIT_FRAMES(30)
         EVT_END_LOOP
     EVT_END_THREAD
@@ -390,7 +390,7 @@ EvtScript N(npcAI_802426B0) = {
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, 0)
     EVT_CALL(ShowSleepBubble, 0, 0, 50, 2, 552, 111, 128, 30, EVT_VAR(0))
     EVT_WAIT_FRAMES(360)
-    EVT_CALL(func_802D8248, EVT_VAR(0), 20)
+    EVT_CALL(SetSleepBubbleUnk1C, EVT_VAR(0), 20)
     EVT_CALL(SetNpcVar, -1, 1, 2)
     EVT_WAIT_FRAMES(20)
     EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2F1, 0)

src/world/area_kmr/kmr_00/8ABF90.c

@@ -58,7 +58,7 @@ ApiStatus func_80240BD8_8ACB68(Evt* script, s32 isInitialCall) {
     if (isInitialCall) {
         script->functionTemp[1] = evt_get_variable(script, *args);
         npc = get_npc_unsafe(script->functionTemp[1]);
-        sfx_play_sound_at_position(0xB000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z);
+        sfx_play_sound_at_position(SOUND_B000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z);
         fx_sparkles(0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 10.0f);
         script->functionTemp[0] = 3;
     }

src/world/common/PullVine.inc.c

@@ -16,7 +16,7 @@ ApiStatus N(PullVine_WaitForPlayerGrab)(Evt* script, s32 isInitialCall) {
     dy = script->varTable[1] - modelY;
     dz = script->varTable[2] - modelZ;
     result = 1;
-    if (!(dx*dx + dy*dy + dz*dz < dist*dist)) {
+    if (!(SQ(dx) + SQ(dy) + SQ(dz) < SQ(dist))) {
         result = 0;
     }
     script->varTable[0] = result;

src/world/common/UnkFunc62.inc.c

@@ -104,7 +104,7 @@ ApiStatus N(UnkFunc62)(Evt* script, s32 isInitialCall) {
             state->velocity = velocity + ((phi_f0 * phi_f2 * temp_f22_3) + temp_f22_3);
         }
         set_animation(ACTOR_SELF, 1, state->animJumpRise);
-        sfx_play_sound(0x2081);
+        sfx_play_sound(SOUND_JUMP_2081);
         script->functionTemp[0] = 1;
     }
 

src/world/partner/kooper.c

@@ -299,7 +299,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) {
 
                         suggest_player_anim_clearUnkFlag(0x10007);
                         D_802BEC60 = 0;
-                        sfx_play_sound_at_npc(0x2081, 0, -4);
+                        sfx_play_sound_at_npc(SOUND_JUMP_2081, 0, -4);
                         script->functionTemp[0] = 2;
                     }
                 }
@@ -353,8 +353,8 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) {
                         script->functionTemp[0] = 3;
                         D_802BEC60 = 0;
                         gCameras->moveFlags |= CAMERA_FLAGS_1;
-                        sfx_play_sound_at_npc(0x283, 0, -4);
+                        sfx_play_sound_at_npc(SOUND_283, 0, -4);
-                        sfx_play_sound_at_npc(0x284, 0, -4);
+                        sfx_play_sound_at_npc(SOUND_284, 0, -4);
                     }
                 }
                 break;
@@ -370,7 +370,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) {
                                                            kooper->yaw - 20.0f, kooper->collisionHeight,
                                                            (kooper->collisionRadius / 2)) != 0) {
                         if (func_802BD100_31B120(kooper) == 0) {
-                            sfx_play_sound_at_npc(0x10C, 0, -4);
+                            sfx_play_sound_at_npc(SOUND_IMMUNE, 0, -4);
                         }
 
                         temp_f20_3 = sin_deg(kooper->yaw);
@@ -413,7 +413,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) {
 
                         if ((kooper->flags & 0x2000000) == 0) {
                             if (func_802BD17C_31B19C(kooper) != 0) {
-                                sfx_play_sound_at_npc(0x286, 0, -4);
+                                sfx_play_sound_at_npc(SOUND_286, 0, -4);
                                 temp_f20_3 = sin_deg(kooper->yaw);
                                 fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z,
                                           temp_f20_3, -1.0f, -cos_deg(kooper->yaw), 1);
@@ -453,7 +453,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) {
                         }
                     } else {
                         if (func_802BD100_31B120(kooper) == 0) {
-                            sfx_play_sound_at_npc(0x10C, 0, -4);
+                            sfx_play_sound_at_npc(SOUND_IMMUNE, 0, -4);
                         }
 
                         temp_f20_3 = sin_deg(kooper->yaw);
@@ -532,7 +532,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) {
                     kooper->pos.x = sp20;
                     kooper->pos.y = sp24;
                     kooper->pos.z = sp28;
-                    sfx_play_sound_at_npc(0x10C, 0, -4);
+                    sfx_play_sound_at_npc(SOUND_IMMUNE, 0, -4);
                     temp_f20_3 = sin_deg(kooper->yaw + 180.0f);
                     fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z,
                             temp_f20_3, -1.0f, -cos_deg(kooper->yaw + 180.0f), 1);

src/world/partner/lakilester.c

@@ -1148,7 +1148,7 @@ s32 func_802BFBA0_3236F0(Evt* script, s32 isInitialCall) {
                 }
             }
 
-            sfx_play_sound_at_npc(0x295, 0, -4);
+            sfx_play_sound_at_npc(SOUND_295, 0, -4);
             playerStatus->anim = 0x8000E;
             playerStatus->unk_BC = 0;
             playerStatus->flags |= PLAYER_STATUS_FLAGS_10000000;

ver/us/asm/data/1AF2D0.data.s

@@ -228,7 +228,7 @@ dlabel MerleeExpBonus
 .word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80261530, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F6, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CreateNpc, 0xFFFFFFF6, 0x00BB0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFF6, 0x00040000, 0x00000001, 0x00000043, 0x00000003, SetNpcRenderMode, 0xFFFFFFF6, 0x00000022, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFF6, 0x00000000, 0x00000041, 0x00000014, 0x00000058, 0x00000000, 0x00000043, 0x00000001, func_802616F4, 0x00000059, 0x00000000, 0x00000043, 0x00000001, func_80261648, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFF6, 0x00BB0000, 0x00000043, 0x00000001, func_802619B4, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000004, 0x00000043, 0x00000001, func_802615C8, 0x00000008, 0x00000001, 0x00000014, 0x00000058, 0x00000000, 0x00000043, 0x00000001, func_802616B4, 0x00000043, 0x00000002, DeleteNpc, 0xFFFFFFF6, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002075, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802613BC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80261478, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000000, 0x00010002, 0x00000043, 0x00000003, ShowMessageBox, 0x00000002, 0x0000003C, 0x00000043, 0x00000001, WaitForMessageBoxDone, 0x00000046, 0x00000001, MerleeRunOut, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel PlayerHappy
-.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPresetWait, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010032, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802619E8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000000D, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, FXRecoverHP, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x0000000D, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000005, FXRecoverFP, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8C, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000001, IncrementPlayerHP, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000001, IncrementPlayerHP, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000001, IncrementPlayerFP, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000000, 0x00010002, 0x00000043, 0x00000001, func_80261B40, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPresetWait, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010032, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802619E8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000000D, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, FXRecoverHP, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x0000000D, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000005, FXRecoverFP, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8C, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, ShowStartRecoveryShimmer, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000001, IncrementPlayerHP, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000001, IncrementPlayerHP, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000001, IncrementPlayerFP, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000000, 0x00010002, 0x00000043, 0x00000001, func_80261B40, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel DoDizzyAttack
 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C80, 0x00000048, 0x00000043, 0x00000005, SetActorRotation, 0x00000200, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80261D98, 0x00000043, 0x00000005, SetActorRotation, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/EA3A80.data.s

@@ -24,7 +24,7 @@ dlabel D_8024356C_EA3E6C
 .word 0x00000047, 0x00000005, D_802434B4_EA3DB4, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243510_EA3E10, 0x00080000, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802435B4_EA3EB4
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000B, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_802458F0_EA61F0, 0x00000046, 0x00000001, D_8024380C_EA410C, 0x00000024, 0x00000002, 0xFE363C80, D_8024356C_EA3E6C, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000044, 0x00000001, D_80245DC8_EA66C8, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000044, 0x00000001, D_8024327C_EA3B7C, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000044, 0x00000001, D_80243398_EA3C98, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000B, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_802458F0_EA61F0, 0x00000046, 0x00000001, D_8024380C_EA410C, 0x00000024, 0x00000002, 0xFE363C80, D_8024356C_EA3E6C, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000044, 0x00000001, D_80245DC8_EA66C8, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000044, 0x00000001, D_8024327C_EA3B7C, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000044, 0x00000001, D_80243398_EA3C98, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010000
 
 dlabel D_8024372C_EA402C
 .word 0x00000024, 0x00000002, 0xF84060A4, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/EA7390.data.s

@@ -36,7 +36,7 @@ dlabel D_80240B4C_EA7B1C
 .word 0x00000043, 0x00000002, 0x802D796C, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, 0x80285FC0, 0x00000044, 0x00000001, D_80240818_EA77E8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240818_EA77E8, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240BCC_EA7B9C
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000C, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80241A4C_EA8A1C, 0x00000046, 0x00000001, D_80241A70_EA8A40, 0x00000044, 0x00000001, D_80240B4C_EA7B1C, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000003, 0x802D6708, 0x00000021, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000022, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000024, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000000, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000000, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80240B2C_EA7AFC, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_8024087C_EA784C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000026, 0x00000044, 0x00000001, D_802404CC_EA749C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000027, 0x00000044, 0x00000001, D_802405E8_EA75B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000C, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80241A4C_EA8A1C, 0x00000046, 0x00000001, D_80241A70_EA8A40, 0x00000044, 0x00000001, D_80240B4C_EA7B1C, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000003, 0x802D6708, 0x00000021, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000022, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000024, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000000, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000000, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80240B2C_EA7AFC, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_8024087C_EA784C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000026, 0x00000044, 0x00000001, D_802404CC_EA749C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000027, 0x00000044, 0x00000001, D_802405E8_EA75B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240DC0_EA7D90
 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000

ver/us/asm/data/EAA810.data.s

@@ -39,7 +39,7 @@ dlabel D_80242AD0_EAB5B0
 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000028, 0x0000000C, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7E1A, 0x00000043, 0x00000005, 0x802D6208, 0x00000032, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x000000B4, 0x00000000, 0x00000028, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7E1A, 0x00000043, 0x00000005, 0x802D6208, 0x00000032, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242C48_EAB728
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000D, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80247DDC_EB08BC, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80247DB8_EB0898, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802482C0_EB0DA0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80244C78_EAD758, 0x00000044, 0x00000001, D_80242750_EAB230, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242750_EAB230, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002E, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000030, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000040, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000040, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000019, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000030, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_802427B4_EAB294, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000044, 0x00000001, D_80241F2C_EAAA0C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000044, 0x00000001, D_80242048_EAAB28, 0x00000044, 0x00000001, D_80241DB0_EAA890, 0x00000044, 0x00000001, D_80242AD0_EAB5B0, 0x00000044, 0x00000001, D_80248068_EB0B48, 0x00000044, 0x00000001, D_80242164_EAAC44, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000D, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80247DDC_EB08BC, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80247DB8_EB0898, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802482C0_EB0DA0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80244C78_EAD758, 0x00000044, 0x00000001, D_80242750_EAB230, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242750_EAB230, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002E, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000030, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000040, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000040, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000019, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000030, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_802427B4_EAB294, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000044, 0x00000001, D_80241F2C_EAAA0C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000044, 0x00000001, D_80242048_EAAB28, 0x00000044, 0x00000001, D_80241DB0_EAA890, 0x00000044, 0x00000001, D_80242AD0_EAB5B0, 0x00000044, 0x00000001, D_80248068_EB0B48, 0x00000044, 0x00000001, D_80242164_EAAC44, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
 
 dlabel D_80242F60_EABA40
 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000

ver/us/asm/data/EB1920.data.s

@@ -42,7 +42,7 @@ dlabel D_8024149C_EB22FC
 .word 0x00000043, 0x0000000F, 0x802E58EC, 0x00000042, 0x00000000, 0x00000002, 0x00000002, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000016, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241548_EB23A8
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000E, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80244294_EB50F4, 0x00000024, 0x00000002, 0xFE363C80, D_80240D24_EB1B84, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80242250_EB30B0, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000003, 0x802D7044, 0x00000016, 0x00000000, 0x00000047, 0x00000005, D_8024149C_EB22FC, 0x00100000, D_8024148C_EB22EC, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240B20_EB1980, 0x00000044, 0x00000001, D_8024106C_EB1ECC, 0x00000044, 0x00000001, D_80240D6C_EB1BCC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000E, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80244294_EB50F4, 0x00000024, 0x00000002, 0xFE363C80, D_80240D24_EB1B84, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80242250_EB30B0, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000003, 0x802D7044, 0x00000016, 0x00000000, 0x00000047, 0x00000005, D_8024149C_EB22FC, 0x00100000, D_8024148C_EB22EC, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240B20_EB1980, 0x00000044, 0x00000001, D_8024106C_EB1ECC, 0x00000044, 0x00000001, D_80240D6C_EB1BCC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_802416D0_EB2530
 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000

ver/us/asm/data/EB54C0.data.s

@@ -39,7 +39,7 @@ dlabel D_80240D30_EB5E60
 .word 0x00000007, 0x43480000, 0x43160000, 0x43340000, 0x00000009, 0x43480000, 0x43160000, 0x43340000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_80240D60_EB5E90
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000F, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_802420C0_EB71F0, 0x00000046, 0x00000001, D_80240EE0_EB6010, 0x00000024, 0x00000002, 0xFE363C80, D_80240790_EB58C0, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_802403E0_EB5510, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80240D30_EB5E60, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_802407BC_EB58EC, 0x00000044, 0x00000001, D_802408A8_EB59D8, 0x00000044, 0x00000001, D_80240A34_EB5B64, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000044, 0x00000001, D_802404EC_EB561C, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000044, 0x00000001, D_80240608_EB5738, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000F, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_802420C0_EB71F0, 0x00000046, 0x00000001, D_80240EE0_EB6010, 0x00000024, 0x00000002, 0xFE363C80, D_80240790_EB58C0, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_802403E0_EB5510, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80240D30_EB5E60, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_802407BC_EB58EC, 0x00000044, 0x00000001, D_802408A8_EB59D8, 0x00000044, 0x00000001, D_80240A34_EB5B64, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000044, 0x00000001, D_802404EC_EB561C, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000044, 0x00000001, D_80240608_EB5738, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240EE0_EB6010
 .word 0x00000043, 0x00000008, 0x8011A58C, 0x802F92E0, 0x000001E0, 0x000000EB, 0x000000AF, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000

ver/us/asm/data/EB7850.data.s

@@ -27,7 +27,7 @@ dlabel D_80240A20_EB7C50
 .word 0x00000044, 0x00000001, D_802409B4_EB7BE4, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFF97, 0x00000024, 0x00000002, 0xFE363C85, 0x00000028, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0x00000000, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802D67E4, 0x00000000, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, 0x802D67E4, 0x00000000, 0x00000001, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C81, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000028, 0x00000002, 0xFE363C83, 0x0000012C, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000028, 0x0000000C, 0x00000002, 0xFD050F8A, 0x00000A8C, 0x00000027, 0x00000002, 0xFD050F8A, 0x00000014, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000001, 0x00000028, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0x00000000, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240C34_EB7E64
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A0010, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80241BE0_EB8E10, 0x00000044, 0x00000001, D_80240670_EB78A0, 0x00000044, 0x00000001, D_80240A20_EB7C50, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000044, 0x00000001, D_8024074C_EB797C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000044, 0x00000001, D_80240868_EB7A98, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A0010, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, D_80241BE0_EB8E10, 0x00000044, 0x00000001, D_80240670_EB78A0, 0x00000044, 0x00000001, D_80240A20_EB7C50, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000044, 0x00000001, D_8024074C_EB797C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000044, 0x00000001, D_80240868_EB7A98, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_80240D20_EB7F50
 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000

ver/us/asm/data/EBA260.data.s

@@ -42,7 +42,7 @@ dlabel D_8024208C_EBAEDC
 .word 0x00000043, 0x00000002, 0x802D796C, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, 0x80285FC0, 0x00000044, 0x00000001, D_80241FD4_EBAE24, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000024, 0x00000002, 0xF97188AC, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80241BC0_EBAA10, 0x00000044, 0x00000001, D_80241FD4_EBAE24, 0x00000057, 0x00000000, 0x00000021, 0x00000002, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, D_80241FD4_EBAE24, 0x00000044, 0x00000001, 0x80285C70, 0x00000016, 0x00000001, 0x00000007, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_8024837C_EC11CC, 0x00000044, 0x00000001, D_80241FD4_EBAE24, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000008, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80247BFC_EC0A4C, 0x00000044, 0x00000001, D_80241FD4_EBAE24, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000009, 0x00000044, 0x00000001, D_802429C8_EBB818, 0x00000024, 0x00000002, 0xFE363C80, D_80241FD4_EBAE24, 0x00000044, 0x00000001, 0x80285C70, 0x00000016, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80241FD4_EBAE24, 0x00000016, 0x00000001, 0x0000000B, 0x00000044, 0x00000001, D_80245EE8_EBED38, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80242FFC_EBBE4C, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242278_EBB0C8
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406340, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000037, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405C87, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80246864_EBF6B4, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80245E14_EBEC64, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80249160_EC1FB0, 0x00000043, 0x00000003, 0x802D75C0, 0x0000002E, 0x00000051, 0x00000044, 0x00000001, D_80248F78_EC1DC8, 0x00000044, 0x00000001, D_80248E60_EC1CB0, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001E, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001F, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000096, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C82, 0x0000019A, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000024, 0x00000002, 0xFE363C80, 0x00000073, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE3E, 0x00000024, 0x00000002, 0xFE363C82, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEB6, 0x00000024, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000019A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE5C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0x000000A0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000044, 0x00000001, D_8024208C_EBAEDC, 0x00000043, 0x00000002, 0x802D796C, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0x00000041, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241500_EBA350, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EB8E50, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x0000012C, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C82, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF8000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF0000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFE8000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000005, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000008, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF0000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF8000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000005, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000008, 0x00000001, 0xFE363C83, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406340, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000037, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405C87, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80246864_EBF6B4, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80245E14_EBEC64, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80249160_EC1FB0, 0x00000043, 0x00000003, 0x802D75C0, 0x0000002E, 0x00000051, 0x00000044, 0x00000001, D_80248F78_EC1DC8, 0x00000044, 0x00000001, D_80248E60_EC1CB0, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001E, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001F, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000096, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C82, 0x0000019A, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000024, 0x00000002, 0xFE363C80, 0x00000073, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE3E, 0x00000024, 0x00000002, 0xFE363C82, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEB6, 0x00000024, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000019A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE5C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0x000000A0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416F0_EBA540, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000044, 0x00000001, D_8024208C_EBAEDC, 0x00000043, 0x00000002, 0x802D796C, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0x00000041, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241500_EBA350, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EB8E50, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x0000012C, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C82, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF8000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF0000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFE8000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000005, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000008, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF0000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFFFF8000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000005, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000008, 0x00000001, 0xFE363C83, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242870_EBB6C0
 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000

ver/us/asm/data/EC2850.data.s

@@ -27,7 +27,7 @@ dlabel D_80240C04_EC2E04
 .word 0x00000047, 0x00000005, D_80240B4C_EC2D4C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240BA8_EC2DA8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240C4C_EC2E4C
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971889B, 0x00000000, 0x00000024, 0x00000002, 0xF971889C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244464_EC6664, 0x00000046, 0x00000001, D_80244F20_EC7120, 0x00000046, 0x00000001, D_80241F14_EC4114, 0x00000044, 0x00000001, D_80244E94_EC7094, 0x00000044, 0x00000001, D_80244F10_EC7110, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEB1, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF4C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802408A0_EC2AA0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF56, 0x00000024, 0x00000002, 0xFE363C82, 0x00000136, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802408A0_EC2AA0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000044, 0x00000001, D_8024101C_EC321C, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C04_EC2E04, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802406C0_EC28C0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EC2200_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971889B, 0x00000000, 0x00000024, 0x00000002, 0xF971889C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244464_EC6664, 0x00000046, 0x00000001, D_80244F20_EC7120, 0x00000046, 0x00000001, D_80241F14_EC4114, 0x00000044, 0x00000001, D_80244E94_EC7094, 0x00000044, 0x00000001, D_80244F10_EC7110, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEB1, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF4C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802408A0_EC2AA0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF56, 0x00000024, 0x00000002, 0xFE363C82, 0x00000136, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802408A0_EC2AA0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000044, 0x00000001, D_8024101C_EC321C, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C04_EC2E04, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802406C0_EC28C0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EC2200_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_80240ED0_EC30D0
 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000

ver/us/asm/data/EC78F0.data.s

@@ -27,7 +27,7 @@ dlabel D_80240C74_EC7E24
 .word 0x00000047, 0x00000005, D_80240C18_EC7DC8, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240CA0_EC7E50
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80242B0C_EC9CBC, 0x00000046, 0x00000001, D_802428C4_EC9A74, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000006, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000129, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017F, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000125, 0x00000024, 0x00000002, 0xFE363C81, 0x00000047, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000071, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000093, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF0E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFAF, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C81, 0x00000055, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFB50, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_80241C14_EC8DC4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C74_EC7E24, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, D_802424F4_EC96A4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802407A0_EC7950, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EC71B0_SpawnSunEffect, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240344_EC74F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80242B0C_EC9CBC, 0x00000046, 0x00000001, D_802428C4_EC9A74, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000006, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000129, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017F, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000125, 0x00000024, 0x00000002, 0xFE363C81, 0x00000047, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000071, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000093, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF0E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFAF, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C81, 0x00000055, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFB50, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_80241C14_EC8DC4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C74_EC7E24, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, D_802424F4_EC96A4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802407A0_EC7950, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EC71B0_SpawnSunEffect, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240344_EC74F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_80241220_EC83D0
 .word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/ECBC10.data.s

@@ -45,7 +45,7 @@ dlabel D_80242A5C_ECC75C
 .word 0x00000009, 0xC4070000, 0x00000000, 0x42480000, 0x0000000A, 0x42700000, 0x00000000, 0x42480000, 0x0000000F, 0x42700000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_80242A9C_ECC79C
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244EF4_ECEBF4, 0x00000046, 0x00000001, D_80242628_ECC328, 0x00000044, 0x00000001, D_80245F8C_ECFC8C, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80242A5C_ECC75C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000015, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000154, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802426B0_ECC3B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001C2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x0000024E, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802426B0_ECC3B0, 0x00000044, 0x00000001, D_80245944_ECF644, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242A14_ECC714, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80241F70_ECBC70, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECAA40_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244EF4_ECEBF4, 0x00000046, 0x00000001, D_80242628_ECC328, 0x00000044, 0x00000001, D_80245F8C_ECFC8C, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80242A5C_ECC75C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000015, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000154, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802426B0_ECC3B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001C2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x0000024E, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802426B0_ECC3B0, 0x00000044, 0x00000001, D_80245944_ECF644, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242A14_ECC714, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80241F70_ECBC70, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECAA40_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_80242EE0_ECCBE0
 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41F00000, 0x00000003, 0x4019999A, 0x0000000F, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001

ver/us/asm/data/ED1840.data.s

@@ -21,7 +21,7 @@ dlabel D_80241C84_ED1C74
 .word 0x00000047, 0x00000005, D_80241BCC_ED1BBC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241C28_ED1C18, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241CCC_ED1CBC
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_8024417C_ED416C, 0x00000044, 0x00000001, D_8024260C_ED25FC, 0x00000044, 0x00000001, D_802434D8_ED34C8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE01, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC1, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED2, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000074, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x00000033, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x000000EA, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x000001F6, 0x00000024, 0x00000002, 0xFE363C83, 0x00000062, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDF3, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF5D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF6C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000205, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241C84_ED1C74, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_802418B0_ED18A0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECFFF0_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_8024417C_ED416C, 0x00000044, 0x00000001, D_8024260C_ED25FC, 0x00000044, 0x00000001, D_802434D8_ED34C8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE01, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC1, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED2, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000074, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x00000033, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x000000EA, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x000001F6, 0x00000024, 0x00000002, 0xFE363C83, 0x00000062, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDF3, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF5D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF6C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000205, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241C84_ED1C74, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_802418B0_ED18A0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECFFF0_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802422EC_ED22DC
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, ED0030_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/ED5780.data.s

@@ -27,7 +27,7 @@ dlabel D_80241A78_ED5C98
 .word 0x00000047, 0x00000005, D_80241A1C_ED5C3C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241AA4_ED5CC4
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244144_ED8364, 0x00000046, 0x00000001, D_80241720_ED5940, 0x00000044, 0x00000001, D_80244B40_ED8D60, 0x00000044, 0x00000001, D_802436E8_ED7908, 0x00000044, 0x00000001, D_80242BD8_ED6DF8, 0x00000044, 0x00000001, D_80244164_ED8384, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF7, 0x00000024, 0x00000002, 0xFE363C81, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C7, 0x00000024, 0x00000002, 0xFE363C83, 0x00000139, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEED, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0x00000107, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF08, 0x00000024, 0x00000002, 0xFE363C82, 0x0000016A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000092, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_8024333C_ED755C, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_802428DC_ED6AFC, 0x00000044, 0x00000001, D_80241A78_ED5C98, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241A78_ED5C98, 0x00000044, 0x00000001, 0x80285C70, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802415D0_ED57F0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ED4260_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244144_ED8364, 0x00000046, 0x00000001, D_80241720_ED5940, 0x00000044, 0x00000001, D_80244B40_ED8D60, 0x00000044, 0x00000001, D_802436E8_ED7908, 0x00000044, 0x00000001, D_80242BD8_ED6DF8, 0x00000044, 0x00000001, D_80244164_ED8384, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF7, 0x00000024, 0x00000002, 0xFE363C81, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C7, 0x00000024, 0x00000002, 0xFE363C83, 0x00000139, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEED, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0x00000107, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF08, 0x00000024, 0x00000002, 0xFE363C82, 0x0000016A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000092, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_8024333C_ED755C, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_802428DC_ED6AFC, 0x00000044, 0x00000001, D_80241A78_ED5C98, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241A78_ED5C98, 0x00000044, 0x00000001, 0x80285C70, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802415D0_ED57F0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ED4260_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
 
 dlabel ED42A0_varStash
 .word 0x00000000

ver/us/asm/data/ED9170.data.s

@@ -48,7 +48,7 @@ dlabel D_802416C8_EDA4E8
 .word 0x00000047, 0x00000005, D_802414B8_EDA2D8, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024145C_EDA27C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000023, 0x00000024, 0x00000002, 0xFE363C82, D_80241514_EDA334, 0x00000047, 0x00000005, D_8024167C_EDA49C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000022, 0x00000024, 0x00000002, 0xFE363C82, D_80241550_EDA370, 0x00000047, 0x00000005, D_8024167C_EDA49C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000021, 0x00000024, 0x00000002, 0xFE363C82, D_8024158C_EDA3AC, 0x00000047, 0x00000005, D_8024167C_EDA49C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x00000020, 0x00000024, 0x00000002, 0xFE363C82, D_802415C8_EDA3E8, 0x00000047, 0x00000005, D_8024167C_EDA49C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C82, D_80241604_EDA424, 0x00000047, 0x00000005, D_8024167C_EDA49C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C82, D_80241640_EDA460, 0x00000047, 0x00000005, D_8024167C_EDA49C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802418D8_EDA6F8
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x800482D8, 0x00000007, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80243104_EDBF24, 0x00000046, 0x00000001, D_80243120_EDBF40, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_802416C8_EDA4E8, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, D_80242270_EDB090, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_802416C8_EDA4E8, 0x00000044, 0x00000001, D_8024072C_ED954C, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240410_ED9230, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240318_ED9138, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000009, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000A, 0x00000009, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000009, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x800482D8, 0x00000007, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80243104_EDBF24, 0x00000046, 0x00000001, D_80243120_EDBF40, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_802416C8_EDA4E8, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, D_80242270_EDB090, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_802416C8_EDA4E8, 0x00000044, 0x00000001, D_8024072C_ED954C, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240410_ED9230, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240318_ED9138, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000009, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000A, 0x00000009, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000009, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_80241AF0_EDA910
 .word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000

ver/us/asm/data/EDC6D0.data.s

@@ -24,7 +24,7 @@ dlabel D_80240B78_EDCB58
 .word 0x00000047, 0x00000005, D_80240B1C_EDCAFC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240BA4_EDCB84
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718896, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802429B8_EDE998, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF92, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C81, 0x00000082, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF1F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_802419F4_EDD9D4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240B78_EDCB58, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240750_EDC730, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EDBFE0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718896, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802429B8_EDE998, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF92, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C81, 0x00000082, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF1F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_802419F4_EDD9D4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240B78_EDCB58, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240750_EDC730, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EDBFE0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_80240E30_EDCE10
 .word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000

ver/us/asm/data/EE20E0.data.s

@@ -36,7 +36,7 @@ dlabel D_80243E54_EE2814
 .word 0x00000047, 0x00000005, D_80243DF8_EE27B8, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243D9C_EE275C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243E9C_EE285C
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80247A4C_EE640C, 0x00000046, 0x00000001, D_80243A28_EE23E8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000D, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000112, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000247, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001B1, 0x00000024, 0x00000002, 0xFE363C81, 0x0000006C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000244, 0x00000024, 0x00000002, 0xFE363C83, 0x000000A9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE34, 0x00000024, 0x00000002, 0xFE363C81, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF83, 0x00000024, 0x00000002, 0xFE363C83, 0x00000082, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE5C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF7E, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF24, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0x000000A0, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80243E54_EE2814, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80243960_EE2320, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EDE9C0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80247A4C_EE640C, 0x00000046, 0x00000001, D_80243A28_EE23E8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000D, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000112, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000247, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001B1, 0x00000024, 0x00000002, 0xFE363C81, 0x0000006C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000244, 0x00000024, 0x00000002, 0xFE363C83, 0x000000A9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE34, 0x00000024, 0x00000002, 0xFE363C81, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF83, 0x00000024, 0x00000002, 0xFE363C83, 0x00000082, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE5C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF7E, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF24, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0x000000A0, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80243E54_EE2814, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80243960_EE2320, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EDE9C0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802441B0_EE2B70
 .word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000

ver/us/asm/data/EE8970.data.s

@@ -24,7 +24,7 @@ dlabel D_8024262C_EE8BDC
 .word 0x0000001F, 0xC3FA0000, 0x00000000, 0xC2B40000, 0x00000019, 0xC3FF0000, 0x00000000, 0x00000000, 0x00000020, 0xC3FA0000, 0x00000000, 0x42DC0000, 0x00000021, 0xC37A0000, 0x00000000, 0xC2B40000, 0x0000001A, 0xC3700000, 0x00000000, 0x00000000, 0x00000022, 0xC37A0000, 0x00000000, 0x42DC0000, 0x0000001B, 0xC2480000, 0x00000000, 0x41C80000, 0x0000001C, 0x428C0000, 0x42700000, 0xC2BE0000, 0x0000001D, 0x43CD0000, 0x42700000, 0xC2BE0000, 0x0000001E, 0x44098000, 0x00000000, 0x42480000, 0x00000023, 0xC2480000, 0x00000000, 0x42DC0000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_802426EC_EE8C9C
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244F30_EEB4E0, 0x00000044, 0x00000001, D_80244F60_EEB510, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_8024262C_EE8BDC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000035, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000021, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000022, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80242490_EE8A40, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80242490_EE8A40, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80243EA8_EEA458, 0x00000044, 0x00000001, D_80245254_EEB804, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802425E4_EE8B94, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80242420_EE89D0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_8024030C_EE68BC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244F30_EEB4E0, 0x00000044, 0x00000001, D_80244F60_EEB510, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_8024262C_EE8BDC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000035, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000021, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000022, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80242490_EE8A40, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80242490_EE8A40, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80243EA8_EEA458, 0x00000044, 0x00000001, D_80245254_EEB804, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802425E4_EE8B94, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80242420_EE89D0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_8024030C_EE68BC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_80242C30_EE91E0
 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/EEFAD0.data.s

@@ -21,7 +21,7 @@ dlabel D_80242BA0_EEFCA0
 .word 0x0000000A, 0xC39B0000, 0x00000000, 0x00000000, 0x0000000B, 0x43988000, 0x42C80000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_80242BD0_EEFCD0
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244534_EF1634, 0x00000046, 0x00000001, D_80243FA4_EF10A4, 0x00000044, 0x00000001, D_802434CC_EF05CC, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80242BA0_EEFCA0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000012, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000014, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000013, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000015, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80245224_EF2324, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242B58_EEFC58, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80242A30_EEFB30, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EED100_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244534_EF1634, 0x00000046, 0x00000001, D_80243FA4_EF10A4, 0x00000044, 0x00000001, D_802434CC_EF05CC, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80242BA0_EEFCA0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000012, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000014, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000013, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000015, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80245224_EF2324, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242B58_EEFC58, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80242A30_EEFB30, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EED100_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242F00_EF0000
 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/EF8250.data.s

@@ -21,7 +21,7 @@ dlabel D_802409E4_EF8464
 .word 0x0000000B, 0xC3480000, 0x00000000, 0x42F00000, 0x0000000C, 0x00000000, 0x00000000, 0x42F00000, 0x0000000D, 0x432A0000, 0x00000000, 0x42F00000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_80240A24_EF84A4
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802466CC_EFE14C, 0x00000044, 0x00000001, D_80247054_EFEAD4, 0x00000044, 0x00000001, D_802436E0_EFB160, 0x00000044, 0x00000001, D_80245704_EFD184, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000008, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_802409E4_EF8464, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000009, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000008, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_EF8340, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_EF8340, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802409B8_EF8438, 0x00000044, 0x00000001, 0x80285C70, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80244088_EFBB08, 0x00000044, 0x00000001, D_802409B8_EF8438, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240830_EF82B0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EF7A80_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleUnk1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802466CC_EFE14C, 0x00000044, 0x00000001, D_80247054_EFEAD4, 0x00000044, 0x00000001, D_802436E0_EFB160, 0x00000044, 0x00000001, D_80245704_EFD184, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000008, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_802409E4_EF8464, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000009, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000008, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_EF8340, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_EF8340, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802409B8_EF8438, 0x00000044, 0x00000001, 0x80285C70, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80244088_EFBB08, 0x00000044, 0x00000001, D_802409B8_EF8438, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240830_EF82B0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EF7A80_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_80240E90_EF8910
 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0x00000004, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s

@@ -21,4 +21,4 @@ dlabel D_802416EC_E1FB4C
 .word 0x00000030, 0x00000001, D_80241644_E1FAA4, 0x00000005, 0x00000001, 0x00000013, 0x00000031, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000
 
 dlabel D_80241748_E1FBA8
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00020000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RandInt, 0x00000004, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000D, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010014, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010023, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000F, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000087, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000C8, 0x00000043, 0x00000001, func_802405EC_E1EA4C, 0x00000043, 0x00000001, func_80240688_E1EAE8, 0x00000008, 0x00000001, 0x00000064, 0x00000057, 0x00000000, 0x00000043, 0x00000008, Spawn802D9D50, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000043, 0x00000005, TranslateGroup, 0x00000004, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000006, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000008, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000A, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000C, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000E, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000010, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000012, 0x00000000, 0x000000C8, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000044, 0x00000001, D_802416EC_E1FB4C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000005E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00020000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RandInt, 0x00000004, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000D, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010014, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010023, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000F, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000087, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000C8, 0x00000043, 0x00000001, func_802405EC_E1EA4C, 0x00000043, 0x00000001, func_80240688_E1EAE8, 0x00000008, 0x00000001, 0x00000064, 0x00000057, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000043, 0x00000005, TranslateGroup, 0x00000004, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000006, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000008, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000A, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000C, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000E, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000010, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000012, 0x00000000, 0x000000C8, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000044, 0x00000001, D_80241690_E1FAF0, 0x00000008, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000044, 0x00000001, D_802416EC_E1FB4C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000005E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000

ver/us/asm/data/world/area_isk/isk_07/983AD0.data.s

@@ -9,7 +9,7 @@ dlabel D_8024177C_983BBC
 .word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000022, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000023, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000022, 0x80000002, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000001E, 0x00000004, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241868_983CA8
-.word 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0x00000171, 0xFFFFFEA3, 0x00000171, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000171, 0xFFFFFEA3, 0x00000171, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000171, 0xFFFFFEA3, 0x00000171, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000046, 0x00000001, D_80241690_983AD0, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_8024177C_983BBC, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000022, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000023, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000047, 0x00000005, D_80241868_983CA8, 0x00020000, 0xF971888E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000007, InterpCamTargetPos, 0x00000000, 0x00000001, 0x00000171, 0xFFFFFEA3, 0x00000171, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000171, 0xFFFFFEA3, 0x00000171, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000171, 0xFFFFFEA3, 0x00000171, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000046, 0x00000001, D_80241690_983AD0, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_8024177C_983BBC, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000022, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000023, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000047, 0x00000005, D_80241868_983CA8, 0x00020000, 0xF971888E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241A80_983EC0
 .word 0x00000011, 0x00000000

ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s

@@ -147,7 +147,7 @@ dlabel D_80246838_B8A9B8
 .word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7BB4, 0x00000001, 0xF24A7BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024687C_B8A9FC
-.word 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFF38, 0x00000027, 0x00000002, 0xFE363C84, 0x000000C8, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000024, 0x00000002, 0xF971888A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x0000000A, func_802D7E08, 0x00000000, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x0000000A, func_802D7E08, 0x00000000, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000024, 0x00000002, 0xFE363C89, 0x00000003, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C89, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000002, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000E1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFF38, 0x00000027, 0x00000002, 0xFE363C84, 0x000000C8, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000024, 0x00000002, 0xF971888A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x0000000A, ShowSweat, 0x00000000, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0x00000000, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000024, 0x00000002, 0xFE363C89, 0x00000003, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C89, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000002, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000E1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80246B7C_B8ACFC
 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE2, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000001, jan_22_SetCamera0Flag1000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C84, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s

@@ -36,7 +36,7 @@ dlabel D_80242D50_AF59F0
 .word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFFFFFFE7, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7AB4, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFFFFFFF8, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, func_802CDE68, 0x00000004, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000028, 0x00000002, 0xFE363C83, 0x00000032, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7B4D, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFFFFFFEC, 0xFE363C82, 0xFFFFFF9C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, RemoveNpc, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242EB4_AF5B54
-.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400AB, 0x000000A0, 0x00000028, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80242C08_AF58A8, 0x00000044, 0x00000001, D_80242D50_AF59F0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10007, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000005A, 0x00000041, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000005A, 0x00000041, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000AA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000C, 0xF24A7080, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24C3280, 0xF24B3080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24ACA80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000381, 0x00000000, 0x00000008, 0x00000001, 0x00000021, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24B7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9880, 0xF24A754D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000382, 0x00000000, 0x00000008, 0x00000001, 0x00000021, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8880, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000383, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000072, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000008, Spawn802D9D50, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AAA80, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000041, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240774_AF3414, 0x00000043, 0x00000001, func_80240774_AF3414, 0x00000043, 0x00000001, func_80240774_AF3414, 0x00000043, 0x00000008, Spawn802D9D50, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000078, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000078, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400AB, 0x000000A0, 0x00000028, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80242C08_AF58A8, 0x00000044, 0x00000001, D_80242D50_AF59F0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10007, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000005A, 0x00000041, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000005A, 0x00000041, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000AA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000C, 0xF24A7080, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24C3280, 0xF24B3080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24ACA80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000381, 0x00000000, 0x00000008, 0x00000001, 0x00000021, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24B7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9880, 0xF24A754D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000382, 0x00000000, 0x00000008, 0x00000001, 0x00000021, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8880, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000383, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000072, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AAA80, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000041, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240774_AF3414, 0x00000043, 0x00000001, func_80240774_AF3414, 0x00000043, 0x00000001, func_80240774_AF3414, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000078, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000078, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802432A4_AF5F44
 .word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000384, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C1000B, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7A82, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C80, 0x000000C8, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24ACA80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000384, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0xFFFFFFD3, 0x00000043, 0x00000003, SetNpcYaw, 0x00000003, 0x0000005A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A87B4, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A714D, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF248EA80, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24CD280, 0x00000026, 0x00000002, 0xFE363C84, 0xF24C0A80, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000384, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000080, 0x00000001, 0x00000043, 0x00000003, SetNpcYaw, 0x00000003, 0x0000010E, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x000000FA, 0x000000A0, 0x00000032, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF9C, 0x00000032, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000080, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000384, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000003, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF9C, 0x00000000, 0x00000046, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x0000008C, 0x00000046, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -45,7 +45,7 @@ dlabel D_802435FC_AF629C
 .word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00002096, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10006, 0x00000043, 0x00000007, MakeItemEntity, 0xFD050F80, 0x00000069, 0x0000001E, 0x00000014, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7B4D, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A794D, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24C1E80, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24AF280, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24ACA80, 0x00000043, 0x00000005, SetItemPos, 0xFE363C8A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7B4D, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7BB4, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24C6E80, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24A7A80, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24B9280, 0x00000043, 0x00000005, SetItemPos, 0xFE363C8A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400A5, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000078, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000078, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400AA, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400A9, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400A8, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400A7, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10002, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0x00000000, 0x00000043, 0x00000006, NpcJump1, 0x00000003, 0x00000078, 0x00000000, 0xFFFFFFEC, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10001, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243A88_AF6728
-.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x0000000A, func_802D7E08, 0x00000000, 0x00000001, 0xFFFFFFD3, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0x00000000, 0x00000001, 0xFFFFFFD3, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243B50_AF67F0
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000000, 0x0014009A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF83, 0x00000028, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000032, 0x00000028, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x0014009B, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000023, 0x0000012C, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x0014009C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x0014009D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x0014009E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x00000064, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x0014009F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C1000C, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, 0x0000006A, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C80, 0x00000024, 0x00000002, 0xF8405D73, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10002, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0x00000000, 0x00000043, 0x00000006, NpcJump1, 0x00000003, 0x00000078, 0x00000000, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400A0, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s

@@ -15,7 +15,7 @@ dlabel D_8024F6BC_8FB4DC
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000163, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024F840_8FB660
-.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000163, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000001, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241CF0_8EDB10, 0xF24A81B4, 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x0000000A, 0x00000043, 0x00000002, func_80241CF0_8EDB10, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000163, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000001, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241CF0_8EDB10, 0xF24A81B4, 0x00000043, 0x00000007, InterpCamTargetPos, 0x00000000, 0x00000001, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x0000000A, 0x00000043, 0x00000002, func_80241CF0_8EDB10, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024FAAC_8FB8CC
 .word 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s

@@ -168,7 +168,7 @@ dlabel D_80249CF0_7F4A00
 .word 0x00A90001, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00630000
 
 dlabel D_80249D1C_7F4A2C
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000016, 0x003B000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000016, 0x003B0003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000016, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000016, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000016, 0x00000190, 0x00000014, 0xFFFFFED4, 0x00000014, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000016, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000016, 0x003B0011, 0x003B0001, 0x00000000, 0x00020002, 0x00000043, 0x0000000A, func_802D7E08, 0x00000016, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000A, func_802D7E08, 0x00000016, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000019A, 0xFFFFFEAC, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000016, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C80, 0x0000203F, 0x00000000, 0x00000045, 0x00000002, D_80248ED0_7F3BE0, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000016, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000016, 0x000000AA, 0xFFFFFF74, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0x00000016, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000AA, 0x00000014, 0xFFFFFF74, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A9A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00880003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001AE, 0xFFFFFE8B, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFE8B, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00880001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00880004, 0x00880001, 0x00000000, 0x00020003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000037, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000038, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000039, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003A, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003D, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000016, 0x003B000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000016, 0x003B0003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000016, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000016, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000016, 0x00000190, 0x00000014, 0xFFFFFED4, 0x00000014, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000016, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000016, 0x003B0011, 0x003B0001, 0x00000000, 0x00020002, 0x00000043, 0x0000000A, ShowSweat, 0x00000016, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000A, ShowSweat, 0x00000016, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000019A, 0xFFFFFEAC, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000016, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C80, 0x0000203F, 0x00000000, 0x00000045, 0x00000002, D_80248ED0_7F3BE0, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000016, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000016, 0x000000AA, 0xFFFFFF74, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0x00000016, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000AA, 0x00000014, 0xFFFFFF74, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A9A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00880003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001AE, 0xFFFFFE8B, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFE8B, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00880001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00880004, 0x00880001, 0x00000000, 0x00020003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000037, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000038, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000039, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003A, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003D, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024A110_7F4E20
 .word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, mac_00_UnkPositionFunc, 0x0000010A, 0xFFFFFEA2, 0x0000016E, 0xFFFFFF03, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000000E1, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000203E, 0x00000000, 0x00000024, 0x00000002, 0xF8405C78, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000016, 0x08000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80249D1C_7F4A2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s

@@ -423,7 +423,7 @@ dlabel D_80257B64_8183E4
 .word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000015E, 0x0000001B, 0x00000118, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000168, 0x0000001B, 0x0000017C, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000012C, 0x000001C2, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000E6, 0x000001C2, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000AA, 0x0000017C, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000000B4, 0x0000001B, 0x00000118, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000DC, 0x000000FA, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000136, 0x0000001B, 0x000000FA, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000015E, 0x00000118, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80257D1C_81859C
-.word 0x00000024, 0x00000002, 0xFE363C8A, 0xF8405C90, 0x00000027, 0x00000002, 0xFE363C8A, 0xF8405C91, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B000C, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x0000001B, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9A80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000043, 0x0000000A, func_802D7E08, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C80, 0x0000203F, 0x00000000, 0x00000045, 0x00000002, D_8024E6F8_80EF78, 0xFE363C89, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000A0, 0x00000190, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000044, 0x00000001, D_80257900_818180, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, func_802D7E08, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x0000006E, 0x00000014, 0x000001A4, 0x00000000, 0x00000043, 0x0000000A, func_802D7E08, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000028, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x0000000A, func_802D7E08, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFE2, 0x00000226, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFE2, 0x000002BC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C8A, 0xF8405C90, 0x00000027, 0x00000002, 0xFE363C8A, 0xF8405C91, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B000C, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x0000001B, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9A80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C80, 0x0000203F, 0x00000000, 0x00000045, 0x00000002, D_8024E6F8_80EF78, 0xFE363C89, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000A0, 0x00000190, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000044, 0x00000001, D_80257900_818180, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x0000006E, 0x00000014, 0x000001A4, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000028, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFE2, 0x00000226, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFE2, 0x000002BC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80258004_818884
 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000E, 0x00000002, 0xFE363C81, 0x00000032, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C83, 0x00000050, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000000E1, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000203E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -570,7 +570,7 @@ dlabel D_8025BF78_81C7F8
 .word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000023C, 0x00000024, 0xFFFFFF1E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFAA2B58F, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x0000021B, 0x00000024, 0xFFFFFF0E, 0x00000008, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFAA2B58F, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x0000023C, 0x00000024, 0xFFFFFF1E, 0x00000008, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8025C0E4_81C964
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x0000000A, func_802D7E08, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B000C, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000024, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9A80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000226, 0x00000014, 0xFFFFFF5F, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000022, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000006, RotateModel, 0x0000006D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF8, 0x00000043, 0x00000006, RotateModel, 0x0000006D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000022, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x0000000A, func_802D7E08, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C80, 0x0000203F, 0x00000000, 0x00000045, 0x00000002, D_8024E6F8_80EF78, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000001A4, 0xFFFFFF8A, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0x00000010, D_8024D59C_80DE1C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B000C, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000024, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9A80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000226, 0x00000014, 0xFFFFFF5F, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000022, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000006, RotateModel, 0x0000006D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF8, 0x00000043, 0x00000006, RotateModel, 0x0000006D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000022, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C80, 0x0000203F, 0x00000000, 0x00000045, 0x00000002, D_8024E6F8_80EF78, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000001A4, 0xFFFFFF8A, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0x00000010, D_8024D59C_80DE1C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8025C3C8_81CC48
 .word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, mac_01_UnkPositionFunc, 0x000001C2, 0xFFFFFF42, 0x000001F4, 0xFFFFFF99, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000000E1, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000203E, 0x00000000, 0x00000024, 0x00000002, 0xF8405C8E, 0x00000001, 0x00000024, 0x00000002, 0xF97188C3, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_8025C0E4_81C964, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x1F000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s

@@ -192,7 +192,7 @@ dlabel D_8024A83C_83C03C
 .word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000000, 0xFFFFFFE7, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF06, 0xFFFFFFE7, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFF06, 0x00000000, 0x0000001E, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF9C, 0x0000001E, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000000, 0xFFFFFFE7, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024A994_83C194
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B000C, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9A80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000045, 0x00000002, D_8024A7F4_83BFF4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x0000000A, func_802D7E08, 0xFFFFFFFF, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x0000000A, func_802D7E08, 0xFFFFFFFF, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000203F, 0x00000000, 0x00000045, 0x00000002, D_8024A7F4_83BFF4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000001E, 0xFFFFFF38, 0x00000000, 0x00000043, 0x0000000A, func_802D7E08, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFE2, 0xFFFFFE70, 0x00000000, 0x00000043, 0x0000000A, func_802D7E08, 0xFFFFFFFF, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000001E, 0xFFFFFDA8, 0x00000000, 0x00000043, 0x0000000A, func_802D7E08, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000000, 0xFFFFFD76, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x000000C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B000C, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9A80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000045, 0x00000002, D_8024A7F4_83BFF4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000203F, 0x00000000, 0x00000045, 0x00000002, D_8024A7F4_83BFF4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000001E, 0xFFFFFF38, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFE2, 0xFFFFFE70, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000001E, 0xFFFFFDA8, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000000, 0xFFFFFD76, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x000000C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024AC94_83C494
 .word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000000E1, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000203E, 0x00000000, 0x00000024, 0x00000002, 0xF8405C9F, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_8024A994_83C194, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x1F000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_nok/nok_04/9EEEB0.data.s

@@ -33,7 +33,7 @@ dlabel D_8024161C_9EF20C
 .word 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C84, 0x00000258, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000064, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000029, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFE363C81, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241710_9EF300
-.word 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x00000043, 0x00000007, InterpCamTargetPos, 0x00000000, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
 
 dlabel D_80241748_9EF338
 .word 0xFFFE0000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00010000, 0x00000000, 0x02000000, 0xFFFFFFFF