Shops and Battle Areas (#287)

* fix BSS bs

* more shop stuff

* gamestatus stuff

* name and some nonmatchings

* cleanup

* clean

* battle area data

* DeadUnkFloatFuncAbs

* symz

* removing stuff

* Battle Area Deduplication

* UnkFogFunc

include/common_structs.h

@@ -1002,6 +1002,11 @@ typedef struct PrintContext {
     /* 0x53A */ char unk_53A[30];
 } PrintContext; // size = 0x558
 
+typedef struct ShopItemEntity {
+    /* 0x00 */ s32 index;
+    /* 0x04 */ Vec3f pos;
+} ShopItemEntity; // size = 0x10
+
 typedef struct GameStatus {
     /* 0x000 */ u32 currentButtons;
     /* 0x004 */ u32 altCurrentButtons; /* input used for batte when flag 80000 set */
@@ -1034,8 +1039,8 @@ typedef struct GameStatus {
     /* 0x071 */ s8 demoState; /* (0 = not demo, 1 = map demo, 2 = demo map changing) */
     /* 0x072 */ u8 nextDemoScene; /* which part of the demo to play next */
     /* 0x073 */ u8 contBitPattern;
-    /* 0x074 */ char unk_74;
-    /* 0x075 */ s8 unk_75;
+    /* 0x074 */ s8 debugEnemyContact;
+    /* 0x075 */ s8 debugQuizmo;
     /* 0x076 */ s8 unk_76;
     /* 0x077 */ char unk_77;
     /* 0x078 */ s8 disableScripts;
@@ -1050,7 +1055,7 @@ typedef struct GameStatus {
     /* 0x081 */ s8 unk_81;
     /* 0x082 */ s8 unk_82;
     /* 0x083 */ s8 unk_83;
-    /* 0x084 */ s8 unk_84;
+    /* 0x084 */ s8 playerSpriteSet;
     /* 0x085 */ char unk_85;
     /* 0x086 */ s16 areaID;
     /* 0x088 */ s16 prevArea;
@@ -1059,12 +1064,12 @@ typedef struct GameStatus {
     /* 0x08E */ s16 entryID;
     /* 0x090 */ u16 unk_90;
     /* 0x092 */ u16 unk_92;
-    /* 0x094 */ f32 exitAngle;
+    /* 0x094 */ f32 exitTangent;
     /* 0x098 */ Vec3f playerPos;
     /* 0x0A4 */ f32 playerYaw;
-    /* 0x0A8 */ s8 unk_A8;
+    /* 0x0A8 */ s8 creditsViewportMode;
     /* 0x0A9 */ s8 unk_A9;
-    /* 0x0AA */ s8 unk_AA;
+    /* 0x0AA */ s8 demoFlags;
     /* 0x0AB */ s8 unk_AB;
     /* 0x0AC */ s8 loadMenuState;
     /* 0x0AD */ s8 menuCounter;
@@ -1081,7 +1086,7 @@ typedef struct GameStatus {
     /* 0x138 */ s32 nextRNG;
     /* 0x13C */ s16 unk_13C;
     /* 0x13E */ char unk_13E[2];
-    /* 0x140 */ s32* shopItemData;
+    /* 0x140 */ ShopItemEntity* shopItemEntities;
     /* 0x144 */ struct Shop* mapShop;
     /* 0x148 */ s16 enableBackground; /* (bit 2 is also used for something) */
     /* 0x14A */ s16 backgroundMinW;
@@ -1341,9 +1346,14 @@ typedef struct ShopOwner {
     /* 0x18 */ s32* shopStringIDs;
 } ShopOwner;
 
+typedef struct ShopItemLocation {
+    /* 0x0 */ s16 posModelID;
+    /* 0x2 */ s16 triggerColliderID;
+} ShopItemLocation; // size = 0x4
+
 typedef struct StaticInventoryItem {
     /* 0x0 */ s32 unk_00;
-    /* 0x4 */ char unk_04[0x4];
+    /* 0x4 */ s32 price;
     /* 0x8 */ s32 unk_08;
 } StaticInventoryItem; // size = 0xC
 
@@ -1353,23 +1363,42 @@ typedef struct StaticPriceItem {
     /* 0x8 */ char unk_08[0x4];
 } StaticPriceItem; // size = 0xC
 
+typedef struct PopupMenu {
+    /* 0x000 */ s32* ptrIcon[32];
+    /* 0x080 */ char unk_80[4];
+    /* 0x084 */ s32 nameString[32];
+    /* 0x104 */ char unk_104[4];
+    /* 0x108 */ s32 userIndex[32]; // used to map menu order to a user-ID for each item
+    /* 0x188 */ char unk_188[4];
+    /* 0x18C */ s32 enabled[32];
+    /* 0x20C */ char unk_20C[4];
+    /* 0x210 */ s32 value[32]; // sale price, etc
+    /* 0x290 */ char unk_290[4];
+    /* 0x294 */ s32 descString[32];
+    /* 0x314 */ char unk_314[4];
+    /* 0x318 */ s32 popupType; // C = keys
+    /* 0x31C */ s32 unk_31C;
+    /* 0x320 */ s32 unk_320;
+    /* 0x324 */ s32 numEntries;
+    /* 0x328 */ s32 initialPos;
+    /* 0x32C */ s16 result;
+    /* 0x32E */ char unk_32E[0x2];
+} PopupMenu; // size = 0x330
+
 typedef struct Shop {
     /* 0x000 */ s16 flags;
     /* 0x002 */ s16 numItems;
     /* 0x004 */ s16 numSpecialPrices;
     /* 0x006 */ char unk_06[2];
-    /* 0x008 */ s32 unk_08;
+    /* 0x008 */ s32 currentItemSlot;
     /* 0x00C */ s32 selectedStoreItemSlot;
     /* 0x010 */ ShopOwner* owner;
-    /* 0x014 */ UNK_PTR staticItemPositions;
+    /* 0x014 */ ShopItemLocation* staticItemPositions;
     /* 0x018 */ StaticInventoryItem* staticInventory;
     /* 0x01C */ StaticPriceItem* staticPriceList;
     /* 0x020 */ s32 costIconID;
     /* 0x024 */ s32 inventoryItemFlags;
-    /* 0x028 */ s32** unk_28;
-    /* 0x02C */ char unk_2C[0x328];
-    /* 0x354 */ s16 unk_354;
-    /* 0x356 */ char unk_356[0x2];
+    /* 0x028 */ PopupMenu itemSelectMenu;
     /* 0x358 */ s32 unk_358;
 } Shop; // size = 0x35C
 

include/functions.h

@@ -48,6 +48,11 @@ void func_802666E4(Actor* actor, f32 arg1, f32 arg2, f32 arg3, s16);
 
 void step_game_loop(void);
 s32 resume_all_group(s32 groupFlags);
+f32 length2D(f32 x, f32 y);
+
+void transform_point(Matrix4f mtx, f32, f32, f32, f32, f32*, f32*, f32*, f32*);
+void draw_number(s32 value, s32 x, s32 y, s32 arg3, s32 palette, s32 opacity, s32 style);
+void set_hud_element_scale(s32 index, f32 scale);
 
 void create_shadow_callback(Shadow* entity);
 void func_802E10F4(Entity* entity);

include/variables.h

@@ -200,7 +200,7 @@ extern s16 gItemMenuNumItems;
 extern s32 D_802705D0;
 extern s32 gItemMenuCurrentScrollPos;
 extern s32 gItemMenuTargetScrollPos;
-extern u32 D_802705DC;
+extern s32 D_802705DC;
 extern s32 gItemMenuLevel;
 extern s32 gItemMenuCurrentTab;
 extern MenuIcon* gItemIcons[20];

src/111f0_len_860.c

@@ -21,7 +21,7 @@ void func_80035E24(void) {
 void func_80035E54(void) {
     D_800A0944 = 0;
     D_800A0946 = 4;
-    gGameStatusPtr->exitAngle = 0.0f;
+    gGameStatusPtr->exitTangent = 0.0f;
     gMapTransitionAlpha = 0xFF;
     nuContRmbForceStopEnd();
     func_801382AC(&gMapTransitionAlpha);

src/11a50_len_7a0.c

@@ -8,7 +8,7 @@ void begin_state_intro(void) {
     set_curtain_scale_goal(1.0f);
     set_curtain_fade_goal(0.3f);
 
-    unk_A8 = gGameStatusPtr->unk_A8;
+    unk_A8 = gGameStatusPtr->creditsViewportMode;
     switch (unk_A8) {
         case 0:
             intro_logos_set_fade_alpha(0);
@@ -48,7 +48,7 @@ void begin_state_intro(void) {
             intro_logos_set_fade_alpha(0);
             intro_logos_set_fade_color(208);
 
-            gGameStatusPtr->unk_A8 = -1;
+            gGameStatusPtr->creditsViewportMode = -1;
 
             D_800A0956 = 6;
             D_800A0958 = 6;

src/1370_len_7d0.c

@@ -12,7 +12,7 @@ extern u16* D_80073E04;
 extern s16 D_80073E08;
 extern s16 D_80073E0A;
 extern s32 D_80073E10;
-extern s16* D_8009A680;
+extern u16* D_8009A680;
 extern OSViMode _osViModeNtscLan1;
 extern OSViMode _osViModeMPalLan1;
 
@@ -57,8 +57,8 @@ void gfxRetrace_Callback(s32 arg0) {
                 temp_8009A680[1] = fb;
                 temp_8009A680[0] = fb;
                 D_80073E04 = fb;
-                nuGfxSetCfb(temp_8009A680, 3);
-                osViSwapBuffer(*temp_8009A680);
+                nuGfxSetCfb(&D_8009A680, 3);
+                osViSwapBuffer(D_8009A680);
                 D_80073E00 = 2;
             }
         }

src/1b40_len_20b0.c

@@ -248,13 +248,13 @@ void load_engine_data(void) {
     gGameStatusPtr->enableBackground = 0;
     gGameStatusPtr->musicEnabled = 1;
     gGameStatusPtr->unk_7C = 1;
-    gGameStatusPtr->unk_A8 = -1;
-    gGameStatusPtr->unk_AA = 0;
+    gGameStatusPtr->creditsViewportMode = -1;
+    gGameStatusPtr->demoFlags = 0;
     gGameStatusPtr->unk_81 = 0;
     gGameStatusPtr->unk_82 = -8;
     gGameStatusPtr->unk_83 = 4;
     timeFreezeMode = 0;
-    gGameStatusPtr->unk_75 = gGameStatusPtr->unk_13C = 0;
+    gGameStatusPtr->debugQuizmo = gGameStatusPtr->unk_13C = 0;
     D_80074021 = 5;
     gGameStatusPtr->saveCount = 0;
     fio_init_flash();

src/3bf0_len_6f0.c

@@ -1,18 +1,16 @@
 #include "common.h"
 
 void func_800287F0(void) {
-    GameStatus** gameStatus = &gGameStatusPtr;
-
-    (*gameStatus)->currentButtons = 0;
-    (*gameStatus)->pressedButtons = 0;
-    (*gameStatus)->heldButtons = 0;
-    (*gameStatus)->stickX = 0;
-    (*gameStatus)->stickY = 0;
-    (*gameStatus)->prevButtons = 0;
-    (*gameStatus)->unk_50[0] = 4;
-    (*gameStatus)->unk_48[0] = 15;
-    (*gameStatus)->unk_60 = 0;
-    (*gameStatus)->unk_58 = 0;
+    gGameStatusPtr->currentButtons = 0;
+    gGameStatusPtr->pressedButtons = 0;
+    gGameStatusPtr->heldButtons = 0;
+    gGameStatusPtr->stickX = 0;
+    gGameStatusPtr->stickY = 0;
+    gGameStatusPtr->prevButtons = 0;
+    gGameStatusPtr->unk_50[0] = 4;
+    gGameStatusPtr->unk_48[0] = 15;
+    gGameStatusPtr->unk_60 = 0;
+    gGameStatusPtr->unk_58 = 0;
 }
 
 void func_80028838(void) {

src/7bb60_len_41b0.c

@@ -8,15 +8,12 @@ extern s32 D_8010C96C; // npc list index
 extern s16 D_8010C9B0;
 
 void func_800E26B0(void) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-
-    playerStatus->jumpApexHeight = playerStatus->position.y;
+    gPlayerStatus.jumpApexHeight = gPlayerStatus.position.y;
 }
 
 s32 func_800E26C4(void) {
-    PlayerStatus* playerStatus = gPlayerStatusPtr;
     PlayerData* playerData = &gPlayerData;
-    s32 actionState = playerStatus->actionState;
+    s32 actionState = gPlayerStatusPtr->actionState;
     Temp8010EBB0* temp_8010EBB0 = &D_8010EBB0;
 
     if (actionState == ACTION_STATE_IDLE ||
@@ -33,7 +30,7 @@ s32 func_800E26C4(void) {
             if (temp_8010EBB0->unk_00 != 0) {
                 return 1;
             } else {
-                playerStatus->animFlags |= 4;
+                gPlayerStatusPtr->animFlags |= 4;
                 return 0;
             }
         } else {
@@ -41,7 +38,7 @@ s32 func_800E26C4(void) {
                 return temp_8010EBB0->unk_00 != 0;
             }
             if (temp_8010EBB0->unk_03 == 4) {
-                playerStatus->animFlags |= 4;
+                gPlayerStatusPtr->animFlags |= 4;
                 return 0;
             }
         }
@@ -52,15 +49,13 @@ s32 func_800E26C4(void) {
 void set_action_state(s32 actionState);
 
 void move_player(s32 duration, f32 heading, f32 speed) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
+    gPlayerStatus.flags |= 0x4000;
+    gPlayerStatus.heading = heading;
+    gPlayerStatus.moveFrames = duration;
+    gPlayerStatus.currentSpeed = speed;
 
-    playerStatus->flags |= 0x4000;
-    playerStatus->heading = heading;
-    playerStatus->moveFrames = duration;
-    playerStatus->currentSpeed = speed;
-
-    if (!(playerStatus->animFlags & 0x400000)) {
-        set_action_state(speed > playerStatus->walkSpeed ? ACTION_STATE_RUN : ACTION_STATE_WALK);
+    if (!(gPlayerStatus.animFlags & 0x400000)) {
+        set_action_state(speed > gPlayerStatus.walkSpeed ? ACTION_STATE_RUN : ACTION_STATE_WALK);
     }
 }
 
@@ -112,12 +107,10 @@ INCLUDE_ASM(s32, "7bb60_len_41b0", gravity_use_fall_params);
 #endif
 
 void func_800E3100(void) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-
-    if (playerStatus->actionState != ACTION_STATE_LAND_ON_SWITCH && playerStatus->actionState != ACTION_STATE_BOUNCE) {
+    if (gPlayerStatus.actionState != ACTION_STATE_LAND_ON_SWITCH && gPlayerStatus.actionState != ACTION_STATE_BOUNCE) {
         s32* colliderID;
 
-        playerStatus->position.y = func_800E3514(func_800E34D8(), &colliderID);
+        gPlayerStatus.position.y = func_800E3514(func_800E34D8(), &colliderID);
 
         func_800E315C(colliderID);
     }
@@ -215,7 +208,7 @@ void func_800E4508(void) {
         f32 y = playerStatus->position.y;
         f32 z = playerStatus->position.z;
 
-        do_lateral_collision(0, playerStatus, &x, &y, &z, temp_64, playerStatus->unk_88);
+        do_lateral_collision(0, &gPlayerStatus, &x, &y, &z, temp_64, playerStatus->unk_88);
 
         temp_64 -= playerStatus->runSpeed / 10.0f;
         playerStatus->position.x = x;
@@ -226,7 +219,7 @@ void func_800E4508(void) {
             temp_64 = 0.0f;
         }
 
-        (*(&playerStatus))->unk_64 = temp_64;
+        playerStatus->unk_64 = temp_64;
     }
 }
 
@@ -273,6 +266,7 @@ void check_input_midair_jump(void) {
         gPlayerStatus.unk_C2 >= 6 &&
         gPlayerStatus.decorationList < 0x12 &&
         gPlayerStatus.pressedButtons & A_BUTTON) {
+
         switch (gPlayerData.bootsLevel) {
             case 0:
                 break;
@@ -570,17 +564,14 @@ void func_800E6428(void) {
     Npc* disguiseNpc;
 
     if (actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || actionState == ACTION_STATE_RUN) {
-        s32* temp_8010C92C = &D_8010C92C;
-
-        if (*temp_8010C92C != 0) {
-            (*temp_8010C92C)--;
-            if (*temp_8010C92C == 0) {
-                GameStatus** gameStatus = &gGameStatusPtr;
-                if ((*gameStatus)->peachFlags & 2) {
+        if (D_8010C92C != 0) {
+            D_8010C92C--;
+            if (D_8010C92C == 0) {
+                if (gGameStatusPtr->peachFlags & 2) {
                     playerStatus->animFlags |= PLAYER_ANIM_FLAG_IN_DISGUISE;
-                    (*gameStatus)->peachFlags |= 2;
+                    gGameStatusPtr->peachFlags |= 2;
 
-                    disguiseNpc = make_disguise_npc((*gameStatus)->peachDisguise);
+                    disguiseNpc = make_disguise_npc(gGameStatusPtr->peachDisguise);
                     if (disguiseNpc != NULL) {
                         disguiseNpc->flags &= ~NPC_FLAG_40000;
                     }

src/B9D60.c

@@ -81,7 +81,7 @@ INCLUDE_ASM(s32, "B9D60", func_80126F78);
 
 INCLUDE_ASM(s32, "B9D60", draw_digit);
 
-INCLUDE_ASM(s32, "B9D60", draw_number);
+INCLUDE_ASM(void, "B9D60", draw_number, s32 value, s32 x, s32 y, s32 arg3, s32 palette, s32 opacity, s32 style);
 
 void func_80127B70(s32 arg0) {
     func_80127D90(arg0, 0, 0, 0, 0, 4, 0);

src/EFEB00.c

@@ -8,7 +8,7 @@
 
 #include "common/DeadUnk1.inc.c"
 
-INCLUDE_ASM(s32, "EFEB00", func_80240340_EFEE40);
+#include "common/DeadUnkFloatFuncAbs.inc.c"
 
 INCLUDE_ASM(s32, "EFEB00", func_802404D0_EFEFD0);
 

src/battle/area_arn/4FEA50.c

@@ -4,6 +4,4 @@
 
 #include "common/StartRumbleWithParams.inc.c"
 
-INCLUDE_ASM(s32, "battle/area_arn/4FEA50", func_80218058_4FEAA8, f32 arg0, f32 arg1);
-
-INCLUDE_ASM(s32, "battle/area_arn/4FEA50", func_802181E4_4FEC34);
+#include "common/BattleAreaAngleStuff.inc.c"

src/battle/area_arn/4FED30.c

@@ -6,6 +6,5 @@
 #include "common/StartRumbleWithParams.inc.c"
 #define NAMESPACE b_area_arn
 
-INCLUDE_ASM(s32, "battle/area_arn/4FED30", func_80218338_4FED88);
-
-INCLUDE_ASM(s32, "battle/area_arn/4FED30", func_802184C4_4FEF14);
+#define NAMESPACE dup_b_area_arn
+#include "common/BattleAreaAngleStuff.inc.c"

src/battle/area_kmr_part_1/4309A0.c

@@ -1,17 +1,13 @@
 #include "common.h"
 
 #define NAMESPACE b_area_kmr_part_1
+#include "common/BattleAreaAngleStuff.inc.c"
 
-INCLUDE_ASM(s32, "battle/area_kmr_part_1/4309A0", func_80218000_4309A0); // goomba.c
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_1/4309A0", func_8021818C_430B2C);
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_1/4309A0", func_80218280_430C20);
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_1/4309A0", func_8021840C_430DAC);
+#define NAMESPACE dup_b_area_kmr_part_1
+#include "common/BattleAreaAngleStuff.inc.c"
+#define NAMESPACE b_area_kmr_part_1
 
 #include "common/StartRumbleWithParams.inc.c"
 
-INCLUDE_ASM(s32, "battle/area_kmr_part_1/4309A0", func_80218558_430EF8);
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_1/4309A0", func_802186E4_431084);
+#define NAMESPACE dup2_b_area_kmr_part_1
+#include "common/BattleAreaAngleStuff.inc.c"

src/battle/area_kmr_part_1/4318D0.c

@@ -6,4 +6,4 @@
 #include "common/UnkAngleFunc2.inc.c"
 #define NAMESPACE b_area_kmr_part_1
 
-INCLUDE_ASM(s32, "battle/area_kmr_part_1/4318D0", func_80219198_431B38);
+#include "common/UnkFogFunc.inc.c"

src/battle/area_kmr_part_1/goomba.c

@@ -4,7 +4,10 @@
 #include "sprite/npc/goomba.h"
 #include "goomba.h"
 
-ApiStatus func_8021818C_430B2C(ScriptInstance* script, s32 isInitialCall);
+#define NAMESPACE b_area_kmr_part_1
+
+ApiStatus N(BattleAreaAngleStuff2)(ScriptInstance* script, s32 isInitialCall);
+
 extern s32 goomba_anims_running[];
 extern s32 goomba_anims[];
 extern s32 goomba_defense_table[];
@@ -289,7 +292,7 @@ Script goomba_dispatch = SCRIPT({
     UseIdleAnimation(ACTOR_SELF, 1);
 });
 
-f32 D_8021A194_432B34[] = {
+f32 N(floatTable)[] = {
     0.000000f, 0.017452f, 0.034899f, 0.052336f, 0.069756f, 0.087156f, 0.104528f, 0.121869f,
     0.139173f, 0.156434f, 0.173648f, 0.190809f, 0.207912f, 0.224951f, 0.241922f, 0.258819f,
     0.275637f, 0.292372f, 0.309017f, 0.325568f, 0.342020f, 0.358368f, 0.374607f, 0.390731f,
@@ -339,7 +342,7 @@ Script goomba_turn = SCRIPT({
                 SI_VAR(0) = 0;
                 loop 16 {
                     GetActorPos(ACTOR_SELF, SI_VAR(4), SI_VAR(5), SI_VAR(6));
-                    func_8021818C_430B2C(SI_VAR(1), SI_VAR(2), SI_VAR(4), SI_VAR(5), SI_VAR(0));
+                    N(BattleAreaAngleStuff2)(SI_VAR(1), SI_VAR(2), SI_VAR(4), SI_VAR(5), SI_VAR(0));
                     SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
                     SI_VAR(1) = SI_VAR(4);
                     SI_VAR(2) = SI_VAR(5);
@@ -414,7 +417,7 @@ Script goomba_turn = SCRIPT({
                 SI_VAR(0) = 0;
                 loop 16 {
                     GetActorPos(ACTOR_SELF, SI_VAR(4), SI_VAR(5), SI_VAR(6));
-                    func_8021818C_430B2C(SI_VAR(1), SI_VAR(2), SI_VAR(4), SI_VAR(5), SI_VAR(0));
+                    N(BattleAreaAngleStuff2)(SI_VAR(1), SI_VAR(2), SI_VAR(4), SI_VAR(5), SI_VAR(0));
                     SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0));
                     SI_VAR(1) = SI_VAR(4);
                     SI_VAR(2) = SI_VAR(5);

src/battle/area_kmr_part_2/439A90.c

@@ -2,23 +2,21 @@
 
 #define NAMESPACE b_area_kmr_part_2
 
-INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_80218000_439A90);
+#include "common/BattleAreaAngleStuff.inc.c"
 
-INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_8021818C_439C1C);
+#define NAMESPACE dup_b_area_kmr_part_2
+#include "common/BattleAreaAngleStuff.inc.c"
+#define NAMESPACE b_area_kmr_part_2
 
-INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_80218280_439D10);
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_8021840C_439E9C);
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_80218500_439F90);
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_8021868C_43A11C);
+#define NAMESPACE dup2_b_area_kmr_part_2
+#include "common/BattleAreaAngleStuff.inc.c"
+#define NAMESPACE b_area_kmr_part_2
 
 INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_80218780_43A210);
 
-INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_802187B0_43A240);
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_8021893C_43A3CC);
+#define NAMESPACE dup3_b_area_kmr_part_2
+#include "common/BattleAreaAngleStuff.inc.c"
+#define NAMESPACE b_area_kmr_part_2
 
 INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_80218A30_43A4C0);
 

src/battle/area_kmr_part_2/43AF30.c

@@ -6,5 +6,4 @@
 #include "common/UnkAngleFunc2.inc.c"
 #define NAMESPACE b_area_kmr_part_2
 
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_2/43AF30", func_80219708_43B198);
+#include "common/UnkFogFunc.inc.c"

src/battle/area_kmr_part_3/447440.c

@@ -2,14 +2,11 @@
 
 #define NAMESPACE b_area_kmr_part_3
 
-INCLUDE_ASM(s32, "battle/area_kmr_part_3/447440", func_80218000_447440);
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_3/447440", func_8021818C_4475CC);
+#include "common/BattleAreaAngleStuff.inc.c"
 
 #define NAMESPACE dup_b_area_kmr_part_3
 #include "common/StartRumbleWithParams.inc.c"
 #define NAMESPACE b_area_kmr_part_3
 
-INCLUDE_ASM(s32, "battle/area_kmr_part_3/447440", func_802182D8_447718);
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_3/447440", func_80218464_4478A4);
+#define NAMESPACE dup_b_area_kmr_part_3
+#include "common/BattleAreaAngleStuff.inc.c"

src/battle/area_kmr_part_3/4479A0.c

@@ -4,6 +4,5 @@
 
 #include "common/StartRumbleWithParams.inc.c"
 
-INCLUDE_ASM(s32, "battle/area_kmr_part_3/4479A0", func_802185B8_4479F8);
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_3/4479A0", func_80218744_447B84);
+#define NAMESPACE dup2_b_area_kmr_part_3
+#include "common/BattleAreaAngleStuff.inc.c"

src/battle/area_kmr_part_3/447D50.c

@@ -14,9 +14,9 @@ INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218AA4_447EE4);
 #include "common/UnkBattleFunc1.inc.c"
 #define NAMESPACE b_area_kmr_part_3
 
-INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218B9C_447FDC);
-
-INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218D28_448168);
+#define NAMESPACE dup3_b_area_kmr_part_3
+#include "common/BattleAreaAngleStuff.inc.c"
+#define NAMESPACE b_area_kmr_part_3
 
 INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218E1C_44825C);
 

src/battle/area_kmr_part_3/448B70.c

@@ -4,4 +4,4 @@
 
 #include "common/UnkAngleFunc2.inc.c"
 
-INCLUDE_ASM(s32, "battle/area_kmr_part_3/448B70", func_80219998_448DD8);
+#include "common/UnkFogFunc.inc.c"

src/battle/area_nok/48D1A0.c

@@ -2,12 +2,9 @@
 
 #define NAMESPACE b_area_nok
 
-INCLUDE_ASM(s32, "battle/area_nok/48D1A0", func_80218000_48D1A0);
-
-INCLUDE_ASM(s32, "battle/area_nok/48D1A0", func_8021818C_48D32C);
+#include "common/BattleAreaAngleStuff.inc.c"
 
 #include "common/StartRumbleWithParams.inc.c"
 
-INCLUDE_ASM(s32, "battle/area_nok/48D1A0", func_802182D8_48D478);
-
-INCLUDE_ASM(s32, "battle/area_nok/48D1A0", func_80218464_48D604);
+#define NAMESPACE dup_b_area_nok
+#include "common/BattleAreaAngleStuff.inc.c"

src/battle/area_nok/48D700.c

@@ -2,8 +2,8 @@
 
 #define NAMESPACE b_area_nok
 
-INCLUDE_ASM(s32, "battle/area_nok/48D700", func_80218560_48D700);
-
-INCLUDE_ASM(s32, "battle/area_nok/48D700", func_802186EC_48D88C);
+#define NAMESPACE dup2_b_area_nok
+#include "common/BattleAreaAngleStuff.inc.c"
+#define NAMESPACE b_area_nok
 
 #include "common/UnkBattleFunc1.inc.c"

src/battle/area_omo3/557AD0.c

@@ -2,9 +2,7 @@
 
 #define NAMESPACE b_area_omo3
 
-INCLUDE_ASM(s32, "battle/area_omo3/557AD0", func_802186F0_557AD0);
-
-INCLUDE_ASM(s32, "battle/area_omo3/557AD0", func_8021887C_557C5C);
+#include "common/BattleAreaAngleStuff.inc.c"
 
 #include "common/UnkBattleFunc2.inc.c"
 

src/battle/area_sam2/63D710.c

@@ -6,6 +6,4 @@
 #include "common/StartRumbleWithParams.inc.c"
 #define NAMESPACE b_area_sam2
 
-INCLUDE_ASM(s32, "battle/area_sam2/63D710", func_80218588_63D768);
-
-INCLUDE_ASM(s32, "battle/area_sam2/63D710", func_80218714_63D8F4);
+#include "common/BattleAreaAngleStuff.inc.c"

src/battle/area_tik/5EC690.c

@@ -2,18 +2,16 @@
 
 #define NAMESPACE b_area_tik
 
-INCLUDE_ASM(s32, "battle/area_tik/5EC690", func_80218200_5EC690);
+#include "common/BattleAreaAngleStuff.inc.c"
 
-INCLUDE_ASM(s32, "battle/area_tik/5EC690", func_8021838C_5EC81C);
-
-INCLUDE_ASM(s32, "battle/area_tik/5EC690", func_80218480_5EC910);
-
-INCLUDE_ASM(s32, "battle/area_tik/5EC690", func_8021860C_5ECA9C);
+#define NAMESPACE dup_b_area_tik
+#include "common/BattleAreaAngleStuff.inc.c"
+#define NAMESPACE b_area_tik
 
 #define NAMESPACE dup_b_area_tik
 #include "common/StartRumbleWithParams.inc.c"
 #define NAMESPACE b_area_tik
 
-INCLUDE_ASM(s32, "battle/area_tik/5EC690", func_80218758_5ECBE8);
-
-INCLUDE_ASM(s32, "battle/area_tik/5EC690", func_802188E4_5ECD74);
+#define NAMESPACE dup2_b_area_tik
+#include "common/BattleAreaAngleStuff.inc.c"
+#define NAMESPACE b_area_tik

src/common/BattleAreaAngleStuff.inc.c

@@ -0,0 +1,61 @@
+#include "common.h"
+
+extern f32 N(floatTable)[];
+
+u32 N(BattleAreaAngleStuff1)(f32 x, f32 y) {
+    f32 tempF = abs(y) / length2D(x, y);
+    u16 angle1 = 0;
+    u16 angle2 = 90;
+    u16 ret;
+    u16 i;
+
+    for (i = 0; i < 7; i++) {
+        u16 temp_v1 = angle1 + ((angle2 - angle1) / 2);
+
+        if (N(floatTable)[temp_v1] < tempF) {
+            angle1 = temp_v1;
+        } else {
+            angle2 = temp_v1;
+        }
+    }
+
+    if (fabsf(N(floatTable)[angle1] - tempF) < fabsf(N(floatTable)[angle2] - tempF)) {
+        ret = angle1;
+    } else {
+        ret = angle2;
+    }
+
+    if (x < 0.0f && y >= 0.0f) {
+        ret = 180 - ret;
+    }
+
+    if (x < 0.0f && y < 0.0f) {
+        ret += 180;
+    }
+
+    if (x >= 0.0f && y < 0.0f) {
+        ret = 360 - ret;
+    }
+
+    return ret;
+}
+
+ApiStatus N(BattleAreaAngleStuff2)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode *args = script->ptrReadPos;
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    s32 var3 = get_variable(script, *args++);
+    s32 var4 = get_variable(script, *args++);
+    s32 var5 = get_variable(script, *args);
+
+    var3 -= var1;
+    var4 -= var2;
+
+    if (var3 == 0 && var4 == 0) {
+        set_variable(script, *args, var5);
+        return ApiStatus_DONE2;
+    } else {
+        set_variable(script, *args, N(BattleAreaAngleStuff1)(var3, var4) - 90);
+        return ApiStatus_DONE2;
+    }
+}

src/common/DeadUnkFloatFuncAbs.inc.c

@@ -0,0 +1,25 @@
+#include "common.h"
+#include "map.h"
+
+// Same as (Dead)UnkFloatFunc with an extra abs on diff
+ApiStatus N(DeadUnkFloatFuncAbs)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 a1 = *args++;
+    s32 var0 = dead_get_variable(script, a1);
+    s32 a2 = *args++;
+    f32 var1 = dead_get_float_variable(script, *args++);
+    f32 var2 = dead_get_float_variable(script, *args++);
+    s32 var3 = dead_get_variable(script, *args++);
+    s32 var4 = dead_get_variable(script, *args++);
+    f32 temp = (dead_get_float_variable(script, *args++) / 180.0f) * PI;
+    f32 diff = fabsf(var2 - var1) / 2;
+
+    if (var4 != 0 && var3 < var0) {
+        var0 = var3;
+        dead_set_variable(script, a1, var3);
+    }
+
+    dead_set_float_variable(script, a2, (var1 + diff) - (diff * dead_cos_rad(((var0 * PI) / var3) + temp)));
+
+    return ApiStatus_DONE2;
+}

src/common/IsGameStatusUnkAA_1.inc.c

@@ -3,7 +3,7 @@
 
 ApiStatus N(IsGameStatusUnkAA_1)(ScriptInstance* script, s32 isInitialCall) {
     script->varTable[0] = 0;
-    if (gGameStatusPtr->unk_AA & 1) {
+    if (gGameStatusPtr->demoFlags & 1) {
         script->varTable[0] = 1;
     }
 

src/common/UnkFogFunc.inc.c

@@ -0,0 +1,8 @@
+#include "common.h"
+
+ApiStatus N(UnkFogFunc)(ScriptInstance* script, s32 isInitialCall) {
+    set_world_fog_dist(980, 1000);
+    set_world_fog_color(15, 5, 55, 255);
+    enable_world_fog();
+    return ApiStatus_DONE2;
+}

src/d5a50_len_5fd0.c

@@ -81,7 +81,7 @@ INCLUDE_ASM(s32, "d5a50_len_5fd0", clear_icon_flags);
 
 INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144A5C);
 
-INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144C20);
+INCLUDE_ASM(void, "d5a50_len_5fd0", set_hud_element_scale, s32 index, f32 scale);
 
 INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144DF4);
 

src/e940_len_290.c

@@ -23,8 +23,8 @@ void step_init_state(void) {
     gGameStatusPtr->unk_76 = 0;
     gGameStatusPtr->disableScripts = 0;
     gGameStatusPtr->unk_7D = 0;
-    gGameStatusPtr->unk_A8 = -1;
-    gGameStatusPtr->unk_AA = 0;
+    gGameStatusPtr->creditsViewportMode = -1;
+    gGameStatusPtr->demoFlags = 0;
     gGameStatusPtr->unk_A9 = -1;
     gGameStatusPtr->demoState = 0;
 

src/f270_len_1190.c

@@ -190,7 +190,7 @@ void state_step_logos(void) {
                 D_800A0910 = 0;
 
                 intro_logos_set_fade_alpha(255);
-                gGameStatusPtr->unk_A8 = 0;
+                gGameStatusPtr->creditsViewportMode = 0;
                 set_game_mode(16);
                 break;
         }
@@ -412,7 +412,7 @@ void state_step_unpause(void) {
                         func_8002ACDC();
                         nuContRmbForceStopEnd();
                         func_80149670(1);
-                        spr_init_sprites(gGameStatusPtr->unk_84);
+                        spr_init_sprites(gGameStatusPtr->playerSpriteSet);
                         init_model_data();
                         func_801480F0();
                         init_entity_models();

src/pause/pause_items.c

@@ -6,7 +6,7 @@ struct struct8024F5C0 {
     char unk14[0x10];
 };
 
-extern struct struct8024F5C0* D_8024F5C0[1];
+extern struct struct8024F5C0 D_8024F5C0[1];
 extern s32 D_8024F570[];
 
 s32 pause_items_comparator(s16* a, s16* b) {
@@ -140,21 +140,18 @@ INCLUDE_ASM(s32, "pause/pause_items", pause_items_load_items);
 
 void pause_items_init(s8* arg0) {
     s32 i;
-    s32* temp_a0 = D_8024F570;
-    MenuIcon** itemIcons = gItemIcons;
-    struct struct8024F5C0* temp = D_8024F5C0;
 
     gItemMenuLevel = 0;
     gItemMenuCurrentTab = 0;
     pause_items_load_items(FALSE);
 
     for (i = 0; i < ARRAY_COUNT(gItemIcons); i++) {
-        itemIcons[i] = create_icon(temp_a0[i]);
-        set_icon_flags(itemIcons[i], 0x80);
+        gItemIcons[i] = create_icon(D_8024F570[i]);
+        set_icon_flags(gItemIcons[i], 0x80);
     }
 
     for (i = 0; i < ARRAY_COUNT(D_8024F5C0); i++) {
-        temp[i].unk10 = arg0;
+        D_8024F5C0[i].unk10 = arg0;
     }
 
     setup_pause_menu_tab(&D_8024F5C0, 1);
@@ -164,35 +161,27 @@ void pause_items_init(s8* arg0) {
 INCLUDE_ASM(s32, "pause/pause_items", pause_items_handle_input);
 
 void pause_items_update(void) {
-    s32* currPos = &gItemMenuCurrentScrollPos;
-    PauseItemPage* menuPages = gItemMenuPages;
-    PauseItemPage* menuPage = &menuPages[gItemMenuCurrentPage];
-    s32* temp802705DC;
+    PauseItemPage* menuPage = &gItemMenuPages[gItemMenuCurrentPage];
     s32 selectedIndex = (gItemMenuSelectedIndex / menuPage->numCols) - menuPage->listStart;
 
-    if ((selectedIndex < 2) || (menuPage->numRows < 9)) {
+    if (selectedIndex < 2 || menuPage->numRows < 9) {
         D_802705DC = 0;
     } else if (selectedIndex >= (menuPage->numRows - 2)) {
         D_802705DC = menuPage->numRows - 8;
-    } else {
-        temp802705DC = &D_802705DC;
-        if ((selectedIndex - *temp802705DC) > 6) {
-            *temp802705DC = selectedIndex - 6;
-        } else if ((selectedIndex - *temp802705DC) < 1) {
-            *temp802705DC = selectedIndex - 1;
-        }
+    } else if ((selectedIndex - D_802705DC) > 6) {
+        D_802705DC = selectedIndex - 6;
+    } else if ((selectedIndex - D_802705DC) < 1) {
+        D_802705DC = selectedIndex - 1;
     }
 
-    currPos = &gItemMenuCurrentScrollPos;
     gItemMenuTargetScrollPos = pause_items_get_pos_y(gItemMenuCurrentPage, D_802705DC * menuPage->numCols);
-    *currPos += pause_interp_vertical_scroll(gItemMenuTargetScrollPos - *currPos);
+    gItemMenuCurrentScrollPos += pause_interp_vertical_scroll(gItemMenuTargetScrollPos - gItemMenuCurrentScrollPos);
 }
 
 void pause_items_cleanup(void) {
-    MenuIcon** itemIcons = gItemIcons;
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gItemIcons); i++) {
-        free_icon(itemIcons[i]);
+        free_icon(gItemIcons[i]);
     }
 }

src/world/area_arn/arn_04/events.c

@@ -755,7 +755,6 @@ ApiStatus N(func_8024219C_BE594C)(ScriptInstance* script, s32 isInitialCall) {
 }
 
 s32 N(func_80242388_BE5B38)(ScriptInstance* script, NpcAISettings *aiSettings, EnemyTerritoryThing* territory) {
-    PlayerStatus** playerStatus;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
     Camera* camera = CAM(gCurrentCamID);
@@ -771,7 +770,6 @@ s32 N(func_80242388_BE5B38)(ScriptInstance* script, NpcAISettings *aiSettings, E
         phi_f20 = 270.0f;
     }
 
-    playerStatus = &gPlayerStatusPtr;
     if (fabsf(get_clamped_angle_diff(phi_f20,
             atan2(npc->pos.x, npc->pos.z,
                   gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z))) > 75.0) {

src/world/area_arn/arn_08/events.c

@@ -460,12 +460,10 @@ ApiStatus N(func_8024019C_BF493C)(ScriptInstance *script, s32 isInitialCall) {
             (*dataPtr)++;
             break;
         case 3: {
-            Npc** partnerNpcPtr = &wPartnerNpc;
-
-            clear_partner_move_history(*partnerNpcPtr);
+            clear_partner_move_history(wPartnerNpc);
             func_800EF3C0(playerStatus->position.x, playerStatus->position.z);
             func_800EF3D4(0);
-            set_npc_yaw(*partnerNpcPtr, 90.0f);
+            set_npc_yaw(wPartnerNpc, 90.0f);
             playerStatus->targetYaw = 90.0f;
             playerStatus->currentYaw = 90.0f;
             playerStatus->spriteFacingAngle = 0.0f;

src/world/area_dro/dro_01/95B7E0.c

@@ -3070,7 +3070,7 @@ ApiStatus N(func_802415AC_95C7AC)(ScriptInstance *script, s32 isInitialCall) {
     test2 = var = temp_v0;
 
     if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        ((gGameStatusPtr->debugQuizmo != 0) && var)) {
         script->varTable[0] = 1;
     } else {
         kill_enemy(enemy);

src/world/area_dro/dro_02/9694C0.c

@@ -3171,7 +3171,7 @@ ApiStatus N(func_8024043C_9695FC)(ScriptInstance *script, s32 isInitialCall) {
     test2 = var = temp_v0;
 
     if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
-        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        ((gGameStatusPtr->debugQuizmo != 0) && var)) {
         script->varTable[0] = 1;
     } else {
         kill_enemy(enemy);

src/world/area_kmr/kmr_11/8DA100.c

@@ -2,6 +2,6 @@
 
 #include "world/common/foliage.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_8024023C_8DA33C);
+#include "common/UnkFogFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_8024027C_8DA37C);

src/world/area_mac/mac_01/800880.c

@@ -3,7 +3,7 @@
 ApiStatus func_80240000_800880(ScriptInstance* script, s32 isInitialCall) {
     s32 itemIndex = get_variable(script, *script->ptrReadPos);
 
-    set_item_entity_flags(gGameStatusPtr->shopItemData[itemIndex * 4], 0x40);
+    set_item_entity_flags(gGameStatusPtr->shopItemEntities[itemIndex].index, 0x40);
     return ApiStatus_DONE2;
 }
 
@@ -11,7 +11,7 @@ ApiStatus func_80240044_8008C4(ScriptInstance* script, s32 isInitialCall) {
     s32 itemIndex = get_variable(script, *script->ptrReadPos);
     s32* var1 = get_variable(NULL, SI_MAP_VAR(2));
 
-    set_item_entity_flags(gGameStatusPtr->shopItemData[itemIndex * 4], 0x40);
+    set_item_entity_flags(gGameStatusPtr->shopItemEntities[itemIndex].index, 0x40);
     set_variable(NULL, var1[itemIndex], 1);
     return ApiStatus_DONE2;
 }

src/world/area_pra/pra_01/D4D060.c

@@ -2,7 +2,7 @@
 
 #include "world/common/reflection.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240F20_D4DF60);
+#include "common/UnkFogFunc.inc.c"
 
 ApiStatus func_80240F60_D4DFA0(ScriptInstance* script, s32 isInitialCall) {
     gOverrideFlags &= ~0x80;

src/world/common/GetGameStatus75.inc.c

@@ -2,6 +2,6 @@
 #include "map.h"
 
 ApiStatus N(GetGameStatus75)(ScriptInstance* script, s32 isInitialCall) {
-    set_variable(script, SI_VAR(0), gGameStatusPtr->unk_75);
+    set_variable(script, SI_VAR(0), gGameStatusPtr->debugQuizmo);
     return ApiStatus_DONE2;
 }

src/world/common/SetGameStatusUnk84_1.inc.c

@@ -2,6 +2,6 @@
 #include "map.h"
 
 ApiStatus N(SetGameStatusUnk84_1)(ScriptInstance* script, s32 isInitialCall) {
-    gGameStatusPtr->unk_84 = 1;
+    gGameStatusPtr->playerSpriteSet = 1;
     return ApiStatus_BLOCK;
 }

src/world/script_api/7E0E80.c

@@ -23,9 +23,6 @@ s32 D_80283F58_7E4DD8[] = { 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8
 
 s32 D_80284034_7E4EB4[] = { 0x00000043, 0x00000002, ShowShopPurchaseDialog, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, ShowShopOwnerDialog, 0x00000002, 0x00000000, 0x00000001, 0x00000000, };
 
-static s32 D_80286520;
-static s32 D_80286524;
-
 s32 shop_owner_begin_speech(s32 messageIndex) {
     Shop* shop = gGameStatusPtr->mapShop;
     s32 shopStringID = shop->owner->shopStringIDs[messageIndex];
@@ -148,26 +145,28 @@ ApiStatus func_802803C8(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-// BSS nop issue
-#ifdef NON_MATCHING
 ApiStatus func_80280410(ScriptInstance* script, s32 isInitialCall) {
+    static ScriptInstance* D_80286520;
+    static s32 D_80286524;
+
     Shop* shop = gGameStatusPtr->mapShop;
-    s32 var1 = get_variable(script, *script->ptrReadPos);
+    s32 currentItemSlot = get_variable(script, *script->ptrReadPos);
 
     if (!(shop->flags & 8)) {
-        shop->unk_08 = var1;
+        shop->currentItemSlot = currentItemSlot;
         shop->flags |= 1;
         func_800E98EC();
         shop->unk_358 = 5;
 
         if (gGameStatusPtr->pressedButtons & 0x8000) {
+
             ScriptInstance* childScript;
 
             disable_player_input();
             disable_player_static_collisions();
 
             childScript = start_script(&D_80284034_7E4EB4, 1, 0);
-            childScript->varTable[0] = var1;
+            childScript->varTable[0] = currentItemSlot;
             D_80286520 = childScript;
             D_80286524 = childScript->id;
             shop->flags |= 8;
@@ -184,15 +183,88 @@ ApiStatus func_80280410(ScriptInstance* script, s32 isInitialCall) {
     enable_player_input();
     return ApiStatus_DONE2;
 }
-#else
-INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280410);
-#endif
 
 INCLUDE_ASM(ApiStatus, "world/script_api/7E0E80", ShowShopPurchaseDialog, ScriptInstance* script, s32 isInitialCall);
 
-INCLUDE_ASM(s32, "world/script_api/7E0E80", shop_open_item_select_popup);
+//dumb stuff
+#ifdef NON_MATCHING
+extern s32 D_8008A680[337][2];
 
-INCLUDE_ASM(s32, "world/script_api/7E0E80", shop_update_item_select_popup);
+void shop_open_item_select_popup(s32 mode) {
+    Shop* shop = gGameStatusPtr->mapShop;
+    PopupMenu* menu = &shop->itemSelectMenu;
+    s32 numItemSlots;
+    s32 popupType;
+    s32 i;
+    s32 numEntries;
+
+    switch (mode) {
+        case 0:
+            numItemSlots = 10;
+            popupType = 5;
+            break;
+        case 1:
+            numItemSlots = 10;
+            popupType = 6;
+            break;
+        default:
+            numItemSlots = 32;
+            popupType = 7;
+    }
+
+    numEntries = 0;
+
+    for (i = 0; i < numItemSlots; i++) {
+        s32 itemID;
+
+        if (mode >= 0 && mode < 2) {
+            itemID = gPlayerData.invItems[i];
+        } else {
+            itemID = gPlayerData.storedItems[i];
+        }
+
+        if (itemID != 0) {
+            menu->ptrIcon[i] = D_8008A680[gItemTable[itemID].iconID][0];
+            menu->userIndex[i] = i;
+            menu->enabled[i] = TRUE;
+            menu->nameString[i] = gItemTable[itemID].nameString;
+            menu->descString[i] = gItemTable[itemID].itemString;
+            menu->value[i] = shop_get_sell_price(itemID);
+            numEntries++;
+        }
+    }
+
+    menu->popupType = popupType;
+    menu->numEntries = numEntries;
+    menu->initialPos = 0;
+    func_800F4FC4(menu);
+    func_800E9894();
+    func_800E98EC();
+    open_status_menu_short();
+}
+#else
+INCLUDE_ASM(s32, "world/script_api/7E0E80", shop_open_item_select_popup);
+#endif
+
+s32 shop_update_item_select_popup(s32* selectedIndex) {
+    Shop* shop = gGameStatusPtr->mapShop;
+    PopupMenu* menu = &shop->itemSelectMenu;
+    s16 menuResult = shop->itemSelectMenu.result;
+
+    if (menuResult == 0) {
+        return 0;
+    }
+
+    func_800F13B0();
+
+    if (menuResult == 0xFF) {
+        *selectedIndex = -1;
+    } else {
+        *selectedIndex = menu->userIndex[menuResult - 1];
+    }
+
+    return 1;
+}
 
 void shop_close_item_select_popup(void) {
     func_800F1538();
@@ -201,30 +273,31 @@ void shop_close_item_select_popup(void) {
     close_status_menu();
 }
 
-// Ordering issue
-#ifdef NON_MATCHING
 s32 shop_get_sell_price(s32 itemID) {
     Shop* shop = gGameStatusPtr->mapShop;
     s32 numItems = shop->numSpecialPrices;
+    StaticPriceItem* items = shop->staticPriceList;
     s32 i;
 
+    if (shop) {
+        i = 0;
+    } // TODO fake match
+
+
     for (i = 0; i < numItems; i++) {
-        if (shop->staticPriceList[i].itemID == itemID) {
-            return shop->staticPriceList[i].sellPrice;
+        if (items[i].itemID == itemID) {
+            return items[i].sellPrice;
         }
     }
 
     return gItemTable[itemID].sellValue;
 }
-#else
-INCLUDE_ASM(s32, "world/script_api/7E0E80", shop_get_sell_price);
-#endif
 
 INCLUDE_ASM(ApiStatus, "world/script_api/7E0E80", ShowShopOwnerDialog, ScriptInstance* script, s32 isInitialCall);
 
 void shop_draw_item_name(s32 arg0, s32 posX, s32 posY) {
     Shop* shop = gGameStatusPtr->mapShop;
-    StaticInventoryItem* siItem = &shop->staticInventory[shop->unk_08];
+    StaticInventoryItem* siItem = &shop->staticInventory[shop->currentItemSlot];
     StaticItem* item = &gItemTable[siItem->unk_00];
 
     draw_msg(item->nameString, posX + 60 - (get_string_width(item->nameString, 0) >> 1), posY + 6, 255, 0, 0);
@@ -232,12 +305,84 @@ void shop_draw_item_name(s32 arg0, s32 posX, s32 posY) {
 
 void shop_draw_item_desc(s32 arg0, s32 posX, s32 posY) {
     Shop* shop = gGameStatusPtr->mapShop;
-    StaticInventoryItem* item = &shop->staticInventory[shop->unk_08];
+    StaticInventoryItem* item = &shop->staticInventory[shop->currentItemSlot];
 
     draw_msg(item->unk_08, posX + 8, posY, 255, 0xA, 0);
 }
 
+// Problems with the struct iteration
+#ifdef NON_MATCHING
+void shop_draw_items(void) {
+    Shop* shop = gGameStatusPtr->mapShop;
+    StaticInventoryItem* staticItems;
+    Camera* camera;
+    s32 i;
+    s32 xTemp;
+    s32 yTemp;
+    s32 xOffset;
+    f32 x, y, z, s;
+    f32 inX, inY, inZ;
+    ShopItemEntity* shopItemEntities;
+
+    if (shop->flags & 1) {
+        set_window_update(10, basic_window_update);
+        set_window_update(11, basic_window_update);
+    } else {
+        set_window_update(10, basic_hidden_window_update);
+        set_window_update(11, basic_hidden_window_update);
+    }
+
+    if (shop->flags & 1) {
+        camera = &gCameras[gCurrentCameraID];
+        staticItems = shop->staticInventory;
+        shopItemEntities = gGameStatusPtr->shopItemEntities;
+
+        for (i = 0; i < shop->numItems; i++) {
+            inX = shopItemEntities[i].pos.x;
+            inY = shopItemEntities[i].pos.y + 30.0f;
+            inZ = shopItemEntities[i].pos.z;
+
+            transform_point(camera->perspectiveMatrix, inX, inY, inZ, 1.0f, &x, &y, &z, &s);
+
+            s = 1.0f / s;
+
+            x *= s;
+            y *= -s;
+            z = (z * s + 1.0f) * 0.5;
+
+            if (z > 0.0f && z < 1.0f) {
+                xTemp = (((x * camera->viewportW) + camera->viewportW) * 0.5) + camera->viewportStartX;
+                yTemp = (((y * camera->viewportH) + camera->viewportH) * 0.5) + camera->viewportStartY;
+
+                if (staticItems[i].price < 100) {
+                    xOffset = -4;
+                } else {
+                    xOffset = 0;
+                }
+
+                if (!(get_item_entity(shopItemEntities[i].index)->flags & 0x40)) {
+                    draw_number(staticItems[i].price, xTemp + xOffset, yTemp, 1, 0, 255, 0);
+                }
+
+                if (i == shop->currentItemSlot) {
+                    set_icon_render_pos(shop->costIconID, (xTemp + xOffset) - 6, yTemp + 5);
+                    set_hud_element_scale(shop->costIconID, 0.7f);
+                    draw_icon_0(shop->costIconID);
+                }
+            }
+        }
+    }
+
+    if (shop->unk_358 > 0) {
+        shop->unk_358--;
+    } else {
+        shop->flags &= ~0x1;
+        func_800E9900();
+    }
+}
+#else
 INCLUDE_ASM(s32, "world/script_api/7E0E80", shop_draw_items);
+#endif
 
 INCLUDE_ASM(ApiStatus, "world/script_api/7E0E80", MakeShop, ScriptInstance* script, s32 isInitialCall);
 

src/world/world.c

@@ -48,7 +48,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) {
     gOverrideFlags &= ~0x40;
     gOverrideFlags &= ~0x80;
 
-    gGameStatusPtr->unk_84 = 0;
+    gGameStatusPtr->playerSpriteSet = 0;
     func_8002D160();
     func_802B2078();
     func_8011D890();
@@ -119,7 +119,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) {
     clear_dynamic_entity_list();
     clear_script_list();
     create_cameras_a();
-    spr_init_sprites(gGameStatusPtr->unk_84);
+    spr_init_sprites(gGameStatusPtr->playerSpriteSet);
     func_8011E224();
     clear_entity_models();
     npc_list_clear();
@@ -129,7 +129,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) {
     func_80148040();
     use_default_background_settings();
 
-    if (gGameStatusPtr->unk_A8 == -1) {
+    if (gGameStatusPtr->creditsViewportMode == -1) {
         func_80138188();
     }
 
@@ -173,7 +173,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) {
     gCameras[2].flags |= 0x2;
     gCameras[3].flags |= 0x2;
 
-    if (gGameStatusPtr->unk_A8 == -1) {
+    if (gGameStatusPtr->creditsViewportMode == -1) {
         set_cam_viewport(0, 12, 20, 296, 200);
     } else {
         set_cam_viewport(0, 29, 28, 262, 162);

ver/us/asm/data/battle/area_kmr_part_1/439984.rodata.s

@@ -0,0 +1,6 @@
+.include "macro.inc"
+
+.section .rodata
+
+glabel D_80220FE4_439984
+.word 0x6B6D725F, 0x30360000, 0x6B6D725F, 0x30350000, 0x6B6D725F, 0x30340000, 0x6B6D725F, 0x30330000, 0x6B6D725F, 0x30320000, 0x6B6D725F, 0x62670000, 0x6B6D725F, 0x62743032, 0x5F736861, 0x70650000, 0x6B6D725F, 0x74657800, 0x6B6D725F, 0x62670000, 0x6B6D725F, 0x62743033, 0x5F686974, 0x00000000, 0x6B6D725F, 0x62743033, 0x5F736861, 0x70650000, 0x6B6D725F, 0x74657800, 0x6B6D725F, 0x62670000, 0x6B6D725F, 0x62743034, 0x5F686974, 0x00000000, 0x6B6D725F, 0x62743034, 0x5F736861, 0x70650000, 0x6B6D725F, 0x74657800, 0x6B6D725F, 0x62670000, 0x6B6D725F, 0x62743035, 0x5F686974, 0x00000000, 0x6B6D725F, 0x62743035, 0x5F736861, 0x70650000, 0x6B6D725F, 0x74657800, 0x6B6D725F, 0x62670000, 0x6B6D725F, 0x62743036, 0x5F686974, 0x00000000, 0x6B6D725F, 0x62743036, 0x5F736861, 0x70650000, 0x6B6D725F, 0x74657800, 0x00000000

ver/us/asm/data/battle/area_omo2_4/552440.data.s

@@ -0,0 +1,27 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_80231000_552440
+.word 0x00000001, 0x00000000, 0x00000000
+
+glabel D_8023100C_55244C
+.word 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000006, 0x00000000, 0x00000009, 0x00000000, 0x00000007, 0x00000000, 0x00000004, 0x00000000, 0x00000003, 0x00000000, 0x0000000B, 0x00000000, 0x00000005, 0x00000000, 0x0000000A, 0x00000000, 0x00000008, 0x00000000, 0x0000001F, 0x00000000, 0x00000020, 0x00000000, 0x00000025, 0x00000000, 0x00000022, 0x00000000, 0x00000024, 0x00000000, 0x00000023, 0x00000000, 0x00000021, 0x00000000, 0x00000026, 0x00000000, 0x00000027, 0x00000000, 0x00000029, 0x00000000, 0x00000000
+
+glabel D_802310B8_5524F8
+.word 0x20820000, 0x01000000, 0x001800FF, D_80231104_552544, D_80231000_552440, 0x00000000, 0x00000000, 0xFFF60000, 0x00000000, 0x02000000, 0x00AC0008, 0x00010000, D_802310B8_5524F8, D_80231110_552550, D_8023100C_55244C, 0x00000000, 0x00045000, 0x1E1E0000, 0xF6140A14
+
+glabel D_80231104_552544
+.word 0x00000001, 0x006F0001, 0x00000000
+
+glabel D_80231110_552550
+.word 0x00000043, 0x00000003, BindTakeTurn, 0xFFFFFF81, D_80231754_552B94, 0x00000043, 0x00000003, BindIdle, 0xFFFFFF81, D_8023129C_5526DC, 0x00000043, 0x00000003, BindHandleEvent, 0xFFFFFF81, D_802312D0_552710, 0x00000043, 0x00000005, SetActorPos, 0xFFFFFF81, 0x000000B4, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ForceHomePos, 0xFFFFFF81, 0x000000B4, 0x00000000, 0x00000000, 0x00000043, 0x00000002, HPBarToHome, 0xFFFFFF81, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x006F000F, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, RunToGoal, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x000000B4, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000395, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x006F0004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x006F0005, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x006F0009, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+
+glabel D_8023129C_5526DC
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+
+glabel D_802312D0_552710
+.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, GetLastEvent, 0xFFFFFF81, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000038, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x0000001D, 0x00000001, 0x0000000E, 0x0000001D, 0x00000001, 0x00000024, 0x0000001D, 0x00000001, 0x0000000B, 0x0000001D, 0x00000001, 0x00000021, 0x0000001D, 0x00000001, 0x0000002F, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x0000001D, 0x00000001, 0x0000001B, 0x0000001D, 0x00000001, 0x00000020, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x006F000A, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A8080, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000023, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000008, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x006F0002, 0x00000008, 0x00000001, 0x00000018, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x006F0003, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x0000000F, PlayEffect, 0x00000028, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x0000002D, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000000, 0x000020BA, 0x000003B4, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000004, 0x0000000A, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x006F000C, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9280, 0x00000043, 0x00000005, AddActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000008, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFFFFFF38, 0x00000000, 0x00000014, 0x00000043, 0x00000004, RunToGoal, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000043, 0x00000004, RemoveActorDecoration, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, RemoveActor, 0xFFFFFF81, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000035, 0x00000043, 0x00000002, HPBarToHome, 0xFFFFFF81, 0x00000016, 0x00000001, 0x00000031, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x006F0001, 0x00000046, 0x00000001, DoRecover, 0x00000016, 0x00000001, 0x00000030, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x006F000A, 0x00000046, 0x00000001, DoNormalHit, 0x00000008, 0x00000001, 0x000003E8, 0x00000016, 0x00000001, 0x00000039, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x006F0001, 0x00000025, 0x00000002, 0xFE363C82, 0x006F000A, 0x00000046, 0x00000001, DoScareAway, 0x00000002, 0x00000000, 0x0000001C, 0x00000000, 0x00000025, 0x00000002, 0xFE363C81, 0x006F000A, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0xFE363C81, 0x00000008, 0x00000001, 0x00000014, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+
+glabel D_80231754_552B94
+.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000

ver/us/asm/data/battle/area_omo2_6/556C90.data.s

@@ -0,0 +1,30 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_80231000_556C90
+.word 0x00000001, 0x00000000, 0x00000000
+
+glabel D_8023100C_556C9C
+.word 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000006, 0x00000000, 0x00000009, 0x00000000, 0x00000007, 0x00000000, 0x00000004, 0x00000000, 0x00000003, 0x00000000, 0x0000000B, 0x00000000, 0x00000005, 0x00000000, 0x0000000A, 0x00000000, 0x00000008, 0x00000000, 0x0000001F, 0x00000000, 0x00000020, 0x00000000, 0x00000025, 0x00000000, 0x00000022, 0x00000000, 0x00000024, 0x00000000, 0x00000023, 0x00000000, 0x00000021, 0x00000000, 0x00000026, 0x00000000, 0x00000027, 0x00000000, 0x00000029, 0x00000000, 0x00000000
+
+glabel D_802310B8_556D48
+.word 0x00820001, 0x01000000, 0x001800FF, 0x00000000, D_80231000_556C90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00120000, 0x02000000, 0x001800FF, D_80231224_556EB4, D_80231000_556C90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00120000, 0x03000000, 0x001800FF, D_80231224_556EB4, D_80231000_556C90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00120000, 0x04000000, 0x001800FF, D_80231224_556EB4, D_80231000_556C90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00120000, 0x05000000, 0x001800FF, D_80231224_556EB4, D_80231000_556C90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00120000, 0x06000000, 0x001800FF, D_80231224_556EB4, D_80231000_556C90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00120000, 0x07000000, 0x001800FF, D_80231224_556EB4, D_80231000_556C90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00120000, 0x08000000, 0x001800FF, D_80231224_556EB4, D_80231000_556C90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00120000, 0x09000000, 0x001800FF, D_80231224_556EB4, D_80231000_556C90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040004, 0x00AE000A, 0x00090000, D_802310B8_556D48, D_80231280_556F10, D_8023100C_556C9C, 0x00000000, 0x00045000, 0x1E1E0000, 0xF6140A14
+
+glabel D_80231224_556EB4
+.word 0x00000001, 0x00780001, 0x0000000C, 0x00780000, 0x00000006, 0x00780000, 0x00000009, 0x00780001, 0x00000008, 0x00780000, 0x0000000B, 0x00780000, 0x00000005, 0x00780000, 0x00000005, 0x00780000, 0x00000004, 0x00780001, 0x00000004, 0x00780001, 0x00000003, 0x00780000, 0x00000000
+
+glabel D_80231280_556F10
+.word 0x00000043, 0x00000003, BindTakeTurn, 0xFFFFFF81, D_8023173C_5573CC, 0x00000043, 0x00000003, BindIdle, 0xFFFFFF81, D_802315EC_55727C, 0x00000043, 0x00000003, BindHandleEvent, 0xFFFFFF81, D_8023172C_5573BC, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000002, 0x00000001, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000003, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000003, 0x00000001, 0xFFFFFFE2, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000004, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000004, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000005, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000005, 0x00000001, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000006, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000006, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000007, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000007, 0x00000001, 0xFFFFFFE2, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000008, 0x00000000, 0x00000028, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000008, 0x00000001, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000009, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPartMovementVar, 0xFFFFFF81, 0x00000009, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000006, SetPartPos, 0xFFFFFF81, 0xFE363C80, 0x000000B9, 0x00000000, 0x0000002F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, ForceHomePos, 0xFFFFFF81, 0x00000014, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000002, HPBarToHome, 0xFFFFFF81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00780003, 0x00000024, 0x00000002, 0xFE363C84, 0xF24A8A80, 0x00000024, 0x00000002, 0xFE363C85, 0x00000005, 0x00000005, 0x00000001, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetPartMovementVar, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, GetPartMovementVar, 0xFFFFFF81, 0xFE363C80, 0x00000001, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000046, 0x00000001, D_80231620_5572B0, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0xFE363C80, 0x00780001, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+
+glabel D_802315EC_55727C
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+
+glabel D_80231620_5572B0
+.word 0x00000043, 0x00000006, GetPartOffset, 0xFFFFFF81, 0xFE363C80, 0xFE363C86, 0x00000000, 0xFE363C87, 0x0000000C, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000043, 0x00000004, SetPartYaw, 0xFFFFFF81, 0xFE363C80, 0x000000B4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, SetPartYaw, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C82, 0xFE363C83, 0x0000000F, 0x00000002, 0xFE363C89, 0xFE363C84, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetPartMoveSpeed, 0xFFFFFF81, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000007, RunPartTo, 0xFFFFFF81, 0xFE363C80, 0xFE363C82, 0x00000000, 0xFE363C83, 0xFE363C85, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+
+glabel D_8023172C_5573BC
+.word 0x00000002, 0x00000000, 0x00000001, 0x00000000
+
+glabel D_8023173C_5573CC
+.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

ver/us/asm/data/world/area_kmr/kmr_11/8DB2F0.data.s

@@ -21,4 +21,4 @@ glabel D_80241DAC_8DBEAC
 .word 0x00000001, 0xFFFFFE83, 0x0000000C, 0x00000052
 
 glabel D_80241DBC_8DBEBC
-.word D_80241DA4_8DBEA4, 0x00000000, D_80241DAC_8DBEAC, 0x80245C78, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001F, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000001, func_8024027C_8DA37C, 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, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80245A88, 0x00000043, 0x00000001, ClearDefeatedEnemies, 0x00000046, 0x00000001, 0x80245E88, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF94, 0x00000043, 0x00000001, func_8024023C_8DA33C, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80246EEC, 0x00000043, 0x00000001, func_802CCCB0, 0x00000043, 0x00000003, EnableModel, 0x00000010, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF92, 0x00000043, 0x00000003, EnableModel, 0x00000034, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000024, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000000F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000030, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000031, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000032, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000033, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF90, 0x0000000A, 0x00000002, 0xF8405BAD, 0x00000000, 0x00000044, 0x00000001, D_80241D5C_8DBE5C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007E, 0x00000001, 0x00000008, 0x00000046, 0x00000001, 0x80244284, 0x00000024, 0x00000002, 0xF8405BAD, 0x00000001, 0x00000012, 0x00000000, 0x00000044, 0x00000001, 0x802411C0, 0x00000024, 0x00000002, 0xFE363C80, D_80241D5C_8DBE5C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000044, 0x00000001, 0x802411C0, 0x00000024, 0x00000002, 0xFE363C80, D_80241D5C_8DBE5C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241DBC_8DBEBC, 0x00000047, 0x00000005, D_802411F0_8DB2F0, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000074, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000007C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000008B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF92, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word D_80241DA4_8DBEA4, 0x00000000, D_80241DAC_8DBEAC, 0x80245C78, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001F, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000001, func_8024027C_8DA37C, 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, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80245A88, 0x00000043, 0x00000001, ClearDefeatedEnemies, 0x00000046, 0x00000001, 0x80245E88, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF94, 0x00000043, 0x00000001, kmr_11_UnkFogFunc, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80246EEC, 0x00000043, 0x00000001, func_802CCCB0, 0x00000043, 0x00000003, EnableModel, 0x00000010, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF92, 0x00000043, 0x00000003, EnableModel, 0x00000034, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000024, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000000F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000030, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000031, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000032, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000033, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF90, 0x0000000A, 0x00000002, 0xF8405BAD, 0x00000000, 0x00000044, 0x00000001, D_80241D5C_8DBE5C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007E, 0x00000001, 0x00000008, 0x00000046, 0x00000001, 0x80244284, 0x00000024, 0x00000002, 0xF8405BAD, 0x00000001, 0x00000012, 0x00000000, 0x00000044, 0x00000001, 0x802411C0, 0x00000024, 0x00000002, 0xFE363C80, D_80241D5C_8DBE5C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000044, 0x00000001, 0x802411C0, 0x00000024, 0x00000002, 0xFE363C80, D_80241D5C_8DBE5C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241DBC_8DBEBC, 0x00000047, 0x00000005, D_802411F0_8DB2F0, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000074, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000007C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000008B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF92, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000

ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s

@@ -21,7 +21,7 @@ glabel D_80244390_8DE490
 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF90, 0x0000000A, 0x00000002, 0xF8405BAD, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFE363C80, 0xFE363C82, 0x0000012C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFDCC, 0xFFFFFFC0, 0x00000000, 0x00000012, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0xFFFFFF90, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7DB4, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7DB4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C82, 0xF24C0A80, 0xFE363C83, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x0000010F, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000000, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C82, 0xF24C0A80, 0xFE363C83, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000010F, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000002, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C82, 0xF24C0A80, 0xFE363C83, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000003E7, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, StartBossBattle, 0x00000007, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802446C4_8DE7C4
-.word 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000002, 0x00000001, 0x00000043, 0x00000001, func_8024023C_8DA33C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, func_80240344_8DA444, 0x00000019, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00630003, 0x00630001, 0x00000000, 0x000B00D1, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9280, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A9280, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A9280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00620106, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00620006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00630004, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFE9A, 0xFFFFFF95, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFE74, 0xFFFFFF87, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFE74, 0xFFFFFFA7, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000005, 0x000001C3, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000014, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000000D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000000B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x00000014, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000000D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000000B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000005, 0x000001C4, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A8280, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF90, 0x00000044, 0x00000001, 0x802411C0, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0xF24E6280, 0xF24AB680, 0xF24A5C80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000B00D2, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000002, 0x00000001, 0x00000043, 0x00000001, kmr_11_UnkFogFunc, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, func_80240344_8DA444, 0x00000019, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00630003, 0x00630001, 0x00000000, 0x000B00D1, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9280, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A9280, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A9280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00620106, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00620006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00630004, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFE9A, 0xFFFFFF95, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFE74, 0xFFFFFF87, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFE74, 0xFFFFFFA7, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000005, 0x000001C3, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000014, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000000D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000000B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x00000014, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000000D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000000B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000005, 0x000001C4, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A8280, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF90, 0x00000044, 0x00000001, 0x802411C0, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0xF24E6280, 0xF24AB680, 0xF24A5C80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000B00D2, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244BA8_8DECA8
 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802446C4_8DE7C4, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A9280, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFC46, 0xFFFFFFCE, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_pra/pra_01/D4E500.data.s

@@ -45,4 +45,4 @@ glabel D_80241A34_D4EA74
 .word 0x00000047, 0x00000005, D_802417B4_D4E7F4, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241810_D4E850, 0x00080000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024186C_D4E8AC, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241950_D4E990, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241AB4_D4EAF4
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241A34_D4EA74, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024179C_D4E7DC, 0x00000024, 0x00000002, 0xFE363C83, D_802417A8_D4E7E8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024177C_D4E7BC, 0x00000024, 0x00000002, 0xFE363C83, D_80241784_D4E7C4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802861B0_7E7030, 0x00000044, 0x00000001, D_80241A34_D4EA74, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024179C_D4E7DC, 0x00000024, 0x00000002, 0xFE363C83, D_802417A8_D4E7E8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024178C_D4E7CC, 0x00000024, 0x00000002, 0xFE363C83, D_80241794_D4E7D4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802861B0_7E7030, 0x00000044, 0x00000001, D_80241A34_D4EA74, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, D_80241A34_D4EA74, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_80241A34_D4EA74, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000002B, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406346, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000058, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242F60, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242F80, 0x00000046, 0x00000001, 0x80241440, 0x00000043, 0x00000001, func_80240F20_D4DF60, 0x00000043, 0x00000001, func_80240F60_D4DFA0, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000044, 0x00000001, D_80241678_D4E6B8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_802415D0_D4E610, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000010, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000018, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000021, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001A, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001D, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000013, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000017, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000024, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000019, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001F, 0x00000008, 0x00000044, 0x00000001, D_80241AB4_D4EAF4, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000008, 0x00000001, 0x00000041, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241A34_D4EA74, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024179C_D4E7DC, 0x00000024, 0x00000002, 0xFE363C83, D_802417A8_D4E7E8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024177C_D4E7BC, 0x00000024, 0x00000002, 0xFE363C83, D_80241784_D4E7C4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802861B0_7E7030, 0x00000044, 0x00000001, D_80241A34_D4EA74, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8406152, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024179C_D4E7DC, 0x00000024, 0x00000002, 0xFE363C83, D_802417A8_D4E7E8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, D_8024178C_D4E7CC, 0x00000024, 0x00000002, 0xFE363C83, D_80241794_D4E7D4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802861B0_7E7030, 0x00000044, 0x00000001, D_80241A34_D4EA74, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, D_80241A34_D4EA74, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_80241A34_D4EA74, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000002B, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406346, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000058, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242F60, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242F80, 0x00000046, 0x00000001, 0x80241440, 0x00000043, 0x00000001, pra_01_UnkFogFunc, 0x00000043, 0x00000001, func_80240F60_D4DFA0, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000044, 0x00000001, D_80241678_D4E6B8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_802415D0_D4E610, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000010, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000018, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000021, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001A, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001D, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000013, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000017, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000024, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000019, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001F, 0x00000008, 0x00000044, 0x00000001, D_80241AB4_D4EAF4, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000008, 0x00000001, 0x00000041, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000

ver/us/asm/nonmatchings/17D6A0/func_80250818.s

@@ -192,7 +192,7 @@ glabel L80250AA0_17F380
 /* 17F394 80250AB4 2626000E */   addiu    $a2, $s1, 0xe
 /* 17F398 80250AB8 86040000 */  lh        $a0, ($s0)
 /* 17F39C 80250ABC 3C053F19 */  lui       $a1, 0x3f19
-/* 17F3A0 80250AC0 0C051308 */  jal       func_80144C20
+/* 17F3A0 80250AC0 0C051308 */  jal       set_hud_element_scale
 /* 17F3A4 80250AC4 34A5999A */   ori      $a1, $a1, 0x999a
 /* 17F3A8 80250AC8 86040000 */  lh        $a0, ($s0)
 /* 17F3AC 80250ACC 0C0513AC */  jal       icon_set_opacity
@@ -242,7 +242,7 @@ glabel L80250B58_17F438
 /* 17F44C 80250B6C 2626000D */   addiu    $a2, $s1, 0xd
 /* 17F450 80250B70 86040000 */  lh        $a0, ($s0)
 /* 17F454 80250B74 3C053F19 */  lui       $a1, 0x3f19
-/* 17F458 80250B78 0C051308 */  jal       func_80144C20
+/* 17F458 80250B78 0C051308 */  jal       set_hud_element_scale
 /* 17F45C 80250B7C 34A5999A */   ori      $a1, $a1, 0x999a
 /* 17F460 80250B80 86040000 */  lh        $a0, ($s0)
 /* 17F464 80250B84 0C0513AC */  jal       icon_set_opacity
@@ -268,7 +268,7 @@ glabel L80250BB0_17F490
 /* 17F4B0 80250BD0 4481A000 */  mtc1      $at, $f20
 /* 17F4B4 80250BD4 86040000 */  lh        $a0, ($s0)
 /* 17F4B8 80250BD8 4405A000 */  mfc1      $a1, $f20
-/* 17F4BC 80250BDC 0C051308 */  jal       func_80144C20
+/* 17F4BC 80250BDC 0C051308 */  jal       set_hud_element_scale
 /* 17F4C0 80250BE0 00000000 */   nop
 /* 17F4C4 80250BE4 86040000 */  lh        $a0, ($s0)
 /* 17F4C8 80250BE8 0C0513AC */  jal       icon_set_opacity
@@ -284,7 +284,7 @@ glabel L80250BB0_17F490
 /* 17F4F0 80250C10 0220302D */   daddu    $a2, $s1, $zero
 /* 17F4F4 80250C14 86040000 */  lh        $a0, ($s0)
 /* 17F4F8 80250C18 4405A000 */  mfc1      $a1, $f20
-/* 17F4FC 80250C1C 0C051308 */  jal       func_80144C20
+/* 17F4FC 80250C1C 0C051308 */  jal       set_hud_element_scale
 /* 17F500 80250C20 00000000 */   nop
 /* 17F504 80250C24 86040000 */  lh        $a0, ($s0)
 /* 17F508 80250C28 0C0513AC */  jal       icon_set_opacity
@@ -329,7 +329,7 @@ glabel L80250C9C_17F57C
 /* 17F59C 80250CBC 4481A000 */  mtc1      $at, $f20
 /* 17F5A0 80250CC0 86040000 */  lh        $a0, ($s0)
 /* 17F5A4 80250CC4 4405A000 */  mfc1      $a1, $f20
-/* 17F5A8 80250CC8 0C051308 */  jal       func_80144C20
+/* 17F5A8 80250CC8 0C051308 */  jal       set_hud_element_scale
 /* 17F5AC 80250CCC 00000000 */   nop
 /* 17F5B0 80250CD0 86040000 */  lh        $a0, ($s0)
 /* 17F5B4 80250CD4 0C0513AC */  jal       icon_set_opacity
@@ -379,7 +379,7 @@ glabel L80250D60_17F640
 /* 17F658 80250D78 86040000 */  lh        $a0, ($s0)
 /* 17F65C 80250D7C 3C053F19 */  lui       $a1, 0x3f19
 /* 17F660 80250D80 34A5999A */  ori       $a1, $a1, 0x999a
-/* 17F664 80250D84 0C051308 */  jal       func_80144C20
+/* 17F664 80250D84 0C051308 */  jal       set_hud_element_scale
 /* 17F668 80250D88 2631000F */   addiu    $s1, $s1, 0xf
 /* 17F66C 80250D8C 86040000 */  lh        $a0, ($s0)
 /* 17F670 80250D90 0C0513AC */  jal       icon_set_opacity
@@ -398,7 +398,7 @@ glabel L80250D60_17F640
 /* 17F6A4 80250DC4 4481A000 */  mtc1      $at, $f20
 /* 17F6A8 80250DC8 86040000 */  lh        $a0, ($s0)
 /* 17F6AC 80250DCC 4405A000 */  mfc1      $a1, $f20
-/* 17F6B0 80250DD0 0C051308 */  jal       func_80144C20
+/* 17F6B0 80250DD0 0C051308 */  jal       set_hud_element_scale
 /* 17F6B4 80250DD4 00000000 */   nop
 /* 17F6B8 80250DD8 86040000 */  lh        $a0, ($s0)
 /* 17F6BC 80250DDC 0C0513AC */  jal       icon_set_opacity
@@ -416,7 +416,7 @@ glabel L80250D60_17F640
 /* 17F6E8 80250E08 00000000 */   nop
 /* 17F6EC 80250E0C 86040000 */  lh        $a0, ($s0)
 /* 17F6F0 80250E10 3C053F4C */  lui       $a1, 0x3f4c
-/* 17F6F4 80250E14 0C051308 */  jal       func_80144C20
+/* 17F6F4 80250E14 0C051308 */  jal       set_hud_element_scale
 /* 17F6F8 80250E18 34A5CCCD */   ori      $a1, $a1, 0xcccd
 /* 17F6FC 80250E1C 86040000 */  lh        $a0, ($s0)
 /* 17F700 80250E20 0C0513AC */  jal       icon_set_opacity
@@ -438,7 +438,7 @@ glabel L80250E3C_17F71C
 /* 17F738 80250E58 86040000 */  lh        $a0, ($s0)
 /* 17F73C 80250E5C 3C053F00 */  lui       $a1, 0x3f00
 .L80250E60:
-/* 17F740 80250E60 0C051308 */  jal       func_80144C20
+/* 17F740 80250E60 0C051308 */  jal       set_hud_element_scale
 /* 17F744 80250E64 00000000 */   nop
 .L80250E68:
 /* 17F748 80250E68 86040000 */  lh        $a0, ($s0)

ver/us/asm/nonmatchings/18C790/func_8025E190.s

@@ -844,7 +844,7 @@ glabel L8025E6A0_18CF80
 /* 18D6FC 8025EE1C 0C05128B */  jal       clear_icon_flags
 /* 18D700 8025EE20 24050002 */   addiu    $a1, $zero, 2
 /* 18D704 8025EE24 3C053F00 */  lui       $a1, 0x3f00
-/* 18D708 8025EE28 0C051308 */  jal       func_80144C20
+/* 18D708 8025EE28 0C051308 */  jal       set_hud_element_scale
 /* 18D70C 8025EE2C 0280202D */   daddu    $a0, $s4, $zero
 /* 18D710 8025EE30 0280202D */  daddu     $a0, $s4, $zero
 /* 18D714 8025EE34 27A50028 */  addiu     $a1, $sp, 0x28
@@ -1090,7 +1090,7 @@ glabel L8025E6A0_18CF80
 /* 18DABC 8025F1DC 0C05128B */  jal       clear_icon_flags
 /* 18DAC0 8025F1E0 24050002 */   addiu    $a1, $zero, 2
 /* 18DAC4 8025F1E4 3C053F00 */  lui       $a1, 0x3f00
-/* 18DAC8 8025F1E8 0C051308 */  jal       func_80144C20
+/* 18DAC8 8025F1E8 0C051308 */  jal       set_hud_element_scale
 /* 18DACC 8025F1EC 0280202D */   daddu    $a0, $s4, $zero
 /* 18DAD0 8025F1F0 0280202D */  daddu     $a0, $s4, $zero
 /* 18DAD4 8025F1F4 27A50028 */  addiu     $a1, $sp, 0x28

ver/us/asm/nonmatchings/415D90/draw_battle_wheel.s

@@ -261,7 +261,7 @@ glabel L802A1DB4_416B44
 /* 416D84 802A1FF4 3C053FCC */  lui       $a1, 0x3fcc
 /* 416D88 802A1FF8 34A5CCCD */  ori       $a1, $a1, 0xcccd
 .L802A1FFC:
-/* 416D8C 802A1FFC 0C051308 */  jal       func_80144C20
+/* 416D8C 802A1FFC 0C051308 */  jal       set_hud_element_scale
 /* 416D90 802A2000 0260202D */   daddu    $a0, $s3, $zero
 /* 416D94 802A2004 0C05108E */  jal       func_80144238
 /* 416D98 802A2008 0260202D */   daddu    $a0, $s3, $zero
@@ -316,7 +316,7 @@ glabel L802A1DB4_416B44
 /* 416E5C 802A20CC 00452823 */   subu     $a1, $v0, $a1
 /* 416E60 802A20D0 3C053F99 */  lui       $a1, 0x3f99
 /* 416E64 802A20D4 34A5999A */  ori       $a1, $a1, 0x999a
-/* 416E68 802A20D8 0C051308 */  jal       func_80144C20
+/* 416E68 802A20D8 0C051308 */  jal       set_hud_element_scale
 /* 416E6C 802A20DC 0260202D */   daddu    $a0, $s3, $zero
 /* 416E70 802A20E0 16E00005 */  bnez      $s7, .L802A20F8
 /* 416E74 802A20E4 0260202D */   daddu    $a0, $s3, $zero
@@ -396,7 +396,7 @@ glabel L802A1DB4_416B44
 /* 416F88 802A21F8 4405C000 */  mfc1      $a1, $f24
 /* 416F8C 802A21FC 3C013F80 */  lui       $at, 0x3f80
 /* 416F90 802A2200 4481B000 */  mtc1      $at, $f22
-/* 416F94 802A2204 0C051308 */  jal       func_80144C20
+/* 416F94 802A2204 0C051308 */  jal       set_hud_element_scale
 /* 416F98 802A2208 0260202D */   daddu    $a0, $s3, $zero
 /* 416F9C 802A220C 4405B000 */  mfc1      $a1, $f22
 /* 416FA0 802A2210 3C063FE6 */  lui       $a2, 0x3fe6
@@ -453,7 +453,7 @@ glabel L802A1DB4_416B44
 /* 41706C 802A22DC 2406FFEC */   addiu    $a2, $zero, -0x14
 /* 417070 802A22E0 3C053F73 */  lui       $a1, 0x3f73
 /* 417074 802A22E4 34A53333 */  ori       $a1, $a1, 0x3333
-/* 417078 802A22E8 0C051308 */  jal       func_80144C20
+/* 417078 802A22E8 0C051308 */  jal       set_hud_element_scale
 /* 41707C 802A22EC 0260202D */   daddu    $a0, $s3, $zero
 /* 417080 802A22F0 001511C0 */  sll       $v0, $s5, 7
 /* 417084 802A22F4 00551023 */  subu      $v0, $v0, $s5
@@ -489,7 +489,7 @@ glabel L802A1DB4_416B44
 /* 4170FC 802A236C 0C051261 */  jal       set_icon_render_pos
 /* 417100 802A2370 24C600D4 */   addiu    $a2, $a2, 0xd4
 /* 417104 802A2374 4405B000 */  mfc1      $a1, $f22
-/* 417108 802A2378 0C051308 */  jal       func_80144C20
+/* 417108 802A2378 0C051308 */  jal       set_hud_element_scale
 /* 41710C 802A237C 0260202D */   daddu    $a0, $s3, $zero
 /* 417110 802A2380 0C05108E */  jal       func_80144238
 /* 417114 802A2384 0260202D */   daddu    $a0, $s3, $zero

ver/us/asm/nonmatchings/415D90/func_802A11B0.s

@@ -117,7 +117,7 @@ glabel func_802A11B0
 /* 4160EC 802A135C 24050002 */   addiu    $a1, $zero, 2
 /* 4160F0 802A1360 0220202D */  daddu     $a0, $s1, $zero
 /* 4160F4 802A1364 3C053F40 */  lui       $a1, 0x3f40
-/* 4160F8 802A1368 0C051308 */  jal       func_80144C20
+/* 4160F8 802A1368 0C051308 */  jal       set_hud_element_scale
 /* 4160FC 802A136C 26520004 */   addiu    $s2, $s2, 4
 /* 416100 802A1370 3C048029 */  lui       $a0, %hi(D_80292C00)
 /* 416104 802A1374 24842C00 */  addiu     $a0, $a0, %lo(D_80292C00)
@@ -528,7 +528,7 @@ glabel func_802A11B0
 /* 416740 802A19B0 240500B4 */   addiu    $a1, $zero, 0xb4
 /* 416744 802A19B4 3C053F59 */  lui       $a1, 0x3f59
 /* 416748 802A19B8 34A5999A */  ori       $a1, $a1, 0x999a
-/* 41674C 802A19BC 0C051308 */  jal       func_80144C20
+/* 41674C 802A19BC 0C051308 */  jal       set_hud_element_scale
 /* 416750 802A19C0 0220202D */   daddu    $a0, $s1, $zero
 /* 416754 802A19C4 0220202D */  daddu     $a0, $s1, $zero
 /* 416758 802A19C8 0C05128B */  jal       clear_icon_flags