diff --git a/include/common_structs.h b/include/common_structs.h index bc1ad09411..f8becb3c93 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1965,7 +1965,7 @@ typedef struct MenuPanel { /* 0x0C */ UNK_FUN_PTR(fpInit); /* 0x10 */ UNK_FUN_PTR(fpHandleInput); /* 0x14 */ UNK_FUN_PTR(fpUpdate); - /* 0x18 */ UNK_FUN_PTR(fpCleanup); + /* 0x18 */ void(*fpCleanup)(struct MenuPanel*); } MenuPanel; // size = 0x1C typedef struct WindowBackground { diff --git a/include/effects.h b/include/effects.h index 88693a8e2e..1c1a7f2c6d 100644 --- a/include/effects.h +++ b/include/effects.h @@ -64,6 +64,60 @@ typedef struct StarSpiritEffect { /* 0x54 */ struct StarSpiritEffectUnkStruct* unk_54; } StarSpiritEffect; // size = 0x58 +typedef struct Effect1 { + /* 0x00 */ s16 unk_00; + /* 0x02 */ s16 unk_02; + /* 0x04 */ s16 unk_04; + /* 0x06 */ s16 unk_06; + /* 0x08 */ s32 unk_08; + /* 0x0C */ f32 x; + /* 0x10 */ f32 y; + /* 0x14 */ f32 z; + /* 0x18 */ f32 partX; + /* 0x1C */ f32 partY; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ char unk_28[0x4]; +} Effect1; // size = 0x2C + +typedef struct Effect6 { + /* 0x00 */ u16 type; + /* 0x02 */ char unk_02[0x2]; + /* 0x04 */ f32 x; + /* 0x08 */ f32 y; + /* 0x0C */ f32 z; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ f32 unk_2C; + /* 0x30 */ f32 unk_30; + /* 0x34 */ f32 unk_34; + /* 0x38 */ s32 unk_38; + /* 0x3C */ s32 unk_3C; + /* 0x40 */ s32 unk_40; +} Effect6; // size = 0x44 + +typedef struct Effect7 { + /* 0x00 */ s32 unk_00; + /* 0x04 */ u16 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ char unk_14[0x44]; + /* 0x58 */ f32 unk_58; + /* 0x5C */ f32 unk_5C; + /* 0x60 */ f32 unk_60; + /* 0x64 */ f32 unk_64; + /* 0x68 */ f32 unk_68; + /* 0x6C */ s32 unk_6C; + /* 0x70 */ s32 unk_70; + /* 0x74 */ s32 unk_74; +} Effect7; // size = 0x78 + // Used by effects 8 and 9 (TODO: better name) typedef struct Effect8 { /* 0x00 */ s32 unk_00; @@ -168,6 +222,108 @@ typedef struct Effect12 { /* 0x94 */ f32 unk_94; } Effect12; // size = 0x98 +typedef struct Effect13 { + /* 0x00 */ s32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ f32 unk_2C; + /* 0x30 */ f32 unk_30; + /* 0x34 */ s32 unk_34; + /* 0x38 */ s32 unk_38; + /* 0x3C */ s32 unk_3C; + /* 0x40 */ s32 unk_40; + /* 0x44 */ s32 unk_44; +} Effect13; // size = 0x48 + +typedef struct Effect14 { + /* 0x00 */ f32 xPos; + /* 0x04 */ f32 yPos; + /* 0x08 */ f32 zPos; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ s32 unk_28; +} Effect14; // size = 0x2C + +typedef struct Effect15 { + /* 0x000 */ s32 unk_00; + /* 0x004 */ f32 unk_04; + /* 0x008 */ f32 unk_08; + /* 0x00C */ f32 unk_0C; + /* 0x010 */ f32 unk_10; + /* 0x014 */ f32 unk_14; + /* 0x018 */ f32 unk_18; + /* 0x01C */ f32 unk_1C; + /* 0x020 */ f32 unk_20; + /* 0x024 */ f32 unk_24; + /* 0x028 */ s32 unk_28; + /* 0x02C */ f32 unk_2C; + /* 0x030 */ s32 unk_30; + /* 0x034 */ f32 unk_34; + /* 0x038 */ s32 unk_38; + /* 0x03C */ s32 unk_3C; + /* 0x040 */ Mtx unk_40[8]; + /* 0x240 */ f32 unk_240; + /* 0x244 */ s32 unk_244; + /* 0x248 */ s32 unk_248; + /* 0x24C */ s32 unk_24C; +} Effect15; // size = 0x250 + +typedef struct Effect16 { + /* 0x00 */ s32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ s32 unk_2C; + /* 0x30 */ s32 unk_30; + /* 0x34 */ s32 unk_34; + /* 0x38 */ s32 unk_38; + /* 0x3C */ s32 unk_3C; +} Effect16; // size = 0x40 + +typedef struct Effect73 { + /* 0x00 */ s32 unk_00; + /* 0x04 */ s32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ s32 unk_14; + /* 0x18 */ s32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ s32 unk_20; +} Effect73; // size = 0x24 + +typedef struct Effect75 { + /* 0x00 */ s32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ s32 unk_1C; + /* 0x20 */ s32 unk_20; +} Effect75; // size = 0x24 + // TODO figure out what this actually is // playFX_4E invokes gEffectTable[78]'s entryPoint function // playFX_6F invokes gEffectTable[111]'s entryPoint function @@ -219,8 +375,8 @@ typedef struct EffectInstance { /* 0x00 */ s32 flags; /* 0x04 */ s32 effectIndex; /* 0x08 */ s32 numParts; - /* 0x0C */ void* data; // often but not always EffectInstanceData - /* 0x10 */ struct EffectGraphics* effect; + /* 0x0C */ Effect16* data; // often but not always EffectInstanceData + /* 0x10 */ struct EffectGraphics* graphics; } EffectInstance; // size = 0x14 typedef struct EffectBlueprint { diff --git a/include/effects_internal.h b/include/effects_internal.h index baa9c0c4ed..4cddc4fa29 100644 --- a/include/effects_internal.h +++ b/include/effects_internal.h @@ -10,16 +10,27 @@ void shim_remove_effect(EffectInstance*); s32 shim_rand_int(s32); void* shim_general_heap_malloc(s32 size); RenderTask* shim_queue_render_task(RenderTask* task); +float shim_sqrtf(float value); +f32 shim_atan2(f32 startX, f32 startZ, f32 endX, f32 endZ); f32 shim_sin_deg(f32 x); f32 shim_cos_deg(f32 x); f32 shim_clamp_angle(f32 theta); +void shim_get_background_color_blend(u8* r, u8* g, u8* b, u8* a); void shim_guMtxF2L(float mf[4][4], Mtx *m); void shim_guMtxCatF(float m[4][4], float n[4][4], float r[4][4]); void shim_guScaleF(float mf[4][4], float x, float y, float z); void shim_guRotateF(float mf[4][4], float a, float x, float y, float z); +void shim_guTranslate(Mtx *m, float x, float y, float z); void shim_guTranslateF(float mf[4][4], float x, float y, float z); void shim_guPositionF(float mf[4][4], float r, float p, float h, float s, float x, float y, float z); void shim_mem_clear(void* data, s32 numBytes); void shim_transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outS); +s32 shim_load_effect(s32 effectIndex); + +s32 shim_npc_raycast_down_sides(s32, f32*, f32*, f32*, f32*); +void shim_sfx_play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); + +void fx_6_main(s32 type, f32 x, f32 y, f32 z, f32 arg4); + #endif diff --git a/include/filemenu.h b/include/filemenu.h index 178f84e78c..f9a07a8bdd 100644 --- a/include/filemenu.h +++ b/include/filemenu.h @@ -14,7 +14,7 @@ extern BSS s32 filemenu_heldButtons; extern BSS s32 filemenu_8024C090; extern BSS s32 filemenu_loadedFileIdx; extern BSS s32 filemenu_8024C098[2]; -extern BSS s32 filemenu_cursorHudElemID; +extern BSS s32 filemenu_cursorHudElemID[1]; extern BSS s32 filemenu_8024C0A4[3]; extern BSS s32 filemenu_hudElemIDs[20]; extern BSS s32 filemenu_8024C100[8]; diff --git a/include/variables.h b/include/variables.h index c9470bab58..329f2bcc80 100644 --- a/include/variables.h +++ b/include/variables.h @@ -79,7 +79,7 @@ extern s8 D_800A0900; extern f32 D_800F7B60[]; extern s16 D_800F7B80; extern EncounterStatus gCurrentEncounter; -extern s8* D_801512F0; +extern u8* D_801512F0; extern s16 D_80151308; extern s32 D_80151310; @@ -378,6 +378,9 @@ extern s32 D_8029C890[12][5]; // Heap? extern s32 D_8038F800; extern s32 D_803B5000; + +extern HeapNode heap_collisionHead; +extern HeapNode heap_generalHead; extern HeapNode heap_battleHead; extern s32 bMarioIdleAnims[]; diff --git a/src/101b90_len_8f0.c b/src/101b90_len_8f0.c index 7d66eefa11..88a4b6d661 100644 --- a/src/101b90_len_8f0.c +++ b/src/101b90_len_8f0.c @@ -1,4 +1,7 @@ #include "common.h" +#include "sprite.h" + +extern s32 spr_allocateBtlComponentsOnWorldHeap; typedef struct UnkSpr10 { /* 0x00 */ s32 unk_00; diff --git a/src/163400.c b/src/163400.c index ca1e918cae..fe3b67536b 100644 --- a/src/163400.c +++ b/src/163400.c @@ -62,7 +62,7 @@ BSS s32 filemenu_heldButtons; BSS s32 filemenu_8024C090; BSS s32 filemenu_loadedFileIdx; BSS s32 filemenu_8024C098[2]; -BSS s32 filemenu_cursorHudElemID; +BSS s32 filemenu_cursorHudElemID[1]; BSS s32 filemenu_8024C0A4[3]; BSS s32 filemenu_hudElemIDs[20]; BSS s32 filemenu_8024C100[8]; @@ -132,7 +132,7 @@ void filemenu_update_cursor(void) { D_80249B94 += xDelta; D_80249B98 += yDelta; - if (filemenu_cursorGoalAlpha == 0) { + if (filemenu_cursorGoalAlpha == 0) { D_80249B9C -= 128; if (D_80249B9C < 0) { D_80249B9C = 0; @@ -143,7 +143,7 @@ void filemenu_update_cursor(void) { D_80249B9C = 255; } } - + for (i = 0x2C; i < ARRAY_COUNT(gWindows); i++) { Window* window = &gWindows[i]; s8 parent = window->parent; @@ -168,7 +168,7 @@ void filemenu_update_cursor(void) { D_80249B98 = D_80249BA4; } } - } + } if (D_80249BB8 == 0) { filemenu_cursorGoalAlpha = filemenu_cursorGoalAlpha2; } @@ -539,9 +539,9 @@ void filemenu_draw_cursor(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 if (temp_a1 > 255) { temp_a1 = 255; } - set_hud_element_alpha(filemenu_cursorHudElemID, temp_a1); - set_hud_element_render_pos(filemenu_cursorHudElemID, baseX + D_80249B94, baseY + D_80249B98); - draw_hud_element_3(filemenu_cursorHudElemID); + set_hud_element_alpha(filemenu_cursorHudElemID[0], temp_a1); + set_hud_element_render_pos(filemenu_cursorHudElemID[0], baseX + D_80249B94, baseY + D_80249B98); + draw_hud_element_3(filemenu_cursorHudElemID[0]); } } @@ -549,6 +549,32 @@ INCLUDE_ASM(s32, "163400", filemenu_draw_contents_copy_arrow); INCLUDE_ASM(void, "163400", filemenu_init); -INCLUDE_ASM(s32, "163400", filemenu_cleanup); +// TODO bad match, look into +void filemenu_cleanup(void) { + MenuPanel** panelIt; + s32 i; + + for (i = 0; i < ARRAY_COUNT(filemenu_cursorHudElemID); i++) { + free_hud_element(filemenu_cursorHudElemID[i]); + } + + panelIt = filemenu_menus; + for (i = 0; i < ARRAY_COUNT(filemenu_menus); i++) { + if ((*panelIt)->unk_00.c.initialized) { + if ((*panelIt)->fpCleanup != NULL) { + (*panelIt)->fpCleanup(*panelIt); + } + } + panelIt++; + } + + for (i = 0x2C; i < ARRAY_COUNT(gWindows); i++) { + set_window_update(i, 2); + } + + set_window_update(0x18, 2); + set_window_update(0x17, 2); + func_80244BC4(); +} INCLUDE_ASM(s32, "163400", func_80244BC4); diff --git a/src/ED0310.c b/src/ED0310.c index 82c6cee60e..b70ecafb40 100644 --- a/src/ED0310.c +++ b/src/ED0310.c @@ -9,7 +9,7 @@ extern f32 D_8024365C_ED364C[]; #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "ED0310", func_802404D0_ED04C0); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/EDEA00.c b/src/EDEA00.c index 854e965531..b0c0c7c299 100644 --- a/src/EDEA00.c +++ b/src/EDEA00.c @@ -11,7 +11,7 @@ extern f32 D_802441DC_EE2B9C[]; #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "EDEA00", func_80240374_EDED34); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/EE70C0.c b/src/EE70C0.c index a0964c3436..a4050b6a34 100644 --- a/src/EE70C0.c +++ b/src/EE70C0.c @@ -5,13 +5,13 @@ #define NAMESPACE EE70C0 -extern s32 D_802453E0_EEB990[]; +extern const s32 D_802453E0_EEB990[]; extern f32 D_802444F0_EEAAA0[]; INCLUDE_ASM(s32, "EE70C0", func_80240B10_EE70C0); //#include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "EE70C0", func_80240CC0_EE7270); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" @@ -65,3 +65,8 @@ ApiStatus func_802422EC_EE889C(Evt* script, s32 isInitialCall) { } return ApiStatus_DONE2; } + +extern EE65B0_UnkTexturePanFunc; + +// TODO sort out this mess +const s32 D_802453E0_EEB990[] = { 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, &EE65B0_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80200000, 0x0019011F, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80241760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240120, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802412C0, 0x00000046, 0x00000001, 0x80241300, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x802404D8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x8024017C, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, 0x802413B0, 0x00000046, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000024, 0x00000002, 0xFE363C84, 0x00000005, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000041A, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A8A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0009, 0x00CB0009, 0x00000205, 0x001100C3, 0x00000043, 0x00000003, 0x802DB654, 0x0000000A, 0x00CB0009, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, 0x802D78AC, 0x80241768, 0x00000009, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB3C8, 0x0000000B, 0x00000030, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFE2, 0x0000001E, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x0000001E, 0xFFFFFFE2, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DF124, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x00000113, 0xFE363C82, 0x0000001E, 0x00000045, 0x00000002, 0x8024032C, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A6, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, 0x802DC5C0, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x000001C2, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000032, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009B, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000032, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009C, 0x00000018, 0x00000001, 0x00000039, 0x0000000A, 0x00000002, 0xF8406102, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009D, 0x00000024, 0x00000002, 0xF8406102, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009E, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009F, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DB4EC, 0x0000000A, 0x00000040, 0x00000028, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000044, 0x00000001, 0x8024032C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000024, 0x00000002, 0xF97188A6, 0x00000000, 0x00000044, 0x00000001, 0x8024094C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x0000000B, 0x00CB0002, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000A, 0x00000003, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000B, 0x00000003, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000A, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000B, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x0000010E, 0xFFFFFFFB, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x000001C2, 0xFFFFFFFB, 0x00000043, 0x00000003, 0x80048F68, 0xFFFFFFFF, 0x8024079C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00400D01, 0x80240CD0, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x0000000B, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00008F01, 0x80240DB4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x00000002, 0x80240EE0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF84060F9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802CCF00, 0xFFFFFF4C, 0x00000000, 0xFFFFFFEE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802412E0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7CE7, 0x0000000D, 0xF24A7D80, 0x00000010, 0xF24A7E1A, 0x00000013, 0xF24A7EB4, 0x00000016, 0xF24A7F4D, 0x00000019, 0xF24A7EB4, 0x00000018, 0xF24A7E1A, 0x00000019, 0xF24A7D80, 0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0x80241360, 0x00000005, 0x00000001, 0x0000000A, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ADE80, 0xF24A5680, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xF249B280, 0xF24ADE80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF4C, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF42, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000004, 0x802D7AC0, 0x0000000B, 0x00000187, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0xFFFFFFCE, 0x00000078, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x666C6F5F, 0x31330000, 0x666C6F5F, 0x30300000, }; diff --git a/src/EEDF50.c b/src/EEDF50.c index 768f481ef3..2d8c6f5159 100644 --- a/src/EEDF50.c +++ b/src/EEDF50.c @@ -9,7 +9,7 @@ extern f32 D_80244070_EF1170[]; #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "EEDF50", func_80241000_EEE100); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/EF2680.c b/src/EF2680.c index f9b408a9ae..710d67decb 100644 --- a/src/EF2680.c +++ b/src/EF2680.c @@ -7,7 +7,7 @@ #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "EF2680", func_80240220_EF2830); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/effects.c b/src/effects.c index ffc0d064b9..d7a392f43d 100644 --- a/src/effects.c +++ b/src/effects.c @@ -340,16 +340,16 @@ void update_effects(void) { EffectInstance* effectInstance = gEffectInstances[i]; if (effectInstance != NULL && (effectInstance->flags & EFFECT_INSTANCE_FLAGS_1)) { - effectInstance->effect->flags &= ~FX_GRAPHICS_FLAGS_2; + effectInstance->graphics->flags &= ~FX_GRAPHICS_FLAGS_2; if (gGameStatusPtr->isBattle) { if (effectInstance->flags & EFFECT_INSTANCE_FLAGS_4) { - effectInstance->effect->update(effectInstance); + effectInstance->graphics->update(effectInstance); effectInstance->flags |= EFFECT_INSTANCE_FLAGS_8; } } else { if (!(effectInstance->flags & EFFECT_INSTANCE_FLAGS_4)) { - effectInstance->effect->update(effectInstance); + effectInstance->graphics->update(effectInstance); effectInstance->flags |= EFFECT_INSTANCE_FLAGS_8; } } @@ -382,11 +382,11 @@ void render_effects_world(void) { if (gEffectInstances[i] != NULL && gEffectInstances[i]->flags & 1 && gEffectInstances[i]->flags & 8) { if (gGameStatusPtr->isBattle) { if (gEffectInstances[i]->flags & 4) { - gEffectInstances[i]->effect->renderWorld(gEffectInstances[i]); + gEffectInstances[i]->graphics->renderWorld(gEffectInstances[i]); } } else { if (!(gEffectInstances[i]->flags & 4)) { - gEffectInstances[i]->effect->renderWorld(gEffectInstances[i]); + gEffectInstances[i]->graphics->renderWorld(gEffectInstances[i]); } } } @@ -413,7 +413,7 @@ void render_effects_UI(void) { continue; } - renderUI = effectInstance->effect->renderUI; + renderUI = effectInstance->graphics->renderUI; if (renderUI != stub_effect_delegate) { if (cond) { Camera* camera = &gCameras[gCurrentCameraID]; @@ -498,7 +498,7 @@ EffectInstance* create_effect_instance(EffectBlueprint* effectBp) { } curEffect->instanceCounter++; - newEffectInst->effect = curEffect; + newEffectInst->graphics = curEffect; if (effectBp->init != NULL) { effectBp->init(newEffectInst); diff --git a/src/effects/effect_1.c b/src/effects/effect_1.c index a9f01bcce4..4aa09925ef 100644 --- a/src/effects/effect_1.c +++ b/src/effects/effect_1.c @@ -1,33 +1,27 @@ #include "common.h" #include "effects_internal.h" -typedef struct Effect1 { - /* 0x00 */ s16 unk_00; - /* 0x02 */ s16 unk_02; - /* 0x04 */ s16 unk_04; - /* 0x06 */ s16 unk_06; - /* 0x08 */ s32 unk_08; - /* 0x0C */ f32 x; - /* 0x10 */ f32 y; - /* 0x14 */ f32 z; - /* 0x18 */ f32 partX; - /* 0x1C */ f32 partY; - /* 0x20 */ f32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ char unk_28[0x4]; -} Effect1; // size = 0x2C - static f32 D_E0002760[10] = { 10.0f, 40.0f, 80.0f, 170.0f, 140.0f, 100.0f, 25.0f, 155.0f, 60.0f, 120.0f }; static f32 D_E0002788[10] = { 2.2f, 2.7f, 3.0f, 2.2f, 2.7f, 3.0f, 1.9f, 1.9f, 1.5f, 1.5f }; static f32 sPartScales[10] = { 1.4f, 1.3f, 1.2f, 1.3f, 1.4f, 1.3f, 1.6f, 1.6f, 1.6f, 1.6f }; static f32 sPartYaws[10] = { 0.0f, 234.0f, 468.0f, 702.0f, 936.0f, 1260.0f, 1404.0f, 1638.0f, 1902.0f, 1976.0f }; -static s32 sDlists[7] = { 0x09000FA0, 0x09001060, 0x09001120, 0x090011E0, 0x090012A0, 0x09001360, 0x09001420 }; +extern Gfx D_09000FA0[]; +extern Gfx D_09001060[]; +extern Gfx D_09001120[]; +extern Gfx D_090011E0[]; +extern Gfx D_090012A0[]; +extern Gfx D_09001360[]; +extern Gfx D_09001420[]; + +static Gfx* sDlists[7] = { + D_09000FA0, D_09001060, D_09001120, D_090011E0, D_090012A0, D_09001360, D_09001420 +}; void fx_1_init(EffectInstance* effect); void fx_1_update(EffectInstance* effect); void fx_1_render(EffectInstance* effect); -void fx_1_appendGfx(EffectInstance* effect); +void fx_1_appendGfx(void* effect); void fx_1_main(f32 x, f32 y, f32 z) { EffectBlueprint bp; @@ -124,35 +118,36 @@ void fx_1_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } -void fx_1_appendGfx(EffectInstance* effect) { - Effect1* effectData = effect->data; +void fx_1_appendGfx(void* effect) { + EffectInstance* eff = (EffectInstance*)effect; + Effect1* effectData = ((EffectInstance*)effect)->data; Matrix4f mtx; s32 i; gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->effect->data)); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guPositionF(&mtx, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, effectData->x, effectData->y, + shim_guPositionF(mtx, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, effectData->x, effectData->y, effectData->z); - shim_guMtxF2L(&mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - for (i = 0; i < effect->numParts; i++, effectData++) { + for (i = 0; i < ((EffectInstance*)effect)->numParts; i++, effectData++) { if (effectData->unk_02 >= 0 && effectData->unk_08 < 0) { s32 primAlpha = effectData->unk_02; f32 temp_f12; s32 envAlpha; - s32 dlist; + Gfx* dlist; if (primAlpha > 16) { primAlpha = 16; } - shim_guPositionF(&mtx, 0.0f, 0.0f, sPartYaws[i], sPartScales[i], effectData->partX, + shim_guPositionF(mtx, 0.0f, 0.0f, sPartYaws[i], sPartScales[i], effectData->partX, effectData->partY, 0.0f); - shim_guMtxF2L(&mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/effect_10.c b/src/effects/effect_10.c index be84f059af..88cd276319 100644 --- a/src/effects/effect_10.c +++ b/src/effects/effect_10.c @@ -7,7 +7,7 @@ extern Gfx D_090001B8[]; void fx_10_init(EffectInstance* effect); void fx_10_update(EffectInstance* effect); void fx_10_render(EffectInstance* effect); -void fx_10_appendGfx(EffectInstance* effect); +void fx_10_appendGfx(void* effect); void fx_10_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { EffectBlueprint bp; @@ -112,15 +112,15 @@ void fx_10_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } -void fx_10_appendGfx(EffectInstance* effect) { +void fx_10_appendGfx(void* effect) { EffectInstance* effectTemp = effect; - Effect10* part = effect->data; + Effect10* part = effectTemp->data; Matrix4f sp20; Matrix4f sp60; s32 i; gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->effect->data)); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); gSPDisplayList(gMasterGfxPos++, D_090000E0); for (i = 0; i < effectTemp->numParts; i++, part++) { diff --git a/src/effects/effect_100.c b/src/effects/effect_100.c index 81d19fa52a..a063bed5c9 100644 --- a/src/effects/effect_100.c +++ b/src/effects/effect_100.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_100_appendGfx(EffectInstance* effect); +void fx_100_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_100", fx_100_main); diff --git a/src/effects/effect_101.c b/src/effects/effect_101.c index 48c6c7c2f1..0614733b66 100644 --- a/src/effects/effect_101.c +++ b/src/effects/effect_101.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_101_appendGfx(EffectInstance* effect); +void fx_101_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_101", fx_101_main); diff --git a/src/effects/effect_102.c b/src/effects/effect_102.c index d013d9d6b2..695fd1133f 100644 --- a/src/effects/effect_102.c +++ b/src/effects/effect_102.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_102_appendGfx(EffectInstance* effect); +void fx_102_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_102", fx_102_main); diff --git a/src/effects/effect_103.c b/src/effects/effect_103.c index d1682d1db1..85b2586449 100644 --- a/src/effects/effect_103.c +++ b/src/effects/effect_103.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_103_appendGfx(EffectInstance* effect); +void fx_103_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_103", fx_103_main); diff --git a/src/effects/effect_104.c b/src/effects/effect_104.c index 2e690c3cf9..1dd636709c 100644 --- a/src/effects/effect_104.c +++ b/src/effects/effect_104.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_104_appendGfx(EffectInstance* effect); +void fx_104_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_104", fx_104_main); diff --git a/src/effects/effect_105.c b/src/effects/effect_105.c index 33f5e6e7c8..f1a298aa51 100644 --- a/src/effects/effect_105.c +++ b/src/effects/effect_105.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_105_appendGfx(EffectInstance* effect); +void fx_105_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_105", fx_105_main); diff --git a/src/effects/effect_107.c b/src/effects/effect_107.c index 1afb5650f9..a9fe6c0dd6 100644 --- a/src/effects/effect_107.c +++ b/src/effects/effect_107.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_107_appendGfx(EffectInstance* effect); +void fx_107_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_107", fx_107_main); diff --git a/src/effects/effect_109.c b/src/effects/effect_109.c index c9e7b323a5..d44318326c 100644 --- a/src/effects/effect_109.c +++ b/src/effects/effect_109.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_109_appendGfx(EffectInstance* effect); +void fx_109_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_109", fx_109_main); diff --git a/src/effects/effect_11.c b/src/effects/effect_11.c index 3f2d69c45f..16055f84db 100644 --- a/src/effects/effect_11.c +++ b/src/effects/effect_11.c @@ -7,7 +7,7 @@ extern Gfx D_090001B8[]; void fx_11_init(EffectInstance* effect); void fx_11_update(EffectInstance* effect); void fx_11_render(EffectInstance* effect); -void fx_11_appendGfx(EffectInstance* effect); +void fx_11_appendGfx(void* effect); void fx_11_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { EffectBlueprint bp; @@ -113,15 +113,15 @@ void fx_11_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } -void fx_11_appendGfx(EffectInstance* effect) { +void fx_11_appendGfx(void* effect) { EffectInstance* effectTemp = effect; - Effect11* part = effect->data; + Effect11* part = effectTemp->data; Matrix4f sp20; Matrix4f sp60; s32 i; gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->effect->data)); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); gSPDisplayList(gMasterGfxPos++, D_090000E0); for (i = 0; i < effectTemp->numParts; i++, part++) { diff --git a/src/effects/effect_110.c b/src/effects/effect_110.c index b491b80544..b834e8e025 100644 --- a/src/effects/effect_110.c +++ b/src/effects/effect_110.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_110_appendGfx(EffectInstance* effect); +void fx_110_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_110", fx_110_main); diff --git a/src/effects/effect_111.c b/src/effects/effect_111.c index 4cf135d117..88ec83e0ee 100644 --- a/src/effects/effect_111.c +++ b/src/effects/effect_111.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_111_appendGfx(EffectInstance* effect); +void fx_111_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_111", fx_111_main); diff --git a/src/effects/effect_112.c b/src/effects/effect_112.c index 773fcfae61..56995fdb96 100644 --- a/src/effects/effect_112.c +++ b/src/effects/effect_112.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_112_appendGfx(EffectInstance* effect); +void fx_112_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_112", fx_112_main); diff --git a/src/effects/effect_113.c b/src/effects/effect_113.c index 61cdf11c94..51e497165b 100644 --- a/src/effects/effect_113.c +++ b/src/effects/effect_113.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_113_appendGfx(EffectInstance* effect); +void fx_113_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_113", fx_113_main); diff --git a/src/effects/effect_114.c b/src/effects/effect_114.c index 49433cc658..f7b009ed9d 100644 --- a/src/effects/effect_114.c +++ b/src/effects/effect_114.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_114_appendGfx(EffectInstance* effect); +void fx_114_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_114", fx_114_main); diff --git a/src/effects/effect_115.c b/src/effects/effect_115.c index 20c5268c1d..243c42d28b 100644 --- a/src/effects/effect_115.c +++ b/src/effects/effect_115.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_115_appendGfx(EffectInstance* effect); +void fx_115_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_115", fx_115_main); diff --git a/src/effects/effect_116.c b/src/effects/effect_116.c index a63742d4d8..7d3586b358 100644 --- a/src/effects/effect_116.c +++ b/src/effects/effect_116.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_116_appendGfx(EffectInstance* effect); +void fx_116_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_116", fx_116_main); diff --git a/src/effects/effect_117.c b/src/effects/effect_117.c index 2134017f12..fa83e9a058 100644 --- a/src/effects/effect_117.c +++ b/src/effects/effect_117.c @@ -8,7 +8,7 @@ typedef struct Effect117 { /* 0x0C */ f32 unk_0C; } Effect117; // size = 0x?? -void fx_117_appendGfx(EffectInstance* effect); +void fx_117_appendGfx(void* effect); s32 D_E00EAA50[2] = { 0x09001A00, 0x09001A20 }; diff --git a/src/effects/effect_119.c b/src/effects/effect_119.c index 0cfad33946..1a3abbb655 100644 --- a/src/effects/effect_119.c +++ b/src/effects/effect_119.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_119_appendGfx(EffectInstance* effect); +void fx_119_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_119", fx_119_main); diff --git a/src/effects/effect_12.c b/src/effects/effect_12.c index fb62c0b25c..fe6d86dd6d 100644 --- a/src/effects/effect_12.c +++ b/src/effects/effect_12.c @@ -1,13 +1,13 @@ #include "common.h" #include "effects_internal.h" -extern Gfx* D_09000240[]; +extern Gfx D_09000240[]; void func_E0018000(Effect12* part); void fx_12_init(EffectInstance* effect); void fx_12_update(EffectInstance* effect); void fx_12_render(EffectInstance* effect); -void fx_12_appendGfx(EffectInstance* effect); +void fx_12_appendGfx(void* effect); void func_E0018000(Effect12* part) { Matrix4f sp18; @@ -114,17 +114,17 @@ void func_E00183BC(EffectInstance* effect) { shim_remove_effect(effect); } -void fx_12_appendGfx(EffectInstance* effect) { +void fx_12_appendGfx(void* effect) { EffectInstance* effectTemp = effect; - Effect12* part = effect->data; + Effect12* part = effectTemp->data; s32 i; gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->effect->data)); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); for (i = 0; i < effectTemp->numParts; i++, part++) { if (part->alive) { - Gfx** dlist = D_09000240; + Gfx* dlist = D_09000240; gDisplayContext->matrixStack[gMatrixListPos] = part->mtx; diff --git a/src/effects/effect_120.c b/src/effects/effect_120.c index 771e836348..207065034d 100644 --- a/src/effects/effect_120.c +++ b/src/effects/effect_120.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_120_appendGfx(EffectInstance* effect); +void fx_120_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_120", fx_120_main); diff --git a/src/effects/effect_121.c b/src/effects/effect_121.c index 4969a6d493..5a7e31baae 100644 --- a/src/effects/effect_121.c +++ b/src/effects/effect_121.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_121_appendGfx(EffectInstance* effect); +void fx_121_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_121", func_E010E000); diff --git a/src/effects/effect_122.c b/src/effects/effect_122.c index 2ff244686f..8af95f0d5d 100644 --- a/src/effects/effect_122.c +++ b/src/effects/effect_122.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_122_appendGfx(EffectInstance* effect); +void fx_122_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_122", fx_122_main); diff --git a/src/effects/effect_123.c b/src/effects/effect_123.c index 4d31b98f5b..fae939f977 100644 --- a/src/effects/effect_123.c +++ b/src/effects/effect_123.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_123_appendGfx(EffectInstance* effect); +void fx_123_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_123", fx_123_main); diff --git a/src/effects/effect_124.c b/src/effects/effect_124.c index e77b459556..5c3d6db666 100644 --- a/src/effects/effect_124.c +++ b/src/effects/effect_124.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_124_appendGfx(EffectInstance* effect); +void fx_124_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_124", fx_124_main); diff --git a/src/effects/effect_125.c b/src/effects/effect_125.c index 93afc9990b..fdcf2c7d62 100644 --- a/src/effects/effect_125.c +++ b/src/effects/effect_125.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_125_appendGfx(EffectInstance* effect); +void fx_125_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_125", fx_125_main); diff --git a/src/effects/effect_126.c b/src/effects/effect_126.c index 25c79eeaea..86edd33397 100644 --- a/src/effects/effect_126.c +++ b/src/effects/effect_126.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_126_appendGfx(EffectInstance* effect); +void fx_126_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_126", fx_126_main); diff --git a/src/effects/effect_128.c b/src/effects/effect_128.c index ec3390c8e0..aea20fe072 100644 --- a/src/effects/effect_128.c +++ b/src/effects/effect_128.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_128_appendGfx(EffectInstance* effect); +void fx_128_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_128", fx_128_main); diff --git a/src/effects/effect_129.c b/src/effects/effect_129.c index 27c2a53727..4c23c67430 100644 --- a/src/effects/effect_129.c +++ b/src/effects/effect_129.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_129_appendGfx(EffectInstance* effect); +void fx_129_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_129", fx_129_main); diff --git a/src/effects/effect_13.c b/src/effects/effect_13.c index f2c345507b..86ba9b8e5a 100644 --- a/src/effects/effect_13.c +++ b/src/effects/effect_13.c @@ -1,14 +1,131 @@ #include "common.h" #include "effects_internal.h" -void fx_13_appendGfx(EffectInstance* effect); +s32 D_E001A610 = 0; -INCLUDE_ASM(s32, "effects/effect_13", fx_13_main); +extern Gfx D_090002F0[]; -void fx_13_init(void) { +void fx_13_init(EffectInstance* effect); +void fx_13_update(EffectInstance* effect); +void fx_13_render(EffectInstance* effect); +void fx_13_appendGfx(void* effect); + +void fx_13_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { + EffectBlueprint bp; + EffectInstance* effect; + Effect13* part; + s32 numParts = 1; + f32 phi_f6; + + bp.unk_00 = 0; + bp.init = fx_13_init; + bp.update = fx_13_update; + bp.renderWorld = fx_13_render; + bp.unk_14 = 0; + bp.effectIndex = 13; + + effect = shim_create_effect_instance(&bp); + effect->numParts = 1; + part = effect->data = shim_general_heap_malloc(numParts * sizeof(*part)); + + ASSERT(effect->data != NULL); + + part->unk_00 = arg0; + part->unk_04 = arg1; + part->unk_0C = arg3; + part->unk_10 = 0.0f; + part->unk_14 = 0.0f; + part->unk_18 = 0; + part->unk_08 = arg2 + 10.0f; + + if (arg0 == 0) { + part->unk_18 = 0; + part->unk_24 = 0.0f; + part->unk_28 = 0.0f; + part->unk_1C = 0.12f; + part->unk_20 = -0.0152f; + part->unk_2C = 3.0f; + if (D_E001A610 != 0) { + phi_f6 = -10.0f; + } else { + phi_f6 = 10.0f; + } + part->unk_30 = phi_f6; + part->unk_34 = arg4; + } else { + part->unk_1C = 0.12f; + part->unk_20 = -0.0152f; + part->unk_24 = (shim_rand_int(1) * 30) - 15; + part->unk_28 = shim_rand_int(360); + part->unk_2C = 0; + part->unk_30 = (shim_rand_int(1) * 8) - 4; + part->unk_34 = arg4; + part->unk_38 = 0; + part->unk_44 = shim_rand_int(10); + part->unk_40 = shim_rand_int(20); + part->unk_3C = (shim_rand_int(1) * 2) - 1; + } + + D_E001A610++; + if (D_E001A610 >= 2) { + D_E001A610 = 0; + } } -INCLUDE_ASM(s32, "effects/effect_13", fx_13_update); +void fx_13_init(EffectInstance* effect) { +} + +void fx_13_update(EffectInstance* effect) { + Effect13* data = effect->data; + s32 unk_00 = data->unk_00; + + if (data->unk_34 < 150) { + data->unk_10 -= 0.001; + data->unk_04 += data->unk_10; + data->unk_0C += data->unk_18; + data->unk_24 += data->unk_2C; + if (unk_00 == 0) { + if (data->unk_24 < 10.0f) { + data->unk_24 = 10.0f; + data->unk_2C = -data->unk_2C; + } + if (data->unk_24 > 45.0f) { + data->unk_24 = 45.0f; + data->unk_2C = -data->unk_2C; + } + } + data->unk_28 += data->unk_30; + if (unk_00 == 0) { + data->unk_14 = 1.4f; + } else { + data->unk_14 = 1.0f; + } + } else { + data->unk_20 += 0.0007; + data->unk_1C += data->unk_20; + data->unk_14 += data->unk_1C; + if (data->unk_14 > 1.0f) { + data->unk_14 = 1.0f; + } + } + + if (unk_00 == 1) { + data->unk_40 += data->unk_3C; + if (data->unk_40 >= 20) { + data->unk_40 = 20; + data->unk_3C = -1; + } else if (data->unk_40 <= 0) { + data->unk_40 = 0; + data->unk_3C = unk_00; + } + } + data->unk_08 += data->unk_14; + data->unk_34 += -1; + data->unk_38 += 1; + if (data->unk_34 < 0) { + shim_remove_effect(effect); + } +} void fx_13_render(EffectInstance* effect) { RenderTask renderTask; @@ -23,4 +140,31 @@ void fx_13_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } -INCLUDE_ASM(s32, "effects/effect_13", fx_13_appendGfx); +void fx_13_appendGfx(void* effect) { + Matrix4f sp20, other; + EffectInstance* effectTemp = effect; + Effect13* part = effectTemp->data; + u32 alpha; + u8 rgb, a; + + gDPPipeSync(gMasterGfxPos++); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + + shim_guPositionF(sp20, part->unk_24, part->unk_28, 0.0f, 1.0f, part->unk_04, part->unk_08, part->unk_0C); + shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + + a = alpha = 255; + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + + if (*D_801512F0 == 1) { + shim_get_background_color_blend(&rgb, &rgb, &rgb, &a); + alpha -= a; + } + + if (alpha != 0) { + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); + gSPDisplayList(gMasterGfxPos++, D_090002F0); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + } +} diff --git a/src/effects/effect_130.c b/src/effects/effect_130.c index 47c6b19869..49ef832413 100644 --- a/src/effects/effect_130.c +++ b/src/effects/effect_130.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_130_appendGfx(EffectInstance* effect); +void fx_130_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_130", fx_130_main); diff --git a/src/effects/effect_131.c b/src/effects/effect_131.c index e712d70670..a72328f749 100644 --- a/src/effects/effect_131.c +++ b/src/effects/effect_131.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_131_appendGfx(EffectInstance* effect); +void fx_131_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_131", fx_131_main); diff --git a/src/effects/effect_132.c b/src/effects/effect_132.c index f9a4940f70..cc74f342ab 100644 --- a/src/effects/effect_132.c +++ b/src/effects/effect_132.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_132_appendGfx(EffectInstance* effect); +void fx_132_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_132", fx_132_main); diff --git a/src/effects/effect_133.c b/src/effects/effect_133.c index 4690b18474..41e982369c 100644 --- a/src/effects/effect_133.c +++ b/src/effects/effect_133.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_133_appendGfx(EffectInstance* effect); +void fx_133_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_133", fx_133_main); diff --git a/src/effects/effect_134.c b/src/effects/effect_134.c index 8d0182f9c4..c48a238d8d 100644 --- a/src/effects/effect_134.c +++ b/src/effects/effect_134.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_134_appendGfx(EffectInstance* effect); +void fx_134_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_134", fx_134_main); diff --git a/src/effects/effect_14.c b/src/effects/effect_14.c index 09d8a43f3b..d1bebe7567 100644 --- a/src/effects/effect_14.c +++ b/src/effects/effect_14.c @@ -1,20 +1,85 @@ #include "common.h" #include "effects_internal.h" -typedef struct Effect14 { - /* 0x00 */ f32 xPos; //xPos - /* 0x04 */ f32 yPos; //yPos - /* 0x08 */ f32 zPos; //zPos -} Effect14; // size = 0x?? +s32 D_E001C5E0 = 0; -void fx_14_appendGfx(EffectInstance* effect); +extern Gfx D_09000900[]; +extern Gfx D_090009E8[]; -INCLUDE_ASM(s32, "effects/effect_14", fx_14_main); +void fx_14_init(EffectInstance* effect); +void fx_14_update(EffectInstance* effect); +void fx_14_render(EffectInstance* effect); +void fx_14_appendGfx(void* effect); -void fx_14_init(void) { +void fx_14_main(f32 arg0, f32 arg1, f32 arg2, s32 arg3, s32 arg4) { + EffectBlueprint bp; + EffectInstance* effect; + Effect14* part; + s32 numParts = 1; + f32 phi_f4; + + bp.unk_00 = 0; + bp.init = fx_14_init; + bp.update = fx_14_update; + bp.renderWorld = fx_14_render; + bp.unk_14 = 0; + bp.effectIndex = 14; + + effect = shim_create_effect_instance(&bp); + effect->numParts = 1; + part = effect->data = shim_general_heap_malloc(numParts * sizeof(*part)); + + ASSERT(effect->data != NULL); + + part->xPos = arg0; + part->yPos = arg1; + part->zPos = arg2; + part->unk_0C = 0; + part->unk_14 = 0; + part->unk_18 = 0; + part->unk_1C = 0; + part->unk_10 = -3.0f; + part->unk_20 = 3.0f; + if (D_E001C5E0 != 0) { + phi_f4 = -10.0f; + } else { + phi_f4 = 10.0f; + } + part->unk_24 = phi_f4; + part->unk_28 = arg3; + + D_E001C5E0++; + if (D_E001C5E0 >= 2) { + D_E001C5E0 = 0; + } } -INCLUDE_ASM(s32, "effects/effect_14", fx_14_update); +void fx_14_init(EffectInstance* effect) { +} + +void fx_14_update(EffectInstance* effect) { + Effect14* data = effect->data; + + data->unk_28--; + if (data->unk_28 < 0) { + shim_remove_effect(effect); + return; + } + + data->xPos += data->unk_0C; + data->yPos += data->unk_10; + data->zPos += data->unk_14; + data->unk_18 += data->unk_20; + if (data->unk_18 < 10.0f) { + data->unk_18 = 10.0f; + data->unk_20 = -data->unk_20; + } + if (data->unk_18 > 45.0f) { + data->unk_18 = 45.0f; + data->unk_20 = -data->unk_20; + } + data->unk_1C += data->unk_24; +} void fx_14_render(EffectInstance* effect) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -24,7 +89,7 @@ void fx_14_render(EffectInstance* effect) { RenderTask* retTask; f32 effectPos = effect14->xPos; f32 playerPos = playerStatus->position.x; - + if (effectPos - playerPos > 200) { effect14->xPos = effectPos - 400; } else { @@ -52,4 +117,30 @@ void fx_14_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } -INCLUDE_ASM(s32, "effects/effect_14", fx_14_appendGfx); +void fx_14_appendGfx(void* effect) { + Matrix4f sp18, sp58, sp98, spD8, sp118; + EffectInstance* effectTemp = effect; + Effect14* part = effectTemp->data; + + gDPPipeSync(gMasterGfxPos++); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + gSPDisplayList(gMasterGfxPos++, D_09000900); + + shim_guTranslateF(sp18, part->xPos, part->yPos, part->zPos); + shim_guRotateF(spD8, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(spD8, sp18, sp118); + shim_guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 255); + + shim_guRotateF(sp58, part->unk_18, 1.0f, 0.0f, 0.0f); + shim_guRotateF(sp98, part->unk_1C, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(sp58, sp98, sp118); + shim_guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, D_090009E8); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} diff --git a/src/effects/effect_15.c b/src/effects/effect_15.c index 74b2faefa5..dc4a398665 100644 --- a/src/effects/effect_15.c +++ b/src/effects/effect_15.c @@ -1,19 +1,182 @@ #include "common.h" #include "effects_internal.h" -typedef struct Effect15 { - /* 0x00 */ char unk_00[0x38]; - /* 0x38 */ s32 unk_38; -} Effect15; // size = 0x?? +extern Gfx D_09001530[]; +extern Gfx D_09001650[]; +extern Gfx D_09001780[]; +extern Gfx D_090017D0[]; -void fx_15_appendGfx(EffectInstance* effect); +void fx_15_init(EffectInstance* effect); +void fx_15_update(EffectInstance* effect); +void fx_15_render(EffectInstance* effect); +void fx_15_appendGfx(void* effect); -INCLUDE_ASM(s32, "effects/effect_15", fx_15_main); +EffectInstance* fx_15_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { + EffectBlueprint bp; + Effect15* part; + EffectInstance* effect; + s32 numParts = 1; + s32 i; -void fx_15_init(void) { + f32 temp_f12; + f32 temp_f20; + f32 currentYaw; + f32 sinYaw; + f32 cosYaw; + f32 temp_f22; + f32 temp_f24; + f32 temp_f26; + f32 temp_f2; + f32 temp_f4; + s32 temp_s0; + f32 phi_f26; + + bp.unk_00 = 0; + bp.init = fx_15_init; + bp.update = fx_15_update; + bp.renderWorld = fx_15_render; + bp.unk_14 = 0; + bp.effectIndex = 15; + + effect = shim_create_effect_instance(&bp); + effect->numParts = 1; + part = effect->data = shim_general_heap_malloc(numParts * sizeof(*part)); + + ASSERT(effect->data != NULL); + part->unk_00 = 1; + part->unk_04 = arg1; + part->unk_08 = arg2; + part->unk_0C = arg3; + part->unk_1C = 0; + part->unk_24 = 0.0f; + part->unk_28 = 0; + part->unk_38 = arg0; + + if (arg0 == 3) { + part->unk_240 = 0.2f; + part->unk_244 = shim_rand_int(255); + part->unk_248 = shim_rand_int(255 - part->unk_244); + temp_s0 = (255 - part->unk_248); + part->unk_24C = temp_s0 - part->unk_244; + } else { + part->unk_244 = 210; + part->unk_248 = 186; + part->unk_24C = 90; + part->unk_240 = 0.5f; + } + + temp_f24 = arg4 - arg1; + temp_f22 = arg5 - arg2; + temp_f20 = arg6 - arg3; + + temp_f26 = SQ(temp_f24) + SQ(temp_f22) + SQ(temp_f20); + phi_f26 = temp_f26; + if (temp_f26 != 0.0f) { + phi_f26 = shim_sqrtf(temp_f26); + temp_f26 = arg7 / phi_f26; + } + + part->unk_10 = temp_f24 * temp_f26; + part->unk_14 = temp_f22 * temp_f26; + part->unk_18 = temp_f20 * temp_f26; + + currentYaw = gCameras[gCurrentCameraID].currentYaw; + cosYaw = -shim_cos_deg(currentYaw); + sinYaw = -shim_sin_deg(currentYaw); + + temp_f4 = cosYaw * part->unk_10; + temp_f2 = sinYaw * part->unk_18; + temp_f12 = SQ(temp_f4) + SQ(temp_f2); + + if (temp_f12 != 0.0f) { + temp_f12 = shim_sqrtf(temp_f12); + } + + if ((cosYaw * part->unk_10) + (sinYaw * part->unk_18) < 0.0f) { + temp_f12 = -temp_f12; + part->unk_2C = -20.0f; + } else { + part->unk_2C = 20.0f; + } + + part->unk_20 = part->unk_24 = shim_atan2(0.0f, 0.0f, -part->unk_14, -temp_f12); + part->unk_30 = phi_f26 / arg7; + part->unk_34 = -temp_f12; + shim_guTranslate(part->unk_40, part->unk_04, part->unk_08, part->unk_0C); + + for (i = 1; i < ARRAY_COUNT(part->unk_40); i++) { + part->unk_40[i] = part->unk_40[0]; + } + + part->unk_3C = -1; + return effect; } -INCLUDE_ASM(s32, "effects/effect_15", fx_15_update); +void fx_15_init(EffectInstance* effect) { +} + +void fx_15_update(EffectInstance* effect) { + PlayerStatus* playerStatus = &gPlayerStatus; + Effect15* data = effect->data; + f32 x, y, z, length; + f32 xTemp, yTemp, zTemp; + + if (data->unk_38 >= 2) { + length = SQ(data->unk_10) + SQ(data->unk_14) + SQ(data->unk_18); + if (length > 0.01f) { + length = 1.0f / shim_sqrtf(length); + } + + xTemp = data->unk_10 * length * 32.0f; + yTemp = data->unk_14 * length * 32.0f; + zTemp = data->unk_18 * length * 32.0f; + x = data->unk_04 - xTemp; + y = data->unk_08 - yTemp; + z = data->unk_0C - zTemp; + length = 64.0f; + + if (data->unk_00 != 0 && + data->unk_14 < 0.0f && + shim_npc_raycast_down_sides(0, &x, &y, &z, &length) != 0 && + length < 42.0f) + { + data->unk_1C = data->unk_1C + 1.0f; + data->unk_14 = -data->unk_14 * 0.6; + data->unk_10 = data->unk_10 * 0.7; + data->unk_34 = data->unk_34 * 0.7; + data->unk_2C = data->unk_2C * 0.7; + shim_load_effect(6); + fx_6_main(0, data->unk_04, data->unk_08 - 5.0f, data->unk_0C, 0.0f); + + if (!gGameStatusPtr->isBattle) { + shim_sfx_play_sound_at_position(0xB0000016, 0, data->unk_04, data->unk_08, data->unk_0C); + } + + data->unk_00 = 0; + if (data->unk_1C >= 10.0f) { + data->unk_30 = -1; + } + } + + if (data->unk_1C != 0.0f) { + data->unk_14 += -0.5; + data->unk_24 += data->unk_2C; + data->unk_20 = shim_atan2(0.0f, 0.0f, -data->unk_14, data->unk_34); + } + } + + if (playerStatus->position.y - data->unk_08 > 300.0f) { + data->unk_30 = -1; + } + + data->unk_04 += data->unk_10; + data->unk_08 += data->unk_14; + data->unk_0C += data->unk_18; + + if (data->unk_30 < 0) { + shim_remove_effect(effect); + } +} void fx_15_render(EffectInstance* effect) { Effect15* effect15 = effect->data; @@ -31,7 +194,7 @@ void fx_15_render(EffectInstance* effect) { renderModeTemp = RENDER_MODE_SURF_SOLID_AA_ZB_LAYER0; } renderTaskPtr->renderMode = renderModeTemp; - + retTask = shim_queue_render_task(&renderTask); } diff --git a/src/effects/effect_16.c b/src/effects/effect_16.c index 8a21698177..355f47ab49 100644 --- a/src/effects/effect_16.c +++ b/src/effects/effect_16.c @@ -1,16 +1,159 @@ #include "common.h" #include "effects_internal.h" -void fx_16_appendGfx(EffectInstance* effect); +extern Gfx D_09002170[]; +extern Gfx D_09002238[]; +extern Gfx D_090022E0[]; +extern Gfx D_09002308[]; +extern Gfx D_090023B0[]; +extern Gfx D_090023D8[]; +extern Gfx D_09002480[]; +extern Gfx D_090024A8[]; +extern Gfx D_09002550[]; +extern Gfx D_09002578[]; + +Gfx* D_E0020C90[] = { D_090022E0, NULL, D_090023B0, D_09002480, D_09002550 }; + +Gfx* D_E0020CA4[] = { D_09002238, NULL, D_09002308, D_090023D8, D_090024A8 }; + +s8 D_E0020CB8[40] = { + 0, 0, 1, 2, 3, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + -1, 0 +}; + +s8 D_E0020CE0[28] = { + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, 0, 0, 0 +}; + +s8 D_E0020CFC[40] = { + 0, 0, 2, 1, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, -1, + 0, 0 +}; + +s8 D_E0020D24[12] = { 0, 0, 1, 1, 2, 2, 3, 3, -13, 0, 0, 0 }; + +s8 D_E0020D30[80] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, -1, 0 +}; + +s8* D_E0020D80[5] = { D_E0020CB8, D_E0020CE0, D_E0020CFC, D_E0020D24, D_E0020D30 }; + +s8 D_E0020D94[] = { + 64, 0, 0, 32, 0, 32, 0, 0, 64, 0, 32, 32, 0, 64, 0, 32, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +void func_E0020000(Effect16* part, s32 arg1); +void fx_16_init(EffectInstance* effect); +void fx_16_update(EffectInstance* effect); +void fx_16_render(EffectInstance* effect); +void fx_16_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_16", func_E0020000); -INCLUDE_ASM(s32, "effects/effect_16", fx_16_main); +void fx_16_main(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7, EffectInstance** arg8) { + EffectBlueprint bp; + EffectBlueprint* bpPtr = &bp; + Effect16* part; + EffectInstance* effect; + s32 numParts; + + if (arg0 == 1) { + numParts = 3; + } else { + numParts = 1; + } -void fx_16_init(void) { + bp.unk_00 = 0; + bp.init = fx_16_init; + bp.update = fx_16_update; + bp.renderWorld = fx_16_render; + bp.unk_14 = 0; + bp.effectIndex = 16; + + effect = shim_create_effect_instance(bpPtr); + effect->numParts = numParts; + part = effect->data = shim_general_heap_malloc(numParts * sizeof(*part)); + + ASSERT(effect->data != NULL); + part->unk_3C = arg1; + part->unk_00 = arg0; + part->unk_30 = arg0; + + if (arg7 <= 0) { + arg7 = 10000; + } + part->unk_2C = arg7; + part->unk_34 = 0; + + if (arg0 == 1) { + s32 i; + + for (i = 0; i < numParts; i++, part++) { + part->unk_10 = arg2; + part->unk_14 = arg3; + part->unk_18 = arg4; + part->unk_1C = arg6; + part->unk_20 = arg5; + part->unk_3C = arg1; + func_E0020000(part, i); + } + } else { + part->unk_10 = arg2; + part->unk_14 = arg3; + part->unk_18 = arg4; + part->unk_1C = arg6; + part->unk_20 = arg5; + part->unk_3C = arg1; + func_E0020000(part, 1); + } + *arg8 = effect; } -INCLUDE_ASM(s32, "effects/effect_16", fx_16_update); +void fx_16_init(EffectInstance* effect) { +} + +void fx_16_update(EffectInstance* effect) { + Effect16* part = effect->data; + s32 temp_a0 = D_E0020D80[part->unk_30][part->unk_34]; + s32 type = part->unk_00; + + part->unk_34++; + part->unk_38 = temp_a0; + if (part->unk_38 < 0) { + if (part->unk_38 != -1) { + part->unk_30 = -part->unk_38 - 10; + part->unk_34 = 0; + part->unk_38 = D_E0020D80[part->unk_30][0]; + part->unk_34 = 1; + } else { + shim_remove_effect(effect); + return; + } + } + + if (part->unk_2C < 10000) { + part->unk_2C--; + } + + if (part->unk_2C < 0) { + shim_remove_effect(effect); + return; + } + + if (part->unk_3C != 0) { + if (type == 1) { + s32 i; + + for (i = 0; i < effect->numParts; i++, part++) { + func_E0020000(part, i); + } + } else { + func_E0020000(part, 1); + } + } +} void fx_16_render(EffectInstance* effect) { RenderTask renderTask; @@ -25,4 +168,118 @@ void fx_16_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } +// lots of issues +#ifdef NON_EQUIVALENT +void fx_16_appendGfx(void* effect) { + Matrix4f sp18; + Matrix4f sp58; + EffectInstance* effectTemp = effect; + Effect16* part = effectTemp->data; + s32 idx; + s32 type; + Gfx* temp_a3; + Gfx* temp_t0; + Mtx* blah; + + s32 sp9C; + s32 spA0; + s32 temp_a0_3; + s32 phi_t1; + s32 phi_s7; + s32 phi_fp; + + type = part->unk_00; + gDPPipeSync(gMasterGfxPos++); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + //phi_s7 = saved_reg_s7; + //phi_fp = saved_reg_fp; + + if (type != 1) { + shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos++]); + shim_guScaleF(sp58, 1.0f, 0.8f, 1.0f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guRotateF(sp58, part->unk_24, 0.0f, 0.0f, 1.0f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, D_09002170) + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + } else { + if (part->unk_38 == 0) { + s32 i; + + for (i = 0; i < 3; i++, part++) { + shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guRotateF(sp58, part->unk_24, 0.0f, 0.0f, 1.0f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guScaleF(sp58, part->unk_28, part->unk_28, 1.0f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 235, 28, 0, 255); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, D_09002578); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + } + } + } + + temp_a0_3 = part->unk_38; + temp_a3 = D_E0020CA4[type]; + temp_t0 = D_E0020C90[type]; + + switch (type) { + case 2: + sp9C = 0x20; + phi_t1 = 0x30; + phi_s7 = 0x80 - (temp_a0_3 << 5); + spA0 = phi_t1; + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 220, 0, 0, 255); + phi_fp = 0; + break; + case 3: + sp9C = 0x20; + spA0 = 0x20; + idx = (part->unk_2C * 3) % 7; + gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E0020D94[idx], D_E0020D94[idx + 1], D_E0020D94[idx + 2], 255); + phi_s7 = 0x80 - (temp_a0_3 << 5); + phi_fp = 0; + break; + case 4: + sp9C = 0x20; + spA0 = 8; + phi_s7 = 0x80 - (temp_a0_3 << 5); + phi_fp = 0; + break; + default: + phi_t1 = 0x10; + if (type == 0) { + sp9C = 0x10; + phi_s7 = 0x80 - (temp_a0_3 * 0x10); + spA0 = phi_t1; + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 220, 0, 0, 255); + phi_fp = 0; + } + break; + } + + if (temp_a3 != NULL) { + gSPDisplayList(gMasterGfxPos++, temp_a3); + } + + gDPSetTileSize(gMasterGfxPos++, 2, phi_s7, 0, phi_s7 + sp9C, spA0); + + if (temp_t0 != NULL) { + gSPDisplayList(gMasterGfxPos++, temp_t0); + } + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} +#else INCLUDE_ASM(s32, "effects/effect_16", fx_16_appendGfx); +#endif diff --git a/src/effects/effect_17.c b/src/effects/effect_17.c index e6e3dfb247..402e716ea7 100644 --- a/src/effects/effect_17.c +++ b/src/effects/effect_17.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_17_appendGfx(EffectInstance* effect); +void fx_17_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_17", fx_17_main); diff --git a/src/effects/effect_18.c b/src/effects/effect_18.c index e87a5e10a1..25b7ff0d78 100644 --- a/src/effects/effect_18.c +++ b/src/effects/effect_18.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_18_appendGfx(EffectInstance* effect); +void fx_18_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_18", fx_18_main); diff --git a/src/effects/effect_19.c b/src/effects/effect_19.c index 2798bb5741..f1dcd29fec 100644 --- a/src/effects/effect_19.c +++ b/src/effects/effect_19.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_19_appendGfx(EffectInstance* effect); +void fx_19_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_19", fx_19_main); diff --git a/src/effects/effect_20.c b/src/effects/effect_20.c index 409baef29d..5bb0d03a74 100644 --- a/src/effects/effect_20.c +++ b/src/effects/effect_20.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_20_appendGfx(EffectInstance* effect); +void fx_20_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_20", fx_20_main); diff --git a/src/effects/effect_21.c b/src/effects/effect_21.c index ddc4fa2126..0f700c45b3 100644 --- a/src/effects/effect_21.c +++ b/src/effects/effect_21.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_21_appendGfx(EffectInstance* effect); +void fx_21_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_21", fx_21_main); diff --git a/src/effects/effect_22.c b/src/effects/effect_22.c index 0d6f112d30..8a07961aa9 100644 --- a/src/effects/effect_22.c +++ b/src/effects/effect_22.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_22_appendGfx(EffectInstance* effect); +void fx_22_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_22", fx_22_main); diff --git a/src/effects/effect_23.c b/src/effects/effect_23.c index a969bad883..93d2383889 100644 --- a/src/effects/effect_23.c +++ b/src/effects/effect_23.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_23_appendGfx(EffectInstance* effect); +void fx_23_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_23", fx_23_main); diff --git a/src/effects/effect_24.c b/src/effects/effect_24.c index 3d34a2d9fa..4ae275832b 100644 --- a/src/effects/effect_24.c +++ b/src/effects/effect_24.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_24_appendGfx(EffectInstance* effect); +void fx_24_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_24", fx_24_main); diff --git a/src/effects/effect_25.c b/src/effects/effect_25.c index 309ae90108..c8e2894b08 100644 --- a/src/effects/effect_25.c +++ b/src/effects/effect_25.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_25_appendGfx(EffectInstance* effect); +void fx_25_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_25", fx_25_main); diff --git a/src/effects/effect_26.c b/src/effects/effect_26.c index 504ec76ed1..d5bc904d9b 100644 --- a/src/effects/effect_26.c +++ b/src/effects/effect_26.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_26_appendGfx(EffectInstance* effect); +void fx_26_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_26", fx_26_main); diff --git a/src/effects/effect_27.c b/src/effects/effect_27.c index 1b4d5bb333..1e20dfcde0 100644 --- a/src/effects/effect_27.c +++ b/src/effects/effect_27.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_27_appendGfx(EffectInstance* effect); +void fx_27_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_27", fx_27_main); diff --git a/src/effects/effect_28.c b/src/effects/effect_28.c index 0a7228c968..1b95fef88a 100644 --- a/src/effects/effect_28.c +++ b/src/effects/effect_28.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_28_appendGfx(EffectInstance* effect); +void fx_28_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_28", fx_28_main); diff --git a/src/effects/effect_29.c b/src/effects/effect_29.c index 9cf407be01..a79e11a729 100644 --- a/src/effects/effect_29.c +++ b/src/effects/effect_29.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_29_appendGfx(EffectInstance* effect); +void fx_29_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_29", fx_29_main); diff --git a/src/effects/effect_31.c b/src/effects/effect_31.c index 245b159b9e..2cdfdec29d 100644 --- a/src/effects/effect_31.c +++ b/src/effects/effect_31.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_31_appendGfx(EffectInstance* effect); +void fx_31_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_31", fx_31_main); diff --git a/src/effects/effect_32.c b/src/effects/effect_32.c index ab239cb597..61b4dd3f94 100644 --- a/src/effects/effect_32.c +++ b/src/effects/effect_32.c @@ -8,7 +8,7 @@ typedef struct Effect32 { /* 0x0C */ f32 unk_0C; } Effect32; // size = 0x?? -void fx_32_appendGfx(EffectInstance* effect); +void fx_32_appendGfx(void* effect); u32 D_E0040840[2] = { 0xFF6DFF5C, 0x66BFFF4B }; diff --git a/src/effects/effect_33.c b/src/effects/effect_33.c index 0c0144a90a..c66bb8fdcb 100644 --- a/src/effects/effect_33.c +++ b/src/effects/effect_33.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_33_appendGfx(EffectInstance* effect); +void fx_33_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_33", fx_33_main); diff --git a/src/effects/effect_34.c b/src/effects/effect_34.c index 9d4e2e8100..445d3d10ce 100644 --- a/src/effects/effect_34.c +++ b/src/effects/effect_34.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_34_appendGfx(EffectInstance* effect); +void fx_34_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_34", fx_34_main); diff --git a/src/effects/effect_35.c b/src/effects/effect_35.c index 06b2040dd9..c53e30e3fa 100644 --- a/src/effects/effect_35.c +++ b/src/effects/effect_35.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_35_appendGfx(EffectInstance* effect); +void fx_35_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_35", fx_35_main); diff --git a/src/effects/effect_36.c b/src/effects/effect_36.c index 5e6c39177f..1966f96e7c 100644 --- a/src/effects/effect_36.c +++ b/src/effects/effect_36.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_36_appendGfx(EffectInstance* effect); +void fx_36_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_36", fx_36_main); diff --git a/src/effects/effect_37.c b/src/effects/effect_37.c index 0d4b1557b7..a52946939d 100644 --- a/src/effects/effect_37.c +++ b/src/effects/effect_37.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_37_appendGfx(EffectInstance* effect); +void fx_37_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_37", fx_37_main); diff --git a/src/effects/effect_38.c b/src/effects/effect_38.c index e5a89d77bf..9edb6efb3b 100644 --- a/src/effects/effect_38.c +++ b/src/effects/effect_38.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_38_appendGfx(EffectInstance* effect); +void fx_38_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_38", fx_38_main); diff --git a/src/effects/effect_39.c b/src/effects/effect_39.c index 479fa8c5c2..c80d6f4c6b 100644 --- a/src/effects/effect_39.c +++ b/src/effects/effect_39.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_39_appendGfx(EffectInstance* effect); +void fx_39_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_39", fx_39_main); diff --git a/src/effects/effect_40.c b/src/effects/effect_40.c index 154ccac505..fe638a400b 100644 --- a/src/effects/effect_40.c +++ b/src/effects/effect_40.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_40_appendGfx(EffectInstance* effect); +void fx_40_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_40", fx_40_main); diff --git a/src/effects/effect_41.c b/src/effects/effect_41.c index 65f83ebd0f..81651ec0f3 100644 --- a/src/effects/effect_41.c +++ b/src/effects/effect_41.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_41_appendGfx(EffectInstance* effect); +void fx_41_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_41", fx_41_main); diff --git a/src/effects/effect_43.c b/src/effects/effect_43.c index e26c3643c9..f288cb6a69 100644 --- a/src/effects/effect_43.c +++ b/src/effects/effect_43.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_43_appendGfx(EffectInstance* effect); +void fx_43_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_43", fx_43_main); diff --git a/src/effects/effect_44.c b/src/effects/effect_44.c index 39ed76a228..e5037cd089 100644 --- a/src/effects/effect_44.c +++ b/src/effects/effect_44.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_44_appendGfx(EffectInstance* effect); +void fx_44_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_44", fx_44_main); diff --git a/src/effects/effect_45.c b/src/effects/effect_45.c index 08b0f6c39e..1edb323f18 100644 --- a/src/effects/effect_45.c +++ b/src/effects/effect_45.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_45_appendGfx(EffectInstance* effect); +void fx_45_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_45", fx_45_main); diff --git a/src/effects/effect_46.c b/src/effects/effect_46.c index d580d88226..90a7e03623 100644 --- a/src/effects/effect_46.c +++ b/src/effects/effect_46.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_46_appendGfx(EffectInstance* effect); +void fx_46_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_46", fx_46_main); diff --git a/src/effects/effect_48.c b/src/effects/effect_48.c index 3f64d4a3fd..8ec8dba926 100644 --- a/src/effects/effect_48.c +++ b/src/effects/effect_48.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_48_appendGfx(EffectInstance* effect); +void fx_48_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_48", fx_48_main); diff --git a/src/effects/effect_49.c b/src/effects/effect_49.c index 32ca7452e3..062004fd26 100644 --- a/src/effects/effect_49.c +++ b/src/effects/effect_49.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_49_appendGfx(EffectInstance* effect); +void fx_49_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_49", fx_49_main); diff --git a/src/effects/effect_50.c b/src/effects/effect_50.c index 6f71c09261..a4fd2dd132 100644 --- a/src/effects/effect_50.c +++ b/src/effects/effect_50.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_50_appendGfx(EffectInstance* effect); +void fx_50_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_50", fx_50_main); diff --git a/src/effects/effect_51.c b/src/effects/effect_51.c index 4df446ac55..c0a555d59c 100644 --- a/src/effects/effect_51.c +++ b/src/effects/effect_51.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_51_appendGfx(EffectInstance* effect); +void fx_51_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_51", fx_51_main); diff --git a/src/effects/effect_52.c b/src/effects/effect_52.c index 0eff5379b8..f84e83d049 100644 --- a/src/effects/effect_52.c +++ b/src/effects/effect_52.c @@ -5,7 +5,7 @@ typedef struct Effect52 { /* 0x00 */ s32 unk_00; } Effect52; // size = 0x?? -void fx_52_appendGfx(EffectInstance* effect); +void fx_52_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_52", fx_52_main); diff --git a/src/effects/effect_53.c b/src/effects/effect_53.c index 6e101377b9..023d977db4 100644 --- a/src/effects/effect_53.c +++ b/src/effects/effect_53.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_53_appendGfx(EffectInstance* effect); +void fx_53_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_53", func_E006A000); diff --git a/src/effects/effect_54.c b/src/effects/effect_54.c index 2a5b411be0..ad023c2457 100644 --- a/src/effects/effect_54.c +++ b/src/effects/effect_54.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_54_appendGfx(EffectInstance* effect); +void fx_54_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_54", fx_54_main); diff --git a/src/effects/effect_55.c b/src/effects/effect_55.c index 1adf292055..b5362ff4e2 100644 --- a/src/effects/effect_55.c +++ b/src/effects/effect_55.c @@ -6,7 +6,7 @@ typedef struct Effect55 { /* 0x14 */ f32 unk_14; } Effect55; // size = 0x?? -void fx_55_appendGfx(EffectInstance* effect); +void fx_55_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_55", fx_55_main); diff --git a/src/effects/effect_56.c b/src/effects/effect_56.c index e37eb13e08..d15c2fbd7b 100644 --- a/src/effects/effect_56.c +++ b/src/effects/effect_56.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_56_appendGfx(EffectInstance* effect); +void fx_56_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_56", fx_56_main); diff --git a/src/effects/effect_57.c b/src/effects/effect_57.c index 531cc3a3c8..ada92ab6a8 100644 --- a/src/effects/effect_57.c +++ b/src/effects/effect_57.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_57_appendGfx(EffectInstance* effect); +void fx_57_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_57", fx_57_main); diff --git a/src/effects/effect_58.c b/src/effects/effect_58.c index 0b8bb67243..6f6da412f1 100644 --- a/src/effects/effect_58.c +++ b/src/effects/effect_58.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_58_appendGfx(EffectInstance* effect); +void fx_58_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_58", fx_58_main); diff --git a/src/effects/effect_59.c b/src/effects/effect_59.c index e7ca3cf2df..cb8d779484 100644 --- a/src/effects/effect_59.c +++ b/src/effects/effect_59.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_59_appendGfx(EffectInstance* effect); +void fx_59_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_59", fx_59_main); diff --git a/src/effects/effect_6.c b/src/effects/effect_6.c index b3279571e0..fccadb739c 100644 --- a/src/effects/effect_6.c +++ b/src/effects/effect_6.c @@ -1,29 +1,16 @@ #include "common.h" #include "effects_internal.h" -typedef struct Effect6 { - /* 0x00 */ u16 type; - /* 0x02 */ char unk_02[0x2]; - /* 0x04 */ f32 x; - /* 0x08 */ f32 y; - /* 0x0C */ f32 z; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ f32 unk_30; - /* 0x34 */ f32 unk_34; - /* 0x38 */ s32 unk_38; - /* 0x3C */ s32 unk_3C; - /* 0x40 */ s32 unk_40; -} Effect6; // size = 0x44 +extern Gfx D_09002780[]; +extern Gfx D_09002868[]; +extern Gfx D_09002950[]; +extern Gfx D_09002A38[]; +extern Gfx D_09002B20[]; +extern Gfx D_09002B40[]; +extern Gfx D_09002B60[]; -static s32 sDlists[] = { 0x09002B20, 0x09002B40, 0x09002B60, 0x09002B60, 0x09002B60 }; -static s32 sDlists2[] = { 0x09002780, 0x09002868, 0x09002950, 0x09002A38, 0x09002A38 }; +static Gfx* sDlists[] = { D_09002B20, D_09002B40, D_09002B60, D_09002B60, D_09002B60 }; +static Gfx* sDlists2[] = { D_09002780, D_09002868, D_09002950, D_09002A38, D_09002A38 }; static s8 D_E000CC38[] = { 0x00, 0x01, 0x02, 0x1A, 0x03, 0x1B, 0x04, 0x1C, 0x05, 0x15, 0x35, 0x46, 0x46, 0x46, 0xFF, 0x00 }; @@ -47,12 +34,12 @@ static s8 D_E000CCE0[] = { 0x00, 0x10, 0x20, 0x30, 0x01, 0x11, 0x21, 0x31, 0x02, 0x1E, 0x26, 0x26, 0x2E, 0x36, 0x36, 0x3E, 0x47, 0x47, 0x4F, 0x57, 0x57, 0x5F, 0x67, 0x67, 0x6F, 0x77, 0x77, 0x7F, 0xFF, 0x00, 0x00, 0x00 }; -static s8* D_E000CD24[4] = { &D_E000CC38, &D_E000CC48, &D_E000CC5C, &D_E000CCE0 }; +static s8* D_E000CD24[4] = { D_E000CC38, D_E000CC48, D_E000CC5C, D_E000CCE0 }; void fx_6_init(EffectInstance* effect); void fx_6_update(EffectInstance* effect); void fx_6_render(EffectInstance* effect); -void fx_6_appendGfx(EffectInstance* effect); +void fx_6_appendGfx(void* effect); void func_E000C000(Effect6* part) { part->unk_18 += part->unk_1C; @@ -270,8 +257,8 @@ void fx_6_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } -void fx_6_appendGfx(EffectInstance* effect) { - Effect6* part = effect->data; +void fx_6_appendGfx(void* effect) { + Effect6* part = ((EffectInstance*)effect)->data; s32 type = part->type; s32 temp_t0 = part->unk_40; Matrix4f mtx1; @@ -281,8 +268,8 @@ void fx_6_appendGfx(EffectInstance* effect) { s32 spDC; s32 temp_lo; s32 envAlpha; - s32 dlist1; - s32 dlist2; + Gfx* dlist1; + Gfx* dlist2; s32 phi_a0; s32 temp; s32 i; @@ -293,7 +280,7 @@ void fx_6_appendGfx(EffectInstance* effect) { dlist2 = sDlists2[type]; gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->effect->data)); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMasterGfxPos++, dlist2); spD8 = temp_t0 & 7; @@ -344,7 +331,7 @@ void fx_6_appendGfx(EffectInstance* effect) { part++; - for (i = 1; i < effect->numParts; i++, part++) { + for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { shim_guTranslateF(mtx1, part->x, part->y, part->z); shim_guMtxF2L(mtx1, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], diff --git a/src/effects/effect_60.c b/src/effects/effect_60.c index 61f860d44d..dbe4620412 100644 --- a/src/effects/effect_60.c +++ b/src/effects/effect_60.c @@ -5,7 +5,7 @@ typedef struct Effect60 { /* 0x00 */ s32 unk_00; } Effect60; // size = 0x?? -void fx_60_appendGfx(EffectInstance* effect); +void fx_60_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_60", fx_60_main); diff --git a/src/effects/effect_61.c b/src/effects/effect_61.c index d7c85bf9fe..f1558bd856 100644 --- a/src/effects/effect_61.c +++ b/src/effects/effect_61.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_61_appendGfx(EffectInstance* effect); +void fx_61_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_61", fx_61_main); diff --git a/src/effects/effect_62.c b/src/effects/effect_62.c index 685acdc384..aef03b82a1 100644 --- a/src/effects/effect_62.c +++ b/src/effects/effect_62.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_62_appendGfx(EffectInstance* effect); +void fx_62_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_62", fx_62_main); diff --git a/src/effects/effect_63.c b/src/effects/effect_63.c index 78336f48ac..869a02d1f0 100644 --- a/src/effects/effect_63.c +++ b/src/effects/effect_63.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_63_appendGfx(EffectInstance* effect); +void fx_63_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_63", fx_63_main); diff --git a/src/effects/effect_66.c b/src/effects/effect_66.c index e58f08ca98..443a8c7dea 100644 --- a/src/effects/effect_66.c +++ b/src/effects/effect_66.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_66_appendGfx(EffectInstance* effect); +void fx_66_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_66", func_E0084000); diff --git a/src/effects/effect_68.c b/src/effects/effect_68.c index 1d910ceea2..1a523a6f61 100644 --- a/src/effects/effect_68.c +++ b/src/effects/effect_68.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_68_appendGfx(EffectInstance* effect); +void fx_68_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_68", func_E0088000); diff --git a/src/effects/effect_69.c b/src/effects/effect_69.c index 2875d353d4..5ff56d8d0d 100644 --- a/src/effects/effect_69.c +++ b/src/effects/effect_69.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_69_appendGfx(EffectInstance* effect); +void fx_69_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_69", func_E008A000); diff --git a/src/effects/effect_7.c b/src/effects/effect_7.c index 118a391cb6..16de59354e 100644 --- a/src/effects/effect_7.c +++ b/src/effects/effect_7.c @@ -1,23 +1,6 @@ #include "common.h" #include "effects_internal.h" -typedef struct Effect7 { - /* 0x00 */ s32 unk_00; - /* 0x04 */ u16 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ char unk_14[0x44]; - /* 0x58 */ f32 unk_58; - /* 0x5C */ f32 unk_5C; - /* 0x60 */ f32 unk_60; - /* 0x64 */ f32 unk_64; - /* 0x68 */ f32 unk_68; - /* 0x6C */ s32 unk_6C; - /* 0x70 */ s32 unk_70; - /* 0x74 */ s32 unk_74; -} Effect7; // size = 0x78 - s8 D_E000E660[16] = { 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, -1, 0 }; s8 D_E000E670[20] = { 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, -1, 0, 0, 0 }; @@ -33,7 +16,7 @@ extern Gfx D_09002B40[]; void fx_7_init(EffectInstance* effect); void fx_7_update(EffectInstance* effect); void fx_7_render(EffectInstance* effect); -void fx_7_appendGfx(EffectInstance* effect); +void fx_7_appendGfx(void* effect); void fx_7_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { EffectBlueprint bp; @@ -109,10 +92,9 @@ void fx_7_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } -void fx_7_appendGfx(EffectInstance* effect) { - // effect temp needed to match - maybe EffectInstance is being cast to a a specific of EffectInstance for effect_7 +void fx_7_appendGfx(void* effect) { EffectInstance* effectTemp = effect; - Effect7* part = (Effect7*)effect->data; + Effect7* part = effectTemp->data; s32 temp_t3 = part->unk_04; s32 temp_t4 = part->unk_74; s32 cond = FALSE; @@ -120,8 +102,8 @@ void fx_7_appendGfx(EffectInstance* effect) { Matrix4f sp58; s32 temp_a0; s32 temp_lo; - s32 dlist; - s32 dlist2; + Gfx* dlist; + Gfx* dlist2; s32 phi_t1; s32 i; @@ -149,7 +131,7 @@ void fx_7_appendGfx(EffectInstance* effect) { } gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->effect->data)); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); gSPDisplayList(gMasterGfxPos++, dlist); gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, 127); gDPSetPrimColor(gMasterGfxPos++, 0, 0, 230, 222, 222, 110); diff --git a/src/effects/effect_70.c b/src/effects/effect_70.c index dfa3e9ddbb..ea9b410804 100644 --- a/src/effects/effect_70.c +++ b/src/effects/effect_70.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_70_appendGfx(EffectInstance* effect); +void fx_70_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_70", fx_70_main); diff --git a/src/effects/effect_71.c b/src/effects/effect_71.c index 796c3eb2f0..2aafce3f66 100644 --- a/src/effects/effect_71.c +++ b/src/effects/effect_71.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_71_appendGfx(EffectInstance* effect); +void fx_71_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_71", fx_71_main); diff --git a/src/effects/effect_73.c b/src/effects/effect_73.c index acfd433260..4505f7ff83 100644 --- a/src/effects/effect_73.c +++ b/src/effects/effect_73.c @@ -1,18 +1,6 @@ #include "common.h" #include "effects_internal.h" -typedef struct Effect73 { - /* 0x00 */ s32 unk_00; - /* 0x04 */ s32 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ s32 unk_14; - /* 0x18 */ s32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ s32 unk_20; -} Effect73; // size = 0x24 - extern Gfx D_090002C0[]; extern Gfx D_09000330[]; extern Gfx D_09000370[]; @@ -33,7 +21,7 @@ static s32 sPartParams[4 * 5] = { void fx_73_init(EffectInstance* effect); void fx_73_update(EffectInstance* effect); void fx_73_render(EffectInstance* effect); -void fx_73_appendGfx(EffectInstance* effect); +void fx_73_appendGfx(void* effect); EffectInstance* fx_73_main(EffectInstanceDataThing* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { EffectBlueprint bp; @@ -121,8 +109,8 @@ void fx_73_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } -void fx_73_appendGfx(EffectInstance* effect) { - Effect73* part = effect->data; +void fx_73_appendGfx(void* effect) { + Effect73* part = ((EffectInstance*)effect)->data; Matrix4f sp18; Matrix4f sp58; Matrix4f sp98; @@ -133,7 +121,7 @@ void fx_73_appendGfx(EffectInstance* effect) { shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); spD8 = &gDisplayContext->matrixStack[gMatrixListPos++]; gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->effect->data)); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); @@ -142,7 +130,7 @@ void fx_73_appendGfx(EffectInstance* effect) { gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 15, 255); part++; - for (i = 1; i < effect->numParts; i++, part++) { + for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { if (part->unk_20 == 0) { f32 temp_f20 = part->unk_1C; diff --git a/src/effects/effect_74.c b/src/effects/effect_74.c index 631816fe8e..68e695153e 100644 --- a/src/effects/effect_74.c +++ b/src/effects/effect_74.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_74_appendGfx(EffectInstance* effect); +void fx_74_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_74", fx_74_main); diff --git a/src/effects/effect_75.c b/src/effects/effect_75.c index 063bd7eea1..5176881e82 100644 --- a/src/effects/effect_75.c +++ b/src/effects/effect_75.c @@ -1,18 +1,6 @@ #include "common.h" #include "effects_internal.h" -typedef struct Effect75 { - /* 0x00 */ s32 unk_00; - /* 0x04 */ f32 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ s32 unk_1C; - /* 0x20 */ s32 unk_20; -} Effect75; // size = 0x24 - extern Gfx D_09001280[]; extern Gfx D_09001358[]; extern Gfx D_09001430[]; @@ -23,7 +11,7 @@ Gfx* D_E00963E0[] = { D_09001280, D_09001358, D_09001430 }; void fx_75_init(EffectInstance* effect); void fx_75_update(EffectInstance* effect); void fx_75_render(EffectInstance* effect); -void fx_75_appendGfx(EffectInstance* effect); +void fx_75_appendGfx(void* effect); EffectInstance* fx_75_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) { EffectBlueprint bp; @@ -95,14 +83,14 @@ void fx_75_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } -void fx_75_appendGfx(EffectInstance* effect) { +void fx_75_appendGfx(void* effect) { Matrix4f sp18; Matrix4f sp58; - Effect75* part = effect->data; + Effect75* part = ((EffectInstance*)effect)->data; s32 idx = part->unk_00; gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->effect->data)); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); diff --git a/src/effects/effect_76.c b/src/effects/effect_76.c index 5afdcf4ad4..a87c9ea14f 100644 --- a/src/effects/effect_76.c +++ b/src/effects/effect_76.c @@ -6,7 +6,7 @@ typedef struct Effect76 { /* 0x0C */ f32 unk_0C; } Effect76; // size = 0x?? -void fx_76_appendGfx(EffectInstance* effect); +void fx_76_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_76", fx_76_main); diff --git a/src/effects/effect_77.c b/src/effects/effect_77.c index 17acbbe5b1..41fa04acb2 100644 --- a/src/effects/effect_77.c +++ b/src/effects/effect_77.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_77_appendGfx(EffectInstance* effect); +void fx_77_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_77", fx_77_main); diff --git a/src/effects/effect_78.c b/src/effects/effect_78.c index f54af605b9..e5a87d9f63 100644 --- a/src/effects/effect_78.c +++ b/src/effects/effect_78.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_78_appendGfx(EffectInstance* effect); +void fx_78_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_78", fx_78_main); diff --git a/src/effects/effect_79.c b/src/effects/effect_79.c index ebb9ed3daa..b5def0cc33 100644 --- a/src/effects/effect_79.c +++ b/src/effects/effect_79.c @@ -9,7 +9,7 @@ s32 D_E009EDF8[] = { 0x090014D0 }; s32 D_E009EDFC[] = { 0x090014F0 }; -void fx_79_appendGfx(EffectInstance* effect); +void fx_79_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_79", fx_79_main); diff --git a/src/effects/effect_8.c b/src/effects/effect_8.c index 74e74df2f9..b9db050222 100644 --- a/src/effects/effect_8.c +++ b/src/effects/effect_8.c @@ -6,7 +6,7 @@ extern Gfx D_09000E08[]; void fx_8_init(EffectInstance* effect); void fx_8_update(EffectInstance* effect); void fx_8_render(EffectInstance* effect); -void fx_8_appendGfx(EffectInstance* effect); +void fx_8_appendGfx(void* effect); void func_E0010000(Effect8* effect) { Matrix4f sp18; @@ -137,13 +137,13 @@ void func_E00104F4(EffectInstance* effect) { shim_remove_effect(effect); } -void fx_8_appendGfx(EffectInstance* effect) { +void fx_8_appendGfx(void* effect) { EffectInstance* effectTemp = effect; Effect8* part = effectTemp->data; s32 i; gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->effect->data)); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); for (i = 0; i < effectTemp->numParts; i++, part++) { if (part->unk_00 != 0) { diff --git a/src/effects/effect_81.c b/src/effects/effect_81.c index ac48763460..aa07bea10d 100644 --- a/src/effects/effect_81.c +++ b/src/effects/effect_81.c @@ -7,7 +7,7 @@ s32 D_E00A29DC[] = { 0x00000010, 0x00000010, 0x3F800000, 0x3F800000, 0x00000008, s32 D_E00A2A24[] = { 0x00000064, 0x0000003C, 0x0000001E, 0x0000000A, 0x00000000, 0x00000000, 0x00000000 }; -void fx_81_appendGfx(EffectInstance* effect); +void fx_81_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_81", fx_81_main); diff --git a/src/effects/effect_82.c b/src/effects/effect_82.c index 40010fadac..06861d0a07 100644 --- a/src/effects/effect_82.c +++ b/src/effects/effect_82.c @@ -5,7 +5,7 @@ typedef struct Effect82 { /* 0x00 */ s32 unk_00; } Effect82; // size = ?? -void fx_82_appendGfx(EffectInstance* effect); +void fx_82_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_82", fx_82_main); diff --git a/src/effects/effect_83.c b/src/effects/effect_83.c index 5f51035a91..8748e5ca8d 100644 --- a/src/effects/effect_83.c +++ b/src/effects/effect_83.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_83_appendGfx(EffectInstance* effect); +void fx_83_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_83", fx_83_main); diff --git a/src/effects/effect_84.c b/src/effects/effect_84.c index 402bca3055..7b652973cd 100644 --- a/src/effects/effect_84.c +++ b/src/effects/effect_84.c @@ -9,7 +9,7 @@ s32 D_E00A8678[] = { 0x00000001, 0x00020002, 0x00030003, 0x00030002, 0x00020001, s32 D_E00A8690[] = { D_E00A8648, 0x18000000, D_E00A8678, 0x0C000000 }; -void fx_84_appendGfx(EffectInstance* effect); +void fx_84_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_84", fx_84_main); diff --git a/src/effects/effect_85.c b/src/effects/effect_85.c index a426593f7c..29fb8aad2d 100644 --- a/src/effects/effect_85.c +++ b/src/effects/effect_85.c @@ -5,7 +5,7 @@ s32 D_E00AA6C0[] = { 0x090038F8, 0x09003968, 0x090039D8, 0x09003A48, 0x09003AB8, s8 D_E00AA6EC[] = { 0xFF, 0xFE, 0xFD, 0xFC, 0xFB, 0xFA, 0xF9, 0xF8, 0xF7, 0xF6, 0xF5, 0xF4, 0xF3, 0xF2, 0xF1, 0xF0, 0xEF, 0xEE, 0xED, 0xEF, 0xF1, 0xF3, 0xF5, 0xF7, 0xF9, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -void fx_85_appendGfx(EffectInstance* effect); +void fx_85_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_85", fx_85_main); diff --git a/src/effects/effect_87.c b/src/effects/effect_87.c index 9f53e4ae60..3bfe0b050d 100644 --- a/src/effects/effect_87.c +++ b/src/effects/effect_87.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_87_appendGfx(EffectInstance* effect); +void fx_87_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_87", fx_87_main); diff --git a/src/effects/effect_88.c b/src/effects/effect_88.c index 8afbb18173..278aa0f31c 100644 --- a/src/effects/effect_88.c +++ b/src/effects/effect_88.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_88_appendGfx(EffectInstance* effect); +void fx_88_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_88", fx_88_main); diff --git a/src/effects/effect_89.c b/src/effects/effect_89.c index bff54845a1..21627cc3fe 100644 --- a/src/effects/effect_89.c +++ b/src/effects/effect_89.c @@ -3,7 +3,7 @@ s32 D_E00B2BA0[] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFC88020, 0x00000000 }; -void fx_89_appendGfx(EffectInstance* effect); +void fx_89_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_89", fx_89_main); diff --git a/src/effects/effect_9.c b/src/effects/effect_9.c index 3780f9c705..295e07fb75 100644 --- a/src/effects/effect_9.c +++ b/src/effects/effect_9.c @@ -7,7 +7,7 @@ extern Gfx D_09000E38[]; void fx_9_init(EffectInstance* effect); void fx_9_update(EffectInstance* effect); void fx_9_render(EffectInstance* effect); -void fx_9_appendGfx(EffectInstance* effect); +void fx_9_appendGfx(void* effect); void func_E0012000(Effect8* effect) { Matrix4f sp18; @@ -155,14 +155,14 @@ void func_E0012548(EffectInstance* effect) { shim_remove_effect(effect); } -void fx_9_appendGfx(EffectInstance* effect) { +void fx_9_appendGfx(void* effect) { EffectInstance* effectTemp = effect; - Effect8* part = (Effect8*)effectTemp->data; + Effect8* part = effectTemp->data; Gfx* dlist; s32 i; gDPPipeSync(gMasterGfxPos++); - gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->effect->data)); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); for (i = 0; i < effectTemp->numParts; i++, part++) { if (part->unk_00 != 0) { diff --git a/src/effects/effect_90.c b/src/effects/effect_90.c index 4fb7e9c976..65c3f526e3 100644 --- a/src/effects/effect_90.c +++ b/src/effects/effect_90.c @@ -3,7 +3,7 @@ s32 D_E00B4CF0[] = { 0x1904E700, 0x04010048, 0xB0B0B000, 0x1600EA00, 0x03C30000, 0xB0B0B000, 0xEA00EA00, 0x003D0000, 0xB0B0B000, 0xE704E700, 0x00010048, 0xB0B0B000, 0x192EE700, 0x040103B7, 0xB0B0B000, 0xE72EE700, 0x000103B7, 0xB0B0B000, 0x1632EA00, 0x037A03E5, 0xAED0D800, 0xEA32EA00, 0x008503E5, 0xAED0D800, 0xEA321600, 0x008503E5, 0xAED0D800, 0x16321600, 0x037A03E5, 0xAED0D800, 0xEA00EA00, 0x00850019, 0x94A5B000, 0x1600EA00, 0x037A0019, 0x94A5B000, 0x16001600, 0x037A0019, 0x94A5B000, 0xEA001600, 0x00850019, 0x94A5B000, 0xEA321600, 0x03C303FD, 0x786E8800, 0xEA32EA00, 0x003D03FD, 0x786E8800, 0xE72EE700, 0x000003B7, 0x786E8800, 0xE72E1900, 0x040003B7, 0x786E8800, 0xE704E700, 0x00000048, 0x786E8800, 0xE7041900, 0x04000048, 0x786E8800, 0xEA00EA00, 0x003D0000, 0x786E8800, 0xEA001600, 0x03C30000, 0x786E8800, 0xEA32EA00, 0x003D03FD, 0xB0B0B000, 0x1632EA00, 0x03C303FD, 0xB0B0B000, 0x16001600, 0x03C30000, 0x786E8800, 0x1600EA00, 0x003D0000, 0x786E8800, 0x1904E700, 0x00000048, 0x786E8800, 0x19041900, 0x04000048, 0x786E8800, 0x192EE700, 0x000003B7, 0x786E8800, 0x192E1900, 0x040003B7, 0x786E8800, 0x1632EA00, 0x003D03FD, 0x786E8800, 0xEA001600, 0x003D0000, 0xF0F0F000, 0x19041900, 0x04010048, 0xF0F0F000, 0x192E1900, 0x040103B7, 0xF0F0F000, 0x16321600, 0x03C303FD, 0x786E8800, 0x16001600, 0x03C30000, 0xF0F0F000, 0xE7041900, 0x00010048, 0xF0F0F000, 0xE72E1900, 0x000103B7, 0xF0F0F000, 0x16321600, 0x03C303FD, 0xF0F0F000, 0xEA321600, 0x003D03FD, 0xF0F0F000 }; -void fx_90_appendGfx(EffectInstance* effect); +void fx_90_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_90", fx_90_main); diff --git a/src/effects/effect_91.c b/src/effects/effect_91.c index 8dfbb48e14..62cd5429b5 100644 --- a/src/effects/effect_91.c +++ b/src/effects/effect_91.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_91_appendGfx(EffectInstance* effect); +void fx_91_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_91", fx_91_main); diff --git a/src/effects/effect_92.c b/src/effects/effect_92.c index aa8aec4d25..c9aa475374 100644 --- a/src/effects/effect_92.c +++ b/src/effects/effect_92.c @@ -9,7 +9,7 @@ s32 D_E00B8B58[] = { 0x0000001E, 0x008C0000, 0xFF000006, 0x001E0078, 0x0000F000, s32 D_E00B8CA4[] = { 0x00000000, 0x00000028, 0x00000037, 0x000000BE, 0x00000014, 0x00000082, 0x0000010E, 0x0000012C, 0x00000000, 0x00000000, 0x00000000 }; -void fx_92_appendGfx(EffectInstance* effect); +void fx_92_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_92", fx_92_main); diff --git a/src/effects/effect_93.c b/src/effects/effect_93.c index 618b54de7b..1de7534bd9 100644 --- a/src/effects/effect_93.c +++ b/src/effects/effect_93.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_93_appendGfx(EffectInstance* effect); +void fx_93_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_93", fx_93_main); diff --git a/src/effects/effect_94.c b/src/effects/effect_94.c index 263d39da6f..2252f0738f 100644 --- a/src/effects/effect_94.c +++ b/src/effects/effect_94.c @@ -12,7 +12,7 @@ s32 D_E00BCD38[] = { 0x19191905, 0x19051919, 0x05191919, 0x04030201, 0x00000000, s32 D_E00BCE40[] = { D_E00BCC30, D_E00BCD38, 0x00000000, 0x00000000 }; -void fx_94_appendGfx(EffectInstance* effect); +void fx_94_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_94", fx_94_main); diff --git a/src/effects/effect_95.c b/src/effects/effect_95.c index 9fec458600..bdb9916023 100644 --- a/src/effects/effect_95.c +++ b/src/effects/effect_95.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_95_appendGfx(EffectInstance* effect); +void fx_95_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_95", fx_95_main); diff --git a/src/effects/effect_96.c b/src/effects/effect_96.c index 8dd9d7075f..f1fbbf47ca 100644 --- a/src/effects/effect_96.c +++ b/src/effects/effect_96.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_96_appendGfx(EffectInstance* effect); +void fx_96_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_96", fx_96_main); diff --git a/src/effects/effect_97.c b/src/effects/effect_97.c index f9e6ae7084..95ba78acb3 100644 --- a/src/effects/effect_97.c +++ b/src/effects/effect_97.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_97_appendGfx(EffectInstance* effect); +void fx_97_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_97", fx_97_main); diff --git a/src/effects/effect_98.c b/src/effects/effect_98.c index fa4952b9ae..258651eec9 100644 --- a/src/effects/effect_98.c +++ b/src/effects/effect_98.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_98_appendGfx(EffectInstance* effect); +void fx_98_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_98", fx_98_main); diff --git a/src/effects/effect_99.c b/src/effects/effect_99.c index 6b7b206408..bb4da5ca30 100644 --- a/src/effects/effect_99.c +++ b/src/effects/effect_99.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -void fx_99_appendGfx(EffectInstance* effect); +void fx_99_appendGfx(void* effect); INCLUDE_ASM(s32, "effects/effect_99", fx_99_main); diff --git a/src/heap.c b/src/heap.c index 52501a971f..322805a46a 100644 --- a/src/heap.c +++ b/src/heap.c @@ -1,9 +1,5 @@ #include "common.h" -extern HeapNode heap_collisionHead; -extern HeapNode heap_generalHead; -extern HeapNode heap_battleHead; - HeapNode* general_heap_create(void) { return _heap_create(&heap_generalHead, 0x54000); } diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c index 75b6ac1c9f..5360cd03a5 100644 --- a/src/world/area_arn/arn_03/events.c +++ b/src/world/area_arn/arn_03/events.c @@ -121,89 +121,7 @@ NpcSettings N(npcSettings_80241C3C) = { #include "world/common/UnkFunc16.inc.c" -ApiStatus N(func_80240B94_BDF924)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - f32 posX, posY, posZ, posW; - - territory.unk_00 = 0; - territory.shape = enemy->territory->patrol.detectShape; - territory.pointX = enemy->territory->patrol.detect.x; - territory.pointZ = enemy->territory->patrol.detect.z; - territory.sizeX = enemy->territory->patrol.detectSizeX; - territory.sizeZ = enemy->territory->patrol.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || enemy->unk_B0 & 4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->patrol.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - - if (enemy->unk_B0 & 4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = 100.0f; - - if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) { - npc->pos.y = posY; - } - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); - case 1: - N(UnkFunc13)(script, npcAISettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); - case 3: - N(UnkFunc14)(script, npcAISettings, territoryPtr); - break; - case 4: - N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); - break; - case 10: - N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); - case 11: - N(NpcJumpFunc)(script, npcAISettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); - case 13: - N(UnkFunc15)(script, npcAISettings, territoryPtr); - break; - case 14: - N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); - break; - case 15: - N(UnkFunc16)(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - return ApiStatus_BLOCK; -} +#include "world/common/UnkNpcAIMainFunc.inc.c" void N(func_80240E90_BDFC20)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/area_arn/arn_04/arn_04.h b/src/world/area_arn/arn_04/arn_04.h index 22826577e4..9c04a30ea8 100644 --- a/src/world/area_arn/arn_04/arn_04.h +++ b/src/world/area_arn/arn_04/arn_04.h @@ -8,7 +8,7 @@ #define NAMESPACE arn_04 s32 func_800493EC(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3); -ApiStatus N(func_80240B94_BE4344)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024219C_BE594C)(Evt* script, s32 isInitialCall); ApiStatus N(func_80243018_BE67C8)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index 1a48922b0c..ce8b890c91 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -49,7 +49,7 @@ NpcAISettings N(npcAISettings_80243660) = { }; EvtSource N(npcAI_80243690) = { - EVT_CALL(N(func_80240B94_BE4344), EVT_PTR(N(npcAISettings_80243660))) + EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAISettings_80243660))) EVT_RETURN EVT_END }; @@ -290,53 +290,7 @@ EvtSource N(makeEntities) = { #include "world/common/UnkNpcAIFunc24.inc.c" -void N(func_80240158_BE3908)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - - if (npc->turnAroundYawAdjustment == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = (*(enemy->territory->patrol.points + script->functionTemp[2])).x; - z = (*(enemy->territory->patrol.points + script->functionTemp[2])).z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1] == 0)) { - script->functionTemp[0] = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0] = 4; - } - } - } -} +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" @@ -356,226 +310,11 @@ void N(func_80240158_BE3908)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit #include "world/common/UnkFunc16.inc.c" -ApiStatus N(func_80240B94_BE4344)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); - f32 posX, posY, posZ, posW; - - territory.unk_00 = 0; - territory.shape = enemy->territory->patrol.detectShape; - territory.pointX = enemy->territory->patrol.detect.x; - territory.pointZ = enemy->territory->patrol.detect.z; - territory.sizeX = enemy->territory->patrol.detectSizeX; - territory.sizeZ = enemy->territory->patrol.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || enemy->unk_B0 & 4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->patrol.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - - if (enemy->unk_B0 & 4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = 100.0f; - - if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) { - npc->pos.y = posY; - } - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc24)(script, aiSettings, territoryPtr); - case 1: - N(func_80240158_BE3908)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc14)(script, aiSettings, territoryPtr); - break; - case 4: - N(UnkNpcAIFunc25)(script, aiSettings, territoryPtr); - break; - case 10: - N(NpcJumpFunc2)(script, aiSettings, territoryPtr); - case 11: - N(NpcJumpFunc)(script, aiSettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr); - case 13: - N(UnkFunc15)(script, aiSettings, territoryPtr); - break; - case 14: - N(UnkNpcDurationFlagFunc)(script, aiSettings, territoryPtr); - break; - case 15: - N(UnkFunc16)(script, aiSettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - return ApiStatus_BLOCK; -} +#include "world/common/UnkNpcAIMainFunc.inc.c" #include "world/common/UnkNpcAIFunc23.inc.c" -#ifdef NON_EQUIVALENT -//second npc_raycast_down_sides call -void N(func_80241040_BE47F0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f24; - f32 yPhi; - f32 posX, posY, posZ, posW; - s32 cond = FALSE; - - f32 vt7 = (f32)enemy->varTable[7] / 100.0; - f32 vt3 = (f32)enemy->varTable[3] / 100.0; - f32 vtY = (f32)enemy->varTable[4] / 100.0; - f32 vt1 = (f32)enemy->varTable[1] / 100.0; - - enemy->varTable[4] = npc->pos.y * 100.0; - temp_f24 = vt3 + vt7; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (vt1 < temp_f24 - npc->pos.y) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - if (vt1 < (vt3 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - if (npc->flags & 8) { - yPhi = temp_f24; - npc->pos.y = ((yPhi - vtY) * 0.09) + vtY; - } else { - posX = npc->pos.x; - posY = vtY; - posZ = npc->pos.z; - posW = 1000.0f; - - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - yPhi = posY; - yPhi += vt3; - npc->pos.y = vtY + ((yPhi - vtY) * 0.09); - } - - if (fabsf(yPhi - npc->pos.y) < 1.0) { - npc->pos.y = yPhi; - enemy->varTable[0] &= ~0x10; - } - } else if (enemy->varTable[1] > 0) { - f32 sinTheta = sin_deg(enemy->varTable[2]); - s32 rayHit; - - if (npc->flags & 8) { - rayHit = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - rayHit = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - } - if (rayHit) { - npc->pos.y = posY + vt3 + (sinTheta * vt1); - } else { - npc->pos.y = temp_f24 + (sinTheta * vt1); - } - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - s32 var; - - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - cond = TRUE; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | cond) { - if (npc->turnAroundYawAdjustment == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - return; - } - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0 && (npc->duration <= 0 || --npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if (aiSettings->unk_2C <= 0 || aiSettings->waitTime <= 0 || script->functionTemp[1] < 3) { - script->functionTemp[0] = 0; - } - } -} -#else -INCLUDE_ASM(void, "world/area_arn/arn_04/events", arn_04_func_80241040_BE47F0, Evt* script, - NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1_copy.inc.c" @@ -635,7 +374,7 @@ ApiStatus N(func_8024219C_BE594C)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_80241040_BE47F0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); return ApiStatus_BLOCK; case 2: N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); diff --git a/src/world/area_arn/arn_05/events.c b/src/world/area_arn/arn_05/events.c index 6f7ebc5093..7f79053535 100644 --- a/src/world/area_arn/arn_05/events.c +++ b/src/world/area_arn/arn_05/events.c @@ -1037,90 +1037,7 @@ EvtSource N(makeEntities) = { #include "world/common/UnkFunc16.inc.c" -ApiStatus N(func_80240B94_BE8774)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); - f32 posX, posY, posZ, posW; - - territory.unk_00 = 0; - territory.shape = enemy->territory->patrol.detectShape; - territory.pointX = enemy->territory->patrol.detect.x; - territory.pointZ = enemy->territory->patrol.detect.z; - territory.sizeX = enemy->territory->patrol.detectSizeX; - territory.sizeZ = enemy->territory->patrol.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || enemy->unk_B0 & 4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->patrol.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - - if (enemy->unk_B0 & 4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = 100.0f; - - if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) { - npc->pos.y = posY; - } - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc24)(script, aiSettings, territoryPtr); - case 1: - N(UnkFunc13)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc14)(script, aiSettings, territoryPtr); - break; - case 4: - N(UnkNpcAIFunc25)(script, aiSettings, territoryPtr); - break; - case 10: - N(NpcJumpFunc2)(script, aiSettings, territoryPtr); - case 11: - N(NpcJumpFunc)(script, aiSettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr); - case 13: - N(UnkFunc15)(script, aiSettings, territoryPtr); - break; - case 14: - N(UnkNpcDurationFlagFunc)(script, aiSettings, territoryPtr); - break; - case 15: - N(UnkFunc16)(script, aiSettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} +#include "world/common/UnkNpcAIMainFunc.inc.c" void N(func_80240E90_BE8A70)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index 6393302746..9e9d6c13ae 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -1205,149 +1205,7 @@ NpcGroupList N(npcGroupList_802478E8) = { #include "world/common/UnkNpcAIFunc23.inc.c" -#ifdef NON_EQUIVALENT -void N(func_80240B00_BED8F0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f24; - f32 posX, posY, posZ, posW; - s32 var; - f32 temp_f0; - f32 phi_f4; - s32 phi_v0; - s32 phi_s4 = 0; - - f32 a = enemy->varTable[7]; - f32 temp_f2 = a / 100.0; - f32 b = enemy->varTable[3]; - f32 temp_f26 = b / 100.0; - f32 c = enemy->varTable[4]; - f32 temp_f20 = c / 100.0; - f32 d = enemy->varTable[1]; - f32 temp_f22 = d / 100.0; - - enemy->varTable[4] = npc->pos.y * 100.0; - temp_f24 = temp_f26 + temp_f2; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (temp_f22 < (temp_f24 - npc->pos.y)) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - if (temp_f22 < (temp_f26 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - f64 test; - if (npc->flags & 8) { - phi_f4 = temp_f24; - test = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - npc->pos.y = test; - } else { - posX = npc->pos.x; - posY = temp_f20; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - phi_f4 = posY; - phi_f4 += temp_f26; - d = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - test = d; - npc->pos.y = test; - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - - if (fabsf(phi_f4 - npc->pos.y) < 1.0) { - npc->pos.y = phi_f4; - enemy->varTable[0] &= ~0x10; - } - } else if (enemy->varTable[1] > 0) { - temp_f0 = sin_deg(enemy->varTable[2]); - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - } - if (phi_v0) { - npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f0 * temp_f22); - } - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - phi_s4 = 1; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { - if (npc->turnAroundYawAdjustment == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - return; - } - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0) { - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) { - script->functionTemp[0] = 0; - } - } - } -} -#else -INCLUDE_ASM(void, "world/area_arn/arn_07/events", arn_07_func_80240B00_BED8F0, Evt* script, - NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" @@ -1407,7 +1265,7 @@ ApiStatus N(func_80241C5C_BEEA4C)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_80240B00_BED8F0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); return ApiStatus_BLOCK; case 2: N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index d6cb1bbe00..cb419e829e 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -2,6 +2,7 @@ #include "sprite/npc/sentinel.h" #include "sprite/npc/world_tubba.h" #include "message_ids.h" +#include "effects.h" EntryList N(entryList) = { { 0.0f, 0.0f, 485.0f, 0.0f }, @@ -503,150 +504,7 @@ NpcAISettings N(npcAISettings_80244D24) = { #include "world/common/UnkNpcAIFunc23.inc.c" -#ifdef NON_EQUIVALENT -// second npc_raycast_down_sides call -void N(func_802402D0_BFDB50)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f24; - f32 posX, posY, posZ, posW; - s32 var; - f32 temp_f0; - f32 phi_f4; - s32 phi_v0; - s32 phi_s4 = 0; - - f32 a = enemy->varTable[7]; - f32 temp_f2 = a / 100.0; - f32 b = enemy->varTable[3]; - f32 temp_f26 = b / 100.0; - f32 c = enemy->varTable[4]; - f32 temp_f20 = c / 100.0; - f32 d = enemy->varTable[1]; - f32 temp_f22 = d / 100.0; - - enemy->varTable[4] = npc->pos.y * 100.0; - temp_f24 = temp_f26 + temp_f2; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (temp_f22 < (temp_f24 - npc->pos.y)) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - if (temp_f22 < (temp_f26 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - f64 test; - if (npc->flags & 8) { - phi_f4 = temp_f24; - test = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - npc->pos.y = test; - } else { - posX = npc->pos.x; - posY = temp_f20; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - phi_f4 = posY; - phi_f4 += temp_f26; - d = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - test = d; - npc->pos.y = test; - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - - if (fabsf(phi_f4 - npc->pos.y) < 1.0) { - npc->pos.y = phi_f4; - enemy->varTable[0] &= ~0x10; - } - } else if (enemy->varTable[1] > 0) { - temp_f0 = sin_deg(enemy->varTable[2]); - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - } - if (phi_v0) { - npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f0 * temp_f22); - } - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - phi_s4 = 1; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { - if (npc->turnAroundYawAdjustment == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - return; - } - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0) { - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) { - script->functionTemp[0] = 0; - } - } - } -} -#else -INCLUDE_ASM(void, "world/area_dgb/dgb_01/BFD9A0", dgb_01_func_802402D0_BFDB50, Evt* script, - NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" @@ -706,7 +564,7 @@ ApiStatus N(func_8024142C_BFECAC)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_802402D0_BFDB50)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); @@ -881,7 +739,7 @@ void N(func_80241CA8_BFF528)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit if (!(npc->pos.y < (posY + temp_f20))) { npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); npc->pos.y = posY + temp_f20; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); + fx_emote(2, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); npc->duration = 10; script->functionTemp[0] = 18; } @@ -950,7 +808,7 @@ void N(func_80241F98_BFF818)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit if (script->functionTemp[1] <= 0) { script->functionTemp[1] = aiSettings->unk_14; if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + fx_emote(0, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); npc->moveToPos.y = npc->pos.y; script->functionTemp[0] = 12; @@ -997,7 +855,7 @@ ApiStatus N(func_802422B0_BFFB30)(Evt* script, s32 isInitialCall) { N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); case 1: - N(func_802402D0_BFDB50)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); if (script->functionTemp[0] == 12) { npc->duration = 6; } diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index e6fd765542..9cda4ca343 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -884,90 +884,7 @@ ApiStatus N(func_8024086C_C31D4C)(Evt* script, s32 isInitialCall) { #include "world/common/UnkFunc16.inc.c" -ApiStatus N(func_802416B4_C32B94)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - f32 posX, posY, posZ, posW; - - territory.unk_00 = 0; - territory.shape = enemy->territory->patrol.detectShape; - territory.pointX = enemy->territory->patrol.detect.x; - territory.pointZ = enemy->territory->patrol.detect.z; - territory.sizeX = enemy->territory->patrol.detectSizeX; - territory.sizeZ = enemy->territory->patrol.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || enemy->unk_B0 & 4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->patrol.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - - if (enemy->unk_B0 & 4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = 100.0f; - - if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) { - npc->pos.y = posY; - } - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); - case 1: - N(UnkFunc13)(script, npcAISettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); - case 3: - N(UnkFunc14)(script, npcAISettings, territoryPtr); - break; - case 4: - N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); - break; - case 10: - N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); - case 11: - N(NpcJumpFunc)(script, npcAISettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); - case 13: - N(UnkFunc15)(script, npcAISettings, territoryPtr); - break; - case 14: - N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); - break; - case 15: - N(UnkFunc16)(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} +#include "world/common/UnkNpcAIMainFunc.inc.c" ApiStatus N(func_802419B0_C32E90)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index c9d322faa6..183b009a0c 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -417,150 +417,7 @@ EvtSource N(makeEntities) = { #include "world/common/UnkNpcAIFunc23.inc.c" -#ifdef NON_EQUIVALENT -// second npc_raycast_down_sides call -void N(func_802401B0_C366E0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f24; - f32 posX, posY, posZ, posW; - s32 var; - f32 temp_f0; - f32 phi_f4; - s32 phi_v0; - s32 phi_s4 = 0; - - f32 a = enemy->varTable[7]; - f32 temp_f2 = a / 100.0; - f32 b = enemy->varTable[3]; - f32 temp_f26 = b / 100.0; - f32 c = enemy->varTable[4]; - f32 temp_f20 = c / 100.0; - f32 d = enemy->varTable[1]; - f32 temp_f22 = d / 100.0; - - enemy->varTable[4] = npc->pos.y * 100.0; - temp_f24 = temp_f26 + temp_f2; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (temp_f22 < (temp_f24 - npc->pos.y)) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - if (temp_f22 < (temp_f26 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - f64 test; - if (npc->flags & 8) { - phi_f4 = temp_f24; - test = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - npc->pos.y = test; - } else { - posX = npc->pos.x; - posY = temp_f20; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - phi_f4 = posY; - phi_f4 += temp_f26; - d = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - test = d; - npc->pos.y = test; - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - - if (fabsf(phi_f4 - npc->pos.y) < 1.0) { - npc->pos.y = phi_f4; - enemy->varTable[0] &= ~0x10; - } - } else if (enemy->varTable[1] > 0) { - temp_f0 = sin_deg(enemy->varTable[2]); - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - } - if (phi_v0) { - npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f0 * temp_f22); - } - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - phi_s4 = 1; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { - if (npc->turnAroundYawAdjustment == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - return; - } - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0) { - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) { - script->functionTemp[0] = 0; - } - } - } -} -#else -INCLUDE_ASM(void, "world/area_dgb/dgb_04/C36530", dgb_04_func_802401B0_C366E0, Evt* script, - NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" @@ -620,7 +477,7 @@ ApiStatus N(func_8024130C_C3783C)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_802401B0_C366E0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); @@ -901,7 +758,7 @@ ApiStatus N(func_80242154_C38684)(Evt* script, s32 isInitialCall) { N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); case 1: - N(func_802401B0_C366E0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); if (script->functionTemp[0] == 12) { npc->duration = 6; } diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 11a041b644..8566629ae8 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -1192,150 +1192,7 @@ ApiStatus N(func_802414AC_C4125C)(Evt* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc23.inc.c" -#ifdef NON_EQUIVALENT -// second npc_raycast_down_sides call -void N(func_80241910_C416C0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f24; - f32 posX, posY, posZ, posW; - s32 var; - f32 temp_f0; - f32 phi_f4; - s32 phi_v0; - s32 phi_s4 = 0; - - f32 a = enemy->varTable[7]; - f32 temp_f2 = a / 100.0; - f32 b = enemy->varTable[3]; - f32 temp_f26 = b / 100.0; - f32 c = enemy->varTable[4]; - f32 temp_f20 = c / 100.0; - f32 d = enemy->varTable[1]; - f32 temp_f22 = d / 100.0; - - enemy->varTable[4] = npc->pos.y * 100.0; - temp_f24 = temp_f26 + temp_f2; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (temp_f22 < (temp_f24 - npc->pos.y)) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - if (temp_f22 < (temp_f26 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - f64 test; - if (npc->flags & 8) { - phi_f4 = temp_f24; - test = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - npc->pos.y = test; - } else { - posX = npc->pos.x; - posY = temp_f20; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - phi_f4 = posY; - phi_f4 += temp_f26; - d = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - test = d; - npc->pos.y = test; - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - - if (fabsf(phi_f4 - npc->pos.y) < 1.0) { - npc->pos.y = phi_f4; - enemy->varTable[0] &= ~0x10; - } - } else if (enemy->varTable[1] > 0) { - temp_f0 = sin_deg(enemy->varTable[2]); - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - } - if (phi_v0) { - npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f0 * temp_f22); - } - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - phi_s4 = 1; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { - if (npc->turnAroundYawAdjustment == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - return; - } - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0) { - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) { - script->functionTemp[0] = 0; - } - } - } -} -#else -INCLUDE_ASM(void, "world/area_dgb/dgb_08/C3FDB0", dgb_08_func_80241910_C416C0, Evt* script, - NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1_copy.inc.c" @@ -1395,7 +1252,7 @@ ApiStatus N(func_80242A6C_C4281C)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_80241910_C416C0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); @@ -1687,7 +1544,7 @@ ApiStatus N(func_802438F0_C436A0)(Evt* script, s32 isInitialCall) { N(UnkNpcAIFunc23)(script, npcAISettings, territoryPtr); func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); case 1: - N(func_80241910_C416C0)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc35)(script, npcAISettings, territoryPtr); if (script->functionTemp[0] == 12) { npc->duration = 6; } diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 0614c1defe..6754affaf4 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -1003,150 +1003,7 @@ ApiStatus N(func_802410D4_C47CB4)(Evt* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc23.inc.c" -#ifdef NON_EQUIVALENT -// second npc_raycast_down_sides call -void N(func_802415D4_C481B4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f24; - f32 posX, posY, posZ, posW; - s32 var; - f32 temp_f0; - f32 phi_f4; - s32 phi_v0; - s32 phi_s4 = 0; - - f32 a = enemy->varTable[7]; - f32 temp_f2 = a / 100.0; - f32 b = enemy->varTable[3]; - f32 temp_f26 = b / 100.0; - f32 c = enemy->varTable[4]; - f32 temp_f20 = c / 100.0; - f32 d = enemy->varTable[1]; - f32 temp_f22 = d / 100.0; - - enemy->varTable[4] = npc->pos.y * 100.0; - temp_f24 = temp_f26 + temp_f2; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (temp_f22 < (temp_f24 - npc->pos.y)) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - if (temp_f22 < (temp_f26 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - f64 test; - if (npc->flags & 8) { - phi_f4 = temp_f24; - test = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - npc->pos.y = test; - } else { - posX = npc->pos.x; - posY = temp_f20; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - phi_f4 = posY; - phi_f4 += temp_f26; - d = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - test = d; - npc->pos.y = test; - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - - if (fabsf(phi_f4 - npc->pos.y) < 1.0) { - npc->pos.y = phi_f4; - enemy->varTable[0] &= ~0x10; - } - } else if (enemy->varTable[1] > 0) { - temp_f0 = sin_deg(enemy->varTable[2]); - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - } - if (phi_v0) { - npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f0 * temp_f22); - } - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - phi_s4 = 1; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { - if (npc->turnAroundYawAdjustment == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - return; - } - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0) { - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) { - script->functionTemp[0] = 0; - } - } - } -} -#else -INCLUDE_ASM(void, "world/area_dgb/dgb_09/C46BE0", dgb_09_func_802415D4_C481B4, Evt* script, - NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" @@ -1206,7 +1063,7 @@ ApiStatus N(func_80242730_C49310)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_802415D4_C481B4)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); @@ -1490,7 +1347,7 @@ ApiStatus N(func_80243578_C4A158)(Evt* script, s32 isInitialCall) { N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); case 1: - N(func_802415D4_C481B4)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); if (script->functionTemp[0] == 12) { npc->duration = 6; } diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 5308d4c07a..deffeba9b8 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -515,7 +515,7 @@ NpcAISettings N(npcAISettings_8024508C) = { }; EvtSource N(npcAI_802450BC) = { - EVT_CALL(N(func_80241174_95C374), EVT_PTR(N(npcAISettings_8024508C))) + EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAISettings_8024508C))) EVT_RETURN EVT_END }; @@ -2966,89 +2966,7 @@ EvtSource N(makeEntities) = { #include "world/common/UnkFunc16.inc.c" -ApiStatus N(func_80241174_95C374)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - f32 posX, posY, posZ, posW; - - territory.unk_00 = 0; - territory.shape = enemy->territory->patrol.detectShape; - territory.pointX = enemy->territory->patrol.detect.x; - territory.pointZ = enemy->territory->patrol.detect.z; - territory.sizeX = enemy->territory->patrol.detectSizeX; - territory.sizeZ = enemy->territory->patrol.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || enemy->unk_B0 & 4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->patrol.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - - if (enemy->unk_B0 & 4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = 100.0f; - - if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) { - npc->pos.y = posY; - } - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); - case 1: - N(UnkFunc13)(script, npcAISettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); - case 3: - N(UnkFunc14)(script, npcAISettings, territoryPtr); - break; - case 4: - N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); - break; - case 10: - N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); - case 11: - N(NpcJumpFunc)(script, npcAISettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); - case 13: - N(UnkFunc15)(script, npcAISettings, territoryPtr); - break; - case 14: - N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); - break; - case 15: - N(UnkFunc16)(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - return ApiStatus_BLOCK; -} +#include "world/common/UnkNpcAIMainFunc.inc.c" ApiStatus N(func_80241470_95C670)(Evt* script, s32 isInitialCall) { s32 i; diff --git a/src/world/area_dro/dro_01/dro_01.h b/src/world/area_dro/dro_01/dro_01.h index 678599f4f6..53c50137ab 100644 --- a/src/world/area_dro/dro_01/dro_01.h +++ b/src/world/area_dro/dro_01/dro_01.h @@ -41,7 +41,7 @@ ApiStatus N(UnkYawFunc)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc25)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc27)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc26)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80241174_95C374)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); ApiStatus N(UnkQuizFunc)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc31)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc29)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 77949a82f1..09b853f843 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -371,7 +371,7 @@ NpcAISettings N(npcAISettings_8024286C) = { }; EvtSource N(npcAI_8024289C) = SCRIPT({ - N(func_80240BD4_C9EAF4)(N(npcAISettings_8024286C)); + N(UnkNpcAIMainFunc)(N(npcAISettings_8024286C)); }); NpcSettings N(npcSettings_802428BC) = { @@ -2102,89 +2102,7 @@ EvtSource N(makeEntities) = SCRIPT({ #include "world/common/UnkFunc16.inc.c" -ApiStatus N(func_80240BD4_C9EAF4)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - f32 posX, posY, posZ, posW; - - territory.unk_00 = 0; - territory.shape = enemy->territory->patrol.detectShape; - territory.pointX = enemy->territory->patrol.detect.x; - territory.pointZ = enemy->territory->patrol.detect.z; - territory.sizeX = enemy->territory->patrol.detectSizeX; - territory.sizeZ = enemy->territory->patrol.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || enemy->unk_B0 & 4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->patrol.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - - if (enemy->unk_B0 & 4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = 100.0f; - - if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) { - npc->pos.y = posY; - } - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); - case 1: - N(UnkFunc13)(script, npcAISettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); - case 3: - N(UnkFunc14)(script, npcAISettings, territoryPtr); - break; - case 4: - N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); - break; - case 10: - N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); - case 11: - N(NpcJumpFunc)(script, npcAISettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); - case 13: - N(UnkFunc15)(script, npcAISettings, territoryPtr); - break; - case 14: - N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); - break; - case 15: - N(UnkFunc16)(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - return ApiStatus_BLOCK; -} +#include "world/common/UnkNpcAIMainFunc.inc.c" ApiStatus N(PostChapter6StatUpdate)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; diff --git a/src/world/area_flo/flo_00/flo_00.h b/src/world/area_flo/flo_00/flo_00.h index 8b162b20fb..4f23d1bb77 100644 --- a/src/world/area_flo/flo_00/flo_00.h +++ b/src/world/area_flo/flo_00/flo_00.h @@ -10,7 +10,7 @@ ApiStatus N(SyncStatusMenu)(Evt* script, s32 isInitialCall); ApiStatus N(PostChapter6StatUpdate)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFloatFunc)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240000_C9DF20)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80240BD4_C9EAF4)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240ED0_C9EDF0)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240F10_C9EE30)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240F80_C9EEA0)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index d152d23bd8..d8aa2f613c 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -2,154 +2,7 @@ #include "world/common/UnkNpcAIFunc23.inc.c" -#ifdef NON_EQUIVALENT -void N(func_802404D0_CB54D0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f24; - f32 posX, posY, posZ, posW; - s32 var; - f32 temp_f0; - f32 phi_f4; - s32 phi_v0; - s32 phi_s4 = 0; - - f32 a = enemy->varTable[7]; - f32 temp_f2 = a / 100.0; - f32 b = enemy->varTable[3]; - f32 temp_f26 = b / 100.0; - f32 c = enemy->varTable[4]; - f32 temp_f20 = c / 100.0; - f32 d = enemy->varTable[1]; - f32 temp_f22 = d / 100.0; - - enemy->varTable[4] = npc->pos.y * 100.0; - temp_f24 = temp_f26 + temp_f2; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (temp_f22 < (temp_f24 - npc->pos.y)) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - if (temp_f22 < (temp_f26 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - // original m2c reference: - //if ((temp_s0->flags & 8) != 0) { - // phi_f0 = temp_f20 + ((temp_f24 - temp_f20) * D_802441A8_CB91A8); - // phi_f4 = temp_f24; - //} else { - // npc_raycast_down_sides(temp_s0->unk_80, &subroutine_argA, &subroutine_argB, &subroutine_argC, &subroutine_argD, temp_s0->pos.x, temp_f20, temp_s0->pos.z, 1000.0f); - // temp_f4 = subroutine_argB + temp_f26; - // phi_f0 = temp_f20 + ((temp_f4 - temp_f20) * D_802441B0_CB91B0); - // phi_f4 = temp_f4; - //} - //temp_s0->pos.y = phi_f0; - - f64 test; - if (npc->flags & 8) { - phi_f4 = temp_f24; - npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } else { - posX = npc->pos.x; - posY = temp_f20; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - phi_f4 = posY + temp_f26; - npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } - - if (fabsf(phi_f4 - npc->pos.y) < 1.0) { - npc->pos.y = phi_f4; - enemy->varTable[0] &= ~0x10; - } - } else if (enemy->varTable[1] > 0) { - temp_f0 = sin_deg(enemy->varTable[2]); - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - } - if (phi_v0) { - npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f0 * temp_f22); - } - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - phi_s4 = 1; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { - if (npc->turnAroundYawAdjustment == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - return; - } - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0) { - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) { - script->functionTemp[0] = 0; - } - } - } -} -#else -INCLUDE_ASM(ApiStatus, "world/area_flo/flo_09/CB5320", flo_09_func_802404D0_CB54D0, Evt* script, - NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" @@ -208,7 +61,7 @@ ApiStatus N(func_8024162C_CB662C)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, npcAISettings, territoryPtr); case 1: - N(func_802404D0_CB54D0)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc35)(script, npcAISettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 373656dadc..a31bbe770e 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -1223,155 +1223,7 @@ NpcGroupList N(npcGroupList_80247984) = { #include "world/common/UnkNpcAIFunc23.inc.c" -void N(func_80240374_CC3B84)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#ifdef NON_EQUIVALENT -void N(func_80240374_CC3B84)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f24; - f32 posX, posY, posZ, posW; - s32 var; - f32 temp_f0; - f32 phi_f4; - s32 phi_v0; - s32 phi_s4 = 0; - - f32 a = enemy->varTable[7]; - f32 temp_f2 = a / 100.0; - f32 b = enemy->varTable[3]; - f32 temp_f26 = b / 100.0; - f32 c = enemy->varTable[4]; - f32 temp_f20 = c / 100.0; - f32 d = enemy->varTable[1]; - f32 temp_f22 = d / 100.0; - - enemy->varTable[4] = npc->pos.y * 100.0; - temp_f24 = temp_f26 + temp_f2; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (temp_f22 < (temp_f24 - npc->pos.y)) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - if (temp_f22 < (temp_f26 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - // original m2c reference: - //if ((temp_s0->flags & 8) != 0) { - // phi_f0 = temp_f20 + ((temp_f24 - temp_f20) * D_802441A8_CB91A8); - // phi_f4 = temp_f24; - //} else { - // npc_raycast_down_sides(temp_s0->unk_80, &subroutine_argA, &subroutine_argB, &subroutine_argC, &subroutine_argD, temp_s0->pos.x, temp_f20, temp_s0->pos.z, 1000.0f); - // temp_f4 = subroutine_argB + temp_f26; - // phi_f0 = temp_f20 + ((temp_f4 - temp_f20) * D_802441B0_CB91B0); - // phi_f4 = temp_f4; - //} - //temp_s0->pos.y = phi_f0; - - f64 test; - if (npc->flags & 8) { - phi_f4 = temp_f24; - npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } else { - posX = npc->pos.x; - posY = temp_f20; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - phi_f4 = posY + temp_f26; - npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } - - if (fabsf(phi_f4 - npc->pos.y) < 1.0) { - npc->pos.y = phi_f4; - enemy->varTable[0] &= ~0x10; - } - } else if (enemy->varTable[1] > 0) { - temp_f0 = sin_deg(enemy->varTable[2]); - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - } - if (phi_v0) { - npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f0 * temp_f22); - } - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - phi_s4 = 1; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { - if (npc->turnAroundYawAdjustment == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - return; - } - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0) { - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) { - script->functionTemp[0] = 0; - } - } - } -} -#else -INCLUDE_ASM(void, "world/area_flo/flo_13/CC3850", flo_13_func_80240374_CC3B84, Evt* script, - NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" @@ -1431,7 +1283,7 @@ ApiStatus N(func_802414D0_CC4CE0)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_80240374_CC3B84)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 7410c6709f..a16ff74916 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -325,155 +325,7 @@ EvtSource N(80245224) = { #include "world/common/UnkNpcAIFunc23.inc.c" -#ifdef NON_EQUIVALENT -// second npc_raycast_down_sides call -void N(func_80240CC0_CCBFD0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f24; - f32 posX, posY, posZ, posW; - s32 var; - f32 temp_f0; - f32 phi_f4; - s32 phi_v0; - s32 phi_s4 = 0; - - f32 a = enemy->varTable[7]; - f32 temp_f2 = a / 100.0; - f32 b = enemy->varTable[3]; - f32 temp_f26 = b / 100.0; - f32 c = enemy->varTable[4]; - f32 temp_f20 = c / 100.0; - f32 d = enemy->varTable[1]; - f32 temp_f22 = d / 100.0; - - enemy->varTable[4] = npc->pos.y * 100.0; - temp_f24 = temp_f26 + temp_f2; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (temp_f22 < (temp_f24 - npc->pos.y)) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - if (temp_f22 < (temp_f26 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - // original m2c reference: - //if ((temp_s0->flags & 8) != 0) { - // phi_f0 = temp_f20 + ((temp_f24 - temp_f20) * D_802441A8_CB91A8); - // phi_f4 = temp_f24; - //} else { - // npc_raycast_down_sides(temp_s0->unk_80, &subroutine_argA, &subroutine_argB, &subroutine_argC, &subroutine_argD, temp_s0->pos.x, temp_f20, temp_s0->pos.z, 1000.0f); - // temp_f4 = subroutine_argB + temp_f26; - // phi_f0 = temp_f20 + ((temp_f4 - temp_f20) * D_802441B0_CB91B0); - // phi_f4 = temp_f4; - //} - //temp_s0->pos.y = phi_f0; - - f64 test; - if (npc->flags & 8) { - phi_f4 = temp_f24; - npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } else { - posX = npc->pos.x; - posY = temp_f20; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - phi_f4 = posY + temp_f26; - npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } - - if (fabsf(phi_f4 - npc->pos.y) < 1.0) { - npc->pos.y = phi_f4; - enemy->varTable[0] &= ~0x10; - } - } else if (enemy->varTable[1] > 0) { - temp_f0 = sin_deg(enemy->varTable[2]); - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - } - if (phi_v0) { - npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f0 * temp_f22); - } - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - phi_s4 = 1; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { - if (npc->turnAroundYawAdjustment == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - return; - } - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0) { - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) { - script->functionTemp[0] = 0; - } - } - } -} -#else -INCLUDE_ASM(void, "world/area_flo/flo_14/CCBE20", flo_14_func_80240CC0_CCBFD0, Evt* script, - NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" @@ -533,7 +385,7 @@ ApiStatus N(func_80241E1C_CCD12C)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_80240CC0_CCBFD0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 67c045149e..f8a80cfe17 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -353,150 +353,7 @@ EvtSource N(802451C4) = { #include "world/common/UnkNpcAIFunc23.inc.c" -#ifdef NON_EQUIVALENT -// second npc_raycast_down_sides call -void N(func_80241000_CD2E30)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f24; - f32 posX, posY, posZ, posW; - s32 var; - f32 temp_f0; - f32 phi_f4; - s32 phi_v0; - s32 phi_s4 = 0; - - f32 a = enemy->varTable[7]; - f32 temp_f2 = a / 100.0; - f32 b = enemy->varTable[3]; - f32 temp_f26 = b / 100.0; - f32 c = enemy->varTable[4]; - f32 temp_f20 = c / 100.0; - f32 d = enemy->varTable[1]; - f32 temp_f22 = d / 100.0; - - enemy->varTable[4] = npc->pos.y * 100.0; - temp_f24 = temp_f26 + temp_f2; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (temp_f22 < (temp_f24 - npc->pos.y)) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - if (temp_f22 < (temp_f26 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - f64 test; - if (npc->flags & 8) { - phi_f4 = temp_f24; - test = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - npc->pos.y = test; - } else { - posX = npc->pos.x; - posY = temp_f20; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - phi_f4 = posY; - phi_f4 += temp_f26; - d = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - test = d; - npc->pos.y = test; - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - - if (fabsf(phi_f4 - npc->pos.y) < 1.0) { - npc->pos.y = phi_f4; - enemy->varTable[0] &= ~0x10; - } - } else if (enemy->varTable[1] > 0) { - temp_f0 = sin_deg(enemy->varTable[2]); - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - } - if (phi_v0) { - npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f0 * temp_f22); - } - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - phi_s4 = 1; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { - if (npc->turnAroundYawAdjustment == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - return; - } - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0) { - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) { - script->functionTemp[0] = 0; - } - } - } -} -#else -INCLUDE_ASM(void, "world/area_flo/flo_16/CD2C80", flo_16_func_80241000_CD2E30, Evt* script, - NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" @@ -556,7 +413,7 @@ ApiStatus N(func_8024215C_CD3F8C)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_80241000_CD2E30)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); @@ -622,7 +479,7 @@ ApiStatus N(func_80242754_CD4584)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_80241000_CD2E30)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 260df7671b..9d896e1d0d 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -627,151 +627,7 @@ EvtSource N(makeEntities) = { #include "world/common/UnkNpcAIFunc23.inc.c" -void N(func_80240220_CD7500)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#ifdef NON_EQUIVALENT -// second npc_raycast_down_sides call -void N(func_80240220_CD7500)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f24; - f32 posX, posY, posZ, posW; - s32 var; - f32 temp_f0; - f32 phi_f4; - s32 phi_v0; - s32 phi_s4 = 0; - - f32 a = enemy->varTable[7]; - f32 temp_f2 = a / 100.0; - f32 b = enemy->varTable[3]; - f32 temp_f26 = b / 100.0; - f32 c = enemy->varTable[4]; - f32 temp_f20 = c / 100.0; - f32 d = enemy->varTable[1]; - f32 temp_f22 = d / 100.0; - - enemy->varTable[4] = npc->pos.y * 100.0; - temp_f24 = temp_f26 + temp_f2; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (temp_f22 < (temp_f24 - npc->pos.y)) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - if (temp_f22 < (temp_f26 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - f64 test; - if (npc->flags & 8) { - phi_f4 = temp_f24; - test = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - npc->pos.y = test; - } else { - posX = npc->pos.x; - posY = temp_f20; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - phi_f4 = posY; - phi_f4 += temp_f26; - d = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - test = d; - npc->pos.y = test; - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - - if (fabsf(phi_f4 - npc->pos.y) < 1.0) { - npc->pos.y = phi_f4; - enemy->varTable[0] &= ~0x10; - } - } else if (enemy->varTable[1] > 0) { - temp_f0 = sin_deg(enemy->varTable[2]); - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - } - if (phi_v0) { - npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f0 * temp_f22); - } - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - phi_s4 = 1; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { - if (npc->turnAroundYawAdjustment == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - return; - } - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0) { - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) { - script->functionTemp[0] = 0; - } - } - } -} -#else -INCLUDE_ASM(void, "world/area_flo/flo_17/CD7350", flo_17_func_80240220_CD7500, Evt* script, - NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" @@ -831,7 +687,7 @@ ApiStatus N(func_8024137C_CD865C)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_80240220_CD7500)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 0d6c65e72f..12ef982cd2 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -516,150 +516,7 @@ static s32 N(pad_3CD8)[] = { #include "world/common/UnkNpcAIFunc23.inc.c" -#ifdef NON_EQUIVALENT -// second npc_raycast_down_sides call -void N(func_80241040_BE47F0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f24; - f32 posX, posY, posZ, posW; - s32 var; - f32 temp_f0; - f32 phi_f4; - s32 phi_v0; - s32 phi_s4 = 0; - - f32 a = enemy->varTable[7]; - f32 temp_f2 = a / 100.0; - f32 b = enemy->varTable[3]; - f32 temp_f26 = b / 100.0; - f32 c = enemy->varTable[4]; - f32 temp_f20 = c / 100.0; - f32 d = enemy->varTable[1]; - f32 temp_f22 = d / 100.0; - - enemy->varTable[4] = npc->pos.y * 100.0; - temp_f24 = temp_f26 + temp_f2; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (temp_f22 < (temp_f24 - npc->pos.y)) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - if (temp_f22 < (temp_f26 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - f64 test; - if (npc->flags & 8) { - phi_f4 = temp_f24; - test = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - npc->pos.y = test; - } else { - posX = npc->pos.x; - posY = temp_f20; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - phi_f4 = posY; - phi_f4 += temp_f26; - d = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - test = d; - npc->pos.y = test; - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - } - //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); - - if (fabsf(phi_f4 - npc->pos.y) < 1.0) { - npc->pos.y = phi_f4; - enemy->varTable[0] &= ~0x10; - } - } else if (enemy->varTable[1] > 0) { - temp_f0 = sin_deg(enemy->varTable[2]); - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); - } - if (phi_v0) { - npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f0 * temp_f22); - } - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - phi_s4 = 1; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { - if (npc->turnAroundYawAdjustment == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - return; - } - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0) { - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1] < 3)) { - script->functionTemp[0] = 0; - } - } - } -} -#else -INCLUDE_ASM(void, "world/area_flo/flo_25/CF2C10", flo_25_func_802401F0_CF2DC0, Evt* script, - NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" @@ -719,7 +576,7 @@ ApiStatus N(func_8024134C_CF3F1C)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_802401F0_CF2DC0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); @@ -787,7 +644,7 @@ ApiStatus N(func_80241944_CF4514)(Evt* script, s32 isInitialCall) { case 0: N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: - N(func_802401F0_CF2DC0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index 70aa4b233a..22ab1489ea 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802411A0_A173C0); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 608fad7d49..2c68e5ede8 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -4,7 +4,7 @@ #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240E60_A1BF60); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c index 3e7ee042d4..5dc28d3e33 100644 --- a/src/world/area_isk/isk_05/97DAD0.c +++ b/src/world/area_isk/isk_05/97DAD0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "isk_04"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240000_97DAD0); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240230_97DD00); diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/98F7E0.c index b4012c9ee8..20a8360dbc 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/98F7E0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "isk_12"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240000_98F7E0); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240230_98FA10); diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/992730.c index ef434a8f1a..22e386d753 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/992730.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "isk_10"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240000_992730); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240230_992960); diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index cb95d9a652..ee13c947d2 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -9,7 +9,7 @@ static char* N(exit_str_1) = "jan_02"; INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_8024030C_B2833C); -INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240340_B28370); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240570_B285A0); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index 7f36349b21..673c5d7139 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802407F0_B4B260); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802408A4_B4B314); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240AD4_B4B544); diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 20201bc083..8046832e97 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -1,6 +1,6 @@ #include "jan_06.h" -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240740_B52F70); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240970_B531A0); diff --git a/src/world/area_jan/jan_10/B6C6A0.c b/src/world/area_jan/jan_10/B6C6A0.c index 1c6a2d398e..2d26032cbf 100644 --- a/src/world/area_jan/jan_10/B6C6A0.c +++ b/src/world/area_jan/jan_10/B6C6A0.c @@ -1,6 +1,6 @@ #include "jan_10.h" -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240310_B6C6A0); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240540_B6C8D0); diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c index 5c76d81d43..3b08ebc0d2 100644 --- a/src/world/area_jan/jan_11/B70860.c +++ b/src/world/area_jan/jan_11/B70860.c @@ -17,4 +17,4 @@ INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240000_B70860); #include "world/common/SomeXYZFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240438_B70C98); +#include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_jan/jan_14/B7A510.c b/src/world/area_jan/jan_14/B7A510.c index a5b3a87bbf..1dfdf780ce 100644 --- a/src/world/area_jan/jan_14/B7A510.c +++ b/src/world/area_jan/jan_14/B7A510.c @@ -1,6 +1,6 @@ #include "jan_14.h" -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_802404C0_B7A510); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_802406F0_B7A740); diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index 8595f6d027..16caf74255 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "kmr_02"; #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802401B0_8CE220); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index f3b36bc3a9..4af457bfee 100644 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ b/src/world/area_kmr/kmr_06/8D1510.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "kmr_07"; #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_802401B0_8D16C0); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index 242dcc483b..b215ef433f 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "kmr_06"; #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802401B0_8D5FB0); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index 6d83a7341d..fbf3d8e8a0 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240690_C5ADD0); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index 2063fb3d05..6ae2714a8a 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802407F4_C6EB24); #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802409D0_C6ED00); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 253bd9ba4d..e61d51d42f 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80240C00_C72080); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index 6efcdaffef..e54e48e340 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240610_C807B0); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index a4e54a3f88..08f0ecc877 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -1,6 +1,6 @@ #include "mim_02.h" -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240070_B97C70); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802402A0_B97EA0); diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c index 2353199354..1161fc4880 100644 --- a/src/world/area_mim/mim_04/B9DB60.c +++ b/src/world/area_mim/mim_04/B9DB60.c @@ -1,6 +1,6 @@ #include "mim_04.h" -INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240200_B9DB60); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240430_B9DD90); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 61b95e6cdc..9e4c92f877 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240FA8_BA5728); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241CC4_BA6444); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241F14_BA6694); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80242144_BA68C4); diff --git a/src/world/area_mim/mim_07/BAA3B0.c b/src/world/area_mim/mim_07/BAA3B0.c index 21d205f54f..27a2654b2b 100644 --- a/src/world/area_mim/mim_07/BAA3B0.c +++ b/src/world/area_mim/mim_07/BAA3B0.c @@ -1,6 +1,6 @@ #include "mim_07.h" -INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240270_BAA3B0); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_802404A0_BAA5E0); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 573f14e38a..a1eac692bf 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -9,7 +9,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240068_BAD9A8); #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240250_BADB90); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_mim/mim_09/BB2E00.c b/src/world/area_mim/mim_09/BB2E00.c index a22c56e809..ab7852b403 100644 --- a/src/world/area_mim/mim_09/BB2E00.c +++ b/src/world/area_mim/mim_09/BB2E00.c @@ -7,7 +7,7 @@ static char* N(exit_str_1) = "mim_07"; INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240068_BB2E68); -INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802400A0_BB2EA0); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802402D0_BB30D0); diff --git a/src/world/area_nok/nok_03/9EB7F0.c b/src/world/area_nok/nok_03/9EB7F0.c index 1b986fad6b..03768f48e8 100644 --- a/src/world/area_nok/nok_03/9EB7F0.c +++ b/src/world/area_nok/nok_03/9EB7F0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "nok_02"; static char* N(exit_str_1) = "nok_04"; -INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240000_9EB7F0); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240230_9EBA20); diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index 3a643f543a..c872d8f8b4 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -15,7 +15,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80240394_9F4DD4); #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80240984_9F53C4); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_nok/nok_13/A00600.c b/src/world/area_nok/nok_13/A00600.c index 2d7d268e02..fd2e2fc4f5 100644 --- a/src/world/area_nok/nok_13/A00600.c +++ b/src/world/area_nok/nok_13/A00600.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "nok_01"; static char* N(exit_str_2) = "nok_14"; static char* N(exit_str_3) = ""; -INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240000_A00600); +#include "world/common/UnkNpcAIFunc36.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240230_A00830); diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index a756cacf5e..c1b01f3703 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240554_A02D94); #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240B44_A03384); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 96af57e299..a5c2e606b4 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -29,7 +29,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240674_A07574); #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240C64_A07B64); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 73d60b44f7..dfba1b01cb 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -19,7 +19,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402F4_DAD6F4); #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240550_DAD950); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index fca3bcc1e7..b0b12ebc61 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -21,7 +21,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240780_DB2A40); #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240C04_DB2EC4); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index a54fc3ccc7..ad88004f0c 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -51,7 +51,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241634_DBE8E4); #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241B28_DBEDD8); +#include "world/common/UnkNpcAIFunc35.inc.c" #define NAMESPACE dup_omo_07 #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index aac963bab4..fe2f03c09e 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240CE0_DEFB80); #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241164_DF0004); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index e666a9fc83..d103285abe 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -2,7 +2,7 @@ #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240700_D20590); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_tik/tik_01/869AA0.c b/src/world/area_tik/tik_01/869AA0.c index 937a75cf4d..78975dba2a 100644 --- a/src/world/area_tik/tik_01/869AA0.c +++ b/src/world/area_tik/tik_01/869AA0.c @@ -1,5 +1,5 @@ #include "tik_01.h" -INCLUDE_ASM(s32, "world/area_tik/tik_01/869AA0", func_802405F0_869AA0); +#include "world/common/UnkPosFunc2.inc.c" #include "world/common/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_02/86CD10.c b/src/world/area_tik/tik_02/86CD10.c index a7e667a61f..aa9e5f6e74 100644 --- a/src/world/area_tik/tik_02/86CD10.c +++ b/src/world/area_tik/tik_02/86CD10.c @@ -1,5 +1,5 @@ #include "tik_02.h" -INCLUDE_ASM(s32, "world/area_tik/tik_02/86CD10", func_802405D0_86CD10); +#include "world/common/UnkPosFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_02/86CD10", func_80240940_86D080); diff --git a/src/world/area_tik/tik_03/86F0F0.c b/src/world/area_tik/tik_03/86F0F0.c index 26b1c17023..0c3a7658e8 100644 --- a/src/world/area_tik/tik_03/86F0F0.c +++ b/src/world/area_tik/tik_03/86F0F0.c @@ -1,6 +1,6 @@ #include "tik_03.h" -INCLUDE_ASM(s32, "world/area_tik/tik_03/86F0F0", func_802405F0_86F0F0); +#include "world/common/UnkPosFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_03/86F0F0", func_80240960_86F460); diff --git a/src/world/area_tik/tik_04/872020.c b/src/world/area_tik/tik_04/872020.c index cc64098f89..bd13604c09 100644 --- a/src/world/area_tik/tik_04/872020.c +++ b/src/world/area_tik/tik_04/872020.c @@ -1,6 +1,6 @@ #include "tik_04.h" -INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_802405F0_872020); +#include "world/common/UnkPosFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_80240960_872390); diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index 8cb8d387b6..247cc6570c 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -1,6 +1,6 @@ #include "tik_05.h" -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240310_8750D0); +#include "world/common/UnkPosFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680_875440); diff --git a/src/world/area_tik/tik_06/8774D0.c b/src/world/area_tik/tik_06/8774D0.c index 072c493494..1df19a0d26 100644 --- a/src/world/area_tik/tik_06/8774D0.c +++ b/src/world/area_tik/tik_06/8774D0.c @@ -1,3 +1,3 @@ #include "tik_06.h" -INCLUDE_ASM(s32, "world/area_tik/tik_06/8774D0", func_802405F0_8774D0); +#include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index 9d134e3e29..bd970de95c 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -1,12 +1,12 @@ #include "tik_07.h" -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241020_87AC00); +#include "world/common/UnkPosFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241390_87AF70); #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802415A0_87B180); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_tik/tik_08/87F3E0.c b/src/world/area_tik/tik_08/87F3E0.c index 1dc9f9afb6..dd9b55c530 100644 --- a/src/world/area_tik/tik_08/87F3E0.c +++ b/src/world/area_tik/tik_08/87F3E0.c @@ -1,5 +1,5 @@ #include "tik_08.h" -INCLUDE_ASM(s32, "world/area_tik/tik_08/87F3E0", func_802405F0_87F3E0); +#include "world/common/UnkPosFunc2.inc.c" #include "world/common/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_09/8827B0.c b/src/world/area_tik/tik_09/8827B0.c index 694c5d9053..cced7a1694 100644 --- a/src/world/area_tik/tik_09/8827B0.c +++ b/src/world/area_tik/tik_09/8827B0.c @@ -1,5 +1,5 @@ #include "tik_09.h" -INCLUDE_ASM(s32, "world/area_tik/tik_09/8827B0", func_802405F0_8827B0); +#include "world/common/UnkPosFunc2.inc.c" #include "world/common/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_10/8866D0.c b/src/world/area_tik/tik_10/8866D0.c index 8f650323af..a1628a2716 100644 --- a/src/world/area_tik/tik_10/8866D0.c +++ b/src/world/area_tik/tik_10/8866D0.c @@ -1,6 +1,6 @@ #include "tik_10.h" -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240310_8866D0); +#include "world/common/UnkPosFunc2.inc.c" #include "world/common/SetOverrideFlags_40.inc.c" diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index 9ee8aa1279..ca55e7a888 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -1,6 +1,6 @@ #include "tik_12.h" -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_802405F0_8891C0); +#include "world/common/UnkPosFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240960_889530); diff --git a/src/world/area_tik/tik_14/88DBF0.c b/src/world/area_tik/tik_14/88DBF0.c index 904fdd6c6c..12baea21b9 100644 --- a/src/world/area_tik/tik_14/88DBF0.c +++ b/src/world/area_tik/tik_14/88DBF0.c @@ -1,3 +1,3 @@ #include "tik_14.h" -INCLUDE_ASM(s32, "world/area_tik/tik_14/88DBF0", func_802405F0_88DBF0); +#include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_15/890190.c b/src/world/area_tik/tik_15/890190.c index 591062a7a9..6614ee1800 100644 --- a/src/world/area_tik/tik_15/890190.c +++ b/src/world/area_tik/tik_15/890190.c @@ -1,6 +1,6 @@ #include "tik_15.h" -INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_802405F0_890190); +#include "world/common/UnkPosFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240960_890500); diff --git a/src/world/area_tik/tik_18/8959F0.c b/src/world/area_tik/tik_18/8959F0.c index 607b0358ae..8123b02f21 100644 --- a/src/world/area_tik/tik_18/8959F0.c +++ b/src/world/area_tik/tik_18/8959F0.c @@ -1,5 +1,5 @@ #include "tik_18.h" -INCLUDE_ASM(s32, "world/area_tik/tik_18/8959F0", func_80240310_8959F0); +#include "world/common/UnkPosFunc2.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_18/8959F0", func_80240680_895D60); diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c index ea8fdd334d..bd3bc36bad 100644 --- a/src/world/area_tik/tik_20/89A350.c +++ b/src/world/area_tik/tik_20/89A350.c @@ -21,4 +21,4 @@ static char* N(exit_str_3) = ""; #include "world/common/SomeXYZFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_802405EC_89A93C); +#include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c index 50efc9a33c..7a6119dea5 100644 --- a/src/world/area_tik/tik_21/89D7A0.c +++ b/src/world/area_tik/tik_21/89D7A0.c @@ -21,4 +21,4 @@ static char* N(exit_str_3) = ""; #include "world/common/SomeXYZFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_802405EC_89DD8C); +#include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c index e2a8133301..d0a7179e96 100644 --- a/src/world/area_tik/tik_22/89FEF0.c +++ b/src/world/area_tik/tik_22/89FEF0.c @@ -18,4 +18,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024061C_8A04DC); -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240640_8A0500); +#include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c index 0906b3680b..59355faa66 100644 --- a/src/world/area_tik/tik_23/8A23D0.c +++ b/src/world/area_tik/tik_23/8A23D0.c @@ -19,4 +19,4 @@ static char* N(exit_str_1) = "tik_20"; #include "world/common/UnkTexturePanFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_802405EC_8A29BC); +#include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_24/8A5DE0.c b/src/world/area_tik/tik_24/8A5DE0.c index a01210fa8e..a742b65a6d 100644 --- a/src/world/area_tik/tik_24/8A5DE0.c +++ b/src/world/area_tik/tik_24/8A5DE0.c @@ -1,6 +1,6 @@ #include "tik_24.h" -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_80240360_8A5DE0); +#include "world/common/UnkPosFunc2.inc.c" #include "world/common/set_script_owner_npc_anim.inc.c" diff --git a/src/world/area_tik/tik_25/8A7F80.c b/src/world/area_tik/tik_25/8A7F80.c index 2476225c93..a8b3c881b8 100644 --- a/src/world/area_tik/tik_25/8A7F80.c +++ b/src/world/area_tik/tik_25/8A7F80.c @@ -7,4 +7,4 @@ static char* N(exit_str_1) = ""; #include "world/common/UnkTexturePanFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_25/8A7F80", func_8024030C_8A828C); +#include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 29979cf00f..72b179828f 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241B14_9A9F04); #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241FC8_9AA3B8); +#include "world/common/UnkNpcAIFunc35.inc.c" #define NAMESPACE dup_trd_04 #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 492d2a79eb..0dcddf0bf6 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802406A4_9B7024); #include "world/common/UnkNpcAIFunc23.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240C94_9B7614); +#include "world/common/UnkNpcAIFunc35.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" diff --git a/src/world/common/UnkNpcAIFunc35.inc.c b/src/world/common/UnkNpcAIFunc35.inc.c new file mode 100644 index 0000000000..f9e20041e4 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc35.inc.c @@ -0,0 +1,147 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" + +void N(UnkNpcAIFunc35)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 cond = FALSE; + f32 vt7 = (f32)enemy->varTable[7] / 100.0; + f32 vt3 = (f32)enemy->varTable[3] / 100.0; + f32 vt4 = (f32)enemy->varTable[4] / 100.0; + f32 vt1 = (f32)enemy->varTable[1] / 100.0; + f32 posX, posY, posZ, posW; + f32 temp_f24; + + enemy->varTable[4] = npc->pos.y * 100.0; + + temp_f24 = vt3 + vt7; + + if ((enemy->varTable[0] & 0x11) == 1) { + if (npc->flags & 8) { + if (vt1 < temp_f24 - npc->pos.y) { + enemy->varTable[0] |= 0x10; + } + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); + if (vt1 < (vt3 - posW)) { + enemy->varTable[0] |= 0x10; + } + } + } + + if ((enemy->varTable[0] & 0x11) == 0x11) { + f64 test; + f32 yTemp; + + do { + if (npc->flags & 8) { + yTemp = temp_f24; + test = vt4 + ((temp_f24 - vt4) * 0.09); + npc->pos.y = test; + } else { + posX = npc->pos.x; + posY = vt4; + posZ = npc->pos.z; + posW = 1000.0f; + npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); + + yTemp = posY; + yTemp += vt3; + test = vt4 + ((yTemp - vt4) * 0.09); + npc->pos.y = test; + } + + if (fabsf(yTemp - npc->pos.y) < 1.0) { + npc->pos.y = yTemp; + enemy->varTable[0] &= ~0x10; + } + } while (0); // required to match + } else { + f32 vt1temp = vt1; // required to match + + if (enemy->varTable[1] > 0) { + f32 sinTemp = sin_deg(enemy->varTable[2]); + s32 hit; + + if (npc->flags & 8) { + hit = FALSE; + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + hit = npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW); + } + + if (hit) { + npc->pos.y = posY + vt3 + (sinTemp * vt1temp); + } else { + npc->pos.y = temp_f24 + (sinTemp * vt1temp); + } + + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); + } + } + + if (enemy->varTable[9] <= 0) { + if (aiSettings->unk_14 >= 0) { + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = aiSettings->unk_14; + if (gPlayerStatusPtr->position.y < (npc->pos.y + npc->collisionHeight) + 10.0 && + func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) + { + s32 emoteTemp; + + fx_emote(0, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xC, &emoteTemp); + npc->moveToPos.y = npc->pos.y; + ai_enemy_play_sound(npc, 0x2F4, 0x200000); + + if (enemy->npcSettings->unk_2A & 1) { + script->functionTemp[0] = 10; + } else { + script->functionTemp[0] = 12; + } + return; + } + } + script->functionTemp[1]--; + } + } else { + enemy->varTable[9]--; + } + + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.point.x, + enemy->territory->wander.point.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { + posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); + if (npc->moveSpeed < posW) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + cond = TRUE; + } + } + + if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | cond) { + if (npc->turnAroundYawAdjustment != 0) { + return; + } + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + + enemy->varTable[4] = npc->pos.y * 100.0; + if (aiSettings->moveTime > 0) { + if ((npc->duration <= 0) || (--npc->duration <= 0)) { + script->functionTemp[0] = 2; + script->functionTemp[1] = (rand_int(1000) % 3) + 2; + if (aiSettings->unk_2C <= 0 || aiSettings->waitTime <= 0 || script->functionTemp[1] < 3) { + script->functionTemp[0] = 0; + } + } + } +} diff --git a/src/world/common/UnkNpcAIFunc36.inc.c b/src/world/common/UnkNpcAIFunc36.inc.c new file mode 100644 index 0000000000..e032759eb2 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc36.inc.c @@ -0,0 +1,41 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" + +void N(UnkNpcAIFunc36)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 x, y, z; + + func_800495A0(script, aiSettings, territory); + npc->flags |= NPC_FLAG_NO_Y_MOVEMENT; + npc->jumpVelocity = (rand_int(45) / 10.0) + 8.0; + npc->jumpScale = 1.5f; + ai_enemy_play_sound(npc, 0xB0000017, 0); + + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.point.x, + enemy->territory->wander.point.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ) != 0) + { + s32 i; + + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + x = npc->pos.x; + y = npc->pos.y; + z = npc->pos.z; + + for (i = 0; i < 6; i++) { + if (npc_test_move_simple_with_slipping(npc->unk_80, &x, &y, &z, 25.0f, + npc->yaw, npc->collisionHeight, npc->collisionRadius) != 0) + { + npc->yaw += 30.0; + } else { + break; + } + } + } else { + npc->yaw = clamp_angle(npc->yaw + rand_int(60) - 30.0f); + } +} diff --git a/src/world/common/UnkNpcAIMainFunc.inc.c b/src/world/common/UnkNpcAIMainFunc.inc.c new file mode 100644 index 0000000000..8f1cc8a3d8 --- /dev/null +++ b/src/world/common/UnkNpcAIMainFunc.inc.c @@ -0,0 +1,86 @@ +#include "common.h" +#include "npc.h" + +ApiStatus N(UnkNpcAIMainFunc) (Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); + f32 posX, posY, posZ, posW; + + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_18 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0] = 0; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0] = 99; + script->functionTemp[1] = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & ENEMY_FLAGS_40000000) { + script->functionTemp[0] = 12; + enemy->flags &= ~ENEMY_FLAGS_40000000; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; + } + } + + switch (script->functionTemp[0]) { + case 0: + N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); + case 1: + N(UnkFunc13)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(UnkFunc14)(script, npcAISettings, territoryPtr); + break; + case 4: + N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(UnkFunc15)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(UnkFunc16)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/UnkPosFunc2.inc.c b/src/world/common/UnkPosFunc2.inc.c new file mode 100644 index 0000000000..b13e99867c --- /dev/null +++ b/src/world/common/UnkPosFunc2.inc.c @@ -0,0 +1,50 @@ +#include "common.h" +#include "npc.h" +#include "model.h" + +ApiStatus N(UnkPosFunc2)(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + Bytecode* args = script->ptrReadPos; + s32 treeIndex = evt_get_variable(script, *args++); + Npc* partner = get_npc_unsafe(NPC_PARTNER); + Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); + f32 xDiff, zDiff, yVal; + f32 sqrtTemp; + s32 i; + + script->varTable[2] = 0; + xDiff = playerStatus->position.x - model->center.x; + zDiff = playerStatus->position.z - model->center.z; + yVal = playerStatus->position.y + playerStatus->colliderHeight - 1.5f - model->center.y; + sqrtTemp = sqrtf(SQ(xDiff) + SQ(zDiff)); + + if (yVal > 0.0f && yVal < playerStatus->colliderHeight && sqrtTemp < playerStatus->colliderDiameter * 0.5f) { + script->varTable[2] = 1; + } + + xDiff = partner->pos.x - model->center.x; + zDiff = partner->pos.z - model->center.z; + yVal = partner->pos.y + partner->collisionHeight - 1.5f - model->center.y; + sqrtTemp = sqrtf(SQ(xDiff) + SQ(zDiff)); + + if (yVal > 0.0f && yVal < partner->collisionHeight && sqrtTemp < partner->collisionRadius * 0.5f) { + script->varTable[2] = 1; + } + + for (i = 0; i < 0x40; i++) { + Npc* npc = get_npc_safe(i); + + if (npc != NULL) { + xDiff = npc->pos.x - model->center.x; + zDiff = npc->pos.z - model->center.z; + yVal = npc->pos.y + npc->collisionHeight - 1.5f - model->center.y; + sqrtTemp = sqrtf(SQ(xDiff) + SQ(zDiff)); + + if (yVal > 0.0f && yVal < npc->collisionHeight && sqrtTemp < npc->collisionRadius * 0.5f) { + script->varTable[2] = 1; + break; + } + } + } + return ApiStatus_DONE2; +} diff --git a/tools/m2ctx.py b/tools/m2ctx.py index 08de6b2c25..b49b8105e8 100755 --- a/tools/m2ctx.py +++ b/tools/m2ctx.py @@ -23,6 +23,7 @@ CPP_FLAGS = [ "-D__asm__(...)=", "-ffreestanding", "-DM2CTX", + "-DPERMUTER", ] def import_c_file(in_file) -> str: diff --git a/ver/us/asm/data/330440.data.s b/ver/us/asm/data/330440.data.s deleted file mode 100644 index 9595b41fc4..0000000000 --- a/ver/us/asm/data/330440.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_E001A610 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_E001A620 -.double 0.001 - -dlabel D_E001A628 -.double 0.0007 diff --git a/ver/us/asm/data/330EF0.data.s b/ver/us/asm/data/330EF0.data.s deleted file mode 100644 index 974d009eda..0000000000 --- a/ver/us/asm/data/330EF0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_E001C5E0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/EE8970.data.s b/ver/us/asm/data/EE8970.data.s index e74303d074..fdee62b561 100644 --- a/ver/us/asm/data/EE8970.data.s +++ b/ver/us/asm/data/EE8970.data.s @@ -125,35 +125,3 @@ dlabel D_80245340_EEB8F0 dlabel D_80245348_EEB8F8 .word 0x666C6F5F, 0x31330000 -dlabel D_80245350_EEB900 -.double 0.04 - -dlabel D_80245358_EEB908 -.double 0.98 - -dlabel D_80245360_EEB910 -.double 3.141592 - -dlabel D_80245368_EEB918 -.double 0.2 - -dlabel D_80245370_EEB920 -.double 0.3 - -dlabel D_80245378_EEB928 -.double 0.7 - -dlabel D_80245380_EEB930 -.double 32767.0 - -dlabel D_80245388_EEB938 -.double 0.09 - -dlabel D_80245390_EEB940 -.double 0.09 - -dlabel jtbl_80245398_EEB948 -.word L80241F54_EE8504, L80241F64_EE8514, L80241F7C_EE852C, L80241F8C_EE853C, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L80241FA4_EE8554, L80241FB4_EE8564, L80241FCC_EE857C, L80241FE4_EE8594, L80241FFC_EE85AC, 0, 0, 0 - -dlabel D_802453E0_EEB990 -.word 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, EE65B0_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019011F, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80241760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240120, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802412C0, 0x00000046, 0x00000001, 0x80241300, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x802404D8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x8024017C, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, 0x802413B0, 0x00000046, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000024, 0x00000002, 0xFE363C84, 0x00000005, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000041A, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A8A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0009, 0x00CB0009, 0x00000205, 0x001100C3, 0x00000043, 0x00000003, 0x802DB654, 0x0000000A, 0x00CB0009, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, 0x802D78AC, 0x80241768, 0x00000009, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB3C8, 0x0000000B, 0x00000030, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFE2, 0x0000001E, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x0000001E, 0xFFFFFFE2, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DF124, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x00000113, 0xFE363C82, 0x0000001E, 0x00000045, 0x00000002, 0x8024032C, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A6, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, 0x802DC5C0, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x000001C2, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000032, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009B, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000032, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009C, 0x00000018, 0x00000001, 0x00000039, 0x0000000A, 0x00000002, 0xF8406102, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009D, 0x00000024, 0x00000002, 0xF8406102, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009E, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009F, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DB4EC, 0x0000000A, 0x00000040, 0x00000028, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000044, 0x00000001, 0x8024032C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000024, 0x00000002, 0xF97188A6, 0x00000000, 0x00000044, 0x00000001, 0x8024094C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x0000000B, 0x00CB0002, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000A, 0x00000003, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000B, 0x00000003, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000A, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000B, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x0000010E, 0xFFFFFFFB, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x000001C2, 0xFFFFFFFB, 0x00000043, 0x00000003, 0x80048F68, 0xFFFFFFFF, 0x8024079C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00400D01, 0x80240CD0, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x0000000B, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00008F01, 0x80240DB4, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x00000002, 0x80240EE0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF84060F9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802CCF00, 0xFFFFFF4C, 0x00000000, 0xFFFFFFEE, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802412E0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7CE7, 0x0000000D, 0xF24A7D80, 0x00000010, 0xF24A7E1A, 0x00000013, 0xF24A7EB4, 0x00000016, 0xF24A7F4D, 0x00000019, 0xF24A7EB4, 0x00000018, 0xF24A7E1A, 0x00000019, 0xF24A7D80, 0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0x80241360, 0x00000005, 0x00000001, 0x0000000A, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ADE80, 0xF24A5680, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xF249B280, 0xF24ADE80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF4C, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF42, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000004, 0x802D7AC0, 0x0000000B, 0x00000187, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0xFFFFFFCE, 0x00000078, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x666C6F5F, 0x31330000, 0x666C6F5F, 0x30300000 diff --git a/ver/us/asm/data/effects/330EF0.data.s b/ver/us/asm/data/effects/330EF0.data.s deleted file mode 100644 index 974d009eda..0000000000 --- a/ver/us/asm/data/effects/330EF0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_E001C5E0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/effects/332690.data.s b/ver/us/asm/data/effects/332690.data.s deleted file mode 100644 index efa0aefbd7..0000000000 --- a/ver/us/asm/data/effects/332690.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_E001ED50 -.double 0.6 - -dlabel D_E001ED58 -.double 0.7 diff --git a/ver/us/asm/data/effects/334B50.data.s b/ver/us/asm/data/effects/334B50.data.s deleted file mode 100644 index fecdeff011..0000000000 --- a/ver/us/asm/data/effects/334B50.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_E0020C90 -.word 0x090022E0, 0x00000000, 0x090023B0, 0x09002480, 0x09002550 - -dlabel D_E0020CA4 -.word 0x09002238, 0x00000000, 0x09002308, 0x090023D8, 0x090024A8 - -dlabel D_E0020CB8 -.word 0x00000102, 0x03050405, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x0505FF00 - -dlabel D_E0020CE0 -.word 0x00000000, 0x00000000, 0x01010101, 0x00000000, 0x00000000, 0x01010101, 0xFF000000 - -dlabel D_E0020CFC -.word 0x00000201, 0x03020303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03FF0000 - -dlabel D_E0020D24 -.word 0x00000101, 0x02020303, 0xF3000000 - -dlabel D_E0020D30 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x0303FF00 - -dlabel D_E0020D80 -.word D_E0020CB8, D_E0020CE0, D_E0020CFC, D_E0020D24, D_E0020D30 - -dlabel D_E0020D94 -.byte 0x40 - -dlabel D_E0020D95 -.byte 0x00 - -dlabel D_E0020D96 -.byte 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x40, 0x00, 0x20, 0x20, 0x00, 0x40, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/ver/us/asm/data/world/area_arn/arn_04/BE6E10.data.s b/ver/us/asm/data/world/area_arn/arn_04/BE6E10.data.s index 2145e9d40d..5ea8edef48 100644 --- a/ver/us/asm/data/world/area_arn/arn_04/BE6E10.data.s +++ b/ver/us/asm/data/world/area_arn/arn_04/BE6E10.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80243660_BE6E10 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B94_BE4344, D_80243660_BE6E10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140017, 0x00000000, 0x00000000, 0x80243690, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0000 +.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, arn_04_UnkNpcAIMainFunc, D_80243660_BE6E10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140017, 0x00000000, 0x00000000, 0x80243690, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0000 dlabel D_802436DC_BE6E8C .word 0x3FE66666, 0x0000003C, 0x0000000F, 0x42F00000, 0x00000000, 0x00000003, 0x40800000, 0x00000005, 0x00000001, 0x43160000, 0x00000000, 0x00000001, diff --git a/ver/us/asm/data/world/area_dgb/dgb_08/C43EB0.data.s b/ver/us/asm/data/world/area_dgb/dgb_08/C43EB0.data.s index 1726430996..a7389a83c8 100644 --- a/ver/us/asm/data/world/area_dgb/dgb_08/C43EB0.data.s +++ b/ver/us/asm/data/world/area_dgb/dgb_08/C43EB0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80244100_C43EB0 -.word 0x40900000, 0x00000000, 0x00000000, 0x432A0000, 0x42B40000, 0x00000001, 0x4079999A, 0x000000B4, 0x00000002, 0x432A0000, 0x42B40000, 0x00000001, 0x00000043, 0x00000002, func_80240B94_C40944, D_80244100_C43EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x80244130, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_802414AC_C4125C, 0x802442C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x802442F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_08_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x8024438C, 0x00000000, 0x00000000, 0x802441D4, 0x00000000, 0x00000000, 0x000D0008 +.word 0x40900000, 0x00000000, 0x00000000, 0x432A0000, 0x42B40000, 0x00000001, 0x4079999A, 0x000000B4, 0x00000002, 0x432A0000, 0x42B40000, 0x00000001, 0x00000043, 0x00000002, dgb_08_UnkNpcAIMainFunc, D_80244100_C43EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x80244130, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_802414AC_C4125C, 0x802442C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x802442F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_08_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x8024438C, 0x00000000, 0x00000000, 0x802441D4, 0x00000000, 0x00000000, 0x000D0008 dlabel D_80244460_C44210 -.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x3F100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000D00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FC00000, 0x0000005A, 0x0000001E, 0x43700000, 0x00000000, 0x00000001, 0x40A9999A, 0x000000B4, 0x00000001, 0x43700000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_802438F0_C436A0, 0x802444B4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x000002F7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00380008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x0000072E, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000108, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x80246E20, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00260020, 0x80244478, 0x00000000, 0x802444E4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE024B, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFE5, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x000001C7, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000012, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000014, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x006A000A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFD67, 0x000000D2, 0x000000B4, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFDEE, 0x000000B4, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000012, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000014, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x000001C8, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE0C, 0x00000050, 0x0000000A, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80244D7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80243B98_C43948, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80243C10_C439C0, 0x00000044, 0x00000001, 0x80244D08, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020F6, 0x00400000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A8280, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020F6, 0x00400000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_80240B94_C40944, D_80244100_C43EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dgb_08_UnkFunc1, 0x00000043, 0x00000003, GotoMap, 0x80246E28, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFE4, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFE6, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7F80, 0xF24A7F80, 0xF24A7F80, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x80244E58, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE024B, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF7E, 0x00000000, 0x000000C8, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244D7C, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE024B, 0x00000008, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244A54, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF7E, 0x000000D2, 0x00000050, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244D7C, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000009, 0x8024417C, 0x00000000, 0xC47A0000, 0x00000000, 0x00A40004, 0x80244E94, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x0000000A, 0xFFFFFE70, 0x000000D2, 0x00000050, 0xFFFFFF9C, 0x000000D2, 0x00000050, 0x00000064, 0x000000D2, 0x00000050, 0x00000190, 0x000000D2, 0x00000050, 0x00000334, 0x00000064, 0x00000050, 0x00000334, 0x00000064, 0x00000104, 0x00000190, 0x00000000, 0x00000104, 0x00000064, 0x00000000, 0x000000C8, 0xFFFFFF9C, 0x00000000, 0x000000AF, 0xFFFFFE3E, 0x00000000, 0x000000AF, 0xFFFF8001, 0x00000096, 0x00000000, 0x000000AF, 0x000005AA, 0x000000C8, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006A0007, 0x006A000A, 0x006A000D, 0x006A000D, 0x006A0019, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80244360, 0xC37A0000, 0x00000000, 0x43070000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80244290, 0x00000000, 0x00000002, 0x80244434, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802442B8, 0x00000000, 0x00000003, 0x80244360, 0x435C0000, 0x00000000, 0x431B0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x000000DC, 0x00000000, 0x0000009B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000DC, 0x00000000, 0x0000009B, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80244290, 0x00000000, 0x00000004, 0x80244434, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802442B8, 0x00000000, 0x00000005, 0x80244360, 0x444E4000, 0x42C80000, 0x43480000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000339, 0x00000064, 0x000000C8, 0x00000019, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000339, 0x00000064, 0x000000C8, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000003, 0x00000000, 0x80244290, 0x00000000, 0x00000006, 0x80244434, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802442B8, 0x00000000, 0x00000007, 0x802449FC, 0x42960000, 0x439B0000, 0x42AA0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004B, 0x00000136, 0x00000055, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000004B, 0x00000000, 0x00000055, 0x000000FA, 0x00000037, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380001, 0x00380002, 0x00380003, 0x00380003, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380005, 0x00380001, 0x00380008, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x802449FC, 0xC3E18000, 0x439B0000, 0x42A20000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFE3D, 0x00000136, 0x00000051, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFECA, 0x00000000, 0x000000AF, 0x000000FA, 0x00000091, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380001, 0x00380002, 0x00380003, 0x00380003, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380005, 0x00380001, 0x00380008, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_80243C50_C43A00, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0039000C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_80243C50_C43A00, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0039000C, 0x00000008, 0x00000001, 0x0000000F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390008, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002F1, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00390005, 0x00390002, 0x00000000, 0x000E00F2, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000024, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80246310, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80246210, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x80244A28, 0x43D50000, 0x00000000, 0x42180000, 0x00600D01, 0x802464C4, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x001A00B6, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80246718, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80244360, 0xC37A0000, 0x00000000, 0x43070000, 0x00000401, 0x80246728, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80244290, 0x00000000, 0x00000001, 0x80246768, 0x0F020003, 0x00000002, 0x80245290, 0x0F020003, 0x00000002, 0x80245670, 0x0F020003, 0x00000002, 0x80245A50, 0x0F030003, 0x00000001, 0x80245E30, 0x00000000, 0x00000001, 0x80246020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802450A0, 0x0F040001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80246528, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x3F100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000D00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FC00000, 0x0000005A, 0x0000001E, 0x43700000, 0x00000000, 0x00000001, 0x40A9999A, 0x000000B4, 0x00000001, 0x43700000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_802438F0_C436A0, 0x802444B4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x000002F7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00380008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x0000072E, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000108, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x80246E20, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00260020, 0x80244478, 0x00000000, 0x802444E4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE024B, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFE5, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x000001C7, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000012, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000014, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x006A000A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFD67, 0x000000D2, 0x000000B4, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFDEE, 0x000000B4, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000012, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000014, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x000001C8, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE0C, 0x00000050, 0x0000000A, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80244D7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80243B98_C43948, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80243C10_C439C0, 0x00000044, 0x00000001, 0x80244D08, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020F6, 0x00400000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A8280, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020F6, 0x00400000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, dgb_08_UnkNpcAIMainFunc, D_80244100_C43EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dgb_08_UnkFunc1, 0x00000043, 0x00000003, GotoMap, 0x80246E28, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFE4, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFE6, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7F80, 0xF24A7F80, 0xF24A7F80, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x80244E58, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE024B, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF7E, 0x00000000, 0x000000C8, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244D7C, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE024B, 0x00000008, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244A54, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF7E, 0x000000D2, 0x00000050, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244D7C, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000009, 0x8024417C, 0x00000000, 0xC47A0000, 0x00000000, 0x00A40004, 0x80244E94, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x0000000A, 0xFFFFFE70, 0x000000D2, 0x00000050, 0xFFFFFF9C, 0x000000D2, 0x00000050, 0x00000064, 0x000000D2, 0x00000050, 0x00000190, 0x000000D2, 0x00000050, 0x00000334, 0x00000064, 0x00000050, 0x00000334, 0x00000064, 0x00000104, 0x00000190, 0x00000000, 0x00000104, 0x00000064, 0x00000000, 0x000000C8, 0xFFFFFF9C, 0x00000000, 0x000000AF, 0xFFFFFE3E, 0x00000000, 0x000000AF, 0xFFFF8001, 0x00000096, 0x00000000, 0x000000AF, 0x000005AA, 0x000000C8, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006A0007, 0x006A000A, 0x006A000D, 0x006A000D, 0x006A0019, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80244360, 0xC37A0000, 0x00000000, 0x43070000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80244290, 0x00000000, 0x00000002, 0x80244434, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802442B8, 0x00000000, 0x00000003, 0x80244360, 0x435C0000, 0x00000000, 0x431B0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x000000DC, 0x00000000, 0x0000009B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000DC, 0x00000000, 0x0000009B, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80244290, 0x00000000, 0x00000004, 0x80244434, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802442B8, 0x00000000, 0x00000005, 0x80244360, 0x444E4000, 0x42C80000, 0x43480000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000339, 0x00000064, 0x000000C8, 0x00000019, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000339, 0x00000064, 0x000000C8, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000003, 0x00000000, 0x80244290, 0x00000000, 0x00000006, 0x80244434, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802442B8, 0x00000000, 0x00000007, 0x802449FC, 0x42960000, 0x439B0000, 0x42AA0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004B, 0x00000136, 0x00000055, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000004B, 0x00000000, 0x00000055, 0x000000FA, 0x00000037, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380001, 0x00380002, 0x00380003, 0x00380003, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380005, 0x00380001, 0x00380008, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x802449FC, 0xC3E18000, 0x439B0000, 0x42A20000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFE3D, 0x00000136, 0x00000051, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFECA, 0x00000000, 0x000000AF, 0x000000FA, 0x00000091, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380001, 0x00380002, 0x00380003, 0x00380003, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380005, 0x00380001, 0x00380008, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_80243C50_C43A00, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0039000C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_80243C50_C43A00, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0039000C, 0x00000008, 0x00000001, 0x0000000F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390008, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002F1, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00390005, 0x00390002, 0x00000000, 0x000E00F2, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000024, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80246310, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80246210, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x80244A28, 0x43D50000, 0x00000000, 0x42180000, 0x00600D01, 0x802464C4, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x001A00B6, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80246718, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80244360, 0xC37A0000, 0x00000000, 0x43070000, 0x00000401, 0x80246728, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80244290, 0x00000000, 0x00000001, 0x80246768, 0x0F020003, 0x00000002, 0x80245290, 0x0F020003, 0x00000002, 0x80245670, 0x0F020003, 0x00000002, 0x80245A50, 0x0F030003, 0x00000001, 0x80245E30, 0x00000000, 0x00000001, 0x80246020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802450A0, 0x0F040001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80246528, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_00/C9F5E0.data.s b/ver/us/asm/data/world/area_flo/flo_00/C9F5E0.data.s index 2a68de2193..5045ae9a41 100644 --- a/ver/us/asm/data/world/area_flo/flo_00/C9F5E0.data.s +++ b/ver/us/asm/data/world/area_flo/flo_00/C9F5E0.data.s @@ -42,7 +42,7 @@ dlabel D_8024286C_CA078C .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_8024289C_CA07BC -.word 0x00000043, 0x00000002, func_80240BD4_C9EAF4, D_8024286C_CA078C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, flo_00_UnkNpcAIMainFunc, D_8024286C_CA078C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802428BC_CA07DC .word 0x00000000, 0x002A001C, 0x00000000, 0x00000000, D_8024289C_CA07BC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s b/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s index 403df7140e..80f82e7ec5 100644 --- a/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s @@ -15,7 +15,7 @@ dlabel D_802415EC_B71E4C .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241ABC_B7231C -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000023, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240438_B70C98, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802415EC_B71E4C, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000023, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, jan_11_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802415EC_B71E4C, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241C94_B724F4 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80241ABC_B7231C, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_01/86B350.data.s b/ver/us/asm/data/world/area_tik/tik_01/86B350.data.s index 6175894883..a33b185504 100644 --- a/ver/us/asm/data/world/area_tik/tik_01/86B350.data.s +++ b/ver/us/asm/data/world/area_tik/tik_01/86B350.data.s @@ -6,7 +6,7 @@ dlabel D_80241EA0_86B350 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242370_86B820 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000012, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405F0_869AA0, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241EA0_86B350, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000012, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_01_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241EA0_86B350, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242548_86B9F8 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242370_86B820, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s b/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s index c2404b909b..264d89b827 100644 --- a/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s +++ b/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s @@ -18,7 +18,7 @@ dlabel D_802412B0_86D9F0 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241780_86DEC0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000011, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405D0_86CD10, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802412B0_86D9F0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000011, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_02_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802412B0_86D9F0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241958_86E098 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80241780_86DEC0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000011, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_03/870B60.data.s b/ver/us/asm/data/world/area_tik/tik_03/870B60.data.s index 4b7cb5357c..2a5b81f9f0 100644 --- a/ver/us/asm/data/world/area_tik/tik_03/870B60.data.s +++ b/ver/us/asm/data/world/area_tik/tik_03/870B60.data.s @@ -6,7 +6,7 @@ dlabel D_80242060_870B60 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242530_871030 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000014, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405F0_86F0F0, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80242060_870B60, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000014, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_03_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80242060_870B60, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242708_871208 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242530_871030, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_04/8739F0.data.s b/ver/us/asm/data/world/area_tik/tik_04/8739F0.data.s index 9b11ab9472..c153d04657 100644 --- a/ver/us/asm/data/world/area_tik/tik_04/8739F0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_04/8739F0.data.s @@ -6,7 +6,7 @@ dlabel D_80241FC0_8739F0 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242490_873EC0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000010, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405F0_872020, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241FC0_8739F0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000010, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_04_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241FC0_8739F0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242668_874098 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242490_873EC0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000010, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_05/875D10.data.s b/ver/us/asm/data/world/area_tik/tik_05/875D10.data.s index a474d99ef8..09f2d131f5 100644 --- a/ver/us/asm/data/world/area_tik/tik_05/875D10.data.s +++ b/ver/us/asm/data/world/area_tik/tik_05/875D10.data.s @@ -6,7 +6,7 @@ dlabel D_80240F50_875D10 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241420_8761E0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000F, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240310_8750D0, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80240F50_875D10, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000F, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_05_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80240F50_875D10, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415F8_8763B8 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80241420_8761E0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_06/878F90.data.s b/ver/us/asm/data/world/area_tik/tik_06/878F90.data.s index 8f5b1f963b..3a3e22c3da 100644 --- a/ver/us/asm/data/world/area_tik/tik_06/878F90.data.s +++ b/ver/us/asm/data/world/area_tik/tik_06/878F90.data.s @@ -6,7 +6,7 @@ dlabel D_802420B0_878F90 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242580_879460 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000020, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405F0_8774D0, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802420B0_878F90, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000020, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_06_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802420B0_878F90, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242758_879638 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242580_879460, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000020, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s index d9c4352d09..43222153d6 100644 --- a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s @@ -24,7 +24,7 @@ dlabel D_802440C0_87DCA0 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244590_87E170 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000010, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80241020_87AC00, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802440C0_87DCA0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000010, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_07_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802440C0_87DCA0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244768_87E348 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80244590_87E170, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000010, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s b/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s index 3e94244140..728fb1da20 100644 --- a/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s @@ -36,7 +36,7 @@ dlabel D_802420B0_880EA0 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242580_881370 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000D, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405F0_87F3E0, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802420B0_880EA0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000D, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_08_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802420B0_880EA0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242758_881548 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242580_881370, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000D, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_09/883500.data.s b/ver/us/asm/data/world/area_tik/tik_09/883500.data.s index 10e7d4666f..e22dc579e6 100644 --- a/ver/us/asm/data/world/area_tik/tik_09/883500.data.s +++ b/ver/us/asm/data/world/area_tik/tik_09/883500.data.s @@ -33,7 +33,7 @@ dlabel D_80242C70_884E30 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243140_885300 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000023, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405F0_8827B0, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80242C70_884E30, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000023, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_09_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80242C70_884E30, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243318_8854D8 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80243140_885300, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_10/887B20.data.s b/ver/us/asm/data/world/area_tik/tik_10/887B20.data.s index 9e692a1aa0..752a779a0f 100644 --- a/ver/us/asm/data/world/area_tik/tik_10/887B20.data.s +++ b/ver/us/asm/data/world/area_tik/tik_10/887B20.data.s @@ -6,7 +6,7 @@ dlabel D_80241760_887B20 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241C30_887FF0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000E, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240310_8866D0, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241760_887B20, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000E, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_10_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241760_887B20, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E08_8881C8 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80241C30_887FF0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88BF60.data.s b/ver/us/asm/data/world/area_tik/tik_12/88BF60.data.s index 9e92db17f8..962e897af9 100644 --- a/ver/us/asm/data/world/area_tik/tik_12/88BF60.data.s +++ b/ver/us/asm/data/world/area_tik/tik_12/88BF60.data.s @@ -6,7 +6,7 @@ dlabel D_80243390_88BF60 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243860_88C430 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000009, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405F0_8891C0, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80243390_88BF60, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000009, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_12_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80243390_88BF60, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243A38_88C608 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80243860_88C430, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000009, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_14/88F180.data.s b/ver/us/asm/data/world/area_tik/tik_14/88F180.data.s index 3fff3c25ae..5e42fc92a3 100644 --- a/ver/us/asm/data/world/area_tik/tik_14/88F180.data.s +++ b/ver/us/asm/data/world/area_tik/tik_14/88F180.data.s @@ -6,7 +6,7 @@ dlabel D_80241B80_88F180 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242050_88F650 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000D, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405F0_88DBF0, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241B80_88F180, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000D, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_14_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241B80_88F180, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242228_88F828 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242050_88F650, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000D, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_15/891890.data.s b/ver/us/asm/data/world/area_tik/tik_15/891890.data.s index 90a151941a..45f3e05e5c 100644 --- a/ver/us/asm/data/world/area_tik/tik_15/891890.data.s +++ b/ver/us/asm/data/world/area_tik/tik_15/891890.data.s @@ -12,7 +12,7 @@ dlabel D_80241E50_8919F0 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242320_891EC0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000016, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405F0_890190, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241E50_8919F0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000016, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_15_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241E50_8919F0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802424F8_892098 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242320_891EC0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_18/895E20.data.s b/ver/us/asm/data/world/area_tik/tik_18/895E20.data.s index 35d350a9c5..cef91ace2a 100644 --- a/ver/us/asm/data/world/area_tik/tik_18/895E20.data.s +++ b/ver/us/asm/data/world/area_tik/tik_18/895E20.data.s @@ -18,7 +18,7 @@ dlabel D_80240D10_8963F0 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802411E0_8968C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000012, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240310_8959F0, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80240D10_8963F0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000012, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_18_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80240D10_8963F0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802413B8_896A98 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_802411E0_8968C0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s b/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s index a329fc4a9b..c240e7c26f 100644 --- a/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s +++ b/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s @@ -36,7 +36,7 @@ dlabel D_80242180_89C4D0 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242650_89C9A0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000013, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405EC_89A93C, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80242180_89C4D0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000013, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_20_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80242180_89C4D0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242828_89CB78 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242650_89C9A0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s b/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s index 4a54e99891..9742aeaf38 100644 --- a/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s @@ -39,7 +39,7 @@ dlabel D_80241B20_89F2C0 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241FF0_89F790 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000013, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405EC_89DD8C, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241B20_89F2C0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000013, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_21_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241B20_89F2C0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421C8_89F968 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80241FF0_89F790, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s b/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s index eda012a2ff..7cf35de146 100644 --- a/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s +++ b/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s @@ -33,7 +33,7 @@ dlabel D_80241A68_8A1928 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F38_8A1DF8 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000012, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240640_8A0500, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241A68_8A1928, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000012, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_22_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241A68_8A1928, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242110_8A1FD0 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80241F38_8A1DF8, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s b/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s index f199a1d37c..ba394c5954 100644 --- a/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s @@ -33,7 +33,7 @@ dlabel D_802420C8_8A4498 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242598_8A4968 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000016, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802405EC_8A29BC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802420C8_8A4498, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000016, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_23_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802420C8_8A4498, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242770_8A4B40 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242598_8A4968, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_24/8A69C0.data.s b/ver/us/asm/data/world/area_tik/tik_24/8A69C0.data.s index f307143ccc..412fd39fbb 100644 --- a/ver/us/asm/data/world/area_tik/tik_24/8A69C0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_24/8A69C0.data.s @@ -18,7 +18,7 @@ dlabel D_802414E0_8A6F60 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802419B0_8A7430 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000012, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240360_8A5DE0, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802414E0_8A6F60, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000012, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_24_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802414E0_8A6F60, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B88_8A7608 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_802419B0_8A7430, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_25/8A8800.data.s b/ver/us/asm/data/world/area_tik/tik_25/8A8800.data.s index a12848393f..ed7444024f 100644 --- a/ver/us/asm/data/world/area_tik/tik_25/8A8800.data.s +++ b/ver/us/asm/data/world/area_tik/tik_25/8A8800.data.s @@ -15,7 +15,7 @@ dlabel D_802409A4_8A8924 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240E74_8A8DF4 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000E, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_8024030C_8A828C, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802409A4_8A8924, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000E, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_25_UnkPosFunc2, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802409A4_8A8924, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024104C_8A8FCC .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80240E74_8A8DF4, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/163400/filemenu_cleanup.s b/ver/us/asm/nonmatchings/163400/filemenu_cleanup.s deleted file mode 100644 index 86fae72a13..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_cleanup.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_cleanup -/* 165360 80244B00 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 165364 80244B04 AFB00010 */ sw $s0, 0x10($sp) -/* 165368 80244B08 0000802D */ daddu $s0, $zero, $zero -/* 16536C 80244B0C AFB10014 */ sw $s1, 0x14($sp) -/* 165370 80244B10 3C118025 */ lui $s1, %hi(filemenu_cursorHudElemID) -/* 165374 80244B14 2631C0A0 */ addiu $s1, $s1, %lo(filemenu_cursorHudElemID) -/* 165378 80244B18 AFBF0018 */ sw $ra, 0x18($sp) -.L80244B1C: -/* 16537C 80244B1C 8E240000 */ lw $a0, ($s1) -/* 165380 80244B20 26310004 */ addiu $s1, $s1, 4 -/* 165384 80244B24 0C05123D */ jal free_hud_element -/* 165388 80244B28 26100001 */ addiu $s0, $s0, 1 -/* 16538C 80244B2C 1A00FFFB */ blez $s0, .L80244B1C -/* 165390 80244B30 00000000 */ nop -/* 165394 80244B34 3C118025 */ lui $s1, %hi(filemenu_menus) -/* 165398 80244B38 26319B84 */ addiu $s1, $s1, %lo(filemenu_menus) -/* 16539C 80244B3C 0000802D */ daddu $s0, $zero, $zero -.L80244B40: -/* 1653A0 80244B40 8E240000 */ lw $a0, ($s1) -/* 1653A4 80244B44 90820000 */ lbu $v0, ($a0) -/* 1653A8 80244B48 10400006 */ beqz $v0, .L80244B64 -/* 1653AC 80244B4C 26100001 */ addiu $s0, $s0, 1 -/* 1653B0 80244B50 8C820018 */ lw $v0, 0x18($a0) -/* 1653B4 80244B54 10400003 */ beqz $v0, .L80244B64 -/* 1653B8 80244B58 00000000 */ nop -/* 1653BC 80244B5C 0040F809 */ jalr $v0 -/* 1653C0 80244B60 00000000 */ nop -.L80244B64: -/* 1653C4 80244B64 2A020004 */ slti $v0, $s0, 4 -/* 1653C8 80244B68 1440FFF5 */ bnez $v0, .L80244B40 -/* 1653CC 80244B6C 26310004 */ addiu $s1, $s1, 4 -/* 1653D0 80244B70 2410002C */ addiu $s0, $zero, 0x2c -/* 1653D4 80244B74 0200202D */ daddu $a0, $s0, $zero -.L80244B78: -/* 1653D8 80244B78 0C051F9F */ jal set_window_update -/* 1653DC 80244B7C 24050002 */ addiu $a1, $zero, 2 -/* 1653E0 80244B80 26100001 */ addiu $s0, $s0, 1 -/* 1653E4 80244B84 2A020040 */ slti $v0, $s0, 0x40 -/* 1653E8 80244B88 1440FFFB */ bnez $v0, .L80244B78 -/* 1653EC 80244B8C 0200202D */ daddu $a0, $s0, $zero -/* 1653F0 80244B90 24040018 */ addiu $a0, $zero, 0x18 -/* 1653F4 80244B94 0C051F9F */ jal set_window_update -/* 1653F8 80244B98 24050002 */ addiu $a1, $zero, 2 -/* 1653FC 80244B9C 24040017 */ addiu $a0, $zero, 0x17 -/* 165400 80244BA0 0C051F9F */ jal set_window_update -/* 165404 80244BA4 24050002 */ addiu $a1, $zero, 2 -/* 165408 80244BA8 0C0912F1 */ jal func_80244BC4 -/* 16540C 80244BAC 00000000 */ nop -/* 165410 80244BB0 8FBF0018 */ lw $ra, 0x18($sp) -/* 165414 80244BB4 8FB10014 */ lw $s1, 0x14($sp) -/* 165418 80244BB8 8FB00010 */ lw $s0, 0x10($sp) -/* 16541C 80244BBC 03E00008 */ jr $ra -/* 165420 80244BC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/ED0310/func_802404D0_ED04C0.s b/ver/us/asm/nonmatchings/ED0310/func_802404D0_ED04C0.s deleted file mode 100644 index 2355918fca..0000000000 --- a/ver/us/asm/nonmatchings/ED0310/func_802404D0_ED04C0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802441D8_ED41C8 -.double 0.09 - -dlabel D_802441E0_ED41D0 -.double 0.09 - -.section .text - -glabel func_802404D0_ED04C0 -/* ED04C0 802404D0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* ED04C4 802404D4 AFB3004C */ sw $s3, 0x4c($sp) -/* ED04C8 802404D8 0080982D */ daddu $s3, $a0, $zero -/* ED04CC 802404DC AFBF0058 */ sw $ra, 0x58($sp) -/* ED04D0 802404E0 AFB50054 */ sw $s5, 0x54($sp) -/* ED04D4 802404E4 AFB40050 */ sw $s4, 0x50($sp) -/* ED04D8 802404E8 AFB20048 */ sw $s2, 0x48($sp) -/* ED04DC 802404EC AFB10044 */ sw $s1, 0x44($sp) -/* ED04E0 802404F0 AFB00040 */ sw $s0, 0x40($sp) -/* ED04E4 802404F4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* ED04E8 802404F8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* ED04EC 802404FC F7B60068 */ sdc1 $f22, 0x68($sp) -/* ED04F0 80240500 F7B40060 */ sdc1 $f20, 0x60($sp) -/* ED04F4 80240504 8E710148 */ lw $s1, 0x148($s3) -/* ED04F8 80240508 00A0902D */ daddu $s2, $a1, $zero -/* ED04FC 8024050C 86240008 */ lh $a0, 8($s1) -/* ED0500 80240510 0C00F92F */ jal dead_get_npc_unsafe -/* ED0504 80240514 00C0A82D */ daddu $s5, $a2, $zero -/* ED0508 80240518 0040802D */ daddu $s0, $v0, $zero -/* ED050C 8024051C 0000A02D */ daddu $s4, $zero, $zero -/* ED0510 80240520 C624007C */ lwc1 $f4, 0x7c($s1) -/* ED0514 80240524 46802120 */ cvt.s.w $f4, $f4 -/* ED0518 80240528 C6220088 */ lwc1 $f2, 0x88($s1) -/* ED051C 8024052C 468010A0 */ cvt.s.w $f2, $f2 -/* ED0520 80240530 460010A1 */ cvt.d.s $f2, $f2 -/* ED0524 80240534 46002121 */ cvt.d.s $f4, $f4 -/* ED0528 80240538 C600003C */ lwc1 $f0, 0x3c($s0) -/* ED052C 8024053C 3C014059 */ lui $at, 0x4059 -/* ED0530 80240540 44813800 */ mtc1 $at, $f7 -/* ED0534 80240544 44803000 */ mtc1 $zero, $f6 -/* ED0538 80240548 46000021 */ cvt.d.s $f0, $f0 -/* ED053C 8024054C 46260002 */ mul.d $f0, $f0, $f6 -/* ED0540 80240550 00000000 */ nop -/* ED0544 80240554 24020001 */ addiu $v0, $zero, 1 -/* ED0548 80240558 8E24006C */ lw $a0, 0x6c($s1) -/* ED054C 8024055C 46261083 */ div.d $f2, $f2, $f6 -/* ED0550 80240560 462010A0 */ cvt.s.d $f2, $f2 -/* ED0554 80240564 46262103 */ div.d $f4, $f4, $f6 -/* ED0558 80240568 46202520 */ cvt.s.d $f20, $f4 -/* ED055C 8024056C 30830011 */ andi $v1, $a0, 0x11 -/* ED0560 80240570 4620020D */ trunc.w.d $f8, $f0 -/* ED0564 80240574 E628007C */ swc1 $f8, 0x7c($s1) -/* ED0568 80240578 C6200078 */ lwc1 $f0, 0x78($s1) -/* ED056C 8024057C 46800020 */ cvt.s.w $f0, $f0 -/* ED0570 80240580 46000021 */ cvt.d.s $f0, $f0 -/* ED0574 80240584 46260003 */ div.d $f0, $f0, $f6 -/* ED0578 80240588 462006A0 */ cvt.s.d $f26, $f0 -/* ED057C 8024058C C6200070 */ lwc1 $f0, 0x70($s1) -/* ED0580 80240590 46800020 */ cvt.s.w $f0, $f0 -/* ED0584 80240594 46000021 */ cvt.d.s $f0, $f0 -/* ED0588 80240598 46260003 */ div.d $f0, $f0, $f6 -/* ED058C 8024059C 462005A0 */ cvt.s.d $f22, $f0 -/* ED0590 802405A0 14620025 */ bne $v1, $v0, .L80240638 -/* ED0594 802405A4 4602D600 */ add.s $f24, $f26, $f2 -/* ED0598 802405A8 8E020000 */ lw $v0, ($s0) -/* ED059C 802405AC 30420008 */ andi $v0, $v0, 8 -/* ED05A0 802405B0 10400009 */ beqz $v0, .L802405D8 -/* ED05A4 802405B4 27A50028 */ addiu $a1, $sp, 0x28 -/* ED05A8 802405B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* ED05AC 802405BC 4600C001 */ sub.s $f0, $f24, $f0 -/* ED05B0 802405C0 4600B03C */ c.lt.s $f22, $f0 -/* ED05B4 802405C4 00000000 */ nop -/* ED05B8 802405C8 4500001B */ bc1f .L80240638 -/* ED05BC 802405CC 34820010 */ ori $v0, $a0, 0x10 -/* ED05C0 802405D0 0809018E */ j .L80240638 -/* ED05C4 802405D4 AE22006C */ sw $v0, 0x6c($s1) -.L802405D8: -/* ED05C8 802405D8 27A6002C */ addiu $a2, $sp, 0x2c -/* ED05CC 802405DC C6000038 */ lwc1 $f0, 0x38($s0) -/* ED05D0 802405E0 C602003C */ lwc1 $f2, 0x3c($s0) -/* ED05D4 802405E4 C6040040 */ lwc1 $f4, 0x40($s0) -/* ED05D8 802405E8 3C01447A */ lui $at, 0x447a -/* ED05DC 802405EC 44813000 */ mtc1 $at, $f6 -/* ED05E0 802405F0 27A20034 */ addiu $v0, $sp, 0x34 -/* ED05E4 802405F4 E7A00028 */ swc1 $f0, 0x28($sp) -/* ED05E8 802405F8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* ED05EC 802405FC E7A40030 */ swc1 $f4, 0x30($sp) -/* ED05F0 80240600 E7A60034 */ swc1 $f6, 0x34($sp) -/* ED05F4 80240604 AFA20010 */ sw $v0, 0x10($sp) -/* ED05F8 80240608 8E040080 */ lw $a0, 0x80($s0) -/* ED05FC 8024060C 0C03908F */ jal dead_npc_raycast_down_sides -/* ED0600 80240610 27A70030 */ addiu $a3, $sp, 0x30 -/* ED0604 80240614 C7A00034 */ lwc1 $f0, 0x34($sp) -/* ED0608 80240618 4600D001 */ sub.s $f0, $f26, $f0 -/* ED060C 8024061C 4600B03C */ c.lt.s $f22, $f0 -/* ED0610 80240620 00000000 */ nop -/* ED0614 80240624 45000004 */ bc1f .L80240638 -/* ED0618 80240628 00000000 */ nop -/* ED061C 8024062C 8E22006C */ lw $v0, 0x6c($s1) -/* ED0620 80240630 34420010 */ ori $v0, $v0, 0x10 -/* ED0624 80240634 AE22006C */ sw $v0, 0x6c($s1) -.L80240638: -/* ED0628 80240638 8E22006C */ lw $v0, 0x6c($s1) -/* ED062C 8024063C 24030011 */ addiu $v1, $zero, 0x11 -/* ED0630 80240640 30420011 */ andi $v0, $v0, 0x11 -/* ED0634 80240644 14430039 */ bne $v0, $v1, .L8024072C -/* ED0638 80240648 00000000 */ nop -/* ED063C 8024064C 8E020000 */ lw $v0, ($s0) -/* ED0640 80240650 30420008 */ andi $v0, $v0, 8 -/* ED0644 80240654 1040000A */ beqz $v0, .L80240680 -/* ED0648 80240658 4600C106 */ mov.s $f4, $f24 -/* ED064C 8024065C 4614C081 */ sub.s $f2, $f24, $f20 -/* ED0650 80240660 3C018024 */ lui $at, %hi(D_802441D8_ED41C8) -/* ED0654 80240664 D42041D8 */ ldc1 $f0, %lo(D_802441D8_ED41C8)($at) -/* ED0658 80240668 460010A1 */ cvt.d.s $f2, $f2 -/* ED065C 8024066C 46201082 */ mul.d $f2, $f2, $f0 -/* ED0660 80240670 00000000 */ nop -/* ED0664 80240674 4600A021 */ cvt.d.s $f0, $f20 -/* ED0668 80240678 080901B9 */ j .L802406E4 -/* ED066C 8024067C 46220000 */ add.d $f0, $f0, $f2 -.L80240680: -/* ED0670 80240680 27A50028 */ addiu $a1, $sp, 0x28 -/* ED0674 80240684 27A6002C */ addiu $a2, $sp, 0x2c -/* ED0678 80240688 C6000038 */ lwc1 $f0, 0x38($s0) -/* ED067C 8024068C C6020040 */ lwc1 $f2, 0x40($s0) -/* ED0680 80240690 3C01447A */ lui $at, 0x447a -/* ED0684 80240694 44812000 */ mtc1 $at, $f4 -/* ED0688 80240698 27A20034 */ addiu $v0, $sp, 0x34 -/* ED068C 8024069C E7B4002C */ swc1 $f20, 0x2c($sp) -/* ED0690 802406A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* ED0694 802406A4 E7A20030 */ swc1 $f2, 0x30($sp) -/* ED0698 802406A8 E7A40034 */ swc1 $f4, 0x34($sp) -/* ED069C 802406AC AFA20010 */ sw $v0, 0x10($sp) -/* ED06A0 802406B0 8E040080 */ lw $a0, 0x80($s0) -/* ED06A4 802406B4 0C03908F */ jal dead_npc_raycast_down_sides -/* ED06A8 802406B8 27A70030 */ addiu $a3, $sp, 0x30 -/* ED06AC 802406BC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* ED06B0 802406C0 461A2100 */ add.s $f4, $f4, $f26 -/* ED06B4 802406C4 46142081 */ sub.s $f2, $f4, $f20 -/* ED06B8 802406C8 3C018024 */ lui $at, %hi(D_802441E0_ED41D0) -/* ED06BC 802406CC D42041E0 */ ldc1 $f0, %lo(D_802441E0_ED41D0)($at) -/* ED06C0 802406D0 460010A1 */ cvt.d.s $f2, $f2 -/* ED06C4 802406D4 46201082 */ mul.d $f2, $f2, $f0 -/* ED06C8 802406D8 00000000 */ nop -/* ED06CC 802406DC 4600A021 */ cvt.d.s $f0, $f20 -/* ED06D0 802406E0 46220000 */ add.d $f0, $f0, $f2 -.L802406E4: -/* ED06D4 802406E4 46200020 */ cvt.s.d $f0, $f0 -/* ED06D8 802406E8 E600003C */ swc1 $f0, 0x3c($s0) -/* ED06DC 802406EC C600003C */ lwc1 $f0, 0x3c($s0) -/* ED06E0 802406F0 46002001 */ sub.s $f0, $f4, $f0 -/* ED06E4 802406F4 3C013FF0 */ lui $at, 0x3ff0 -/* ED06E8 802406F8 44811800 */ mtc1 $at, $f3 -/* ED06EC 802406FC 44801000 */ mtc1 $zero, $f2 -/* ED06F0 80240700 46000005 */ abs.s $f0, $f0 -/* ED06F4 80240704 46000021 */ cvt.d.s $f0, $f0 -/* ED06F8 80240708 4622003C */ c.lt.d $f0, $f2 -/* ED06FC 8024070C 00000000 */ nop -/* ED0700 80240710 45000036 */ bc1f .L802407EC -/* ED0704 80240714 2403FFEF */ addiu $v1, $zero, -0x11 -/* ED0708 80240718 E604003C */ swc1 $f4, 0x3c($s0) -/* ED070C 8024071C 8E22006C */ lw $v0, 0x6c($s1) -/* ED0710 80240720 00431024 */ and $v0, $v0, $v1 -/* ED0714 80240724 080901FB */ j .L802407EC -/* ED0718 80240728 AE22006C */ sw $v0, 0x6c($s1) -.L8024072C: -/* ED071C 8024072C 8E220070 */ lw $v0, 0x70($s1) -/* ED0720 80240730 1840002E */ blez $v0, .L802407EC -/* ED0724 80240734 00000000 */ nop -/* ED0728 80240738 C62C0074 */ lwc1 $f12, 0x74($s1) -/* ED072C 8024073C 0C00AD77 */ jal dead_sin_deg -/* ED0730 80240740 46806320 */ cvt.s.w $f12, $f12 -/* ED0734 80240744 8E020000 */ lw $v0, ($s0) -/* ED0738 80240748 30420008 */ andi $v0, $v0, 8 -/* ED073C 8024074C 10400003 */ beqz $v0, .L8024075C -/* ED0740 80240750 46000506 */ mov.s $f20, $f0 -/* ED0744 80240754 080901E7 */ j .L8024079C -/* ED0748 80240758 0000102D */ daddu $v0, $zero, $zero -.L8024075C: -/* ED074C 8024075C 27A50028 */ addiu $a1, $sp, 0x28 -/* ED0750 80240760 27A6002C */ addiu $a2, $sp, 0x2c -/* ED0754 80240764 C6000038 */ lwc1 $f0, 0x38($s0) -/* ED0758 80240768 C602003C */ lwc1 $f2, 0x3c($s0) -/* ED075C 8024076C C6040040 */ lwc1 $f4, 0x40($s0) -/* ED0760 80240770 3C01447A */ lui $at, 0x447a -/* ED0764 80240774 44813000 */ mtc1 $at, $f6 -/* ED0768 80240778 27A20034 */ addiu $v0, $sp, 0x34 -/* ED076C 8024077C E7A00028 */ swc1 $f0, 0x28($sp) -/* ED0770 80240780 E7A2002C */ swc1 $f2, 0x2c($sp) -/* ED0774 80240784 E7A40030 */ swc1 $f4, 0x30($sp) -/* ED0778 80240788 E7A60034 */ swc1 $f6, 0x34($sp) -/* ED077C 8024078C AFA20010 */ sw $v0, 0x10($sp) -/* ED0780 80240790 8E040080 */ lw $a0, 0x80($s0) -/* ED0784 80240794 0C03908F */ jal dead_npc_raycast_down_sides -/* ED0788 80240798 27A70030 */ addiu $a3, $sp, 0x30 -.L8024079C: -/* ED078C 8024079C 10400007 */ beqz $v0, .L802407BC -/* ED0790 802407A0 00000000 */ nop -/* ED0794 802407A4 4616A082 */ mul.s $f2, $f20, $f22 -/* ED0798 802407A8 00000000 */ nop -/* ED079C 802407AC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* ED07A0 802407B0 461A0000 */ add.s $f0, $f0, $f26 -/* ED07A4 802407B4 080901F2 */ j .L802407C8 -/* ED07A8 802407B8 46020000 */ add.s $f0, $f0, $f2 -.L802407BC: -/* ED07AC 802407BC 4616A002 */ mul.s $f0, $f20, $f22 -/* ED07B0 802407C0 00000000 */ nop -/* ED07B4 802407C4 4600C000 */ add.s $f0, $f24, $f0 -.L802407C8: -/* ED07B8 802407C8 E600003C */ swc1 $f0, 0x3c($s0) -/* ED07BC 802407CC 8E220074 */ lw $v0, 0x74($s1) -/* ED07C0 802407D0 2442000A */ addiu $v0, $v0, 0xa -/* ED07C4 802407D4 44826000 */ mtc1 $v0, $f12 -/* ED07C8 802407D8 00000000 */ nop -/* ED07CC 802407DC 0C00AB85 */ jal dead_clamp_angle -/* ED07D0 802407E0 46806320 */ cvt.s.w $f12, $f12 -/* ED07D4 802407E4 4600020D */ trunc.w.s $f8, $f0 -/* ED07D8 802407E8 E6280074 */ swc1 $f8, 0x74($s1) -.L802407EC: -/* ED07DC 802407EC 8E220090 */ lw $v0, 0x90($s1) -/* ED07E0 802407F0 1C40004A */ bgtz $v0, .L8024091C -/* ED07E4 802407F4 2442FFFF */ addiu $v0, $v0, -1 -/* ED07E8 802407F8 8E430014 */ lw $v1, 0x14($s2) -/* ED07EC 802407FC 04600048 */ bltz $v1, .L80240920 -/* ED07F0 80240800 00000000 */ nop -/* ED07F4 80240804 8E620074 */ lw $v0, 0x74($s3) -/* ED07F8 80240808 1C400042 */ bgtz $v0, .L80240914 -/* ED07FC 8024080C 2442FFFF */ addiu $v0, $v0, -1 -/* ED0800 80240810 AE630074 */ sw $v1, 0x74($s3) -/* ED0804 80240814 860200A8 */ lh $v0, 0xa8($s0) -/* ED0808 80240818 C602003C */ lwc1 $f2, 0x3c($s0) -/* ED080C 8024081C 44820000 */ mtc1 $v0, $f0 -/* ED0810 80240820 00000000 */ nop -/* ED0814 80240824 46800020 */ cvt.s.w $f0, $f0 -/* ED0818 80240828 46001080 */ add.s $f2, $f2, $f0 -/* ED081C 8024082C 3C014024 */ lui $at, 0x4024 -/* ED0820 80240830 44810800 */ mtc1 $at, $f1 -/* ED0824 80240834 44800000 */ mtc1 $zero, $f0 -/* ED0828 80240838 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* ED082C 8024083C 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* ED0830 80240840 460010A1 */ cvt.d.s $f2, $f2 -/* ED0834 80240844 46201080 */ add.d $f2, $f2, $f0 -/* ED0838 80240848 C440002C */ lwc1 $f0, 0x2c($v0) -/* ED083C 8024084C 46000021 */ cvt.d.s $f0, $f0 -/* ED0840 80240850 4622003C */ c.lt.d $f0, $f2 -/* ED0844 80240854 00000000 */ nop -/* ED0848 80240858 4500002C */ bc1f .L8024090C -/* ED084C 8024085C 02A0202D */ daddu $a0, $s5, $zero -/* ED0850 80240860 AFA00010 */ sw $zero, 0x10($sp) -/* ED0854 80240864 8E46000C */ lw $a2, 0xc($s2) -/* ED0858 80240868 8E470010 */ lw $a3, 0x10($s2) -/* ED085C 8024086C 0C013469 */ jal func_8004D1A4 -/* ED0860 80240870 0220282D */ daddu $a1, $s1, $zero -/* ED0864 80240874 10400025 */ beqz $v0, .L8024090C -/* ED0868 80240878 0000202D */ daddu $a0, $zero, $zero -/* ED086C 8024087C 0200282D */ daddu $a1, $s0, $zero -/* ED0870 80240880 0000302D */ daddu $a2, $zero, $zero -/* ED0874 80240884 2412000C */ addiu $s2, $zero, 0xc -/* ED0878 80240888 860300A8 */ lh $v1, 0xa8($s0) -/* ED087C 8024088C 3C013F80 */ lui $at, 0x3f80 -/* ED0880 80240890 44810000 */ mtc1 $at, $f0 -/* ED0884 80240894 3C014000 */ lui $at, 0x4000 -/* ED0888 80240898 44811000 */ mtc1 $at, $f2 -/* ED088C 8024089C 3C01C1A0 */ lui $at, 0xc1a0 -/* ED0890 802408A0 44812000 */ mtc1 $at, $f4 -/* ED0894 802408A4 44834000 */ mtc1 $v1, $f8 -/* ED0898 802408A8 00000000 */ nop -/* ED089C 802408AC 46804220 */ cvt.s.w $f8, $f8 -/* ED08A0 802408B0 44074000 */ mfc1 $a3, $f8 -/* ED08A4 802408B4 27A20038 */ addiu $v0, $sp, 0x38 -/* ED08A8 802408B8 AFB2001C */ sw $s2, 0x1c($sp) -/* ED08AC 802408BC AFA20020 */ sw $v0, 0x20($sp) -/* ED08B0 802408C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* ED08B4 802408C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* ED08B8 802408C8 0C01D444 */ jal dead_fx_emote -/* ED08BC 802408CC E7A40018 */ swc1 $f4, 0x18($sp) -/* ED08C0 802408D0 0200202D */ daddu $a0, $s0, $zero -/* ED08C4 802408D4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* ED08C8 802408D8 C480003C */ lwc1 $f0, 0x3c($a0) -/* ED08CC 802408DC 3C060020 */ lui $a2, 0x20 -/* ED08D0 802408E0 0C013600 */ jal dead_ai_enemy_play_sound -/* ED08D4 802408E4 E4800064 */ swc1 $f0, 0x64($a0) -/* ED08D8 802408E8 8E220018 */ lw $v0, 0x18($s1) -/* ED08DC 802408EC 9442002A */ lhu $v0, 0x2a($v0) -/* ED08E0 802408F0 30420001 */ andi $v0, $v0, 1 -/* ED08E4 802408F4 10400003 */ beqz $v0, .L80240904 -/* ED08E8 802408F8 2402000A */ addiu $v0, $zero, 0xa -/* ED08EC 802408FC 080902B1 */ j .L80240AC4 -/* ED08F0 80240900 AE620070 */ sw $v0, 0x70($s3) -.L80240904: -/* ED08F4 80240904 080902B1 */ j .L80240AC4 -/* ED08F8 80240908 AE720070 */ sw $s2, 0x70($s3) -.L8024090C: -/* ED08FC 8024090C 8E620074 */ lw $v0, 0x74($s3) -/* ED0900 80240910 2442FFFF */ addiu $v0, $v0, -1 -.L80240914: -/* ED0904 80240914 08090248 */ j .L80240920 -/* ED0908 80240918 AE620074 */ sw $v0, 0x74($s3) -.L8024091C: -/* ED090C 8024091C AE220090 */ sw $v0, 0x90($s1) -.L80240920: -/* ED0910 80240920 8E2300D0 */ lw $v1, 0xd0($s1) -/* ED0914 80240924 C6000040 */ lwc1 $f0, 0x40($s0) -/* ED0918 80240928 C4620000 */ lwc1 $f2, ($v1) -/* ED091C 8024092C 468010A0 */ cvt.s.w $f2, $f2 -/* ED0920 80240930 C4640008 */ lwc1 $f4, 8($v1) -/* ED0924 80240934 46802120 */ cvt.s.w $f4, $f4 -/* ED0928 80240938 E7A00010 */ swc1 $f0, 0x10($sp) -/* ED092C 8024093C 8E2200D0 */ lw $v0, 0xd0($s1) -/* ED0930 80240940 44051000 */ mfc1 $a1, $f2 -/* ED0934 80240944 C440000C */ lwc1 $f0, 0xc($v0) -/* ED0938 80240948 46800020 */ cvt.s.w $f0, $f0 -/* ED093C 8024094C E7A00014 */ swc1 $f0, 0x14($sp) -/* ED0940 80240950 8E2200D0 */ lw $v0, 0xd0($s1) -/* ED0944 80240954 44062000 */ mfc1 $a2, $f4 -/* ED0948 80240958 C4400010 */ lwc1 $f0, 0x10($v0) -/* ED094C 8024095C 46800020 */ cvt.s.w $f0, $f0 -/* ED0950 80240960 E7A00018 */ swc1 $f0, 0x18($sp) -/* ED0954 80240964 8C640018 */ lw $a0, 0x18($v1) -/* ED0958 80240968 0C013431 */ jal dead_is_point_within_region -/* ED095C 8024096C 8E070038 */ lw $a3, 0x38($s0) -/* ED0960 80240970 1040001A */ beqz $v0, .L802409DC -/* ED0964 80240974 00000000 */ nop -/* ED0968 80240978 8E060038 */ lw $a2, 0x38($s0) -/* ED096C 8024097C 8E2200D0 */ lw $v0, 0xd0($s1) -/* ED0970 80240980 8E070040 */ lw $a3, 0x40($s0) -/* ED0974 80240984 C44C0000 */ lwc1 $f12, ($v0) -/* ED0978 80240988 46806320 */ cvt.s.w $f12, $f12 -/* ED097C 8024098C C44E0008 */ lwc1 $f14, 8($v0) -/* ED0980 80240990 0C00AC71 */ jal dead_dist2D -/* ED0984 80240994 468073A0 */ cvt.s.w $f14, $f14 -/* ED0988 80240998 C6020018 */ lwc1 $f2, 0x18($s0) -/* ED098C 8024099C 4600103C */ c.lt.s $f2, $f0 -/* ED0990 802409A0 00000000 */ nop -/* ED0994 802409A4 4500000D */ bc1f .L802409DC -/* ED0998 802409A8 E7A00034 */ swc1 $f0, 0x34($sp) -/* ED099C 802409AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* ED09A0 802409B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* ED09A4 802409B4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ED09A8 802409B8 C4480000 */ lwc1 $f8, ($v0) -/* ED09AC 802409BC 46804220 */ cvt.s.w $f8, $f8 -/* ED09B0 802409C0 44064000 */ mfc1 $a2, $f8 -/* ED09B4 802409C4 C4480008 */ lwc1 $f8, 8($v0) -/* ED09B8 802409C8 46804220 */ cvt.s.w $f8, $f8 -/* ED09BC 802409CC 44074000 */ mfc1 $a3, $f8 -/* ED09C0 802409D0 0C00ABDC */ jal fio_validate_header_checksums -/* ED09C4 802409D4 24140001 */ addiu $s4, $zero, 1 -/* ED09C8 802409D8 E600000C */ swc1 $f0, 0xc($s0) -.L802409DC: -/* ED09CC 802409DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* ED09D0 802409E0 8C43000C */ lw $v1, 0xc($v0) -/* ED09D4 802409E4 8C420010 */ lw $v0, 0x10($v0) -/* ED09D8 802409E8 00621825 */ or $v1, $v1, $v0 -/* ED09DC 802409EC 00741825 */ or $v1, $v1, $s4 -/* ED09E0 802409F0 10600008 */ beqz $v1, .L80240A14 -/* ED09E4 802409F4 00000000 */ nop -/* ED09E8 802409F8 8602008C */ lh $v0, 0x8c($s0) -/* ED09EC 802409FC 14400031 */ bnez $v0, .L80240AC4 -/* ED09F0 80240A00 00000000 */ nop -/* ED09F4 80240A04 8E050018 */ lw $a1, 0x18($s0) -/* ED09F8 80240A08 8E06000C */ lw $a2, 0xc($s0) -/* ED09FC 80240A0C 0C00F909 */ jal dead_npc_move_heading -/* ED0A00 80240A10 0200202D */ daddu $a0, $s0, $zero -.L80240A14: -/* ED0A04 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* ED0A08 80240A18 3C014059 */ lui $at, 0x4059 -/* ED0A0C 80240A1C 44811800 */ mtc1 $at, $f3 -/* ED0A10 80240A20 44801000 */ mtc1 $zero, $f2 -/* ED0A14 80240A24 46000021 */ cvt.d.s $f0, $f0 -/* ED0A18 80240A28 46220002 */ mul.d $f0, $f0, $f2 -/* ED0A1C 80240A2C 00000000 */ nop -/* ED0A20 80240A30 4620020D */ trunc.w.d $f8, $f0 -/* ED0A24 80240A34 E628007C */ swc1 $f8, 0x7c($s1) -/* ED0A28 80240A38 8E420004 */ lw $v0, 4($s2) -/* ED0A2C 80240A3C 18400021 */ blez $v0, .L80240AC4 -/* ED0A30 80240A40 00000000 */ nop -/* ED0A34 80240A44 8602008E */ lh $v0, 0x8e($s0) -/* ED0A38 80240A48 9603008E */ lhu $v1, 0x8e($s0) -/* ED0A3C 80240A4C 18400005 */ blez $v0, .L80240A64 -/* ED0A40 80240A50 2462FFFF */ addiu $v0, $v1, -1 -/* ED0A44 80240A54 A602008E */ sh $v0, 0x8e($s0) -/* ED0A48 80240A58 00021400 */ sll $v0, $v0, 0x10 -/* ED0A4C 80240A5C 1C400019 */ bgtz $v0, .L80240AC4 -/* ED0A50 80240A60 00000000 */ nop -.L80240A64: -/* ED0A54 80240A64 240403E8 */ addiu $a0, $zero, 0x3e8 -/* ED0A58 80240A68 24020002 */ addiu $v0, $zero, 2 -/* ED0A5C 80240A6C 0C00AB3B */ jal dead_rand_int -/* ED0A60 80240A70 AE620070 */ sw $v0, 0x70($s3) -/* ED0A64 80240A74 3C035555 */ lui $v1, 0x5555 -/* ED0A68 80240A78 34635556 */ ori $v1, $v1, 0x5556 -/* ED0A6C 80240A7C 00430018 */ mult $v0, $v1 -/* ED0A70 80240A80 000227C3 */ sra $a0, $v0, 0x1f -/* ED0A74 80240A84 00004010 */ mfhi $t0 -/* ED0A78 80240A88 01042023 */ subu $a0, $t0, $a0 -/* ED0A7C 80240A8C 00041840 */ sll $v1, $a0, 1 -/* ED0A80 80240A90 00641821 */ addu $v1, $v1, $a0 -/* ED0A84 80240A94 00431023 */ subu $v0, $v0, $v1 -/* ED0A88 80240A98 24430002 */ addiu $v1, $v0, 2 -/* ED0A8C 80240A9C AE630074 */ sw $v1, 0x74($s3) -/* ED0A90 80240AA0 8E42002C */ lw $v0, 0x2c($s2) -/* ED0A94 80240AA4 58400007 */ blezl $v0, .L80240AC4 -/* ED0A98 80240AA8 AE600070 */ sw $zero, 0x70($s3) -/* ED0A9C 80240AAC 8E420008 */ lw $v0, 8($s2) -/* ED0AA0 80240AB0 18400003 */ blez $v0, .L80240AC0 -/* ED0AA4 80240AB4 28620003 */ slti $v0, $v1, 3 -/* ED0AA8 80240AB8 10400002 */ beqz $v0, .L80240AC4 -/* ED0AAC 80240ABC 00000000 */ nop -.L80240AC0: -/* ED0AB0 80240AC0 AE600070 */ sw $zero, 0x70($s3) -.L80240AC4: -/* ED0AB4 80240AC4 8FBF0058 */ lw $ra, 0x58($sp) -/* ED0AB8 80240AC8 8FB50054 */ lw $s5, 0x54($sp) -/* ED0ABC 80240ACC 8FB40050 */ lw $s4, 0x50($sp) -/* ED0AC0 80240AD0 8FB3004C */ lw $s3, 0x4c($sp) -/* ED0AC4 80240AD4 8FB20048 */ lw $s2, 0x48($sp) -/* ED0AC8 80240AD8 8FB10044 */ lw $s1, 0x44($sp) -/* ED0ACC 80240ADC 8FB00040 */ lw $s0, 0x40($sp) -/* ED0AD0 80240AE0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* ED0AD4 80240AE4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* ED0AD8 80240AE8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* ED0ADC 80240AEC D7B40060 */ ldc1 $f20, 0x60($sp) -/* ED0AE0 80240AF0 03E00008 */ jr $ra -/* ED0AE4 80240AF4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s b/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s index 5e2e2646b8..4219aa0dcf 100644 --- a/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s +++ b/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s @@ -97,7 +97,7 @@ glabel func_8024162C_ED161C .L80241774_ED1764: /* ED1764 80241774 02A0202D */ daddu $a0, $s5, $zero /* ED1768 80241778 0200282D */ daddu $a1, $s0, $zero -/* ED176C 8024177C 0C090134 */ jal func_802404D0_ED04C0 +/* ED176C 8024177C 0C090134 */ jal ED0310_UnkNpcAIFunc35 /* ED1770 80241780 0260302D */ daddu $a2, $s3, $zero /* ED1774 80241784 08090608 */ j .L80241820 /* ED1778 80241788 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80240374_EDED34.s b/ver/us/asm/nonmatchings/EDEA00/func_80240374_EDED34.s deleted file mode 100644 index 60041cced0..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_80240374_EDED34.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247AF8_EE64B8 -.double 0.09 - -dlabel D_80247B00_EE64C0 -.double 0.09 - -.section .text - -glabel func_80240374_EDED34 -/* EDED34 80240374 27BDFF80 */ addiu $sp, $sp, -0x80 -/* EDED38 80240378 AFB3004C */ sw $s3, 0x4c($sp) -/* EDED3C 8024037C 0080982D */ daddu $s3, $a0, $zero -/* EDED40 80240380 AFBF0058 */ sw $ra, 0x58($sp) -/* EDED44 80240384 AFB50054 */ sw $s5, 0x54($sp) -/* EDED48 80240388 AFB40050 */ sw $s4, 0x50($sp) -/* EDED4C 8024038C AFB20048 */ sw $s2, 0x48($sp) -/* EDED50 80240390 AFB10044 */ sw $s1, 0x44($sp) -/* EDED54 80240394 AFB00040 */ sw $s0, 0x40($sp) -/* EDED58 80240398 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* EDED5C 8024039C F7B80070 */ sdc1 $f24, 0x70($sp) -/* EDED60 802403A0 F7B60068 */ sdc1 $f22, 0x68($sp) -/* EDED64 802403A4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* EDED68 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* EDED6C 802403AC 00A0902D */ daddu $s2, $a1, $zero -/* EDED70 802403B0 86240008 */ lh $a0, 8($s1) -/* EDED74 802403B4 0C00F92F */ jal dead_get_npc_unsafe -/* EDED78 802403B8 00C0A82D */ daddu $s5, $a2, $zero -/* EDED7C 802403BC 0040802D */ daddu $s0, $v0, $zero -/* EDED80 802403C0 0000A02D */ daddu $s4, $zero, $zero -/* EDED84 802403C4 C624007C */ lwc1 $f4, 0x7c($s1) -/* EDED88 802403C8 46802120 */ cvt.s.w $f4, $f4 -/* EDED8C 802403CC C6220088 */ lwc1 $f2, 0x88($s1) -/* EDED90 802403D0 468010A0 */ cvt.s.w $f2, $f2 -/* EDED94 802403D4 460010A1 */ cvt.d.s $f2, $f2 -/* EDED98 802403D8 46002121 */ cvt.d.s $f4, $f4 -/* EDED9C 802403DC C600003C */ lwc1 $f0, 0x3c($s0) -/* EDEDA0 802403E0 3C014059 */ lui $at, 0x4059 -/* EDEDA4 802403E4 44813800 */ mtc1 $at, $f7 -/* EDEDA8 802403E8 44803000 */ mtc1 $zero, $f6 -/* EDEDAC 802403EC 46000021 */ cvt.d.s $f0, $f0 -/* EDEDB0 802403F0 46260002 */ mul.d $f0, $f0, $f6 -/* EDEDB4 802403F4 00000000 */ nop -/* EDEDB8 802403F8 24020001 */ addiu $v0, $zero, 1 -/* EDEDBC 802403FC 8E24006C */ lw $a0, 0x6c($s1) -/* EDEDC0 80240400 46261083 */ div.d $f2, $f2, $f6 -/* EDEDC4 80240404 462010A0 */ cvt.s.d $f2, $f2 -/* EDEDC8 80240408 46262103 */ div.d $f4, $f4, $f6 -/* EDEDCC 8024040C 46202520 */ cvt.s.d $f20, $f4 -/* EDEDD0 80240410 30830011 */ andi $v1, $a0, 0x11 -/* EDEDD4 80240414 4620020D */ trunc.w.d $f8, $f0 -/* EDEDD8 80240418 E628007C */ swc1 $f8, 0x7c($s1) -/* EDEDDC 8024041C C6200078 */ lwc1 $f0, 0x78($s1) -/* EDEDE0 80240420 46800020 */ cvt.s.w $f0, $f0 -/* EDEDE4 80240424 46000021 */ cvt.d.s $f0, $f0 -/* EDEDE8 80240428 46260003 */ div.d $f0, $f0, $f6 -/* EDEDEC 8024042C 462006A0 */ cvt.s.d $f26, $f0 -/* EDEDF0 80240430 C6200070 */ lwc1 $f0, 0x70($s1) -/* EDEDF4 80240434 46800020 */ cvt.s.w $f0, $f0 -/* EDEDF8 80240438 46000021 */ cvt.d.s $f0, $f0 -/* EDEDFC 8024043C 46260003 */ div.d $f0, $f0, $f6 -/* EDEE00 80240440 462005A0 */ cvt.s.d $f22, $f0 -/* EDEE04 80240444 14620025 */ bne $v1, $v0, .L802404DC -/* EDEE08 80240448 4602D600 */ add.s $f24, $f26, $f2 -/* EDEE0C 8024044C 8E020000 */ lw $v0, ($s0) -/* EDEE10 80240450 30420008 */ andi $v0, $v0, 8 -/* EDEE14 80240454 10400009 */ beqz $v0, .L8024047C -/* EDEE18 80240458 27A50028 */ addiu $a1, $sp, 0x28 -/* EDEE1C 8024045C C600003C */ lwc1 $f0, 0x3c($s0) -/* EDEE20 80240460 4600C001 */ sub.s $f0, $f24, $f0 -/* EDEE24 80240464 4600B03C */ c.lt.s $f22, $f0 -/* EDEE28 80240468 00000000 */ nop -/* EDEE2C 8024046C 4500001B */ bc1f .L802404DC -/* EDEE30 80240470 34820010 */ ori $v0, $a0, 0x10 -/* EDEE34 80240474 08090137 */ j .L802404DC -/* EDEE38 80240478 AE22006C */ sw $v0, 0x6c($s1) -.L8024047C: -/* EDEE3C 8024047C 27A6002C */ addiu $a2, $sp, 0x2c -/* EDEE40 80240480 C6000038 */ lwc1 $f0, 0x38($s0) -/* EDEE44 80240484 C602003C */ lwc1 $f2, 0x3c($s0) -/* EDEE48 80240488 C6040040 */ lwc1 $f4, 0x40($s0) -/* EDEE4C 8024048C 3C01447A */ lui $at, 0x447a -/* EDEE50 80240490 44813000 */ mtc1 $at, $f6 -/* EDEE54 80240494 27A20034 */ addiu $v0, $sp, 0x34 -/* EDEE58 80240498 E7A00028 */ swc1 $f0, 0x28($sp) -/* EDEE5C 8024049C E7A2002C */ swc1 $f2, 0x2c($sp) -/* EDEE60 802404A0 E7A40030 */ swc1 $f4, 0x30($sp) -/* EDEE64 802404A4 E7A60034 */ swc1 $f6, 0x34($sp) -/* EDEE68 802404A8 AFA20010 */ sw $v0, 0x10($sp) -/* EDEE6C 802404AC 8E040080 */ lw $a0, 0x80($s0) -/* EDEE70 802404B0 0C03908F */ jal dead_npc_raycast_down_sides -/* EDEE74 802404B4 27A70030 */ addiu $a3, $sp, 0x30 -/* EDEE78 802404B8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* EDEE7C 802404BC 4600D001 */ sub.s $f0, $f26, $f0 -/* EDEE80 802404C0 4600B03C */ c.lt.s $f22, $f0 -/* EDEE84 802404C4 00000000 */ nop -/* EDEE88 802404C8 45000004 */ bc1f .L802404DC -/* EDEE8C 802404CC 00000000 */ nop -/* EDEE90 802404D0 8E22006C */ lw $v0, 0x6c($s1) -/* EDEE94 802404D4 34420010 */ ori $v0, $v0, 0x10 -/* EDEE98 802404D8 AE22006C */ sw $v0, 0x6c($s1) -.L802404DC: -/* EDEE9C 802404DC 8E22006C */ lw $v0, 0x6c($s1) -/* EDEEA0 802404E0 24030011 */ addiu $v1, $zero, 0x11 -/* EDEEA4 802404E4 30420011 */ andi $v0, $v0, 0x11 -/* EDEEA8 802404E8 14430039 */ bne $v0, $v1, .L802405D0 -/* EDEEAC 802404EC 00000000 */ nop -/* EDEEB0 802404F0 8E020000 */ lw $v0, ($s0) -/* EDEEB4 802404F4 30420008 */ andi $v0, $v0, 8 -/* EDEEB8 802404F8 1040000A */ beqz $v0, .L80240524 -/* EDEEBC 802404FC 4600C106 */ mov.s $f4, $f24 -/* EDEEC0 80240500 4614C081 */ sub.s $f2, $f24, $f20 -/* EDEEC4 80240504 3C018024 */ lui $at, %hi(D_80247AF8_EE64B8) -/* EDEEC8 80240508 D4207AF8 */ ldc1 $f0, %lo(D_80247AF8_EE64B8)($at) -/* EDEECC 8024050C 460010A1 */ cvt.d.s $f2, $f2 -/* EDEED0 80240510 46201082 */ mul.d $f2, $f2, $f0 -/* EDEED4 80240514 00000000 */ nop -/* EDEED8 80240518 4600A021 */ cvt.d.s $f0, $f20 -/* EDEEDC 8024051C 08090162 */ j .L80240588 -/* EDEEE0 80240520 46220000 */ add.d $f0, $f0, $f2 -.L80240524: -/* EDEEE4 80240524 27A50028 */ addiu $a1, $sp, 0x28 -/* EDEEE8 80240528 27A6002C */ addiu $a2, $sp, 0x2c -/* EDEEEC 8024052C C6000038 */ lwc1 $f0, 0x38($s0) -/* EDEEF0 80240530 C6020040 */ lwc1 $f2, 0x40($s0) -/* EDEEF4 80240534 3C01447A */ lui $at, 0x447a -/* EDEEF8 80240538 44812000 */ mtc1 $at, $f4 -/* EDEEFC 8024053C 27A20034 */ addiu $v0, $sp, 0x34 -/* EDEF00 80240540 E7B4002C */ swc1 $f20, 0x2c($sp) -/* EDEF04 80240544 E7A00028 */ swc1 $f0, 0x28($sp) -/* EDEF08 80240548 E7A20030 */ swc1 $f2, 0x30($sp) -/* EDEF0C 8024054C E7A40034 */ swc1 $f4, 0x34($sp) -/* EDEF10 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* EDEF14 80240554 8E040080 */ lw $a0, 0x80($s0) -/* EDEF18 80240558 0C03908F */ jal dead_npc_raycast_down_sides -/* EDEF1C 8024055C 27A70030 */ addiu $a3, $sp, 0x30 -/* EDEF20 80240560 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* EDEF24 80240564 461A2100 */ add.s $f4, $f4, $f26 -/* EDEF28 80240568 46142081 */ sub.s $f2, $f4, $f20 -/* EDEF2C 8024056C 3C018024 */ lui $at, %hi(D_80247B00_EE64C0) -/* EDEF30 80240570 D4207B00 */ ldc1 $f0, %lo(D_80247B00_EE64C0)($at) -/* EDEF34 80240574 460010A1 */ cvt.d.s $f2, $f2 -/* EDEF38 80240578 46201082 */ mul.d $f2, $f2, $f0 -/* EDEF3C 8024057C 00000000 */ nop -/* EDEF40 80240580 4600A021 */ cvt.d.s $f0, $f20 -/* EDEF44 80240584 46220000 */ add.d $f0, $f0, $f2 -.L80240588: -/* EDEF48 80240588 46200020 */ cvt.s.d $f0, $f0 -/* EDEF4C 8024058C E600003C */ swc1 $f0, 0x3c($s0) -/* EDEF50 80240590 C600003C */ lwc1 $f0, 0x3c($s0) -/* EDEF54 80240594 46002001 */ sub.s $f0, $f4, $f0 -/* EDEF58 80240598 3C013FF0 */ lui $at, 0x3ff0 -/* EDEF5C 8024059C 44811800 */ mtc1 $at, $f3 -/* EDEF60 802405A0 44801000 */ mtc1 $zero, $f2 -/* EDEF64 802405A4 46000005 */ abs.s $f0, $f0 -/* EDEF68 802405A8 46000021 */ cvt.d.s $f0, $f0 -/* EDEF6C 802405AC 4622003C */ c.lt.d $f0, $f2 -/* EDEF70 802405B0 00000000 */ nop -/* EDEF74 802405B4 45000036 */ bc1f .L80240690 -/* EDEF78 802405B8 2403FFEF */ addiu $v1, $zero, -0x11 -/* EDEF7C 802405BC E604003C */ swc1 $f4, 0x3c($s0) -/* EDEF80 802405C0 8E22006C */ lw $v0, 0x6c($s1) -/* EDEF84 802405C4 00431024 */ and $v0, $v0, $v1 -/* EDEF88 802405C8 080901A4 */ j .L80240690 -/* EDEF8C 802405CC AE22006C */ sw $v0, 0x6c($s1) -.L802405D0: -/* EDEF90 802405D0 8E220070 */ lw $v0, 0x70($s1) -/* EDEF94 802405D4 1840002E */ blez $v0, .L80240690 -/* EDEF98 802405D8 00000000 */ nop -/* EDEF9C 802405DC C62C0074 */ lwc1 $f12, 0x74($s1) -/* EDEFA0 802405E0 0C00AD77 */ jal dead_sin_deg -/* EDEFA4 802405E4 46806320 */ cvt.s.w $f12, $f12 -/* EDEFA8 802405E8 8E020000 */ lw $v0, ($s0) -/* EDEFAC 802405EC 30420008 */ andi $v0, $v0, 8 -/* EDEFB0 802405F0 10400003 */ beqz $v0, .L80240600 -/* EDEFB4 802405F4 46000506 */ mov.s $f20, $f0 -/* EDEFB8 802405F8 08090190 */ j .L80240640 -/* EDEFBC 802405FC 0000102D */ daddu $v0, $zero, $zero -.L80240600: -/* EDEFC0 80240600 27A50028 */ addiu $a1, $sp, 0x28 -/* EDEFC4 80240604 27A6002C */ addiu $a2, $sp, 0x2c -/* EDEFC8 80240608 C6000038 */ lwc1 $f0, 0x38($s0) -/* EDEFCC 8024060C C602003C */ lwc1 $f2, 0x3c($s0) -/* EDEFD0 80240610 C6040040 */ lwc1 $f4, 0x40($s0) -/* EDEFD4 80240614 3C01447A */ lui $at, 0x447a -/* EDEFD8 80240618 44813000 */ mtc1 $at, $f6 -/* EDEFDC 8024061C 27A20034 */ addiu $v0, $sp, 0x34 -/* EDEFE0 80240620 E7A00028 */ swc1 $f0, 0x28($sp) -/* EDEFE4 80240624 E7A2002C */ swc1 $f2, 0x2c($sp) -/* EDEFE8 80240628 E7A40030 */ swc1 $f4, 0x30($sp) -/* EDEFEC 8024062C E7A60034 */ swc1 $f6, 0x34($sp) -/* EDEFF0 80240630 AFA20010 */ sw $v0, 0x10($sp) -/* EDEFF4 80240634 8E040080 */ lw $a0, 0x80($s0) -/* EDEFF8 80240638 0C03908F */ jal dead_npc_raycast_down_sides -/* EDEFFC 8024063C 27A70030 */ addiu $a3, $sp, 0x30 -.L80240640: -/* EDF000 80240640 10400007 */ beqz $v0, .L80240660 -/* EDF004 80240644 00000000 */ nop -/* EDF008 80240648 4616A082 */ mul.s $f2, $f20, $f22 -/* EDF00C 8024064C 00000000 */ nop -/* EDF010 80240650 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* EDF014 80240654 461A0000 */ add.s $f0, $f0, $f26 -/* EDF018 80240658 0809019B */ j .L8024066C -/* EDF01C 8024065C 46020000 */ add.s $f0, $f0, $f2 -.L80240660: -/* EDF020 80240660 4616A002 */ mul.s $f0, $f20, $f22 -/* EDF024 80240664 00000000 */ nop -/* EDF028 80240668 4600C000 */ add.s $f0, $f24, $f0 -.L8024066C: -/* EDF02C 8024066C E600003C */ swc1 $f0, 0x3c($s0) -/* EDF030 80240670 8E220074 */ lw $v0, 0x74($s1) -/* EDF034 80240674 2442000A */ addiu $v0, $v0, 0xa -/* EDF038 80240678 44826000 */ mtc1 $v0, $f12 -/* EDF03C 8024067C 00000000 */ nop -/* EDF040 80240680 0C00AB85 */ jal dead_clamp_angle -/* EDF044 80240684 46806320 */ cvt.s.w $f12, $f12 -/* EDF048 80240688 4600020D */ trunc.w.s $f8, $f0 -/* EDF04C 8024068C E6280074 */ swc1 $f8, 0x74($s1) -.L80240690: -/* EDF050 80240690 8E220090 */ lw $v0, 0x90($s1) -/* EDF054 80240694 1C40004A */ bgtz $v0, .L802407C0 -/* EDF058 80240698 2442FFFF */ addiu $v0, $v0, -1 -/* EDF05C 8024069C 8E430014 */ lw $v1, 0x14($s2) -/* EDF060 802406A0 04600048 */ bltz $v1, .L802407C4 -/* EDF064 802406A4 00000000 */ nop -/* EDF068 802406A8 8E620074 */ lw $v0, 0x74($s3) -/* EDF06C 802406AC 1C400042 */ bgtz $v0, .L802407B8 -/* EDF070 802406B0 2442FFFF */ addiu $v0, $v0, -1 -/* EDF074 802406B4 AE630074 */ sw $v1, 0x74($s3) -/* EDF078 802406B8 860200A8 */ lh $v0, 0xa8($s0) -/* EDF07C 802406BC C602003C */ lwc1 $f2, 0x3c($s0) -/* EDF080 802406C0 44820000 */ mtc1 $v0, $f0 -/* EDF084 802406C4 00000000 */ nop -/* EDF088 802406C8 46800020 */ cvt.s.w $f0, $f0 -/* EDF08C 802406CC 46001080 */ add.s $f2, $f2, $f0 -/* EDF090 802406D0 3C014024 */ lui $at, 0x4024 -/* EDF094 802406D4 44810800 */ mtc1 $at, $f1 -/* EDF098 802406D8 44800000 */ mtc1 $zero, $f0 -/* EDF09C 802406DC 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EDF0A0 802406E0 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EDF0A4 802406E4 460010A1 */ cvt.d.s $f2, $f2 -/* EDF0A8 802406E8 46201080 */ add.d $f2, $f2, $f0 -/* EDF0AC 802406EC C440002C */ lwc1 $f0, 0x2c($v0) -/* EDF0B0 802406F0 46000021 */ cvt.d.s $f0, $f0 -/* EDF0B4 802406F4 4622003C */ c.lt.d $f0, $f2 -/* EDF0B8 802406F8 00000000 */ nop -/* EDF0BC 802406FC 4500002C */ bc1f .L802407B0 -/* EDF0C0 80240700 02A0202D */ daddu $a0, $s5, $zero -/* EDF0C4 80240704 AFA00010 */ sw $zero, 0x10($sp) -/* EDF0C8 80240708 8E46000C */ lw $a2, 0xc($s2) -/* EDF0CC 8024070C 8E470010 */ lw $a3, 0x10($s2) -/* EDF0D0 80240710 0C013469 */ jal func_8004D1A4 -/* EDF0D4 80240714 0220282D */ daddu $a1, $s1, $zero -/* EDF0D8 80240718 10400025 */ beqz $v0, .L802407B0 -/* EDF0DC 8024071C 0000202D */ daddu $a0, $zero, $zero -/* EDF0E0 80240720 0200282D */ daddu $a1, $s0, $zero -/* EDF0E4 80240724 0000302D */ daddu $a2, $zero, $zero -/* EDF0E8 80240728 2412000C */ addiu $s2, $zero, 0xc -/* EDF0EC 8024072C 860300A8 */ lh $v1, 0xa8($s0) -/* EDF0F0 80240730 3C013F80 */ lui $at, 0x3f80 -/* EDF0F4 80240734 44810000 */ mtc1 $at, $f0 -/* EDF0F8 80240738 3C014000 */ lui $at, 0x4000 -/* EDF0FC 8024073C 44811000 */ mtc1 $at, $f2 -/* EDF100 80240740 3C01C1A0 */ lui $at, 0xc1a0 -/* EDF104 80240744 44812000 */ mtc1 $at, $f4 -/* EDF108 80240748 44834000 */ mtc1 $v1, $f8 -/* EDF10C 8024074C 00000000 */ nop -/* EDF110 80240750 46804220 */ cvt.s.w $f8, $f8 -/* EDF114 80240754 44074000 */ mfc1 $a3, $f8 -/* EDF118 80240758 27A20038 */ addiu $v0, $sp, 0x38 -/* EDF11C 8024075C AFB2001C */ sw $s2, 0x1c($sp) -/* EDF120 80240760 AFA20020 */ sw $v0, 0x20($sp) -/* EDF124 80240764 E7A00010 */ swc1 $f0, 0x10($sp) -/* EDF128 80240768 E7A20014 */ swc1 $f2, 0x14($sp) -/* EDF12C 8024076C 0C01D444 */ jal dead_fx_emote -/* EDF130 80240770 E7A40018 */ swc1 $f4, 0x18($sp) -/* EDF134 80240774 0200202D */ daddu $a0, $s0, $zero -/* EDF138 80240778 240502F4 */ addiu $a1, $zero, 0x2f4 -/* EDF13C 8024077C C480003C */ lwc1 $f0, 0x3c($a0) -/* EDF140 80240780 3C060020 */ lui $a2, 0x20 -/* EDF144 80240784 0C013600 */ jal dead_ai_enemy_play_sound -/* EDF148 80240788 E4800064 */ swc1 $f0, 0x64($a0) -/* EDF14C 8024078C 8E220018 */ lw $v0, 0x18($s1) -/* EDF150 80240790 9442002A */ lhu $v0, 0x2a($v0) -/* EDF154 80240794 30420001 */ andi $v0, $v0, 1 -/* EDF158 80240798 10400003 */ beqz $v0, .L802407A8 -/* EDF15C 8024079C 2402000A */ addiu $v0, $zero, 0xa -/* EDF160 802407A0 0809025A */ j .L80240968 -/* EDF164 802407A4 AE620070 */ sw $v0, 0x70($s3) -.L802407A8: -/* EDF168 802407A8 0809025A */ j .L80240968 -/* EDF16C 802407AC AE720070 */ sw $s2, 0x70($s3) -.L802407B0: -/* EDF170 802407B0 8E620074 */ lw $v0, 0x74($s3) -/* EDF174 802407B4 2442FFFF */ addiu $v0, $v0, -1 -.L802407B8: -/* EDF178 802407B8 080901F1 */ j .L802407C4 -/* EDF17C 802407BC AE620074 */ sw $v0, 0x74($s3) -.L802407C0: -/* EDF180 802407C0 AE220090 */ sw $v0, 0x90($s1) -.L802407C4: -/* EDF184 802407C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* EDF188 802407C8 C6000040 */ lwc1 $f0, 0x40($s0) -/* EDF18C 802407CC C4620000 */ lwc1 $f2, ($v1) -/* EDF190 802407D0 468010A0 */ cvt.s.w $f2, $f2 -/* EDF194 802407D4 C4640008 */ lwc1 $f4, 8($v1) -/* EDF198 802407D8 46802120 */ cvt.s.w $f4, $f4 -/* EDF19C 802407DC E7A00010 */ swc1 $f0, 0x10($sp) -/* EDF1A0 802407E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* EDF1A4 802407E4 44051000 */ mfc1 $a1, $f2 -/* EDF1A8 802407E8 C440000C */ lwc1 $f0, 0xc($v0) -/* EDF1AC 802407EC 46800020 */ cvt.s.w $f0, $f0 -/* EDF1B0 802407F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* EDF1B4 802407F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* EDF1B8 802407F8 44062000 */ mfc1 $a2, $f4 -/* EDF1BC 802407FC C4400010 */ lwc1 $f0, 0x10($v0) -/* EDF1C0 80240800 46800020 */ cvt.s.w $f0, $f0 -/* EDF1C4 80240804 E7A00018 */ swc1 $f0, 0x18($sp) -/* EDF1C8 80240808 8C640018 */ lw $a0, 0x18($v1) -/* EDF1CC 8024080C 0C013431 */ jal dead_is_point_within_region -/* EDF1D0 80240810 8E070038 */ lw $a3, 0x38($s0) -/* EDF1D4 80240814 1040001A */ beqz $v0, .L80240880 -/* EDF1D8 80240818 00000000 */ nop -/* EDF1DC 8024081C 8E060038 */ lw $a2, 0x38($s0) -/* EDF1E0 80240820 8E2200D0 */ lw $v0, 0xd0($s1) -/* EDF1E4 80240824 8E070040 */ lw $a3, 0x40($s0) -/* EDF1E8 80240828 C44C0000 */ lwc1 $f12, ($v0) -/* EDF1EC 8024082C 46806320 */ cvt.s.w $f12, $f12 -/* EDF1F0 80240830 C44E0008 */ lwc1 $f14, 8($v0) -/* EDF1F4 80240834 0C00AC71 */ jal dead_dist2D -/* EDF1F8 80240838 468073A0 */ cvt.s.w $f14, $f14 -/* EDF1FC 8024083C C6020018 */ lwc1 $f2, 0x18($s0) -/* EDF200 80240840 4600103C */ c.lt.s $f2, $f0 -/* EDF204 80240844 00000000 */ nop -/* EDF208 80240848 4500000D */ bc1f .L80240880 -/* EDF20C 8024084C E7A00034 */ swc1 $f0, 0x34($sp) -/* EDF210 80240850 C60C0038 */ lwc1 $f12, 0x38($s0) -/* EDF214 80240854 8E2200D0 */ lw $v0, 0xd0($s1) -/* EDF218 80240858 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EDF21C 8024085C C4480000 */ lwc1 $f8, ($v0) -/* EDF220 80240860 46804220 */ cvt.s.w $f8, $f8 -/* EDF224 80240864 44064000 */ mfc1 $a2, $f8 -/* EDF228 80240868 C4480008 */ lwc1 $f8, 8($v0) -/* EDF22C 8024086C 46804220 */ cvt.s.w $f8, $f8 -/* EDF230 80240870 44074000 */ mfc1 $a3, $f8 -/* EDF234 80240874 0C00ABDC */ jal fio_validate_header_checksums -/* EDF238 80240878 24140001 */ addiu $s4, $zero, 1 -/* EDF23C 8024087C E600000C */ swc1 $f0, 0xc($s0) -.L80240880: -/* EDF240 80240880 8E2200D0 */ lw $v0, 0xd0($s1) -/* EDF244 80240884 8C43000C */ lw $v1, 0xc($v0) -/* EDF248 80240888 8C420010 */ lw $v0, 0x10($v0) -/* EDF24C 8024088C 00621825 */ or $v1, $v1, $v0 -/* EDF250 80240890 00741825 */ or $v1, $v1, $s4 -/* EDF254 80240894 10600008 */ beqz $v1, .L802408B8 -/* EDF258 80240898 00000000 */ nop -/* EDF25C 8024089C 8602008C */ lh $v0, 0x8c($s0) -/* EDF260 802408A0 14400031 */ bnez $v0, .L80240968 -/* EDF264 802408A4 00000000 */ nop -/* EDF268 802408A8 8E050018 */ lw $a1, 0x18($s0) -/* EDF26C 802408AC 8E06000C */ lw $a2, 0xc($s0) -/* EDF270 802408B0 0C00F909 */ jal dead_npc_move_heading -/* EDF274 802408B4 0200202D */ daddu $a0, $s0, $zero -.L802408B8: -/* EDF278 802408B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* EDF27C 802408BC 3C014059 */ lui $at, 0x4059 -/* EDF280 802408C0 44811800 */ mtc1 $at, $f3 -/* EDF284 802408C4 44801000 */ mtc1 $zero, $f2 -/* EDF288 802408C8 46000021 */ cvt.d.s $f0, $f0 -/* EDF28C 802408CC 46220002 */ mul.d $f0, $f0, $f2 -/* EDF290 802408D0 00000000 */ nop -/* EDF294 802408D4 4620020D */ trunc.w.d $f8, $f0 -/* EDF298 802408D8 E628007C */ swc1 $f8, 0x7c($s1) -/* EDF29C 802408DC 8E420004 */ lw $v0, 4($s2) -/* EDF2A0 802408E0 18400021 */ blez $v0, .L80240968 -/* EDF2A4 802408E4 00000000 */ nop -/* EDF2A8 802408E8 8602008E */ lh $v0, 0x8e($s0) -/* EDF2AC 802408EC 9603008E */ lhu $v1, 0x8e($s0) -/* EDF2B0 802408F0 18400005 */ blez $v0, .L80240908 -/* EDF2B4 802408F4 2462FFFF */ addiu $v0, $v1, -1 -/* EDF2B8 802408F8 A602008E */ sh $v0, 0x8e($s0) -/* EDF2BC 802408FC 00021400 */ sll $v0, $v0, 0x10 -/* EDF2C0 80240900 1C400019 */ bgtz $v0, .L80240968 -/* EDF2C4 80240904 00000000 */ nop -.L80240908: -/* EDF2C8 80240908 240403E8 */ addiu $a0, $zero, 0x3e8 -/* EDF2CC 8024090C 24020002 */ addiu $v0, $zero, 2 -/* EDF2D0 80240910 0C00AB3B */ jal dead_rand_int -/* EDF2D4 80240914 AE620070 */ sw $v0, 0x70($s3) -/* EDF2D8 80240918 3C035555 */ lui $v1, 0x5555 -/* EDF2DC 8024091C 34635556 */ ori $v1, $v1, 0x5556 -/* EDF2E0 80240920 00430018 */ mult $v0, $v1 -/* EDF2E4 80240924 000227C3 */ sra $a0, $v0, 0x1f -/* EDF2E8 80240928 00004010 */ mfhi $t0 -/* EDF2EC 8024092C 01042023 */ subu $a0, $t0, $a0 -/* EDF2F0 80240930 00041840 */ sll $v1, $a0, 1 -/* EDF2F4 80240934 00641821 */ addu $v1, $v1, $a0 -/* EDF2F8 80240938 00431023 */ subu $v0, $v0, $v1 -/* EDF2FC 8024093C 24430002 */ addiu $v1, $v0, 2 -/* EDF300 80240940 AE630074 */ sw $v1, 0x74($s3) -/* EDF304 80240944 8E42002C */ lw $v0, 0x2c($s2) -/* EDF308 80240948 58400007 */ blezl $v0, .L80240968 -/* EDF30C 8024094C AE600070 */ sw $zero, 0x70($s3) -/* EDF310 80240950 8E420008 */ lw $v0, 8($s2) -/* EDF314 80240954 18400003 */ blez $v0, .L80240964 -/* EDF318 80240958 28620003 */ slti $v0, $v1, 3 -/* EDF31C 8024095C 10400002 */ beqz $v0, .L80240968 -/* EDF320 80240960 00000000 */ nop -.L80240964: -/* EDF324 80240964 AE600070 */ sw $zero, 0x70($s3) -.L80240968: -/* EDF328 80240968 8FBF0058 */ lw $ra, 0x58($sp) -/* EDF32C 8024096C 8FB50054 */ lw $s5, 0x54($sp) -/* EDF330 80240970 8FB40050 */ lw $s4, 0x50($sp) -/* EDF334 80240974 8FB3004C */ lw $s3, 0x4c($sp) -/* EDF338 80240978 8FB20048 */ lw $s2, 0x48($sp) -/* EDF33C 8024097C 8FB10044 */ lw $s1, 0x44($sp) -/* EDF340 80240980 8FB00040 */ lw $s0, 0x40($sp) -/* EDF344 80240984 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* EDF348 80240988 D7B80070 */ ldc1 $f24, 0x70($sp) -/* EDF34C 8024098C D7B60068 */ ldc1 $f22, 0x68($sp) -/* EDF350 80240990 D7B40060 */ ldc1 $f20, 0x60($sp) -/* EDF354 80240994 03E00008 */ jr $ra -/* EDF358 80240998 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s b/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s index d1143ce5bf..89c4c75af8 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s @@ -100,7 +100,7 @@ glabel func_802414D0_EDFE90 .L80241618_EDFFD8: /* EDFFD8 80241618 02A0202D */ daddu $a0, $s5, $zero /* EDFFDC 8024161C 0200282D */ daddu $a1, $s0, $zero -/* EDFFE0 80241620 0C0900DD */ jal func_80240374_EDED34 +/* EDFFE0 80241620 0C0900DD */ jal EDEA00_UnkNpcAIFunc35 /* EDFFE4 80241624 0260302D */ daddu $a2, $s3, $zero /* EDFFE8 80241628 080905B1 */ j .L802416C4 /* EDFFEC 8024162C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EE65B0/func_80240504_EE6AB4.s b/ver/us/asm/nonmatchings/EE65B0/func_80240504_EE6AB4.s index aea4f69b79..3cb77c2d27 100644 --- a/ver/us/asm/nonmatchings/EE65B0/func_80240504_EE6AB4.s +++ b/ver/us/asm/nonmatchings/EE65B0/func_80240504_EE6AB4.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_80245350_EEB900 +.double 0.04 + +dlabel D_80245358_EEB908 +.double 0.98 + +.section .text + glabel func_80240504_EE6AB4 /* EE6AB4 80240504 27BDFF88 */ addiu $sp, $sp, -0x78 /* EE6AB8 80240508 AFBF0064 */ sw $ra, 0x64($sp) diff --git a/ver/us/asm/nonmatchings/EE65B0/func_802407D4_EE6D84.s b/ver/us/asm/nonmatchings/EE65B0/func_802407D4_EE6D84.s index e665010e37..c61b5e54ab 100644 --- a/ver/us/asm/nonmatchings/EE65B0/func_802407D4_EE6D84.s +++ b/ver/us/asm/nonmatchings/EE65B0/func_802407D4_EE6D84.s @@ -1,6 +1,22 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_80245360_EEB910 +.double 3.141592 + +dlabel D_80245368_EEB918 +.double 0.2 + +dlabel D_80245370_EEB920 +.double 0.3 + +dlabel D_80245378_EEB928 +.double 0.7 + +.section .text + glabel func_802407D4_EE6D84 /* EE6D84 802407D4 27BDFFA8 */ addiu $sp, $sp, -0x58 /* EE6D88 802407D8 24040001 */ addiu $a0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s b/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s index c20db306be..789133a6be 100644 --- a/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s +++ b/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_80245380_EEB930 +.double 32767.0 + +.section .text + glabel EE70C0_UnkNpcAIFunc23 /* EE70C0 80240B10 27BDFFC8 */ addiu $sp, $sp, -0x38 /* EE70C4 80240B14 AFB3002C */ sw $s3, 0x2c($sp) diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80240CC0_EE7270.s b/ver/us/asm/nonmatchings/EE70C0/func_80240CC0_EE7270.s deleted file mode 100644 index f933ea8ec2..0000000000 --- a/ver/us/asm/nonmatchings/EE70C0/func_80240CC0_EE7270.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_EE7270 -/* EE7270 80240CC0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* EE7274 80240CC4 AFB3004C */ sw $s3, 0x4c($sp) -/* EE7278 80240CC8 0080982D */ daddu $s3, $a0, $zero -/* EE727C 80240CCC AFBF0058 */ sw $ra, 0x58($sp) -/* EE7280 80240CD0 AFB50054 */ sw $s5, 0x54($sp) -/* EE7284 80240CD4 AFB40050 */ sw $s4, 0x50($sp) -/* EE7288 80240CD8 AFB20048 */ sw $s2, 0x48($sp) -/* EE728C 80240CDC AFB10044 */ sw $s1, 0x44($sp) -/* EE7290 80240CE0 AFB00040 */ sw $s0, 0x40($sp) -/* EE7294 80240CE4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* EE7298 80240CE8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* EE729C 80240CEC F7B60068 */ sdc1 $f22, 0x68($sp) -/* EE72A0 80240CF0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* EE72A4 80240CF4 8E710148 */ lw $s1, 0x148($s3) -/* EE72A8 80240CF8 00A0902D */ daddu $s2, $a1, $zero -/* EE72AC 80240CFC 86240008 */ lh $a0, 8($s1) -/* EE72B0 80240D00 0C00F92F */ jal dead_get_npc_unsafe -/* EE72B4 80240D04 00C0A82D */ daddu $s5, $a2, $zero -/* EE72B8 80240D08 0040802D */ daddu $s0, $v0, $zero -/* EE72BC 80240D0C 0000A02D */ daddu $s4, $zero, $zero -/* EE72C0 80240D10 C624007C */ lwc1 $f4, 0x7c($s1) -/* EE72C4 80240D14 46802120 */ cvt.s.w $f4, $f4 -/* EE72C8 80240D18 C6220088 */ lwc1 $f2, 0x88($s1) -/* EE72CC 80240D1C 468010A0 */ cvt.s.w $f2, $f2 -/* EE72D0 80240D20 460010A1 */ cvt.d.s $f2, $f2 -/* EE72D4 80240D24 46002121 */ cvt.d.s $f4, $f4 -/* EE72D8 80240D28 C600003C */ lwc1 $f0, 0x3c($s0) -/* EE72DC 80240D2C 3C014059 */ lui $at, 0x4059 -/* EE72E0 80240D30 44813800 */ mtc1 $at, $f7 -/* EE72E4 80240D34 44803000 */ mtc1 $zero, $f6 -/* EE72E8 80240D38 46000021 */ cvt.d.s $f0, $f0 -/* EE72EC 80240D3C 46260002 */ mul.d $f0, $f0, $f6 -/* EE72F0 80240D40 00000000 */ nop -/* EE72F4 80240D44 24020001 */ addiu $v0, $zero, 1 -/* EE72F8 80240D48 8E24006C */ lw $a0, 0x6c($s1) -/* EE72FC 80240D4C 46261083 */ div.d $f2, $f2, $f6 -/* EE7300 80240D50 462010A0 */ cvt.s.d $f2, $f2 -/* EE7304 80240D54 46262103 */ div.d $f4, $f4, $f6 -/* EE7308 80240D58 46202520 */ cvt.s.d $f20, $f4 -/* EE730C 80240D5C 30830011 */ andi $v1, $a0, 0x11 -/* EE7310 80240D60 4620020D */ trunc.w.d $f8, $f0 -/* EE7314 80240D64 E628007C */ swc1 $f8, 0x7c($s1) -/* EE7318 80240D68 C6200078 */ lwc1 $f0, 0x78($s1) -/* EE731C 80240D6C 46800020 */ cvt.s.w $f0, $f0 -/* EE7320 80240D70 46000021 */ cvt.d.s $f0, $f0 -/* EE7324 80240D74 46260003 */ div.d $f0, $f0, $f6 -/* EE7328 80240D78 462006A0 */ cvt.s.d $f26, $f0 -/* EE732C 80240D7C C6200070 */ lwc1 $f0, 0x70($s1) -/* EE7330 80240D80 46800020 */ cvt.s.w $f0, $f0 -/* EE7334 80240D84 46000021 */ cvt.d.s $f0, $f0 -/* EE7338 80240D88 46260003 */ div.d $f0, $f0, $f6 -/* EE733C 80240D8C 462005A0 */ cvt.s.d $f22, $f0 -/* EE7340 80240D90 14620025 */ bne $v1, $v0, .L80240E28 -/* EE7344 80240D94 4602D600 */ add.s $f24, $f26, $f2 -/* EE7348 80240D98 8E020000 */ lw $v0, ($s0) -/* EE734C 80240D9C 30420008 */ andi $v0, $v0, 8 -/* EE7350 80240DA0 10400009 */ beqz $v0, .L80240DC8 -/* EE7354 80240DA4 27A50028 */ addiu $a1, $sp, 0x28 -/* EE7358 80240DA8 C600003C */ lwc1 $f0, 0x3c($s0) -/* EE735C 80240DAC 4600C001 */ sub.s $f0, $f24, $f0 -/* EE7360 80240DB0 4600B03C */ c.lt.s $f22, $f0 -/* EE7364 80240DB4 00000000 */ nop -/* EE7368 80240DB8 4500001B */ bc1f .L80240E28 -/* EE736C 80240DBC 34820010 */ ori $v0, $a0, 0x10 -/* EE7370 80240DC0 0809038A */ j .L80240E28 -/* EE7374 80240DC4 AE22006C */ sw $v0, 0x6c($s1) -.L80240DC8: -/* EE7378 80240DC8 27A6002C */ addiu $a2, $sp, 0x2c -/* EE737C 80240DCC C6000038 */ lwc1 $f0, 0x38($s0) -/* EE7380 80240DD0 C602003C */ lwc1 $f2, 0x3c($s0) -/* EE7384 80240DD4 C6040040 */ lwc1 $f4, 0x40($s0) -/* EE7388 80240DD8 3C01447A */ lui $at, 0x447a -/* EE738C 80240DDC 44813000 */ mtc1 $at, $f6 -/* EE7390 80240DE0 27A20034 */ addiu $v0, $sp, 0x34 -/* EE7394 80240DE4 E7A00028 */ swc1 $f0, 0x28($sp) -/* EE7398 80240DE8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* EE739C 80240DEC E7A40030 */ swc1 $f4, 0x30($sp) -/* EE73A0 80240DF0 E7A60034 */ swc1 $f6, 0x34($sp) -/* EE73A4 80240DF4 AFA20010 */ sw $v0, 0x10($sp) -/* EE73A8 80240DF8 8E040080 */ lw $a0, 0x80($s0) -/* EE73AC 80240DFC 0C03908F */ jal dead_npc_raycast_down_sides -/* EE73B0 80240E00 27A70030 */ addiu $a3, $sp, 0x30 -/* EE73B4 80240E04 C7A00034 */ lwc1 $f0, 0x34($sp) -/* EE73B8 80240E08 4600D001 */ sub.s $f0, $f26, $f0 -/* EE73BC 80240E0C 4600B03C */ c.lt.s $f22, $f0 -/* EE73C0 80240E10 00000000 */ nop -/* EE73C4 80240E14 45000004 */ bc1f .L80240E28 -/* EE73C8 80240E18 00000000 */ nop -/* EE73CC 80240E1C 8E22006C */ lw $v0, 0x6c($s1) -/* EE73D0 80240E20 34420010 */ ori $v0, $v0, 0x10 -/* EE73D4 80240E24 AE22006C */ sw $v0, 0x6c($s1) -.L80240E28: -/* EE73D8 80240E28 8E22006C */ lw $v0, 0x6c($s1) -/* EE73DC 80240E2C 24030011 */ addiu $v1, $zero, 0x11 -/* EE73E0 80240E30 30420011 */ andi $v0, $v0, 0x11 -/* EE73E4 80240E34 14430039 */ bne $v0, $v1, .L80240F1C -/* EE73E8 80240E38 00000000 */ nop -/* EE73EC 80240E3C 8E020000 */ lw $v0, ($s0) -/* EE73F0 80240E40 30420008 */ andi $v0, $v0, 8 -/* EE73F4 80240E44 1040000A */ beqz $v0, .L80240E70 -/* EE73F8 80240E48 4600C106 */ mov.s $f4, $f24 -/* EE73FC 80240E4C 4614C081 */ sub.s $f2, $f24, $f20 -/* EE7400 80240E50 3C018024 */ lui $at, %hi(D_80245388_EEB938) -/* EE7404 80240E54 D4205388 */ ldc1 $f0, %lo(D_80245388_EEB938)($at) -/* EE7408 80240E58 460010A1 */ cvt.d.s $f2, $f2 -/* EE740C 80240E5C 46201082 */ mul.d $f2, $f2, $f0 -/* EE7410 80240E60 00000000 */ nop -/* EE7414 80240E64 4600A021 */ cvt.d.s $f0, $f20 -/* EE7418 80240E68 080903B5 */ j .L80240ED4 -/* EE741C 80240E6C 46220000 */ add.d $f0, $f0, $f2 -.L80240E70: -/* EE7420 80240E70 27A50028 */ addiu $a1, $sp, 0x28 -/* EE7424 80240E74 27A6002C */ addiu $a2, $sp, 0x2c -/* EE7428 80240E78 C6000038 */ lwc1 $f0, 0x38($s0) -/* EE742C 80240E7C C6020040 */ lwc1 $f2, 0x40($s0) -/* EE7430 80240E80 3C01447A */ lui $at, 0x447a -/* EE7434 80240E84 44812000 */ mtc1 $at, $f4 -/* EE7438 80240E88 27A20034 */ addiu $v0, $sp, 0x34 -/* EE743C 80240E8C E7B4002C */ swc1 $f20, 0x2c($sp) -/* EE7440 80240E90 E7A00028 */ swc1 $f0, 0x28($sp) -/* EE7444 80240E94 E7A20030 */ swc1 $f2, 0x30($sp) -/* EE7448 80240E98 E7A40034 */ swc1 $f4, 0x34($sp) -/* EE744C 80240E9C AFA20010 */ sw $v0, 0x10($sp) -/* EE7450 80240EA0 8E040080 */ lw $a0, 0x80($s0) -/* EE7454 80240EA4 0C03908F */ jal dead_npc_raycast_down_sides -/* EE7458 80240EA8 27A70030 */ addiu $a3, $sp, 0x30 -/* EE745C 80240EAC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* EE7460 80240EB0 461A2100 */ add.s $f4, $f4, $f26 -/* EE7464 80240EB4 46142081 */ sub.s $f2, $f4, $f20 -/* EE7468 80240EB8 3C018024 */ lui $at, %hi(D_80245390_EEB940) -/* EE746C 80240EBC D4205390 */ ldc1 $f0, %lo(D_80245390_EEB940)($at) -/* EE7470 80240EC0 460010A1 */ cvt.d.s $f2, $f2 -/* EE7474 80240EC4 46201082 */ mul.d $f2, $f2, $f0 -/* EE7478 80240EC8 00000000 */ nop -/* EE747C 80240ECC 4600A021 */ cvt.d.s $f0, $f20 -/* EE7480 80240ED0 46220000 */ add.d $f0, $f0, $f2 -.L80240ED4: -/* EE7484 80240ED4 46200020 */ cvt.s.d $f0, $f0 -/* EE7488 80240ED8 E600003C */ swc1 $f0, 0x3c($s0) -/* EE748C 80240EDC C600003C */ lwc1 $f0, 0x3c($s0) -/* EE7490 80240EE0 46002001 */ sub.s $f0, $f4, $f0 -/* EE7494 80240EE4 3C013FF0 */ lui $at, 0x3ff0 -/* EE7498 80240EE8 44811800 */ mtc1 $at, $f3 -/* EE749C 80240EEC 44801000 */ mtc1 $zero, $f2 -/* EE74A0 80240EF0 46000005 */ abs.s $f0, $f0 -/* EE74A4 80240EF4 46000021 */ cvt.d.s $f0, $f0 -/* EE74A8 80240EF8 4622003C */ c.lt.d $f0, $f2 -/* EE74AC 80240EFC 00000000 */ nop -/* EE74B0 80240F00 45000036 */ bc1f .L80240FDC -/* EE74B4 80240F04 2403FFEF */ addiu $v1, $zero, -0x11 -/* EE74B8 80240F08 E604003C */ swc1 $f4, 0x3c($s0) -/* EE74BC 80240F0C 8E22006C */ lw $v0, 0x6c($s1) -/* EE74C0 80240F10 00431024 */ and $v0, $v0, $v1 -/* EE74C4 80240F14 080903F7 */ j .L80240FDC -/* EE74C8 80240F18 AE22006C */ sw $v0, 0x6c($s1) -.L80240F1C: -/* EE74CC 80240F1C 8E220070 */ lw $v0, 0x70($s1) -/* EE74D0 80240F20 1840002E */ blez $v0, .L80240FDC -/* EE74D4 80240F24 00000000 */ nop -/* EE74D8 80240F28 C62C0074 */ lwc1 $f12, 0x74($s1) -/* EE74DC 80240F2C 0C00AD77 */ jal dead_sin_deg -/* EE74E0 80240F30 46806320 */ cvt.s.w $f12, $f12 -/* EE74E4 80240F34 8E020000 */ lw $v0, ($s0) -/* EE74E8 80240F38 30420008 */ andi $v0, $v0, 8 -/* EE74EC 80240F3C 10400003 */ beqz $v0, .L80240F4C -/* EE74F0 80240F40 46000506 */ mov.s $f20, $f0 -/* EE74F4 80240F44 080903E3 */ j .L80240F8C -/* EE74F8 80240F48 0000102D */ daddu $v0, $zero, $zero -.L80240F4C: -/* EE74FC 80240F4C 27A50028 */ addiu $a1, $sp, 0x28 -/* EE7500 80240F50 27A6002C */ addiu $a2, $sp, 0x2c -/* EE7504 80240F54 C6000038 */ lwc1 $f0, 0x38($s0) -/* EE7508 80240F58 C602003C */ lwc1 $f2, 0x3c($s0) -/* EE750C 80240F5C C6040040 */ lwc1 $f4, 0x40($s0) -/* EE7510 80240F60 3C01447A */ lui $at, 0x447a -/* EE7514 80240F64 44813000 */ mtc1 $at, $f6 -/* EE7518 80240F68 27A20034 */ addiu $v0, $sp, 0x34 -/* EE751C 80240F6C E7A00028 */ swc1 $f0, 0x28($sp) -/* EE7520 80240F70 E7A2002C */ swc1 $f2, 0x2c($sp) -/* EE7524 80240F74 E7A40030 */ swc1 $f4, 0x30($sp) -/* EE7528 80240F78 E7A60034 */ swc1 $f6, 0x34($sp) -/* EE752C 80240F7C AFA20010 */ sw $v0, 0x10($sp) -/* EE7530 80240F80 8E040080 */ lw $a0, 0x80($s0) -/* EE7534 80240F84 0C03908F */ jal dead_npc_raycast_down_sides -/* EE7538 80240F88 27A70030 */ addiu $a3, $sp, 0x30 -.L80240F8C: -/* EE753C 80240F8C 10400007 */ beqz $v0, .L80240FAC -/* EE7540 80240F90 00000000 */ nop -/* EE7544 80240F94 4616A082 */ mul.s $f2, $f20, $f22 -/* EE7548 80240F98 00000000 */ nop -/* EE754C 80240F9C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* EE7550 80240FA0 461A0000 */ add.s $f0, $f0, $f26 -/* EE7554 80240FA4 080903EE */ j .L80240FB8 -/* EE7558 80240FA8 46020000 */ add.s $f0, $f0, $f2 -.L80240FAC: -/* EE755C 80240FAC 4616A002 */ mul.s $f0, $f20, $f22 -/* EE7560 80240FB0 00000000 */ nop -/* EE7564 80240FB4 4600C000 */ add.s $f0, $f24, $f0 -.L80240FB8: -/* EE7568 80240FB8 E600003C */ swc1 $f0, 0x3c($s0) -/* EE756C 80240FBC 8E220074 */ lw $v0, 0x74($s1) -/* EE7570 80240FC0 2442000A */ addiu $v0, $v0, 0xa -/* EE7574 80240FC4 44826000 */ mtc1 $v0, $f12 -/* EE7578 80240FC8 00000000 */ nop -/* EE757C 80240FCC 0C00AB85 */ jal dead_clamp_angle -/* EE7580 80240FD0 46806320 */ cvt.s.w $f12, $f12 -/* EE7584 80240FD4 4600020D */ trunc.w.s $f8, $f0 -/* EE7588 80240FD8 E6280074 */ swc1 $f8, 0x74($s1) -.L80240FDC: -/* EE758C 80240FDC 8E220090 */ lw $v0, 0x90($s1) -/* EE7590 80240FE0 1C40004A */ bgtz $v0, .L8024110C -/* EE7594 80240FE4 2442FFFF */ addiu $v0, $v0, -1 -/* EE7598 80240FE8 8E430014 */ lw $v1, 0x14($s2) -/* EE759C 80240FEC 04600048 */ bltz $v1, .L80241110 -/* EE75A0 80240FF0 00000000 */ nop -/* EE75A4 80240FF4 8E620074 */ lw $v0, 0x74($s3) -/* EE75A8 80240FF8 1C400042 */ bgtz $v0, .L80241104 -/* EE75AC 80240FFC 2442FFFF */ addiu $v0, $v0, -1 -/* EE75B0 80241000 AE630074 */ sw $v1, 0x74($s3) -/* EE75B4 80241004 860200A8 */ lh $v0, 0xa8($s0) -/* EE75B8 80241008 C602003C */ lwc1 $f2, 0x3c($s0) -/* EE75BC 8024100C 44820000 */ mtc1 $v0, $f0 -/* EE75C0 80241010 00000000 */ nop -/* EE75C4 80241014 46800020 */ cvt.s.w $f0, $f0 -/* EE75C8 80241018 46001080 */ add.s $f2, $f2, $f0 -/* EE75CC 8024101C 3C014024 */ lui $at, 0x4024 -/* EE75D0 80241020 44810800 */ mtc1 $at, $f1 -/* EE75D4 80241024 44800000 */ mtc1 $zero, $f0 -/* EE75D8 80241028 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EE75DC 8024102C 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EE75E0 80241030 460010A1 */ cvt.d.s $f2, $f2 -/* EE75E4 80241034 46201080 */ add.d $f2, $f2, $f0 -/* EE75E8 80241038 C440002C */ lwc1 $f0, 0x2c($v0) -/* EE75EC 8024103C 46000021 */ cvt.d.s $f0, $f0 -/* EE75F0 80241040 4622003C */ c.lt.d $f0, $f2 -/* EE75F4 80241044 00000000 */ nop -/* EE75F8 80241048 4500002C */ bc1f .L802410FC -/* EE75FC 8024104C 02A0202D */ daddu $a0, $s5, $zero -/* EE7600 80241050 AFA00010 */ sw $zero, 0x10($sp) -/* EE7604 80241054 8E46000C */ lw $a2, 0xc($s2) -/* EE7608 80241058 8E470010 */ lw $a3, 0x10($s2) -/* EE760C 8024105C 0C013469 */ jal func_8004D1A4 -/* EE7610 80241060 0220282D */ daddu $a1, $s1, $zero -/* EE7614 80241064 10400025 */ beqz $v0, .L802410FC -/* EE7618 80241068 0000202D */ daddu $a0, $zero, $zero -/* EE761C 8024106C 0200282D */ daddu $a1, $s0, $zero -/* EE7620 80241070 0000302D */ daddu $a2, $zero, $zero -/* EE7624 80241074 2412000C */ addiu $s2, $zero, 0xc -/* EE7628 80241078 860300A8 */ lh $v1, 0xa8($s0) -/* EE762C 8024107C 3C013F80 */ lui $at, 0x3f80 -/* EE7630 80241080 44810000 */ mtc1 $at, $f0 -/* EE7634 80241084 3C014000 */ lui $at, 0x4000 -/* EE7638 80241088 44811000 */ mtc1 $at, $f2 -/* EE763C 8024108C 3C01C1A0 */ lui $at, 0xc1a0 -/* EE7640 80241090 44812000 */ mtc1 $at, $f4 -/* EE7644 80241094 44834000 */ mtc1 $v1, $f8 -/* EE7648 80241098 00000000 */ nop -/* EE764C 8024109C 46804220 */ cvt.s.w $f8, $f8 -/* EE7650 802410A0 44074000 */ mfc1 $a3, $f8 -/* EE7654 802410A4 27A20038 */ addiu $v0, $sp, 0x38 -/* EE7658 802410A8 AFB2001C */ sw $s2, 0x1c($sp) -/* EE765C 802410AC AFA20020 */ sw $v0, 0x20($sp) -/* EE7660 802410B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* EE7664 802410B4 E7A20014 */ swc1 $f2, 0x14($sp) -/* EE7668 802410B8 0C01D444 */ jal dead_fx_emote -/* EE766C 802410BC E7A40018 */ swc1 $f4, 0x18($sp) -/* EE7670 802410C0 0200202D */ daddu $a0, $s0, $zero -/* EE7674 802410C4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* EE7678 802410C8 C480003C */ lwc1 $f0, 0x3c($a0) -/* EE767C 802410CC 3C060020 */ lui $a2, 0x20 -/* EE7680 802410D0 0C013600 */ jal dead_ai_enemy_play_sound -/* EE7684 802410D4 E4800064 */ swc1 $f0, 0x64($a0) -/* EE7688 802410D8 8E220018 */ lw $v0, 0x18($s1) -/* EE768C 802410DC 9442002A */ lhu $v0, 0x2a($v0) -/* EE7690 802410E0 30420001 */ andi $v0, $v0, 1 -/* EE7694 802410E4 10400003 */ beqz $v0, .L802410F4 -/* EE7698 802410E8 2402000A */ addiu $v0, $zero, 0xa -/* EE769C 802410EC 080904AD */ j .L802412B4 -/* EE76A0 802410F0 AE620070 */ sw $v0, 0x70($s3) -.L802410F4: -/* EE76A4 802410F4 080904AD */ j .L802412B4 -/* EE76A8 802410F8 AE720070 */ sw $s2, 0x70($s3) -.L802410FC: -/* EE76AC 802410FC 8E620074 */ lw $v0, 0x74($s3) -/* EE76B0 80241100 2442FFFF */ addiu $v0, $v0, -1 -.L80241104: -/* EE76B4 80241104 08090444 */ j .L80241110 -/* EE76B8 80241108 AE620074 */ sw $v0, 0x74($s3) -.L8024110C: -/* EE76BC 8024110C AE220090 */ sw $v0, 0x90($s1) -.L80241110: -/* EE76C0 80241110 8E2300D0 */ lw $v1, 0xd0($s1) -/* EE76C4 80241114 C6000040 */ lwc1 $f0, 0x40($s0) -/* EE76C8 80241118 C4620000 */ lwc1 $f2, ($v1) -/* EE76CC 8024111C 468010A0 */ cvt.s.w $f2, $f2 -/* EE76D0 80241120 C4640008 */ lwc1 $f4, 8($v1) -/* EE76D4 80241124 46802120 */ cvt.s.w $f4, $f4 -/* EE76D8 80241128 E7A00010 */ swc1 $f0, 0x10($sp) -/* EE76DC 8024112C 8E2200D0 */ lw $v0, 0xd0($s1) -/* EE76E0 80241130 44051000 */ mfc1 $a1, $f2 -/* EE76E4 80241134 C440000C */ lwc1 $f0, 0xc($v0) -/* EE76E8 80241138 46800020 */ cvt.s.w $f0, $f0 -/* EE76EC 8024113C E7A00014 */ swc1 $f0, 0x14($sp) -/* EE76F0 80241140 8E2200D0 */ lw $v0, 0xd0($s1) -/* EE76F4 80241144 44062000 */ mfc1 $a2, $f4 -/* EE76F8 80241148 C4400010 */ lwc1 $f0, 0x10($v0) -/* EE76FC 8024114C 46800020 */ cvt.s.w $f0, $f0 -/* EE7700 80241150 E7A00018 */ swc1 $f0, 0x18($sp) -/* EE7704 80241154 8C640018 */ lw $a0, 0x18($v1) -/* EE7708 80241158 0C013431 */ jal dead_is_point_within_region -/* EE770C 8024115C 8E070038 */ lw $a3, 0x38($s0) -/* EE7710 80241160 1040001A */ beqz $v0, .L802411CC -/* EE7714 80241164 00000000 */ nop -/* EE7718 80241168 8E060038 */ lw $a2, 0x38($s0) -/* EE771C 8024116C 8E2200D0 */ lw $v0, 0xd0($s1) -/* EE7720 80241170 8E070040 */ lw $a3, 0x40($s0) -/* EE7724 80241174 C44C0000 */ lwc1 $f12, ($v0) -/* EE7728 80241178 46806320 */ cvt.s.w $f12, $f12 -/* EE772C 8024117C C44E0008 */ lwc1 $f14, 8($v0) -/* EE7730 80241180 0C00AC71 */ jal dead_dist2D -/* EE7734 80241184 468073A0 */ cvt.s.w $f14, $f14 -/* EE7738 80241188 C6020018 */ lwc1 $f2, 0x18($s0) -/* EE773C 8024118C 4600103C */ c.lt.s $f2, $f0 -/* EE7740 80241190 00000000 */ nop -/* EE7744 80241194 4500000D */ bc1f .L802411CC -/* EE7748 80241198 E7A00034 */ swc1 $f0, 0x34($sp) -/* EE774C 8024119C C60C0038 */ lwc1 $f12, 0x38($s0) -/* EE7750 802411A0 8E2200D0 */ lw $v0, 0xd0($s1) -/* EE7754 802411A4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EE7758 802411A8 C4480000 */ lwc1 $f8, ($v0) -/* EE775C 802411AC 46804220 */ cvt.s.w $f8, $f8 -/* EE7760 802411B0 44064000 */ mfc1 $a2, $f8 -/* EE7764 802411B4 C4480008 */ lwc1 $f8, 8($v0) -/* EE7768 802411B8 46804220 */ cvt.s.w $f8, $f8 -/* EE776C 802411BC 44074000 */ mfc1 $a3, $f8 -/* EE7770 802411C0 0C00ABDC */ jal fio_validate_header_checksums -/* EE7774 802411C4 24140001 */ addiu $s4, $zero, 1 -/* EE7778 802411C8 E600000C */ swc1 $f0, 0xc($s0) -.L802411CC: -/* EE777C 802411CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* EE7780 802411D0 8C43000C */ lw $v1, 0xc($v0) -/* EE7784 802411D4 8C420010 */ lw $v0, 0x10($v0) -/* EE7788 802411D8 00621825 */ or $v1, $v1, $v0 -/* EE778C 802411DC 00741825 */ or $v1, $v1, $s4 -/* EE7790 802411E0 10600008 */ beqz $v1, .L80241204 -/* EE7794 802411E4 00000000 */ nop -/* EE7798 802411E8 8602008C */ lh $v0, 0x8c($s0) -/* EE779C 802411EC 14400031 */ bnez $v0, .L802412B4 -/* EE77A0 802411F0 00000000 */ nop -/* EE77A4 802411F4 8E050018 */ lw $a1, 0x18($s0) -/* EE77A8 802411F8 8E06000C */ lw $a2, 0xc($s0) -/* EE77AC 802411FC 0C00F909 */ jal dead_npc_move_heading -/* EE77B0 80241200 0200202D */ daddu $a0, $s0, $zero -.L80241204: -/* EE77B4 80241204 C600003C */ lwc1 $f0, 0x3c($s0) -/* EE77B8 80241208 3C014059 */ lui $at, 0x4059 -/* EE77BC 8024120C 44811800 */ mtc1 $at, $f3 -/* EE77C0 80241210 44801000 */ mtc1 $zero, $f2 -/* EE77C4 80241214 46000021 */ cvt.d.s $f0, $f0 -/* EE77C8 80241218 46220002 */ mul.d $f0, $f0, $f2 -/* EE77CC 8024121C 00000000 */ nop -/* EE77D0 80241220 4620020D */ trunc.w.d $f8, $f0 -/* EE77D4 80241224 E628007C */ swc1 $f8, 0x7c($s1) -/* EE77D8 80241228 8E420004 */ lw $v0, 4($s2) -/* EE77DC 8024122C 18400021 */ blez $v0, .L802412B4 -/* EE77E0 80241230 00000000 */ nop -/* EE77E4 80241234 8602008E */ lh $v0, 0x8e($s0) -/* EE77E8 80241238 9603008E */ lhu $v1, 0x8e($s0) -/* EE77EC 8024123C 18400005 */ blez $v0, .L80241254 -/* EE77F0 80241240 2462FFFF */ addiu $v0, $v1, -1 -/* EE77F4 80241244 A602008E */ sh $v0, 0x8e($s0) -/* EE77F8 80241248 00021400 */ sll $v0, $v0, 0x10 -/* EE77FC 8024124C 1C400019 */ bgtz $v0, .L802412B4 -/* EE7800 80241250 00000000 */ nop -.L80241254: -/* EE7804 80241254 240403E8 */ addiu $a0, $zero, 0x3e8 -/* EE7808 80241258 24020002 */ addiu $v0, $zero, 2 -/* EE780C 8024125C 0C00AB3B */ jal dead_rand_int -/* EE7810 80241260 AE620070 */ sw $v0, 0x70($s3) -/* EE7814 80241264 3C035555 */ lui $v1, 0x5555 -/* EE7818 80241268 34635556 */ ori $v1, $v1, 0x5556 -/* EE781C 8024126C 00430018 */ mult $v0, $v1 -/* EE7820 80241270 000227C3 */ sra $a0, $v0, 0x1f -/* EE7824 80241274 00004010 */ mfhi $t0 -/* EE7828 80241278 01042023 */ subu $a0, $t0, $a0 -/* EE782C 8024127C 00041840 */ sll $v1, $a0, 1 -/* EE7830 80241280 00641821 */ addu $v1, $v1, $a0 -/* EE7834 80241284 00431023 */ subu $v0, $v0, $v1 -/* EE7838 80241288 24430002 */ addiu $v1, $v0, 2 -/* EE783C 8024128C AE630074 */ sw $v1, 0x74($s3) -/* EE7840 80241290 8E42002C */ lw $v0, 0x2c($s2) -/* EE7844 80241294 58400007 */ blezl $v0, .L802412B4 -/* EE7848 80241298 AE600070 */ sw $zero, 0x70($s3) -/* EE784C 8024129C 8E420008 */ lw $v0, 8($s2) -/* EE7850 802412A0 18400003 */ blez $v0, .L802412B0 -/* EE7854 802412A4 28620003 */ slti $v0, $v1, 3 -/* EE7858 802412A8 10400002 */ beqz $v0, .L802412B4 -/* EE785C 802412AC 00000000 */ nop -.L802412B0: -/* EE7860 802412B0 AE600070 */ sw $zero, 0x70($s3) -.L802412B4: -/* EE7864 802412B4 8FBF0058 */ lw $ra, 0x58($sp) -/* EE7868 802412B8 8FB50054 */ lw $s5, 0x54($sp) -/* EE786C 802412BC 8FB40050 */ lw $s4, 0x50($sp) -/* EE7870 802412C0 8FB3004C */ lw $s3, 0x4c($sp) -/* EE7874 802412C4 8FB20048 */ lw $s2, 0x48($sp) -/* EE7878 802412C8 8FB10044 */ lw $s1, 0x44($sp) -/* EE787C 802412CC 8FB00040 */ lw $s0, 0x40($sp) -/* EE7880 802412D0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* EE7884 802412D4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* EE7888 802412D8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* EE788C 802412DC D7B40060 */ ldc1 $f20, 0x60($sp) -/* EE7890 802412E0 03E00008 */ jr $ra -/* EE7894 802412E4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s index 2db6bedadc..79595b94c6 100644 --- a/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s +++ b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel jtbl_80245398_EEB948 +.word L80241F54_EE8504, L80241F64_EE8514, L80241F7C_EE852C, L80241F8C_EE853C, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L80241FA4_EE8554, L80241FB4_EE8564, L80241FCC_EE857C, L80241FE4_EE8594, L80241FFC_EE85AC, 0, 0, 0 + +.section .text + glabel func_80241E1C_EE83CC /* EE83CC 80241E1C 27BDFFB0 */ addiu $sp, $sp, -0x50 /* EE83D0 80241E20 AFB50044 */ sw $s5, 0x44($sp) @@ -90,7 +97,7 @@ dlabel L80241F54_EE8504 dlabel L80241F64_EE8514 /* EE8514 80241F64 02A0202D */ daddu $a0, $s5, $zero /* EE8518 80241F68 0200282D */ daddu $a1, $s0, $zero -/* EE851C 80241F6C 0C090330 */ jal func_80240CC0_EE7270 +/* EE851C 80241F6C 0C090330 */ jal EE70C0_UnkNpcAIFunc35 /* EE8520 80241F70 0260302D */ daddu $a2, $s3, $zero /* EE8524 80241F74 08090804 */ j .L80242010 /* EE8528 80241F78 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80241000_EEE100.s b/ver/us/asm/nonmatchings/EEDF50/func_80241000_EEE100.s deleted file mode 100644 index d6bb6d4466..0000000000 --- a/ver/us/asm/nonmatchings/EEDF50/func_80241000_EEE100.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245458_EF2558 -.double 0.09 - -dlabel D_80245460_EF2560 -.double 0.09 - -.section .text - -glabel func_80241000_EEE100 -/* EEE100 80241000 27BDFF80 */ addiu $sp, $sp, -0x80 -/* EEE104 80241004 AFB3004C */ sw $s3, 0x4c($sp) -/* EEE108 80241008 0080982D */ daddu $s3, $a0, $zero -/* EEE10C 8024100C AFBF0058 */ sw $ra, 0x58($sp) -/* EEE110 80241010 AFB50054 */ sw $s5, 0x54($sp) -/* EEE114 80241014 AFB40050 */ sw $s4, 0x50($sp) -/* EEE118 80241018 AFB20048 */ sw $s2, 0x48($sp) -/* EEE11C 8024101C AFB10044 */ sw $s1, 0x44($sp) -/* EEE120 80241020 AFB00040 */ sw $s0, 0x40($sp) -/* EEE124 80241024 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* EEE128 80241028 F7B80070 */ sdc1 $f24, 0x70($sp) -/* EEE12C 8024102C F7B60068 */ sdc1 $f22, 0x68($sp) -/* EEE130 80241030 F7B40060 */ sdc1 $f20, 0x60($sp) -/* EEE134 80241034 8E710148 */ lw $s1, 0x148($s3) -/* EEE138 80241038 00A0902D */ daddu $s2, $a1, $zero -/* EEE13C 8024103C 86240008 */ lh $a0, 8($s1) -/* EEE140 80241040 0C00F92F */ jal dead_get_npc_unsafe -/* EEE144 80241044 00C0A82D */ daddu $s5, $a2, $zero -/* EEE148 80241048 0040802D */ daddu $s0, $v0, $zero -/* EEE14C 8024104C 0000A02D */ daddu $s4, $zero, $zero -/* EEE150 80241050 C624007C */ lwc1 $f4, 0x7c($s1) -/* EEE154 80241054 46802120 */ cvt.s.w $f4, $f4 -/* EEE158 80241058 C6220088 */ lwc1 $f2, 0x88($s1) -/* EEE15C 8024105C 468010A0 */ cvt.s.w $f2, $f2 -/* EEE160 80241060 460010A1 */ cvt.d.s $f2, $f2 -/* EEE164 80241064 46002121 */ cvt.d.s $f4, $f4 -/* EEE168 80241068 C600003C */ lwc1 $f0, 0x3c($s0) -/* EEE16C 8024106C 3C014059 */ lui $at, 0x4059 -/* EEE170 80241070 44813800 */ mtc1 $at, $f7 -/* EEE174 80241074 44803000 */ mtc1 $zero, $f6 -/* EEE178 80241078 46000021 */ cvt.d.s $f0, $f0 -/* EEE17C 8024107C 46260002 */ mul.d $f0, $f0, $f6 -/* EEE180 80241080 00000000 */ nop -/* EEE184 80241084 24020001 */ addiu $v0, $zero, 1 -/* EEE188 80241088 8E24006C */ lw $a0, 0x6c($s1) -/* EEE18C 8024108C 46261083 */ div.d $f2, $f2, $f6 -/* EEE190 80241090 462010A0 */ cvt.s.d $f2, $f2 -/* EEE194 80241094 46262103 */ div.d $f4, $f4, $f6 -/* EEE198 80241098 46202520 */ cvt.s.d $f20, $f4 -/* EEE19C 8024109C 30830011 */ andi $v1, $a0, 0x11 -/* EEE1A0 802410A0 4620020D */ trunc.w.d $f8, $f0 -/* EEE1A4 802410A4 E628007C */ swc1 $f8, 0x7c($s1) -/* EEE1A8 802410A8 C6200078 */ lwc1 $f0, 0x78($s1) -/* EEE1AC 802410AC 46800020 */ cvt.s.w $f0, $f0 -/* EEE1B0 802410B0 46000021 */ cvt.d.s $f0, $f0 -/* EEE1B4 802410B4 46260003 */ div.d $f0, $f0, $f6 -/* EEE1B8 802410B8 462006A0 */ cvt.s.d $f26, $f0 -/* EEE1BC 802410BC C6200070 */ lwc1 $f0, 0x70($s1) -/* EEE1C0 802410C0 46800020 */ cvt.s.w $f0, $f0 -/* EEE1C4 802410C4 46000021 */ cvt.d.s $f0, $f0 -/* EEE1C8 802410C8 46260003 */ div.d $f0, $f0, $f6 -/* EEE1CC 802410CC 462005A0 */ cvt.s.d $f22, $f0 -/* EEE1D0 802410D0 14620025 */ bne $v1, $v0, .L80241168 -/* EEE1D4 802410D4 4602D600 */ add.s $f24, $f26, $f2 -/* EEE1D8 802410D8 8E020000 */ lw $v0, ($s0) -/* EEE1DC 802410DC 30420008 */ andi $v0, $v0, 8 -/* EEE1E0 802410E0 10400009 */ beqz $v0, .L80241108 -/* EEE1E4 802410E4 27A50028 */ addiu $a1, $sp, 0x28 -/* EEE1E8 802410E8 C600003C */ lwc1 $f0, 0x3c($s0) -/* EEE1EC 802410EC 4600C001 */ sub.s $f0, $f24, $f0 -/* EEE1F0 802410F0 4600B03C */ c.lt.s $f22, $f0 -/* EEE1F4 802410F4 00000000 */ nop -/* EEE1F8 802410F8 4500001B */ bc1f .L80241168 -/* EEE1FC 802410FC 34820010 */ ori $v0, $a0, 0x10 -/* EEE200 80241100 0809045A */ j .L80241168 -/* EEE204 80241104 AE22006C */ sw $v0, 0x6c($s1) -.L80241108: -/* EEE208 80241108 27A6002C */ addiu $a2, $sp, 0x2c -/* EEE20C 8024110C C6000038 */ lwc1 $f0, 0x38($s0) -/* EEE210 80241110 C602003C */ lwc1 $f2, 0x3c($s0) -/* EEE214 80241114 C6040040 */ lwc1 $f4, 0x40($s0) -/* EEE218 80241118 3C01447A */ lui $at, 0x447a -/* EEE21C 8024111C 44813000 */ mtc1 $at, $f6 -/* EEE220 80241120 27A20034 */ addiu $v0, $sp, 0x34 -/* EEE224 80241124 E7A00028 */ swc1 $f0, 0x28($sp) -/* EEE228 80241128 E7A2002C */ swc1 $f2, 0x2c($sp) -/* EEE22C 8024112C E7A40030 */ swc1 $f4, 0x30($sp) -/* EEE230 80241130 E7A60034 */ swc1 $f6, 0x34($sp) -/* EEE234 80241134 AFA20010 */ sw $v0, 0x10($sp) -/* EEE238 80241138 8E040080 */ lw $a0, 0x80($s0) -/* EEE23C 8024113C 0C03908F */ jal dead_npc_raycast_down_sides -/* EEE240 80241140 27A70030 */ addiu $a3, $sp, 0x30 -/* EEE244 80241144 C7A00034 */ lwc1 $f0, 0x34($sp) -/* EEE248 80241148 4600D001 */ sub.s $f0, $f26, $f0 -/* EEE24C 8024114C 4600B03C */ c.lt.s $f22, $f0 -/* EEE250 80241150 00000000 */ nop -/* EEE254 80241154 45000004 */ bc1f .L80241168 -/* EEE258 80241158 00000000 */ nop -/* EEE25C 8024115C 8E22006C */ lw $v0, 0x6c($s1) -/* EEE260 80241160 34420010 */ ori $v0, $v0, 0x10 -/* EEE264 80241164 AE22006C */ sw $v0, 0x6c($s1) -.L80241168: -/* EEE268 80241168 8E22006C */ lw $v0, 0x6c($s1) -/* EEE26C 8024116C 24030011 */ addiu $v1, $zero, 0x11 -/* EEE270 80241170 30420011 */ andi $v0, $v0, 0x11 -/* EEE274 80241174 14430039 */ bne $v0, $v1, .L8024125C -/* EEE278 80241178 00000000 */ nop -/* EEE27C 8024117C 8E020000 */ lw $v0, ($s0) -/* EEE280 80241180 30420008 */ andi $v0, $v0, 8 -/* EEE284 80241184 1040000A */ beqz $v0, .L802411B0 -/* EEE288 80241188 4600C106 */ mov.s $f4, $f24 -/* EEE28C 8024118C 4614C081 */ sub.s $f2, $f24, $f20 -/* EEE290 80241190 3C018024 */ lui $at, %hi(D_80245458_EF2558) -/* EEE294 80241194 D4205458 */ ldc1 $f0, %lo(D_80245458_EF2558)($at) -/* EEE298 80241198 460010A1 */ cvt.d.s $f2, $f2 -/* EEE29C 8024119C 46201082 */ mul.d $f2, $f2, $f0 -/* EEE2A0 802411A0 00000000 */ nop -/* EEE2A4 802411A4 4600A021 */ cvt.d.s $f0, $f20 -/* EEE2A8 802411A8 08090485 */ j .L80241214 -/* EEE2AC 802411AC 46220000 */ add.d $f0, $f0, $f2 -.L802411B0: -/* EEE2B0 802411B0 27A50028 */ addiu $a1, $sp, 0x28 -/* EEE2B4 802411B4 27A6002C */ addiu $a2, $sp, 0x2c -/* EEE2B8 802411B8 C6000038 */ lwc1 $f0, 0x38($s0) -/* EEE2BC 802411BC C6020040 */ lwc1 $f2, 0x40($s0) -/* EEE2C0 802411C0 3C01447A */ lui $at, 0x447a -/* EEE2C4 802411C4 44812000 */ mtc1 $at, $f4 -/* EEE2C8 802411C8 27A20034 */ addiu $v0, $sp, 0x34 -/* EEE2CC 802411CC E7B4002C */ swc1 $f20, 0x2c($sp) -/* EEE2D0 802411D0 E7A00028 */ swc1 $f0, 0x28($sp) -/* EEE2D4 802411D4 E7A20030 */ swc1 $f2, 0x30($sp) -/* EEE2D8 802411D8 E7A40034 */ swc1 $f4, 0x34($sp) -/* EEE2DC 802411DC AFA20010 */ sw $v0, 0x10($sp) -/* EEE2E0 802411E0 8E040080 */ lw $a0, 0x80($s0) -/* EEE2E4 802411E4 0C03908F */ jal dead_npc_raycast_down_sides -/* EEE2E8 802411E8 27A70030 */ addiu $a3, $sp, 0x30 -/* EEE2EC 802411EC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* EEE2F0 802411F0 461A2100 */ add.s $f4, $f4, $f26 -/* EEE2F4 802411F4 46142081 */ sub.s $f2, $f4, $f20 -/* EEE2F8 802411F8 3C018024 */ lui $at, %hi(D_80245460_EF2560) -/* EEE2FC 802411FC D4205460 */ ldc1 $f0, %lo(D_80245460_EF2560)($at) -/* EEE300 80241200 460010A1 */ cvt.d.s $f2, $f2 -/* EEE304 80241204 46201082 */ mul.d $f2, $f2, $f0 -/* EEE308 80241208 00000000 */ nop -/* EEE30C 8024120C 4600A021 */ cvt.d.s $f0, $f20 -/* EEE310 80241210 46220000 */ add.d $f0, $f0, $f2 -.L80241214: -/* EEE314 80241214 46200020 */ cvt.s.d $f0, $f0 -/* EEE318 80241218 E600003C */ swc1 $f0, 0x3c($s0) -/* EEE31C 8024121C C600003C */ lwc1 $f0, 0x3c($s0) -/* EEE320 80241220 46002001 */ sub.s $f0, $f4, $f0 -/* EEE324 80241224 3C013FF0 */ lui $at, 0x3ff0 -/* EEE328 80241228 44811800 */ mtc1 $at, $f3 -/* EEE32C 8024122C 44801000 */ mtc1 $zero, $f2 -/* EEE330 80241230 46000005 */ abs.s $f0, $f0 -/* EEE334 80241234 46000021 */ cvt.d.s $f0, $f0 -/* EEE338 80241238 4622003C */ c.lt.d $f0, $f2 -/* EEE33C 8024123C 00000000 */ nop -/* EEE340 80241240 45000036 */ bc1f .L8024131C -/* EEE344 80241244 2403FFEF */ addiu $v1, $zero, -0x11 -/* EEE348 80241248 E604003C */ swc1 $f4, 0x3c($s0) -/* EEE34C 8024124C 8E22006C */ lw $v0, 0x6c($s1) -/* EEE350 80241250 00431024 */ and $v0, $v0, $v1 -/* EEE354 80241254 080904C7 */ j .L8024131C -/* EEE358 80241258 AE22006C */ sw $v0, 0x6c($s1) -.L8024125C: -/* EEE35C 8024125C 8E220070 */ lw $v0, 0x70($s1) -/* EEE360 80241260 1840002E */ blez $v0, .L8024131C -/* EEE364 80241264 00000000 */ nop -/* EEE368 80241268 C62C0074 */ lwc1 $f12, 0x74($s1) -/* EEE36C 8024126C 0C00AD77 */ jal dead_sin_deg -/* EEE370 80241270 46806320 */ cvt.s.w $f12, $f12 -/* EEE374 80241274 8E020000 */ lw $v0, ($s0) -/* EEE378 80241278 30420008 */ andi $v0, $v0, 8 -/* EEE37C 8024127C 10400003 */ beqz $v0, .L8024128C -/* EEE380 80241280 46000506 */ mov.s $f20, $f0 -/* EEE384 80241284 080904B3 */ j .L802412CC -/* EEE388 80241288 0000102D */ daddu $v0, $zero, $zero -.L8024128C: -/* EEE38C 8024128C 27A50028 */ addiu $a1, $sp, 0x28 -/* EEE390 80241290 27A6002C */ addiu $a2, $sp, 0x2c -/* EEE394 80241294 C6000038 */ lwc1 $f0, 0x38($s0) -/* EEE398 80241298 C602003C */ lwc1 $f2, 0x3c($s0) -/* EEE39C 8024129C C6040040 */ lwc1 $f4, 0x40($s0) -/* EEE3A0 802412A0 3C01447A */ lui $at, 0x447a -/* EEE3A4 802412A4 44813000 */ mtc1 $at, $f6 -/* EEE3A8 802412A8 27A20034 */ addiu $v0, $sp, 0x34 -/* EEE3AC 802412AC E7A00028 */ swc1 $f0, 0x28($sp) -/* EEE3B0 802412B0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* EEE3B4 802412B4 E7A40030 */ swc1 $f4, 0x30($sp) -/* EEE3B8 802412B8 E7A60034 */ swc1 $f6, 0x34($sp) -/* EEE3BC 802412BC AFA20010 */ sw $v0, 0x10($sp) -/* EEE3C0 802412C0 8E040080 */ lw $a0, 0x80($s0) -/* EEE3C4 802412C4 0C03908F */ jal dead_npc_raycast_down_sides -/* EEE3C8 802412C8 27A70030 */ addiu $a3, $sp, 0x30 -.L802412CC: -/* EEE3CC 802412CC 10400007 */ beqz $v0, .L802412EC -/* EEE3D0 802412D0 00000000 */ nop -/* EEE3D4 802412D4 4616A082 */ mul.s $f2, $f20, $f22 -/* EEE3D8 802412D8 00000000 */ nop -/* EEE3DC 802412DC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* EEE3E0 802412E0 461A0000 */ add.s $f0, $f0, $f26 -/* EEE3E4 802412E4 080904BE */ j .L802412F8 -/* EEE3E8 802412E8 46020000 */ add.s $f0, $f0, $f2 -.L802412EC: -/* EEE3EC 802412EC 4616A002 */ mul.s $f0, $f20, $f22 -/* EEE3F0 802412F0 00000000 */ nop -/* EEE3F4 802412F4 4600C000 */ add.s $f0, $f24, $f0 -.L802412F8: -/* EEE3F8 802412F8 E600003C */ swc1 $f0, 0x3c($s0) -/* EEE3FC 802412FC 8E220074 */ lw $v0, 0x74($s1) -/* EEE400 80241300 2442000A */ addiu $v0, $v0, 0xa -/* EEE404 80241304 44826000 */ mtc1 $v0, $f12 -/* EEE408 80241308 00000000 */ nop -/* EEE40C 8024130C 0C00AB85 */ jal dead_clamp_angle -/* EEE410 80241310 46806320 */ cvt.s.w $f12, $f12 -/* EEE414 80241314 4600020D */ trunc.w.s $f8, $f0 -/* EEE418 80241318 E6280074 */ swc1 $f8, 0x74($s1) -.L8024131C: -/* EEE41C 8024131C 8E220090 */ lw $v0, 0x90($s1) -/* EEE420 80241320 1C40004A */ bgtz $v0, .L8024144C -/* EEE424 80241324 2442FFFF */ addiu $v0, $v0, -1 -/* EEE428 80241328 8E430014 */ lw $v1, 0x14($s2) -/* EEE42C 8024132C 04600048 */ bltz $v1, .L80241450 -/* EEE430 80241330 00000000 */ nop -/* EEE434 80241334 8E620074 */ lw $v0, 0x74($s3) -/* EEE438 80241338 1C400042 */ bgtz $v0, .L80241444 -/* EEE43C 8024133C 2442FFFF */ addiu $v0, $v0, -1 -/* EEE440 80241340 AE630074 */ sw $v1, 0x74($s3) -/* EEE444 80241344 860200A8 */ lh $v0, 0xa8($s0) -/* EEE448 80241348 C602003C */ lwc1 $f2, 0x3c($s0) -/* EEE44C 8024134C 44820000 */ mtc1 $v0, $f0 -/* EEE450 80241350 00000000 */ nop -/* EEE454 80241354 46800020 */ cvt.s.w $f0, $f0 -/* EEE458 80241358 46001080 */ add.s $f2, $f2, $f0 -/* EEE45C 8024135C 3C014024 */ lui $at, 0x4024 -/* EEE460 80241360 44810800 */ mtc1 $at, $f1 -/* EEE464 80241364 44800000 */ mtc1 $zero, $f0 -/* EEE468 80241368 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EEE46C 8024136C 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EEE470 80241370 460010A1 */ cvt.d.s $f2, $f2 -/* EEE474 80241374 46201080 */ add.d $f2, $f2, $f0 -/* EEE478 80241378 C440002C */ lwc1 $f0, 0x2c($v0) -/* EEE47C 8024137C 46000021 */ cvt.d.s $f0, $f0 -/* EEE480 80241380 4622003C */ c.lt.d $f0, $f2 -/* EEE484 80241384 00000000 */ nop -/* EEE488 80241388 4500002C */ bc1f .L8024143C -/* EEE48C 8024138C 02A0202D */ daddu $a0, $s5, $zero -/* EEE490 80241390 AFA00010 */ sw $zero, 0x10($sp) -/* EEE494 80241394 8E46000C */ lw $a2, 0xc($s2) -/* EEE498 80241398 8E470010 */ lw $a3, 0x10($s2) -/* EEE49C 8024139C 0C013469 */ jal func_8004D1A4 -/* EEE4A0 802413A0 0220282D */ daddu $a1, $s1, $zero -/* EEE4A4 802413A4 10400025 */ beqz $v0, .L8024143C -/* EEE4A8 802413A8 0000202D */ daddu $a0, $zero, $zero -/* EEE4AC 802413AC 0200282D */ daddu $a1, $s0, $zero -/* EEE4B0 802413B0 0000302D */ daddu $a2, $zero, $zero -/* EEE4B4 802413B4 2412000C */ addiu $s2, $zero, 0xc -/* EEE4B8 802413B8 860300A8 */ lh $v1, 0xa8($s0) -/* EEE4BC 802413BC 3C013F80 */ lui $at, 0x3f80 -/* EEE4C0 802413C0 44810000 */ mtc1 $at, $f0 -/* EEE4C4 802413C4 3C014000 */ lui $at, 0x4000 -/* EEE4C8 802413C8 44811000 */ mtc1 $at, $f2 -/* EEE4CC 802413CC 3C01C1A0 */ lui $at, 0xc1a0 -/* EEE4D0 802413D0 44812000 */ mtc1 $at, $f4 -/* EEE4D4 802413D4 44834000 */ mtc1 $v1, $f8 -/* EEE4D8 802413D8 00000000 */ nop -/* EEE4DC 802413DC 46804220 */ cvt.s.w $f8, $f8 -/* EEE4E0 802413E0 44074000 */ mfc1 $a3, $f8 -/* EEE4E4 802413E4 27A20038 */ addiu $v0, $sp, 0x38 -/* EEE4E8 802413E8 AFB2001C */ sw $s2, 0x1c($sp) -/* EEE4EC 802413EC AFA20020 */ sw $v0, 0x20($sp) -/* EEE4F0 802413F0 E7A00010 */ swc1 $f0, 0x10($sp) -/* EEE4F4 802413F4 E7A20014 */ swc1 $f2, 0x14($sp) -/* EEE4F8 802413F8 0C01D444 */ jal dead_fx_emote -/* EEE4FC 802413FC E7A40018 */ swc1 $f4, 0x18($sp) -/* EEE500 80241400 0200202D */ daddu $a0, $s0, $zero -/* EEE504 80241404 240502F4 */ addiu $a1, $zero, 0x2f4 -/* EEE508 80241408 C480003C */ lwc1 $f0, 0x3c($a0) -/* EEE50C 8024140C 3C060020 */ lui $a2, 0x20 -/* EEE510 80241410 0C013600 */ jal dead_ai_enemy_play_sound -/* EEE514 80241414 E4800064 */ swc1 $f0, 0x64($a0) -/* EEE518 80241418 8E220018 */ lw $v0, 0x18($s1) -/* EEE51C 8024141C 9442002A */ lhu $v0, 0x2a($v0) -/* EEE520 80241420 30420001 */ andi $v0, $v0, 1 -/* EEE524 80241424 10400003 */ beqz $v0, .L80241434 -/* EEE528 80241428 2402000A */ addiu $v0, $zero, 0xa -/* EEE52C 8024142C 0809057D */ j .L802415F4 -/* EEE530 80241430 AE620070 */ sw $v0, 0x70($s3) -.L80241434: -/* EEE534 80241434 0809057D */ j .L802415F4 -/* EEE538 80241438 AE720070 */ sw $s2, 0x70($s3) -.L8024143C: -/* EEE53C 8024143C 8E620074 */ lw $v0, 0x74($s3) -/* EEE540 80241440 2442FFFF */ addiu $v0, $v0, -1 -.L80241444: -/* EEE544 80241444 08090514 */ j .L80241450 -/* EEE548 80241448 AE620074 */ sw $v0, 0x74($s3) -.L8024144C: -/* EEE54C 8024144C AE220090 */ sw $v0, 0x90($s1) -.L80241450: -/* EEE550 80241450 8E2300D0 */ lw $v1, 0xd0($s1) -/* EEE554 80241454 C6000040 */ lwc1 $f0, 0x40($s0) -/* EEE558 80241458 C4620000 */ lwc1 $f2, ($v1) -/* EEE55C 8024145C 468010A0 */ cvt.s.w $f2, $f2 -/* EEE560 80241460 C4640008 */ lwc1 $f4, 8($v1) -/* EEE564 80241464 46802120 */ cvt.s.w $f4, $f4 -/* EEE568 80241468 E7A00010 */ swc1 $f0, 0x10($sp) -/* EEE56C 8024146C 8E2200D0 */ lw $v0, 0xd0($s1) -/* EEE570 80241470 44051000 */ mfc1 $a1, $f2 -/* EEE574 80241474 C440000C */ lwc1 $f0, 0xc($v0) -/* EEE578 80241478 46800020 */ cvt.s.w $f0, $f0 -/* EEE57C 8024147C E7A00014 */ swc1 $f0, 0x14($sp) -/* EEE580 80241480 8E2200D0 */ lw $v0, 0xd0($s1) -/* EEE584 80241484 44062000 */ mfc1 $a2, $f4 -/* EEE588 80241488 C4400010 */ lwc1 $f0, 0x10($v0) -/* EEE58C 8024148C 46800020 */ cvt.s.w $f0, $f0 -/* EEE590 80241490 E7A00018 */ swc1 $f0, 0x18($sp) -/* EEE594 80241494 8C640018 */ lw $a0, 0x18($v1) -/* EEE598 80241498 0C013431 */ jal dead_is_point_within_region -/* EEE59C 8024149C 8E070038 */ lw $a3, 0x38($s0) -/* EEE5A0 802414A0 1040001A */ beqz $v0, .L8024150C -/* EEE5A4 802414A4 00000000 */ nop -/* EEE5A8 802414A8 8E060038 */ lw $a2, 0x38($s0) -/* EEE5AC 802414AC 8E2200D0 */ lw $v0, 0xd0($s1) -/* EEE5B0 802414B0 8E070040 */ lw $a3, 0x40($s0) -/* EEE5B4 802414B4 C44C0000 */ lwc1 $f12, ($v0) -/* EEE5B8 802414B8 46806320 */ cvt.s.w $f12, $f12 -/* EEE5BC 802414BC C44E0008 */ lwc1 $f14, 8($v0) -/* EEE5C0 802414C0 0C00AC71 */ jal dead_dist2D -/* EEE5C4 802414C4 468073A0 */ cvt.s.w $f14, $f14 -/* EEE5C8 802414C8 C6020018 */ lwc1 $f2, 0x18($s0) -/* EEE5CC 802414CC 4600103C */ c.lt.s $f2, $f0 -/* EEE5D0 802414D0 00000000 */ nop -/* EEE5D4 802414D4 4500000D */ bc1f .L8024150C -/* EEE5D8 802414D8 E7A00034 */ swc1 $f0, 0x34($sp) -/* EEE5DC 802414DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* EEE5E0 802414E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* EEE5E4 802414E4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EEE5E8 802414E8 C4480000 */ lwc1 $f8, ($v0) -/* EEE5EC 802414EC 46804220 */ cvt.s.w $f8, $f8 -/* EEE5F0 802414F0 44064000 */ mfc1 $a2, $f8 -/* EEE5F4 802414F4 C4480008 */ lwc1 $f8, 8($v0) -/* EEE5F8 802414F8 46804220 */ cvt.s.w $f8, $f8 -/* EEE5FC 802414FC 44074000 */ mfc1 $a3, $f8 -/* EEE600 80241500 0C00ABDC */ jal fio_validate_header_checksums -/* EEE604 80241504 24140001 */ addiu $s4, $zero, 1 -/* EEE608 80241508 E600000C */ swc1 $f0, 0xc($s0) -.L8024150C: -/* EEE60C 8024150C 8E2200D0 */ lw $v0, 0xd0($s1) -/* EEE610 80241510 8C43000C */ lw $v1, 0xc($v0) -/* EEE614 80241514 8C420010 */ lw $v0, 0x10($v0) -/* EEE618 80241518 00621825 */ or $v1, $v1, $v0 -/* EEE61C 8024151C 00741825 */ or $v1, $v1, $s4 -/* EEE620 80241520 10600008 */ beqz $v1, .L80241544 -/* EEE624 80241524 00000000 */ nop -/* EEE628 80241528 8602008C */ lh $v0, 0x8c($s0) -/* EEE62C 8024152C 14400031 */ bnez $v0, .L802415F4 -/* EEE630 80241530 00000000 */ nop -/* EEE634 80241534 8E050018 */ lw $a1, 0x18($s0) -/* EEE638 80241538 8E06000C */ lw $a2, 0xc($s0) -/* EEE63C 8024153C 0C00F909 */ jal dead_npc_move_heading -/* EEE640 80241540 0200202D */ daddu $a0, $s0, $zero -.L80241544: -/* EEE644 80241544 C600003C */ lwc1 $f0, 0x3c($s0) -/* EEE648 80241548 3C014059 */ lui $at, 0x4059 -/* EEE64C 8024154C 44811800 */ mtc1 $at, $f3 -/* EEE650 80241550 44801000 */ mtc1 $zero, $f2 -/* EEE654 80241554 46000021 */ cvt.d.s $f0, $f0 -/* EEE658 80241558 46220002 */ mul.d $f0, $f0, $f2 -/* EEE65C 8024155C 00000000 */ nop -/* EEE660 80241560 4620020D */ trunc.w.d $f8, $f0 -/* EEE664 80241564 E628007C */ swc1 $f8, 0x7c($s1) -/* EEE668 80241568 8E420004 */ lw $v0, 4($s2) -/* EEE66C 8024156C 18400021 */ blez $v0, .L802415F4 -/* EEE670 80241570 00000000 */ nop -/* EEE674 80241574 8602008E */ lh $v0, 0x8e($s0) -/* EEE678 80241578 9603008E */ lhu $v1, 0x8e($s0) -/* EEE67C 8024157C 18400005 */ blez $v0, .L80241594 -/* EEE680 80241580 2462FFFF */ addiu $v0, $v1, -1 -/* EEE684 80241584 A602008E */ sh $v0, 0x8e($s0) -/* EEE688 80241588 00021400 */ sll $v0, $v0, 0x10 -/* EEE68C 8024158C 1C400019 */ bgtz $v0, .L802415F4 -/* EEE690 80241590 00000000 */ nop -.L80241594: -/* EEE694 80241594 240403E8 */ addiu $a0, $zero, 0x3e8 -/* EEE698 80241598 24020002 */ addiu $v0, $zero, 2 -/* EEE69C 8024159C 0C00AB3B */ jal dead_rand_int -/* EEE6A0 802415A0 AE620070 */ sw $v0, 0x70($s3) -/* EEE6A4 802415A4 3C035555 */ lui $v1, 0x5555 -/* EEE6A8 802415A8 34635556 */ ori $v1, $v1, 0x5556 -/* EEE6AC 802415AC 00430018 */ mult $v0, $v1 -/* EEE6B0 802415B0 000227C3 */ sra $a0, $v0, 0x1f -/* EEE6B4 802415B4 00004010 */ mfhi $t0 -/* EEE6B8 802415B8 01042023 */ subu $a0, $t0, $a0 -/* EEE6BC 802415BC 00041840 */ sll $v1, $a0, 1 -/* EEE6C0 802415C0 00641821 */ addu $v1, $v1, $a0 -/* EEE6C4 802415C4 00431023 */ subu $v0, $v0, $v1 -/* EEE6C8 802415C8 24430002 */ addiu $v1, $v0, 2 -/* EEE6CC 802415CC AE630074 */ sw $v1, 0x74($s3) -/* EEE6D0 802415D0 8E42002C */ lw $v0, 0x2c($s2) -/* EEE6D4 802415D4 58400007 */ blezl $v0, .L802415F4 -/* EEE6D8 802415D8 AE600070 */ sw $zero, 0x70($s3) -/* EEE6DC 802415DC 8E420008 */ lw $v0, 8($s2) -/* EEE6E0 802415E0 18400003 */ blez $v0, .L802415F0 -/* EEE6E4 802415E4 28620003 */ slti $v0, $v1, 3 -/* EEE6E8 802415E8 10400002 */ beqz $v0, .L802415F4 -/* EEE6EC 802415EC 00000000 */ nop -.L802415F0: -/* EEE6F0 802415F0 AE600070 */ sw $zero, 0x70($s3) -.L802415F4: -/* EEE6F4 802415F4 8FBF0058 */ lw $ra, 0x58($sp) -/* EEE6F8 802415F8 8FB50054 */ lw $s5, 0x54($sp) -/* EEE6FC 802415FC 8FB40050 */ lw $s4, 0x50($sp) -/* EEE700 80241600 8FB3004C */ lw $s3, 0x4c($sp) -/* EEE704 80241604 8FB20048 */ lw $s2, 0x48($sp) -/* EEE708 80241608 8FB10044 */ lw $s1, 0x44($sp) -/* EEE70C 8024160C 8FB00040 */ lw $s0, 0x40($sp) -/* EEE710 80241610 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* EEE714 80241614 D7B80070 */ ldc1 $f24, 0x70($sp) -/* EEE718 80241618 D7B60068 */ ldc1 $f22, 0x68($sp) -/* EEE71C 8024161C D7B40060 */ ldc1 $f20, 0x60($sp) -/* EEE720 80241620 03E00008 */ jr $ra -/* EEE724 80241624 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s b/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s index ebfb9af656..de645ed8e1 100644 --- a/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s +++ b/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s @@ -97,7 +97,7 @@ glabel func_8024215C_EEF25C .L802422A4_EEF3A4: /* EEF3A4 802422A4 02A0202D */ daddu $a0, $s5, $zero /* EEF3A8 802422A8 0200282D */ daddu $a1, $s0, $zero -/* EEF3AC 802422AC 0C090400 */ jal func_80241000_EEE100 +/* EEF3AC 802422AC 0C090400 */ jal EEDF50_UnkNpcAIFunc35 /* EEF3B0 802422B0 0260302D */ daddu $a2, $s3, $zero /* EEF3B4 802422B4 080908D4 */ j .L80242350 /* EEF3B8 802422B8 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s b/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s index b6368b1531..82a237cf89 100644 --- a/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s +++ b/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s @@ -98,7 +98,7 @@ glabel func_80242780_EEF880 .L802428CC_EEF9CC: /* EEF9CC 802428CC 0280202D */ daddu $a0, $s4, $zero /* EEF9D0 802428D0 0200282D */ daddu $a1, $s0, $zero -/* EEF9D4 802428D4 0C090400 */ jal func_80241000_EEE100 +/* EEF9D4 802428D4 0C090400 */ jal EEDF50_UnkNpcAIFunc35 /* EEF9D8 802428D8 0260302D */ daddu $a2, $s3, $zero /* EEF9DC 802428DC 08090A5C */ j .L80242970 /* EEF9E0 802428E0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EF2680/func_80240220_EF2830.s b/ver/us/asm/nonmatchings/EF2680/func_80240220_EF2830.s deleted file mode 100644 index d7523afb2a..0000000000 --- a/ver/us/asm/nonmatchings/EF2680/func_80240220_EF2830.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802453B8_EF79C8 -.double 0.09 - -dlabel D_802453C0_EF79D0 -.double 0.09 - -.section .text - -glabel func_80240220_EF2830 -/* EF2830 80240220 27BDFF80 */ addiu $sp, $sp, -0x80 -/* EF2834 80240224 AFB3004C */ sw $s3, 0x4c($sp) -/* EF2838 80240228 0080982D */ daddu $s3, $a0, $zero -/* EF283C 8024022C AFBF0058 */ sw $ra, 0x58($sp) -/* EF2840 80240230 AFB50054 */ sw $s5, 0x54($sp) -/* EF2844 80240234 AFB40050 */ sw $s4, 0x50($sp) -/* EF2848 80240238 AFB20048 */ sw $s2, 0x48($sp) -/* EF284C 8024023C AFB10044 */ sw $s1, 0x44($sp) -/* EF2850 80240240 AFB00040 */ sw $s0, 0x40($sp) -/* EF2854 80240244 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* EF2858 80240248 F7B80070 */ sdc1 $f24, 0x70($sp) -/* EF285C 8024024C F7B60068 */ sdc1 $f22, 0x68($sp) -/* EF2860 80240250 F7B40060 */ sdc1 $f20, 0x60($sp) -/* EF2864 80240254 8E710148 */ lw $s1, 0x148($s3) -/* EF2868 80240258 00A0902D */ daddu $s2, $a1, $zero -/* EF286C 8024025C 86240008 */ lh $a0, 8($s1) -/* EF2870 80240260 0C00F92F */ jal dead_get_npc_unsafe -/* EF2874 80240264 00C0A82D */ daddu $s5, $a2, $zero -/* EF2878 80240268 0040802D */ daddu $s0, $v0, $zero -/* EF287C 8024026C 0000A02D */ daddu $s4, $zero, $zero -/* EF2880 80240270 C624007C */ lwc1 $f4, 0x7c($s1) -/* EF2884 80240274 46802120 */ cvt.s.w $f4, $f4 -/* EF2888 80240278 C6220088 */ lwc1 $f2, 0x88($s1) -/* EF288C 8024027C 468010A0 */ cvt.s.w $f2, $f2 -/* EF2890 80240280 460010A1 */ cvt.d.s $f2, $f2 -/* EF2894 80240284 46002121 */ cvt.d.s $f4, $f4 -/* EF2898 80240288 C600003C */ lwc1 $f0, 0x3c($s0) -/* EF289C 8024028C 3C014059 */ lui $at, 0x4059 -/* EF28A0 80240290 44813800 */ mtc1 $at, $f7 -/* EF28A4 80240294 44803000 */ mtc1 $zero, $f6 -/* EF28A8 80240298 46000021 */ cvt.d.s $f0, $f0 -/* EF28AC 8024029C 46260002 */ mul.d $f0, $f0, $f6 -/* EF28B0 802402A0 00000000 */ nop -/* EF28B4 802402A4 24020001 */ addiu $v0, $zero, 1 -/* EF28B8 802402A8 8E24006C */ lw $a0, 0x6c($s1) -/* EF28BC 802402AC 46261083 */ div.d $f2, $f2, $f6 -/* EF28C0 802402B0 462010A0 */ cvt.s.d $f2, $f2 -/* EF28C4 802402B4 46262103 */ div.d $f4, $f4, $f6 -/* EF28C8 802402B8 46202520 */ cvt.s.d $f20, $f4 -/* EF28CC 802402BC 30830011 */ andi $v1, $a0, 0x11 -/* EF28D0 802402C0 4620020D */ trunc.w.d $f8, $f0 -/* EF28D4 802402C4 E628007C */ swc1 $f8, 0x7c($s1) -/* EF28D8 802402C8 C6200078 */ lwc1 $f0, 0x78($s1) -/* EF28DC 802402CC 46800020 */ cvt.s.w $f0, $f0 -/* EF28E0 802402D0 46000021 */ cvt.d.s $f0, $f0 -/* EF28E4 802402D4 46260003 */ div.d $f0, $f0, $f6 -/* EF28E8 802402D8 462006A0 */ cvt.s.d $f26, $f0 -/* EF28EC 802402DC C6200070 */ lwc1 $f0, 0x70($s1) -/* EF28F0 802402E0 46800020 */ cvt.s.w $f0, $f0 -/* EF28F4 802402E4 46000021 */ cvt.d.s $f0, $f0 -/* EF28F8 802402E8 46260003 */ div.d $f0, $f0, $f6 -/* EF28FC 802402EC 462005A0 */ cvt.s.d $f22, $f0 -/* EF2900 802402F0 14620025 */ bne $v1, $v0, .L80240388 -/* EF2904 802402F4 4602D600 */ add.s $f24, $f26, $f2 -/* EF2908 802402F8 8E020000 */ lw $v0, ($s0) -/* EF290C 802402FC 30420008 */ andi $v0, $v0, 8 -/* EF2910 80240300 10400009 */ beqz $v0, .L80240328 -/* EF2914 80240304 27A50028 */ addiu $a1, $sp, 0x28 -/* EF2918 80240308 C600003C */ lwc1 $f0, 0x3c($s0) -/* EF291C 8024030C 4600C001 */ sub.s $f0, $f24, $f0 -/* EF2920 80240310 4600B03C */ c.lt.s $f22, $f0 -/* EF2924 80240314 00000000 */ nop -/* EF2928 80240318 4500001B */ bc1f .L80240388 -/* EF292C 8024031C 34820010 */ ori $v0, $a0, 0x10 -/* EF2930 80240320 080900E2 */ j .L80240388 -/* EF2934 80240324 AE22006C */ sw $v0, 0x6c($s1) -.L80240328: -/* EF2938 80240328 27A6002C */ addiu $a2, $sp, 0x2c -/* EF293C 8024032C C6000038 */ lwc1 $f0, 0x38($s0) -/* EF2940 80240330 C602003C */ lwc1 $f2, 0x3c($s0) -/* EF2944 80240334 C6040040 */ lwc1 $f4, 0x40($s0) -/* EF2948 80240338 3C01447A */ lui $at, 0x447a -/* EF294C 8024033C 44813000 */ mtc1 $at, $f6 -/* EF2950 80240340 27A20034 */ addiu $v0, $sp, 0x34 -/* EF2954 80240344 E7A00028 */ swc1 $f0, 0x28($sp) -/* EF2958 80240348 E7A2002C */ swc1 $f2, 0x2c($sp) -/* EF295C 8024034C E7A40030 */ swc1 $f4, 0x30($sp) -/* EF2960 80240350 E7A60034 */ swc1 $f6, 0x34($sp) -/* EF2964 80240354 AFA20010 */ sw $v0, 0x10($sp) -/* EF2968 80240358 8E040080 */ lw $a0, 0x80($s0) -/* EF296C 8024035C 0C03908F */ jal dead_npc_raycast_down_sides -/* EF2970 80240360 27A70030 */ addiu $a3, $sp, 0x30 -/* EF2974 80240364 C7A00034 */ lwc1 $f0, 0x34($sp) -/* EF2978 80240368 4600D001 */ sub.s $f0, $f26, $f0 -/* EF297C 8024036C 4600B03C */ c.lt.s $f22, $f0 -/* EF2980 80240370 00000000 */ nop -/* EF2984 80240374 45000004 */ bc1f .L80240388 -/* EF2988 80240378 00000000 */ nop -/* EF298C 8024037C 8E22006C */ lw $v0, 0x6c($s1) -/* EF2990 80240380 34420010 */ ori $v0, $v0, 0x10 -/* EF2994 80240384 AE22006C */ sw $v0, 0x6c($s1) -.L80240388: -/* EF2998 80240388 8E22006C */ lw $v0, 0x6c($s1) -/* EF299C 8024038C 24030011 */ addiu $v1, $zero, 0x11 -/* EF29A0 80240390 30420011 */ andi $v0, $v0, 0x11 -/* EF29A4 80240394 14430039 */ bne $v0, $v1, .L8024047C -/* EF29A8 80240398 00000000 */ nop -/* EF29AC 8024039C 8E020000 */ lw $v0, ($s0) -/* EF29B0 802403A0 30420008 */ andi $v0, $v0, 8 -/* EF29B4 802403A4 1040000A */ beqz $v0, .L802403D0 -/* EF29B8 802403A8 4600C106 */ mov.s $f4, $f24 -/* EF29BC 802403AC 4614C081 */ sub.s $f2, $f24, $f20 -/* EF29C0 802403B0 3C018024 */ lui $at, %hi(D_802453B8_EF79C8) -/* EF29C4 802403B4 D42053B8 */ ldc1 $f0, %lo(D_802453B8_EF79C8)($at) -/* EF29C8 802403B8 460010A1 */ cvt.d.s $f2, $f2 -/* EF29CC 802403BC 46201082 */ mul.d $f2, $f2, $f0 -/* EF29D0 802403C0 00000000 */ nop -/* EF29D4 802403C4 4600A021 */ cvt.d.s $f0, $f20 -/* EF29D8 802403C8 0809010D */ j .L80240434 -/* EF29DC 802403CC 46220000 */ add.d $f0, $f0, $f2 -.L802403D0: -/* EF29E0 802403D0 27A50028 */ addiu $a1, $sp, 0x28 -/* EF29E4 802403D4 27A6002C */ addiu $a2, $sp, 0x2c -/* EF29E8 802403D8 C6000038 */ lwc1 $f0, 0x38($s0) -/* EF29EC 802403DC C6020040 */ lwc1 $f2, 0x40($s0) -/* EF29F0 802403E0 3C01447A */ lui $at, 0x447a -/* EF29F4 802403E4 44812000 */ mtc1 $at, $f4 -/* EF29F8 802403E8 27A20034 */ addiu $v0, $sp, 0x34 -/* EF29FC 802403EC E7B4002C */ swc1 $f20, 0x2c($sp) -/* EF2A00 802403F0 E7A00028 */ swc1 $f0, 0x28($sp) -/* EF2A04 802403F4 E7A20030 */ swc1 $f2, 0x30($sp) -/* EF2A08 802403F8 E7A40034 */ swc1 $f4, 0x34($sp) -/* EF2A0C 802403FC AFA20010 */ sw $v0, 0x10($sp) -/* EF2A10 80240400 8E040080 */ lw $a0, 0x80($s0) -/* EF2A14 80240404 0C03908F */ jal dead_npc_raycast_down_sides -/* EF2A18 80240408 27A70030 */ addiu $a3, $sp, 0x30 -/* EF2A1C 8024040C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* EF2A20 80240410 461A2100 */ add.s $f4, $f4, $f26 -/* EF2A24 80240414 46142081 */ sub.s $f2, $f4, $f20 -/* EF2A28 80240418 3C018024 */ lui $at, %hi(D_802453C0_EF79D0) -/* EF2A2C 8024041C D42053C0 */ ldc1 $f0, %lo(D_802453C0_EF79D0)($at) -/* EF2A30 80240420 460010A1 */ cvt.d.s $f2, $f2 -/* EF2A34 80240424 46201082 */ mul.d $f2, $f2, $f0 -/* EF2A38 80240428 00000000 */ nop -/* EF2A3C 8024042C 4600A021 */ cvt.d.s $f0, $f20 -/* EF2A40 80240430 46220000 */ add.d $f0, $f0, $f2 -.L80240434: -/* EF2A44 80240434 46200020 */ cvt.s.d $f0, $f0 -/* EF2A48 80240438 E600003C */ swc1 $f0, 0x3c($s0) -/* EF2A4C 8024043C C600003C */ lwc1 $f0, 0x3c($s0) -/* EF2A50 80240440 46002001 */ sub.s $f0, $f4, $f0 -/* EF2A54 80240444 3C013FF0 */ lui $at, 0x3ff0 -/* EF2A58 80240448 44811800 */ mtc1 $at, $f3 -/* EF2A5C 8024044C 44801000 */ mtc1 $zero, $f2 -/* EF2A60 80240450 46000005 */ abs.s $f0, $f0 -/* EF2A64 80240454 46000021 */ cvt.d.s $f0, $f0 -/* EF2A68 80240458 4622003C */ c.lt.d $f0, $f2 -/* EF2A6C 8024045C 00000000 */ nop -/* EF2A70 80240460 45000036 */ bc1f .L8024053C -/* EF2A74 80240464 2403FFEF */ addiu $v1, $zero, -0x11 -/* EF2A78 80240468 E604003C */ swc1 $f4, 0x3c($s0) -/* EF2A7C 8024046C 8E22006C */ lw $v0, 0x6c($s1) -/* EF2A80 80240470 00431024 */ and $v0, $v0, $v1 -/* EF2A84 80240474 0809014F */ j .L8024053C -/* EF2A88 80240478 AE22006C */ sw $v0, 0x6c($s1) -.L8024047C: -/* EF2A8C 8024047C 8E220070 */ lw $v0, 0x70($s1) -/* EF2A90 80240480 1840002E */ blez $v0, .L8024053C -/* EF2A94 80240484 00000000 */ nop -/* EF2A98 80240488 C62C0074 */ lwc1 $f12, 0x74($s1) -/* EF2A9C 8024048C 0C00AD77 */ jal dead_sin_deg -/* EF2AA0 80240490 46806320 */ cvt.s.w $f12, $f12 -/* EF2AA4 80240494 8E020000 */ lw $v0, ($s0) -/* EF2AA8 80240498 30420008 */ andi $v0, $v0, 8 -/* EF2AAC 8024049C 10400003 */ beqz $v0, .L802404AC -/* EF2AB0 802404A0 46000506 */ mov.s $f20, $f0 -/* EF2AB4 802404A4 0809013B */ j .L802404EC -/* EF2AB8 802404A8 0000102D */ daddu $v0, $zero, $zero -.L802404AC: -/* EF2ABC 802404AC 27A50028 */ addiu $a1, $sp, 0x28 -/* EF2AC0 802404B0 27A6002C */ addiu $a2, $sp, 0x2c -/* EF2AC4 802404B4 C6000038 */ lwc1 $f0, 0x38($s0) -/* EF2AC8 802404B8 C602003C */ lwc1 $f2, 0x3c($s0) -/* EF2ACC 802404BC C6040040 */ lwc1 $f4, 0x40($s0) -/* EF2AD0 802404C0 3C01447A */ lui $at, 0x447a -/* EF2AD4 802404C4 44813000 */ mtc1 $at, $f6 -/* EF2AD8 802404C8 27A20034 */ addiu $v0, $sp, 0x34 -/* EF2ADC 802404CC E7A00028 */ swc1 $f0, 0x28($sp) -/* EF2AE0 802404D0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* EF2AE4 802404D4 E7A40030 */ swc1 $f4, 0x30($sp) -/* EF2AE8 802404D8 E7A60034 */ swc1 $f6, 0x34($sp) -/* EF2AEC 802404DC AFA20010 */ sw $v0, 0x10($sp) -/* EF2AF0 802404E0 8E040080 */ lw $a0, 0x80($s0) -/* EF2AF4 802404E4 0C03908F */ jal dead_npc_raycast_down_sides -/* EF2AF8 802404E8 27A70030 */ addiu $a3, $sp, 0x30 -.L802404EC: -/* EF2AFC 802404EC 10400007 */ beqz $v0, .L8024050C -/* EF2B00 802404F0 00000000 */ nop -/* EF2B04 802404F4 4616A082 */ mul.s $f2, $f20, $f22 -/* EF2B08 802404F8 00000000 */ nop -/* EF2B0C 802404FC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* EF2B10 80240500 461A0000 */ add.s $f0, $f0, $f26 -/* EF2B14 80240504 08090146 */ j .L80240518 -/* EF2B18 80240508 46020000 */ add.s $f0, $f0, $f2 -.L8024050C: -/* EF2B1C 8024050C 4616A002 */ mul.s $f0, $f20, $f22 -/* EF2B20 80240510 00000000 */ nop -/* EF2B24 80240514 4600C000 */ add.s $f0, $f24, $f0 -.L80240518: -/* EF2B28 80240518 E600003C */ swc1 $f0, 0x3c($s0) -/* EF2B2C 8024051C 8E220074 */ lw $v0, 0x74($s1) -/* EF2B30 80240520 2442000A */ addiu $v0, $v0, 0xa -/* EF2B34 80240524 44826000 */ mtc1 $v0, $f12 -/* EF2B38 80240528 00000000 */ nop -/* EF2B3C 8024052C 0C00AB85 */ jal dead_clamp_angle -/* EF2B40 80240530 46806320 */ cvt.s.w $f12, $f12 -/* EF2B44 80240534 4600020D */ trunc.w.s $f8, $f0 -/* EF2B48 80240538 E6280074 */ swc1 $f8, 0x74($s1) -.L8024053C: -/* EF2B4C 8024053C 8E220090 */ lw $v0, 0x90($s1) -/* EF2B50 80240540 1C40004A */ bgtz $v0, .L8024066C -/* EF2B54 80240544 2442FFFF */ addiu $v0, $v0, -1 -/* EF2B58 80240548 8E430014 */ lw $v1, 0x14($s2) -/* EF2B5C 8024054C 04600048 */ bltz $v1, .L80240670 -/* EF2B60 80240550 00000000 */ nop -/* EF2B64 80240554 8E620074 */ lw $v0, 0x74($s3) -/* EF2B68 80240558 1C400042 */ bgtz $v0, .L80240664 -/* EF2B6C 8024055C 2442FFFF */ addiu $v0, $v0, -1 -/* EF2B70 80240560 AE630074 */ sw $v1, 0x74($s3) -/* EF2B74 80240564 860200A8 */ lh $v0, 0xa8($s0) -/* EF2B78 80240568 C602003C */ lwc1 $f2, 0x3c($s0) -/* EF2B7C 8024056C 44820000 */ mtc1 $v0, $f0 -/* EF2B80 80240570 00000000 */ nop -/* EF2B84 80240574 46800020 */ cvt.s.w $f0, $f0 -/* EF2B88 80240578 46001080 */ add.s $f2, $f2, $f0 -/* EF2B8C 8024057C 3C014024 */ lui $at, 0x4024 -/* EF2B90 80240580 44810800 */ mtc1 $at, $f1 -/* EF2B94 80240584 44800000 */ mtc1 $zero, $f0 -/* EF2B98 80240588 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EF2B9C 8024058C 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EF2BA0 80240590 460010A1 */ cvt.d.s $f2, $f2 -/* EF2BA4 80240594 46201080 */ add.d $f2, $f2, $f0 -/* EF2BA8 80240598 C440002C */ lwc1 $f0, 0x2c($v0) -/* EF2BAC 8024059C 46000021 */ cvt.d.s $f0, $f0 -/* EF2BB0 802405A0 4622003C */ c.lt.d $f0, $f2 -/* EF2BB4 802405A4 00000000 */ nop -/* EF2BB8 802405A8 4500002C */ bc1f .L8024065C -/* EF2BBC 802405AC 02A0202D */ daddu $a0, $s5, $zero -/* EF2BC0 802405B0 AFA00010 */ sw $zero, 0x10($sp) -/* EF2BC4 802405B4 8E46000C */ lw $a2, 0xc($s2) -/* EF2BC8 802405B8 8E470010 */ lw $a3, 0x10($s2) -/* EF2BCC 802405BC 0C013469 */ jal func_8004D1A4 -/* EF2BD0 802405C0 0220282D */ daddu $a1, $s1, $zero -/* EF2BD4 802405C4 10400025 */ beqz $v0, .L8024065C -/* EF2BD8 802405C8 0000202D */ daddu $a0, $zero, $zero -/* EF2BDC 802405CC 0200282D */ daddu $a1, $s0, $zero -/* EF2BE0 802405D0 0000302D */ daddu $a2, $zero, $zero -/* EF2BE4 802405D4 2412000C */ addiu $s2, $zero, 0xc -/* EF2BE8 802405D8 860300A8 */ lh $v1, 0xa8($s0) -/* EF2BEC 802405DC 3C013F80 */ lui $at, 0x3f80 -/* EF2BF0 802405E0 44810000 */ mtc1 $at, $f0 -/* EF2BF4 802405E4 3C014000 */ lui $at, 0x4000 -/* EF2BF8 802405E8 44811000 */ mtc1 $at, $f2 -/* EF2BFC 802405EC 3C01C1A0 */ lui $at, 0xc1a0 -/* EF2C00 802405F0 44812000 */ mtc1 $at, $f4 -/* EF2C04 802405F4 44834000 */ mtc1 $v1, $f8 -/* EF2C08 802405F8 00000000 */ nop -/* EF2C0C 802405FC 46804220 */ cvt.s.w $f8, $f8 -/* EF2C10 80240600 44074000 */ mfc1 $a3, $f8 -/* EF2C14 80240604 27A20038 */ addiu $v0, $sp, 0x38 -/* EF2C18 80240608 AFB2001C */ sw $s2, 0x1c($sp) -/* EF2C1C 8024060C AFA20020 */ sw $v0, 0x20($sp) -/* EF2C20 80240610 E7A00010 */ swc1 $f0, 0x10($sp) -/* EF2C24 80240614 E7A20014 */ swc1 $f2, 0x14($sp) -/* EF2C28 80240618 0C01D444 */ jal dead_fx_emote -/* EF2C2C 8024061C E7A40018 */ swc1 $f4, 0x18($sp) -/* EF2C30 80240620 0200202D */ daddu $a0, $s0, $zero -/* EF2C34 80240624 240502F4 */ addiu $a1, $zero, 0x2f4 -/* EF2C38 80240628 C480003C */ lwc1 $f0, 0x3c($a0) -/* EF2C3C 8024062C 3C060020 */ lui $a2, 0x20 -/* EF2C40 80240630 0C013600 */ jal dead_ai_enemy_play_sound -/* EF2C44 80240634 E4800064 */ swc1 $f0, 0x64($a0) -/* EF2C48 80240638 8E220018 */ lw $v0, 0x18($s1) -/* EF2C4C 8024063C 9442002A */ lhu $v0, 0x2a($v0) -/* EF2C50 80240640 30420001 */ andi $v0, $v0, 1 -/* EF2C54 80240644 10400003 */ beqz $v0, .L80240654 -/* EF2C58 80240648 2402000A */ addiu $v0, $zero, 0xa -/* EF2C5C 8024064C 08090205 */ j .L80240814 -/* EF2C60 80240650 AE620070 */ sw $v0, 0x70($s3) -.L80240654: -/* EF2C64 80240654 08090205 */ j .L80240814 -/* EF2C68 80240658 AE720070 */ sw $s2, 0x70($s3) -.L8024065C: -/* EF2C6C 8024065C 8E620074 */ lw $v0, 0x74($s3) -/* EF2C70 80240660 2442FFFF */ addiu $v0, $v0, -1 -.L80240664: -/* EF2C74 80240664 0809019C */ j .L80240670 -/* EF2C78 80240668 AE620074 */ sw $v0, 0x74($s3) -.L8024066C: -/* EF2C7C 8024066C AE220090 */ sw $v0, 0x90($s1) -.L80240670: -/* EF2C80 80240670 8E2300D0 */ lw $v1, 0xd0($s1) -/* EF2C84 80240674 C6000040 */ lwc1 $f0, 0x40($s0) -/* EF2C88 80240678 C4620000 */ lwc1 $f2, ($v1) -/* EF2C8C 8024067C 468010A0 */ cvt.s.w $f2, $f2 -/* EF2C90 80240680 C4640008 */ lwc1 $f4, 8($v1) -/* EF2C94 80240684 46802120 */ cvt.s.w $f4, $f4 -/* EF2C98 80240688 E7A00010 */ swc1 $f0, 0x10($sp) -/* EF2C9C 8024068C 8E2200D0 */ lw $v0, 0xd0($s1) -/* EF2CA0 80240690 44051000 */ mfc1 $a1, $f2 -/* EF2CA4 80240694 C440000C */ lwc1 $f0, 0xc($v0) -/* EF2CA8 80240698 46800020 */ cvt.s.w $f0, $f0 -/* EF2CAC 8024069C E7A00014 */ swc1 $f0, 0x14($sp) -/* EF2CB0 802406A0 8E2200D0 */ lw $v0, 0xd0($s1) -/* EF2CB4 802406A4 44062000 */ mfc1 $a2, $f4 -/* EF2CB8 802406A8 C4400010 */ lwc1 $f0, 0x10($v0) -/* EF2CBC 802406AC 46800020 */ cvt.s.w $f0, $f0 -/* EF2CC0 802406B0 E7A00018 */ swc1 $f0, 0x18($sp) -/* EF2CC4 802406B4 8C640018 */ lw $a0, 0x18($v1) -/* EF2CC8 802406B8 0C013431 */ jal dead_is_point_within_region -/* EF2CCC 802406BC 8E070038 */ lw $a3, 0x38($s0) -/* EF2CD0 802406C0 1040001A */ beqz $v0, .L8024072C -/* EF2CD4 802406C4 00000000 */ nop -/* EF2CD8 802406C8 8E060038 */ lw $a2, 0x38($s0) -/* EF2CDC 802406CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* EF2CE0 802406D0 8E070040 */ lw $a3, 0x40($s0) -/* EF2CE4 802406D4 C44C0000 */ lwc1 $f12, ($v0) -/* EF2CE8 802406D8 46806320 */ cvt.s.w $f12, $f12 -/* EF2CEC 802406DC C44E0008 */ lwc1 $f14, 8($v0) -/* EF2CF0 802406E0 0C00AC71 */ jal dead_dist2D -/* EF2CF4 802406E4 468073A0 */ cvt.s.w $f14, $f14 -/* EF2CF8 802406E8 C6020018 */ lwc1 $f2, 0x18($s0) -/* EF2CFC 802406EC 4600103C */ c.lt.s $f2, $f0 -/* EF2D00 802406F0 00000000 */ nop -/* EF2D04 802406F4 4500000D */ bc1f .L8024072C -/* EF2D08 802406F8 E7A00034 */ swc1 $f0, 0x34($sp) -/* EF2D0C 802406FC C60C0038 */ lwc1 $f12, 0x38($s0) -/* EF2D10 80240700 8E2200D0 */ lw $v0, 0xd0($s1) -/* EF2D14 80240704 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EF2D18 80240708 C4480000 */ lwc1 $f8, ($v0) -/* EF2D1C 8024070C 46804220 */ cvt.s.w $f8, $f8 -/* EF2D20 80240710 44064000 */ mfc1 $a2, $f8 -/* EF2D24 80240714 C4480008 */ lwc1 $f8, 8($v0) -/* EF2D28 80240718 46804220 */ cvt.s.w $f8, $f8 -/* EF2D2C 8024071C 44074000 */ mfc1 $a3, $f8 -/* EF2D30 80240720 0C00ABDC */ jal fio_validate_header_checksums -/* EF2D34 80240724 24140001 */ addiu $s4, $zero, 1 -/* EF2D38 80240728 E600000C */ swc1 $f0, 0xc($s0) -.L8024072C: -/* EF2D3C 8024072C 8E2200D0 */ lw $v0, 0xd0($s1) -/* EF2D40 80240730 8C43000C */ lw $v1, 0xc($v0) -/* EF2D44 80240734 8C420010 */ lw $v0, 0x10($v0) -/* EF2D48 80240738 00621825 */ or $v1, $v1, $v0 -/* EF2D4C 8024073C 00741825 */ or $v1, $v1, $s4 -/* EF2D50 80240740 10600008 */ beqz $v1, .L80240764 -/* EF2D54 80240744 00000000 */ nop -/* EF2D58 80240748 8602008C */ lh $v0, 0x8c($s0) -/* EF2D5C 8024074C 14400031 */ bnez $v0, .L80240814 -/* EF2D60 80240750 00000000 */ nop -/* EF2D64 80240754 8E050018 */ lw $a1, 0x18($s0) -/* EF2D68 80240758 8E06000C */ lw $a2, 0xc($s0) -/* EF2D6C 8024075C 0C00F909 */ jal dead_npc_move_heading -/* EF2D70 80240760 0200202D */ daddu $a0, $s0, $zero -.L80240764: -/* EF2D74 80240764 C600003C */ lwc1 $f0, 0x3c($s0) -/* EF2D78 80240768 3C014059 */ lui $at, 0x4059 -/* EF2D7C 8024076C 44811800 */ mtc1 $at, $f3 -/* EF2D80 80240770 44801000 */ mtc1 $zero, $f2 -/* EF2D84 80240774 46000021 */ cvt.d.s $f0, $f0 -/* EF2D88 80240778 46220002 */ mul.d $f0, $f0, $f2 -/* EF2D8C 8024077C 00000000 */ nop -/* EF2D90 80240780 4620020D */ trunc.w.d $f8, $f0 -/* EF2D94 80240784 E628007C */ swc1 $f8, 0x7c($s1) -/* EF2D98 80240788 8E420004 */ lw $v0, 4($s2) -/* EF2D9C 8024078C 18400021 */ blez $v0, .L80240814 -/* EF2DA0 80240790 00000000 */ nop -/* EF2DA4 80240794 8602008E */ lh $v0, 0x8e($s0) -/* EF2DA8 80240798 9603008E */ lhu $v1, 0x8e($s0) -/* EF2DAC 8024079C 18400005 */ blez $v0, .L802407B4 -/* EF2DB0 802407A0 2462FFFF */ addiu $v0, $v1, -1 -/* EF2DB4 802407A4 A602008E */ sh $v0, 0x8e($s0) -/* EF2DB8 802407A8 00021400 */ sll $v0, $v0, 0x10 -/* EF2DBC 802407AC 1C400019 */ bgtz $v0, .L80240814 -/* EF2DC0 802407B0 00000000 */ nop -.L802407B4: -/* EF2DC4 802407B4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* EF2DC8 802407B8 24020002 */ addiu $v0, $zero, 2 -/* EF2DCC 802407BC 0C00AB3B */ jal dead_rand_int -/* EF2DD0 802407C0 AE620070 */ sw $v0, 0x70($s3) -/* EF2DD4 802407C4 3C035555 */ lui $v1, 0x5555 -/* EF2DD8 802407C8 34635556 */ ori $v1, $v1, 0x5556 -/* EF2DDC 802407CC 00430018 */ mult $v0, $v1 -/* EF2DE0 802407D0 000227C3 */ sra $a0, $v0, 0x1f -/* EF2DE4 802407D4 00004010 */ mfhi $t0 -/* EF2DE8 802407D8 01042023 */ subu $a0, $t0, $a0 -/* EF2DEC 802407DC 00041840 */ sll $v1, $a0, 1 -/* EF2DF0 802407E0 00641821 */ addu $v1, $v1, $a0 -/* EF2DF4 802407E4 00431023 */ subu $v0, $v0, $v1 -/* EF2DF8 802407E8 24430002 */ addiu $v1, $v0, 2 -/* EF2DFC 802407EC AE630074 */ sw $v1, 0x74($s3) -/* EF2E00 802407F0 8E42002C */ lw $v0, 0x2c($s2) -/* EF2E04 802407F4 58400007 */ blezl $v0, .L80240814 -/* EF2E08 802407F8 AE600070 */ sw $zero, 0x70($s3) -/* EF2E0C 802407FC 8E420008 */ lw $v0, 8($s2) -/* EF2E10 80240800 18400003 */ blez $v0, .L80240810 -/* EF2E14 80240804 28620003 */ slti $v0, $v1, 3 -/* EF2E18 80240808 10400002 */ beqz $v0, .L80240814 -/* EF2E1C 8024080C 00000000 */ nop -.L80240810: -/* EF2E20 80240810 AE600070 */ sw $zero, 0x70($s3) -.L80240814: -/* EF2E24 80240814 8FBF0058 */ lw $ra, 0x58($sp) -/* EF2E28 80240818 8FB50054 */ lw $s5, 0x54($sp) -/* EF2E2C 8024081C 8FB40050 */ lw $s4, 0x50($sp) -/* EF2E30 80240820 8FB3004C */ lw $s3, 0x4c($sp) -/* EF2E34 80240824 8FB20048 */ lw $s2, 0x48($sp) -/* EF2E38 80240828 8FB10044 */ lw $s1, 0x44($sp) -/* EF2E3C 8024082C 8FB00040 */ lw $s0, 0x40($sp) -/* EF2E40 80240830 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* EF2E44 80240834 D7B80070 */ ldc1 $f24, 0x70($sp) -/* EF2E48 80240838 D7B60068 */ ldc1 $f22, 0x68($sp) -/* EF2E4C 8024083C D7B40060 */ ldc1 $f20, 0x60($sp) -/* EF2E50 80240840 03E00008 */ jr $ra -/* EF2E54 80240844 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s index fd75b35379..efd5e30b09 100644 --- a/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s +++ b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s @@ -97,7 +97,7 @@ glabel func_8024137C_EF398C .L802414C4_EF3AD4: /* EF3AD4 802414C4 02A0202D */ daddu $a0, $s5, $zero /* EF3AD8 802414C8 0200282D */ daddu $a1, $s0, $zero -/* EF3ADC 802414CC 0C090088 */ jal func_80240220_EF2830 +/* EF3ADC 802414CC 0C090088 */ jal EF2680_UnkNpcAIFunc35 /* EF3AE0 802414D0 0260302D */ daddu $a2, $s3, $zero /* EF3AE4 802414D4 0809055C */ j .L80241570 /* EF3AE8 802414D8 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/effects/effect_13/fx_13_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_appendGfx.s deleted file mode 100644 index 5e736f92e5..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_13/fx_13_appendGfx.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_13_appendGfx -/* 330270 E001A440 27BDFF40 */ addiu $sp, $sp, -0xc0 -/* 330274 E001A444 0080382D */ daddu $a3, $a0, $zero -/* 330278 E001A448 3C08DB06 */ lui $t0, 0xdb06 -/* 33027C E001A44C 35080024 */ ori $t0, $t0, 0x24 -/* 330280 E001A450 AFB400B8 */ sw $s4, 0xb8($sp) -/* 330284 E001A454 3C14800A */ lui $s4, %hi(gMasterGfxPos) -/* 330288 E001A458 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) -/* 33028C E001A45C 27A40020 */ addiu $a0, $sp, 0x20 -/* 330290 E001A460 3C02E700 */ lui $v0, 0xe700 -/* 330294 E001A464 AFBF00BC */ sw $ra, 0xbc($sp) -/* 330298 E001A468 AFB300B4 */ sw $s3, 0xb4($sp) -/* 33029C E001A46C AFB200B0 */ sw $s2, 0xb0($sp) -/* 3302A0 E001A470 AFB100AC */ sw $s1, 0xac($sp) -/* 3302A4 E001A474 AFB000A8 */ sw $s0, 0xa8($sp) -/* 3302A8 E001A478 8E830000 */ lw $v1, ($s4) -/* 3302AC E001A47C 8CE6000C */ lw $a2, 0xc($a3) -/* 3302B0 E001A480 0060282D */ daddu $a1, $v1, $zero -/* 3302B4 E001A484 24630008 */ addiu $v1, $v1, 8 -/* 3302B8 E001A488 ACA20000 */ sw $v0, ($a1) -/* 3302BC E001A48C ACA00004 */ sw $zero, 4($a1) -/* 3302C0 E001A490 AC680000 */ sw $t0, ($v1) -/* 3302C4 E001A494 8CE20010 */ lw $v0, 0x10($a3) -/* 3302C8 E001A498 3C013F80 */ lui $at, 0x3f80 -/* 3302CC E001A49C 44810000 */ mtc1 $at, $f0 -/* 3302D0 E001A4A0 8C42001C */ lw $v0, 0x1c($v0) -/* 3302D4 E001A4A4 3C058000 */ lui $a1, 0x8000 -/* 3302D8 E001A4A8 00451021 */ addu $v0, $v0, $a1 -/* 3302DC E001A4AC AC620004 */ sw $v0, 4($v1) -/* 3302E0 E001A4B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 3302E4 E001A4B4 C4C00004 */ lwc1 $f0, 4($a2) -/* 3302E8 E001A4B8 3C120001 */ lui $s2, 1 -/* 3302EC E001A4BC E7A00014 */ swc1 $f0, 0x14($sp) -/* 3302F0 E001A4C0 C4C00008 */ lwc1 $f0, 8($a2) -/* 3302F4 E001A4C4 36521630 */ ori $s2, $s2, 0x1630 -/* 3302F8 E001A4C8 E7A00018 */ swc1 $f0, 0x18($sp) -/* 3302FC E001A4CC C4C0000C */ lwc1 $f0, 0xc($a2) -/* 330300 E001A4D0 0000382D */ daddu $a3, $zero, $zero -/* 330304 E001A4D4 AE830000 */ sw $v1, ($s4) -/* 330308 E001A4D8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 33030C E001A4DC 8CC50024 */ lw $a1, 0x24($a2) -/* 330310 E001A4E0 8CC60028 */ lw $a2, 0x28($a2) -/* 330314 E001A4E4 24630008 */ addiu $v1, $v1, 8 -/* 330318 E001A4E8 0C080180 */ jal shim_guPositionF -/* 33031C E001A4EC AE830000 */ sw $v1, ($s4) -/* 330320 E001A4F0 27A40020 */ addiu $a0, $sp, 0x20 -/* 330324 E001A4F4 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* 330328 E001A4F8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* 33032C E001A4FC 3C11800A */ lui $s1, %hi(gDisplayContext) -/* 330330 E001A500 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) -/* 330334 E001A504 96050000 */ lhu $a1, ($s0) -/* 330338 E001A508 8E220000 */ lw $v0, ($s1) -/* 33033C E001A50C 00052980 */ sll $a1, $a1, 6 -/* 330340 E001A510 00B22821 */ addu $a1, $a1, $s2 -/* 330344 E001A514 0C080118 */ jal shim_guMtxF2L -/* 330348 E001A518 00452821 */ addu $a1, $v0, $a1 -/* 33034C E001A51C 8E820000 */ lw $v0, ($s4) -/* 330350 E001A520 241300FF */ addiu $s3, $zero, 0xff -/* 330354 E001A524 A3B300A1 */ sb $s3, 0xa1($sp) -/* 330358 E001A528 0040282D */ daddu $a1, $v0, $zero -/* 33035C E001A52C 24420008 */ addiu $v0, $v0, 8 -/* 330360 E001A530 AE820000 */ sw $v0, ($s4) -/* 330364 E001A534 96020000 */ lhu $v0, ($s0) -/* 330368 E001A538 3C03DA38 */ lui $v1, 0xda38 -/* 33036C E001A53C ACA30000 */ sw $v1, ($a1) -/* 330370 E001A540 24430001 */ addiu $v1, $v0, 1 -/* 330374 E001A544 3042FFFF */ andi $v0, $v0, 0xffff -/* 330378 E001A548 00021180 */ sll $v0, $v0, 6 -/* 33037C E001A54C 00521021 */ addu $v0, $v0, $s2 -/* 330380 E001A550 A6030000 */ sh $v1, ($s0) -/* 330384 E001A554 8E230000 */ lw $v1, ($s1) -/* 330388 E001A558 3C048015 */ lui $a0, %hi(D_801512F0) -/* 33038C E001A55C 8C8412F0 */ lw $a0, %lo(D_801512F0)($a0) -/* 330390 E001A560 00621821 */ addu $v1, $v1, $v0 -/* 330394 E001A564 ACA30004 */ sw $v1, 4($a1) -/* 330398 E001A568 90830000 */ lbu $v1, ($a0) -/* 33039C E001A56C 24020001 */ addiu $v0, $zero, 1 -/* 3303A0 E001A570 14620007 */ bne $v1, $v0, .LE001A590 -/* 3303A4 E001A574 27A400A0 */ addiu $a0, $sp, 0xa0 -/* 3303A8 E001A578 0080282D */ daddu $a1, $a0, $zero -/* 3303AC E001A57C 0080302D */ daddu $a2, $a0, $zero -/* 3303B0 E001A580 0C08019C */ jal shim_get_background_color_blend -/* 3303B4 E001A584 27A700A1 */ addiu $a3, $sp, 0xa1 -/* 3303B8 E001A588 93A200A1 */ lbu $v0, 0xa1($sp) -/* 3303BC E001A58C 02629823 */ subu $s3, $s3, $v0 -.LE001A590: -/* 3303C0 E001A590 12600016 */ beqz $s3, .LE001A5EC -/* 3303C4 E001A594 3C05D838 */ lui $a1, 0xd838 -/* 3303C8 E001A598 34A50002 */ ori $a1, $a1, 2 -/* 3303CC E001A59C 8E830000 */ lw $v1, ($s4) -/* 3303D0 E001A5A0 3C02FA00 */ lui $v0, 0xfa00 -/* 3303D4 E001A5A4 0060202D */ daddu $a0, $v1, $zero -/* 3303D8 E001A5A8 24630008 */ addiu $v1, $v1, 8 -/* 3303DC E001A5AC AE830000 */ sw $v1, ($s4) -/* 3303E0 E001A5B0 AC820000 */ sw $v0, ($a0) -/* 3303E4 E001A5B4 326200FF */ andi $v0, $s3, 0xff -/* 3303E8 E001A5B8 AC820004 */ sw $v0, 4($a0) -/* 3303EC E001A5BC 24620008 */ addiu $v0, $v1, 8 -/* 3303F0 E001A5C0 AE820000 */ sw $v0, ($s4) -/* 3303F4 E001A5C4 3C02DE00 */ lui $v0, 0xde00 -/* 3303F8 E001A5C8 AC620000 */ sw $v0, ($v1) -/* 3303FC E001A5CC 3C020900 */ lui $v0, 0x900 -/* 330400 E001A5D0 244202F0 */ addiu $v0, $v0, 0x2f0 -/* 330404 E001A5D4 AC620004 */ sw $v0, 4($v1) -/* 330408 E001A5D8 24620010 */ addiu $v0, $v1, 0x10 -/* 33040C E001A5DC AE820000 */ sw $v0, ($s4) -/* 330410 E001A5E0 24020040 */ addiu $v0, $zero, 0x40 -/* 330414 E001A5E4 AC650008 */ sw $a1, 8($v1) -/* 330418 E001A5E8 AC62000C */ sw $v0, 0xc($v1) -.LE001A5EC: -/* 33041C E001A5EC 8FBF00BC */ lw $ra, 0xbc($sp) -/* 330420 E001A5F0 8FB400B8 */ lw $s4, 0xb8($sp) -/* 330424 E001A5F4 8FB300B4 */ lw $s3, 0xb4($sp) -/* 330428 E001A5F8 8FB200B0 */ lw $s2, 0xb0($sp) -/* 33042C E001A5FC 8FB100AC */ lw $s1, 0xac($sp) -/* 330430 E001A600 8FB000A8 */ lw $s0, 0xa8($sp) -/* 330434 E001A604 03E00008 */ jr $ra -/* 330438 E001A608 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 33043C E001A60C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_13/fx_13_main.s b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_main.s deleted file mode 100644 index 5d8a69bb31..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_13/fx_13_main.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_13_main -/* 32FE30 E001A000 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 32FE34 E001A004 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 32FE38 E001A008 4485A000 */ mtc1 $a1, $f20 -/* 32FE3C E001A00C F7B80048 */ sdc1 $f24, 0x48($sp) -/* 32FE40 E001A010 4486C000 */ mtc1 $a2, $f24 -/* 32FE44 E001A014 AFB1002C */ sw $s1, 0x2c($sp) -/* 32FE48 E001A018 0080882D */ daddu $s1, $a0, $zero -/* 32FE4C E001A01C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 32FE50 E001A020 4487B000 */ mtc1 $a3, $f22 -/* 32FE54 E001A024 27A40010 */ addiu $a0, $sp, 0x10 -/* 32FE58 E001A028 AFB20030 */ sw $s2, 0x30($sp) -/* 32FE5C E001A02C 8FB20060 */ lw $s2, 0x60($sp) -/* 32FE60 E001A030 3C02E002 */ lui $v0, %hi(fx_13_init) -/* 32FE64 E001A034 2442A21C */ addiu $v0, $v0, %lo(fx_13_init) -/* 32FE68 E001A038 AFA20018 */ sw $v0, 0x18($sp) -/* 32FE6C E001A03C 3C02E002 */ lui $v0, %hi(fx_13_update) -/* 32FE70 E001A040 2442A224 */ addiu $v0, $v0, %lo(fx_13_update) -/* 32FE74 E001A044 AFA2001C */ sw $v0, 0x1c($sp) -/* 32FE78 E001A048 3C02E002 */ lui $v0, %hi(fx_13_render) -/* 32FE7C E001A04C 2442A3FC */ addiu $v0, $v0, %lo(fx_13_render) -/* 32FE80 E001A050 AFA20020 */ sw $v0, 0x20($sp) -/* 32FE84 E001A054 2402000D */ addiu $v0, $zero, 0xd -/* 32FE88 E001A058 AFBF0034 */ sw $ra, 0x34($sp) -/* 32FE8C E001A05C AFB00028 */ sw $s0, 0x28($sp) -/* 32FE90 E001A060 AFA00010 */ sw $zero, 0x10($sp) -/* 32FE94 E001A064 AFA00024 */ sw $zero, 0x24($sp) -/* 32FE98 E001A068 0C080124 */ jal shim_create_effect_instance -/* 32FE9C E001A06C AFA20014 */ sw $v0, 0x14($sp) -/* 32FEA0 E001A070 24040048 */ addiu $a0, $zero, 0x48 -/* 32FEA4 E001A074 24030001 */ addiu $v1, $zero, 1 -/* 32FEA8 E001A078 0040802D */ daddu $s0, $v0, $zero -/* 32FEAC E001A07C 0C08012C */ jal shim_general_heap_malloc -/* 32FEB0 E001A080 AE030008 */ sw $v1, 8($s0) -/* 32FEB4 E001A084 AE02000C */ sw $v0, 0xc($s0) -/* 32FEB8 E001A088 0040802D */ daddu $s0, $v0, $zero -/* 32FEBC E001A08C 56000003 */ bnel $s0, $zero, .LE001A09C -/* 32FEC0 E001A090 AE110000 */ sw $s1, ($s0) -.LE001A094: -/* 32FEC4 E001A094 08006825 */ j .LE001A094 -/* 32FEC8 E001A098 00000000 */ nop -.LE001A09C: -/* 32FECC E001A09C 3C014120 */ lui $at, 0x4120 -/* 32FED0 E001A0A0 44813000 */ mtc1 $at, $f6 -/* 32FED4 E001A0A4 E6140004 */ swc1 $f20, 4($s0) -/* 32FED8 E001A0A8 E616000C */ swc1 $f22, 0xc($s0) -/* 32FEDC E001A0AC AE000010 */ sw $zero, 0x10($s0) -/* 32FEE0 E001A0B0 4606C000 */ add.s $f0, $f24, $f6 -/* 32FEE4 E001A0B4 AE000014 */ sw $zero, 0x14($s0) -/* 32FEE8 E001A0B8 AE000018 */ sw $zero, 0x18($s0) -/* 32FEEC E001A0BC 16200018 */ bnez $s1, .LE001A120 -/* 32FEF0 E001A0C0 E6000008 */ swc1 $f0, 8($s0) -/* 32FEF4 E001A0C4 3C013DF5 */ lui $at, 0x3df5 -/* 32FEF8 E001A0C8 3421C28F */ ori $at, $at, 0xc28f -/* 32FEFC E001A0CC 44810000 */ mtc1 $at, $f0 -/* 32FF00 E001A0D0 3C01BC79 */ lui $at, 0xbc79 -/* 32FF04 E001A0D4 3421096C */ ori $at, $at, 0x96c -/* 32FF08 E001A0D8 44811000 */ mtc1 $at, $f2 -/* 32FF0C E001A0DC 3C014040 */ lui $at, 0x4040 -/* 32FF10 E001A0E0 44812000 */ mtc1 $at, $f4 -/* 32FF14 E001A0E4 3C02E002 */ lui $v0, %hi(D_E001A610) -/* 32FF18 E001A0E8 8C42A610 */ lw $v0, %lo(D_E001A610)($v0) -/* 32FF1C E001A0EC AE000018 */ sw $zero, 0x18($s0) -/* 32FF20 E001A0F0 AE000024 */ sw $zero, 0x24($s0) -/* 32FF24 E001A0F4 AE000028 */ sw $zero, 0x28($s0) -/* 32FF28 E001A0F8 E600001C */ swc1 $f0, 0x1c($s0) -/* 32FF2C E001A0FC E6020020 */ swc1 $f2, 0x20($s0) -/* 32FF30 E001A100 10400004 */ beqz $v0, .LE001A114 -/* 32FF34 E001A104 E604002C */ swc1 $f4, 0x2c($s0) -/* 32FF38 E001A108 3C01C120 */ lui $at, 0xc120 -/* 32FF3C E001A10C 44813000 */ mtc1 $at, $f6 -/* 32FF40 E001A110 00000000 */ nop -.LE001A114: -/* 32FF44 E001A114 E6060030 */ swc1 $f6, 0x30($s0) -/* 32FF48 E001A118 08006876 */ j .LE001A1D8 -/* 32FF4C E001A11C AE120034 */ sw $s2, 0x34($s0) -.LE001A120: -/* 32FF50 E001A120 3C013DF5 */ lui $at, 0x3df5 -/* 32FF54 E001A124 3421C28F */ ori $at, $at, 0xc28f -/* 32FF58 E001A128 44810000 */ mtc1 $at, $f0 -/* 32FF5C E001A12C 3C01BC79 */ lui $at, 0xbc79 -/* 32FF60 E001A130 3421096C */ ori $at, $at, 0x96c -/* 32FF64 E001A134 44811000 */ mtc1 $at, $f2 -/* 32FF68 E001A138 24040001 */ addiu $a0, $zero, 1 -/* 32FF6C E001A13C E600001C */ swc1 $f0, 0x1c($s0) -/* 32FF70 E001A140 0C080138 */ jal shim_rand_int -/* 32FF74 E001A144 E6020020 */ swc1 $f2, 0x20($s0) -/* 32FF78 E001A148 24040168 */ addiu $a0, $zero, 0x168 -/* 32FF7C E001A14C 00021900 */ sll $v1, $v0, 4 -/* 32FF80 E001A150 00621823 */ subu $v1, $v1, $v0 -/* 32FF84 E001A154 00031840 */ sll $v1, $v1, 1 -/* 32FF88 E001A158 2463FFF1 */ addiu $v1, $v1, -0xf -/* 32FF8C E001A15C 44830000 */ mtc1 $v1, $f0 -/* 32FF90 E001A160 00000000 */ nop -/* 32FF94 E001A164 46800020 */ cvt.s.w $f0, $f0 -/* 32FF98 E001A168 0C080138 */ jal shim_rand_int -/* 32FF9C E001A16C E6000024 */ swc1 $f0, 0x24($s0) -/* 32FFA0 E001A170 24040001 */ addiu $a0, $zero, 1 -/* 32FFA4 E001A174 44820000 */ mtc1 $v0, $f0 -/* 32FFA8 E001A178 00000000 */ nop -/* 32FFAC E001A17C 46800020 */ cvt.s.w $f0, $f0 -/* 32FFB0 E001A180 E6000028 */ swc1 $f0, 0x28($s0) -/* 32FFB4 E001A184 0C080138 */ jal shim_rand_int -/* 32FFB8 E001A188 AE00002C */ sw $zero, 0x2c($s0) -/* 32FFBC E001A18C 2404000A */ addiu $a0, $zero, 0xa -/* 32FFC0 E001A190 000210C0 */ sll $v0, $v0, 3 -/* 32FFC4 E001A194 2442FFFC */ addiu $v0, $v0, -4 -/* 32FFC8 E001A198 44820000 */ mtc1 $v0, $f0 -/* 32FFCC E001A19C 00000000 */ nop -/* 32FFD0 E001A1A0 46800020 */ cvt.s.w $f0, $f0 -/* 32FFD4 E001A1A4 E6000030 */ swc1 $f0, 0x30($s0) -/* 32FFD8 E001A1A8 AE120034 */ sw $s2, 0x34($s0) -/* 32FFDC E001A1AC 0C080138 */ jal shim_rand_int -/* 32FFE0 E001A1B0 AE000038 */ sw $zero, 0x38($s0) -/* 32FFE4 E001A1B4 24040014 */ addiu $a0, $zero, 0x14 -/* 32FFE8 E001A1B8 0C080138 */ jal shim_rand_int -/* 32FFEC E001A1BC AE020044 */ sw $v0, 0x44($s0) -/* 32FFF0 E001A1C0 24040001 */ addiu $a0, $zero, 1 -/* 32FFF4 E001A1C4 0C080138 */ jal shim_rand_int -/* 32FFF8 E001A1C8 AE020040 */ sw $v0, 0x40($s0) -/* 32FFFC E001A1CC 00021040 */ sll $v0, $v0, 1 -/* 330000 E001A1D0 2442FFFF */ addiu $v0, $v0, -1 -/* 330004 E001A1D4 AE02003C */ sw $v0, 0x3c($s0) -.LE001A1D8: -/* 330008 E001A1D8 3C03E002 */ lui $v1, %hi(D_E001A610) -/* 33000C E001A1DC 2463A610 */ addiu $v1, $v1, %lo(D_E001A610) -/* 330010 E001A1E0 8C620000 */ lw $v0, ($v1) -/* 330014 E001A1E4 24420001 */ addiu $v0, $v0, 1 -/* 330018 E001A1E8 AC620000 */ sw $v0, ($v1) -/* 33001C E001A1EC 28420002 */ slti $v0, $v0, 2 -/* 330020 E001A1F0 50400001 */ beql $v0, $zero, .LE001A1F8 -/* 330024 E001A1F4 AC600000 */ sw $zero, ($v1) -.LE001A1F8: -/* 330028 E001A1F8 8FBF0034 */ lw $ra, 0x34($sp) -/* 33002C E001A1FC 8FB20030 */ lw $s2, 0x30($sp) -/* 330030 E001A200 8FB1002C */ lw $s1, 0x2c($sp) -/* 330034 E001A204 8FB00028 */ lw $s0, 0x28($sp) -/* 330038 E001A208 D7B80048 */ ldc1 $f24, 0x48($sp) -/* 33003C E001A20C D7B60040 */ ldc1 $f22, 0x40($sp) -/* 330040 E001A210 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 330044 E001A214 03E00008 */ jr $ra -/* 330048 E001A218 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/effects/effect_13/fx_13_update.s b/ver/us/asm/nonmatchings/effects/effect_13/fx_13_update.s deleted file mode 100644 index 4bf60362fa..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_13/fx_13_update.s +++ /dev/null @@ -1,130 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_13_update -/* 330054 E001A224 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 330058 E001A228 AFBF0010 */ sw $ra, 0x10($sp) -/* 33005C E001A22C 8C85000C */ lw $a1, 0xc($a0) -/* 330060 E001A230 8CA20034 */ lw $v0, 0x34($a1) -/* 330064 E001A234 8CA60000 */ lw $a2, ($a1) -/* 330068 E001A238 28420096 */ slti $v0, $v0, 0x96 -/* 33006C E001A23C 10400039 */ beqz $v0, .LE001A324 -/* 330070 E001A240 00000000 */ nop -/* 330074 E001A244 C4A00010 */ lwc1 $f0, 0x10($a1) -/* 330078 E001A248 3C01E002 */ lui $at, %hi(D_E001A620) -/* 33007C E001A24C D422A620 */ ldc1 $f2, %lo(D_E001A620)($at) -/* 330080 E001A250 C4A6000C */ lwc1 $f6, 0xc($a1) -/* 330084 E001A254 46000021 */ cvt.d.s $f0, $f0 -/* 330088 E001A258 46220001 */ sub.d $f0, $f0, $f2 -/* 33008C E001A25C C4A20018 */ lwc1 $f2, 0x18($a1) -/* 330090 E001A260 C4A40024 */ lwc1 $f4, 0x24($a1) -/* 330094 E001A264 46023180 */ add.s $f6, $f6, $f2 -/* 330098 E001A268 C4A2002C */ lwc1 $f2, 0x2c($a1) -/* 33009C E001A26C 46022100 */ add.s $f4, $f4, $f2 -/* 3300A0 E001A270 C4A20004 */ lwc1 $f2, 4($a1) -/* 3300A4 E001A274 46200020 */ cvt.s.d $f0, $f0 -/* 3300A8 E001A278 E4A00010 */ swc1 $f0, 0x10($a1) -/* 3300AC E001A27C 46001080 */ add.s $f2, $f2, $f0 -/* 3300B0 E001A280 E4A6000C */ swc1 $f6, 0xc($a1) -/* 3300B4 E001A284 E4A40024 */ swc1 $f4, 0x24($a1) -/* 3300B8 E001A288 14C00018 */ bnez $a2, .LE001A2EC -/* 3300BC E001A28C E4A20004 */ swc1 $f2, 4($a1) -/* 3300C0 E001A290 3C014120 */ lui $at, 0x4120 -/* 3300C4 E001A294 44811000 */ mtc1 $at, $f2 -/* 3300C8 E001A298 00000000 */ nop -/* 3300CC E001A29C 4602203C */ c.lt.s $f4, $f2 -/* 3300D0 E001A2A0 00000000 */ nop -/* 3300D4 E001A2A4 45000005 */ bc1f .LE001A2BC -/* 3300D8 E001A2A8 00000000 */ nop -/* 3300DC E001A2AC C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 3300E0 E001A2B0 E4A20024 */ swc1 $f2, 0x24($a1) -/* 3300E4 E001A2B4 46000007 */ neg.s $f0, $f0 -/* 3300E8 E001A2B8 E4A0002C */ swc1 $f0, 0x2c($a1) -.LE001A2BC: -/* 3300EC E001A2BC C4A00024 */ lwc1 $f0, 0x24($a1) -/* 3300F0 E001A2C0 3C014234 */ lui $at, 0x4234 -/* 3300F4 E001A2C4 44811000 */ mtc1 $at, $f2 -/* 3300F8 E001A2C8 00000000 */ nop -/* 3300FC E001A2CC 4600103C */ c.lt.s $f2, $f0 -/* 330100 E001A2D0 00000000 */ nop -/* 330104 E001A2D4 45000005 */ bc1f .LE001A2EC -/* 330108 E001A2D8 00000000 */ nop -/* 33010C E001A2DC C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 330110 E001A2E0 E4A20024 */ swc1 $f2, 0x24($a1) -/* 330114 E001A2E4 46000007 */ neg.s $f0, $f0 -/* 330118 E001A2E8 E4A0002C */ swc1 $f0, 0x2c($a1) -.LE001A2EC: -/* 33011C E001A2EC C4A00028 */ lwc1 $f0, 0x28($a1) -/* 330120 E001A2F0 C4A20030 */ lwc1 $f2, 0x30($a1) -/* 330124 E001A2F4 46020000 */ add.s $f0, $f0, $f2 -/* 330128 E001A2F8 14C00006 */ bnez $a2, .LE001A314 -/* 33012C E001A2FC E4A00028 */ swc1 $f0, 0x28($a1) -/* 330130 E001A300 3C013FB3 */ lui $at, 0x3fb3 -/* 330134 E001A304 34213333 */ ori $at, $at, 0x3333 -/* 330138 E001A308 44810000 */ mtc1 $at, $f0 -/* 33013C E001A30C 080068DC */ j .LE001A370 -/* 330140 E001A310 E4A00014 */ swc1 $f0, 0x14($a1) -.LE001A314: -/* 330144 E001A314 3C013F80 */ lui $at, 0x3f80 -/* 330148 E001A318 44810000 */ mtc1 $at, $f0 -/* 33014C E001A31C 080068DC */ j .LE001A370 -/* 330150 E001A320 E4A00014 */ swc1 $f0, 0x14($a1) -.LE001A324: -/* 330154 E001A324 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 330158 E001A328 3C01E002 */ lui $at, %hi(D_E001A628) -/* 33015C E001A32C D422A628 */ ldc1 $f2, %lo(D_E001A628)($at) -/* 330160 E001A330 46000021 */ cvt.d.s $f0, $f0 -/* 330164 E001A334 46220000 */ add.d $f0, $f0, $f2 -/* 330168 E001A338 C4A4001C */ lwc1 $f4, 0x1c($a1) -/* 33016C E001A33C 46200020 */ cvt.s.d $f0, $f0 -/* 330170 E001A340 46002100 */ add.s $f4, $f4, $f0 -/* 330174 E001A344 C4A20014 */ lwc1 $f2, 0x14($a1) -/* 330178 E001A348 3C013F80 */ lui $at, 0x3f80 -/* 33017C E001A34C 44813000 */ mtc1 $at, $f6 -/* 330180 E001A350 46041080 */ add.s $f2, $f2, $f4 -/* 330184 E001A354 E4A00020 */ swc1 $f0, 0x20($a1) -/* 330188 E001A358 E4A4001C */ swc1 $f4, 0x1c($a1) -/* 33018C E001A35C 4602303C */ c.lt.s $f6, $f2 -/* 330190 E001A360 00000000 */ nop -/* 330194 E001A364 45000002 */ bc1f .LE001A370 -/* 330198 E001A368 E4A20014 */ swc1 $f2, 0x14($a1) -/* 33019C E001A36C E4A60014 */ swc1 $f6, 0x14($a1) -.LE001A370: -/* 3301A0 E001A370 24020001 */ addiu $v0, $zero, 1 -/* 3301A4 E001A374 14C20010 */ bne $a2, $v0, .LE001A3B8 -/* 3301A8 E001A378 00000000 */ nop -/* 3301AC E001A37C 8CA20040 */ lw $v0, 0x40($a1) -/* 3301B0 E001A380 8CA3003C */ lw $v1, 0x3c($a1) -/* 3301B4 E001A384 00431821 */ addu $v1, $v0, $v1 -/* 3301B8 E001A388 28620014 */ slti $v0, $v1, 0x14 -/* 3301BC E001A38C 14400006 */ bnez $v0, .LE001A3A8 -/* 3301C0 E001A390 ACA30040 */ sw $v1, 0x40($a1) -/* 3301C4 E001A394 24020014 */ addiu $v0, $zero, 0x14 -/* 3301C8 E001A398 ACA20040 */ sw $v0, 0x40($a1) -/* 3301CC E001A39C 2402FFFF */ addiu $v0, $zero, -1 -/* 3301D0 E001A3A0 080068EE */ j .LE001A3B8 -/* 3301D4 E001A3A4 ACA2003C */ sw $v0, 0x3c($a1) -.LE001A3A8: -/* 3301D8 E001A3A8 1C600003 */ bgtz $v1, .LE001A3B8 -/* 3301DC E001A3AC 00000000 */ nop -/* 3301E0 E001A3B0 ACA00040 */ sw $zero, 0x40($a1) -/* 3301E4 E001A3B4 ACA6003C */ sw $a2, 0x3c($a1) -.LE001A3B8: -/* 3301E8 E001A3B8 C4A00008 */ lwc1 $f0, 8($a1) -/* 3301EC E001A3BC 8CA20034 */ lw $v0, 0x34($a1) -/* 3301F0 E001A3C0 C4A20014 */ lwc1 $f2, 0x14($a1) -/* 3301F4 E001A3C4 2442FFFF */ addiu $v0, $v0, -1 -/* 3301F8 E001A3C8 46020000 */ add.s $f0, $f0, $f2 -/* 3301FC E001A3CC ACA20034 */ sw $v0, 0x34($a1) -/* 330200 E001A3D0 8CA20038 */ lw $v0, 0x38($a1) -/* 330204 E001A3D4 8CA30034 */ lw $v1, 0x34($a1) -/* 330208 E001A3D8 24420001 */ addiu $v0, $v0, 1 -/* 33020C E001A3DC ACA20038 */ sw $v0, 0x38($a1) -/* 330210 E001A3E0 04610003 */ bgez $v1, .LE001A3F0 -/* 330214 E001A3E4 E4A00008 */ swc1 $f0, 8($a1) -/* 330218 E001A3E8 0C080128 */ jal shim_remove_effect -/* 33021C E001A3EC 00000000 */ nop -.LE001A3F0: -/* 330220 E001A3F0 8FBF0010 */ lw $ra, 0x10($sp) -/* 330224 E001A3F4 03E00008 */ jr $ra -/* 330228 E001A3F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/effects/effect_14/fx_14_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_appendGfx.s deleted file mode 100644 index 2bcc6e1790..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_14/fx_14_appendGfx.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_14_appendGfx -/* 330C1C E001C30C 27BDFE70 */ addiu $sp, $sp, -0x190 -/* 330C20 E001C310 0080302D */ daddu $a2, $a0, $zero -/* 330C24 E001C314 3C07DB06 */ lui $a3, 0xdb06 -/* 330C28 E001C318 34E70024 */ ori $a3, $a3, 0x24 -/* 330C2C E001C31C 27A40018 */ addiu $a0, $sp, 0x18 -/* 330C30 E001C320 AFB70174 */ sw $s7, 0x174($sp) -/* 330C34 E001C324 3C170001 */ lui $s7, 1 -/* 330C38 E001C328 AFB1015C */ sw $s1, 0x15c($sp) -/* 330C3C E001C32C 3C11800A */ lui $s1, %hi(gMasterGfxPos) -/* 330C40 E001C330 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) -/* 330C44 E001C334 AFBF017C */ sw $ra, 0x17c($sp) -/* 330C48 E001C338 AFBE0178 */ sw $fp, 0x178($sp) -/* 330C4C E001C33C AFB60170 */ sw $s6, 0x170($sp) -/* 330C50 E001C340 AFB5016C */ sw $s5, 0x16c($sp) -/* 330C54 E001C344 AFB40168 */ sw $s4, 0x168($sp) -/* 330C58 E001C348 AFB30164 */ sw $s3, 0x164($sp) -/* 330C5C E001C34C AFB20160 */ sw $s2, 0x160($sp) -/* 330C60 E001C350 AFB00158 */ sw $s0, 0x158($sp) -/* 330C64 E001C354 F7B60188 */ sdc1 $f22, 0x188($sp) -/* 330C68 E001C358 F7B40180 */ sdc1 $f20, 0x180($sp) -/* 330C6C E001C35C 8E230000 */ lw $v1, ($s1) -/* 330C70 E001C360 36F71630 */ ori $s7, $s7, 0x1630 -/* 330C74 E001C364 0060282D */ daddu $a1, $v1, $zero -/* 330C78 E001C368 24630008 */ addiu $v1, $v1, 8 -/* 330C7C E001C36C AE230000 */ sw $v1, ($s1) -/* 330C80 E001C370 8CD6000C */ lw $s6, 0xc($a2) -/* 330C84 E001C374 3C02E700 */ lui $v0, 0xe700 -/* 330C88 E001C378 ACA20000 */ sw $v0, ($a1) -/* 330C8C E001C37C ACA00004 */ sw $zero, 4($a1) -/* 330C90 E001C380 AC670000 */ sw $a3, ($v1) -/* 330C94 E001C384 8CC50010 */ lw $a1, 0x10($a2) -/* 330C98 E001C388 24620008 */ addiu $v0, $v1, 8 -/* 330C9C E001C38C AE220000 */ sw $v0, ($s1) -/* 330CA0 E001C390 3C020900 */ lui $v0, 0x900 -/* 330CA4 E001C394 24420900 */ addiu $v0, $v0, 0x900 -/* 330CA8 E001C398 8CA5001C */ lw $a1, 0x1c($a1) -/* 330CAC E001C39C 3C0ADE00 */ lui $t2, 0xde00 -/* 330CB0 E001C3A0 AC62000C */ sw $v0, 0xc($v1) -/* 330CB4 E001C3A4 3C028000 */ lui $v0, 0x8000 -/* 330CB8 E001C3A8 AC6A0008 */ sw $t2, 8($v1) -/* 330CBC E001C3AC 00A22821 */ addu $a1, $a1, $v0 -/* 330CC0 E001C3B0 AC650004 */ sw $a1, 4($v1) -/* 330CC4 E001C3B4 8EC50000 */ lw $a1, ($s6) -/* 330CC8 E001C3B8 8EC60004 */ lw $a2, 4($s6) -/* 330CCC E001C3BC 8EC70008 */ lw $a3, 8($s6) -/* 330CD0 E001C3C0 24630010 */ addiu $v1, $v1, 0x10 -/* 330CD4 E001C3C4 0C080108 */ jal shim_guTranslateF -/* 330CD8 E001C3C8 AE230000 */ sw $v1, ($s1) -/* 330CDC E001C3CC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* 330CE0 E001C3D0 4480A000 */ mtc1 $zero, $f20 -/* 330CE4 E001C3D4 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 330CE8 E001C3D8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 330CEC E001C3DC 3C013F80 */ lui $at, 0x3f80 -/* 330CF0 E001C3E0 4481B000 */ mtc1 $at, $f22 -/* 330CF4 E001C3E4 00031080 */ sll $v0, $v1, 2 -/* 330CF8 E001C3E8 00431021 */ addu $v0, $v0, $v1 -/* 330CFC E001C3EC 00021080 */ sll $v0, $v0, 2 -/* 330D00 E001C3F0 00431023 */ subu $v0, $v0, $v1 -/* 330D04 E001C3F4 000218C0 */ sll $v1, $v0, 3 -/* 330D08 E001C3F8 00431021 */ addu $v0, $v0, $v1 -/* 330D0C E001C3FC 000210C0 */ sll $v0, $v0, 3 -/* 330D10 E001C400 4406A000 */ mfc1 $a2, $f20 -/* 330D14 E001C404 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 330D18 E001C408 00220821 */ addu $at, $at, $v0 -/* 330D1C E001C40C C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* 330D20 E001C410 4407B000 */ mfc1 $a3, $f22 -/* 330D24 E001C414 46000007 */ neg.s $f0, $f0 -/* 330D28 E001C418 44050000 */ mfc1 $a1, $f0 -/* 330D2C E001C41C 0200202D */ daddu $a0, $s0, $zero -/* 330D30 E001C420 0C080104 */ jal shim_guRotateF -/* 330D34 E001C424 E7B40010 */ swc1 $f20, 0x10($sp) -/* 330D38 E001C428 0200202D */ daddu $a0, $s0, $zero -/* 330D3C E001C42C 27A50018 */ addiu $a1, $sp, 0x18 -/* 330D40 E001C430 27B40118 */ addiu $s4, $sp, 0x118 -/* 330D44 E001C434 0C080114 */ jal shim_guMtxCatF -/* 330D48 E001C438 0280302D */ daddu $a2, $s4, $zero -/* 330D4C E001C43C 0280202D */ daddu $a0, $s4, $zero -/* 330D50 E001C440 3C128007 */ lui $s2, %hi(gMatrixListPos) -/* 330D54 E001C444 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) -/* 330D58 E001C448 3C15800A */ lui $s5, %hi(gDisplayContext) -/* 330D5C E001C44C 26B5A674 */ addiu $s5, $s5, %lo(gDisplayContext) -/* 330D60 E001C450 96450000 */ lhu $a1, ($s2) -/* 330D64 E001C454 8EA20000 */ lw $v0, ($s5) -/* 330D68 E001C458 00052980 */ sll $a1, $a1, 6 -/* 330D6C E001C45C 00B72821 */ addu $a1, $a1, $s7 -/* 330D70 E001C460 0C080118 */ jal shim_guMtxF2L -/* 330D74 E001C464 00452821 */ addu $a1, $v0, $a1 -/* 330D78 E001C468 3C1EDA38 */ lui $fp, 0xda38 -/* 330D7C E001C46C 27B30058 */ addiu $s3, $sp, 0x58 -/* 330D80 E001C470 8E280000 */ lw $t0, ($s1) -/* 330D84 E001C474 4406B000 */ mfc1 $a2, $f22 -/* 330D88 E001C478 4407A000 */ mfc1 $a3, $f20 -/* 330D8C E001C47C 96490000 */ lhu $t1, ($s2) -/* 330D90 E001C480 0100202D */ daddu $a0, $t0, $zero -/* 330D94 E001C484 25080008 */ addiu $t0, $t0, 8 -/* 330D98 E001C488 3122FFFF */ andi $v0, $t1, 0xffff -/* 330D9C E001C48C 00021180 */ sll $v0, $v0, 6 -/* 330DA0 E001C490 00571021 */ addu $v0, $v0, $s7 -/* 330DA4 E001C494 AC9E0000 */ sw $fp, ($a0) -/* 330DA8 E001C498 8EA30000 */ lw $v1, ($s5) -/* 330DAC E001C49C 25290001 */ addiu $t1, $t1, 1 -/* 330DB0 E001C4A0 00621821 */ addu $v1, $v1, $v0 -/* 330DB4 E001C4A4 3C02FA00 */ lui $v0, 0xfa00 -/* 330DB8 E001C4A8 AC830004 */ sw $v1, 4($a0) -/* 330DBC E001C4AC AD020000 */ sw $v0, ($t0) -/* 330DC0 E001C4B0 240200FF */ addiu $v0, $zero, 0xff -/* 330DC4 E001C4B4 AD020004 */ sw $v0, 4($t0) -/* 330DC8 E001C4B8 E7B40010 */ swc1 $f20, 0x10($sp) -/* 330DCC E001C4BC 8EC50018 */ lw $a1, 0x18($s6) -/* 330DD0 E001C4C0 0260202D */ daddu $a0, $s3, $zero -/* 330DD4 E001C4C4 AE280000 */ sw $t0, ($s1) -/* 330DD8 E001C4C8 25080008 */ addiu $t0, $t0, 8 -/* 330DDC E001C4CC A6490000 */ sh $t1, ($s2) -/* 330DE0 E001C4D0 0C080104 */ jal shim_guRotateF -/* 330DE4 E001C4D4 AE280000 */ sw $t0, ($s1) -/* 330DE8 E001C4D8 27B00098 */ addiu $s0, $sp, 0x98 -/* 330DEC E001C4DC E7B40010 */ swc1 $f20, 0x10($sp) -/* 330DF0 E001C4E0 8EC5001C */ lw $a1, 0x1c($s6) -/* 330DF4 E001C4E4 4406A000 */ mfc1 $a2, $f20 -/* 330DF8 E001C4E8 4407B000 */ mfc1 $a3, $f22 -/* 330DFC E001C4EC 0C080104 */ jal shim_guRotateF -/* 330E00 E001C4F0 0200202D */ daddu $a0, $s0, $zero -/* 330E04 E001C4F4 0260202D */ daddu $a0, $s3, $zero -/* 330E08 E001C4F8 0200282D */ daddu $a1, $s0, $zero -/* 330E0C E001C4FC 0C080114 */ jal shim_guMtxCatF -/* 330E10 E001C500 0280302D */ daddu $a2, $s4, $zero -/* 330E14 E001C504 0280202D */ daddu $a0, $s4, $zero -/* 330E18 E001C508 96450000 */ lhu $a1, ($s2) -/* 330E1C E001C50C 8EA20000 */ lw $v0, ($s5) -/* 330E20 E001C510 00052980 */ sll $a1, $a1, 6 -/* 330E24 E001C514 00B72821 */ addu $a1, $a1, $s7 -/* 330E28 E001C518 0C080118 */ jal shim_guMtxF2L -/* 330E2C E001C51C 00452821 */ addu $a1, $v0, $a1 -/* 330E30 E001C520 3C06D838 */ lui $a2, 0xd838 -/* 330E34 E001C524 34C60002 */ ori $a2, $a2, 2 -/* 330E38 E001C528 8E240000 */ lw $a0, ($s1) -/* 330E3C E001C52C 96420000 */ lhu $v0, ($s2) -/* 330E40 E001C530 0080282D */ daddu $a1, $a0, $zero -/* 330E44 E001C534 24840008 */ addiu $a0, $a0, 8 -/* 330E48 E001C538 24430001 */ addiu $v1, $v0, 1 -/* 330E4C E001C53C 3042FFFF */ andi $v0, $v0, 0xffff -/* 330E50 E001C540 00021180 */ sll $v0, $v0, 6 -/* 330E54 E001C544 AE240000 */ sw $a0, ($s1) -/* 330E58 E001C548 ACBE0000 */ sw $fp, ($a1) -/* 330E5C E001C54C A6430000 */ sh $v1, ($s2) -/* 330E60 E001C550 8EA30000 */ lw $v1, ($s5) -/* 330E64 E001C554 00571021 */ addu $v0, $v0, $s7 -/* 330E68 E001C558 00621821 */ addu $v1, $v1, $v0 -/* 330E6C E001C55C 24820008 */ addiu $v0, $a0, 8 -/* 330E70 E001C560 ACA30004 */ sw $v1, 4($a1) -/* 330E74 E001C564 3C0ADE00 */ lui $t2, 0xde00 -/* 330E78 E001C568 AE220000 */ sw $v0, ($s1) -/* 330E7C E001C56C 3C020900 */ lui $v0, 0x900 -/* 330E80 E001C570 244209E8 */ addiu $v0, $v0, 0x9e8 -/* 330E84 E001C574 AC820004 */ sw $v0, 4($a0) -/* 330E88 E001C578 24820010 */ addiu $v0, $a0, 0x10 -/* 330E8C E001C57C 24030040 */ addiu $v1, $zero, 0x40 -/* 330E90 E001C580 AC8A0000 */ sw $t2, ($a0) -/* 330E94 E001C584 AE220000 */ sw $v0, ($s1) -/* 330E98 E001C588 24820018 */ addiu $v0, $a0, 0x18 -/* 330E9C E001C58C AC860008 */ sw $a2, 8($a0) -/* 330EA0 E001C590 AC83000C */ sw $v1, 0xc($a0) -/* 330EA4 E001C594 AE220000 */ sw $v0, ($s1) -/* 330EA8 E001C598 AC860010 */ sw $a2, 0x10($a0) -/* 330EAC E001C59C AC830014 */ sw $v1, 0x14($a0) -/* 330EB0 E001C5A0 8FBF017C */ lw $ra, 0x17c($sp) -/* 330EB4 E001C5A4 8FBE0178 */ lw $fp, 0x178($sp) -/* 330EB8 E001C5A8 8FB70174 */ lw $s7, 0x174($sp) -/* 330EBC E001C5AC 8FB60170 */ lw $s6, 0x170($sp) -/* 330EC0 E001C5B0 8FB5016C */ lw $s5, 0x16c($sp) -/* 330EC4 E001C5B4 8FB40168 */ lw $s4, 0x168($sp) -/* 330EC8 E001C5B8 8FB30164 */ lw $s3, 0x164($sp) -/* 330ECC E001C5BC 8FB20160 */ lw $s2, 0x160($sp) -/* 330ED0 E001C5C0 8FB1015C */ lw $s1, 0x15c($sp) -/* 330ED4 E001C5C4 8FB00158 */ lw $s0, 0x158($sp) -/* 330ED8 E001C5C8 D7B60188 */ ldc1 $f22, 0x188($sp) -/* 330EDC E001C5CC D7B40180 */ ldc1 $f20, 0x180($sp) -/* 330EE0 E001C5D0 03E00008 */ jr $ra -/* 330EE4 E001C5D4 27BD0190 */ addiu $sp, $sp, 0x190 -/* 330EE8 E001C5D8 00000000 */ nop -/* 330EEC E001C5DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/effect_14/fx_14_main.s b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_main.s deleted file mode 100644 index f3abcbaf06..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_14/fx_14_main.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_14_main -/* 330910 E001C000 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 330914 E001C004 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 330918 E001C008 46006506 */ mov.s $f20, $f12 -/* 33091C E001C00C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 330920 E001C010 46007586 */ mov.s $f22, $f14 -/* 330924 E001C014 AFB1002C */ sw $s1, 0x2c($sp) -/* 330928 E001C018 00E0882D */ daddu $s1, $a3, $zero -/* 33092C E001C01C 27A40010 */ addiu $a0, $sp, 0x10 -/* 330930 E001C020 F7B80048 */ sdc1 $f24, 0x48($sp) -/* 330934 E001C024 4486C000 */ mtc1 $a2, $f24 -/* 330938 E001C028 3C02E002 */ lui $v0, %hi(fx_14_init) -/* 33093C E001C02C 2442C120 */ addiu $v0, $v0, %lo(fx_14_init) -/* 330940 E001C030 AFA20018 */ sw $v0, 0x18($sp) -/* 330944 E001C034 3C02E002 */ lui $v0, %hi(fx_14_update) -/* 330948 E001C038 2442C128 */ addiu $v0, $v0, %lo(fx_14_update) -/* 33094C E001C03C AFA2001C */ sw $v0, 0x1c($sp) -/* 330950 E001C040 3C02E002 */ lui $v0, %hi(fx_14_render) -/* 330954 E001C044 2442C200 */ addiu $v0, $v0, %lo(fx_14_render) -/* 330958 E001C048 AFA20020 */ sw $v0, 0x20($sp) -/* 33095C E001C04C 2402000E */ addiu $v0, $zero, 0xe -/* 330960 E001C050 AFBF0030 */ sw $ra, 0x30($sp) -/* 330964 E001C054 AFB00028 */ sw $s0, 0x28($sp) -/* 330968 E001C058 AFA00010 */ sw $zero, 0x10($sp) -/* 33096C E001C05C AFA00024 */ sw $zero, 0x24($sp) -/* 330970 E001C060 0C080124 */ jal shim_create_effect_instance -/* 330974 E001C064 AFA20014 */ sw $v0, 0x14($sp) -/* 330978 E001C068 2404002C */ addiu $a0, $zero, 0x2c -/* 33097C E001C06C 24030001 */ addiu $v1, $zero, 1 -/* 330980 E001C070 0040802D */ daddu $s0, $v0, $zero -/* 330984 E001C074 0C08012C */ jal shim_general_heap_malloc -/* 330988 E001C078 AE030008 */ sw $v1, 8($s0) -/* 33098C E001C07C 14400003 */ bnez $v0, .LE001C08C -/* 330990 E001C080 AE02000C */ sw $v0, 0xc($s0) -.LE001C084: -/* 330994 E001C084 08007021 */ j .LE001C084 -/* 330998 E001C088 00000000 */ nop -.LE001C08C: -/* 33099C E001C08C 3C04E002 */ lui $a0, %hi(D_E001C5E0) -/* 3309A0 E001C090 2484C5E0 */ addiu $a0, $a0, %lo(D_E001C5E0) -/* 3309A4 E001C094 3C014120 */ lui $at, 0x4120 -/* 3309A8 E001C098 44812000 */ mtc1 $at, $f4 -/* 3309AC E001C09C 3C01C040 */ lui $at, 0xc040 -/* 3309B0 E001C0A0 44810000 */ mtc1 $at, $f0 -/* 3309B4 E001C0A4 3C014040 */ lui $at, 0x4040 -/* 3309B8 E001C0A8 44811000 */ mtc1 $at, $f2 -/* 3309BC E001C0AC 8C830000 */ lw $v1, ($a0) -/* 3309C0 E001C0B0 E4540000 */ swc1 $f20, ($v0) -/* 3309C4 E001C0B4 E4560004 */ swc1 $f22, 4($v0) -/* 3309C8 E001C0B8 E4580008 */ swc1 $f24, 8($v0) -/* 3309CC E001C0BC AC40000C */ sw $zero, 0xc($v0) -/* 3309D0 E001C0C0 AC400014 */ sw $zero, 0x14($v0) -/* 3309D4 E001C0C4 AC400018 */ sw $zero, 0x18($v0) -/* 3309D8 E001C0C8 AC40001C */ sw $zero, 0x1c($v0) -/* 3309DC E001C0CC E4400010 */ swc1 $f0, 0x10($v0) -/* 3309E0 E001C0D0 10600004 */ beqz $v1, .LE001C0E4 -/* 3309E4 E001C0D4 E4420020 */ swc1 $f2, 0x20($v0) -/* 3309E8 E001C0D8 3C01C120 */ lui $at, 0xc120 -/* 3309EC E001C0DC 44812000 */ mtc1 $at, $f4 -/* 3309F0 E001C0E0 00000000 */ nop -.LE001C0E4: -/* 3309F4 E001C0E4 E4440024 */ swc1 $f4, 0x24($v0) -/* 3309F8 E001C0E8 AC510028 */ sw $s1, 0x28($v0) -/* 3309FC E001C0EC 24620001 */ addiu $v0, $v1, 1 -/* 330A00 E001C0F0 AC820000 */ sw $v0, ($a0) -/* 330A04 E001C0F4 28420002 */ slti $v0, $v0, 2 -/* 330A08 E001C0F8 50400001 */ beql $v0, $zero, .LE001C100 -/* 330A0C E001C0FC AC800000 */ sw $zero, ($a0) -.LE001C100: -/* 330A10 E001C100 8FBF0030 */ lw $ra, 0x30($sp) -/* 330A14 E001C104 8FB1002C */ lw $s1, 0x2c($sp) -/* 330A18 E001C108 8FB00028 */ lw $s0, 0x28($sp) -/* 330A1C E001C10C D7B80048 */ ldc1 $f24, 0x48($sp) -/* 330A20 E001C110 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 330A24 E001C114 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 330A28 E001C118 03E00008 */ jr $ra -/* 330A2C E001C11C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/effects/effect_14/fx_14_update.s b/ver/us/asm/nonmatchings/effects/effect_14/fx_14_update.s deleted file mode 100644 index 83b7a1c1fd..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_14/fx_14_update.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_14_update -/* 330A38 E001C128 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 330A3C E001C12C AFBF0010 */ sw $ra, 0x10($sp) -/* 330A40 E001C130 8C83000C */ lw $v1, 0xc($a0) -/* 330A44 E001C134 8C620028 */ lw $v0, 0x28($v1) -/* 330A48 E001C138 2442FFFF */ addiu $v0, $v0, -1 -/* 330A4C E001C13C 04410005 */ bgez $v0, .LE001C154 -/* 330A50 E001C140 AC620028 */ sw $v0, 0x28($v1) -/* 330A54 E001C144 0C080128 */ jal shim_remove_effect -/* 330A58 E001C148 00000000 */ nop -/* 330A5C E001C14C 0800707D */ j .LE001C1F4 -/* 330A60 E001C150 00000000 */ nop -.LE001C154: -/* 330A64 E001C154 C4680000 */ lwc1 $f8, ($v1) -/* 330A68 E001C158 C460000C */ lwc1 $f0, 0xc($v1) -/* 330A6C E001C15C C4660004 */ lwc1 $f6, 4($v1) -/* 330A70 E001C160 46004200 */ add.s $f8, $f8, $f0 -/* 330A74 E001C164 C4600010 */ lwc1 $f0, 0x10($v1) -/* 330A78 E001C168 C4640018 */ lwc1 $f4, 0x18($v1) -/* 330A7C E001C16C 46003180 */ add.s $f6, $f6, $f0 -/* 330A80 E001C170 C4600020 */ lwc1 $f0, 0x20($v1) -/* 330A84 E001C174 C4620014 */ lwc1 $f2, 0x14($v1) -/* 330A88 E001C178 46002100 */ add.s $f4, $f4, $f0 -/* 330A8C E001C17C C4600008 */ lwc1 $f0, 8($v1) -/* 330A90 E001C180 3C014120 */ lui $at, 0x4120 -/* 330A94 E001C184 44815000 */ mtc1 $at, $f10 -/* 330A98 E001C188 46020000 */ add.s $f0, $f0, $f2 -/* 330A9C E001C18C E4680000 */ swc1 $f8, ($v1) -/* 330AA0 E001C190 E4660004 */ swc1 $f6, 4($v1) -/* 330AA4 E001C194 460A203C */ c.lt.s $f4, $f10 -/* 330AA8 E001C198 E4640018 */ swc1 $f4, 0x18($v1) -/* 330AAC E001C19C 45000005 */ bc1f .LE001C1B4 -/* 330AB0 E001C1A0 E4600008 */ swc1 $f0, 8($v1) -/* 330AB4 E001C1A4 C4600020 */ lwc1 $f0, 0x20($v1) -/* 330AB8 E001C1A8 E46A0018 */ swc1 $f10, 0x18($v1) -/* 330ABC E001C1AC 46000007 */ neg.s $f0, $f0 -/* 330AC0 E001C1B0 E4600020 */ swc1 $f0, 0x20($v1) -.LE001C1B4: -/* 330AC4 E001C1B4 C4600018 */ lwc1 $f0, 0x18($v1) -/* 330AC8 E001C1B8 3C014234 */ lui $at, 0x4234 -/* 330ACC E001C1BC 44811000 */ mtc1 $at, $f2 -/* 330AD0 E001C1C0 00000000 */ nop -/* 330AD4 E001C1C4 4600103C */ c.lt.s $f2, $f0 -/* 330AD8 E001C1C8 00000000 */ nop -/* 330ADC E001C1CC 45000005 */ bc1f .LE001C1E4 -/* 330AE0 E001C1D0 00000000 */ nop -/* 330AE4 E001C1D4 C4600020 */ lwc1 $f0, 0x20($v1) -/* 330AE8 E001C1D8 E4620018 */ swc1 $f2, 0x18($v1) -/* 330AEC E001C1DC 46000007 */ neg.s $f0, $f0 -/* 330AF0 E001C1E0 E4600020 */ swc1 $f0, 0x20($v1) -.LE001C1E4: -/* 330AF4 E001C1E4 C460001C */ lwc1 $f0, 0x1c($v1) -/* 330AF8 E001C1E8 C4620024 */ lwc1 $f2, 0x24($v1) -/* 330AFC E001C1EC 46020000 */ add.s $f0, $f0, $f2 -/* 330B00 E001C1F0 E460001C */ swc1 $f0, 0x1c($v1) -.LE001C1F4: -/* 330B04 E001C1F4 8FBF0010 */ lw $ra, 0x10($sp) -/* 330B08 E001C1F8 03E00008 */ jr $ra -/* 330B0C E001C1FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/effects/effect_15/fx_15_main.s b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_main.s deleted file mode 100644 index 70e1f6521f..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_15/fx_15_main.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_15_main -/* 331940 E001E000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 331944 E001E004 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 331948 E001E008 4485A000 */ mtc1 $a1, $f20 -/* 33194C E001E00C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 331950 E001E010 4486B000 */ mtc1 $a2, $f22 -/* 331954 E001E014 AFB00028 */ sw $s0, 0x28($sp) -/* 331958 E001E018 0080802D */ daddu $s0, $a0, $zero -/* 33195C E001E01C F7BA0050 */ sdc1 $f26, 0x50($sp) -/* 331960 E001E020 4487D000 */ mtc1 $a3, $f26 -/* 331964 E001E024 27A40010 */ addiu $a0, $sp, 0x10 -/* 331968 E001E028 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* 33196C E001E02C C7BE0084 */ lwc1 $f30, 0x84($sp) -/* 331970 E001E030 3C02E002 */ lui $v0, %hi(fx_15_init) -/* 331974 E001E034 2442E370 */ addiu $v0, $v0, %lo(fx_15_init) -/* 331978 E001E038 AFA20018 */ sw $v0, 0x18($sp) -/* 33197C E001E03C 3C02E002 */ lui $v0, %hi(fx_15_update) -/* 331980 E001E040 2442E378 */ addiu $v0, $v0, %lo(fx_15_update) -/* 331984 E001E044 AFA2001C */ sw $v0, 0x1c($sp) -/* 331988 E001E048 3C02E002 */ lui $v0, %hi(fx_15_render) -/* 33198C E001E04C 2442E6E8 */ addiu $v0, $v0, %lo(fx_15_render) -/* 331990 E001E050 AFA20020 */ sw $v0, 0x20($sp) -/* 331994 E001E054 2402000F */ addiu $v0, $zero, 0xf -/* 331998 E001E058 AFBF0034 */ sw $ra, 0x34($sp) -/* 33199C E001E05C AFB20030 */ sw $s2, 0x30($sp) -/* 3319A0 E001E060 AFB1002C */ sw $s1, 0x2c($sp) -/* 3319A4 E001E064 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* 3319A8 E001E068 F7B80048 */ sdc1 $f24, 0x48($sp) -/* 3319AC E001E06C AFA00010 */ sw $zero, 0x10($sp) -/* 3319B0 E001E070 AFA00024 */ sw $zero, 0x24($sp) -/* 3319B4 E001E074 0C080124 */ jal shim_create_effect_instance -/* 3319B8 E001E078 AFA20014 */ sw $v0, 0x14($sp) -/* 3319BC E001E07C 24040250 */ addiu $a0, $zero, 0x250 -/* 3319C0 E001E080 24030001 */ addiu $v1, $zero, 1 -/* 3319C4 E001E084 0040902D */ daddu $s2, $v0, $zero -/* 3319C8 E001E088 0C08012C */ jal shim_general_heap_malloc -/* 3319CC E001E08C AE430008 */ sw $v1, 8($s2) -/* 3319D0 E001E090 0040882D */ daddu $s1, $v0, $zero -/* 3319D4 E001E094 16200003 */ bnez $s1, .LE001E0A4 -/* 3319D8 E001E098 AE42000C */ sw $v0, 0xc($s2) -.LE001E09C: -/* 3319DC E001E09C 08007827 */ j .LE001E09C -/* 3319E0 E001E0A0 00000000 */ nop -.LE001E0A4: -/* 3319E4 E001E0A4 24020001 */ addiu $v0, $zero, 1 -/* 3319E8 E001E0A8 AE220000 */ sw $v0, ($s1) -/* 3319EC E001E0AC 24020003 */ addiu $v0, $zero, 3 -/* 3319F0 E001E0B0 E6340004 */ swc1 $f20, 4($s1) -/* 3319F4 E001E0B4 E6360008 */ swc1 $f22, 8($s1) -/* 3319F8 E001E0B8 E63A000C */ swc1 $f26, 0xc($s1) -/* 3319FC E001E0BC AE20001C */ sw $zero, 0x1c($s1) -/* 331A00 E001E0C0 AE200024 */ sw $zero, 0x24($s1) -/* 331A04 E001E0C4 AE200028 */ sw $zero, 0x28($s1) -/* 331A08 E001E0C8 16020011 */ bne $s0, $v0, .LE001E110 -/* 331A0C E001E0CC AE300038 */ sw $s0, 0x38($s1) -/* 331A10 E001E0D0 3C013E4C */ lui $at, 0x3e4c -/* 331A14 E001E0D4 3421CCCD */ ori $at, $at, 0xcccd -/* 331A18 E001E0D8 44810000 */ mtc1 $at, $f0 -/* 331A1C E001E0DC 240400FF */ addiu $a0, $zero, 0xff -/* 331A20 E001E0E0 0C080138 */ jal shim_rand_int -/* 331A24 E001E0E4 E6200240 */ swc1 $f0, 0x240($s1) -/* 331A28 E001E0E8 241000FF */ addiu $s0, $zero, 0xff -/* 331A2C E001E0EC 02022023 */ subu $a0, $s0, $v0 -/* 331A30 E001E0F0 0C080138 */ jal shim_rand_int -/* 331A34 E001E0F4 AE220244 */ sw $v0, 0x244($s1) -/* 331A38 E001E0F8 8E230244 */ lw $v1, 0x244($s1) -/* 331A3C E001E0FC 02028023 */ subu $s0, $s0, $v0 -/* 331A40 E001E100 AE220248 */ sw $v0, 0x248($s1) -/* 331A44 E001E104 02038023 */ subu $s0, $s0, $v1 -/* 331A48 E001E108 0800784D */ j .LE001E134 -/* 331A4C E001E10C AE30024C */ sw $s0, 0x24c($s1) -.LE001E110: -/* 331A50 E001E110 3C013F00 */ lui $at, 0x3f00 -/* 331A54 E001E114 44810000 */ mtc1 $at, $f0 -/* 331A58 E001E118 240200D2 */ addiu $v0, $zero, 0xd2 -/* 331A5C E001E11C AE220244 */ sw $v0, 0x244($s1) -/* 331A60 E001E120 240200BA */ addiu $v0, $zero, 0xba -/* 331A64 E001E124 AE220248 */ sw $v0, 0x248($s1) -/* 331A68 E001E128 2402005A */ addiu $v0, $zero, 0x5a -/* 331A6C E001E12C AE22024C */ sw $v0, 0x24c($s1) -/* 331A70 E001E130 E6200240 */ swc1 $f0, 0x240($s1) -.LE001E134: -/* 331A74 E001E134 C7A00078 */ lwc1 $f0, 0x78($sp) -/* 331A78 E001E138 46140601 */ sub.s $f24, $f0, $f20 -/* 331A7C E001E13C 4618C082 */ mul.s $f2, $f24, $f24 -/* 331A80 E001E140 00000000 */ nop -/* 331A84 E001E144 C7A0007C */ lwc1 $f0, 0x7c($sp) -/* 331A88 E001E148 46160581 */ sub.s $f22, $f0, $f22 -/* 331A8C E001E14C 4616B102 */ mul.s $f4, $f22, $f22 -/* 331A90 E001E150 00000000 */ nop -/* 331A94 E001E154 C7A00080 */ lwc1 $f0, 0x80($sp) -/* 331A98 E001E158 461A0501 */ sub.s $f20, $f0, $f26 -/* 331A9C E001E15C 4614A002 */ mul.s $f0, $f20, $f20 -/* 331AA0 E001E160 00000000 */ nop -/* 331AA4 E001E164 46041080 */ add.s $f2, $f2, $f4 -/* 331AA8 E001E168 46001680 */ add.s $f26, $f2, $f0 -/* 331AAC E001E16C 4480E000 */ mtc1 $zero, $f28 -/* 331AB0 E001E170 00000000 */ nop -/* 331AB4 E001E174 461CD032 */ c.eq.s $f26, $f28 -/* 331AB8 E001E178 00000000 */ nop -/* 331ABC E001E17C 45010005 */ bc1t .LE001E194 -/* 331AC0 E001E180 4600D106 */ mov.s $f4, $f26 -/* 331AC4 E001E184 0C080154 */ jal shim_sqrtf -/* 331AC8 E001E188 4600D306 */ mov.s $f12, $f26 -/* 331ACC E001E18C 46000686 */ mov.s $f26, $f0 -/* 331AD0 E001E190 461AF103 */ div.s $f4, $f30, $f26 -.LE001E194: -/* 331AD4 E001E194 4604C002 */ mul.s $f0, $f24, $f4 -/* 331AD8 E001E198 00000000 */ nop -/* 331ADC E001E19C 4604B082 */ mul.s $f2, $f22, $f4 -/* 331AE0 E001E1A0 00000000 */ nop -/* 331AE4 E001E1A4 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 331AE8 E001E1A8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 331AEC E001E1AC 4604A102 */ mul.s $f4, $f20, $f4 -/* 331AF0 E001E1B0 00000000 */ nop -/* 331AF4 E001E1B4 00031080 */ sll $v0, $v1, 2 -/* 331AF8 E001E1B8 00431021 */ addu $v0, $v0, $v1 -/* 331AFC E001E1BC 00021080 */ sll $v0, $v0, 2 -/* 331B00 E001E1C0 00431023 */ subu $v0, $v0, $v1 -/* 331B04 E001E1C4 000218C0 */ sll $v1, $v0, 3 -/* 331B08 E001E1C8 00431021 */ addu $v0, $v0, $v1 -/* 331B0C E001E1CC 000210C0 */ sll $v0, $v0, 3 -/* 331B10 E001E1D0 E6200010 */ swc1 $f0, 0x10($s1) -/* 331B14 E001E1D4 E6220014 */ swc1 $f2, 0x14($s1) -/* 331B18 E001E1D8 E6240018 */ swc1 $f4, 0x18($s1) -/* 331B1C E001E1DC 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 331B20 E001E1E0 00220821 */ addu $at, $at, $v0 -/* 331B24 E001E1E4 C4341DEC */ lwc1 $f20, %lo(gCameras+0x6C)($at) -/* 331B28 E001E1E8 0C080144 */ jal shim_cos_deg -/* 331B2C E001E1EC 4600A306 */ mov.s $f12, $f20 -/* 331B30 E001E1F0 4600A306 */ mov.s $f12, $f20 -/* 331B34 E001E1F4 0C080140 */ jal shim_sin_deg -/* 331B38 E001E1F8 46000587 */ neg.s $f22, $f0 -/* 331B3C E001E1FC C6240010 */ lwc1 $f4, 0x10($s1) -/* 331B40 E001E200 4604B102 */ mul.s $f4, $f22, $f4 -/* 331B44 E001E204 00000000 */ nop -/* 331B48 E001E208 C6220018 */ lwc1 $f2, 0x18($s1) -/* 331B4C E001E20C 46000507 */ neg.s $f20, $f0 -/* 331B50 E001E210 4602A082 */ mul.s $f2, $f20, $f2 -/* 331B54 E001E214 00000000 */ nop -/* 331B58 E001E218 46042102 */ mul.s $f4, $f4, $f4 -/* 331B5C E001E21C 00000000 */ nop -/* 331B60 E001E220 46021082 */ mul.s $f2, $f2, $f2 -/* 331B64 E001E224 00000000 */ nop -/* 331B68 E001E228 46022300 */ add.s $f12, $f4, $f2 -/* 331B6C E001E22C 461C6032 */ c.eq.s $f12, $f28 -/* 331B70 E001E230 00000000 */ nop -/* 331B74 E001E234 45010004 */ bc1t .LE001E248 -/* 331B78 E001E238 00000000 */ nop -/* 331B7C E001E23C 0C080154 */ jal shim_sqrtf -/* 331B80 E001E240 00000000 */ nop -/* 331B84 E001E244 46000306 */ mov.s $f12, $f0 -.LE001E248: -/* 331B88 E001E248 C6220010 */ lwc1 $f2, 0x10($s1) -/* 331B8C E001E24C 4602B082 */ mul.s $f2, $f22, $f2 -/* 331B90 E001E250 00000000 */ nop -/* 331B94 E001E254 C6200018 */ lwc1 $f0, 0x18($s1) -/* 331B98 E001E258 4600A002 */ mul.s $f0, $f20, $f0 -/* 331B9C E001E25C 00000000 */ nop -/* 331BA0 E001E260 46001080 */ add.s $f2, $f2, $f0 -/* 331BA4 E001E264 461C103C */ c.lt.s $f2, $f28 -/* 331BA8 E001E268 00000000 */ nop -/* 331BAC E001E26C 45000005 */ bc1f .LE001E284 -/* 331BB0 E001E270 00000000 */ nop -/* 331BB4 E001E274 3C01C1A0 */ lui $at, 0xc1a0 -/* 331BB8 E001E278 44810000 */ mtc1 $at, $f0 -/* 331BBC E001E27C 080078A4 */ j .LE001E290 -/* 331BC0 E001E280 46006307 */ neg.s $f12, $f12 -.LE001E284: -/* 331BC4 E001E284 3C0141A0 */ lui $at, 0x41a0 -/* 331BC8 E001E288 44810000 */ mtc1 $at, $f0 -/* 331BCC E001E28C 00000000 */ nop -.LE001E290: -/* 331BD0 E001E290 E620002C */ swc1 $f0, 0x2c($s1) -/* 331BD4 E001E294 46006507 */ neg.s $f20, $f12 -/* 331BD8 E001E298 4407A000 */ mfc1 $a3, $f20 -/* 331BDC E001E29C C6200014 */ lwc1 $f0, 0x14($s1) -/* 331BE0 E001E2A0 44806000 */ mtc1 $zero, $f12 -/* 331BE4 E001E2A4 46000007 */ neg.s $f0, $f0 -/* 331BE8 E001E2A8 44060000 */ mfc1 $a2, $f0 -/* 331BEC E001E2AC 0C080148 */ jal shim_atan2 -/* 331BF0 E001E2B0 46006386 */ mov.s $f14, $f12 -/* 331BF4 E001E2B4 461ED083 */ div.s $f2, $f26, $f30 -/* 331BF8 E001E2B8 4600118D */ trunc.w.s $f6, $f2 -/* 331BFC E001E2BC E6260030 */ swc1 $f6, 0x30($s1) -/* 331C00 E001E2C0 26300040 */ addiu $s0, $s1, 0x40 -/* 331C04 E001E2C4 8E260008 */ lw $a2, 8($s1) -/* 331C08 E001E2C8 8E27000C */ lw $a3, 0xc($s1) -/* 331C0C E001E2CC 8E250004 */ lw $a1, 4($s1) -/* 331C10 E001E2D0 0200202D */ daddu $a0, $s0, $zero -/* 331C14 E001E2D4 E6200024 */ swc1 $f0, 0x24($s1) -/* 331C18 E001E2D8 E6200020 */ swc1 $f0, 0x20($s1) -/* 331C1C E001E2DC 0C08010C */ jal shim_guTranslate -/* 331C20 E001E2E0 E6340034 */ swc1 $f20, 0x34($s1) -/* 331C24 E001E2E4 24050001 */ addiu $a1, $zero, 1 -/* 331C28 E001E2E8 26260080 */ addiu $a2, $s1, 0x80 -/* 331C2C E001E2EC 0200202D */ daddu $a0, $s0, $zero -.LE001E2F0: -/* 331C30 E001E2F0 24830040 */ addiu $v1, $a0, 0x40 -/* 331C34 E001E2F4 0200102D */ daddu $v0, $s0, $zero -.LE001E2F8: -/* 331C38 E001E2F8 8C490000 */ lw $t1, ($v0) -/* 331C3C E001E2FC 8C4A0004 */ lw $t2, 4($v0) -/* 331C40 E001E300 8C4B0008 */ lw $t3, 8($v0) -/* 331C44 E001E304 8C48000C */ lw $t0, 0xc($v0) -/* 331C48 E001E308 AC690000 */ sw $t1, ($v1) -/* 331C4C E001E30C AC6A0004 */ sw $t2, 4($v1) -/* 331C50 E001E310 AC6B0008 */ sw $t3, 8($v1) -/* 331C54 E001E314 AC68000C */ sw $t0, 0xc($v1) -/* 331C58 E001E318 24420010 */ addiu $v0, $v0, 0x10 -/* 331C5C E001E31C 1446FFF6 */ bne $v0, $a2, .LE001E2F8 -/* 331C60 E001E320 24630010 */ addiu $v1, $v1, 0x10 -/* 331C64 E001E324 24A50001 */ addiu $a1, $a1, 1 -/* 331C68 E001E328 28A20008 */ slti $v0, $a1, 8 -/* 331C6C E001E32C 1440FFF0 */ bnez $v0, .LE001E2F0 -/* 331C70 E001E330 24840040 */ addiu $a0, $a0, 0x40 -/* 331C74 E001E334 2402FFFF */ addiu $v0, $zero, -1 -/* 331C78 E001E338 AE22003C */ sw $v0, 0x3c($s1) -/* 331C7C E001E33C 0240102D */ daddu $v0, $s2, $zero -/* 331C80 E001E340 8FBF0034 */ lw $ra, 0x34($sp) -/* 331C84 E001E344 8FB20030 */ lw $s2, 0x30($sp) -/* 331C88 E001E348 8FB1002C */ lw $s1, 0x2c($sp) -/* 331C8C E001E34C 8FB00028 */ lw $s0, 0x28($sp) -/* 331C90 E001E350 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* 331C94 E001E354 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* 331C98 E001E358 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* 331C9C E001E35C D7B80048 */ ldc1 $f24, 0x48($sp) -/* 331CA0 E001E360 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 331CA4 E001E364 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 331CA8 E001E368 03E00008 */ jr $ra -/* 331CAC E001E36C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/effects/effect_15/fx_15_update.s b/ver/us/asm/nonmatchings/effects/effect_15/fx_15_update.s deleted file mode 100644 index 529fc73211..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_15/fx_15_update.s +++ /dev/null @@ -1,230 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_15_update -/* 331CB8 E001E378 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 331CBC E001E37C AFB1002C */ sw $s1, 0x2c($sp) -/* 331CC0 E001E380 0080882D */ daddu $s1, $a0, $zero -/* 331CC4 E001E384 AFBF0030 */ sw $ra, 0x30($sp) -/* 331CC8 E001E388 AFB00028 */ sw $s0, 0x28($sp) -/* 331CCC E001E38C F7B40038 */ sdc1 $f20, 0x38($sp) -/* 331CD0 E001E390 8E30000C */ lw $s0, 0xc($s1) -/* 331CD4 E001E394 8E020038 */ lw $v0, 0x38($s0) -/* 331CD8 E001E398 28420002 */ slti $v0, $v0, 2 -/* 331CDC E001E39C 144000AF */ bnez $v0, .LE001E65C -/* 331CE0 E001E3A0 00000000 */ nop -/* 331CE4 E001E3A4 C6040010 */ lwc1 $f4, 0x10($s0) -/* 331CE8 E001E3A8 46042102 */ mul.s $f4, $f4, $f4 -/* 331CEC E001E3AC 00000000 */ nop -/* 331CF0 E001E3B0 C6020014 */ lwc1 $f2, 0x14($s0) -/* 331CF4 E001E3B4 46021082 */ mul.s $f2, $f2, $f2 -/* 331CF8 E001E3B8 00000000 */ nop -/* 331CFC E001E3BC C6000018 */ lwc1 $f0, 0x18($s0) -/* 331D00 E001E3C0 46000002 */ mul.s $f0, $f0, $f0 -/* 331D04 E001E3C4 00000000 */ nop -/* 331D08 E001E3C8 46022100 */ add.s $f4, $f4, $f2 -/* 331D0C E001E3CC 46002300 */ add.s $f12, $f4, $f0 -/* 331D10 E001E3D0 3C013C23 */ lui $at, 0x3c23 -/* 331D14 E001E3D4 3421D70A */ ori $at, $at, 0xd70a -/* 331D18 E001E3D8 44810000 */ mtc1 $at, $f0 -/* 331D1C E001E3DC 00000000 */ nop -/* 331D20 E001E3E0 460C003C */ c.lt.s $f0, $f12 -/* 331D24 E001E3E4 00000000 */ nop -/* 331D28 E001E3E8 45000008 */ bc1f .LE001E40C -/* 331D2C E001E3EC E7AC0024 */ swc1 $f12, 0x24($sp) -/* 331D30 E001E3F0 0C080154 */ jal shim_sqrtf -/* 331D34 E001E3F4 00000000 */ nop -/* 331D38 E001E3F8 3C013F80 */ lui $at, 0x3f80 -/* 331D3C E001E3FC 44811000 */ mtc1 $at, $f2 -/* 331D40 E001E400 00000000 */ nop -/* 331D44 E001E404 46001083 */ div.s $f2, $f2, $f0 -/* 331D48 E001E408 E7A20024 */ swc1 $f2, 0x24($sp) -.LE001E40C: -/* 331D4C E001E40C C60A0010 */ lwc1 $f10, 0x10($s0) -/* 331D50 E001E410 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 331D54 E001E414 46005282 */ mul.s $f10, $f10, $f0 -/* 331D58 E001E418 00000000 */ nop -/* 331D5C E001E41C C6040014 */ lwc1 $f4, 0x14($s0) -/* 331D60 E001E420 46002102 */ mul.s $f4, $f4, $f0 -/* 331D64 E001E424 00000000 */ nop -/* 331D68 E001E428 C6060018 */ lwc1 $f6, 0x18($s0) -/* 331D6C E001E42C 46003182 */ mul.s $f6, $f6, $f0 -/* 331D70 E001E430 00000000 */ nop -/* 331D74 E001E434 3C014200 */ lui $at, 0x4200 -/* 331D78 E001E438 44811000 */ mtc1 $at, $f2 -/* 331D7C E001E43C 00000000 */ nop -/* 331D80 E001E440 46025282 */ mul.s $f10, $f10, $f2 -/* 331D84 E001E444 00000000 */ nop -/* 331D88 E001E448 46022102 */ mul.s $f4, $f4, $f2 -/* 331D8C E001E44C 00000000 */ nop -/* 331D90 E001E450 46023182 */ mul.s $f6, $f6, $f2 -/* 331D94 E001E454 00000000 */ nop -/* 331D98 E001E458 C6080004 */ lwc1 $f8, 4($s0) -/* 331D9C E001E45C 3C014280 */ lui $at, 0x4280 -/* 331DA0 E001E460 44810000 */ mtc1 $at, $f0 -/* 331DA4 E001E464 C6020008 */ lwc1 $f2, 8($s0) -/* 331DA8 E001E468 460A4201 */ sub.s $f8, $f8, $f10 -/* 331DAC E001E46C E7A00024 */ swc1 $f0, 0x24($sp) -/* 331DB0 E001E470 46041081 */ sub.s $f2, $f2, $f4 -/* 331DB4 E001E474 C600000C */ lwc1 $f0, 0xc($s0) -/* 331DB8 E001E478 8E020000 */ lw $v0, ($s0) -/* 331DBC E001E47C 46060001 */ sub.s $f0, $f0, $f6 -/* 331DC0 E001E480 E7A80018 */ swc1 $f8, 0x18($sp) -/* 331DC4 E001E484 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 331DC8 E001E488 1040005C */ beqz $v0, .LE001E5FC -/* 331DCC E001E48C E7A00020 */ swc1 $f0, 0x20($sp) -/* 331DD0 E001E490 C6000014 */ lwc1 $f0, 0x14($s0) -/* 331DD4 E001E494 4480A000 */ mtc1 $zero, $f20 -/* 331DD8 E001E498 00000000 */ nop -/* 331DDC E001E49C 4614003C */ c.lt.s $f0, $f20 -/* 331DE0 E001E4A0 00000000 */ nop -/* 331DE4 E001E4A4 45000055 */ bc1f .LE001E5FC -/* 331DE8 E001E4A8 27A20024 */ addiu $v0, $sp, 0x24 -/* 331DEC E001E4AC AFA20010 */ sw $v0, 0x10($sp) -/* 331DF0 E001E4B0 0000202D */ daddu $a0, $zero, $zero -/* 331DF4 E001E4B4 27A50018 */ addiu $a1, $sp, 0x18 -/* 331DF8 E001E4B8 27A6001C */ addiu $a2, $sp, 0x1c -/* 331DFC E001E4BC 0C08014C */ jal shim_npc_raycast_down_sides -/* 331E00 E001E4C0 27A70020 */ addiu $a3, $sp, 0x20 -/* 331E04 E001E4C4 1040004D */ beqz $v0, .LE001E5FC -/* 331E08 E001E4C8 00000000 */ nop -/* 331E0C E001E4CC C7A20024 */ lwc1 $f2, 0x24($sp) -/* 331E10 E001E4D0 3C014228 */ lui $at, 0x4228 -/* 331E14 E001E4D4 44810000 */ mtc1 $at, $f0 -/* 331E18 E001E4D8 00000000 */ nop -/* 331E1C E001E4DC 4600103C */ c.lt.s $f2, $f0 -/* 331E20 E001E4E0 00000000 */ nop -/* 331E24 E001E4E4 45000045 */ bc1f .LE001E5FC -/* 331E28 E001E4E8 24040006 */ addiu $a0, $zero, 6 -/* 331E2C E001E4EC C6040014 */ lwc1 $f4, 0x14($s0) -/* 331E30 E001E4F0 3C01E002 */ lui $at, %hi(D_E001ED50) -/* 331E34 E001E4F4 D420ED50 */ ldc1 $f0, %lo(D_E001ED50)($at) -/* 331E38 E001E4F8 46002107 */ neg.s $f4, $f4 -/* 331E3C E001E4FC 46002121 */ cvt.d.s $f4, $f4 -/* 331E40 E001E500 46202102 */ mul.d $f4, $f4, $f0 -/* 331E44 E001E504 00000000 */ nop -/* 331E48 E001E508 C6060010 */ lwc1 $f6, 0x10($s0) -/* 331E4C E001E50C 3C01E002 */ lui $at, %hi(D_E001ED58) -/* 331E50 E001E510 D428ED58 */ ldc1 $f8, %lo(D_E001ED58)($at) -/* 331E54 E001E514 460031A1 */ cvt.d.s $f6, $f6 -/* 331E58 E001E518 46283182 */ mul.d $f6, $f6, $f8 -/* 331E5C E001E51C 00000000 */ nop -/* 331E60 E001E520 C6020034 */ lwc1 $f2, 0x34($s0) -/* 331E64 E001E524 460010A1 */ cvt.d.s $f2, $f2 -/* 331E68 E001E528 46281082 */ mul.d $f2, $f2, $f8 -/* 331E6C E001E52C 00000000 */ nop -/* 331E70 E001E530 C60A001C */ lwc1 $f10, 0x1c($s0) -/* 331E74 E001E534 3C013F80 */ lui $at, 0x3f80 -/* 331E78 E001E538 44810000 */ mtc1 $at, $f0 -/* 331E7C E001E53C 00000000 */ nop -/* 331E80 E001E540 46005280 */ add.s $f10, $f10, $f0 -/* 331E84 E001E544 C600002C */ lwc1 $f0, 0x2c($s0) -/* 331E88 E001E548 46000021 */ cvt.d.s $f0, $f0 -/* 331E8C E001E54C 46280002 */ mul.d $f0, $f0, $f8 -/* 331E90 E001E550 00000000 */ nop -/* 331E94 E001E554 E60A001C */ swc1 $f10, 0x1c($s0) -/* 331E98 E001E558 46202120 */ cvt.s.d $f4, $f4 -/* 331E9C E001E55C 462031A0 */ cvt.s.d $f6, $f6 -/* 331EA0 E001E560 462010A0 */ cvt.s.d $f2, $f2 -/* 331EA4 E001E564 E6040014 */ swc1 $f4, 0x14($s0) -/* 331EA8 E001E568 E6060010 */ swc1 $f6, 0x10($s0) -/* 331EAC E001E56C E6020034 */ swc1 $f2, 0x34($s0) -/* 331EB0 E001E570 46200020 */ cvt.s.d $f0, $f0 -/* 331EB4 E001E574 0C080150 */ jal shim_load_effect -/* 331EB8 E001E578 E600002C */ swc1 $f0, 0x2c($s0) -/* 331EBC E001E57C C6020008 */ lwc1 $f2, 8($s0) -/* 331EC0 E001E580 3C0140A0 */ lui $at, 0x40a0 -/* 331EC4 E001E584 44810000 */ mtc1 $at, $f0 -/* 331EC8 E001E588 E7B40010 */ swc1 $f20, 0x10($sp) -/* 331ECC E001E58C 46001081 */ sub.s $f2, $f2, $f0 -/* 331ED0 E001E590 8E050004 */ lw $a1, 4($s0) -/* 331ED4 E001E594 8E07000C */ lw $a3, 0xc($s0) -/* 331ED8 E001E598 44061000 */ mfc1 $a2, $f2 -/* 331EDC E001E59C 0C003058 */ jal fx_6_main -/* 331EE0 E001E5A0 0000202D */ daddu $a0, $zero, $zero -/* 331EE4 E001E5A4 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 331EE8 E001E5A8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 331EEC E001E5AC 80420070 */ lb $v0, 0x70($v0) -/* 331EF0 E001E5B0 14400008 */ bnez $v0, .LE001E5D4 -/* 331EF4 E001E5B4 3C04B000 */ lui $a0, 0xb000 -/* 331EF8 E001E5B8 C600000C */ lwc1 $f0, 0xc($s0) -/* 331EFC E001E5BC 34840016 */ ori $a0, $a0, 0x16 -/* 331F00 E001E5C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 331F04 E001E5C4 8E060004 */ lw $a2, 4($s0) -/* 331F08 E001E5C8 8E070008 */ lw $a3, 8($s0) -/* 331F0C E001E5CC 0C0801A0 */ jal shim_sfx_play_sound_at_position -/* 331F10 E001E5D0 0000282D */ daddu $a1, $zero, $zero -.LE001E5D4: -/* 331F14 E001E5D4 C602001C */ lwc1 $f2, 0x1c($s0) -/* 331F18 E001E5D8 3C014120 */ lui $at, 0x4120 -/* 331F1C E001E5DC 44810000 */ mtc1 $at, $f0 -/* 331F20 E001E5E0 00000000 */ nop -/* 331F24 E001E5E4 4602003E */ c.le.s $f0, $f2 -/* 331F28 E001E5E8 00000000 */ nop -/* 331F2C E001E5EC 45000003 */ bc1f .LE001E5FC -/* 331F30 E001E5F0 AE000000 */ sw $zero, ($s0) -/* 331F34 E001E5F4 2402FFFF */ addiu $v0, $zero, -1 -/* 331F38 E001E5F8 AE020030 */ sw $v0, 0x30($s0) -.LE001E5FC: -/* 331F3C E001E5FC C600001C */ lwc1 $f0, 0x1c($s0) -/* 331F40 E001E600 44806000 */ mtc1 $zero, $f12 -/* 331F44 E001E604 00000000 */ nop -/* 331F48 E001E608 460C0032 */ c.eq.s $f0, $f12 -/* 331F4C E001E60C 00000000 */ nop -/* 331F50 E001E610 45010012 */ bc1t .LE001E65C -/* 331F54 E001E614 46006386 */ mov.s $f14, $f12 -/* 331F58 E001E618 C6000014 */ lwc1 $f0, 0x14($s0) -/* 331F5C E001E61C 3C01BFE0 */ lui $at, 0xbfe0 -/* 331F60 E001E620 44811800 */ mtc1 $at, $f3 -/* 331F64 E001E624 44801000 */ mtc1 $zero, $f2 -/* 331F68 E001E628 C604002C */ lwc1 $f4, 0x2c($s0) -/* 331F6C E001E62C 46000021 */ cvt.d.s $f0, $f0 -/* 331F70 E001E630 46220000 */ add.d $f0, $f0, $f2 -/* 331F74 E001E634 C6020024 */ lwc1 $f2, 0x24($s0) -/* 331F78 E001E638 8E070034 */ lw $a3, 0x34($s0) -/* 331F7C E001E63C 46041080 */ add.s $f2, $f2, $f4 -/* 331F80 E001E640 46200020 */ cvt.s.d $f0, $f0 -/* 331F84 E001E644 E6000014 */ swc1 $f0, 0x14($s0) -/* 331F88 E001E648 46000007 */ neg.s $f0, $f0 -/* 331F8C E001E64C 44060000 */ mfc1 $a2, $f0 -/* 331F90 E001E650 0C080148 */ jal shim_atan2 -/* 331F94 E001E654 E6020024 */ swc1 $f2, 0x24($s0) -/* 331F98 E001E658 E6000020 */ swc1 $f0, 0x20($s0) -.LE001E65C: -/* 331F9C E001E65C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 331FA0 E001E660 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 331FA4 E001E664 C440002C */ lwc1 $f0, 0x2c($v0) -/* 331FA8 E001E668 C6020008 */ lwc1 $f2, 8($s0) -/* 331FAC E001E66C 46020001 */ sub.s $f0, $f0, $f2 -/* 331FB0 E001E670 3C014396 */ lui $at, 0x4396 -/* 331FB4 E001E674 44811000 */ mtc1 $at, $f2 -/* 331FB8 E001E678 00000000 */ nop -/* 331FBC E001E67C 4600103C */ c.lt.s $f2, $f0 -/* 331FC0 E001E680 00000000 */ nop -/* 331FC4 E001E684 45000002 */ bc1f .LE001E690 -/* 331FC8 E001E688 2402FFFF */ addiu $v0, $zero, -1 -/* 331FCC E001E68C AE020030 */ sw $v0, 0x30($s0) -.LE001E690: -/* 331FD0 E001E690 C6060004 */ lwc1 $f6, 4($s0) -/* 331FD4 E001E694 C6000010 */ lwc1 $f0, 0x10($s0) -/* 331FD8 E001E698 C6020008 */ lwc1 $f2, 8($s0) -/* 331FDC E001E69C 46003180 */ add.s $f6, $f6, $f0 -/* 331FE0 E001E6A0 C6000014 */ lwc1 $f0, 0x14($s0) -/* 331FE4 E001E6A4 C6040018 */ lwc1 $f4, 0x18($s0) -/* 331FE8 E001E6A8 46001080 */ add.s $f2, $f2, $f0 -/* 331FEC E001E6AC C600000C */ lwc1 $f0, 0xc($s0) -/* 331FF0 E001E6B0 8E020030 */ lw $v0, 0x30($s0) -/* 331FF4 E001E6B4 46040000 */ add.s $f0, $f0, $f4 -/* 331FF8 E001E6B8 E6060004 */ swc1 $f6, 4($s0) -/* 331FFC E001E6BC E6020008 */ swc1 $f2, 8($s0) -/* 332000 E001E6C0 04410003 */ bgez $v0, .LE001E6D0 -/* 332004 E001E6C4 E600000C */ swc1 $f0, 0xc($s0) -/* 332008 E001E6C8 0C080128 */ jal shim_remove_effect -/* 33200C E001E6CC 0220202D */ daddu $a0, $s1, $zero -.LE001E6D0: -/* 332010 E001E6D0 8FBF0030 */ lw $ra, 0x30($sp) -/* 332014 E001E6D4 8FB1002C */ lw $s1, 0x2c($sp) -/* 332018 E001E6D8 8FB00028 */ lw $s0, 0x28($sp) -/* 33201C E001E6DC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 332020 E001E6E0 03E00008 */ jr $ra -/* 332024 E001E6E4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_appendGfx.s index 0601d509ea..d2754e68a8 100644 --- a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_appendGfx.s +++ b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_appendGfx.s @@ -355,12 +355,12 @@ glabel fx_16_appendGfx /* 3349E8 E0020B28 3C02E002 */ lui $v0, %hi(D_E0020D94) /* 3349EC E0020B2C 00431021 */ addu $v0, $v0, $v1 /* 3349F0 E0020B30 90420D94 */ lbu $v0, %lo(D_E0020D94)($v0) -/* 3349F4 E0020B34 3C04E002 */ lui $a0, %hi(D_E0020D95) +/* 3349F4 E0020B34 3C04E002 */ lui $a0, %hi(D_E0020D94 + 0x1) /* 3349F8 E0020B38 00832021 */ addu $a0, $a0, $v1 -/* 3349FC E0020B3C 90840D95 */ lbu $a0, %lo(D_E0020D95)($a0) -/* 334A00 E0020B40 3C01E002 */ lui $at, %hi(D_E0020D96) +/* 3349FC E0020B3C 90840D95 */ lbu $a0, %lo(D_E0020D94 + 0x1)($a0) +/* 334A00 E0020B40 3C01E002 */ lui $at, %hi(D_E0020D94 + 0x2) /* 334A04 E0020B44 00230821 */ addu $at, $at, $v1 -/* 334A08 E0020B48 90230D96 */ lbu $v1, %lo(D_E0020D96)($at) +/* 334A08 E0020B48 90230D96 */ lbu $v1, %lo(D_E0020D94 + 0x2)($at) /* 334A0C E0020B4C 00021600 */ sll $v0, $v0, 0x18 /* 334A10 E0020B50 00042400 */ sll $a0, $a0, 0x10 /* 334A14 E0020B54 00441025 */ or $v0, $v0, $a0 diff --git a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_main.s b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_main.s deleted file mode 100644 index 8bed4b022f..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_main.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_16_main -/* 33418C E00202CC 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 334190 E00202D0 F7B80058 */ sdc1 $f24, 0x58($sp) -/* 334194 E00202D4 4486C000 */ mtc1 $a2, $f24 -/* 334198 E00202D8 F7BC0068 */ sdc1 $f28, 0x68($sp) -/* 33419C E00202DC 4487E000 */ mtc1 $a3, $f28 -/* 3341A0 E00202E0 AFB00028 */ sw $s0, 0x28($sp) -/* 3341A4 E00202E4 8FB0008C */ lw $s0, 0x8c($sp) -/* 3341A8 E00202E8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 3341AC E00202EC C7B60080 */ lwc1 $f22, 0x80($sp) -/* 3341B0 E00202F0 F7BA0060 */ sdc1 $f26, 0x60($sp) -/* 3341B4 E00202F4 C7BA0084 */ lwc1 $f26, 0x84($sp) -/* 3341B8 E00202F8 AFB20030 */ sw $s2, 0x30($sp) -/* 3341BC E00202FC 0080902D */ daddu $s2, $a0, $zero -/* 3341C0 E0020300 AFB5003C */ sw $s5, 0x3c($sp) -/* 3341C4 E0020304 00A0A82D */ daddu $s5, $a1, $zero -/* 3341C8 E0020308 AFB30034 */ sw $s3, 0x34($sp) -/* 3341CC E002030C 24130001 */ addiu $s3, $zero, 1 -/* 3341D0 E0020310 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 3341D4 E0020314 C7B40088 */ lwc1 $f20, 0x88($sp) -/* 3341D8 E0020318 27A40010 */ addiu $a0, $sp, 0x10 -/* 3341DC E002031C AFBF0040 */ sw $ra, 0x40($sp) -/* 3341E0 E0020320 AFB40038 */ sw $s4, 0x38($sp) -/* 3341E4 E0020324 16530002 */ bne $s2, $s3, .LE0020330 -/* 3341E8 E0020328 AFB1002C */ sw $s1, 0x2c($sp) -/* 3341EC E002032C 24130003 */ addiu $s3, $zero, 3 -.LE0020330: -/* 3341F0 E0020330 3C02E002 */ lui $v0, %hi(fx_16_init) -/* 3341F4 E0020334 24420460 */ addiu $v0, $v0, %lo(fx_16_init) -/* 3341F8 E0020338 AFA20018 */ sw $v0, 0x18($sp) -/* 3341FC E002033C 3C02E002 */ lui $v0, %hi(fx_16_update) -/* 334200 E0020340 24420468 */ addiu $v0, $v0, %lo(fx_16_update) -/* 334204 E0020344 AFA2001C */ sw $v0, 0x1c($sp) -/* 334208 E0020348 3C02E002 */ lui $v0, %hi(fx_16_render) -/* 33420C E002034C 2442058C */ addiu $v0, $v0, %lo(fx_16_render) -/* 334210 E0020350 AFA20020 */ sw $v0, 0x20($sp) -/* 334214 E0020354 24020010 */ addiu $v0, $zero, 0x10 -/* 334218 E0020358 AFA00010 */ sw $zero, 0x10($sp) -/* 33421C E002035C AFA00024 */ sw $zero, 0x24($sp) -/* 334220 E0020360 0C080124 */ jal shim_create_effect_instance -/* 334224 E0020364 AFA20014 */ sw $v0, 0x14($sp) -/* 334228 E0020368 00132180 */ sll $a0, $s3, 6 -/* 33422C E002036C 0040A02D */ daddu $s4, $v0, $zero -/* 334230 E0020370 0C08012C */ jal shim_general_heap_malloc -/* 334234 E0020374 AE930008 */ sw $s3, 8($s4) -/* 334238 E0020378 0040882D */ daddu $s1, $v0, $zero -/* 33423C E002037C 16200003 */ bnez $s1, .LE002038C -/* 334240 E0020380 AE91000C */ sw $s1, 0xc($s4) -.LE0020384: -/* 334244 E0020384 080080E1 */ j .LE0020384 -/* 334248 E0020388 00000000 */ nop -.LE002038C: -/* 33424C E002038C AE35003C */ sw $s5, 0x3c($s1) -/* 334250 E0020390 AE320000 */ sw $s2, ($s1) -/* 334254 E0020394 1E000002 */ bgtz $s0, .LE00203A0 -/* 334258 E0020398 AE320030 */ sw $s2, 0x30($s1) -/* 33425C E002039C 24102710 */ addiu $s0, $zero, 0x2710 -.LE00203A0: -/* 334260 E00203A0 24020001 */ addiu $v0, $zero, 1 -/* 334264 E00203A4 AE30002C */ sw $s0, 0x2c($s1) -/* 334268 E00203A8 16420014 */ bne $s2, $v0, .LE00203FC -/* 33426C E00203AC AE200034 */ sw $zero, 0x34($s1) -/* 334270 E00203B0 1260001B */ beqz $s3, .LE0020420 -/* 334274 E00203B4 0000902D */ daddu $s2, $zero, $zero -/* 334278 E00203B8 2630003C */ addiu $s0, $s1, 0x3c -.LE00203BC: -/* 33427C E00203BC 0220202D */ daddu $a0, $s1, $zero -/* 334280 E00203C0 0240282D */ daddu $a1, $s2, $zero -/* 334284 E00203C4 E618FFD4 */ swc1 $f24, -0x2c($s0) -/* 334288 E00203C8 E61CFFD8 */ swc1 $f28, -0x28($s0) -/* 33428C E00203CC E616FFDC */ swc1 $f22, -0x24($s0) -/* 334290 E00203D0 E614FFE0 */ swc1 $f20, -0x20($s0) -/* 334294 E00203D4 E61AFFE4 */ swc1 $f26, -0x1c($s0) -/* 334298 E00203D8 0C008000 */ jal func_E0020000 -/* 33429C E00203DC AE150000 */ sw $s5, ($s0) -/* 3342A0 E00203E0 26520001 */ addiu $s2, $s2, 1 -/* 3342A4 E00203E4 26100040 */ addiu $s0, $s0, 0x40 -/* 3342A8 E00203E8 0253102A */ slt $v0, $s2, $s3 -/* 3342AC E00203EC 1440FFF3 */ bnez $v0, .LE00203BC -/* 3342B0 E00203F0 26310040 */ addiu $s1, $s1, 0x40 -/* 3342B4 E00203F4 08008108 */ j .LE0020420 -/* 3342B8 E00203F8 00000000 */ nop -.LE00203FC: -/* 3342BC E00203FC 0220202D */ daddu $a0, $s1, $zero -/* 3342C0 E0020400 24050001 */ addiu $a1, $zero, 1 -/* 3342C4 E0020404 E4980010 */ swc1 $f24, 0x10($a0) -/* 3342C8 E0020408 E49C0014 */ swc1 $f28, 0x14($a0) -/* 3342CC E002040C E4960018 */ swc1 $f22, 0x18($a0) -/* 3342D0 E0020410 E494001C */ swc1 $f20, 0x1c($a0) -/* 3342D4 E0020414 E49A0020 */ swc1 $f26, 0x20($a0) -/* 3342D8 E0020418 0C008000 */ jal func_E0020000 -/* 3342DC E002041C AC95003C */ sw $s5, 0x3c($a0) -.LE0020420: -/* 3342E0 E0020420 8FA20090 */ lw $v0, 0x90($sp) -/* 3342E4 E0020424 AC540000 */ sw $s4, ($v0) -/* 3342E8 E0020428 8FBF0040 */ lw $ra, 0x40($sp) -/* 3342EC E002042C 8FB5003C */ lw $s5, 0x3c($sp) -/* 3342F0 E0020430 8FB40038 */ lw $s4, 0x38($sp) -/* 3342F4 E0020434 8FB30034 */ lw $s3, 0x34($sp) -/* 3342F8 E0020438 8FB20030 */ lw $s2, 0x30($sp) -/* 3342FC E002043C 8FB1002C */ lw $s1, 0x2c($sp) -/* 334300 E0020440 8FB00028 */ lw $s0, 0x28($sp) -/* 334304 E0020444 D7BC0068 */ ldc1 $f28, 0x68($sp) -/* 334308 E0020448 D7BA0060 */ ldc1 $f26, 0x60($sp) -/* 33430C E002044C D7B80058 */ ldc1 $f24, 0x58($sp) -/* 334310 E0020450 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 334314 E0020454 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 334318 E0020458 03E00008 */ jr $ra -/* 33431C E002045C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_update.s b/ver/us/asm/nonmatchings/effects/effect_16/fx_16_update.s deleted file mode 100644 index 5a3f59efe4..0000000000 --- a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_update.s +++ /dev/null @@ -1,84 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_16_update -/* 334328 E0020468 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 33432C E002046C AFB20018 */ sw $s2, 0x18($sp) -/* 334330 E0020470 0080902D */ daddu $s2, $a0, $zero -/* 334334 E0020474 AFBF001C */ sw $ra, 0x1c($sp) -/* 334338 E0020478 AFB10014 */ sw $s1, 0x14($sp) -/* 33433C E002047C AFB00010 */ sw $s0, 0x10($sp) -/* 334340 E0020480 8E51000C */ lw $s1, 0xc($s2) -/* 334344 E0020484 8E220030 */ lw $v0, 0x30($s1) -/* 334348 E0020488 8E230034 */ lw $v1, 0x34($s1) -/* 33434C E002048C 00021080 */ sll $v0, $v0, 2 -/* 334350 E0020490 3C01E002 */ lui $at, %hi(D_E0020D80) -/* 334354 E0020494 00220821 */ addu $at, $at, $v0 -/* 334358 E0020498 8C220D80 */ lw $v0, %lo(D_E0020D80)($at) -/* 33435C E002049C 8E250000 */ lw $a1, ($s1) -/* 334360 E00204A0 00431021 */ addu $v0, $v0, $v1 -/* 334364 E00204A4 80440000 */ lb $a0, ($v0) -/* 334368 E00204A8 24630001 */ addiu $v1, $v1, 1 -/* 33436C E00204AC AE230034 */ sw $v1, 0x34($s1) -/* 334370 E00204B0 3C03E002 */ lui $v1, %hi(D_E0020D80) -/* 334374 E00204B4 24630D80 */ addiu $v1, $v1, %lo(D_E0020D80) -/* 334378 E00204B8 0481000E */ bgez $a0, .LE00204F4 -/* 33437C E00204BC AE240038 */ sw $a0, 0x38($s1) -/* 334380 E00204C0 2402FFFF */ addiu $v0, $zero, -1 -/* 334384 E00204C4 10820013 */ beq $a0, $v0, .LE0020514 -/* 334388 E00204C8 00041023 */ negu $v0, $a0 -/* 33438C E00204CC 2442FFF6 */ addiu $v0, $v0, -0xa -/* 334390 E00204D0 AE220030 */ sw $v0, 0x30($s1) -/* 334394 E00204D4 00021080 */ sll $v0, $v0, 2 -/* 334398 E00204D8 00431021 */ addu $v0, $v0, $v1 -/* 33439C E00204DC AE200034 */ sw $zero, 0x34($s1) -/* 3343A0 E00204E0 8C420000 */ lw $v0, ($v0) -/* 3343A4 E00204E4 80430000 */ lb $v1, ($v0) -/* 3343A8 E00204E8 24020001 */ addiu $v0, $zero, 1 -/* 3343AC E00204EC AE220034 */ sw $v0, 0x34($s1) -/* 3343B0 E00204F0 AE230038 */ sw $v1, 0x38($s1) -.LE00204F4: -/* 3343B4 E00204F4 8E23002C */ lw $v1, 0x2c($s1) -/* 3343B8 E00204F8 28622710 */ slti $v0, $v1, 0x2710 -/* 3343BC E00204FC 10400002 */ beqz $v0, .LE0020508 -/* 3343C0 E0020500 2462FFFF */ addiu $v0, $v1, -1 -/* 3343C4 E0020504 AE22002C */ sw $v0, 0x2c($s1) -.LE0020508: -/* 3343C8 E0020508 8E22002C */ lw $v0, 0x2c($s1) -/* 3343CC E002050C 04410005 */ bgez $v0, .LE0020524 -/* 3343D0 E0020510 00000000 */ nop -.LE0020514: -/* 3343D4 E0020514 0C080128 */ jal shim_remove_effect -/* 3343D8 E0020518 0240202D */ daddu $a0, $s2, $zero -/* 3343DC E002051C 0800815D */ j .LE0020574 -/* 3343E0 E0020520 00000000 */ nop -.LE0020524: -/* 3343E4 E0020524 8E22003C */ lw $v0, 0x3c($s1) -/* 3343E8 E0020528 10400012 */ beqz $v0, .LE0020574 -/* 3343EC E002052C 24020001 */ addiu $v0, $zero, 1 -/* 3343F0 E0020530 14A2000E */ bne $a1, $v0, .LE002056C -/* 3343F4 E0020534 0220202D */ daddu $a0, $s1, $zero -/* 3343F8 E0020538 8E420008 */ lw $v0, 8($s2) -/* 3343FC E002053C 1840000D */ blez $v0, .LE0020574 -/* 334400 E0020540 0000802D */ daddu $s0, $zero, $zero -.LE0020544: -/* 334404 E0020544 0220202D */ daddu $a0, $s1, $zero -/* 334408 E0020548 0C008000 */ jal func_E0020000 -/* 33440C E002054C 0200282D */ daddu $a1, $s0, $zero -/* 334410 E0020550 26100001 */ addiu $s0, $s0, 1 -/* 334414 E0020554 8E420008 */ lw $v0, 8($s2) -/* 334418 E0020558 0202102A */ slt $v0, $s0, $v0 -/* 33441C E002055C 1440FFF9 */ bnez $v0, .LE0020544 -/* 334420 E0020560 26310040 */ addiu $s1, $s1, 0x40 -/* 334424 E0020564 0800815D */ j .LE0020574 -/* 334428 E0020568 00000000 */ nop -.LE002056C: -/* 33442C E002056C 0C008000 */ jal func_E0020000 -/* 334430 E0020570 24050001 */ addiu $a1, $zero, 1 -.LE0020574: -/* 334434 E0020574 8FBF001C */ lw $ra, 0x1c($sp) -/* 334438 E0020578 8FB20018 */ lw $s2, 0x18($sp) -/* 33443C E002057C 8FB10014 */ lw $s1, 0x14($sp) -/* 334440 E0020580 8FB00010 */ lw $s0, 0x10($sp) -/* 334444 E0020584 03E00008 */ jr $ra -/* 334448 E0020588 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_04/events/arn_04_func_80241040_BE47F0.s b/ver/us/asm/nonmatchings/world/area_arn/arn_04/events/arn_04_func_80241040_BE47F0.s deleted file mode 100644 index 8b8a5f4f30..0000000000 --- a/ver/us/asm/nonmatchings/world/area_arn/arn_04/events/arn_04_func_80241040_BE47F0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802442D8_BE7A88 -.double 0.09 - -dlabel D_802442E0_BE7A90 -.double 0.09 - -.section .text - -glabel arn_04_func_80241040_BE47F0 -/* BE47F0 80241040 27BDFF80 */ addiu $sp, $sp, -0x80 -/* BE47F4 80241044 AFB3004C */ sw $s3, 0x4c($sp) -/* BE47F8 80241048 0080982D */ daddu $s3, $a0, $zero -/* BE47FC 8024104C AFBF0058 */ sw $ra, 0x58($sp) -/* BE4800 80241050 AFB50054 */ sw $s5, 0x54($sp) -/* BE4804 80241054 AFB40050 */ sw $s4, 0x50($sp) -/* BE4808 80241058 AFB20048 */ sw $s2, 0x48($sp) -/* BE480C 8024105C AFB10044 */ sw $s1, 0x44($sp) -/* BE4810 80241060 AFB00040 */ sw $s0, 0x40($sp) -/* BE4814 80241064 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* BE4818 80241068 F7B80070 */ sdc1 $f24, 0x70($sp) -/* BE481C 8024106C F7B60068 */ sdc1 $f22, 0x68($sp) -/* BE4820 80241070 F7B40060 */ sdc1 $f20, 0x60($sp) -/* BE4824 80241074 8E710148 */ lw $s1, 0x148($s3) -/* BE4828 80241078 00A0902D */ daddu $s2, $a1, $zero -/* BE482C 8024107C 86240008 */ lh $a0, 8($s1) -/* BE4830 80241080 0C00EABB */ jal get_npc_unsafe -/* BE4834 80241084 00C0A82D */ daddu $s5, $a2, $zero -/* BE4838 80241088 0040802D */ daddu $s0, $v0, $zero -/* BE483C 8024108C 0000A02D */ daddu $s4, $zero, $zero -/* BE4840 80241090 C624007C */ lwc1 $f4, 0x7c($s1) -/* BE4844 80241094 46802120 */ cvt.s.w $f4, $f4 -/* BE4848 80241098 C6220088 */ lwc1 $f2, 0x88($s1) -/* BE484C 8024109C 468010A0 */ cvt.s.w $f2, $f2 -/* BE4850 802410A0 460010A1 */ cvt.d.s $f2, $f2 -/* BE4854 802410A4 46002121 */ cvt.d.s $f4, $f4 -/* BE4858 802410A8 C600003C */ lwc1 $f0, 0x3c($s0) -/* BE485C 802410AC 3C014059 */ lui $at, 0x4059 -/* BE4860 802410B0 44813800 */ mtc1 $at, $f7 -/* BE4864 802410B4 44803000 */ mtc1 $zero, $f6 -/* BE4868 802410B8 46000021 */ cvt.d.s $f0, $f0 -/* BE486C 802410BC 46260002 */ mul.d $f0, $f0, $f6 -/* BE4870 802410C0 00000000 */ nop -/* BE4874 802410C4 24020001 */ addiu $v0, $zero, 1 -/* BE4878 802410C8 8E24006C */ lw $a0, 0x6c($s1) -/* BE487C 802410CC 46261083 */ div.d $f2, $f2, $f6 -/* BE4880 802410D0 462010A0 */ cvt.s.d $f2, $f2 -/* BE4884 802410D4 46262103 */ div.d $f4, $f4, $f6 -/* BE4888 802410D8 46202520 */ cvt.s.d $f20, $f4 -/* BE488C 802410DC 30830011 */ andi $v1, $a0, 0x11 -/* BE4890 802410E0 4620020D */ trunc.w.d $f8, $f0 -/* BE4894 802410E4 E628007C */ swc1 $f8, 0x7c($s1) -/* BE4898 802410E8 C6200078 */ lwc1 $f0, 0x78($s1) -/* BE489C 802410EC 46800020 */ cvt.s.w $f0, $f0 -/* BE48A0 802410F0 46000021 */ cvt.d.s $f0, $f0 -/* BE48A4 802410F4 46260003 */ div.d $f0, $f0, $f6 -/* BE48A8 802410F8 462006A0 */ cvt.s.d $f26, $f0 -/* BE48AC 802410FC C6200070 */ lwc1 $f0, 0x70($s1) -/* BE48B0 80241100 46800020 */ cvt.s.w $f0, $f0 -/* BE48B4 80241104 46000021 */ cvt.d.s $f0, $f0 -/* BE48B8 80241108 46260003 */ div.d $f0, $f0, $f6 -/* BE48BC 8024110C 462005A0 */ cvt.s.d $f22, $f0 -/* BE48C0 80241110 14620025 */ bne $v1, $v0, .L802411A8 -/* BE48C4 80241114 4602D600 */ add.s $f24, $f26, $f2 -/* BE48C8 80241118 8E020000 */ lw $v0, ($s0) -/* BE48CC 8024111C 30420008 */ andi $v0, $v0, 8 -/* BE48D0 80241120 10400009 */ beqz $v0, .L80241148 -/* BE48D4 80241124 27A50028 */ addiu $a1, $sp, 0x28 -/* BE48D8 80241128 C600003C */ lwc1 $f0, 0x3c($s0) -/* BE48DC 8024112C 4600C001 */ sub.s $f0, $f24, $f0 -/* BE48E0 80241130 4600B03C */ c.lt.s $f22, $f0 -/* BE48E4 80241134 00000000 */ nop -/* BE48E8 80241138 4500001B */ bc1f .L802411A8 -/* BE48EC 8024113C 34820010 */ ori $v0, $a0, 0x10 -/* BE48F0 80241140 0809046A */ j .L802411A8 -/* BE48F4 80241144 AE22006C */ sw $v0, 0x6c($s1) -.L80241148: -/* BE48F8 80241148 27A6002C */ addiu $a2, $sp, 0x2c -/* BE48FC 8024114C C6000038 */ lwc1 $f0, 0x38($s0) -/* BE4900 80241150 C602003C */ lwc1 $f2, 0x3c($s0) -/* BE4904 80241154 C6040040 */ lwc1 $f4, 0x40($s0) -/* BE4908 80241158 3C01447A */ lui $at, 0x447a -/* BE490C 8024115C 44813000 */ mtc1 $at, $f6 -/* BE4910 80241160 27A20034 */ addiu $v0, $sp, 0x34 -/* BE4914 80241164 E7A00028 */ swc1 $f0, 0x28($sp) -/* BE4918 80241168 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BE491C 8024116C E7A40030 */ swc1 $f4, 0x30($sp) -/* BE4920 80241170 E7A60034 */ swc1 $f6, 0x34($sp) -/* BE4924 80241174 AFA20010 */ sw $v0, 0x10($sp) -/* BE4928 80241178 8E040080 */ lw $a0, 0x80($s0) -/* BE492C 8024117C 0C0372DF */ jal npc_raycast_down_sides -/* BE4930 80241180 27A70030 */ addiu $a3, $sp, 0x30 -/* BE4934 80241184 C7A00034 */ lwc1 $f0, 0x34($sp) -/* BE4938 80241188 4600D001 */ sub.s $f0, $f26, $f0 -/* BE493C 8024118C 4600B03C */ c.lt.s $f22, $f0 -/* BE4940 80241190 00000000 */ nop -/* BE4944 80241194 45000004 */ bc1f .L802411A8 -/* BE4948 80241198 00000000 */ nop -/* BE494C 8024119C 8E22006C */ lw $v0, 0x6c($s1) -/* BE4950 802411A0 34420010 */ ori $v0, $v0, 0x10 -/* BE4954 802411A4 AE22006C */ sw $v0, 0x6c($s1) -.L802411A8: -/* BE4958 802411A8 8E22006C */ lw $v0, 0x6c($s1) -/* BE495C 802411AC 24030011 */ addiu $v1, $zero, 0x11 -/* BE4960 802411B0 30420011 */ andi $v0, $v0, 0x11 -/* BE4964 802411B4 14430039 */ bne $v0, $v1, .L8024129C -/* BE4968 802411B8 00000000 */ nop -/* BE496C 802411BC 8E020000 */ lw $v0, ($s0) -/* BE4970 802411C0 30420008 */ andi $v0, $v0, 8 -/* BE4974 802411C4 1040000A */ beqz $v0, .L802411F0 -/* BE4978 802411C8 4600C106 */ mov.s $f4, $f24 -/* BE497C 802411CC 4614C081 */ sub.s $f2, $f24, $f20 -/* BE4980 802411D0 3C018024 */ lui $at, %hi(D_802442D8_BE7A88) -/* BE4984 802411D4 D42042D8 */ ldc1 $f0, %lo(D_802442D8_BE7A88)($at) -/* BE4988 802411D8 460010A1 */ cvt.d.s $f2, $f2 -/* BE498C 802411DC 46201082 */ mul.d $f2, $f2, $f0 -/* BE4990 802411E0 00000000 */ nop -/* BE4994 802411E4 4600A021 */ cvt.d.s $f0, $f20 -/* BE4998 802411E8 08090495 */ j .L80241254 -/* BE499C 802411EC 46220000 */ add.d $f0, $f0, $f2 -.L802411F0: -/* BE49A0 802411F0 27A50028 */ addiu $a1, $sp, 0x28 -/* BE49A4 802411F4 27A6002C */ addiu $a2, $sp, 0x2c -/* BE49A8 802411F8 C6000038 */ lwc1 $f0, 0x38($s0) -/* BE49AC 802411FC C6020040 */ lwc1 $f2, 0x40($s0) -/* BE49B0 80241200 3C01447A */ lui $at, 0x447a -/* BE49B4 80241204 44812000 */ mtc1 $at, $f4 -/* BE49B8 80241208 27A20034 */ addiu $v0, $sp, 0x34 -/* BE49BC 8024120C E7B4002C */ swc1 $f20, 0x2c($sp) -/* BE49C0 80241210 E7A00028 */ swc1 $f0, 0x28($sp) -/* BE49C4 80241214 E7A20030 */ swc1 $f2, 0x30($sp) -/* BE49C8 80241218 E7A40034 */ swc1 $f4, 0x34($sp) -/* BE49CC 8024121C AFA20010 */ sw $v0, 0x10($sp) -/* BE49D0 80241220 8E040080 */ lw $a0, 0x80($s0) -/* BE49D4 80241224 0C0372DF */ jal npc_raycast_down_sides -/* BE49D8 80241228 27A70030 */ addiu $a3, $sp, 0x30 -/* BE49DC 8024122C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* BE49E0 80241230 461A2100 */ add.s $f4, $f4, $f26 -/* BE49E4 80241234 46142081 */ sub.s $f2, $f4, $f20 -/* BE49E8 80241238 3C018024 */ lui $at, %hi(D_802442E0_BE7A90) -/* BE49EC 8024123C D42042E0 */ ldc1 $f0, %lo(D_802442E0_BE7A90)($at) -/* BE49F0 80241240 460010A1 */ cvt.d.s $f2, $f2 -/* BE49F4 80241244 46201082 */ mul.d $f2, $f2, $f0 -/* BE49F8 80241248 00000000 */ nop -/* BE49FC 8024124C 4600A021 */ cvt.d.s $f0, $f20 -/* BE4A00 80241250 46220000 */ add.d $f0, $f0, $f2 -.L80241254: -/* BE4A04 80241254 46200020 */ cvt.s.d $f0, $f0 -/* BE4A08 80241258 E600003C */ swc1 $f0, 0x3c($s0) -/* BE4A0C 8024125C C600003C */ lwc1 $f0, 0x3c($s0) -/* BE4A10 80241260 46002001 */ sub.s $f0, $f4, $f0 -/* BE4A14 80241264 3C013FF0 */ lui $at, 0x3ff0 -/* BE4A18 80241268 44811800 */ mtc1 $at, $f3 -/* BE4A1C 8024126C 44801000 */ mtc1 $zero, $f2 -/* BE4A20 80241270 46000005 */ abs.s $f0, $f0 -/* BE4A24 80241274 46000021 */ cvt.d.s $f0, $f0 -/* BE4A28 80241278 4622003C */ c.lt.d $f0, $f2 -/* BE4A2C 8024127C 00000000 */ nop -/* BE4A30 80241280 45000036 */ bc1f .L8024135C -/* BE4A34 80241284 2403FFEF */ addiu $v1, $zero, -0x11 -/* BE4A38 80241288 E604003C */ swc1 $f4, 0x3c($s0) -/* BE4A3C 8024128C 8E22006C */ lw $v0, 0x6c($s1) -/* BE4A40 80241290 00431024 */ and $v0, $v0, $v1 -/* BE4A44 80241294 080904D7 */ j .L8024135C -/* BE4A48 80241298 AE22006C */ sw $v0, 0x6c($s1) -.L8024129C: -/* BE4A4C 8024129C 8E220070 */ lw $v0, 0x70($s1) -/* BE4A50 802412A0 1840002E */ blez $v0, .L8024135C -/* BE4A54 802412A4 00000000 */ nop -/* BE4A58 802412A8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BE4A5C 802412AC 0C00A8BB */ jal sin_deg -/* BE4A60 802412B0 46806320 */ cvt.s.w $f12, $f12 -/* BE4A64 802412B4 8E020000 */ lw $v0, ($s0) -/* BE4A68 802412B8 30420008 */ andi $v0, $v0, 8 -/* BE4A6C 802412BC 10400003 */ beqz $v0, .L802412CC -/* BE4A70 802412C0 46000506 */ mov.s $f20, $f0 -/* BE4A74 802412C4 080904C3 */ j .L8024130C -/* BE4A78 802412C8 0000102D */ daddu $v0, $zero, $zero -.L802412CC: -/* BE4A7C 802412CC 27A50028 */ addiu $a1, $sp, 0x28 -/* BE4A80 802412D0 27A6002C */ addiu $a2, $sp, 0x2c -/* BE4A84 802412D4 C6000038 */ lwc1 $f0, 0x38($s0) -/* BE4A88 802412D8 C602003C */ lwc1 $f2, 0x3c($s0) -/* BE4A8C 802412DC C6040040 */ lwc1 $f4, 0x40($s0) -/* BE4A90 802412E0 3C01447A */ lui $at, 0x447a -/* BE4A94 802412E4 44813000 */ mtc1 $at, $f6 -/* BE4A98 802412E8 27A20034 */ addiu $v0, $sp, 0x34 -/* BE4A9C 802412EC E7A00028 */ swc1 $f0, 0x28($sp) -/* BE4AA0 802412F0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BE4AA4 802412F4 E7A40030 */ swc1 $f4, 0x30($sp) -/* BE4AA8 802412F8 E7A60034 */ swc1 $f6, 0x34($sp) -/* BE4AAC 802412FC AFA20010 */ sw $v0, 0x10($sp) -/* BE4AB0 80241300 8E040080 */ lw $a0, 0x80($s0) -/* BE4AB4 80241304 0C0372DF */ jal npc_raycast_down_sides -/* BE4AB8 80241308 27A70030 */ addiu $a3, $sp, 0x30 -.L8024130C: -/* BE4ABC 8024130C 10400007 */ beqz $v0, .L8024132C -/* BE4AC0 80241310 00000000 */ nop -/* BE4AC4 80241314 4616A082 */ mul.s $f2, $f20, $f22 -/* BE4AC8 80241318 00000000 */ nop -/* BE4ACC 8024131C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BE4AD0 80241320 461A0000 */ add.s $f0, $f0, $f26 -/* BE4AD4 80241324 080904CE */ j .L80241338 -/* BE4AD8 80241328 46020000 */ add.s $f0, $f0, $f2 -.L8024132C: -/* BE4ADC 8024132C 4616A002 */ mul.s $f0, $f20, $f22 -/* BE4AE0 80241330 00000000 */ nop -/* BE4AE4 80241334 4600C000 */ add.s $f0, $f24, $f0 -.L80241338: -/* BE4AE8 80241338 E600003C */ swc1 $f0, 0x3c($s0) -/* BE4AEC 8024133C 8E220074 */ lw $v0, 0x74($s1) -/* BE4AF0 80241340 2442000A */ addiu $v0, $v0, 0xa -/* BE4AF4 80241344 44826000 */ mtc1 $v0, $f12 -/* BE4AF8 80241348 00000000 */ nop -/* BE4AFC 8024134C 0C00A6C9 */ jal clamp_angle -/* BE4B00 80241350 46806320 */ cvt.s.w $f12, $f12 -/* BE4B04 80241354 4600020D */ trunc.w.s $f8, $f0 -/* BE4B08 80241358 E6280074 */ swc1 $f8, 0x74($s1) -.L8024135C: -/* BE4B0C 8024135C 8E220090 */ lw $v0, 0x90($s1) -/* BE4B10 80241360 1C40004A */ bgtz $v0, .L8024148C -/* BE4B14 80241364 2442FFFF */ addiu $v0, $v0, -1 -/* BE4B18 80241368 8E430014 */ lw $v1, 0x14($s2) -/* BE4B1C 8024136C 04600048 */ bltz $v1, .L80241490 -/* BE4B20 80241370 00000000 */ nop -/* BE4B24 80241374 8E620074 */ lw $v0, 0x74($s3) -/* BE4B28 80241378 1C400042 */ bgtz $v0, .L80241484 -/* BE4B2C 8024137C 2442FFFF */ addiu $v0, $v0, -1 -/* BE4B30 80241380 AE630074 */ sw $v1, 0x74($s3) -/* BE4B34 80241384 860200A8 */ lh $v0, 0xa8($s0) -/* BE4B38 80241388 C602003C */ lwc1 $f2, 0x3c($s0) -/* BE4B3C 8024138C 44820000 */ mtc1 $v0, $f0 -/* BE4B40 80241390 00000000 */ nop -/* BE4B44 80241394 46800020 */ cvt.s.w $f0, $f0 -/* BE4B48 80241398 46001080 */ add.s $f2, $f2, $f0 -/* BE4B4C 8024139C 3C014024 */ lui $at, 0x4024 -/* BE4B50 802413A0 44810800 */ mtc1 $at, $f1 -/* BE4B54 802413A4 44800000 */ mtc1 $zero, $f0 -/* BE4B58 802413A8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE4B5C 802413AC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE4B60 802413B0 460010A1 */ cvt.d.s $f2, $f2 -/* BE4B64 802413B4 46201080 */ add.d $f2, $f2, $f0 -/* BE4B68 802413B8 C440002C */ lwc1 $f0, 0x2c($v0) -/* BE4B6C 802413BC 46000021 */ cvt.d.s $f0, $f0 -/* BE4B70 802413C0 4622003C */ c.lt.d $f0, $f2 -/* BE4B74 802413C4 00000000 */ nop -/* BE4B78 802413C8 4500002C */ bc1f .L8024147C -/* BE4B7C 802413CC 02A0202D */ daddu $a0, $s5, $zero -/* BE4B80 802413D0 AFA00010 */ sw $zero, 0x10($sp) -/* BE4B84 802413D4 8E46000C */ lw $a2, 0xc($s2) -/* BE4B88 802413D8 8E470010 */ lw $a3, 0x10($s2) -/* BE4B8C 802413DC 0C01242D */ jal func_800490B4 -/* BE4B90 802413E0 0220282D */ daddu $a1, $s1, $zero -/* BE4B94 802413E4 10400025 */ beqz $v0, .L8024147C -/* BE4B98 802413E8 0000202D */ daddu $a0, $zero, $zero -/* BE4B9C 802413EC 0200282D */ daddu $a1, $s0, $zero -/* BE4BA0 802413F0 0000302D */ daddu $a2, $zero, $zero -/* BE4BA4 802413F4 2412000C */ addiu $s2, $zero, 0xc -/* BE4BA8 802413F8 860300A8 */ lh $v1, 0xa8($s0) -/* BE4BAC 802413FC 3C013F80 */ lui $at, 0x3f80 -/* BE4BB0 80241400 44810000 */ mtc1 $at, $f0 -/* BE4BB4 80241404 3C014000 */ lui $at, 0x4000 -/* BE4BB8 80241408 44811000 */ mtc1 $at, $f2 -/* BE4BBC 8024140C 3C01C1A0 */ lui $at, 0xc1a0 -/* BE4BC0 80241410 44812000 */ mtc1 $at, $f4 -/* BE4BC4 80241414 44834000 */ mtc1 $v1, $f8 -/* BE4BC8 80241418 00000000 */ nop -/* BE4BCC 8024141C 46804220 */ cvt.s.w $f8, $f8 -/* BE4BD0 80241420 44074000 */ mfc1 $a3, $f8 -/* BE4BD4 80241424 27A20038 */ addiu $v0, $sp, 0x38 -/* BE4BD8 80241428 AFB2001C */ sw $s2, 0x1c($sp) -/* BE4BDC 8024142C AFA20020 */ sw $v0, 0x20($sp) -/* BE4BE0 80241430 E7A00010 */ swc1 $f0, 0x10($sp) -/* BE4BE4 80241434 E7A20014 */ swc1 $f2, 0x14($sp) -/* BE4BE8 80241438 0C01BFA4 */ jal fx_emote -/* BE4BEC 8024143C E7A40018 */ swc1 $f4, 0x18($sp) -/* BE4BF0 80241440 0200202D */ daddu $a0, $s0, $zero -/* BE4BF4 80241444 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BE4BF8 80241448 C480003C */ lwc1 $f0, 0x3c($a0) -/* BE4BFC 8024144C 3C060020 */ lui $a2, 0x20 -/* BE4C00 80241450 0C012530 */ jal ai_enemy_play_sound -/* BE4C04 80241454 E4800064 */ swc1 $f0, 0x64($a0) -/* BE4C08 80241458 8E220018 */ lw $v0, 0x18($s1) -/* BE4C0C 8024145C 9442002A */ lhu $v0, 0x2a($v0) -/* BE4C10 80241460 30420001 */ andi $v0, $v0, 1 -/* BE4C14 80241464 10400003 */ beqz $v0, .L80241474 -/* BE4C18 80241468 2402000A */ addiu $v0, $zero, 0xa -/* BE4C1C 8024146C 0809058D */ j .L80241634 -/* BE4C20 80241470 AE620070 */ sw $v0, 0x70($s3) -.L80241474: -/* BE4C24 80241474 0809058D */ j .L80241634 -/* BE4C28 80241478 AE720070 */ sw $s2, 0x70($s3) -.L8024147C: -/* BE4C2C 8024147C 8E620074 */ lw $v0, 0x74($s3) -/* BE4C30 80241480 2442FFFF */ addiu $v0, $v0, -1 -.L80241484: -/* BE4C34 80241484 08090524 */ j .L80241490 -/* BE4C38 80241488 AE620074 */ sw $v0, 0x74($s3) -.L8024148C: -/* BE4C3C 8024148C AE220090 */ sw $v0, 0x90($s1) -.L80241490: -/* BE4C40 80241490 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE4C44 80241494 C6000040 */ lwc1 $f0, 0x40($s0) -/* BE4C48 80241498 C4620000 */ lwc1 $f2, ($v1) -/* BE4C4C 8024149C 468010A0 */ cvt.s.w $f2, $f2 -/* BE4C50 802414A0 C4640008 */ lwc1 $f4, 8($v1) -/* BE4C54 802414A4 46802120 */ cvt.s.w $f4, $f4 -/* BE4C58 802414A8 E7A00010 */ swc1 $f0, 0x10($sp) -/* BE4C5C 802414AC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE4C60 802414B0 44051000 */ mfc1 $a1, $f2 -/* BE4C64 802414B4 C440000C */ lwc1 $f0, 0xc($v0) -/* BE4C68 802414B8 46800020 */ cvt.s.w $f0, $f0 -/* BE4C6C 802414BC E7A00014 */ swc1 $f0, 0x14($sp) -/* BE4C70 802414C0 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE4C74 802414C4 44062000 */ mfc1 $a2, $f4 -/* BE4C78 802414C8 C4400010 */ lwc1 $f0, 0x10($v0) -/* BE4C7C 802414CC 46800020 */ cvt.s.w $f0, $f0 -/* BE4C80 802414D0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BE4C84 802414D4 8C640018 */ lw $a0, 0x18($v1) -/* BE4C88 802414D8 0C0123F5 */ jal is_point_within_region -/* BE4C8C 802414DC 8E070038 */ lw $a3, 0x38($s0) -/* BE4C90 802414E0 1040001A */ beqz $v0, .L8024154C -/* BE4C94 802414E4 00000000 */ nop -/* BE4C98 802414E8 8E060038 */ lw $a2, 0x38($s0) -/* BE4C9C 802414EC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE4CA0 802414F0 8E070040 */ lw $a3, 0x40($s0) -/* BE4CA4 802414F4 C44C0000 */ lwc1 $f12, ($v0) -/* BE4CA8 802414F8 46806320 */ cvt.s.w $f12, $f12 -/* BE4CAC 802414FC C44E0008 */ lwc1 $f14, 8($v0) -/* BE4CB0 80241500 0C00A7B5 */ jal dist2D -/* BE4CB4 80241504 468073A0 */ cvt.s.w $f14, $f14 -/* BE4CB8 80241508 C6020018 */ lwc1 $f2, 0x18($s0) -/* BE4CBC 8024150C 4600103C */ c.lt.s $f2, $f0 -/* BE4CC0 80241510 00000000 */ nop -/* BE4CC4 80241514 4500000D */ bc1f .L8024154C -/* BE4CC8 80241518 E7A00034 */ swc1 $f0, 0x34($sp) -/* BE4CCC 8024151C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE4CD0 80241520 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE4CD4 80241524 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE4CD8 80241528 C4480000 */ lwc1 $f8, ($v0) -/* BE4CDC 8024152C 46804220 */ cvt.s.w $f8, $f8 -/* BE4CE0 80241530 44064000 */ mfc1 $a2, $f8 -/* BE4CE4 80241534 C4480008 */ lwc1 $f8, 8($v0) -/* BE4CE8 80241538 46804220 */ cvt.s.w $f8, $f8 -/* BE4CEC 8024153C 44074000 */ mfc1 $a3, $f8 -/* BE4CF0 80241540 0C00A720 */ jal atan2 -/* BE4CF4 80241544 24140001 */ addiu $s4, $zero, 1 -/* BE4CF8 80241548 E600000C */ swc1 $f0, 0xc($s0) -.L8024154C: -/* BE4CFC 8024154C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE4D00 80241550 8C43000C */ lw $v1, 0xc($v0) -/* BE4D04 80241554 8C420010 */ lw $v0, 0x10($v0) -/* BE4D08 80241558 00621825 */ or $v1, $v1, $v0 -/* BE4D0C 8024155C 00741825 */ or $v1, $v1, $s4 -/* BE4D10 80241560 10600008 */ beqz $v1, .L80241584 -/* BE4D14 80241564 00000000 */ nop -/* BE4D18 80241568 8602008C */ lh $v0, 0x8c($s0) -/* BE4D1C 8024156C 14400031 */ bnez $v0, .L80241634 -/* BE4D20 80241570 00000000 */ nop -/* BE4D24 80241574 8E050018 */ lw $a1, 0x18($s0) -/* BE4D28 80241578 8E06000C */ lw $a2, 0xc($s0) -/* BE4D2C 8024157C 0C00EA95 */ jal npc_move_heading -/* BE4D30 80241580 0200202D */ daddu $a0, $s0, $zero -.L80241584: -/* BE4D34 80241584 C600003C */ lwc1 $f0, 0x3c($s0) -/* BE4D38 80241588 3C014059 */ lui $at, 0x4059 -/* BE4D3C 8024158C 44811800 */ mtc1 $at, $f3 -/* BE4D40 80241590 44801000 */ mtc1 $zero, $f2 -/* BE4D44 80241594 46000021 */ cvt.d.s $f0, $f0 -/* BE4D48 80241598 46220002 */ mul.d $f0, $f0, $f2 -/* BE4D4C 8024159C 00000000 */ nop -/* BE4D50 802415A0 4620020D */ trunc.w.d $f8, $f0 -/* BE4D54 802415A4 E628007C */ swc1 $f8, 0x7c($s1) -/* BE4D58 802415A8 8E420004 */ lw $v0, 4($s2) -/* BE4D5C 802415AC 18400021 */ blez $v0, .L80241634 -/* BE4D60 802415B0 00000000 */ nop -/* BE4D64 802415B4 8602008E */ lh $v0, 0x8e($s0) -/* BE4D68 802415B8 9603008E */ lhu $v1, 0x8e($s0) -/* BE4D6C 802415BC 18400005 */ blez $v0, .L802415D4 -/* BE4D70 802415C0 2462FFFF */ addiu $v0, $v1, -1 -/* BE4D74 802415C4 A602008E */ sh $v0, 0x8e($s0) -/* BE4D78 802415C8 00021400 */ sll $v0, $v0, 0x10 -/* BE4D7C 802415CC 1C400019 */ bgtz $v0, .L80241634 -/* BE4D80 802415D0 00000000 */ nop -.L802415D4: -/* BE4D84 802415D4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BE4D88 802415D8 24020002 */ addiu $v0, $zero, 2 -/* BE4D8C 802415DC 0C00A67F */ jal rand_int -/* BE4D90 802415E0 AE620070 */ sw $v0, 0x70($s3) -/* BE4D94 802415E4 3C035555 */ lui $v1, 0x5555 -/* BE4D98 802415E8 34635556 */ ori $v1, $v1, 0x5556 -/* BE4D9C 802415EC 00430018 */ mult $v0, $v1 -/* BE4DA0 802415F0 000227C3 */ sra $a0, $v0, 0x1f -/* BE4DA4 802415F4 00004010 */ mfhi $t0 -/* BE4DA8 802415F8 01042023 */ subu $a0, $t0, $a0 -/* BE4DAC 802415FC 00041840 */ sll $v1, $a0, 1 -/* BE4DB0 80241600 00641821 */ addu $v1, $v1, $a0 -/* BE4DB4 80241604 00431023 */ subu $v0, $v0, $v1 -/* BE4DB8 80241608 24430002 */ addiu $v1, $v0, 2 -/* BE4DBC 8024160C AE630074 */ sw $v1, 0x74($s3) -/* BE4DC0 80241610 8E42002C */ lw $v0, 0x2c($s2) -/* BE4DC4 80241614 58400007 */ blezl $v0, .L80241634 -/* BE4DC8 80241618 AE600070 */ sw $zero, 0x70($s3) -/* BE4DCC 8024161C 8E420008 */ lw $v0, 8($s2) -/* BE4DD0 80241620 18400003 */ blez $v0, .L80241630 -/* BE4DD4 80241624 28620003 */ slti $v0, $v1, 3 -/* BE4DD8 80241628 10400002 */ beqz $v0, .L80241634 -/* BE4DDC 8024162C 00000000 */ nop -.L80241630: -/* BE4DE0 80241630 AE600070 */ sw $zero, 0x70($s3) -.L80241634: -/* BE4DE4 80241634 8FBF0058 */ lw $ra, 0x58($sp) -/* BE4DE8 80241638 8FB50054 */ lw $s5, 0x54($sp) -/* BE4DEC 8024163C 8FB40050 */ lw $s4, 0x50($sp) -/* BE4DF0 80241640 8FB3004C */ lw $s3, 0x4c($sp) -/* BE4DF4 80241644 8FB20048 */ lw $s2, 0x48($sp) -/* BE4DF8 80241648 8FB10044 */ lw $s1, 0x44($sp) -/* BE4DFC 8024164C 8FB00040 */ lw $s0, 0x40($sp) -/* BE4E00 80241650 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* BE4E04 80241654 D7B80070 */ ldc1 $f24, 0x70($sp) -/* BE4E08 80241658 D7B60068 */ ldc1 $f22, 0x68($sp) -/* BE4E0C 8024165C D7B40060 */ ldc1 $f20, 0x60($sp) -/* BE4E10 80241660 03E00008 */ jr $ra -/* BE4E14 80241664 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_07/events/arn_07_func_80240B00_BED8F0.s b/ver/us/asm/nonmatchings/world/area_arn/arn_07/events/arn_07_func_80240B00_BED8F0.s deleted file mode 100644 index efc6da86be..0000000000 --- a/ver/us/asm/nonmatchings/world/area_arn/arn_07/events/arn_07_func_80240B00_BED8F0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247958_BF4748 -.double 0.09 - -dlabel D_80247960_BF4750 -.double 0.09 - -.section .text - -glabel arn_07_func_80240B00_BED8F0 -/* BED8F0 80240B00 27BDFF80 */ addiu $sp, $sp, -0x80 -/* BED8F4 80240B04 AFB3004C */ sw $s3, 0x4c($sp) -/* BED8F8 80240B08 0080982D */ daddu $s3, $a0, $zero -/* BED8FC 80240B0C AFBF0058 */ sw $ra, 0x58($sp) -/* BED900 80240B10 AFB50054 */ sw $s5, 0x54($sp) -/* BED904 80240B14 AFB40050 */ sw $s4, 0x50($sp) -/* BED908 80240B18 AFB20048 */ sw $s2, 0x48($sp) -/* BED90C 80240B1C AFB10044 */ sw $s1, 0x44($sp) -/* BED910 80240B20 AFB00040 */ sw $s0, 0x40($sp) -/* BED914 80240B24 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* BED918 80240B28 F7B80070 */ sdc1 $f24, 0x70($sp) -/* BED91C 80240B2C F7B60068 */ sdc1 $f22, 0x68($sp) -/* BED920 80240B30 F7B40060 */ sdc1 $f20, 0x60($sp) -/* BED924 80240B34 8E710148 */ lw $s1, 0x148($s3) -/* BED928 80240B38 00A0902D */ daddu $s2, $a1, $zero -/* BED92C 80240B3C 86240008 */ lh $a0, 8($s1) -/* BED930 80240B40 0C00EABB */ jal get_npc_unsafe -/* BED934 80240B44 00C0A82D */ daddu $s5, $a2, $zero -/* BED938 80240B48 0040802D */ daddu $s0, $v0, $zero -/* BED93C 80240B4C 0000A02D */ daddu $s4, $zero, $zero -/* BED940 80240B50 C624007C */ lwc1 $f4, 0x7c($s1) -/* BED944 80240B54 46802120 */ cvt.s.w $f4, $f4 -/* BED948 80240B58 C6220088 */ lwc1 $f2, 0x88($s1) -/* BED94C 80240B5C 468010A0 */ cvt.s.w $f2, $f2 -/* BED950 80240B60 460010A1 */ cvt.d.s $f2, $f2 -/* BED954 80240B64 46002121 */ cvt.d.s $f4, $f4 -/* BED958 80240B68 C600003C */ lwc1 $f0, 0x3c($s0) -/* BED95C 80240B6C 3C014059 */ lui $at, 0x4059 -/* BED960 80240B70 44813800 */ mtc1 $at, $f7 -/* BED964 80240B74 44803000 */ mtc1 $zero, $f6 -/* BED968 80240B78 46000021 */ cvt.d.s $f0, $f0 -/* BED96C 80240B7C 46260002 */ mul.d $f0, $f0, $f6 -/* BED970 80240B80 00000000 */ nop -/* BED974 80240B84 24020001 */ addiu $v0, $zero, 1 -/* BED978 80240B88 8E24006C */ lw $a0, 0x6c($s1) -/* BED97C 80240B8C 46261083 */ div.d $f2, $f2, $f6 -/* BED980 80240B90 462010A0 */ cvt.s.d $f2, $f2 -/* BED984 80240B94 46262103 */ div.d $f4, $f4, $f6 -/* BED988 80240B98 46202520 */ cvt.s.d $f20, $f4 -/* BED98C 80240B9C 30830011 */ andi $v1, $a0, 0x11 -/* BED990 80240BA0 4620020D */ trunc.w.d $f8, $f0 -/* BED994 80240BA4 E628007C */ swc1 $f8, 0x7c($s1) -/* BED998 80240BA8 C6200078 */ lwc1 $f0, 0x78($s1) -/* BED99C 80240BAC 46800020 */ cvt.s.w $f0, $f0 -/* BED9A0 80240BB0 46000021 */ cvt.d.s $f0, $f0 -/* BED9A4 80240BB4 46260003 */ div.d $f0, $f0, $f6 -/* BED9A8 80240BB8 462006A0 */ cvt.s.d $f26, $f0 -/* BED9AC 80240BBC C6200070 */ lwc1 $f0, 0x70($s1) -/* BED9B0 80240BC0 46800020 */ cvt.s.w $f0, $f0 -/* BED9B4 80240BC4 46000021 */ cvt.d.s $f0, $f0 -/* BED9B8 80240BC8 46260003 */ div.d $f0, $f0, $f6 -/* BED9BC 80240BCC 462005A0 */ cvt.s.d $f22, $f0 -/* BED9C0 80240BD0 14620025 */ bne $v1, $v0, .L80240C68 -/* BED9C4 80240BD4 4602D600 */ add.s $f24, $f26, $f2 -/* BED9C8 80240BD8 8E020000 */ lw $v0, ($s0) -/* BED9CC 80240BDC 30420008 */ andi $v0, $v0, 8 -/* BED9D0 80240BE0 10400009 */ beqz $v0, .L80240C08 -/* BED9D4 80240BE4 27A50028 */ addiu $a1, $sp, 0x28 -/* BED9D8 80240BE8 C600003C */ lwc1 $f0, 0x3c($s0) -/* BED9DC 80240BEC 4600C001 */ sub.s $f0, $f24, $f0 -/* BED9E0 80240BF0 4600B03C */ c.lt.s $f22, $f0 -/* BED9E4 80240BF4 00000000 */ nop -/* BED9E8 80240BF8 4500001B */ bc1f .L80240C68 -/* BED9EC 80240BFC 34820010 */ ori $v0, $a0, 0x10 -/* BED9F0 80240C00 0809031A */ j .L80240C68 -/* BED9F4 80240C04 AE22006C */ sw $v0, 0x6c($s1) -.L80240C08: -/* BED9F8 80240C08 27A6002C */ addiu $a2, $sp, 0x2c -/* BED9FC 80240C0C C6000038 */ lwc1 $f0, 0x38($s0) -/* BEDA00 80240C10 C602003C */ lwc1 $f2, 0x3c($s0) -/* BEDA04 80240C14 C6040040 */ lwc1 $f4, 0x40($s0) -/* BEDA08 80240C18 3C01447A */ lui $at, 0x447a -/* BEDA0C 80240C1C 44813000 */ mtc1 $at, $f6 -/* BEDA10 80240C20 27A20034 */ addiu $v0, $sp, 0x34 -/* BEDA14 80240C24 E7A00028 */ swc1 $f0, 0x28($sp) -/* BEDA18 80240C28 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BEDA1C 80240C2C E7A40030 */ swc1 $f4, 0x30($sp) -/* BEDA20 80240C30 E7A60034 */ swc1 $f6, 0x34($sp) -/* BEDA24 80240C34 AFA20010 */ sw $v0, 0x10($sp) -/* BEDA28 80240C38 8E040080 */ lw $a0, 0x80($s0) -/* BEDA2C 80240C3C 0C0372DF */ jal npc_raycast_down_sides -/* BEDA30 80240C40 27A70030 */ addiu $a3, $sp, 0x30 -/* BEDA34 80240C44 C7A00034 */ lwc1 $f0, 0x34($sp) -/* BEDA38 80240C48 4600D001 */ sub.s $f0, $f26, $f0 -/* BEDA3C 80240C4C 4600B03C */ c.lt.s $f22, $f0 -/* BEDA40 80240C50 00000000 */ nop -/* BEDA44 80240C54 45000004 */ bc1f .L80240C68 -/* BEDA48 80240C58 00000000 */ nop -/* BEDA4C 80240C5C 8E22006C */ lw $v0, 0x6c($s1) -/* BEDA50 80240C60 34420010 */ ori $v0, $v0, 0x10 -/* BEDA54 80240C64 AE22006C */ sw $v0, 0x6c($s1) -.L80240C68: -/* BEDA58 80240C68 8E22006C */ lw $v0, 0x6c($s1) -/* BEDA5C 80240C6C 24030011 */ addiu $v1, $zero, 0x11 -/* BEDA60 80240C70 30420011 */ andi $v0, $v0, 0x11 -/* BEDA64 80240C74 14430039 */ bne $v0, $v1, .L80240D5C -/* BEDA68 80240C78 00000000 */ nop -/* BEDA6C 80240C7C 8E020000 */ lw $v0, ($s0) -/* BEDA70 80240C80 30420008 */ andi $v0, $v0, 8 -/* BEDA74 80240C84 1040000A */ beqz $v0, .L80240CB0 -/* BEDA78 80240C88 4600C106 */ mov.s $f4, $f24 -/* BEDA7C 80240C8C 4614C081 */ sub.s $f2, $f24, $f20 -/* BEDA80 80240C90 3C018024 */ lui $at, %hi(D_80247958_BF4748) -/* BEDA84 80240C94 D4207958 */ ldc1 $f0, %lo(D_80247958_BF4748)($at) -/* BEDA88 80240C98 460010A1 */ cvt.d.s $f2, $f2 -/* BEDA8C 80240C9C 46201082 */ mul.d $f2, $f2, $f0 -/* BEDA90 80240CA0 00000000 */ nop -/* BEDA94 80240CA4 4600A021 */ cvt.d.s $f0, $f20 -/* BEDA98 80240CA8 08090345 */ j .L80240D14 -/* BEDA9C 80240CAC 46220000 */ add.d $f0, $f0, $f2 -.L80240CB0: -/* BEDAA0 80240CB0 27A50028 */ addiu $a1, $sp, 0x28 -/* BEDAA4 80240CB4 27A6002C */ addiu $a2, $sp, 0x2c -/* BEDAA8 80240CB8 C6000038 */ lwc1 $f0, 0x38($s0) -/* BEDAAC 80240CBC C6020040 */ lwc1 $f2, 0x40($s0) -/* BEDAB0 80240CC0 3C01447A */ lui $at, 0x447a -/* BEDAB4 80240CC4 44812000 */ mtc1 $at, $f4 -/* BEDAB8 80240CC8 27A20034 */ addiu $v0, $sp, 0x34 -/* BEDABC 80240CCC E7B4002C */ swc1 $f20, 0x2c($sp) -/* BEDAC0 80240CD0 E7A00028 */ swc1 $f0, 0x28($sp) -/* BEDAC4 80240CD4 E7A20030 */ swc1 $f2, 0x30($sp) -/* BEDAC8 80240CD8 E7A40034 */ swc1 $f4, 0x34($sp) -/* BEDACC 80240CDC AFA20010 */ sw $v0, 0x10($sp) -/* BEDAD0 80240CE0 8E040080 */ lw $a0, 0x80($s0) -/* BEDAD4 80240CE4 0C0372DF */ jal npc_raycast_down_sides -/* BEDAD8 80240CE8 27A70030 */ addiu $a3, $sp, 0x30 -/* BEDADC 80240CEC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* BEDAE0 80240CF0 461A2100 */ add.s $f4, $f4, $f26 -/* BEDAE4 80240CF4 46142081 */ sub.s $f2, $f4, $f20 -/* BEDAE8 80240CF8 3C018024 */ lui $at, %hi(D_80247960_BF4750) -/* BEDAEC 80240CFC D4207960 */ ldc1 $f0, %lo(D_80247960_BF4750)($at) -/* BEDAF0 80240D00 460010A1 */ cvt.d.s $f2, $f2 -/* BEDAF4 80240D04 46201082 */ mul.d $f2, $f2, $f0 -/* BEDAF8 80240D08 00000000 */ nop -/* BEDAFC 80240D0C 4600A021 */ cvt.d.s $f0, $f20 -/* BEDB00 80240D10 46220000 */ add.d $f0, $f0, $f2 -.L80240D14: -/* BEDB04 80240D14 46200020 */ cvt.s.d $f0, $f0 -/* BEDB08 80240D18 E600003C */ swc1 $f0, 0x3c($s0) -/* BEDB0C 80240D1C C600003C */ lwc1 $f0, 0x3c($s0) -/* BEDB10 80240D20 46002001 */ sub.s $f0, $f4, $f0 -/* BEDB14 80240D24 3C013FF0 */ lui $at, 0x3ff0 -/* BEDB18 80240D28 44811800 */ mtc1 $at, $f3 -/* BEDB1C 80240D2C 44801000 */ mtc1 $zero, $f2 -/* BEDB20 80240D30 46000005 */ abs.s $f0, $f0 -/* BEDB24 80240D34 46000021 */ cvt.d.s $f0, $f0 -/* BEDB28 80240D38 4622003C */ c.lt.d $f0, $f2 -/* BEDB2C 80240D3C 00000000 */ nop -/* BEDB30 80240D40 45000036 */ bc1f .L80240E1C -/* BEDB34 80240D44 2403FFEF */ addiu $v1, $zero, -0x11 -/* BEDB38 80240D48 E604003C */ swc1 $f4, 0x3c($s0) -/* BEDB3C 80240D4C 8E22006C */ lw $v0, 0x6c($s1) -/* BEDB40 80240D50 00431024 */ and $v0, $v0, $v1 -/* BEDB44 80240D54 08090387 */ j .L80240E1C -/* BEDB48 80240D58 AE22006C */ sw $v0, 0x6c($s1) -.L80240D5C: -/* BEDB4C 80240D5C 8E220070 */ lw $v0, 0x70($s1) -/* BEDB50 80240D60 1840002E */ blez $v0, .L80240E1C -/* BEDB54 80240D64 00000000 */ nop -/* BEDB58 80240D68 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BEDB5C 80240D6C 0C00A8BB */ jal sin_deg -/* BEDB60 80240D70 46806320 */ cvt.s.w $f12, $f12 -/* BEDB64 80240D74 8E020000 */ lw $v0, ($s0) -/* BEDB68 80240D78 30420008 */ andi $v0, $v0, 8 -/* BEDB6C 80240D7C 10400003 */ beqz $v0, .L80240D8C -/* BEDB70 80240D80 46000506 */ mov.s $f20, $f0 -/* BEDB74 80240D84 08090373 */ j .L80240DCC -/* BEDB78 80240D88 0000102D */ daddu $v0, $zero, $zero -.L80240D8C: -/* BEDB7C 80240D8C 27A50028 */ addiu $a1, $sp, 0x28 -/* BEDB80 80240D90 27A6002C */ addiu $a2, $sp, 0x2c -/* BEDB84 80240D94 C6000038 */ lwc1 $f0, 0x38($s0) -/* BEDB88 80240D98 C602003C */ lwc1 $f2, 0x3c($s0) -/* BEDB8C 80240D9C C6040040 */ lwc1 $f4, 0x40($s0) -/* BEDB90 80240DA0 3C01447A */ lui $at, 0x447a -/* BEDB94 80240DA4 44813000 */ mtc1 $at, $f6 -/* BEDB98 80240DA8 27A20034 */ addiu $v0, $sp, 0x34 -/* BEDB9C 80240DAC E7A00028 */ swc1 $f0, 0x28($sp) -/* BEDBA0 80240DB0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BEDBA4 80240DB4 E7A40030 */ swc1 $f4, 0x30($sp) -/* BEDBA8 80240DB8 E7A60034 */ swc1 $f6, 0x34($sp) -/* BEDBAC 80240DBC AFA20010 */ sw $v0, 0x10($sp) -/* BEDBB0 80240DC0 8E040080 */ lw $a0, 0x80($s0) -/* BEDBB4 80240DC4 0C0372DF */ jal npc_raycast_down_sides -/* BEDBB8 80240DC8 27A70030 */ addiu $a3, $sp, 0x30 -.L80240DCC: -/* BEDBBC 80240DCC 10400007 */ beqz $v0, .L80240DEC -/* BEDBC0 80240DD0 00000000 */ nop -/* BEDBC4 80240DD4 4616A082 */ mul.s $f2, $f20, $f22 -/* BEDBC8 80240DD8 00000000 */ nop -/* BEDBCC 80240DDC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BEDBD0 80240DE0 461A0000 */ add.s $f0, $f0, $f26 -/* BEDBD4 80240DE4 0809037E */ j .L80240DF8 -/* BEDBD8 80240DE8 46020000 */ add.s $f0, $f0, $f2 -.L80240DEC: -/* BEDBDC 80240DEC 4616A002 */ mul.s $f0, $f20, $f22 -/* BEDBE0 80240DF0 00000000 */ nop -/* BEDBE4 80240DF4 4600C000 */ add.s $f0, $f24, $f0 -.L80240DF8: -/* BEDBE8 80240DF8 E600003C */ swc1 $f0, 0x3c($s0) -/* BEDBEC 80240DFC 8E220074 */ lw $v0, 0x74($s1) -/* BEDBF0 80240E00 2442000A */ addiu $v0, $v0, 0xa -/* BEDBF4 80240E04 44826000 */ mtc1 $v0, $f12 -/* BEDBF8 80240E08 00000000 */ nop -/* BEDBFC 80240E0C 0C00A6C9 */ jal clamp_angle -/* BEDC00 80240E10 46806320 */ cvt.s.w $f12, $f12 -/* BEDC04 80240E14 4600020D */ trunc.w.s $f8, $f0 -/* BEDC08 80240E18 E6280074 */ swc1 $f8, 0x74($s1) -.L80240E1C: -/* BEDC0C 80240E1C 8E220090 */ lw $v0, 0x90($s1) -/* BEDC10 80240E20 1C40004A */ bgtz $v0, .L80240F4C -/* BEDC14 80240E24 2442FFFF */ addiu $v0, $v0, -1 -/* BEDC18 80240E28 8E430014 */ lw $v1, 0x14($s2) -/* BEDC1C 80240E2C 04600048 */ bltz $v1, .L80240F50 -/* BEDC20 80240E30 00000000 */ nop -/* BEDC24 80240E34 8E620074 */ lw $v0, 0x74($s3) -/* BEDC28 80240E38 1C400042 */ bgtz $v0, .L80240F44 -/* BEDC2C 80240E3C 2442FFFF */ addiu $v0, $v0, -1 -/* BEDC30 80240E40 AE630074 */ sw $v1, 0x74($s3) -/* BEDC34 80240E44 860200A8 */ lh $v0, 0xa8($s0) -/* BEDC38 80240E48 C602003C */ lwc1 $f2, 0x3c($s0) -/* BEDC3C 80240E4C 44820000 */ mtc1 $v0, $f0 -/* BEDC40 80240E50 00000000 */ nop -/* BEDC44 80240E54 46800020 */ cvt.s.w $f0, $f0 -/* BEDC48 80240E58 46001080 */ add.s $f2, $f2, $f0 -/* BEDC4C 80240E5C 3C014024 */ lui $at, 0x4024 -/* BEDC50 80240E60 44810800 */ mtc1 $at, $f1 -/* BEDC54 80240E64 44800000 */ mtc1 $zero, $f0 -/* BEDC58 80240E68 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BEDC5C 80240E6C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BEDC60 80240E70 460010A1 */ cvt.d.s $f2, $f2 -/* BEDC64 80240E74 46201080 */ add.d $f2, $f2, $f0 -/* BEDC68 80240E78 C440002C */ lwc1 $f0, 0x2c($v0) -/* BEDC6C 80240E7C 46000021 */ cvt.d.s $f0, $f0 -/* BEDC70 80240E80 4622003C */ c.lt.d $f0, $f2 -/* BEDC74 80240E84 00000000 */ nop -/* BEDC78 80240E88 4500002C */ bc1f .L80240F3C -/* BEDC7C 80240E8C 02A0202D */ daddu $a0, $s5, $zero -/* BEDC80 80240E90 AFA00010 */ sw $zero, 0x10($sp) -/* BEDC84 80240E94 8E46000C */ lw $a2, 0xc($s2) -/* BEDC88 80240E98 8E470010 */ lw $a3, 0x10($s2) -/* BEDC8C 80240E9C 0C01242D */ jal func_800490B4 -/* BEDC90 80240EA0 0220282D */ daddu $a1, $s1, $zero -/* BEDC94 80240EA4 10400025 */ beqz $v0, .L80240F3C -/* BEDC98 80240EA8 0000202D */ daddu $a0, $zero, $zero -/* BEDC9C 80240EAC 0200282D */ daddu $a1, $s0, $zero -/* BEDCA0 80240EB0 0000302D */ daddu $a2, $zero, $zero -/* BEDCA4 80240EB4 2412000C */ addiu $s2, $zero, 0xc -/* BEDCA8 80240EB8 860300A8 */ lh $v1, 0xa8($s0) -/* BEDCAC 80240EBC 3C013F80 */ lui $at, 0x3f80 -/* BEDCB0 80240EC0 44810000 */ mtc1 $at, $f0 -/* BEDCB4 80240EC4 3C014000 */ lui $at, 0x4000 -/* BEDCB8 80240EC8 44811000 */ mtc1 $at, $f2 -/* BEDCBC 80240ECC 3C01C1A0 */ lui $at, 0xc1a0 -/* BEDCC0 80240ED0 44812000 */ mtc1 $at, $f4 -/* BEDCC4 80240ED4 44834000 */ mtc1 $v1, $f8 -/* BEDCC8 80240ED8 00000000 */ nop -/* BEDCCC 80240EDC 46804220 */ cvt.s.w $f8, $f8 -/* BEDCD0 80240EE0 44074000 */ mfc1 $a3, $f8 -/* BEDCD4 80240EE4 27A20038 */ addiu $v0, $sp, 0x38 -/* BEDCD8 80240EE8 AFB2001C */ sw $s2, 0x1c($sp) -/* BEDCDC 80240EEC AFA20020 */ sw $v0, 0x20($sp) -/* BEDCE0 80240EF0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BEDCE4 80240EF4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BEDCE8 80240EF8 0C01BFA4 */ jal fx_emote -/* BEDCEC 80240EFC E7A40018 */ swc1 $f4, 0x18($sp) -/* BEDCF0 80240F00 0200202D */ daddu $a0, $s0, $zero -/* BEDCF4 80240F04 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BEDCF8 80240F08 C480003C */ lwc1 $f0, 0x3c($a0) -/* BEDCFC 80240F0C 3C060020 */ lui $a2, 0x20 -/* BEDD00 80240F10 0C012530 */ jal ai_enemy_play_sound -/* BEDD04 80240F14 E4800064 */ swc1 $f0, 0x64($a0) -/* BEDD08 80240F18 8E220018 */ lw $v0, 0x18($s1) -/* BEDD0C 80240F1C 9442002A */ lhu $v0, 0x2a($v0) -/* BEDD10 80240F20 30420001 */ andi $v0, $v0, 1 -/* BEDD14 80240F24 10400003 */ beqz $v0, .L80240F34 -/* BEDD18 80240F28 2402000A */ addiu $v0, $zero, 0xa -/* BEDD1C 80240F2C 0809043D */ j .L802410F4 -/* BEDD20 80240F30 AE620070 */ sw $v0, 0x70($s3) -.L80240F34: -/* BEDD24 80240F34 0809043D */ j .L802410F4 -/* BEDD28 80240F38 AE720070 */ sw $s2, 0x70($s3) -.L80240F3C: -/* BEDD2C 80240F3C 8E620074 */ lw $v0, 0x74($s3) -/* BEDD30 80240F40 2442FFFF */ addiu $v0, $v0, -1 -.L80240F44: -/* BEDD34 80240F44 080903D4 */ j .L80240F50 -/* BEDD38 80240F48 AE620074 */ sw $v0, 0x74($s3) -.L80240F4C: -/* BEDD3C 80240F4C AE220090 */ sw $v0, 0x90($s1) -.L80240F50: -/* BEDD40 80240F50 8E2300D0 */ lw $v1, 0xd0($s1) -/* BEDD44 80240F54 C6000040 */ lwc1 $f0, 0x40($s0) -/* BEDD48 80240F58 C4620000 */ lwc1 $f2, ($v1) -/* BEDD4C 80240F5C 468010A0 */ cvt.s.w $f2, $f2 -/* BEDD50 80240F60 C4640008 */ lwc1 $f4, 8($v1) -/* BEDD54 80240F64 46802120 */ cvt.s.w $f4, $f4 -/* BEDD58 80240F68 E7A00010 */ swc1 $f0, 0x10($sp) -/* BEDD5C 80240F6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BEDD60 80240F70 44051000 */ mfc1 $a1, $f2 -/* BEDD64 80240F74 C440000C */ lwc1 $f0, 0xc($v0) -/* BEDD68 80240F78 46800020 */ cvt.s.w $f0, $f0 -/* BEDD6C 80240F7C E7A00014 */ swc1 $f0, 0x14($sp) -/* BEDD70 80240F80 8E2200D0 */ lw $v0, 0xd0($s1) -/* BEDD74 80240F84 44062000 */ mfc1 $a2, $f4 -/* BEDD78 80240F88 C4400010 */ lwc1 $f0, 0x10($v0) -/* BEDD7C 80240F8C 46800020 */ cvt.s.w $f0, $f0 -/* BEDD80 80240F90 E7A00018 */ swc1 $f0, 0x18($sp) -/* BEDD84 80240F94 8C640018 */ lw $a0, 0x18($v1) -/* BEDD88 80240F98 0C0123F5 */ jal is_point_within_region -/* BEDD8C 80240F9C 8E070038 */ lw $a3, 0x38($s0) -/* BEDD90 80240FA0 1040001A */ beqz $v0, .L8024100C -/* BEDD94 80240FA4 00000000 */ nop -/* BEDD98 80240FA8 8E060038 */ lw $a2, 0x38($s0) -/* BEDD9C 80240FAC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BEDDA0 80240FB0 8E070040 */ lw $a3, 0x40($s0) -/* BEDDA4 80240FB4 C44C0000 */ lwc1 $f12, ($v0) -/* BEDDA8 80240FB8 46806320 */ cvt.s.w $f12, $f12 -/* BEDDAC 80240FBC C44E0008 */ lwc1 $f14, 8($v0) -/* BEDDB0 80240FC0 0C00A7B5 */ jal dist2D -/* BEDDB4 80240FC4 468073A0 */ cvt.s.w $f14, $f14 -/* BEDDB8 80240FC8 C6020018 */ lwc1 $f2, 0x18($s0) -/* BEDDBC 80240FCC 4600103C */ c.lt.s $f2, $f0 -/* BEDDC0 80240FD0 00000000 */ nop -/* BEDDC4 80240FD4 4500000D */ bc1f .L8024100C -/* BEDDC8 80240FD8 E7A00034 */ swc1 $f0, 0x34($sp) -/* BEDDCC 80240FDC C60C0038 */ lwc1 $f12, 0x38($s0) -/* BEDDD0 80240FE0 8E2200D0 */ lw $v0, 0xd0($s1) -/* BEDDD4 80240FE4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BEDDD8 80240FE8 C4480000 */ lwc1 $f8, ($v0) -/* BEDDDC 80240FEC 46804220 */ cvt.s.w $f8, $f8 -/* BEDDE0 80240FF0 44064000 */ mfc1 $a2, $f8 -/* BEDDE4 80240FF4 C4480008 */ lwc1 $f8, 8($v0) -/* BEDDE8 80240FF8 46804220 */ cvt.s.w $f8, $f8 -/* BEDDEC 80240FFC 44074000 */ mfc1 $a3, $f8 -/* BEDDF0 80241000 0C00A720 */ jal atan2 -/* BEDDF4 80241004 24140001 */ addiu $s4, $zero, 1 -/* BEDDF8 80241008 E600000C */ swc1 $f0, 0xc($s0) -.L8024100C: -/* BEDDFC 8024100C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BEDE00 80241010 8C43000C */ lw $v1, 0xc($v0) -/* BEDE04 80241014 8C420010 */ lw $v0, 0x10($v0) -/* BEDE08 80241018 00621825 */ or $v1, $v1, $v0 -/* BEDE0C 8024101C 00741825 */ or $v1, $v1, $s4 -/* BEDE10 80241020 10600008 */ beqz $v1, .L80241044 -/* BEDE14 80241024 00000000 */ nop -/* BEDE18 80241028 8602008C */ lh $v0, 0x8c($s0) -/* BEDE1C 8024102C 14400031 */ bnez $v0, .L802410F4 -/* BEDE20 80241030 00000000 */ nop -/* BEDE24 80241034 8E050018 */ lw $a1, 0x18($s0) -/* BEDE28 80241038 8E06000C */ lw $a2, 0xc($s0) -/* BEDE2C 8024103C 0C00EA95 */ jal npc_move_heading -/* BEDE30 80241040 0200202D */ daddu $a0, $s0, $zero -.L80241044: -/* BEDE34 80241044 C600003C */ lwc1 $f0, 0x3c($s0) -/* BEDE38 80241048 3C014059 */ lui $at, 0x4059 -/* BEDE3C 8024104C 44811800 */ mtc1 $at, $f3 -/* BEDE40 80241050 44801000 */ mtc1 $zero, $f2 -/* BEDE44 80241054 46000021 */ cvt.d.s $f0, $f0 -/* BEDE48 80241058 46220002 */ mul.d $f0, $f0, $f2 -/* BEDE4C 8024105C 00000000 */ nop -/* BEDE50 80241060 4620020D */ trunc.w.d $f8, $f0 -/* BEDE54 80241064 E628007C */ swc1 $f8, 0x7c($s1) -/* BEDE58 80241068 8E420004 */ lw $v0, 4($s2) -/* BEDE5C 8024106C 18400021 */ blez $v0, .L802410F4 -/* BEDE60 80241070 00000000 */ nop -/* BEDE64 80241074 8602008E */ lh $v0, 0x8e($s0) -/* BEDE68 80241078 9603008E */ lhu $v1, 0x8e($s0) -/* BEDE6C 8024107C 18400005 */ blez $v0, .L80241094 -/* BEDE70 80241080 2462FFFF */ addiu $v0, $v1, -1 -/* BEDE74 80241084 A602008E */ sh $v0, 0x8e($s0) -/* BEDE78 80241088 00021400 */ sll $v0, $v0, 0x10 -/* BEDE7C 8024108C 1C400019 */ bgtz $v0, .L802410F4 -/* BEDE80 80241090 00000000 */ nop -.L80241094: -/* BEDE84 80241094 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BEDE88 80241098 24020002 */ addiu $v0, $zero, 2 -/* BEDE8C 8024109C 0C00A67F */ jal rand_int -/* BEDE90 802410A0 AE620070 */ sw $v0, 0x70($s3) -/* BEDE94 802410A4 3C035555 */ lui $v1, 0x5555 -/* BEDE98 802410A8 34635556 */ ori $v1, $v1, 0x5556 -/* BEDE9C 802410AC 00430018 */ mult $v0, $v1 -/* BEDEA0 802410B0 000227C3 */ sra $a0, $v0, 0x1f -/* BEDEA4 802410B4 00004010 */ mfhi $t0 -/* BEDEA8 802410B8 01042023 */ subu $a0, $t0, $a0 -/* BEDEAC 802410BC 00041840 */ sll $v1, $a0, 1 -/* BEDEB0 802410C0 00641821 */ addu $v1, $v1, $a0 -/* BEDEB4 802410C4 00431023 */ subu $v0, $v0, $v1 -/* BEDEB8 802410C8 24430002 */ addiu $v1, $v0, 2 -/* BEDEBC 802410CC AE630074 */ sw $v1, 0x74($s3) -/* BEDEC0 802410D0 8E42002C */ lw $v0, 0x2c($s2) -/* BEDEC4 802410D4 58400007 */ blezl $v0, .L802410F4 -/* BEDEC8 802410D8 AE600070 */ sw $zero, 0x70($s3) -/* BEDECC 802410DC 8E420008 */ lw $v0, 8($s2) -/* BEDED0 802410E0 18400003 */ blez $v0, .L802410F0 -/* BEDED4 802410E4 28620003 */ slti $v0, $v1, 3 -/* BEDED8 802410E8 10400002 */ beqz $v0, .L802410F4 -/* BEDEDC 802410EC 00000000 */ nop -.L802410F0: -/* BEDEE0 802410F0 AE600070 */ sw $zero, 0x70($s3) -.L802410F4: -/* BEDEE4 802410F4 8FBF0058 */ lw $ra, 0x58($sp) -/* BEDEE8 802410F8 8FB50054 */ lw $s5, 0x54($sp) -/* BEDEEC 802410FC 8FB40050 */ lw $s4, 0x50($sp) -/* BEDEF0 80241100 8FB3004C */ lw $s3, 0x4c($sp) -/* BEDEF4 80241104 8FB20048 */ lw $s2, 0x48($sp) -/* BEDEF8 80241108 8FB10044 */ lw $s1, 0x44($sp) -/* BEDEFC 8024110C 8FB00040 */ lw $s0, 0x40($sp) -/* BEDF00 80241110 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* BEDF04 80241114 D7B80070 */ ldc1 $f24, 0x70($sp) -/* BEDF08 80241118 D7B60068 */ ldc1 $f22, 0x68($sp) -/* BEDF0C 8024111C D7B40060 */ ldc1 $f20, 0x60($sp) -/* BEDF10 80241120 03E00008 */ jr $ra -/* BEDF14 80241124 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/dgb_01_func_802402D0_BFDB50.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/dgb_01_func_802402D0_BFDB50.s deleted file mode 100644 index da0ba59dbf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/dgb_01_func_802402D0_BFDB50.s +++ /dev/null @@ -1,426 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata -dlabel D_80263428_C20CA8 -.double 0.09 - -dlabel D_80263430_C20CB0 -.double 0.09 - -.section .text -glabel func_802402D0_BFDB50 -/* BFDB50 802402D0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* BFDB54 802402D4 AFB3004C */ sw $s3, 0x4c($sp) -/* BFDB58 802402D8 0080982D */ daddu $s3, $a0, $zero -/* BFDB5C 802402DC AFBF0058 */ sw $ra, 0x58($sp) -/* BFDB60 802402E0 AFB50054 */ sw $s5, 0x54($sp) -/* BFDB64 802402E4 AFB40050 */ sw $s4, 0x50($sp) -/* BFDB68 802402E8 AFB20048 */ sw $s2, 0x48($sp) -/* BFDB6C 802402EC AFB10044 */ sw $s1, 0x44($sp) -/* BFDB70 802402F0 AFB00040 */ sw $s0, 0x40($sp) -/* BFDB74 802402F4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* BFDB78 802402F8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* BFDB7C 802402FC F7B60068 */ sdc1 $f22, 0x68($sp) -/* BFDB80 80240300 F7B40060 */ sdc1 $f20, 0x60($sp) -/* BFDB84 80240304 8E710148 */ lw $s1, 0x148($s3) -/* BFDB88 80240308 00A0902D */ daddu $s2, $a1, $zero -/* BFDB8C 8024030C 86240008 */ lh $a0, 8($s1) -/* BFDB90 80240310 0C00EABB */ jal get_npc_unsafe -/* BFDB94 80240314 00C0A82D */ daddu $s5, $a2, $zero -/* BFDB98 80240318 0040802D */ daddu $s0, $v0, $zero -/* BFDB9C 8024031C 0000A02D */ daddu $s4, $zero, $zero -/* BFDBA0 80240320 C624007C */ lwc1 $f4, 0x7c($s1) -/* BFDBA4 80240324 46802120 */ cvt.s.w $f4, $f4 -/* BFDBA8 80240328 C6220088 */ lwc1 $f2, 0x88($s1) -/* BFDBAC 8024032C 468010A0 */ cvt.s.w $f2, $f2 -/* BFDBB0 80240330 460010A1 */ cvt.d.s $f2, $f2 -/* BFDBB4 80240334 46002121 */ cvt.d.s $f4, $f4 -/* BFDBB8 80240338 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFDBBC 8024033C 3C014059 */ lui $at, 0x4059 -/* BFDBC0 80240340 44813800 */ mtc1 $at, $f7 -/* BFDBC4 80240344 44803000 */ mtc1 $zero, $f6 -/* BFDBC8 80240348 46000021 */ cvt.d.s $f0, $f0 -/* BFDBCC 8024034C 46260002 */ mul.d $f0, $f0, $f6 -/* BFDBD0 80240350 00000000 */ nop -/* BFDBD4 80240354 24020001 */ addiu $v0, $zero, 1 -/* BFDBD8 80240358 8E24006C */ lw $a0, 0x6c($s1) -/* BFDBDC 8024035C 46261083 */ div.d $f2, $f2, $f6 -/* BFDBE0 80240360 462010A0 */ cvt.s.d $f2, $f2 -/* BFDBE4 80240364 46262103 */ div.d $f4, $f4, $f6 -/* BFDBE8 80240368 46202520 */ cvt.s.d $f20, $f4 -/* BFDBEC 8024036C 30830011 */ andi $v1, $a0, 0x11 -/* BFDBF0 80240370 4620020D */ trunc.w.d $f8, $f0 -/* BFDBF4 80240374 E628007C */ swc1 $f8, 0x7c($s1) -/* BFDBF8 80240378 C6200078 */ lwc1 $f0, 0x78($s1) -/* BFDBFC 8024037C 46800020 */ cvt.s.w $f0, $f0 -/* BFDC00 80240380 46000021 */ cvt.d.s $f0, $f0 -/* BFDC04 80240384 46260003 */ div.d $f0, $f0, $f6 -/* BFDC08 80240388 462006A0 */ cvt.s.d $f26, $f0 -/* BFDC0C 8024038C C6200070 */ lwc1 $f0, 0x70($s1) -/* BFDC10 80240390 46800020 */ cvt.s.w $f0, $f0 -/* BFDC14 80240394 46000021 */ cvt.d.s $f0, $f0 -/* BFDC18 80240398 46260003 */ div.d $f0, $f0, $f6 -/* BFDC1C 8024039C 462005A0 */ cvt.s.d $f22, $f0 -/* BFDC20 802403A0 14620025 */ bne $v1, $v0, .L80240438 -/* BFDC24 802403A4 4602D600 */ add.s $f24, $f26, $f2 -/* BFDC28 802403A8 8E020000 */ lw $v0, ($s0) -/* BFDC2C 802403AC 30420008 */ andi $v0, $v0, 8 -/* BFDC30 802403B0 10400009 */ beqz $v0, .L802403D8 -/* BFDC34 802403B4 27A50028 */ addiu $a1, $sp, 0x28 -/* BFDC38 802403B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFDC3C 802403BC 4600C001 */ sub.s $f0, $f24, $f0 -/* BFDC40 802403C0 4600B03C */ c.lt.s $f22, $f0 -/* BFDC44 802403C4 00000000 */ nop -/* BFDC48 802403C8 4500001B */ bc1f .L80240438 -/* BFDC4C 802403CC 34820010 */ ori $v0, $a0, 0x10 -/* BFDC50 802403D0 0809010E */ j .L80240438 -/* BFDC54 802403D4 AE22006C */ sw $v0, 0x6c($s1) -.L802403D8: -/* BFDC58 802403D8 27A6002C */ addiu $a2, $sp, 0x2c -/* BFDC5C 802403DC C6000038 */ lwc1 $f0, 0x38($s0) -/* BFDC60 802403E0 C602003C */ lwc1 $f2, 0x3c($s0) -/* BFDC64 802403E4 C6040040 */ lwc1 $f4, 0x40($s0) -/* BFDC68 802403E8 3C01447A */ lui $at, 0x447a -/* BFDC6C 802403EC 44813000 */ mtc1 $at, $f6 -/* BFDC70 802403F0 27A20034 */ addiu $v0, $sp, 0x34 -/* BFDC74 802403F4 E7A00028 */ swc1 $f0, 0x28($sp) -/* BFDC78 802403F8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BFDC7C 802403FC E7A40030 */ swc1 $f4, 0x30($sp) -/* BFDC80 80240400 E7A60034 */ swc1 $f6, 0x34($sp) -/* BFDC84 80240404 AFA20010 */ sw $v0, 0x10($sp) -/* BFDC88 80240408 8E040080 */ lw $a0, 0x80($s0) -/* BFDC8C 8024040C 0C0372DF */ jal npc_raycast_down_sides -/* BFDC90 80240410 27A70030 */ addiu $a3, $sp, 0x30 -/* BFDC94 80240414 C7A00034 */ lwc1 $f0, 0x34($sp) -/* BFDC98 80240418 4600D001 */ sub.s $f0, $f26, $f0 -/* BFDC9C 8024041C 4600B03C */ c.lt.s $f22, $f0 -/* BFDCA0 80240420 00000000 */ nop -/* BFDCA4 80240424 45000004 */ bc1f .L80240438 -/* BFDCA8 80240428 00000000 */ nop -/* BFDCAC 8024042C 8E22006C */ lw $v0, 0x6c($s1) -/* BFDCB0 80240430 34420010 */ ori $v0, $v0, 0x10 -/* BFDCB4 80240434 AE22006C */ sw $v0, 0x6c($s1) -.L80240438: -/* BFDCB8 80240438 8E22006C */ lw $v0, 0x6c($s1) -/* BFDCBC 8024043C 24030011 */ addiu $v1, $zero, 0x11 -/* BFDCC0 80240440 30420011 */ andi $v0, $v0, 0x11 -/* BFDCC4 80240444 14430039 */ bne $v0, $v1, .L8024052C -/* BFDCC8 80240448 00000000 */ nop -/* BFDCCC 8024044C 8E020000 */ lw $v0, ($s0) -/* BFDCD0 80240450 30420008 */ andi $v0, $v0, 8 -/* BFDCD4 80240454 1040000A */ beqz $v0, .L80240480 -/* BFDCD8 80240458 4600C106 */ mov.s $f4, $f24 -/* BFDCDC 8024045C 4614C081 */ sub.s $f2, $f24, $f20 -/* BFDCE0 80240460 3C018026 */ lui $at, %hi(D_80263428_C20CA8) -/* BFDCE4 80240464 D4203428 */ ldc1 $f0, %lo(D_80263428_C20CA8)($at) -/* BFDCE8 80240468 460010A1 */ cvt.d.s $f2, $f2 -/* BFDCEC 8024046C 46201082 */ mul.d $f2, $f2, $f0 -/* BFDCF0 80240470 00000000 */ nop -/* BFDCF4 80240474 4600A021 */ cvt.d.s $f0, $f20 -/* BFDCF8 80240478 08090139 */ j .L802404E4 -/* BFDCFC 8024047C 46220000 */ add.d $f0, $f0, $f2 -.L80240480: -/* BFDD00 80240480 27A50028 */ addiu $a1, $sp, 0x28 -/* BFDD04 80240484 27A6002C */ addiu $a2, $sp, 0x2c -/* BFDD08 80240488 C6000038 */ lwc1 $f0, 0x38($s0) -/* BFDD0C 8024048C C6020040 */ lwc1 $f2, 0x40($s0) -/* BFDD10 80240490 3C01447A */ lui $at, 0x447a -/* BFDD14 80240494 44812000 */ mtc1 $at, $f4 -/* BFDD18 80240498 27A20034 */ addiu $v0, $sp, 0x34 -/* BFDD1C 8024049C E7B4002C */ swc1 $f20, 0x2c($sp) -/* BFDD20 802404A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* BFDD24 802404A4 E7A20030 */ swc1 $f2, 0x30($sp) -/* BFDD28 802404A8 E7A40034 */ swc1 $f4, 0x34($sp) -/* BFDD2C 802404AC AFA20010 */ sw $v0, 0x10($sp) -/* BFDD30 802404B0 8E040080 */ lw $a0, 0x80($s0) -/* BFDD34 802404B4 0C0372DF */ jal npc_raycast_down_sides -/* BFDD38 802404B8 27A70030 */ addiu $a3, $sp, 0x30 -/* BFDD3C 802404BC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* BFDD40 802404C0 461A2100 */ add.s $f4, $f4, $f26 -/* BFDD44 802404C4 46142081 */ sub.s $f2, $f4, $f20 -/* BFDD48 802404C8 3C018026 */ lui $at, %hi(D_80263430_C20CB0) -/* BFDD4C 802404CC D4203430 */ ldc1 $f0, %lo(D_80263430_C20CB0)($at) -/* BFDD50 802404D0 460010A1 */ cvt.d.s $f2, $f2 -/* BFDD54 802404D4 46201082 */ mul.d $f2, $f2, $f0 -/* BFDD58 802404D8 00000000 */ nop -/* BFDD5C 802404DC 4600A021 */ cvt.d.s $f0, $f20 -/* BFDD60 802404E0 46220000 */ add.d $f0, $f0, $f2 -.L802404E4: -/* BFDD64 802404E4 46200020 */ cvt.s.d $f0, $f0 -/* BFDD68 802404E8 E600003C */ swc1 $f0, 0x3c($s0) -/* BFDD6C 802404EC C600003C */ lwc1 $f0, 0x3c($s0) -/* BFDD70 802404F0 46002001 */ sub.s $f0, $f4, $f0 -/* BFDD74 802404F4 3C013FF0 */ lui $at, 0x3ff0 -/* BFDD78 802404F8 44811800 */ mtc1 $at, $f3 -/* BFDD7C 802404FC 44801000 */ mtc1 $zero, $f2 -/* BFDD80 80240500 46000005 */ abs.s $f0, $f0 -/* BFDD84 80240504 46000021 */ cvt.d.s $f0, $f0 -/* BFDD88 80240508 4622003C */ c.lt.d $f0, $f2 -/* BFDD8C 8024050C 00000000 */ nop -/* BFDD90 80240510 45000036 */ bc1f .L802405EC -/* BFDD94 80240514 2403FFEF */ addiu $v1, $zero, -0x11 -/* BFDD98 80240518 E604003C */ swc1 $f4, 0x3c($s0) -/* BFDD9C 8024051C 8E22006C */ lw $v0, 0x6c($s1) -/* BFDDA0 80240520 00431024 */ and $v0, $v0, $v1 -/* BFDDA4 80240524 0809017B */ j .L802405EC -/* BFDDA8 80240528 AE22006C */ sw $v0, 0x6c($s1) -.L8024052C: -/* BFDDAC 8024052C 8E220070 */ lw $v0, 0x70($s1) -/* BFDDB0 80240530 1840002E */ blez $v0, .L802405EC -/* BFDDB4 80240534 00000000 */ nop -/* BFDDB8 80240538 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BFDDBC 8024053C 0C00A8BB */ jal sin_deg -/* BFDDC0 80240540 46806320 */ cvt.s.w $f12, $f12 -/* BFDDC4 80240544 8E020000 */ lw $v0, ($s0) -/* BFDDC8 80240548 30420008 */ andi $v0, $v0, 8 -/* BFDDCC 8024054C 10400003 */ beqz $v0, .L8024055C -/* BFDDD0 80240550 46000506 */ mov.s $f20, $f0 -/* BFDDD4 80240554 08090167 */ j .L8024059C -/* BFDDD8 80240558 0000102D */ daddu $v0, $zero, $zero -.L8024055C: -/* BFDDDC 8024055C 27A50028 */ addiu $a1, $sp, 0x28 -/* BFDDE0 80240560 27A6002C */ addiu $a2, $sp, 0x2c -/* BFDDE4 80240564 C6000038 */ lwc1 $f0, 0x38($s0) -/* BFDDE8 80240568 C602003C */ lwc1 $f2, 0x3c($s0) -/* BFDDEC 8024056C C6040040 */ lwc1 $f4, 0x40($s0) -/* BFDDF0 80240570 3C01447A */ lui $at, 0x447a -/* BFDDF4 80240574 44813000 */ mtc1 $at, $f6 -/* BFDDF8 80240578 27A20034 */ addiu $v0, $sp, 0x34 -/* BFDDFC 8024057C E7A00028 */ swc1 $f0, 0x28($sp) -/* BFDE00 80240580 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BFDE04 80240584 E7A40030 */ swc1 $f4, 0x30($sp) -/* BFDE08 80240588 E7A60034 */ swc1 $f6, 0x34($sp) -/* BFDE0C 8024058C AFA20010 */ sw $v0, 0x10($sp) -/* BFDE10 80240590 8E040080 */ lw $a0, 0x80($s0) -/* BFDE14 80240594 0C0372DF */ jal npc_raycast_down_sides -/* BFDE18 80240598 27A70030 */ addiu $a3, $sp, 0x30 -.L8024059C: -/* BFDE1C 8024059C 10400007 */ beqz $v0, .L802405BC -/* BFDE20 802405A0 00000000 */ nop -/* BFDE24 802405A4 4616A082 */ mul.s $f2, $f20, $f22 -/* BFDE28 802405A8 00000000 */ nop -/* BFDE2C 802405AC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BFDE30 802405B0 461A0000 */ add.s $f0, $f0, $f26 -/* BFDE34 802405B4 08090172 */ j .L802405C8 -/* BFDE38 802405B8 46020000 */ add.s $f0, $f0, $f2 -.L802405BC: -/* BFDE3C 802405BC 4616A002 */ mul.s $f0, $f20, $f22 -/* BFDE40 802405C0 00000000 */ nop -/* BFDE44 802405C4 4600C000 */ add.s $f0, $f24, $f0 -.L802405C8: -/* BFDE48 802405C8 E600003C */ swc1 $f0, 0x3c($s0) -/* BFDE4C 802405CC 8E220074 */ lw $v0, 0x74($s1) -/* BFDE50 802405D0 2442000A */ addiu $v0, $v0, 0xa -/* BFDE54 802405D4 44826000 */ mtc1 $v0, $f12 -/* BFDE58 802405D8 00000000 */ nop -/* BFDE5C 802405DC 0C00A6C9 */ jal clamp_angle -/* BFDE60 802405E0 46806320 */ cvt.s.w $f12, $f12 -/* BFDE64 802405E4 4600020D */ trunc.w.s $f8, $f0 -/* BFDE68 802405E8 E6280074 */ swc1 $f8, 0x74($s1) -.L802405EC: -/* BFDE6C 802405EC 8E220090 */ lw $v0, 0x90($s1) -/* BFDE70 802405F0 1C40004A */ bgtz $v0, .L8024071C -/* BFDE74 802405F4 2442FFFF */ addiu $v0, $v0, -1 -/* BFDE78 802405F8 8E430014 */ lw $v1, 0x14($s2) -/* BFDE7C 802405FC 04600048 */ bltz $v1, .L80240720 -/* BFDE80 80240600 00000000 */ nop -/* BFDE84 80240604 8E620074 */ lw $v0, 0x74($s3) -/* BFDE88 80240608 1C400042 */ bgtz $v0, .L80240714 -/* BFDE8C 8024060C 2442FFFF */ addiu $v0, $v0, -1 -/* BFDE90 80240610 AE630074 */ sw $v1, 0x74($s3) -/* BFDE94 80240614 860200A8 */ lh $v0, 0xa8($s0) -/* BFDE98 80240618 C602003C */ lwc1 $f2, 0x3c($s0) -/* BFDE9C 8024061C 44820000 */ mtc1 $v0, $f0 -/* BFDEA0 80240620 00000000 */ nop -/* BFDEA4 80240624 46800020 */ cvt.s.w $f0, $f0 -/* BFDEA8 80240628 46001080 */ add.s $f2, $f2, $f0 -/* BFDEAC 8024062C 3C014024 */ lui $at, 0x4024 -/* BFDEB0 80240630 44810800 */ mtc1 $at, $f1 -/* BFDEB4 80240634 44800000 */ mtc1 $zero, $f0 -/* BFDEB8 80240638 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFDEBC 8024063C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFDEC0 80240640 460010A1 */ cvt.d.s $f2, $f2 -/* BFDEC4 80240644 46201080 */ add.d $f2, $f2, $f0 -/* BFDEC8 80240648 C440002C */ lwc1 $f0, 0x2c($v0) -/* BFDECC 8024064C 46000021 */ cvt.d.s $f0, $f0 -/* BFDED0 80240650 4622003C */ c.lt.d $f0, $f2 -/* BFDED4 80240654 00000000 */ nop -/* BFDED8 80240658 4500002C */ bc1f .L8024070C -/* BFDEDC 8024065C 02A0202D */ daddu $a0, $s5, $zero -/* BFDEE0 80240660 AFA00010 */ sw $zero, 0x10($sp) -/* BFDEE4 80240664 8E46000C */ lw $a2, 0xc($s2) -/* BFDEE8 80240668 8E470010 */ lw $a3, 0x10($s2) -/* BFDEEC 8024066C 0C01242D */ jal func_800490B4 -/* BFDEF0 80240670 0220282D */ daddu $a1, $s1, $zero -/* BFDEF4 80240674 10400025 */ beqz $v0, .L8024070C -/* BFDEF8 80240678 0000202D */ daddu $a0, $zero, $zero -/* BFDEFC 8024067C 0200282D */ daddu $a1, $s0, $zero -/* BFDF00 80240680 0000302D */ daddu $a2, $zero, $zero -/* BFDF04 80240684 2412000C */ addiu $s2, $zero, 0xc -/* BFDF08 80240688 860300A8 */ lh $v1, 0xa8($s0) -/* BFDF0C 8024068C 3C013F80 */ lui $at, 0x3f80 -/* BFDF10 80240690 44810000 */ mtc1 $at, $f0 -/* BFDF14 80240694 3C014000 */ lui $at, 0x4000 -/* BFDF18 80240698 44811000 */ mtc1 $at, $f2 -/* BFDF1C 8024069C 3C01C1A0 */ lui $at, 0xc1a0 -/* BFDF20 802406A0 44812000 */ mtc1 $at, $f4 -/* BFDF24 802406A4 44834000 */ mtc1 $v1, $f8 -/* BFDF28 802406A8 00000000 */ nop -/* BFDF2C 802406AC 46804220 */ cvt.s.w $f8, $f8 -/* BFDF30 802406B0 44074000 */ mfc1 $a3, $f8 -/* BFDF34 802406B4 27A20038 */ addiu $v0, $sp, 0x38 -/* BFDF38 802406B8 AFB2001C */ sw $s2, 0x1c($sp) -/* BFDF3C 802406BC AFA20020 */ sw $v0, 0x20($sp) -/* BFDF40 802406C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFDF44 802406C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BFDF48 802406C8 0C01BFA4 */ jal fx_emote -/* BFDF4C 802406CC E7A40018 */ swc1 $f4, 0x18($sp) -/* BFDF50 802406D0 0200202D */ daddu $a0, $s0, $zero -/* BFDF54 802406D4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BFDF58 802406D8 C480003C */ lwc1 $f0, 0x3c($a0) -/* BFDF5C 802406DC 3C060020 */ lui $a2, 0x20 -/* BFDF60 802406E0 0C012530 */ jal ai_enemy_play_sound -/* BFDF64 802406E4 E4800064 */ swc1 $f0, 0x64($a0) -/* BFDF68 802406E8 8E220018 */ lw $v0, 0x18($s1) -/* BFDF6C 802406EC 9442002A */ lhu $v0, 0x2a($v0) -/* BFDF70 802406F0 30420001 */ andi $v0, $v0, 1 -/* BFDF74 802406F4 10400003 */ beqz $v0, .L80240704 -/* BFDF78 802406F8 2402000A */ addiu $v0, $zero, 0xa -/* BFDF7C 802406FC 08090231 */ j .L802408C4 -/* BFDF80 80240700 AE620070 */ sw $v0, 0x70($s3) -.L80240704: -/* BFDF84 80240704 08090231 */ j .L802408C4 -/* BFDF88 80240708 AE720070 */ sw $s2, 0x70($s3) -.L8024070C: -/* BFDF8C 8024070C 8E620074 */ lw $v0, 0x74($s3) -/* BFDF90 80240710 2442FFFF */ addiu $v0, $v0, -1 -.L80240714: -/* BFDF94 80240714 080901C8 */ j .L80240720 -/* BFDF98 80240718 AE620074 */ sw $v0, 0x74($s3) -.L8024071C: -/* BFDF9C 8024071C AE220090 */ sw $v0, 0x90($s1) -.L80240720: -/* BFDFA0 80240720 8E2300D0 */ lw $v1, 0xd0($s1) -/* BFDFA4 80240724 C6000040 */ lwc1 $f0, 0x40($s0) -/* BFDFA8 80240728 C4620000 */ lwc1 $f2, ($v1) -/* BFDFAC 8024072C 468010A0 */ cvt.s.w $f2, $f2 -/* BFDFB0 80240730 C4640008 */ lwc1 $f4, 8($v1) -/* BFDFB4 80240734 46802120 */ cvt.s.w $f4, $f4 -/* BFDFB8 80240738 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFDFBC 8024073C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFDFC0 80240740 44051000 */ mfc1 $a1, $f2 -/* BFDFC4 80240744 C440000C */ lwc1 $f0, 0xc($v0) -/* BFDFC8 80240748 46800020 */ cvt.s.w $f0, $f0 -/* BFDFCC 8024074C E7A00014 */ swc1 $f0, 0x14($sp) -/* BFDFD0 80240750 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFDFD4 80240754 44062000 */ mfc1 $a2, $f4 -/* BFDFD8 80240758 C4400010 */ lwc1 $f0, 0x10($v0) -/* BFDFDC 8024075C 46800020 */ cvt.s.w $f0, $f0 -/* BFDFE0 80240760 E7A00018 */ swc1 $f0, 0x18($sp) -/* BFDFE4 80240764 8C640018 */ lw $a0, 0x18($v1) -/* BFDFE8 80240768 0C0123F5 */ jal is_point_within_region -/* BFDFEC 8024076C 8E070038 */ lw $a3, 0x38($s0) -/* BFDFF0 80240770 1040001A */ beqz $v0, .L802407DC -/* BFDFF4 80240774 00000000 */ nop -/* BFDFF8 80240778 8E060038 */ lw $a2, 0x38($s0) -/* BFDFFC 8024077C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFE000 80240780 8E070040 */ lw $a3, 0x40($s0) -/* BFE004 80240784 C44C0000 */ lwc1 $f12, ($v0) -/* BFE008 80240788 46806320 */ cvt.s.w $f12, $f12 -/* BFE00C 8024078C C44E0008 */ lwc1 $f14, 8($v0) -/* BFE010 80240790 0C00A7B5 */ jal dist2D -/* BFE014 80240794 468073A0 */ cvt.s.w $f14, $f14 -/* BFE018 80240798 C6020018 */ lwc1 $f2, 0x18($s0) -/* BFE01C 8024079C 4600103C */ c.lt.s $f2, $f0 -/* BFE020 802407A0 00000000 */ nop -/* BFE024 802407A4 4500000D */ bc1f .L802407DC -/* BFE028 802407A8 E7A00034 */ swc1 $f0, 0x34($sp) -/* BFE02C 802407AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* BFE030 802407B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFE034 802407B4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BFE038 802407B8 C4480000 */ lwc1 $f8, ($v0) -/* BFE03C 802407BC 46804220 */ cvt.s.w $f8, $f8 -/* BFE040 802407C0 44064000 */ mfc1 $a2, $f8 -/* BFE044 802407C4 C4480008 */ lwc1 $f8, 8($v0) -/* BFE048 802407C8 46804220 */ cvt.s.w $f8, $f8 -/* BFE04C 802407CC 44074000 */ mfc1 $a3, $f8 -/* BFE050 802407D0 0C00A720 */ jal atan2 -/* BFE054 802407D4 24140001 */ addiu $s4, $zero, 1 -/* BFE058 802407D8 E600000C */ swc1 $f0, 0xc($s0) -.L802407DC: -/* BFE05C 802407DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFE060 802407E0 8C43000C */ lw $v1, 0xc($v0) -/* BFE064 802407E4 8C420010 */ lw $v0, 0x10($v0) -/* BFE068 802407E8 00621825 */ or $v1, $v1, $v0 -/* BFE06C 802407EC 00741825 */ or $v1, $v1, $s4 -/* BFE070 802407F0 10600008 */ beqz $v1, .L80240814 -/* BFE074 802407F4 00000000 */ nop -/* BFE078 802407F8 8602008C */ lh $v0, 0x8c($s0) -/* BFE07C 802407FC 14400031 */ bnez $v0, .L802408C4 -/* BFE080 80240800 00000000 */ nop -/* BFE084 80240804 8E050018 */ lw $a1, 0x18($s0) -/* BFE088 80240808 8E06000C */ lw $a2, 0xc($s0) -/* BFE08C 8024080C 0C00EA95 */ jal npc_move_heading -/* BFE090 80240810 0200202D */ daddu $a0, $s0, $zero -.L80240814: -/* BFE094 80240814 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFE098 80240818 3C014059 */ lui $at, 0x4059 -/* BFE09C 8024081C 44811800 */ mtc1 $at, $f3 -/* BFE0A0 80240820 44801000 */ mtc1 $zero, $f2 -/* BFE0A4 80240824 46000021 */ cvt.d.s $f0, $f0 -/* BFE0A8 80240828 46220002 */ mul.d $f0, $f0, $f2 -/* BFE0AC 8024082C 00000000 */ nop -/* BFE0B0 80240830 4620020D */ trunc.w.d $f8, $f0 -/* BFE0B4 80240834 E628007C */ swc1 $f8, 0x7c($s1) -/* BFE0B8 80240838 8E420004 */ lw $v0, 4($s2) -/* BFE0BC 8024083C 18400021 */ blez $v0, .L802408C4 -/* BFE0C0 80240840 00000000 */ nop -/* BFE0C4 80240844 8602008E */ lh $v0, 0x8e($s0) -/* BFE0C8 80240848 9603008E */ lhu $v1, 0x8e($s0) -/* BFE0CC 8024084C 18400005 */ blez $v0, .L80240864 -/* BFE0D0 80240850 2462FFFF */ addiu $v0, $v1, -1 -/* BFE0D4 80240854 A602008E */ sh $v0, 0x8e($s0) -/* BFE0D8 80240858 00021400 */ sll $v0, $v0, 0x10 -/* BFE0DC 8024085C 1C400019 */ bgtz $v0, .L802408C4 -/* BFE0E0 80240860 00000000 */ nop -.L80240864: -/* BFE0E4 80240864 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BFE0E8 80240868 24020002 */ addiu $v0, $zero, 2 -/* BFE0EC 8024086C 0C00A67F */ jal rand_int -/* BFE0F0 80240870 AE620070 */ sw $v0, 0x70($s3) -/* BFE0F4 80240874 3C035555 */ lui $v1, 0x5555 -/* BFE0F8 80240878 34635556 */ ori $v1, $v1, 0x5556 -/* BFE0FC 8024087C 00430018 */ mult $v0, $v1 -/* BFE100 80240880 000227C3 */ sra $a0, $v0, 0x1f -/* BFE104 80240884 00004010 */ mfhi $t0 -/* BFE108 80240888 01042023 */ subu $a0, $t0, $a0 -/* BFE10C 8024088C 00041840 */ sll $v1, $a0, 1 -/* BFE110 80240890 00641821 */ addu $v1, $v1, $a0 -/* BFE114 80240894 00431023 */ subu $v0, $v0, $v1 -/* BFE118 80240898 24430002 */ addiu $v1, $v0, 2 -/* BFE11C 8024089C AE630074 */ sw $v1, 0x74($s3) -/* BFE120 802408A0 8E42002C */ lw $v0, 0x2c($s2) -/* BFE124 802408A4 58400007 */ blezl $v0, .L802408C4 -/* BFE128 802408A8 AE600070 */ sw $zero, 0x70($s3) -/* BFE12C 802408AC 8E420008 */ lw $v0, 8($s2) -/* BFE130 802408B0 18400003 */ blez $v0, .L802408C0 -/* BFE134 802408B4 28620003 */ slti $v0, $v1, 3 -/* BFE138 802408B8 10400002 */ beqz $v0, .L802408C4 -/* BFE13C 802408BC 00000000 */ nop -.L802408C0: -/* BFE140 802408C0 AE600070 */ sw $zero, 0x70($s3) -.L802408C4: -/* BFE144 802408C4 8FBF0058 */ lw $ra, 0x58($sp) -/* BFE148 802408C8 8FB50054 */ lw $s5, 0x54($sp) -/* BFE14C 802408CC 8FB40050 */ lw $s4, 0x50($sp) -/* BFE150 802408D0 8FB3004C */ lw $s3, 0x4c($sp) -/* BFE154 802408D4 8FB20048 */ lw $s2, 0x48($sp) -/* BFE158 802408D8 8FB10044 */ lw $s1, 0x44($sp) -/* BFE15C 802408DC 8FB00040 */ lw $s0, 0x40($sp) -/* BFE160 802408E0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* BFE164 802408E4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* BFE168 802408E8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* BFE16C 802408EC D7B40060 */ ldc1 $f20, 0x60($sp) -/* BFE170 802408F0 03E00008 */ jr $ra -/* BFE174 802408F4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_802401B0_C366E0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_802401B0_C366E0.s deleted file mode 100644 index 080d235fcc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_802401B0_C366E0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802443F8_C3A928 -.double 0.09 - -dlabel D_80244400_C3A930 -.double 0.09 - -.section .text - -glabel dgb_04_func_802401B0_C366E0 -/* C366E0 802401B0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C366E4 802401B4 AFB3004C */ sw $s3, 0x4c($sp) -/* C366E8 802401B8 0080982D */ daddu $s3, $a0, $zero -/* C366EC 802401BC AFBF0058 */ sw $ra, 0x58($sp) -/* C366F0 802401C0 AFB50054 */ sw $s5, 0x54($sp) -/* C366F4 802401C4 AFB40050 */ sw $s4, 0x50($sp) -/* C366F8 802401C8 AFB20048 */ sw $s2, 0x48($sp) -/* C366FC 802401CC AFB10044 */ sw $s1, 0x44($sp) -/* C36700 802401D0 AFB00040 */ sw $s0, 0x40($sp) -/* C36704 802401D4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C36708 802401D8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C3670C 802401DC F7B60068 */ sdc1 $f22, 0x68($sp) -/* C36710 802401E0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C36714 802401E4 8E710148 */ lw $s1, 0x148($s3) -/* C36718 802401E8 00A0902D */ daddu $s2, $a1, $zero -/* C3671C 802401EC 86240008 */ lh $a0, 8($s1) -/* C36720 802401F0 0C00EABB */ jal get_npc_unsafe -/* C36724 802401F4 00C0A82D */ daddu $s5, $a2, $zero -/* C36728 802401F8 0040802D */ daddu $s0, $v0, $zero -/* C3672C 802401FC 0000A02D */ daddu $s4, $zero, $zero -/* C36730 80240200 C624007C */ lwc1 $f4, 0x7c($s1) -/* C36734 80240204 46802120 */ cvt.s.w $f4, $f4 -/* C36738 80240208 C6220088 */ lwc1 $f2, 0x88($s1) -/* C3673C 8024020C 468010A0 */ cvt.s.w $f2, $f2 -/* C36740 80240210 460010A1 */ cvt.d.s $f2, $f2 -/* C36744 80240214 46002121 */ cvt.d.s $f4, $f4 -/* C36748 80240218 C600003C */ lwc1 $f0, 0x3c($s0) -/* C3674C 8024021C 3C014059 */ lui $at, 0x4059 -/* C36750 80240220 44813800 */ mtc1 $at, $f7 -/* C36754 80240224 44803000 */ mtc1 $zero, $f6 -/* C36758 80240228 46000021 */ cvt.d.s $f0, $f0 -/* C3675C 8024022C 46260002 */ mul.d $f0, $f0, $f6 -/* C36760 80240230 00000000 */ nop -/* C36764 80240234 24020001 */ addiu $v0, $zero, 1 -/* C36768 80240238 8E24006C */ lw $a0, 0x6c($s1) -/* C3676C 8024023C 46261083 */ div.d $f2, $f2, $f6 -/* C36770 80240240 462010A0 */ cvt.s.d $f2, $f2 -/* C36774 80240244 46262103 */ div.d $f4, $f4, $f6 -/* C36778 80240248 46202520 */ cvt.s.d $f20, $f4 -/* C3677C 8024024C 30830011 */ andi $v1, $a0, 0x11 -/* C36780 80240250 4620020D */ trunc.w.d $f8, $f0 -/* C36784 80240254 E628007C */ swc1 $f8, 0x7c($s1) -/* C36788 80240258 C6200078 */ lwc1 $f0, 0x78($s1) -/* C3678C 8024025C 46800020 */ cvt.s.w $f0, $f0 -/* C36790 80240260 46000021 */ cvt.d.s $f0, $f0 -/* C36794 80240264 46260003 */ div.d $f0, $f0, $f6 -/* C36798 80240268 462006A0 */ cvt.s.d $f26, $f0 -/* C3679C 8024026C C6200070 */ lwc1 $f0, 0x70($s1) -/* C367A0 80240270 46800020 */ cvt.s.w $f0, $f0 -/* C367A4 80240274 46000021 */ cvt.d.s $f0, $f0 -/* C367A8 80240278 46260003 */ div.d $f0, $f0, $f6 -/* C367AC 8024027C 462005A0 */ cvt.s.d $f22, $f0 -/* C367B0 80240280 14620025 */ bne $v1, $v0, .L80240318 -/* C367B4 80240284 4602D600 */ add.s $f24, $f26, $f2 -/* C367B8 80240288 8E020000 */ lw $v0, ($s0) -/* C367BC 8024028C 30420008 */ andi $v0, $v0, 8 -/* C367C0 80240290 10400009 */ beqz $v0, .L802402B8 -/* C367C4 80240294 27A50028 */ addiu $a1, $sp, 0x28 -/* C367C8 80240298 C600003C */ lwc1 $f0, 0x3c($s0) -/* C367CC 8024029C 4600C001 */ sub.s $f0, $f24, $f0 -/* C367D0 802402A0 4600B03C */ c.lt.s $f22, $f0 -/* C367D4 802402A4 00000000 */ nop -/* C367D8 802402A8 4500001B */ bc1f .L80240318 -/* C367DC 802402AC 34820010 */ ori $v0, $a0, 0x10 -/* C367E0 802402B0 080900C6 */ j .L80240318 -/* C367E4 802402B4 AE22006C */ sw $v0, 0x6c($s1) -.L802402B8: -/* C367E8 802402B8 27A6002C */ addiu $a2, $sp, 0x2c -/* C367EC 802402BC C6000038 */ lwc1 $f0, 0x38($s0) -/* C367F0 802402C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C367F4 802402C4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C367F8 802402C8 3C01447A */ lui $at, 0x447a -/* C367FC 802402CC 44813000 */ mtc1 $at, $f6 -/* C36800 802402D0 27A20034 */ addiu $v0, $sp, 0x34 -/* C36804 802402D4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C36808 802402D8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C3680C 802402DC E7A40030 */ swc1 $f4, 0x30($sp) -/* C36810 802402E0 E7A60034 */ swc1 $f6, 0x34($sp) -/* C36814 802402E4 AFA20010 */ sw $v0, 0x10($sp) -/* C36818 802402E8 8E040080 */ lw $a0, 0x80($s0) -/* C3681C 802402EC 0C0372DF */ jal npc_raycast_down_sides -/* C36820 802402F0 27A70030 */ addiu $a3, $sp, 0x30 -/* C36824 802402F4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C36828 802402F8 4600D001 */ sub.s $f0, $f26, $f0 -/* C3682C 802402FC 4600B03C */ c.lt.s $f22, $f0 -/* C36830 80240300 00000000 */ nop -/* C36834 80240304 45000004 */ bc1f .L80240318 -/* C36838 80240308 00000000 */ nop -/* C3683C 8024030C 8E22006C */ lw $v0, 0x6c($s1) -/* C36840 80240310 34420010 */ ori $v0, $v0, 0x10 -/* C36844 80240314 AE22006C */ sw $v0, 0x6c($s1) -.L80240318: -/* C36848 80240318 8E22006C */ lw $v0, 0x6c($s1) -/* C3684C 8024031C 24030011 */ addiu $v1, $zero, 0x11 -/* C36850 80240320 30420011 */ andi $v0, $v0, 0x11 -/* C36854 80240324 14430039 */ bne $v0, $v1, .L8024040C -/* C36858 80240328 00000000 */ nop -/* C3685C 8024032C 8E020000 */ lw $v0, ($s0) -/* C36860 80240330 30420008 */ andi $v0, $v0, 8 -/* C36864 80240334 1040000A */ beqz $v0, .L80240360 -/* C36868 80240338 4600C106 */ mov.s $f4, $f24 -/* C3686C 8024033C 4614C081 */ sub.s $f2, $f24, $f20 -/* C36870 80240340 3C018024 */ lui $at, %hi(D_802443F8_C3A928) -/* C36874 80240344 D42043F8 */ ldc1 $f0, %lo(D_802443F8_C3A928)($at) -/* C36878 80240348 460010A1 */ cvt.d.s $f2, $f2 -/* C3687C 8024034C 46201082 */ mul.d $f2, $f2, $f0 -/* C36880 80240350 00000000 */ nop -/* C36884 80240354 4600A021 */ cvt.d.s $f0, $f20 -/* C36888 80240358 080900F1 */ j .L802403C4 -/* C3688C 8024035C 46220000 */ add.d $f0, $f0, $f2 -.L80240360: -/* C36890 80240360 27A50028 */ addiu $a1, $sp, 0x28 -/* C36894 80240364 27A6002C */ addiu $a2, $sp, 0x2c -/* C36898 80240368 C6000038 */ lwc1 $f0, 0x38($s0) -/* C3689C 8024036C C6020040 */ lwc1 $f2, 0x40($s0) -/* C368A0 80240370 3C01447A */ lui $at, 0x447a -/* C368A4 80240374 44812000 */ mtc1 $at, $f4 -/* C368A8 80240378 27A20034 */ addiu $v0, $sp, 0x34 -/* C368AC 8024037C E7B4002C */ swc1 $f20, 0x2c($sp) -/* C368B0 80240380 E7A00028 */ swc1 $f0, 0x28($sp) -/* C368B4 80240384 E7A20030 */ swc1 $f2, 0x30($sp) -/* C368B8 80240388 E7A40034 */ swc1 $f4, 0x34($sp) -/* C368BC 8024038C AFA20010 */ sw $v0, 0x10($sp) -/* C368C0 80240390 8E040080 */ lw $a0, 0x80($s0) -/* C368C4 80240394 0C0372DF */ jal npc_raycast_down_sides -/* C368C8 80240398 27A70030 */ addiu $a3, $sp, 0x30 -/* C368CC 8024039C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C368D0 802403A0 461A2100 */ add.s $f4, $f4, $f26 -/* C368D4 802403A4 46142081 */ sub.s $f2, $f4, $f20 -/* C368D8 802403A8 3C018024 */ lui $at, %hi(D_80244400_C3A930) -/* C368DC 802403AC D4204400 */ ldc1 $f0, %lo(D_80244400_C3A930)($at) -/* C368E0 802403B0 460010A1 */ cvt.d.s $f2, $f2 -/* C368E4 802403B4 46201082 */ mul.d $f2, $f2, $f0 -/* C368E8 802403B8 00000000 */ nop -/* C368EC 802403BC 4600A021 */ cvt.d.s $f0, $f20 -/* C368F0 802403C0 46220000 */ add.d $f0, $f0, $f2 -.L802403C4: -/* C368F4 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* C368F8 802403C8 E600003C */ swc1 $f0, 0x3c($s0) -/* C368FC 802403CC C600003C */ lwc1 $f0, 0x3c($s0) -/* C36900 802403D0 46002001 */ sub.s $f0, $f4, $f0 -/* C36904 802403D4 3C013FF0 */ lui $at, 0x3ff0 -/* C36908 802403D8 44811800 */ mtc1 $at, $f3 -/* C3690C 802403DC 44801000 */ mtc1 $zero, $f2 -/* C36910 802403E0 46000005 */ abs.s $f0, $f0 -/* C36914 802403E4 46000021 */ cvt.d.s $f0, $f0 -/* C36918 802403E8 4622003C */ c.lt.d $f0, $f2 -/* C3691C 802403EC 00000000 */ nop -/* C36920 802403F0 45000036 */ bc1f .L802404CC -/* C36924 802403F4 2403FFEF */ addiu $v1, $zero, -0x11 -/* C36928 802403F8 E604003C */ swc1 $f4, 0x3c($s0) -/* C3692C 802403FC 8E22006C */ lw $v0, 0x6c($s1) -/* C36930 80240400 00431024 */ and $v0, $v0, $v1 -/* C36934 80240404 08090133 */ j .L802404CC -/* C36938 80240408 AE22006C */ sw $v0, 0x6c($s1) -.L8024040C: -/* C3693C 8024040C 8E220070 */ lw $v0, 0x70($s1) -/* C36940 80240410 1840002E */ blez $v0, .L802404CC -/* C36944 80240414 00000000 */ nop -/* C36948 80240418 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C3694C 8024041C 0C00A8BB */ jal sin_deg -/* C36950 80240420 46806320 */ cvt.s.w $f12, $f12 -/* C36954 80240424 8E020000 */ lw $v0, ($s0) -/* C36958 80240428 30420008 */ andi $v0, $v0, 8 -/* C3695C 8024042C 10400003 */ beqz $v0, .L8024043C -/* C36960 80240430 46000506 */ mov.s $f20, $f0 -/* C36964 80240434 0809011F */ j .L8024047C -/* C36968 80240438 0000102D */ daddu $v0, $zero, $zero -.L8024043C: -/* C3696C 8024043C 27A50028 */ addiu $a1, $sp, 0x28 -/* C36970 80240440 27A6002C */ addiu $a2, $sp, 0x2c -/* C36974 80240444 C6000038 */ lwc1 $f0, 0x38($s0) -/* C36978 80240448 C602003C */ lwc1 $f2, 0x3c($s0) -/* C3697C 8024044C C6040040 */ lwc1 $f4, 0x40($s0) -/* C36980 80240450 3C01447A */ lui $at, 0x447a -/* C36984 80240454 44813000 */ mtc1 $at, $f6 -/* C36988 80240458 27A20034 */ addiu $v0, $sp, 0x34 -/* C3698C 8024045C E7A00028 */ swc1 $f0, 0x28($sp) -/* C36990 80240460 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C36994 80240464 E7A40030 */ swc1 $f4, 0x30($sp) -/* C36998 80240468 E7A60034 */ swc1 $f6, 0x34($sp) -/* C3699C 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* C369A0 80240470 8E040080 */ lw $a0, 0x80($s0) -/* C369A4 80240474 0C0372DF */ jal npc_raycast_down_sides -/* C369A8 80240478 27A70030 */ addiu $a3, $sp, 0x30 -.L8024047C: -/* C369AC 8024047C 10400007 */ beqz $v0, .L8024049C -/* C369B0 80240480 00000000 */ nop -/* C369B4 80240484 4616A082 */ mul.s $f2, $f20, $f22 -/* C369B8 80240488 00000000 */ nop -/* C369BC 8024048C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C369C0 80240490 461A0000 */ add.s $f0, $f0, $f26 -/* C369C4 80240494 0809012A */ j .L802404A8 -/* C369C8 80240498 46020000 */ add.s $f0, $f0, $f2 -.L8024049C: -/* C369CC 8024049C 4616A002 */ mul.s $f0, $f20, $f22 -/* C369D0 802404A0 00000000 */ nop -/* C369D4 802404A4 4600C000 */ add.s $f0, $f24, $f0 -.L802404A8: -/* C369D8 802404A8 E600003C */ swc1 $f0, 0x3c($s0) -/* C369DC 802404AC 8E220074 */ lw $v0, 0x74($s1) -/* C369E0 802404B0 2442000A */ addiu $v0, $v0, 0xa -/* C369E4 802404B4 44826000 */ mtc1 $v0, $f12 -/* C369E8 802404B8 00000000 */ nop -/* C369EC 802404BC 0C00A6C9 */ jal clamp_angle -/* C369F0 802404C0 46806320 */ cvt.s.w $f12, $f12 -/* C369F4 802404C4 4600020D */ trunc.w.s $f8, $f0 -/* C369F8 802404C8 E6280074 */ swc1 $f8, 0x74($s1) -.L802404CC: -/* C369FC 802404CC 8E220090 */ lw $v0, 0x90($s1) -/* C36A00 802404D0 1C40004A */ bgtz $v0, .L802405FC -/* C36A04 802404D4 2442FFFF */ addiu $v0, $v0, -1 -/* C36A08 802404D8 8E430014 */ lw $v1, 0x14($s2) -/* C36A0C 802404DC 04600048 */ bltz $v1, .L80240600 -/* C36A10 802404E0 00000000 */ nop -/* C36A14 802404E4 8E620074 */ lw $v0, 0x74($s3) -/* C36A18 802404E8 1C400042 */ bgtz $v0, .L802405F4 -/* C36A1C 802404EC 2442FFFF */ addiu $v0, $v0, -1 -/* C36A20 802404F0 AE630074 */ sw $v1, 0x74($s3) -/* C36A24 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* C36A28 802404F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C36A2C 802404FC 44820000 */ mtc1 $v0, $f0 -/* C36A30 80240500 00000000 */ nop -/* C36A34 80240504 46800020 */ cvt.s.w $f0, $f0 -/* C36A38 80240508 46001080 */ add.s $f2, $f2, $f0 -/* C36A3C 8024050C 3C014024 */ lui $at, 0x4024 -/* C36A40 80240510 44810800 */ mtc1 $at, $f1 -/* C36A44 80240514 44800000 */ mtc1 $zero, $f0 -/* C36A48 80240518 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C36A4C 8024051C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C36A50 80240520 460010A1 */ cvt.d.s $f2, $f2 -/* C36A54 80240524 46201080 */ add.d $f2, $f2, $f0 -/* C36A58 80240528 C440002C */ lwc1 $f0, 0x2c($v0) -/* C36A5C 8024052C 46000021 */ cvt.d.s $f0, $f0 -/* C36A60 80240530 4622003C */ c.lt.d $f0, $f2 -/* C36A64 80240534 00000000 */ nop -/* C36A68 80240538 4500002C */ bc1f .L802405EC -/* C36A6C 8024053C 02A0202D */ daddu $a0, $s5, $zero -/* C36A70 80240540 AFA00010 */ sw $zero, 0x10($sp) -/* C36A74 80240544 8E46000C */ lw $a2, 0xc($s2) -/* C36A78 80240548 8E470010 */ lw $a3, 0x10($s2) -/* C36A7C 8024054C 0C01242D */ jal func_800490B4 -/* C36A80 80240550 0220282D */ daddu $a1, $s1, $zero -/* C36A84 80240554 10400025 */ beqz $v0, .L802405EC -/* C36A88 80240558 0000202D */ daddu $a0, $zero, $zero -/* C36A8C 8024055C 0200282D */ daddu $a1, $s0, $zero -/* C36A90 80240560 0000302D */ daddu $a2, $zero, $zero -/* C36A94 80240564 2412000C */ addiu $s2, $zero, 0xc -/* C36A98 80240568 860300A8 */ lh $v1, 0xa8($s0) -/* C36A9C 8024056C 3C013F80 */ lui $at, 0x3f80 -/* C36AA0 80240570 44810000 */ mtc1 $at, $f0 -/* C36AA4 80240574 3C014000 */ lui $at, 0x4000 -/* C36AA8 80240578 44811000 */ mtc1 $at, $f2 -/* C36AAC 8024057C 3C01C1A0 */ lui $at, 0xc1a0 -/* C36AB0 80240580 44812000 */ mtc1 $at, $f4 -/* C36AB4 80240584 44834000 */ mtc1 $v1, $f8 -/* C36AB8 80240588 00000000 */ nop -/* C36ABC 8024058C 46804220 */ cvt.s.w $f8, $f8 -/* C36AC0 80240590 44074000 */ mfc1 $a3, $f8 -/* C36AC4 80240594 27A20038 */ addiu $v0, $sp, 0x38 -/* C36AC8 80240598 AFB2001C */ sw $s2, 0x1c($sp) -/* C36ACC 8024059C AFA20020 */ sw $v0, 0x20($sp) -/* C36AD0 802405A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C36AD4 802405A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C36AD8 802405A8 0C01BFA4 */ jal fx_emote -/* C36ADC 802405AC E7A40018 */ swc1 $f4, 0x18($sp) -/* C36AE0 802405B0 0200202D */ daddu $a0, $s0, $zero -/* C36AE4 802405B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C36AE8 802405B8 C480003C */ lwc1 $f0, 0x3c($a0) -/* C36AEC 802405BC 3C060020 */ lui $a2, 0x20 -/* C36AF0 802405C0 0C012530 */ jal ai_enemy_play_sound -/* C36AF4 802405C4 E4800064 */ swc1 $f0, 0x64($a0) -/* C36AF8 802405C8 8E220018 */ lw $v0, 0x18($s1) -/* C36AFC 802405CC 9442002A */ lhu $v0, 0x2a($v0) -/* C36B00 802405D0 30420001 */ andi $v0, $v0, 1 -/* C36B04 802405D4 10400003 */ beqz $v0, .L802405E4 -/* C36B08 802405D8 2402000A */ addiu $v0, $zero, 0xa -/* C36B0C 802405DC 080901E9 */ j .L802407A4 -/* C36B10 802405E0 AE620070 */ sw $v0, 0x70($s3) -.L802405E4: -/* C36B14 802405E4 080901E9 */ j .L802407A4 -/* C36B18 802405E8 AE720070 */ sw $s2, 0x70($s3) -.L802405EC: -/* C36B1C 802405EC 8E620074 */ lw $v0, 0x74($s3) -/* C36B20 802405F0 2442FFFF */ addiu $v0, $v0, -1 -.L802405F4: -/* C36B24 802405F4 08090180 */ j .L80240600 -/* C36B28 802405F8 AE620074 */ sw $v0, 0x74($s3) -.L802405FC: -/* C36B2C 802405FC AE220090 */ sw $v0, 0x90($s1) -.L80240600: -/* C36B30 80240600 8E2300D0 */ lw $v1, 0xd0($s1) -/* C36B34 80240604 C6000040 */ lwc1 $f0, 0x40($s0) -/* C36B38 80240608 C4620000 */ lwc1 $f2, ($v1) -/* C36B3C 8024060C 468010A0 */ cvt.s.w $f2, $f2 -/* C36B40 80240610 C4640008 */ lwc1 $f4, 8($v1) -/* C36B44 80240614 46802120 */ cvt.s.w $f4, $f4 -/* C36B48 80240618 E7A00010 */ swc1 $f0, 0x10($sp) -/* C36B4C 8024061C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C36B50 80240620 44051000 */ mfc1 $a1, $f2 -/* C36B54 80240624 C440000C */ lwc1 $f0, 0xc($v0) -/* C36B58 80240628 46800020 */ cvt.s.w $f0, $f0 -/* C36B5C 8024062C E7A00014 */ swc1 $f0, 0x14($sp) -/* C36B60 80240630 8E2200D0 */ lw $v0, 0xd0($s1) -/* C36B64 80240634 44062000 */ mfc1 $a2, $f4 -/* C36B68 80240638 C4400010 */ lwc1 $f0, 0x10($v0) -/* C36B6C 8024063C 46800020 */ cvt.s.w $f0, $f0 -/* C36B70 80240640 E7A00018 */ swc1 $f0, 0x18($sp) -/* C36B74 80240644 8C640018 */ lw $a0, 0x18($v1) -/* C36B78 80240648 0C0123F5 */ jal is_point_within_region -/* C36B7C 8024064C 8E070038 */ lw $a3, 0x38($s0) -/* C36B80 80240650 1040001A */ beqz $v0, .L802406BC -/* C36B84 80240654 00000000 */ nop -/* C36B88 80240658 8E060038 */ lw $a2, 0x38($s0) -/* C36B8C 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C36B90 80240660 8E070040 */ lw $a3, 0x40($s0) -/* C36B94 80240664 C44C0000 */ lwc1 $f12, ($v0) -/* C36B98 80240668 46806320 */ cvt.s.w $f12, $f12 -/* C36B9C 8024066C C44E0008 */ lwc1 $f14, 8($v0) -/* C36BA0 80240670 0C00A7B5 */ jal dist2D -/* C36BA4 80240674 468073A0 */ cvt.s.w $f14, $f14 -/* C36BA8 80240678 C6020018 */ lwc1 $f2, 0x18($s0) -/* C36BAC 8024067C 4600103C */ c.lt.s $f2, $f0 -/* C36BB0 80240680 00000000 */ nop -/* C36BB4 80240684 4500000D */ bc1f .L802406BC -/* C36BB8 80240688 E7A00034 */ swc1 $f0, 0x34($sp) -/* C36BBC 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C36BC0 80240690 8E2200D0 */ lw $v0, 0xd0($s1) -/* C36BC4 80240694 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C36BC8 80240698 C4480000 */ lwc1 $f8, ($v0) -/* C36BCC 8024069C 46804220 */ cvt.s.w $f8, $f8 -/* C36BD0 802406A0 44064000 */ mfc1 $a2, $f8 -/* C36BD4 802406A4 C4480008 */ lwc1 $f8, 8($v0) -/* C36BD8 802406A8 46804220 */ cvt.s.w $f8, $f8 -/* C36BDC 802406AC 44074000 */ mfc1 $a3, $f8 -/* C36BE0 802406B0 0C00A720 */ jal atan2 -/* C36BE4 802406B4 24140001 */ addiu $s4, $zero, 1 -/* C36BE8 802406B8 E600000C */ swc1 $f0, 0xc($s0) -.L802406BC: -/* C36BEC 802406BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C36BF0 802406C0 8C43000C */ lw $v1, 0xc($v0) -/* C36BF4 802406C4 8C420010 */ lw $v0, 0x10($v0) -/* C36BF8 802406C8 00621825 */ or $v1, $v1, $v0 -/* C36BFC 802406CC 00741825 */ or $v1, $v1, $s4 -/* C36C00 802406D0 10600008 */ beqz $v1, .L802406F4 -/* C36C04 802406D4 00000000 */ nop -/* C36C08 802406D8 8602008C */ lh $v0, 0x8c($s0) -/* C36C0C 802406DC 14400031 */ bnez $v0, .L802407A4 -/* C36C10 802406E0 00000000 */ nop -/* C36C14 802406E4 8E050018 */ lw $a1, 0x18($s0) -/* C36C18 802406E8 8E06000C */ lw $a2, 0xc($s0) -/* C36C1C 802406EC 0C00EA95 */ jal npc_move_heading -/* C36C20 802406F0 0200202D */ daddu $a0, $s0, $zero -.L802406F4: -/* C36C24 802406F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* C36C28 802406F8 3C014059 */ lui $at, 0x4059 -/* C36C2C 802406FC 44811800 */ mtc1 $at, $f3 -/* C36C30 80240700 44801000 */ mtc1 $zero, $f2 -/* C36C34 80240704 46000021 */ cvt.d.s $f0, $f0 -/* C36C38 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* C36C3C 8024070C 00000000 */ nop -/* C36C40 80240710 4620020D */ trunc.w.d $f8, $f0 -/* C36C44 80240714 E628007C */ swc1 $f8, 0x7c($s1) -/* C36C48 80240718 8E420004 */ lw $v0, 4($s2) -/* C36C4C 8024071C 18400021 */ blez $v0, .L802407A4 -/* C36C50 80240720 00000000 */ nop -/* C36C54 80240724 8602008E */ lh $v0, 0x8e($s0) -/* C36C58 80240728 9603008E */ lhu $v1, 0x8e($s0) -/* C36C5C 8024072C 18400005 */ blez $v0, .L80240744 -/* C36C60 80240730 2462FFFF */ addiu $v0, $v1, -1 -/* C36C64 80240734 A602008E */ sh $v0, 0x8e($s0) -/* C36C68 80240738 00021400 */ sll $v0, $v0, 0x10 -/* C36C6C 8024073C 1C400019 */ bgtz $v0, .L802407A4 -/* C36C70 80240740 00000000 */ nop -.L80240744: -/* C36C74 80240744 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C36C78 80240748 24020002 */ addiu $v0, $zero, 2 -/* C36C7C 8024074C 0C00A67F */ jal rand_int -/* C36C80 80240750 AE620070 */ sw $v0, 0x70($s3) -/* C36C84 80240754 3C035555 */ lui $v1, 0x5555 -/* C36C88 80240758 34635556 */ ori $v1, $v1, 0x5556 -/* C36C8C 8024075C 00430018 */ mult $v0, $v1 -/* C36C90 80240760 000227C3 */ sra $a0, $v0, 0x1f -/* C36C94 80240764 00004010 */ mfhi $t0 -/* C36C98 80240768 01042023 */ subu $a0, $t0, $a0 -/* C36C9C 8024076C 00041840 */ sll $v1, $a0, 1 -/* C36CA0 80240770 00641821 */ addu $v1, $v1, $a0 -/* C36CA4 80240774 00431023 */ subu $v0, $v0, $v1 -/* C36CA8 80240778 24430002 */ addiu $v1, $v0, 2 -/* C36CAC 8024077C AE630074 */ sw $v1, 0x74($s3) -/* C36CB0 80240780 8E42002C */ lw $v0, 0x2c($s2) -/* C36CB4 80240784 58400007 */ blezl $v0, .L802407A4 -/* C36CB8 80240788 AE600070 */ sw $zero, 0x70($s3) -/* C36CBC 8024078C 8E420008 */ lw $v0, 8($s2) -/* C36CC0 80240790 18400003 */ blez $v0, .L802407A0 -/* C36CC4 80240794 28620003 */ slti $v0, $v1, 3 -/* C36CC8 80240798 10400002 */ beqz $v0, .L802407A4 -/* C36CCC 8024079C 00000000 */ nop -.L802407A0: -/* C36CD0 802407A0 AE600070 */ sw $zero, 0x70($s3) -.L802407A4: -/* C36CD4 802407A4 8FBF0058 */ lw $ra, 0x58($sp) -/* C36CD8 802407A8 8FB50054 */ lw $s5, 0x54($sp) -/* C36CDC 802407AC 8FB40050 */ lw $s4, 0x50($sp) -/* C36CE0 802407B0 8FB3004C */ lw $s3, 0x4c($sp) -/* C36CE4 802407B4 8FB20048 */ lw $s2, 0x48($sp) -/* C36CE8 802407B8 8FB10044 */ lw $s1, 0x44($sp) -/* C36CEC 802407BC 8FB00040 */ lw $s0, 0x40($sp) -/* C36CF0 802407C0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C36CF4 802407C4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C36CF8 802407C8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C36CFC 802407CC D7B40060 */ ldc1 $f20, 0x60($sp) -/* C36D00 802407D0 03E00008 */ jr $ra -/* C36D04 802407D4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/dgb_08_func_80241910_C416C0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/dgb_08_func_80241910_C416C0.s deleted file mode 100644 index c6c27a3cd6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/dgb_08_func_80241910_C416C0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80246D40_C46AF0 -.double 0.09 - -dlabel D_80246D48_C46AF8 -.double 0.09 - -.section .text - -glabel dgb_08_func_80241910_C416C0 -/* C416C0 80241910 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C416C4 80241914 AFB3004C */ sw $s3, 0x4c($sp) -/* C416C8 80241918 0080982D */ daddu $s3, $a0, $zero -/* C416CC 8024191C AFBF0058 */ sw $ra, 0x58($sp) -/* C416D0 80241920 AFB50054 */ sw $s5, 0x54($sp) -/* C416D4 80241924 AFB40050 */ sw $s4, 0x50($sp) -/* C416D8 80241928 AFB20048 */ sw $s2, 0x48($sp) -/* C416DC 8024192C AFB10044 */ sw $s1, 0x44($sp) -/* C416E0 80241930 AFB00040 */ sw $s0, 0x40($sp) -/* C416E4 80241934 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C416E8 80241938 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C416EC 8024193C F7B60068 */ sdc1 $f22, 0x68($sp) -/* C416F0 80241940 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C416F4 80241944 8E710148 */ lw $s1, 0x148($s3) -/* C416F8 80241948 00A0902D */ daddu $s2, $a1, $zero -/* C416FC 8024194C 86240008 */ lh $a0, 8($s1) -/* C41700 80241950 0C00EABB */ jal get_npc_unsafe -/* C41704 80241954 00C0A82D */ daddu $s5, $a2, $zero -/* C41708 80241958 0040802D */ daddu $s0, $v0, $zero -/* C4170C 8024195C 0000A02D */ daddu $s4, $zero, $zero -/* C41710 80241960 C624007C */ lwc1 $f4, 0x7c($s1) -/* C41714 80241964 46802120 */ cvt.s.w $f4, $f4 -/* C41718 80241968 C6220088 */ lwc1 $f2, 0x88($s1) -/* C4171C 8024196C 468010A0 */ cvt.s.w $f2, $f2 -/* C41720 80241970 460010A1 */ cvt.d.s $f2, $f2 -/* C41724 80241974 46002121 */ cvt.d.s $f4, $f4 -/* C41728 80241978 C600003C */ lwc1 $f0, 0x3c($s0) -/* C4172C 8024197C 3C014059 */ lui $at, 0x4059 -/* C41730 80241980 44813800 */ mtc1 $at, $f7 -/* C41734 80241984 44803000 */ mtc1 $zero, $f6 -/* C41738 80241988 46000021 */ cvt.d.s $f0, $f0 -/* C4173C 8024198C 46260002 */ mul.d $f0, $f0, $f6 -/* C41740 80241990 00000000 */ nop -/* C41744 80241994 24020001 */ addiu $v0, $zero, 1 -/* C41748 80241998 8E24006C */ lw $a0, 0x6c($s1) -/* C4174C 8024199C 46261083 */ div.d $f2, $f2, $f6 -/* C41750 802419A0 462010A0 */ cvt.s.d $f2, $f2 -/* C41754 802419A4 46262103 */ div.d $f4, $f4, $f6 -/* C41758 802419A8 46202520 */ cvt.s.d $f20, $f4 -/* C4175C 802419AC 30830011 */ andi $v1, $a0, 0x11 -/* C41760 802419B0 4620020D */ trunc.w.d $f8, $f0 -/* C41764 802419B4 E628007C */ swc1 $f8, 0x7c($s1) -/* C41768 802419B8 C6200078 */ lwc1 $f0, 0x78($s1) -/* C4176C 802419BC 46800020 */ cvt.s.w $f0, $f0 -/* C41770 802419C0 46000021 */ cvt.d.s $f0, $f0 -/* C41774 802419C4 46260003 */ div.d $f0, $f0, $f6 -/* C41778 802419C8 462006A0 */ cvt.s.d $f26, $f0 -/* C4177C 802419CC C6200070 */ lwc1 $f0, 0x70($s1) -/* C41780 802419D0 46800020 */ cvt.s.w $f0, $f0 -/* C41784 802419D4 46000021 */ cvt.d.s $f0, $f0 -/* C41788 802419D8 46260003 */ div.d $f0, $f0, $f6 -/* C4178C 802419DC 462005A0 */ cvt.s.d $f22, $f0 -/* C41790 802419E0 14620025 */ bne $v1, $v0, .L80241A78 -/* C41794 802419E4 4602D600 */ add.s $f24, $f26, $f2 -/* C41798 802419E8 8E020000 */ lw $v0, ($s0) -/* C4179C 802419EC 30420008 */ andi $v0, $v0, 8 -/* C417A0 802419F0 10400009 */ beqz $v0, .L80241A18 -/* C417A4 802419F4 27A50028 */ addiu $a1, $sp, 0x28 -/* C417A8 802419F8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C417AC 802419FC 4600C001 */ sub.s $f0, $f24, $f0 -/* C417B0 80241A00 4600B03C */ c.lt.s $f22, $f0 -/* C417B4 80241A04 00000000 */ nop -/* C417B8 80241A08 4500001B */ bc1f .L80241A78 -/* C417BC 80241A0C 34820010 */ ori $v0, $a0, 0x10 -/* C417C0 80241A10 0809069E */ j .L80241A78 -/* C417C4 80241A14 AE22006C */ sw $v0, 0x6c($s1) -.L80241A18: -/* C417C8 80241A18 27A6002C */ addiu $a2, $sp, 0x2c -/* C417CC 80241A1C C6000038 */ lwc1 $f0, 0x38($s0) -/* C417D0 80241A20 C602003C */ lwc1 $f2, 0x3c($s0) -/* C417D4 80241A24 C6040040 */ lwc1 $f4, 0x40($s0) -/* C417D8 80241A28 3C01447A */ lui $at, 0x447a -/* C417DC 80241A2C 44813000 */ mtc1 $at, $f6 -/* C417E0 80241A30 27A20034 */ addiu $v0, $sp, 0x34 -/* C417E4 80241A34 E7A00028 */ swc1 $f0, 0x28($sp) -/* C417E8 80241A38 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C417EC 80241A3C E7A40030 */ swc1 $f4, 0x30($sp) -/* C417F0 80241A40 E7A60034 */ swc1 $f6, 0x34($sp) -/* C417F4 80241A44 AFA20010 */ sw $v0, 0x10($sp) -/* C417F8 80241A48 8E040080 */ lw $a0, 0x80($s0) -/* C417FC 80241A4C 0C0372DF */ jal npc_raycast_down_sides -/* C41800 80241A50 27A70030 */ addiu $a3, $sp, 0x30 -/* C41804 80241A54 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C41808 80241A58 4600D001 */ sub.s $f0, $f26, $f0 -/* C4180C 80241A5C 4600B03C */ c.lt.s $f22, $f0 -/* C41810 80241A60 00000000 */ nop -/* C41814 80241A64 45000004 */ bc1f .L80241A78 -/* C41818 80241A68 00000000 */ nop -/* C4181C 80241A6C 8E22006C */ lw $v0, 0x6c($s1) -/* C41820 80241A70 34420010 */ ori $v0, $v0, 0x10 -/* C41824 80241A74 AE22006C */ sw $v0, 0x6c($s1) -.L80241A78: -/* C41828 80241A78 8E22006C */ lw $v0, 0x6c($s1) -/* C4182C 80241A7C 24030011 */ addiu $v1, $zero, 0x11 -/* C41830 80241A80 30420011 */ andi $v0, $v0, 0x11 -/* C41834 80241A84 14430039 */ bne $v0, $v1, .L80241B6C -/* C41838 80241A88 00000000 */ nop -/* C4183C 80241A8C 8E020000 */ lw $v0, ($s0) -/* C41840 80241A90 30420008 */ andi $v0, $v0, 8 -/* C41844 80241A94 1040000A */ beqz $v0, .L80241AC0 -/* C41848 80241A98 4600C106 */ mov.s $f4, $f24 -/* C4184C 80241A9C 4614C081 */ sub.s $f2, $f24, $f20 -/* C41850 80241AA0 3C018024 */ lui $at, %hi(D_80246D40_C46AF0) -/* C41854 80241AA4 D4206D40 */ ldc1 $f0, %lo(D_80246D40_C46AF0)($at) -/* C41858 80241AA8 460010A1 */ cvt.d.s $f2, $f2 -/* C4185C 80241AAC 46201082 */ mul.d $f2, $f2, $f0 -/* C41860 80241AB0 00000000 */ nop -/* C41864 80241AB4 4600A021 */ cvt.d.s $f0, $f20 -/* C41868 80241AB8 080906C9 */ j .L80241B24 -/* C4186C 80241ABC 46220000 */ add.d $f0, $f0, $f2 -.L80241AC0: -/* C41870 80241AC0 27A50028 */ addiu $a1, $sp, 0x28 -/* C41874 80241AC4 27A6002C */ addiu $a2, $sp, 0x2c -/* C41878 80241AC8 C6000038 */ lwc1 $f0, 0x38($s0) -/* C4187C 80241ACC C6020040 */ lwc1 $f2, 0x40($s0) -/* C41880 80241AD0 3C01447A */ lui $at, 0x447a -/* C41884 80241AD4 44812000 */ mtc1 $at, $f4 -/* C41888 80241AD8 27A20034 */ addiu $v0, $sp, 0x34 -/* C4188C 80241ADC E7B4002C */ swc1 $f20, 0x2c($sp) -/* C41890 80241AE0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C41894 80241AE4 E7A20030 */ swc1 $f2, 0x30($sp) -/* C41898 80241AE8 E7A40034 */ swc1 $f4, 0x34($sp) -/* C4189C 80241AEC AFA20010 */ sw $v0, 0x10($sp) -/* C418A0 80241AF0 8E040080 */ lw $a0, 0x80($s0) -/* C418A4 80241AF4 0C0372DF */ jal npc_raycast_down_sides -/* C418A8 80241AF8 27A70030 */ addiu $a3, $sp, 0x30 -/* C418AC 80241AFC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C418B0 80241B00 461A2100 */ add.s $f4, $f4, $f26 -/* C418B4 80241B04 46142081 */ sub.s $f2, $f4, $f20 -/* C418B8 80241B08 3C018024 */ lui $at, %hi(D_80246D48_C46AF8) -/* C418BC 80241B0C D4206D48 */ ldc1 $f0, %lo(D_80246D48_C46AF8)($at) -/* C418C0 80241B10 460010A1 */ cvt.d.s $f2, $f2 -/* C418C4 80241B14 46201082 */ mul.d $f2, $f2, $f0 -/* C418C8 80241B18 00000000 */ nop -/* C418CC 80241B1C 4600A021 */ cvt.d.s $f0, $f20 -/* C418D0 80241B20 46220000 */ add.d $f0, $f0, $f2 -.L80241B24: -/* C418D4 80241B24 46200020 */ cvt.s.d $f0, $f0 -/* C418D8 80241B28 E600003C */ swc1 $f0, 0x3c($s0) -/* C418DC 80241B2C C600003C */ lwc1 $f0, 0x3c($s0) -/* C418E0 80241B30 46002001 */ sub.s $f0, $f4, $f0 -/* C418E4 80241B34 3C013FF0 */ lui $at, 0x3ff0 -/* C418E8 80241B38 44811800 */ mtc1 $at, $f3 -/* C418EC 80241B3C 44801000 */ mtc1 $zero, $f2 -/* C418F0 80241B40 46000005 */ abs.s $f0, $f0 -/* C418F4 80241B44 46000021 */ cvt.d.s $f0, $f0 -/* C418F8 80241B48 4622003C */ c.lt.d $f0, $f2 -/* C418FC 80241B4C 00000000 */ nop -/* C41900 80241B50 45000036 */ bc1f .L80241C2C -/* C41904 80241B54 2403FFEF */ addiu $v1, $zero, -0x11 -/* C41908 80241B58 E604003C */ swc1 $f4, 0x3c($s0) -/* C4190C 80241B5C 8E22006C */ lw $v0, 0x6c($s1) -/* C41910 80241B60 00431024 */ and $v0, $v0, $v1 -/* C41914 80241B64 0809070B */ j .L80241C2C -/* C41918 80241B68 AE22006C */ sw $v0, 0x6c($s1) -.L80241B6C: -/* C4191C 80241B6C 8E220070 */ lw $v0, 0x70($s1) -/* C41920 80241B70 1840002E */ blez $v0, .L80241C2C -/* C41924 80241B74 00000000 */ nop -/* C41928 80241B78 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C4192C 80241B7C 0C00A8BB */ jal sin_deg -/* C41930 80241B80 46806320 */ cvt.s.w $f12, $f12 -/* C41934 80241B84 8E020000 */ lw $v0, ($s0) -/* C41938 80241B88 30420008 */ andi $v0, $v0, 8 -/* C4193C 80241B8C 10400003 */ beqz $v0, .L80241B9C -/* C41940 80241B90 46000506 */ mov.s $f20, $f0 -/* C41944 80241B94 080906F7 */ j .L80241BDC -/* C41948 80241B98 0000102D */ daddu $v0, $zero, $zero -.L80241B9C: -/* C4194C 80241B9C 27A50028 */ addiu $a1, $sp, 0x28 -/* C41950 80241BA0 27A6002C */ addiu $a2, $sp, 0x2c -/* C41954 80241BA4 C6000038 */ lwc1 $f0, 0x38($s0) -/* C41958 80241BA8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C4195C 80241BAC C6040040 */ lwc1 $f4, 0x40($s0) -/* C41960 80241BB0 3C01447A */ lui $at, 0x447a -/* C41964 80241BB4 44813000 */ mtc1 $at, $f6 -/* C41968 80241BB8 27A20034 */ addiu $v0, $sp, 0x34 -/* C4196C 80241BBC E7A00028 */ swc1 $f0, 0x28($sp) -/* C41970 80241BC0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C41974 80241BC4 E7A40030 */ swc1 $f4, 0x30($sp) -/* C41978 80241BC8 E7A60034 */ swc1 $f6, 0x34($sp) -/* C4197C 80241BCC AFA20010 */ sw $v0, 0x10($sp) -/* C41980 80241BD0 8E040080 */ lw $a0, 0x80($s0) -/* C41984 80241BD4 0C0372DF */ jal npc_raycast_down_sides -/* C41988 80241BD8 27A70030 */ addiu $a3, $sp, 0x30 -.L80241BDC: -/* C4198C 80241BDC 10400007 */ beqz $v0, .L80241BFC -/* C41990 80241BE0 00000000 */ nop -/* C41994 80241BE4 4616A082 */ mul.s $f2, $f20, $f22 -/* C41998 80241BE8 00000000 */ nop -/* C4199C 80241BEC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C419A0 80241BF0 461A0000 */ add.s $f0, $f0, $f26 -/* C419A4 80241BF4 08090702 */ j .L80241C08 -/* C419A8 80241BF8 46020000 */ add.s $f0, $f0, $f2 -.L80241BFC: -/* C419AC 80241BFC 4616A002 */ mul.s $f0, $f20, $f22 -/* C419B0 80241C00 00000000 */ nop -/* C419B4 80241C04 4600C000 */ add.s $f0, $f24, $f0 -.L80241C08: -/* C419B8 80241C08 E600003C */ swc1 $f0, 0x3c($s0) -/* C419BC 80241C0C 8E220074 */ lw $v0, 0x74($s1) -/* C419C0 80241C10 2442000A */ addiu $v0, $v0, 0xa -/* C419C4 80241C14 44826000 */ mtc1 $v0, $f12 -/* C419C8 80241C18 00000000 */ nop -/* C419CC 80241C1C 0C00A6C9 */ jal clamp_angle -/* C419D0 80241C20 46806320 */ cvt.s.w $f12, $f12 -/* C419D4 80241C24 4600020D */ trunc.w.s $f8, $f0 -/* C419D8 80241C28 E6280074 */ swc1 $f8, 0x74($s1) -.L80241C2C: -/* C419DC 80241C2C 8E220090 */ lw $v0, 0x90($s1) -/* C419E0 80241C30 1C40004A */ bgtz $v0, .L80241D5C -/* C419E4 80241C34 2442FFFF */ addiu $v0, $v0, -1 -/* C419E8 80241C38 8E430014 */ lw $v1, 0x14($s2) -/* C419EC 80241C3C 04600048 */ bltz $v1, .L80241D60 -/* C419F0 80241C40 00000000 */ nop -/* C419F4 80241C44 8E620074 */ lw $v0, 0x74($s3) -/* C419F8 80241C48 1C400042 */ bgtz $v0, .L80241D54 -/* C419FC 80241C4C 2442FFFF */ addiu $v0, $v0, -1 -/* C41A00 80241C50 AE630074 */ sw $v1, 0x74($s3) -/* C41A04 80241C54 860200A8 */ lh $v0, 0xa8($s0) -/* C41A08 80241C58 C602003C */ lwc1 $f2, 0x3c($s0) -/* C41A0C 80241C5C 44820000 */ mtc1 $v0, $f0 -/* C41A10 80241C60 00000000 */ nop -/* C41A14 80241C64 46800020 */ cvt.s.w $f0, $f0 -/* C41A18 80241C68 46001080 */ add.s $f2, $f2, $f0 -/* C41A1C 80241C6C 3C014024 */ lui $at, 0x4024 -/* C41A20 80241C70 44810800 */ mtc1 $at, $f1 -/* C41A24 80241C74 44800000 */ mtc1 $zero, $f0 -/* C41A28 80241C78 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C41A2C 80241C7C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C41A30 80241C80 460010A1 */ cvt.d.s $f2, $f2 -/* C41A34 80241C84 46201080 */ add.d $f2, $f2, $f0 -/* C41A38 80241C88 C440002C */ lwc1 $f0, 0x2c($v0) -/* C41A3C 80241C8C 46000021 */ cvt.d.s $f0, $f0 -/* C41A40 80241C90 4622003C */ c.lt.d $f0, $f2 -/* C41A44 80241C94 00000000 */ nop -/* C41A48 80241C98 4500002C */ bc1f .L80241D4C -/* C41A4C 80241C9C 02A0202D */ daddu $a0, $s5, $zero -/* C41A50 80241CA0 AFA00010 */ sw $zero, 0x10($sp) -/* C41A54 80241CA4 8E46000C */ lw $a2, 0xc($s2) -/* C41A58 80241CA8 8E470010 */ lw $a3, 0x10($s2) -/* C41A5C 80241CAC 0C01242D */ jal func_800490B4 -/* C41A60 80241CB0 0220282D */ daddu $a1, $s1, $zero -/* C41A64 80241CB4 10400025 */ beqz $v0, .L80241D4C -/* C41A68 80241CB8 0000202D */ daddu $a0, $zero, $zero -/* C41A6C 80241CBC 0200282D */ daddu $a1, $s0, $zero -/* C41A70 80241CC0 0000302D */ daddu $a2, $zero, $zero -/* C41A74 80241CC4 2412000C */ addiu $s2, $zero, 0xc -/* C41A78 80241CC8 860300A8 */ lh $v1, 0xa8($s0) -/* C41A7C 80241CCC 3C013F80 */ lui $at, 0x3f80 -/* C41A80 80241CD0 44810000 */ mtc1 $at, $f0 -/* C41A84 80241CD4 3C014000 */ lui $at, 0x4000 -/* C41A88 80241CD8 44811000 */ mtc1 $at, $f2 -/* C41A8C 80241CDC 3C01C1A0 */ lui $at, 0xc1a0 -/* C41A90 80241CE0 44812000 */ mtc1 $at, $f4 -/* C41A94 80241CE4 44834000 */ mtc1 $v1, $f8 -/* C41A98 80241CE8 00000000 */ nop -/* C41A9C 80241CEC 46804220 */ cvt.s.w $f8, $f8 -/* C41AA0 80241CF0 44074000 */ mfc1 $a3, $f8 -/* C41AA4 80241CF4 27A20038 */ addiu $v0, $sp, 0x38 -/* C41AA8 80241CF8 AFB2001C */ sw $s2, 0x1c($sp) -/* C41AAC 80241CFC AFA20020 */ sw $v0, 0x20($sp) -/* C41AB0 80241D00 E7A00010 */ swc1 $f0, 0x10($sp) -/* C41AB4 80241D04 E7A20014 */ swc1 $f2, 0x14($sp) -/* C41AB8 80241D08 0C01BFA4 */ jal fx_emote -/* C41ABC 80241D0C E7A40018 */ swc1 $f4, 0x18($sp) -/* C41AC0 80241D10 0200202D */ daddu $a0, $s0, $zero -/* C41AC4 80241D14 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C41AC8 80241D18 C480003C */ lwc1 $f0, 0x3c($a0) -/* C41ACC 80241D1C 3C060020 */ lui $a2, 0x20 -/* C41AD0 80241D20 0C012530 */ jal ai_enemy_play_sound -/* C41AD4 80241D24 E4800064 */ swc1 $f0, 0x64($a0) -/* C41AD8 80241D28 8E220018 */ lw $v0, 0x18($s1) -/* C41ADC 80241D2C 9442002A */ lhu $v0, 0x2a($v0) -/* C41AE0 80241D30 30420001 */ andi $v0, $v0, 1 -/* C41AE4 80241D34 10400003 */ beqz $v0, .L80241D44 -/* C41AE8 80241D38 2402000A */ addiu $v0, $zero, 0xa -/* C41AEC 80241D3C 080907C1 */ j .L80241F04 -/* C41AF0 80241D40 AE620070 */ sw $v0, 0x70($s3) -.L80241D44: -/* C41AF4 80241D44 080907C1 */ j .L80241F04 -/* C41AF8 80241D48 AE720070 */ sw $s2, 0x70($s3) -.L80241D4C: -/* C41AFC 80241D4C 8E620074 */ lw $v0, 0x74($s3) -/* C41B00 80241D50 2442FFFF */ addiu $v0, $v0, -1 -.L80241D54: -/* C41B04 80241D54 08090758 */ j .L80241D60 -/* C41B08 80241D58 AE620074 */ sw $v0, 0x74($s3) -.L80241D5C: -/* C41B0C 80241D5C AE220090 */ sw $v0, 0x90($s1) -.L80241D60: -/* C41B10 80241D60 8E2300D0 */ lw $v1, 0xd0($s1) -/* C41B14 80241D64 C6000040 */ lwc1 $f0, 0x40($s0) -/* C41B18 80241D68 C4620000 */ lwc1 $f2, ($v1) -/* C41B1C 80241D6C 468010A0 */ cvt.s.w $f2, $f2 -/* C41B20 80241D70 C4640008 */ lwc1 $f4, 8($v1) -/* C41B24 80241D74 46802120 */ cvt.s.w $f4, $f4 -/* C41B28 80241D78 E7A00010 */ swc1 $f0, 0x10($sp) -/* C41B2C 80241D7C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41B30 80241D80 44051000 */ mfc1 $a1, $f2 -/* C41B34 80241D84 C440000C */ lwc1 $f0, 0xc($v0) -/* C41B38 80241D88 46800020 */ cvt.s.w $f0, $f0 -/* C41B3C 80241D8C E7A00014 */ swc1 $f0, 0x14($sp) -/* C41B40 80241D90 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41B44 80241D94 44062000 */ mfc1 $a2, $f4 -/* C41B48 80241D98 C4400010 */ lwc1 $f0, 0x10($v0) -/* C41B4C 80241D9C 46800020 */ cvt.s.w $f0, $f0 -/* C41B50 80241DA0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C41B54 80241DA4 8C640018 */ lw $a0, 0x18($v1) -/* C41B58 80241DA8 0C0123F5 */ jal is_point_within_region -/* C41B5C 80241DAC 8E070038 */ lw $a3, 0x38($s0) -/* C41B60 80241DB0 1040001A */ beqz $v0, .L80241E1C -/* C41B64 80241DB4 00000000 */ nop -/* C41B68 80241DB8 8E060038 */ lw $a2, 0x38($s0) -/* C41B6C 80241DBC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41B70 80241DC0 8E070040 */ lw $a3, 0x40($s0) -/* C41B74 80241DC4 C44C0000 */ lwc1 $f12, ($v0) -/* C41B78 80241DC8 46806320 */ cvt.s.w $f12, $f12 -/* C41B7C 80241DCC C44E0008 */ lwc1 $f14, 8($v0) -/* C41B80 80241DD0 0C00A7B5 */ jal dist2D -/* C41B84 80241DD4 468073A0 */ cvt.s.w $f14, $f14 -/* C41B88 80241DD8 C6020018 */ lwc1 $f2, 0x18($s0) -/* C41B8C 80241DDC 4600103C */ c.lt.s $f2, $f0 -/* C41B90 80241DE0 00000000 */ nop -/* C41B94 80241DE4 4500000D */ bc1f .L80241E1C -/* C41B98 80241DE8 E7A00034 */ swc1 $f0, 0x34($sp) -/* C41B9C 80241DEC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C41BA0 80241DF0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41BA4 80241DF4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C41BA8 80241DF8 C4480000 */ lwc1 $f8, ($v0) -/* C41BAC 80241DFC 46804220 */ cvt.s.w $f8, $f8 -/* C41BB0 80241E00 44064000 */ mfc1 $a2, $f8 -/* C41BB4 80241E04 C4480008 */ lwc1 $f8, 8($v0) -/* C41BB8 80241E08 46804220 */ cvt.s.w $f8, $f8 -/* C41BBC 80241E0C 44074000 */ mfc1 $a3, $f8 -/* C41BC0 80241E10 0C00A720 */ jal atan2 -/* C41BC4 80241E14 24140001 */ addiu $s4, $zero, 1 -/* C41BC8 80241E18 E600000C */ swc1 $f0, 0xc($s0) -.L80241E1C: -/* C41BCC 80241E1C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41BD0 80241E20 8C43000C */ lw $v1, 0xc($v0) -/* C41BD4 80241E24 8C420010 */ lw $v0, 0x10($v0) -/* C41BD8 80241E28 00621825 */ or $v1, $v1, $v0 -/* C41BDC 80241E2C 00741825 */ or $v1, $v1, $s4 -/* C41BE0 80241E30 10600008 */ beqz $v1, .L80241E54 -/* C41BE4 80241E34 00000000 */ nop -/* C41BE8 80241E38 8602008C */ lh $v0, 0x8c($s0) -/* C41BEC 80241E3C 14400031 */ bnez $v0, .L80241F04 -/* C41BF0 80241E40 00000000 */ nop -/* C41BF4 80241E44 8E050018 */ lw $a1, 0x18($s0) -/* C41BF8 80241E48 8E06000C */ lw $a2, 0xc($s0) -/* C41BFC 80241E4C 0C00EA95 */ jal npc_move_heading -/* C41C00 80241E50 0200202D */ daddu $a0, $s0, $zero -.L80241E54: -/* C41C04 80241E54 C600003C */ lwc1 $f0, 0x3c($s0) -/* C41C08 80241E58 3C014059 */ lui $at, 0x4059 -/* C41C0C 80241E5C 44811800 */ mtc1 $at, $f3 -/* C41C10 80241E60 44801000 */ mtc1 $zero, $f2 -/* C41C14 80241E64 46000021 */ cvt.d.s $f0, $f0 -/* C41C18 80241E68 46220002 */ mul.d $f0, $f0, $f2 -/* C41C1C 80241E6C 00000000 */ nop -/* C41C20 80241E70 4620020D */ trunc.w.d $f8, $f0 -/* C41C24 80241E74 E628007C */ swc1 $f8, 0x7c($s1) -/* C41C28 80241E78 8E420004 */ lw $v0, 4($s2) -/* C41C2C 80241E7C 18400021 */ blez $v0, .L80241F04 -/* C41C30 80241E80 00000000 */ nop -/* C41C34 80241E84 8602008E */ lh $v0, 0x8e($s0) -/* C41C38 80241E88 9603008E */ lhu $v1, 0x8e($s0) -/* C41C3C 80241E8C 18400005 */ blez $v0, .L80241EA4 -/* C41C40 80241E90 2462FFFF */ addiu $v0, $v1, -1 -/* C41C44 80241E94 A602008E */ sh $v0, 0x8e($s0) -/* C41C48 80241E98 00021400 */ sll $v0, $v0, 0x10 -/* C41C4C 80241E9C 1C400019 */ bgtz $v0, .L80241F04 -/* C41C50 80241EA0 00000000 */ nop -.L80241EA4: -/* C41C54 80241EA4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C41C58 80241EA8 24020002 */ addiu $v0, $zero, 2 -/* C41C5C 80241EAC 0C00A67F */ jal rand_int -/* C41C60 80241EB0 AE620070 */ sw $v0, 0x70($s3) -/* C41C64 80241EB4 3C035555 */ lui $v1, 0x5555 -/* C41C68 80241EB8 34635556 */ ori $v1, $v1, 0x5556 -/* C41C6C 80241EBC 00430018 */ mult $v0, $v1 -/* C41C70 80241EC0 000227C3 */ sra $a0, $v0, 0x1f -/* C41C74 80241EC4 00004010 */ mfhi $t0 -/* C41C78 80241EC8 01042023 */ subu $a0, $t0, $a0 -/* C41C7C 80241ECC 00041840 */ sll $v1, $a0, 1 -/* C41C80 80241ED0 00641821 */ addu $v1, $v1, $a0 -/* C41C84 80241ED4 00431023 */ subu $v0, $v0, $v1 -/* C41C88 80241ED8 24430002 */ addiu $v1, $v0, 2 -/* C41C8C 80241EDC AE630074 */ sw $v1, 0x74($s3) -/* C41C90 80241EE0 8E42002C */ lw $v0, 0x2c($s2) -/* C41C94 80241EE4 58400007 */ blezl $v0, .L80241F04 -/* C41C98 80241EE8 AE600070 */ sw $zero, 0x70($s3) -/* C41C9C 80241EEC 8E420008 */ lw $v0, 8($s2) -/* C41CA0 80241EF0 18400003 */ blez $v0, .L80241F00 -/* C41CA4 80241EF4 28620003 */ slti $v0, $v1, 3 -/* C41CA8 80241EF8 10400002 */ beqz $v0, .L80241F04 -/* C41CAC 80241EFC 00000000 */ nop -.L80241F00: -/* C41CB0 80241F00 AE600070 */ sw $zero, 0x70($s3) -.L80241F04: -/* C41CB4 80241F04 8FBF0058 */ lw $ra, 0x58($sp) -/* C41CB8 80241F08 8FB50054 */ lw $s5, 0x54($sp) -/* C41CBC 80241F0C 8FB40050 */ lw $s4, 0x50($sp) -/* C41CC0 80241F10 8FB3004C */ lw $s3, 0x4c($sp) -/* C41CC4 80241F14 8FB20048 */ lw $s2, 0x48($sp) -/* C41CC8 80241F18 8FB10044 */ lw $s1, 0x44($sp) -/* C41CCC 80241F1C 8FB00040 */ lw $s0, 0x40($sp) -/* C41CD0 80241F20 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C41CD4 80241F24 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C41CD8 80241F28 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C41CDC 80241F2C D7B40060 */ ldc1 $f20, 0x60($sp) -/* C41CE0 80241F30 03E00008 */ jr $ra -/* C41CE4 80241F34 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/dgb_09_func_802415D4_C481B4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/dgb_09_func_802415D4_C481B4.s deleted file mode 100644 index 63a1e0a8a2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/dgb_09_func_802415D4_C481B4.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802456C8_C4C2A8 -.double 0.09 - -dlabel D_802456D0_C4C2B0 -.double 0.09 - -.section .text - -glabel dgb_09_func_802415D4_C481B4 -/* C481B4 802415D4 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C481B8 802415D8 AFB3004C */ sw $s3, 0x4c($sp) -/* C481BC 802415DC 0080982D */ daddu $s3, $a0, $zero -/* C481C0 802415E0 AFBF0058 */ sw $ra, 0x58($sp) -/* C481C4 802415E4 AFB50054 */ sw $s5, 0x54($sp) -/* C481C8 802415E8 AFB40050 */ sw $s4, 0x50($sp) -/* C481CC 802415EC AFB20048 */ sw $s2, 0x48($sp) -/* C481D0 802415F0 AFB10044 */ sw $s1, 0x44($sp) -/* C481D4 802415F4 AFB00040 */ sw $s0, 0x40($sp) -/* C481D8 802415F8 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C481DC 802415FC F7B80070 */ sdc1 $f24, 0x70($sp) -/* C481E0 80241600 F7B60068 */ sdc1 $f22, 0x68($sp) -/* C481E4 80241604 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C481E8 80241608 8E710148 */ lw $s1, 0x148($s3) -/* C481EC 8024160C 00A0902D */ daddu $s2, $a1, $zero -/* C481F0 80241610 86240008 */ lh $a0, 8($s1) -/* C481F4 80241614 0C00EABB */ jal get_npc_unsafe -/* C481F8 80241618 00C0A82D */ daddu $s5, $a2, $zero -/* C481FC 8024161C 0040802D */ daddu $s0, $v0, $zero -/* C48200 80241620 0000A02D */ daddu $s4, $zero, $zero -/* C48204 80241624 C624007C */ lwc1 $f4, 0x7c($s1) -/* C48208 80241628 46802120 */ cvt.s.w $f4, $f4 -/* C4820C 8024162C C6220088 */ lwc1 $f2, 0x88($s1) -/* C48210 80241630 468010A0 */ cvt.s.w $f2, $f2 -/* C48214 80241634 460010A1 */ cvt.d.s $f2, $f2 -/* C48218 80241638 46002121 */ cvt.d.s $f4, $f4 -/* C4821C 8024163C C600003C */ lwc1 $f0, 0x3c($s0) -/* C48220 80241640 3C014059 */ lui $at, 0x4059 -/* C48224 80241644 44813800 */ mtc1 $at, $f7 -/* C48228 80241648 44803000 */ mtc1 $zero, $f6 -/* C4822C 8024164C 46000021 */ cvt.d.s $f0, $f0 -/* C48230 80241650 46260002 */ mul.d $f0, $f0, $f6 -/* C48234 80241654 00000000 */ nop -/* C48238 80241658 24020001 */ addiu $v0, $zero, 1 -/* C4823C 8024165C 8E24006C */ lw $a0, 0x6c($s1) -/* C48240 80241660 46261083 */ div.d $f2, $f2, $f6 -/* C48244 80241664 462010A0 */ cvt.s.d $f2, $f2 -/* C48248 80241668 46262103 */ div.d $f4, $f4, $f6 -/* C4824C 8024166C 46202520 */ cvt.s.d $f20, $f4 -/* C48250 80241670 30830011 */ andi $v1, $a0, 0x11 -/* C48254 80241674 4620020D */ trunc.w.d $f8, $f0 -/* C48258 80241678 E628007C */ swc1 $f8, 0x7c($s1) -/* C4825C 8024167C C6200078 */ lwc1 $f0, 0x78($s1) -/* C48260 80241680 46800020 */ cvt.s.w $f0, $f0 -/* C48264 80241684 46000021 */ cvt.d.s $f0, $f0 -/* C48268 80241688 46260003 */ div.d $f0, $f0, $f6 -/* C4826C 8024168C 462006A0 */ cvt.s.d $f26, $f0 -/* C48270 80241690 C6200070 */ lwc1 $f0, 0x70($s1) -/* C48274 80241694 46800020 */ cvt.s.w $f0, $f0 -/* C48278 80241698 46000021 */ cvt.d.s $f0, $f0 -/* C4827C 8024169C 46260003 */ div.d $f0, $f0, $f6 -/* C48280 802416A0 462005A0 */ cvt.s.d $f22, $f0 -/* C48284 802416A4 14620025 */ bne $v1, $v0, .L8024173C -/* C48288 802416A8 4602D600 */ add.s $f24, $f26, $f2 -/* C4828C 802416AC 8E020000 */ lw $v0, ($s0) -/* C48290 802416B0 30420008 */ andi $v0, $v0, 8 -/* C48294 802416B4 10400009 */ beqz $v0, .L802416DC -/* C48298 802416B8 27A50028 */ addiu $a1, $sp, 0x28 -/* C4829C 802416BC C600003C */ lwc1 $f0, 0x3c($s0) -/* C482A0 802416C0 4600C001 */ sub.s $f0, $f24, $f0 -/* C482A4 802416C4 4600B03C */ c.lt.s $f22, $f0 -/* C482A8 802416C8 00000000 */ nop -/* C482AC 802416CC 4500001B */ bc1f .L8024173C -/* C482B0 802416D0 34820010 */ ori $v0, $a0, 0x10 -/* C482B4 802416D4 080905CF */ j .L8024173C -/* C482B8 802416D8 AE22006C */ sw $v0, 0x6c($s1) -.L802416DC: -/* C482BC 802416DC 27A6002C */ addiu $a2, $sp, 0x2c -/* C482C0 802416E0 C6000038 */ lwc1 $f0, 0x38($s0) -/* C482C4 802416E4 C602003C */ lwc1 $f2, 0x3c($s0) -/* C482C8 802416E8 C6040040 */ lwc1 $f4, 0x40($s0) -/* C482CC 802416EC 3C01447A */ lui $at, 0x447a -/* C482D0 802416F0 44813000 */ mtc1 $at, $f6 -/* C482D4 802416F4 27A20034 */ addiu $v0, $sp, 0x34 -/* C482D8 802416F8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C482DC 802416FC E7A2002C */ swc1 $f2, 0x2c($sp) -/* C482E0 80241700 E7A40030 */ swc1 $f4, 0x30($sp) -/* C482E4 80241704 E7A60034 */ swc1 $f6, 0x34($sp) -/* C482E8 80241708 AFA20010 */ sw $v0, 0x10($sp) -/* C482EC 8024170C 8E040080 */ lw $a0, 0x80($s0) -/* C482F0 80241710 0C0372DF */ jal npc_raycast_down_sides -/* C482F4 80241714 27A70030 */ addiu $a3, $sp, 0x30 -/* C482F8 80241718 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C482FC 8024171C 4600D001 */ sub.s $f0, $f26, $f0 -/* C48300 80241720 4600B03C */ c.lt.s $f22, $f0 -/* C48304 80241724 00000000 */ nop -/* C48308 80241728 45000004 */ bc1f .L8024173C -/* C4830C 8024172C 00000000 */ nop -/* C48310 80241730 8E22006C */ lw $v0, 0x6c($s1) -/* C48314 80241734 34420010 */ ori $v0, $v0, 0x10 -/* C48318 80241738 AE22006C */ sw $v0, 0x6c($s1) -.L8024173C: -/* C4831C 8024173C 8E22006C */ lw $v0, 0x6c($s1) -/* C48320 80241740 24030011 */ addiu $v1, $zero, 0x11 -/* C48324 80241744 30420011 */ andi $v0, $v0, 0x11 -/* C48328 80241748 14430039 */ bne $v0, $v1, .L80241830 -/* C4832C 8024174C 00000000 */ nop -/* C48330 80241750 8E020000 */ lw $v0, ($s0) -/* C48334 80241754 30420008 */ andi $v0, $v0, 8 -/* C48338 80241758 1040000A */ beqz $v0, .L80241784 -/* C4833C 8024175C 4600C106 */ mov.s $f4, $f24 -/* C48340 80241760 4614C081 */ sub.s $f2, $f24, $f20 -/* C48344 80241764 3C018024 */ lui $at, %hi(D_802456C8_C4C2A8) -/* C48348 80241768 D42056C8 */ ldc1 $f0, %lo(D_802456C8_C4C2A8)($at) -/* C4834C 8024176C 460010A1 */ cvt.d.s $f2, $f2 -/* C48350 80241770 46201082 */ mul.d $f2, $f2, $f0 -/* C48354 80241774 00000000 */ nop -/* C48358 80241778 4600A021 */ cvt.d.s $f0, $f20 -/* C4835C 8024177C 080905FA */ j .L802417E8 -/* C48360 80241780 46220000 */ add.d $f0, $f0, $f2 -.L80241784: -/* C48364 80241784 27A50028 */ addiu $a1, $sp, 0x28 -/* C48368 80241788 27A6002C */ addiu $a2, $sp, 0x2c -/* C4836C 8024178C C6000038 */ lwc1 $f0, 0x38($s0) -/* C48370 80241790 C6020040 */ lwc1 $f2, 0x40($s0) -/* C48374 80241794 3C01447A */ lui $at, 0x447a -/* C48378 80241798 44812000 */ mtc1 $at, $f4 -/* C4837C 8024179C 27A20034 */ addiu $v0, $sp, 0x34 -/* C48380 802417A0 E7B4002C */ swc1 $f20, 0x2c($sp) -/* C48384 802417A4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C48388 802417A8 E7A20030 */ swc1 $f2, 0x30($sp) -/* C4838C 802417AC E7A40034 */ swc1 $f4, 0x34($sp) -/* C48390 802417B0 AFA20010 */ sw $v0, 0x10($sp) -/* C48394 802417B4 8E040080 */ lw $a0, 0x80($s0) -/* C48398 802417B8 0C0372DF */ jal npc_raycast_down_sides -/* C4839C 802417BC 27A70030 */ addiu $a3, $sp, 0x30 -/* C483A0 802417C0 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C483A4 802417C4 461A2100 */ add.s $f4, $f4, $f26 -/* C483A8 802417C8 46142081 */ sub.s $f2, $f4, $f20 -/* C483AC 802417CC 3C018024 */ lui $at, %hi(D_802456D0_C4C2B0) -/* C483B0 802417D0 D42056D0 */ ldc1 $f0, %lo(D_802456D0_C4C2B0)($at) -/* C483B4 802417D4 460010A1 */ cvt.d.s $f2, $f2 -/* C483B8 802417D8 46201082 */ mul.d $f2, $f2, $f0 -/* C483BC 802417DC 00000000 */ nop -/* C483C0 802417E0 4600A021 */ cvt.d.s $f0, $f20 -/* C483C4 802417E4 46220000 */ add.d $f0, $f0, $f2 -.L802417E8: -/* C483C8 802417E8 46200020 */ cvt.s.d $f0, $f0 -/* C483CC 802417EC E600003C */ swc1 $f0, 0x3c($s0) -/* C483D0 802417F0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C483D4 802417F4 46002001 */ sub.s $f0, $f4, $f0 -/* C483D8 802417F8 3C013FF0 */ lui $at, 0x3ff0 -/* C483DC 802417FC 44811800 */ mtc1 $at, $f3 -/* C483E0 80241800 44801000 */ mtc1 $zero, $f2 -/* C483E4 80241804 46000005 */ abs.s $f0, $f0 -/* C483E8 80241808 46000021 */ cvt.d.s $f0, $f0 -/* C483EC 8024180C 4622003C */ c.lt.d $f0, $f2 -/* C483F0 80241810 00000000 */ nop -/* C483F4 80241814 45000036 */ bc1f .L802418F0 -/* C483F8 80241818 2403FFEF */ addiu $v1, $zero, -0x11 -/* C483FC 8024181C E604003C */ swc1 $f4, 0x3c($s0) -/* C48400 80241820 8E22006C */ lw $v0, 0x6c($s1) -/* C48404 80241824 00431024 */ and $v0, $v0, $v1 -/* C48408 80241828 0809063C */ j .L802418F0 -/* C4840C 8024182C AE22006C */ sw $v0, 0x6c($s1) -.L80241830: -/* C48410 80241830 8E220070 */ lw $v0, 0x70($s1) -/* C48414 80241834 1840002E */ blez $v0, .L802418F0 -/* C48418 80241838 00000000 */ nop -/* C4841C 8024183C C62C0074 */ lwc1 $f12, 0x74($s1) -/* C48420 80241840 0C00A8BB */ jal sin_deg -/* C48424 80241844 46806320 */ cvt.s.w $f12, $f12 -/* C48428 80241848 8E020000 */ lw $v0, ($s0) -/* C4842C 8024184C 30420008 */ andi $v0, $v0, 8 -/* C48430 80241850 10400003 */ beqz $v0, .L80241860 -/* C48434 80241854 46000506 */ mov.s $f20, $f0 -/* C48438 80241858 08090628 */ j .L802418A0 -/* C4843C 8024185C 0000102D */ daddu $v0, $zero, $zero -.L80241860: -/* C48440 80241860 27A50028 */ addiu $a1, $sp, 0x28 -/* C48444 80241864 27A6002C */ addiu $a2, $sp, 0x2c -/* C48448 80241868 C6000038 */ lwc1 $f0, 0x38($s0) -/* C4844C 8024186C C602003C */ lwc1 $f2, 0x3c($s0) -/* C48450 80241870 C6040040 */ lwc1 $f4, 0x40($s0) -/* C48454 80241874 3C01447A */ lui $at, 0x447a -/* C48458 80241878 44813000 */ mtc1 $at, $f6 -/* C4845C 8024187C 27A20034 */ addiu $v0, $sp, 0x34 -/* C48460 80241880 E7A00028 */ swc1 $f0, 0x28($sp) -/* C48464 80241884 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C48468 80241888 E7A40030 */ swc1 $f4, 0x30($sp) -/* C4846C 8024188C E7A60034 */ swc1 $f6, 0x34($sp) -/* C48470 80241890 AFA20010 */ sw $v0, 0x10($sp) -/* C48474 80241894 8E040080 */ lw $a0, 0x80($s0) -/* C48478 80241898 0C0372DF */ jal npc_raycast_down_sides -/* C4847C 8024189C 27A70030 */ addiu $a3, $sp, 0x30 -.L802418A0: -/* C48480 802418A0 10400007 */ beqz $v0, .L802418C0 -/* C48484 802418A4 00000000 */ nop -/* C48488 802418A8 4616A082 */ mul.s $f2, $f20, $f22 -/* C4848C 802418AC 00000000 */ nop -/* C48490 802418B0 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C48494 802418B4 461A0000 */ add.s $f0, $f0, $f26 -/* C48498 802418B8 08090633 */ j .L802418CC -/* C4849C 802418BC 46020000 */ add.s $f0, $f0, $f2 -.L802418C0: -/* C484A0 802418C0 4616A002 */ mul.s $f0, $f20, $f22 -/* C484A4 802418C4 00000000 */ nop -/* C484A8 802418C8 4600C000 */ add.s $f0, $f24, $f0 -.L802418CC: -/* C484AC 802418CC E600003C */ swc1 $f0, 0x3c($s0) -/* C484B0 802418D0 8E220074 */ lw $v0, 0x74($s1) -/* C484B4 802418D4 2442000A */ addiu $v0, $v0, 0xa -/* C484B8 802418D8 44826000 */ mtc1 $v0, $f12 -/* C484BC 802418DC 00000000 */ nop -/* C484C0 802418E0 0C00A6C9 */ jal clamp_angle -/* C484C4 802418E4 46806320 */ cvt.s.w $f12, $f12 -/* C484C8 802418E8 4600020D */ trunc.w.s $f8, $f0 -/* C484CC 802418EC E6280074 */ swc1 $f8, 0x74($s1) -.L802418F0: -/* C484D0 802418F0 8E220090 */ lw $v0, 0x90($s1) -/* C484D4 802418F4 1C40004A */ bgtz $v0, .L80241A20 -/* C484D8 802418F8 2442FFFF */ addiu $v0, $v0, -1 -/* C484DC 802418FC 8E430014 */ lw $v1, 0x14($s2) -/* C484E0 80241900 04600048 */ bltz $v1, .L80241A24 -/* C484E4 80241904 00000000 */ nop -/* C484E8 80241908 8E620074 */ lw $v0, 0x74($s3) -/* C484EC 8024190C 1C400042 */ bgtz $v0, .L80241A18 -/* C484F0 80241910 2442FFFF */ addiu $v0, $v0, -1 -/* C484F4 80241914 AE630074 */ sw $v1, 0x74($s3) -/* C484F8 80241918 860200A8 */ lh $v0, 0xa8($s0) -/* C484FC 8024191C C602003C */ lwc1 $f2, 0x3c($s0) -/* C48500 80241920 44820000 */ mtc1 $v0, $f0 -/* C48504 80241924 00000000 */ nop -/* C48508 80241928 46800020 */ cvt.s.w $f0, $f0 -/* C4850C 8024192C 46001080 */ add.s $f2, $f2, $f0 -/* C48510 80241930 3C014024 */ lui $at, 0x4024 -/* C48514 80241934 44810800 */ mtc1 $at, $f1 -/* C48518 80241938 44800000 */ mtc1 $zero, $f0 -/* C4851C 8024193C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C48520 80241940 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C48524 80241944 460010A1 */ cvt.d.s $f2, $f2 -/* C48528 80241948 46201080 */ add.d $f2, $f2, $f0 -/* C4852C 8024194C C440002C */ lwc1 $f0, 0x2c($v0) -/* C48530 80241950 46000021 */ cvt.d.s $f0, $f0 -/* C48534 80241954 4622003C */ c.lt.d $f0, $f2 -/* C48538 80241958 00000000 */ nop -/* C4853C 8024195C 4500002C */ bc1f .L80241A10 -/* C48540 80241960 02A0202D */ daddu $a0, $s5, $zero -/* C48544 80241964 AFA00010 */ sw $zero, 0x10($sp) -/* C48548 80241968 8E46000C */ lw $a2, 0xc($s2) -/* C4854C 8024196C 8E470010 */ lw $a3, 0x10($s2) -/* C48550 80241970 0C01242D */ jal func_800490B4 -/* C48554 80241974 0220282D */ daddu $a1, $s1, $zero -/* C48558 80241978 10400025 */ beqz $v0, .L80241A10 -/* C4855C 8024197C 0000202D */ daddu $a0, $zero, $zero -/* C48560 80241980 0200282D */ daddu $a1, $s0, $zero -/* C48564 80241984 0000302D */ daddu $a2, $zero, $zero -/* C48568 80241988 2412000C */ addiu $s2, $zero, 0xc -/* C4856C 8024198C 860300A8 */ lh $v1, 0xa8($s0) -/* C48570 80241990 3C013F80 */ lui $at, 0x3f80 -/* C48574 80241994 44810000 */ mtc1 $at, $f0 -/* C48578 80241998 3C014000 */ lui $at, 0x4000 -/* C4857C 8024199C 44811000 */ mtc1 $at, $f2 -/* C48580 802419A0 3C01C1A0 */ lui $at, 0xc1a0 -/* C48584 802419A4 44812000 */ mtc1 $at, $f4 -/* C48588 802419A8 44834000 */ mtc1 $v1, $f8 -/* C4858C 802419AC 00000000 */ nop -/* C48590 802419B0 46804220 */ cvt.s.w $f8, $f8 -/* C48594 802419B4 44074000 */ mfc1 $a3, $f8 -/* C48598 802419B8 27A20038 */ addiu $v0, $sp, 0x38 -/* C4859C 802419BC AFB2001C */ sw $s2, 0x1c($sp) -/* C485A0 802419C0 AFA20020 */ sw $v0, 0x20($sp) -/* C485A4 802419C4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C485A8 802419C8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C485AC 802419CC 0C01BFA4 */ jal fx_emote -/* C485B0 802419D0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C485B4 802419D4 0200202D */ daddu $a0, $s0, $zero -/* C485B8 802419D8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C485BC 802419DC C480003C */ lwc1 $f0, 0x3c($a0) -/* C485C0 802419E0 3C060020 */ lui $a2, 0x20 -/* C485C4 802419E4 0C012530 */ jal ai_enemy_play_sound -/* C485C8 802419E8 E4800064 */ swc1 $f0, 0x64($a0) -/* C485CC 802419EC 8E220018 */ lw $v0, 0x18($s1) -/* C485D0 802419F0 9442002A */ lhu $v0, 0x2a($v0) -/* C485D4 802419F4 30420001 */ andi $v0, $v0, 1 -/* C485D8 802419F8 10400003 */ beqz $v0, .L80241A08 -/* C485DC 802419FC 2402000A */ addiu $v0, $zero, 0xa -/* C485E0 80241A00 080906F2 */ j .L80241BC8 -/* C485E4 80241A04 AE620070 */ sw $v0, 0x70($s3) -.L80241A08: -/* C485E8 80241A08 080906F2 */ j .L80241BC8 -/* C485EC 80241A0C AE720070 */ sw $s2, 0x70($s3) -.L80241A10: -/* C485F0 80241A10 8E620074 */ lw $v0, 0x74($s3) -/* C485F4 80241A14 2442FFFF */ addiu $v0, $v0, -1 -.L80241A18: -/* C485F8 80241A18 08090689 */ j .L80241A24 -/* C485FC 80241A1C AE620074 */ sw $v0, 0x74($s3) -.L80241A20: -/* C48600 80241A20 AE220090 */ sw $v0, 0x90($s1) -.L80241A24: -/* C48604 80241A24 8E2300D0 */ lw $v1, 0xd0($s1) -/* C48608 80241A28 C6000040 */ lwc1 $f0, 0x40($s0) -/* C4860C 80241A2C C4620000 */ lwc1 $f2, ($v1) -/* C48610 80241A30 468010A0 */ cvt.s.w $f2, $f2 -/* C48614 80241A34 C4640008 */ lwc1 $f4, 8($v1) -/* C48618 80241A38 46802120 */ cvt.s.w $f4, $f4 -/* C4861C 80241A3C E7A00010 */ swc1 $f0, 0x10($sp) -/* C48620 80241A40 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48624 80241A44 44051000 */ mfc1 $a1, $f2 -/* C48628 80241A48 C440000C */ lwc1 $f0, 0xc($v0) -/* C4862C 80241A4C 46800020 */ cvt.s.w $f0, $f0 -/* C48630 80241A50 E7A00014 */ swc1 $f0, 0x14($sp) -/* C48634 80241A54 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48638 80241A58 44062000 */ mfc1 $a2, $f4 -/* C4863C 80241A5C C4400010 */ lwc1 $f0, 0x10($v0) -/* C48640 80241A60 46800020 */ cvt.s.w $f0, $f0 -/* C48644 80241A64 E7A00018 */ swc1 $f0, 0x18($sp) -/* C48648 80241A68 8C640018 */ lw $a0, 0x18($v1) -/* C4864C 80241A6C 0C0123F5 */ jal is_point_within_region -/* C48650 80241A70 8E070038 */ lw $a3, 0x38($s0) -/* C48654 80241A74 1040001A */ beqz $v0, .L80241AE0 -/* C48658 80241A78 00000000 */ nop -/* C4865C 80241A7C 8E060038 */ lw $a2, 0x38($s0) -/* C48660 80241A80 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48664 80241A84 8E070040 */ lw $a3, 0x40($s0) -/* C48668 80241A88 C44C0000 */ lwc1 $f12, ($v0) -/* C4866C 80241A8C 46806320 */ cvt.s.w $f12, $f12 -/* C48670 80241A90 C44E0008 */ lwc1 $f14, 8($v0) -/* C48674 80241A94 0C00A7B5 */ jal dist2D -/* C48678 80241A98 468073A0 */ cvt.s.w $f14, $f14 -/* C4867C 80241A9C C6020018 */ lwc1 $f2, 0x18($s0) -/* C48680 80241AA0 4600103C */ c.lt.s $f2, $f0 -/* C48684 80241AA4 00000000 */ nop -/* C48688 80241AA8 4500000D */ bc1f .L80241AE0 -/* C4868C 80241AAC E7A00034 */ swc1 $f0, 0x34($sp) -/* C48690 80241AB0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C48694 80241AB4 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48698 80241AB8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C4869C 80241ABC C4480000 */ lwc1 $f8, ($v0) -/* C486A0 80241AC0 46804220 */ cvt.s.w $f8, $f8 -/* C486A4 80241AC4 44064000 */ mfc1 $a2, $f8 -/* C486A8 80241AC8 C4480008 */ lwc1 $f8, 8($v0) -/* C486AC 80241ACC 46804220 */ cvt.s.w $f8, $f8 -/* C486B0 80241AD0 44074000 */ mfc1 $a3, $f8 -/* C486B4 80241AD4 0C00A720 */ jal atan2 -/* C486B8 80241AD8 24140001 */ addiu $s4, $zero, 1 -/* C486BC 80241ADC E600000C */ swc1 $f0, 0xc($s0) -.L80241AE0: -/* C486C0 80241AE0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C486C4 80241AE4 8C43000C */ lw $v1, 0xc($v0) -/* C486C8 80241AE8 8C420010 */ lw $v0, 0x10($v0) -/* C486CC 80241AEC 00621825 */ or $v1, $v1, $v0 -/* C486D0 80241AF0 00741825 */ or $v1, $v1, $s4 -/* C486D4 80241AF4 10600008 */ beqz $v1, .L80241B18 -/* C486D8 80241AF8 00000000 */ nop -/* C486DC 80241AFC 8602008C */ lh $v0, 0x8c($s0) -/* C486E0 80241B00 14400031 */ bnez $v0, .L80241BC8 -/* C486E4 80241B04 00000000 */ nop -/* C486E8 80241B08 8E050018 */ lw $a1, 0x18($s0) -/* C486EC 80241B0C 8E06000C */ lw $a2, 0xc($s0) -/* C486F0 80241B10 0C00EA95 */ jal npc_move_heading -/* C486F4 80241B14 0200202D */ daddu $a0, $s0, $zero -.L80241B18: -/* C486F8 80241B18 C600003C */ lwc1 $f0, 0x3c($s0) -/* C486FC 80241B1C 3C014059 */ lui $at, 0x4059 -/* C48700 80241B20 44811800 */ mtc1 $at, $f3 -/* C48704 80241B24 44801000 */ mtc1 $zero, $f2 -/* C48708 80241B28 46000021 */ cvt.d.s $f0, $f0 -/* C4870C 80241B2C 46220002 */ mul.d $f0, $f0, $f2 -/* C48710 80241B30 00000000 */ nop -/* C48714 80241B34 4620020D */ trunc.w.d $f8, $f0 -/* C48718 80241B38 E628007C */ swc1 $f8, 0x7c($s1) -/* C4871C 80241B3C 8E420004 */ lw $v0, 4($s2) -/* C48720 80241B40 18400021 */ blez $v0, .L80241BC8 -/* C48724 80241B44 00000000 */ nop -/* C48728 80241B48 8602008E */ lh $v0, 0x8e($s0) -/* C4872C 80241B4C 9603008E */ lhu $v1, 0x8e($s0) -/* C48730 80241B50 18400005 */ blez $v0, .L80241B68 -/* C48734 80241B54 2462FFFF */ addiu $v0, $v1, -1 -/* C48738 80241B58 A602008E */ sh $v0, 0x8e($s0) -/* C4873C 80241B5C 00021400 */ sll $v0, $v0, 0x10 -/* C48740 80241B60 1C400019 */ bgtz $v0, .L80241BC8 -/* C48744 80241B64 00000000 */ nop -.L80241B68: -/* C48748 80241B68 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C4874C 80241B6C 24020002 */ addiu $v0, $zero, 2 -/* C48750 80241B70 0C00A67F */ jal rand_int -/* C48754 80241B74 AE620070 */ sw $v0, 0x70($s3) -/* C48758 80241B78 3C035555 */ lui $v1, 0x5555 -/* C4875C 80241B7C 34635556 */ ori $v1, $v1, 0x5556 -/* C48760 80241B80 00430018 */ mult $v0, $v1 -/* C48764 80241B84 000227C3 */ sra $a0, $v0, 0x1f -/* C48768 80241B88 00004010 */ mfhi $t0 -/* C4876C 80241B8C 01042023 */ subu $a0, $t0, $a0 -/* C48770 80241B90 00041840 */ sll $v1, $a0, 1 -/* C48774 80241B94 00641821 */ addu $v1, $v1, $a0 -/* C48778 80241B98 00431023 */ subu $v0, $v0, $v1 -/* C4877C 80241B9C 24430002 */ addiu $v1, $v0, 2 -/* C48780 80241BA0 AE630074 */ sw $v1, 0x74($s3) -/* C48784 80241BA4 8E42002C */ lw $v0, 0x2c($s2) -/* C48788 80241BA8 58400007 */ blezl $v0, .L80241BC8 -/* C4878C 80241BAC AE600070 */ sw $zero, 0x70($s3) -/* C48790 80241BB0 8E420008 */ lw $v0, 8($s2) -/* C48794 80241BB4 18400003 */ blez $v0, .L80241BC4 -/* C48798 80241BB8 28620003 */ slti $v0, $v1, 3 -/* C4879C 80241BBC 10400002 */ beqz $v0, .L80241BC8 -/* C487A0 80241BC0 00000000 */ nop -.L80241BC4: -/* C487A4 80241BC4 AE600070 */ sw $zero, 0x70($s3) -.L80241BC8: -/* C487A8 80241BC8 8FBF0058 */ lw $ra, 0x58($sp) -/* C487AC 80241BCC 8FB50054 */ lw $s5, 0x54($sp) -/* C487B0 80241BD0 8FB40050 */ lw $s4, 0x50($sp) -/* C487B4 80241BD4 8FB3004C */ lw $s3, 0x4c($sp) -/* C487B8 80241BD8 8FB20048 */ lw $s2, 0x48($sp) -/* C487BC 80241BDC 8FB10044 */ lw $s1, 0x44($sp) -/* C487C0 80241BE0 8FB00040 */ lw $s0, 0x40($sp) -/* C487C4 80241BE4 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C487C8 80241BE8 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C487CC 80241BEC D7B60068 */ ldc1 $f22, 0x68($sp) -/* C487D0 80241BF0 D7B40060 */ ldc1 $f20, 0x60($sp) -/* C487D4 80241BF4 03E00008 */ jr $ra -/* C487D8 80241BF8 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/flo_09_func_802404D0_CB54D0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/flo_09_func_802404D0_CB54D0.s deleted file mode 100644 index ae143d362f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/flo_09_func_802404D0_CB54D0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802441A8_CB91A8 -.double 0.09 - -dlabel D_802441B0_CB91B0 -.double 0.09 - -.section .text - -glabel flo_09_func_802404D0_CB54D0 -/* CB54D0 802404D0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* CB54D4 802404D4 AFB3004C */ sw $s3, 0x4c($sp) -/* CB54D8 802404D8 0080982D */ daddu $s3, $a0, $zero -/* CB54DC 802404DC AFBF0058 */ sw $ra, 0x58($sp) -/* CB54E0 802404E0 AFB50054 */ sw $s5, 0x54($sp) -/* CB54E4 802404E4 AFB40050 */ sw $s4, 0x50($sp) -/* CB54E8 802404E8 AFB20048 */ sw $s2, 0x48($sp) -/* CB54EC 802404EC AFB10044 */ sw $s1, 0x44($sp) -/* CB54F0 802404F0 AFB00040 */ sw $s0, 0x40($sp) -/* CB54F4 802404F4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CB54F8 802404F8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CB54FC 802404FC F7B60068 */ sdc1 $f22, 0x68($sp) -/* CB5500 80240500 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CB5504 80240504 8E710148 */ lw $s1, 0x148($s3) -/* CB5508 80240508 00A0902D */ daddu $s2, $a1, $zero -/* CB550C 8024050C 86240008 */ lh $a0, 8($s1) -/* CB5510 80240510 0C00EABB */ jal get_npc_unsafe -/* CB5514 80240514 00C0A82D */ daddu $s5, $a2, $zero -/* CB5518 80240518 0040802D */ daddu $s0, $v0, $zero -/* CB551C 8024051C 0000A02D */ daddu $s4, $zero, $zero -/* CB5520 80240520 C624007C */ lwc1 $f4, 0x7c($s1) -/* CB5524 80240524 46802120 */ cvt.s.w $f4, $f4 -/* CB5528 80240528 C6220088 */ lwc1 $f2, 0x88($s1) -/* CB552C 8024052C 468010A0 */ cvt.s.w $f2, $f2 -/* CB5530 80240530 460010A1 */ cvt.d.s $f2, $f2 -/* CB5534 80240534 46002121 */ cvt.d.s $f4, $f4 -/* CB5538 80240538 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB553C 8024053C 3C014059 */ lui $at, 0x4059 -/* CB5540 80240540 44813800 */ mtc1 $at, $f7 -/* CB5544 80240544 44803000 */ mtc1 $zero, $f6 -/* CB5548 80240548 46000021 */ cvt.d.s $f0, $f0 -/* CB554C 8024054C 46260002 */ mul.d $f0, $f0, $f6 -/* CB5550 80240550 00000000 */ nop -/* CB5554 80240554 24020001 */ addiu $v0, $zero, 1 -/* CB5558 80240558 8E24006C */ lw $a0, 0x6c($s1) -/* CB555C 8024055C 46261083 */ div.d $f2, $f2, $f6 -/* CB5560 80240560 462010A0 */ cvt.s.d $f2, $f2 -/* CB5564 80240564 46262103 */ div.d $f4, $f4, $f6 -/* CB5568 80240568 46202520 */ cvt.s.d $f20, $f4 -/* CB556C 8024056C 30830011 */ andi $v1, $a0, 0x11 -/* CB5570 80240570 4620020D */ trunc.w.d $f8, $f0 -/* CB5574 80240574 E628007C */ swc1 $f8, 0x7c($s1) -/* CB5578 80240578 C6200078 */ lwc1 $f0, 0x78($s1) -/* CB557C 8024057C 46800020 */ cvt.s.w $f0, $f0 -/* CB5580 80240580 46000021 */ cvt.d.s $f0, $f0 -/* CB5584 80240584 46260003 */ div.d $f0, $f0, $f6 -/* CB5588 80240588 462006A0 */ cvt.s.d $f26, $f0 -/* CB558C 8024058C C6200070 */ lwc1 $f0, 0x70($s1) -/* CB5590 80240590 46800020 */ cvt.s.w $f0, $f0 -/* CB5594 80240594 46000021 */ cvt.d.s $f0, $f0 -/* CB5598 80240598 46260003 */ div.d $f0, $f0, $f6 -/* CB559C 8024059C 462005A0 */ cvt.s.d $f22, $f0 -/* CB55A0 802405A0 14620025 */ bne $v1, $v0, .L80240638 -/* CB55A4 802405A4 4602D600 */ add.s $f24, $f26, $f2 -/* CB55A8 802405A8 8E020000 */ lw $v0, ($s0) -/* CB55AC 802405AC 30420008 */ andi $v0, $v0, 8 -/* CB55B0 802405B0 10400009 */ beqz $v0, .L802405D8 -/* CB55B4 802405B4 27A50028 */ addiu $a1, $sp, 0x28 -/* CB55B8 802405B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB55BC 802405BC 4600C001 */ sub.s $f0, $f24, $f0 -/* CB55C0 802405C0 4600B03C */ c.lt.s $f22, $f0 -/* CB55C4 802405C4 00000000 */ nop -/* CB55C8 802405C8 4500001B */ bc1f .L80240638 -/* CB55CC 802405CC 34820010 */ ori $v0, $a0, 0x10 -/* CB55D0 802405D0 0809018E */ j .L80240638 -/* CB55D4 802405D4 AE22006C */ sw $v0, 0x6c($s1) -.L802405D8: -/* CB55D8 802405D8 27A6002C */ addiu $a2, $sp, 0x2c -/* CB55DC 802405DC C6000038 */ lwc1 $f0, 0x38($s0) -/* CB55E0 802405E0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CB55E4 802405E4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CB55E8 802405E8 3C01447A */ lui $at, 0x447a -/* CB55EC 802405EC 44813000 */ mtc1 $at, $f6 -/* CB55F0 802405F0 27A20034 */ addiu $v0, $sp, 0x34 -/* CB55F4 802405F4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CB55F8 802405F8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CB55FC 802405FC E7A40030 */ swc1 $f4, 0x30($sp) -/* CB5600 80240600 E7A60034 */ swc1 $f6, 0x34($sp) -/* CB5604 80240604 AFA20010 */ sw $v0, 0x10($sp) -/* CB5608 80240608 8E040080 */ lw $a0, 0x80($s0) -/* CB560C 8024060C 0C0372DF */ jal npc_raycast_down_sides -/* CB5610 80240610 27A70030 */ addiu $a3, $sp, 0x30 -/* CB5614 80240614 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CB5618 80240618 4600D001 */ sub.s $f0, $f26, $f0 -/* CB561C 8024061C 4600B03C */ c.lt.s $f22, $f0 -/* CB5620 80240620 00000000 */ nop -/* CB5624 80240624 45000004 */ bc1f .L80240638 -/* CB5628 80240628 00000000 */ nop -/* CB562C 8024062C 8E22006C */ lw $v0, 0x6c($s1) -/* CB5630 80240630 34420010 */ ori $v0, $v0, 0x10 -/* CB5634 80240634 AE22006C */ sw $v0, 0x6c($s1) -.L80240638: -/* CB5638 80240638 8E22006C */ lw $v0, 0x6c($s1) -/* CB563C 8024063C 24030011 */ addiu $v1, $zero, 0x11 -/* CB5640 80240640 30420011 */ andi $v0, $v0, 0x11 -/* CB5644 80240644 14430039 */ bne $v0, $v1, .L8024072C -/* CB5648 80240648 00000000 */ nop -/* CB564C 8024064C 8E020000 */ lw $v0, ($s0) -/* CB5650 80240650 30420008 */ andi $v0, $v0, 8 -/* CB5654 80240654 1040000A */ beqz $v0, .L80240680 -/* CB5658 80240658 4600C106 */ mov.s $f4, $f24 -/* CB565C 8024065C 4614C081 */ sub.s $f2, $f24, $f20 -/* CB5660 80240660 3C018024 */ lui $at, %hi(D_802441A8_CB91A8) -/* CB5664 80240664 D42041A8 */ ldc1 $f0, %lo(D_802441A8_CB91A8)($at) -/* CB5668 80240668 460010A1 */ cvt.d.s $f2, $f2 -/* CB566C 8024066C 46201082 */ mul.d $f2, $f2, $f0 -/* CB5670 80240670 00000000 */ nop -/* CB5674 80240674 4600A021 */ cvt.d.s $f0, $f20 -/* CB5678 80240678 080901B9 */ j .L802406E4 -/* CB567C 8024067C 46220000 */ add.d $f0, $f0, $f2 -.L80240680: -/* CB5680 80240680 27A50028 */ addiu $a1, $sp, 0x28 -/* CB5684 80240684 27A6002C */ addiu $a2, $sp, 0x2c -/* CB5688 80240688 C6000038 */ lwc1 $f0, 0x38($s0) -/* CB568C 8024068C C6020040 */ lwc1 $f2, 0x40($s0) -/* CB5690 80240690 3C01447A */ lui $at, 0x447a -/* CB5694 80240694 44812000 */ mtc1 $at, $f4 -/* CB5698 80240698 27A20034 */ addiu $v0, $sp, 0x34 -/* CB569C 8024069C E7B4002C */ swc1 $f20, 0x2c($sp) -/* CB56A0 802406A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CB56A4 802406A4 E7A20030 */ swc1 $f2, 0x30($sp) -/* CB56A8 802406A8 E7A40034 */ swc1 $f4, 0x34($sp) -/* CB56AC 802406AC AFA20010 */ sw $v0, 0x10($sp) -/* CB56B0 802406B0 8E040080 */ lw $a0, 0x80($s0) -/* CB56B4 802406B4 0C0372DF */ jal npc_raycast_down_sides -/* CB56B8 802406B8 27A70030 */ addiu $a3, $sp, 0x30 -/* CB56BC 802406BC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CB56C0 802406C0 461A2100 */ add.s $f4, $f4, $f26 -/* CB56C4 802406C4 46142081 */ sub.s $f2, $f4, $f20 -/* CB56C8 802406C8 3C018024 */ lui $at, %hi(D_802441B0_CB91B0) -/* CB56CC 802406CC D42041B0 */ ldc1 $f0, %lo(D_802441B0_CB91B0)($at) -/* CB56D0 802406D0 460010A1 */ cvt.d.s $f2, $f2 -/* CB56D4 802406D4 46201082 */ mul.d $f2, $f2, $f0 -/* CB56D8 802406D8 00000000 */ nop -/* CB56DC 802406DC 4600A021 */ cvt.d.s $f0, $f20 -/* CB56E0 802406E0 46220000 */ add.d $f0, $f0, $f2 -.L802406E4: -/* CB56E4 802406E4 46200020 */ cvt.s.d $f0, $f0 -/* CB56E8 802406E8 E600003C */ swc1 $f0, 0x3c($s0) -/* CB56EC 802406EC C600003C */ lwc1 $f0, 0x3c($s0) -/* CB56F0 802406F0 46002001 */ sub.s $f0, $f4, $f0 -/* CB56F4 802406F4 3C013FF0 */ lui $at, 0x3ff0 -/* CB56F8 802406F8 44811800 */ mtc1 $at, $f3 -/* CB56FC 802406FC 44801000 */ mtc1 $zero, $f2 -/* CB5700 80240700 46000005 */ abs.s $f0, $f0 -/* CB5704 80240704 46000021 */ cvt.d.s $f0, $f0 -/* CB5708 80240708 4622003C */ c.lt.d $f0, $f2 -/* CB570C 8024070C 00000000 */ nop -/* CB5710 80240710 45000036 */ bc1f .L802407EC -/* CB5714 80240714 2403FFEF */ addiu $v1, $zero, -0x11 -/* CB5718 80240718 E604003C */ swc1 $f4, 0x3c($s0) -/* CB571C 8024071C 8E22006C */ lw $v0, 0x6c($s1) -/* CB5720 80240720 00431024 */ and $v0, $v0, $v1 -/* CB5724 80240724 080901FB */ j .L802407EC -/* CB5728 80240728 AE22006C */ sw $v0, 0x6c($s1) -.L8024072C: -/* CB572C 8024072C 8E220070 */ lw $v0, 0x70($s1) -/* CB5730 80240730 1840002E */ blez $v0, .L802407EC -/* CB5734 80240734 00000000 */ nop -/* CB5738 80240738 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CB573C 8024073C 0C00A8BB */ jal sin_deg -/* CB5740 80240740 46806320 */ cvt.s.w $f12, $f12 -/* CB5744 80240744 8E020000 */ lw $v0, ($s0) -/* CB5748 80240748 30420008 */ andi $v0, $v0, 8 -/* CB574C 8024074C 10400003 */ beqz $v0, .L8024075C -/* CB5750 80240750 46000506 */ mov.s $f20, $f0 -/* CB5754 80240754 080901E7 */ j .L8024079C -/* CB5758 80240758 0000102D */ daddu $v0, $zero, $zero -.L8024075C: -/* CB575C 8024075C 27A50028 */ addiu $a1, $sp, 0x28 -/* CB5760 80240760 27A6002C */ addiu $a2, $sp, 0x2c -/* CB5764 80240764 C6000038 */ lwc1 $f0, 0x38($s0) -/* CB5768 80240768 C602003C */ lwc1 $f2, 0x3c($s0) -/* CB576C 8024076C C6040040 */ lwc1 $f4, 0x40($s0) -/* CB5770 80240770 3C01447A */ lui $at, 0x447a -/* CB5774 80240774 44813000 */ mtc1 $at, $f6 -/* CB5778 80240778 27A20034 */ addiu $v0, $sp, 0x34 -/* CB577C 8024077C E7A00028 */ swc1 $f0, 0x28($sp) -/* CB5780 80240780 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CB5784 80240784 E7A40030 */ swc1 $f4, 0x30($sp) -/* CB5788 80240788 E7A60034 */ swc1 $f6, 0x34($sp) -/* CB578C 8024078C AFA20010 */ sw $v0, 0x10($sp) -/* CB5790 80240790 8E040080 */ lw $a0, 0x80($s0) -/* CB5794 80240794 0C0372DF */ jal npc_raycast_down_sides -/* CB5798 80240798 27A70030 */ addiu $a3, $sp, 0x30 -.L8024079C: -/* CB579C 8024079C 10400007 */ beqz $v0, .L802407BC -/* CB57A0 802407A0 00000000 */ nop -/* CB57A4 802407A4 4616A082 */ mul.s $f2, $f20, $f22 -/* CB57A8 802407A8 00000000 */ nop -/* CB57AC 802407AC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CB57B0 802407B0 461A0000 */ add.s $f0, $f0, $f26 -/* CB57B4 802407B4 080901F2 */ j .L802407C8 -/* CB57B8 802407B8 46020000 */ add.s $f0, $f0, $f2 -.L802407BC: -/* CB57BC 802407BC 4616A002 */ mul.s $f0, $f20, $f22 -/* CB57C0 802407C0 00000000 */ nop -/* CB57C4 802407C4 4600C000 */ add.s $f0, $f24, $f0 -.L802407C8: -/* CB57C8 802407C8 E600003C */ swc1 $f0, 0x3c($s0) -/* CB57CC 802407CC 8E220074 */ lw $v0, 0x74($s1) -/* CB57D0 802407D0 2442000A */ addiu $v0, $v0, 0xa -/* CB57D4 802407D4 44826000 */ mtc1 $v0, $f12 -/* CB57D8 802407D8 00000000 */ nop -/* CB57DC 802407DC 0C00A6C9 */ jal clamp_angle -/* CB57E0 802407E0 46806320 */ cvt.s.w $f12, $f12 -/* CB57E4 802407E4 4600020D */ trunc.w.s $f8, $f0 -/* CB57E8 802407E8 E6280074 */ swc1 $f8, 0x74($s1) -.L802407EC: -/* CB57EC 802407EC 8E220090 */ lw $v0, 0x90($s1) -/* CB57F0 802407F0 1C40004A */ bgtz $v0, .L8024091C -/* CB57F4 802407F4 2442FFFF */ addiu $v0, $v0, -1 -/* CB57F8 802407F8 8E430014 */ lw $v1, 0x14($s2) -/* CB57FC 802407FC 04600048 */ bltz $v1, .L80240920 -/* CB5800 80240800 00000000 */ nop -/* CB5804 80240804 8E620074 */ lw $v0, 0x74($s3) -/* CB5808 80240808 1C400042 */ bgtz $v0, .L80240914 -/* CB580C 8024080C 2442FFFF */ addiu $v0, $v0, -1 -/* CB5810 80240810 AE630074 */ sw $v1, 0x74($s3) -/* CB5814 80240814 860200A8 */ lh $v0, 0xa8($s0) -/* CB5818 80240818 C602003C */ lwc1 $f2, 0x3c($s0) -/* CB581C 8024081C 44820000 */ mtc1 $v0, $f0 -/* CB5820 80240820 00000000 */ nop -/* CB5824 80240824 46800020 */ cvt.s.w $f0, $f0 -/* CB5828 80240828 46001080 */ add.s $f2, $f2, $f0 -/* CB582C 8024082C 3C014024 */ lui $at, 0x4024 -/* CB5830 80240830 44810800 */ mtc1 $at, $f1 -/* CB5834 80240834 44800000 */ mtc1 $zero, $f0 -/* CB5838 80240838 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CB583C 8024083C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CB5840 80240840 460010A1 */ cvt.d.s $f2, $f2 -/* CB5844 80240844 46201080 */ add.d $f2, $f2, $f0 -/* CB5848 80240848 C440002C */ lwc1 $f0, 0x2c($v0) -/* CB584C 8024084C 46000021 */ cvt.d.s $f0, $f0 -/* CB5850 80240850 4622003C */ c.lt.d $f0, $f2 -/* CB5854 80240854 00000000 */ nop -/* CB5858 80240858 4500002C */ bc1f .L8024090C -/* CB585C 8024085C 02A0202D */ daddu $a0, $s5, $zero -/* CB5860 80240860 AFA00010 */ sw $zero, 0x10($sp) -/* CB5864 80240864 8E46000C */ lw $a2, 0xc($s2) -/* CB5868 80240868 8E470010 */ lw $a3, 0x10($s2) -/* CB586C 8024086C 0C01242D */ jal func_800490B4 -/* CB5870 80240870 0220282D */ daddu $a1, $s1, $zero -/* CB5874 80240874 10400025 */ beqz $v0, .L8024090C -/* CB5878 80240878 0000202D */ daddu $a0, $zero, $zero -/* CB587C 8024087C 0200282D */ daddu $a1, $s0, $zero -/* CB5880 80240880 0000302D */ daddu $a2, $zero, $zero -/* CB5884 80240884 2412000C */ addiu $s2, $zero, 0xc -/* CB5888 80240888 860300A8 */ lh $v1, 0xa8($s0) -/* CB588C 8024088C 3C013F80 */ lui $at, 0x3f80 -/* CB5890 80240890 44810000 */ mtc1 $at, $f0 -/* CB5894 80240894 3C014000 */ lui $at, 0x4000 -/* CB5898 80240898 44811000 */ mtc1 $at, $f2 -/* CB589C 8024089C 3C01C1A0 */ lui $at, 0xc1a0 -/* CB58A0 802408A0 44812000 */ mtc1 $at, $f4 -/* CB58A4 802408A4 44834000 */ mtc1 $v1, $f8 -/* CB58A8 802408A8 00000000 */ nop -/* CB58AC 802408AC 46804220 */ cvt.s.w $f8, $f8 -/* CB58B0 802408B0 44074000 */ mfc1 $a3, $f8 -/* CB58B4 802408B4 27A20038 */ addiu $v0, $sp, 0x38 -/* CB58B8 802408B8 AFB2001C */ sw $s2, 0x1c($sp) -/* CB58BC 802408BC AFA20020 */ sw $v0, 0x20($sp) -/* CB58C0 802408C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CB58C4 802408C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* CB58C8 802408C8 0C01BFA4 */ jal fx_emote -/* CB58CC 802408CC E7A40018 */ swc1 $f4, 0x18($sp) -/* CB58D0 802408D0 0200202D */ daddu $a0, $s0, $zero -/* CB58D4 802408D4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CB58D8 802408D8 C480003C */ lwc1 $f0, 0x3c($a0) -/* CB58DC 802408DC 3C060020 */ lui $a2, 0x20 -/* CB58E0 802408E0 0C012530 */ jal ai_enemy_play_sound -/* CB58E4 802408E4 E4800064 */ swc1 $f0, 0x64($a0) -/* CB58E8 802408E8 8E220018 */ lw $v0, 0x18($s1) -/* CB58EC 802408EC 9442002A */ lhu $v0, 0x2a($v0) -/* CB58F0 802408F0 30420001 */ andi $v0, $v0, 1 -/* CB58F4 802408F4 10400003 */ beqz $v0, .L80240904 -/* CB58F8 802408F8 2402000A */ addiu $v0, $zero, 0xa -/* CB58FC 802408FC 080902B1 */ j .L80240AC4 -/* CB5900 80240900 AE620070 */ sw $v0, 0x70($s3) -.L80240904: -/* CB5904 80240904 080902B1 */ j .L80240AC4 -/* CB5908 80240908 AE720070 */ sw $s2, 0x70($s3) -.L8024090C: -/* CB590C 8024090C 8E620074 */ lw $v0, 0x74($s3) -/* CB5910 80240910 2442FFFF */ addiu $v0, $v0, -1 -.L80240914: -/* CB5914 80240914 08090248 */ j .L80240920 -/* CB5918 80240918 AE620074 */ sw $v0, 0x74($s3) -.L8024091C: -/* CB591C 8024091C AE220090 */ sw $v0, 0x90($s1) -.L80240920: -/* CB5920 80240920 8E2300D0 */ lw $v1, 0xd0($s1) -/* CB5924 80240924 C6000040 */ lwc1 $f0, 0x40($s0) -/* CB5928 80240928 C4620000 */ lwc1 $f2, ($v1) -/* CB592C 8024092C 468010A0 */ cvt.s.w $f2, $f2 -/* CB5930 80240930 C4640008 */ lwc1 $f4, 8($v1) -/* CB5934 80240934 46802120 */ cvt.s.w $f4, $f4 -/* CB5938 80240938 E7A00010 */ swc1 $f0, 0x10($sp) -/* CB593C 8024093C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB5940 80240940 44051000 */ mfc1 $a1, $f2 -/* CB5944 80240944 C440000C */ lwc1 $f0, 0xc($v0) -/* CB5948 80240948 46800020 */ cvt.s.w $f0, $f0 -/* CB594C 8024094C E7A00014 */ swc1 $f0, 0x14($sp) -/* CB5950 80240950 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB5954 80240954 44062000 */ mfc1 $a2, $f4 -/* CB5958 80240958 C4400010 */ lwc1 $f0, 0x10($v0) -/* CB595C 8024095C 46800020 */ cvt.s.w $f0, $f0 -/* CB5960 80240960 E7A00018 */ swc1 $f0, 0x18($sp) -/* CB5964 80240964 8C640018 */ lw $a0, 0x18($v1) -/* CB5968 80240968 0C0123F5 */ jal is_point_within_region -/* CB596C 8024096C 8E070038 */ lw $a3, 0x38($s0) -/* CB5970 80240970 1040001A */ beqz $v0, .L802409DC -/* CB5974 80240974 00000000 */ nop -/* CB5978 80240978 8E060038 */ lw $a2, 0x38($s0) -/* CB597C 8024097C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB5980 80240980 8E070040 */ lw $a3, 0x40($s0) -/* CB5984 80240984 C44C0000 */ lwc1 $f12, ($v0) -/* CB5988 80240988 46806320 */ cvt.s.w $f12, $f12 -/* CB598C 8024098C C44E0008 */ lwc1 $f14, 8($v0) -/* CB5990 80240990 0C00A7B5 */ jal dist2D -/* CB5994 80240994 468073A0 */ cvt.s.w $f14, $f14 -/* CB5998 80240998 C6020018 */ lwc1 $f2, 0x18($s0) -/* CB599C 8024099C 4600103C */ c.lt.s $f2, $f0 -/* CB59A0 802409A0 00000000 */ nop -/* CB59A4 802409A4 4500000D */ bc1f .L802409DC -/* CB59A8 802409A8 E7A00034 */ swc1 $f0, 0x34($sp) -/* CB59AC 802409AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CB59B0 802409B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB59B4 802409B4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CB59B8 802409B8 C4480000 */ lwc1 $f8, ($v0) -/* CB59BC 802409BC 46804220 */ cvt.s.w $f8, $f8 -/* CB59C0 802409C0 44064000 */ mfc1 $a2, $f8 -/* CB59C4 802409C4 C4480008 */ lwc1 $f8, 8($v0) -/* CB59C8 802409C8 46804220 */ cvt.s.w $f8, $f8 -/* CB59CC 802409CC 44074000 */ mfc1 $a3, $f8 -/* CB59D0 802409D0 0C00A720 */ jal atan2 -/* CB59D4 802409D4 24140001 */ addiu $s4, $zero, 1 -/* CB59D8 802409D8 E600000C */ swc1 $f0, 0xc($s0) -.L802409DC: -/* CB59DC 802409DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB59E0 802409E0 8C43000C */ lw $v1, 0xc($v0) -/* CB59E4 802409E4 8C420010 */ lw $v0, 0x10($v0) -/* CB59E8 802409E8 00621825 */ or $v1, $v1, $v0 -/* CB59EC 802409EC 00741825 */ or $v1, $v1, $s4 -/* CB59F0 802409F0 10600008 */ beqz $v1, .L80240A14 -/* CB59F4 802409F4 00000000 */ nop -/* CB59F8 802409F8 8602008C */ lh $v0, 0x8c($s0) -/* CB59FC 802409FC 14400031 */ bnez $v0, .L80240AC4 -/* CB5A00 80240A00 00000000 */ nop -/* CB5A04 80240A04 8E050018 */ lw $a1, 0x18($s0) -/* CB5A08 80240A08 8E06000C */ lw $a2, 0xc($s0) -/* CB5A0C 80240A0C 0C00EA95 */ jal npc_move_heading -/* CB5A10 80240A10 0200202D */ daddu $a0, $s0, $zero -.L80240A14: -/* CB5A14 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB5A18 80240A18 3C014059 */ lui $at, 0x4059 -/* CB5A1C 80240A1C 44811800 */ mtc1 $at, $f3 -/* CB5A20 80240A20 44801000 */ mtc1 $zero, $f2 -/* CB5A24 80240A24 46000021 */ cvt.d.s $f0, $f0 -/* CB5A28 80240A28 46220002 */ mul.d $f0, $f0, $f2 -/* CB5A2C 80240A2C 00000000 */ nop -/* CB5A30 80240A30 4620020D */ trunc.w.d $f8, $f0 -/* CB5A34 80240A34 E628007C */ swc1 $f8, 0x7c($s1) -/* CB5A38 80240A38 8E420004 */ lw $v0, 4($s2) -/* CB5A3C 80240A3C 18400021 */ blez $v0, .L80240AC4 -/* CB5A40 80240A40 00000000 */ nop -/* CB5A44 80240A44 8602008E */ lh $v0, 0x8e($s0) -/* CB5A48 80240A48 9603008E */ lhu $v1, 0x8e($s0) -/* CB5A4C 80240A4C 18400005 */ blez $v0, .L80240A64 -/* CB5A50 80240A50 2462FFFF */ addiu $v0, $v1, -1 -/* CB5A54 80240A54 A602008E */ sh $v0, 0x8e($s0) -/* CB5A58 80240A58 00021400 */ sll $v0, $v0, 0x10 -/* CB5A5C 80240A5C 1C400019 */ bgtz $v0, .L80240AC4 -/* CB5A60 80240A60 00000000 */ nop -.L80240A64: -/* CB5A64 80240A64 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CB5A68 80240A68 24020002 */ addiu $v0, $zero, 2 -/* CB5A6C 80240A6C 0C00A67F */ jal rand_int -/* CB5A70 80240A70 AE620070 */ sw $v0, 0x70($s3) -/* CB5A74 80240A74 3C035555 */ lui $v1, 0x5555 -/* CB5A78 80240A78 34635556 */ ori $v1, $v1, 0x5556 -/* CB5A7C 80240A7C 00430018 */ mult $v0, $v1 -/* CB5A80 80240A80 000227C3 */ sra $a0, $v0, 0x1f -/* CB5A84 80240A84 00004010 */ mfhi $t0 -/* CB5A88 80240A88 01042023 */ subu $a0, $t0, $a0 -/* CB5A8C 80240A8C 00041840 */ sll $v1, $a0, 1 -/* CB5A90 80240A90 00641821 */ addu $v1, $v1, $a0 -/* CB5A94 80240A94 00431023 */ subu $v0, $v0, $v1 -/* CB5A98 80240A98 24430002 */ addiu $v1, $v0, 2 -/* CB5A9C 80240A9C AE630074 */ sw $v1, 0x74($s3) -/* CB5AA0 80240AA0 8E42002C */ lw $v0, 0x2c($s2) -/* CB5AA4 80240AA4 58400007 */ blezl $v0, .L80240AC4 -/* CB5AA8 80240AA8 AE600070 */ sw $zero, 0x70($s3) -/* CB5AAC 80240AAC 8E420008 */ lw $v0, 8($s2) -/* CB5AB0 80240AB0 18400003 */ blez $v0, .L80240AC0 -/* CB5AB4 80240AB4 28620003 */ slti $v0, $v1, 3 -/* CB5AB8 80240AB8 10400002 */ beqz $v0, .L80240AC4 -/* CB5ABC 80240ABC 00000000 */ nop -.L80240AC0: -/* CB5AC0 80240AC0 AE600070 */ sw $zero, 0x70($s3) -.L80240AC4: -/* CB5AC4 80240AC4 8FBF0058 */ lw $ra, 0x58($sp) -/* CB5AC8 80240AC8 8FB50054 */ lw $s5, 0x54($sp) -/* CB5ACC 80240ACC 8FB40050 */ lw $s4, 0x50($sp) -/* CB5AD0 80240AD0 8FB3004C */ lw $s3, 0x4c($sp) -/* CB5AD4 80240AD4 8FB20048 */ lw $s2, 0x48($sp) -/* CB5AD8 80240AD8 8FB10044 */ lw $s1, 0x44($sp) -/* CB5ADC 80240ADC 8FB00040 */ lw $s0, 0x40($sp) -/* CB5AE0 80240AE0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CB5AE4 80240AE4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CB5AE8 80240AE8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CB5AEC 80240AEC D7B40060 */ ldc1 $f20, 0x60($sp) -/* CB5AF0 80240AF0 03E00008 */ jr $ra -/* CB5AF4 80240AF4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80240374_CC3B84.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80240374_CC3B84.s deleted file mode 100644 index 09b6dfe48a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80240374_CC3B84.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247A38_CCB248 -.double 0.09 - -dlabel D_80247A40_CCB250 -.double 0.09 - -.section .text - -glabel flo_13_func_80240374_CC3B84 -/* CC3B84 80240374 27BDFF80 */ addiu $sp, $sp, -0x80 -/* CC3B88 80240378 AFB3004C */ sw $s3, 0x4c($sp) -/* CC3B8C 8024037C 0080982D */ daddu $s3, $a0, $zero -/* CC3B90 80240380 AFBF0058 */ sw $ra, 0x58($sp) -/* CC3B94 80240384 AFB50054 */ sw $s5, 0x54($sp) -/* CC3B98 80240388 AFB40050 */ sw $s4, 0x50($sp) -/* CC3B9C 8024038C AFB20048 */ sw $s2, 0x48($sp) -/* CC3BA0 80240390 AFB10044 */ sw $s1, 0x44($sp) -/* CC3BA4 80240394 AFB00040 */ sw $s0, 0x40($sp) -/* CC3BA8 80240398 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CC3BAC 8024039C F7B80070 */ sdc1 $f24, 0x70($sp) -/* CC3BB0 802403A0 F7B60068 */ sdc1 $f22, 0x68($sp) -/* CC3BB4 802403A4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CC3BB8 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* CC3BBC 802403AC 00A0902D */ daddu $s2, $a1, $zero -/* CC3BC0 802403B0 86240008 */ lh $a0, 8($s1) -/* CC3BC4 802403B4 0C00EABB */ jal get_npc_unsafe -/* CC3BC8 802403B8 00C0A82D */ daddu $s5, $a2, $zero -/* CC3BCC 802403BC 0040802D */ daddu $s0, $v0, $zero -/* CC3BD0 802403C0 0000A02D */ daddu $s4, $zero, $zero -/* CC3BD4 802403C4 C624007C */ lwc1 $f4, 0x7c($s1) -/* CC3BD8 802403C8 46802120 */ cvt.s.w $f4, $f4 -/* CC3BDC 802403CC C6220088 */ lwc1 $f2, 0x88($s1) -/* CC3BE0 802403D0 468010A0 */ cvt.s.w $f2, $f2 -/* CC3BE4 802403D4 460010A1 */ cvt.d.s $f2, $f2 -/* CC3BE8 802403D8 46002121 */ cvt.d.s $f4, $f4 -/* CC3BEC 802403DC C600003C */ lwc1 $f0, 0x3c($s0) -/* CC3BF0 802403E0 3C014059 */ lui $at, 0x4059 -/* CC3BF4 802403E4 44813800 */ mtc1 $at, $f7 -/* CC3BF8 802403E8 44803000 */ mtc1 $zero, $f6 -/* CC3BFC 802403EC 46000021 */ cvt.d.s $f0, $f0 -/* CC3C00 802403F0 46260002 */ mul.d $f0, $f0, $f6 -/* CC3C04 802403F4 00000000 */ nop -/* CC3C08 802403F8 24020001 */ addiu $v0, $zero, 1 -/* CC3C0C 802403FC 8E24006C */ lw $a0, 0x6c($s1) -/* CC3C10 80240400 46261083 */ div.d $f2, $f2, $f6 -/* CC3C14 80240404 462010A0 */ cvt.s.d $f2, $f2 -/* CC3C18 80240408 46262103 */ div.d $f4, $f4, $f6 -/* CC3C1C 8024040C 46202520 */ cvt.s.d $f20, $f4 -/* CC3C20 80240410 30830011 */ andi $v1, $a0, 0x11 -/* CC3C24 80240414 4620020D */ trunc.w.d $f8, $f0 -/* CC3C28 80240418 E628007C */ swc1 $f8, 0x7c($s1) -/* CC3C2C 8024041C C6200078 */ lwc1 $f0, 0x78($s1) -/* CC3C30 80240420 46800020 */ cvt.s.w $f0, $f0 -/* CC3C34 80240424 46000021 */ cvt.d.s $f0, $f0 -/* CC3C38 80240428 46260003 */ div.d $f0, $f0, $f6 -/* CC3C3C 8024042C 462006A0 */ cvt.s.d $f26, $f0 -/* CC3C40 80240430 C6200070 */ lwc1 $f0, 0x70($s1) -/* CC3C44 80240434 46800020 */ cvt.s.w $f0, $f0 -/* CC3C48 80240438 46000021 */ cvt.d.s $f0, $f0 -/* CC3C4C 8024043C 46260003 */ div.d $f0, $f0, $f6 -/* CC3C50 80240440 462005A0 */ cvt.s.d $f22, $f0 -/* CC3C54 80240444 14620025 */ bne $v1, $v0, .L802404DC -/* CC3C58 80240448 4602D600 */ add.s $f24, $f26, $f2 -/* CC3C5C 8024044C 8E020000 */ lw $v0, ($s0) -/* CC3C60 80240450 30420008 */ andi $v0, $v0, 8 -/* CC3C64 80240454 10400009 */ beqz $v0, .L8024047C -/* CC3C68 80240458 27A50028 */ addiu $a1, $sp, 0x28 -/* CC3C6C 8024045C C600003C */ lwc1 $f0, 0x3c($s0) -/* CC3C70 80240460 4600C001 */ sub.s $f0, $f24, $f0 -/* CC3C74 80240464 4600B03C */ c.lt.s $f22, $f0 -/* CC3C78 80240468 00000000 */ nop -/* CC3C7C 8024046C 4500001B */ bc1f .L802404DC -/* CC3C80 80240470 34820010 */ ori $v0, $a0, 0x10 -/* CC3C84 80240474 08090137 */ j .L802404DC -/* CC3C88 80240478 AE22006C */ sw $v0, 0x6c($s1) -.L8024047C: -/* CC3C8C 8024047C 27A6002C */ addiu $a2, $sp, 0x2c -/* CC3C90 80240480 C6000038 */ lwc1 $f0, 0x38($s0) -/* CC3C94 80240484 C602003C */ lwc1 $f2, 0x3c($s0) -/* CC3C98 80240488 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC3C9C 8024048C 3C01447A */ lui $at, 0x447a -/* CC3CA0 80240490 44813000 */ mtc1 $at, $f6 -/* CC3CA4 80240494 27A20034 */ addiu $v0, $sp, 0x34 -/* CC3CA8 80240498 E7A00028 */ swc1 $f0, 0x28($sp) -/* CC3CAC 8024049C E7A2002C */ swc1 $f2, 0x2c($sp) -/* CC3CB0 802404A0 E7A40030 */ swc1 $f4, 0x30($sp) -/* CC3CB4 802404A4 E7A60034 */ swc1 $f6, 0x34($sp) -/* CC3CB8 802404A8 AFA20010 */ sw $v0, 0x10($sp) -/* CC3CBC 802404AC 8E040080 */ lw $a0, 0x80($s0) -/* CC3CC0 802404B0 0C0372DF */ jal npc_raycast_down_sides -/* CC3CC4 802404B4 27A70030 */ addiu $a3, $sp, 0x30 -/* CC3CC8 802404B8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CC3CCC 802404BC 4600D001 */ sub.s $f0, $f26, $f0 -/* CC3CD0 802404C0 4600B03C */ c.lt.s $f22, $f0 -/* CC3CD4 802404C4 00000000 */ nop -/* CC3CD8 802404C8 45000004 */ bc1f .L802404DC -/* CC3CDC 802404CC 00000000 */ nop -/* CC3CE0 802404D0 8E22006C */ lw $v0, 0x6c($s1) -/* CC3CE4 802404D4 34420010 */ ori $v0, $v0, 0x10 -/* CC3CE8 802404D8 AE22006C */ sw $v0, 0x6c($s1) -.L802404DC: -/* CC3CEC 802404DC 8E22006C */ lw $v0, 0x6c($s1) -/* CC3CF0 802404E0 24030011 */ addiu $v1, $zero, 0x11 -/* CC3CF4 802404E4 30420011 */ andi $v0, $v0, 0x11 -/* CC3CF8 802404E8 14430039 */ bne $v0, $v1, .L802405D0 -/* CC3CFC 802404EC 00000000 */ nop -/* CC3D00 802404F0 8E020000 */ lw $v0, ($s0) -/* CC3D04 802404F4 30420008 */ andi $v0, $v0, 8 -/* CC3D08 802404F8 1040000A */ beqz $v0, .L80240524 -/* CC3D0C 802404FC 4600C106 */ mov.s $f4, $f24 -/* CC3D10 80240500 4614C081 */ sub.s $f2, $f24, $f20 -/* CC3D14 80240504 3C018024 */ lui $at, %hi(D_80247A38_CCB248) -/* CC3D18 80240508 D4207A38 */ ldc1 $f0, %lo(D_80247A38_CCB248)($at) -/* CC3D1C 8024050C 460010A1 */ cvt.d.s $f2, $f2 -/* CC3D20 80240510 46201082 */ mul.d $f2, $f2, $f0 -/* CC3D24 80240514 00000000 */ nop -/* CC3D28 80240518 4600A021 */ cvt.d.s $f0, $f20 -/* CC3D2C 8024051C 08090162 */ j .L80240588 -/* CC3D30 80240520 46220000 */ add.d $f0, $f0, $f2 -.L80240524: -/* CC3D34 80240524 27A50028 */ addiu $a1, $sp, 0x28 -/* CC3D38 80240528 27A6002C */ addiu $a2, $sp, 0x2c -/* CC3D3C 8024052C C6000038 */ lwc1 $f0, 0x38($s0) -/* CC3D40 80240530 C6020040 */ lwc1 $f2, 0x40($s0) -/* CC3D44 80240534 3C01447A */ lui $at, 0x447a -/* CC3D48 80240538 44812000 */ mtc1 $at, $f4 -/* CC3D4C 8024053C 27A20034 */ addiu $v0, $sp, 0x34 -/* CC3D50 80240540 E7B4002C */ swc1 $f20, 0x2c($sp) -/* CC3D54 80240544 E7A00028 */ swc1 $f0, 0x28($sp) -/* CC3D58 80240548 E7A20030 */ swc1 $f2, 0x30($sp) -/* CC3D5C 8024054C E7A40034 */ swc1 $f4, 0x34($sp) -/* CC3D60 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* CC3D64 80240554 8E040080 */ lw $a0, 0x80($s0) -/* CC3D68 80240558 0C0372DF */ jal npc_raycast_down_sides -/* CC3D6C 8024055C 27A70030 */ addiu $a3, $sp, 0x30 -/* CC3D70 80240560 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CC3D74 80240564 461A2100 */ add.s $f4, $f4, $f26 -/* CC3D78 80240568 46142081 */ sub.s $f2, $f4, $f20 -/* CC3D7C 8024056C 3C018024 */ lui $at, %hi(D_80247A40_CCB250) -/* CC3D80 80240570 D4207A40 */ ldc1 $f0, %lo(D_80247A40_CCB250)($at) -/* CC3D84 80240574 460010A1 */ cvt.d.s $f2, $f2 -/* CC3D88 80240578 46201082 */ mul.d $f2, $f2, $f0 -/* CC3D8C 8024057C 00000000 */ nop -/* CC3D90 80240580 4600A021 */ cvt.d.s $f0, $f20 -/* CC3D94 80240584 46220000 */ add.d $f0, $f0, $f2 -.L80240588: -/* CC3D98 80240588 46200020 */ cvt.s.d $f0, $f0 -/* CC3D9C 8024058C E600003C */ swc1 $f0, 0x3c($s0) -/* CC3DA0 80240590 C600003C */ lwc1 $f0, 0x3c($s0) -/* CC3DA4 80240594 46002001 */ sub.s $f0, $f4, $f0 -/* CC3DA8 80240598 3C013FF0 */ lui $at, 0x3ff0 -/* CC3DAC 8024059C 44811800 */ mtc1 $at, $f3 -/* CC3DB0 802405A0 44801000 */ mtc1 $zero, $f2 -/* CC3DB4 802405A4 46000005 */ abs.s $f0, $f0 -/* CC3DB8 802405A8 46000021 */ cvt.d.s $f0, $f0 -/* CC3DBC 802405AC 4622003C */ c.lt.d $f0, $f2 -/* CC3DC0 802405B0 00000000 */ nop -/* CC3DC4 802405B4 45000036 */ bc1f .L80240690 -/* CC3DC8 802405B8 2403FFEF */ addiu $v1, $zero, -0x11 -/* CC3DCC 802405BC E604003C */ swc1 $f4, 0x3c($s0) -/* CC3DD0 802405C0 8E22006C */ lw $v0, 0x6c($s1) -/* CC3DD4 802405C4 00431024 */ and $v0, $v0, $v1 -/* CC3DD8 802405C8 080901A4 */ j .L80240690 -/* CC3DDC 802405CC AE22006C */ sw $v0, 0x6c($s1) -.L802405D0: -/* CC3DE0 802405D0 8E220070 */ lw $v0, 0x70($s1) -/* CC3DE4 802405D4 1840002E */ blez $v0, .L80240690 -/* CC3DE8 802405D8 00000000 */ nop -/* CC3DEC 802405DC C62C0074 */ lwc1 $f12, 0x74($s1) -/* CC3DF0 802405E0 0C00A8BB */ jal sin_deg -/* CC3DF4 802405E4 46806320 */ cvt.s.w $f12, $f12 -/* CC3DF8 802405E8 8E020000 */ lw $v0, ($s0) -/* CC3DFC 802405EC 30420008 */ andi $v0, $v0, 8 -/* CC3E00 802405F0 10400003 */ beqz $v0, .L80240600 -/* CC3E04 802405F4 46000506 */ mov.s $f20, $f0 -/* CC3E08 802405F8 08090190 */ j .L80240640 -/* CC3E0C 802405FC 0000102D */ daddu $v0, $zero, $zero -.L80240600: -/* CC3E10 80240600 27A50028 */ addiu $a1, $sp, 0x28 -/* CC3E14 80240604 27A6002C */ addiu $a2, $sp, 0x2c -/* CC3E18 80240608 C6000038 */ lwc1 $f0, 0x38($s0) -/* CC3E1C 8024060C C602003C */ lwc1 $f2, 0x3c($s0) -/* CC3E20 80240610 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC3E24 80240614 3C01447A */ lui $at, 0x447a -/* CC3E28 80240618 44813000 */ mtc1 $at, $f6 -/* CC3E2C 8024061C 27A20034 */ addiu $v0, $sp, 0x34 -/* CC3E30 80240620 E7A00028 */ swc1 $f0, 0x28($sp) -/* CC3E34 80240624 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CC3E38 80240628 E7A40030 */ swc1 $f4, 0x30($sp) -/* CC3E3C 8024062C E7A60034 */ swc1 $f6, 0x34($sp) -/* CC3E40 80240630 AFA20010 */ sw $v0, 0x10($sp) -/* CC3E44 80240634 8E040080 */ lw $a0, 0x80($s0) -/* CC3E48 80240638 0C0372DF */ jal npc_raycast_down_sides -/* CC3E4C 8024063C 27A70030 */ addiu $a3, $sp, 0x30 -.L80240640: -/* CC3E50 80240640 10400007 */ beqz $v0, .L80240660 -/* CC3E54 80240644 00000000 */ nop -/* CC3E58 80240648 4616A082 */ mul.s $f2, $f20, $f22 -/* CC3E5C 8024064C 00000000 */ nop -/* CC3E60 80240650 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CC3E64 80240654 461A0000 */ add.s $f0, $f0, $f26 -/* CC3E68 80240658 0809019B */ j .L8024066C -/* CC3E6C 8024065C 46020000 */ add.s $f0, $f0, $f2 -.L80240660: -/* CC3E70 80240660 4616A002 */ mul.s $f0, $f20, $f22 -/* CC3E74 80240664 00000000 */ nop -/* CC3E78 80240668 4600C000 */ add.s $f0, $f24, $f0 -.L8024066C: -/* CC3E7C 8024066C E600003C */ swc1 $f0, 0x3c($s0) -/* CC3E80 80240670 8E220074 */ lw $v0, 0x74($s1) -/* CC3E84 80240674 2442000A */ addiu $v0, $v0, 0xa -/* CC3E88 80240678 44826000 */ mtc1 $v0, $f12 -/* CC3E8C 8024067C 00000000 */ nop -/* CC3E90 80240680 0C00A6C9 */ jal clamp_angle -/* CC3E94 80240684 46806320 */ cvt.s.w $f12, $f12 -/* CC3E98 80240688 4600020D */ trunc.w.s $f8, $f0 -/* CC3E9C 8024068C E6280074 */ swc1 $f8, 0x74($s1) -.L80240690: -/* CC3EA0 80240690 8E220090 */ lw $v0, 0x90($s1) -/* CC3EA4 80240694 1C40004A */ bgtz $v0, .L802407C0 -/* CC3EA8 80240698 2442FFFF */ addiu $v0, $v0, -1 -/* CC3EAC 8024069C 8E430014 */ lw $v1, 0x14($s2) -/* CC3EB0 802406A0 04600048 */ bltz $v1, .L802407C4 -/* CC3EB4 802406A4 00000000 */ nop -/* CC3EB8 802406A8 8E620074 */ lw $v0, 0x74($s3) -/* CC3EBC 802406AC 1C400042 */ bgtz $v0, .L802407B8 -/* CC3EC0 802406B0 2442FFFF */ addiu $v0, $v0, -1 -/* CC3EC4 802406B4 AE630074 */ sw $v1, 0x74($s3) -/* CC3EC8 802406B8 860200A8 */ lh $v0, 0xa8($s0) -/* CC3ECC 802406BC C602003C */ lwc1 $f2, 0x3c($s0) -/* CC3ED0 802406C0 44820000 */ mtc1 $v0, $f0 -/* CC3ED4 802406C4 00000000 */ nop -/* CC3ED8 802406C8 46800020 */ cvt.s.w $f0, $f0 -/* CC3EDC 802406CC 46001080 */ add.s $f2, $f2, $f0 -/* CC3EE0 802406D0 3C014024 */ lui $at, 0x4024 -/* CC3EE4 802406D4 44810800 */ mtc1 $at, $f1 -/* CC3EE8 802406D8 44800000 */ mtc1 $zero, $f0 -/* CC3EEC 802406DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC3EF0 802406E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC3EF4 802406E4 460010A1 */ cvt.d.s $f2, $f2 -/* CC3EF8 802406E8 46201080 */ add.d $f2, $f2, $f0 -/* CC3EFC 802406EC C440002C */ lwc1 $f0, 0x2c($v0) -/* CC3F00 802406F0 46000021 */ cvt.d.s $f0, $f0 -/* CC3F04 802406F4 4622003C */ c.lt.d $f0, $f2 -/* CC3F08 802406F8 00000000 */ nop -/* CC3F0C 802406FC 4500002C */ bc1f .L802407B0 -/* CC3F10 80240700 02A0202D */ daddu $a0, $s5, $zero -/* CC3F14 80240704 AFA00010 */ sw $zero, 0x10($sp) -/* CC3F18 80240708 8E46000C */ lw $a2, 0xc($s2) -/* CC3F1C 8024070C 8E470010 */ lw $a3, 0x10($s2) -/* CC3F20 80240710 0C01242D */ jal func_800490B4 -/* CC3F24 80240714 0220282D */ daddu $a1, $s1, $zero -/* CC3F28 80240718 10400025 */ beqz $v0, .L802407B0 -/* CC3F2C 8024071C 0000202D */ daddu $a0, $zero, $zero -/* CC3F30 80240720 0200282D */ daddu $a1, $s0, $zero -/* CC3F34 80240724 0000302D */ daddu $a2, $zero, $zero -/* CC3F38 80240728 2412000C */ addiu $s2, $zero, 0xc -/* CC3F3C 8024072C 860300A8 */ lh $v1, 0xa8($s0) -/* CC3F40 80240730 3C013F80 */ lui $at, 0x3f80 -/* CC3F44 80240734 44810000 */ mtc1 $at, $f0 -/* CC3F48 80240738 3C014000 */ lui $at, 0x4000 -/* CC3F4C 8024073C 44811000 */ mtc1 $at, $f2 -/* CC3F50 80240740 3C01C1A0 */ lui $at, 0xc1a0 -/* CC3F54 80240744 44812000 */ mtc1 $at, $f4 -/* CC3F58 80240748 44834000 */ mtc1 $v1, $f8 -/* CC3F5C 8024074C 00000000 */ nop -/* CC3F60 80240750 46804220 */ cvt.s.w $f8, $f8 -/* CC3F64 80240754 44074000 */ mfc1 $a3, $f8 -/* CC3F68 80240758 27A20038 */ addiu $v0, $sp, 0x38 -/* CC3F6C 8024075C AFB2001C */ sw $s2, 0x1c($sp) -/* CC3F70 80240760 AFA20020 */ sw $v0, 0x20($sp) -/* CC3F74 80240764 E7A00010 */ swc1 $f0, 0x10($sp) -/* CC3F78 80240768 E7A20014 */ swc1 $f2, 0x14($sp) -/* CC3F7C 8024076C 0C01BFA4 */ jal fx_emote -/* CC3F80 80240770 E7A40018 */ swc1 $f4, 0x18($sp) -/* CC3F84 80240774 0200202D */ daddu $a0, $s0, $zero -/* CC3F88 80240778 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CC3F8C 8024077C C480003C */ lwc1 $f0, 0x3c($a0) -/* CC3F90 80240780 3C060020 */ lui $a2, 0x20 -/* CC3F94 80240784 0C012530 */ jal ai_enemy_play_sound -/* CC3F98 80240788 E4800064 */ swc1 $f0, 0x64($a0) -/* CC3F9C 8024078C 8E220018 */ lw $v0, 0x18($s1) -/* CC3FA0 80240790 9442002A */ lhu $v0, 0x2a($v0) -/* CC3FA4 80240794 30420001 */ andi $v0, $v0, 1 -/* CC3FA8 80240798 10400003 */ beqz $v0, .L802407A8 -/* CC3FAC 8024079C 2402000A */ addiu $v0, $zero, 0xa -/* CC3FB0 802407A0 0809025A */ j .L80240968 -/* CC3FB4 802407A4 AE620070 */ sw $v0, 0x70($s3) -.L802407A8: -/* CC3FB8 802407A8 0809025A */ j .L80240968 -/* CC3FBC 802407AC AE720070 */ sw $s2, 0x70($s3) -.L802407B0: -/* CC3FC0 802407B0 8E620074 */ lw $v0, 0x74($s3) -/* CC3FC4 802407B4 2442FFFF */ addiu $v0, $v0, -1 -.L802407B8: -/* CC3FC8 802407B8 080901F1 */ j .L802407C4 -/* CC3FCC 802407BC AE620074 */ sw $v0, 0x74($s3) -.L802407C0: -/* CC3FD0 802407C0 AE220090 */ sw $v0, 0x90($s1) -.L802407C4: -/* CC3FD4 802407C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* CC3FD8 802407C8 C6000040 */ lwc1 $f0, 0x40($s0) -/* CC3FDC 802407CC C4620000 */ lwc1 $f2, ($v1) -/* CC3FE0 802407D0 468010A0 */ cvt.s.w $f2, $f2 -/* CC3FE4 802407D4 C4640008 */ lwc1 $f4, 8($v1) -/* CC3FE8 802407D8 46802120 */ cvt.s.w $f4, $f4 -/* CC3FEC 802407DC E7A00010 */ swc1 $f0, 0x10($sp) -/* CC3FF0 802407E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC3FF4 802407E4 44051000 */ mfc1 $a1, $f2 -/* CC3FF8 802407E8 C440000C */ lwc1 $f0, 0xc($v0) -/* CC3FFC 802407EC 46800020 */ cvt.s.w $f0, $f0 -/* CC4000 802407F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* CC4004 802407F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC4008 802407F8 44062000 */ mfc1 $a2, $f4 -/* CC400C 802407FC C4400010 */ lwc1 $f0, 0x10($v0) -/* CC4010 80240800 46800020 */ cvt.s.w $f0, $f0 -/* CC4014 80240804 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC4018 80240808 8C640018 */ lw $a0, 0x18($v1) -/* CC401C 8024080C 0C0123F5 */ jal is_point_within_region -/* CC4020 80240810 8E070038 */ lw $a3, 0x38($s0) -/* CC4024 80240814 1040001A */ beqz $v0, .L80240880 -/* CC4028 80240818 00000000 */ nop -/* CC402C 8024081C 8E060038 */ lw $a2, 0x38($s0) -/* CC4030 80240820 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC4034 80240824 8E070040 */ lw $a3, 0x40($s0) -/* CC4038 80240828 C44C0000 */ lwc1 $f12, ($v0) -/* CC403C 8024082C 46806320 */ cvt.s.w $f12, $f12 -/* CC4040 80240830 C44E0008 */ lwc1 $f14, 8($v0) -/* CC4044 80240834 0C00A7B5 */ jal dist2D -/* CC4048 80240838 468073A0 */ cvt.s.w $f14, $f14 -/* CC404C 8024083C C6020018 */ lwc1 $f2, 0x18($s0) -/* CC4050 80240840 4600103C */ c.lt.s $f2, $f0 -/* CC4054 80240844 00000000 */ nop -/* CC4058 80240848 4500000D */ bc1f .L80240880 -/* CC405C 8024084C E7A00034 */ swc1 $f0, 0x34($sp) -/* CC4060 80240850 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CC4064 80240854 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC4068 80240858 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CC406C 8024085C C4480000 */ lwc1 $f8, ($v0) -/* CC4070 80240860 46804220 */ cvt.s.w $f8, $f8 -/* CC4074 80240864 44064000 */ mfc1 $a2, $f8 -/* CC4078 80240868 C4480008 */ lwc1 $f8, 8($v0) -/* CC407C 8024086C 46804220 */ cvt.s.w $f8, $f8 -/* CC4080 80240870 44074000 */ mfc1 $a3, $f8 -/* CC4084 80240874 0C00A720 */ jal atan2 -/* CC4088 80240878 24140001 */ addiu $s4, $zero, 1 -/* CC408C 8024087C E600000C */ swc1 $f0, 0xc($s0) -.L80240880: -/* CC4090 80240880 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC4094 80240884 8C43000C */ lw $v1, 0xc($v0) -/* CC4098 80240888 8C420010 */ lw $v0, 0x10($v0) -/* CC409C 8024088C 00621825 */ or $v1, $v1, $v0 -/* CC40A0 80240890 00741825 */ or $v1, $v1, $s4 -/* CC40A4 80240894 10600008 */ beqz $v1, .L802408B8 -/* CC40A8 80240898 00000000 */ nop -/* CC40AC 8024089C 8602008C */ lh $v0, 0x8c($s0) -/* CC40B0 802408A0 14400031 */ bnez $v0, .L80240968 -/* CC40B4 802408A4 00000000 */ nop -/* CC40B8 802408A8 8E050018 */ lw $a1, 0x18($s0) -/* CC40BC 802408AC 8E06000C */ lw $a2, 0xc($s0) -/* CC40C0 802408B0 0C00EA95 */ jal npc_move_heading -/* CC40C4 802408B4 0200202D */ daddu $a0, $s0, $zero -.L802408B8: -/* CC40C8 802408B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CC40CC 802408BC 3C014059 */ lui $at, 0x4059 -/* CC40D0 802408C0 44811800 */ mtc1 $at, $f3 -/* CC40D4 802408C4 44801000 */ mtc1 $zero, $f2 -/* CC40D8 802408C8 46000021 */ cvt.d.s $f0, $f0 -/* CC40DC 802408CC 46220002 */ mul.d $f0, $f0, $f2 -/* CC40E0 802408D0 00000000 */ nop -/* CC40E4 802408D4 4620020D */ trunc.w.d $f8, $f0 -/* CC40E8 802408D8 E628007C */ swc1 $f8, 0x7c($s1) -/* CC40EC 802408DC 8E420004 */ lw $v0, 4($s2) -/* CC40F0 802408E0 18400021 */ blez $v0, .L80240968 -/* CC40F4 802408E4 00000000 */ nop -/* CC40F8 802408E8 8602008E */ lh $v0, 0x8e($s0) -/* CC40FC 802408EC 9603008E */ lhu $v1, 0x8e($s0) -/* CC4100 802408F0 18400005 */ blez $v0, .L80240908 -/* CC4104 802408F4 2462FFFF */ addiu $v0, $v1, -1 -/* CC4108 802408F8 A602008E */ sh $v0, 0x8e($s0) -/* CC410C 802408FC 00021400 */ sll $v0, $v0, 0x10 -/* CC4110 80240900 1C400019 */ bgtz $v0, .L80240968 -/* CC4114 80240904 00000000 */ nop -.L80240908: -/* CC4118 80240908 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CC411C 8024090C 24020002 */ addiu $v0, $zero, 2 -/* CC4120 80240910 0C00A67F */ jal rand_int -/* CC4124 80240914 AE620070 */ sw $v0, 0x70($s3) -/* CC4128 80240918 3C035555 */ lui $v1, 0x5555 -/* CC412C 8024091C 34635556 */ ori $v1, $v1, 0x5556 -/* CC4130 80240920 00430018 */ mult $v0, $v1 -/* CC4134 80240924 000227C3 */ sra $a0, $v0, 0x1f -/* CC4138 80240928 00004010 */ mfhi $t0 -/* CC413C 8024092C 01042023 */ subu $a0, $t0, $a0 -/* CC4140 80240930 00041840 */ sll $v1, $a0, 1 -/* CC4144 80240934 00641821 */ addu $v1, $v1, $a0 -/* CC4148 80240938 00431023 */ subu $v0, $v0, $v1 -/* CC414C 8024093C 24430002 */ addiu $v1, $v0, 2 -/* CC4150 80240940 AE630074 */ sw $v1, 0x74($s3) -/* CC4154 80240944 8E42002C */ lw $v0, 0x2c($s2) -/* CC4158 80240948 58400007 */ blezl $v0, .L80240968 -/* CC415C 8024094C AE600070 */ sw $zero, 0x70($s3) -/* CC4160 80240950 8E420008 */ lw $v0, 8($s2) -/* CC4164 80240954 18400003 */ blez $v0, .L80240964 -/* CC4168 80240958 28620003 */ slti $v0, $v1, 3 -/* CC416C 8024095C 10400002 */ beqz $v0, .L80240968 -/* CC4170 80240960 00000000 */ nop -.L80240964: -/* CC4174 80240964 AE600070 */ sw $zero, 0x70($s3) -.L80240968: -/* CC4178 80240968 8FBF0058 */ lw $ra, 0x58($sp) -/* CC417C 8024096C 8FB50054 */ lw $s5, 0x54($sp) -/* CC4180 80240970 8FB40050 */ lw $s4, 0x50($sp) -/* CC4184 80240974 8FB3004C */ lw $s3, 0x4c($sp) -/* CC4188 80240978 8FB20048 */ lw $s2, 0x48($sp) -/* CC418C 8024097C 8FB10044 */ lw $s1, 0x44($sp) -/* CC4190 80240980 8FB00040 */ lw $s0, 0x40($sp) -/* CC4194 80240984 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CC4198 80240988 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CC419C 8024098C D7B60068 */ ldc1 $f22, 0x68($sp) -/* CC41A0 80240990 D7B40060 */ ldc1 $f20, 0x60($sp) -/* CC41A4 80240994 03E00008 */ jr $ra -/* CC41A8 80240998 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/flo_14_func_80240CC0_CCBFD0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/flo_14_func_80240CC0_CCBFD0.s deleted file mode 100644 index b09365fb93..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/flo_14_func_80240CC0_CCBFD0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245358_CD0668 -.double 0.09 - -dlabel D_80245360_CD0670 -.double 0.09 - -.section .text - -glabel flo_14_func_80240CC0_CCBFD0 -/* CCBFD0 80240CC0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* CCBFD4 80240CC4 AFB3004C */ sw $s3, 0x4c($sp) -/* CCBFD8 80240CC8 0080982D */ daddu $s3, $a0, $zero -/* CCBFDC 80240CCC AFBF0058 */ sw $ra, 0x58($sp) -/* CCBFE0 80240CD0 AFB50054 */ sw $s5, 0x54($sp) -/* CCBFE4 80240CD4 AFB40050 */ sw $s4, 0x50($sp) -/* CCBFE8 80240CD8 AFB20048 */ sw $s2, 0x48($sp) -/* CCBFEC 80240CDC AFB10044 */ sw $s1, 0x44($sp) -/* CCBFF0 80240CE0 AFB00040 */ sw $s0, 0x40($sp) -/* CCBFF4 80240CE4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CCBFF8 80240CE8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CCBFFC 80240CEC F7B60068 */ sdc1 $f22, 0x68($sp) -/* CCC000 80240CF0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CCC004 80240CF4 8E710148 */ lw $s1, 0x148($s3) -/* CCC008 80240CF8 00A0902D */ daddu $s2, $a1, $zero -/* CCC00C 80240CFC 86240008 */ lh $a0, 8($s1) -/* CCC010 80240D00 0C00EABB */ jal get_npc_unsafe -/* CCC014 80240D04 00C0A82D */ daddu $s5, $a2, $zero -/* CCC018 80240D08 0040802D */ daddu $s0, $v0, $zero -/* CCC01C 80240D0C 0000A02D */ daddu $s4, $zero, $zero -/* CCC020 80240D10 C624007C */ lwc1 $f4, 0x7c($s1) -/* CCC024 80240D14 46802120 */ cvt.s.w $f4, $f4 -/* CCC028 80240D18 C6220088 */ lwc1 $f2, 0x88($s1) -/* CCC02C 80240D1C 468010A0 */ cvt.s.w $f2, $f2 -/* CCC030 80240D20 460010A1 */ cvt.d.s $f2, $f2 -/* CCC034 80240D24 46002121 */ cvt.d.s $f4, $f4 -/* CCC038 80240D28 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCC03C 80240D2C 3C014059 */ lui $at, 0x4059 -/* CCC040 80240D30 44813800 */ mtc1 $at, $f7 -/* CCC044 80240D34 44803000 */ mtc1 $zero, $f6 -/* CCC048 80240D38 46000021 */ cvt.d.s $f0, $f0 -/* CCC04C 80240D3C 46260002 */ mul.d $f0, $f0, $f6 -/* CCC050 80240D40 00000000 */ nop -/* CCC054 80240D44 24020001 */ addiu $v0, $zero, 1 -/* CCC058 80240D48 8E24006C */ lw $a0, 0x6c($s1) -/* CCC05C 80240D4C 46261083 */ div.d $f2, $f2, $f6 -/* CCC060 80240D50 462010A0 */ cvt.s.d $f2, $f2 -/* CCC064 80240D54 46262103 */ div.d $f4, $f4, $f6 -/* CCC068 80240D58 46202520 */ cvt.s.d $f20, $f4 -/* CCC06C 80240D5C 30830011 */ andi $v1, $a0, 0x11 -/* CCC070 80240D60 4620020D */ trunc.w.d $f8, $f0 -/* CCC074 80240D64 E628007C */ swc1 $f8, 0x7c($s1) -/* CCC078 80240D68 C6200078 */ lwc1 $f0, 0x78($s1) -/* CCC07C 80240D6C 46800020 */ cvt.s.w $f0, $f0 -/* CCC080 80240D70 46000021 */ cvt.d.s $f0, $f0 -/* CCC084 80240D74 46260003 */ div.d $f0, $f0, $f6 -/* CCC088 80240D78 462006A0 */ cvt.s.d $f26, $f0 -/* CCC08C 80240D7C C6200070 */ lwc1 $f0, 0x70($s1) -/* CCC090 80240D80 46800020 */ cvt.s.w $f0, $f0 -/* CCC094 80240D84 46000021 */ cvt.d.s $f0, $f0 -/* CCC098 80240D88 46260003 */ div.d $f0, $f0, $f6 -/* CCC09C 80240D8C 462005A0 */ cvt.s.d $f22, $f0 -/* CCC0A0 80240D90 14620025 */ bne $v1, $v0, .L80240E28 -/* CCC0A4 80240D94 4602D600 */ add.s $f24, $f26, $f2 -/* CCC0A8 80240D98 8E020000 */ lw $v0, ($s0) -/* CCC0AC 80240D9C 30420008 */ andi $v0, $v0, 8 -/* CCC0B0 80240DA0 10400009 */ beqz $v0, .L80240DC8 -/* CCC0B4 80240DA4 27A50028 */ addiu $a1, $sp, 0x28 -/* CCC0B8 80240DA8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCC0BC 80240DAC 4600C001 */ sub.s $f0, $f24, $f0 -/* CCC0C0 80240DB0 4600B03C */ c.lt.s $f22, $f0 -/* CCC0C4 80240DB4 00000000 */ nop -/* CCC0C8 80240DB8 4500001B */ bc1f .L80240E28 -/* CCC0CC 80240DBC 34820010 */ ori $v0, $a0, 0x10 -/* CCC0D0 80240DC0 0809038A */ j .L80240E28 -/* CCC0D4 80240DC4 AE22006C */ sw $v0, 0x6c($s1) -.L80240DC8: -/* CCC0D8 80240DC8 27A6002C */ addiu $a2, $sp, 0x2c -/* CCC0DC 80240DCC C6000038 */ lwc1 $f0, 0x38($s0) -/* CCC0E0 80240DD0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CCC0E4 80240DD4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CCC0E8 80240DD8 3C01447A */ lui $at, 0x447a -/* CCC0EC 80240DDC 44813000 */ mtc1 $at, $f6 -/* CCC0F0 80240DE0 27A20034 */ addiu $v0, $sp, 0x34 -/* CCC0F4 80240DE4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CCC0F8 80240DE8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CCC0FC 80240DEC E7A40030 */ swc1 $f4, 0x30($sp) -/* CCC100 80240DF0 E7A60034 */ swc1 $f6, 0x34($sp) -/* CCC104 80240DF4 AFA20010 */ sw $v0, 0x10($sp) -/* CCC108 80240DF8 8E040080 */ lw $a0, 0x80($s0) -/* CCC10C 80240DFC 0C0372DF */ jal npc_raycast_down_sides -/* CCC110 80240E00 27A70030 */ addiu $a3, $sp, 0x30 -/* CCC114 80240E04 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CCC118 80240E08 4600D001 */ sub.s $f0, $f26, $f0 -/* CCC11C 80240E0C 4600B03C */ c.lt.s $f22, $f0 -/* CCC120 80240E10 00000000 */ nop -/* CCC124 80240E14 45000004 */ bc1f .L80240E28 -/* CCC128 80240E18 00000000 */ nop -/* CCC12C 80240E1C 8E22006C */ lw $v0, 0x6c($s1) -/* CCC130 80240E20 34420010 */ ori $v0, $v0, 0x10 -/* CCC134 80240E24 AE22006C */ sw $v0, 0x6c($s1) -.L80240E28: -/* CCC138 80240E28 8E22006C */ lw $v0, 0x6c($s1) -/* CCC13C 80240E2C 24030011 */ addiu $v1, $zero, 0x11 -/* CCC140 80240E30 30420011 */ andi $v0, $v0, 0x11 -/* CCC144 80240E34 14430039 */ bne $v0, $v1, .L80240F1C -/* CCC148 80240E38 00000000 */ nop -/* CCC14C 80240E3C 8E020000 */ lw $v0, ($s0) -/* CCC150 80240E40 30420008 */ andi $v0, $v0, 8 -/* CCC154 80240E44 1040000A */ beqz $v0, .L80240E70 -/* CCC158 80240E48 4600C106 */ mov.s $f4, $f24 -/* CCC15C 80240E4C 4614C081 */ sub.s $f2, $f24, $f20 -/* CCC160 80240E50 3C018024 */ lui $at, %hi(D_80245358_CD0668) -/* CCC164 80240E54 D4205358 */ ldc1 $f0, %lo(D_80245358_CD0668)($at) -/* CCC168 80240E58 460010A1 */ cvt.d.s $f2, $f2 -/* CCC16C 80240E5C 46201082 */ mul.d $f2, $f2, $f0 -/* CCC170 80240E60 00000000 */ nop -/* CCC174 80240E64 4600A021 */ cvt.d.s $f0, $f20 -/* CCC178 80240E68 080903B5 */ j .L80240ED4 -/* CCC17C 80240E6C 46220000 */ add.d $f0, $f0, $f2 -.L80240E70: -/* CCC180 80240E70 27A50028 */ addiu $a1, $sp, 0x28 -/* CCC184 80240E74 27A6002C */ addiu $a2, $sp, 0x2c -/* CCC188 80240E78 C6000038 */ lwc1 $f0, 0x38($s0) -/* CCC18C 80240E7C C6020040 */ lwc1 $f2, 0x40($s0) -/* CCC190 80240E80 3C01447A */ lui $at, 0x447a -/* CCC194 80240E84 44812000 */ mtc1 $at, $f4 -/* CCC198 80240E88 27A20034 */ addiu $v0, $sp, 0x34 -/* CCC19C 80240E8C E7B4002C */ swc1 $f20, 0x2c($sp) -/* CCC1A0 80240E90 E7A00028 */ swc1 $f0, 0x28($sp) -/* CCC1A4 80240E94 E7A20030 */ swc1 $f2, 0x30($sp) -/* CCC1A8 80240E98 E7A40034 */ swc1 $f4, 0x34($sp) -/* CCC1AC 80240E9C AFA20010 */ sw $v0, 0x10($sp) -/* CCC1B0 80240EA0 8E040080 */ lw $a0, 0x80($s0) -/* CCC1B4 80240EA4 0C0372DF */ jal npc_raycast_down_sides -/* CCC1B8 80240EA8 27A70030 */ addiu $a3, $sp, 0x30 -/* CCC1BC 80240EAC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CCC1C0 80240EB0 461A2100 */ add.s $f4, $f4, $f26 -/* CCC1C4 80240EB4 46142081 */ sub.s $f2, $f4, $f20 -/* CCC1C8 80240EB8 3C018024 */ lui $at, %hi(D_80245360_CD0670) -/* CCC1CC 80240EBC D4205360 */ ldc1 $f0, %lo(D_80245360_CD0670)($at) -/* CCC1D0 80240EC0 460010A1 */ cvt.d.s $f2, $f2 -/* CCC1D4 80240EC4 46201082 */ mul.d $f2, $f2, $f0 -/* CCC1D8 80240EC8 00000000 */ nop -/* CCC1DC 80240ECC 4600A021 */ cvt.d.s $f0, $f20 -/* CCC1E0 80240ED0 46220000 */ add.d $f0, $f0, $f2 -.L80240ED4: -/* CCC1E4 80240ED4 46200020 */ cvt.s.d $f0, $f0 -/* CCC1E8 80240ED8 E600003C */ swc1 $f0, 0x3c($s0) -/* CCC1EC 80240EDC C600003C */ lwc1 $f0, 0x3c($s0) -/* CCC1F0 80240EE0 46002001 */ sub.s $f0, $f4, $f0 -/* CCC1F4 80240EE4 3C013FF0 */ lui $at, 0x3ff0 -/* CCC1F8 80240EE8 44811800 */ mtc1 $at, $f3 -/* CCC1FC 80240EEC 44801000 */ mtc1 $zero, $f2 -/* CCC200 80240EF0 46000005 */ abs.s $f0, $f0 -/* CCC204 80240EF4 46000021 */ cvt.d.s $f0, $f0 -/* CCC208 80240EF8 4622003C */ c.lt.d $f0, $f2 -/* CCC20C 80240EFC 00000000 */ nop -/* CCC210 80240F00 45000036 */ bc1f .L80240FDC -/* CCC214 80240F04 2403FFEF */ addiu $v1, $zero, -0x11 -/* CCC218 80240F08 E604003C */ swc1 $f4, 0x3c($s0) -/* CCC21C 80240F0C 8E22006C */ lw $v0, 0x6c($s1) -/* CCC220 80240F10 00431024 */ and $v0, $v0, $v1 -/* CCC224 80240F14 080903F7 */ j .L80240FDC -/* CCC228 80240F18 AE22006C */ sw $v0, 0x6c($s1) -.L80240F1C: -/* CCC22C 80240F1C 8E220070 */ lw $v0, 0x70($s1) -/* CCC230 80240F20 1840002E */ blez $v0, .L80240FDC -/* CCC234 80240F24 00000000 */ nop -/* CCC238 80240F28 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CCC23C 80240F2C 0C00A8BB */ jal sin_deg -/* CCC240 80240F30 46806320 */ cvt.s.w $f12, $f12 -/* CCC244 80240F34 8E020000 */ lw $v0, ($s0) -/* CCC248 80240F38 30420008 */ andi $v0, $v0, 8 -/* CCC24C 80240F3C 10400003 */ beqz $v0, .L80240F4C -/* CCC250 80240F40 46000506 */ mov.s $f20, $f0 -/* CCC254 80240F44 080903E3 */ j .L80240F8C -/* CCC258 80240F48 0000102D */ daddu $v0, $zero, $zero -.L80240F4C: -/* CCC25C 80240F4C 27A50028 */ addiu $a1, $sp, 0x28 -/* CCC260 80240F50 27A6002C */ addiu $a2, $sp, 0x2c -/* CCC264 80240F54 C6000038 */ lwc1 $f0, 0x38($s0) -/* CCC268 80240F58 C602003C */ lwc1 $f2, 0x3c($s0) -/* CCC26C 80240F5C C6040040 */ lwc1 $f4, 0x40($s0) -/* CCC270 80240F60 3C01447A */ lui $at, 0x447a -/* CCC274 80240F64 44813000 */ mtc1 $at, $f6 -/* CCC278 80240F68 27A20034 */ addiu $v0, $sp, 0x34 -/* CCC27C 80240F6C E7A00028 */ swc1 $f0, 0x28($sp) -/* CCC280 80240F70 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CCC284 80240F74 E7A40030 */ swc1 $f4, 0x30($sp) -/* CCC288 80240F78 E7A60034 */ swc1 $f6, 0x34($sp) -/* CCC28C 80240F7C AFA20010 */ sw $v0, 0x10($sp) -/* CCC290 80240F80 8E040080 */ lw $a0, 0x80($s0) -/* CCC294 80240F84 0C0372DF */ jal npc_raycast_down_sides -/* CCC298 80240F88 27A70030 */ addiu $a3, $sp, 0x30 -.L80240F8C: -/* CCC29C 80240F8C 10400007 */ beqz $v0, .L80240FAC -/* CCC2A0 80240F90 00000000 */ nop -/* CCC2A4 80240F94 4616A082 */ mul.s $f2, $f20, $f22 -/* CCC2A8 80240F98 00000000 */ nop -/* CCC2AC 80240F9C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CCC2B0 80240FA0 461A0000 */ add.s $f0, $f0, $f26 -/* CCC2B4 80240FA4 080903EE */ j .L80240FB8 -/* CCC2B8 80240FA8 46020000 */ add.s $f0, $f0, $f2 -.L80240FAC: -/* CCC2BC 80240FAC 4616A002 */ mul.s $f0, $f20, $f22 -/* CCC2C0 80240FB0 00000000 */ nop -/* CCC2C4 80240FB4 4600C000 */ add.s $f0, $f24, $f0 -.L80240FB8: -/* CCC2C8 80240FB8 E600003C */ swc1 $f0, 0x3c($s0) -/* CCC2CC 80240FBC 8E220074 */ lw $v0, 0x74($s1) -/* CCC2D0 80240FC0 2442000A */ addiu $v0, $v0, 0xa -/* CCC2D4 80240FC4 44826000 */ mtc1 $v0, $f12 -/* CCC2D8 80240FC8 00000000 */ nop -/* CCC2DC 80240FCC 0C00A6C9 */ jal clamp_angle -/* CCC2E0 80240FD0 46806320 */ cvt.s.w $f12, $f12 -/* CCC2E4 80240FD4 4600020D */ trunc.w.s $f8, $f0 -/* CCC2E8 80240FD8 E6280074 */ swc1 $f8, 0x74($s1) -.L80240FDC: -/* CCC2EC 80240FDC 8E220090 */ lw $v0, 0x90($s1) -/* CCC2F0 80240FE0 1C40004A */ bgtz $v0, .L8024110C -/* CCC2F4 80240FE4 2442FFFF */ addiu $v0, $v0, -1 -/* CCC2F8 80240FE8 8E430014 */ lw $v1, 0x14($s2) -/* CCC2FC 80240FEC 04600048 */ bltz $v1, .L80241110 -/* CCC300 80240FF0 00000000 */ nop -/* CCC304 80240FF4 8E620074 */ lw $v0, 0x74($s3) -/* CCC308 80240FF8 1C400042 */ bgtz $v0, .L80241104 -/* CCC30C 80240FFC 2442FFFF */ addiu $v0, $v0, -1 -/* CCC310 80241000 AE630074 */ sw $v1, 0x74($s3) -/* CCC314 80241004 860200A8 */ lh $v0, 0xa8($s0) -/* CCC318 80241008 C602003C */ lwc1 $f2, 0x3c($s0) -/* CCC31C 8024100C 44820000 */ mtc1 $v0, $f0 -/* CCC320 80241010 00000000 */ nop -/* CCC324 80241014 46800020 */ cvt.s.w $f0, $f0 -/* CCC328 80241018 46001080 */ add.s $f2, $f2, $f0 -/* CCC32C 8024101C 3C014024 */ lui $at, 0x4024 -/* CCC330 80241020 44810800 */ mtc1 $at, $f1 -/* CCC334 80241024 44800000 */ mtc1 $zero, $f0 -/* CCC338 80241028 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CCC33C 8024102C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CCC340 80241030 460010A1 */ cvt.d.s $f2, $f2 -/* CCC344 80241034 46201080 */ add.d $f2, $f2, $f0 -/* CCC348 80241038 C440002C */ lwc1 $f0, 0x2c($v0) -/* CCC34C 8024103C 46000021 */ cvt.d.s $f0, $f0 -/* CCC350 80241040 4622003C */ c.lt.d $f0, $f2 -/* CCC354 80241044 00000000 */ nop -/* CCC358 80241048 4500002C */ bc1f .L802410FC -/* CCC35C 8024104C 02A0202D */ daddu $a0, $s5, $zero -/* CCC360 80241050 AFA00010 */ sw $zero, 0x10($sp) -/* CCC364 80241054 8E46000C */ lw $a2, 0xc($s2) -/* CCC368 80241058 8E470010 */ lw $a3, 0x10($s2) -/* CCC36C 8024105C 0C01242D */ jal func_800490B4 -/* CCC370 80241060 0220282D */ daddu $a1, $s1, $zero -/* CCC374 80241064 10400025 */ beqz $v0, .L802410FC -/* CCC378 80241068 0000202D */ daddu $a0, $zero, $zero -/* CCC37C 8024106C 0200282D */ daddu $a1, $s0, $zero -/* CCC380 80241070 0000302D */ daddu $a2, $zero, $zero -/* CCC384 80241074 2412000C */ addiu $s2, $zero, 0xc -/* CCC388 80241078 860300A8 */ lh $v1, 0xa8($s0) -/* CCC38C 8024107C 3C013F80 */ lui $at, 0x3f80 -/* CCC390 80241080 44810000 */ mtc1 $at, $f0 -/* CCC394 80241084 3C014000 */ lui $at, 0x4000 -/* CCC398 80241088 44811000 */ mtc1 $at, $f2 -/* CCC39C 8024108C 3C01C1A0 */ lui $at, 0xc1a0 -/* CCC3A0 80241090 44812000 */ mtc1 $at, $f4 -/* CCC3A4 80241094 44834000 */ mtc1 $v1, $f8 -/* CCC3A8 80241098 00000000 */ nop -/* CCC3AC 8024109C 46804220 */ cvt.s.w $f8, $f8 -/* CCC3B0 802410A0 44074000 */ mfc1 $a3, $f8 -/* CCC3B4 802410A4 27A20038 */ addiu $v0, $sp, 0x38 -/* CCC3B8 802410A8 AFB2001C */ sw $s2, 0x1c($sp) -/* CCC3BC 802410AC AFA20020 */ sw $v0, 0x20($sp) -/* CCC3C0 802410B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CCC3C4 802410B4 E7A20014 */ swc1 $f2, 0x14($sp) -/* CCC3C8 802410B8 0C01BFA4 */ jal fx_emote -/* CCC3CC 802410BC E7A40018 */ swc1 $f4, 0x18($sp) -/* CCC3D0 802410C0 0200202D */ daddu $a0, $s0, $zero -/* CCC3D4 802410C4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CCC3D8 802410C8 C480003C */ lwc1 $f0, 0x3c($a0) -/* CCC3DC 802410CC 3C060020 */ lui $a2, 0x20 -/* CCC3E0 802410D0 0C012530 */ jal ai_enemy_play_sound -/* CCC3E4 802410D4 E4800064 */ swc1 $f0, 0x64($a0) -/* CCC3E8 802410D8 8E220018 */ lw $v0, 0x18($s1) -/* CCC3EC 802410DC 9442002A */ lhu $v0, 0x2a($v0) -/* CCC3F0 802410E0 30420001 */ andi $v0, $v0, 1 -/* CCC3F4 802410E4 10400003 */ beqz $v0, .L802410F4 -/* CCC3F8 802410E8 2402000A */ addiu $v0, $zero, 0xa -/* CCC3FC 802410EC 080904AD */ j .L802412B4 -/* CCC400 802410F0 AE620070 */ sw $v0, 0x70($s3) -.L802410F4: -/* CCC404 802410F4 080904AD */ j .L802412B4 -/* CCC408 802410F8 AE720070 */ sw $s2, 0x70($s3) -.L802410FC: -/* CCC40C 802410FC 8E620074 */ lw $v0, 0x74($s3) -/* CCC410 80241100 2442FFFF */ addiu $v0, $v0, -1 -.L80241104: -/* CCC414 80241104 08090444 */ j .L80241110 -/* CCC418 80241108 AE620074 */ sw $v0, 0x74($s3) -.L8024110C: -/* CCC41C 8024110C AE220090 */ sw $v0, 0x90($s1) -.L80241110: -/* CCC420 80241110 8E2300D0 */ lw $v1, 0xd0($s1) -/* CCC424 80241114 C6000040 */ lwc1 $f0, 0x40($s0) -/* CCC428 80241118 C4620000 */ lwc1 $f2, ($v1) -/* CCC42C 8024111C 468010A0 */ cvt.s.w $f2, $f2 -/* CCC430 80241120 C4640008 */ lwc1 $f4, 8($v1) -/* CCC434 80241124 46802120 */ cvt.s.w $f4, $f4 -/* CCC438 80241128 E7A00010 */ swc1 $f0, 0x10($sp) -/* CCC43C 8024112C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCC440 80241130 44051000 */ mfc1 $a1, $f2 -/* CCC444 80241134 C440000C */ lwc1 $f0, 0xc($v0) -/* CCC448 80241138 46800020 */ cvt.s.w $f0, $f0 -/* CCC44C 8024113C E7A00014 */ swc1 $f0, 0x14($sp) -/* CCC450 80241140 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCC454 80241144 44062000 */ mfc1 $a2, $f4 -/* CCC458 80241148 C4400010 */ lwc1 $f0, 0x10($v0) -/* CCC45C 8024114C 46800020 */ cvt.s.w $f0, $f0 -/* CCC460 80241150 E7A00018 */ swc1 $f0, 0x18($sp) -/* CCC464 80241154 8C640018 */ lw $a0, 0x18($v1) -/* CCC468 80241158 0C0123F5 */ jal is_point_within_region -/* CCC46C 8024115C 8E070038 */ lw $a3, 0x38($s0) -/* CCC470 80241160 1040001A */ beqz $v0, .L802411CC -/* CCC474 80241164 00000000 */ nop -/* CCC478 80241168 8E060038 */ lw $a2, 0x38($s0) -/* CCC47C 8024116C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCC480 80241170 8E070040 */ lw $a3, 0x40($s0) -/* CCC484 80241174 C44C0000 */ lwc1 $f12, ($v0) -/* CCC488 80241178 46806320 */ cvt.s.w $f12, $f12 -/* CCC48C 8024117C C44E0008 */ lwc1 $f14, 8($v0) -/* CCC490 80241180 0C00A7B5 */ jal dist2D -/* CCC494 80241184 468073A0 */ cvt.s.w $f14, $f14 -/* CCC498 80241188 C6020018 */ lwc1 $f2, 0x18($s0) -/* CCC49C 8024118C 4600103C */ c.lt.s $f2, $f0 -/* CCC4A0 80241190 00000000 */ nop -/* CCC4A4 80241194 4500000D */ bc1f .L802411CC -/* CCC4A8 80241198 E7A00034 */ swc1 $f0, 0x34($sp) -/* CCC4AC 8024119C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CCC4B0 802411A0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCC4B4 802411A4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CCC4B8 802411A8 C4480000 */ lwc1 $f8, ($v0) -/* CCC4BC 802411AC 46804220 */ cvt.s.w $f8, $f8 -/* CCC4C0 802411B0 44064000 */ mfc1 $a2, $f8 -/* CCC4C4 802411B4 C4480008 */ lwc1 $f8, 8($v0) -/* CCC4C8 802411B8 46804220 */ cvt.s.w $f8, $f8 -/* CCC4CC 802411BC 44074000 */ mfc1 $a3, $f8 -/* CCC4D0 802411C0 0C00A720 */ jal atan2 -/* CCC4D4 802411C4 24140001 */ addiu $s4, $zero, 1 -/* CCC4D8 802411C8 E600000C */ swc1 $f0, 0xc($s0) -.L802411CC: -/* CCC4DC 802411CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCC4E0 802411D0 8C43000C */ lw $v1, 0xc($v0) -/* CCC4E4 802411D4 8C420010 */ lw $v0, 0x10($v0) -/* CCC4E8 802411D8 00621825 */ or $v1, $v1, $v0 -/* CCC4EC 802411DC 00741825 */ or $v1, $v1, $s4 -/* CCC4F0 802411E0 10600008 */ beqz $v1, .L80241204 -/* CCC4F4 802411E4 00000000 */ nop -/* CCC4F8 802411E8 8602008C */ lh $v0, 0x8c($s0) -/* CCC4FC 802411EC 14400031 */ bnez $v0, .L802412B4 -/* CCC500 802411F0 00000000 */ nop -/* CCC504 802411F4 8E050018 */ lw $a1, 0x18($s0) -/* CCC508 802411F8 8E06000C */ lw $a2, 0xc($s0) -/* CCC50C 802411FC 0C00EA95 */ jal npc_move_heading -/* CCC510 80241200 0200202D */ daddu $a0, $s0, $zero -.L80241204: -/* CCC514 80241204 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCC518 80241208 3C014059 */ lui $at, 0x4059 -/* CCC51C 8024120C 44811800 */ mtc1 $at, $f3 -/* CCC520 80241210 44801000 */ mtc1 $zero, $f2 -/* CCC524 80241214 46000021 */ cvt.d.s $f0, $f0 -/* CCC528 80241218 46220002 */ mul.d $f0, $f0, $f2 -/* CCC52C 8024121C 00000000 */ nop -/* CCC530 80241220 4620020D */ trunc.w.d $f8, $f0 -/* CCC534 80241224 E628007C */ swc1 $f8, 0x7c($s1) -/* CCC538 80241228 8E420004 */ lw $v0, 4($s2) -/* CCC53C 8024122C 18400021 */ blez $v0, .L802412B4 -/* CCC540 80241230 00000000 */ nop -/* CCC544 80241234 8602008E */ lh $v0, 0x8e($s0) -/* CCC548 80241238 9603008E */ lhu $v1, 0x8e($s0) -/* CCC54C 8024123C 18400005 */ blez $v0, .L80241254 -/* CCC550 80241240 2462FFFF */ addiu $v0, $v1, -1 -/* CCC554 80241244 A602008E */ sh $v0, 0x8e($s0) -/* CCC558 80241248 00021400 */ sll $v0, $v0, 0x10 -/* CCC55C 8024124C 1C400019 */ bgtz $v0, .L802412B4 -/* CCC560 80241250 00000000 */ nop -.L80241254: -/* CCC564 80241254 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CCC568 80241258 24020002 */ addiu $v0, $zero, 2 -/* CCC56C 8024125C 0C00A67F */ jal rand_int -/* CCC570 80241260 AE620070 */ sw $v0, 0x70($s3) -/* CCC574 80241264 3C035555 */ lui $v1, 0x5555 -/* CCC578 80241268 34635556 */ ori $v1, $v1, 0x5556 -/* CCC57C 8024126C 00430018 */ mult $v0, $v1 -/* CCC580 80241270 000227C3 */ sra $a0, $v0, 0x1f -/* CCC584 80241274 00004010 */ mfhi $t0 -/* CCC588 80241278 01042023 */ subu $a0, $t0, $a0 -/* CCC58C 8024127C 00041840 */ sll $v1, $a0, 1 -/* CCC590 80241280 00641821 */ addu $v1, $v1, $a0 -/* CCC594 80241284 00431023 */ subu $v0, $v0, $v1 -/* CCC598 80241288 24430002 */ addiu $v1, $v0, 2 -/* CCC59C 8024128C AE630074 */ sw $v1, 0x74($s3) -/* CCC5A0 80241290 8E42002C */ lw $v0, 0x2c($s2) -/* CCC5A4 80241294 58400007 */ blezl $v0, .L802412B4 -/* CCC5A8 80241298 AE600070 */ sw $zero, 0x70($s3) -/* CCC5AC 8024129C 8E420008 */ lw $v0, 8($s2) -/* CCC5B0 802412A0 18400003 */ blez $v0, .L802412B0 -/* CCC5B4 802412A4 28620003 */ slti $v0, $v1, 3 -/* CCC5B8 802412A8 10400002 */ beqz $v0, .L802412B4 -/* CCC5BC 802412AC 00000000 */ nop -.L802412B0: -/* CCC5C0 802412B0 AE600070 */ sw $zero, 0x70($s3) -.L802412B4: -/* CCC5C4 802412B4 8FBF0058 */ lw $ra, 0x58($sp) -/* CCC5C8 802412B8 8FB50054 */ lw $s5, 0x54($sp) -/* CCC5CC 802412BC 8FB40050 */ lw $s4, 0x50($sp) -/* CCC5D0 802412C0 8FB3004C */ lw $s3, 0x4c($sp) -/* CCC5D4 802412C4 8FB20048 */ lw $s2, 0x48($sp) -/* CCC5D8 802412C8 8FB10044 */ lw $s1, 0x44($sp) -/* CCC5DC 802412CC 8FB00040 */ lw $s0, 0x40($sp) -/* CCC5E0 802412D0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CCC5E4 802412D4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CCC5E8 802412D8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CCC5EC 802412DC D7B40060 */ ldc1 $f20, 0x60($sp) -/* CCC5F0 802412E0 03E00008 */ jr $ra -/* CCC5F4 802412E4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/flo_16_func_80241000_CD2E30.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/flo_16_func_80241000_CD2E30.s deleted file mode 100644 index 8a44c188a1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/flo_16_func_80241000_CD2E30.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802453F8_CD7228 -.double 0.09 - -dlabel D_80245400_CD7230 -.double 0.09 - -.section .text - -glabel flo_16_func_80241000_CD2E30 -/* CD2E30 80241000 27BDFF80 */ addiu $sp, $sp, -0x80 -/* CD2E34 80241004 AFB3004C */ sw $s3, 0x4c($sp) -/* CD2E38 80241008 0080982D */ daddu $s3, $a0, $zero -/* CD2E3C 8024100C AFBF0058 */ sw $ra, 0x58($sp) -/* CD2E40 80241010 AFB50054 */ sw $s5, 0x54($sp) -/* CD2E44 80241014 AFB40050 */ sw $s4, 0x50($sp) -/* CD2E48 80241018 AFB20048 */ sw $s2, 0x48($sp) -/* CD2E4C 8024101C AFB10044 */ sw $s1, 0x44($sp) -/* CD2E50 80241020 AFB00040 */ sw $s0, 0x40($sp) -/* CD2E54 80241024 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CD2E58 80241028 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CD2E5C 8024102C F7B60068 */ sdc1 $f22, 0x68($sp) -/* CD2E60 80241030 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CD2E64 80241034 8E710148 */ lw $s1, 0x148($s3) -/* CD2E68 80241038 00A0902D */ daddu $s2, $a1, $zero -/* CD2E6C 8024103C 86240008 */ lh $a0, 8($s1) -/* CD2E70 80241040 0C00EABB */ jal get_npc_unsafe -/* CD2E74 80241044 00C0A82D */ daddu $s5, $a2, $zero -/* CD2E78 80241048 0040802D */ daddu $s0, $v0, $zero -/* CD2E7C 8024104C 0000A02D */ daddu $s4, $zero, $zero -/* CD2E80 80241050 C624007C */ lwc1 $f4, 0x7c($s1) -/* CD2E84 80241054 46802120 */ cvt.s.w $f4, $f4 -/* CD2E88 80241058 C6220088 */ lwc1 $f2, 0x88($s1) -/* CD2E8C 8024105C 468010A0 */ cvt.s.w $f2, $f2 -/* CD2E90 80241060 460010A1 */ cvt.d.s $f2, $f2 -/* CD2E94 80241064 46002121 */ cvt.d.s $f4, $f4 -/* CD2E98 80241068 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD2E9C 8024106C 3C014059 */ lui $at, 0x4059 -/* CD2EA0 80241070 44813800 */ mtc1 $at, $f7 -/* CD2EA4 80241074 44803000 */ mtc1 $zero, $f6 -/* CD2EA8 80241078 46000021 */ cvt.d.s $f0, $f0 -/* CD2EAC 8024107C 46260002 */ mul.d $f0, $f0, $f6 -/* CD2EB0 80241080 00000000 */ nop -/* CD2EB4 80241084 24020001 */ addiu $v0, $zero, 1 -/* CD2EB8 80241088 8E24006C */ lw $a0, 0x6c($s1) -/* CD2EBC 8024108C 46261083 */ div.d $f2, $f2, $f6 -/* CD2EC0 80241090 462010A0 */ cvt.s.d $f2, $f2 -/* CD2EC4 80241094 46262103 */ div.d $f4, $f4, $f6 -/* CD2EC8 80241098 46202520 */ cvt.s.d $f20, $f4 -/* CD2ECC 8024109C 30830011 */ andi $v1, $a0, 0x11 -/* CD2ED0 802410A0 4620020D */ trunc.w.d $f8, $f0 -/* CD2ED4 802410A4 E628007C */ swc1 $f8, 0x7c($s1) -/* CD2ED8 802410A8 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD2EDC 802410AC 46800020 */ cvt.s.w $f0, $f0 -/* CD2EE0 802410B0 46000021 */ cvt.d.s $f0, $f0 -/* CD2EE4 802410B4 46260003 */ div.d $f0, $f0, $f6 -/* CD2EE8 802410B8 462006A0 */ cvt.s.d $f26, $f0 -/* CD2EEC 802410BC C6200070 */ lwc1 $f0, 0x70($s1) -/* CD2EF0 802410C0 46800020 */ cvt.s.w $f0, $f0 -/* CD2EF4 802410C4 46000021 */ cvt.d.s $f0, $f0 -/* CD2EF8 802410C8 46260003 */ div.d $f0, $f0, $f6 -/* CD2EFC 802410CC 462005A0 */ cvt.s.d $f22, $f0 -/* CD2F00 802410D0 14620025 */ bne $v1, $v0, .L80241168 -/* CD2F04 802410D4 4602D600 */ add.s $f24, $f26, $f2 -/* CD2F08 802410D8 8E020000 */ lw $v0, ($s0) -/* CD2F0C 802410DC 30420008 */ andi $v0, $v0, 8 -/* CD2F10 802410E0 10400009 */ beqz $v0, .L80241108 -/* CD2F14 802410E4 27A50028 */ addiu $a1, $sp, 0x28 -/* CD2F18 802410E8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD2F1C 802410EC 4600C001 */ sub.s $f0, $f24, $f0 -/* CD2F20 802410F0 4600B03C */ c.lt.s $f22, $f0 -/* CD2F24 802410F4 00000000 */ nop -/* CD2F28 802410F8 4500001B */ bc1f .L80241168 -/* CD2F2C 802410FC 34820010 */ ori $v0, $a0, 0x10 -/* CD2F30 80241100 0809045A */ j .L80241168 -/* CD2F34 80241104 AE22006C */ sw $v0, 0x6c($s1) -.L80241108: -/* CD2F38 80241108 27A6002C */ addiu $a2, $sp, 0x2c -/* CD2F3C 8024110C C6000038 */ lwc1 $f0, 0x38($s0) -/* CD2F40 80241110 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD2F44 80241114 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD2F48 80241118 3C01447A */ lui $at, 0x447a -/* CD2F4C 8024111C 44813000 */ mtc1 $at, $f6 -/* CD2F50 80241120 27A20034 */ addiu $v0, $sp, 0x34 -/* CD2F54 80241124 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD2F58 80241128 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD2F5C 8024112C E7A40030 */ swc1 $f4, 0x30($sp) -/* CD2F60 80241130 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD2F64 80241134 AFA20010 */ sw $v0, 0x10($sp) -/* CD2F68 80241138 8E040080 */ lw $a0, 0x80($s0) -/* CD2F6C 8024113C 0C0372DF */ jal npc_raycast_down_sides -/* CD2F70 80241140 27A70030 */ addiu $a3, $sp, 0x30 -/* CD2F74 80241144 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CD2F78 80241148 4600D001 */ sub.s $f0, $f26, $f0 -/* CD2F7C 8024114C 4600B03C */ c.lt.s $f22, $f0 -/* CD2F80 80241150 00000000 */ nop -/* CD2F84 80241154 45000004 */ bc1f .L80241168 -/* CD2F88 80241158 00000000 */ nop -/* CD2F8C 8024115C 8E22006C */ lw $v0, 0x6c($s1) -/* CD2F90 80241160 34420010 */ ori $v0, $v0, 0x10 -/* CD2F94 80241164 AE22006C */ sw $v0, 0x6c($s1) -.L80241168: -/* CD2F98 80241168 8E22006C */ lw $v0, 0x6c($s1) -/* CD2F9C 8024116C 24030011 */ addiu $v1, $zero, 0x11 -/* CD2FA0 80241170 30420011 */ andi $v0, $v0, 0x11 -/* CD2FA4 80241174 14430039 */ bne $v0, $v1, .L8024125C -/* CD2FA8 80241178 00000000 */ nop -/* CD2FAC 8024117C 8E020000 */ lw $v0, ($s0) -/* CD2FB0 80241180 30420008 */ andi $v0, $v0, 8 -/* CD2FB4 80241184 1040000A */ beqz $v0, .L802411B0 -/* CD2FB8 80241188 4600C106 */ mov.s $f4, $f24 -/* CD2FBC 8024118C 4614C081 */ sub.s $f2, $f24, $f20 -/* CD2FC0 80241190 3C018024 */ lui $at, %hi(D_802453F8_CD7228) -/* CD2FC4 80241194 D42053F8 */ ldc1 $f0, %lo(D_802453F8_CD7228)($at) -/* CD2FC8 80241198 460010A1 */ cvt.d.s $f2, $f2 -/* CD2FCC 8024119C 46201082 */ mul.d $f2, $f2, $f0 -/* CD2FD0 802411A0 00000000 */ nop -/* CD2FD4 802411A4 4600A021 */ cvt.d.s $f0, $f20 -/* CD2FD8 802411A8 08090485 */ j .L80241214 -/* CD2FDC 802411AC 46220000 */ add.d $f0, $f0, $f2 -.L802411B0: -/* CD2FE0 802411B0 27A50028 */ addiu $a1, $sp, 0x28 -/* CD2FE4 802411B4 27A6002C */ addiu $a2, $sp, 0x2c -/* CD2FE8 802411B8 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD2FEC 802411BC C6020040 */ lwc1 $f2, 0x40($s0) -/* CD2FF0 802411C0 3C01447A */ lui $at, 0x447a -/* CD2FF4 802411C4 44812000 */ mtc1 $at, $f4 -/* CD2FF8 802411C8 27A20034 */ addiu $v0, $sp, 0x34 -/* CD2FFC 802411CC E7B4002C */ swc1 $f20, 0x2c($sp) -/* CD3000 802411D0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD3004 802411D4 E7A20030 */ swc1 $f2, 0x30($sp) -/* CD3008 802411D8 E7A40034 */ swc1 $f4, 0x34($sp) -/* CD300C 802411DC AFA20010 */ sw $v0, 0x10($sp) -/* CD3010 802411E0 8E040080 */ lw $a0, 0x80($s0) -/* CD3014 802411E4 0C0372DF */ jal npc_raycast_down_sides -/* CD3018 802411E8 27A70030 */ addiu $a3, $sp, 0x30 -/* CD301C 802411EC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CD3020 802411F0 461A2100 */ add.s $f4, $f4, $f26 -/* CD3024 802411F4 46142081 */ sub.s $f2, $f4, $f20 -/* CD3028 802411F8 3C018024 */ lui $at, %hi(D_80245400_CD7230) -/* CD302C 802411FC D4205400 */ ldc1 $f0, %lo(D_80245400_CD7230)($at) -/* CD3030 80241200 460010A1 */ cvt.d.s $f2, $f2 -/* CD3034 80241204 46201082 */ mul.d $f2, $f2, $f0 -/* CD3038 80241208 00000000 */ nop -/* CD303C 8024120C 4600A021 */ cvt.d.s $f0, $f20 -/* CD3040 80241210 46220000 */ add.d $f0, $f0, $f2 -.L80241214: -/* CD3044 80241214 46200020 */ cvt.s.d $f0, $f0 -/* CD3048 80241218 E600003C */ swc1 $f0, 0x3c($s0) -/* CD304C 8024121C C600003C */ lwc1 $f0, 0x3c($s0) -/* CD3050 80241220 46002001 */ sub.s $f0, $f4, $f0 -/* CD3054 80241224 3C013FF0 */ lui $at, 0x3ff0 -/* CD3058 80241228 44811800 */ mtc1 $at, $f3 -/* CD305C 8024122C 44801000 */ mtc1 $zero, $f2 -/* CD3060 80241230 46000005 */ abs.s $f0, $f0 -/* CD3064 80241234 46000021 */ cvt.d.s $f0, $f0 -/* CD3068 80241238 4622003C */ c.lt.d $f0, $f2 -/* CD306C 8024123C 00000000 */ nop -/* CD3070 80241240 45000036 */ bc1f .L8024131C -/* CD3074 80241244 2403FFEF */ addiu $v1, $zero, -0x11 -/* CD3078 80241248 E604003C */ swc1 $f4, 0x3c($s0) -/* CD307C 8024124C 8E22006C */ lw $v0, 0x6c($s1) -/* CD3080 80241250 00431024 */ and $v0, $v0, $v1 -/* CD3084 80241254 080904C7 */ j .L8024131C -/* CD3088 80241258 AE22006C */ sw $v0, 0x6c($s1) -.L8024125C: -/* CD308C 8024125C 8E220070 */ lw $v0, 0x70($s1) -/* CD3090 80241260 1840002E */ blez $v0, .L8024131C -/* CD3094 80241264 00000000 */ nop -/* CD3098 80241268 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CD309C 8024126C 0C00A8BB */ jal sin_deg -/* CD30A0 80241270 46806320 */ cvt.s.w $f12, $f12 -/* CD30A4 80241274 8E020000 */ lw $v0, ($s0) -/* CD30A8 80241278 30420008 */ andi $v0, $v0, 8 -/* CD30AC 8024127C 10400003 */ beqz $v0, .L8024128C -/* CD30B0 80241280 46000506 */ mov.s $f20, $f0 -/* CD30B4 80241284 080904B3 */ j .L802412CC -/* CD30B8 80241288 0000102D */ daddu $v0, $zero, $zero -.L8024128C: -/* CD30BC 8024128C 27A50028 */ addiu $a1, $sp, 0x28 -/* CD30C0 80241290 27A6002C */ addiu $a2, $sp, 0x2c -/* CD30C4 80241294 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD30C8 80241298 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD30CC 8024129C C6040040 */ lwc1 $f4, 0x40($s0) -/* CD30D0 802412A0 3C01447A */ lui $at, 0x447a -/* CD30D4 802412A4 44813000 */ mtc1 $at, $f6 -/* CD30D8 802412A8 27A20034 */ addiu $v0, $sp, 0x34 -/* CD30DC 802412AC E7A00028 */ swc1 $f0, 0x28($sp) -/* CD30E0 802412B0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD30E4 802412B4 E7A40030 */ swc1 $f4, 0x30($sp) -/* CD30E8 802412B8 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD30EC 802412BC AFA20010 */ sw $v0, 0x10($sp) -/* CD30F0 802412C0 8E040080 */ lw $a0, 0x80($s0) -/* CD30F4 802412C4 0C0372DF */ jal npc_raycast_down_sides -/* CD30F8 802412C8 27A70030 */ addiu $a3, $sp, 0x30 -.L802412CC: -/* CD30FC 802412CC 10400007 */ beqz $v0, .L802412EC -/* CD3100 802412D0 00000000 */ nop -/* CD3104 802412D4 4616A082 */ mul.s $f2, $f20, $f22 -/* CD3108 802412D8 00000000 */ nop -/* CD310C 802412DC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CD3110 802412E0 461A0000 */ add.s $f0, $f0, $f26 -/* CD3114 802412E4 080904BE */ j .L802412F8 -/* CD3118 802412E8 46020000 */ add.s $f0, $f0, $f2 -.L802412EC: -/* CD311C 802412EC 4616A002 */ mul.s $f0, $f20, $f22 -/* CD3120 802412F0 00000000 */ nop -/* CD3124 802412F4 4600C000 */ add.s $f0, $f24, $f0 -.L802412F8: -/* CD3128 802412F8 E600003C */ swc1 $f0, 0x3c($s0) -/* CD312C 802412FC 8E220074 */ lw $v0, 0x74($s1) -/* CD3130 80241300 2442000A */ addiu $v0, $v0, 0xa -/* CD3134 80241304 44826000 */ mtc1 $v0, $f12 -/* CD3138 80241308 00000000 */ nop -/* CD313C 8024130C 0C00A6C9 */ jal clamp_angle -/* CD3140 80241310 46806320 */ cvt.s.w $f12, $f12 -/* CD3144 80241314 4600020D */ trunc.w.s $f8, $f0 -/* CD3148 80241318 E6280074 */ swc1 $f8, 0x74($s1) -.L8024131C: -/* CD314C 8024131C 8E220090 */ lw $v0, 0x90($s1) -/* CD3150 80241320 1C40004A */ bgtz $v0, .L8024144C -/* CD3154 80241324 2442FFFF */ addiu $v0, $v0, -1 -/* CD3158 80241328 8E430014 */ lw $v1, 0x14($s2) -/* CD315C 8024132C 04600048 */ bltz $v1, .L80241450 -/* CD3160 80241330 00000000 */ nop -/* CD3164 80241334 8E620074 */ lw $v0, 0x74($s3) -/* CD3168 80241338 1C400042 */ bgtz $v0, .L80241444 -/* CD316C 8024133C 2442FFFF */ addiu $v0, $v0, -1 -/* CD3170 80241340 AE630074 */ sw $v1, 0x74($s3) -/* CD3174 80241344 860200A8 */ lh $v0, 0xa8($s0) -/* CD3178 80241348 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD317C 8024134C 44820000 */ mtc1 $v0, $f0 -/* CD3180 80241350 00000000 */ nop -/* CD3184 80241354 46800020 */ cvt.s.w $f0, $f0 -/* CD3188 80241358 46001080 */ add.s $f2, $f2, $f0 -/* CD318C 8024135C 3C014024 */ lui $at, 0x4024 -/* CD3190 80241360 44810800 */ mtc1 $at, $f1 -/* CD3194 80241364 44800000 */ mtc1 $zero, $f0 -/* CD3198 80241368 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD319C 8024136C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD31A0 80241370 460010A1 */ cvt.d.s $f2, $f2 -/* CD31A4 80241374 46201080 */ add.d $f2, $f2, $f0 -/* CD31A8 80241378 C440002C */ lwc1 $f0, 0x2c($v0) -/* CD31AC 8024137C 46000021 */ cvt.d.s $f0, $f0 -/* CD31B0 80241380 4622003C */ c.lt.d $f0, $f2 -/* CD31B4 80241384 00000000 */ nop -/* CD31B8 80241388 4500002C */ bc1f .L8024143C -/* CD31BC 8024138C 02A0202D */ daddu $a0, $s5, $zero -/* CD31C0 80241390 AFA00010 */ sw $zero, 0x10($sp) -/* CD31C4 80241394 8E46000C */ lw $a2, 0xc($s2) -/* CD31C8 80241398 8E470010 */ lw $a3, 0x10($s2) -/* CD31CC 8024139C 0C01242D */ jal func_800490B4 -/* CD31D0 802413A0 0220282D */ daddu $a1, $s1, $zero -/* CD31D4 802413A4 10400025 */ beqz $v0, .L8024143C -/* CD31D8 802413A8 0000202D */ daddu $a0, $zero, $zero -/* CD31DC 802413AC 0200282D */ daddu $a1, $s0, $zero -/* CD31E0 802413B0 0000302D */ daddu $a2, $zero, $zero -/* CD31E4 802413B4 2412000C */ addiu $s2, $zero, 0xc -/* CD31E8 802413B8 860300A8 */ lh $v1, 0xa8($s0) -/* CD31EC 802413BC 3C013F80 */ lui $at, 0x3f80 -/* CD31F0 802413C0 44810000 */ mtc1 $at, $f0 -/* CD31F4 802413C4 3C014000 */ lui $at, 0x4000 -/* CD31F8 802413C8 44811000 */ mtc1 $at, $f2 -/* CD31FC 802413CC 3C01C1A0 */ lui $at, 0xc1a0 -/* CD3200 802413D0 44812000 */ mtc1 $at, $f4 -/* CD3204 802413D4 44834000 */ mtc1 $v1, $f8 -/* CD3208 802413D8 00000000 */ nop -/* CD320C 802413DC 46804220 */ cvt.s.w $f8, $f8 -/* CD3210 802413E0 44074000 */ mfc1 $a3, $f8 -/* CD3214 802413E4 27A20038 */ addiu $v0, $sp, 0x38 -/* CD3218 802413E8 AFB2001C */ sw $s2, 0x1c($sp) -/* CD321C 802413EC AFA20020 */ sw $v0, 0x20($sp) -/* CD3220 802413F0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD3224 802413F4 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD3228 802413F8 0C01BFA4 */ jal fx_emote -/* CD322C 802413FC E7A40018 */ swc1 $f4, 0x18($sp) -/* CD3230 80241400 0200202D */ daddu $a0, $s0, $zero -/* CD3234 80241404 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CD3238 80241408 C480003C */ lwc1 $f0, 0x3c($a0) -/* CD323C 8024140C 3C060020 */ lui $a2, 0x20 -/* CD3240 80241410 0C012530 */ jal ai_enemy_play_sound -/* CD3244 80241414 E4800064 */ swc1 $f0, 0x64($a0) -/* CD3248 80241418 8E220018 */ lw $v0, 0x18($s1) -/* CD324C 8024141C 9442002A */ lhu $v0, 0x2a($v0) -/* CD3250 80241420 30420001 */ andi $v0, $v0, 1 -/* CD3254 80241424 10400003 */ beqz $v0, .L80241434 -/* CD3258 80241428 2402000A */ addiu $v0, $zero, 0xa -/* CD325C 8024142C 0809057D */ j .L802415F4 -/* CD3260 80241430 AE620070 */ sw $v0, 0x70($s3) -.L80241434: -/* CD3264 80241434 0809057D */ j .L802415F4 -/* CD3268 80241438 AE720070 */ sw $s2, 0x70($s3) -.L8024143C: -/* CD326C 8024143C 8E620074 */ lw $v0, 0x74($s3) -/* CD3270 80241440 2442FFFF */ addiu $v0, $v0, -1 -.L80241444: -/* CD3274 80241444 08090514 */ j .L80241450 -/* CD3278 80241448 AE620074 */ sw $v0, 0x74($s3) -.L8024144C: -/* CD327C 8024144C AE220090 */ sw $v0, 0x90($s1) -.L80241450: -/* CD3280 80241450 8E2300D0 */ lw $v1, 0xd0($s1) -/* CD3284 80241454 C6000040 */ lwc1 $f0, 0x40($s0) -/* CD3288 80241458 C4620000 */ lwc1 $f2, ($v1) -/* CD328C 8024145C 468010A0 */ cvt.s.w $f2, $f2 -/* CD3290 80241460 C4640008 */ lwc1 $f4, 8($v1) -/* CD3294 80241464 46802120 */ cvt.s.w $f4, $f4 -/* CD3298 80241468 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD329C 8024146C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD32A0 80241470 44051000 */ mfc1 $a1, $f2 -/* CD32A4 80241474 C440000C */ lwc1 $f0, 0xc($v0) -/* CD32A8 80241478 46800020 */ cvt.s.w $f0, $f0 -/* CD32AC 8024147C E7A00014 */ swc1 $f0, 0x14($sp) -/* CD32B0 80241480 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD32B4 80241484 44062000 */ mfc1 $a2, $f4 -/* CD32B8 80241488 C4400010 */ lwc1 $f0, 0x10($v0) -/* CD32BC 8024148C 46800020 */ cvt.s.w $f0, $f0 -/* CD32C0 80241490 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD32C4 80241494 8C640018 */ lw $a0, 0x18($v1) -/* CD32C8 80241498 0C0123F5 */ jal is_point_within_region -/* CD32CC 8024149C 8E070038 */ lw $a3, 0x38($s0) -/* CD32D0 802414A0 1040001A */ beqz $v0, .L8024150C -/* CD32D4 802414A4 00000000 */ nop -/* CD32D8 802414A8 8E060038 */ lw $a2, 0x38($s0) -/* CD32DC 802414AC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD32E0 802414B0 8E070040 */ lw $a3, 0x40($s0) -/* CD32E4 802414B4 C44C0000 */ lwc1 $f12, ($v0) -/* CD32E8 802414B8 46806320 */ cvt.s.w $f12, $f12 -/* CD32EC 802414BC C44E0008 */ lwc1 $f14, 8($v0) -/* CD32F0 802414C0 0C00A7B5 */ jal dist2D -/* CD32F4 802414C4 468073A0 */ cvt.s.w $f14, $f14 -/* CD32F8 802414C8 C6020018 */ lwc1 $f2, 0x18($s0) -/* CD32FC 802414CC 4600103C */ c.lt.s $f2, $f0 -/* CD3300 802414D0 00000000 */ nop -/* CD3304 802414D4 4500000D */ bc1f .L8024150C -/* CD3308 802414D8 E7A00034 */ swc1 $f0, 0x34($sp) -/* CD330C 802414DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD3310 802414E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD3314 802414E4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD3318 802414E8 C4480000 */ lwc1 $f8, ($v0) -/* CD331C 802414EC 46804220 */ cvt.s.w $f8, $f8 -/* CD3320 802414F0 44064000 */ mfc1 $a2, $f8 -/* CD3324 802414F4 C4480008 */ lwc1 $f8, 8($v0) -/* CD3328 802414F8 46804220 */ cvt.s.w $f8, $f8 -/* CD332C 802414FC 44074000 */ mfc1 $a3, $f8 -/* CD3330 80241500 0C00A720 */ jal atan2 -/* CD3334 80241504 24140001 */ addiu $s4, $zero, 1 -/* CD3338 80241508 E600000C */ swc1 $f0, 0xc($s0) -.L8024150C: -/* CD333C 8024150C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD3340 80241510 8C43000C */ lw $v1, 0xc($v0) -/* CD3344 80241514 8C420010 */ lw $v0, 0x10($v0) -/* CD3348 80241518 00621825 */ or $v1, $v1, $v0 -/* CD334C 8024151C 00741825 */ or $v1, $v1, $s4 -/* CD3350 80241520 10600008 */ beqz $v1, .L80241544 -/* CD3354 80241524 00000000 */ nop -/* CD3358 80241528 8602008C */ lh $v0, 0x8c($s0) -/* CD335C 8024152C 14400031 */ bnez $v0, .L802415F4 -/* CD3360 80241530 00000000 */ nop -/* CD3364 80241534 8E050018 */ lw $a1, 0x18($s0) -/* CD3368 80241538 8E06000C */ lw $a2, 0xc($s0) -/* CD336C 8024153C 0C00EA95 */ jal npc_move_heading -/* CD3370 80241540 0200202D */ daddu $a0, $s0, $zero -.L80241544: -/* CD3374 80241544 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD3378 80241548 3C014059 */ lui $at, 0x4059 -/* CD337C 8024154C 44811800 */ mtc1 $at, $f3 -/* CD3380 80241550 44801000 */ mtc1 $zero, $f2 -/* CD3384 80241554 46000021 */ cvt.d.s $f0, $f0 -/* CD3388 80241558 46220002 */ mul.d $f0, $f0, $f2 -/* CD338C 8024155C 00000000 */ nop -/* CD3390 80241560 4620020D */ trunc.w.d $f8, $f0 -/* CD3394 80241564 E628007C */ swc1 $f8, 0x7c($s1) -/* CD3398 80241568 8E420004 */ lw $v0, 4($s2) -/* CD339C 8024156C 18400021 */ blez $v0, .L802415F4 -/* CD33A0 80241570 00000000 */ nop -/* CD33A4 80241574 8602008E */ lh $v0, 0x8e($s0) -/* CD33A8 80241578 9603008E */ lhu $v1, 0x8e($s0) -/* CD33AC 8024157C 18400005 */ blez $v0, .L80241594 -/* CD33B0 80241580 2462FFFF */ addiu $v0, $v1, -1 -/* CD33B4 80241584 A602008E */ sh $v0, 0x8e($s0) -/* CD33B8 80241588 00021400 */ sll $v0, $v0, 0x10 -/* CD33BC 8024158C 1C400019 */ bgtz $v0, .L802415F4 -/* CD33C0 80241590 00000000 */ nop -.L80241594: -/* CD33C4 80241594 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CD33C8 80241598 24020002 */ addiu $v0, $zero, 2 -/* CD33CC 8024159C 0C00A67F */ jal rand_int -/* CD33D0 802415A0 AE620070 */ sw $v0, 0x70($s3) -/* CD33D4 802415A4 3C035555 */ lui $v1, 0x5555 -/* CD33D8 802415A8 34635556 */ ori $v1, $v1, 0x5556 -/* CD33DC 802415AC 00430018 */ mult $v0, $v1 -/* CD33E0 802415B0 000227C3 */ sra $a0, $v0, 0x1f -/* CD33E4 802415B4 00004010 */ mfhi $t0 -/* CD33E8 802415B8 01042023 */ subu $a0, $t0, $a0 -/* CD33EC 802415BC 00041840 */ sll $v1, $a0, 1 -/* CD33F0 802415C0 00641821 */ addu $v1, $v1, $a0 -/* CD33F4 802415C4 00431023 */ subu $v0, $v0, $v1 -/* CD33F8 802415C8 24430002 */ addiu $v1, $v0, 2 -/* CD33FC 802415CC AE630074 */ sw $v1, 0x74($s3) -/* CD3400 802415D0 8E42002C */ lw $v0, 0x2c($s2) -/* CD3404 802415D4 58400007 */ blezl $v0, .L802415F4 -/* CD3408 802415D8 AE600070 */ sw $zero, 0x70($s3) -/* CD340C 802415DC 8E420008 */ lw $v0, 8($s2) -/* CD3410 802415E0 18400003 */ blez $v0, .L802415F0 -/* CD3414 802415E4 28620003 */ slti $v0, $v1, 3 -/* CD3418 802415E8 10400002 */ beqz $v0, .L802415F4 -/* CD341C 802415EC 00000000 */ nop -.L802415F0: -/* CD3420 802415F0 AE600070 */ sw $zero, 0x70($s3) -.L802415F4: -/* CD3424 802415F4 8FBF0058 */ lw $ra, 0x58($sp) -/* CD3428 802415F8 8FB50054 */ lw $s5, 0x54($sp) -/* CD342C 802415FC 8FB40050 */ lw $s4, 0x50($sp) -/* CD3430 80241600 8FB3004C */ lw $s3, 0x4c($sp) -/* CD3434 80241604 8FB20048 */ lw $s2, 0x48($sp) -/* CD3438 80241608 8FB10044 */ lw $s1, 0x44($sp) -/* CD343C 8024160C 8FB00040 */ lw $s0, 0x40($sp) -/* CD3440 80241610 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CD3444 80241614 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CD3448 80241618 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CD344C 8024161C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CD3450 80241620 03E00008 */ jr $ra -/* CD3454 80241624 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80240220_CD7500.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80240220_CD7500.s deleted file mode 100644 index ec9e60056e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80240220_CD7500.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245308_CDC5E8 -.double 0.09 - -dlabel D_80245310_CDC5F0 -.double 0.09 - -.section .text - -glabel flo_17_func_80240220_CD7500 -/* CD7500 80240220 27BDFF80 */ addiu $sp, $sp, -0x80 -/* CD7504 80240224 AFB3004C */ sw $s3, 0x4c($sp) -/* CD7508 80240228 0080982D */ daddu $s3, $a0, $zero -/* CD750C 8024022C AFBF0058 */ sw $ra, 0x58($sp) -/* CD7510 80240230 AFB50054 */ sw $s5, 0x54($sp) -/* CD7514 80240234 AFB40050 */ sw $s4, 0x50($sp) -/* CD7518 80240238 AFB20048 */ sw $s2, 0x48($sp) -/* CD751C 8024023C AFB10044 */ sw $s1, 0x44($sp) -/* CD7520 80240240 AFB00040 */ sw $s0, 0x40($sp) -/* CD7524 80240244 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CD7528 80240248 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CD752C 8024024C F7B60068 */ sdc1 $f22, 0x68($sp) -/* CD7530 80240250 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CD7534 80240254 8E710148 */ lw $s1, 0x148($s3) -/* CD7538 80240258 00A0902D */ daddu $s2, $a1, $zero -/* CD753C 8024025C 86240008 */ lh $a0, 8($s1) -/* CD7540 80240260 0C00EABB */ jal get_npc_unsafe -/* CD7544 80240264 00C0A82D */ daddu $s5, $a2, $zero -/* CD7548 80240268 0040802D */ daddu $s0, $v0, $zero -/* CD754C 8024026C 0000A02D */ daddu $s4, $zero, $zero -/* CD7550 80240270 C624007C */ lwc1 $f4, 0x7c($s1) -/* CD7554 80240274 46802120 */ cvt.s.w $f4, $f4 -/* CD7558 80240278 C6220088 */ lwc1 $f2, 0x88($s1) -/* CD755C 8024027C 468010A0 */ cvt.s.w $f2, $f2 -/* CD7560 80240280 460010A1 */ cvt.d.s $f2, $f2 -/* CD7564 80240284 46002121 */ cvt.d.s $f4, $f4 -/* CD7568 80240288 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD756C 8024028C 3C014059 */ lui $at, 0x4059 -/* CD7570 80240290 44813800 */ mtc1 $at, $f7 -/* CD7574 80240294 44803000 */ mtc1 $zero, $f6 -/* CD7578 80240298 46000021 */ cvt.d.s $f0, $f0 -/* CD757C 8024029C 46260002 */ mul.d $f0, $f0, $f6 -/* CD7580 802402A0 00000000 */ nop -/* CD7584 802402A4 24020001 */ addiu $v0, $zero, 1 -/* CD7588 802402A8 8E24006C */ lw $a0, 0x6c($s1) -/* CD758C 802402AC 46261083 */ div.d $f2, $f2, $f6 -/* CD7590 802402B0 462010A0 */ cvt.s.d $f2, $f2 -/* CD7594 802402B4 46262103 */ div.d $f4, $f4, $f6 -/* CD7598 802402B8 46202520 */ cvt.s.d $f20, $f4 -/* CD759C 802402BC 30830011 */ andi $v1, $a0, 0x11 -/* CD75A0 802402C0 4620020D */ trunc.w.d $f8, $f0 -/* CD75A4 802402C4 E628007C */ swc1 $f8, 0x7c($s1) -/* CD75A8 802402C8 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD75AC 802402CC 46800020 */ cvt.s.w $f0, $f0 -/* CD75B0 802402D0 46000021 */ cvt.d.s $f0, $f0 -/* CD75B4 802402D4 46260003 */ div.d $f0, $f0, $f6 -/* CD75B8 802402D8 462006A0 */ cvt.s.d $f26, $f0 -/* CD75BC 802402DC C6200070 */ lwc1 $f0, 0x70($s1) -/* CD75C0 802402E0 46800020 */ cvt.s.w $f0, $f0 -/* CD75C4 802402E4 46000021 */ cvt.d.s $f0, $f0 -/* CD75C8 802402E8 46260003 */ div.d $f0, $f0, $f6 -/* CD75CC 802402EC 462005A0 */ cvt.s.d $f22, $f0 -/* CD75D0 802402F0 14620025 */ bne $v1, $v0, .L80240388 -/* CD75D4 802402F4 4602D600 */ add.s $f24, $f26, $f2 -/* CD75D8 802402F8 8E020000 */ lw $v0, ($s0) -/* CD75DC 802402FC 30420008 */ andi $v0, $v0, 8 -/* CD75E0 80240300 10400009 */ beqz $v0, .L80240328 -/* CD75E4 80240304 27A50028 */ addiu $a1, $sp, 0x28 -/* CD75E8 80240308 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD75EC 8024030C 4600C001 */ sub.s $f0, $f24, $f0 -/* CD75F0 80240310 4600B03C */ c.lt.s $f22, $f0 -/* CD75F4 80240314 00000000 */ nop -/* CD75F8 80240318 4500001B */ bc1f .L80240388 -/* CD75FC 8024031C 34820010 */ ori $v0, $a0, 0x10 -/* CD7600 80240320 080900E2 */ j .L80240388 -/* CD7604 80240324 AE22006C */ sw $v0, 0x6c($s1) -.L80240328: -/* CD7608 80240328 27A6002C */ addiu $a2, $sp, 0x2c -/* CD760C 8024032C C6000038 */ lwc1 $f0, 0x38($s0) -/* CD7610 80240330 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD7614 80240334 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD7618 80240338 3C01447A */ lui $at, 0x447a -/* CD761C 8024033C 44813000 */ mtc1 $at, $f6 -/* CD7620 80240340 27A20034 */ addiu $v0, $sp, 0x34 -/* CD7624 80240344 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD7628 80240348 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD762C 8024034C E7A40030 */ swc1 $f4, 0x30($sp) -/* CD7630 80240350 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD7634 80240354 AFA20010 */ sw $v0, 0x10($sp) -/* CD7638 80240358 8E040080 */ lw $a0, 0x80($s0) -/* CD763C 8024035C 0C0372DF */ jal npc_raycast_down_sides -/* CD7640 80240360 27A70030 */ addiu $a3, $sp, 0x30 -/* CD7644 80240364 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CD7648 80240368 4600D001 */ sub.s $f0, $f26, $f0 -/* CD764C 8024036C 4600B03C */ c.lt.s $f22, $f0 -/* CD7650 80240370 00000000 */ nop -/* CD7654 80240374 45000004 */ bc1f .L80240388 -/* CD7658 80240378 00000000 */ nop -/* CD765C 8024037C 8E22006C */ lw $v0, 0x6c($s1) -/* CD7660 80240380 34420010 */ ori $v0, $v0, 0x10 -/* CD7664 80240384 AE22006C */ sw $v0, 0x6c($s1) -.L80240388: -/* CD7668 80240388 8E22006C */ lw $v0, 0x6c($s1) -/* CD766C 8024038C 24030011 */ addiu $v1, $zero, 0x11 -/* CD7670 80240390 30420011 */ andi $v0, $v0, 0x11 -/* CD7674 80240394 14430039 */ bne $v0, $v1, .L8024047C -/* CD7678 80240398 00000000 */ nop -/* CD767C 8024039C 8E020000 */ lw $v0, ($s0) -/* CD7680 802403A0 30420008 */ andi $v0, $v0, 8 -/* CD7684 802403A4 1040000A */ beqz $v0, .L802403D0 -/* CD7688 802403A8 4600C106 */ mov.s $f4, $f24 -/* CD768C 802403AC 4614C081 */ sub.s $f2, $f24, $f20 -/* CD7690 802403B0 3C018024 */ lui $at, %hi(D_80245308_CDC5E8) -/* CD7694 802403B4 D4205308 */ ldc1 $f0, %lo(D_80245308_CDC5E8)($at) -/* CD7698 802403B8 460010A1 */ cvt.d.s $f2, $f2 -/* CD769C 802403BC 46201082 */ mul.d $f2, $f2, $f0 -/* CD76A0 802403C0 00000000 */ nop -/* CD76A4 802403C4 4600A021 */ cvt.d.s $f0, $f20 -/* CD76A8 802403C8 0809010D */ j .L80240434 -/* CD76AC 802403CC 46220000 */ add.d $f0, $f0, $f2 -.L802403D0: -/* CD76B0 802403D0 27A50028 */ addiu $a1, $sp, 0x28 -/* CD76B4 802403D4 27A6002C */ addiu $a2, $sp, 0x2c -/* CD76B8 802403D8 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD76BC 802403DC C6020040 */ lwc1 $f2, 0x40($s0) -/* CD76C0 802403E0 3C01447A */ lui $at, 0x447a -/* CD76C4 802403E4 44812000 */ mtc1 $at, $f4 -/* CD76C8 802403E8 27A20034 */ addiu $v0, $sp, 0x34 -/* CD76CC 802403EC E7B4002C */ swc1 $f20, 0x2c($sp) -/* CD76D0 802403F0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD76D4 802403F4 E7A20030 */ swc1 $f2, 0x30($sp) -/* CD76D8 802403F8 E7A40034 */ swc1 $f4, 0x34($sp) -/* CD76DC 802403FC AFA20010 */ sw $v0, 0x10($sp) -/* CD76E0 80240400 8E040080 */ lw $a0, 0x80($s0) -/* CD76E4 80240404 0C0372DF */ jal npc_raycast_down_sides -/* CD76E8 80240408 27A70030 */ addiu $a3, $sp, 0x30 -/* CD76EC 8024040C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CD76F0 80240410 461A2100 */ add.s $f4, $f4, $f26 -/* CD76F4 80240414 46142081 */ sub.s $f2, $f4, $f20 -/* CD76F8 80240418 3C018024 */ lui $at, %hi(D_80245310_CDC5F0) -/* CD76FC 8024041C D4205310 */ ldc1 $f0, %lo(D_80245310_CDC5F0)($at) -/* CD7700 80240420 460010A1 */ cvt.d.s $f2, $f2 -/* CD7704 80240424 46201082 */ mul.d $f2, $f2, $f0 -/* CD7708 80240428 00000000 */ nop -/* CD770C 8024042C 4600A021 */ cvt.d.s $f0, $f20 -/* CD7710 80240430 46220000 */ add.d $f0, $f0, $f2 -.L80240434: -/* CD7714 80240434 46200020 */ cvt.s.d $f0, $f0 -/* CD7718 80240438 E600003C */ swc1 $f0, 0x3c($s0) -/* CD771C 8024043C C600003C */ lwc1 $f0, 0x3c($s0) -/* CD7720 80240440 46002001 */ sub.s $f0, $f4, $f0 -/* CD7724 80240444 3C013FF0 */ lui $at, 0x3ff0 -/* CD7728 80240448 44811800 */ mtc1 $at, $f3 -/* CD772C 8024044C 44801000 */ mtc1 $zero, $f2 -/* CD7730 80240450 46000005 */ abs.s $f0, $f0 -/* CD7734 80240454 46000021 */ cvt.d.s $f0, $f0 -/* CD7738 80240458 4622003C */ c.lt.d $f0, $f2 -/* CD773C 8024045C 00000000 */ nop -/* CD7740 80240460 45000036 */ bc1f .L8024053C -/* CD7744 80240464 2403FFEF */ addiu $v1, $zero, -0x11 -/* CD7748 80240468 E604003C */ swc1 $f4, 0x3c($s0) -/* CD774C 8024046C 8E22006C */ lw $v0, 0x6c($s1) -/* CD7750 80240470 00431024 */ and $v0, $v0, $v1 -/* CD7754 80240474 0809014F */ j .L8024053C -/* CD7758 80240478 AE22006C */ sw $v0, 0x6c($s1) -.L8024047C: -/* CD775C 8024047C 8E220070 */ lw $v0, 0x70($s1) -/* CD7760 80240480 1840002E */ blez $v0, .L8024053C -/* CD7764 80240484 00000000 */ nop -/* CD7768 80240488 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CD776C 8024048C 0C00A8BB */ jal sin_deg -/* CD7770 80240490 46806320 */ cvt.s.w $f12, $f12 -/* CD7774 80240494 8E020000 */ lw $v0, ($s0) -/* CD7778 80240498 30420008 */ andi $v0, $v0, 8 -/* CD777C 8024049C 10400003 */ beqz $v0, .L802404AC -/* CD7780 802404A0 46000506 */ mov.s $f20, $f0 -/* CD7784 802404A4 0809013B */ j .L802404EC -/* CD7788 802404A8 0000102D */ daddu $v0, $zero, $zero -.L802404AC: -/* CD778C 802404AC 27A50028 */ addiu $a1, $sp, 0x28 -/* CD7790 802404B0 27A6002C */ addiu $a2, $sp, 0x2c -/* CD7794 802404B4 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD7798 802404B8 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD779C 802404BC C6040040 */ lwc1 $f4, 0x40($s0) -/* CD77A0 802404C0 3C01447A */ lui $at, 0x447a -/* CD77A4 802404C4 44813000 */ mtc1 $at, $f6 -/* CD77A8 802404C8 27A20034 */ addiu $v0, $sp, 0x34 -/* CD77AC 802404CC E7A00028 */ swc1 $f0, 0x28($sp) -/* CD77B0 802404D0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD77B4 802404D4 E7A40030 */ swc1 $f4, 0x30($sp) -/* CD77B8 802404D8 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD77BC 802404DC AFA20010 */ sw $v0, 0x10($sp) -/* CD77C0 802404E0 8E040080 */ lw $a0, 0x80($s0) -/* CD77C4 802404E4 0C0372DF */ jal npc_raycast_down_sides -/* CD77C8 802404E8 27A70030 */ addiu $a3, $sp, 0x30 -.L802404EC: -/* CD77CC 802404EC 10400007 */ beqz $v0, .L8024050C -/* CD77D0 802404F0 00000000 */ nop -/* CD77D4 802404F4 4616A082 */ mul.s $f2, $f20, $f22 -/* CD77D8 802404F8 00000000 */ nop -/* CD77DC 802404FC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CD77E0 80240500 461A0000 */ add.s $f0, $f0, $f26 -/* CD77E4 80240504 08090146 */ j .L80240518 -/* CD77E8 80240508 46020000 */ add.s $f0, $f0, $f2 -.L8024050C: -/* CD77EC 8024050C 4616A002 */ mul.s $f0, $f20, $f22 -/* CD77F0 80240510 00000000 */ nop -/* CD77F4 80240514 4600C000 */ add.s $f0, $f24, $f0 -.L80240518: -/* CD77F8 80240518 E600003C */ swc1 $f0, 0x3c($s0) -/* CD77FC 8024051C 8E220074 */ lw $v0, 0x74($s1) -/* CD7800 80240520 2442000A */ addiu $v0, $v0, 0xa -/* CD7804 80240524 44826000 */ mtc1 $v0, $f12 -/* CD7808 80240528 00000000 */ nop -/* CD780C 8024052C 0C00A6C9 */ jal clamp_angle -/* CD7810 80240530 46806320 */ cvt.s.w $f12, $f12 -/* CD7814 80240534 4600020D */ trunc.w.s $f8, $f0 -/* CD7818 80240538 E6280074 */ swc1 $f8, 0x74($s1) -.L8024053C: -/* CD781C 8024053C 8E220090 */ lw $v0, 0x90($s1) -/* CD7820 80240540 1C40004A */ bgtz $v0, .L8024066C -/* CD7824 80240544 2442FFFF */ addiu $v0, $v0, -1 -/* CD7828 80240548 8E430014 */ lw $v1, 0x14($s2) -/* CD782C 8024054C 04600048 */ bltz $v1, .L80240670 -/* CD7830 80240550 00000000 */ nop -/* CD7834 80240554 8E620074 */ lw $v0, 0x74($s3) -/* CD7838 80240558 1C400042 */ bgtz $v0, .L80240664 -/* CD783C 8024055C 2442FFFF */ addiu $v0, $v0, -1 -/* CD7840 80240560 AE630074 */ sw $v1, 0x74($s3) -/* CD7844 80240564 860200A8 */ lh $v0, 0xa8($s0) -/* CD7848 80240568 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD784C 8024056C 44820000 */ mtc1 $v0, $f0 -/* CD7850 80240570 00000000 */ nop -/* CD7854 80240574 46800020 */ cvt.s.w $f0, $f0 -/* CD7858 80240578 46001080 */ add.s $f2, $f2, $f0 -/* CD785C 8024057C 3C014024 */ lui $at, 0x4024 -/* CD7860 80240580 44810800 */ mtc1 $at, $f1 -/* CD7864 80240584 44800000 */ mtc1 $zero, $f0 -/* CD7868 80240588 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD786C 8024058C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD7870 80240590 460010A1 */ cvt.d.s $f2, $f2 -/* CD7874 80240594 46201080 */ add.d $f2, $f2, $f0 -/* CD7878 80240598 C440002C */ lwc1 $f0, 0x2c($v0) -/* CD787C 8024059C 46000021 */ cvt.d.s $f0, $f0 -/* CD7880 802405A0 4622003C */ c.lt.d $f0, $f2 -/* CD7884 802405A4 00000000 */ nop -/* CD7888 802405A8 4500002C */ bc1f .L8024065C -/* CD788C 802405AC 02A0202D */ daddu $a0, $s5, $zero -/* CD7890 802405B0 AFA00010 */ sw $zero, 0x10($sp) -/* CD7894 802405B4 8E46000C */ lw $a2, 0xc($s2) -/* CD7898 802405B8 8E470010 */ lw $a3, 0x10($s2) -/* CD789C 802405BC 0C01242D */ jal func_800490B4 -/* CD78A0 802405C0 0220282D */ daddu $a1, $s1, $zero -/* CD78A4 802405C4 10400025 */ beqz $v0, .L8024065C -/* CD78A8 802405C8 0000202D */ daddu $a0, $zero, $zero -/* CD78AC 802405CC 0200282D */ daddu $a1, $s0, $zero -/* CD78B0 802405D0 0000302D */ daddu $a2, $zero, $zero -/* CD78B4 802405D4 2412000C */ addiu $s2, $zero, 0xc -/* CD78B8 802405D8 860300A8 */ lh $v1, 0xa8($s0) -/* CD78BC 802405DC 3C013F80 */ lui $at, 0x3f80 -/* CD78C0 802405E0 44810000 */ mtc1 $at, $f0 -/* CD78C4 802405E4 3C014000 */ lui $at, 0x4000 -/* CD78C8 802405E8 44811000 */ mtc1 $at, $f2 -/* CD78CC 802405EC 3C01C1A0 */ lui $at, 0xc1a0 -/* CD78D0 802405F0 44812000 */ mtc1 $at, $f4 -/* CD78D4 802405F4 44834000 */ mtc1 $v1, $f8 -/* CD78D8 802405F8 00000000 */ nop -/* CD78DC 802405FC 46804220 */ cvt.s.w $f8, $f8 -/* CD78E0 80240600 44074000 */ mfc1 $a3, $f8 -/* CD78E4 80240604 27A20038 */ addiu $v0, $sp, 0x38 -/* CD78E8 80240608 AFB2001C */ sw $s2, 0x1c($sp) -/* CD78EC 8024060C AFA20020 */ sw $v0, 0x20($sp) -/* CD78F0 80240610 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD78F4 80240614 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD78F8 80240618 0C01BFA4 */ jal fx_emote -/* CD78FC 8024061C E7A40018 */ swc1 $f4, 0x18($sp) -/* CD7900 80240620 0200202D */ daddu $a0, $s0, $zero -/* CD7904 80240624 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CD7908 80240628 C480003C */ lwc1 $f0, 0x3c($a0) -/* CD790C 8024062C 3C060020 */ lui $a2, 0x20 -/* CD7910 80240630 0C012530 */ jal ai_enemy_play_sound -/* CD7914 80240634 E4800064 */ swc1 $f0, 0x64($a0) -/* CD7918 80240638 8E220018 */ lw $v0, 0x18($s1) -/* CD791C 8024063C 9442002A */ lhu $v0, 0x2a($v0) -/* CD7920 80240640 30420001 */ andi $v0, $v0, 1 -/* CD7924 80240644 10400003 */ beqz $v0, .L80240654 -/* CD7928 80240648 2402000A */ addiu $v0, $zero, 0xa -/* CD792C 8024064C 08090205 */ j .L80240814 -/* CD7930 80240650 AE620070 */ sw $v0, 0x70($s3) -.L80240654: -/* CD7934 80240654 08090205 */ j .L80240814 -/* CD7938 80240658 AE720070 */ sw $s2, 0x70($s3) -.L8024065C: -/* CD793C 8024065C 8E620074 */ lw $v0, 0x74($s3) -/* CD7940 80240660 2442FFFF */ addiu $v0, $v0, -1 -.L80240664: -/* CD7944 80240664 0809019C */ j .L80240670 -/* CD7948 80240668 AE620074 */ sw $v0, 0x74($s3) -.L8024066C: -/* CD794C 8024066C AE220090 */ sw $v0, 0x90($s1) -.L80240670: -/* CD7950 80240670 8E2300D0 */ lw $v1, 0xd0($s1) -/* CD7954 80240674 C6000040 */ lwc1 $f0, 0x40($s0) -/* CD7958 80240678 C4620000 */ lwc1 $f2, ($v1) -/* CD795C 8024067C 468010A0 */ cvt.s.w $f2, $f2 -/* CD7960 80240680 C4640008 */ lwc1 $f4, 8($v1) -/* CD7964 80240684 46802120 */ cvt.s.w $f4, $f4 -/* CD7968 80240688 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD796C 8024068C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD7970 80240690 44051000 */ mfc1 $a1, $f2 -/* CD7974 80240694 C440000C */ lwc1 $f0, 0xc($v0) -/* CD7978 80240698 46800020 */ cvt.s.w $f0, $f0 -/* CD797C 8024069C E7A00014 */ swc1 $f0, 0x14($sp) -/* CD7980 802406A0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD7984 802406A4 44062000 */ mfc1 $a2, $f4 -/* CD7988 802406A8 C4400010 */ lwc1 $f0, 0x10($v0) -/* CD798C 802406AC 46800020 */ cvt.s.w $f0, $f0 -/* CD7990 802406B0 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD7994 802406B4 8C640018 */ lw $a0, 0x18($v1) -/* CD7998 802406B8 0C0123F5 */ jal is_point_within_region -/* CD799C 802406BC 8E070038 */ lw $a3, 0x38($s0) -/* CD79A0 802406C0 1040001A */ beqz $v0, .L8024072C -/* CD79A4 802406C4 00000000 */ nop -/* CD79A8 802406C8 8E060038 */ lw $a2, 0x38($s0) -/* CD79AC 802406CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD79B0 802406D0 8E070040 */ lw $a3, 0x40($s0) -/* CD79B4 802406D4 C44C0000 */ lwc1 $f12, ($v0) -/* CD79B8 802406D8 46806320 */ cvt.s.w $f12, $f12 -/* CD79BC 802406DC C44E0008 */ lwc1 $f14, 8($v0) -/* CD79C0 802406E0 0C00A7B5 */ jal dist2D -/* CD79C4 802406E4 468073A0 */ cvt.s.w $f14, $f14 -/* CD79C8 802406E8 C6020018 */ lwc1 $f2, 0x18($s0) -/* CD79CC 802406EC 4600103C */ c.lt.s $f2, $f0 -/* CD79D0 802406F0 00000000 */ nop -/* CD79D4 802406F4 4500000D */ bc1f .L8024072C -/* CD79D8 802406F8 E7A00034 */ swc1 $f0, 0x34($sp) -/* CD79DC 802406FC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD79E0 80240700 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD79E4 80240704 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD79E8 80240708 C4480000 */ lwc1 $f8, ($v0) -/* CD79EC 8024070C 46804220 */ cvt.s.w $f8, $f8 -/* CD79F0 80240710 44064000 */ mfc1 $a2, $f8 -/* CD79F4 80240714 C4480008 */ lwc1 $f8, 8($v0) -/* CD79F8 80240718 46804220 */ cvt.s.w $f8, $f8 -/* CD79FC 8024071C 44074000 */ mfc1 $a3, $f8 -/* CD7A00 80240720 0C00A720 */ jal atan2 -/* CD7A04 80240724 24140001 */ addiu $s4, $zero, 1 -/* CD7A08 80240728 E600000C */ swc1 $f0, 0xc($s0) -.L8024072C: -/* CD7A0C 8024072C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD7A10 80240730 8C43000C */ lw $v1, 0xc($v0) -/* CD7A14 80240734 8C420010 */ lw $v0, 0x10($v0) -/* CD7A18 80240738 00621825 */ or $v1, $v1, $v0 -/* CD7A1C 8024073C 00741825 */ or $v1, $v1, $s4 -/* CD7A20 80240740 10600008 */ beqz $v1, .L80240764 -/* CD7A24 80240744 00000000 */ nop -/* CD7A28 80240748 8602008C */ lh $v0, 0x8c($s0) -/* CD7A2C 8024074C 14400031 */ bnez $v0, .L80240814 -/* CD7A30 80240750 00000000 */ nop -/* CD7A34 80240754 8E050018 */ lw $a1, 0x18($s0) -/* CD7A38 80240758 8E06000C */ lw $a2, 0xc($s0) -/* CD7A3C 8024075C 0C00EA95 */ jal npc_move_heading -/* CD7A40 80240760 0200202D */ daddu $a0, $s0, $zero -.L80240764: -/* CD7A44 80240764 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD7A48 80240768 3C014059 */ lui $at, 0x4059 -/* CD7A4C 8024076C 44811800 */ mtc1 $at, $f3 -/* CD7A50 80240770 44801000 */ mtc1 $zero, $f2 -/* CD7A54 80240774 46000021 */ cvt.d.s $f0, $f0 -/* CD7A58 80240778 46220002 */ mul.d $f0, $f0, $f2 -/* CD7A5C 8024077C 00000000 */ nop -/* CD7A60 80240780 4620020D */ trunc.w.d $f8, $f0 -/* CD7A64 80240784 E628007C */ swc1 $f8, 0x7c($s1) -/* CD7A68 80240788 8E420004 */ lw $v0, 4($s2) -/* CD7A6C 8024078C 18400021 */ blez $v0, .L80240814 -/* CD7A70 80240790 00000000 */ nop -/* CD7A74 80240794 8602008E */ lh $v0, 0x8e($s0) -/* CD7A78 80240798 9603008E */ lhu $v1, 0x8e($s0) -/* CD7A7C 8024079C 18400005 */ blez $v0, .L802407B4 -/* CD7A80 802407A0 2462FFFF */ addiu $v0, $v1, -1 -/* CD7A84 802407A4 A602008E */ sh $v0, 0x8e($s0) -/* CD7A88 802407A8 00021400 */ sll $v0, $v0, 0x10 -/* CD7A8C 802407AC 1C400019 */ bgtz $v0, .L80240814 -/* CD7A90 802407B0 00000000 */ nop -.L802407B4: -/* CD7A94 802407B4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CD7A98 802407B8 24020002 */ addiu $v0, $zero, 2 -/* CD7A9C 802407BC 0C00A67F */ jal rand_int -/* CD7AA0 802407C0 AE620070 */ sw $v0, 0x70($s3) -/* CD7AA4 802407C4 3C035555 */ lui $v1, 0x5555 -/* CD7AA8 802407C8 34635556 */ ori $v1, $v1, 0x5556 -/* CD7AAC 802407CC 00430018 */ mult $v0, $v1 -/* CD7AB0 802407D0 000227C3 */ sra $a0, $v0, 0x1f -/* CD7AB4 802407D4 00004010 */ mfhi $t0 -/* CD7AB8 802407D8 01042023 */ subu $a0, $t0, $a0 -/* CD7ABC 802407DC 00041840 */ sll $v1, $a0, 1 -/* CD7AC0 802407E0 00641821 */ addu $v1, $v1, $a0 -/* CD7AC4 802407E4 00431023 */ subu $v0, $v0, $v1 -/* CD7AC8 802407E8 24430002 */ addiu $v1, $v0, 2 -/* CD7ACC 802407EC AE630074 */ sw $v1, 0x74($s3) -/* CD7AD0 802407F0 8E42002C */ lw $v0, 0x2c($s2) -/* CD7AD4 802407F4 58400007 */ blezl $v0, .L80240814 -/* CD7AD8 802407F8 AE600070 */ sw $zero, 0x70($s3) -/* CD7ADC 802407FC 8E420008 */ lw $v0, 8($s2) -/* CD7AE0 80240800 18400003 */ blez $v0, .L80240810 -/* CD7AE4 80240804 28620003 */ slti $v0, $v1, 3 -/* CD7AE8 80240808 10400002 */ beqz $v0, .L80240814 -/* CD7AEC 8024080C 00000000 */ nop -.L80240810: -/* CD7AF0 80240810 AE600070 */ sw $zero, 0x70($s3) -.L80240814: -/* CD7AF4 80240814 8FBF0058 */ lw $ra, 0x58($sp) -/* CD7AF8 80240818 8FB50054 */ lw $s5, 0x54($sp) -/* CD7AFC 8024081C 8FB40050 */ lw $s4, 0x50($sp) -/* CD7B00 80240820 8FB3004C */ lw $s3, 0x4c($sp) -/* CD7B04 80240824 8FB20048 */ lw $s2, 0x48($sp) -/* CD7B08 80240828 8FB10044 */ lw $s1, 0x44($sp) -/* CD7B0C 8024082C 8FB00040 */ lw $s0, 0x40($sp) -/* CD7B10 80240830 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CD7B14 80240834 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CD7B18 80240838 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CD7B1C 8024083C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CD7B20 80240840 03E00008 */ jr $ra -/* CD7B24 80240844 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/flo_25_func_802401F0_CF2DC0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/flo_25_func_802401F0_CF2DC0.s deleted file mode 100644 index 20041145a4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/flo_25_func_802401F0_CF2DC0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244EE8_CF7AB8 -.double 0.09 - -dlabel D_80244EF0_CF7AC0 -.double 0.09 - -.section .text - -glabel flo_25_func_802401F0_CF2DC0 -/* CF2DC0 802401F0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* CF2DC4 802401F4 AFB3004C */ sw $s3, 0x4c($sp) -/* CF2DC8 802401F8 0080982D */ daddu $s3, $a0, $zero -/* CF2DCC 802401FC AFBF0058 */ sw $ra, 0x58($sp) -/* CF2DD0 80240200 AFB50054 */ sw $s5, 0x54($sp) -/* CF2DD4 80240204 AFB40050 */ sw $s4, 0x50($sp) -/* CF2DD8 80240208 AFB20048 */ sw $s2, 0x48($sp) -/* CF2DDC 8024020C AFB10044 */ sw $s1, 0x44($sp) -/* CF2DE0 80240210 AFB00040 */ sw $s0, 0x40($sp) -/* CF2DE4 80240214 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CF2DE8 80240218 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CF2DEC 8024021C F7B60068 */ sdc1 $f22, 0x68($sp) -/* CF2DF0 80240220 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CF2DF4 80240224 8E710148 */ lw $s1, 0x148($s3) -/* CF2DF8 80240228 00A0902D */ daddu $s2, $a1, $zero -/* CF2DFC 8024022C 86240008 */ lh $a0, 8($s1) -/* CF2E00 80240230 0C00EABB */ jal get_npc_unsafe -/* CF2E04 80240234 00C0A82D */ daddu $s5, $a2, $zero -/* CF2E08 80240238 0040802D */ daddu $s0, $v0, $zero -/* CF2E0C 8024023C 0000A02D */ daddu $s4, $zero, $zero -/* CF2E10 80240240 C624007C */ lwc1 $f4, 0x7c($s1) -/* CF2E14 80240244 46802120 */ cvt.s.w $f4, $f4 -/* CF2E18 80240248 C6220088 */ lwc1 $f2, 0x88($s1) -/* CF2E1C 8024024C 468010A0 */ cvt.s.w $f2, $f2 -/* CF2E20 80240250 460010A1 */ cvt.d.s $f2, $f2 -/* CF2E24 80240254 46002121 */ cvt.d.s $f4, $f4 -/* CF2E28 80240258 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF2E2C 8024025C 3C014059 */ lui $at, 0x4059 -/* CF2E30 80240260 44813800 */ mtc1 $at, $f7 -/* CF2E34 80240264 44803000 */ mtc1 $zero, $f6 -/* CF2E38 80240268 46000021 */ cvt.d.s $f0, $f0 -/* CF2E3C 8024026C 46260002 */ mul.d $f0, $f0, $f6 -/* CF2E40 80240270 00000000 */ nop -/* CF2E44 80240274 24020001 */ addiu $v0, $zero, 1 -/* CF2E48 80240278 8E24006C */ lw $a0, 0x6c($s1) -/* CF2E4C 8024027C 46261083 */ div.d $f2, $f2, $f6 -/* CF2E50 80240280 462010A0 */ cvt.s.d $f2, $f2 -/* CF2E54 80240284 46262103 */ div.d $f4, $f4, $f6 -/* CF2E58 80240288 46202520 */ cvt.s.d $f20, $f4 -/* CF2E5C 8024028C 30830011 */ andi $v1, $a0, 0x11 -/* CF2E60 80240290 4620020D */ trunc.w.d $f8, $f0 -/* CF2E64 80240294 E628007C */ swc1 $f8, 0x7c($s1) -/* CF2E68 80240298 C6200078 */ lwc1 $f0, 0x78($s1) -/* CF2E6C 8024029C 46800020 */ cvt.s.w $f0, $f0 -/* CF2E70 802402A0 46000021 */ cvt.d.s $f0, $f0 -/* CF2E74 802402A4 46260003 */ div.d $f0, $f0, $f6 -/* CF2E78 802402A8 462006A0 */ cvt.s.d $f26, $f0 -/* CF2E7C 802402AC C6200070 */ lwc1 $f0, 0x70($s1) -/* CF2E80 802402B0 46800020 */ cvt.s.w $f0, $f0 -/* CF2E84 802402B4 46000021 */ cvt.d.s $f0, $f0 -/* CF2E88 802402B8 46260003 */ div.d $f0, $f0, $f6 -/* CF2E8C 802402BC 462005A0 */ cvt.s.d $f22, $f0 -/* CF2E90 802402C0 14620025 */ bne $v1, $v0, .L80240358 -/* CF2E94 802402C4 4602D600 */ add.s $f24, $f26, $f2 -/* CF2E98 802402C8 8E020000 */ lw $v0, ($s0) -/* CF2E9C 802402CC 30420008 */ andi $v0, $v0, 8 -/* CF2EA0 802402D0 10400009 */ beqz $v0, .L802402F8 -/* CF2EA4 802402D4 27A50028 */ addiu $a1, $sp, 0x28 -/* CF2EA8 802402D8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF2EAC 802402DC 4600C001 */ sub.s $f0, $f24, $f0 -/* CF2EB0 802402E0 4600B03C */ c.lt.s $f22, $f0 -/* CF2EB4 802402E4 00000000 */ nop -/* CF2EB8 802402E8 4500001B */ bc1f .L80240358 -/* CF2EBC 802402EC 34820010 */ ori $v0, $a0, 0x10 -/* CF2EC0 802402F0 080900D6 */ j .L80240358 -/* CF2EC4 802402F4 AE22006C */ sw $v0, 0x6c($s1) -.L802402F8: -/* CF2EC8 802402F8 27A6002C */ addiu $a2, $sp, 0x2c -/* CF2ECC 802402FC C6000038 */ lwc1 $f0, 0x38($s0) -/* CF2ED0 80240300 C602003C */ lwc1 $f2, 0x3c($s0) -/* CF2ED4 80240304 C6040040 */ lwc1 $f4, 0x40($s0) -/* CF2ED8 80240308 3C01447A */ lui $at, 0x447a -/* CF2EDC 8024030C 44813000 */ mtc1 $at, $f6 -/* CF2EE0 80240310 27A20034 */ addiu $v0, $sp, 0x34 -/* CF2EE4 80240314 E7A00028 */ swc1 $f0, 0x28($sp) -/* CF2EE8 80240318 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CF2EEC 8024031C E7A40030 */ swc1 $f4, 0x30($sp) -/* CF2EF0 80240320 E7A60034 */ swc1 $f6, 0x34($sp) -/* CF2EF4 80240324 AFA20010 */ sw $v0, 0x10($sp) -/* CF2EF8 80240328 8E040080 */ lw $a0, 0x80($s0) -/* CF2EFC 8024032C 0C0372DF */ jal npc_raycast_down_sides -/* CF2F00 80240330 27A70030 */ addiu $a3, $sp, 0x30 -/* CF2F04 80240334 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CF2F08 80240338 4600D001 */ sub.s $f0, $f26, $f0 -/* CF2F0C 8024033C 4600B03C */ c.lt.s $f22, $f0 -/* CF2F10 80240340 00000000 */ nop -/* CF2F14 80240344 45000004 */ bc1f .L80240358 -/* CF2F18 80240348 00000000 */ nop -/* CF2F1C 8024034C 8E22006C */ lw $v0, 0x6c($s1) -/* CF2F20 80240350 34420010 */ ori $v0, $v0, 0x10 -/* CF2F24 80240354 AE22006C */ sw $v0, 0x6c($s1) -.L80240358: -/* CF2F28 80240358 8E22006C */ lw $v0, 0x6c($s1) -/* CF2F2C 8024035C 24030011 */ addiu $v1, $zero, 0x11 -/* CF2F30 80240360 30420011 */ andi $v0, $v0, 0x11 -/* CF2F34 80240364 14430039 */ bne $v0, $v1, .L8024044C -/* CF2F38 80240368 00000000 */ nop -/* CF2F3C 8024036C 8E020000 */ lw $v0, ($s0) -/* CF2F40 80240370 30420008 */ andi $v0, $v0, 8 -/* CF2F44 80240374 1040000A */ beqz $v0, .L802403A0 -/* CF2F48 80240378 4600C106 */ mov.s $f4, $f24 -/* CF2F4C 8024037C 4614C081 */ sub.s $f2, $f24, $f20 -/* CF2F50 80240380 3C018024 */ lui $at, %hi(D_80244EE8_CF7AB8) -/* CF2F54 80240384 D4204EE8 */ ldc1 $f0, %lo(D_80244EE8_CF7AB8)($at) -/* CF2F58 80240388 460010A1 */ cvt.d.s $f2, $f2 -/* CF2F5C 8024038C 46201082 */ mul.d $f2, $f2, $f0 -/* CF2F60 80240390 00000000 */ nop -/* CF2F64 80240394 4600A021 */ cvt.d.s $f0, $f20 -/* CF2F68 80240398 08090101 */ j .L80240404 -/* CF2F6C 8024039C 46220000 */ add.d $f0, $f0, $f2 -.L802403A0: -/* CF2F70 802403A0 27A50028 */ addiu $a1, $sp, 0x28 -/* CF2F74 802403A4 27A6002C */ addiu $a2, $sp, 0x2c -/* CF2F78 802403A8 C6000038 */ lwc1 $f0, 0x38($s0) -/* CF2F7C 802403AC C6020040 */ lwc1 $f2, 0x40($s0) -/* CF2F80 802403B0 3C01447A */ lui $at, 0x447a -/* CF2F84 802403B4 44812000 */ mtc1 $at, $f4 -/* CF2F88 802403B8 27A20034 */ addiu $v0, $sp, 0x34 -/* CF2F8C 802403BC E7B4002C */ swc1 $f20, 0x2c($sp) -/* CF2F90 802403C0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CF2F94 802403C4 E7A20030 */ swc1 $f2, 0x30($sp) -/* CF2F98 802403C8 E7A40034 */ swc1 $f4, 0x34($sp) -/* CF2F9C 802403CC AFA20010 */ sw $v0, 0x10($sp) -/* CF2FA0 802403D0 8E040080 */ lw $a0, 0x80($s0) -/* CF2FA4 802403D4 0C0372DF */ jal npc_raycast_down_sides -/* CF2FA8 802403D8 27A70030 */ addiu $a3, $sp, 0x30 -/* CF2FAC 802403DC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CF2FB0 802403E0 461A2100 */ add.s $f4, $f4, $f26 -/* CF2FB4 802403E4 46142081 */ sub.s $f2, $f4, $f20 -/* CF2FB8 802403E8 3C018024 */ lui $at, %hi(D_80244EF0_CF7AC0) -/* CF2FBC 802403EC D4204EF0 */ ldc1 $f0, %lo(D_80244EF0_CF7AC0)($at) -/* CF2FC0 802403F0 460010A1 */ cvt.d.s $f2, $f2 -/* CF2FC4 802403F4 46201082 */ mul.d $f2, $f2, $f0 -/* CF2FC8 802403F8 00000000 */ nop -/* CF2FCC 802403FC 4600A021 */ cvt.d.s $f0, $f20 -/* CF2FD0 80240400 46220000 */ add.d $f0, $f0, $f2 -.L80240404: -/* CF2FD4 80240404 46200020 */ cvt.s.d $f0, $f0 -/* CF2FD8 80240408 E600003C */ swc1 $f0, 0x3c($s0) -/* CF2FDC 8024040C C600003C */ lwc1 $f0, 0x3c($s0) -/* CF2FE0 80240410 46002001 */ sub.s $f0, $f4, $f0 -/* CF2FE4 80240414 3C013FF0 */ lui $at, 0x3ff0 -/* CF2FE8 80240418 44811800 */ mtc1 $at, $f3 -/* CF2FEC 8024041C 44801000 */ mtc1 $zero, $f2 -/* CF2FF0 80240420 46000005 */ abs.s $f0, $f0 -/* CF2FF4 80240424 46000021 */ cvt.d.s $f0, $f0 -/* CF2FF8 80240428 4622003C */ c.lt.d $f0, $f2 -/* CF2FFC 8024042C 00000000 */ nop -/* CF3000 80240430 45000036 */ bc1f .L8024050C -/* CF3004 80240434 2403FFEF */ addiu $v1, $zero, -0x11 -/* CF3008 80240438 E604003C */ swc1 $f4, 0x3c($s0) -/* CF300C 8024043C 8E22006C */ lw $v0, 0x6c($s1) -/* CF3010 80240440 00431024 */ and $v0, $v0, $v1 -/* CF3014 80240444 08090143 */ j .L8024050C -/* CF3018 80240448 AE22006C */ sw $v0, 0x6c($s1) -.L8024044C: -/* CF301C 8024044C 8E220070 */ lw $v0, 0x70($s1) -/* CF3020 80240450 1840002E */ blez $v0, .L8024050C -/* CF3024 80240454 00000000 */ nop -/* CF3028 80240458 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CF302C 8024045C 0C00A8BB */ jal sin_deg -/* CF3030 80240460 46806320 */ cvt.s.w $f12, $f12 -/* CF3034 80240464 8E020000 */ lw $v0, ($s0) -/* CF3038 80240468 30420008 */ andi $v0, $v0, 8 -/* CF303C 8024046C 10400003 */ beqz $v0, .L8024047C -/* CF3040 80240470 46000506 */ mov.s $f20, $f0 -/* CF3044 80240474 0809012F */ j .L802404BC -/* CF3048 80240478 0000102D */ daddu $v0, $zero, $zero -.L8024047C: -/* CF304C 8024047C 27A50028 */ addiu $a1, $sp, 0x28 -/* CF3050 80240480 27A6002C */ addiu $a2, $sp, 0x2c -/* CF3054 80240484 C6000038 */ lwc1 $f0, 0x38($s0) -/* CF3058 80240488 C602003C */ lwc1 $f2, 0x3c($s0) -/* CF305C 8024048C C6040040 */ lwc1 $f4, 0x40($s0) -/* CF3060 80240490 3C01447A */ lui $at, 0x447a -/* CF3064 80240494 44813000 */ mtc1 $at, $f6 -/* CF3068 80240498 27A20034 */ addiu $v0, $sp, 0x34 -/* CF306C 8024049C E7A00028 */ swc1 $f0, 0x28($sp) -/* CF3070 802404A0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CF3074 802404A4 E7A40030 */ swc1 $f4, 0x30($sp) -/* CF3078 802404A8 E7A60034 */ swc1 $f6, 0x34($sp) -/* CF307C 802404AC AFA20010 */ sw $v0, 0x10($sp) -/* CF3080 802404B0 8E040080 */ lw $a0, 0x80($s0) -/* CF3084 802404B4 0C0372DF */ jal npc_raycast_down_sides -/* CF3088 802404B8 27A70030 */ addiu $a3, $sp, 0x30 -.L802404BC: -/* CF308C 802404BC 10400007 */ beqz $v0, .L802404DC -/* CF3090 802404C0 00000000 */ nop -/* CF3094 802404C4 4616A082 */ mul.s $f2, $f20, $f22 -/* CF3098 802404C8 00000000 */ nop -/* CF309C 802404CC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CF30A0 802404D0 461A0000 */ add.s $f0, $f0, $f26 -/* CF30A4 802404D4 0809013A */ j .L802404E8 -/* CF30A8 802404D8 46020000 */ add.s $f0, $f0, $f2 -.L802404DC: -/* CF30AC 802404DC 4616A002 */ mul.s $f0, $f20, $f22 -/* CF30B0 802404E0 00000000 */ nop -/* CF30B4 802404E4 4600C000 */ add.s $f0, $f24, $f0 -.L802404E8: -/* CF30B8 802404E8 E600003C */ swc1 $f0, 0x3c($s0) -/* CF30BC 802404EC 8E220074 */ lw $v0, 0x74($s1) -/* CF30C0 802404F0 2442000A */ addiu $v0, $v0, 0xa -/* CF30C4 802404F4 44826000 */ mtc1 $v0, $f12 -/* CF30C8 802404F8 00000000 */ nop -/* CF30CC 802404FC 0C00A6C9 */ jal clamp_angle -/* CF30D0 80240500 46806320 */ cvt.s.w $f12, $f12 -/* CF30D4 80240504 4600020D */ trunc.w.s $f8, $f0 -/* CF30D8 80240508 E6280074 */ swc1 $f8, 0x74($s1) -.L8024050C: -/* CF30DC 8024050C 8E220090 */ lw $v0, 0x90($s1) -/* CF30E0 80240510 1C40004A */ bgtz $v0, .L8024063C -/* CF30E4 80240514 2442FFFF */ addiu $v0, $v0, -1 -/* CF30E8 80240518 8E430014 */ lw $v1, 0x14($s2) -/* CF30EC 8024051C 04600048 */ bltz $v1, .L80240640 -/* CF30F0 80240520 00000000 */ nop -/* CF30F4 80240524 8E620074 */ lw $v0, 0x74($s3) -/* CF30F8 80240528 1C400042 */ bgtz $v0, .L80240634 -/* CF30FC 8024052C 2442FFFF */ addiu $v0, $v0, -1 -/* CF3100 80240530 AE630074 */ sw $v1, 0x74($s3) -/* CF3104 80240534 860200A8 */ lh $v0, 0xa8($s0) -/* CF3108 80240538 C602003C */ lwc1 $f2, 0x3c($s0) -/* CF310C 8024053C 44820000 */ mtc1 $v0, $f0 -/* CF3110 80240540 00000000 */ nop -/* CF3114 80240544 46800020 */ cvt.s.w $f0, $f0 -/* CF3118 80240548 46001080 */ add.s $f2, $f2, $f0 -/* CF311C 8024054C 3C014024 */ lui $at, 0x4024 -/* CF3120 80240550 44810800 */ mtc1 $at, $f1 -/* CF3124 80240554 44800000 */ mtc1 $zero, $f0 -/* CF3128 80240558 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CF312C 8024055C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CF3130 80240560 460010A1 */ cvt.d.s $f2, $f2 -/* CF3134 80240564 46201080 */ add.d $f2, $f2, $f0 -/* CF3138 80240568 C440002C */ lwc1 $f0, 0x2c($v0) -/* CF313C 8024056C 46000021 */ cvt.d.s $f0, $f0 -/* CF3140 80240570 4622003C */ c.lt.d $f0, $f2 -/* CF3144 80240574 00000000 */ nop -/* CF3148 80240578 4500002C */ bc1f .L8024062C -/* CF314C 8024057C 02A0202D */ daddu $a0, $s5, $zero -/* CF3150 80240580 AFA00010 */ sw $zero, 0x10($sp) -/* CF3154 80240584 8E46000C */ lw $a2, 0xc($s2) -/* CF3158 80240588 8E470010 */ lw $a3, 0x10($s2) -/* CF315C 8024058C 0C01242D */ jal func_800490B4 -/* CF3160 80240590 0220282D */ daddu $a1, $s1, $zero -/* CF3164 80240594 10400025 */ beqz $v0, .L8024062C -/* CF3168 80240598 0000202D */ daddu $a0, $zero, $zero -/* CF316C 8024059C 0200282D */ daddu $a1, $s0, $zero -/* CF3170 802405A0 0000302D */ daddu $a2, $zero, $zero -/* CF3174 802405A4 2412000C */ addiu $s2, $zero, 0xc -/* CF3178 802405A8 860300A8 */ lh $v1, 0xa8($s0) -/* CF317C 802405AC 3C013F80 */ lui $at, 0x3f80 -/* CF3180 802405B0 44810000 */ mtc1 $at, $f0 -/* CF3184 802405B4 3C014000 */ lui $at, 0x4000 -/* CF3188 802405B8 44811000 */ mtc1 $at, $f2 -/* CF318C 802405BC 3C01C1A0 */ lui $at, 0xc1a0 -/* CF3190 802405C0 44812000 */ mtc1 $at, $f4 -/* CF3194 802405C4 44834000 */ mtc1 $v1, $f8 -/* CF3198 802405C8 00000000 */ nop -/* CF319C 802405CC 46804220 */ cvt.s.w $f8, $f8 -/* CF31A0 802405D0 44074000 */ mfc1 $a3, $f8 -/* CF31A4 802405D4 27A20038 */ addiu $v0, $sp, 0x38 -/* CF31A8 802405D8 AFB2001C */ sw $s2, 0x1c($sp) -/* CF31AC 802405DC AFA20020 */ sw $v0, 0x20($sp) -/* CF31B0 802405E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CF31B4 802405E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* CF31B8 802405E8 0C01BFA4 */ jal fx_emote -/* CF31BC 802405EC E7A40018 */ swc1 $f4, 0x18($sp) -/* CF31C0 802405F0 0200202D */ daddu $a0, $s0, $zero -/* CF31C4 802405F4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CF31C8 802405F8 C480003C */ lwc1 $f0, 0x3c($a0) -/* CF31CC 802405FC 3C060020 */ lui $a2, 0x20 -/* CF31D0 80240600 0C012530 */ jal ai_enemy_play_sound -/* CF31D4 80240604 E4800064 */ swc1 $f0, 0x64($a0) -/* CF31D8 80240608 8E220018 */ lw $v0, 0x18($s1) -/* CF31DC 8024060C 9442002A */ lhu $v0, 0x2a($v0) -/* CF31E0 80240610 30420001 */ andi $v0, $v0, 1 -/* CF31E4 80240614 10400003 */ beqz $v0, .L80240624 -/* CF31E8 80240618 2402000A */ addiu $v0, $zero, 0xa -/* CF31EC 8024061C 080901F9 */ j .L802407E4 -/* CF31F0 80240620 AE620070 */ sw $v0, 0x70($s3) -.L80240624: -/* CF31F4 80240624 080901F9 */ j .L802407E4 -/* CF31F8 80240628 AE720070 */ sw $s2, 0x70($s3) -.L8024062C: -/* CF31FC 8024062C 8E620074 */ lw $v0, 0x74($s3) -/* CF3200 80240630 2442FFFF */ addiu $v0, $v0, -1 -.L80240634: -/* CF3204 80240634 08090190 */ j .L80240640 -/* CF3208 80240638 AE620074 */ sw $v0, 0x74($s3) -.L8024063C: -/* CF320C 8024063C AE220090 */ sw $v0, 0x90($s1) -.L80240640: -/* CF3210 80240640 8E2300D0 */ lw $v1, 0xd0($s1) -/* CF3214 80240644 C6000040 */ lwc1 $f0, 0x40($s0) -/* CF3218 80240648 C4620000 */ lwc1 $f2, ($v1) -/* CF321C 8024064C 468010A0 */ cvt.s.w $f2, $f2 -/* CF3220 80240650 C4640008 */ lwc1 $f4, 8($v1) -/* CF3224 80240654 46802120 */ cvt.s.w $f4, $f4 -/* CF3228 80240658 E7A00010 */ swc1 $f0, 0x10($sp) -/* CF322C 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF3230 80240660 44051000 */ mfc1 $a1, $f2 -/* CF3234 80240664 C440000C */ lwc1 $f0, 0xc($v0) -/* CF3238 80240668 46800020 */ cvt.s.w $f0, $f0 -/* CF323C 8024066C E7A00014 */ swc1 $f0, 0x14($sp) -/* CF3240 80240670 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF3244 80240674 44062000 */ mfc1 $a2, $f4 -/* CF3248 80240678 C4400010 */ lwc1 $f0, 0x10($v0) -/* CF324C 8024067C 46800020 */ cvt.s.w $f0, $f0 -/* CF3250 80240680 E7A00018 */ swc1 $f0, 0x18($sp) -/* CF3254 80240684 8C640018 */ lw $a0, 0x18($v1) -/* CF3258 80240688 0C0123F5 */ jal is_point_within_region -/* CF325C 8024068C 8E070038 */ lw $a3, 0x38($s0) -/* CF3260 80240690 1040001A */ beqz $v0, .L802406FC -/* CF3264 80240694 00000000 */ nop -/* CF3268 80240698 8E060038 */ lw $a2, 0x38($s0) -/* CF326C 8024069C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF3270 802406A0 8E070040 */ lw $a3, 0x40($s0) -/* CF3274 802406A4 C44C0000 */ lwc1 $f12, ($v0) -/* CF3278 802406A8 46806320 */ cvt.s.w $f12, $f12 -/* CF327C 802406AC C44E0008 */ lwc1 $f14, 8($v0) -/* CF3280 802406B0 0C00A7B5 */ jal dist2D -/* CF3284 802406B4 468073A0 */ cvt.s.w $f14, $f14 -/* CF3288 802406B8 C6020018 */ lwc1 $f2, 0x18($s0) -/* CF328C 802406BC 4600103C */ c.lt.s $f2, $f0 -/* CF3290 802406C0 00000000 */ nop -/* CF3294 802406C4 4500000D */ bc1f .L802406FC -/* CF3298 802406C8 E7A00034 */ swc1 $f0, 0x34($sp) -/* CF329C 802406CC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CF32A0 802406D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF32A4 802406D4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CF32A8 802406D8 C4480000 */ lwc1 $f8, ($v0) -/* CF32AC 802406DC 46804220 */ cvt.s.w $f8, $f8 -/* CF32B0 802406E0 44064000 */ mfc1 $a2, $f8 -/* CF32B4 802406E4 C4480008 */ lwc1 $f8, 8($v0) -/* CF32B8 802406E8 46804220 */ cvt.s.w $f8, $f8 -/* CF32BC 802406EC 44074000 */ mfc1 $a3, $f8 -/* CF32C0 802406F0 0C00A720 */ jal atan2 -/* CF32C4 802406F4 24140001 */ addiu $s4, $zero, 1 -/* CF32C8 802406F8 E600000C */ swc1 $f0, 0xc($s0) -.L802406FC: -/* CF32CC 802406FC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF32D0 80240700 8C43000C */ lw $v1, 0xc($v0) -/* CF32D4 80240704 8C420010 */ lw $v0, 0x10($v0) -/* CF32D8 80240708 00621825 */ or $v1, $v1, $v0 -/* CF32DC 8024070C 00741825 */ or $v1, $v1, $s4 -/* CF32E0 80240710 10600008 */ beqz $v1, .L80240734 -/* CF32E4 80240714 00000000 */ nop -/* CF32E8 80240718 8602008C */ lh $v0, 0x8c($s0) -/* CF32EC 8024071C 14400031 */ bnez $v0, .L802407E4 -/* CF32F0 80240720 00000000 */ nop -/* CF32F4 80240724 8E050018 */ lw $a1, 0x18($s0) -/* CF32F8 80240728 8E06000C */ lw $a2, 0xc($s0) -/* CF32FC 8024072C 0C00EA95 */ jal npc_move_heading -/* CF3300 80240730 0200202D */ daddu $a0, $s0, $zero -.L80240734: -/* CF3304 80240734 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF3308 80240738 3C014059 */ lui $at, 0x4059 -/* CF330C 8024073C 44811800 */ mtc1 $at, $f3 -/* CF3310 80240740 44801000 */ mtc1 $zero, $f2 -/* CF3314 80240744 46000021 */ cvt.d.s $f0, $f0 -/* CF3318 80240748 46220002 */ mul.d $f0, $f0, $f2 -/* CF331C 8024074C 00000000 */ nop -/* CF3320 80240750 4620020D */ trunc.w.d $f8, $f0 -/* CF3324 80240754 E628007C */ swc1 $f8, 0x7c($s1) -/* CF3328 80240758 8E420004 */ lw $v0, 4($s2) -/* CF332C 8024075C 18400021 */ blez $v0, .L802407E4 -/* CF3330 80240760 00000000 */ nop -/* CF3334 80240764 8602008E */ lh $v0, 0x8e($s0) -/* CF3338 80240768 9603008E */ lhu $v1, 0x8e($s0) -/* CF333C 8024076C 18400005 */ blez $v0, .L80240784 -/* CF3340 80240770 2462FFFF */ addiu $v0, $v1, -1 -/* CF3344 80240774 A602008E */ sh $v0, 0x8e($s0) -/* CF3348 80240778 00021400 */ sll $v0, $v0, 0x10 -/* CF334C 8024077C 1C400019 */ bgtz $v0, .L802407E4 -/* CF3350 80240780 00000000 */ nop -.L80240784: -/* CF3354 80240784 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CF3358 80240788 24020002 */ addiu $v0, $zero, 2 -/* CF335C 8024078C 0C00A67F */ jal rand_int -/* CF3360 80240790 AE620070 */ sw $v0, 0x70($s3) -/* CF3364 80240794 3C035555 */ lui $v1, 0x5555 -/* CF3368 80240798 34635556 */ ori $v1, $v1, 0x5556 -/* CF336C 8024079C 00430018 */ mult $v0, $v1 -/* CF3370 802407A0 000227C3 */ sra $a0, $v0, 0x1f -/* CF3374 802407A4 00004010 */ mfhi $t0 -/* CF3378 802407A8 01042023 */ subu $a0, $t0, $a0 -/* CF337C 802407AC 00041840 */ sll $v1, $a0, 1 -/* CF3380 802407B0 00641821 */ addu $v1, $v1, $a0 -/* CF3384 802407B4 00431023 */ subu $v0, $v0, $v1 -/* CF3388 802407B8 24430002 */ addiu $v1, $v0, 2 -/* CF338C 802407BC AE630074 */ sw $v1, 0x74($s3) -/* CF3390 802407C0 8E42002C */ lw $v0, 0x2c($s2) -/* CF3394 802407C4 58400007 */ blezl $v0, .L802407E4 -/* CF3398 802407C8 AE600070 */ sw $zero, 0x70($s3) -/* CF339C 802407CC 8E420008 */ lw $v0, 8($s2) -/* CF33A0 802407D0 18400003 */ blez $v0, .L802407E0 -/* CF33A4 802407D4 28620003 */ slti $v0, $v1, 3 -/* CF33A8 802407D8 10400002 */ beqz $v0, .L802407E4 -/* CF33AC 802407DC 00000000 */ nop -.L802407E0: -/* CF33B0 802407E0 AE600070 */ sw $zero, 0x70($s3) -.L802407E4: -/* CF33B4 802407E4 8FBF0058 */ lw $ra, 0x58($sp) -/* CF33B8 802407E8 8FB50054 */ lw $s5, 0x54($sp) -/* CF33BC 802407EC 8FB40050 */ lw $s4, 0x50($sp) -/* CF33C0 802407F0 8FB3004C */ lw $s3, 0x4c($sp) -/* CF33C4 802407F4 8FB20048 */ lw $s2, 0x48($sp) -/* CF33C8 802407F8 8FB10044 */ lw $s1, 0x44($sp) -/* CF33CC 802407FC 8FB00040 */ lw $s0, 0x40($sp) -/* CF33D0 80240800 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CF33D4 80240804 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CF33D8 80240808 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CF33DC 8024080C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CF33E0 80240810 03E00008 */ jr $ra -/* CF33E4 80240814 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s deleted file mode 100644 index e29348dc6f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244E28_A1B048 -.double 0.09 - -dlabel D_80244E30_A1B050 -.double 0.09 - -.section .text - -glabel func_802411A0_A173C0 -/* A173C0 802411A0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* A173C4 802411A4 AFB3004C */ sw $s3, 0x4c($sp) -/* A173C8 802411A8 0080982D */ daddu $s3, $a0, $zero -/* A173CC 802411AC AFBF0058 */ sw $ra, 0x58($sp) -/* A173D0 802411B0 AFB50054 */ sw $s5, 0x54($sp) -/* A173D4 802411B4 AFB40050 */ sw $s4, 0x50($sp) -/* A173D8 802411B8 AFB20048 */ sw $s2, 0x48($sp) -/* A173DC 802411BC AFB10044 */ sw $s1, 0x44($sp) -/* A173E0 802411C0 AFB00040 */ sw $s0, 0x40($sp) -/* A173E4 802411C4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* A173E8 802411C8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* A173EC 802411CC F7B60068 */ sdc1 $f22, 0x68($sp) -/* A173F0 802411D0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* A173F4 802411D4 8E710148 */ lw $s1, 0x148($s3) -/* A173F8 802411D8 00A0902D */ daddu $s2, $a1, $zero -/* A173FC 802411DC 86240008 */ lh $a0, 8($s1) -/* A17400 802411E0 0C00EABB */ jal get_npc_unsafe -/* A17404 802411E4 00C0A82D */ daddu $s5, $a2, $zero -/* A17408 802411E8 0040802D */ daddu $s0, $v0, $zero -/* A1740C 802411EC 0000A02D */ daddu $s4, $zero, $zero -/* A17410 802411F0 C624007C */ lwc1 $f4, 0x7c($s1) -/* A17414 802411F4 46802120 */ cvt.s.w $f4, $f4 -/* A17418 802411F8 C6220088 */ lwc1 $f2, 0x88($s1) -/* A1741C 802411FC 468010A0 */ cvt.s.w $f2, $f2 -/* A17420 80241200 460010A1 */ cvt.d.s $f2, $f2 -/* A17424 80241204 46002121 */ cvt.d.s $f4, $f4 -/* A17428 80241208 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1742C 8024120C 3C014059 */ lui $at, 0x4059 -/* A17430 80241210 44813800 */ mtc1 $at, $f7 -/* A17434 80241214 44803000 */ mtc1 $zero, $f6 -/* A17438 80241218 46000021 */ cvt.d.s $f0, $f0 -/* A1743C 8024121C 46260002 */ mul.d $f0, $f0, $f6 -/* A17440 80241220 00000000 */ nop -/* A17444 80241224 24020001 */ addiu $v0, $zero, 1 -/* A17448 80241228 8E24006C */ lw $a0, 0x6c($s1) -/* A1744C 8024122C 46261083 */ div.d $f2, $f2, $f6 -/* A17450 80241230 462010A0 */ cvt.s.d $f2, $f2 -/* A17454 80241234 46262103 */ div.d $f4, $f4, $f6 -/* A17458 80241238 46202520 */ cvt.s.d $f20, $f4 -/* A1745C 8024123C 30830011 */ andi $v1, $a0, 0x11 -/* A17460 80241240 4620020D */ trunc.w.d $f8, $f0 -/* A17464 80241244 E628007C */ swc1 $f8, 0x7c($s1) -/* A17468 80241248 C6200078 */ lwc1 $f0, 0x78($s1) -/* A1746C 8024124C 46800020 */ cvt.s.w $f0, $f0 -/* A17470 80241250 46000021 */ cvt.d.s $f0, $f0 -/* A17474 80241254 46260003 */ div.d $f0, $f0, $f6 -/* A17478 80241258 462006A0 */ cvt.s.d $f26, $f0 -/* A1747C 8024125C C6200070 */ lwc1 $f0, 0x70($s1) -/* A17480 80241260 46800020 */ cvt.s.w $f0, $f0 -/* A17484 80241264 46000021 */ cvt.d.s $f0, $f0 -/* A17488 80241268 46260003 */ div.d $f0, $f0, $f6 -/* A1748C 8024126C 462005A0 */ cvt.s.d $f22, $f0 -/* A17490 80241270 14620025 */ bne $v1, $v0, .L80241308 -/* A17494 80241274 4602D600 */ add.s $f24, $f26, $f2 -/* A17498 80241278 8E020000 */ lw $v0, ($s0) -/* A1749C 8024127C 30420008 */ andi $v0, $v0, 8 -/* A174A0 80241280 10400009 */ beqz $v0, .L802412A8 -/* A174A4 80241284 27A50028 */ addiu $a1, $sp, 0x28 -/* A174A8 80241288 C600003C */ lwc1 $f0, 0x3c($s0) -/* A174AC 8024128C 4600C001 */ sub.s $f0, $f24, $f0 -/* A174B0 80241290 4600B03C */ c.lt.s $f22, $f0 -/* A174B4 80241294 00000000 */ nop -/* A174B8 80241298 4500001B */ bc1f .L80241308 -/* A174BC 8024129C 34820010 */ ori $v0, $a0, 0x10 -/* A174C0 802412A0 080904C2 */ j .L80241308 -/* A174C4 802412A4 AE22006C */ sw $v0, 0x6c($s1) -.L802412A8: -/* A174C8 802412A8 27A6002C */ addiu $a2, $sp, 0x2c -/* A174CC 802412AC C6000038 */ lwc1 $f0, 0x38($s0) -/* A174D0 802412B0 C602003C */ lwc1 $f2, 0x3c($s0) -/* A174D4 802412B4 C6040040 */ lwc1 $f4, 0x40($s0) -/* A174D8 802412B8 3C01447A */ lui $at, 0x447a -/* A174DC 802412BC 44813000 */ mtc1 $at, $f6 -/* A174E0 802412C0 27A20034 */ addiu $v0, $sp, 0x34 -/* A174E4 802412C4 E7A00028 */ swc1 $f0, 0x28($sp) -/* A174E8 802412C8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A174EC 802412CC E7A40030 */ swc1 $f4, 0x30($sp) -/* A174F0 802412D0 E7A60034 */ swc1 $f6, 0x34($sp) -/* A174F4 802412D4 AFA20010 */ sw $v0, 0x10($sp) -/* A174F8 802412D8 8E040080 */ lw $a0, 0x80($s0) -/* A174FC 802412DC 0C0372DF */ jal npc_raycast_down_sides -/* A17500 802412E0 27A70030 */ addiu $a3, $sp, 0x30 -/* A17504 802412E4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* A17508 802412E8 4600D001 */ sub.s $f0, $f26, $f0 -/* A1750C 802412EC 4600B03C */ c.lt.s $f22, $f0 -/* A17510 802412F0 00000000 */ nop -/* A17514 802412F4 45000004 */ bc1f .L80241308 -/* A17518 802412F8 00000000 */ nop -/* A1751C 802412FC 8E22006C */ lw $v0, 0x6c($s1) -/* A17520 80241300 34420010 */ ori $v0, $v0, 0x10 -/* A17524 80241304 AE22006C */ sw $v0, 0x6c($s1) -.L80241308: -/* A17528 80241308 8E22006C */ lw $v0, 0x6c($s1) -/* A1752C 8024130C 24030011 */ addiu $v1, $zero, 0x11 -/* A17530 80241310 30420011 */ andi $v0, $v0, 0x11 -/* A17534 80241314 14430039 */ bne $v0, $v1, .L802413FC -/* A17538 80241318 00000000 */ nop -/* A1753C 8024131C 8E020000 */ lw $v0, ($s0) -/* A17540 80241320 30420008 */ andi $v0, $v0, 8 -/* A17544 80241324 1040000A */ beqz $v0, .L80241350 -/* A17548 80241328 4600C106 */ mov.s $f4, $f24 -/* A1754C 8024132C 4614C081 */ sub.s $f2, $f24, $f20 -/* A17550 80241330 3C018024 */ lui $at, %hi(D_80244E28_A1B048) -/* A17554 80241334 D4204E28 */ ldc1 $f0, %lo(D_80244E28_A1B048)($at) -/* A17558 80241338 460010A1 */ cvt.d.s $f2, $f2 -/* A1755C 8024133C 46201082 */ mul.d $f2, $f2, $f0 -/* A17560 80241340 00000000 */ nop -/* A17564 80241344 4600A021 */ cvt.d.s $f0, $f20 -/* A17568 80241348 080904ED */ j .L802413B4 -/* A1756C 8024134C 46220000 */ add.d $f0, $f0, $f2 -.L80241350: -/* A17570 80241350 27A50028 */ addiu $a1, $sp, 0x28 -/* A17574 80241354 27A6002C */ addiu $a2, $sp, 0x2c -/* A17578 80241358 C6000038 */ lwc1 $f0, 0x38($s0) -/* A1757C 8024135C C6020040 */ lwc1 $f2, 0x40($s0) -/* A17580 80241360 3C01447A */ lui $at, 0x447a -/* A17584 80241364 44812000 */ mtc1 $at, $f4 -/* A17588 80241368 27A20034 */ addiu $v0, $sp, 0x34 -/* A1758C 8024136C E7B4002C */ swc1 $f20, 0x2c($sp) -/* A17590 80241370 E7A00028 */ swc1 $f0, 0x28($sp) -/* A17594 80241374 E7A20030 */ swc1 $f2, 0x30($sp) -/* A17598 80241378 E7A40034 */ swc1 $f4, 0x34($sp) -/* A1759C 8024137C AFA20010 */ sw $v0, 0x10($sp) -/* A175A0 80241380 8E040080 */ lw $a0, 0x80($s0) -/* A175A4 80241384 0C0372DF */ jal npc_raycast_down_sides -/* A175A8 80241388 27A70030 */ addiu $a3, $sp, 0x30 -/* A175AC 8024138C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* A175B0 80241390 461A2100 */ add.s $f4, $f4, $f26 -/* A175B4 80241394 46142081 */ sub.s $f2, $f4, $f20 -/* A175B8 80241398 3C018024 */ lui $at, %hi(D_80244E30_A1B050) -/* A175BC 8024139C D4204E30 */ ldc1 $f0, %lo(D_80244E30_A1B050)($at) -/* A175C0 802413A0 460010A1 */ cvt.d.s $f2, $f2 -/* A175C4 802413A4 46201082 */ mul.d $f2, $f2, $f0 -/* A175C8 802413A8 00000000 */ nop -/* A175CC 802413AC 4600A021 */ cvt.d.s $f0, $f20 -/* A175D0 802413B0 46220000 */ add.d $f0, $f0, $f2 -.L802413B4: -/* A175D4 802413B4 46200020 */ cvt.s.d $f0, $f0 -/* A175D8 802413B8 E600003C */ swc1 $f0, 0x3c($s0) -/* A175DC 802413BC C600003C */ lwc1 $f0, 0x3c($s0) -/* A175E0 802413C0 46002001 */ sub.s $f0, $f4, $f0 -/* A175E4 802413C4 3C013FF0 */ lui $at, 0x3ff0 -/* A175E8 802413C8 44811800 */ mtc1 $at, $f3 -/* A175EC 802413CC 44801000 */ mtc1 $zero, $f2 -/* A175F0 802413D0 46000005 */ abs.s $f0, $f0 -/* A175F4 802413D4 46000021 */ cvt.d.s $f0, $f0 -/* A175F8 802413D8 4622003C */ c.lt.d $f0, $f2 -/* A175FC 802413DC 00000000 */ nop -/* A17600 802413E0 45000036 */ bc1f .L802414BC -/* A17604 802413E4 2403FFEF */ addiu $v1, $zero, -0x11 -/* A17608 802413E8 E604003C */ swc1 $f4, 0x3c($s0) -/* A1760C 802413EC 8E22006C */ lw $v0, 0x6c($s1) -/* A17610 802413F0 00431024 */ and $v0, $v0, $v1 -/* A17614 802413F4 0809052F */ j .L802414BC -/* A17618 802413F8 AE22006C */ sw $v0, 0x6c($s1) -.L802413FC: -/* A1761C 802413FC 8E220070 */ lw $v0, 0x70($s1) -/* A17620 80241400 1840002E */ blez $v0, .L802414BC -/* A17624 80241404 00000000 */ nop -/* A17628 80241408 C62C0074 */ lwc1 $f12, 0x74($s1) -/* A1762C 8024140C 0C00A8BB */ jal sin_deg -/* A17630 80241410 46806320 */ cvt.s.w $f12, $f12 -/* A17634 80241414 8E020000 */ lw $v0, ($s0) -/* A17638 80241418 30420008 */ andi $v0, $v0, 8 -/* A1763C 8024141C 10400003 */ beqz $v0, .L8024142C -/* A17640 80241420 46000506 */ mov.s $f20, $f0 -/* A17644 80241424 0809051B */ j .L8024146C -/* A17648 80241428 0000102D */ daddu $v0, $zero, $zero -.L8024142C: -/* A1764C 8024142C 27A50028 */ addiu $a1, $sp, 0x28 -/* A17650 80241430 27A6002C */ addiu $a2, $sp, 0x2c -/* A17654 80241434 C6000038 */ lwc1 $f0, 0x38($s0) -/* A17658 80241438 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1765C 8024143C C6040040 */ lwc1 $f4, 0x40($s0) -/* A17660 80241440 3C01447A */ lui $at, 0x447a -/* A17664 80241444 44813000 */ mtc1 $at, $f6 -/* A17668 80241448 27A20034 */ addiu $v0, $sp, 0x34 -/* A1766C 8024144C E7A00028 */ swc1 $f0, 0x28($sp) -/* A17670 80241450 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A17674 80241454 E7A40030 */ swc1 $f4, 0x30($sp) -/* A17678 80241458 E7A60034 */ swc1 $f6, 0x34($sp) -/* A1767C 8024145C AFA20010 */ sw $v0, 0x10($sp) -/* A17680 80241460 8E040080 */ lw $a0, 0x80($s0) -/* A17684 80241464 0C0372DF */ jal npc_raycast_down_sides -/* A17688 80241468 27A70030 */ addiu $a3, $sp, 0x30 -.L8024146C: -/* A1768C 8024146C 10400007 */ beqz $v0, .L8024148C -/* A17690 80241470 00000000 */ nop -/* A17694 80241474 4616A082 */ mul.s $f2, $f20, $f22 -/* A17698 80241478 00000000 */ nop -/* A1769C 8024147C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A176A0 80241480 461A0000 */ add.s $f0, $f0, $f26 -/* A176A4 80241484 08090526 */ j .L80241498 -/* A176A8 80241488 46020000 */ add.s $f0, $f0, $f2 -.L8024148C: -/* A176AC 8024148C 4616A002 */ mul.s $f0, $f20, $f22 -/* A176B0 80241490 00000000 */ nop -/* A176B4 80241494 4600C000 */ add.s $f0, $f24, $f0 -.L80241498: -/* A176B8 80241498 E600003C */ swc1 $f0, 0x3c($s0) -/* A176BC 8024149C 8E220074 */ lw $v0, 0x74($s1) -/* A176C0 802414A0 2442000A */ addiu $v0, $v0, 0xa -/* A176C4 802414A4 44826000 */ mtc1 $v0, $f12 -/* A176C8 802414A8 00000000 */ nop -/* A176CC 802414AC 0C00A6C9 */ jal clamp_angle -/* A176D0 802414B0 46806320 */ cvt.s.w $f12, $f12 -/* A176D4 802414B4 4600020D */ trunc.w.s $f8, $f0 -/* A176D8 802414B8 E6280074 */ swc1 $f8, 0x74($s1) -.L802414BC: -/* A176DC 802414BC 8E220090 */ lw $v0, 0x90($s1) -/* A176E0 802414C0 1C40004A */ bgtz $v0, .L802415EC -/* A176E4 802414C4 2442FFFF */ addiu $v0, $v0, -1 -/* A176E8 802414C8 8E430014 */ lw $v1, 0x14($s2) -/* A176EC 802414CC 04600048 */ bltz $v1, .L802415F0 -/* A176F0 802414D0 00000000 */ nop -/* A176F4 802414D4 8E620074 */ lw $v0, 0x74($s3) -/* A176F8 802414D8 1C400042 */ bgtz $v0, .L802415E4 -/* A176FC 802414DC 2442FFFF */ addiu $v0, $v0, -1 -/* A17700 802414E0 AE630074 */ sw $v1, 0x74($s3) -/* A17704 802414E4 860200A8 */ lh $v0, 0xa8($s0) -/* A17708 802414E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1770C 802414EC 44820000 */ mtc1 $v0, $f0 -/* A17710 802414F0 00000000 */ nop -/* A17714 802414F4 46800020 */ cvt.s.w $f0, $f0 -/* A17718 802414F8 46001080 */ add.s $f2, $f2, $f0 -/* A1771C 802414FC 3C014024 */ lui $at, 0x4024 -/* A17720 80241500 44810800 */ mtc1 $at, $f1 -/* A17724 80241504 44800000 */ mtc1 $zero, $f0 -/* A17728 80241508 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A1772C 8024150C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A17730 80241510 460010A1 */ cvt.d.s $f2, $f2 -/* A17734 80241514 46201080 */ add.d $f2, $f2, $f0 -/* A17738 80241518 C440002C */ lwc1 $f0, 0x2c($v0) -/* A1773C 8024151C 46000021 */ cvt.d.s $f0, $f0 -/* A17740 80241520 4622003C */ c.lt.d $f0, $f2 -/* A17744 80241524 00000000 */ nop -/* A17748 80241528 4500002C */ bc1f .L802415DC -/* A1774C 8024152C 02A0202D */ daddu $a0, $s5, $zero -/* A17750 80241530 AFA00010 */ sw $zero, 0x10($sp) -/* A17754 80241534 8E46000C */ lw $a2, 0xc($s2) -/* A17758 80241538 8E470010 */ lw $a3, 0x10($s2) -/* A1775C 8024153C 0C01242D */ jal func_800490B4 -/* A17760 80241540 0220282D */ daddu $a1, $s1, $zero -/* A17764 80241544 10400025 */ beqz $v0, .L802415DC -/* A17768 80241548 0000202D */ daddu $a0, $zero, $zero -/* A1776C 8024154C 0200282D */ daddu $a1, $s0, $zero -/* A17770 80241550 0000302D */ daddu $a2, $zero, $zero -/* A17774 80241554 2412000C */ addiu $s2, $zero, 0xc -/* A17778 80241558 860300A8 */ lh $v1, 0xa8($s0) -/* A1777C 8024155C 3C013F80 */ lui $at, 0x3f80 -/* A17780 80241560 44810000 */ mtc1 $at, $f0 -/* A17784 80241564 3C014000 */ lui $at, 0x4000 -/* A17788 80241568 44811000 */ mtc1 $at, $f2 -/* A1778C 8024156C 3C01C1A0 */ lui $at, 0xc1a0 -/* A17790 80241570 44812000 */ mtc1 $at, $f4 -/* A17794 80241574 44834000 */ mtc1 $v1, $f8 -/* A17798 80241578 00000000 */ nop -/* A1779C 8024157C 46804220 */ cvt.s.w $f8, $f8 -/* A177A0 80241580 44074000 */ mfc1 $a3, $f8 -/* A177A4 80241584 27A20038 */ addiu $v0, $sp, 0x38 -/* A177A8 80241588 AFB2001C */ sw $s2, 0x1c($sp) -/* A177AC 8024158C AFA20020 */ sw $v0, 0x20($sp) -/* A177B0 80241590 E7A00010 */ swc1 $f0, 0x10($sp) -/* A177B4 80241594 E7A20014 */ swc1 $f2, 0x14($sp) -/* A177B8 80241598 0C01BFA4 */ jal fx_emote -/* A177BC 8024159C E7A40018 */ swc1 $f4, 0x18($sp) -/* A177C0 802415A0 0200202D */ daddu $a0, $s0, $zero -/* A177C4 802415A4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A177C8 802415A8 C480003C */ lwc1 $f0, 0x3c($a0) -/* A177CC 802415AC 3C060020 */ lui $a2, 0x20 -/* A177D0 802415B0 0C012530 */ jal ai_enemy_play_sound -/* A177D4 802415B4 E4800064 */ swc1 $f0, 0x64($a0) -/* A177D8 802415B8 8E220018 */ lw $v0, 0x18($s1) -/* A177DC 802415BC 9442002A */ lhu $v0, 0x2a($v0) -/* A177E0 802415C0 30420001 */ andi $v0, $v0, 1 -/* A177E4 802415C4 10400003 */ beqz $v0, .L802415D4 -/* A177E8 802415C8 2402000A */ addiu $v0, $zero, 0xa -/* A177EC 802415CC 080905E5 */ j .L80241794 -/* A177F0 802415D0 AE620070 */ sw $v0, 0x70($s3) -.L802415D4: -/* A177F4 802415D4 080905E5 */ j .L80241794 -/* A177F8 802415D8 AE720070 */ sw $s2, 0x70($s3) -.L802415DC: -/* A177FC 802415DC 8E620074 */ lw $v0, 0x74($s3) -/* A17800 802415E0 2442FFFF */ addiu $v0, $v0, -1 -.L802415E4: -/* A17804 802415E4 0809057C */ j .L802415F0 -/* A17808 802415E8 AE620074 */ sw $v0, 0x74($s3) -.L802415EC: -/* A1780C 802415EC AE220090 */ sw $v0, 0x90($s1) -.L802415F0: -/* A17810 802415F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A17814 802415F4 C6000040 */ lwc1 $f0, 0x40($s0) -/* A17818 802415F8 C4620000 */ lwc1 $f2, ($v1) -/* A1781C 802415FC 468010A0 */ cvt.s.w $f2, $f2 -/* A17820 80241600 C4640008 */ lwc1 $f4, 8($v1) -/* A17824 80241604 46802120 */ cvt.s.w $f4, $f4 -/* A17828 80241608 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1782C 8024160C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A17830 80241610 44051000 */ mfc1 $a1, $f2 -/* A17834 80241614 C440000C */ lwc1 $f0, 0xc($v0) -/* A17838 80241618 46800020 */ cvt.s.w $f0, $f0 -/* A1783C 8024161C E7A00014 */ swc1 $f0, 0x14($sp) -/* A17840 80241620 8E2200D0 */ lw $v0, 0xd0($s1) -/* A17844 80241624 44062000 */ mfc1 $a2, $f4 -/* A17848 80241628 C4400010 */ lwc1 $f0, 0x10($v0) -/* A1784C 8024162C 46800020 */ cvt.s.w $f0, $f0 -/* A17850 80241630 E7A00018 */ swc1 $f0, 0x18($sp) -/* A17854 80241634 8C640018 */ lw $a0, 0x18($v1) -/* A17858 80241638 0C0123F5 */ jal is_point_within_region -/* A1785C 8024163C 8E070038 */ lw $a3, 0x38($s0) -/* A17860 80241640 1040001A */ beqz $v0, .L802416AC -/* A17864 80241644 00000000 */ nop -/* A17868 80241648 8E060038 */ lw $a2, 0x38($s0) -/* A1786C 8024164C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A17870 80241650 8E070040 */ lw $a3, 0x40($s0) -/* A17874 80241654 C44C0000 */ lwc1 $f12, ($v0) -/* A17878 80241658 46806320 */ cvt.s.w $f12, $f12 -/* A1787C 8024165C C44E0008 */ lwc1 $f14, 8($v0) -/* A17880 80241660 0C00A7B5 */ jal dist2D -/* A17884 80241664 468073A0 */ cvt.s.w $f14, $f14 -/* A17888 80241668 C6020018 */ lwc1 $f2, 0x18($s0) -/* A1788C 8024166C 4600103C */ c.lt.s $f2, $f0 -/* A17890 80241670 00000000 */ nop -/* A17894 80241674 4500000D */ bc1f .L802416AC -/* A17898 80241678 E7A00034 */ swc1 $f0, 0x34($sp) -/* A1789C 8024167C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A178A0 80241680 8E2200D0 */ lw $v0, 0xd0($s1) -/* A178A4 80241684 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A178A8 80241688 C4480000 */ lwc1 $f8, ($v0) -/* A178AC 8024168C 46804220 */ cvt.s.w $f8, $f8 -/* A178B0 80241690 44064000 */ mfc1 $a2, $f8 -/* A178B4 80241694 C4480008 */ lwc1 $f8, 8($v0) -/* A178B8 80241698 46804220 */ cvt.s.w $f8, $f8 -/* A178BC 8024169C 44074000 */ mfc1 $a3, $f8 -/* A178C0 802416A0 0C00A720 */ jal atan2 -/* A178C4 802416A4 24140001 */ addiu $s4, $zero, 1 -/* A178C8 802416A8 E600000C */ swc1 $f0, 0xc($s0) -.L802416AC: -/* A178CC 802416AC 8E2200D0 */ lw $v0, 0xd0($s1) -/* A178D0 802416B0 8C43000C */ lw $v1, 0xc($v0) -/* A178D4 802416B4 8C420010 */ lw $v0, 0x10($v0) -/* A178D8 802416B8 00621825 */ or $v1, $v1, $v0 -/* A178DC 802416BC 00741825 */ or $v1, $v1, $s4 -/* A178E0 802416C0 10600008 */ beqz $v1, .L802416E4 -/* A178E4 802416C4 00000000 */ nop -/* A178E8 802416C8 8602008C */ lh $v0, 0x8c($s0) -/* A178EC 802416CC 14400031 */ bnez $v0, .L80241794 -/* A178F0 802416D0 00000000 */ nop -/* A178F4 802416D4 8E050018 */ lw $a1, 0x18($s0) -/* A178F8 802416D8 8E06000C */ lw $a2, 0xc($s0) -/* A178FC 802416DC 0C00EA95 */ jal npc_move_heading -/* A17900 802416E0 0200202D */ daddu $a0, $s0, $zero -.L802416E4: -/* A17904 802416E4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A17908 802416E8 3C014059 */ lui $at, 0x4059 -/* A1790C 802416EC 44811800 */ mtc1 $at, $f3 -/* A17910 802416F0 44801000 */ mtc1 $zero, $f2 -/* A17914 802416F4 46000021 */ cvt.d.s $f0, $f0 -/* A17918 802416F8 46220002 */ mul.d $f0, $f0, $f2 -/* A1791C 802416FC 00000000 */ nop -/* A17920 80241700 4620020D */ trunc.w.d $f8, $f0 -/* A17924 80241704 E628007C */ swc1 $f8, 0x7c($s1) -/* A17928 80241708 8E420004 */ lw $v0, 4($s2) -/* A1792C 8024170C 18400021 */ blez $v0, .L80241794 -/* A17930 80241710 00000000 */ nop -/* A17934 80241714 8602008E */ lh $v0, 0x8e($s0) -/* A17938 80241718 9603008E */ lhu $v1, 0x8e($s0) -/* A1793C 8024171C 18400005 */ blez $v0, .L80241734 -/* A17940 80241720 2462FFFF */ addiu $v0, $v1, -1 -/* A17944 80241724 A602008E */ sh $v0, 0x8e($s0) -/* A17948 80241728 00021400 */ sll $v0, $v0, 0x10 -/* A1794C 8024172C 1C400019 */ bgtz $v0, .L80241794 -/* A17950 80241730 00000000 */ nop -.L80241734: -/* A17954 80241734 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A17958 80241738 24020002 */ addiu $v0, $zero, 2 -/* A1795C 8024173C 0C00A67F */ jal rand_int -/* A17960 80241740 AE620070 */ sw $v0, 0x70($s3) -/* A17964 80241744 3C035555 */ lui $v1, 0x5555 -/* A17968 80241748 34635556 */ ori $v1, $v1, 0x5556 -/* A1796C 8024174C 00430018 */ mult $v0, $v1 -/* A17970 80241750 000227C3 */ sra $a0, $v0, 0x1f -/* A17974 80241754 00004010 */ mfhi $t0 -/* A17978 80241758 01042023 */ subu $a0, $t0, $a0 -/* A1797C 8024175C 00041840 */ sll $v1, $a0, 1 -/* A17980 80241760 00641821 */ addu $v1, $v1, $a0 -/* A17984 80241764 00431023 */ subu $v0, $v0, $v1 -/* A17988 80241768 24430002 */ addiu $v1, $v0, 2 -/* A1798C 8024176C AE630074 */ sw $v1, 0x74($s3) -/* A17990 80241770 8E42002C */ lw $v0, 0x2c($s2) -/* A17994 80241774 58400007 */ blezl $v0, .L80241794 -/* A17998 80241778 AE600070 */ sw $zero, 0x70($s3) -/* A1799C 8024177C 8E420008 */ lw $v0, 8($s2) -/* A179A0 80241780 18400003 */ blez $v0, .L80241790 -/* A179A4 80241784 28620003 */ slti $v0, $v1, 3 -/* A179A8 80241788 10400002 */ beqz $v0, .L80241794 -/* A179AC 8024178C 00000000 */ nop -.L80241790: -/* A179B0 80241790 AE600070 */ sw $zero, 0x70($s3) -.L80241794: -/* A179B4 80241794 8FBF0058 */ lw $ra, 0x58($sp) -/* A179B8 80241798 8FB50054 */ lw $s5, 0x54($sp) -/* A179BC 8024179C 8FB40050 */ lw $s4, 0x50($sp) -/* A179C0 802417A0 8FB3004C */ lw $s3, 0x4c($sp) -/* A179C4 802417A4 8FB20048 */ lw $s2, 0x48($sp) -/* A179C8 802417A8 8FB10044 */ lw $s1, 0x44($sp) -/* A179CC 802417AC 8FB00040 */ lw $s0, 0x40($sp) -/* A179D0 802417B0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* A179D4 802417B4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* A179D8 802417B8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* A179DC 802417BC D7B40060 */ ldc1 $f20, 0x60($sp) -/* A179E0 802417C0 03E00008 */ jr $ra -/* A179E4 802417C4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s index 9c009980a0..487d41066e 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s @@ -86,7 +86,7 @@ glabel func_802422FC_A1851C .L80242418_A18638: /* A18638 80242418 0280202D */ daddu $a0, $s4, $zero /* A1863C 8024241C 0200282D */ daddu $a1, $s0, $zero -/* A18640 80242420 0C090468 */ jal func_802411A0_A173C0 +/* A18640 80242420 0C090468 */ jal hos_02_UnkNpcAIFunc35 /* A18644 80242424 0260302D */ daddu $a2, $s3, $zero /* A18648 80242428 08090931 */ j .L802424C4 /* A1864C 8024242C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s index df23b3af6d..bcfb925e00 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s @@ -87,7 +87,7 @@ glabel func_802428F4_A18B14 .L80242A14_A18C34: /* A18C34 80242A14 0280202D */ daddu $a0, $s4, $zero /* A18C38 80242A18 0200282D */ daddu $a1, $s0, $zero -/* A18C3C 80242A1C 0C090468 */ jal func_802411A0_A173C0 +/* A18C3C 80242A1C 0C090468 */ jal hos_02_UnkNpcAIFunc35 /* A18C40 80242A20 0260302D */ daddu $a2, $s3, $zero /* A18C44 80242A24 08090AAE */ j .L80242AB8 /* A18C48 80242A28 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240E60_A1BF60.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240E60_A1BF60.s deleted file mode 100644 index b267d4aef1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240E60_A1BF60.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8024BD78_A26E78 -.double 0.09 - -dlabel D_8024BD80_A26E80 -.double 0.09 - -.section .text - -glabel func_80240E60_A1BF60 -/* A1BF60 80240E60 27BDFF80 */ addiu $sp, $sp, -0x80 -/* A1BF64 80240E64 AFB3004C */ sw $s3, 0x4c($sp) -/* A1BF68 80240E68 0080982D */ daddu $s3, $a0, $zero -/* A1BF6C 80240E6C AFBF0058 */ sw $ra, 0x58($sp) -/* A1BF70 80240E70 AFB50054 */ sw $s5, 0x54($sp) -/* A1BF74 80240E74 AFB40050 */ sw $s4, 0x50($sp) -/* A1BF78 80240E78 AFB20048 */ sw $s2, 0x48($sp) -/* A1BF7C 80240E7C AFB10044 */ sw $s1, 0x44($sp) -/* A1BF80 80240E80 AFB00040 */ sw $s0, 0x40($sp) -/* A1BF84 80240E84 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* A1BF88 80240E88 F7B80070 */ sdc1 $f24, 0x70($sp) -/* A1BF8C 80240E8C F7B60068 */ sdc1 $f22, 0x68($sp) -/* A1BF90 80240E90 F7B40060 */ sdc1 $f20, 0x60($sp) -/* A1BF94 80240E94 8E710148 */ lw $s1, 0x148($s3) -/* A1BF98 80240E98 00A0902D */ daddu $s2, $a1, $zero -/* A1BF9C 80240E9C 86240008 */ lh $a0, 8($s1) -/* A1BFA0 80240EA0 0C00EABB */ jal get_npc_unsafe -/* A1BFA4 80240EA4 00C0A82D */ daddu $s5, $a2, $zero -/* A1BFA8 80240EA8 0040802D */ daddu $s0, $v0, $zero -/* A1BFAC 80240EAC 0000A02D */ daddu $s4, $zero, $zero -/* A1BFB0 80240EB0 C624007C */ lwc1 $f4, 0x7c($s1) -/* A1BFB4 80240EB4 46802120 */ cvt.s.w $f4, $f4 -/* A1BFB8 80240EB8 C6220088 */ lwc1 $f2, 0x88($s1) -/* A1BFBC 80240EBC 468010A0 */ cvt.s.w $f2, $f2 -/* A1BFC0 80240EC0 460010A1 */ cvt.d.s $f2, $f2 -/* A1BFC4 80240EC4 46002121 */ cvt.d.s $f4, $f4 -/* A1BFC8 80240EC8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1BFCC 80240ECC 3C014059 */ lui $at, 0x4059 -/* A1BFD0 80240ED0 44813800 */ mtc1 $at, $f7 -/* A1BFD4 80240ED4 44803000 */ mtc1 $zero, $f6 -/* A1BFD8 80240ED8 46000021 */ cvt.d.s $f0, $f0 -/* A1BFDC 80240EDC 46260002 */ mul.d $f0, $f0, $f6 -/* A1BFE0 80240EE0 00000000 */ nop -/* A1BFE4 80240EE4 24020001 */ addiu $v0, $zero, 1 -/* A1BFE8 80240EE8 8E24006C */ lw $a0, 0x6c($s1) -/* A1BFEC 80240EEC 46261083 */ div.d $f2, $f2, $f6 -/* A1BFF0 80240EF0 462010A0 */ cvt.s.d $f2, $f2 -/* A1BFF4 80240EF4 46262103 */ div.d $f4, $f4, $f6 -/* A1BFF8 80240EF8 46202520 */ cvt.s.d $f20, $f4 -/* A1BFFC 80240EFC 30830011 */ andi $v1, $a0, 0x11 -/* A1C000 80240F00 4620020D */ trunc.w.d $f8, $f0 -/* A1C004 80240F04 E628007C */ swc1 $f8, 0x7c($s1) -/* A1C008 80240F08 C6200078 */ lwc1 $f0, 0x78($s1) -/* A1C00C 80240F0C 46800020 */ cvt.s.w $f0, $f0 -/* A1C010 80240F10 46000021 */ cvt.d.s $f0, $f0 -/* A1C014 80240F14 46260003 */ div.d $f0, $f0, $f6 -/* A1C018 80240F18 462006A0 */ cvt.s.d $f26, $f0 -/* A1C01C 80240F1C C6200070 */ lwc1 $f0, 0x70($s1) -/* A1C020 80240F20 46800020 */ cvt.s.w $f0, $f0 -/* A1C024 80240F24 46000021 */ cvt.d.s $f0, $f0 -/* A1C028 80240F28 46260003 */ div.d $f0, $f0, $f6 -/* A1C02C 80240F2C 462005A0 */ cvt.s.d $f22, $f0 -/* A1C030 80240F30 14620025 */ bne $v1, $v0, .L80240FC8 -/* A1C034 80240F34 4602D600 */ add.s $f24, $f26, $f2 -/* A1C038 80240F38 8E020000 */ lw $v0, ($s0) -/* A1C03C 80240F3C 30420008 */ andi $v0, $v0, 8 -/* A1C040 80240F40 10400009 */ beqz $v0, .L80240F68 -/* A1C044 80240F44 27A50028 */ addiu $a1, $sp, 0x28 -/* A1C048 80240F48 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1C04C 80240F4C 4600C001 */ sub.s $f0, $f24, $f0 -/* A1C050 80240F50 4600B03C */ c.lt.s $f22, $f0 -/* A1C054 80240F54 00000000 */ nop -/* A1C058 80240F58 4500001B */ bc1f .L80240FC8 -/* A1C05C 80240F5C 34820010 */ ori $v0, $a0, 0x10 -/* A1C060 80240F60 080903F2 */ j .L80240FC8 -/* A1C064 80240F64 AE22006C */ sw $v0, 0x6c($s1) -.L80240F68: -/* A1C068 80240F68 27A6002C */ addiu $a2, $sp, 0x2c -/* A1C06C 80240F6C C6000038 */ lwc1 $f0, 0x38($s0) -/* A1C070 80240F70 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1C074 80240F74 C6040040 */ lwc1 $f4, 0x40($s0) -/* A1C078 80240F78 3C01447A */ lui $at, 0x447a -/* A1C07C 80240F7C 44813000 */ mtc1 $at, $f6 -/* A1C080 80240F80 27A20034 */ addiu $v0, $sp, 0x34 -/* A1C084 80240F84 E7A00028 */ swc1 $f0, 0x28($sp) -/* A1C088 80240F88 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A1C08C 80240F8C E7A40030 */ swc1 $f4, 0x30($sp) -/* A1C090 80240F90 E7A60034 */ swc1 $f6, 0x34($sp) -/* A1C094 80240F94 AFA20010 */ sw $v0, 0x10($sp) -/* A1C098 80240F98 8E040080 */ lw $a0, 0x80($s0) -/* A1C09C 80240F9C 0C0372DF */ jal npc_raycast_down_sides -/* A1C0A0 80240FA0 27A70030 */ addiu $a3, $sp, 0x30 -/* A1C0A4 80240FA4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* A1C0A8 80240FA8 4600D001 */ sub.s $f0, $f26, $f0 -/* A1C0AC 80240FAC 4600B03C */ c.lt.s $f22, $f0 -/* A1C0B0 80240FB0 00000000 */ nop -/* A1C0B4 80240FB4 45000004 */ bc1f .L80240FC8 -/* A1C0B8 80240FB8 00000000 */ nop -/* A1C0BC 80240FBC 8E22006C */ lw $v0, 0x6c($s1) -/* A1C0C0 80240FC0 34420010 */ ori $v0, $v0, 0x10 -/* A1C0C4 80240FC4 AE22006C */ sw $v0, 0x6c($s1) -.L80240FC8: -/* A1C0C8 80240FC8 8E22006C */ lw $v0, 0x6c($s1) -/* A1C0CC 80240FCC 24030011 */ addiu $v1, $zero, 0x11 -/* A1C0D0 80240FD0 30420011 */ andi $v0, $v0, 0x11 -/* A1C0D4 80240FD4 14430039 */ bne $v0, $v1, .L802410BC -/* A1C0D8 80240FD8 00000000 */ nop -/* A1C0DC 80240FDC 8E020000 */ lw $v0, ($s0) -/* A1C0E0 80240FE0 30420008 */ andi $v0, $v0, 8 -/* A1C0E4 80240FE4 1040000A */ beqz $v0, .L80241010 -/* A1C0E8 80240FE8 4600C106 */ mov.s $f4, $f24 -/* A1C0EC 80240FEC 4614C081 */ sub.s $f2, $f24, $f20 -/* A1C0F0 80240FF0 3C018025 */ lui $at, %hi(D_8024BD78_A26E78) -/* A1C0F4 80240FF4 D420BD78 */ ldc1 $f0, %lo(D_8024BD78_A26E78)($at) -/* A1C0F8 80240FF8 460010A1 */ cvt.d.s $f2, $f2 -/* A1C0FC 80240FFC 46201082 */ mul.d $f2, $f2, $f0 -/* A1C100 80241000 00000000 */ nop -/* A1C104 80241004 4600A021 */ cvt.d.s $f0, $f20 -/* A1C108 80241008 0809041D */ j .L80241074 -/* A1C10C 8024100C 46220000 */ add.d $f0, $f0, $f2 -.L80241010: -/* A1C110 80241010 27A50028 */ addiu $a1, $sp, 0x28 -/* A1C114 80241014 27A6002C */ addiu $a2, $sp, 0x2c -/* A1C118 80241018 C6000038 */ lwc1 $f0, 0x38($s0) -/* A1C11C 8024101C C6020040 */ lwc1 $f2, 0x40($s0) -/* A1C120 80241020 3C01447A */ lui $at, 0x447a -/* A1C124 80241024 44812000 */ mtc1 $at, $f4 -/* A1C128 80241028 27A20034 */ addiu $v0, $sp, 0x34 -/* A1C12C 8024102C E7B4002C */ swc1 $f20, 0x2c($sp) -/* A1C130 80241030 E7A00028 */ swc1 $f0, 0x28($sp) -/* A1C134 80241034 E7A20030 */ swc1 $f2, 0x30($sp) -/* A1C138 80241038 E7A40034 */ swc1 $f4, 0x34($sp) -/* A1C13C 8024103C AFA20010 */ sw $v0, 0x10($sp) -/* A1C140 80241040 8E040080 */ lw $a0, 0x80($s0) -/* A1C144 80241044 0C0372DF */ jal npc_raycast_down_sides -/* A1C148 80241048 27A70030 */ addiu $a3, $sp, 0x30 -/* A1C14C 8024104C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* A1C150 80241050 461A2100 */ add.s $f4, $f4, $f26 -/* A1C154 80241054 46142081 */ sub.s $f2, $f4, $f20 -/* A1C158 80241058 3C018025 */ lui $at, %hi(D_8024BD80_A26E80) -/* A1C15C 8024105C D420BD80 */ ldc1 $f0, %lo(D_8024BD80_A26E80)($at) -/* A1C160 80241060 460010A1 */ cvt.d.s $f2, $f2 -/* A1C164 80241064 46201082 */ mul.d $f2, $f2, $f0 -/* A1C168 80241068 00000000 */ nop -/* A1C16C 8024106C 4600A021 */ cvt.d.s $f0, $f20 -/* A1C170 80241070 46220000 */ add.d $f0, $f0, $f2 -.L80241074: -/* A1C174 80241074 46200020 */ cvt.s.d $f0, $f0 -/* A1C178 80241078 E600003C */ swc1 $f0, 0x3c($s0) -/* A1C17C 8024107C C600003C */ lwc1 $f0, 0x3c($s0) -/* A1C180 80241080 46002001 */ sub.s $f0, $f4, $f0 -/* A1C184 80241084 3C013FF0 */ lui $at, 0x3ff0 -/* A1C188 80241088 44811800 */ mtc1 $at, $f3 -/* A1C18C 8024108C 44801000 */ mtc1 $zero, $f2 -/* A1C190 80241090 46000005 */ abs.s $f0, $f0 -/* A1C194 80241094 46000021 */ cvt.d.s $f0, $f0 -/* A1C198 80241098 4622003C */ c.lt.d $f0, $f2 -/* A1C19C 8024109C 00000000 */ nop -/* A1C1A0 802410A0 45000036 */ bc1f .L8024117C -/* A1C1A4 802410A4 2403FFEF */ addiu $v1, $zero, -0x11 -/* A1C1A8 802410A8 E604003C */ swc1 $f4, 0x3c($s0) -/* A1C1AC 802410AC 8E22006C */ lw $v0, 0x6c($s1) -/* A1C1B0 802410B0 00431024 */ and $v0, $v0, $v1 -/* A1C1B4 802410B4 0809045F */ j .L8024117C -/* A1C1B8 802410B8 AE22006C */ sw $v0, 0x6c($s1) -.L802410BC: -/* A1C1BC 802410BC 8E220070 */ lw $v0, 0x70($s1) -/* A1C1C0 802410C0 1840002E */ blez $v0, .L8024117C -/* A1C1C4 802410C4 00000000 */ nop -/* A1C1C8 802410C8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* A1C1CC 802410CC 0C00A8BB */ jal sin_deg -/* A1C1D0 802410D0 46806320 */ cvt.s.w $f12, $f12 -/* A1C1D4 802410D4 8E020000 */ lw $v0, ($s0) -/* A1C1D8 802410D8 30420008 */ andi $v0, $v0, 8 -/* A1C1DC 802410DC 10400003 */ beqz $v0, .L802410EC -/* A1C1E0 802410E0 46000506 */ mov.s $f20, $f0 -/* A1C1E4 802410E4 0809044B */ j .L8024112C -/* A1C1E8 802410E8 0000102D */ daddu $v0, $zero, $zero -.L802410EC: -/* A1C1EC 802410EC 27A50028 */ addiu $a1, $sp, 0x28 -/* A1C1F0 802410F0 27A6002C */ addiu $a2, $sp, 0x2c -/* A1C1F4 802410F4 C6000038 */ lwc1 $f0, 0x38($s0) -/* A1C1F8 802410F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1C1FC 802410FC C6040040 */ lwc1 $f4, 0x40($s0) -/* A1C200 80241100 3C01447A */ lui $at, 0x447a -/* A1C204 80241104 44813000 */ mtc1 $at, $f6 -/* A1C208 80241108 27A20034 */ addiu $v0, $sp, 0x34 -/* A1C20C 8024110C E7A00028 */ swc1 $f0, 0x28($sp) -/* A1C210 80241110 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A1C214 80241114 E7A40030 */ swc1 $f4, 0x30($sp) -/* A1C218 80241118 E7A60034 */ swc1 $f6, 0x34($sp) -/* A1C21C 8024111C AFA20010 */ sw $v0, 0x10($sp) -/* A1C220 80241120 8E040080 */ lw $a0, 0x80($s0) -/* A1C224 80241124 0C0372DF */ jal npc_raycast_down_sides -/* A1C228 80241128 27A70030 */ addiu $a3, $sp, 0x30 -.L8024112C: -/* A1C22C 8024112C 10400007 */ beqz $v0, .L8024114C -/* A1C230 80241130 00000000 */ nop -/* A1C234 80241134 4616A082 */ mul.s $f2, $f20, $f22 -/* A1C238 80241138 00000000 */ nop -/* A1C23C 8024113C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A1C240 80241140 461A0000 */ add.s $f0, $f0, $f26 -/* A1C244 80241144 08090456 */ j .L80241158 -/* A1C248 80241148 46020000 */ add.s $f0, $f0, $f2 -.L8024114C: -/* A1C24C 8024114C 4616A002 */ mul.s $f0, $f20, $f22 -/* A1C250 80241150 00000000 */ nop -/* A1C254 80241154 4600C000 */ add.s $f0, $f24, $f0 -.L80241158: -/* A1C258 80241158 E600003C */ swc1 $f0, 0x3c($s0) -/* A1C25C 8024115C 8E220074 */ lw $v0, 0x74($s1) -/* A1C260 80241160 2442000A */ addiu $v0, $v0, 0xa -/* A1C264 80241164 44826000 */ mtc1 $v0, $f12 -/* A1C268 80241168 00000000 */ nop -/* A1C26C 8024116C 0C00A6C9 */ jal clamp_angle -/* A1C270 80241170 46806320 */ cvt.s.w $f12, $f12 -/* A1C274 80241174 4600020D */ trunc.w.s $f8, $f0 -/* A1C278 80241178 E6280074 */ swc1 $f8, 0x74($s1) -.L8024117C: -/* A1C27C 8024117C 8E220090 */ lw $v0, 0x90($s1) -/* A1C280 80241180 1C40004A */ bgtz $v0, .L802412AC -/* A1C284 80241184 2442FFFF */ addiu $v0, $v0, -1 -/* A1C288 80241188 8E430014 */ lw $v1, 0x14($s2) -/* A1C28C 8024118C 04600048 */ bltz $v1, .L802412B0 -/* A1C290 80241190 00000000 */ nop -/* A1C294 80241194 8E620074 */ lw $v0, 0x74($s3) -/* A1C298 80241198 1C400042 */ bgtz $v0, .L802412A4 -/* A1C29C 8024119C 2442FFFF */ addiu $v0, $v0, -1 -/* A1C2A0 802411A0 AE630074 */ sw $v1, 0x74($s3) -/* A1C2A4 802411A4 860200A8 */ lh $v0, 0xa8($s0) -/* A1C2A8 802411A8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1C2AC 802411AC 44820000 */ mtc1 $v0, $f0 -/* A1C2B0 802411B0 00000000 */ nop -/* A1C2B4 802411B4 46800020 */ cvt.s.w $f0, $f0 -/* A1C2B8 802411B8 46001080 */ add.s $f2, $f2, $f0 -/* A1C2BC 802411BC 3C014024 */ lui $at, 0x4024 -/* A1C2C0 802411C0 44810800 */ mtc1 $at, $f1 -/* A1C2C4 802411C4 44800000 */ mtc1 $zero, $f0 -/* A1C2C8 802411C8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A1C2CC 802411CC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A1C2D0 802411D0 460010A1 */ cvt.d.s $f2, $f2 -/* A1C2D4 802411D4 46201080 */ add.d $f2, $f2, $f0 -/* A1C2D8 802411D8 C440002C */ lwc1 $f0, 0x2c($v0) -/* A1C2DC 802411DC 46000021 */ cvt.d.s $f0, $f0 -/* A1C2E0 802411E0 4622003C */ c.lt.d $f0, $f2 -/* A1C2E4 802411E4 00000000 */ nop -/* A1C2E8 802411E8 4500002C */ bc1f .L8024129C -/* A1C2EC 802411EC 02A0202D */ daddu $a0, $s5, $zero -/* A1C2F0 802411F0 AFA00010 */ sw $zero, 0x10($sp) -/* A1C2F4 802411F4 8E46000C */ lw $a2, 0xc($s2) -/* A1C2F8 802411F8 8E470010 */ lw $a3, 0x10($s2) -/* A1C2FC 802411FC 0C01242D */ jal func_800490B4 -/* A1C300 80241200 0220282D */ daddu $a1, $s1, $zero -/* A1C304 80241204 10400025 */ beqz $v0, .L8024129C -/* A1C308 80241208 0000202D */ daddu $a0, $zero, $zero -/* A1C30C 8024120C 0200282D */ daddu $a1, $s0, $zero -/* A1C310 80241210 0000302D */ daddu $a2, $zero, $zero -/* A1C314 80241214 2412000C */ addiu $s2, $zero, 0xc -/* A1C318 80241218 860300A8 */ lh $v1, 0xa8($s0) -/* A1C31C 8024121C 3C013F80 */ lui $at, 0x3f80 -/* A1C320 80241220 44810000 */ mtc1 $at, $f0 -/* A1C324 80241224 3C014000 */ lui $at, 0x4000 -/* A1C328 80241228 44811000 */ mtc1 $at, $f2 -/* A1C32C 8024122C 3C01C1A0 */ lui $at, 0xc1a0 -/* A1C330 80241230 44812000 */ mtc1 $at, $f4 -/* A1C334 80241234 44834000 */ mtc1 $v1, $f8 -/* A1C338 80241238 00000000 */ nop -/* A1C33C 8024123C 46804220 */ cvt.s.w $f8, $f8 -/* A1C340 80241240 44074000 */ mfc1 $a3, $f8 -/* A1C344 80241244 27A20038 */ addiu $v0, $sp, 0x38 -/* A1C348 80241248 AFB2001C */ sw $s2, 0x1c($sp) -/* A1C34C 8024124C AFA20020 */ sw $v0, 0x20($sp) -/* A1C350 80241250 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1C354 80241254 E7A20014 */ swc1 $f2, 0x14($sp) -/* A1C358 80241258 0C01BFA4 */ jal fx_emote -/* A1C35C 8024125C E7A40018 */ swc1 $f4, 0x18($sp) -/* A1C360 80241260 0200202D */ daddu $a0, $s0, $zero -/* A1C364 80241264 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A1C368 80241268 C480003C */ lwc1 $f0, 0x3c($a0) -/* A1C36C 8024126C 3C060020 */ lui $a2, 0x20 -/* A1C370 80241270 0C012530 */ jal ai_enemy_play_sound -/* A1C374 80241274 E4800064 */ swc1 $f0, 0x64($a0) -/* A1C378 80241278 8E220018 */ lw $v0, 0x18($s1) -/* A1C37C 8024127C 9442002A */ lhu $v0, 0x2a($v0) -/* A1C380 80241280 30420001 */ andi $v0, $v0, 1 -/* A1C384 80241284 10400003 */ beqz $v0, .L80241294 -/* A1C388 80241288 2402000A */ addiu $v0, $zero, 0xa -/* A1C38C 8024128C 08090515 */ j .L80241454 -/* A1C390 80241290 AE620070 */ sw $v0, 0x70($s3) -.L80241294: -/* A1C394 80241294 08090515 */ j .L80241454 -/* A1C398 80241298 AE720070 */ sw $s2, 0x70($s3) -.L8024129C: -/* A1C39C 8024129C 8E620074 */ lw $v0, 0x74($s3) -/* A1C3A0 802412A0 2442FFFF */ addiu $v0, $v0, -1 -.L802412A4: -/* A1C3A4 802412A4 080904AC */ j .L802412B0 -/* A1C3A8 802412A8 AE620074 */ sw $v0, 0x74($s3) -.L802412AC: -/* A1C3AC 802412AC AE220090 */ sw $v0, 0x90($s1) -.L802412B0: -/* A1C3B0 802412B0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A1C3B4 802412B4 C6000040 */ lwc1 $f0, 0x40($s0) -/* A1C3B8 802412B8 C4620000 */ lwc1 $f2, ($v1) -/* A1C3BC 802412BC 468010A0 */ cvt.s.w $f2, $f2 -/* A1C3C0 802412C0 C4640008 */ lwc1 $f4, 8($v1) -/* A1C3C4 802412C4 46802120 */ cvt.s.w $f4, $f4 -/* A1C3C8 802412C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1C3CC 802412CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1C3D0 802412D0 44051000 */ mfc1 $a1, $f2 -/* A1C3D4 802412D4 C440000C */ lwc1 $f0, 0xc($v0) -/* A1C3D8 802412D8 46800020 */ cvt.s.w $f0, $f0 -/* A1C3DC 802412DC E7A00014 */ swc1 $f0, 0x14($sp) -/* A1C3E0 802412E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1C3E4 802412E4 44062000 */ mfc1 $a2, $f4 -/* A1C3E8 802412E8 C4400010 */ lwc1 $f0, 0x10($v0) -/* A1C3EC 802412EC 46800020 */ cvt.s.w $f0, $f0 -/* A1C3F0 802412F0 E7A00018 */ swc1 $f0, 0x18($sp) -/* A1C3F4 802412F4 8C640018 */ lw $a0, 0x18($v1) -/* A1C3F8 802412F8 0C0123F5 */ jal is_point_within_region -/* A1C3FC 802412FC 8E070038 */ lw $a3, 0x38($s0) -/* A1C400 80241300 1040001A */ beqz $v0, .L8024136C -/* A1C404 80241304 00000000 */ nop -/* A1C408 80241308 8E060038 */ lw $a2, 0x38($s0) -/* A1C40C 8024130C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1C410 80241310 8E070040 */ lw $a3, 0x40($s0) -/* A1C414 80241314 C44C0000 */ lwc1 $f12, ($v0) -/* A1C418 80241318 46806320 */ cvt.s.w $f12, $f12 -/* A1C41C 8024131C C44E0008 */ lwc1 $f14, 8($v0) -/* A1C420 80241320 0C00A7B5 */ jal dist2D -/* A1C424 80241324 468073A0 */ cvt.s.w $f14, $f14 -/* A1C428 80241328 C6020018 */ lwc1 $f2, 0x18($s0) -/* A1C42C 8024132C 4600103C */ c.lt.s $f2, $f0 -/* A1C430 80241330 00000000 */ nop -/* A1C434 80241334 4500000D */ bc1f .L8024136C -/* A1C438 80241338 E7A00034 */ swc1 $f0, 0x34($sp) -/* A1C43C 8024133C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A1C440 80241340 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1C444 80241344 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A1C448 80241348 C4480000 */ lwc1 $f8, ($v0) -/* A1C44C 8024134C 46804220 */ cvt.s.w $f8, $f8 -/* A1C450 80241350 44064000 */ mfc1 $a2, $f8 -/* A1C454 80241354 C4480008 */ lwc1 $f8, 8($v0) -/* A1C458 80241358 46804220 */ cvt.s.w $f8, $f8 -/* A1C45C 8024135C 44074000 */ mfc1 $a3, $f8 -/* A1C460 80241360 0C00A720 */ jal atan2 -/* A1C464 80241364 24140001 */ addiu $s4, $zero, 1 -/* A1C468 80241368 E600000C */ swc1 $f0, 0xc($s0) -.L8024136C: -/* A1C46C 8024136C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1C470 80241370 8C43000C */ lw $v1, 0xc($v0) -/* A1C474 80241374 8C420010 */ lw $v0, 0x10($v0) -/* A1C478 80241378 00621825 */ or $v1, $v1, $v0 -/* A1C47C 8024137C 00741825 */ or $v1, $v1, $s4 -/* A1C480 80241380 10600008 */ beqz $v1, .L802413A4 -/* A1C484 80241384 00000000 */ nop -/* A1C488 80241388 8602008C */ lh $v0, 0x8c($s0) -/* A1C48C 8024138C 14400031 */ bnez $v0, .L80241454 -/* A1C490 80241390 00000000 */ nop -/* A1C494 80241394 8E050018 */ lw $a1, 0x18($s0) -/* A1C498 80241398 8E06000C */ lw $a2, 0xc($s0) -/* A1C49C 8024139C 0C00EA95 */ jal npc_move_heading -/* A1C4A0 802413A0 0200202D */ daddu $a0, $s0, $zero -.L802413A4: -/* A1C4A4 802413A4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1C4A8 802413A8 3C014059 */ lui $at, 0x4059 -/* A1C4AC 802413AC 44811800 */ mtc1 $at, $f3 -/* A1C4B0 802413B0 44801000 */ mtc1 $zero, $f2 -/* A1C4B4 802413B4 46000021 */ cvt.d.s $f0, $f0 -/* A1C4B8 802413B8 46220002 */ mul.d $f0, $f0, $f2 -/* A1C4BC 802413BC 00000000 */ nop -/* A1C4C0 802413C0 4620020D */ trunc.w.d $f8, $f0 -/* A1C4C4 802413C4 E628007C */ swc1 $f8, 0x7c($s1) -/* A1C4C8 802413C8 8E420004 */ lw $v0, 4($s2) -/* A1C4CC 802413CC 18400021 */ blez $v0, .L80241454 -/* A1C4D0 802413D0 00000000 */ nop -/* A1C4D4 802413D4 8602008E */ lh $v0, 0x8e($s0) -/* A1C4D8 802413D8 9603008E */ lhu $v1, 0x8e($s0) -/* A1C4DC 802413DC 18400005 */ blez $v0, .L802413F4 -/* A1C4E0 802413E0 2462FFFF */ addiu $v0, $v1, -1 -/* A1C4E4 802413E4 A602008E */ sh $v0, 0x8e($s0) -/* A1C4E8 802413E8 00021400 */ sll $v0, $v0, 0x10 -/* A1C4EC 802413EC 1C400019 */ bgtz $v0, .L80241454 -/* A1C4F0 802413F0 00000000 */ nop -.L802413F4: -/* A1C4F4 802413F4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A1C4F8 802413F8 24020002 */ addiu $v0, $zero, 2 -/* A1C4FC 802413FC 0C00A67F */ jal rand_int -/* A1C500 80241400 AE620070 */ sw $v0, 0x70($s3) -/* A1C504 80241404 3C035555 */ lui $v1, 0x5555 -/* A1C508 80241408 34635556 */ ori $v1, $v1, 0x5556 -/* A1C50C 8024140C 00430018 */ mult $v0, $v1 -/* A1C510 80241410 000227C3 */ sra $a0, $v0, 0x1f -/* A1C514 80241414 00004010 */ mfhi $t0 -/* A1C518 80241418 01042023 */ subu $a0, $t0, $a0 -/* A1C51C 8024141C 00041840 */ sll $v1, $a0, 1 -/* A1C520 80241420 00641821 */ addu $v1, $v1, $a0 -/* A1C524 80241424 00431023 */ subu $v0, $v0, $v1 -/* A1C528 80241428 24430002 */ addiu $v1, $v0, 2 -/* A1C52C 8024142C AE630074 */ sw $v1, 0x74($s3) -/* A1C530 80241430 8E42002C */ lw $v0, 0x2c($s2) -/* A1C534 80241434 58400007 */ blezl $v0, .L80241454 -/* A1C538 80241438 AE600070 */ sw $zero, 0x70($s3) -/* A1C53C 8024143C 8E420008 */ lw $v0, 8($s2) -/* A1C540 80241440 18400003 */ blez $v0, .L80241450 -/* A1C544 80241444 28620003 */ slti $v0, $v1, 3 -/* A1C548 80241448 10400002 */ beqz $v0, .L80241454 -/* A1C54C 8024144C 00000000 */ nop -.L80241450: -/* A1C550 80241450 AE600070 */ sw $zero, 0x70($s3) -.L80241454: -/* A1C554 80241454 8FBF0058 */ lw $ra, 0x58($sp) -/* A1C558 80241458 8FB50054 */ lw $s5, 0x54($sp) -/* A1C55C 8024145C 8FB40050 */ lw $s4, 0x50($sp) -/* A1C560 80241460 8FB3004C */ lw $s3, 0x4c($sp) -/* A1C564 80241464 8FB20048 */ lw $s2, 0x48($sp) -/* A1C568 80241468 8FB10044 */ lw $s1, 0x44($sp) -/* A1C56C 8024146C 8FB00040 */ lw $s0, 0x40($sp) -/* A1C570 80241470 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* A1C574 80241474 D7B80070 */ ldc1 $f24, 0x70($sp) -/* A1C578 80241478 D7B60068 */ ldc1 $f22, 0x68($sp) -/* A1C57C 8024147C D7B40060 */ ldc1 $f20, 0x60($sp) -/* A1C580 80241480 03E00008 */ jr $ra -/* A1C584 80241484 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s index 1c79dabd7d..f851c64086 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s @@ -86,7 +86,7 @@ glabel func_80241FBC_A1D0BC .L802420D8_A1D1D8: /* A1D1D8 802420D8 0280202D */ daddu $a0, $s4, $zero /* A1D1DC 802420DC 0200282D */ daddu $a1, $s0, $zero -/* A1D1E0 802420E0 0C090398 */ jal func_80240E60_A1BF60 +/* A1D1E0 802420E0 0C090398 */ jal hos_03_UnkNpcAIFunc35 /* A1D1E4 802420E4 0260302D */ daddu $a2, $s3, $zero /* A1D1E8 802420E8 08090861 */ j .L80242184 /* A1D1EC 802420EC 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240000_97DAD0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240000_97DAD0.s deleted file mode 100644 index 7c5c1e358a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240000_97DAD0.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_97DAD0 -/* 97DAD0 80240000 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 97DAD4 80240004 AFB00030 */ sw $s0, 0x30($sp) -/* 97DAD8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 97DADC 8024000C AFBF0040 */ sw $ra, 0x40($sp) -/* 97DAE0 80240010 AFB3003C */ sw $s3, 0x3c($sp) -/* 97DAE4 80240014 AFB20038 */ sw $s2, 0x38($sp) -/* 97DAE8 80240018 AFB10034 */ sw $s1, 0x34($sp) -/* 97DAEC 8024001C F7B60050 */ sdc1 $f22, 0x50($sp) -/* 97DAF0 80240020 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 97DAF4 80240024 8E130148 */ lw $s3, 0x148($s0) -/* 97DAF8 80240028 00A0882D */ daddu $s1, $a1, $zero -/* 97DAFC 8024002C 86640008 */ lh $a0, 8($s3) -/* 97DB00 80240030 0C00EABB */ jal get_npc_unsafe -/* 97DB04 80240034 00C0902D */ daddu $s2, $a2, $zero -/* 97DB08 80240038 0200202D */ daddu $a0, $s0, $zero -/* 97DB0C 8024003C 0220282D */ daddu $a1, $s1, $zero -/* 97DB10 80240040 0240302D */ daddu $a2, $s2, $zero -/* 97DB14 80240044 0C012568 */ jal func_800495A0 -/* 97DB18 80240048 0040802D */ daddu $s0, $v0, $zero -/* 97DB1C 8024004C 8E020000 */ lw $v0, ($s0) -/* 97DB20 80240050 2404002D */ addiu $a0, $zero, 0x2d -/* 97DB24 80240054 34420800 */ ori $v0, $v0, 0x800 -/* 97DB28 80240058 0C00A67F */ jal rand_int -/* 97DB2C 8024005C AE020000 */ sw $v0, ($s0) -/* 97DB30 80240060 0200202D */ daddu $a0, $s0, $zero -/* 97DB34 80240064 3C05B000 */ lui $a1, 0xb000 -/* 97DB38 80240068 34A50017 */ ori $a1, $a1, 0x17 -/* 97DB3C 8024006C 44820000 */ mtc1 $v0, $f0 -/* 97DB40 80240070 00000000 */ nop -/* 97DB44 80240074 46800021 */ cvt.d.w $f0, $f0 -/* 97DB48 80240078 3C014024 */ lui $at, 0x4024 -/* 97DB4C 8024007C 44811800 */ mtc1 $at, $f3 -/* 97DB50 80240080 44801000 */ mtc1 $zero, $f2 -/* 97DB54 80240084 3C014020 */ lui $at, 0x4020 -/* 97DB58 80240088 44812800 */ mtc1 $at, $f5 -/* 97DB5C 8024008C 44802000 */ mtc1 $zero, $f4 -/* 97DB60 80240090 46220003 */ div.d $f0, $f0, $f2 -/* 97DB64 80240094 46240000 */ add.d $f0, $f0, $f4 -/* 97DB68 80240098 3C013FC0 */ lui $at, 0x3fc0 -/* 97DB6C 8024009C 44811000 */ mtc1 $at, $f2 -/* 97DB70 802400A0 0000302D */ daddu $a2, $zero, $zero -/* 97DB74 802400A4 E6020014 */ swc1 $f2, 0x14($s0) -/* 97DB78 802400A8 46200020 */ cvt.s.d $f0, $f0 -/* 97DB7C 802400AC 0C012530 */ jal ai_enemy_play_sound -/* 97DB80 802400B0 E600001C */ swc1 $f0, 0x1c($s0) -/* 97DB84 802400B4 8E6300D0 */ lw $v1, 0xd0($s3) -/* 97DB88 802400B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 97DB8C 802400BC C4620000 */ lwc1 $f2, ($v1) -/* 97DB90 802400C0 468010A0 */ cvt.s.w $f2, $f2 -/* 97DB94 802400C4 C4640008 */ lwc1 $f4, 8($v1) -/* 97DB98 802400C8 46802120 */ cvt.s.w $f4, $f4 -/* 97DB9C 802400CC E7A00010 */ swc1 $f0, 0x10($sp) -/* 97DBA0 802400D0 8E6200D0 */ lw $v0, 0xd0($s3) -/* 97DBA4 802400D4 44051000 */ mfc1 $a1, $f2 -/* 97DBA8 802400D8 C440000C */ lwc1 $f0, 0xc($v0) -/* 97DBAC 802400DC 46800020 */ cvt.s.w $f0, $f0 -/* 97DBB0 802400E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* 97DBB4 802400E4 8E6200D0 */ lw $v0, 0xd0($s3) -/* 97DBB8 802400E8 44062000 */ mfc1 $a2, $f4 -/* 97DBBC 802400EC C4400010 */ lwc1 $f0, 0x10($v0) -/* 97DBC0 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* 97DBC4 802400F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 97DBC8 802400F8 8C640018 */ lw $a0, 0x18($v1) -/* 97DBCC 802400FC 0C0123F5 */ jal is_point_within_region -/* 97DBD0 80240100 8E070038 */ lw $a3, 0x38($s0) -/* 97DBD4 80240104 10400035 */ beqz $v0, .L802401DC -/* 97DBD8 80240108 00000000 */ nop -/* 97DBDC 8024010C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 97DBE0 80240110 3C0141C8 */ lui $at, 0x41c8 -/* 97DBE4 80240114 4481B000 */ mtc1 $at, $f22 -/* 97DBE8 80240118 8E6200D0 */ lw $v0, 0xd0($s3) -/* 97DBEC 8024011C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 97DBF0 80240120 C4480000 */ lwc1 $f8, ($v0) -/* 97DBF4 80240124 46804220 */ cvt.s.w $f8, $f8 -/* 97DBF8 80240128 44064000 */ mfc1 $a2, $f8 -/* 97DBFC 8024012C C4480008 */ lwc1 $f8, 8($v0) -/* 97DC00 80240130 46804220 */ cvt.s.w $f8, $f8 -/* 97DC04 80240134 44074000 */ mfc1 $a3, $f8 -/* 97DC08 80240138 3C01403E */ lui $at, 0x403e -/* 97DC0C 8024013C 4481A800 */ mtc1 $at, $f21 -/* 97DC10 80240140 4480A000 */ mtc1 $zero, $f20 -/* 97DC14 80240144 0C00A720 */ jal atan2 -/* 97DC18 80240148 0000882D */ daddu $s1, $zero, $zero -/* 97DC1C 8024014C C6020038 */ lwc1 $f2, 0x38($s0) -/* 97DC20 80240150 C604003C */ lwc1 $f4, 0x3c($s0) -/* 97DC24 80240154 C6060040 */ lwc1 $f6, 0x40($s0) -/* 97DC28 80240158 E600000C */ swc1 $f0, 0xc($s0) -/* 97DC2C 8024015C E7A20020 */ swc1 $f2, 0x20($sp) -/* 97DC30 80240160 E7A40024 */ swc1 $f4, 0x24($sp) -/* 97DC34 80240164 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240168: -/* 97DC38 80240168 E7B60010 */ swc1 $f22, 0x10($sp) -/* 97DC3C 8024016C C600000C */ lwc1 $f0, 0xc($s0) -/* 97DC40 80240170 E7A00014 */ swc1 $f0, 0x14($sp) -/* 97DC44 80240174 860200A8 */ lh $v0, 0xa8($s0) -/* 97DC48 80240178 27A50020 */ addiu $a1, $sp, 0x20 -/* 97DC4C 8024017C 44820000 */ mtc1 $v0, $f0 -/* 97DC50 80240180 00000000 */ nop -/* 97DC54 80240184 46800020 */ cvt.s.w $f0, $f0 -/* 97DC58 80240188 E7A00018 */ swc1 $f0, 0x18($sp) -/* 97DC5C 8024018C 860200A6 */ lh $v0, 0xa6($s0) -/* 97DC60 80240190 27A60024 */ addiu $a2, $sp, 0x24 -/* 97DC64 80240194 44820000 */ mtc1 $v0, $f0 -/* 97DC68 80240198 00000000 */ nop -/* 97DC6C 8024019C 46800020 */ cvt.s.w $f0, $f0 -/* 97DC70 802401A0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 97DC74 802401A4 8E040080 */ lw $a0, 0x80($s0) -/* 97DC78 802401A8 0C037711 */ jal npc_test_move_simple_with_slipping -/* 97DC7C 802401AC 27A70028 */ addiu $a3, $sp, 0x28 -/* 97DC80 802401B0 10400016 */ beqz $v0, .L8024020C -/* 97DC84 802401B4 26310001 */ addiu $s1, $s1, 1 -/* 97DC88 802401B8 C600000C */ lwc1 $f0, 0xc($s0) -/* 97DC8C 802401BC 46000021 */ cvt.d.s $f0, $f0 -/* 97DC90 802401C0 46340000 */ add.d $f0, $f0, $f20 -/* 97DC94 802401C4 2A220006 */ slti $v0, $s1, 6 -/* 97DC98 802401C8 46200020 */ cvt.s.d $f0, $f0 -/* 97DC9C 802401CC 1440FFE6 */ bnez $v0, .L80240168 -/* 97DCA0 802401D0 E600000C */ swc1 $f0, 0xc($s0) -/* 97DCA4 802401D4 08090083 */ j .L8024020C -/* 97DCA8 802401D8 00000000 */ nop -.L802401DC: -/* 97DCAC 802401DC 0C00A67F */ jal rand_int -/* 97DCB0 802401E0 2404003C */ addiu $a0, $zero, 0x3c -/* 97DCB4 802401E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* 97DCB8 802401E8 44820000 */ mtc1 $v0, $f0 -/* 97DCBC 802401EC 00000000 */ nop -/* 97DCC0 802401F0 46800020 */ cvt.s.w $f0, $f0 -/* 97DCC4 802401F4 46006300 */ add.s $f12, $f12, $f0 -/* 97DCC8 802401F8 3C0141F0 */ lui $at, 0x41f0 -/* 97DCCC 802401FC 44810000 */ mtc1 $at, $f0 -/* 97DCD0 80240200 0C00A6C9 */ jal clamp_angle -/* 97DCD4 80240204 46006301 */ sub.s $f12, $f12, $f0 -/* 97DCD8 80240208 E600000C */ swc1 $f0, 0xc($s0) -.L8024020C: -/* 97DCDC 8024020C 8FBF0040 */ lw $ra, 0x40($sp) -/* 97DCE0 80240210 8FB3003C */ lw $s3, 0x3c($sp) -/* 97DCE4 80240214 8FB20038 */ lw $s2, 0x38($sp) -/* 97DCE8 80240218 8FB10034 */ lw $s1, 0x34($sp) -/* 97DCEC 8024021C 8FB00030 */ lw $s0, 0x30($sp) -/* 97DCF0 80240220 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 97DCF4 80240224 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 97DCF8 80240228 03E00008 */ jr $ra -/* 97DCFC 8024022C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s index 7d53303393..aad160b7f6 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s @@ -103,7 +103,7 @@ glabel func_80240BF0_97E6C0 .L80240D54_97E824: /* 97E824 80240D54 0260202D */ daddu $a0, $s3, $zero /* 97E828 80240D58 0280282D */ daddu $a1, $s4, $zero -/* 97E82C 80240D5C 0C090000 */ jal func_80240000_97DAD0 +/* 97E82C 80240D5C 0C090000 */ jal isk_05_UnkNpcAIFunc36 /* 97E830 80240D60 0200302D */ daddu $a2, $s0, $zero .L80240D64_97E834: /* 97E834 80240D64 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240000_98F7E0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240000_98F7E0.s deleted file mode 100644 index 31a00093e8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240000_98F7E0.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_98F7E0 -/* 98F7E0 80240000 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 98F7E4 80240004 AFB00030 */ sw $s0, 0x30($sp) -/* 98F7E8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 98F7EC 8024000C AFBF0040 */ sw $ra, 0x40($sp) -/* 98F7F0 80240010 AFB3003C */ sw $s3, 0x3c($sp) -/* 98F7F4 80240014 AFB20038 */ sw $s2, 0x38($sp) -/* 98F7F8 80240018 AFB10034 */ sw $s1, 0x34($sp) -/* 98F7FC 8024001C F7B60050 */ sdc1 $f22, 0x50($sp) -/* 98F800 80240020 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 98F804 80240024 8E130148 */ lw $s3, 0x148($s0) -/* 98F808 80240028 00A0882D */ daddu $s1, $a1, $zero -/* 98F80C 8024002C 86640008 */ lh $a0, 8($s3) -/* 98F810 80240030 0C00EABB */ jal get_npc_unsafe -/* 98F814 80240034 00C0902D */ daddu $s2, $a2, $zero -/* 98F818 80240038 0200202D */ daddu $a0, $s0, $zero -/* 98F81C 8024003C 0220282D */ daddu $a1, $s1, $zero -/* 98F820 80240040 0240302D */ daddu $a2, $s2, $zero -/* 98F824 80240044 0C012568 */ jal func_800495A0 -/* 98F828 80240048 0040802D */ daddu $s0, $v0, $zero -/* 98F82C 8024004C 8E020000 */ lw $v0, ($s0) -/* 98F830 80240050 2404002D */ addiu $a0, $zero, 0x2d -/* 98F834 80240054 34420800 */ ori $v0, $v0, 0x800 -/* 98F838 80240058 0C00A67F */ jal rand_int -/* 98F83C 8024005C AE020000 */ sw $v0, ($s0) -/* 98F840 80240060 0200202D */ daddu $a0, $s0, $zero -/* 98F844 80240064 3C05B000 */ lui $a1, 0xb000 -/* 98F848 80240068 34A50017 */ ori $a1, $a1, 0x17 -/* 98F84C 8024006C 44820000 */ mtc1 $v0, $f0 -/* 98F850 80240070 00000000 */ nop -/* 98F854 80240074 46800021 */ cvt.d.w $f0, $f0 -/* 98F858 80240078 3C014024 */ lui $at, 0x4024 -/* 98F85C 8024007C 44811800 */ mtc1 $at, $f3 -/* 98F860 80240080 44801000 */ mtc1 $zero, $f2 -/* 98F864 80240084 3C014020 */ lui $at, 0x4020 -/* 98F868 80240088 44812800 */ mtc1 $at, $f5 -/* 98F86C 8024008C 44802000 */ mtc1 $zero, $f4 -/* 98F870 80240090 46220003 */ div.d $f0, $f0, $f2 -/* 98F874 80240094 46240000 */ add.d $f0, $f0, $f4 -/* 98F878 80240098 3C013FC0 */ lui $at, 0x3fc0 -/* 98F87C 8024009C 44811000 */ mtc1 $at, $f2 -/* 98F880 802400A0 0000302D */ daddu $a2, $zero, $zero -/* 98F884 802400A4 E6020014 */ swc1 $f2, 0x14($s0) -/* 98F888 802400A8 46200020 */ cvt.s.d $f0, $f0 -/* 98F88C 802400AC 0C012530 */ jal ai_enemy_play_sound -/* 98F890 802400B0 E600001C */ swc1 $f0, 0x1c($s0) -/* 98F894 802400B4 8E6300D0 */ lw $v1, 0xd0($s3) -/* 98F898 802400B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 98F89C 802400BC C4620000 */ lwc1 $f2, ($v1) -/* 98F8A0 802400C0 468010A0 */ cvt.s.w $f2, $f2 -/* 98F8A4 802400C4 C4640008 */ lwc1 $f4, 8($v1) -/* 98F8A8 802400C8 46802120 */ cvt.s.w $f4, $f4 -/* 98F8AC 802400CC E7A00010 */ swc1 $f0, 0x10($sp) -/* 98F8B0 802400D0 8E6200D0 */ lw $v0, 0xd0($s3) -/* 98F8B4 802400D4 44051000 */ mfc1 $a1, $f2 -/* 98F8B8 802400D8 C440000C */ lwc1 $f0, 0xc($v0) -/* 98F8BC 802400DC 46800020 */ cvt.s.w $f0, $f0 -/* 98F8C0 802400E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* 98F8C4 802400E4 8E6200D0 */ lw $v0, 0xd0($s3) -/* 98F8C8 802400E8 44062000 */ mfc1 $a2, $f4 -/* 98F8CC 802400EC C4400010 */ lwc1 $f0, 0x10($v0) -/* 98F8D0 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* 98F8D4 802400F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 98F8D8 802400F8 8C640018 */ lw $a0, 0x18($v1) -/* 98F8DC 802400FC 0C0123F5 */ jal is_point_within_region -/* 98F8E0 80240100 8E070038 */ lw $a3, 0x38($s0) -/* 98F8E4 80240104 10400035 */ beqz $v0, .L802401DC -/* 98F8E8 80240108 00000000 */ nop -/* 98F8EC 8024010C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 98F8F0 80240110 3C0141C8 */ lui $at, 0x41c8 -/* 98F8F4 80240114 4481B000 */ mtc1 $at, $f22 -/* 98F8F8 80240118 8E6200D0 */ lw $v0, 0xd0($s3) -/* 98F8FC 8024011C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 98F900 80240120 C4480000 */ lwc1 $f8, ($v0) -/* 98F904 80240124 46804220 */ cvt.s.w $f8, $f8 -/* 98F908 80240128 44064000 */ mfc1 $a2, $f8 -/* 98F90C 8024012C C4480008 */ lwc1 $f8, 8($v0) -/* 98F910 80240130 46804220 */ cvt.s.w $f8, $f8 -/* 98F914 80240134 44074000 */ mfc1 $a3, $f8 -/* 98F918 80240138 3C01403E */ lui $at, 0x403e -/* 98F91C 8024013C 4481A800 */ mtc1 $at, $f21 -/* 98F920 80240140 4480A000 */ mtc1 $zero, $f20 -/* 98F924 80240144 0C00A720 */ jal atan2 -/* 98F928 80240148 0000882D */ daddu $s1, $zero, $zero -/* 98F92C 8024014C C6020038 */ lwc1 $f2, 0x38($s0) -/* 98F930 80240150 C604003C */ lwc1 $f4, 0x3c($s0) -/* 98F934 80240154 C6060040 */ lwc1 $f6, 0x40($s0) -/* 98F938 80240158 E600000C */ swc1 $f0, 0xc($s0) -/* 98F93C 8024015C E7A20020 */ swc1 $f2, 0x20($sp) -/* 98F940 80240160 E7A40024 */ swc1 $f4, 0x24($sp) -/* 98F944 80240164 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240168: -/* 98F948 80240168 E7B60010 */ swc1 $f22, 0x10($sp) -/* 98F94C 8024016C C600000C */ lwc1 $f0, 0xc($s0) -/* 98F950 80240170 E7A00014 */ swc1 $f0, 0x14($sp) -/* 98F954 80240174 860200A8 */ lh $v0, 0xa8($s0) -/* 98F958 80240178 27A50020 */ addiu $a1, $sp, 0x20 -/* 98F95C 8024017C 44820000 */ mtc1 $v0, $f0 -/* 98F960 80240180 00000000 */ nop -/* 98F964 80240184 46800020 */ cvt.s.w $f0, $f0 -/* 98F968 80240188 E7A00018 */ swc1 $f0, 0x18($sp) -/* 98F96C 8024018C 860200A6 */ lh $v0, 0xa6($s0) -/* 98F970 80240190 27A60024 */ addiu $a2, $sp, 0x24 -/* 98F974 80240194 44820000 */ mtc1 $v0, $f0 -/* 98F978 80240198 00000000 */ nop -/* 98F97C 8024019C 46800020 */ cvt.s.w $f0, $f0 -/* 98F980 802401A0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 98F984 802401A4 8E040080 */ lw $a0, 0x80($s0) -/* 98F988 802401A8 0C037711 */ jal npc_test_move_simple_with_slipping -/* 98F98C 802401AC 27A70028 */ addiu $a3, $sp, 0x28 -/* 98F990 802401B0 10400016 */ beqz $v0, .L8024020C -/* 98F994 802401B4 26310001 */ addiu $s1, $s1, 1 -/* 98F998 802401B8 C600000C */ lwc1 $f0, 0xc($s0) -/* 98F99C 802401BC 46000021 */ cvt.d.s $f0, $f0 -/* 98F9A0 802401C0 46340000 */ add.d $f0, $f0, $f20 -/* 98F9A4 802401C4 2A220006 */ slti $v0, $s1, 6 -/* 98F9A8 802401C8 46200020 */ cvt.s.d $f0, $f0 -/* 98F9AC 802401CC 1440FFE6 */ bnez $v0, .L80240168 -/* 98F9B0 802401D0 E600000C */ swc1 $f0, 0xc($s0) -/* 98F9B4 802401D4 08090083 */ j .L8024020C -/* 98F9B8 802401D8 00000000 */ nop -.L802401DC: -/* 98F9BC 802401DC 0C00A67F */ jal rand_int -/* 98F9C0 802401E0 2404003C */ addiu $a0, $zero, 0x3c -/* 98F9C4 802401E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* 98F9C8 802401E8 44820000 */ mtc1 $v0, $f0 -/* 98F9CC 802401EC 00000000 */ nop -/* 98F9D0 802401F0 46800020 */ cvt.s.w $f0, $f0 -/* 98F9D4 802401F4 46006300 */ add.s $f12, $f12, $f0 -/* 98F9D8 802401F8 3C0141F0 */ lui $at, 0x41f0 -/* 98F9DC 802401FC 44810000 */ mtc1 $at, $f0 -/* 98F9E0 80240200 0C00A6C9 */ jal clamp_angle -/* 98F9E4 80240204 46006301 */ sub.s $f12, $f12, $f0 -/* 98F9E8 80240208 E600000C */ swc1 $f0, 0xc($s0) -.L8024020C: -/* 98F9EC 8024020C 8FBF0040 */ lw $ra, 0x40($sp) -/* 98F9F0 80240210 8FB3003C */ lw $s3, 0x3c($sp) -/* 98F9F4 80240214 8FB20038 */ lw $s2, 0x38($sp) -/* 98F9F8 80240218 8FB10034 */ lw $s1, 0x34($sp) -/* 98F9FC 8024021C 8FB00030 */ lw $s0, 0x30($sp) -/* 98FA00 80240220 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 98FA04 80240224 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 98FA08 80240228 03E00008 */ jr $ra -/* 98FA0C 8024022C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s index e096d1a717..60a90f6398 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s @@ -103,7 +103,7 @@ glabel func_80240BF0_9903D0 .L80240D54_990534: /* 990534 80240D54 0260202D */ daddu $a0, $s3, $zero /* 990538 80240D58 0280282D */ daddu $a1, $s4, $zero -/* 99053C 80240D5C 0C090000 */ jal func_80240000_98F7E0 +/* 99053C 80240D5C 0C090000 */ jal isk_13_UnkNpcAIFunc36 /* 990540 80240D60 0200302D */ daddu $a2, $s0, $zero .L80240D64_990544: /* 990544 80240D64 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240000_992730.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240000_992730.s deleted file mode 100644 index b6909ab090..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240000_992730.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_992730 -/* 992730 80240000 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 992734 80240004 AFB00030 */ sw $s0, 0x30($sp) -/* 992738 80240008 0080802D */ daddu $s0, $a0, $zero -/* 99273C 8024000C AFBF0040 */ sw $ra, 0x40($sp) -/* 992740 80240010 AFB3003C */ sw $s3, 0x3c($sp) -/* 992744 80240014 AFB20038 */ sw $s2, 0x38($sp) -/* 992748 80240018 AFB10034 */ sw $s1, 0x34($sp) -/* 99274C 8024001C F7B60050 */ sdc1 $f22, 0x50($sp) -/* 992750 80240020 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 992754 80240024 8E130148 */ lw $s3, 0x148($s0) -/* 992758 80240028 00A0882D */ daddu $s1, $a1, $zero -/* 99275C 8024002C 86640008 */ lh $a0, 8($s3) -/* 992760 80240030 0C00EABB */ jal get_npc_unsafe -/* 992764 80240034 00C0902D */ daddu $s2, $a2, $zero -/* 992768 80240038 0200202D */ daddu $a0, $s0, $zero -/* 99276C 8024003C 0220282D */ daddu $a1, $s1, $zero -/* 992770 80240040 0240302D */ daddu $a2, $s2, $zero -/* 992774 80240044 0C012568 */ jal func_800495A0 -/* 992778 80240048 0040802D */ daddu $s0, $v0, $zero -/* 99277C 8024004C 8E020000 */ lw $v0, ($s0) -/* 992780 80240050 2404002D */ addiu $a0, $zero, 0x2d -/* 992784 80240054 34420800 */ ori $v0, $v0, 0x800 -/* 992788 80240058 0C00A67F */ jal rand_int -/* 99278C 8024005C AE020000 */ sw $v0, ($s0) -/* 992790 80240060 0200202D */ daddu $a0, $s0, $zero -/* 992794 80240064 3C05B000 */ lui $a1, 0xb000 -/* 992798 80240068 34A50017 */ ori $a1, $a1, 0x17 -/* 99279C 8024006C 44820000 */ mtc1 $v0, $f0 -/* 9927A0 80240070 00000000 */ nop -/* 9927A4 80240074 46800021 */ cvt.d.w $f0, $f0 -/* 9927A8 80240078 3C014024 */ lui $at, 0x4024 -/* 9927AC 8024007C 44811800 */ mtc1 $at, $f3 -/* 9927B0 80240080 44801000 */ mtc1 $zero, $f2 -/* 9927B4 80240084 3C014020 */ lui $at, 0x4020 -/* 9927B8 80240088 44812800 */ mtc1 $at, $f5 -/* 9927BC 8024008C 44802000 */ mtc1 $zero, $f4 -/* 9927C0 80240090 46220003 */ div.d $f0, $f0, $f2 -/* 9927C4 80240094 46240000 */ add.d $f0, $f0, $f4 -/* 9927C8 80240098 3C013FC0 */ lui $at, 0x3fc0 -/* 9927CC 8024009C 44811000 */ mtc1 $at, $f2 -/* 9927D0 802400A0 0000302D */ daddu $a2, $zero, $zero -/* 9927D4 802400A4 E6020014 */ swc1 $f2, 0x14($s0) -/* 9927D8 802400A8 46200020 */ cvt.s.d $f0, $f0 -/* 9927DC 802400AC 0C012530 */ jal ai_enemy_play_sound -/* 9927E0 802400B0 E600001C */ swc1 $f0, 0x1c($s0) -/* 9927E4 802400B4 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9927E8 802400B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9927EC 802400BC C4620000 */ lwc1 $f2, ($v1) -/* 9927F0 802400C0 468010A0 */ cvt.s.w $f2, $f2 -/* 9927F4 802400C4 C4640008 */ lwc1 $f4, 8($v1) -/* 9927F8 802400C8 46802120 */ cvt.s.w $f4, $f4 -/* 9927FC 802400CC E7A00010 */ swc1 $f0, 0x10($sp) -/* 992800 802400D0 8E6200D0 */ lw $v0, 0xd0($s3) -/* 992804 802400D4 44051000 */ mfc1 $a1, $f2 -/* 992808 802400D8 C440000C */ lwc1 $f0, 0xc($v0) -/* 99280C 802400DC 46800020 */ cvt.s.w $f0, $f0 -/* 992810 802400E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* 992814 802400E4 8E6200D0 */ lw $v0, 0xd0($s3) -/* 992818 802400E8 44062000 */ mfc1 $a2, $f4 -/* 99281C 802400EC C4400010 */ lwc1 $f0, 0x10($v0) -/* 992820 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* 992824 802400F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 992828 802400F8 8C640018 */ lw $a0, 0x18($v1) -/* 99282C 802400FC 0C0123F5 */ jal is_point_within_region -/* 992830 80240100 8E070038 */ lw $a3, 0x38($s0) -/* 992834 80240104 10400035 */ beqz $v0, .L802401DC -/* 992838 80240108 00000000 */ nop -/* 99283C 8024010C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 992840 80240110 3C0141C8 */ lui $at, 0x41c8 -/* 992844 80240114 4481B000 */ mtc1 $at, $f22 -/* 992848 80240118 8E6200D0 */ lw $v0, 0xd0($s3) -/* 99284C 8024011C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 992850 80240120 C4480000 */ lwc1 $f8, ($v0) -/* 992854 80240124 46804220 */ cvt.s.w $f8, $f8 -/* 992858 80240128 44064000 */ mfc1 $a2, $f8 -/* 99285C 8024012C C4480008 */ lwc1 $f8, 8($v0) -/* 992860 80240130 46804220 */ cvt.s.w $f8, $f8 -/* 992864 80240134 44074000 */ mfc1 $a3, $f8 -/* 992868 80240138 3C01403E */ lui $at, 0x403e -/* 99286C 8024013C 4481A800 */ mtc1 $at, $f21 -/* 992870 80240140 4480A000 */ mtc1 $zero, $f20 -/* 992874 80240144 0C00A720 */ jal atan2 -/* 992878 80240148 0000882D */ daddu $s1, $zero, $zero -/* 99287C 8024014C C6020038 */ lwc1 $f2, 0x38($s0) -/* 992880 80240150 C604003C */ lwc1 $f4, 0x3c($s0) -/* 992884 80240154 C6060040 */ lwc1 $f6, 0x40($s0) -/* 992888 80240158 E600000C */ swc1 $f0, 0xc($s0) -/* 99288C 8024015C E7A20020 */ swc1 $f2, 0x20($sp) -/* 992890 80240160 E7A40024 */ swc1 $f4, 0x24($sp) -/* 992894 80240164 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240168: -/* 992898 80240168 E7B60010 */ swc1 $f22, 0x10($sp) -/* 99289C 8024016C C600000C */ lwc1 $f0, 0xc($s0) -/* 9928A0 80240170 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9928A4 80240174 860200A8 */ lh $v0, 0xa8($s0) -/* 9928A8 80240178 27A50020 */ addiu $a1, $sp, 0x20 -/* 9928AC 8024017C 44820000 */ mtc1 $v0, $f0 -/* 9928B0 80240180 00000000 */ nop -/* 9928B4 80240184 46800020 */ cvt.s.w $f0, $f0 -/* 9928B8 80240188 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9928BC 8024018C 860200A6 */ lh $v0, 0xa6($s0) -/* 9928C0 80240190 27A60024 */ addiu $a2, $sp, 0x24 -/* 9928C4 80240194 44820000 */ mtc1 $v0, $f0 -/* 9928C8 80240198 00000000 */ nop -/* 9928CC 8024019C 46800020 */ cvt.s.w $f0, $f0 -/* 9928D0 802401A0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9928D4 802401A4 8E040080 */ lw $a0, 0x80($s0) -/* 9928D8 802401A8 0C037711 */ jal npc_test_move_simple_with_slipping -/* 9928DC 802401AC 27A70028 */ addiu $a3, $sp, 0x28 -/* 9928E0 802401B0 10400016 */ beqz $v0, .L8024020C -/* 9928E4 802401B4 26310001 */ addiu $s1, $s1, 1 -/* 9928E8 802401B8 C600000C */ lwc1 $f0, 0xc($s0) -/* 9928EC 802401BC 46000021 */ cvt.d.s $f0, $f0 -/* 9928F0 802401C0 46340000 */ add.d $f0, $f0, $f20 -/* 9928F4 802401C4 2A220006 */ slti $v0, $s1, 6 -/* 9928F8 802401C8 46200020 */ cvt.s.d $f0, $f0 -/* 9928FC 802401CC 1440FFE6 */ bnez $v0, .L80240168 -/* 992900 802401D0 E600000C */ swc1 $f0, 0xc($s0) -/* 992904 802401D4 08090083 */ j .L8024020C -/* 992908 802401D8 00000000 */ nop -.L802401DC: -/* 99290C 802401DC 0C00A67F */ jal rand_int -/* 992910 802401E0 2404003C */ addiu $a0, $zero, 0x3c -/* 992914 802401E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* 992918 802401E8 44820000 */ mtc1 $v0, $f0 -/* 99291C 802401EC 00000000 */ nop -/* 992920 802401F0 46800020 */ cvt.s.w $f0, $f0 -/* 992924 802401F4 46006300 */ add.s $f12, $f12, $f0 -/* 992928 802401F8 3C0141F0 */ lui $at, 0x41f0 -/* 99292C 802401FC 44810000 */ mtc1 $at, $f0 -/* 992930 80240200 0C00A6C9 */ jal clamp_angle -/* 992934 80240204 46006301 */ sub.s $f12, $f12, $f0 -/* 992938 80240208 E600000C */ swc1 $f0, 0xc($s0) -.L8024020C: -/* 99293C 8024020C 8FBF0040 */ lw $ra, 0x40($sp) -/* 992940 80240210 8FB3003C */ lw $s3, 0x3c($sp) -/* 992944 80240214 8FB20038 */ lw $s2, 0x38($sp) -/* 992948 80240218 8FB10034 */ lw $s1, 0x34($sp) -/* 99294C 8024021C 8FB00030 */ lw $s0, 0x30($sp) -/* 992950 80240220 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 992954 80240224 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 992958 80240228 03E00008 */ jr $ra -/* 99295C 8024022C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s index 4da7f69a23..09409176a4 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s @@ -103,7 +103,7 @@ glabel func_80240BF0_993320 .L80240D54_993484: /* 993484 80240D54 0260202D */ daddu $a0, $s3, $zero /* 993488 80240D58 0280282D */ daddu $a1, $s4, $zero -/* 99348C 80240D5C 0C090000 */ jal func_80240000_992730 +/* 99348C 80240D5C 0C090000 */ jal isk_14_UnkNpcAIFunc36 /* 993490 80240D60 0200302D */ daddu $a2, $s0, $zero .L80240D64_993494: /* 993494 80240D64 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240340_B28370.s b/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240340_B28370.s deleted file mode 100644 index 6e00c50622..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240340_B28370.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_B28370 -/* B28370 80240340 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B28374 80240344 AFB00030 */ sw $s0, 0x30($sp) -/* B28378 80240348 0080802D */ daddu $s0, $a0, $zero -/* B2837C 8024034C AFBF0040 */ sw $ra, 0x40($sp) -/* B28380 80240350 AFB3003C */ sw $s3, 0x3c($sp) -/* B28384 80240354 AFB20038 */ sw $s2, 0x38($sp) -/* B28388 80240358 AFB10034 */ sw $s1, 0x34($sp) -/* B2838C 8024035C F7B60050 */ sdc1 $f22, 0x50($sp) -/* B28390 80240360 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B28394 80240364 8E130148 */ lw $s3, 0x148($s0) -/* B28398 80240368 00A0882D */ daddu $s1, $a1, $zero -/* B2839C 8024036C 86640008 */ lh $a0, 8($s3) -/* B283A0 80240370 0C00EABB */ jal get_npc_unsafe -/* B283A4 80240374 00C0902D */ daddu $s2, $a2, $zero -/* B283A8 80240378 0200202D */ daddu $a0, $s0, $zero -/* B283AC 8024037C 0220282D */ daddu $a1, $s1, $zero -/* B283B0 80240380 0240302D */ daddu $a2, $s2, $zero -/* B283B4 80240384 0C012568 */ jal func_800495A0 -/* B283B8 80240388 0040802D */ daddu $s0, $v0, $zero -/* B283BC 8024038C 8E020000 */ lw $v0, ($s0) -/* B283C0 80240390 2404002D */ addiu $a0, $zero, 0x2d -/* B283C4 80240394 34420800 */ ori $v0, $v0, 0x800 -/* B283C8 80240398 0C00A67F */ jal rand_int -/* B283CC 8024039C AE020000 */ sw $v0, ($s0) -/* B283D0 802403A0 0200202D */ daddu $a0, $s0, $zero -/* B283D4 802403A4 3C05B000 */ lui $a1, 0xb000 -/* B283D8 802403A8 34A50017 */ ori $a1, $a1, 0x17 -/* B283DC 802403AC 44820000 */ mtc1 $v0, $f0 -/* B283E0 802403B0 00000000 */ nop -/* B283E4 802403B4 46800021 */ cvt.d.w $f0, $f0 -/* B283E8 802403B8 3C014024 */ lui $at, 0x4024 -/* B283EC 802403BC 44811800 */ mtc1 $at, $f3 -/* B283F0 802403C0 44801000 */ mtc1 $zero, $f2 -/* B283F4 802403C4 3C014020 */ lui $at, 0x4020 -/* B283F8 802403C8 44812800 */ mtc1 $at, $f5 -/* B283FC 802403CC 44802000 */ mtc1 $zero, $f4 -/* B28400 802403D0 46220003 */ div.d $f0, $f0, $f2 -/* B28404 802403D4 46240000 */ add.d $f0, $f0, $f4 -/* B28408 802403D8 3C013FC0 */ lui $at, 0x3fc0 -/* B2840C 802403DC 44811000 */ mtc1 $at, $f2 -/* B28410 802403E0 0000302D */ daddu $a2, $zero, $zero -/* B28414 802403E4 E6020014 */ swc1 $f2, 0x14($s0) -/* B28418 802403E8 46200020 */ cvt.s.d $f0, $f0 -/* B2841C 802403EC 0C012530 */ jal ai_enemy_play_sound -/* B28420 802403F0 E600001C */ swc1 $f0, 0x1c($s0) -/* B28424 802403F4 8E6300D0 */ lw $v1, 0xd0($s3) -/* B28428 802403F8 C6000040 */ lwc1 $f0, 0x40($s0) -/* B2842C 802403FC C4620000 */ lwc1 $f2, ($v1) -/* B28430 80240400 468010A0 */ cvt.s.w $f2, $f2 -/* B28434 80240404 C4640008 */ lwc1 $f4, 8($v1) -/* B28438 80240408 46802120 */ cvt.s.w $f4, $f4 -/* B2843C 8024040C E7A00010 */ swc1 $f0, 0x10($sp) -/* B28440 80240410 8E6200D0 */ lw $v0, 0xd0($s3) -/* B28444 80240414 44051000 */ mfc1 $a1, $f2 -/* B28448 80240418 C440000C */ lwc1 $f0, 0xc($v0) -/* B2844C 8024041C 46800020 */ cvt.s.w $f0, $f0 -/* B28450 80240420 E7A00014 */ swc1 $f0, 0x14($sp) -/* B28454 80240424 8E6200D0 */ lw $v0, 0xd0($s3) -/* B28458 80240428 44062000 */ mfc1 $a2, $f4 -/* B2845C 8024042C C4400010 */ lwc1 $f0, 0x10($v0) -/* B28460 80240430 46800020 */ cvt.s.w $f0, $f0 -/* B28464 80240434 E7A00018 */ swc1 $f0, 0x18($sp) -/* B28468 80240438 8C640018 */ lw $a0, 0x18($v1) -/* B2846C 8024043C 0C0123F5 */ jal is_point_within_region -/* B28470 80240440 8E070038 */ lw $a3, 0x38($s0) -/* B28474 80240444 10400035 */ beqz $v0, .L8024051C -/* B28478 80240448 00000000 */ nop -/* B2847C 8024044C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B28480 80240450 3C0141C8 */ lui $at, 0x41c8 -/* B28484 80240454 4481B000 */ mtc1 $at, $f22 -/* B28488 80240458 8E6200D0 */ lw $v0, 0xd0($s3) -/* B2848C 8024045C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B28490 80240460 C4480000 */ lwc1 $f8, ($v0) -/* B28494 80240464 46804220 */ cvt.s.w $f8, $f8 -/* B28498 80240468 44064000 */ mfc1 $a2, $f8 -/* B2849C 8024046C C4480008 */ lwc1 $f8, 8($v0) -/* B284A0 80240470 46804220 */ cvt.s.w $f8, $f8 -/* B284A4 80240474 44074000 */ mfc1 $a3, $f8 -/* B284A8 80240478 3C01403E */ lui $at, 0x403e -/* B284AC 8024047C 4481A800 */ mtc1 $at, $f21 -/* B284B0 80240480 4480A000 */ mtc1 $zero, $f20 -/* B284B4 80240484 0C00A720 */ jal atan2 -/* B284B8 80240488 0000882D */ daddu $s1, $zero, $zero -/* B284BC 8024048C C6020038 */ lwc1 $f2, 0x38($s0) -/* B284C0 80240490 C604003C */ lwc1 $f4, 0x3c($s0) -/* B284C4 80240494 C6060040 */ lwc1 $f6, 0x40($s0) -/* B284C8 80240498 E600000C */ swc1 $f0, 0xc($s0) -/* B284CC 8024049C E7A20020 */ swc1 $f2, 0x20($sp) -/* B284D0 802404A0 E7A40024 */ swc1 $f4, 0x24($sp) -/* B284D4 802404A4 E7A60028 */ swc1 $f6, 0x28($sp) -.L802404A8: -/* B284D8 802404A8 E7B60010 */ swc1 $f22, 0x10($sp) -/* B284DC 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* B284E0 802404B0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B284E4 802404B4 860200A8 */ lh $v0, 0xa8($s0) -/* B284E8 802404B8 27A50020 */ addiu $a1, $sp, 0x20 -/* B284EC 802404BC 44820000 */ mtc1 $v0, $f0 -/* B284F0 802404C0 00000000 */ nop -/* B284F4 802404C4 46800020 */ cvt.s.w $f0, $f0 -/* B284F8 802404C8 E7A00018 */ swc1 $f0, 0x18($sp) -/* B284FC 802404CC 860200A6 */ lh $v0, 0xa6($s0) -/* B28500 802404D0 27A60024 */ addiu $a2, $sp, 0x24 -/* B28504 802404D4 44820000 */ mtc1 $v0, $f0 -/* B28508 802404D8 00000000 */ nop -/* B2850C 802404DC 46800020 */ cvt.s.w $f0, $f0 -/* B28510 802404E0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B28514 802404E4 8E040080 */ lw $a0, 0x80($s0) -/* B28518 802404E8 0C037711 */ jal npc_test_move_simple_with_slipping -/* B2851C 802404EC 27A70028 */ addiu $a3, $sp, 0x28 -/* B28520 802404F0 10400016 */ beqz $v0, .L8024054C -/* B28524 802404F4 26310001 */ addiu $s1, $s1, 1 -/* B28528 802404F8 C600000C */ lwc1 $f0, 0xc($s0) -/* B2852C 802404FC 46000021 */ cvt.d.s $f0, $f0 -/* B28530 80240500 46340000 */ add.d $f0, $f0, $f20 -/* B28534 80240504 2A220006 */ slti $v0, $s1, 6 -/* B28538 80240508 46200020 */ cvt.s.d $f0, $f0 -/* B2853C 8024050C 1440FFE6 */ bnez $v0, .L802404A8 -/* B28540 80240510 E600000C */ swc1 $f0, 0xc($s0) -/* B28544 80240514 08090153 */ j .L8024054C -/* B28548 80240518 00000000 */ nop -.L8024051C: -/* B2854C 8024051C 0C00A67F */ jal rand_int -/* B28550 80240520 2404003C */ addiu $a0, $zero, 0x3c -/* B28554 80240524 C60C000C */ lwc1 $f12, 0xc($s0) -/* B28558 80240528 44820000 */ mtc1 $v0, $f0 -/* B2855C 8024052C 00000000 */ nop -/* B28560 80240530 46800020 */ cvt.s.w $f0, $f0 -/* B28564 80240534 46006300 */ add.s $f12, $f12, $f0 -/* B28568 80240538 3C0141F0 */ lui $at, 0x41f0 -/* B2856C 8024053C 44810000 */ mtc1 $at, $f0 -/* B28570 80240540 0C00A6C9 */ jal clamp_angle -/* B28574 80240544 46006301 */ sub.s $f12, $f12, $f0 -/* B28578 80240548 E600000C */ swc1 $f0, 0xc($s0) -.L8024054C: -/* B2857C 8024054C 8FBF0040 */ lw $ra, 0x40($sp) -/* B28580 80240550 8FB3003C */ lw $s3, 0x3c($sp) -/* B28584 80240554 8FB20038 */ lw $s2, 0x38($sp) -/* B28588 80240558 8FB10034 */ lw $s1, 0x34($sp) -/* B2858C 8024055C 8FB00030 */ lw $s0, 0x30($sp) -/* B28590 80240560 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B28594 80240564 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B28598 80240568 03E00008 */ jr $ra -/* B2859C 8024056C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s b/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s index e56003d1f8..810bfd16dc 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s @@ -103,7 +103,7 @@ glabel func_80240F30_B28F60 .L80241094_B290C4: /* B290C4 80241094 0260202D */ daddu $a0, $s3, $zero /* B290C8 80241098 0280282D */ daddu $a1, $s4, $zero -/* B290CC 8024109C 0C0900D0 */ jal func_80240340_B28370 +/* B290CC 8024109C 0C0900D0 */ jal jan_01_UnkNpcAIFunc36 /* B290D0 802410A0 0200302D */ daddu $a2, $s0, $zero .L802410A4_B290D4: /* B290D4 802410A4 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802408A4_B4B314.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802408A4_B4B314.s deleted file mode 100644 index 7af796ca94..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802408A4_B4B314.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A4_B4B314 -/* B4B314 802408A4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B4B318 802408A8 AFB00030 */ sw $s0, 0x30($sp) -/* B4B31C 802408AC 0080802D */ daddu $s0, $a0, $zero -/* B4B320 802408B0 AFBF0040 */ sw $ra, 0x40($sp) -/* B4B324 802408B4 AFB3003C */ sw $s3, 0x3c($sp) -/* B4B328 802408B8 AFB20038 */ sw $s2, 0x38($sp) -/* B4B32C 802408BC AFB10034 */ sw $s1, 0x34($sp) -/* B4B330 802408C0 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B4B334 802408C4 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B4B338 802408C8 8E130148 */ lw $s3, 0x148($s0) -/* B4B33C 802408CC 00A0882D */ daddu $s1, $a1, $zero -/* B4B340 802408D0 86640008 */ lh $a0, 8($s3) -/* B4B344 802408D4 0C00EABB */ jal get_npc_unsafe -/* B4B348 802408D8 00C0902D */ daddu $s2, $a2, $zero -/* B4B34C 802408DC 0200202D */ daddu $a0, $s0, $zero -/* B4B350 802408E0 0220282D */ daddu $a1, $s1, $zero -/* B4B354 802408E4 0240302D */ daddu $a2, $s2, $zero -/* B4B358 802408E8 0C012568 */ jal func_800495A0 -/* B4B35C 802408EC 0040802D */ daddu $s0, $v0, $zero -/* B4B360 802408F0 8E020000 */ lw $v0, ($s0) -/* B4B364 802408F4 2404002D */ addiu $a0, $zero, 0x2d -/* B4B368 802408F8 34420800 */ ori $v0, $v0, 0x800 -/* B4B36C 802408FC 0C00A67F */ jal rand_int -/* B4B370 80240900 AE020000 */ sw $v0, ($s0) -/* B4B374 80240904 0200202D */ daddu $a0, $s0, $zero -/* B4B378 80240908 3C05B000 */ lui $a1, 0xb000 -/* B4B37C 8024090C 34A50017 */ ori $a1, $a1, 0x17 -/* B4B380 80240910 44820000 */ mtc1 $v0, $f0 -/* B4B384 80240914 00000000 */ nop -/* B4B388 80240918 46800021 */ cvt.d.w $f0, $f0 -/* B4B38C 8024091C 3C014024 */ lui $at, 0x4024 -/* B4B390 80240920 44811800 */ mtc1 $at, $f3 -/* B4B394 80240924 44801000 */ mtc1 $zero, $f2 -/* B4B398 80240928 3C014020 */ lui $at, 0x4020 -/* B4B39C 8024092C 44812800 */ mtc1 $at, $f5 -/* B4B3A0 80240930 44802000 */ mtc1 $zero, $f4 -/* B4B3A4 80240934 46220003 */ div.d $f0, $f0, $f2 -/* B4B3A8 80240938 46240000 */ add.d $f0, $f0, $f4 -/* B4B3AC 8024093C 3C013FC0 */ lui $at, 0x3fc0 -/* B4B3B0 80240940 44811000 */ mtc1 $at, $f2 -/* B4B3B4 80240944 0000302D */ daddu $a2, $zero, $zero -/* B4B3B8 80240948 E6020014 */ swc1 $f2, 0x14($s0) -/* B4B3BC 8024094C 46200020 */ cvt.s.d $f0, $f0 -/* B4B3C0 80240950 0C012530 */ jal ai_enemy_play_sound -/* B4B3C4 80240954 E600001C */ swc1 $f0, 0x1c($s0) -/* B4B3C8 80240958 8E6300D0 */ lw $v1, 0xd0($s3) -/* B4B3CC 8024095C C6000040 */ lwc1 $f0, 0x40($s0) -/* B4B3D0 80240960 C4620000 */ lwc1 $f2, ($v1) -/* B4B3D4 80240964 468010A0 */ cvt.s.w $f2, $f2 -/* B4B3D8 80240968 C4640008 */ lwc1 $f4, 8($v1) -/* B4B3DC 8024096C 46802120 */ cvt.s.w $f4, $f4 -/* B4B3E0 80240970 E7A00010 */ swc1 $f0, 0x10($sp) -/* B4B3E4 80240974 8E6200D0 */ lw $v0, 0xd0($s3) -/* B4B3E8 80240978 44051000 */ mfc1 $a1, $f2 -/* B4B3EC 8024097C C440000C */ lwc1 $f0, 0xc($v0) -/* B4B3F0 80240980 46800020 */ cvt.s.w $f0, $f0 -/* B4B3F4 80240984 E7A00014 */ swc1 $f0, 0x14($sp) -/* B4B3F8 80240988 8E6200D0 */ lw $v0, 0xd0($s3) -/* B4B3FC 8024098C 44062000 */ mfc1 $a2, $f4 -/* B4B400 80240990 C4400010 */ lwc1 $f0, 0x10($v0) -/* B4B404 80240994 46800020 */ cvt.s.w $f0, $f0 -/* B4B408 80240998 E7A00018 */ swc1 $f0, 0x18($sp) -/* B4B40C 8024099C 8C640018 */ lw $a0, 0x18($v1) -/* B4B410 802409A0 0C0123F5 */ jal is_point_within_region -/* B4B414 802409A4 8E070038 */ lw $a3, 0x38($s0) -/* B4B418 802409A8 10400035 */ beqz $v0, .L80240A80 -/* B4B41C 802409AC 00000000 */ nop -/* B4B420 802409B0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B4B424 802409B4 3C0141C8 */ lui $at, 0x41c8 -/* B4B428 802409B8 4481B000 */ mtc1 $at, $f22 -/* B4B42C 802409BC 8E6200D0 */ lw $v0, 0xd0($s3) -/* B4B430 802409C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B4B434 802409C4 C4480000 */ lwc1 $f8, ($v0) -/* B4B438 802409C8 46804220 */ cvt.s.w $f8, $f8 -/* B4B43C 802409CC 44064000 */ mfc1 $a2, $f8 -/* B4B440 802409D0 C4480008 */ lwc1 $f8, 8($v0) -/* B4B444 802409D4 46804220 */ cvt.s.w $f8, $f8 -/* B4B448 802409D8 44074000 */ mfc1 $a3, $f8 -/* B4B44C 802409DC 3C01403E */ lui $at, 0x403e -/* B4B450 802409E0 4481A800 */ mtc1 $at, $f21 -/* B4B454 802409E4 4480A000 */ mtc1 $zero, $f20 -/* B4B458 802409E8 0C00A720 */ jal atan2 -/* B4B45C 802409EC 0000882D */ daddu $s1, $zero, $zero -/* B4B460 802409F0 C6020038 */ lwc1 $f2, 0x38($s0) -/* B4B464 802409F4 C604003C */ lwc1 $f4, 0x3c($s0) -/* B4B468 802409F8 C6060040 */ lwc1 $f6, 0x40($s0) -/* B4B46C 802409FC E600000C */ swc1 $f0, 0xc($s0) -/* B4B470 80240A00 E7A20020 */ swc1 $f2, 0x20($sp) -/* B4B474 80240A04 E7A40024 */ swc1 $f4, 0x24($sp) -/* B4B478 80240A08 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240A0C: -/* B4B47C 80240A0C E7B60010 */ swc1 $f22, 0x10($sp) -/* B4B480 80240A10 C600000C */ lwc1 $f0, 0xc($s0) -/* B4B484 80240A14 E7A00014 */ swc1 $f0, 0x14($sp) -/* B4B488 80240A18 860200A8 */ lh $v0, 0xa8($s0) -/* B4B48C 80240A1C 27A50020 */ addiu $a1, $sp, 0x20 -/* B4B490 80240A20 44820000 */ mtc1 $v0, $f0 -/* B4B494 80240A24 00000000 */ nop -/* B4B498 80240A28 46800020 */ cvt.s.w $f0, $f0 -/* B4B49C 80240A2C E7A00018 */ swc1 $f0, 0x18($sp) -/* B4B4A0 80240A30 860200A6 */ lh $v0, 0xa6($s0) -/* B4B4A4 80240A34 27A60024 */ addiu $a2, $sp, 0x24 -/* B4B4A8 80240A38 44820000 */ mtc1 $v0, $f0 -/* B4B4AC 80240A3C 00000000 */ nop -/* B4B4B0 80240A40 46800020 */ cvt.s.w $f0, $f0 -/* B4B4B4 80240A44 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B4B4B8 80240A48 8E040080 */ lw $a0, 0x80($s0) -/* B4B4BC 80240A4C 0C037711 */ jal npc_test_move_simple_with_slipping -/* B4B4C0 80240A50 27A70028 */ addiu $a3, $sp, 0x28 -/* B4B4C4 80240A54 10400016 */ beqz $v0, .L80240AB0 -/* B4B4C8 80240A58 26310001 */ addiu $s1, $s1, 1 -/* B4B4CC 80240A5C C600000C */ lwc1 $f0, 0xc($s0) -/* B4B4D0 80240A60 46000021 */ cvt.d.s $f0, $f0 -/* B4B4D4 80240A64 46340000 */ add.d $f0, $f0, $f20 -/* B4B4D8 80240A68 2A220006 */ slti $v0, $s1, 6 -/* B4B4DC 80240A6C 46200020 */ cvt.s.d $f0, $f0 -/* B4B4E0 80240A70 1440FFE6 */ bnez $v0, .L80240A0C -/* B4B4E4 80240A74 E600000C */ swc1 $f0, 0xc($s0) -/* B4B4E8 80240A78 080902AC */ j .L80240AB0 -/* B4B4EC 80240A7C 00000000 */ nop -.L80240A80: -/* B4B4F0 80240A80 0C00A67F */ jal rand_int -/* B4B4F4 80240A84 2404003C */ addiu $a0, $zero, 0x3c -/* B4B4F8 80240A88 C60C000C */ lwc1 $f12, 0xc($s0) -/* B4B4FC 80240A8C 44820000 */ mtc1 $v0, $f0 -/* B4B500 80240A90 00000000 */ nop -/* B4B504 80240A94 46800020 */ cvt.s.w $f0, $f0 -/* B4B508 80240A98 46006300 */ add.s $f12, $f12, $f0 -/* B4B50C 80240A9C 3C0141F0 */ lui $at, 0x41f0 -/* B4B510 80240AA0 44810000 */ mtc1 $at, $f0 -/* B4B514 80240AA4 0C00A6C9 */ jal clamp_angle -/* B4B518 80240AA8 46006301 */ sub.s $f12, $f12, $f0 -/* B4B51C 80240AAC E600000C */ swc1 $f0, 0xc($s0) -.L80240AB0: -/* B4B520 80240AB0 8FBF0040 */ lw $ra, 0x40($sp) -/* B4B524 80240AB4 8FB3003C */ lw $s3, 0x3c($sp) -/* B4B528 80240AB8 8FB20038 */ lw $s2, 0x38($sp) -/* B4B52C 80240ABC 8FB10034 */ lw $s1, 0x34($sp) -/* B4B530 80240AC0 8FB00030 */ lw $s0, 0x30($sp) -/* B4B534 80240AC4 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B4B538 80240AC8 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B4B53C 80240ACC 03E00008 */ jr $ra -/* B4B540 80240AD0 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s index 5129a3a1ac..be001a17bb 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s @@ -103,7 +103,7 @@ glabel func_80241494_B4BF04 .L802415F8_B4C068: /* B4C068 802415F8 0260202D */ daddu $a0, $s3, $zero /* B4C06C 802415FC 0280282D */ daddu $a1, $s4, $zero -/* B4C070 80241600 0C090229 */ jal func_802408A4_B4B314 +/* B4C070 80241600 0C090229 */ jal jan_05_UnkNpcAIFunc36 /* B4C074 80241604 0200302D */ daddu $a2, $s0, $zero .L80241608_B4C078: /* B4C078 80241608 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740_B52F70.s b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740_B52F70.s deleted file mode 100644 index a9ea525a88..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740_B52F70.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240740_B52F70 -/* B52F70 80240740 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B52F74 80240744 AFB00030 */ sw $s0, 0x30($sp) -/* B52F78 80240748 0080802D */ daddu $s0, $a0, $zero -/* B52F7C 8024074C AFBF0040 */ sw $ra, 0x40($sp) -/* B52F80 80240750 AFB3003C */ sw $s3, 0x3c($sp) -/* B52F84 80240754 AFB20038 */ sw $s2, 0x38($sp) -/* B52F88 80240758 AFB10034 */ sw $s1, 0x34($sp) -/* B52F8C 8024075C F7B60050 */ sdc1 $f22, 0x50($sp) -/* B52F90 80240760 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B52F94 80240764 8E130148 */ lw $s3, 0x148($s0) -/* B52F98 80240768 00A0882D */ daddu $s1, $a1, $zero -/* B52F9C 8024076C 86640008 */ lh $a0, 8($s3) -/* B52FA0 80240770 0C00EABB */ jal get_npc_unsafe -/* B52FA4 80240774 00C0902D */ daddu $s2, $a2, $zero -/* B52FA8 80240778 0200202D */ daddu $a0, $s0, $zero -/* B52FAC 8024077C 0220282D */ daddu $a1, $s1, $zero -/* B52FB0 80240780 0240302D */ daddu $a2, $s2, $zero -/* B52FB4 80240784 0C012568 */ jal func_800495A0 -/* B52FB8 80240788 0040802D */ daddu $s0, $v0, $zero -/* B52FBC 8024078C 8E020000 */ lw $v0, ($s0) -/* B52FC0 80240790 2404002D */ addiu $a0, $zero, 0x2d -/* B52FC4 80240794 34420800 */ ori $v0, $v0, 0x800 -/* B52FC8 80240798 0C00A67F */ jal rand_int -/* B52FCC 8024079C AE020000 */ sw $v0, ($s0) -/* B52FD0 802407A0 0200202D */ daddu $a0, $s0, $zero -/* B52FD4 802407A4 3C05B000 */ lui $a1, 0xb000 -/* B52FD8 802407A8 34A50017 */ ori $a1, $a1, 0x17 -/* B52FDC 802407AC 44820000 */ mtc1 $v0, $f0 -/* B52FE0 802407B0 00000000 */ nop -/* B52FE4 802407B4 46800021 */ cvt.d.w $f0, $f0 -/* B52FE8 802407B8 3C014024 */ lui $at, 0x4024 -/* B52FEC 802407BC 44811800 */ mtc1 $at, $f3 -/* B52FF0 802407C0 44801000 */ mtc1 $zero, $f2 -/* B52FF4 802407C4 3C014020 */ lui $at, 0x4020 -/* B52FF8 802407C8 44812800 */ mtc1 $at, $f5 -/* B52FFC 802407CC 44802000 */ mtc1 $zero, $f4 -/* B53000 802407D0 46220003 */ div.d $f0, $f0, $f2 -/* B53004 802407D4 46240000 */ add.d $f0, $f0, $f4 -/* B53008 802407D8 3C013FC0 */ lui $at, 0x3fc0 -/* B5300C 802407DC 44811000 */ mtc1 $at, $f2 -/* B53010 802407E0 0000302D */ daddu $a2, $zero, $zero -/* B53014 802407E4 E6020014 */ swc1 $f2, 0x14($s0) -/* B53018 802407E8 46200020 */ cvt.s.d $f0, $f0 -/* B5301C 802407EC 0C012530 */ jal ai_enemy_play_sound -/* B53020 802407F0 E600001C */ swc1 $f0, 0x1c($s0) -/* B53024 802407F4 8E6300D0 */ lw $v1, 0xd0($s3) -/* B53028 802407F8 C6000040 */ lwc1 $f0, 0x40($s0) -/* B5302C 802407FC C4620000 */ lwc1 $f2, ($v1) -/* B53030 80240800 468010A0 */ cvt.s.w $f2, $f2 -/* B53034 80240804 C4640008 */ lwc1 $f4, 8($v1) -/* B53038 80240808 46802120 */ cvt.s.w $f4, $f4 -/* B5303C 8024080C E7A00010 */ swc1 $f0, 0x10($sp) -/* B53040 80240810 8E6200D0 */ lw $v0, 0xd0($s3) -/* B53044 80240814 44051000 */ mfc1 $a1, $f2 -/* B53048 80240818 C440000C */ lwc1 $f0, 0xc($v0) -/* B5304C 8024081C 46800020 */ cvt.s.w $f0, $f0 -/* B53050 80240820 E7A00014 */ swc1 $f0, 0x14($sp) -/* B53054 80240824 8E6200D0 */ lw $v0, 0xd0($s3) -/* B53058 80240828 44062000 */ mfc1 $a2, $f4 -/* B5305C 8024082C C4400010 */ lwc1 $f0, 0x10($v0) -/* B53060 80240830 46800020 */ cvt.s.w $f0, $f0 -/* B53064 80240834 E7A00018 */ swc1 $f0, 0x18($sp) -/* B53068 80240838 8C640018 */ lw $a0, 0x18($v1) -/* B5306C 8024083C 0C0123F5 */ jal is_point_within_region -/* B53070 80240840 8E070038 */ lw $a3, 0x38($s0) -/* B53074 80240844 10400035 */ beqz $v0, .L8024091C -/* B53078 80240848 00000000 */ nop -/* B5307C 8024084C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B53080 80240850 3C0141C8 */ lui $at, 0x41c8 -/* B53084 80240854 4481B000 */ mtc1 $at, $f22 -/* B53088 80240858 8E6200D0 */ lw $v0, 0xd0($s3) -/* B5308C 8024085C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B53090 80240860 C4480000 */ lwc1 $f8, ($v0) -/* B53094 80240864 46804220 */ cvt.s.w $f8, $f8 -/* B53098 80240868 44064000 */ mfc1 $a2, $f8 -/* B5309C 8024086C C4480008 */ lwc1 $f8, 8($v0) -/* B530A0 80240870 46804220 */ cvt.s.w $f8, $f8 -/* B530A4 80240874 44074000 */ mfc1 $a3, $f8 -/* B530A8 80240878 3C01403E */ lui $at, 0x403e -/* B530AC 8024087C 4481A800 */ mtc1 $at, $f21 -/* B530B0 80240880 4480A000 */ mtc1 $zero, $f20 -/* B530B4 80240884 0C00A720 */ jal atan2 -/* B530B8 80240888 0000882D */ daddu $s1, $zero, $zero -/* B530BC 8024088C C6020038 */ lwc1 $f2, 0x38($s0) -/* B530C0 80240890 C604003C */ lwc1 $f4, 0x3c($s0) -/* B530C4 80240894 C6060040 */ lwc1 $f6, 0x40($s0) -/* B530C8 80240898 E600000C */ swc1 $f0, 0xc($s0) -/* B530CC 8024089C E7A20020 */ swc1 $f2, 0x20($sp) -/* B530D0 802408A0 E7A40024 */ swc1 $f4, 0x24($sp) -/* B530D4 802408A4 E7A60028 */ swc1 $f6, 0x28($sp) -.L802408A8: -/* B530D8 802408A8 E7B60010 */ swc1 $f22, 0x10($sp) -/* B530DC 802408AC C600000C */ lwc1 $f0, 0xc($s0) -/* B530E0 802408B0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B530E4 802408B4 860200A8 */ lh $v0, 0xa8($s0) -/* B530E8 802408B8 27A50020 */ addiu $a1, $sp, 0x20 -/* B530EC 802408BC 44820000 */ mtc1 $v0, $f0 -/* B530F0 802408C0 00000000 */ nop -/* B530F4 802408C4 46800020 */ cvt.s.w $f0, $f0 -/* B530F8 802408C8 E7A00018 */ swc1 $f0, 0x18($sp) -/* B530FC 802408CC 860200A6 */ lh $v0, 0xa6($s0) -/* B53100 802408D0 27A60024 */ addiu $a2, $sp, 0x24 -/* B53104 802408D4 44820000 */ mtc1 $v0, $f0 -/* B53108 802408D8 00000000 */ nop -/* B5310C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* B53110 802408E0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B53114 802408E4 8E040080 */ lw $a0, 0x80($s0) -/* B53118 802408E8 0C037711 */ jal npc_test_move_simple_with_slipping -/* B5311C 802408EC 27A70028 */ addiu $a3, $sp, 0x28 -/* B53120 802408F0 10400016 */ beqz $v0, .L8024094C -/* B53124 802408F4 26310001 */ addiu $s1, $s1, 1 -/* B53128 802408F8 C600000C */ lwc1 $f0, 0xc($s0) -/* B5312C 802408FC 46000021 */ cvt.d.s $f0, $f0 -/* B53130 80240900 46340000 */ add.d $f0, $f0, $f20 -/* B53134 80240904 2A220006 */ slti $v0, $s1, 6 -/* B53138 80240908 46200020 */ cvt.s.d $f0, $f0 -/* B5313C 8024090C 1440FFE6 */ bnez $v0, .L802408A8 -/* B53140 80240910 E600000C */ swc1 $f0, 0xc($s0) -/* B53144 80240914 08090253 */ j .L8024094C -/* B53148 80240918 00000000 */ nop -.L8024091C: -/* B5314C 8024091C 0C00A67F */ jal rand_int -/* B53150 80240920 2404003C */ addiu $a0, $zero, 0x3c -/* B53154 80240924 C60C000C */ lwc1 $f12, 0xc($s0) -/* B53158 80240928 44820000 */ mtc1 $v0, $f0 -/* B5315C 8024092C 00000000 */ nop -/* B53160 80240930 46800020 */ cvt.s.w $f0, $f0 -/* B53164 80240934 46006300 */ add.s $f12, $f12, $f0 -/* B53168 80240938 3C0141F0 */ lui $at, 0x41f0 -/* B5316C 8024093C 44810000 */ mtc1 $at, $f0 -/* B53170 80240940 0C00A6C9 */ jal clamp_angle -/* B53174 80240944 46006301 */ sub.s $f12, $f12, $f0 -/* B53178 80240948 E600000C */ swc1 $f0, 0xc($s0) -.L8024094C: -/* B5317C 8024094C 8FBF0040 */ lw $ra, 0x40($sp) -/* B53180 80240950 8FB3003C */ lw $s3, 0x3c($sp) -/* B53184 80240954 8FB20038 */ lw $s2, 0x38($sp) -/* B53188 80240958 8FB10034 */ lw $s1, 0x34($sp) -/* B5318C 8024095C 8FB00030 */ lw $s0, 0x30($sp) -/* B53190 80240960 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B53194 80240964 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B53198 80240968 03E00008 */ jr $ra -/* B5319C 8024096C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s index 02b31fabd2..376fa95e01 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s @@ -103,7 +103,7 @@ glabel func_80241330_B53B60 .L80241494_B53CC4: /* B53CC4 80241494 0260202D */ daddu $a0, $s3, $zero /* B53CC8 80241498 0280282D */ daddu $a1, $s4, $zero -/* B53CCC 8024149C 0C0901D0 */ jal func_80240740_B52F70 +/* B53CCC 8024149C 0C0901D0 */ jal jan_06_UnkNpcAIFunc36 /* B53CD0 802414A0 0200302D */ daddu $a2, $s0, $zero .L802414A4_B53CD4: /* B53CD4 802414A4 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240310_B6C6A0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240310_B6C6A0.s deleted file mode 100644 index a47a1a215e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240310_B6C6A0.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_B6C6A0 -/* B6C6A0 80240310 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B6C6A4 80240314 AFB00030 */ sw $s0, 0x30($sp) -/* B6C6A8 80240318 0080802D */ daddu $s0, $a0, $zero -/* B6C6AC 8024031C AFBF0040 */ sw $ra, 0x40($sp) -/* B6C6B0 80240320 AFB3003C */ sw $s3, 0x3c($sp) -/* B6C6B4 80240324 AFB20038 */ sw $s2, 0x38($sp) -/* B6C6B8 80240328 AFB10034 */ sw $s1, 0x34($sp) -/* B6C6BC 8024032C F7B60050 */ sdc1 $f22, 0x50($sp) -/* B6C6C0 80240330 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B6C6C4 80240334 8E130148 */ lw $s3, 0x148($s0) -/* B6C6C8 80240338 00A0882D */ daddu $s1, $a1, $zero -/* B6C6CC 8024033C 86640008 */ lh $a0, 8($s3) -/* B6C6D0 80240340 0C00EABB */ jal get_npc_unsafe -/* B6C6D4 80240344 00C0902D */ daddu $s2, $a2, $zero -/* B6C6D8 80240348 0200202D */ daddu $a0, $s0, $zero -/* B6C6DC 8024034C 0220282D */ daddu $a1, $s1, $zero -/* B6C6E0 80240350 0240302D */ daddu $a2, $s2, $zero -/* B6C6E4 80240354 0C012568 */ jal func_800495A0 -/* B6C6E8 80240358 0040802D */ daddu $s0, $v0, $zero -/* B6C6EC 8024035C 8E020000 */ lw $v0, ($s0) -/* B6C6F0 80240360 2404002D */ addiu $a0, $zero, 0x2d -/* B6C6F4 80240364 34420800 */ ori $v0, $v0, 0x800 -/* B6C6F8 80240368 0C00A67F */ jal rand_int -/* B6C6FC 8024036C AE020000 */ sw $v0, ($s0) -/* B6C700 80240370 0200202D */ daddu $a0, $s0, $zero -/* B6C704 80240374 3C05B000 */ lui $a1, 0xb000 -/* B6C708 80240378 34A50017 */ ori $a1, $a1, 0x17 -/* B6C70C 8024037C 44820000 */ mtc1 $v0, $f0 -/* B6C710 80240380 00000000 */ nop -/* B6C714 80240384 46800021 */ cvt.d.w $f0, $f0 -/* B6C718 80240388 3C014024 */ lui $at, 0x4024 -/* B6C71C 8024038C 44811800 */ mtc1 $at, $f3 -/* B6C720 80240390 44801000 */ mtc1 $zero, $f2 -/* B6C724 80240394 3C014020 */ lui $at, 0x4020 -/* B6C728 80240398 44812800 */ mtc1 $at, $f5 -/* B6C72C 8024039C 44802000 */ mtc1 $zero, $f4 -/* B6C730 802403A0 46220003 */ div.d $f0, $f0, $f2 -/* B6C734 802403A4 46240000 */ add.d $f0, $f0, $f4 -/* B6C738 802403A8 3C013FC0 */ lui $at, 0x3fc0 -/* B6C73C 802403AC 44811000 */ mtc1 $at, $f2 -/* B6C740 802403B0 0000302D */ daddu $a2, $zero, $zero -/* B6C744 802403B4 E6020014 */ swc1 $f2, 0x14($s0) -/* B6C748 802403B8 46200020 */ cvt.s.d $f0, $f0 -/* B6C74C 802403BC 0C012530 */ jal ai_enemy_play_sound -/* B6C750 802403C0 E600001C */ swc1 $f0, 0x1c($s0) -/* B6C754 802403C4 8E6300D0 */ lw $v1, 0xd0($s3) -/* B6C758 802403C8 C6000040 */ lwc1 $f0, 0x40($s0) -/* B6C75C 802403CC C4620000 */ lwc1 $f2, ($v1) -/* B6C760 802403D0 468010A0 */ cvt.s.w $f2, $f2 -/* B6C764 802403D4 C4640008 */ lwc1 $f4, 8($v1) -/* B6C768 802403D8 46802120 */ cvt.s.w $f4, $f4 -/* B6C76C 802403DC E7A00010 */ swc1 $f0, 0x10($sp) -/* B6C770 802403E0 8E6200D0 */ lw $v0, 0xd0($s3) -/* B6C774 802403E4 44051000 */ mfc1 $a1, $f2 -/* B6C778 802403E8 C440000C */ lwc1 $f0, 0xc($v0) -/* B6C77C 802403EC 46800020 */ cvt.s.w $f0, $f0 -/* B6C780 802403F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B6C784 802403F4 8E6200D0 */ lw $v0, 0xd0($s3) -/* B6C788 802403F8 44062000 */ mfc1 $a2, $f4 -/* B6C78C 802403FC C4400010 */ lwc1 $f0, 0x10($v0) -/* B6C790 80240400 46800020 */ cvt.s.w $f0, $f0 -/* B6C794 80240404 E7A00018 */ swc1 $f0, 0x18($sp) -/* B6C798 80240408 8C640018 */ lw $a0, 0x18($v1) -/* B6C79C 8024040C 0C0123F5 */ jal is_point_within_region -/* B6C7A0 80240410 8E070038 */ lw $a3, 0x38($s0) -/* B6C7A4 80240414 10400035 */ beqz $v0, .L802404EC -/* B6C7A8 80240418 00000000 */ nop -/* B6C7AC 8024041C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B6C7B0 80240420 3C0141C8 */ lui $at, 0x41c8 -/* B6C7B4 80240424 4481B000 */ mtc1 $at, $f22 -/* B6C7B8 80240428 8E6200D0 */ lw $v0, 0xd0($s3) -/* B6C7BC 8024042C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B6C7C0 80240430 C4480000 */ lwc1 $f8, ($v0) -/* B6C7C4 80240434 46804220 */ cvt.s.w $f8, $f8 -/* B6C7C8 80240438 44064000 */ mfc1 $a2, $f8 -/* B6C7CC 8024043C C4480008 */ lwc1 $f8, 8($v0) -/* B6C7D0 80240440 46804220 */ cvt.s.w $f8, $f8 -/* B6C7D4 80240444 44074000 */ mfc1 $a3, $f8 -/* B6C7D8 80240448 3C01403E */ lui $at, 0x403e -/* B6C7DC 8024044C 4481A800 */ mtc1 $at, $f21 -/* B6C7E0 80240450 4480A000 */ mtc1 $zero, $f20 -/* B6C7E4 80240454 0C00A720 */ jal atan2 -/* B6C7E8 80240458 0000882D */ daddu $s1, $zero, $zero -/* B6C7EC 8024045C C6020038 */ lwc1 $f2, 0x38($s0) -/* B6C7F0 80240460 C604003C */ lwc1 $f4, 0x3c($s0) -/* B6C7F4 80240464 C6060040 */ lwc1 $f6, 0x40($s0) -/* B6C7F8 80240468 E600000C */ swc1 $f0, 0xc($s0) -/* B6C7FC 8024046C E7A20020 */ swc1 $f2, 0x20($sp) -/* B6C800 80240470 E7A40024 */ swc1 $f4, 0x24($sp) -/* B6C804 80240474 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240478: -/* B6C808 80240478 E7B60010 */ swc1 $f22, 0x10($sp) -/* B6C80C 8024047C C600000C */ lwc1 $f0, 0xc($s0) -/* B6C810 80240480 E7A00014 */ swc1 $f0, 0x14($sp) -/* B6C814 80240484 860200A8 */ lh $v0, 0xa8($s0) -/* B6C818 80240488 27A50020 */ addiu $a1, $sp, 0x20 -/* B6C81C 8024048C 44820000 */ mtc1 $v0, $f0 -/* B6C820 80240490 00000000 */ nop -/* B6C824 80240494 46800020 */ cvt.s.w $f0, $f0 -/* B6C828 80240498 E7A00018 */ swc1 $f0, 0x18($sp) -/* B6C82C 8024049C 860200A6 */ lh $v0, 0xa6($s0) -/* B6C830 802404A0 27A60024 */ addiu $a2, $sp, 0x24 -/* B6C834 802404A4 44820000 */ mtc1 $v0, $f0 -/* B6C838 802404A8 00000000 */ nop -/* B6C83C 802404AC 46800020 */ cvt.s.w $f0, $f0 -/* B6C840 802404B0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B6C844 802404B4 8E040080 */ lw $a0, 0x80($s0) -/* B6C848 802404B8 0C037711 */ jal npc_test_move_simple_with_slipping -/* B6C84C 802404BC 27A70028 */ addiu $a3, $sp, 0x28 -/* B6C850 802404C0 10400016 */ beqz $v0, .L8024051C -/* B6C854 802404C4 26310001 */ addiu $s1, $s1, 1 -/* B6C858 802404C8 C600000C */ lwc1 $f0, 0xc($s0) -/* B6C85C 802404CC 46000021 */ cvt.d.s $f0, $f0 -/* B6C860 802404D0 46340000 */ add.d $f0, $f0, $f20 -/* B6C864 802404D4 2A220006 */ slti $v0, $s1, 6 -/* B6C868 802404D8 46200020 */ cvt.s.d $f0, $f0 -/* B6C86C 802404DC 1440FFE6 */ bnez $v0, .L80240478 -/* B6C870 802404E0 E600000C */ swc1 $f0, 0xc($s0) -/* B6C874 802404E4 08090147 */ j .L8024051C -/* B6C878 802404E8 00000000 */ nop -.L802404EC: -/* B6C87C 802404EC 0C00A67F */ jal rand_int -/* B6C880 802404F0 2404003C */ addiu $a0, $zero, 0x3c -/* B6C884 802404F4 C60C000C */ lwc1 $f12, 0xc($s0) -/* B6C888 802404F8 44820000 */ mtc1 $v0, $f0 -/* B6C88C 802404FC 00000000 */ nop -/* B6C890 80240500 46800020 */ cvt.s.w $f0, $f0 -/* B6C894 80240504 46006300 */ add.s $f12, $f12, $f0 -/* B6C898 80240508 3C0141F0 */ lui $at, 0x41f0 -/* B6C89C 8024050C 44810000 */ mtc1 $at, $f0 -/* B6C8A0 80240510 0C00A6C9 */ jal clamp_angle -/* B6C8A4 80240514 46006301 */ sub.s $f12, $f12, $f0 -/* B6C8A8 80240518 E600000C */ swc1 $f0, 0xc($s0) -.L8024051C: -/* B6C8AC 8024051C 8FBF0040 */ lw $ra, 0x40($sp) -/* B6C8B0 80240520 8FB3003C */ lw $s3, 0x3c($sp) -/* B6C8B4 80240524 8FB20038 */ lw $s2, 0x38($sp) -/* B6C8B8 80240528 8FB10034 */ lw $s1, 0x34($sp) -/* B6C8BC 8024052C 8FB00030 */ lw $s0, 0x30($sp) -/* B6C8C0 80240530 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B6C8C4 80240534 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B6C8C8 80240538 03E00008 */ jr $ra -/* B6C8CC 8024053C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s b/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s index 0abc44dbcd..b7f3c0964c 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s @@ -103,7 +103,7 @@ glabel func_80240F00_B6D290 .L80241064_B6D3F4: /* B6D3F4 80241064 0260202D */ daddu $a0, $s3, $zero /* B6D3F8 80241068 0280282D */ daddu $a1, $s4, $zero -/* B6D3FC 8024106C 0C0900C4 */ jal func_80240310_B6C6A0 +/* B6D3FC 8024106C 0C0900C4 */ jal jan_10_UnkNpcAIFunc36 /* B6D400 80241070 0200302D */ daddu $a2, $s0, $zero .L80241074_B6D404: /* B6D404 80241074 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438_B70C98.s b/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438_B70C98.s deleted file mode 100644 index c03df4bdd1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438_B70C98.s +++ /dev/null @@ -1,236 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240438_B70C98 -/* B70C98 80240438 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B70C9C 8024043C AFB3001C */ sw $s3, 0x1c($sp) -/* B70CA0 80240440 0080982D */ daddu $s3, $a0, $zero -/* B70CA4 80240444 AFBF0020 */ sw $ra, 0x20($sp) -/* B70CA8 80240448 AFB20018 */ sw $s2, 0x18($sp) -/* B70CAC 8024044C AFB10014 */ sw $s1, 0x14($sp) -/* B70CB0 80240450 AFB00010 */ sw $s0, 0x10($sp) -/* B70CB4 80240454 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* B70CB8 80240458 F7B80038 */ sdc1 $f24, 0x38($sp) -/* B70CBC 8024045C F7B60030 */ sdc1 $f22, 0x30($sp) -/* B70CC0 80240460 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B70CC4 80240464 8E62000C */ lw $v0, 0xc($s3) -/* B70CC8 80240468 0C0B1EAF */ jal evt_get_variable -/* B70CCC 8024046C 8C450000 */ lw $a1, ($v0) -/* B70CD0 80240470 2404FFFC */ addiu $a0, $zero, -4 -/* B70CD4 80240474 0C00EABB */ jal get_npc_unsafe -/* B70CD8 80240478 0040802D */ daddu $s0, $v0, $zero -/* B70CDC 8024047C 0200202D */ daddu $a0, $s0, $zero -/* B70CE0 80240480 0C046C04 */ jal get_model_list_index_from_tree_index -/* B70CE4 80240484 0040802D */ daddu $s0, $v0, $zero -/* B70CE8 80240488 0C046B4C */ jal get_model_from_list_index -/* B70CEC 8024048C 0040202D */ daddu $a0, $v0, $zero -/* B70CF0 80240490 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* B70CF4 80240494 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* B70CF8 80240498 0040902D */ daddu $s2, $v0, $zero -/* B70CFC 8024049C AE60008C */ sw $zero, 0x8c($s3) -/* B70D00 802404A0 C4620028 */ lwc1 $f2, 0x28($v1) -/* B70D04 802404A4 C6400098 */ lwc1 $f0, 0x98($s2) -/* B70D08 802404A8 46001081 */ sub.s $f2, $f2, $f0 -/* B70D0C 802404AC 46021182 */ mul.s $f6, $f2, $f2 -/* B70D10 802404B0 00000000 */ nop -/* B70D14 802404B4 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* B70D18 802404B8 C4620030 */ lwc1 $f2, 0x30($v1) -/* B70D1C 802404BC 46001081 */ sub.s $f2, $f2, $f0 -/* B70D20 802404C0 46021102 */ mul.s $f4, $f2, $f2 -/* B70D24 802404C4 00000000 */ nop -/* B70D28 802404C8 846200B0 */ lh $v0, 0xb0($v1) -/* B70D2C 802404CC C462002C */ lwc1 $f2, 0x2c($v1) -/* B70D30 802404D0 44820000 */ mtc1 $v0, $f0 -/* B70D34 802404D4 00000000 */ nop -/* B70D38 802404D8 46800020 */ cvt.s.w $f0, $f0 -/* B70D3C 802404DC 46001080 */ add.s $f2, $f2, $f0 -/* B70D40 802404E0 3C013FC0 */ lui $at, 0x3fc0 -/* B70D44 802404E4 44810000 */ mtc1 $at, $f0 -/* B70D48 802404E8 00000000 */ nop -/* B70D4C 802404EC 46001081 */ sub.s $f2, $f2, $f0 -/* B70D50 802404F0 46043300 */ add.s $f12, $f6, $f4 -/* B70D54 802404F4 C640009C */ lwc1 $f0, 0x9c($s2) -/* B70D58 802404F8 46001501 */ sub.s $f20, $f2, $f0 -/* B70D5C 802404FC 46006084 */ sqrt.s $f2, $f12 -/* B70D60 80240500 46021032 */ c.eq.s $f2, $f2 -/* B70D64 80240504 00000000 */ nop -/* B70D68 80240508 45010004 */ bc1t .L8024051C -/* B70D6C 8024050C 0060882D */ daddu $s1, $v1, $zero -/* B70D70 80240510 0C0187BC */ jal sqrtf -/* B70D74 80240514 00000000 */ nop -/* B70D78 80240518 46000086 */ mov.s $f2, $f0 -.L8024051C: -/* B70D7C 8024051C 44800000 */ mtc1 $zero, $f0 -/* B70D80 80240520 00000000 */ nop -/* B70D84 80240524 4614003C */ c.lt.s $f0, $f20 -/* B70D88 80240528 00000000 */ nop -/* B70D8C 8024052C 45000016 */ bc1f .L80240588 -/* B70D90 80240530 46001106 */ mov.s $f4, $f2 -/* B70D94 80240534 862200B0 */ lh $v0, 0xb0($s1) -/* B70D98 80240538 44820000 */ mtc1 $v0, $f0 -/* B70D9C 8024053C 00000000 */ nop -/* B70DA0 80240540 46800020 */ cvt.s.w $f0, $f0 -/* B70DA4 80240544 4600A03C */ c.lt.s $f20, $f0 -/* B70DA8 80240548 00000000 */ nop -/* B70DAC 8024054C 4500000E */ bc1f .L80240588 -/* B70DB0 80240550 00000000 */ nop -/* B70DB4 80240554 862200B2 */ lh $v0, 0xb2($s1) -/* B70DB8 80240558 3C013F00 */ lui $at, 0x3f00 -/* B70DBC 8024055C 44811000 */ mtc1 $at, $f2 -/* B70DC0 80240560 44820000 */ mtc1 $v0, $f0 -/* B70DC4 80240564 00000000 */ nop -/* B70DC8 80240568 46800020 */ cvt.s.w $f0, $f0 -/* B70DCC 8024056C 46020002 */ mul.s $f0, $f0, $f2 -/* B70DD0 80240570 00000000 */ nop -/* B70DD4 80240574 4600203C */ c.lt.s $f4, $f0 -/* B70DD8 80240578 00000000 */ nop -/* B70DDC 8024057C 45000002 */ bc1f .L80240588 -/* B70DE0 80240580 24020001 */ addiu $v0, $zero, 1 -/* B70DE4 80240584 AE62008C */ sw $v0, 0x8c($s3) -.L80240588: -/* B70DE8 80240588 C6020038 */ lwc1 $f2, 0x38($s0) -/* B70DEC 8024058C C6400098 */ lwc1 $f0, 0x98($s2) -/* B70DF0 80240590 46001081 */ sub.s $f2, $f2, $f0 -/* B70DF4 80240594 46021182 */ mul.s $f6, $f2, $f2 -/* B70DF8 80240598 00000000 */ nop -/* B70DFC 8024059C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* B70E00 802405A0 C6020040 */ lwc1 $f2, 0x40($s0) -/* B70E04 802405A4 46001081 */ sub.s $f2, $f2, $f0 -/* B70E08 802405A8 46021102 */ mul.s $f4, $f2, $f2 -/* B70E0C 802405AC 00000000 */ nop -/* B70E10 802405B0 860200A8 */ lh $v0, 0xa8($s0) -/* B70E14 802405B4 C602003C */ lwc1 $f2, 0x3c($s0) -/* B70E18 802405B8 44820000 */ mtc1 $v0, $f0 -/* B70E1C 802405BC 00000000 */ nop -/* B70E20 802405C0 46800020 */ cvt.s.w $f0, $f0 -/* B70E24 802405C4 46001080 */ add.s $f2, $f2, $f0 -/* B70E28 802405C8 3C013FC0 */ lui $at, 0x3fc0 -/* B70E2C 802405CC 44810000 */ mtc1 $at, $f0 -/* B70E30 802405D0 00000000 */ nop -/* B70E34 802405D4 46001081 */ sub.s $f2, $f2, $f0 -/* B70E38 802405D8 46043300 */ add.s $f12, $f6, $f4 -/* B70E3C 802405DC C640009C */ lwc1 $f0, 0x9c($s2) -/* B70E40 802405E0 46001501 */ sub.s $f20, $f2, $f0 -/* B70E44 802405E4 46006084 */ sqrt.s $f2, $f12 -/* B70E48 802405E8 46021032 */ c.eq.s $f2, $f2 -/* B70E4C 802405EC 00000000 */ nop -/* B70E50 802405F0 45010004 */ bc1t .L80240604 -/* B70E54 802405F4 00000000 */ nop -/* B70E58 802405F8 0C0187BC */ jal sqrtf -/* B70E5C 802405FC 00000000 */ nop -/* B70E60 80240600 46000086 */ mov.s $f2, $f0 -.L80240604: -/* B70E64 80240604 44800000 */ mtc1 $zero, $f0 -/* B70E68 80240608 00000000 */ nop -/* B70E6C 8024060C 4614003C */ c.lt.s $f0, $f20 -/* B70E70 80240610 00000000 */ nop -/* B70E74 80240614 45000016 */ bc1f .L80240670 -/* B70E78 80240618 46001106 */ mov.s $f4, $f2 -/* B70E7C 8024061C 860200A8 */ lh $v0, 0xa8($s0) -/* B70E80 80240620 44820000 */ mtc1 $v0, $f0 -/* B70E84 80240624 00000000 */ nop -/* B70E88 80240628 46800020 */ cvt.s.w $f0, $f0 -/* B70E8C 8024062C 4600A03C */ c.lt.s $f20, $f0 -/* B70E90 80240630 00000000 */ nop -/* B70E94 80240634 4500000F */ bc1f .L80240674 -/* B70E98 80240638 0000882D */ daddu $s1, $zero, $zero -/* B70E9C 8024063C 860200A6 */ lh $v0, 0xa6($s0) -/* B70EA0 80240640 3C013F00 */ lui $at, 0x3f00 -/* B70EA4 80240644 44811000 */ mtc1 $at, $f2 -/* B70EA8 80240648 44820000 */ mtc1 $v0, $f0 -/* B70EAC 8024064C 00000000 */ nop -/* B70EB0 80240650 46800020 */ cvt.s.w $f0, $f0 -/* B70EB4 80240654 46020002 */ mul.s $f0, $f0, $f2 -/* B70EB8 80240658 00000000 */ nop -/* B70EBC 8024065C 4600203C */ c.lt.s $f4, $f0 -/* B70EC0 80240660 00000000 */ nop -/* B70EC4 80240664 45000003 */ bc1f .L80240674 -/* B70EC8 80240668 24020001 */ addiu $v0, $zero, 1 -/* B70ECC 8024066C AE62008C */ sw $v0, 0x8c($s3) -.L80240670: -/* B70ED0 80240670 0000882D */ daddu $s1, $zero, $zero -.L80240674: -/* B70ED4 80240674 3C013FC0 */ lui $at, 0x3fc0 -/* B70ED8 80240678 4481D000 */ mtc1 $at, $f26 -/* B70EDC 8024067C 4480C000 */ mtc1 $zero, $f24 -/* B70EE0 80240680 3C013F00 */ lui $at, 0x3f00 -/* B70EE4 80240684 4481B000 */ mtc1 $at, $f22 -.L80240688: -/* B70EE8 80240688 0C00EAD2 */ jal get_npc_safe -/* B70EEC 8024068C 0220202D */ daddu $a0, $s1, $zero -/* B70EF0 80240690 0040802D */ daddu $s0, $v0, $zero -/* B70EF4 80240694 52000035 */ beql $s0, $zero, .L8024076C -/* B70EF8 80240698 26310001 */ addiu $s1, $s1, 1 -/* B70EFC 8024069C C6020038 */ lwc1 $f2, 0x38($s0) -/* B70F00 802406A0 C6400098 */ lwc1 $f0, 0x98($s2) -/* B70F04 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* B70F08 802406A8 46021182 */ mul.s $f6, $f2, $f2 -/* B70F0C 802406AC 00000000 */ nop -/* B70F10 802406B0 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* B70F14 802406B4 C6020040 */ lwc1 $f2, 0x40($s0) -/* B70F18 802406B8 46001081 */ sub.s $f2, $f2, $f0 -/* B70F1C 802406BC 46021102 */ mul.s $f4, $f2, $f2 -/* B70F20 802406C0 00000000 */ nop -/* B70F24 802406C4 860200A8 */ lh $v0, 0xa8($s0) -/* B70F28 802406C8 C602003C */ lwc1 $f2, 0x3c($s0) -/* B70F2C 802406CC 44820000 */ mtc1 $v0, $f0 -/* B70F30 802406D0 00000000 */ nop -/* B70F34 802406D4 46800020 */ cvt.s.w $f0, $f0 -/* B70F38 802406D8 46001080 */ add.s $f2, $f2, $f0 -/* B70F3C 802406DC 461A1081 */ sub.s $f2, $f2, $f26 -/* B70F40 802406E0 46043300 */ add.s $f12, $f6, $f4 -/* B70F44 802406E4 C640009C */ lwc1 $f0, 0x9c($s2) -/* B70F48 802406E8 46001501 */ sub.s $f20, $f2, $f0 -/* B70F4C 802406EC 46006004 */ sqrt.s $f0, $f12 -/* B70F50 802406F0 46000032 */ c.eq.s $f0, $f0 -/* B70F54 802406F4 00000000 */ nop -/* B70F58 802406F8 45010003 */ bc1t .L80240708 -/* B70F5C 802406FC 00000000 */ nop -/* B70F60 80240700 0C0187BC */ jal sqrtf -/* B70F64 80240704 00000000 */ nop -.L80240708: -/* B70F68 80240708 4614C03C */ c.lt.s $f24, $f20 -/* B70F6C 8024070C 00000000 */ nop -/* B70F70 80240710 45000015 */ bc1f .L80240768 -/* B70F74 80240714 46000106 */ mov.s $f4, $f0 -/* B70F78 80240718 860200A8 */ lh $v0, 0xa8($s0) -/* B70F7C 8024071C 44820000 */ mtc1 $v0, $f0 -/* B70F80 80240720 00000000 */ nop -/* B70F84 80240724 46800020 */ cvt.s.w $f0, $f0 -/* B70F88 80240728 4600A03C */ c.lt.s $f20, $f0 -/* B70F8C 8024072C 00000000 */ nop -/* B70F90 80240730 4500000E */ bc1f .L8024076C -/* B70F94 80240734 26310001 */ addiu $s1, $s1, 1 -/* B70F98 80240738 860200A6 */ lh $v0, 0xa6($s0) -/* B70F9C 8024073C 44820000 */ mtc1 $v0, $f0 -/* B70FA0 80240740 00000000 */ nop -/* B70FA4 80240744 46800020 */ cvt.s.w $f0, $f0 -/* B70FA8 80240748 46160002 */ mul.s $f0, $f0, $f22 -/* B70FAC 8024074C 00000000 */ nop -/* B70FB0 80240750 4600203C */ c.lt.s $f4, $f0 -/* B70FB4 80240754 00000000 */ nop -/* B70FB8 80240758 45000004 */ bc1f .L8024076C -/* B70FBC 8024075C 24020001 */ addiu $v0, $zero, 1 -/* B70FC0 80240760 080901DE */ j .L80240778 -/* B70FC4 80240764 AE62008C */ sw $v0, 0x8c($s3) -.L80240768: -/* B70FC8 80240768 26310001 */ addiu $s1, $s1, 1 -.L8024076C: -/* B70FCC 8024076C 2A220040 */ slti $v0, $s1, 0x40 -/* B70FD0 80240770 1440FFC5 */ bnez $v0, .L80240688 -/* B70FD4 80240774 00000000 */ nop -.L80240778: -/* B70FD8 80240778 8FBF0020 */ lw $ra, 0x20($sp) -/* B70FDC 8024077C 8FB3001C */ lw $s3, 0x1c($sp) -/* B70FE0 80240780 8FB20018 */ lw $s2, 0x18($sp) -/* B70FE4 80240784 8FB10014 */ lw $s1, 0x14($sp) -/* B70FE8 80240788 8FB00010 */ lw $s0, 0x10($sp) -/* B70FEC 8024078C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* B70FF0 80240790 D7B80038 */ ldc1 $f24, 0x38($sp) -/* B70FF4 80240794 D7B60030 */ ldc1 $f22, 0x30($sp) -/* B70FF8 80240798 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B70FFC 8024079C 24020002 */ addiu $v0, $zero, 2 -/* B71000 802407A0 03E00008 */ jr $ra -/* B71004 802407A4 27BD0048 */ addiu $sp, $sp, 0x48 -/* B71008 802407A8 00000000 */ nop -/* B7100C 802407AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802404C0_B7A510.s b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802404C0_B7A510.s deleted file mode 100644 index cd5aca18f4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802404C0_B7A510.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_B7A510 -/* B7A510 802404C0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B7A514 802404C4 AFB00030 */ sw $s0, 0x30($sp) -/* B7A518 802404C8 0080802D */ daddu $s0, $a0, $zero -/* B7A51C 802404CC AFBF0040 */ sw $ra, 0x40($sp) -/* B7A520 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* B7A524 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* B7A528 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* B7A52C 802404DC F7B60050 */ sdc1 $f22, 0x50($sp) -/* B7A530 802404E0 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B7A534 802404E4 8E130148 */ lw $s3, 0x148($s0) -/* B7A538 802404E8 00A0882D */ daddu $s1, $a1, $zero -/* B7A53C 802404EC 86640008 */ lh $a0, 8($s3) -/* B7A540 802404F0 0C00EABB */ jal get_npc_unsafe -/* B7A544 802404F4 00C0902D */ daddu $s2, $a2, $zero -/* B7A548 802404F8 0200202D */ daddu $a0, $s0, $zero -/* B7A54C 802404FC 0220282D */ daddu $a1, $s1, $zero -/* B7A550 80240500 0240302D */ daddu $a2, $s2, $zero -/* B7A554 80240504 0C012568 */ jal func_800495A0 -/* B7A558 80240508 0040802D */ daddu $s0, $v0, $zero -/* B7A55C 8024050C 8E020000 */ lw $v0, ($s0) -/* B7A560 80240510 2404002D */ addiu $a0, $zero, 0x2d -/* B7A564 80240514 34420800 */ ori $v0, $v0, 0x800 -/* B7A568 80240518 0C00A67F */ jal rand_int -/* B7A56C 8024051C AE020000 */ sw $v0, ($s0) -/* B7A570 80240520 0200202D */ daddu $a0, $s0, $zero -/* B7A574 80240524 3C05B000 */ lui $a1, 0xb000 -/* B7A578 80240528 34A50017 */ ori $a1, $a1, 0x17 -/* B7A57C 8024052C 44820000 */ mtc1 $v0, $f0 -/* B7A580 80240530 00000000 */ nop -/* B7A584 80240534 46800021 */ cvt.d.w $f0, $f0 -/* B7A588 80240538 3C014024 */ lui $at, 0x4024 -/* B7A58C 8024053C 44811800 */ mtc1 $at, $f3 -/* B7A590 80240540 44801000 */ mtc1 $zero, $f2 -/* B7A594 80240544 3C014020 */ lui $at, 0x4020 -/* B7A598 80240548 44812800 */ mtc1 $at, $f5 -/* B7A59C 8024054C 44802000 */ mtc1 $zero, $f4 -/* B7A5A0 80240550 46220003 */ div.d $f0, $f0, $f2 -/* B7A5A4 80240554 46240000 */ add.d $f0, $f0, $f4 -/* B7A5A8 80240558 3C013FC0 */ lui $at, 0x3fc0 -/* B7A5AC 8024055C 44811000 */ mtc1 $at, $f2 -/* B7A5B0 80240560 0000302D */ daddu $a2, $zero, $zero -/* B7A5B4 80240564 E6020014 */ swc1 $f2, 0x14($s0) -/* B7A5B8 80240568 46200020 */ cvt.s.d $f0, $f0 -/* B7A5BC 8024056C 0C012530 */ jal ai_enemy_play_sound -/* B7A5C0 80240570 E600001C */ swc1 $f0, 0x1c($s0) -/* B7A5C4 80240574 8E6300D0 */ lw $v1, 0xd0($s3) -/* B7A5C8 80240578 C6000040 */ lwc1 $f0, 0x40($s0) -/* B7A5CC 8024057C C4620000 */ lwc1 $f2, ($v1) -/* B7A5D0 80240580 468010A0 */ cvt.s.w $f2, $f2 -/* B7A5D4 80240584 C4640008 */ lwc1 $f4, 8($v1) -/* B7A5D8 80240588 46802120 */ cvt.s.w $f4, $f4 -/* B7A5DC 8024058C E7A00010 */ swc1 $f0, 0x10($sp) -/* B7A5E0 80240590 8E6200D0 */ lw $v0, 0xd0($s3) -/* B7A5E4 80240594 44051000 */ mfc1 $a1, $f2 -/* B7A5E8 80240598 C440000C */ lwc1 $f0, 0xc($v0) -/* B7A5EC 8024059C 46800020 */ cvt.s.w $f0, $f0 -/* B7A5F0 802405A0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B7A5F4 802405A4 8E6200D0 */ lw $v0, 0xd0($s3) -/* B7A5F8 802405A8 44062000 */ mfc1 $a2, $f4 -/* B7A5FC 802405AC C4400010 */ lwc1 $f0, 0x10($v0) -/* B7A600 802405B0 46800020 */ cvt.s.w $f0, $f0 -/* B7A604 802405B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* B7A608 802405B8 8C640018 */ lw $a0, 0x18($v1) -/* B7A60C 802405BC 0C0123F5 */ jal is_point_within_region -/* B7A610 802405C0 8E070038 */ lw $a3, 0x38($s0) -/* B7A614 802405C4 10400035 */ beqz $v0, .L8024069C -/* B7A618 802405C8 00000000 */ nop -/* B7A61C 802405CC C60C0038 */ lwc1 $f12, 0x38($s0) -/* B7A620 802405D0 3C0141C8 */ lui $at, 0x41c8 -/* B7A624 802405D4 4481B000 */ mtc1 $at, $f22 -/* B7A628 802405D8 8E6200D0 */ lw $v0, 0xd0($s3) -/* B7A62C 802405DC C60E0040 */ lwc1 $f14, 0x40($s0) -/* B7A630 802405E0 C4480000 */ lwc1 $f8, ($v0) -/* B7A634 802405E4 46804220 */ cvt.s.w $f8, $f8 -/* B7A638 802405E8 44064000 */ mfc1 $a2, $f8 -/* B7A63C 802405EC C4480008 */ lwc1 $f8, 8($v0) -/* B7A640 802405F0 46804220 */ cvt.s.w $f8, $f8 -/* B7A644 802405F4 44074000 */ mfc1 $a3, $f8 -/* B7A648 802405F8 3C01403E */ lui $at, 0x403e -/* B7A64C 802405FC 4481A800 */ mtc1 $at, $f21 -/* B7A650 80240600 4480A000 */ mtc1 $zero, $f20 -/* B7A654 80240604 0C00A720 */ jal atan2 -/* B7A658 80240608 0000882D */ daddu $s1, $zero, $zero -/* B7A65C 8024060C C6020038 */ lwc1 $f2, 0x38($s0) -/* B7A660 80240610 C604003C */ lwc1 $f4, 0x3c($s0) -/* B7A664 80240614 C6060040 */ lwc1 $f6, 0x40($s0) -/* B7A668 80240618 E600000C */ swc1 $f0, 0xc($s0) -/* B7A66C 8024061C E7A20020 */ swc1 $f2, 0x20($sp) -/* B7A670 80240620 E7A40024 */ swc1 $f4, 0x24($sp) -/* B7A674 80240624 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240628: -/* B7A678 80240628 E7B60010 */ swc1 $f22, 0x10($sp) -/* B7A67C 8024062C C600000C */ lwc1 $f0, 0xc($s0) -/* B7A680 80240630 E7A00014 */ swc1 $f0, 0x14($sp) -/* B7A684 80240634 860200A8 */ lh $v0, 0xa8($s0) -/* B7A688 80240638 27A50020 */ addiu $a1, $sp, 0x20 -/* B7A68C 8024063C 44820000 */ mtc1 $v0, $f0 -/* B7A690 80240640 00000000 */ nop -/* B7A694 80240644 46800020 */ cvt.s.w $f0, $f0 -/* B7A698 80240648 E7A00018 */ swc1 $f0, 0x18($sp) -/* B7A69C 8024064C 860200A6 */ lh $v0, 0xa6($s0) -/* B7A6A0 80240650 27A60024 */ addiu $a2, $sp, 0x24 -/* B7A6A4 80240654 44820000 */ mtc1 $v0, $f0 -/* B7A6A8 80240658 00000000 */ nop -/* B7A6AC 8024065C 46800020 */ cvt.s.w $f0, $f0 -/* B7A6B0 80240660 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B7A6B4 80240664 8E040080 */ lw $a0, 0x80($s0) -/* B7A6B8 80240668 0C037711 */ jal npc_test_move_simple_with_slipping -/* B7A6BC 8024066C 27A70028 */ addiu $a3, $sp, 0x28 -/* B7A6C0 80240670 10400016 */ beqz $v0, .L802406CC -/* B7A6C4 80240674 26310001 */ addiu $s1, $s1, 1 -/* B7A6C8 80240678 C600000C */ lwc1 $f0, 0xc($s0) -/* B7A6CC 8024067C 46000021 */ cvt.d.s $f0, $f0 -/* B7A6D0 80240680 46340000 */ add.d $f0, $f0, $f20 -/* B7A6D4 80240684 2A220006 */ slti $v0, $s1, 6 -/* B7A6D8 80240688 46200020 */ cvt.s.d $f0, $f0 -/* B7A6DC 8024068C 1440FFE6 */ bnez $v0, .L80240628 -/* B7A6E0 80240690 E600000C */ swc1 $f0, 0xc($s0) -/* B7A6E4 80240694 080901B3 */ j .L802406CC -/* B7A6E8 80240698 00000000 */ nop -.L8024069C: -/* B7A6EC 8024069C 0C00A67F */ jal rand_int -/* B7A6F0 802406A0 2404003C */ addiu $a0, $zero, 0x3c -/* B7A6F4 802406A4 C60C000C */ lwc1 $f12, 0xc($s0) -/* B7A6F8 802406A8 44820000 */ mtc1 $v0, $f0 -/* B7A6FC 802406AC 00000000 */ nop -/* B7A700 802406B0 46800020 */ cvt.s.w $f0, $f0 -/* B7A704 802406B4 46006300 */ add.s $f12, $f12, $f0 -/* B7A708 802406B8 3C0141F0 */ lui $at, 0x41f0 -/* B7A70C 802406BC 44810000 */ mtc1 $at, $f0 -/* B7A710 802406C0 0C00A6C9 */ jal clamp_angle -/* B7A714 802406C4 46006301 */ sub.s $f12, $f12, $f0 -/* B7A718 802406C8 E600000C */ swc1 $f0, 0xc($s0) -.L802406CC: -/* B7A71C 802406CC 8FBF0040 */ lw $ra, 0x40($sp) -/* B7A720 802406D0 8FB3003C */ lw $s3, 0x3c($sp) -/* B7A724 802406D4 8FB20038 */ lw $s2, 0x38($sp) -/* B7A728 802406D8 8FB10034 */ lw $s1, 0x34($sp) -/* B7A72C 802406DC 8FB00030 */ lw $s0, 0x30($sp) -/* B7A730 802406E0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B7A734 802406E4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B7A738 802406E8 03E00008 */ jr $ra -/* B7A73C 802406EC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s index 56f1e5321c..43e3cfac19 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s @@ -103,7 +103,7 @@ glabel func_802410B0_B7B100 .L80241214_B7B264: /* B7B264 80241214 0260202D */ daddu $a0, $s3, $zero /* B7B268 80241218 0280282D */ daddu $a1, $s4, $zero -/* B7B26C 8024121C 0C090130 */ jal func_802404C0_B7A510 +/* B7B26C 8024121C 0C090130 */ jal jan_14_UnkNpcAIFunc36 /* B7B270 80241220 0200302D */ daddu $a2, $s0, $zero .L80241224_B7B274: /* B7B274 80241224 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802401B0_8CE220.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802401B0_8CE220.s deleted file mode 100644 index af08798d3f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802401B0_8CE220.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243448_8D14B8 -.double 0.09 - -dlabel D_80243450_8D14C0 -.double 0.09 - -.section .text - -glabel func_802401B0_8CE220 -/* 8CE220 802401B0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 8CE224 802401B4 AFB3004C */ sw $s3, 0x4c($sp) -/* 8CE228 802401B8 0080982D */ daddu $s3, $a0, $zero -/* 8CE22C 802401BC AFBF0058 */ sw $ra, 0x58($sp) -/* 8CE230 802401C0 AFB50054 */ sw $s5, 0x54($sp) -/* 8CE234 802401C4 AFB40050 */ sw $s4, 0x50($sp) -/* 8CE238 802401C8 AFB20048 */ sw $s2, 0x48($sp) -/* 8CE23C 802401CC AFB10044 */ sw $s1, 0x44($sp) -/* 8CE240 802401D0 AFB00040 */ sw $s0, 0x40($sp) -/* 8CE244 802401D4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8CE248 802401D8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8CE24C 802401DC F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8CE250 802401E0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8CE254 802401E4 8E710148 */ lw $s1, 0x148($s3) -/* 8CE258 802401E8 00A0902D */ daddu $s2, $a1, $zero -/* 8CE25C 802401EC 86240008 */ lh $a0, 8($s1) -/* 8CE260 802401F0 0C00EABB */ jal get_npc_unsafe -/* 8CE264 802401F4 00C0A82D */ daddu $s5, $a2, $zero -/* 8CE268 802401F8 0040802D */ daddu $s0, $v0, $zero -/* 8CE26C 802401FC 0000A02D */ daddu $s4, $zero, $zero -/* 8CE270 80240200 C624007C */ lwc1 $f4, 0x7c($s1) -/* 8CE274 80240204 46802120 */ cvt.s.w $f4, $f4 -/* 8CE278 80240208 C6220088 */ lwc1 $f2, 0x88($s1) -/* 8CE27C 8024020C 468010A0 */ cvt.s.w $f2, $f2 -/* 8CE280 80240210 460010A1 */ cvt.d.s $f2, $f2 -/* 8CE284 80240214 46002121 */ cvt.d.s $f4, $f4 -/* 8CE288 80240218 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CE28C 8024021C 3C014059 */ lui $at, 0x4059 -/* 8CE290 80240220 44813800 */ mtc1 $at, $f7 -/* 8CE294 80240224 44803000 */ mtc1 $zero, $f6 -/* 8CE298 80240228 46000021 */ cvt.d.s $f0, $f0 -/* 8CE29C 8024022C 46260002 */ mul.d $f0, $f0, $f6 -/* 8CE2A0 80240230 00000000 */ nop -/* 8CE2A4 80240234 24020001 */ addiu $v0, $zero, 1 -/* 8CE2A8 80240238 8E24006C */ lw $a0, 0x6c($s1) -/* 8CE2AC 8024023C 46261083 */ div.d $f2, $f2, $f6 -/* 8CE2B0 80240240 462010A0 */ cvt.s.d $f2, $f2 -/* 8CE2B4 80240244 46262103 */ div.d $f4, $f4, $f6 -/* 8CE2B8 80240248 46202520 */ cvt.s.d $f20, $f4 -/* 8CE2BC 8024024C 30830011 */ andi $v1, $a0, 0x11 -/* 8CE2C0 80240250 4620020D */ trunc.w.d $f8, $f0 -/* 8CE2C4 80240254 E628007C */ swc1 $f8, 0x7c($s1) -/* 8CE2C8 80240258 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8CE2CC 8024025C 46800020 */ cvt.s.w $f0, $f0 -/* 8CE2D0 80240260 46000021 */ cvt.d.s $f0, $f0 -/* 8CE2D4 80240264 46260003 */ div.d $f0, $f0, $f6 -/* 8CE2D8 80240268 462006A0 */ cvt.s.d $f26, $f0 -/* 8CE2DC 8024026C C6200070 */ lwc1 $f0, 0x70($s1) -/* 8CE2E0 80240270 46800020 */ cvt.s.w $f0, $f0 -/* 8CE2E4 80240274 46000021 */ cvt.d.s $f0, $f0 -/* 8CE2E8 80240278 46260003 */ div.d $f0, $f0, $f6 -/* 8CE2EC 8024027C 462005A0 */ cvt.s.d $f22, $f0 -/* 8CE2F0 80240280 14620025 */ bne $v1, $v0, .L80240318 -/* 8CE2F4 80240284 4602D600 */ add.s $f24, $f26, $f2 -/* 8CE2F8 80240288 8E020000 */ lw $v0, ($s0) -/* 8CE2FC 8024028C 30420008 */ andi $v0, $v0, 8 -/* 8CE300 80240290 10400009 */ beqz $v0, .L802402B8 -/* 8CE304 80240294 27A50028 */ addiu $a1, $sp, 0x28 -/* 8CE308 80240298 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CE30C 8024029C 4600C001 */ sub.s $f0, $f24, $f0 -/* 8CE310 802402A0 4600B03C */ c.lt.s $f22, $f0 -/* 8CE314 802402A4 00000000 */ nop -/* 8CE318 802402A8 4500001B */ bc1f .L80240318 -/* 8CE31C 802402AC 34820010 */ ori $v0, $a0, 0x10 -/* 8CE320 802402B0 080900C6 */ j .L80240318 -/* 8CE324 802402B4 AE22006C */ sw $v0, 0x6c($s1) -.L802402B8: -/* 8CE328 802402B8 27A6002C */ addiu $a2, $sp, 0x2c -/* 8CE32C 802402BC C6000038 */ lwc1 $f0, 0x38($s0) -/* 8CE330 802402C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CE334 802402C4 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8CE338 802402C8 3C01447A */ lui $at, 0x447a -/* 8CE33C 802402CC 44813000 */ mtc1 $at, $f6 -/* 8CE340 802402D0 27A20034 */ addiu $v0, $sp, 0x34 -/* 8CE344 802402D4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8CE348 802402D8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8CE34C 802402DC E7A40030 */ swc1 $f4, 0x30($sp) -/* 8CE350 802402E0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8CE354 802402E4 AFA20010 */ sw $v0, 0x10($sp) -/* 8CE358 802402E8 8E040080 */ lw $a0, 0x80($s0) -/* 8CE35C 802402EC 0C0372DF */ jal npc_raycast_down_sides -/* 8CE360 802402F0 27A70030 */ addiu $a3, $sp, 0x30 -/* 8CE364 802402F4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 8CE368 802402F8 4600D001 */ sub.s $f0, $f26, $f0 -/* 8CE36C 802402FC 4600B03C */ c.lt.s $f22, $f0 -/* 8CE370 80240300 00000000 */ nop -/* 8CE374 80240304 45000004 */ bc1f .L80240318 -/* 8CE378 80240308 00000000 */ nop -/* 8CE37C 8024030C 8E22006C */ lw $v0, 0x6c($s1) -/* 8CE380 80240310 34420010 */ ori $v0, $v0, 0x10 -/* 8CE384 80240314 AE22006C */ sw $v0, 0x6c($s1) -.L80240318: -/* 8CE388 80240318 8E22006C */ lw $v0, 0x6c($s1) -/* 8CE38C 8024031C 24030011 */ addiu $v1, $zero, 0x11 -/* 8CE390 80240320 30420011 */ andi $v0, $v0, 0x11 -/* 8CE394 80240324 14430039 */ bne $v0, $v1, .L8024040C -/* 8CE398 80240328 00000000 */ nop -/* 8CE39C 8024032C 8E020000 */ lw $v0, ($s0) -/* 8CE3A0 80240330 30420008 */ andi $v0, $v0, 8 -/* 8CE3A4 80240334 1040000A */ beqz $v0, .L80240360 -/* 8CE3A8 80240338 4600C106 */ mov.s $f4, $f24 -/* 8CE3AC 8024033C 4614C081 */ sub.s $f2, $f24, $f20 -/* 8CE3B0 80240340 3C018024 */ lui $at, %hi(D_80243448_8D14B8) -/* 8CE3B4 80240344 D4203448 */ ldc1 $f0, %lo(D_80243448_8D14B8)($at) -/* 8CE3B8 80240348 460010A1 */ cvt.d.s $f2, $f2 -/* 8CE3BC 8024034C 46201082 */ mul.d $f2, $f2, $f0 -/* 8CE3C0 80240350 00000000 */ nop -/* 8CE3C4 80240354 4600A021 */ cvt.d.s $f0, $f20 -/* 8CE3C8 80240358 080900F1 */ j .L802403C4 -/* 8CE3CC 8024035C 46220000 */ add.d $f0, $f0, $f2 -.L80240360: -/* 8CE3D0 80240360 27A50028 */ addiu $a1, $sp, 0x28 -/* 8CE3D4 80240364 27A6002C */ addiu $a2, $sp, 0x2c -/* 8CE3D8 80240368 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8CE3DC 8024036C C6020040 */ lwc1 $f2, 0x40($s0) -/* 8CE3E0 80240370 3C01447A */ lui $at, 0x447a -/* 8CE3E4 80240374 44812000 */ mtc1 $at, $f4 -/* 8CE3E8 80240378 27A20034 */ addiu $v0, $sp, 0x34 -/* 8CE3EC 8024037C E7B4002C */ swc1 $f20, 0x2c($sp) -/* 8CE3F0 80240380 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8CE3F4 80240384 E7A20030 */ swc1 $f2, 0x30($sp) -/* 8CE3F8 80240388 E7A40034 */ swc1 $f4, 0x34($sp) -/* 8CE3FC 8024038C AFA20010 */ sw $v0, 0x10($sp) -/* 8CE400 80240390 8E040080 */ lw $a0, 0x80($s0) -/* 8CE404 80240394 0C0372DF */ jal npc_raycast_down_sides -/* 8CE408 80240398 27A70030 */ addiu $a3, $sp, 0x30 -/* 8CE40C 8024039C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 8CE410 802403A0 461A2100 */ add.s $f4, $f4, $f26 -/* 8CE414 802403A4 46142081 */ sub.s $f2, $f4, $f20 -/* 8CE418 802403A8 3C018024 */ lui $at, %hi(D_80243450_8D14C0) -/* 8CE41C 802403AC D4203450 */ ldc1 $f0, %lo(D_80243450_8D14C0)($at) -/* 8CE420 802403B0 460010A1 */ cvt.d.s $f2, $f2 -/* 8CE424 802403B4 46201082 */ mul.d $f2, $f2, $f0 -/* 8CE428 802403B8 00000000 */ nop -/* 8CE42C 802403BC 4600A021 */ cvt.d.s $f0, $f20 -/* 8CE430 802403C0 46220000 */ add.d $f0, $f0, $f2 -.L802403C4: -/* 8CE434 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* 8CE438 802403C8 E600003C */ swc1 $f0, 0x3c($s0) -/* 8CE43C 802403CC C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CE440 802403D0 46002001 */ sub.s $f0, $f4, $f0 -/* 8CE444 802403D4 3C013FF0 */ lui $at, 0x3ff0 -/* 8CE448 802403D8 44811800 */ mtc1 $at, $f3 -/* 8CE44C 802403DC 44801000 */ mtc1 $zero, $f2 -/* 8CE450 802403E0 46000005 */ abs.s $f0, $f0 -/* 8CE454 802403E4 46000021 */ cvt.d.s $f0, $f0 -/* 8CE458 802403E8 4622003C */ c.lt.d $f0, $f2 -/* 8CE45C 802403EC 00000000 */ nop -/* 8CE460 802403F0 45000036 */ bc1f .L802404CC -/* 8CE464 802403F4 2403FFEF */ addiu $v1, $zero, -0x11 -/* 8CE468 802403F8 E604003C */ swc1 $f4, 0x3c($s0) -/* 8CE46C 802403FC 8E22006C */ lw $v0, 0x6c($s1) -/* 8CE470 80240400 00431024 */ and $v0, $v0, $v1 -/* 8CE474 80240404 08090133 */ j .L802404CC -/* 8CE478 80240408 AE22006C */ sw $v0, 0x6c($s1) -.L8024040C: -/* 8CE47C 8024040C 8E220070 */ lw $v0, 0x70($s1) -/* 8CE480 80240410 1840002E */ blez $v0, .L802404CC -/* 8CE484 80240414 00000000 */ nop -/* 8CE488 80240418 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8CE48C 8024041C 0C00A8BB */ jal sin_deg -/* 8CE490 80240420 46806320 */ cvt.s.w $f12, $f12 -/* 8CE494 80240424 8E020000 */ lw $v0, ($s0) -/* 8CE498 80240428 30420008 */ andi $v0, $v0, 8 -/* 8CE49C 8024042C 10400003 */ beqz $v0, .L8024043C -/* 8CE4A0 80240430 46000506 */ mov.s $f20, $f0 -/* 8CE4A4 80240434 0809011F */ j .L8024047C -/* 8CE4A8 80240438 0000102D */ daddu $v0, $zero, $zero -.L8024043C: -/* 8CE4AC 8024043C 27A50028 */ addiu $a1, $sp, 0x28 -/* 8CE4B0 80240440 27A6002C */ addiu $a2, $sp, 0x2c -/* 8CE4B4 80240444 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8CE4B8 80240448 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CE4BC 8024044C C6040040 */ lwc1 $f4, 0x40($s0) -/* 8CE4C0 80240450 3C01447A */ lui $at, 0x447a -/* 8CE4C4 80240454 44813000 */ mtc1 $at, $f6 -/* 8CE4C8 80240458 27A20034 */ addiu $v0, $sp, 0x34 -/* 8CE4CC 8024045C E7A00028 */ swc1 $f0, 0x28($sp) -/* 8CE4D0 80240460 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8CE4D4 80240464 E7A40030 */ swc1 $f4, 0x30($sp) -/* 8CE4D8 80240468 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8CE4DC 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* 8CE4E0 80240470 8E040080 */ lw $a0, 0x80($s0) -/* 8CE4E4 80240474 0C0372DF */ jal npc_raycast_down_sides -/* 8CE4E8 80240478 27A70030 */ addiu $a3, $sp, 0x30 -.L8024047C: -/* 8CE4EC 8024047C 10400007 */ beqz $v0, .L8024049C -/* 8CE4F0 80240480 00000000 */ nop -/* 8CE4F4 80240484 4616A082 */ mul.s $f2, $f20, $f22 -/* 8CE4F8 80240488 00000000 */ nop -/* 8CE4FC 8024048C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8CE500 80240490 461A0000 */ add.s $f0, $f0, $f26 -/* 8CE504 80240494 0809012A */ j .L802404A8 -/* 8CE508 80240498 46020000 */ add.s $f0, $f0, $f2 -.L8024049C: -/* 8CE50C 8024049C 4616A002 */ mul.s $f0, $f20, $f22 -/* 8CE510 802404A0 00000000 */ nop -/* 8CE514 802404A4 4600C000 */ add.s $f0, $f24, $f0 -.L802404A8: -/* 8CE518 802404A8 E600003C */ swc1 $f0, 0x3c($s0) -/* 8CE51C 802404AC 8E220074 */ lw $v0, 0x74($s1) -/* 8CE520 802404B0 2442000A */ addiu $v0, $v0, 0xa -/* 8CE524 802404B4 44826000 */ mtc1 $v0, $f12 -/* 8CE528 802404B8 00000000 */ nop -/* 8CE52C 802404BC 0C00A6C9 */ jal clamp_angle -/* 8CE530 802404C0 46806320 */ cvt.s.w $f12, $f12 -/* 8CE534 802404C4 4600020D */ trunc.w.s $f8, $f0 -/* 8CE538 802404C8 E6280074 */ swc1 $f8, 0x74($s1) -.L802404CC: -/* 8CE53C 802404CC 8E220090 */ lw $v0, 0x90($s1) -/* 8CE540 802404D0 1C40004A */ bgtz $v0, .L802405FC -/* 8CE544 802404D4 2442FFFF */ addiu $v0, $v0, -1 -/* 8CE548 802404D8 8E430014 */ lw $v1, 0x14($s2) -/* 8CE54C 802404DC 04600048 */ bltz $v1, .L80240600 -/* 8CE550 802404E0 00000000 */ nop -/* 8CE554 802404E4 8E620074 */ lw $v0, 0x74($s3) -/* 8CE558 802404E8 1C400042 */ bgtz $v0, .L802405F4 -/* 8CE55C 802404EC 2442FFFF */ addiu $v0, $v0, -1 -/* 8CE560 802404F0 AE630074 */ sw $v1, 0x74($s3) -/* 8CE564 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* 8CE568 802404F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CE56C 802404FC 44820000 */ mtc1 $v0, $f0 -/* 8CE570 80240500 00000000 */ nop -/* 8CE574 80240504 46800020 */ cvt.s.w $f0, $f0 -/* 8CE578 80240508 46001080 */ add.s $f2, $f2, $f0 -/* 8CE57C 8024050C 3C014024 */ lui $at, 0x4024 -/* 8CE580 80240510 44810800 */ mtc1 $at, $f1 -/* 8CE584 80240514 44800000 */ mtc1 $zero, $f0 -/* 8CE588 80240518 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8CE58C 8024051C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8CE590 80240520 460010A1 */ cvt.d.s $f2, $f2 -/* 8CE594 80240524 46201080 */ add.d $f2, $f2, $f0 -/* 8CE598 80240528 C440002C */ lwc1 $f0, 0x2c($v0) -/* 8CE59C 8024052C 46000021 */ cvt.d.s $f0, $f0 -/* 8CE5A0 80240530 4622003C */ c.lt.d $f0, $f2 -/* 8CE5A4 80240534 00000000 */ nop -/* 8CE5A8 80240538 4500002C */ bc1f .L802405EC -/* 8CE5AC 8024053C 02A0202D */ daddu $a0, $s5, $zero -/* 8CE5B0 80240540 AFA00010 */ sw $zero, 0x10($sp) -/* 8CE5B4 80240544 8E46000C */ lw $a2, 0xc($s2) -/* 8CE5B8 80240548 8E470010 */ lw $a3, 0x10($s2) -/* 8CE5BC 8024054C 0C01242D */ jal func_800490B4 -/* 8CE5C0 80240550 0220282D */ daddu $a1, $s1, $zero -/* 8CE5C4 80240554 10400025 */ beqz $v0, .L802405EC -/* 8CE5C8 80240558 0000202D */ daddu $a0, $zero, $zero -/* 8CE5CC 8024055C 0200282D */ daddu $a1, $s0, $zero -/* 8CE5D0 80240560 0000302D */ daddu $a2, $zero, $zero -/* 8CE5D4 80240564 2412000C */ addiu $s2, $zero, 0xc -/* 8CE5D8 80240568 860300A8 */ lh $v1, 0xa8($s0) -/* 8CE5DC 8024056C 3C013F80 */ lui $at, 0x3f80 -/* 8CE5E0 80240570 44810000 */ mtc1 $at, $f0 -/* 8CE5E4 80240574 3C014000 */ lui $at, 0x4000 -/* 8CE5E8 80240578 44811000 */ mtc1 $at, $f2 -/* 8CE5EC 8024057C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8CE5F0 80240580 44812000 */ mtc1 $at, $f4 -/* 8CE5F4 80240584 44834000 */ mtc1 $v1, $f8 -/* 8CE5F8 80240588 00000000 */ nop -/* 8CE5FC 8024058C 46804220 */ cvt.s.w $f8, $f8 -/* 8CE600 80240590 44074000 */ mfc1 $a3, $f8 -/* 8CE604 80240594 27A20038 */ addiu $v0, $sp, 0x38 -/* 8CE608 80240598 AFB2001C */ sw $s2, 0x1c($sp) -/* 8CE60C 8024059C AFA20020 */ sw $v0, 0x20($sp) -/* 8CE610 802405A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8CE614 802405A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8CE618 802405A8 0C01BFA4 */ jal fx_emote -/* 8CE61C 802405AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8CE620 802405B0 0200202D */ daddu $a0, $s0, $zero -/* 8CE624 802405B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8CE628 802405B8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 8CE62C 802405BC 3C060020 */ lui $a2, 0x20 -/* 8CE630 802405C0 0C012530 */ jal ai_enemy_play_sound -/* 8CE634 802405C4 E4800064 */ swc1 $f0, 0x64($a0) -/* 8CE638 802405C8 8E220018 */ lw $v0, 0x18($s1) -/* 8CE63C 802405CC 9442002A */ lhu $v0, 0x2a($v0) -/* 8CE640 802405D0 30420001 */ andi $v0, $v0, 1 -/* 8CE644 802405D4 10400003 */ beqz $v0, .L802405E4 -/* 8CE648 802405D8 2402000A */ addiu $v0, $zero, 0xa -/* 8CE64C 802405DC 080901E9 */ j .L802407A4 -/* 8CE650 802405E0 AE620070 */ sw $v0, 0x70($s3) -.L802405E4: -/* 8CE654 802405E4 080901E9 */ j .L802407A4 -/* 8CE658 802405E8 AE720070 */ sw $s2, 0x70($s3) -.L802405EC: -/* 8CE65C 802405EC 8E620074 */ lw $v0, 0x74($s3) -/* 8CE660 802405F0 2442FFFF */ addiu $v0, $v0, -1 -.L802405F4: -/* 8CE664 802405F4 08090180 */ j .L80240600 -/* 8CE668 802405F8 AE620074 */ sw $v0, 0x74($s3) -.L802405FC: -/* 8CE66C 802405FC AE220090 */ sw $v0, 0x90($s1) -.L80240600: -/* 8CE670 80240600 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8CE674 80240604 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8CE678 80240608 C4620000 */ lwc1 $f2, ($v1) -/* 8CE67C 8024060C 468010A0 */ cvt.s.w $f2, $f2 -/* 8CE680 80240610 C4640008 */ lwc1 $f4, 8($v1) -/* 8CE684 80240614 46802120 */ cvt.s.w $f4, $f4 -/* 8CE688 80240618 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8CE68C 8024061C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE690 80240620 44051000 */ mfc1 $a1, $f2 -/* 8CE694 80240624 C440000C */ lwc1 $f0, 0xc($v0) -/* 8CE698 80240628 46800020 */ cvt.s.w $f0, $f0 -/* 8CE69C 8024062C E7A00014 */ swc1 $f0, 0x14($sp) -/* 8CE6A0 80240630 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE6A4 80240634 44062000 */ mfc1 $a2, $f4 -/* 8CE6A8 80240638 C4400010 */ lwc1 $f0, 0x10($v0) -/* 8CE6AC 8024063C 46800020 */ cvt.s.w $f0, $f0 -/* 8CE6B0 80240640 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8CE6B4 80240644 8C640018 */ lw $a0, 0x18($v1) -/* 8CE6B8 80240648 0C0123F5 */ jal is_point_within_region -/* 8CE6BC 8024064C 8E070038 */ lw $a3, 0x38($s0) -/* 8CE6C0 80240650 1040001A */ beqz $v0, .L802406BC -/* 8CE6C4 80240654 00000000 */ nop -/* 8CE6C8 80240658 8E060038 */ lw $a2, 0x38($s0) -/* 8CE6CC 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE6D0 80240660 8E070040 */ lw $a3, 0x40($s0) -/* 8CE6D4 80240664 C44C0000 */ lwc1 $f12, ($v0) -/* 8CE6D8 80240668 46806320 */ cvt.s.w $f12, $f12 -/* 8CE6DC 8024066C C44E0008 */ lwc1 $f14, 8($v0) -/* 8CE6E0 80240670 0C00A7B5 */ jal dist2D -/* 8CE6E4 80240674 468073A0 */ cvt.s.w $f14, $f14 -/* 8CE6E8 80240678 C6020018 */ lwc1 $f2, 0x18($s0) -/* 8CE6EC 8024067C 4600103C */ c.lt.s $f2, $f0 -/* 8CE6F0 80240680 00000000 */ nop -/* 8CE6F4 80240684 4500000D */ bc1f .L802406BC -/* 8CE6F8 80240688 E7A00034 */ swc1 $f0, 0x34($sp) -/* 8CE6FC 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8CE700 80240690 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE704 80240694 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8CE708 80240698 C4480000 */ lwc1 $f8, ($v0) -/* 8CE70C 8024069C 46804220 */ cvt.s.w $f8, $f8 -/* 8CE710 802406A0 44064000 */ mfc1 $a2, $f8 -/* 8CE714 802406A4 C4480008 */ lwc1 $f8, 8($v0) -/* 8CE718 802406A8 46804220 */ cvt.s.w $f8, $f8 -/* 8CE71C 802406AC 44074000 */ mfc1 $a3, $f8 -/* 8CE720 802406B0 0C00A720 */ jal atan2 -/* 8CE724 802406B4 24140001 */ addiu $s4, $zero, 1 -/* 8CE728 802406B8 E600000C */ swc1 $f0, 0xc($s0) -.L802406BC: -/* 8CE72C 802406BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE730 802406C0 8C43000C */ lw $v1, 0xc($v0) -/* 8CE734 802406C4 8C420010 */ lw $v0, 0x10($v0) -/* 8CE738 802406C8 00621825 */ or $v1, $v1, $v0 -/* 8CE73C 802406CC 00741825 */ or $v1, $v1, $s4 -/* 8CE740 802406D0 10600008 */ beqz $v1, .L802406F4 -/* 8CE744 802406D4 00000000 */ nop -/* 8CE748 802406D8 8602008C */ lh $v0, 0x8c($s0) -/* 8CE74C 802406DC 14400031 */ bnez $v0, .L802407A4 -/* 8CE750 802406E0 00000000 */ nop -/* 8CE754 802406E4 8E050018 */ lw $a1, 0x18($s0) -/* 8CE758 802406E8 8E06000C */ lw $a2, 0xc($s0) -/* 8CE75C 802406EC 0C00EA95 */ jal npc_move_heading -/* 8CE760 802406F0 0200202D */ daddu $a0, $s0, $zero -.L802406F4: -/* 8CE764 802406F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CE768 802406F8 3C014059 */ lui $at, 0x4059 -/* 8CE76C 802406FC 44811800 */ mtc1 $at, $f3 -/* 8CE770 80240700 44801000 */ mtc1 $zero, $f2 -/* 8CE774 80240704 46000021 */ cvt.d.s $f0, $f0 -/* 8CE778 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* 8CE77C 8024070C 00000000 */ nop -/* 8CE780 80240710 4620020D */ trunc.w.d $f8, $f0 -/* 8CE784 80240714 E628007C */ swc1 $f8, 0x7c($s1) -/* 8CE788 80240718 8E420004 */ lw $v0, 4($s2) -/* 8CE78C 8024071C 18400021 */ blez $v0, .L802407A4 -/* 8CE790 80240720 00000000 */ nop -/* 8CE794 80240724 8602008E */ lh $v0, 0x8e($s0) -/* 8CE798 80240728 9603008E */ lhu $v1, 0x8e($s0) -/* 8CE79C 8024072C 18400005 */ blez $v0, .L80240744 -/* 8CE7A0 80240730 2462FFFF */ addiu $v0, $v1, -1 -/* 8CE7A4 80240734 A602008E */ sh $v0, 0x8e($s0) -/* 8CE7A8 80240738 00021400 */ sll $v0, $v0, 0x10 -/* 8CE7AC 8024073C 1C400019 */ bgtz $v0, .L802407A4 -/* 8CE7B0 80240740 00000000 */ nop -.L80240744: -/* 8CE7B4 80240744 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8CE7B8 80240748 24020002 */ addiu $v0, $zero, 2 -/* 8CE7BC 8024074C 0C00A67F */ jal rand_int -/* 8CE7C0 80240750 AE620070 */ sw $v0, 0x70($s3) -/* 8CE7C4 80240754 3C035555 */ lui $v1, 0x5555 -/* 8CE7C8 80240758 34635556 */ ori $v1, $v1, 0x5556 -/* 8CE7CC 8024075C 00430018 */ mult $v0, $v1 -/* 8CE7D0 80240760 000227C3 */ sra $a0, $v0, 0x1f -/* 8CE7D4 80240764 00004010 */ mfhi $t0 -/* 8CE7D8 80240768 01042023 */ subu $a0, $t0, $a0 -/* 8CE7DC 8024076C 00041840 */ sll $v1, $a0, 1 -/* 8CE7E0 80240770 00641821 */ addu $v1, $v1, $a0 -/* 8CE7E4 80240774 00431023 */ subu $v0, $v0, $v1 -/* 8CE7E8 80240778 24430002 */ addiu $v1, $v0, 2 -/* 8CE7EC 8024077C AE630074 */ sw $v1, 0x74($s3) -/* 8CE7F0 80240780 8E42002C */ lw $v0, 0x2c($s2) -/* 8CE7F4 80240784 58400007 */ blezl $v0, .L802407A4 -/* 8CE7F8 80240788 AE600070 */ sw $zero, 0x70($s3) -/* 8CE7FC 8024078C 8E420008 */ lw $v0, 8($s2) -/* 8CE800 80240790 18400003 */ blez $v0, .L802407A0 -/* 8CE804 80240794 28620003 */ slti $v0, $v1, 3 -/* 8CE808 80240798 10400002 */ beqz $v0, .L802407A4 -/* 8CE80C 8024079C 00000000 */ nop -.L802407A0: -/* 8CE810 802407A0 AE600070 */ sw $zero, 0x70($s3) -.L802407A4: -/* 8CE814 802407A4 8FBF0058 */ lw $ra, 0x58($sp) -/* 8CE818 802407A8 8FB50054 */ lw $s5, 0x54($sp) -/* 8CE81C 802407AC 8FB40050 */ lw $s4, 0x50($sp) -/* 8CE820 802407B0 8FB3004C */ lw $s3, 0x4c($sp) -/* 8CE824 802407B4 8FB20048 */ lw $s2, 0x48($sp) -/* 8CE828 802407B8 8FB10044 */ lw $s1, 0x44($sp) -/* 8CE82C 802407BC 8FB00040 */ lw $s0, 0x40($sp) -/* 8CE830 802407C0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8CE834 802407C4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8CE838 802407C8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8CE83C 802407CC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8CE840 802407D0 03E00008 */ jr $ra -/* 8CE844 802407D4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s index 51856bb099..42fa8e6dca 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s @@ -86,7 +86,7 @@ glabel func_8024130C_8CF37C .L80241428_8CF498: /* 8CF498 80241428 0280202D */ daddu $a0, $s4, $zero /* 8CF49C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* 8CF4A0 80241430 0C09006C */ jal func_802401B0_8CE220 +/* 8CF4A0 80241430 0C09006C */ jal kmr_05_UnkNpcAIFunc35 /* 8CF4A4 80241434 0260302D */ daddu $a2, $s3, $zero /* 8CF4A8 80241438 08090535 */ j .L802414D4 /* 8CF4AC 8024143C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s deleted file mode 100644 index b17fb64356..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242858_8D3D68 -.double 0.09 - -dlabel D_80242860_8D3D70 -.double 0.09 - -.section .text - -glabel func_802401B0_8D16C0 -/* 8D16C0 802401B0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 8D16C4 802401B4 AFB3004C */ sw $s3, 0x4c($sp) -/* 8D16C8 802401B8 0080982D */ daddu $s3, $a0, $zero -/* 8D16CC 802401BC AFBF0058 */ sw $ra, 0x58($sp) -/* 8D16D0 802401C0 AFB50054 */ sw $s5, 0x54($sp) -/* 8D16D4 802401C4 AFB40050 */ sw $s4, 0x50($sp) -/* 8D16D8 802401C8 AFB20048 */ sw $s2, 0x48($sp) -/* 8D16DC 802401CC AFB10044 */ sw $s1, 0x44($sp) -/* 8D16E0 802401D0 AFB00040 */ sw $s0, 0x40($sp) -/* 8D16E4 802401D4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8D16E8 802401D8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8D16EC 802401DC F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8D16F0 802401E0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8D16F4 802401E4 8E710148 */ lw $s1, 0x148($s3) -/* 8D16F8 802401E8 00A0902D */ daddu $s2, $a1, $zero -/* 8D16FC 802401EC 86240008 */ lh $a0, 8($s1) -/* 8D1700 802401F0 0C00EABB */ jal get_npc_unsafe -/* 8D1704 802401F4 00C0A82D */ daddu $s5, $a2, $zero -/* 8D1708 802401F8 0040802D */ daddu $s0, $v0, $zero -/* 8D170C 802401FC 0000A02D */ daddu $s4, $zero, $zero -/* 8D1710 80240200 C624007C */ lwc1 $f4, 0x7c($s1) -/* 8D1714 80240204 46802120 */ cvt.s.w $f4, $f4 -/* 8D1718 80240208 C6220088 */ lwc1 $f2, 0x88($s1) -/* 8D171C 8024020C 468010A0 */ cvt.s.w $f2, $f2 -/* 8D1720 80240210 460010A1 */ cvt.d.s $f2, $f2 -/* 8D1724 80240214 46002121 */ cvt.d.s $f4, $f4 -/* 8D1728 80240218 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D172C 8024021C 3C014059 */ lui $at, 0x4059 -/* 8D1730 80240220 44813800 */ mtc1 $at, $f7 -/* 8D1734 80240224 44803000 */ mtc1 $zero, $f6 -/* 8D1738 80240228 46000021 */ cvt.d.s $f0, $f0 -/* 8D173C 8024022C 46260002 */ mul.d $f0, $f0, $f6 -/* 8D1740 80240230 00000000 */ nop -/* 8D1744 80240234 24020001 */ addiu $v0, $zero, 1 -/* 8D1748 80240238 8E24006C */ lw $a0, 0x6c($s1) -/* 8D174C 8024023C 46261083 */ div.d $f2, $f2, $f6 -/* 8D1750 80240240 462010A0 */ cvt.s.d $f2, $f2 -/* 8D1754 80240244 46262103 */ div.d $f4, $f4, $f6 -/* 8D1758 80240248 46202520 */ cvt.s.d $f20, $f4 -/* 8D175C 8024024C 30830011 */ andi $v1, $a0, 0x11 -/* 8D1760 80240250 4620020D */ trunc.w.d $f8, $f0 -/* 8D1764 80240254 E628007C */ swc1 $f8, 0x7c($s1) -/* 8D1768 80240258 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D176C 8024025C 46800020 */ cvt.s.w $f0, $f0 -/* 8D1770 80240260 46000021 */ cvt.d.s $f0, $f0 -/* 8D1774 80240264 46260003 */ div.d $f0, $f0, $f6 -/* 8D1778 80240268 462006A0 */ cvt.s.d $f26, $f0 -/* 8D177C 8024026C C6200070 */ lwc1 $f0, 0x70($s1) -/* 8D1780 80240270 46800020 */ cvt.s.w $f0, $f0 -/* 8D1784 80240274 46000021 */ cvt.d.s $f0, $f0 -/* 8D1788 80240278 46260003 */ div.d $f0, $f0, $f6 -/* 8D178C 8024027C 462005A0 */ cvt.s.d $f22, $f0 -/* 8D1790 80240280 14620025 */ bne $v1, $v0, .L80240318 -/* 8D1794 80240284 4602D600 */ add.s $f24, $f26, $f2 -/* 8D1798 80240288 8E020000 */ lw $v0, ($s0) -/* 8D179C 8024028C 30420008 */ andi $v0, $v0, 8 -/* 8D17A0 80240290 10400009 */ beqz $v0, .L802402B8 -/* 8D17A4 80240294 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D17A8 80240298 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D17AC 8024029C 4600C001 */ sub.s $f0, $f24, $f0 -/* 8D17B0 802402A0 4600B03C */ c.lt.s $f22, $f0 -/* 8D17B4 802402A4 00000000 */ nop -/* 8D17B8 802402A8 4500001B */ bc1f .L80240318 -/* 8D17BC 802402AC 34820010 */ ori $v0, $a0, 0x10 -/* 8D17C0 802402B0 080900C6 */ j .L80240318 -/* 8D17C4 802402B4 AE22006C */ sw $v0, 0x6c($s1) -.L802402B8: -/* 8D17C8 802402B8 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D17CC 802402BC C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D17D0 802402C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D17D4 802402C4 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D17D8 802402C8 3C01447A */ lui $at, 0x447a -/* 8D17DC 802402CC 44813000 */ mtc1 $at, $f6 -/* 8D17E0 802402D0 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D17E4 802402D4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D17E8 802402D8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8D17EC 802402DC E7A40030 */ swc1 $f4, 0x30($sp) -/* 8D17F0 802402E0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8D17F4 802402E4 AFA20010 */ sw $v0, 0x10($sp) -/* 8D17F8 802402E8 8E040080 */ lw $a0, 0x80($s0) -/* 8D17FC 802402EC 0C0372DF */ jal npc_raycast_down_sides -/* 8D1800 802402F0 27A70030 */ addiu $a3, $sp, 0x30 -/* 8D1804 802402F4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 8D1808 802402F8 4600D001 */ sub.s $f0, $f26, $f0 -/* 8D180C 802402FC 4600B03C */ c.lt.s $f22, $f0 -/* 8D1810 80240300 00000000 */ nop -/* 8D1814 80240304 45000004 */ bc1f .L80240318 -/* 8D1818 80240308 00000000 */ nop -/* 8D181C 8024030C 8E22006C */ lw $v0, 0x6c($s1) -/* 8D1820 80240310 34420010 */ ori $v0, $v0, 0x10 -/* 8D1824 80240314 AE22006C */ sw $v0, 0x6c($s1) -.L80240318: -/* 8D1828 80240318 8E22006C */ lw $v0, 0x6c($s1) -/* 8D182C 8024031C 24030011 */ addiu $v1, $zero, 0x11 -/* 8D1830 80240320 30420011 */ andi $v0, $v0, 0x11 -/* 8D1834 80240324 14430039 */ bne $v0, $v1, .L8024040C -/* 8D1838 80240328 00000000 */ nop -/* 8D183C 8024032C 8E020000 */ lw $v0, ($s0) -/* 8D1840 80240330 30420008 */ andi $v0, $v0, 8 -/* 8D1844 80240334 1040000A */ beqz $v0, .L80240360 -/* 8D1848 80240338 4600C106 */ mov.s $f4, $f24 -/* 8D184C 8024033C 4614C081 */ sub.s $f2, $f24, $f20 -/* 8D1850 80240340 3C018024 */ lui $at, %hi(D_80242858_8D3D68) -/* 8D1854 80240344 D4202858 */ ldc1 $f0, %lo(D_80242858_8D3D68)($at) -/* 8D1858 80240348 460010A1 */ cvt.d.s $f2, $f2 -/* 8D185C 8024034C 46201082 */ mul.d $f2, $f2, $f0 -/* 8D1860 80240350 00000000 */ nop -/* 8D1864 80240354 4600A021 */ cvt.d.s $f0, $f20 -/* 8D1868 80240358 080900F1 */ j .L802403C4 -/* 8D186C 8024035C 46220000 */ add.d $f0, $f0, $f2 -.L80240360: -/* 8D1870 80240360 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D1874 80240364 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D1878 80240368 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D187C 8024036C C6020040 */ lwc1 $f2, 0x40($s0) -/* 8D1880 80240370 3C01447A */ lui $at, 0x447a -/* 8D1884 80240374 44812000 */ mtc1 $at, $f4 -/* 8D1888 80240378 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D188C 8024037C E7B4002C */ swc1 $f20, 0x2c($sp) -/* 8D1890 80240380 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D1894 80240384 E7A20030 */ swc1 $f2, 0x30($sp) -/* 8D1898 80240388 E7A40034 */ swc1 $f4, 0x34($sp) -/* 8D189C 8024038C AFA20010 */ sw $v0, 0x10($sp) -/* 8D18A0 80240390 8E040080 */ lw $a0, 0x80($s0) -/* 8D18A4 80240394 0C0372DF */ jal npc_raycast_down_sides -/* 8D18A8 80240398 27A70030 */ addiu $a3, $sp, 0x30 -/* 8D18AC 8024039C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 8D18B0 802403A0 461A2100 */ add.s $f4, $f4, $f26 -/* 8D18B4 802403A4 46142081 */ sub.s $f2, $f4, $f20 -/* 8D18B8 802403A8 3C018024 */ lui $at, %hi(D_80242860_8D3D70) -/* 8D18BC 802403AC D4202860 */ ldc1 $f0, %lo(D_80242860_8D3D70)($at) -/* 8D18C0 802403B0 460010A1 */ cvt.d.s $f2, $f2 -/* 8D18C4 802403B4 46201082 */ mul.d $f2, $f2, $f0 -/* 8D18C8 802403B8 00000000 */ nop -/* 8D18CC 802403BC 4600A021 */ cvt.d.s $f0, $f20 -/* 8D18D0 802403C0 46220000 */ add.d $f0, $f0, $f2 -.L802403C4: -/* 8D18D4 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* 8D18D8 802403C8 E600003C */ swc1 $f0, 0x3c($s0) -/* 8D18DC 802403CC C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D18E0 802403D0 46002001 */ sub.s $f0, $f4, $f0 -/* 8D18E4 802403D4 3C013FF0 */ lui $at, 0x3ff0 -/* 8D18E8 802403D8 44811800 */ mtc1 $at, $f3 -/* 8D18EC 802403DC 44801000 */ mtc1 $zero, $f2 -/* 8D18F0 802403E0 46000005 */ abs.s $f0, $f0 -/* 8D18F4 802403E4 46000021 */ cvt.d.s $f0, $f0 -/* 8D18F8 802403E8 4622003C */ c.lt.d $f0, $f2 -/* 8D18FC 802403EC 00000000 */ nop -/* 8D1900 802403F0 45000036 */ bc1f .L802404CC -/* 8D1904 802403F4 2403FFEF */ addiu $v1, $zero, -0x11 -/* 8D1908 802403F8 E604003C */ swc1 $f4, 0x3c($s0) -/* 8D190C 802403FC 8E22006C */ lw $v0, 0x6c($s1) -/* 8D1910 80240400 00431024 */ and $v0, $v0, $v1 -/* 8D1914 80240404 08090133 */ j .L802404CC -/* 8D1918 80240408 AE22006C */ sw $v0, 0x6c($s1) -.L8024040C: -/* 8D191C 8024040C 8E220070 */ lw $v0, 0x70($s1) -/* 8D1920 80240410 1840002E */ blez $v0, .L802404CC -/* 8D1924 80240414 00000000 */ nop -/* 8D1928 80240418 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8D192C 8024041C 0C00A8BB */ jal sin_deg -/* 8D1930 80240420 46806320 */ cvt.s.w $f12, $f12 -/* 8D1934 80240424 8E020000 */ lw $v0, ($s0) -/* 8D1938 80240428 30420008 */ andi $v0, $v0, 8 -/* 8D193C 8024042C 10400003 */ beqz $v0, .L8024043C -/* 8D1940 80240430 46000506 */ mov.s $f20, $f0 -/* 8D1944 80240434 0809011F */ j .L8024047C -/* 8D1948 80240438 0000102D */ daddu $v0, $zero, $zero -.L8024043C: -/* 8D194C 8024043C 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D1950 80240440 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D1954 80240444 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D1958 80240448 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D195C 8024044C C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D1960 80240450 3C01447A */ lui $at, 0x447a -/* 8D1964 80240454 44813000 */ mtc1 $at, $f6 -/* 8D1968 80240458 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D196C 8024045C E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D1970 80240460 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8D1974 80240464 E7A40030 */ swc1 $f4, 0x30($sp) -/* 8D1978 80240468 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8D197C 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* 8D1980 80240470 8E040080 */ lw $a0, 0x80($s0) -/* 8D1984 80240474 0C0372DF */ jal npc_raycast_down_sides -/* 8D1988 80240478 27A70030 */ addiu $a3, $sp, 0x30 -.L8024047C: -/* 8D198C 8024047C 10400007 */ beqz $v0, .L8024049C -/* 8D1990 80240480 00000000 */ nop -/* 8D1994 80240484 4616A082 */ mul.s $f2, $f20, $f22 -/* 8D1998 80240488 00000000 */ nop -/* 8D199C 8024048C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8D19A0 80240490 461A0000 */ add.s $f0, $f0, $f26 -/* 8D19A4 80240494 0809012A */ j .L802404A8 -/* 8D19A8 80240498 46020000 */ add.s $f0, $f0, $f2 -.L8024049C: -/* 8D19AC 8024049C 4616A002 */ mul.s $f0, $f20, $f22 -/* 8D19B0 802404A0 00000000 */ nop -/* 8D19B4 802404A4 4600C000 */ add.s $f0, $f24, $f0 -.L802404A8: -/* 8D19B8 802404A8 E600003C */ swc1 $f0, 0x3c($s0) -/* 8D19BC 802404AC 8E220074 */ lw $v0, 0x74($s1) -/* 8D19C0 802404B0 2442000A */ addiu $v0, $v0, 0xa -/* 8D19C4 802404B4 44826000 */ mtc1 $v0, $f12 -/* 8D19C8 802404B8 00000000 */ nop -/* 8D19CC 802404BC 0C00A6C9 */ jal clamp_angle -/* 8D19D0 802404C0 46806320 */ cvt.s.w $f12, $f12 -/* 8D19D4 802404C4 4600020D */ trunc.w.s $f8, $f0 -/* 8D19D8 802404C8 E6280074 */ swc1 $f8, 0x74($s1) -.L802404CC: -/* 8D19DC 802404CC 8E220090 */ lw $v0, 0x90($s1) -/* 8D19E0 802404D0 1C40004A */ bgtz $v0, .L802405FC -/* 8D19E4 802404D4 2442FFFF */ addiu $v0, $v0, -1 -/* 8D19E8 802404D8 8E430014 */ lw $v1, 0x14($s2) -/* 8D19EC 802404DC 04600048 */ bltz $v1, .L80240600 -/* 8D19F0 802404E0 00000000 */ nop -/* 8D19F4 802404E4 8E620074 */ lw $v0, 0x74($s3) -/* 8D19F8 802404E8 1C400042 */ bgtz $v0, .L802405F4 -/* 8D19FC 802404EC 2442FFFF */ addiu $v0, $v0, -1 -/* 8D1A00 802404F0 AE630074 */ sw $v1, 0x74($s3) -/* 8D1A04 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* 8D1A08 802404F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D1A0C 802404FC 44820000 */ mtc1 $v0, $f0 -/* 8D1A10 80240500 00000000 */ nop -/* 8D1A14 80240504 46800020 */ cvt.s.w $f0, $f0 -/* 8D1A18 80240508 46001080 */ add.s $f2, $f2, $f0 -/* 8D1A1C 8024050C 3C014024 */ lui $at, 0x4024 -/* 8D1A20 80240510 44810800 */ mtc1 $at, $f1 -/* 8D1A24 80240514 44800000 */ mtc1 $zero, $f0 -/* 8D1A28 80240518 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D1A2C 8024051C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D1A30 80240520 460010A1 */ cvt.d.s $f2, $f2 -/* 8D1A34 80240524 46201080 */ add.d $f2, $f2, $f0 -/* 8D1A38 80240528 C440002C */ lwc1 $f0, 0x2c($v0) -/* 8D1A3C 8024052C 46000021 */ cvt.d.s $f0, $f0 -/* 8D1A40 80240530 4622003C */ c.lt.d $f0, $f2 -/* 8D1A44 80240534 00000000 */ nop -/* 8D1A48 80240538 4500002C */ bc1f .L802405EC -/* 8D1A4C 8024053C 02A0202D */ daddu $a0, $s5, $zero -/* 8D1A50 80240540 AFA00010 */ sw $zero, 0x10($sp) -/* 8D1A54 80240544 8E46000C */ lw $a2, 0xc($s2) -/* 8D1A58 80240548 8E470010 */ lw $a3, 0x10($s2) -/* 8D1A5C 8024054C 0C01242D */ jal func_800490B4 -/* 8D1A60 80240550 0220282D */ daddu $a1, $s1, $zero -/* 8D1A64 80240554 10400025 */ beqz $v0, .L802405EC -/* 8D1A68 80240558 0000202D */ daddu $a0, $zero, $zero -/* 8D1A6C 8024055C 0200282D */ daddu $a1, $s0, $zero -/* 8D1A70 80240560 0000302D */ daddu $a2, $zero, $zero -/* 8D1A74 80240564 2412000C */ addiu $s2, $zero, 0xc -/* 8D1A78 80240568 860300A8 */ lh $v1, 0xa8($s0) -/* 8D1A7C 8024056C 3C013F80 */ lui $at, 0x3f80 -/* 8D1A80 80240570 44810000 */ mtc1 $at, $f0 -/* 8D1A84 80240574 3C014000 */ lui $at, 0x4000 -/* 8D1A88 80240578 44811000 */ mtc1 $at, $f2 -/* 8D1A8C 8024057C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D1A90 80240580 44812000 */ mtc1 $at, $f4 -/* 8D1A94 80240584 44834000 */ mtc1 $v1, $f8 -/* 8D1A98 80240588 00000000 */ nop -/* 8D1A9C 8024058C 46804220 */ cvt.s.w $f8, $f8 -/* 8D1AA0 80240590 44074000 */ mfc1 $a3, $f8 -/* 8D1AA4 80240594 27A20038 */ addiu $v0, $sp, 0x38 -/* 8D1AA8 80240598 AFB2001C */ sw $s2, 0x1c($sp) -/* 8D1AAC 8024059C AFA20020 */ sw $v0, 0x20($sp) -/* 8D1AB0 802405A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D1AB4 802405A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D1AB8 802405A8 0C01BFA4 */ jal fx_emote -/* 8D1ABC 802405AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D1AC0 802405B0 0200202D */ daddu $a0, $s0, $zero -/* 8D1AC4 802405B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8D1AC8 802405B8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 8D1ACC 802405BC 3C060020 */ lui $a2, 0x20 -/* 8D1AD0 802405C0 0C012530 */ jal ai_enemy_play_sound -/* 8D1AD4 802405C4 E4800064 */ swc1 $f0, 0x64($a0) -/* 8D1AD8 802405C8 8E220018 */ lw $v0, 0x18($s1) -/* 8D1ADC 802405CC 9442002A */ lhu $v0, 0x2a($v0) -/* 8D1AE0 802405D0 30420001 */ andi $v0, $v0, 1 -/* 8D1AE4 802405D4 10400003 */ beqz $v0, .L802405E4 -/* 8D1AE8 802405D8 2402000A */ addiu $v0, $zero, 0xa -/* 8D1AEC 802405DC 080901E9 */ j .L802407A4 -/* 8D1AF0 802405E0 AE620070 */ sw $v0, 0x70($s3) -.L802405E4: -/* 8D1AF4 802405E4 080901E9 */ j .L802407A4 -/* 8D1AF8 802405E8 AE720070 */ sw $s2, 0x70($s3) -.L802405EC: -/* 8D1AFC 802405EC 8E620074 */ lw $v0, 0x74($s3) -/* 8D1B00 802405F0 2442FFFF */ addiu $v0, $v0, -1 -.L802405F4: -/* 8D1B04 802405F4 08090180 */ j .L80240600 -/* 8D1B08 802405F8 AE620074 */ sw $v0, 0x74($s3) -.L802405FC: -/* 8D1B0C 802405FC AE220090 */ sw $v0, 0x90($s1) -.L80240600: -/* 8D1B10 80240600 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8D1B14 80240604 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8D1B18 80240608 C4620000 */ lwc1 $f2, ($v1) -/* 8D1B1C 8024060C 468010A0 */ cvt.s.w $f2, $f2 -/* 8D1B20 80240610 C4640008 */ lwc1 $f4, 8($v1) -/* 8D1B24 80240614 46802120 */ cvt.s.w $f4, $f4 -/* 8D1B28 80240618 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D1B2C 8024061C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D1B30 80240620 44051000 */ mfc1 $a1, $f2 -/* 8D1B34 80240624 C440000C */ lwc1 $f0, 0xc($v0) -/* 8D1B38 80240628 46800020 */ cvt.s.w $f0, $f0 -/* 8D1B3C 8024062C E7A00014 */ swc1 $f0, 0x14($sp) -/* 8D1B40 80240630 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D1B44 80240634 44062000 */ mfc1 $a2, $f4 -/* 8D1B48 80240638 C4400010 */ lwc1 $f0, 0x10($v0) -/* 8D1B4C 8024063C 46800020 */ cvt.s.w $f0, $f0 -/* 8D1B50 80240640 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D1B54 80240644 8C640018 */ lw $a0, 0x18($v1) -/* 8D1B58 80240648 0C0123F5 */ jal is_point_within_region -/* 8D1B5C 8024064C 8E070038 */ lw $a3, 0x38($s0) -/* 8D1B60 80240650 1040001A */ beqz $v0, .L802406BC -/* 8D1B64 80240654 00000000 */ nop -/* 8D1B68 80240658 8E060038 */ lw $a2, 0x38($s0) -/* 8D1B6C 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D1B70 80240660 8E070040 */ lw $a3, 0x40($s0) -/* 8D1B74 80240664 C44C0000 */ lwc1 $f12, ($v0) -/* 8D1B78 80240668 46806320 */ cvt.s.w $f12, $f12 -/* 8D1B7C 8024066C C44E0008 */ lwc1 $f14, 8($v0) -/* 8D1B80 80240670 0C00A7B5 */ jal dist2D -/* 8D1B84 80240674 468073A0 */ cvt.s.w $f14, $f14 -/* 8D1B88 80240678 C6020018 */ lwc1 $f2, 0x18($s0) -/* 8D1B8C 8024067C 4600103C */ c.lt.s $f2, $f0 -/* 8D1B90 80240680 00000000 */ nop -/* 8D1B94 80240684 4500000D */ bc1f .L802406BC -/* 8D1B98 80240688 E7A00034 */ swc1 $f0, 0x34($sp) -/* 8D1B9C 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D1BA0 80240690 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D1BA4 80240694 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D1BA8 80240698 C4480000 */ lwc1 $f8, ($v0) -/* 8D1BAC 8024069C 46804220 */ cvt.s.w $f8, $f8 -/* 8D1BB0 802406A0 44064000 */ mfc1 $a2, $f8 -/* 8D1BB4 802406A4 C4480008 */ lwc1 $f8, 8($v0) -/* 8D1BB8 802406A8 46804220 */ cvt.s.w $f8, $f8 -/* 8D1BBC 802406AC 44074000 */ mfc1 $a3, $f8 -/* 8D1BC0 802406B0 0C00A720 */ jal atan2 -/* 8D1BC4 802406B4 24140001 */ addiu $s4, $zero, 1 -/* 8D1BC8 802406B8 E600000C */ swc1 $f0, 0xc($s0) -.L802406BC: -/* 8D1BCC 802406BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D1BD0 802406C0 8C43000C */ lw $v1, 0xc($v0) -/* 8D1BD4 802406C4 8C420010 */ lw $v0, 0x10($v0) -/* 8D1BD8 802406C8 00621825 */ or $v1, $v1, $v0 -/* 8D1BDC 802406CC 00741825 */ or $v1, $v1, $s4 -/* 8D1BE0 802406D0 10600008 */ beqz $v1, .L802406F4 -/* 8D1BE4 802406D4 00000000 */ nop -/* 8D1BE8 802406D8 8602008C */ lh $v0, 0x8c($s0) -/* 8D1BEC 802406DC 14400031 */ bnez $v0, .L802407A4 -/* 8D1BF0 802406E0 00000000 */ nop -/* 8D1BF4 802406E4 8E050018 */ lw $a1, 0x18($s0) -/* 8D1BF8 802406E8 8E06000C */ lw $a2, 0xc($s0) -/* 8D1BFC 802406EC 0C00EA95 */ jal npc_move_heading -/* 8D1C00 802406F0 0200202D */ daddu $a0, $s0, $zero -.L802406F4: -/* 8D1C04 802406F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D1C08 802406F8 3C014059 */ lui $at, 0x4059 -/* 8D1C0C 802406FC 44811800 */ mtc1 $at, $f3 -/* 8D1C10 80240700 44801000 */ mtc1 $zero, $f2 -/* 8D1C14 80240704 46000021 */ cvt.d.s $f0, $f0 -/* 8D1C18 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* 8D1C1C 8024070C 00000000 */ nop -/* 8D1C20 80240710 4620020D */ trunc.w.d $f8, $f0 -/* 8D1C24 80240714 E628007C */ swc1 $f8, 0x7c($s1) -/* 8D1C28 80240718 8E420004 */ lw $v0, 4($s2) -/* 8D1C2C 8024071C 18400021 */ blez $v0, .L802407A4 -/* 8D1C30 80240720 00000000 */ nop -/* 8D1C34 80240724 8602008E */ lh $v0, 0x8e($s0) -/* 8D1C38 80240728 9603008E */ lhu $v1, 0x8e($s0) -/* 8D1C3C 8024072C 18400005 */ blez $v0, .L80240744 -/* 8D1C40 80240730 2462FFFF */ addiu $v0, $v1, -1 -/* 8D1C44 80240734 A602008E */ sh $v0, 0x8e($s0) -/* 8D1C48 80240738 00021400 */ sll $v0, $v0, 0x10 -/* 8D1C4C 8024073C 1C400019 */ bgtz $v0, .L802407A4 -/* 8D1C50 80240740 00000000 */ nop -.L80240744: -/* 8D1C54 80240744 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8D1C58 80240748 24020002 */ addiu $v0, $zero, 2 -/* 8D1C5C 8024074C 0C00A67F */ jal rand_int -/* 8D1C60 80240750 AE620070 */ sw $v0, 0x70($s3) -/* 8D1C64 80240754 3C035555 */ lui $v1, 0x5555 -/* 8D1C68 80240758 34635556 */ ori $v1, $v1, 0x5556 -/* 8D1C6C 8024075C 00430018 */ mult $v0, $v1 -/* 8D1C70 80240760 000227C3 */ sra $a0, $v0, 0x1f -/* 8D1C74 80240764 00004010 */ mfhi $t0 -/* 8D1C78 80240768 01042023 */ subu $a0, $t0, $a0 -/* 8D1C7C 8024076C 00041840 */ sll $v1, $a0, 1 -/* 8D1C80 80240770 00641821 */ addu $v1, $v1, $a0 -/* 8D1C84 80240774 00431023 */ subu $v0, $v0, $v1 -/* 8D1C88 80240778 24430002 */ addiu $v1, $v0, 2 -/* 8D1C8C 8024077C AE630074 */ sw $v1, 0x74($s3) -/* 8D1C90 80240780 8E42002C */ lw $v0, 0x2c($s2) -/* 8D1C94 80240784 58400007 */ blezl $v0, .L802407A4 -/* 8D1C98 80240788 AE600070 */ sw $zero, 0x70($s3) -/* 8D1C9C 8024078C 8E420008 */ lw $v0, 8($s2) -/* 8D1CA0 80240790 18400003 */ blez $v0, .L802407A0 -/* 8D1CA4 80240794 28620003 */ slti $v0, $v1, 3 -/* 8D1CA8 80240798 10400002 */ beqz $v0, .L802407A4 -/* 8D1CAC 8024079C 00000000 */ nop -.L802407A0: -/* 8D1CB0 802407A0 AE600070 */ sw $zero, 0x70($s3) -.L802407A4: -/* 8D1CB4 802407A4 8FBF0058 */ lw $ra, 0x58($sp) -/* 8D1CB8 802407A8 8FB50054 */ lw $s5, 0x54($sp) -/* 8D1CBC 802407AC 8FB40050 */ lw $s4, 0x50($sp) -/* 8D1CC0 802407B0 8FB3004C */ lw $s3, 0x4c($sp) -/* 8D1CC4 802407B4 8FB20048 */ lw $s2, 0x48($sp) -/* 8D1CC8 802407B8 8FB10044 */ lw $s1, 0x44($sp) -/* 8D1CCC 802407BC 8FB00040 */ lw $s0, 0x40($sp) -/* 8D1CD0 802407C0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8D1CD4 802407C4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8D1CD8 802407C8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8D1CDC 802407CC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8D1CE0 802407D0 03E00008 */ jr $ra -/* 8D1CE4 802407D4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s index 11405d37c4..d0b52b05de 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s @@ -86,7 +86,7 @@ glabel func_8024130C_8D281C .L80241428_8D2938: /* 8D2938 80241428 0280202D */ daddu $a0, $s4, $zero /* 8D293C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* 8D2940 80241430 0C09006C */ jal func_802401B0_8D16C0 +/* 8D2940 80241430 0C09006C */ jal kmr_06_UnkNpcAIFunc35 /* 8D2944 80241434 0260302D */ daddu $a2, $s3, $zero /* 8D2948 80241438 08090535 */ j .L802414D4 /* 8D294C 8024143C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s deleted file mode 100644 index 61a772e62a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242678_8D8478 -.double 0.09 - -dlabel D_80242680_8D8480 -.double 0.09 - -.section .text - -glabel func_802401B0_8D5FB0 -/* 8D5FB0 802401B0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 8D5FB4 802401B4 AFB3004C */ sw $s3, 0x4c($sp) -/* 8D5FB8 802401B8 0080982D */ daddu $s3, $a0, $zero -/* 8D5FBC 802401BC AFBF0058 */ sw $ra, 0x58($sp) -/* 8D5FC0 802401C0 AFB50054 */ sw $s5, 0x54($sp) -/* 8D5FC4 802401C4 AFB40050 */ sw $s4, 0x50($sp) -/* 8D5FC8 802401C8 AFB20048 */ sw $s2, 0x48($sp) -/* 8D5FCC 802401CC AFB10044 */ sw $s1, 0x44($sp) -/* 8D5FD0 802401D0 AFB00040 */ sw $s0, 0x40($sp) -/* 8D5FD4 802401D4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8D5FD8 802401D8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8D5FDC 802401DC F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8D5FE0 802401E0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8D5FE4 802401E4 8E710148 */ lw $s1, 0x148($s3) -/* 8D5FE8 802401E8 00A0902D */ daddu $s2, $a1, $zero -/* 8D5FEC 802401EC 86240008 */ lh $a0, 8($s1) -/* 8D5FF0 802401F0 0C00EABB */ jal get_npc_unsafe -/* 8D5FF4 802401F4 00C0A82D */ daddu $s5, $a2, $zero -/* 8D5FF8 802401F8 0040802D */ daddu $s0, $v0, $zero -/* 8D5FFC 802401FC 0000A02D */ daddu $s4, $zero, $zero -/* 8D6000 80240200 C624007C */ lwc1 $f4, 0x7c($s1) -/* 8D6004 80240204 46802120 */ cvt.s.w $f4, $f4 -/* 8D6008 80240208 C6220088 */ lwc1 $f2, 0x88($s1) -/* 8D600C 8024020C 468010A0 */ cvt.s.w $f2, $f2 -/* 8D6010 80240210 460010A1 */ cvt.d.s $f2, $f2 -/* 8D6014 80240214 46002121 */ cvt.d.s $f4, $f4 -/* 8D6018 80240218 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D601C 8024021C 3C014059 */ lui $at, 0x4059 -/* 8D6020 80240220 44813800 */ mtc1 $at, $f7 -/* 8D6024 80240224 44803000 */ mtc1 $zero, $f6 -/* 8D6028 80240228 46000021 */ cvt.d.s $f0, $f0 -/* 8D602C 8024022C 46260002 */ mul.d $f0, $f0, $f6 -/* 8D6030 80240230 00000000 */ nop -/* 8D6034 80240234 24020001 */ addiu $v0, $zero, 1 -/* 8D6038 80240238 8E24006C */ lw $a0, 0x6c($s1) -/* 8D603C 8024023C 46261083 */ div.d $f2, $f2, $f6 -/* 8D6040 80240240 462010A0 */ cvt.s.d $f2, $f2 -/* 8D6044 80240244 46262103 */ div.d $f4, $f4, $f6 -/* 8D6048 80240248 46202520 */ cvt.s.d $f20, $f4 -/* 8D604C 8024024C 30830011 */ andi $v1, $a0, 0x11 -/* 8D6050 80240250 4620020D */ trunc.w.d $f8, $f0 -/* 8D6054 80240254 E628007C */ swc1 $f8, 0x7c($s1) -/* 8D6058 80240258 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D605C 8024025C 46800020 */ cvt.s.w $f0, $f0 -/* 8D6060 80240260 46000021 */ cvt.d.s $f0, $f0 -/* 8D6064 80240264 46260003 */ div.d $f0, $f0, $f6 -/* 8D6068 80240268 462006A0 */ cvt.s.d $f26, $f0 -/* 8D606C 8024026C C6200070 */ lwc1 $f0, 0x70($s1) -/* 8D6070 80240270 46800020 */ cvt.s.w $f0, $f0 -/* 8D6074 80240274 46000021 */ cvt.d.s $f0, $f0 -/* 8D6078 80240278 46260003 */ div.d $f0, $f0, $f6 -/* 8D607C 8024027C 462005A0 */ cvt.s.d $f22, $f0 -/* 8D6080 80240280 14620025 */ bne $v1, $v0, .L80240318 -/* 8D6084 80240284 4602D600 */ add.s $f24, $f26, $f2 -/* 8D6088 80240288 8E020000 */ lw $v0, ($s0) -/* 8D608C 8024028C 30420008 */ andi $v0, $v0, 8 -/* 8D6090 80240290 10400009 */ beqz $v0, .L802402B8 -/* 8D6094 80240294 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D6098 80240298 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D609C 8024029C 4600C001 */ sub.s $f0, $f24, $f0 -/* 8D60A0 802402A0 4600B03C */ c.lt.s $f22, $f0 -/* 8D60A4 802402A4 00000000 */ nop -/* 8D60A8 802402A8 4500001B */ bc1f .L80240318 -/* 8D60AC 802402AC 34820010 */ ori $v0, $a0, 0x10 -/* 8D60B0 802402B0 080900C6 */ j .L80240318 -/* 8D60B4 802402B4 AE22006C */ sw $v0, 0x6c($s1) -.L802402B8: -/* 8D60B8 802402B8 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D60BC 802402BC C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D60C0 802402C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D60C4 802402C4 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D60C8 802402C8 3C01447A */ lui $at, 0x447a -/* 8D60CC 802402CC 44813000 */ mtc1 $at, $f6 -/* 8D60D0 802402D0 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D60D4 802402D4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D60D8 802402D8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8D60DC 802402DC E7A40030 */ swc1 $f4, 0x30($sp) -/* 8D60E0 802402E0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8D60E4 802402E4 AFA20010 */ sw $v0, 0x10($sp) -/* 8D60E8 802402E8 8E040080 */ lw $a0, 0x80($s0) -/* 8D60EC 802402EC 0C0372DF */ jal npc_raycast_down_sides -/* 8D60F0 802402F0 27A70030 */ addiu $a3, $sp, 0x30 -/* 8D60F4 802402F4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 8D60F8 802402F8 4600D001 */ sub.s $f0, $f26, $f0 -/* 8D60FC 802402FC 4600B03C */ c.lt.s $f22, $f0 -/* 8D6100 80240300 00000000 */ nop -/* 8D6104 80240304 45000004 */ bc1f .L80240318 -/* 8D6108 80240308 00000000 */ nop -/* 8D610C 8024030C 8E22006C */ lw $v0, 0x6c($s1) -/* 8D6110 80240310 34420010 */ ori $v0, $v0, 0x10 -/* 8D6114 80240314 AE22006C */ sw $v0, 0x6c($s1) -.L80240318: -/* 8D6118 80240318 8E22006C */ lw $v0, 0x6c($s1) -/* 8D611C 8024031C 24030011 */ addiu $v1, $zero, 0x11 -/* 8D6120 80240320 30420011 */ andi $v0, $v0, 0x11 -/* 8D6124 80240324 14430039 */ bne $v0, $v1, .L8024040C -/* 8D6128 80240328 00000000 */ nop -/* 8D612C 8024032C 8E020000 */ lw $v0, ($s0) -/* 8D6130 80240330 30420008 */ andi $v0, $v0, 8 -/* 8D6134 80240334 1040000A */ beqz $v0, .L80240360 -/* 8D6138 80240338 4600C106 */ mov.s $f4, $f24 -/* 8D613C 8024033C 4614C081 */ sub.s $f2, $f24, $f20 -/* 8D6140 80240340 3C018024 */ lui $at, %hi(D_80242678_8D8478) -/* 8D6144 80240344 D4202678 */ ldc1 $f0, %lo(D_80242678_8D8478)($at) -/* 8D6148 80240348 460010A1 */ cvt.d.s $f2, $f2 -/* 8D614C 8024034C 46201082 */ mul.d $f2, $f2, $f0 -/* 8D6150 80240350 00000000 */ nop -/* 8D6154 80240354 4600A021 */ cvt.d.s $f0, $f20 -/* 8D6158 80240358 080900F1 */ j .L802403C4 -/* 8D615C 8024035C 46220000 */ add.d $f0, $f0, $f2 -.L80240360: -/* 8D6160 80240360 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D6164 80240364 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D6168 80240368 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D616C 8024036C C6020040 */ lwc1 $f2, 0x40($s0) -/* 8D6170 80240370 3C01447A */ lui $at, 0x447a -/* 8D6174 80240374 44812000 */ mtc1 $at, $f4 -/* 8D6178 80240378 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D617C 8024037C E7B4002C */ swc1 $f20, 0x2c($sp) -/* 8D6180 80240380 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D6184 80240384 E7A20030 */ swc1 $f2, 0x30($sp) -/* 8D6188 80240388 E7A40034 */ swc1 $f4, 0x34($sp) -/* 8D618C 8024038C AFA20010 */ sw $v0, 0x10($sp) -/* 8D6190 80240390 8E040080 */ lw $a0, 0x80($s0) -/* 8D6194 80240394 0C0372DF */ jal npc_raycast_down_sides -/* 8D6198 80240398 27A70030 */ addiu $a3, $sp, 0x30 -/* 8D619C 8024039C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 8D61A0 802403A0 461A2100 */ add.s $f4, $f4, $f26 -/* 8D61A4 802403A4 46142081 */ sub.s $f2, $f4, $f20 -/* 8D61A8 802403A8 3C018024 */ lui $at, %hi(D_80242680_8D8480) -/* 8D61AC 802403AC D4202680 */ ldc1 $f0, %lo(D_80242680_8D8480)($at) -/* 8D61B0 802403B0 460010A1 */ cvt.d.s $f2, $f2 -/* 8D61B4 802403B4 46201082 */ mul.d $f2, $f2, $f0 -/* 8D61B8 802403B8 00000000 */ nop -/* 8D61BC 802403BC 4600A021 */ cvt.d.s $f0, $f20 -/* 8D61C0 802403C0 46220000 */ add.d $f0, $f0, $f2 -.L802403C4: -/* 8D61C4 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* 8D61C8 802403C8 E600003C */ swc1 $f0, 0x3c($s0) -/* 8D61CC 802403CC C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D61D0 802403D0 46002001 */ sub.s $f0, $f4, $f0 -/* 8D61D4 802403D4 3C013FF0 */ lui $at, 0x3ff0 -/* 8D61D8 802403D8 44811800 */ mtc1 $at, $f3 -/* 8D61DC 802403DC 44801000 */ mtc1 $zero, $f2 -/* 8D61E0 802403E0 46000005 */ abs.s $f0, $f0 -/* 8D61E4 802403E4 46000021 */ cvt.d.s $f0, $f0 -/* 8D61E8 802403E8 4622003C */ c.lt.d $f0, $f2 -/* 8D61EC 802403EC 00000000 */ nop -/* 8D61F0 802403F0 45000036 */ bc1f .L802404CC -/* 8D61F4 802403F4 2403FFEF */ addiu $v1, $zero, -0x11 -/* 8D61F8 802403F8 E604003C */ swc1 $f4, 0x3c($s0) -/* 8D61FC 802403FC 8E22006C */ lw $v0, 0x6c($s1) -/* 8D6200 80240400 00431024 */ and $v0, $v0, $v1 -/* 8D6204 80240404 08090133 */ j .L802404CC -/* 8D6208 80240408 AE22006C */ sw $v0, 0x6c($s1) -.L8024040C: -/* 8D620C 8024040C 8E220070 */ lw $v0, 0x70($s1) -/* 8D6210 80240410 1840002E */ blez $v0, .L802404CC -/* 8D6214 80240414 00000000 */ nop -/* 8D6218 80240418 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8D621C 8024041C 0C00A8BB */ jal sin_deg -/* 8D6220 80240420 46806320 */ cvt.s.w $f12, $f12 -/* 8D6224 80240424 8E020000 */ lw $v0, ($s0) -/* 8D6228 80240428 30420008 */ andi $v0, $v0, 8 -/* 8D622C 8024042C 10400003 */ beqz $v0, .L8024043C -/* 8D6230 80240430 46000506 */ mov.s $f20, $f0 -/* 8D6234 80240434 0809011F */ j .L8024047C -/* 8D6238 80240438 0000102D */ daddu $v0, $zero, $zero -.L8024043C: -/* 8D623C 8024043C 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D6240 80240440 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D6244 80240444 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D6248 80240448 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D624C 8024044C C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D6250 80240450 3C01447A */ lui $at, 0x447a -/* 8D6254 80240454 44813000 */ mtc1 $at, $f6 -/* 8D6258 80240458 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D625C 8024045C E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D6260 80240460 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8D6264 80240464 E7A40030 */ swc1 $f4, 0x30($sp) -/* 8D6268 80240468 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8D626C 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* 8D6270 80240470 8E040080 */ lw $a0, 0x80($s0) -/* 8D6274 80240474 0C0372DF */ jal npc_raycast_down_sides -/* 8D6278 80240478 27A70030 */ addiu $a3, $sp, 0x30 -.L8024047C: -/* 8D627C 8024047C 10400007 */ beqz $v0, .L8024049C -/* 8D6280 80240480 00000000 */ nop -/* 8D6284 80240484 4616A082 */ mul.s $f2, $f20, $f22 -/* 8D6288 80240488 00000000 */ nop -/* 8D628C 8024048C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8D6290 80240490 461A0000 */ add.s $f0, $f0, $f26 -/* 8D6294 80240494 0809012A */ j .L802404A8 -/* 8D6298 80240498 46020000 */ add.s $f0, $f0, $f2 -.L8024049C: -/* 8D629C 8024049C 4616A002 */ mul.s $f0, $f20, $f22 -/* 8D62A0 802404A0 00000000 */ nop -/* 8D62A4 802404A4 4600C000 */ add.s $f0, $f24, $f0 -.L802404A8: -/* 8D62A8 802404A8 E600003C */ swc1 $f0, 0x3c($s0) -/* 8D62AC 802404AC 8E220074 */ lw $v0, 0x74($s1) -/* 8D62B0 802404B0 2442000A */ addiu $v0, $v0, 0xa -/* 8D62B4 802404B4 44826000 */ mtc1 $v0, $f12 -/* 8D62B8 802404B8 00000000 */ nop -/* 8D62BC 802404BC 0C00A6C9 */ jal clamp_angle -/* 8D62C0 802404C0 46806320 */ cvt.s.w $f12, $f12 -/* 8D62C4 802404C4 4600020D */ trunc.w.s $f8, $f0 -/* 8D62C8 802404C8 E6280074 */ swc1 $f8, 0x74($s1) -.L802404CC: -/* 8D62CC 802404CC 8E220090 */ lw $v0, 0x90($s1) -/* 8D62D0 802404D0 1C40004A */ bgtz $v0, .L802405FC -/* 8D62D4 802404D4 2442FFFF */ addiu $v0, $v0, -1 -/* 8D62D8 802404D8 8E430014 */ lw $v1, 0x14($s2) -/* 8D62DC 802404DC 04600048 */ bltz $v1, .L80240600 -/* 8D62E0 802404E0 00000000 */ nop -/* 8D62E4 802404E4 8E620074 */ lw $v0, 0x74($s3) -/* 8D62E8 802404E8 1C400042 */ bgtz $v0, .L802405F4 -/* 8D62EC 802404EC 2442FFFF */ addiu $v0, $v0, -1 -/* 8D62F0 802404F0 AE630074 */ sw $v1, 0x74($s3) -/* 8D62F4 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* 8D62F8 802404F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D62FC 802404FC 44820000 */ mtc1 $v0, $f0 -/* 8D6300 80240500 00000000 */ nop -/* 8D6304 80240504 46800020 */ cvt.s.w $f0, $f0 -/* 8D6308 80240508 46001080 */ add.s $f2, $f2, $f0 -/* 8D630C 8024050C 3C014024 */ lui $at, 0x4024 -/* 8D6310 80240510 44810800 */ mtc1 $at, $f1 -/* 8D6314 80240514 44800000 */ mtc1 $zero, $f0 -/* 8D6318 80240518 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D631C 8024051C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D6320 80240520 460010A1 */ cvt.d.s $f2, $f2 -/* 8D6324 80240524 46201080 */ add.d $f2, $f2, $f0 -/* 8D6328 80240528 C440002C */ lwc1 $f0, 0x2c($v0) -/* 8D632C 8024052C 46000021 */ cvt.d.s $f0, $f0 -/* 8D6330 80240530 4622003C */ c.lt.d $f0, $f2 -/* 8D6334 80240534 00000000 */ nop -/* 8D6338 80240538 4500002C */ bc1f .L802405EC -/* 8D633C 8024053C 02A0202D */ daddu $a0, $s5, $zero -/* 8D6340 80240540 AFA00010 */ sw $zero, 0x10($sp) -/* 8D6344 80240544 8E46000C */ lw $a2, 0xc($s2) -/* 8D6348 80240548 8E470010 */ lw $a3, 0x10($s2) -/* 8D634C 8024054C 0C01242D */ jal func_800490B4 -/* 8D6350 80240550 0220282D */ daddu $a1, $s1, $zero -/* 8D6354 80240554 10400025 */ beqz $v0, .L802405EC -/* 8D6358 80240558 0000202D */ daddu $a0, $zero, $zero -/* 8D635C 8024055C 0200282D */ daddu $a1, $s0, $zero -/* 8D6360 80240560 0000302D */ daddu $a2, $zero, $zero -/* 8D6364 80240564 2412000C */ addiu $s2, $zero, 0xc -/* 8D6368 80240568 860300A8 */ lh $v1, 0xa8($s0) -/* 8D636C 8024056C 3C013F80 */ lui $at, 0x3f80 -/* 8D6370 80240570 44810000 */ mtc1 $at, $f0 -/* 8D6374 80240574 3C014000 */ lui $at, 0x4000 -/* 8D6378 80240578 44811000 */ mtc1 $at, $f2 -/* 8D637C 8024057C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D6380 80240580 44812000 */ mtc1 $at, $f4 -/* 8D6384 80240584 44834000 */ mtc1 $v1, $f8 -/* 8D6388 80240588 00000000 */ nop -/* 8D638C 8024058C 46804220 */ cvt.s.w $f8, $f8 -/* 8D6390 80240590 44074000 */ mfc1 $a3, $f8 -/* 8D6394 80240594 27A20038 */ addiu $v0, $sp, 0x38 -/* 8D6398 80240598 AFB2001C */ sw $s2, 0x1c($sp) -/* 8D639C 8024059C AFA20020 */ sw $v0, 0x20($sp) -/* 8D63A0 802405A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D63A4 802405A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D63A8 802405A8 0C01BFA4 */ jal fx_emote -/* 8D63AC 802405AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D63B0 802405B0 0200202D */ daddu $a0, $s0, $zero -/* 8D63B4 802405B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8D63B8 802405B8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 8D63BC 802405BC 3C060020 */ lui $a2, 0x20 -/* 8D63C0 802405C0 0C012530 */ jal ai_enemy_play_sound -/* 8D63C4 802405C4 E4800064 */ swc1 $f0, 0x64($a0) -/* 8D63C8 802405C8 8E220018 */ lw $v0, 0x18($s1) -/* 8D63CC 802405CC 9442002A */ lhu $v0, 0x2a($v0) -/* 8D63D0 802405D0 30420001 */ andi $v0, $v0, 1 -/* 8D63D4 802405D4 10400003 */ beqz $v0, .L802405E4 -/* 8D63D8 802405D8 2402000A */ addiu $v0, $zero, 0xa -/* 8D63DC 802405DC 080901E9 */ j .L802407A4 -/* 8D63E0 802405E0 AE620070 */ sw $v0, 0x70($s3) -.L802405E4: -/* 8D63E4 802405E4 080901E9 */ j .L802407A4 -/* 8D63E8 802405E8 AE720070 */ sw $s2, 0x70($s3) -.L802405EC: -/* 8D63EC 802405EC 8E620074 */ lw $v0, 0x74($s3) -/* 8D63F0 802405F0 2442FFFF */ addiu $v0, $v0, -1 -.L802405F4: -/* 8D63F4 802405F4 08090180 */ j .L80240600 -/* 8D63F8 802405F8 AE620074 */ sw $v0, 0x74($s3) -.L802405FC: -/* 8D63FC 802405FC AE220090 */ sw $v0, 0x90($s1) -.L80240600: -/* 8D6400 80240600 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8D6404 80240604 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8D6408 80240608 C4620000 */ lwc1 $f2, ($v1) -/* 8D640C 8024060C 468010A0 */ cvt.s.w $f2, $f2 -/* 8D6410 80240610 C4640008 */ lwc1 $f4, 8($v1) -/* 8D6414 80240614 46802120 */ cvt.s.w $f4, $f4 -/* 8D6418 80240618 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D641C 8024061C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D6420 80240620 44051000 */ mfc1 $a1, $f2 -/* 8D6424 80240624 C440000C */ lwc1 $f0, 0xc($v0) -/* 8D6428 80240628 46800020 */ cvt.s.w $f0, $f0 -/* 8D642C 8024062C E7A00014 */ swc1 $f0, 0x14($sp) -/* 8D6430 80240630 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D6434 80240634 44062000 */ mfc1 $a2, $f4 -/* 8D6438 80240638 C4400010 */ lwc1 $f0, 0x10($v0) -/* 8D643C 8024063C 46800020 */ cvt.s.w $f0, $f0 -/* 8D6440 80240640 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D6444 80240644 8C640018 */ lw $a0, 0x18($v1) -/* 8D6448 80240648 0C0123F5 */ jal is_point_within_region -/* 8D644C 8024064C 8E070038 */ lw $a3, 0x38($s0) -/* 8D6450 80240650 1040001A */ beqz $v0, .L802406BC -/* 8D6454 80240654 00000000 */ nop -/* 8D6458 80240658 8E060038 */ lw $a2, 0x38($s0) -/* 8D645C 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D6460 80240660 8E070040 */ lw $a3, 0x40($s0) -/* 8D6464 80240664 C44C0000 */ lwc1 $f12, ($v0) -/* 8D6468 80240668 46806320 */ cvt.s.w $f12, $f12 -/* 8D646C 8024066C C44E0008 */ lwc1 $f14, 8($v0) -/* 8D6470 80240670 0C00A7B5 */ jal dist2D -/* 8D6474 80240674 468073A0 */ cvt.s.w $f14, $f14 -/* 8D6478 80240678 C6020018 */ lwc1 $f2, 0x18($s0) -/* 8D647C 8024067C 4600103C */ c.lt.s $f2, $f0 -/* 8D6480 80240680 00000000 */ nop -/* 8D6484 80240684 4500000D */ bc1f .L802406BC -/* 8D6488 80240688 E7A00034 */ swc1 $f0, 0x34($sp) -/* 8D648C 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D6490 80240690 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D6494 80240694 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D6498 80240698 C4480000 */ lwc1 $f8, ($v0) -/* 8D649C 8024069C 46804220 */ cvt.s.w $f8, $f8 -/* 8D64A0 802406A0 44064000 */ mfc1 $a2, $f8 -/* 8D64A4 802406A4 C4480008 */ lwc1 $f8, 8($v0) -/* 8D64A8 802406A8 46804220 */ cvt.s.w $f8, $f8 -/* 8D64AC 802406AC 44074000 */ mfc1 $a3, $f8 -/* 8D64B0 802406B0 0C00A720 */ jal atan2 -/* 8D64B4 802406B4 24140001 */ addiu $s4, $zero, 1 -/* 8D64B8 802406B8 E600000C */ swc1 $f0, 0xc($s0) -.L802406BC: -/* 8D64BC 802406BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D64C0 802406C0 8C43000C */ lw $v1, 0xc($v0) -/* 8D64C4 802406C4 8C420010 */ lw $v0, 0x10($v0) -/* 8D64C8 802406C8 00621825 */ or $v1, $v1, $v0 -/* 8D64CC 802406CC 00741825 */ or $v1, $v1, $s4 -/* 8D64D0 802406D0 10600008 */ beqz $v1, .L802406F4 -/* 8D64D4 802406D4 00000000 */ nop -/* 8D64D8 802406D8 8602008C */ lh $v0, 0x8c($s0) -/* 8D64DC 802406DC 14400031 */ bnez $v0, .L802407A4 -/* 8D64E0 802406E0 00000000 */ nop -/* 8D64E4 802406E4 8E050018 */ lw $a1, 0x18($s0) -/* 8D64E8 802406E8 8E06000C */ lw $a2, 0xc($s0) -/* 8D64EC 802406EC 0C00EA95 */ jal npc_move_heading -/* 8D64F0 802406F0 0200202D */ daddu $a0, $s0, $zero -.L802406F4: -/* 8D64F4 802406F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D64F8 802406F8 3C014059 */ lui $at, 0x4059 -/* 8D64FC 802406FC 44811800 */ mtc1 $at, $f3 -/* 8D6500 80240700 44801000 */ mtc1 $zero, $f2 -/* 8D6504 80240704 46000021 */ cvt.d.s $f0, $f0 -/* 8D6508 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* 8D650C 8024070C 00000000 */ nop -/* 8D6510 80240710 4620020D */ trunc.w.d $f8, $f0 -/* 8D6514 80240714 E628007C */ swc1 $f8, 0x7c($s1) -/* 8D6518 80240718 8E420004 */ lw $v0, 4($s2) -/* 8D651C 8024071C 18400021 */ blez $v0, .L802407A4 -/* 8D6520 80240720 00000000 */ nop -/* 8D6524 80240724 8602008E */ lh $v0, 0x8e($s0) -/* 8D6528 80240728 9603008E */ lhu $v1, 0x8e($s0) -/* 8D652C 8024072C 18400005 */ blez $v0, .L80240744 -/* 8D6530 80240730 2462FFFF */ addiu $v0, $v1, -1 -/* 8D6534 80240734 A602008E */ sh $v0, 0x8e($s0) -/* 8D6538 80240738 00021400 */ sll $v0, $v0, 0x10 -/* 8D653C 8024073C 1C400019 */ bgtz $v0, .L802407A4 -/* 8D6540 80240740 00000000 */ nop -.L80240744: -/* 8D6544 80240744 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8D6548 80240748 24020002 */ addiu $v0, $zero, 2 -/* 8D654C 8024074C 0C00A67F */ jal rand_int -/* 8D6550 80240750 AE620070 */ sw $v0, 0x70($s3) -/* 8D6554 80240754 3C035555 */ lui $v1, 0x5555 -/* 8D6558 80240758 34635556 */ ori $v1, $v1, 0x5556 -/* 8D655C 8024075C 00430018 */ mult $v0, $v1 -/* 8D6560 80240760 000227C3 */ sra $a0, $v0, 0x1f -/* 8D6564 80240764 00004010 */ mfhi $t0 -/* 8D6568 80240768 01042023 */ subu $a0, $t0, $a0 -/* 8D656C 8024076C 00041840 */ sll $v1, $a0, 1 -/* 8D6570 80240770 00641821 */ addu $v1, $v1, $a0 -/* 8D6574 80240774 00431023 */ subu $v0, $v0, $v1 -/* 8D6578 80240778 24430002 */ addiu $v1, $v0, 2 -/* 8D657C 8024077C AE630074 */ sw $v1, 0x74($s3) -/* 8D6580 80240780 8E42002C */ lw $v0, 0x2c($s2) -/* 8D6584 80240784 58400007 */ blezl $v0, .L802407A4 -/* 8D6588 80240788 AE600070 */ sw $zero, 0x70($s3) -/* 8D658C 8024078C 8E420008 */ lw $v0, 8($s2) -/* 8D6590 80240790 18400003 */ blez $v0, .L802407A0 -/* 8D6594 80240794 28620003 */ slti $v0, $v1, 3 -/* 8D6598 80240798 10400002 */ beqz $v0, .L802407A4 -/* 8D659C 8024079C 00000000 */ nop -.L802407A0: -/* 8D65A0 802407A0 AE600070 */ sw $zero, 0x70($s3) -.L802407A4: -/* 8D65A4 802407A4 8FBF0058 */ lw $ra, 0x58($sp) -/* 8D65A8 802407A8 8FB50054 */ lw $s5, 0x54($sp) -/* 8D65AC 802407AC 8FB40050 */ lw $s4, 0x50($sp) -/* 8D65B0 802407B0 8FB3004C */ lw $s3, 0x4c($sp) -/* 8D65B4 802407B4 8FB20048 */ lw $s2, 0x48($sp) -/* 8D65B8 802407B8 8FB10044 */ lw $s1, 0x44($sp) -/* 8D65BC 802407BC 8FB00040 */ lw $s0, 0x40($sp) -/* 8D65C0 802407C0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8D65C4 802407C4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8D65C8 802407C8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8D65CC 802407CC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8D65D0 802407D0 03E00008 */ jr $ra -/* 8D65D4 802407D4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s index eab1d5ae0b..f9691d6f4d 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s @@ -86,7 +86,7 @@ glabel func_8024130C_8D710C .L80241428_8D7228: /* 8D7228 80241428 0280202D */ daddu $a0, $s4, $zero /* 8D722C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* 8D7230 80241430 0C09006C */ jal func_802401B0_8D5FB0 +/* 8D7230 80241430 0C09006C */ jal kmr_09_UnkNpcAIFunc35 /* 8D7234 80241434 0260302D */ daddu $a2, $s3, $zero /* 8D7238 80241438 08090535 */ j .L802414D4 /* 8D723C 8024143C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240690_C5ADD0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240690_C5ADD0.s deleted file mode 100644 index 2f34352077..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240690_C5ADD0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80246508_C60C48 -.double 0.09 - -dlabel D_80246510_C60C50 -.double 0.09 - -.section .text - -glabel func_80240690_C5ADD0 -/* C5ADD0 80240690 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C5ADD4 80240694 AFB3004C */ sw $s3, 0x4c($sp) -/* C5ADD8 80240698 0080982D */ daddu $s3, $a0, $zero -/* C5ADDC 8024069C AFBF0058 */ sw $ra, 0x58($sp) -/* C5ADE0 802406A0 AFB50054 */ sw $s5, 0x54($sp) -/* C5ADE4 802406A4 AFB40050 */ sw $s4, 0x50($sp) -/* C5ADE8 802406A8 AFB20048 */ sw $s2, 0x48($sp) -/* C5ADEC 802406AC AFB10044 */ sw $s1, 0x44($sp) -/* C5ADF0 802406B0 AFB00040 */ sw $s0, 0x40($sp) -/* C5ADF4 802406B4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C5ADF8 802406B8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C5ADFC 802406BC F7B60068 */ sdc1 $f22, 0x68($sp) -/* C5AE00 802406C0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C5AE04 802406C4 8E710148 */ lw $s1, 0x148($s3) -/* C5AE08 802406C8 00A0902D */ daddu $s2, $a1, $zero -/* C5AE0C 802406CC 86240008 */ lh $a0, 8($s1) -/* C5AE10 802406D0 0C00EABB */ jal get_npc_unsafe -/* C5AE14 802406D4 00C0A82D */ daddu $s5, $a2, $zero -/* C5AE18 802406D8 0040802D */ daddu $s0, $v0, $zero -/* C5AE1C 802406DC 0000A02D */ daddu $s4, $zero, $zero -/* C5AE20 802406E0 C624007C */ lwc1 $f4, 0x7c($s1) -/* C5AE24 802406E4 46802120 */ cvt.s.w $f4, $f4 -/* C5AE28 802406E8 C6220088 */ lwc1 $f2, 0x88($s1) -/* C5AE2C 802406EC 468010A0 */ cvt.s.w $f2, $f2 -/* C5AE30 802406F0 460010A1 */ cvt.d.s $f2, $f2 -/* C5AE34 802406F4 46002121 */ cvt.d.s $f4, $f4 -/* C5AE38 802406F8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5AE3C 802406FC 3C014059 */ lui $at, 0x4059 -/* C5AE40 80240700 44813800 */ mtc1 $at, $f7 -/* C5AE44 80240704 44803000 */ mtc1 $zero, $f6 -/* C5AE48 80240708 46000021 */ cvt.d.s $f0, $f0 -/* C5AE4C 8024070C 46260002 */ mul.d $f0, $f0, $f6 -/* C5AE50 80240710 00000000 */ nop -/* C5AE54 80240714 24020001 */ addiu $v0, $zero, 1 -/* C5AE58 80240718 8E24006C */ lw $a0, 0x6c($s1) -/* C5AE5C 8024071C 46261083 */ div.d $f2, $f2, $f6 -/* C5AE60 80240720 462010A0 */ cvt.s.d $f2, $f2 -/* C5AE64 80240724 46262103 */ div.d $f4, $f4, $f6 -/* C5AE68 80240728 46202520 */ cvt.s.d $f20, $f4 -/* C5AE6C 8024072C 30830011 */ andi $v1, $a0, 0x11 -/* C5AE70 80240730 4620020D */ trunc.w.d $f8, $f0 -/* C5AE74 80240734 E628007C */ swc1 $f8, 0x7c($s1) -/* C5AE78 80240738 C6200078 */ lwc1 $f0, 0x78($s1) -/* C5AE7C 8024073C 46800020 */ cvt.s.w $f0, $f0 -/* C5AE80 80240740 46000021 */ cvt.d.s $f0, $f0 -/* C5AE84 80240744 46260003 */ div.d $f0, $f0, $f6 -/* C5AE88 80240748 462006A0 */ cvt.s.d $f26, $f0 -/* C5AE8C 8024074C C6200070 */ lwc1 $f0, 0x70($s1) -/* C5AE90 80240750 46800020 */ cvt.s.w $f0, $f0 -/* C5AE94 80240754 46000021 */ cvt.d.s $f0, $f0 -/* C5AE98 80240758 46260003 */ div.d $f0, $f0, $f6 -/* C5AE9C 8024075C 462005A0 */ cvt.s.d $f22, $f0 -/* C5AEA0 80240760 14620025 */ bne $v1, $v0, .L802407F8 -/* C5AEA4 80240764 4602D600 */ add.s $f24, $f26, $f2 -/* C5AEA8 80240768 8E020000 */ lw $v0, ($s0) -/* C5AEAC 8024076C 30420008 */ andi $v0, $v0, 8 -/* C5AEB0 80240770 10400009 */ beqz $v0, .L80240798 -/* C5AEB4 80240774 27A50028 */ addiu $a1, $sp, 0x28 -/* C5AEB8 80240778 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5AEBC 8024077C 4600C001 */ sub.s $f0, $f24, $f0 -/* C5AEC0 80240780 4600B03C */ c.lt.s $f22, $f0 -/* C5AEC4 80240784 00000000 */ nop -/* C5AEC8 80240788 4500001B */ bc1f .L802407F8 -/* C5AECC 8024078C 34820010 */ ori $v0, $a0, 0x10 -/* C5AED0 80240790 080901FE */ j .L802407F8 -/* C5AED4 80240794 AE22006C */ sw $v0, 0x6c($s1) -.L80240798: -/* C5AED8 80240798 27A6002C */ addiu $a2, $sp, 0x2c -/* C5AEDC 8024079C C6000038 */ lwc1 $f0, 0x38($s0) -/* C5AEE0 802407A0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C5AEE4 802407A4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C5AEE8 802407A8 3C01447A */ lui $at, 0x447a -/* C5AEEC 802407AC 44813000 */ mtc1 $at, $f6 -/* C5AEF0 802407B0 27A20034 */ addiu $v0, $sp, 0x34 -/* C5AEF4 802407B4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C5AEF8 802407B8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C5AEFC 802407BC E7A40030 */ swc1 $f4, 0x30($sp) -/* C5AF00 802407C0 E7A60034 */ swc1 $f6, 0x34($sp) -/* C5AF04 802407C4 AFA20010 */ sw $v0, 0x10($sp) -/* C5AF08 802407C8 8E040080 */ lw $a0, 0x80($s0) -/* C5AF0C 802407CC 0C0372DF */ jal npc_raycast_down_sides -/* C5AF10 802407D0 27A70030 */ addiu $a3, $sp, 0x30 -/* C5AF14 802407D4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C5AF18 802407D8 4600D001 */ sub.s $f0, $f26, $f0 -/* C5AF1C 802407DC 4600B03C */ c.lt.s $f22, $f0 -/* C5AF20 802407E0 00000000 */ nop -/* C5AF24 802407E4 45000004 */ bc1f .L802407F8 -/* C5AF28 802407E8 00000000 */ nop -/* C5AF2C 802407EC 8E22006C */ lw $v0, 0x6c($s1) -/* C5AF30 802407F0 34420010 */ ori $v0, $v0, 0x10 -/* C5AF34 802407F4 AE22006C */ sw $v0, 0x6c($s1) -.L802407F8: -/* C5AF38 802407F8 8E22006C */ lw $v0, 0x6c($s1) -/* C5AF3C 802407FC 24030011 */ addiu $v1, $zero, 0x11 -/* C5AF40 80240800 30420011 */ andi $v0, $v0, 0x11 -/* C5AF44 80240804 14430039 */ bne $v0, $v1, .L802408EC -/* C5AF48 80240808 00000000 */ nop -/* C5AF4C 8024080C 8E020000 */ lw $v0, ($s0) -/* C5AF50 80240810 30420008 */ andi $v0, $v0, 8 -/* C5AF54 80240814 1040000A */ beqz $v0, .L80240840 -/* C5AF58 80240818 4600C106 */ mov.s $f4, $f24 -/* C5AF5C 8024081C 4614C081 */ sub.s $f2, $f24, $f20 -/* C5AF60 80240820 3C018024 */ lui $at, %hi(D_80246508_C60C48) -/* C5AF64 80240824 D4206508 */ ldc1 $f0, %lo(D_80246508_C60C48)($at) -/* C5AF68 80240828 460010A1 */ cvt.d.s $f2, $f2 -/* C5AF6C 8024082C 46201082 */ mul.d $f2, $f2, $f0 -/* C5AF70 80240830 00000000 */ nop -/* C5AF74 80240834 4600A021 */ cvt.d.s $f0, $f20 -/* C5AF78 80240838 08090229 */ j .L802408A4 -/* C5AF7C 8024083C 46220000 */ add.d $f0, $f0, $f2 -.L80240840: -/* C5AF80 80240840 27A50028 */ addiu $a1, $sp, 0x28 -/* C5AF84 80240844 27A6002C */ addiu $a2, $sp, 0x2c -/* C5AF88 80240848 C6000038 */ lwc1 $f0, 0x38($s0) -/* C5AF8C 8024084C C6020040 */ lwc1 $f2, 0x40($s0) -/* C5AF90 80240850 3C01447A */ lui $at, 0x447a -/* C5AF94 80240854 44812000 */ mtc1 $at, $f4 -/* C5AF98 80240858 27A20034 */ addiu $v0, $sp, 0x34 -/* C5AF9C 8024085C E7B4002C */ swc1 $f20, 0x2c($sp) -/* C5AFA0 80240860 E7A00028 */ swc1 $f0, 0x28($sp) -/* C5AFA4 80240864 E7A20030 */ swc1 $f2, 0x30($sp) -/* C5AFA8 80240868 E7A40034 */ swc1 $f4, 0x34($sp) -/* C5AFAC 8024086C AFA20010 */ sw $v0, 0x10($sp) -/* C5AFB0 80240870 8E040080 */ lw $a0, 0x80($s0) -/* C5AFB4 80240874 0C0372DF */ jal npc_raycast_down_sides -/* C5AFB8 80240878 27A70030 */ addiu $a3, $sp, 0x30 -/* C5AFBC 8024087C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C5AFC0 80240880 461A2100 */ add.s $f4, $f4, $f26 -/* C5AFC4 80240884 46142081 */ sub.s $f2, $f4, $f20 -/* C5AFC8 80240888 3C018024 */ lui $at, %hi(D_80246510_C60C50) -/* C5AFCC 8024088C D4206510 */ ldc1 $f0, %lo(D_80246510_C60C50)($at) -/* C5AFD0 80240890 460010A1 */ cvt.d.s $f2, $f2 -/* C5AFD4 80240894 46201082 */ mul.d $f2, $f2, $f0 -/* C5AFD8 80240898 00000000 */ nop -/* C5AFDC 8024089C 4600A021 */ cvt.d.s $f0, $f20 -/* C5AFE0 802408A0 46220000 */ add.d $f0, $f0, $f2 -.L802408A4: -/* C5AFE4 802408A4 46200020 */ cvt.s.d $f0, $f0 -/* C5AFE8 802408A8 E600003C */ swc1 $f0, 0x3c($s0) -/* C5AFEC 802408AC C600003C */ lwc1 $f0, 0x3c($s0) -/* C5AFF0 802408B0 46002001 */ sub.s $f0, $f4, $f0 -/* C5AFF4 802408B4 3C013FF0 */ lui $at, 0x3ff0 -/* C5AFF8 802408B8 44811800 */ mtc1 $at, $f3 -/* C5AFFC 802408BC 44801000 */ mtc1 $zero, $f2 -/* C5B000 802408C0 46000005 */ abs.s $f0, $f0 -/* C5B004 802408C4 46000021 */ cvt.d.s $f0, $f0 -/* C5B008 802408C8 4622003C */ c.lt.d $f0, $f2 -/* C5B00C 802408CC 00000000 */ nop -/* C5B010 802408D0 45000036 */ bc1f .L802409AC -/* C5B014 802408D4 2403FFEF */ addiu $v1, $zero, -0x11 -/* C5B018 802408D8 E604003C */ swc1 $f4, 0x3c($s0) -/* C5B01C 802408DC 8E22006C */ lw $v0, 0x6c($s1) -/* C5B020 802408E0 00431024 */ and $v0, $v0, $v1 -/* C5B024 802408E4 0809026B */ j .L802409AC -/* C5B028 802408E8 AE22006C */ sw $v0, 0x6c($s1) -.L802408EC: -/* C5B02C 802408EC 8E220070 */ lw $v0, 0x70($s1) -/* C5B030 802408F0 1840002E */ blez $v0, .L802409AC -/* C5B034 802408F4 00000000 */ nop -/* C5B038 802408F8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C5B03C 802408FC 0C00A8BB */ jal sin_deg -/* C5B040 80240900 46806320 */ cvt.s.w $f12, $f12 -/* C5B044 80240904 8E020000 */ lw $v0, ($s0) -/* C5B048 80240908 30420008 */ andi $v0, $v0, 8 -/* C5B04C 8024090C 10400003 */ beqz $v0, .L8024091C -/* C5B050 80240910 46000506 */ mov.s $f20, $f0 -/* C5B054 80240914 08090257 */ j .L8024095C -/* C5B058 80240918 0000102D */ daddu $v0, $zero, $zero -.L8024091C: -/* C5B05C 8024091C 27A50028 */ addiu $a1, $sp, 0x28 -/* C5B060 80240920 27A6002C */ addiu $a2, $sp, 0x2c -/* C5B064 80240924 C6000038 */ lwc1 $f0, 0x38($s0) -/* C5B068 80240928 C602003C */ lwc1 $f2, 0x3c($s0) -/* C5B06C 8024092C C6040040 */ lwc1 $f4, 0x40($s0) -/* C5B070 80240930 3C01447A */ lui $at, 0x447a -/* C5B074 80240934 44813000 */ mtc1 $at, $f6 -/* C5B078 80240938 27A20034 */ addiu $v0, $sp, 0x34 -/* C5B07C 8024093C E7A00028 */ swc1 $f0, 0x28($sp) -/* C5B080 80240940 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C5B084 80240944 E7A40030 */ swc1 $f4, 0x30($sp) -/* C5B088 80240948 E7A60034 */ swc1 $f6, 0x34($sp) -/* C5B08C 8024094C AFA20010 */ sw $v0, 0x10($sp) -/* C5B090 80240950 8E040080 */ lw $a0, 0x80($s0) -/* C5B094 80240954 0C0372DF */ jal npc_raycast_down_sides -/* C5B098 80240958 27A70030 */ addiu $a3, $sp, 0x30 -.L8024095C: -/* C5B09C 8024095C 10400007 */ beqz $v0, .L8024097C -/* C5B0A0 80240960 00000000 */ nop -/* C5B0A4 80240964 4616A082 */ mul.s $f2, $f20, $f22 -/* C5B0A8 80240968 00000000 */ nop -/* C5B0AC 8024096C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C5B0B0 80240970 461A0000 */ add.s $f0, $f0, $f26 -/* C5B0B4 80240974 08090262 */ j .L80240988 -/* C5B0B8 80240978 46020000 */ add.s $f0, $f0, $f2 -.L8024097C: -/* C5B0BC 8024097C 4616A002 */ mul.s $f0, $f20, $f22 -/* C5B0C0 80240980 00000000 */ nop -/* C5B0C4 80240984 4600C000 */ add.s $f0, $f24, $f0 -.L80240988: -/* C5B0C8 80240988 E600003C */ swc1 $f0, 0x3c($s0) -/* C5B0CC 8024098C 8E220074 */ lw $v0, 0x74($s1) -/* C5B0D0 80240990 2442000A */ addiu $v0, $v0, 0xa -/* C5B0D4 80240994 44826000 */ mtc1 $v0, $f12 -/* C5B0D8 80240998 00000000 */ nop -/* C5B0DC 8024099C 0C00A6C9 */ jal clamp_angle -/* C5B0E0 802409A0 46806320 */ cvt.s.w $f12, $f12 -/* C5B0E4 802409A4 4600020D */ trunc.w.s $f8, $f0 -/* C5B0E8 802409A8 E6280074 */ swc1 $f8, 0x74($s1) -.L802409AC: -/* C5B0EC 802409AC 8E220090 */ lw $v0, 0x90($s1) -/* C5B0F0 802409B0 1C40004A */ bgtz $v0, .L80240ADC -/* C5B0F4 802409B4 2442FFFF */ addiu $v0, $v0, -1 -/* C5B0F8 802409B8 8E430014 */ lw $v1, 0x14($s2) -/* C5B0FC 802409BC 04600048 */ bltz $v1, .L80240AE0 -/* C5B100 802409C0 00000000 */ nop -/* C5B104 802409C4 8E620074 */ lw $v0, 0x74($s3) -/* C5B108 802409C8 1C400042 */ bgtz $v0, .L80240AD4 -/* C5B10C 802409CC 2442FFFF */ addiu $v0, $v0, -1 -/* C5B110 802409D0 AE630074 */ sw $v1, 0x74($s3) -/* C5B114 802409D4 860200A8 */ lh $v0, 0xa8($s0) -/* C5B118 802409D8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C5B11C 802409DC 44820000 */ mtc1 $v0, $f0 -/* C5B120 802409E0 00000000 */ nop -/* C5B124 802409E4 46800020 */ cvt.s.w $f0, $f0 -/* C5B128 802409E8 46001080 */ add.s $f2, $f2, $f0 -/* C5B12C 802409EC 3C014024 */ lui $at, 0x4024 -/* C5B130 802409F0 44810800 */ mtc1 $at, $f1 -/* C5B134 802409F4 44800000 */ mtc1 $zero, $f0 -/* C5B138 802409F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5B13C 802409FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5B140 80240A00 460010A1 */ cvt.d.s $f2, $f2 -/* C5B144 80240A04 46201080 */ add.d $f2, $f2, $f0 -/* C5B148 80240A08 C440002C */ lwc1 $f0, 0x2c($v0) -/* C5B14C 80240A0C 46000021 */ cvt.d.s $f0, $f0 -/* C5B150 80240A10 4622003C */ c.lt.d $f0, $f2 -/* C5B154 80240A14 00000000 */ nop -/* C5B158 80240A18 4500002C */ bc1f .L80240ACC -/* C5B15C 80240A1C 02A0202D */ daddu $a0, $s5, $zero -/* C5B160 80240A20 AFA00010 */ sw $zero, 0x10($sp) -/* C5B164 80240A24 8E46000C */ lw $a2, 0xc($s2) -/* C5B168 80240A28 8E470010 */ lw $a3, 0x10($s2) -/* C5B16C 80240A2C 0C01242D */ jal func_800490B4 -/* C5B170 80240A30 0220282D */ daddu $a1, $s1, $zero -/* C5B174 80240A34 10400025 */ beqz $v0, .L80240ACC -/* C5B178 80240A38 0000202D */ daddu $a0, $zero, $zero -/* C5B17C 80240A3C 0200282D */ daddu $a1, $s0, $zero -/* C5B180 80240A40 0000302D */ daddu $a2, $zero, $zero -/* C5B184 80240A44 2412000C */ addiu $s2, $zero, 0xc -/* C5B188 80240A48 860300A8 */ lh $v1, 0xa8($s0) -/* C5B18C 80240A4C 3C013F80 */ lui $at, 0x3f80 -/* C5B190 80240A50 44810000 */ mtc1 $at, $f0 -/* C5B194 80240A54 3C014000 */ lui $at, 0x4000 -/* C5B198 80240A58 44811000 */ mtc1 $at, $f2 -/* C5B19C 80240A5C 3C01C1A0 */ lui $at, 0xc1a0 -/* C5B1A0 80240A60 44812000 */ mtc1 $at, $f4 -/* C5B1A4 80240A64 44834000 */ mtc1 $v1, $f8 -/* C5B1A8 80240A68 00000000 */ nop -/* C5B1AC 80240A6C 46804220 */ cvt.s.w $f8, $f8 -/* C5B1B0 80240A70 44074000 */ mfc1 $a3, $f8 -/* C5B1B4 80240A74 27A20038 */ addiu $v0, $sp, 0x38 -/* C5B1B8 80240A78 AFB2001C */ sw $s2, 0x1c($sp) -/* C5B1BC 80240A7C AFA20020 */ sw $v0, 0x20($sp) -/* C5B1C0 80240A80 E7A00010 */ swc1 $f0, 0x10($sp) -/* C5B1C4 80240A84 E7A20014 */ swc1 $f2, 0x14($sp) -/* C5B1C8 80240A88 0C01BFA4 */ jal fx_emote -/* C5B1CC 80240A8C E7A40018 */ swc1 $f4, 0x18($sp) -/* C5B1D0 80240A90 0200202D */ daddu $a0, $s0, $zero -/* C5B1D4 80240A94 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C5B1D8 80240A98 C480003C */ lwc1 $f0, 0x3c($a0) -/* C5B1DC 80240A9C 3C060020 */ lui $a2, 0x20 -/* C5B1E0 80240AA0 0C012530 */ jal ai_enemy_play_sound -/* C5B1E4 80240AA4 E4800064 */ swc1 $f0, 0x64($a0) -/* C5B1E8 80240AA8 8E220018 */ lw $v0, 0x18($s1) -/* C5B1EC 80240AAC 9442002A */ lhu $v0, 0x2a($v0) -/* C5B1F0 80240AB0 30420001 */ andi $v0, $v0, 1 -/* C5B1F4 80240AB4 10400003 */ beqz $v0, .L80240AC4 -/* C5B1F8 80240AB8 2402000A */ addiu $v0, $zero, 0xa -/* C5B1FC 80240ABC 08090321 */ j .L80240C84 -/* C5B200 80240AC0 AE620070 */ sw $v0, 0x70($s3) -.L80240AC4: -/* C5B204 80240AC4 08090321 */ j .L80240C84 -/* C5B208 80240AC8 AE720070 */ sw $s2, 0x70($s3) -.L80240ACC: -/* C5B20C 80240ACC 8E620074 */ lw $v0, 0x74($s3) -/* C5B210 80240AD0 2442FFFF */ addiu $v0, $v0, -1 -.L80240AD4: -/* C5B214 80240AD4 080902B8 */ j .L80240AE0 -/* C5B218 80240AD8 AE620074 */ sw $v0, 0x74($s3) -.L80240ADC: -/* C5B21C 80240ADC AE220090 */ sw $v0, 0x90($s1) -.L80240AE0: -/* C5B220 80240AE0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C5B224 80240AE4 C6000040 */ lwc1 $f0, 0x40($s0) -/* C5B228 80240AE8 C4620000 */ lwc1 $f2, ($v1) -/* C5B22C 80240AEC 468010A0 */ cvt.s.w $f2, $f2 -/* C5B230 80240AF0 C4640008 */ lwc1 $f4, 8($v1) -/* C5B234 80240AF4 46802120 */ cvt.s.w $f4, $f4 -/* C5B238 80240AF8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C5B23C 80240AFC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5B240 80240B00 44051000 */ mfc1 $a1, $f2 -/* C5B244 80240B04 C440000C */ lwc1 $f0, 0xc($v0) -/* C5B248 80240B08 46800020 */ cvt.s.w $f0, $f0 -/* C5B24C 80240B0C E7A00014 */ swc1 $f0, 0x14($sp) -/* C5B250 80240B10 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5B254 80240B14 44062000 */ mfc1 $a2, $f4 -/* C5B258 80240B18 C4400010 */ lwc1 $f0, 0x10($v0) -/* C5B25C 80240B1C 46800020 */ cvt.s.w $f0, $f0 -/* C5B260 80240B20 E7A00018 */ swc1 $f0, 0x18($sp) -/* C5B264 80240B24 8C640018 */ lw $a0, 0x18($v1) -/* C5B268 80240B28 0C0123F5 */ jal is_point_within_region -/* C5B26C 80240B2C 8E070038 */ lw $a3, 0x38($s0) -/* C5B270 80240B30 1040001A */ beqz $v0, .L80240B9C -/* C5B274 80240B34 00000000 */ nop -/* C5B278 80240B38 8E060038 */ lw $a2, 0x38($s0) -/* C5B27C 80240B3C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5B280 80240B40 8E070040 */ lw $a3, 0x40($s0) -/* C5B284 80240B44 C44C0000 */ lwc1 $f12, ($v0) -/* C5B288 80240B48 46806320 */ cvt.s.w $f12, $f12 -/* C5B28C 80240B4C C44E0008 */ lwc1 $f14, 8($v0) -/* C5B290 80240B50 0C00A7B5 */ jal dist2D -/* C5B294 80240B54 468073A0 */ cvt.s.w $f14, $f14 -/* C5B298 80240B58 C6020018 */ lwc1 $f2, 0x18($s0) -/* C5B29C 80240B5C 4600103C */ c.lt.s $f2, $f0 -/* C5B2A0 80240B60 00000000 */ nop -/* C5B2A4 80240B64 4500000D */ bc1f .L80240B9C -/* C5B2A8 80240B68 E7A00034 */ swc1 $f0, 0x34($sp) -/* C5B2AC 80240B6C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C5B2B0 80240B70 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5B2B4 80240B74 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5B2B8 80240B78 C4480000 */ lwc1 $f8, ($v0) -/* C5B2BC 80240B7C 46804220 */ cvt.s.w $f8, $f8 -/* C5B2C0 80240B80 44064000 */ mfc1 $a2, $f8 -/* C5B2C4 80240B84 C4480008 */ lwc1 $f8, 8($v0) -/* C5B2C8 80240B88 46804220 */ cvt.s.w $f8, $f8 -/* C5B2CC 80240B8C 44074000 */ mfc1 $a3, $f8 -/* C5B2D0 80240B90 0C00A720 */ jal atan2 -/* C5B2D4 80240B94 24140001 */ addiu $s4, $zero, 1 -/* C5B2D8 80240B98 E600000C */ swc1 $f0, 0xc($s0) -.L80240B9C: -/* C5B2DC 80240B9C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5B2E0 80240BA0 8C43000C */ lw $v1, 0xc($v0) -/* C5B2E4 80240BA4 8C420010 */ lw $v0, 0x10($v0) -/* C5B2E8 80240BA8 00621825 */ or $v1, $v1, $v0 -/* C5B2EC 80240BAC 00741825 */ or $v1, $v1, $s4 -/* C5B2F0 80240BB0 10600008 */ beqz $v1, .L80240BD4 -/* C5B2F4 80240BB4 00000000 */ nop -/* C5B2F8 80240BB8 8602008C */ lh $v0, 0x8c($s0) -/* C5B2FC 80240BBC 14400031 */ bnez $v0, .L80240C84 -/* C5B300 80240BC0 00000000 */ nop -/* C5B304 80240BC4 8E050018 */ lw $a1, 0x18($s0) -/* C5B308 80240BC8 8E06000C */ lw $a2, 0xc($s0) -/* C5B30C 80240BCC 0C00EA95 */ jal npc_move_heading -/* C5B310 80240BD0 0200202D */ daddu $a0, $s0, $zero -.L80240BD4: -/* C5B314 80240BD4 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5B318 80240BD8 3C014059 */ lui $at, 0x4059 -/* C5B31C 80240BDC 44811800 */ mtc1 $at, $f3 -/* C5B320 80240BE0 44801000 */ mtc1 $zero, $f2 -/* C5B324 80240BE4 46000021 */ cvt.d.s $f0, $f0 -/* C5B328 80240BE8 46220002 */ mul.d $f0, $f0, $f2 -/* C5B32C 80240BEC 00000000 */ nop -/* C5B330 80240BF0 4620020D */ trunc.w.d $f8, $f0 -/* C5B334 80240BF4 E628007C */ swc1 $f8, 0x7c($s1) -/* C5B338 80240BF8 8E420004 */ lw $v0, 4($s2) -/* C5B33C 80240BFC 18400021 */ blez $v0, .L80240C84 -/* C5B340 80240C00 00000000 */ nop -/* C5B344 80240C04 8602008E */ lh $v0, 0x8e($s0) -/* C5B348 80240C08 9603008E */ lhu $v1, 0x8e($s0) -/* C5B34C 80240C0C 18400005 */ blez $v0, .L80240C24 -/* C5B350 80240C10 2462FFFF */ addiu $v0, $v1, -1 -/* C5B354 80240C14 A602008E */ sh $v0, 0x8e($s0) -/* C5B358 80240C18 00021400 */ sll $v0, $v0, 0x10 -/* C5B35C 80240C1C 1C400019 */ bgtz $v0, .L80240C84 -/* C5B360 80240C20 00000000 */ nop -.L80240C24: -/* C5B364 80240C24 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C5B368 80240C28 24020002 */ addiu $v0, $zero, 2 -/* C5B36C 80240C2C 0C00A67F */ jal rand_int -/* C5B370 80240C30 AE620070 */ sw $v0, 0x70($s3) -/* C5B374 80240C34 3C035555 */ lui $v1, 0x5555 -/* C5B378 80240C38 34635556 */ ori $v1, $v1, 0x5556 -/* C5B37C 80240C3C 00430018 */ mult $v0, $v1 -/* C5B380 80240C40 000227C3 */ sra $a0, $v0, 0x1f -/* C5B384 80240C44 00004010 */ mfhi $t0 -/* C5B388 80240C48 01042023 */ subu $a0, $t0, $a0 -/* C5B38C 80240C4C 00041840 */ sll $v1, $a0, 1 -/* C5B390 80240C50 00641821 */ addu $v1, $v1, $a0 -/* C5B394 80240C54 00431023 */ subu $v0, $v0, $v1 -/* C5B398 80240C58 24430002 */ addiu $v1, $v0, 2 -/* C5B39C 80240C5C AE630074 */ sw $v1, 0x74($s3) -/* C5B3A0 80240C60 8E42002C */ lw $v0, 0x2c($s2) -/* C5B3A4 80240C64 58400007 */ blezl $v0, .L80240C84 -/* C5B3A8 80240C68 AE600070 */ sw $zero, 0x70($s3) -/* C5B3AC 80240C6C 8E420008 */ lw $v0, 8($s2) -/* C5B3B0 80240C70 18400003 */ blez $v0, .L80240C80 -/* C5B3B4 80240C74 28620003 */ slti $v0, $v1, 3 -/* C5B3B8 80240C78 10400002 */ beqz $v0, .L80240C84 -/* C5B3BC 80240C7C 00000000 */ nop -.L80240C80: -/* C5B3C0 80240C80 AE600070 */ sw $zero, 0x70($s3) -.L80240C84: -/* C5B3C4 80240C84 8FBF0058 */ lw $ra, 0x58($sp) -/* C5B3C8 80240C88 8FB50054 */ lw $s5, 0x54($sp) -/* C5B3CC 80240C8C 8FB40050 */ lw $s4, 0x50($sp) -/* C5B3D0 80240C90 8FB3004C */ lw $s3, 0x4c($sp) -/* C5B3D4 80240C94 8FB20048 */ lw $s2, 0x48($sp) -/* C5B3D8 80240C98 8FB10044 */ lw $s1, 0x44($sp) -/* C5B3DC 80240C9C 8FB00040 */ lw $s0, 0x40($sp) -/* C5B3E0 80240CA0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C5B3E4 80240CA4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C5B3E8 80240CA8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C5B3EC 80240CAC D7B40060 */ ldc1 $f20, 0x60($sp) -/* C5B3F0 80240CB0 03E00008 */ jr $ra -/* C5B3F4 80240CB4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s index dbb298eeff..4c90cf5d1e 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s @@ -86,7 +86,7 @@ glabel func_802417EC_C5BF2C .L80241908_C5C048: /* C5C048 80241908 0280202D */ daddu $a0, $s4, $zero /* C5C04C 8024190C 0200282D */ daddu $a1, $s0, $zero -/* C5C050 80241910 0C0901A4 */ jal func_80240690_C5ADD0 +/* C5C050 80241910 0C0901A4 */ jal kzn_02_UnkNpcAIFunc35 /* C5C054 80241914 0260302D */ daddu $a2, $s3, $zero /* C5C058 80241918 0809066D */ j .L802419B4 /* C5C05C 8024191C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s index 1ed376e62b..15d97a8199 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s @@ -87,7 +87,7 @@ glabel func_80241DE4_C5C524 .L80241F04_C5C644: /* C5C644 80241F04 0280202D */ daddu $a0, $s4, $zero /* C5C648 80241F08 0200282D */ daddu $a1, $s0, $zero -/* C5C64C 80241F0C 0C0901A4 */ jal func_80240690_C5ADD0 +/* C5C64C 80241F0C 0C0901A4 */ jal kzn_02_UnkNpcAIFunc35 /* C5C650 80241F10 0260302D */ daddu $a2, $s3, $zero /* C5C654 80241F14 080907EA */ j .L80241FA8 /* C5C658 80241F18 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s deleted file mode 100644 index 3188456de7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243098_C713C8 -.double 0.09 - -dlabel D_802430A0_C713D0 -.double 0.09 - -.section .text - -glabel func_802409D0_C6ED00 -/* C6ED00 802409D0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C6ED04 802409D4 AFB3004C */ sw $s3, 0x4c($sp) -/* C6ED08 802409D8 0080982D */ daddu $s3, $a0, $zero -/* C6ED0C 802409DC AFBF0058 */ sw $ra, 0x58($sp) -/* C6ED10 802409E0 AFB50054 */ sw $s5, 0x54($sp) -/* C6ED14 802409E4 AFB40050 */ sw $s4, 0x50($sp) -/* C6ED18 802409E8 AFB20048 */ sw $s2, 0x48($sp) -/* C6ED1C 802409EC AFB10044 */ sw $s1, 0x44($sp) -/* C6ED20 802409F0 AFB00040 */ sw $s0, 0x40($sp) -/* C6ED24 802409F4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C6ED28 802409F8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C6ED2C 802409FC F7B60068 */ sdc1 $f22, 0x68($sp) -/* C6ED30 80240A00 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C6ED34 80240A04 8E710148 */ lw $s1, 0x148($s3) -/* C6ED38 80240A08 00A0902D */ daddu $s2, $a1, $zero -/* C6ED3C 80240A0C 86240008 */ lh $a0, 8($s1) -/* C6ED40 80240A10 0C00EABB */ jal get_npc_unsafe -/* C6ED44 80240A14 00C0A82D */ daddu $s5, $a2, $zero -/* C6ED48 80240A18 0040802D */ daddu $s0, $v0, $zero -/* C6ED4C 80240A1C 0000A02D */ daddu $s4, $zero, $zero -/* C6ED50 80240A20 C624007C */ lwc1 $f4, 0x7c($s1) -/* C6ED54 80240A24 46802120 */ cvt.s.w $f4, $f4 -/* C6ED58 80240A28 C6220088 */ lwc1 $f2, 0x88($s1) -/* C6ED5C 80240A2C 468010A0 */ cvt.s.w $f2, $f2 -/* C6ED60 80240A30 460010A1 */ cvt.d.s $f2, $f2 -/* C6ED64 80240A34 46002121 */ cvt.d.s $f4, $f4 -/* C6ED68 80240A38 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6ED6C 80240A3C 3C014059 */ lui $at, 0x4059 -/* C6ED70 80240A40 44813800 */ mtc1 $at, $f7 -/* C6ED74 80240A44 44803000 */ mtc1 $zero, $f6 -/* C6ED78 80240A48 46000021 */ cvt.d.s $f0, $f0 -/* C6ED7C 80240A4C 46260002 */ mul.d $f0, $f0, $f6 -/* C6ED80 80240A50 00000000 */ nop -/* C6ED84 80240A54 24020001 */ addiu $v0, $zero, 1 -/* C6ED88 80240A58 8E24006C */ lw $a0, 0x6c($s1) -/* C6ED8C 80240A5C 46261083 */ div.d $f2, $f2, $f6 -/* C6ED90 80240A60 462010A0 */ cvt.s.d $f2, $f2 -/* C6ED94 80240A64 46262103 */ div.d $f4, $f4, $f6 -/* C6ED98 80240A68 46202520 */ cvt.s.d $f20, $f4 -/* C6ED9C 80240A6C 30830011 */ andi $v1, $a0, 0x11 -/* C6EDA0 80240A70 4620020D */ trunc.w.d $f8, $f0 -/* C6EDA4 80240A74 E628007C */ swc1 $f8, 0x7c($s1) -/* C6EDA8 80240A78 C6200078 */ lwc1 $f0, 0x78($s1) -/* C6EDAC 80240A7C 46800020 */ cvt.s.w $f0, $f0 -/* C6EDB0 80240A80 46000021 */ cvt.d.s $f0, $f0 -/* C6EDB4 80240A84 46260003 */ div.d $f0, $f0, $f6 -/* C6EDB8 80240A88 462006A0 */ cvt.s.d $f26, $f0 -/* C6EDBC 80240A8C C6200070 */ lwc1 $f0, 0x70($s1) -/* C6EDC0 80240A90 46800020 */ cvt.s.w $f0, $f0 -/* C6EDC4 80240A94 46000021 */ cvt.d.s $f0, $f0 -/* C6EDC8 80240A98 46260003 */ div.d $f0, $f0, $f6 -/* C6EDCC 80240A9C 462005A0 */ cvt.s.d $f22, $f0 -/* C6EDD0 80240AA0 14620025 */ bne $v1, $v0, .L80240B38 -/* C6EDD4 80240AA4 4602D600 */ add.s $f24, $f26, $f2 -/* C6EDD8 80240AA8 8E020000 */ lw $v0, ($s0) -/* C6EDDC 80240AAC 30420008 */ andi $v0, $v0, 8 -/* C6EDE0 80240AB0 10400009 */ beqz $v0, .L80240AD8 -/* C6EDE4 80240AB4 27A50028 */ addiu $a1, $sp, 0x28 -/* C6EDE8 80240AB8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6EDEC 80240ABC 4600C001 */ sub.s $f0, $f24, $f0 -/* C6EDF0 80240AC0 4600B03C */ c.lt.s $f22, $f0 -/* C6EDF4 80240AC4 00000000 */ nop -/* C6EDF8 80240AC8 4500001B */ bc1f .L80240B38 -/* C6EDFC 80240ACC 34820010 */ ori $v0, $a0, 0x10 -/* C6EE00 80240AD0 080902CE */ j .L80240B38 -/* C6EE04 80240AD4 AE22006C */ sw $v0, 0x6c($s1) -.L80240AD8: -/* C6EE08 80240AD8 27A6002C */ addiu $a2, $sp, 0x2c -/* C6EE0C 80240ADC C6000038 */ lwc1 $f0, 0x38($s0) -/* C6EE10 80240AE0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6EE14 80240AE4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C6EE18 80240AE8 3C01447A */ lui $at, 0x447a -/* C6EE1C 80240AEC 44813000 */ mtc1 $at, $f6 -/* C6EE20 80240AF0 27A20034 */ addiu $v0, $sp, 0x34 -/* C6EE24 80240AF4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C6EE28 80240AF8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C6EE2C 80240AFC E7A40030 */ swc1 $f4, 0x30($sp) -/* C6EE30 80240B00 E7A60034 */ swc1 $f6, 0x34($sp) -/* C6EE34 80240B04 AFA20010 */ sw $v0, 0x10($sp) -/* C6EE38 80240B08 8E040080 */ lw $a0, 0x80($s0) -/* C6EE3C 80240B0C 0C0372DF */ jal npc_raycast_down_sides -/* C6EE40 80240B10 27A70030 */ addiu $a3, $sp, 0x30 -/* C6EE44 80240B14 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C6EE48 80240B18 4600D001 */ sub.s $f0, $f26, $f0 -/* C6EE4C 80240B1C 4600B03C */ c.lt.s $f22, $f0 -/* C6EE50 80240B20 00000000 */ nop -/* C6EE54 80240B24 45000004 */ bc1f .L80240B38 -/* C6EE58 80240B28 00000000 */ nop -/* C6EE5C 80240B2C 8E22006C */ lw $v0, 0x6c($s1) -/* C6EE60 80240B30 34420010 */ ori $v0, $v0, 0x10 -/* C6EE64 80240B34 AE22006C */ sw $v0, 0x6c($s1) -.L80240B38: -/* C6EE68 80240B38 8E22006C */ lw $v0, 0x6c($s1) -/* C6EE6C 80240B3C 24030011 */ addiu $v1, $zero, 0x11 -/* C6EE70 80240B40 30420011 */ andi $v0, $v0, 0x11 -/* C6EE74 80240B44 14430039 */ bne $v0, $v1, .L80240C2C -/* C6EE78 80240B48 00000000 */ nop -/* C6EE7C 80240B4C 8E020000 */ lw $v0, ($s0) -/* C6EE80 80240B50 30420008 */ andi $v0, $v0, 8 -/* C6EE84 80240B54 1040000A */ beqz $v0, .L80240B80 -/* C6EE88 80240B58 4600C106 */ mov.s $f4, $f24 -/* C6EE8C 80240B5C 4614C081 */ sub.s $f2, $f24, $f20 -/* C6EE90 80240B60 3C018024 */ lui $at, %hi(D_80243098_C713C8) -/* C6EE94 80240B64 D4203098 */ ldc1 $f0, %lo(D_80243098_C713C8)($at) -/* C6EE98 80240B68 460010A1 */ cvt.d.s $f2, $f2 -/* C6EE9C 80240B6C 46201082 */ mul.d $f2, $f2, $f0 -/* C6EEA0 80240B70 00000000 */ nop -/* C6EEA4 80240B74 4600A021 */ cvt.d.s $f0, $f20 -/* C6EEA8 80240B78 080902F9 */ j .L80240BE4 -/* C6EEAC 80240B7C 46220000 */ add.d $f0, $f0, $f2 -.L80240B80: -/* C6EEB0 80240B80 27A50028 */ addiu $a1, $sp, 0x28 -/* C6EEB4 80240B84 27A6002C */ addiu $a2, $sp, 0x2c -/* C6EEB8 80240B88 C6000038 */ lwc1 $f0, 0x38($s0) -/* C6EEBC 80240B8C C6020040 */ lwc1 $f2, 0x40($s0) -/* C6EEC0 80240B90 3C01447A */ lui $at, 0x447a -/* C6EEC4 80240B94 44812000 */ mtc1 $at, $f4 -/* C6EEC8 80240B98 27A20034 */ addiu $v0, $sp, 0x34 -/* C6EECC 80240B9C E7B4002C */ swc1 $f20, 0x2c($sp) -/* C6EED0 80240BA0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C6EED4 80240BA4 E7A20030 */ swc1 $f2, 0x30($sp) -/* C6EED8 80240BA8 E7A40034 */ swc1 $f4, 0x34($sp) -/* C6EEDC 80240BAC AFA20010 */ sw $v0, 0x10($sp) -/* C6EEE0 80240BB0 8E040080 */ lw $a0, 0x80($s0) -/* C6EEE4 80240BB4 0C0372DF */ jal npc_raycast_down_sides -/* C6EEE8 80240BB8 27A70030 */ addiu $a3, $sp, 0x30 -/* C6EEEC 80240BBC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C6EEF0 80240BC0 461A2100 */ add.s $f4, $f4, $f26 -/* C6EEF4 80240BC4 46142081 */ sub.s $f2, $f4, $f20 -/* C6EEF8 80240BC8 3C018024 */ lui $at, %hi(D_802430A0_C713D0) -/* C6EEFC 80240BCC D42030A0 */ ldc1 $f0, %lo(D_802430A0_C713D0)($at) -/* C6EF00 80240BD0 460010A1 */ cvt.d.s $f2, $f2 -/* C6EF04 80240BD4 46201082 */ mul.d $f2, $f2, $f0 -/* C6EF08 80240BD8 00000000 */ nop -/* C6EF0C 80240BDC 4600A021 */ cvt.d.s $f0, $f20 -/* C6EF10 80240BE0 46220000 */ add.d $f0, $f0, $f2 -.L80240BE4: -/* C6EF14 80240BE4 46200020 */ cvt.s.d $f0, $f0 -/* C6EF18 80240BE8 E600003C */ swc1 $f0, 0x3c($s0) -/* C6EF1C 80240BEC C600003C */ lwc1 $f0, 0x3c($s0) -/* C6EF20 80240BF0 46002001 */ sub.s $f0, $f4, $f0 -/* C6EF24 80240BF4 3C013FF0 */ lui $at, 0x3ff0 -/* C6EF28 80240BF8 44811800 */ mtc1 $at, $f3 -/* C6EF2C 80240BFC 44801000 */ mtc1 $zero, $f2 -/* C6EF30 80240C00 46000005 */ abs.s $f0, $f0 -/* C6EF34 80240C04 46000021 */ cvt.d.s $f0, $f0 -/* C6EF38 80240C08 4622003C */ c.lt.d $f0, $f2 -/* C6EF3C 80240C0C 00000000 */ nop -/* C6EF40 80240C10 45000036 */ bc1f .L80240CEC -/* C6EF44 80240C14 2403FFEF */ addiu $v1, $zero, -0x11 -/* C6EF48 80240C18 E604003C */ swc1 $f4, 0x3c($s0) -/* C6EF4C 80240C1C 8E22006C */ lw $v0, 0x6c($s1) -/* C6EF50 80240C20 00431024 */ and $v0, $v0, $v1 -/* C6EF54 80240C24 0809033B */ j .L80240CEC -/* C6EF58 80240C28 AE22006C */ sw $v0, 0x6c($s1) -.L80240C2C: -/* C6EF5C 80240C2C 8E220070 */ lw $v0, 0x70($s1) -/* C6EF60 80240C30 1840002E */ blez $v0, .L80240CEC -/* C6EF64 80240C34 00000000 */ nop -/* C6EF68 80240C38 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C6EF6C 80240C3C 0C00A8BB */ jal sin_deg -/* C6EF70 80240C40 46806320 */ cvt.s.w $f12, $f12 -/* C6EF74 80240C44 8E020000 */ lw $v0, ($s0) -/* C6EF78 80240C48 30420008 */ andi $v0, $v0, 8 -/* C6EF7C 80240C4C 10400003 */ beqz $v0, .L80240C5C -/* C6EF80 80240C50 46000506 */ mov.s $f20, $f0 -/* C6EF84 80240C54 08090327 */ j .L80240C9C -/* C6EF88 80240C58 0000102D */ daddu $v0, $zero, $zero -.L80240C5C: -/* C6EF8C 80240C5C 27A50028 */ addiu $a1, $sp, 0x28 -/* C6EF90 80240C60 27A6002C */ addiu $a2, $sp, 0x2c -/* C6EF94 80240C64 C6000038 */ lwc1 $f0, 0x38($s0) -/* C6EF98 80240C68 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6EF9C 80240C6C C6040040 */ lwc1 $f4, 0x40($s0) -/* C6EFA0 80240C70 3C01447A */ lui $at, 0x447a -/* C6EFA4 80240C74 44813000 */ mtc1 $at, $f6 -/* C6EFA8 80240C78 27A20034 */ addiu $v0, $sp, 0x34 -/* C6EFAC 80240C7C E7A00028 */ swc1 $f0, 0x28($sp) -/* C6EFB0 80240C80 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C6EFB4 80240C84 E7A40030 */ swc1 $f4, 0x30($sp) -/* C6EFB8 80240C88 E7A60034 */ swc1 $f6, 0x34($sp) -/* C6EFBC 80240C8C AFA20010 */ sw $v0, 0x10($sp) -/* C6EFC0 80240C90 8E040080 */ lw $a0, 0x80($s0) -/* C6EFC4 80240C94 0C0372DF */ jal npc_raycast_down_sides -/* C6EFC8 80240C98 27A70030 */ addiu $a3, $sp, 0x30 -.L80240C9C: -/* C6EFCC 80240C9C 10400007 */ beqz $v0, .L80240CBC -/* C6EFD0 80240CA0 00000000 */ nop -/* C6EFD4 80240CA4 4616A082 */ mul.s $f2, $f20, $f22 -/* C6EFD8 80240CA8 00000000 */ nop -/* C6EFDC 80240CAC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C6EFE0 80240CB0 461A0000 */ add.s $f0, $f0, $f26 -/* C6EFE4 80240CB4 08090332 */ j .L80240CC8 -/* C6EFE8 80240CB8 46020000 */ add.s $f0, $f0, $f2 -.L80240CBC: -/* C6EFEC 80240CBC 4616A002 */ mul.s $f0, $f20, $f22 -/* C6EFF0 80240CC0 00000000 */ nop -/* C6EFF4 80240CC4 4600C000 */ add.s $f0, $f24, $f0 -.L80240CC8: -/* C6EFF8 80240CC8 E600003C */ swc1 $f0, 0x3c($s0) -/* C6EFFC 80240CCC 8E220074 */ lw $v0, 0x74($s1) -/* C6F000 80240CD0 2442000A */ addiu $v0, $v0, 0xa -/* C6F004 80240CD4 44826000 */ mtc1 $v0, $f12 -/* C6F008 80240CD8 00000000 */ nop -/* C6F00C 80240CDC 0C00A6C9 */ jal clamp_angle -/* C6F010 80240CE0 46806320 */ cvt.s.w $f12, $f12 -/* C6F014 80240CE4 4600020D */ trunc.w.s $f8, $f0 -/* C6F018 80240CE8 E6280074 */ swc1 $f8, 0x74($s1) -.L80240CEC: -/* C6F01C 80240CEC 8E220090 */ lw $v0, 0x90($s1) -/* C6F020 80240CF0 1C40004A */ bgtz $v0, .L80240E1C -/* C6F024 80240CF4 2442FFFF */ addiu $v0, $v0, -1 -/* C6F028 80240CF8 8E430014 */ lw $v1, 0x14($s2) -/* C6F02C 80240CFC 04600048 */ bltz $v1, .L80240E20 -/* C6F030 80240D00 00000000 */ nop -/* C6F034 80240D04 8E620074 */ lw $v0, 0x74($s3) -/* C6F038 80240D08 1C400042 */ bgtz $v0, .L80240E14 -/* C6F03C 80240D0C 2442FFFF */ addiu $v0, $v0, -1 -/* C6F040 80240D10 AE630074 */ sw $v1, 0x74($s3) -/* C6F044 80240D14 860200A8 */ lh $v0, 0xa8($s0) -/* C6F048 80240D18 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6F04C 80240D1C 44820000 */ mtc1 $v0, $f0 -/* C6F050 80240D20 00000000 */ nop -/* C6F054 80240D24 46800020 */ cvt.s.w $f0, $f0 -/* C6F058 80240D28 46001080 */ add.s $f2, $f2, $f0 -/* C6F05C 80240D2C 3C014024 */ lui $at, 0x4024 -/* C6F060 80240D30 44810800 */ mtc1 $at, $f1 -/* C6F064 80240D34 44800000 */ mtc1 $zero, $f0 -/* C6F068 80240D38 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C6F06C 80240D3C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C6F070 80240D40 460010A1 */ cvt.d.s $f2, $f2 -/* C6F074 80240D44 46201080 */ add.d $f2, $f2, $f0 -/* C6F078 80240D48 C440002C */ lwc1 $f0, 0x2c($v0) -/* C6F07C 80240D4C 46000021 */ cvt.d.s $f0, $f0 -/* C6F080 80240D50 4622003C */ c.lt.d $f0, $f2 -/* C6F084 80240D54 00000000 */ nop -/* C6F088 80240D58 4500002C */ bc1f .L80240E0C -/* C6F08C 80240D5C 02A0202D */ daddu $a0, $s5, $zero -/* C6F090 80240D60 AFA00010 */ sw $zero, 0x10($sp) -/* C6F094 80240D64 8E46000C */ lw $a2, 0xc($s2) -/* C6F098 80240D68 8E470010 */ lw $a3, 0x10($s2) -/* C6F09C 80240D6C 0C01242D */ jal func_800490B4 -/* C6F0A0 80240D70 0220282D */ daddu $a1, $s1, $zero -/* C6F0A4 80240D74 10400025 */ beqz $v0, .L80240E0C -/* C6F0A8 80240D78 0000202D */ daddu $a0, $zero, $zero -/* C6F0AC 80240D7C 0200282D */ daddu $a1, $s0, $zero -/* C6F0B0 80240D80 0000302D */ daddu $a2, $zero, $zero -/* C6F0B4 80240D84 2412000C */ addiu $s2, $zero, 0xc -/* C6F0B8 80240D88 860300A8 */ lh $v1, 0xa8($s0) -/* C6F0BC 80240D8C 3C013F80 */ lui $at, 0x3f80 -/* C6F0C0 80240D90 44810000 */ mtc1 $at, $f0 -/* C6F0C4 80240D94 3C014000 */ lui $at, 0x4000 -/* C6F0C8 80240D98 44811000 */ mtc1 $at, $f2 -/* C6F0CC 80240D9C 3C01C1A0 */ lui $at, 0xc1a0 -/* C6F0D0 80240DA0 44812000 */ mtc1 $at, $f4 -/* C6F0D4 80240DA4 44834000 */ mtc1 $v1, $f8 -/* C6F0D8 80240DA8 00000000 */ nop -/* C6F0DC 80240DAC 46804220 */ cvt.s.w $f8, $f8 -/* C6F0E0 80240DB0 44074000 */ mfc1 $a3, $f8 -/* C6F0E4 80240DB4 27A20038 */ addiu $v0, $sp, 0x38 -/* C6F0E8 80240DB8 AFB2001C */ sw $s2, 0x1c($sp) -/* C6F0EC 80240DBC AFA20020 */ sw $v0, 0x20($sp) -/* C6F0F0 80240DC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C6F0F4 80240DC4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C6F0F8 80240DC8 0C01BFA4 */ jal fx_emote -/* C6F0FC 80240DCC E7A40018 */ swc1 $f4, 0x18($sp) -/* C6F100 80240DD0 0200202D */ daddu $a0, $s0, $zero -/* C6F104 80240DD4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C6F108 80240DD8 C480003C */ lwc1 $f0, 0x3c($a0) -/* C6F10C 80240DDC 3C060020 */ lui $a2, 0x20 -/* C6F110 80240DE0 0C012530 */ jal ai_enemy_play_sound -/* C6F114 80240DE4 E4800064 */ swc1 $f0, 0x64($a0) -/* C6F118 80240DE8 8E220018 */ lw $v0, 0x18($s1) -/* C6F11C 80240DEC 9442002A */ lhu $v0, 0x2a($v0) -/* C6F120 80240DF0 30420001 */ andi $v0, $v0, 1 -/* C6F124 80240DF4 10400003 */ beqz $v0, .L80240E04 -/* C6F128 80240DF8 2402000A */ addiu $v0, $zero, 0xa -/* C6F12C 80240DFC 080903F1 */ j .L80240FC4 -/* C6F130 80240E00 AE620070 */ sw $v0, 0x70($s3) -.L80240E04: -/* C6F134 80240E04 080903F1 */ j .L80240FC4 -/* C6F138 80240E08 AE720070 */ sw $s2, 0x70($s3) -.L80240E0C: -/* C6F13C 80240E0C 8E620074 */ lw $v0, 0x74($s3) -/* C6F140 80240E10 2442FFFF */ addiu $v0, $v0, -1 -.L80240E14: -/* C6F144 80240E14 08090388 */ j .L80240E20 -/* C6F148 80240E18 AE620074 */ sw $v0, 0x74($s3) -.L80240E1C: -/* C6F14C 80240E1C AE220090 */ sw $v0, 0x90($s1) -.L80240E20: -/* C6F150 80240E20 8E2300D0 */ lw $v1, 0xd0($s1) -/* C6F154 80240E24 C6000040 */ lwc1 $f0, 0x40($s0) -/* C6F158 80240E28 C4620000 */ lwc1 $f2, ($v1) -/* C6F15C 80240E2C 468010A0 */ cvt.s.w $f2, $f2 -/* C6F160 80240E30 C4640008 */ lwc1 $f4, 8($v1) -/* C6F164 80240E34 46802120 */ cvt.s.w $f4, $f4 -/* C6F168 80240E38 E7A00010 */ swc1 $f0, 0x10($sp) -/* C6F16C 80240E3C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6F170 80240E40 44051000 */ mfc1 $a1, $f2 -/* C6F174 80240E44 C440000C */ lwc1 $f0, 0xc($v0) -/* C6F178 80240E48 46800020 */ cvt.s.w $f0, $f0 -/* C6F17C 80240E4C E7A00014 */ swc1 $f0, 0x14($sp) -/* C6F180 80240E50 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6F184 80240E54 44062000 */ mfc1 $a2, $f4 -/* C6F188 80240E58 C4400010 */ lwc1 $f0, 0x10($v0) -/* C6F18C 80240E5C 46800020 */ cvt.s.w $f0, $f0 -/* C6F190 80240E60 E7A00018 */ swc1 $f0, 0x18($sp) -/* C6F194 80240E64 8C640018 */ lw $a0, 0x18($v1) -/* C6F198 80240E68 0C0123F5 */ jal is_point_within_region -/* C6F19C 80240E6C 8E070038 */ lw $a3, 0x38($s0) -/* C6F1A0 80240E70 1040001A */ beqz $v0, .L80240EDC -/* C6F1A4 80240E74 00000000 */ nop -/* C6F1A8 80240E78 8E060038 */ lw $a2, 0x38($s0) -/* C6F1AC 80240E7C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6F1B0 80240E80 8E070040 */ lw $a3, 0x40($s0) -/* C6F1B4 80240E84 C44C0000 */ lwc1 $f12, ($v0) -/* C6F1B8 80240E88 46806320 */ cvt.s.w $f12, $f12 -/* C6F1BC 80240E8C C44E0008 */ lwc1 $f14, 8($v0) -/* C6F1C0 80240E90 0C00A7B5 */ jal dist2D -/* C6F1C4 80240E94 468073A0 */ cvt.s.w $f14, $f14 -/* C6F1C8 80240E98 C6020018 */ lwc1 $f2, 0x18($s0) -/* C6F1CC 80240E9C 4600103C */ c.lt.s $f2, $f0 -/* C6F1D0 80240EA0 00000000 */ nop -/* C6F1D4 80240EA4 4500000D */ bc1f .L80240EDC -/* C6F1D8 80240EA8 E7A00034 */ swc1 $f0, 0x34($sp) -/* C6F1DC 80240EAC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C6F1E0 80240EB0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6F1E4 80240EB4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C6F1E8 80240EB8 C4480000 */ lwc1 $f8, ($v0) -/* C6F1EC 80240EBC 46804220 */ cvt.s.w $f8, $f8 -/* C6F1F0 80240EC0 44064000 */ mfc1 $a2, $f8 -/* C6F1F4 80240EC4 C4480008 */ lwc1 $f8, 8($v0) -/* C6F1F8 80240EC8 46804220 */ cvt.s.w $f8, $f8 -/* C6F1FC 80240ECC 44074000 */ mfc1 $a3, $f8 -/* C6F200 80240ED0 0C00A720 */ jal atan2 -/* C6F204 80240ED4 24140001 */ addiu $s4, $zero, 1 -/* C6F208 80240ED8 E600000C */ swc1 $f0, 0xc($s0) -.L80240EDC: -/* C6F20C 80240EDC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6F210 80240EE0 8C43000C */ lw $v1, 0xc($v0) -/* C6F214 80240EE4 8C420010 */ lw $v0, 0x10($v0) -/* C6F218 80240EE8 00621825 */ or $v1, $v1, $v0 -/* C6F21C 80240EEC 00741825 */ or $v1, $v1, $s4 -/* C6F220 80240EF0 10600008 */ beqz $v1, .L80240F14 -/* C6F224 80240EF4 00000000 */ nop -/* C6F228 80240EF8 8602008C */ lh $v0, 0x8c($s0) -/* C6F22C 80240EFC 14400031 */ bnez $v0, .L80240FC4 -/* C6F230 80240F00 00000000 */ nop -/* C6F234 80240F04 8E050018 */ lw $a1, 0x18($s0) -/* C6F238 80240F08 8E06000C */ lw $a2, 0xc($s0) -/* C6F23C 80240F0C 0C00EA95 */ jal npc_move_heading -/* C6F240 80240F10 0200202D */ daddu $a0, $s0, $zero -.L80240F14: -/* C6F244 80240F14 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6F248 80240F18 3C014059 */ lui $at, 0x4059 -/* C6F24C 80240F1C 44811800 */ mtc1 $at, $f3 -/* C6F250 80240F20 44801000 */ mtc1 $zero, $f2 -/* C6F254 80240F24 46000021 */ cvt.d.s $f0, $f0 -/* C6F258 80240F28 46220002 */ mul.d $f0, $f0, $f2 -/* C6F25C 80240F2C 00000000 */ nop -/* C6F260 80240F30 4620020D */ trunc.w.d $f8, $f0 -/* C6F264 80240F34 E628007C */ swc1 $f8, 0x7c($s1) -/* C6F268 80240F38 8E420004 */ lw $v0, 4($s2) -/* C6F26C 80240F3C 18400021 */ blez $v0, .L80240FC4 -/* C6F270 80240F40 00000000 */ nop -/* C6F274 80240F44 8602008E */ lh $v0, 0x8e($s0) -/* C6F278 80240F48 9603008E */ lhu $v1, 0x8e($s0) -/* C6F27C 80240F4C 18400005 */ blez $v0, .L80240F64 -/* C6F280 80240F50 2462FFFF */ addiu $v0, $v1, -1 -/* C6F284 80240F54 A602008E */ sh $v0, 0x8e($s0) -/* C6F288 80240F58 00021400 */ sll $v0, $v0, 0x10 -/* C6F28C 80240F5C 1C400019 */ bgtz $v0, .L80240FC4 -/* C6F290 80240F60 00000000 */ nop -.L80240F64: -/* C6F294 80240F64 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C6F298 80240F68 24020002 */ addiu $v0, $zero, 2 -/* C6F29C 80240F6C 0C00A67F */ jal rand_int -/* C6F2A0 80240F70 AE620070 */ sw $v0, 0x70($s3) -/* C6F2A4 80240F74 3C035555 */ lui $v1, 0x5555 -/* C6F2A8 80240F78 34635556 */ ori $v1, $v1, 0x5556 -/* C6F2AC 80240F7C 00430018 */ mult $v0, $v1 -/* C6F2B0 80240F80 000227C3 */ sra $a0, $v0, 0x1f -/* C6F2B4 80240F84 00004010 */ mfhi $t0 -/* C6F2B8 80240F88 01042023 */ subu $a0, $t0, $a0 -/* C6F2BC 80240F8C 00041840 */ sll $v1, $a0, 1 -/* C6F2C0 80240F90 00641821 */ addu $v1, $v1, $a0 -/* C6F2C4 80240F94 00431023 */ subu $v0, $v0, $v1 -/* C6F2C8 80240F98 24430002 */ addiu $v1, $v0, 2 -/* C6F2CC 80240F9C AE630074 */ sw $v1, 0x74($s3) -/* C6F2D0 80240FA0 8E42002C */ lw $v0, 0x2c($s2) -/* C6F2D4 80240FA4 58400007 */ blezl $v0, .L80240FC4 -/* C6F2D8 80240FA8 AE600070 */ sw $zero, 0x70($s3) -/* C6F2DC 80240FAC 8E420008 */ lw $v0, 8($s2) -/* C6F2E0 80240FB0 18400003 */ blez $v0, .L80240FC0 -/* C6F2E4 80240FB4 28620003 */ slti $v0, $v1, 3 -/* C6F2E8 80240FB8 10400002 */ beqz $v0, .L80240FC4 -/* C6F2EC 80240FBC 00000000 */ nop -.L80240FC0: -/* C6F2F0 80240FC0 AE600070 */ sw $zero, 0x70($s3) -.L80240FC4: -/* C6F2F4 80240FC4 8FBF0058 */ lw $ra, 0x58($sp) -/* C6F2F8 80240FC8 8FB50054 */ lw $s5, 0x54($sp) -/* C6F2FC 80240FCC 8FB40050 */ lw $s4, 0x50($sp) -/* C6F300 80240FD0 8FB3004C */ lw $s3, 0x4c($sp) -/* C6F304 80240FD4 8FB20048 */ lw $s2, 0x48($sp) -/* C6F308 80240FD8 8FB10044 */ lw $s1, 0x44($sp) -/* C6F30C 80240FDC 8FB00040 */ lw $s0, 0x40($sp) -/* C6F310 80240FE0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C6F314 80240FE4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C6F318 80240FE8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C6F31C 80240FEC D7B40060 */ ldc1 $f20, 0x60($sp) -/* C6F320 80240FF0 03E00008 */ jr $ra -/* C6F324 80240FF4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s index 6d5ff04956..b2fb75708b 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s @@ -86,7 +86,7 @@ glabel func_80241B2C_C6FE5C .L80241C48_C6FF78: /* C6FF78 80241C48 0280202D */ daddu $a0, $s4, $zero /* C6FF7C 80241C4C 0200282D */ daddu $a1, $s0, $zero -/* C6FF80 80241C50 0C090274 */ jal func_802409D0_C6ED00 +/* C6FF80 80241C50 0C090274 */ jal kzn_07_UnkNpcAIFunc35 /* C6FF84 80241C54 0260302D */ daddu $a2, $s3, $zero /* C6FF88 80241C58 0809073D */ j .L80241CF4 /* C6FF8C 80241C5C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s index ef5947d840..83ee654c48 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s @@ -87,7 +87,7 @@ glabel func_80242124_C70454 .L80242244_C70574: /* C70574 80242244 0280202D */ daddu $a0, $s4, $zero /* C70578 80242248 0200282D */ daddu $a1, $s0, $zero -/* C7057C 8024224C 0C090274 */ jal func_802409D0_C6ED00 +/* C7057C 8024224C 0C090274 */ jal kzn_07_UnkNpcAIFunc35 /* C70580 80242250 0260302D */ daddu $a2, $s3, $zero /* C70584 80242254 080908BA */ j .L802422E8 /* C70588 80242258 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240C00_C72080.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240C00_C72080.s deleted file mode 100644 index 93e7e09ab3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240C00_C72080.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802455E8_C76A68 -.double 0.09 - -dlabel D_802455F0_C76A70 -.double 0.09 - -.section .text - -glabel func_80240C00_C72080 -/* C72080 80240C00 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C72084 80240C04 AFB3004C */ sw $s3, 0x4c($sp) -/* C72088 80240C08 0080982D */ daddu $s3, $a0, $zero -/* C7208C 80240C0C AFBF0058 */ sw $ra, 0x58($sp) -/* C72090 80240C10 AFB50054 */ sw $s5, 0x54($sp) -/* C72094 80240C14 AFB40050 */ sw $s4, 0x50($sp) -/* C72098 80240C18 AFB20048 */ sw $s2, 0x48($sp) -/* C7209C 80240C1C AFB10044 */ sw $s1, 0x44($sp) -/* C720A0 80240C20 AFB00040 */ sw $s0, 0x40($sp) -/* C720A4 80240C24 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C720A8 80240C28 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C720AC 80240C2C F7B60068 */ sdc1 $f22, 0x68($sp) -/* C720B0 80240C30 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C720B4 80240C34 8E710148 */ lw $s1, 0x148($s3) -/* C720B8 80240C38 00A0902D */ daddu $s2, $a1, $zero -/* C720BC 80240C3C 86240008 */ lh $a0, 8($s1) -/* C720C0 80240C40 0C00EABB */ jal get_npc_unsafe -/* C720C4 80240C44 00C0A82D */ daddu $s5, $a2, $zero -/* C720C8 80240C48 0040802D */ daddu $s0, $v0, $zero -/* C720CC 80240C4C 0000A02D */ daddu $s4, $zero, $zero -/* C720D0 80240C50 C624007C */ lwc1 $f4, 0x7c($s1) -/* C720D4 80240C54 46802120 */ cvt.s.w $f4, $f4 -/* C720D8 80240C58 C6220088 */ lwc1 $f2, 0x88($s1) -/* C720DC 80240C5C 468010A0 */ cvt.s.w $f2, $f2 -/* C720E0 80240C60 460010A1 */ cvt.d.s $f2, $f2 -/* C720E4 80240C64 46002121 */ cvt.d.s $f4, $f4 -/* C720E8 80240C68 C600003C */ lwc1 $f0, 0x3c($s0) -/* C720EC 80240C6C 3C014059 */ lui $at, 0x4059 -/* C720F0 80240C70 44813800 */ mtc1 $at, $f7 -/* C720F4 80240C74 44803000 */ mtc1 $zero, $f6 -/* C720F8 80240C78 46000021 */ cvt.d.s $f0, $f0 -/* C720FC 80240C7C 46260002 */ mul.d $f0, $f0, $f6 -/* C72100 80240C80 00000000 */ nop -/* C72104 80240C84 24020001 */ addiu $v0, $zero, 1 -/* C72108 80240C88 8E24006C */ lw $a0, 0x6c($s1) -/* C7210C 80240C8C 46261083 */ div.d $f2, $f2, $f6 -/* C72110 80240C90 462010A0 */ cvt.s.d $f2, $f2 -/* C72114 80240C94 46262103 */ div.d $f4, $f4, $f6 -/* C72118 80240C98 46202520 */ cvt.s.d $f20, $f4 -/* C7211C 80240C9C 30830011 */ andi $v1, $a0, 0x11 -/* C72120 80240CA0 4620020D */ trunc.w.d $f8, $f0 -/* C72124 80240CA4 E628007C */ swc1 $f8, 0x7c($s1) -/* C72128 80240CA8 C6200078 */ lwc1 $f0, 0x78($s1) -/* C7212C 80240CAC 46800020 */ cvt.s.w $f0, $f0 -/* C72130 80240CB0 46000021 */ cvt.d.s $f0, $f0 -/* C72134 80240CB4 46260003 */ div.d $f0, $f0, $f6 -/* C72138 80240CB8 462006A0 */ cvt.s.d $f26, $f0 -/* C7213C 80240CBC C6200070 */ lwc1 $f0, 0x70($s1) -/* C72140 80240CC0 46800020 */ cvt.s.w $f0, $f0 -/* C72144 80240CC4 46000021 */ cvt.d.s $f0, $f0 -/* C72148 80240CC8 46260003 */ div.d $f0, $f0, $f6 -/* C7214C 80240CCC 462005A0 */ cvt.s.d $f22, $f0 -/* C72150 80240CD0 14620025 */ bne $v1, $v0, .L80240D68 -/* C72154 80240CD4 4602D600 */ add.s $f24, $f26, $f2 -/* C72158 80240CD8 8E020000 */ lw $v0, ($s0) -/* C7215C 80240CDC 30420008 */ andi $v0, $v0, 8 -/* C72160 80240CE0 10400009 */ beqz $v0, .L80240D08 -/* C72164 80240CE4 27A50028 */ addiu $a1, $sp, 0x28 -/* C72168 80240CE8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C7216C 80240CEC 4600C001 */ sub.s $f0, $f24, $f0 -/* C72170 80240CF0 4600B03C */ c.lt.s $f22, $f0 -/* C72174 80240CF4 00000000 */ nop -/* C72178 80240CF8 4500001B */ bc1f .L80240D68 -/* C7217C 80240CFC 34820010 */ ori $v0, $a0, 0x10 -/* C72180 80240D00 0809035A */ j .L80240D68 -/* C72184 80240D04 AE22006C */ sw $v0, 0x6c($s1) -.L80240D08: -/* C72188 80240D08 27A6002C */ addiu $a2, $sp, 0x2c -/* C7218C 80240D0C C6000038 */ lwc1 $f0, 0x38($s0) -/* C72190 80240D10 C602003C */ lwc1 $f2, 0x3c($s0) -/* C72194 80240D14 C6040040 */ lwc1 $f4, 0x40($s0) -/* C72198 80240D18 3C01447A */ lui $at, 0x447a -/* C7219C 80240D1C 44813000 */ mtc1 $at, $f6 -/* C721A0 80240D20 27A20034 */ addiu $v0, $sp, 0x34 -/* C721A4 80240D24 E7A00028 */ swc1 $f0, 0x28($sp) -/* C721A8 80240D28 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C721AC 80240D2C E7A40030 */ swc1 $f4, 0x30($sp) -/* C721B0 80240D30 E7A60034 */ swc1 $f6, 0x34($sp) -/* C721B4 80240D34 AFA20010 */ sw $v0, 0x10($sp) -/* C721B8 80240D38 8E040080 */ lw $a0, 0x80($s0) -/* C721BC 80240D3C 0C0372DF */ jal npc_raycast_down_sides -/* C721C0 80240D40 27A70030 */ addiu $a3, $sp, 0x30 -/* C721C4 80240D44 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C721C8 80240D48 4600D001 */ sub.s $f0, $f26, $f0 -/* C721CC 80240D4C 4600B03C */ c.lt.s $f22, $f0 -/* C721D0 80240D50 00000000 */ nop -/* C721D4 80240D54 45000004 */ bc1f .L80240D68 -/* C721D8 80240D58 00000000 */ nop -/* C721DC 80240D5C 8E22006C */ lw $v0, 0x6c($s1) -/* C721E0 80240D60 34420010 */ ori $v0, $v0, 0x10 -/* C721E4 80240D64 AE22006C */ sw $v0, 0x6c($s1) -.L80240D68: -/* C721E8 80240D68 8E22006C */ lw $v0, 0x6c($s1) -/* C721EC 80240D6C 24030011 */ addiu $v1, $zero, 0x11 -/* C721F0 80240D70 30420011 */ andi $v0, $v0, 0x11 -/* C721F4 80240D74 14430039 */ bne $v0, $v1, .L80240E5C -/* C721F8 80240D78 00000000 */ nop -/* C721FC 80240D7C 8E020000 */ lw $v0, ($s0) -/* C72200 80240D80 30420008 */ andi $v0, $v0, 8 -/* C72204 80240D84 1040000A */ beqz $v0, .L80240DB0 -/* C72208 80240D88 4600C106 */ mov.s $f4, $f24 -/* C7220C 80240D8C 4614C081 */ sub.s $f2, $f24, $f20 -/* C72210 80240D90 3C018024 */ lui $at, %hi(D_802455E8_C76A68) -/* C72214 80240D94 D42055E8 */ ldc1 $f0, %lo(D_802455E8_C76A68)($at) -/* C72218 80240D98 460010A1 */ cvt.d.s $f2, $f2 -/* C7221C 80240D9C 46201082 */ mul.d $f2, $f2, $f0 -/* C72220 80240DA0 00000000 */ nop -/* C72224 80240DA4 4600A021 */ cvt.d.s $f0, $f20 -/* C72228 80240DA8 08090385 */ j .L80240E14 -/* C7222C 80240DAC 46220000 */ add.d $f0, $f0, $f2 -.L80240DB0: -/* C72230 80240DB0 27A50028 */ addiu $a1, $sp, 0x28 -/* C72234 80240DB4 27A6002C */ addiu $a2, $sp, 0x2c -/* C72238 80240DB8 C6000038 */ lwc1 $f0, 0x38($s0) -/* C7223C 80240DBC C6020040 */ lwc1 $f2, 0x40($s0) -/* C72240 80240DC0 3C01447A */ lui $at, 0x447a -/* C72244 80240DC4 44812000 */ mtc1 $at, $f4 -/* C72248 80240DC8 27A20034 */ addiu $v0, $sp, 0x34 -/* C7224C 80240DCC E7B4002C */ swc1 $f20, 0x2c($sp) -/* C72250 80240DD0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C72254 80240DD4 E7A20030 */ swc1 $f2, 0x30($sp) -/* C72258 80240DD8 E7A40034 */ swc1 $f4, 0x34($sp) -/* C7225C 80240DDC AFA20010 */ sw $v0, 0x10($sp) -/* C72260 80240DE0 8E040080 */ lw $a0, 0x80($s0) -/* C72264 80240DE4 0C0372DF */ jal npc_raycast_down_sides -/* C72268 80240DE8 27A70030 */ addiu $a3, $sp, 0x30 -/* C7226C 80240DEC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C72270 80240DF0 461A2100 */ add.s $f4, $f4, $f26 -/* C72274 80240DF4 46142081 */ sub.s $f2, $f4, $f20 -/* C72278 80240DF8 3C018024 */ lui $at, %hi(D_802455F0_C76A70) -/* C7227C 80240DFC D42055F0 */ ldc1 $f0, %lo(D_802455F0_C76A70)($at) -/* C72280 80240E00 460010A1 */ cvt.d.s $f2, $f2 -/* C72284 80240E04 46201082 */ mul.d $f2, $f2, $f0 -/* C72288 80240E08 00000000 */ nop -/* C7228C 80240E0C 4600A021 */ cvt.d.s $f0, $f20 -/* C72290 80240E10 46220000 */ add.d $f0, $f0, $f2 -.L80240E14: -/* C72294 80240E14 46200020 */ cvt.s.d $f0, $f0 -/* C72298 80240E18 E600003C */ swc1 $f0, 0x3c($s0) -/* C7229C 80240E1C C600003C */ lwc1 $f0, 0x3c($s0) -/* C722A0 80240E20 46002001 */ sub.s $f0, $f4, $f0 -/* C722A4 80240E24 3C013FF0 */ lui $at, 0x3ff0 -/* C722A8 80240E28 44811800 */ mtc1 $at, $f3 -/* C722AC 80240E2C 44801000 */ mtc1 $zero, $f2 -/* C722B0 80240E30 46000005 */ abs.s $f0, $f0 -/* C722B4 80240E34 46000021 */ cvt.d.s $f0, $f0 -/* C722B8 80240E38 4622003C */ c.lt.d $f0, $f2 -/* C722BC 80240E3C 00000000 */ nop -/* C722C0 80240E40 45000036 */ bc1f .L80240F1C -/* C722C4 80240E44 2403FFEF */ addiu $v1, $zero, -0x11 -/* C722C8 80240E48 E604003C */ swc1 $f4, 0x3c($s0) -/* C722CC 80240E4C 8E22006C */ lw $v0, 0x6c($s1) -/* C722D0 80240E50 00431024 */ and $v0, $v0, $v1 -/* C722D4 80240E54 080903C7 */ j .L80240F1C -/* C722D8 80240E58 AE22006C */ sw $v0, 0x6c($s1) -.L80240E5C: -/* C722DC 80240E5C 8E220070 */ lw $v0, 0x70($s1) -/* C722E0 80240E60 1840002E */ blez $v0, .L80240F1C -/* C722E4 80240E64 00000000 */ nop -/* C722E8 80240E68 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C722EC 80240E6C 0C00A8BB */ jal sin_deg -/* C722F0 80240E70 46806320 */ cvt.s.w $f12, $f12 -/* C722F4 80240E74 8E020000 */ lw $v0, ($s0) -/* C722F8 80240E78 30420008 */ andi $v0, $v0, 8 -/* C722FC 80240E7C 10400003 */ beqz $v0, .L80240E8C -/* C72300 80240E80 46000506 */ mov.s $f20, $f0 -/* C72304 80240E84 080903B3 */ j .L80240ECC -/* C72308 80240E88 0000102D */ daddu $v0, $zero, $zero -.L80240E8C: -/* C7230C 80240E8C 27A50028 */ addiu $a1, $sp, 0x28 -/* C72310 80240E90 27A6002C */ addiu $a2, $sp, 0x2c -/* C72314 80240E94 C6000038 */ lwc1 $f0, 0x38($s0) -/* C72318 80240E98 C602003C */ lwc1 $f2, 0x3c($s0) -/* C7231C 80240E9C C6040040 */ lwc1 $f4, 0x40($s0) -/* C72320 80240EA0 3C01447A */ lui $at, 0x447a -/* C72324 80240EA4 44813000 */ mtc1 $at, $f6 -/* C72328 80240EA8 27A20034 */ addiu $v0, $sp, 0x34 -/* C7232C 80240EAC E7A00028 */ swc1 $f0, 0x28($sp) -/* C72330 80240EB0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C72334 80240EB4 E7A40030 */ swc1 $f4, 0x30($sp) -/* C72338 80240EB8 E7A60034 */ swc1 $f6, 0x34($sp) -/* C7233C 80240EBC AFA20010 */ sw $v0, 0x10($sp) -/* C72340 80240EC0 8E040080 */ lw $a0, 0x80($s0) -/* C72344 80240EC4 0C0372DF */ jal npc_raycast_down_sides -/* C72348 80240EC8 27A70030 */ addiu $a3, $sp, 0x30 -.L80240ECC: -/* C7234C 80240ECC 10400007 */ beqz $v0, .L80240EEC -/* C72350 80240ED0 00000000 */ nop -/* C72354 80240ED4 4616A082 */ mul.s $f2, $f20, $f22 -/* C72358 80240ED8 00000000 */ nop -/* C7235C 80240EDC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C72360 80240EE0 461A0000 */ add.s $f0, $f0, $f26 -/* C72364 80240EE4 080903BE */ j .L80240EF8 -/* C72368 80240EE8 46020000 */ add.s $f0, $f0, $f2 -.L80240EEC: -/* C7236C 80240EEC 4616A002 */ mul.s $f0, $f20, $f22 -/* C72370 80240EF0 00000000 */ nop -/* C72374 80240EF4 4600C000 */ add.s $f0, $f24, $f0 -.L80240EF8: -/* C72378 80240EF8 E600003C */ swc1 $f0, 0x3c($s0) -/* C7237C 80240EFC 8E220074 */ lw $v0, 0x74($s1) -/* C72380 80240F00 2442000A */ addiu $v0, $v0, 0xa -/* C72384 80240F04 44826000 */ mtc1 $v0, $f12 -/* C72388 80240F08 00000000 */ nop -/* C7238C 80240F0C 0C00A6C9 */ jal clamp_angle -/* C72390 80240F10 46806320 */ cvt.s.w $f12, $f12 -/* C72394 80240F14 4600020D */ trunc.w.s $f8, $f0 -/* C72398 80240F18 E6280074 */ swc1 $f8, 0x74($s1) -.L80240F1C: -/* C7239C 80240F1C 8E220090 */ lw $v0, 0x90($s1) -/* C723A0 80240F20 1C40004A */ bgtz $v0, .L8024104C -/* C723A4 80240F24 2442FFFF */ addiu $v0, $v0, -1 -/* C723A8 80240F28 8E430014 */ lw $v1, 0x14($s2) -/* C723AC 80240F2C 04600048 */ bltz $v1, .L80241050 -/* C723B0 80240F30 00000000 */ nop -/* C723B4 80240F34 8E620074 */ lw $v0, 0x74($s3) -/* C723B8 80240F38 1C400042 */ bgtz $v0, .L80241044 -/* C723BC 80240F3C 2442FFFF */ addiu $v0, $v0, -1 -/* C723C0 80240F40 AE630074 */ sw $v1, 0x74($s3) -/* C723C4 80240F44 860200A8 */ lh $v0, 0xa8($s0) -/* C723C8 80240F48 C602003C */ lwc1 $f2, 0x3c($s0) -/* C723CC 80240F4C 44820000 */ mtc1 $v0, $f0 -/* C723D0 80240F50 00000000 */ nop -/* C723D4 80240F54 46800020 */ cvt.s.w $f0, $f0 -/* C723D8 80240F58 46001080 */ add.s $f2, $f2, $f0 -/* C723DC 80240F5C 3C014024 */ lui $at, 0x4024 -/* C723E0 80240F60 44810800 */ mtc1 $at, $f1 -/* C723E4 80240F64 44800000 */ mtc1 $zero, $f0 -/* C723E8 80240F68 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C723EC 80240F6C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C723F0 80240F70 460010A1 */ cvt.d.s $f2, $f2 -/* C723F4 80240F74 46201080 */ add.d $f2, $f2, $f0 -/* C723F8 80240F78 C440002C */ lwc1 $f0, 0x2c($v0) -/* C723FC 80240F7C 46000021 */ cvt.d.s $f0, $f0 -/* C72400 80240F80 4622003C */ c.lt.d $f0, $f2 -/* C72404 80240F84 00000000 */ nop -/* C72408 80240F88 4500002C */ bc1f .L8024103C -/* C7240C 80240F8C 02A0202D */ daddu $a0, $s5, $zero -/* C72410 80240F90 AFA00010 */ sw $zero, 0x10($sp) -/* C72414 80240F94 8E46000C */ lw $a2, 0xc($s2) -/* C72418 80240F98 8E470010 */ lw $a3, 0x10($s2) -/* C7241C 80240F9C 0C01242D */ jal func_800490B4 -/* C72420 80240FA0 0220282D */ daddu $a1, $s1, $zero -/* C72424 80240FA4 10400025 */ beqz $v0, .L8024103C -/* C72428 80240FA8 0000202D */ daddu $a0, $zero, $zero -/* C7242C 80240FAC 0200282D */ daddu $a1, $s0, $zero -/* C72430 80240FB0 0000302D */ daddu $a2, $zero, $zero -/* C72434 80240FB4 2412000C */ addiu $s2, $zero, 0xc -/* C72438 80240FB8 860300A8 */ lh $v1, 0xa8($s0) -/* C7243C 80240FBC 3C013F80 */ lui $at, 0x3f80 -/* C72440 80240FC0 44810000 */ mtc1 $at, $f0 -/* C72444 80240FC4 3C014000 */ lui $at, 0x4000 -/* C72448 80240FC8 44811000 */ mtc1 $at, $f2 -/* C7244C 80240FCC 3C01C1A0 */ lui $at, 0xc1a0 -/* C72450 80240FD0 44812000 */ mtc1 $at, $f4 -/* C72454 80240FD4 44834000 */ mtc1 $v1, $f8 -/* C72458 80240FD8 00000000 */ nop -/* C7245C 80240FDC 46804220 */ cvt.s.w $f8, $f8 -/* C72460 80240FE0 44074000 */ mfc1 $a3, $f8 -/* C72464 80240FE4 27A20038 */ addiu $v0, $sp, 0x38 -/* C72468 80240FE8 AFB2001C */ sw $s2, 0x1c($sp) -/* C7246C 80240FEC AFA20020 */ sw $v0, 0x20($sp) -/* C72470 80240FF0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C72474 80240FF4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C72478 80240FF8 0C01BFA4 */ jal fx_emote -/* C7247C 80240FFC E7A40018 */ swc1 $f4, 0x18($sp) -/* C72480 80241000 0200202D */ daddu $a0, $s0, $zero -/* C72484 80241004 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C72488 80241008 C480003C */ lwc1 $f0, 0x3c($a0) -/* C7248C 8024100C 3C060020 */ lui $a2, 0x20 -/* C72490 80241010 0C012530 */ jal ai_enemy_play_sound -/* C72494 80241014 E4800064 */ swc1 $f0, 0x64($a0) -/* C72498 80241018 8E220018 */ lw $v0, 0x18($s1) -/* C7249C 8024101C 9442002A */ lhu $v0, 0x2a($v0) -/* C724A0 80241020 30420001 */ andi $v0, $v0, 1 -/* C724A4 80241024 10400003 */ beqz $v0, .L80241034 -/* C724A8 80241028 2402000A */ addiu $v0, $zero, 0xa -/* C724AC 8024102C 0809047D */ j .L802411F4 -/* C724B0 80241030 AE620070 */ sw $v0, 0x70($s3) -.L80241034: -/* C724B4 80241034 0809047D */ j .L802411F4 -/* C724B8 80241038 AE720070 */ sw $s2, 0x70($s3) -.L8024103C: -/* C724BC 8024103C 8E620074 */ lw $v0, 0x74($s3) -/* C724C0 80241040 2442FFFF */ addiu $v0, $v0, -1 -.L80241044: -/* C724C4 80241044 08090414 */ j .L80241050 -/* C724C8 80241048 AE620074 */ sw $v0, 0x74($s3) -.L8024104C: -/* C724CC 8024104C AE220090 */ sw $v0, 0x90($s1) -.L80241050: -/* C724D0 80241050 8E2300D0 */ lw $v1, 0xd0($s1) -/* C724D4 80241054 C6000040 */ lwc1 $f0, 0x40($s0) -/* C724D8 80241058 C4620000 */ lwc1 $f2, ($v1) -/* C724DC 8024105C 468010A0 */ cvt.s.w $f2, $f2 -/* C724E0 80241060 C4640008 */ lwc1 $f4, 8($v1) -/* C724E4 80241064 46802120 */ cvt.s.w $f4, $f4 -/* C724E8 80241068 E7A00010 */ swc1 $f0, 0x10($sp) -/* C724EC 8024106C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C724F0 80241070 44051000 */ mfc1 $a1, $f2 -/* C724F4 80241074 C440000C */ lwc1 $f0, 0xc($v0) -/* C724F8 80241078 46800020 */ cvt.s.w $f0, $f0 -/* C724FC 8024107C E7A00014 */ swc1 $f0, 0x14($sp) -/* C72500 80241080 8E2200D0 */ lw $v0, 0xd0($s1) -/* C72504 80241084 44062000 */ mfc1 $a2, $f4 -/* C72508 80241088 C4400010 */ lwc1 $f0, 0x10($v0) -/* C7250C 8024108C 46800020 */ cvt.s.w $f0, $f0 -/* C72510 80241090 E7A00018 */ swc1 $f0, 0x18($sp) -/* C72514 80241094 8C640018 */ lw $a0, 0x18($v1) -/* C72518 80241098 0C0123F5 */ jal is_point_within_region -/* C7251C 8024109C 8E070038 */ lw $a3, 0x38($s0) -/* C72520 802410A0 1040001A */ beqz $v0, .L8024110C -/* C72524 802410A4 00000000 */ nop -/* C72528 802410A8 8E060038 */ lw $a2, 0x38($s0) -/* C7252C 802410AC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C72530 802410B0 8E070040 */ lw $a3, 0x40($s0) -/* C72534 802410B4 C44C0000 */ lwc1 $f12, ($v0) -/* C72538 802410B8 46806320 */ cvt.s.w $f12, $f12 -/* C7253C 802410BC C44E0008 */ lwc1 $f14, 8($v0) -/* C72540 802410C0 0C00A7B5 */ jal dist2D -/* C72544 802410C4 468073A0 */ cvt.s.w $f14, $f14 -/* C72548 802410C8 C6020018 */ lwc1 $f2, 0x18($s0) -/* C7254C 802410CC 4600103C */ c.lt.s $f2, $f0 -/* C72550 802410D0 00000000 */ nop -/* C72554 802410D4 4500000D */ bc1f .L8024110C -/* C72558 802410D8 E7A00034 */ swc1 $f0, 0x34($sp) -/* C7255C 802410DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C72560 802410E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C72564 802410E4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C72568 802410E8 C4480000 */ lwc1 $f8, ($v0) -/* C7256C 802410EC 46804220 */ cvt.s.w $f8, $f8 -/* C72570 802410F0 44064000 */ mfc1 $a2, $f8 -/* C72574 802410F4 C4480008 */ lwc1 $f8, 8($v0) -/* C72578 802410F8 46804220 */ cvt.s.w $f8, $f8 -/* C7257C 802410FC 44074000 */ mfc1 $a3, $f8 -/* C72580 80241100 0C00A720 */ jal atan2 -/* C72584 80241104 24140001 */ addiu $s4, $zero, 1 -/* C72588 80241108 E600000C */ swc1 $f0, 0xc($s0) -.L8024110C: -/* C7258C 8024110C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C72590 80241110 8C43000C */ lw $v1, 0xc($v0) -/* C72594 80241114 8C420010 */ lw $v0, 0x10($v0) -/* C72598 80241118 00621825 */ or $v1, $v1, $v0 -/* C7259C 8024111C 00741825 */ or $v1, $v1, $s4 -/* C725A0 80241120 10600008 */ beqz $v1, .L80241144 -/* C725A4 80241124 00000000 */ nop -/* C725A8 80241128 8602008C */ lh $v0, 0x8c($s0) -/* C725AC 8024112C 14400031 */ bnez $v0, .L802411F4 -/* C725B0 80241130 00000000 */ nop -/* C725B4 80241134 8E050018 */ lw $a1, 0x18($s0) -/* C725B8 80241138 8E06000C */ lw $a2, 0xc($s0) -/* C725BC 8024113C 0C00EA95 */ jal npc_move_heading -/* C725C0 80241140 0200202D */ daddu $a0, $s0, $zero -.L80241144: -/* C725C4 80241144 C600003C */ lwc1 $f0, 0x3c($s0) -/* C725C8 80241148 3C014059 */ lui $at, 0x4059 -/* C725CC 8024114C 44811800 */ mtc1 $at, $f3 -/* C725D0 80241150 44801000 */ mtc1 $zero, $f2 -/* C725D4 80241154 46000021 */ cvt.d.s $f0, $f0 -/* C725D8 80241158 46220002 */ mul.d $f0, $f0, $f2 -/* C725DC 8024115C 00000000 */ nop -/* C725E0 80241160 4620020D */ trunc.w.d $f8, $f0 -/* C725E4 80241164 E628007C */ swc1 $f8, 0x7c($s1) -/* C725E8 80241168 8E420004 */ lw $v0, 4($s2) -/* C725EC 8024116C 18400021 */ blez $v0, .L802411F4 -/* C725F0 80241170 00000000 */ nop -/* C725F4 80241174 8602008E */ lh $v0, 0x8e($s0) -/* C725F8 80241178 9603008E */ lhu $v1, 0x8e($s0) -/* C725FC 8024117C 18400005 */ blez $v0, .L80241194 -/* C72600 80241180 2462FFFF */ addiu $v0, $v1, -1 -/* C72604 80241184 A602008E */ sh $v0, 0x8e($s0) -/* C72608 80241188 00021400 */ sll $v0, $v0, 0x10 -/* C7260C 8024118C 1C400019 */ bgtz $v0, .L802411F4 -/* C72610 80241190 00000000 */ nop -.L80241194: -/* C72614 80241194 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C72618 80241198 24020002 */ addiu $v0, $zero, 2 -/* C7261C 8024119C 0C00A67F */ jal rand_int -/* C72620 802411A0 AE620070 */ sw $v0, 0x70($s3) -/* C72624 802411A4 3C035555 */ lui $v1, 0x5555 -/* C72628 802411A8 34635556 */ ori $v1, $v1, 0x5556 -/* C7262C 802411AC 00430018 */ mult $v0, $v1 -/* C72630 802411B0 000227C3 */ sra $a0, $v0, 0x1f -/* C72634 802411B4 00004010 */ mfhi $t0 -/* C72638 802411B8 01042023 */ subu $a0, $t0, $a0 -/* C7263C 802411BC 00041840 */ sll $v1, $a0, 1 -/* C72640 802411C0 00641821 */ addu $v1, $v1, $a0 -/* C72644 802411C4 00431023 */ subu $v0, $v0, $v1 -/* C72648 802411C8 24430002 */ addiu $v1, $v0, 2 -/* C7264C 802411CC AE630074 */ sw $v1, 0x74($s3) -/* C72650 802411D0 8E42002C */ lw $v0, 0x2c($s2) -/* C72654 802411D4 58400007 */ blezl $v0, .L802411F4 -/* C72658 802411D8 AE600070 */ sw $zero, 0x70($s3) -/* C7265C 802411DC 8E420008 */ lw $v0, 8($s2) -/* C72660 802411E0 18400003 */ blez $v0, .L802411F0 -/* C72664 802411E4 28620003 */ slti $v0, $v1, 3 -/* C72668 802411E8 10400002 */ beqz $v0, .L802411F4 -/* C7266C 802411EC 00000000 */ nop -.L802411F0: -/* C72670 802411F0 AE600070 */ sw $zero, 0x70($s3) -.L802411F4: -/* C72674 802411F4 8FBF0058 */ lw $ra, 0x58($sp) -/* C72678 802411F8 8FB50054 */ lw $s5, 0x54($sp) -/* C7267C 802411FC 8FB40050 */ lw $s4, 0x50($sp) -/* C72680 80241200 8FB3004C */ lw $s3, 0x4c($sp) -/* C72684 80241204 8FB20048 */ lw $s2, 0x48($sp) -/* C72688 80241208 8FB10044 */ lw $s1, 0x44($sp) -/* C7268C 8024120C 8FB00040 */ lw $s0, 0x40($sp) -/* C72690 80241210 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C72694 80241214 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C72698 80241218 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C7269C 8024121C D7B40060 */ ldc1 $f20, 0x60($sp) -/* C726A0 80241220 03E00008 */ jr $ra -/* C726A4 80241224 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s index 75d0e8e95e..4e04291c51 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s @@ -86,7 +86,7 @@ glabel func_80241D5C_C731DC .L80241E78_C732F8: /* C732F8 80241E78 0280202D */ daddu $a0, $s4, $zero /* C732FC 80241E7C 0200282D */ daddu $a1, $s0, $zero -/* C73300 80241E80 0C090300 */ jal func_80240C00_C72080 +/* C73300 80241E80 0C090300 */ jal kzn_08_UnkNpcAIFunc35 /* C73304 80241E84 0260302D */ daddu $a2, $s3, $zero /* C73308 80241E88 080907C9 */ j .L80241F24 /* C7330C 80241E8C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s index f8b0249228..925295eef7 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s @@ -87,7 +87,7 @@ glabel func_80242354_C737D4 .L80242474_C738F4: /* C738F4 80242474 0280202D */ daddu $a0, $s4, $zero /* C738F8 80242478 0200282D */ daddu $a1, $s0, $zero -/* C738FC 8024247C 0C090300 */ jal func_80240C00_C72080 +/* C738FC 8024247C 0C090300 */ jal kzn_08_UnkNpcAIFunc35 /* C73900 80242480 0260302D */ daddu $a2, $s3, $zero /* C73904 80242484 08090946 */ j .L80242518 /* C73908 80242488 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240610_C807B0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240610_C807B0.s deleted file mode 100644 index 39d87d92f4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240610_C807B0.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245858_C859F8 -.double 0.09 - -dlabel D_80245860_C85A00 -.double 0.09 - -.section .text - -glabel func_80240610_C807B0 -/* C807B0 80240610 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C807B4 80240614 AFB3004C */ sw $s3, 0x4c($sp) -/* C807B8 80240618 0080982D */ daddu $s3, $a0, $zero -/* C807BC 8024061C AFBF0058 */ sw $ra, 0x58($sp) -/* C807C0 80240620 AFB50054 */ sw $s5, 0x54($sp) -/* C807C4 80240624 AFB40050 */ sw $s4, 0x50($sp) -/* C807C8 80240628 AFB20048 */ sw $s2, 0x48($sp) -/* C807CC 8024062C AFB10044 */ sw $s1, 0x44($sp) -/* C807D0 80240630 AFB00040 */ sw $s0, 0x40($sp) -/* C807D4 80240634 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C807D8 80240638 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C807DC 8024063C F7B60068 */ sdc1 $f22, 0x68($sp) -/* C807E0 80240640 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C807E4 80240644 8E710148 */ lw $s1, 0x148($s3) -/* C807E8 80240648 00A0902D */ daddu $s2, $a1, $zero -/* C807EC 8024064C 86240008 */ lh $a0, 8($s1) -/* C807F0 80240650 0C00EABB */ jal get_npc_unsafe -/* C807F4 80240654 00C0A82D */ daddu $s5, $a2, $zero -/* C807F8 80240658 0040802D */ daddu $s0, $v0, $zero -/* C807FC 8024065C 0000A02D */ daddu $s4, $zero, $zero -/* C80800 80240660 C624007C */ lwc1 $f4, 0x7c($s1) -/* C80804 80240664 46802120 */ cvt.s.w $f4, $f4 -/* C80808 80240668 C6220088 */ lwc1 $f2, 0x88($s1) -/* C8080C 8024066C 468010A0 */ cvt.s.w $f2, $f2 -/* C80810 80240670 460010A1 */ cvt.d.s $f2, $f2 -/* C80814 80240674 46002121 */ cvt.d.s $f4, $f4 -/* C80818 80240678 C600003C */ lwc1 $f0, 0x3c($s0) -/* C8081C 8024067C 3C014059 */ lui $at, 0x4059 -/* C80820 80240680 44813800 */ mtc1 $at, $f7 -/* C80824 80240684 44803000 */ mtc1 $zero, $f6 -/* C80828 80240688 46000021 */ cvt.d.s $f0, $f0 -/* C8082C 8024068C 46260002 */ mul.d $f0, $f0, $f6 -/* C80830 80240690 00000000 */ nop -/* C80834 80240694 24020001 */ addiu $v0, $zero, 1 -/* C80838 80240698 8E24006C */ lw $a0, 0x6c($s1) -/* C8083C 8024069C 46261083 */ div.d $f2, $f2, $f6 -/* C80840 802406A0 462010A0 */ cvt.s.d $f2, $f2 -/* C80844 802406A4 46262103 */ div.d $f4, $f4, $f6 -/* C80848 802406A8 46202520 */ cvt.s.d $f20, $f4 -/* C8084C 802406AC 30830011 */ andi $v1, $a0, 0x11 -/* C80850 802406B0 4620020D */ trunc.w.d $f8, $f0 -/* C80854 802406B4 E628007C */ swc1 $f8, 0x7c($s1) -/* C80858 802406B8 C6200078 */ lwc1 $f0, 0x78($s1) -/* C8085C 802406BC 46800020 */ cvt.s.w $f0, $f0 -/* C80860 802406C0 46000021 */ cvt.d.s $f0, $f0 -/* C80864 802406C4 46260003 */ div.d $f0, $f0, $f6 -/* C80868 802406C8 462006A0 */ cvt.s.d $f26, $f0 -/* C8086C 802406CC C6200070 */ lwc1 $f0, 0x70($s1) -/* C80870 802406D0 46800020 */ cvt.s.w $f0, $f0 -/* C80874 802406D4 46000021 */ cvt.d.s $f0, $f0 -/* C80878 802406D8 46260003 */ div.d $f0, $f0, $f6 -/* C8087C 802406DC 462005A0 */ cvt.s.d $f22, $f0 -/* C80880 802406E0 14620025 */ bne $v1, $v0, .L80240778 -/* C80884 802406E4 4602D600 */ add.s $f24, $f26, $f2 -/* C80888 802406E8 8E020000 */ lw $v0, ($s0) -/* C8088C 802406EC 30420008 */ andi $v0, $v0, 8 -/* C80890 802406F0 10400009 */ beqz $v0, .L80240718 -/* C80894 802406F4 27A50028 */ addiu $a1, $sp, 0x28 -/* C80898 802406F8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C8089C 802406FC 4600C001 */ sub.s $f0, $f24, $f0 -/* C808A0 80240700 4600B03C */ c.lt.s $f22, $f0 -/* C808A4 80240704 00000000 */ nop -/* C808A8 80240708 4500001B */ bc1f .L80240778 -/* C808AC 8024070C 34820010 */ ori $v0, $a0, 0x10 -/* C808B0 80240710 080901DE */ j .L80240778 -/* C808B4 80240714 AE22006C */ sw $v0, 0x6c($s1) -.L80240718: -/* C808B8 80240718 27A6002C */ addiu $a2, $sp, 0x2c -/* C808BC 8024071C C6000038 */ lwc1 $f0, 0x38($s0) -/* C808C0 80240720 C602003C */ lwc1 $f2, 0x3c($s0) -/* C808C4 80240724 C6040040 */ lwc1 $f4, 0x40($s0) -/* C808C8 80240728 3C01447A */ lui $at, 0x447a -/* C808CC 8024072C 44813000 */ mtc1 $at, $f6 -/* C808D0 80240730 27A20034 */ addiu $v0, $sp, 0x34 -/* C808D4 80240734 E7A00028 */ swc1 $f0, 0x28($sp) -/* C808D8 80240738 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C808DC 8024073C E7A40030 */ swc1 $f4, 0x30($sp) -/* C808E0 80240740 E7A60034 */ swc1 $f6, 0x34($sp) -/* C808E4 80240744 AFA20010 */ sw $v0, 0x10($sp) -/* C808E8 80240748 8E040080 */ lw $a0, 0x80($s0) -/* C808EC 8024074C 0C0372DF */ jal npc_raycast_down_sides -/* C808F0 80240750 27A70030 */ addiu $a3, $sp, 0x30 -/* C808F4 80240754 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C808F8 80240758 4600D001 */ sub.s $f0, $f26, $f0 -/* C808FC 8024075C 4600B03C */ c.lt.s $f22, $f0 -/* C80900 80240760 00000000 */ nop -/* C80904 80240764 45000004 */ bc1f .L80240778 -/* C80908 80240768 00000000 */ nop -/* C8090C 8024076C 8E22006C */ lw $v0, 0x6c($s1) -/* C80910 80240770 34420010 */ ori $v0, $v0, 0x10 -/* C80914 80240774 AE22006C */ sw $v0, 0x6c($s1) -.L80240778: -/* C80918 80240778 8E22006C */ lw $v0, 0x6c($s1) -/* C8091C 8024077C 24030011 */ addiu $v1, $zero, 0x11 -/* C80920 80240780 30420011 */ andi $v0, $v0, 0x11 -/* C80924 80240784 14430039 */ bne $v0, $v1, .L8024086C -/* C80928 80240788 00000000 */ nop -/* C8092C 8024078C 8E020000 */ lw $v0, ($s0) -/* C80930 80240790 30420008 */ andi $v0, $v0, 8 -/* C80934 80240794 1040000A */ beqz $v0, .L802407C0 -/* C80938 80240798 4600C106 */ mov.s $f4, $f24 -/* C8093C 8024079C 4614C081 */ sub.s $f2, $f24, $f20 -/* C80940 802407A0 3C018024 */ lui $at, %hi(D_80245858_C859F8) -/* C80944 802407A4 D4205858 */ ldc1 $f0, %lo(D_80245858_C859F8)($at) -/* C80948 802407A8 460010A1 */ cvt.d.s $f2, $f2 -/* C8094C 802407AC 46201082 */ mul.d $f2, $f2, $f0 -/* C80950 802407B0 00000000 */ nop -/* C80954 802407B4 4600A021 */ cvt.d.s $f0, $f20 -/* C80958 802407B8 08090209 */ j .L80240824 -/* C8095C 802407BC 46220000 */ add.d $f0, $f0, $f2 -.L802407C0: -/* C80960 802407C0 27A50028 */ addiu $a1, $sp, 0x28 -/* C80964 802407C4 27A6002C */ addiu $a2, $sp, 0x2c -/* C80968 802407C8 C6000038 */ lwc1 $f0, 0x38($s0) -/* C8096C 802407CC C6020040 */ lwc1 $f2, 0x40($s0) -/* C80970 802407D0 3C01447A */ lui $at, 0x447a -/* C80974 802407D4 44812000 */ mtc1 $at, $f4 -/* C80978 802407D8 27A20034 */ addiu $v0, $sp, 0x34 -/* C8097C 802407DC E7B4002C */ swc1 $f20, 0x2c($sp) -/* C80980 802407E0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C80984 802407E4 E7A20030 */ swc1 $f2, 0x30($sp) -/* C80988 802407E8 E7A40034 */ swc1 $f4, 0x34($sp) -/* C8098C 802407EC AFA20010 */ sw $v0, 0x10($sp) -/* C80990 802407F0 8E040080 */ lw $a0, 0x80($s0) -/* C80994 802407F4 0C0372DF */ jal npc_raycast_down_sides -/* C80998 802407F8 27A70030 */ addiu $a3, $sp, 0x30 -/* C8099C 802407FC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C809A0 80240800 461A2100 */ add.s $f4, $f4, $f26 -/* C809A4 80240804 46142081 */ sub.s $f2, $f4, $f20 -/* C809A8 80240808 3C018024 */ lui $at, %hi(D_80245860_C85A00) -/* C809AC 8024080C D4205860 */ ldc1 $f0, %lo(D_80245860_C85A00)($at) -/* C809B0 80240810 460010A1 */ cvt.d.s $f2, $f2 -/* C809B4 80240814 46201082 */ mul.d $f2, $f2, $f0 -/* C809B8 80240818 00000000 */ nop -/* C809BC 8024081C 4600A021 */ cvt.d.s $f0, $f20 -/* C809C0 80240820 46220000 */ add.d $f0, $f0, $f2 -.L80240824: -/* C809C4 80240824 46200020 */ cvt.s.d $f0, $f0 -/* C809C8 80240828 E600003C */ swc1 $f0, 0x3c($s0) -/* C809CC 8024082C C600003C */ lwc1 $f0, 0x3c($s0) -/* C809D0 80240830 46002001 */ sub.s $f0, $f4, $f0 -/* C809D4 80240834 3C013FF0 */ lui $at, 0x3ff0 -/* C809D8 80240838 44811800 */ mtc1 $at, $f3 -/* C809DC 8024083C 44801000 */ mtc1 $zero, $f2 -/* C809E0 80240840 46000005 */ abs.s $f0, $f0 -/* C809E4 80240844 46000021 */ cvt.d.s $f0, $f0 -/* C809E8 80240848 4622003C */ c.lt.d $f0, $f2 -/* C809EC 8024084C 00000000 */ nop -/* C809F0 80240850 45000036 */ bc1f .L8024092C -/* C809F4 80240854 2403FFEF */ addiu $v1, $zero, -0x11 -/* C809F8 80240858 E604003C */ swc1 $f4, 0x3c($s0) -/* C809FC 8024085C 8E22006C */ lw $v0, 0x6c($s1) -/* C80A00 80240860 00431024 */ and $v0, $v0, $v1 -/* C80A04 80240864 0809024B */ j .L8024092C -/* C80A08 80240868 AE22006C */ sw $v0, 0x6c($s1) -.L8024086C: -/* C80A0C 8024086C 8E220070 */ lw $v0, 0x70($s1) -/* C80A10 80240870 1840002E */ blez $v0, .L8024092C -/* C80A14 80240874 00000000 */ nop -/* C80A18 80240878 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C80A1C 8024087C 0C00A8BB */ jal sin_deg -/* C80A20 80240880 46806320 */ cvt.s.w $f12, $f12 -/* C80A24 80240884 8E020000 */ lw $v0, ($s0) -/* C80A28 80240888 30420008 */ andi $v0, $v0, 8 -/* C80A2C 8024088C 10400003 */ beqz $v0, .L8024089C -/* C80A30 80240890 46000506 */ mov.s $f20, $f0 -/* C80A34 80240894 08090237 */ j .L802408DC -/* C80A38 80240898 0000102D */ daddu $v0, $zero, $zero -.L8024089C: -/* C80A3C 8024089C 27A50028 */ addiu $a1, $sp, 0x28 -/* C80A40 802408A0 27A6002C */ addiu $a2, $sp, 0x2c -/* C80A44 802408A4 C6000038 */ lwc1 $f0, 0x38($s0) -/* C80A48 802408A8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C80A4C 802408AC C6040040 */ lwc1 $f4, 0x40($s0) -/* C80A50 802408B0 3C01447A */ lui $at, 0x447a -/* C80A54 802408B4 44813000 */ mtc1 $at, $f6 -/* C80A58 802408B8 27A20034 */ addiu $v0, $sp, 0x34 -/* C80A5C 802408BC E7A00028 */ swc1 $f0, 0x28($sp) -/* C80A60 802408C0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C80A64 802408C4 E7A40030 */ swc1 $f4, 0x30($sp) -/* C80A68 802408C8 E7A60034 */ swc1 $f6, 0x34($sp) -/* C80A6C 802408CC AFA20010 */ sw $v0, 0x10($sp) -/* C80A70 802408D0 8E040080 */ lw $a0, 0x80($s0) -/* C80A74 802408D4 0C0372DF */ jal npc_raycast_down_sides -/* C80A78 802408D8 27A70030 */ addiu $a3, $sp, 0x30 -.L802408DC: -/* C80A7C 802408DC 10400007 */ beqz $v0, .L802408FC -/* C80A80 802408E0 00000000 */ nop -/* C80A84 802408E4 4616A082 */ mul.s $f2, $f20, $f22 -/* C80A88 802408E8 00000000 */ nop -/* C80A8C 802408EC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C80A90 802408F0 461A0000 */ add.s $f0, $f0, $f26 -/* C80A94 802408F4 08090242 */ j .L80240908 -/* C80A98 802408F8 46020000 */ add.s $f0, $f0, $f2 -.L802408FC: -/* C80A9C 802408FC 4616A002 */ mul.s $f0, $f20, $f22 -/* C80AA0 80240900 00000000 */ nop -/* C80AA4 80240904 4600C000 */ add.s $f0, $f24, $f0 -.L80240908: -/* C80AA8 80240908 E600003C */ swc1 $f0, 0x3c($s0) -/* C80AAC 8024090C 8E220074 */ lw $v0, 0x74($s1) -/* C80AB0 80240910 2442000A */ addiu $v0, $v0, 0xa -/* C80AB4 80240914 44826000 */ mtc1 $v0, $f12 -/* C80AB8 80240918 00000000 */ nop -/* C80ABC 8024091C 0C00A6C9 */ jal clamp_angle -/* C80AC0 80240920 46806320 */ cvt.s.w $f12, $f12 -/* C80AC4 80240924 4600020D */ trunc.w.s $f8, $f0 -/* C80AC8 80240928 E6280074 */ swc1 $f8, 0x74($s1) -.L8024092C: -/* C80ACC 8024092C 8E220090 */ lw $v0, 0x90($s1) -/* C80AD0 80240930 1C40004A */ bgtz $v0, .L80240A5C -/* C80AD4 80240934 2442FFFF */ addiu $v0, $v0, -1 -/* C80AD8 80240938 8E430014 */ lw $v1, 0x14($s2) -/* C80ADC 8024093C 04600048 */ bltz $v1, .L80240A60 -/* C80AE0 80240940 00000000 */ nop -/* C80AE4 80240944 8E620074 */ lw $v0, 0x74($s3) -/* C80AE8 80240948 1C400042 */ bgtz $v0, .L80240A54 -/* C80AEC 8024094C 2442FFFF */ addiu $v0, $v0, -1 -/* C80AF0 80240950 AE630074 */ sw $v1, 0x74($s3) -/* C80AF4 80240954 860200A8 */ lh $v0, 0xa8($s0) -/* C80AF8 80240958 C602003C */ lwc1 $f2, 0x3c($s0) -/* C80AFC 8024095C 44820000 */ mtc1 $v0, $f0 -/* C80B00 80240960 00000000 */ nop -/* C80B04 80240964 46800020 */ cvt.s.w $f0, $f0 -/* C80B08 80240968 46001080 */ add.s $f2, $f2, $f0 -/* C80B0C 8024096C 3C014024 */ lui $at, 0x4024 -/* C80B10 80240970 44810800 */ mtc1 $at, $f1 -/* C80B14 80240974 44800000 */ mtc1 $zero, $f0 -/* C80B18 80240978 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C80B1C 8024097C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C80B20 80240980 460010A1 */ cvt.d.s $f2, $f2 -/* C80B24 80240984 46201080 */ add.d $f2, $f2, $f0 -/* C80B28 80240988 C440002C */ lwc1 $f0, 0x2c($v0) -/* C80B2C 8024098C 46000021 */ cvt.d.s $f0, $f0 -/* C80B30 80240990 4622003C */ c.lt.d $f0, $f2 -/* C80B34 80240994 00000000 */ nop -/* C80B38 80240998 4500002C */ bc1f .L80240A4C -/* C80B3C 8024099C 02A0202D */ daddu $a0, $s5, $zero -/* C80B40 802409A0 AFA00010 */ sw $zero, 0x10($sp) -/* C80B44 802409A4 8E46000C */ lw $a2, 0xc($s2) -/* C80B48 802409A8 8E470010 */ lw $a3, 0x10($s2) -/* C80B4C 802409AC 0C01242D */ jal func_800490B4 -/* C80B50 802409B0 0220282D */ daddu $a1, $s1, $zero -/* C80B54 802409B4 10400025 */ beqz $v0, .L80240A4C -/* C80B58 802409B8 0000202D */ daddu $a0, $zero, $zero -/* C80B5C 802409BC 0200282D */ daddu $a1, $s0, $zero -/* C80B60 802409C0 0000302D */ daddu $a2, $zero, $zero -/* C80B64 802409C4 2412000C */ addiu $s2, $zero, 0xc -/* C80B68 802409C8 860300A8 */ lh $v1, 0xa8($s0) -/* C80B6C 802409CC 3C013F80 */ lui $at, 0x3f80 -/* C80B70 802409D0 44810000 */ mtc1 $at, $f0 -/* C80B74 802409D4 3C014000 */ lui $at, 0x4000 -/* C80B78 802409D8 44811000 */ mtc1 $at, $f2 -/* C80B7C 802409DC 3C01C1A0 */ lui $at, 0xc1a0 -/* C80B80 802409E0 44812000 */ mtc1 $at, $f4 -/* C80B84 802409E4 44834000 */ mtc1 $v1, $f8 -/* C80B88 802409E8 00000000 */ nop -/* C80B8C 802409EC 46804220 */ cvt.s.w $f8, $f8 -/* C80B90 802409F0 44074000 */ mfc1 $a3, $f8 -/* C80B94 802409F4 27A20038 */ addiu $v0, $sp, 0x38 -/* C80B98 802409F8 AFB2001C */ sw $s2, 0x1c($sp) -/* C80B9C 802409FC AFA20020 */ sw $v0, 0x20($sp) -/* C80BA0 80240A00 E7A00010 */ swc1 $f0, 0x10($sp) -/* C80BA4 80240A04 E7A20014 */ swc1 $f2, 0x14($sp) -/* C80BA8 80240A08 0C01BFA4 */ jal fx_emote -/* C80BAC 80240A0C E7A40018 */ swc1 $f4, 0x18($sp) -/* C80BB0 80240A10 0200202D */ daddu $a0, $s0, $zero -/* C80BB4 80240A14 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C80BB8 80240A18 C480003C */ lwc1 $f0, 0x3c($a0) -/* C80BBC 80240A1C 3C060020 */ lui $a2, 0x20 -/* C80BC0 80240A20 0C012530 */ jal ai_enemy_play_sound -/* C80BC4 80240A24 E4800064 */ swc1 $f0, 0x64($a0) -/* C80BC8 80240A28 8E220018 */ lw $v0, 0x18($s1) -/* C80BCC 80240A2C 9442002A */ lhu $v0, 0x2a($v0) -/* C80BD0 80240A30 30420001 */ andi $v0, $v0, 1 -/* C80BD4 80240A34 10400003 */ beqz $v0, .L80240A44 -/* C80BD8 80240A38 2402000A */ addiu $v0, $zero, 0xa -/* C80BDC 80240A3C 08090301 */ j .L80240C04 -/* C80BE0 80240A40 AE620070 */ sw $v0, 0x70($s3) -.L80240A44: -/* C80BE4 80240A44 08090301 */ j .L80240C04 -/* C80BE8 80240A48 AE720070 */ sw $s2, 0x70($s3) -.L80240A4C: -/* C80BEC 80240A4C 8E620074 */ lw $v0, 0x74($s3) -/* C80BF0 80240A50 2442FFFF */ addiu $v0, $v0, -1 -.L80240A54: -/* C80BF4 80240A54 08090298 */ j .L80240A60 -/* C80BF8 80240A58 AE620074 */ sw $v0, 0x74($s3) -.L80240A5C: -/* C80BFC 80240A5C AE220090 */ sw $v0, 0x90($s1) -.L80240A60: -/* C80C00 80240A60 8E2300D0 */ lw $v1, 0xd0($s1) -/* C80C04 80240A64 C6000040 */ lwc1 $f0, 0x40($s0) -/* C80C08 80240A68 C4620000 */ lwc1 $f2, ($v1) -/* C80C0C 80240A6C 468010A0 */ cvt.s.w $f2, $f2 -/* C80C10 80240A70 C4640008 */ lwc1 $f4, 8($v1) -/* C80C14 80240A74 46802120 */ cvt.s.w $f4, $f4 -/* C80C18 80240A78 E7A00010 */ swc1 $f0, 0x10($sp) -/* C80C1C 80240A7C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80C20 80240A80 44051000 */ mfc1 $a1, $f2 -/* C80C24 80240A84 C440000C */ lwc1 $f0, 0xc($v0) -/* C80C28 80240A88 46800020 */ cvt.s.w $f0, $f0 -/* C80C2C 80240A8C E7A00014 */ swc1 $f0, 0x14($sp) -/* C80C30 80240A90 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80C34 80240A94 44062000 */ mfc1 $a2, $f4 -/* C80C38 80240A98 C4400010 */ lwc1 $f0, 0x10($v0) -/* C80C3C 80240A9C 46800020 */ cvt.s.w $f0, $f0 -/* C80C40 80240AA0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C80C44 80240AA4 8C640018 */ lw $a0, 0x18($v1) -/* C80C48 80240AA8 0C0123F5 */ jal is_point_within_region -/* C80C4C 80240AAC 8E070038 */ lw $a3, 0x38($s0) -/* C80C50 80240AB0 1040001A */ beqz $v0, .L80240B1C -/* C80C54 80240AB4 00000000 */ nop -/* C80C58 80240AB8 8E060038 */ lw $a2, 0x38($s0) -/* C80C5C 80240ABC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80C60 80240AC0 8E070040 */ lw $a3, 0x40($s0) -/* C80C64 80240AC4 C44C0000 */ lwc1 $f12, ($v0) -/* C80C68 80240AC8 46806320 */ cvt.s.w $f12, $f12 -/* C80C6C 80240ACC C44E0008 */ lwc1 $f14, 8($v0) -/* C80C70 80240AD0 0C00A7B5 */ jal dist2D -/* C80C74 80240AD4 468073A0 */ cvt.s.w $f14, $f14 -/* C80C78 80240AD8 C6020018 */ lwc1 $f2, 0x18($s0) -/* C80C7C 80240ADC 4600103C */ c.lt.s $f2, $f0 -/* C80C80 80240AE0 00000000 */ nop -/* C80C84 80240AE4 4500000D */ bc1f .L80240B1C -/* C80C88 80240AE8 E7A00034 */ swc1 $f0, 0x34($sp) -/* C80C8C 80240AEC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C80C90 80240AF0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80C94 80240AF4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C80C98 80240AF8 C4480000 */ lwc1 $f8, ($v0) -/* C80C9C 80240AFC 46804220 */ cvt.s.w $f8, $f8 -/* C80CA0 80240B00 44064000 */ mfc1 $a2, $f8 -/* C80CA4 80240B04 C4480008 */ lwc1 $f8, 8($v0) -/* C80CA8 80240B08 46804220 */ cvt.s.w $f8, $f8 -/* C80CAC 80240B0C 44074000 */ mfc1 $a3, $f8 -/* C80CB0 80240B10 0C00A720 */ jal atan2 -/* C80CB4 80240B14 24140001 */ addiu $s4, $zero, 1 -/* C80CB8 80240B18 E600000C */ swc1 $f0, 0xc($s0) -.L80240B1C: -/* C80CBC 80240B1C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80CC0 80240B20 8C43000C */ lw $v1, 0xc($v0) -/* C80CC4 80240B24 8C420010 */ lw $v0, 0x10($v0) -/* C80CC8 80240B28 00621825 */ or $v1, $v1, $v0 -/* C80CCC 80240B2C 00741825 */ or $v1, $v1, $s4 -/* C80CD0 80240B30 10600008 */ beqz $v1, .L80240B54 -/* C80CD4 80240B34 00000000 */ nop -/* C80CD8 80240B38 8602008C */ lh $v0, 0x8c($s0) -/* C80CDC 80240B3C 14400031 */ bnez $v0, .L80240C04 -/* C80CE0 80240B40 00000000 */ nop -/* C80CE4 80240B44 8E050018 */ lw $a1, 0x18($s0) -/* C80CE8 80240B48 8E06000C */ lw $a2, 0xc($s0) -/* C80CEC 80240B4C 0C00EA95 */ jal npc_move_heading -/* C80CF0 80240B50 0200202D */ daddu $a0, $s0, $zero -.L80240B54: -/* C80CF4 80240B54 C600003C */ lwc1 $f0, 0x3c($s0) -/* C80CF8 80240B58 3C014059 */ lui $at, 0x4059 -/* C80CFC 80240B5C 44811800 */ mtc1 $at, $f3 -/* C80D00 80240B60 44801000 */ mtc1 $zero, $f2 -/* C80D04 80240B64 46000021 */ cvt.d.s $f0, $f0 -/* C80D08 80240B68 46220002 */ mul.d $f0, $f0, $f2 -/* C80D0C 80240B6C 00000000 */ nop -/* C80D10 80240B70 4620020D */ trunc.w.d $f8, $f0 -/* C80D14 80240B74 E628007C */ swc1 $f8, 0x7c($s1) -/* C80D18 80240B78 8E420004 */ lw $v0, 4($s2) -/* C80D1C 80240B7C 18400021 */ blez $v0, .L80240C04 -/* C80D20 80240B80 00000000 */ nop -/* C80D24 80240B84 8602008E */ lh $v0, 0x8e($s0) -/* C80D28 80240B88 9603008E */ lhu $v1, 0x8e($s0) -/* C80D2C 80240B8C 18400005 */ blez $v0, .L80240BA4 -/* C80D30 80240B90 2462FFFF */ addiu $v0, $v1, -1 -/* C80D34 80240B94 A602008E */ sh $v0, 0x8e($s0) -/* C80D38 80240B98 00021400 */ sll $v0, $v0, 0x10 -/* C80D3C 80240B9C 1C400019 */ bgtz $v0, .L80240C04 -/* C80D40 80240BA0 00000000 */ nop -.L80240BA4: -/* C80D44 80240BA4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C80D48 80240BA8 24020002 */ addiu $v0, $zero, 2 -/* C80D4C 80240BAC 0C00A67F */ jal rand_int -/* C80D50 80240BB0 AE620070 */ sw $v0, 0x70($s3) -/* C80D54 80240BB4 3C035555 */ lui $v1, 0x5555 -/* C80D58 80240BB8 34635556 */ ori $v1, $v1, 0x5556 -/* C80D5C 80240BBC 00430018 */ mult $v0, $v1 -/* C80D60 80240BC0 000227C3 */ sra $a0, $v0, 0x1f -/* C80D64 80240BC4 00004010 */ mfhi $t0 -/* C80D68 80240BC8 01042023 */ subu $a0, $t0, $a0 -/* C80D6C 80240BCC 00041840 */ sll $v1, $a0, 1 -/* C80D70 80240BD0 00641821 */ addu $v1, $v1, $a0 -/* C80D74 80240BD4 00431023 */ subu $v0, $v0, $v1 -/* C80D78 80240BD8 24430002 */ addiu $v1, $v0, 2 -/* C80D7C 80240BDC AE630074 */ sw $v1, 0x74($s3) -/* C80D80 80240BE0 8E42002C */ lw $v0, 0x2c($s2) -/* C80D84 80240BE4 58400007 */ blezl $v0, .L80240C04 -/* C80D88 80240BE8 AE600070 */ sw $zero, 0x70($s3) -/* C80D8C 80240BEC 8E420008 */ lw $v0, 8($s2) -/* C80D90 80240BF0 18400003 */ blez $v0, .L80240C00 -/* C80D94 80240BF4 28620003 */ slti $v0, $v1, 3 -/* C80D98 80240BF8 10400002 */ beqz $v0, .L80240C04 -/* C80D9C 80240BFC 00000000 */ nop -.L80240C00: -/* C80DA0 80240C00 AE600070 */ sw $zero, 0x70($s3) -.L80240C04: -/* C80DA4 80240C04 8FBF0058 */ lw $ra, 0x58($sp) -/* C80DA8 80240C08 8FB50054 */ lw $s5, 0x54($sp) -/* C80DAC 80240C0C 8FB40050 */ lw $s4, 0x50($sp) -/* C80DB0 80240C10 8FB3004C */ lw $s3, 0x4c($sp) -/* C80DB4 80240C14 8FB20048 */ lw $s2, 0x48($sp) -/* C80DB8 80240C18 8FB10044 */ lw $s1, 0x44($sp) -/* C80DBC 80240C1C 8FB00040 */ lw $s0, 0x40($sp) -/* C80DC0 80240C20 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C80DC4 80240C24 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C80DC8 80240C28 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C80DCC 80240C2C D7B40060 */ ldc1 $f20, 0x60($sp) -/* C80DD0 80240C30 03E00008 */ jr $ra -/* C80DD4 80240C34 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s index 80080ace7d..05b609d687 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s @@ -86,7 +86,7 @@ glabel func_8024176C_C8190C .L80241888_C81A28: /* C81A28 80241888 0280202D */ daddu $a0, $s4, $zero /* C81A2C 8024188C 0200282D */ daddu $a1, $s0, $zero -/* C81A30 80241890 0C090184 */ jal func_80240610_C807B0 +/* C81A30 80241890 0C090184 */ jal kzn_11_UnkNpcAIFunc35 /* C81A34 80241894 0260302D */ daddu $a2, $s3, $zero /* C81A38 80241898 0809064D */ j .L80241934 /* C81A3C 8024189C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s index dfd643e803..df544740de 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s @@ -87,7 +87,7 @@ glabel func_80241D64_C81F04 .L80241E84_C82024: /* C82024 80241E84 0280202D */ daddu $a0, $s4, $zero /* C82028 80241E88 0200282D */ daddu $a1, $s0, $zero -/* C8202C 80241E8C 0C090184 */ jal func_80240610_C807B0 +/* C8202C 80241E8C 0C090184 */ jal kzn_11_UnkNpcAIFunc35 /* C82030 80241E90 0260302D */ daddu $a2, $s3, $zero /* C82034 80241E94 080907CA */ j .L80241F28 /* C82038 80241E98 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240070_B97C70.s b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240070_B97C70.s deleted file mode 100644 index bd797b48a5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240070_B97C70.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_B97C70 -/* B97C70 80240070 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B97C74 80240074 AFB00030 */ sw $s0, 0x30($sp) -/* B97C78 80240078 0080802D */ daddu $s0, $a0, $zero -/* B97C7C 8024007C AFBF0040 */ sw $ra, 0x40($sp) -/* B97C80 80240080 AFB3003C */ sw $s3, 0x3c($sp) -/* B97C84 80240084 AFB20038 */ sw $s2, 0x38($sp) -/* B97C88 80240088 AFB10034 */ sw $s1, 0x34($sp) -/* B97C8C 8024008C F7B60050 */ sdc1 $f22, 0x50($sp) -/* B97C90 80240090 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B97C94 80240094 8E130148 */ lw $s3, 0x148($s0) -/* B97C98 80240098 00A0882D */ daddu $s1, $a1, $zero -/* B97C9C 8024009C 86640008 */ lh $a0, 8($s3) -/* B97CA0 802400A0 0C00EABB */ jal get_npc_unsafe -/* B97CA4 802400A4 00C0902D */ daddu $s2, $a2, $zero -/* B97CA8 802400A8 0200202D */ daddu $a0, $s0, $zero -/* B97CAC 802400AC 0220282D */ daddu $a1, $s1, $zero -/* B97CB0 802400B0 0240302D */ daddu $a2, $s2, $zero -/* B97CB4 802400B4 0C012568 */ jal func_800495A0 -/* B97CB8 802400B8 0040802D */ daddu $s0, $v0, $zero -/* B97CBC 802400BC 8E020000 */ lw $v0, ($s0) -/* B97CC0 802400C0 2404002D */ addiu $a0, $zero, 0x2d -/* B97CC4 802400C4 34420800 */ ori $v0, $v0, 0x800 -/* B97CC8 802400C8 0C00A67F */ jal rand_int -/* B97CCC 802400CC AE020000 */ sw $v0, ($s0) -/* B97CD0 802400D0 0200202D */ daddu $a0, $s0, $zero -/* B97CD4 802400D4 3C05B000 */ lui $a1, 0xb000 -/* B97CD8 802400D8 34A50017 */ ori $a1, $a1, 0x17 -/* B97CDC 802400DC 44820000 */ mtc1 $v0, $f0 -/* B97CE0 802400E0 00000000 */ nop -/* B97CE4 802400E4 46800021 */ cvt.d.w $f0, $f0 -/* B97CE8 802400E8 3C014024 */ lui $at, 0x4024 -/* B97CEC 802400EC 44811800 */ mtc1 $at, $f3 -/* B97CF0 802400F0 44801000 */ mtc1 $zero, $f2 -/* B97CF4 802400F4 3C014020 */ lui $at, 0x4020 -/* B97CF8 802400F8 44812800 */ mtc1 $at, $f5 -/* B97CFC 802400FC 44802000 */ mtc1 $zero, $f4 -/* B97D00 80240100 46220003 */ div.d $f0, $f0, $f2 -/* B97D04 80240104 46240000 */ add.d $f0, $f0, $f4 -/* B97D08 80240108 3C013FC0 */ lui $at, 0x3fc0 -/* B97D0C 8024010C 44811000 */ mtc1 $at, $f2 -/* B97D10 80240110 0000302D */ daddu $a2, $zero, $zero -/* B97D14 80240114 E6020014 */ swc1 $f2, 0x14($s0) -/* B97D18 80240118 46200020 */ cvt.s.d $f0, $f0 -/* B97D1C 8024011C 0C012530 */ jal ai_enemy_play_sound -/* B97D20 80240120 E600001C */ swc1 $f0, 0x1c($s0) -/* B97D24 80240124 8E6300D0 */ lw $v1, 0xd0($s3) -/* B97D28 80240128 C6000040 */ lwc1 $f0, 0x40($s0) -/* B97D2C 8024012C C4620000 */ lwc1 $f2, ($v1) -/* B97D30 80240130 468010A0 */ cvt.s.w $f2, $f2 -/* B97D34 80240134 C4640008 */ lwc1 $f4, 8($v1) -/* B97D38 80240138 46802120 */ cvt.s.w $f4, $f4 -/* B97D3C 8024013C E7A00010 */ swc1 $f0, 0x10($sp) -/* B97D40 80240140 8E6200D0 */ lw $v0, 0xd0($s3) -/* B97D44 80240144 44051000 */ mfc1 $a1, $f2 -/* B97D48 80240148 C440000C */ lwc1 $f0, 0xc($v0) -/* B97D4C 8024014C 46800020 */ cvt.s.w $f0, $f0 -/* B97D50 80240150 E7A00014 */ swc1 $f0, 0x14($sp) -/* B97D54 80240154 8E6200D0 */ lw $v0, 0xd0($s3) -/* B97D58 80240158 44062000 */ mfc1 $a2, $f4 -/* B97D5C 8024015C C4400010 */ lwc1 $f0, 0x10($v0) -/* B97D60 80240160 46800020 */ cvt.s.w $f0, $f0 -/* B97D64 80240164 E7A00018 */ swc1 $f0, 0x18($sp) -/* B97D68 80240168 8C640018 */ lw $a0, 0x18($v1) -/* B97D6C 8024016C 0C0123F5 */ jal is_point_within_region -/* B97D70 80240170 8E070038 */ lw $a3, 0x38($s0) -/* B97D74 80240174 10400035 */ beqz $v0, .L8024024C -/* B97D78 80240178 00000000 */ nop -/* B97D7C 8024017C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B97D80 80240180 3C0141C8 */ lui $at, 0x41c8 -/* B97D84 80240184 4481B000 */ mtc1 $at, $f22 -/* B97D88 80240188 8E6200D0 */ lw $v0, 0xd0($s3) -/* B97D8C 8024018C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B97D90 80240190 C4480000 */ lwc1 $f8, ($v0) -/* B97D94 80240194 46804220 */ cvt.s.w $f8, $f8 -/* B97D98 80240198 44064000 */ mfc1 $a2, $f8 -/* B97D9C 8024019C C4480008 */ lwc1 $f8, 8($v0) -/* B97DA0 802401A0 46804220 */ cvt.s.w $f8, $f8 -/* B97DA4 802401A4 44074000 */ mfc1 $a3, $f8 -/* B97DA8 802401A8 3C01403E */ lui $at, 0x403e -/* B97DAC 802401AC 4481A800 */ mtc1 $at, $f21 -/* B97DB0 802401B0 4480A000 */ mtc1 $zero, $f20 -/* B97DB4 802401B4 0C00A720 */ jal atan2 -/* B97DB8 802401B8 0000882D */ daddu $s1, $zero, $zero -/* B97DBC 802401BC C6020038 */ lwc1 $f2, 0x38($s0) -/* B97DC0 802401C0 C604003C */ lwc1 $f4, 0x3c($s0) -/* B97DC4 802401C4 C6060040 */ lwc1 $f6, 0x40($s0) -/* B97DC8 802401C8 E600000C */ swc1 $f0, 0xc($s0) -/* B97DCC 802401CC E7A20020 */ swc1 $f2, 0x20($sp) -/* B97DD0 802401D0 E7A40024 */ swc1 $f4, 0x24($sp) -/* B97DD4 802401D4 E7A60028 */ swc1 $f6, 0x28($sp) -.L802401D8: -/* B97DD8 802401D8 E7B60010 */ swc1 $f22, 0x10($sp) -/* B97DDC 802401DC C600000C */ lwc1 $f0, 0xc($s0) -/* B97DE0 802401E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B97DE4 802401E4 860200A8 */ lh $v0, 0xa8($s0) -/* B97DE8 802401E8 27A50020 */ addiu $a1, $sp, 0x20 -/* B97DEC 802401EC 44820000 */ mtc1 $v0, $f0 -/* B97DF0 802401F0 00000000 */ nop -/* B97DF4 802401F4 46800020 */ cvt.s.w $f0, $f0 -/* B97DF8 802401F8 E7A00018 */ swc1 $f0, 0x18($sp) -/* B97DFC 802401FC 860200A6 */ lh $v0, 0xa6($s0) -/* B97E00 80240200 27A60024 */ addiu $a2, $sp, 0x24 -/* B97E04 80240204 44820000 */ mtc1 $v0, $f0 -/* B97E08 80240208 00000000 */ nop -/* B97E0C 8024020C 46800020 */ cvt.s.w $f0, $f0 -/* B97E10 80240210 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B97E14 80240214 8E040080 */ lw $a0, 0x80($s0) -/* B97E18 80240218 0C037711 */ jal npc_test_move_simple_with_slipping -/* B97E1C 8024021C 27A70028 */ addiu $a3, $sp, 0x28 -/* B97E20 80240220 10400016 */ beqz $v0, .L8024027C -/* B97E24 80240224 26310001 */ addiu $s1, $s1, 1 -/* B97E28 80240228 C600000C */ lwc1 $f0, 0xc($s0) -/* B97E2C 8024022C 46000021 */ cvt.d.s $f0, $f0 -/* B97E30 80240230 46340000 */ add.d $f0, $f0, $f20 -/* B97E34 80240234 2A220006 */ slti $v0, $s1, 6 -/* B97E38 80240238 46200020 */ cvt.s.d $f0, $f0 -/* B97E3C 8024023C 1440FFE6 */ bnez $v0, .L802401D8 -/* B97E40 80240240 E600000C */ swc1 $f0, 0xc($s0) -/* B97E44 80240244 0809009F */ j .L8024027C -/* B97E48 80240248 00000000 */ nop -.L8024024C: -/* B97E4C 8024024C 0C00A67F */ jal rand_int -/* B97E50 80240250 2404003C */ addiu $a0, $zero, 0x3c -/* B97E54 80240254 C60C000C */ lwc1 $f12, 0xc($s0) -/* B97E58 80240258 44820000 */ mtc1 $v0, $f0 -/* B97E5C 8024025C 00000000 */ nop -/* B97E60 80240260 46800020 */ cvt.s.w $f0, $f0 -/* B97E64 80240264 46006300 */ add.s $f12, $f12, $f0 -/* B97E68 80240268 3C0141F0 */ lui $at, 0x41f0 -/* B97E6C 8024026C 44810000 */ mtc1 $at, $f0 -/* B97E70 80240270 0C00A6C9 */ jal clamp_angle -/* B97E74 80240274 46006301 */ sub.s $f12, $f12, $f0 -/* B97E78 80240278 E600000C */ swc1 $f0, 0xc($s0) -.L8024027C: -/* B97E7C 8024027C 8FBF0040 */ lw $ra, 0x40($sp) -/* B97E80 80240280 8FB3003C */ lw $s3, 0x3c($sp) -/* B97E84 80240284 8FB20038 */ lw $s2, 0x38($sp) -/* B97E88 80240288 8FB10034 */ lw $s1, 0x34($sp) -/* B97E8C 8024028C 8FB00030 */ lw $s0, 0x30($sp) -/* B97E90 80240290 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B97E94 80240294 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B97E98 80240298 03E00008 */ jr $ra -/* B97E9C 8024029C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s index 6a49c2548b..3b61531bc0 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s @@ -103,7 +103,7 @@ glabel func_80240C60_B98860 .L80240DC4_B989C4: /* B989C4 80240DC4 0260202D */ daddu $a0, $s3, $zero /* B989C8 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* B989CC 80240DCC 0C09001C */ jal func_80240070_B97C70 +/* B989CC 80240DCC 0C09001C */ jal mim_02_UnkNpcAIFunc36 /* B989D0 80240DD0 0200302D */ daddu $a2, $s0, $zero .L80240DD4_B989D4: /* B989D4 80240DD4 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240200_B9DB60.s b/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240200_B9DB60.s deleted file mode 100644 index ed82c64928..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240200_B9DB60.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240200_B9DB60 -/* B9DB60 80240200 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B9DB64 80240204 AFB00030 */ sw $s0, 0x30($sp) -/* B9DB68 80240208 0080802D */ daddu $s0, $a0, $zero -/* B9DB6C 8024020C AFBF0040 */ sw $ra, 0x40($sp) -/* B9DB70 80240210 AFB3003C */ sw $s3, 0x3c($sp) -/* B9DB74 80240214 AFB20038 */ sw $s2, 0x38($sp) -/* B9DB78 80240218 AFB10034 */ sw $s1, 0x34($sp) -/* B9DB7C 8024021C F7B60050 */ sdc1 $f22, 0x50($sp) -/* B9DB80 80240220 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B9DB84 80240224 8E130148 */ lw $s3, 0x148($s0) -/* B9DB88 80240228 00A0882D */ daddu $s1, $a1, $zero -/* B9DB8C 8024022C 86640008 */ lh $a0, 8($s3) -/* B9DB90 80240230 0C00EABB */ jal get_npc_unsafe -/* B9DB94 80240234 00C0902D */ daddu $s2, $a2, $zero -/* B9DB98 80240238 0200202D */ daddu $a0, $s0, $zero -/* B9DB9C 8024023C 0220282D */ daddu $a1, $s1, $zero -/* B9DBA0 80240240 0240302D */ daddu $a2, $s2, $zero -/* B9DBA4 80240244 0C012568 */ jal func_800495A0 -/* B9DBA8 80240248 0040802D */ daddu $s0, $v0, $zero -/* B9DBAC 8024024C 8E020000 */ lw $v0, ($s0) -/* B9DBB0 80240250 2404002D */ addiu $a0, $zero, 0x2d -/* B9DBB4 80240254 34420800 */ ori $v0, $v0, 0x800 -/* B9DBB8 80240258 0C00A67F */ jal rand_int -/* B9DBBC 8024025C AE020000 */ sw $v0, ($s0) -/* B9DBC0 80240260 0200202D */ daddu $a0, $s0, $zero -/* B9DBC4 80240264 3C05B000 */ lui $a1, 0xb000 -/* B9DBC8 80240268 34A50017 */ ori $a1, $a1, 0x17 -/* B9DBCC 8024026C 44820000 */ mtc1 $v0, $f0 -/* B9DBD0 80240270 00000000 */ nop -/* B9DBD4 80240274 46800021 */ cvt.d.w $f0, $f0 -/* B9DBD8 80240278 3C014024 */ lui $at, 0x4024 -/* B9DBDC 8024027C 44811800 */ mtc1 $at, $f3 -/* B9DBE0 80240280 44801000 */ mtc1 $zero, $f2 -/* B9DBE4 80240284 3C014020 */ lui $at, 0x4020 -/* B9DBE8 80240288 44812800 */ mtc1 $at, $f5 -/* B9DBEC 8024028C 44802000 */ mtc1 $zero, $f4 -/* B9DBF0 80240290 46220003 */ div.d $f0, $f0, $f2 -/* B9DBF4 80240294 46240000 */ add.d $f0, $f0, $f4 -/* B9DBF8 80240298 3C013FC0 */ lui $at, 0x3fc0 -/* B9DBFC 8024029C 44811000 */ mtc1 $at, $f2 -/* B9DC00 802402A0 0000302D */ daddu $a2, $zero, $zero -/* B9DC04 802402A4 E6020014 */ swc1 $f2, 0x14($s0) -/* B9DC08 802402A8 46200020 */ cvt.s.d $f0, $f0 -/* B9DC0C 802402AC 0C012530 */ jal ai_enemy_play_sound -/* B9DC10 802402B0 E600001C */ swc1 $f0, 0x1c($s0) -/* B9DC14 802402B4 8E6300D0 */ lw $v1, 0xd0($s3) -/* B9DC18 802402B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* B9DC1C 802402BC C4620000 */ lwc1 $f2, ($v1) -/* B9DC20 802402C0 468010A0 */ cvt.s.w $f2, $f2 -/* B9DC24 802402C4 C4640008 */ lwc1 $f4, 8($v1) -/* B9DC28 802402C8 46802120 */ cvt.s.w $f4, $f4 -/* B9DC2C 802402CC E7A00010 */ swc1 $f0, 0x10($sp) -/* B9DC30 802402D0 8E6200D0 */ lw $v0, 0xd0($s3) -/* B9DC34 802402D4 44051000 */ mfc1 $a1, $f2 -/* B9DC38 802402D8 C440000C */ lwc1 $f0, 0xc($v0) -/* B9DC3C 802402DC 46800020 */ cvt.s.w $f0, $f0 -/* B9DC40 802402E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B9DC44 802402E4 8E6200D0 */ lw $v0, 0xd0($s3) -/* B9DC48 802402E8 44062000 */ mfc1 $a2, $f4 -/* B9DC4C 802402EC C4400010 */ lwc1 $f0, 0x10($v0) -/* B9DC50 802402F0 46800020 */ cvt.s.w $f0, $f0 -/* B9DC54 802402F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* B9DC58 802402F8 8C640018 */ lw $a0, 0x18($v1) -/* B9DC5C 802402FC 0C0123F5 */ jal is_point_within_region -/* B9DC60 80240300 8E070038 */ lw $a3, 0x38($s0) -/* B9DC64 80240304 10400035 */ beqz $v0, .L802403DC -/* B9DC68 80240308 00000000 */ nop -/* B9DC6C 8024030C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B9DC70 80240310 3C0141C8 */ lui $at, 0x41c8 -/* B9DC74 80240314 4481B000 */ mtc1 $at, $f22 -/* B9DC78 80240318 8E6200D0 */ lw $v0, 0xd0($s3) -/* B9DC7C 8024031C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B9DC80 80240320 C4480000 */ lwc1 $f8, ($v0) -/* B9DC84 80240324 46804220 */ cvt.s.w $f8, $f8 -/* B9DC88 80240328 44064000 */ mfc1 $a2, $f8 -/* B9DC8C 8024032C C4480008 */ lwc1 $f8, 8($v0) -/* B9DC90 80240330 46804220 */ cvt.s.w $f8, $f8 -/* B9DC94 80240334 44074000 */ mfc1 $a3, $f8 -/* B9DC98 80240338 3C01403E */ lui $at, 0x403e -/* B9DC9C 8024033C 4481A800 */ mtc1 $at, $f21 -/* B9DCA0 80240340 4480A000 */ mtc1 $zero, $f20 -/* B9DCA4 80240344 0C00A720 */ jal atan2 -/* B9DCA8 80240348 0000882D */ daddu $s1, $zero, $zero -/* B9DCAC 8024034C C6020038 */ lwc1 $f2, 0x38($s0) -/* B9DCB0 80240350 C604003C */ lwc1 $f4, 0x3c($s0) -/* B9DCB4 80240354 C6060040 */ lwc1 $f6, 0x40($s0) -/* B9DCB8 80240358 E600000C */ swc1 $f0, 0xc($s0) -/* B9DCBC 8024035C E7A20020 */ swc1 $f2, 0x20($sp) -/* B9DCC0 80240360 E7A40024 */ swc1 $f4, 0x24($sp) -/* B9DCC4 80240364 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240368: -/* B9DCC8 80240368 E7B60010 */ swc1 $f22, 0x10($sp) -/* B9DCCC 8024036C C600000C */ lwc1 $f0, 0xc($s0) -/* B9DCD0 80240370 E7A00014 */ swc1 $f0, 0x14($sp) -/* B9DCD4 80240374 860200A8 */ lh $v0, 0xa8($s0) -/* B9DCD8 80240378 27A50020 */ addiu $a1, $sp, 0x20 -/* B9DCDC 8024037C 44820000 */ mtc1 $v0, $f0 -/* B9DCE0 80240380 00000000 */ nop -/* B9DCE4 80240384 46800020 */ cvt.s.w $f0, $f0 -/* B9DCE8 80240388 E7A00018 */ swc1 $f0, 0x18($sp) -/* B9DCEC 8024038C 860200A6 */ lh $v0, 0xa6($s0) -/* B9DCF0 80240390 27A60024 */ addiu $a2, $sp, 0x24 -/* B9DCF4 80240394 44820000 */ mtc1 $v0, $f0 -/* B9DCF8 80240398 00000000 */ nop -/* B9DCFC 8024039C 46800020 */ cvt.s.w $f0, $f0 -/* B9DD00 802403A0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B9DD04 802403A4 8E040080 */ lw $a0, 0x80($s0) -/* B9DD08 802403A8 0C037711 */ jal npc_test_move_simple_with_slipping -/* B9DD0C 802403AC 27A70028 */ addiu $a3, $sp, 0x28 -/* B9DD10 802403B0 10400016 */ beqz $v0, .L8024040C -/* B9DD14 802403B4 26310001 */ addiu $s1, $s1, 1 -/* B9DD18 802403B8 C600000C */ lwc1 $f0, 0xc($s0) -/* B9DD1C 802403BC 46000021 */ cvt.d.s $f0, $f0 -/* B9DD20 802403C0 46340000 */ add.d $f0, $f0, $f20 -/* B9DD24 802403C4 2A220006 */ slti $v0, $s1, 6 -/* B9DD28 802403C8 46200020 */ cvt.s.d $f0, $f0 -/* B9DD2C 802403CC 1440FFE6 */ bnez $v0, .L80240368 -/* B9DD30 802403D0 E600000C */ swc1 $f0, 0xc($s0) -/* B9DD34 802403D4 08090103 */ j .L8024040C -/* B9DD38 802403D8 00000000 */ nop -.L802403DC: -/* B9DD3C 802403DC 0C00A67F */ jal rand_int -/* B9DD40 802403E0 2404003C */ addiu $a0, $zero, 0x3c -/* B9DD44 802403E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* B9DD48 802403E8 44820000 */ mtc1 $v0, $f0 -/* B9DD4C 802403EC 00000000 */ nop -/* B9DD50 802403F0 46800020 */ cvt.s.w $f0, $f0 -/* B9DD54 802403F4 46006300 */ add.s $f12, $f12, $f0 -/* B9DD58 802403F8 3C0141F0 */ lui $at, 0x41f0 -/* B9DD5C 802403FC 44810000 */ mtc1 $at, $f0 -/* B9DD60 80240400 0C00A6C9 */ jal clamp_angle -/* B9DD64 80240404 46006301 */ sub.s $f12, $f12, $f0 -/* B9DD68 80240408 E600000C */ swc1 $f0, 0xc($s0) -.L8024040C: -/* B9DD6C 8024040C 8FBF0040 */ lw $ra, 0x40($sp) -/* B9DD70 80240410 8FB3003C */ lw $s3, 0x3c($sp) -/* B9DD74 80240414 8FB20038 */ lw $s2, 0x38($sp) -/* B9DD78 80240418 8FB10034 */ lw $s1, 0x34($sp) -/* B9DD7C 8024041C 8FB00030 */ lw $s0, 0x30($sp) -/* B9DD80 80240420 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B9DD84 80240424 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B9DD88 80240428 03E00008 */ jr $ra -/* B9DD8C 8024042C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s b/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s index 42c9efb296..7e7895255f 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s @@ -103,7 +103,7 @@ glabel func_80240DF0_B9E750 .L80240F54_B9E8B4: /* B9E8B4 80240F54 0260202D */ daddu $a0, $s3, $zero /* B9E8B8 80240F58 0280282D */ daddu $a1, $s4, $zero -/* B9E8BC 80240F5C 0C090080 */ jal func_80240200_B9DB60 +/* B9E8BC 80240F5C 0C090080 */ jal mim_04_UnkNpcAIFunc36 /* B9E8C0 80240F60 0200302D */ daddu $a2, $s0, $zero .L80240F64_B9E8C4: /* B9E8C4 80240F64 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14_BA6694.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14_BA6694.s deleted file mode 100644 index c303ed7212..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14_BA6694.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F14_BA6694 -/* BA6694 80241F14 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BA6698 80241F18 AFB00030 */ sw $s0, 0x30($sp) -/* BA669C 80241F1C 0080802D */ daddu $s0, $a0, $zero -/* BA66A0 80241F20 AFBF0040 */ sw $ra, 0x40($sp) -/* BA66A4 80241F24 AFB3003C */ sw $s3, 0x3c($sp) -/* BA66A8 80241F28 AFB20038 */ sw $s2, 0x38($sp) -/* BA66AC 80241F2C AFB10034 */ sw $s1, 0x34($sp) -/* BA66B0 80241F30 F7B60050 */ sdc1 $f22, 0x50($sp) -/* BA66B4 80241F34 F7B40048 */ sdc1 $f20, 0x48($sp) -/* BA66B8 80241F38 8E130148 */ lw $s3, 0x148($s0) -/* BA66BC 80241F3C 00A0882D */ daddu $s1, $a1, $zero -/* BA66C0 80241F40 86640008 */ lh $a0, 8($s3) -/* BA66C4 80241F44 0C00EABB */ jal get_npc_unsafe -/* BA66C8 80241F48 00C0902D */ daddu $s2, $a2, $zero -/* BA66CC 80241F4C 0200202D */ daddu $a0, $s0, $zero -/* BA66D0 80241F50 0220282D */ daddu $a1, $s1, $zero -/* BA66D4 80241F54 0240302D */ daddu $a2, $s2, $zero -/* BA66D8 80241F58 0C012568 */ jal func_800495A0 -/* BA66DC 80241F5C 0040802D */ daddu $s0, $v0, $zero -/* BA66E0 80241F60 8E020000 */ lw $v0, ($s0) -/* BA66E4 80241F64 2404002D */ addiu $a0, $zero, 0x2d -/* BA66E8 80241F68 34420800 */ ori $v0, $v0, 0x800 -/* BA66EC 80241F6C 0C00A67F */ jal rand_int -/* BA66F0 80241F70 AE020000 */ sw $v0, ($s0) -/* BA66F4 80241F74 0200202D */ daddu $a0, $s0, $zero -/* BA66F8 80241F78 3C05B000 */ lui $a1, 0xb000 -/* BA66FC 80241F7C 34A50017 */ ori $a1, $a1, 0x17 -/* BA6700 80241F80 44820000 */ mtc1 $v0, $f0 -/* BA6704 80241F84 00000000 */ nop -/* BA6708 80241F88 46800021 */ cvt.d.w $f0, $f0 -/* BA670C 80241F8C 3C014024 */ lui $at, 0x4024 -/* BA6710 80241F90 44811800 */ mtc1 $at, $f3 -/* BA6714 80241F94 44801000 */ mtc1 $zero, $f2 -/* BA6718 80241F98 3C014020 */ lui $at, 0x4020 -/* BA671C 80241F9C 44812800 */ mtc1 $at, $f5 -/* BA6720 80241FA0 44802000 */ mtc1 $zero, $f4 -/* BA6724 80241FA4 46220003 */ div.d $f0, $f0, $f2 -/* BA6728 80241FA8 46240000 */ add.d $f0, $f0, $f4 -/* BA672C 80241FAC 3C013FC0 */ lui $at, 0x3fc0 -/* BA6730 80241FB0 44811000 */ mtc1 $at, $f2 -/* BA6734 80241FB4 0000302D */ daddu $a2, $zero, $zero -/* BA6738 80241FB8 E6020014 */ swc1 $f2, 0x14($s0) -/* BA673C 80241FBC 46200020 */ cvt.s.d $f0, $f0 -/* BA6740 80241FC0 0C012530 */ jal ai_enemy_play_sound -/* BA6744 80241FC4 E600001C */ swc1 $f0, 0x1c($s0) -/* BA6748 80241FC8 8E6300D0 */ lw $v1, 0xd0($s3) -/* BA674C 80241FCC C6000040 */ lwc1 $f0, 0x40($s0) -/* BA6750 80241FD0 C4620000 */ lwc1 $f2, ($v1) -/* BA6754 80241FD4 468010A0 */ cvt.s.w $f2, $f2 -/* BA6758 80241FD8 C4640008 */ lwc1 $f4, 8($v1) -/* BA675C 80241FDC 46802120 */ cvt.s.w $f4, $f4 -/* BA6760 80241FE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA6764 80241FE4 8E6200D0 */ lw $v0, 0xd0($s3) -/* BA6768 80241FE8 44051000 */ mfc1 $a1, $f2 -/* BA676C 80241FEC C440000C */ lwc1 $f0, 0xc($v0) -/* BA6770 80241FF0 46800020 */ cvt.s.w $f0, $f0 -/* BA6774 80241FF4 E7A00014 */ swc1 $f0, 0x14($sp) -/* BA6778 80241FF8 8E6200D0 */ lw $v0, 0xd0($s3) -/* BA677C 80241FFC 44062000 */ mfc1 $a2, $f4 -/* BA6780 80242000 C4400010 */ lwc1 $f0, 0x10($v0) -/* BA6784 80242004 46800020 */ cvt.s.w $f0, $f0 -/* BA6788 80242008 E7A00018 */ swc1 $f0, 0x18($sp) -/* BA678C 8024200C 8C640018 */ lw $a0, 0x18($v1) -/* BA6790 80242010 0C0123F5 */ jal is_point_within_region -/* BA6794 80242014 8E070038 */ lw $a3, 0x38($s0) -/* BA6798 80242018 10400035 */ beqz $v0, .L802420F0 -/* BA679C 8024201C 00000000 */ nop -/* BA67A0 80242020 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BA67A4 80242024 3C0141C8 */ lui $at, 0x41c8 -/* BA67A8 80242028 4481B000 */ mtc1 $at, $f22 -/* BA67AC 8024202C 8E6200D0 */ lw $v0, 0xd0($s3) -/* BA67B0 80242030 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BA67B4 80242034 C4480000 */ lwc1 $f8, ($v0) -/* BA67B8 80242038 46804220 */ cvt.s.w $f8, $f8 -/* BA67BC 8024203C 44064000 */ mfc1 $a2, $f8 -/* BA67C0 80242040 C4480008 */ lwc1 $f8, 8($v0) -/* BA67C4 80242044 46804220 */ cvt.s.w $f8, $f8 -/* BA67C8 80242048 44074000 */ mfc1 $a3, $f8 -/* BA67CC 8024204C 3C01403E */ lui $at, 0x403e -/* BA67D0 80242050 4481A800 */ mtc1 $at, $f21 -/* BA67D4 80242054 4480A000 */ mtc1 $zero, $f20 -/* BA67D8 80242058 0C00A720 */ jal atan2 -/* BA67DC 8024205C 0000882D */ daddu $s1, $zero, $zero -/* BA67E0 80242060 C6020038 */ lwc1 $f2, 0x38($s0) -/* BA67E4 80242064 C604003C */ lwc1 $f4, 0x3c($s0) -/* BA67E8 80242068 C6060040 */ lwc1 $f6, 0x40($s0) -/* BA67EC 8024206C E600000C */ swc1 $f0, 0xc($s0) -/* BA67F0 80242070 E7A20020 */ swc1 $f2, 0x20($sp) -/* BA67F4 80242074 E7A40024 */ swc1 $f4, 0x24($sp) -/* BA67F8 80242078 E7A60028 */ swc1 $f6, 0x28($sp) -.L8024207C: -/* BA67FC 8024207C E7B60010 */ swc1 $f22, 0x10($sp) -/* BA6800 80242080 C600000C */ lwc1 $f0, 0xc($s0) -/* BA6804 80242084 E7A00014 */ swc1 $f0, 0x14($sp) -/* BA6808 80242088 860200A8 */ lh $v0, 0xa8($s0) -/* BA680C 8024208C 27A50020 */ addiu $a1, $sp, 0x20 -/* BA6810 80242090 44820000 */ mtc1 $v0, $f0 -/* BA6814 80242094 00000000 */ nop -/* BA6818 80242098 46800020 */ cvt.s.w $f0, $f0 -/* BA681C 8024209C E7A00018 */ swc1 $f0, 0x18($sp) -/* BA6820 802420A0 860200A6 */ lh $v0, 0xa6($s0) -/* BA6824 802420A4 27A60024 */ addiu $a2, $sp, 0x24 -/* BA6828 802420A8 44820000 */ mtc1 $v0, $f0 -/* BA682C 802420AC 00000000 */ nop -/* BA6830 802420B0 46800020 */ cvt.s.w $f0, $f0 -/* BA6834 802420B4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BA6838 802420B8 8E040080 */ lw $a0, 0x80($s0) -/* BA683C 802420BC 0C037711 */ jal npc_test_move_simple_with_slipping -/* BA6840 802420C0 27A70028 */ addiu $a3, $sp, 0x28 -/* BA6844 802420C4 10400016 */ beqz $v0, .L80242120 -/* BA6848 802420C8 26310001 */ addiu $s1, $s1, 1 -/* BA684C 802420CC C600000C */ lwc1 $f0, 0xc($s0) -/* BA6850 802420D0 46000021 */ cvt.d.s $f0, $f0 -/* BA6854 802420D4 46340000 */ add.d $f0, $f0, $f20 -/* BA6858 802420D8 2A220006 */ slti $v0, $s1, 6 -/* BA685C 802420DC 46200020 */ cvt.s.d $f0, $f0 -/* BA6860 802420E0 1440FFE6 */ bnez $v0, .L8024207C -/* BA6864 802420E4 E600000C */ swc1 $f0, 0xc($s0) -/* BA6868 802420E8 08090848 */ j .L80242120 -/* BA686C 802420EC 00000000 */ nop -.L802420F0: -/* BA6870 802420F0 0C00A67F */ jal rand_int -/* BA6874 802420F4 2404003C */ addiu $a0, $zero, 0x3c -/* BA6878 802420F8 C60C000C */ lwc1 $f12, 0xc($s0) -/* BA687C 802420FC 44820000 */ mtc1 $v0, $f0 -/* BA6880 80242100 00000000 */ nop -/* BA6884 80242104 46800020 */ cvt.s.w $f0, $f0 -/* BA6888 80242108 46006300 */ add.s $f12, $f12, $f0 -/* BA688C 8024210C 3C0141F0 */ lui $at, 0x41f0 -/* BA6890 80242110 44810000 */ mtc1 $at, $f0 -/* BA6894 80242114 0C00A6C9 */ jal clamp_angle -/* BA6898 80242118 46006301 */ sub.s $f12, $f12, $f0 -/* BA689C 8024211C E600000C */ swc1 $f0, 0xc($s0) -.L80242120: -/* BA68A0 80242120 8FBF0040 */ lw $ra, 0x40($sp) -/* BA68A4 80242124 8FB3003C */ lw $s3, 0x3c($sp) -/* BA68A8 80242128 8FB20038 */ lw $s2, 0x38($sp) -/* BA68AC 8024212C 8FB10034 */ lw $s1, 0x34($sp) -/* BA68B0 80242130 8FB00030 */ lw $s0, 0x30($sp) -/* BA68B4 80242134 D7B60050 */ ldc1 $f22, 0x50($sp) -/* BA68B8 80242138 D7B40048 */ ldc1 $f20, 0x48($sp) -/* BA68BC 8024213C 03E00008 */ jr $ra -/* BA68C0 80242140 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s index 15d86a86b8..dbbfd78f4b 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s @@ -103,7 +103,7 @@ glabel func_80242B04_BA7284 .L80242C68_BA73E8: /* BA73E8 80242C68 0260202D */ daddu $a0, $s3, $zero /* BA73EC 80242C6C 0280282D */ daddu $a1, $s4, $zero -/* BA73F0 80242C70 0C0907C5 */ jal func_80241F14_BA6694 +/* BA73F0 80242C70 0C0907C5 */ jal mim_06_UnkNpcAIFunc36 /* BA73F4 80242C74 0200302D */ daddu $a2, $s0, $zero .L80242C78_BA73F8: /* BA73F8 80242C78 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240270_BAA3B0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240270_BAA3B0.s deleted file mode 100644 index 2e58bfbbdd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240270_BAA3B0.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240270_BAA3B0 -/* BAA3B0 80240270 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BAA3B4 80240274 AFB00030 */ sw $s0, 0x30($sp) -/* BAA3B8 80240278 0080802D */ daddu $s0, $a0, $zero -/* BAA3BC 8024027C AFBF0040 */ sw $ra, 0x40($sp) -/* BAA3C0 80240280 AFB3003C */ sw $s3, 0x3c($sp) -/* BAA3C4 80240284 AFB20038 */ sw $s2, 0x38($sp) -/* BAA3C8 80240288 AFB10034 */ sw $s1, 0x34($sp) -/* BAA3CC 8024028C F7B60050 */ sdc1 $f22, 0x50($sp) -/* BAA3D0 80240290 F7B40048 */ sdc1 $f20, 0x48($sp) -/* BAA3D4 80240294 8E130148 */ lw $s3, 0x148($s0) -/* BAA3D8 80240298 00A0882D */ daddu $s1, $a1, $zero -/* BAA3DC 8024029C 86640008 */ lh $a0, 8($s3) -/* BAA3E0 802402A0 0C00EABB */ jal get_npc_unsafe -/* BAA3E4 802402A4 00C0902D */ daddu $s2, $a2, $zero -/* BAA3E8 802402A8 0200202D */ daddu $a0, $s0, $zero -/* BAA3EC 802402AC 0220282D */ daddu $a1, $s1, $zero -/* BAA3F0 802402B0 0240302D */ daddu $a2, $s2, $zero -/* BAA3F4 802402B4 0C012568 */ jal func_800495A0 -/* BAA3F8 802402B8 0040802D */ daddu $s0, $v0, $zero -/* BAA3FC 802402BC 8E020000 */ lw $v0, ($s0) -/* BAA400 802402C0 2404002D */ addiu $a0, $zero, 0x2d -/* BAA404 802402C4 34420800 */ ori $v0, $v0, 0x800 -/* BAA408 802402C8 0C00A67F */ jal rand_int -/* BAA40C 802402CC AE020000 */ sw $v0, ($s0) -/* BAA410 802402D0 0200202D */ daddu $a0, $s0, $zero -/* BAA414 802402D4 3C05B000 */ lui $a1, 0xb000 -/* BAA418 802402D8 34A50017 */ ori $a1, $a1, 0x17 -/* BAA41C 802402DC 44820000 */ mtc1 $v0, $f0 -/* BAA420 802402E0 00000000 */ nop -/* BAA424 802402E4 46800021 */ cvt.d.w $f0, $f0 -/* BAA428 802402E8 3C014024 */ lui $at, 0x4024 -/* BAA42C 802402EC 44811800 */ mtc1 $at, $f3 -/* BAA430 802402F0 44801000 */ mtc1 $zero, $f2 -/* BAA434 802402F4 3C014020 */ lui $at, 0x4020 -/* BAA438 802402F8 44812800 */ mtc1 $at, $f5 -/* BAA43C 802402FC 44802000 */ mtc1 $zero, $f4 -/* BAA440 80240300 46220003 */ div.d $f0, $f0, $f2 -/* BAA444 80240304 46240000 */ add.d $f0, $f0, $f4 -/* BAA448 80240308 3C013FC0 */ lui $at, 0x3fc0 -/* BAA44C 8024030C 44811000 */ mtc1 $at, $f2 -/* BAA450 80240310 0000302D */ daddu $a2, $zero, $zero -/* BAA454 80240314 E6020014 */ swc1 $f2, 0x14($s0) -/* BAA458 80240318 46200020 */ cvt.s.d $f0, $f0 -/* BAA45C 8024031C 0C012530 */ jal ai_enemy_play_sound -/* BAA460 80240320 E600001C */ swc1 $f0, 0x1c($s0) -/* BAA464 80240324 8E6300D0 */ lw $v1, 0xd0($s3) -/* BAA468 80240328 C6000040 */ lwc1 $f0, 0x40($s0) -/* BAA46C 8024032C C4620000 */ lwc1 $f2, ($v1) -/* BAA470 80240330 468010A0 */ cvt.s.w $f2, $f2 -/* BAA474 80240334 C4640008 */ lwc1 $f4, 8($v1) -/* BAA478 80240338 46802120 */ cvt.s.w $f4, $f4 -/* BAA47C 8024033C E7A00010 */ swc1 $f0, 0x10($sp) -/* BAA480 80240340 8E6200D0 */ lw $v0, 0xd0($s3) -/* BAA484 80240344 44051000 */ mfc1 $a1, $f2 -/* BAA488 80240348 C440000C */ lwc1 $f0, 0xc($v0) -/* BAA48C 8024034C 46800020 */ cvt.s.w $f0, $f0 -/* BAA490 80240350 E7A00014 */ swc1 $f0, 0x14($sp) -/* BAA494 80240354 8E6200D0 */ lw $v0, 0xd0($s3) -/* BAA498 80240358 44062000 */ mfc1 $a2, $f4 -/* BAA49C 8024035C C4400010 */ lwc1 $f0, 0x10($v0) -/* BAA4A0 80240360 46800020 */ cvt.s.w $f0, $f0 -/* BAA4A4 80240364 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAA4A8 80240368 8C640018 */ lw $a0, 0x18($v1) -/* BAA4AC 8024036C 0C0123F5 */ jal is_point_within_region -/* BAA4B0 80240370 8E070038 */ lw $a3, 0x38($s0) -/* BAA4B4 80240374 10400035 */ beqz $v0, .L8024044C -/* BAA4B8 80240378 00000000 */ nop -/* BAA4BC 8024037C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAA4C0 80240380 3C0141C8 */ lui $at, 0x41c8 -/* BAA4C4 80240384 4481B000 */ mtc1 $at, $f22 -/* BAA4C8 80240388 8E6200D0 */ lw $v0, 0xd0($s3) -/* BAA4CC 8024038C C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAA4D0 80240390 C4480000 */ lwc1 $f8, ($v0) -/* BAA4D4 80240394 46804220 */ cvt.s.w $f8, $f8 -/* BAA4D8 80240398 44064000 */ mfc1 $a2, $f8 -/* BAA4DC 8024039C C4480008 */ lwc1 $f8, 8($v0) -/* BAA4E0 802403A0 46804220 */ cvt.s.w $f8, $f8 -/* BAA4E4 802403A4 44074000 */ mfc1 $a3, $f8 -/* BAA4E8 802403A8 3C01403E */ lui $at, 0x403e -/* BAA4EC 802403AC 4481A800 */ mtc1 $at, $f21 -/* BAA4F0 802403B0 4480A000 */ mtc1 $zero, $f20 -/* BAA4F4 802403B4 0C00A720 */ jal atan2 -/* BAA4F8 802403B8 0000882D */ daddu $s1, $zero, $zero -/* BAA4FC 802403BC C6020038 */ lwc1 $f2, 0x38($s0) -/* BAA500 802403C0 C604003C */ lwc1 $f4, 0x3c($s0) -/* BAA504 802403C4 C6060040 */ lwc1 $f6, 0x40($s0) -/* BAA508 802403C8 E600000C */ swc1 $f0, 0xc($s0) -/* BAA50C 802403CC E7A20020 */ swc1 $f2, 0x20($sp) -/* BAA510 802403D0 E7A40024 */ swc1 $f4, 0x24($sp) -/* BAA514 802403D4 E7A60028 */ swc1 $f6, 0x28($sp) -.L802403D8: -/* BAA518 802403D8 E7B60010 */ swc1 $f22, 0x10($sp) -/* BAA51C 802403DC C600000C */ lwc1 $f0, 0xc($s0) -/* BAA520 802403E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* BAA524 802403E4 860200A8 */ lh $v0, 0xa8($s0) -/* BAA528 802403E8 27A50020 */ addiu $a1, $sp, 0x20 -/* BAA52C 802403EC 44820000 */ mtc1 $v0, $f0 -/* BAA530 802403F0 00000000 */ nop -/* BAA534 802403F4 46800020 */ cvt.s.w $f0, $f0 -/* BAA538 802403F8 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAA53C 802403FC 860200A6 */ lh $v0, 0xa6($s0) -/* BAA540 80240400 27A60024 */ addiu $a2, $sp, 0x24 -/* BAA544 80240404 44820000 */ mtc1 $v0, $f0 -/* BAA548 80240408 00000000 */ nop -/* BAA54C 8024040C 46800020 */ cvt.s.w $f0, $f0 -/* BAA550 80240410 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BAA554 80240414 8E040080 */ lw $a0, 0x80($s0) -/* BAA558 80240418 0C037711 */ jal npc_test_move_simple_with_slipping -/* BAA55C 8024041C 27A70028 */ addiu $a3, $sp, 0x28 -/* BAA560 80240420 10400016 */ beqz $v0, .L8024047C -/* BAA564 80240424 26310001 */ addiu $s1, $s1, 1 -/* BAA568 80240428 C600000C */ lwc1 $f0, 0xc($s0) -/* BAA56C 8024042C 46000021 */ cvt.d.s $f0, $f0 -/* BAA570 80240430 46340000 */ add.d $f0, $f0, $f20 -/* BAA574 80240434 2A220006 */ slti $v0, $s1, 6 -/* BAA578 80240438 46200020 */ cvt.s.d $f0, $f0 -/* BAA57C 8024043C 1440FFE6 */ bnez $v0, .L802403D8 -/* BAA580 80240440 E600000C */ swc1 $f0, 0xc($s0) -/* BAA584 80240444 0809011F */ j .L8024047C -/* BAA588 80240448 00000000 */ nop -.L8024044C: -/* BAA58C 8024044C 0C00A67F */ jal rand_int -/* BAA590 80240450 2404003C */ addiu $a0, $zero, 0x3c -/* BAA594 80240454 C60C000C */ lwc1 $f12, 0xc($s0) -/* BAA598 80240458 44820000 */ mtc1 $v0, $f0 -/* BAA59C 8024045C 00000000 */ nop -/* BAA5A0 80240460 46800020 */ cvt.s.w $f0, $f0 -/* BAA5A4 80240464 46006300 */ add.s $f12, $f12, $f0 -/* BAA5A8 80240468 3C0141F0 */ lui $at, 0x41f0 -/* BAA5AC 8024046C 44810000 */ mtc1 $at, $f0 -/* BAA5B0 80240470 0C00A6C9 */ jal clamp_angle -/* BAA5B4 80240474 46006301 */ sub.s $f12, $f12, $f0 -/* BAA5B8 80240478 E600000C */ swc1 $f0, 0xc($s0) -.L8024047C: -/* BAA5BC 8024047C 8FBF0040 */ lw $ra, 0x40($sp) -/* BAA5C0 80240480 8FB3003C */ lw $s3, 0x3c($sp) -/* BAA5C4 80240484 8FB20038 */ lw $s2, 0x38($sp) -/* BAA5C8 80240488 8FB10034 */ lw $s1, 0x34($sp) -/* BAA5CC 8024048C 8FB00030 */ lw $s0, 0x30($sp) -/* BAA5D0 80240490 D7B60050 */ ldc1 $f22, 0x50($sp) -/* BAA5D4 80240494 D7B40048 */ ldc1 $f20, 0x48($sp) -/* BAA5D8 80240498 03E00008 */ jr $ra -/* BAA5DC 8024049C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s index 95958f88e9..2add87cebf 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s @@ -103,7 +103,7 @@ glabel btl_merlee_on_start_turn_BAAFA0 .L80240FC4_BAB104: /* BAB104 80240FC4 0260202D */ daddu $a0, $s3, $zero /* BAB108 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* BAB10C 80240FCC 0C09009C */ jal func_80240270_BAA3B0 +/* BAB10C 80240FCC 0C09009C */ jal mim_07_UnkNpcAIFunc36 /* BAB110 80240FD0 0200302D */ daddu $a2, $s0, $zero .L80240FD4_BAB114: /* BAB114 80240FD4 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240250_BADB90.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240250_BADB90.s deleted file mode 100644 index d5ff706e4c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240250_BADB90.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802452A8_BB2BE8 -.double 0.09 - -dlabel D_802452B0_BB2BF0 -.double 0.09 - -.section .text - -glabel func_80240250_BADB90 -/* BADB90 80240250 27BDFF80 */ addiu $sp, $sp, -0x80 -/* BADB94 80240254 AFB3004C */ sw $s3, 0x4c($sp) -/* BADB98 80240258 0080982D */ daddu $s3, $a0, $zero -/* BADB9C 8024025C AFBF0058 */ sw $ra, 0x58($sp) -/* BADBA0 80240260 AFB50054 */ sw $s5, 0x54($sp) -/* BADBA4 80240264 AFB40050 */ sw $s4, 0x50($sp) -/* BADBA8 80240268 AFB20048 */ sw $s2, 0x48($sp) -/* BADBAC 8024026C AFB10044 */ sw $s1, 0x44($sp) -/* BADBB0 80240270 AFB00040 */ sw $s0, 0x40($sp) -/* BADBB4 80240274 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* BADBB8 80240278 F7B80070 */ sdc1 $f24, 0x70($sp) -/* BADBBC 8024027C F7B60068 */ sdc1 $f22, 0x68($sp) -/* BADBC0 80240280 F7B40060 */ sdc1 $f20, 0x60($sp) -/* BADBC4 80240284 8E710148 */ lw $s1, 0x148($s3) -/* BADBC8 80240288 00A0902D */ daddu $s2, $a1, $zero -/* BADBCC 8024028C 86240008 */ lh $a0, 8($s1) -/* BADBD0 80240290 0C00EABB */ jal get_npc_unsafe -/* BADBD4 80240294 00C0A82D */ daddu $s5, $a2, $zero -/* BADBD8 80240298 0040802D */ daddu $s0, $v0, $zero -/* BADBDC 8024029C 0000A02D */ daddu $s4, $zero, $zero -/* BADBE0 802402A0 C624007C */ lwc1 $f4, 0x7c($s1) -/* BADBE4 802402A4 46802120 */ cvt.s.w $f4, $f4 -/* BADBE8 802402A8 C6220088 */ lwc1 $f2, 0x88($s1) -/* BADBEC 802402AC 468010A0 */ cvt.s.w $f2, $f2 -/* BADBF0 802402B0 460010A1 */ cvt.d.s $f2, $f2 -/* BADBF4 802402B4 46002121 */ cvt.d.s $f4, $f4 -/* BADBF8 802402B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* BADBFC 802402BC 3C014059 */ lui $at, 0x4059 -/* BADC00 802402C0 44813800 */ mtc1 $at, $f7 -/* BADC04 802402C4 44803000 */ mtc1 $zero, $f6 -/* BADC08 802402C8 46000021 */ cvt.d.s $f0, $f0 -/* BADC0C 802402CC 46260002 */ mul.d $f0, $f0, $f6 -/* BADC10 802402D0 00000000 */ nop -/* BADC14 802402D4 24020001 */ addiu $v0, $zero, 1 -/* BADC18 802402D8 8E24006C */ lw $a0, 0x6c($s1) -/* BADC1C 802402DC 46261083 */ div.d $f2, $f2, $f6 -/* BADC20 802402E0 462010A0 */ cvt.s.d $f2, $f2 -/* BADC24 802402E4 46262103 */ div.d $f4, $f4, $f6 -/* BADC28 802402E8 46202520 */ cvt.s.d $f20, $f4 -/* BADC2C 802402EC 30830011 */ andi $v1, $a0, 0x11 -/* BADC30 802402F0 4620020D */ trunc.w.d $f8, $f0 -/* BADC34 802402F4 E628007C */ swc1 $f8, 0x7c($s1) -/* BADC38 802402F8 C6200078 */ lwc1 $f0, 0x78($s1) -/* BADC3C 802402FC 46800020 */ cvt.s.w $f0, $f0 -/* BADC40 80240300 46000021 */ cvt.d.s $f0, $f0 -/* BADC44 80240304 46260003 */ div.d $f0, $f0, $f6 -/* BADC48 80240308 462006A0 */ cvt.s.d $f26, $f0 -/* BADC4C 8024030C C6200070 */ lwc1 $f0, 0x70($s1) -/* BADC50 80240310 46800020 */ cvt.s.w $f0, $f0 -/* BADC54 80240314 46000021 */ cvt.d.s $f0, $f0 -/* BADC58 80240318 46260003 */ div.d $f0, $f0, $f6 -/* BADC5C 8024031C 462005A0 */ cvt.s.d $f22, $f0 -/* BADC60 80240320 14620025 */ bne $v1, $v0, .L802403B8 -/* BADC64 80240324 4602D600 */ add.s $f24, $f26, $f2 -/* BADC68 80240328 8E020000 */ lw $v0, ($s0) -/* BADC6C 8024032C 30420008 */ andi $v0, $v0, 8 -/* BADC70 80240330 10400009 */ beqz $v0, .L80240358 -/* BADC74 80240334 27A50028 */ addiu $a1, $sp, 0x28 -/* BADC78 80240338 C600003C */ lwc1 $f0, 0x3c($s0) -/* BADC7C 8024033C 4600C001 */ sub.s $f0, $f24, $f0 -/* BADC80 80240340 4600B03C */ c.lt.s $f22, $f0 -/* BADC84 80240344 00000000 */ nop -/* BADC88 80240348 4500001B */ bc1f .L802403B8 -/* BADC8C 8024034C 34820010 */ ori $v0, $a0, 0x10 -/* BADC90 80240350 080900EE */ j .L802403B8 -/* BADC94 80240354 AE22006C */ sw $v0, 0x6c($s1) -.L80240358: -/* BADC98 80240358 27A6002C */ addiu $a2, $sp, 0x2c -/* BADC9C 8024035C C6000038 */ lwc1 $f0, 0x38($s0) -/* BADCA0 80240360 C602003C */ lwc1 $f2, 0x3c($s0) -/* BADCA4 80240364 C6040040 */ lwc1 $f4, 0x40($s0) -/* BADCA8 80240368 3C01447A */ lui $at, 0x447a -/* BADCAC 8024036C 44813000 */ mtc1 $at, $f6 -/* BADCB0 80240370 27A20034 */ addiu $v0, $sp, 0x34 -/* BADCB4 80240374 E7A00028 */ swc1 $f0, 0x28($sp) -/* BADCB8 80240378 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BADCBC 8024037C E7A40030 */ swc1 $f4, 0x30($sp) -/* BADCC0 80240380 E7A60034 */ swc1 $f6, 0x34($sp) -/* BADCC4 80240384 AFA20010 */ sw $v0, 0x10($sp) -/* BADCC8 80240388 8E040080 */ lw $a0, 0x80($s0) -/* BADCCC 8024038C 0C0372DF */ jal npc_raycast_down_sides -/* BADCD0 80240390 27A70030 */ addiu $a3, $sp, 0x30 -/* BADCD4 80240394 C7A00034 */ lwc1 $f0, 0x34($sp) -/* BADCD8 80240398 4600D001 */ sub.s $f0, $f26, $f0 -/* BADCDC 8024039C 4600B03C */ c.lt.s $f22, $f0 -/* BADCE0 802403A0 00000000 */ nop -/* BADCE4 802403A4 45000004 */ bc1f .L802403B8 -/* BADCE8 802403A8 00000000 */ nop -/* BADCEC 802403AC 8E22006C */ lw $v0, 0x6c($s1) -/* BADCF0 802403B0 34420010 */ ori $v0, $v0, 0x10 -/* BADCF4 802403B4 AE22006C */ sw $v0, 0x6c($s1) -.L802403B8: -/* BADCF8 802403B8 8E22006C */ lw $v0, 0x6c($s1) -/* BADCFC 802403BC 24030011 */ addiu $v1, $zero, 0x11 -/* BADD00 802403C0 30420011 */ andi $v0, $v0, 0x11 -/* BADD04 802403C4 14430039 */ bne $v0, $v1, .L802404AC -/* BADD08 802403C8 00000000 */ nop -/* BADD0C 802403CC 8E020000 */ lw $v0, ($s0) -/* BADD10 802403D0 30420008 */ andi $v0, $v0, 8 -/* BADD14 802403D4 1040000A */ beqz $v0, .L80240400 -/* BADD18 802403D8 4600C106 */ mov.s $f4, $f24 -/* BADD1C 802403DC 4614C081 */ sub.s $f2, $f24, $f20 -/* BADD20 802403E0 3C018024 */ lui $at, %hi(D_802452A8_BB2BE8) -/* BADD24 802403E4 D42052A8 */ ldc1 $f0, %lo(D_802452A8_BB2BE8)($at) -/* BADD28 802403E8 460010A1 */ cvt.d.s $f2, $f2 -/* BADD2C 802403EC 46201082 */ mul.d $f2, $f2, $f0 -/* BADD30 802403F0 00000000 */ nop -/* BADD34 802403F4 4600A021 */ cvt.d.s $f0, $f20 -/* BADD38 802403F8 08090119 */ j .L80240464 -/* BADD3C 802403FC 46220000 */ add.d $f0, $f0, $f2 -.L80240400: -/* BADD40 80240400 27A50028 */ addiu $a1, $sp, 0x28 -/* BADD44 80240404 27A6002C */ addiu $a2, $sp, 0x2c -/* BADD48 80240408 C6000038 */ lwc1 $f0, 0x38($s0) -/* BADD4C 8024040C C6020040 */ lwc1 $f2, 0x40($s0) -/* BADD50 80240410 3C01447A */ lui $at, 0x447a -/* BADD54 80240414 44812000 */ mtc1 $at, $f4 -/* BADD58 80240418 27A20034 */ addiu $v0, $sp, 0x34 -/* BADD5C 8024041C E7B4002C */ swc1 $f20, 0x2c($sp) -/* BADD60 80240420 E7A00028 */ swc1 $f0, 0x28($sp) -/* BADD64 80240424 E7A20030 */ swc1 $f2, 0x30($sp) -/* BADD68 80240428 E7A40034 */ swc1 $f4, 0x34($sp) -/* BADD6C 8024042C AFA20010 */ sw $v0, 0x10($sp) -/* BADD70 80240430 8E040080 */ lw $a0, 0x80($s0) -/* BADD74 80240434 0C0372DF */ jal npc_raycast_down_sides -/* BADD78 80240438 27A70030 */ addiu $a3, $sp, 0x30 -/* BADD7C 8024043C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* BADD80 80240440 461A2100 */ add.s $f4, $f4, $f26 -/* BADD84 80240444 46142081 */ sub.s $f2, $f4, $f20 -/* BADD88 80240448 3C018024 */ lui $at, %hi(D_802452B0_BB2BF0) -/* BADD8C 8024044C D42052B0 */ ldc1 $f0, %lo(D_802452B0_BB2BF0)($at) -/* BADD90 80240450 460010A1 */ cvt.d.s $f2, $f2 -/* BADD94 80240454 46201082 */ mul.d $f2, $f2, $f0 -/* BADD98 80240458 00000000 */ nop -/* BADD9C 8024045C 4600A021 */ cvt.d.s $f0, $f20 -/* BADDA0 80240460 46220000 */ add.d $f0, $f0, $f2 -.L80240464: -/* BADDA4 80240464 46200020 */ cvt.s.d $f0, $f0 -/* BADDA8 80240468 E600003C */ swc1 $f0, 0x3c($s0) -/* BADDAC 8024046C C600003C */ lwc1 $f0, 0x3c($s0) -/* BADDB0 80240470 46002001 */ sub.s $f0, $f4, $f0 -/* BADDB4 80240474 3C013FF0 */ lui $at, 0x3ff0 -/* BADDB8 80240478 44811800 */ mtc1 $at, $f3 -/* BADDBC 8024047C 44801000 */ mtc1 $zero, $f2 -/* BADDC0 80240480 46000005 */ abs.s $f0, $f0 -/* BADDC4 80240484 46000021 */ cvt.d.s $f0, $f0 -/* BADDC8 80240488 4622003C */ c.lt.d $f0, $f2 -/* BADDCC 8024048C 00000000 */ nop -/* BADDD0 80240490 45000036 */ bc1f .L8024056C -/* BADDD4 80240494 2403FFEF */ addiu $v1, $zero, -0x11 -/* BADDD8 80240498 E604003C */ swc1 $f4, 0x3c($s0) -/* BADDDC 8024049C 8E22006C */ lw $v0, 0x6c($s1) -/* BADDE0 802404A0 00431024 */ and $v0, $v0, $v1 -/* BADDE4 802404A4 0809015B */ j .L8024056C -/* BADDE8 802404A8 AE22006C */ sw $v0, 0x6c($s1) -.L802404AC: -/* BADDEC 802404AC 8E220070 */ lw $v0, 0x70($s1) -/* BADDF0 802404B0 1840002E */ blez $v0, .L8024056C -/* BADDF4 802404B4 00000000 */ nop -/* BADDF8 802404B8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BADDFC 802404BC 0C00A8BB */ jal sin_deg -/* BADE00 802404C0 46806320 */ cvt.s.w $f12, $f12 -/* BADE04 802404C4 8E020000 */ lw $v0, ($s0) -/* BADE08 802404C8 30420008 */ andi $v0, $v0, 8 -/* BADE0C 802404CC 10400003 */ beqz $v0, .L802404DC -/* BADE10 802404D0 46000506 */ mov.s $f20, $f0 -/* BADE14 802404D4 08090147 */ j .L8024051C -/* BADE18 802404D8 0000102D */ daddu $v0, $zero, $zero -.L802404DC: -/* BADE1C 802404DC 27A50028 */ addiu $a1, $sp, 0x28 -/* BADE20 802404E0 27A6002C */ addiu $a2, $sp, 0x2c -/* BADE24 802404E4 C6000038 */ lwc1 $f0, 0x38($s0) -/* BADE28 802404E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* BADE2C 802404EC C6040040 */ lwc1 $f4, 0x40($s0) -/* BADE30 802404F0 3C01447A */ lui $at, 0x447a -/* BADE34 802404F4 44813000 */ mtc1 $at, $f6 -/* BADE38 802404F8 27A20034 */ addiu $v0, $sp, 0x34 -/* BADE3C 802404FC E7A00028 */ swc1 $f0, 0x28($sp) -/* BADE40 80240500 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BADE44 80240504 E7A40030 */ swc1 $f4, 0x30($sp) -/* BADE48 80240508 E7A60034 */ swc1 $f6, 0x34($sp) -/* BADE4C 8024050C AFA20010 */ sw $v0, 0x10($sp) -/* BADE50 80240510 8E040080 */ lw $a0, 0x80($s0) -/* BADE54 80240514 0C0372DF */ jal npc_raycast_down_sides -/* BADE58 80240518 27A70030 */ addiu $a3, $sp, 0x30 -.L8024051C: -/* BADE5C 8024051C 10400007 */ beqz $v0, .L8024053C -/* BADE60 80240520 00000000 */ nop -/* BADE64 80240524 4616A082 */ mul.s $f2, $f20, $f22 -/* BADE68 80240528 00000000 */ nop -/* BADE6C 8024052C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BADE70 80240530 461A0000 */ add.s $f0, $f0, $f26 -/* BADE74 80240534 08090152 */ j .L80240548 -/* BADE78 80240538 46020000 */ add.s $f0, $f0, $f2 -.L8024053C: -/* BADE7C 8024053C 4616A002 */ mul.s $f0, $f20, $f22 -/* BADE80 80240540 00000000 */ nop -/* BADE84 80240544 4600C000 */ add.s $f0, $f24, $f0 -.L80240548: -/* BADE88 80240548 E600003C */ swc1 $f0, 0x3c($s0) -/* BADE8C 8024054C 8E220074 */ lw $v0, 0x74($s1) -/* BADE90 80240550 2442000A */ addiu $v0, $v0, 0xa -/* BADE94 80240554 44826000 */ mtc1 $v0, $f12 -/* BADE98 80240558 00000000 */ nop -/* BADE9C 8024055C 0C00A6C9 */ jal clamp_angle -/* BADEA0 80240560 46806320 */ cvt.s.w $f12, $f12 -/* BADEA4 80240564 4600020D */ trunc.w.s $f8, $f0 -/* BADEA8 80240568 E6280074 */ swc1 $f8, 0x74($s1) -.L8024056C: -/* BADEAC 8024056C 8E220090 */ lw $v0, 0x90($s1) -/* BADEB0 80240570 1C40004A */ bgtz $v0, .L8024069C -/* BADEB4 80240574 2442FFFF */ addiu $v0, $v0, -1 -/* BADEB8 80240578 8E430014 */ lw $v1, 0x14($s2) -/* BADEBC 8024057C 04600048 */ bltz $v1, .L802406A0 -/* BADEC0 80240580 00000000 */ nop -/* BADEC4 80240584 8E620074 */ lw $v0, 0x74($s3) -/* BADEC8 80240588 1C400042 */ bgtz $v0, .L80240694 -/* BADECC 8024058C 2442FFFF */ addiu $v0, $v0, -1 -/* BADED0 80240590 AE630074 */ sw $v1, 0x74($s3) -/* BADED4 80240594 860200A8 */ lh $v0, 0xa8($s0) -/* BADED8 80240598 C602003C */ lwc1 $f2, 0x3c($s0) -/* BADEDC 8024059C 44820000 */ mtc1 $v0, $f0 -/* BADEE0 802405A0 00000000 */ nop -/* BADEE4 802405A4 46800020 */ cvt.s.w $f0, $f0 -/* BADEE8 802405A8 46001080 */ add.s $f2, $f2, $f0 -/* BADEEC 802405AC 3C014024 */ lui $at, 0x4024 -/* BADEF0 802405B0 44810800 */ mtc1 $at, $f1 -/* BADEF4 802405B4 44800000 */ mtc1 $zero, $f0 -/* BADEF8 802405B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BADEFC 802405BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BADF00 802405C0 460010A1 */ cvt.d.s $f2, $f2 -/* BADF04 802405C4 46201080 */ add.d $f2, $f2, $f0 -/* BADF08 802405C8 C440002C */ lwc1 $f0, 0x2c($v0) -/* BADF0C 802405CC 46000021 */ cvt.d.s $f0, $f0 -/* BADF10 802405D0 4622003C */ c.lt.d $f0, $f2 -/* BADF14 802405D4 00000000 */ nop -/* BADF18 802405D8 4500002C */ bc1f .L8024068C -/* BADF1C 802405DC 02A0202D */ daddu $a0, $s5, $zero -/* BADF20 802405E0 AFA00010 */ sw $zero, 0x10($sp) -/* BADF24 802405E4 8E46000C */ lw $a2, 0xc($s2) -/* BADF28 802405E8 8E470010 */ lw $a3, 0x10($s2) -/* BADF2C 802405EC 0C01242D */ jal func_800490B4 -/* BADF30 802405F0 0220282D */ daddu $a1, $s1, $zero -/* BADF34 802405F4 10400025 */ beqz $v0, .L8024068C -/* BADF38 802405F8 0000202D */ daddu $a0, $zero, $zero -/* BADF3C 802405FC 0200282D */ daddu $a1, $s0, $zero -/* BADF40 80240600 0000302D */ daddu $a2, $zero, $zero -/* BADF44 80240604 2412000C */ addiu $s2, $zero, 0xc -/* BADF48 80240608 860300A8 */ lh $v1, 0xa8($s0) -/* BADF4C 8024060C 3C013F80 */ lui $at, 0x3f80 -/* BADF50 80240610 44810000 */ mtc1 $at, $f0 -/* BADF54 80240614 3C014000 */ lui $at, 0x4000 -/* BADF58 80240618 44811000 */ mtc1 $at, $f2 -/* BADF5C 8024061C 3C01C1A0 */ lui $at, 0xc1a0 -/* BADF60 80240620 44812000 */ mtc1 $at, $f4 -/* BADF64 80240624 44834000 */ mtc1 $v1, $f8 -/* BADF68 80240628 00000000 */ nop -/* BADF6C 8024062C 46804220 */ cvt.s.w $f8, $f8 -/* BADF70 80240630 44074000 */ mfc1 $a3, $f8 -/* BADF74 80240634 27A20038 */ addiu $v0, $sp, 0x38 -/* BADF78 80240638 AFB2001C */ sw $s2, 0x1c($sp) -/* BADF7C 8024063C AFA20020 */ sw $v0, 0x20($sp) -/* BADF80 80240640 E7A00010 */ swc1 $f0, 0x10($sp) -/* BADF84 80240644 E7A20014 */ swc1 $f2, 0x14($sp) -/* BADF88 80240648 0C01BFA4 */ jal fx_emote -/* BADF8C 8024064C E7A40018 */ swc1 $f4, 0x18($sp) -/* BADF90 80240650 0200202D */ daddu $a0, $s0, $zero -/* BADF94 80240654 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BADF98 80240658 C480003C */ lwc1 $f0, 0x3c($a0) -/* BADF9C 8024065C 3C060020 */ lui $a2, 0x20 -/* BADFA0 80240660 0C012530 */ jal ai_enemy_play_sound -/* BADFA4 80240664 E4800064 */ swc1 $f0, 0x64($a0) -/* BADFA8 80240668 8E220018 */ lw $v0, 0x18($s1) -/* BADFAC 8024066C 9442002A */ lhu $v0, 0x2a($v0) -/* BADFB0 80240670 30420001 */ andi $v0, $v0, 1 -/* BADFB4 80240674 10400003 */ beqz $v0, .L80240684 -/* BADFB8 80240678 2402000A */ addiu $v0, $zero, 0xa -/* BADFBC 8024067C 08090211 */ j .L80240844 -/* BADFC0 80240680 AE620070 */ sw $v0, 0x70($s3) -.L80240684: -/* BADFC4 80240684 08090211 */ j .L80240844 -/* BADFC8 80240688 AE720070 */ sw $s2, 0x70($s3) -.L8024068C: -/* BADFCC 8024068C 8E620074 */ lw $v0, 0x74($s3) -/* BADFD0 80240690 2442FFFF */ addiu $v0, $v0, -1 -.L80240694: -/* BADFD4 80240694 080901A8 */ j .L802406A0 -/* BADFD8 80240698 AE620074 */ sw $v0, 0x74($s3) -.L8024069C: -/* BADFDC 8024069C AE220090 */ sw $v0, 0x90($s1) -.L802406A0: -/* BADFE0 802406A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* BADFE4 802406A4 C6000040 */ lwc1 $f0, 0x40($s0) -/* BADFE8 802406A8 C4620000 */ lwc1 $f2, ($v1) -/* BADFEC 802406AC 468010A0 */ cvt.s.w $f2, $f2 -/* BADFF0 802406B0 C4640008 */ lwc1 $f4, 8($v1) -/* BADFF4 802406B4 46802120 */ cvt.s.w $f4, $f4 -/* BADFF8 802406B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* BADFFC 802406BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BAE000 802406C0 44051000 */ mfc1 $a1, $f2 -/* BAE004 802406C4 C440000C */ lwc1 $f0, 0xc($v0) -/* BAE008 802406C8 46800020 */ cvt.s.w $f0, $f0 -/* BAE00C 802406CC E7A00014 */ swc1 $f0, 0x14($sp) -/* BAE010 802406D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* BAE014 802406D4 44062000 */ mfc1 $a2, $f4 -/* BAE018 802406D8 C4400010 */ lwc1 $f0, 0x10($v0) -/* BAE01C 802406DC 46800020 */ cvt.s.w $f0, $f0 -/* BAE020 802406E0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAE024 802406E4 8C640018 */ lw $a0, 0x18($v1) -/* BAE028 802406E8 0C0123F5 */ jal is_point_within_region -/* BAE02C 802406EC 8E070038 */ lw $a3, 0x38($s0) -/* BAE030 802406F0 1040001A */ beqz $v0, .L8024075C -/* BAE034 802406F4 00000000 */ nop -/* BAE038 802406F8 8E060038 */ lw $a2, 0x38($s0) -/* BAE03C 802406FC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BAE040 80240700 8E070040 */ lw $a3, 0x40($s0) -/* BAE044 80240704 C44C0000 */ lwc1 $f12, ($v0) -/* BAE048 80240708 46806320 */ cvt.s.w $f12, $f12 -/* BAE04C 8024070C C44E0008 */ lwc1 $f14, 8($v0) -/* BAE050 80240710 0C00A7B5 */ jal dist2D -/* BAE054 80240714 468073A0 */ cvt.s.w $f14, $f14 -/* BAE058 80240718 C6020018 */ lwc1 $f2, 0x18($s0) -/* BAE05C 8024071C 4600103C */ c.lt.s $f2, $f0 -/* BAE060 80240720 00000000 */ nop -/* BAE064 80240724 4500000D */ bc1f .L8024075C -/* BAE068 80240728 E7A00034 */ swc1 $f0, 0x34($sp) -/* BAE06C 8024072C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAE070 80240730 8E2200D0 */ lw $v0, 0xd0($s1) -/* BAE074 80240734 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAE078 80240738 C4480000 */ lwc1 $f8, ($v0) -/* BAE07C 8024073C 46804220 */ cvt.s.w $f8, $f8 -/* BAE080 80240740 44064000 */ mfc1 $a2, $f8 -/* BAE084 80240744 C4480008 */ lwc1 $f8, 8($v0) -/* BAE088 80240748 46804220 */ cvt.s.w $f8, $f8 -/* BAE08C 8024074C 44074000 */ mfc1 $a3, $f8 -/* BAE090 80240750 0C00A720 */ jal atan2 -/* BAE094 80240754 24140001 */ addiu $s4, $zero, 1 -/* BAE098 80240758 E600000C */ swc1 $f0, 0xc($s0) -.L8024075C: -/* BAE09C 8024075C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BAE0A0 80240760 8C43000C */ lw $v1, 0xc($v0) -/* BAE0A4 80240764 8C420010 */ lw $v0, 0x10($v0) -/* BAE0A8 80240768 00621825 */ or $v1, $v1, $v0 -/* BAE0AC 8024076C 00741825 */ or $v1, $v1, $s4 -/* BAE0B0 80240770 10600008 */ beqz $v1, .L80240794 -/* BAE0B4 80240774 00000000 */ nop -/* BAE0B8 80240778 8602008C */ lh $v0, 0x8c($s0) -/* BAE0BC 8024077C 14400031 */ bnez $v0, .L80240844 -/* BAE0C0 80240780 00000000 */ nop -/* BAE0C4 80240784 8E050018 */ lw $a1, 0x18($s0) -/* BAE0C8 80240788 8E06000C */ lw $a2, 0xc($s0) -/* BAE0CC 8024078C 0C00EA95 */ jal npc_move_heading -/* BAE0D0 80240790 0200202D */ daddu $a0, $s0, $zero -.L80240794: -/* BAE0D4 80240794 C600003C */ lwc1 $f0, 0x3c($s0) -/* BAE0D8 80240798 3C014059 */ lui $at, 0x4059 -/* BAE0DC 8024079C 44811800 */ mtc1 $at, $f3 -/* BAE0E0 802407A0 44801000 */ mtc1 $zero, $f2 -/* BAE0E4 802407A4 46000021 */ cvt.d.s $f0, $f0 -/* BAE0E8 802407A8 46220002 */ mul.d $f0, $f0, $f2 -/* BAE0EC 802407AC 00000000 */ nop -/* BAE0F0 802407B0 4620020D */ trunc.w.d $f8, $f0 -/* BAE0F4 802407B4 E628007C */ swc1 $f8, 0x7c($s1) -/* BAE0F8 802407B8 8E420004 */ lw $v0, 4($s2) -/* BAE0FC 802407BC 18400021 */ blez $v0, .L80240844 -/* BAE100 802407C0 00000000 */ nop -/* BAE104 802407C4 8602008E */ lh $v0, 0x8e($s0) -/* BAE108 802407C8 9603008E */ lhu $v1, 0x8e($s0) -/* BAE10C 802407CC 18400005 */ blez $v0, .L802407E4 -/* BAE110 802407D0 2462FFFF */ addiu $v0, $v1, -1 -/* BAE114 802407D4 A602008E */ sh $v0, 0x8e($s0) -/* BAE118 802407D8 00021400 */ sll $v0, $v0, 0x10 -/* BAE11C 802407DC 1C400019 */ bgtz $v0, .L80240844 -/* BAE120 802407E0 00000000 */ nop -.L802407E4: -/* BAE124 802407E4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BAE128 802407E8 24020002 */ addiu $v0, $zero, 2 -/* BAE12C 802407EC 0C00A67F */ jal rand_int -/* BAE130 802407F0 AE620070 */ sw $v0, 0x70($s3) -/* BAE134 802407F4 3C035555 */ lui $v1, 0x5555 -/* BAE138 802407F8 34635556 */ ori $v1, $v1, 0x5556 -/* BAE13C 802407FC 00430018 */ mult $v0, $v1 -/* BAE140 80240800 000227C3 */ sra $a0, $v0, 0x1f -/* BAE144 80240804 00004010 */ mfhi $t0 -/* BAE148 80240808 01042023 */ subu $a0, $t0, $a0 -/* BAE14C 8024080C 00041840 */ sll $v1, $a0, 1 -/* BAE150 80240810 00641821 */ addu $v1, $v1, $a0 -/* BAE154 80240814 00431023 */ subu $v0, $v0, $v1 -/* BAE158 80240818 24430002 */ addiu $v1, $v0, 2 -/* BAE15C 8024081C AE630074 */ sw $v1, 0x74($s3) -/* BAE160 80240820 8E42002C */ lw $v0, 0x2c($s2) -/* BAE164 80240824 58400007 */ blezl $v0, .L80240844 -/* BAE168 80240828 AE600070 */ sw $zero, 0x70($s3) -/* BAE16C 8024082C 8E420008 */ lw $v0, 8($s2) -/* BAE170 80240830 18400003 */ blez $v0, .L80240840 -/* BAE174 80240834 28620003 */ slti $v0, $v1, 3 -/* BAE178 80240838 10400002 */ beqz $v0, .L80240844 -/* BAE17C 8024083C 00000000 */ nop -.L80240840: -/* BAE180 80240840 AE600070 */ sw $zero, 0x70($s3) -.L80240844: -/* BAE184 80240844 8FBF0058 */ lw $ra, 0x58($sp) -/* BAE188 80240848 8FB50054 */ lw $s5, 0x54($sp) -/* BAE18C 8024084C 8FB40050 */ lw $s4, 0x50($sp) -/* BAE190 80240850 8FB3004C */ lw $s3, 0x4c($sp) -/* BAE194 80240854 8FB20048 */ lw $s2, 0x48($sp) -/* BAE198 80240858 8FB10044 */ lw $s1, 0x44($sp) -/* BAE19C 8024085C 8FB00040 */ lw $s0, 0x40($sp) -/* BAE1A0 80240860 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* BAE1A4 80240864 D7B80070 */ ldc1 $f24, 0x70($sp) -/* BAE1A8 80240868 D7B60068 */ ldc1 $f22, 0x68($sp) -/* BAE1AC 8024086C D7B40060 */ ldc1 $f20, 0x60($sp) -/* BAE1B0 80240870 03E00008 */ jr $ra -/* BAE1B4 80240874 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s index e0514a13ac..c87f011e79 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s @@ -86,7 +86,7 @@ glabel func_802413AC_BAECEC .L802414C8_BAEE08: /* BAEE08 802414C8 0280202D */ daddu $a0, $s4, $zero /* BAEE0C 802414CC 0200282D */ daddu $a1, $s0, $zero -/* BAEE10 802414D0 0C090094 */ jal func_80240250_BADB90 +/* BAEE10 802414D0 0C090094 */ jal mim_08_UnkNpcAIFunc35 /* BAEE14 802414D4 0260302D */ daddu $a2, $s3, $zero /* BAEE18 802414D8 0809055D */ j .L80241574 /* BAEE1C 802414DC 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802400A0_BB2EA0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802400A0_BB2EA0.s deleted file mode 100644 index 2c51b74b3c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802400A0_BB2EA0.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400A0_BB2EA0 -/* BB2EA0 802400A0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BB2EA4 802400A4 AFB00030 */ sw $s0, 0x30($sp) -/* BB2EA8 802400A8 0080802D */ daddu $s0, $a0, $zero -/* BB2EAC 802400AC AFBF0040 */ sw $ra, 0x40($sp) -/* BB2EB0 802400B0 AFB3003C */ sw $s3, 0x3c($sp) -/* BB2EB4 802400B4 AFB20038 */ sw $s2, 0x38($sp) -/* BB2EB8 802400B8 AFB10034 */ sw $s1, 0x34($sp) -/* BB2EBC 802400BC F7B60050 */ sdc1 $f22, 0x50($sp) -/* BB2EC0 802400C0 F7B40048 */ sdc1 $f20, 0x48($sp) -/* BB2EC4 802400C4 8E130148 */ lw $s3, 0x148($s0) -/* BB2EC8 802400C8 00A0882D */ daddu $s1, $a1, $zero -/* BB2ECC 802400CC 86640008 */ lh $a0, 8($s3) -/* BB2ED0 802400D0 0C00EABB */ jal get_npc_unsafe -/* BB2ED4 802400D4 00C0902D */ daddu $s2, $a2, $zero -/* BB2ED8 802400D8 0200202D */ daddu $a0, $s0, $zero -/* BB2EDC 802400DC 0220282D */ daddu $a1, $s1, $zero -/* BB2EE0 802400E0 0240302D */ daddu $a2, $s2, $zero -/* BB2EE4 802400E4 0C012568 */ jal func_800495A0 -/* BB2EE8 802400E8 0040802D */ daddu $s0, $v0, $zero -/* BB2EEC 802400EC 8E020000 */ lw $v0, ($s0) -/* BB2EF0 802400F0 2404002D */ addiu $a0, $zero, 0x2d -/* BB2EF4 802400F4 34420800 */ ori $v0, $v0, 0x800 -/* BB2EF8 802400F8 0C00A67F */ jal rand_int -/* BB2EFC 802400FC AE020000 */ sw $v0, ($s0) -/* BB2F00 80240100 0200202D */ daddu $a0, $s0, $zero -/* BB2F04 80240104 3C05B000 */ lui $a1, 0xb000 -/* BB2F08 80240108 34A50017 */ ori $a1, $a1, 0x17 -/* BB2F0C 8024010C 44820000 */ mtc1 $v0, $f0 -/* BB2F10 80240110 00000000 */ nop -/* BB2F14 80240114 46800021 */ cvt.d.w $f0, $f0 -/* BB2F18 80240118 3C014024 */ lui $at, 0x4024 -/* BB2F1C 8024011C 44811800 */ mtc1 $at, $f3 -/* BB2F20 80240120 44801000 */ mtc1 $zero, $f2 -/* BB2F24 80240124 3C014020 */ lui $at, 0x4020 -/* BB2F28 80240128 44812800 */ mtc1 $at, $f5 -/* BB2F2C 8024012C 44802000 */ mtc1 $zero, $f4 -/* BB2F30 80240130 46220003 */ div.d $f0, $f0, $f2 -/* BB2F34 80240134 46240000 */ add.d $f0, $f0, $f4 -/* BB2F38 80240138 3C013FC0 */ lui $at, 0x3fc0 -/* BB2F3C 8024013C 44811000 */ mtc1 $at, $f2 -/* BB2F40 80240140 0000302D */ daddu $a2, $zero, $zero -/* BB2F44 80240144 E6020014 */ swc1 $f2, 0x14($s0) -/* BB2F48 80240148 46200020 */ cvt.s.d $f0, $f0 -/* BB2F4C 8024014C 0C012530 */ jal ai_enemy_play_sound -/* BB2F50 80240150 E600001C */ swc1 $f0, 0x1c($s0) -/* BB2F54 80240154 8E6300D0 */ lw $v1, 0xd0($s3) -/* BB2F58 80240158 C6000040 */ lwc1 $f0, 0x40($s0) -/* BB2F5C 8024015C C4620000 */ lwc1 $f2, ($v1) -/* BB2F60 80240160 468010A0 */ cvt.s.w $f2, $f2 -/* BB2F64 80240164 C4640008 */ lwc1 $f4, 8($v1) -/* BB2F68 80240168 46802120 */ cvt.s.w $f4, $f4 -/* BB2F6C 8024016C E7A00010 */ swc1 $f0, 0x10($sp) -/* BB2F70 80240170 8E6200D0 */ lw $v0, 0xd0($s3) -/* BB2F74 80240174 44051000 */ mfc1 $a1, $f2 -/* BB2F78 80240178 C440000C */ lwc1 $f0, 0xc($v0) -/* BB2F7C 8024017C 46800020 */ cvt.s.w $f0, $f0 -/* BB2F80 80240180 E7A00014 */ swc1 $f0, 0x14($sp) -/* BB2F84 80240184 8E6200D0 */ lw $v0, 0xd0($s3) -/* BB2F88 80240188 44062000 */ mfc1 $a2, $f4 -/* BB2F8C 8024018C C4400010 */ lwc1 $f0, 0x10($v0) -/* BB2F90 80240190 46800020 */ cvt.s.w $f0, $f0 -/* BB2F94 80240194 E7A00018 */ swc1 $f0, 0x18($sp) -/* BB2F98 80240198 8C640018 */ lw $a0, 0x18($v1) -/* BB2F9C 8024019C 0C0123F5 */ jal is_point_within_region -/* BB2FA0 802401A0 8E070038 */ lw $a3, 0x38($s0) -/* BB2FA4 802401A4 10400035 */ beqz $v0, .L8024027C -/* BB2FA8 802401A8 00000000 */ nop -/* BB2FAC 802401AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* BB2FB0 802401B0 3C0141C8 */ lui $at, 0x41c8 -/* BB2FB4 802401B4 4481B000 */ mtc1 $at, $f22 -/* BB2FB8 802401B8 8E6200D0 */ lw $v0, 0xd0($s3) -/* BB2FBC 802401BC C60E0040 */ lwc1 $f14, 0x40($s0) -/* BB2FC0 802401C0 C4480000 */ lwc1 $f8, ($v0) -/* BB2FC4 802401C4 46804220 */ cvt.s.w $f8, $f8 -/* BB2FC8 802401C8 44064000 */ mfc1 $a2, $f8 -/* BB2FCC 802401CC C4480008 */ lwc1 $f8, 8($v0) -/* BB2FD0 802401D0 46804220 */ cvt.s.w $f8, $f8 -/* BB2FD4 802401D4 44074000 */ mfc1 $a3, $f8 -/* BB2FD8 802401D8 3C01403E */ lui $at, 0x403e -/* BB2FDC 802401DC 4481A800 */ mtc1 $at, $f21 -/* BB2FE0 802401E0 4480A000 */ mtc1 $zero, $f20 -/* BB2FE4 802401E4 0C00A720 */ jal atan2 -/* BB2FE8 802401E8 0000882D */ daddu $s1, $zero, $zero -/* BB2FEC 802401EC C6020038 */ lwc1 $f2, 0x38($s0) -/* BB2FF0 802401F0 C604003C */ lwc1 $f4, 0x3c($s0) -/* BB2FF4 802401F4 C6060040 */ lwc1 $f6, 0x40($s0) -/* BB2FF8 802401F8 E600000C */ swc1 $f0, 0xc($s0) -/* BB2FFC 802401FC E7A20020 */ swc1 $f2, 0x20($sp) -/* BB3000 80240200 E7A40024 */ swc1 $f4, 0x24($sp) -/* BB3004 80240204 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240208: -/* BB3008 80240208 E7B60010 */ swc1 $f22, 0x10($sp) -/* BB300C 8024020C C600000C */ lwc1 $f0, 0xc($s0) -/* BB3010 80240210 E7A00014 */ swc1 $f0, 0x14($sp) -/* BB3014 80240214 860200A8 */ lh $v0, 0xa8($s0) -/* BB3018 80240218 27A50020 */ addiu $a1, $sp, 0x20 -/* BB301C 8024021C 44820000 */ mtc1 $v0, $f0 -/* BB3020 80240220 00000000 */ nop -/* BB3024 80240224 46800020 */ cvt.s.w $f0, $f0 -/* BB3028 80240228 E7A00018 */ swc1 $f0, 0x18($sp) -/* BB302C 8024022C 860200A6 */ lh $v0, 0xa6($s0) -/* BB3030 80240230 27A60024 */ addiu $a2, $sp, 0x24 -/* BB3034 80240234 44820000 */ mtc1 $v0, $f0 -/* BB3038 80240238 00000000 */ nop -/* BB303C 8024023C 46800020 */ cvt.s.w $f0, $f0 -/* BB3040 80240240 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BB3044 80240244 8E040080 */ lw $a0, 0x80($s0) -/* BB3048 80240248 0C037711 */ jal npc_test_move_simple_with_slipping -/* BB304C 8024024C 27A70028 */ addiu $a3, $sp, 0x28 -/* BB3050 80240250 10400016 */ beqz $v0, .L802402AC -/* BB3054 80240254 26310001 */ addiu $s1, $s1, 1 -/* BB3058 80240258 C600000C */ lwc1 $f0, 0xc($s0) -/* BB305C 8024025C 46000021 */ cvt.d.s $f0, $f0 -/* BB3060 80240260 46340000 */ add.d $f0, $f0, $f20 -/* BB3064 80240264 2A220006 */ slti $v0, $s1, 6 -/* BB3068 80240268 46200020 */ cvt.s.d $f0, $f0 -/* BB306C 8024026C 1440FFE6 */ bnez $v0, .L80240208 -/* BB3070 80240270 E600000C */ swc1 $f0, 0xc($s0) -/* BB3074 80240274 080900AB */ j .L802402AC -/* BB3078 80240278 00000000 */ nop -.L8024027C: -/* BB307C 8024027C 0C00A67F */ jal rand_int -/* BB3080 80240280 2404003C */ addiu $a0, $zero, 0x3c -/* BB3084 80240284 C60C000C */ lwc1 $f12, 0xc($s0) -/* BB3088 80240288 44820000 */ mtc1 $v0, $f0 -/* BB308C 8024028C 00000000 */ nop -/* BB3090 80240290 46800020 */ cvt.s.w $f0, $f0 -/* BB3094 80240294 46006300 */ add.s $f12, $f12, $f0 -/* BB3098 80240298 3C0141F0 */ lui $at, 0x41f0 -/* BB309C 8024029C 44810000 */ mtc1 $at, $f0 -/* BB30A0 802402A0 0C00A6C9 */ jal clamp_angle -/* BB30A4 802402A4 46006301 */ sub.s $f12, $f12, $f0 -/* BB30A8 802402A8 E600000C */ swc1 $f0, 0xc($s0) -.L802402AC: -/* BB30AC 802402AC 8FBF0040 */ lw $ra, 0x40($sp) -/* BB30B0 802402B0 8FB3003C */ lw $s3, 0x3c($sp) -/* BB30B4 802402B4 8FB20038 */ lw $s2, 0x38($sp) -/* BB30B8 802402B8 8FB10034 */ lw $s1, 0x34($sp) -/* BB30BC 802402BC 8FB00030 */ lw $s0, 0x30($sp) -/* BB30C0 802402C0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* BB30C4 802402C4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* BB30C8 802402C8 03E00008 */ jr $ra -/* BB30CC 802402CC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s b/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s index 0b2a4d2828..72c45c9e22 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s @@ -103,7 +103,7 @@ glabel func_80240C90_BB3A90 .L80240DF4_BB3BF4: /* BB3BF4 80240DF4 0260202D */ daddu $a0, $s3, $zero /* BB3BF8 80240DF8 0280282D */ daddu $a1, $s4, $zero -/* BB3BFC 80240DFC 0C090028 */ jal func_802400A0_BB2EA0 +/* BB3BFC 80240DFC 0C090028 */ jal mim_09_UnkNpcAIFunc36 /* BB3C00 80240E00 0200302D */ daddu $a2, $s0, $zero .L80240E04_BB3C04: /* BB3C04 80240E04 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240000_9EB7F0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240000_9EB7F0.s deleted file mode 100644 index 4ba1afa466..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240000_9EB7F0.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9EB7F0 -/* 9EB7F0 80240000 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9EB7F4 80240004 AFB00030 */ sw $s0, 0x30($sp) -/* 9EB7F8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 9EB7FC 8024000C AFBF0040 */ sw $ra, 0x40($sp) -/* 9EB800 80240010 AFB3003C */ sw $s3, 0x3c($sp) -/* 9EB804 80240014 AFB20038 */ sw $s2, 0x38($sp) -/* 9EB808 80240018 AFB10034 */ sw $s1, 0x34($sp) -/* 9EB80C 8024001C F7B60050 */ sdc1 $f22, 0x50($sp) -/* 9EB810 80240020 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 9EB814 80240024 8E130148 */ lw $s3, 0x148($s0) -/* 9EB818 80240028 00A0882D */ daddu $s1, $a1, $zero -/* 9EB81C 8024002C 86640008 */ lh $a0, 8($s3) -/* 9EB820 80240030 0C00EABB */ jal get_npc_unsafe -/* 9EB824 80240034 00C0902D */ daddu $s2, $a2, $zero -/* 9EB828 80240038 0200202D */ daddu $a0, $s0, $zero -/* 9EB82C 8024003C 0220282D */ daddu $a1, $s1, $zero -/* 9EB830 80240040 0240302D */ daddu $a2, $s2, $zero -/* 9EB834 80240044 0C012568 */ jal func_800495A0 -/* 9EB838 80240048 0040802D */ daddu $s0, $v0, $zero -/* 9EB83C 8024004C 8E020000 */ lw $v0, ($s0) -/* 9EB840 80240050 2404002D */ addiu $a0, $zero, 0x2d -/* 9EB844 80240054 34420800 */ ori $v0, $v0, 0x800 -/* 9EB848 80240058 0C00A67F */ jal rand_int -/* 9EB84C 8024005C AE020000 */ sw $v0, ($s0) -/* 9EB850 80240060 0200202D */ daddu $a0, $s0, $zero -/* 9EB854 80240064 3C05B000 */ lui $a1, 0xb000 -/* 9EB858 80240068 34A50017 */ ori $a1, $a1, 0x17 -/* 9EB85C 8024006C 44820000 */ mtc1 $v0, $f0 -/* 9EB860 80240070 00000000 */ nop -/* 9EB864 80240074 46800021 */ cvt.d.w $f0, $f0 -/* 9EB868 80240078 3C014024 */ lui $at, 0x4024 -/* 9EB86C 8024007C 44811800 */ mtc1 $at, $f3 -/* 9EB870 80240080 44801000 */ mtc1 $zero, $f2 -/* 9EB874 80240084 3C014020 */ lui $at, 0x4020 -/* 9EB878 80240088 44812800 */ mtc1 $at, $f5 -/* 9EB87C 8024008C 44802000 */ mtc1 $zero, $f4 -/* 9EB880 80240090 46220003 */ div.d $f0, $f0, $f2 -/* 9EB884 80240094 46240000 */ add.d $f0, $f0, $f4 -/* 9EB888 80240098 3C013FC0 */ lui $at, 0x3fc0 -/* 9EB88C 8024009C 44811000 */ mtc1 $at, $f2 -/* 9EB890 802400A0 0000302D */ daddu $a2, $zero, $zero -/* 9EB894 802400A4 E6020014 */ swc1 $f2, 0x14($s0) -/* 9EB898 802400A8 46200020 */ cvt.s.d $f0, $f0 -/* 9EB89C 802400AC 0C012530 */ jal ai_enemy_play_sound -/* 9EB8A0 802400B0 E600001C */ swc1 $f0, 0x1c($s0) -/* 9EB8A4 802400B4 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9EB8A8 802400B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9EB8AC 802400BC C4620000 */ lwc1 $f2, ($v1) -/* 9EB8B0 802400C0 468010A0 */ cvt.s.w $f2, $f2 -/* 9EB8B4 802400C4 C4640008 */ lwc1 $f4, 8($v1) -/* 9EB8B8 802400C8 46802120 */ cvt.s.w $f4, $f4 -/* 9EB8BC 802400CC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9EB8C0 802400D0 8E6200D0 */ lw $v0, 0xd0($s3) -/* 9EB8C4 802400D4 44051000 */ mfc1 $a1, $f2 -/* 9EB8C8 802400D8 C440000C */ lwc1 $f0, 0xc($v0) -/* 9EB8CC 802400DC 46800020 */ cvt.s.w $f0, $f0 -/* 9EB8D0 802400E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9EB8D4 802400E4 8E6200D0 */ lw $v0, 0xd0($s3) -/* 9EB8D8 802400E8 44062000 */ mfc1 $a2, $f4 -/* 9EB8DC 802400EC C4400010 */ lwc1 $f0, 0x10($v0) -/* 9EB8E0 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* 9EB8E4 802400F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9EB8E8 802400F8 8C640018 */ lw $a0, 0x18($v1) -/* 9EB8EC 802400FC 0C0123F5 */ jal is_point_within_region -/* 9EB8F0 80240100 8E070038 */ lw $a3, 0x38($s0) -/* 9EB8F4 80240104 10400035 */ beqz $v0, .L802401DC -/* 9EB8F8 80240108 00000000 */ nop -/* 9EB8FC 8024010C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9EB900 80240110 3C0141C8 */ lui $at, 0x41c8 -/* 9EB904 80240114 4481B000 */ mtc1 $at, $f22 -/* 9EB908 80240118 8E6200D0 */ lw $v0, 0xd0($s3) -/* 9EB90C 8024011C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9EB910 80240120 C4480000 */ lwc1 $f8, ($v0) -/* 9EB914 80240124 46804220 */ cvt.s.w $f8, $f8 -/* 9EB918 80240128 44064000 */ mfc1 $a2, $f8 -/* 9EB91C 8024012C C4480008 */ lwc1 $f8, 8($v0) -/* 9EB920 80240130 46804220 */ cvt.s.w $f8, $f8 -/* 9EB924 80240134 44074000 */ mfc1 $a3, $f8 -/* 9EB928 80240138 3C01403E */ lui $at, 0x403e -/* 9EB92C 8024013C 4481A800 */ mtc1 $at, $f21 -/* 9EB930 80240140 4480A000 */ mtc1 $zero, $f20 -/* 9EB934 80240144 0C00A720 */ jal atan2 -/* 9EB938 80240148 0000882D */ daddu $s1, $zero, $zero -/* 9EB93C 8024014C C6020038 */ lwc1 $f2, 0x38($s0) -/* 9EB940 80240150 C604003C */ lwc1 $f4, 0x3c($s0) -/* 9EB944 80240154 C6060040 */ lwc1 $f6, 0x40($s0) -/* 9EB948 80240158 E600000C */ swc1 $f0, 0xc($s0) -/* 9EB94C 8024015C E7A20020 */ swc1 $f2, 0x20($sp) -/* 9EB950 80240160 E7A40024 */ swc1 $f4, 0x24($sp) -/* 9EB954 80240164 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240168: -/* 9EB958 80240168 E7B60010 */ swc1 $f22, 0x10($sp) -/* 9EB95C 8024016C C600000C */ lwc1 $f0, 0xc($s0) -/* 9EB960 80240170 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9EB964 80240174 860200A8 */ lh $v0, 0xa8($s0) -/* 9EB968 80240178 27A50020 */ addiu $a1, $sp, 0x20 -/* 9EB96C 8024017C 44820000 */ mtc1 $v0, $f0 -/* 9EB970 80240180 00000000 */ nop -/* 9EB974 80240184 46800020 */ cvt.s.w $f0, $f0 -/* 9EB978 80240188 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9EB97C 8024018C 860200A6 */ lh $v0, 0xa6($s0) -/* 9EB980 80240190 27A60024 */ addiu $a2, $sp, 0x24 -/* 9EB984 80240194 44820000 */ mtc1 $v0, $f0 -/* 9EB988 80240198 00000000 */ nop -/* 9EB98C 8024019C 46800020 */ cvt.s.w $f0, $f0 -/* 9EB990 802401A0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9EB994 802401A4 8E040080 */ lw $a0, 0x80($s0) -/* 9EB998 802401A8 0C037711 */ jal npc_test_move_simple_with_slipping -/* 9EB99C 802401AC 27A70028 */ addiu $a3, $sp, 0x28 -/* 9EB9A0 802401B0 10400016 */ beqz $v0, .L8024020C -/* 9EB9A4 802401B4 26310001 */ addiu $s1, $s1, 1 -/* 9EB9A8 802401B8 C600000C */ lwc1 $f0, 0xc($s0) -/* 9EB9AC 802401BC 46000021 */ cvt.d.s $f0, $f0 -/* 9EB9B0 802401C0 46340000 */ add.d $f0, $f0, $f20 -/* 9EB9B4 802401C4 2A220006 */ slti $v0, $s1, 6 -/* 9EB9B8 802401C8 46200020 */ cvt.s.d $f0, $f0 -/* 9EB9BC 802401CC 1440FFE6 */ bnez $v0, .L80240168 -/* 9EB9C0 802401D0 E600000C */ swc1 $f0, 0xc($s0) -/* 9EB9C4 802401D4 08090083 */ j .L8024020C -/* 9EB9C8 802401D8 00000000 */ nop -.L802401DC: -/* 9EB9CC 802401DC 0C00A67F */ jal rand_int -/* 9EB9D0 802401E0 2404003C */ addiu $a0, $zero, 0x3c -/* 9EB9D4 802401E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9EB9D8 802401E8 44820000 */ mtc1 $v0, $f0 -/* 9EB9DC 802401EC 00000000 */ nop -/* 9EB9E0 802401F0 46800020 */ cvt.s.w $f0, $f0 -/* 9EB9E4 802401F4 46006300 */ add.s $f12, $f12, $f0 -/* 9EB9E8 802401F8 3C0141F0 */ lui $at, 0x41f0 -/* 9EB9EC 802401FC 44810000 */ mtc1 $at, $f0 -/* 9EB9F0 80240200 0C00A6C9 */ jal clamp_angle -/* 9EB9F4 80240204 46006301 */ sub.s $f12, $f12, $f0 -/* 9EB9F8 80240208 E600000C */ swc1 $f0, 0xc($s0) -.L8024020C: -/* 9EB9FC 8024020C 8FBF0040 */ lw $ra, 0x40($sp) -/* 9EBA00 80240210 8FB3003C */ lw $s3, 0x3c($sp) -/* 9EBA04 80240214 8FB20038 */ lw $s2, 0x38($sp) -/* 9EBA08 80240218 8FB10034 */ lw $s1, 0x34($sp) -/* 9EBA0C 8024021C 8FB00030 */ lw $s0, 0x30($sp) -/* 9EBA10 80240220 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 9EBA14 80240224 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 9EBA18 80240228 03E00008 */ jr $ra -/* 9EBA1C 8024022C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s index d6cbc46e59..1a2f68b1aa 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s @@ -103,7 +103,7 @@ glabel func_80240BF0_9EC3E0 .L80240D54_9EC544: /* 9EC544 80240D54 0260202D */ daddu $a0, $s3, $zero /* 9EC548 80240D58 0280282D */ daddu $a1, $s4, $zero -/* 9EC54C 80240D5C 0C090000 */ jal func_80240000_9EB7F0 +/* 9EC54C 80240D5C 0C090000 */ jal nok_03_UnkNpcAIFunc36 /* 9EC550 80240D60 0200302D */ daddu $a2, $s0, $zero .L80240D64_9EC554: /* 9EC554 80240D64 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240984_9F53C4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240984_9F53C4.s deleted file mode 100644 index bae094b599..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240984_9F53C4.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245D58_9FA798 -.double 0.09 - -dlabel D_80245D60_9FA7A0 -.double 0.09 - -.section .text - -glabel func_80240984_9F53C4 -/* 9F53C4 80240984 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 9F53C8 80240988 AFB3004C */ sw $s3, 0x4c($sp) -/* 9F53CC 8024098C 0080982D */ daddu $s3, $a0, $zero -/* 9F53D0 80240990 AFBF0058 */ sw $ra, 0x58($sp) -/* 9F53D4 80240994 AFB50054 */ sw $s5, 0x54($sp) -/* 9F53D8 80240998 AFB40050 */ sw $s4, 0x50($sp) -/* 9F53DC 8024099C AFB20048 */ sw $s2, 0x48($sp) -/* 9F53E0 802409A0 AFB10044 */ sw $s1, 0x44($sp) -/* 9F53E4 802409A4 AFB00040 */ sw $s0, 0x40($sp) -/* 9F53E8 802409A8 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 9F53EC 802409AC F7B80070 */ sdc1 $f24, 0x70($sp) -/* 9F53F0 802409B0 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 9F53F4 802409B4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 9F53F8 802409B8 8E710148 */ lw $s1, 0x148($s3) -/* 9F53FC 802409BC 00A0902D */ daddu $s2, $a1, $zero -/* 9F5400 802409C0 86240008 */ lh $a0, 8($s1) -/* 9F5404 802409C4 0C00EABB */ jal get_npc_unsafe -/* 9F5408 802409C8 00C0A82D */ daddu $s5, $a2, $zero -/* 9F540C 802409CC 0040802D */ daddu $s0, $v0, $zero -/* 9F5410 802409D0 0000A02D */ daddu $s4, $zero, $zero -/* 9F5414 802409D4 C624007C */ lwc1 $f4, 0x7c($s1) -/* 9F5418 802409D8 46802120 */ cvt.s.w $f4, $f4 -/* 9F541C 802409DC C6220088 */ lwc1 $f2, 0x88($s1) -/* 9F5420 802409E0 468010A0 */ cvt.s.w $f2, $f2 -/* 9F5424 802409E4 460010A1 */ cvt.d.s $f2, $f2 -/* 9F5428 802409E8 46002121 */ cvt.d.s $f4, $f4 -/* 9F542C 802409EC C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F5430 802409F0 3C014059 */ lui $at, 0x4059 -/* 9F5434 802409F4 44813800 */ mtc1 $at, $f7 -/* 9F5438 802409F8 44803000 */ mtc1 $zero, $f6 -/* 9F543C 802409FC 46000021 */ cvt.d.s $f0, $f0 -/* 9F5440 80240A00 46260002 */ mul.d $f0, $f0, $f6 -/* 9F5444 80240A04 00000000 */ nop -/* 9F5448 80240A08 24020001 */ addiu $v0, $zero, 1 -/* 9F544C 80240A0C 8E24006C */ lw $a0, 0x6c($s1) -/* 9F5450 80240A10 46261083 */ div.d $f2, $f2, $f6 -/* 9F5454 80240A14 462010A0 */ cvt.s.d $f2, $f2 -/* 9F5458 80240A18 46262103 */ div.d $f4, $f4, $f6 -/* 9F545C 80240A1C 46202520 */ cvt.s.d $f20, $f4 -/* 9F5460 80240A20 30830011 */ andi $v1, $a0, 0x11 -/* 9F5464 80240A24 4620020D */ trunc.w.d $f8, $f0 -/* 9F5468 80240A28 E628007C */ swc1 $f8, 0x7c($s1) -/* 9F546C 80240A2C C6200078 */ lwc1 $f0, 0x78($s1) -/* 9F5470 80240A30 46800020 */ cvt.s.w $f0, $f0 -/* 9F5474 80240A34 46000021 */ cvt.d.s $f0, $f0 -/* 9F5478 80240A38 46260003 */ div.d $f0, $f0, $f6 -/* 9F547C 80240A3C 462006A0 */ cvt.s.d $f26, $f0 -/* 9F5480 80240A40 C6200070 */ lwc1 $f0, 0x70($s1) -/* 9F5484 80240A44 46800020 */ cvt.s.w $f0, $f0 -/* 9F5488 80240A48 46000021 */ cvt.d.s $f0, $f0 -/* 9F548C 80240A4C 46260003 */ div.d $f0, $f0, $f6 -/* 9F5490 80240A50 462005A0 */ cvt.s.d $f22, $f0 -/* 9F5494 80240A54 14620025 */ bne $v1, $v0, .L80240AEC -/* 9F5498 80240A58 4602D600 */ add.s $f24, $f26, $f2 -/* 9F549C 80240A5C 8E020000 */ lw $v0, ($s0) -/* 9F54A0 80240A60 30420008 */ andi $v0, $v0, 8 -/* 9F54A4 80240A64 10400009 */ beqz $v0, .L80240A8C -/* 9F54A8 80240A68 27A50028 */ addiu $a1, $sp, 0x28 -/* 9F54AC 80240A6C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F54B0 80240A70 4600C001 */ sub.s $f0, $f24, $f0 -/* 9F54B4 80240A74 4600B03C */ c.lt.s $f22, $f0 -/* 9F54B8 80240A78 00000000 */ nop -/* 9F54BC 80240A7C 4500001B */ bc1f .L80240AEC -/* 9F54C0 80240A80 34820010 */ ori $v0, $a0, 0x10 -/* 9F54C4 80240A84 080902BB */ j .L80240AEC -/* 9F54C8 80240A88 AE22006C */ sw $v0, 0x6c($s1) -.L80240A8C: -/* 9F54CC 80240A8C 27A6002C */ addiu $a2, $sp, 0x2c -/* 9F54D0 80240A90 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F54D4 80240A94 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F54D8 80240A98 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9F54DC 80240A9C 3C01447A */ lui $at, 0x447a -/* 9F54E0 80240AA0 44813000 */ mtc1 $at, $f6 -/* 9F54E4 80240AA4 27A20034 */ addiu $v0, $sp, 0x34 -/* 9F54E8 80240AA8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9F54EC 80240AAC E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9F54F0 80240AB0 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9F54F4 80240AB4 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9F54F8 80240AB8 AFA20010 */ sw $v0, 0x10($sp) -/* 9F54FC 80240ABC 8E040080 */ lw $a0, 0x80($s0) -/* 9F5500 80240AC0 0C0372DF */ jal npc_raycast_down_sides -/* 9F5504 80240AC4 27A70030 */ addiu $a3, $sp, 0x30 -/* 9F5508 80240AC8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 9F550C 80240ACC 4600D001 */ sub.s $f0, $f26, $f0 -/* 9F5510 80240AD0 4600B03C */ c.lt.s $f22, $f0 -/* 9F5514 80240AD4 00000000 */ nop -/* 9F5518 80240AD8 45000004 */ bc1f .L80240AEC -/* 9F551C 80240ADC 00000000 */ nop -/* 9F5520 80240AE0 8E22006C */ lw $v0, 0x6c($s1) -/* 9F5524 80240AE4 34420010 */ ori $v0, $v0, 0x10 -/* 9F5528 80240AE8 AE22006C */ sw $v0, 0x6c($s1) -.L80240AEC: -/* 9F552C 80240AEC 8E22006C */ lw $v0, 0x6c($s1) -/* 9F5530 80240AF0 24030011 */ addiu $v1, $zero, 0x11 -/* 9F5534 80240AF4 30420011 */ andi $v0, $v0, 0x11 -/* 9F5538 80240AF8 14430039 */ bne $v0, $v1, .L80240BE0 -/* 9F553C 80240AFC 00000000 */ nop -/* 9F5540 80240B00 8E020000 */ lw $v0, ($s0) -/* 9F5544 80240B04 30420008 */ andi $v0, $v0, 8 -/* 9F5548 80240B08 1040000A */ beqz $v0, .L80240B34 -/* 9F554C 80240B0C 4600C106 */ mov.s $f4, $f24 -/* 9F5550 80240B10 4614C081 */ sub.s $f2, $f24, $f20 -/* 9F5554 80240B14 3C018024 */ lui $at, %hi(D_80245D58_9FA798) -/* 9F5558 80240B18 D4205D58 */ ldc1 $f0, %lo(D_80245D58_9FA798)($at) -/* 9F555C 80240B1C 460010A1 */ cvt.d.s $f2, $f2 -/* 9F5560 80240B20 46201082 */ mul.d $f2, $f2, $f0 -/* 9F5564 80240B24 00000000 */ nop -/* 9F5568 80240B28 4600A021 */ cvt.d.s $f0, $f20 -/* 9F556C 80240B2C 080902E6 */ j .L80240B98 -/* 9F5570 80240B30 46220000 */ add.d $f0, $f0, $f2 -.L80240B34: -/* 9F5574 80240B34 27A50028 */ addiu $a1, $sp, 0x28 -/* 9F5578 80240B38 27A6002C */ addiu $a2, $sp, 0x2c -/* 9F557C 80240B3C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F5580 80240B40 C6020040 */ lwc1 $f2, 0x40($s0) -/* 9F5584 80240B44 3C01447A */ lui $at, 0x447a -/* 9F5588 80240B48 44812000 */ mtc1 $at, $f4 -/* 9F558C 80240B4C 27A20034 */ addiu $v0, $sp, 0x34 -/* 9F5590 80240B50 E7B4002C */ swc1 $f20, 0x2c($sp) -/* 9F5594 80240B54 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9F5598 80240B58 E7A20030 */ swc1 $f2, 0x30($sp) -/* 9F559C 80240B5C E7A40034 */ swc1 $f4, 0x34($sp) -/* 9F55A0 80240B60 AFA20010 */ sw $v0, 0x10($sp) -/* 9F55A4 80240B64 8E040080 */ lw $a0, 0x80($s0) -/* 9F55A8 80240B68 0C0372DF */ jal npc_raycast_down_sides -/* 9F55AC 80240B6C 27A70030 */ addiu $a3, $sp, 0x30 -/* 9F55B0 80240B70 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 9F55B4 80240B74 461A2100 */ add.s $f4, $f4, $f26 -/* 9F55B8 80240B78 46142081 */ sub.s $f2, $f4, $f20 -/* 9F55BC 80240B7C 3C018024 */ lui $at, %hi(D_80245D60_9FA7A0) -/* 9F55C0 80240B80 D4205D60 */ ldc1 $f0, %lo(D_80245D60_9FA7A0)($at) -/* 9F55C4 80240B84 460010A1 */ cvt.d.s $f2, $f2 -/* 9F55C8 80240B88 46201082 */ mul.d $f2, $f2, $f0 -/* 9F55CC 80240B8C 00000000 */ nop -/* 9F55D0 80240B90 4600A021 */ cvt.d.s $f0, $f20 -/* 9F55D4 80240B94 46220000 */ add.d $f0, $f0, $f2 -.L80240B98: -/* 9F55D8 80240B98 46200020 */ cvt.s.d $f0, $f0 -/* 9F55DC 80240B9C E600003C */ swc1 $f0, 0x3c($s0) -/* 9F55E0 80240BA0 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F55E4 80240BA4 46002001 */ sub.s $f0, $f4, $f0 -/* 9F55E8 80240BA8 3C013FF0 */ lui $at, 0x3ff0 -/* 9F55EC 80240BAC 44811800 */ mtc1 $at, $f3 -/* 9F55F0 80240BB0 44801000 */ mtc1 $zero, $f2 -/* 9F55F4 80240BB4 46000005 */ abs.s $f0, $f0 -/* 9F55F8 80240BB8 46000021 */ cvt.d.s $f0, $f0 -/* 9F55FC 80240BBC 4622003C */ c.lt.d $f0, $f2 -/* 9F5600 80240BC0 00000000 */ nop -/* 9F5604 80240BC4 45000036 */ bc1f .L80240CA0 -/* 9F5608 80240BC8 2403FFEF */ addiu $v1, $zero, -0x11 -/* 9F560C 80240BCC E604003C */ swc1 $f4, 0x3c($s0) -/* 9F5610 80240BD0 8E22006C */ lw $v0, 0x6c($s1) -/* 9F5614 80240BD4 00431024 */ and $v0, $v0, $v1 -/* 9F5618 80240BD8 08090328 */ j .L80240CA0 -/* 9F561C 80240BDC AE22006C */ sw $v0, 0x6c($s1) -.L80240BE0: -/* 9F5620 80240BE0 8E220070 */ lw $v0, 0x70($s1) -/* 9F5624 80240BE4 1840002E */ blez $v0, .L80240CA0 -/* 9F5628 80240BE8 00000000 */ nop -/* 9F562C 80240BEC C62C0074 */ lwc1 $f12, 0x74($s1) -/* 9F5630 80240BF0 0C00A8BB */ jal sin_deg -/* 9F5634 80240BF4 46806320 */ cvt.s.w $f12, $f12 -/* 9F5638 80240BF8 8E020000 */ lw $v0, ($s0) -/* 9F563C 80240BFC 30420008 */ andi $v0, $v0, 8 -/* 9F5640 80240C00 10400003 */ beqz $v0, .L80240C10 -/* 9F5644 80240C04 46000506 */ mov.s $f20, $f0 -/* 9F5648 80240C08 08090314 */ j .L80240C50 -/* 9F564C 80240C0C 0000102D */ daddu $v0, $zero, $zero -.L80240C10: -/* 9F5650 80240C10 27A50028 */ addiu $a1, $sp, 0x28 -/* 9F5654 80240C14 27A6002C */ addiu $a2, $sp, 0x2c -/* 9F5658 80240C18 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F565C 80240C1C C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F5660 80240C20 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9F5664 80240C24 3C01447A */ lui $at, 0x447a -/* 9F5668 80240C28 44813000 */ mtc1 $at, $f6 -/* 9F566C 80240C2C 27A20034 */ addiu $v0, $sp, 0x34 -/* 9F5670 80240C30 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9F5674 80240C34 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9F5678 80240C38 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9F567C 80240C3C E7A60034 */ swc1 $f6, 0x34($sp) -/* 9F5680 80240C40 AFA20010 */ sw $v0, 0x10($sp) -/* 9F5684 80240C44 8E040080 */ lw $a0, 0x80($s0) -/* 9F5688 80240C48 0C0372DF */ jal npc_raycast_down_sides -/* 9F568C 80240C4C 27A70030 */ addiu $a3, $sp, 0x30 -.L80240C50: -/* 9F5690 80240C50 10400007 */ beqz $v0, .L80240C70 -/* 9F5694 80240C54 00000000 */ nop -/* 9F5698 80240C58 4616A082 */ mul.s $f2, $f20, $f22 -/* 9F569C 80240C5C 00000000 */ nop -/* 9F56A0 80240C60 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9F56A4 80240C64 461A0000 */ add.s $f0, $f0, $f26 -/* 9F56A8 80240C68 0809031F */ j .L80240C7C -/* 9F56AC 80240C6C 46020000 */ add.s $f0, $f0, $f2 -.L80240C70: -/* 9F56B0 80240C70 4616A002 */ mul.s $f0, $f20, $f22 -/* 9F56B4 80240C74 00000000 */ nop -/* 9F56B8 80240C78 4600C000 */ add.s $f0, $f24, $f0 -.L80240C7C: -/* 9F56BC 80240C7C E600003C */ swc1 $f0, 0x3c($s0) -/* 9F56C0 80240C80 8E220074 */ lw $v0, 0x74($s1) -/* 9F56C4 80240C84 2442000A */ addiu $v0, $v0, 0xa -/* 9F56C8 80240C88 44826000 */ mtc1 $v0, $f12 -/* 9F56CC 80240C8C 00000000 */ nop -/* 9F56D0 80240C90 0C00A6C9 */ jal clamp_angle -/* 9F56D4 80240C94 46806320 */ cvt.s.w $f12, $f12 -/* 9F56D8 80240C98 4600020D */ trunc.w.s $f8, $f0 -/* 9F56DC 80240C9C E6280074 */ swc1 $f8, 0x74($s1) -.L80240CA0: -/* 9F56E0 80240CA0 8E220090 */ lw $v0, 0x90($s1) -/* 9F56E4 80240CA4 1C40004A */ bgtz $v0, .L80240DD0 -/* 9F56E8 80240CA8 2442FFFF */ addiu $v0, $v0, -1 -/* 9F56EC 80240CAC 8E430014 */ lw $v1, 0x14($s2) -/* 9F56F0 80240CB0 04600048 */ bltz $v1, .L80240DD4 -/* 9F56F4 80240CB4 00000000 */ nop -/* 9F56F8 80240CB8 8E620074 */ lw $v0, 0x74($s3) -/* 9F56FC 80240CBC 1C400042 */ bgtz $v0, .L80240DC8 -/* 9F5700 80240CC0 2442FFFF */ addiu $v0, $v0, -1 -/* 9F5704 80240CC4 AE630074 */ sw $v1, 0x74($s3) -/* 9F5708 80240CC8 860200A8 */ lh $v0, 0xa8($s0) -/* 9F570C 80240CCC C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F5710 80240CD0 44820000 */ mtc1 $v0, $f0 -/* 9F5714 80240CD4 00000000 */ nop -/* 9F5718 80240CD8 46800020 */ cvt.s.w $f0, $f0 -/* 9F571C 80240CDC 46001080 */ add.s $f2, $f2, $f0 -/* 9F5720 80240CE0 3C014024 */ lui $at, 0x4024 -/* 9F5724 80240CE4 44810800 */ mtc1 $at, $f1 -/* 9F5728 80240CE8 44800000 */ mtc1 $zero, $f0 -/* 9F572C 80240CEC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9F5730 80240CF0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9F5734 80240CF4 460010A1 */ cvt.d.s $f2, $f2 -/* 9F5738 80240CF8 46201080 */ add.d $f2, $f2, $f0 -/* 9F573C 80240CFC C440002C */ lwc1 $f0, 0x2c($v0) -/* 9F5740 80240D00 46000021 */ cvt.d.s $f0, $f0 -/* 9F5744 80240D04 4622003C */ c.lt.d $f0, $f2 -/* 9F5748 80240D08 00000000 */ nop -/* 9F574C 80240D0C 4500002C */ bc1f .L80240DC0 -/* 9F5750 80240D10 02A0202D */ daddu $a0, $s5, $zero -/* 9F5754 80240D14 AFA00010 */ sw $zero, 0x10($sp) -/* 9F5758 80240D18 8E46000C */ lw $a2, 0xc($s2) -/* 9F575C 80240D1C 8E470010 */ lw $a3, 0x10($s2) -/* 9F5760 80240D20 0C01242D */ jal func_800490B4 -/* 9F5764 80240D24 0220282D */ daddu $a1, $s1, $zero -/* 9F5768 80240D28 10400025 */ beqz $v0, .L80240DC0 -/* 9F576C 80240D2C 0000202D */ daddu $a0, $zero, $zero -/* 9F5770 80240D30 0200282D */ daddu $a1, $s0, $zero -/* 9F5774 80240D34 0000302D */ daddu $a2, $zero, $zero -/* 9F5778 80240D38 2412000C */ addiu $s2, $zero, 0xc -/* 9F577C 80240D3C 860300A8 */ lh $v1, 0xa8($s0) -/* 9F5780 80240D40 3C013F80 */ lui $at, 0x3f80 -/* 9F5784 80240D44 44810000 */ mtc1 $at, $f0 -/* 9F5788 80240D48 3C014000 */ lui $at, 0x4000 -/* 9F578C 80240D4C 44811000 */ mtc1 $at, $f2 -/* 9F5790 80240D50 3C01C1A0 */ lui $at, 0xc1a0 -/* 9F5794 80240D54 44812000 */ mtc1 $at, $f4 -/* 9F5798 80240D58 44834000 */ mtc1 $v1, $f8 -/* 9F579C 80240D5C 00000000 */ nop -/* 9F57A0 80240D60 46804220 */ cvt.s.w $f8, $f8 -/* 9F57A4 80240D64 44074000 */ mfc1 $a3, $f8 -/* 9F57A8 80240D68 27A20038 */ addiu $v0, $sp, 0x38 -/* 9F57AC 80240D6C AFB2001C */ sw $s2, 0x1c($sp) -/* 9F57B0 80240D70 AFA20020 */ sw $v0, 0x20($sp) -/* 9F57B4 80240D74 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9F57B8 80240D78 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9F57BC 80240D7C 0C01BFA4 */ jal fx_emote -/* 9F57C0 80240D80 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9F57C4 80240D84 0200202D */ daddu $a0, $s0, $zero -/* 9F57C8 80240D88 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9F57CC 80240D8C C480003C */ lwc1 $f0, 0x3c($a0) -/* 9F57D0 80240D90 3C060020 */ lui $a2, 0x20 -/* 9F57D4 80240D94 0C012530 */ jal ai_enemy_play_sound -/* 9F57D8 80240D98 E4800064 */ swc1 $f0, 0x64($a0) -/* 9F57DC 80240D9C 8E220018 */ lw $v0, 0x18($s1) -/* 9F57E0 80240DA0 9442002A */ lhu $v0, 0x2a($v0) -/* 9F57E4 80240DA4 30420001 */ andi $v0, $v0, 1 -/* 9F57E8 80240DA8 10400003 */ beqz $v0, .L80240DB8 -/* 9F57EC 80240DAC 2402000A */ addiu $v0, $zero, 0xa -/* 9F57F0 80240DB0 080903DE */ j .L80240F78 -/* 9F57F4 80240DB4 AE620070 */ sw $v0, 0x70($s3) -.L80240DB8: -/* 9F57F8 80240DB8 080903DE */ j .L80240F78 -/* 9F57FC 80240DBC AE720070 */ sw $s2, 0x70($s3) -.L80240DC0: -/* 9F5800 80240DC0 8E620074 */ lw $v0, 0x74($s3) -/* 9F5804 80240DC4 2442FFFF */ addiu $v0, $v0, -1 -.L80240DC8: -/* 9F5808 80240DC8 08090375 */ j .L80240DD4 -/* 9F580C 80240DCC AE620074 */ sw $v0, 0x74($s3) -.L80240DD0: -/* 9F5810 80240DD0 AE220090 */ sw $v0, 0x90($s1) -.L80240DD4: -/* 9F5814 80240DD4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F5818 80240DD8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9F581C 80240DDC C4620000 */ lwc1 $f2, ($v1) -/* 9F5820 80240DE0 468010A0 */ cvt.s.w $f2, $f2 -/* 9F5824 80240DE4 C4640008 */ lwc1 $f4, 8($v1) -/* 9F5828 80240DE8 46802120 */ cvt.s.w $f4, $f4 -/* 9F582C 80240DEC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9F5830 80240DF0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F5834 80240DF4 44051000 */ mfc1 $a1, $f2 -/* 9F5838 80240DF8 C440000C */ lwc1 $f0, 0xc($v0) -/* 9F583C 80240DFC 46800020 */ cvt.s.w $f0, $f0 -/* 9F5840 80240E00 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9F5844 80240E04 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F5848 80240E08 44062000 */ mfc1 $a2, $f4 -/* 9F584C 80240E0C C4400010 */ lwc1 $f0, 0x10($v0) -/* 9F5850 80240E10 46800020 */ cvt.s.w $f0, $f0 -/* 9F5854 80240E14 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9F5858 80240E18 8C640018 */ lw $a0, 0x18($v1) -/* 9F585C 80240E1C 0C0123F5 */ jal is_point_within_region -/* 9F5860 80240E20 8E070038 */ lw $a3, 0x38($s0) -/* 9F5864 80240E24 1040001A */ beqz $v0, .L80240E90 -/* 9F5868 80240E28 00000000 */ nop -/* 9F586C 80240E2C 8E060038 */ lw $a2, 0x38($s0) -/* 9F5870 80240E30 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F5874 80240E34 8E070040 */ lw $a3, 0x40($s0) -/* 9F5878 80240E38 C44C0000 */ lwc1 $f12, ($v0) -/* 9F587C 80240E3C 46806320 */ cvt.s.w $f12, $f12 -/* 9F5880 80240E40 C44E0008 */ lwc1 $f14, 8($v0) -/* 9F5884 80240E44 0C00A7B5 */ jal dist2D -/* 9F5888 80240E48 468073A0 */ cvt.s.w $f14, $f14 -/* 9F588C 80240E4C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9F5890 80240E50 4600103C */ c.lt.s $f2, $f0 -/* 9F5894 80240E54 00000000 */ nop -/* 9F5898 80240E58 4500000D */ bc1f .L80240E90 -/* 9F589C 80240E5C E7A00034 */ swc1 $f0, 0x34($sp) -/* 9F58A0 80240E60 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9F58A4 80240E64 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F58A8 80240E68 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9F58AC 80240E6C C4480000 */ lwc1 $f8, ($v0) -/* 9F58B0 80240E70 46804220 */ cvt.s.w $f8, $f8 -/* 9F58B4 80240E74 44064000 */ mfc1 $a2, $f8 -/* 9F58B8 80240E78 C4480008 */ lwc1 $f8, 8($v0) -/* 9F58BC 80240E7C 46804220 */ cvt.s.w $f8, $f8 -/* 9F58C0 80240E80 44074000 */ mfc1 $a3, $f8 -/* 9F58C4 80240E84 0C00A720 */ jal atan2 -/* 9F58C8 80240E88 24140001 */ addiu $s4, $zero, 1 -/* 9F58CC 80240E8C E600000C */ swc1 $f0, 0xc($s0) -.L80240E90: -/* 9F58D0 80240E90 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F58D4 80240E94 8C43000C */ lw $v1, 0xc($v0) -/* 9F58D8 80240E98 8C420010 */ lw $v0, 0x10($v0) -/* 9F58DC 80240E9C 00621825 */ or $v1, $v1, $v0 -/* 9F58E0 80240EA0 00741825 */ or $v1, $v1, $s4 -/* 9F58E4 80240EA4 10600008 */ beqz $v1, .L80240EC8 -/* 9F58E8 80240EA8 00000000 */ nop -/* 9F58EC 80240EAC 8602008C */ lh $v0, 0x8c($s0) -/* 9F58F0 80240EB0 14400031 */ bnez $v0, .L80240F78 -/* 9F58F4 80240EB4 00000000 */ nop -/* 9F58F8 80240EB8 8E050018 */ lw $a1, 0x18($s0) -/* 9F58FC 80240EBC 8E06000C */ lw $a2, 0xc($s0) -/* 9F5900 80240EC0 0C00EA95 */ jal npc_move_heading -/* 9F5904 80240EC4 0200202D */ daddu $a0, $s0, $zero -.L80240EC8: -/* 9F5908 80240EC8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F590C 80240ECC 3C014059 */ lui $at, 0x4059 -/* 9F5910 80240ED0 44811800 */ mtc1 $at, $f3 -/* 9F5914 80240ED4 44801000 */ mtc1 $zero, $f2 -/* 9F5918 80240ED8 46000021 */ cvt.d.s $f0, $f0 -/* 9F591C 80240EDC 46220002 */ mul.d $f0, $f0, $f2 -/* 9F5920 80240EE0 00000000 */ nop -/* 9F5924 80240EE4 4620020D */ trunc.w.d $f8, $f0 -/* 9F5928 80240EE8 E628007C */ swc1 $f8, 0x7c($s1) -/* 9F592C 80240EEC 8E420004 */ lw $v0, 4($s2) -/* 9F5930 80240EF0 18400021 */ blez $v0, .L80240F78 -/* 9F5934 80240EF4 00000000 */ nop -/* 9F5938 80240EF8 8602008E */ lh $v0, 0x8e($s0) -/* 9F593C 80240EFC 9603008E */ lhu $v1, 0x8e($s0) -/* 9F5940 80240F00 18400005 */ blez $v0, .L80240F18 -/* 9F5944 80240F04 2462FFFF */ addiu $v0, $v1, -1 -/* 9F5948 80240F08 A602008E */ sh $v0, 0x8e($s0) -/* 9F594C 80240F0C 00021400 */ sll $v0, $v0, 0x10 -/* 9F5950 80240F10 1C400019 */ bgtz $v0, .L80240F78 -/* 9F5954 80240F14 00000000 */ nop -.L80240F18: -/* 9F5958 80240F18 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9F595C 80240F1C 24020002 */ addiu $v0, $zero, 2 -/* 9F5960 80240F20 0C00A67F */ jal rand_int -/* 9F5964 80240F24 AE620070 */ sw $v0, 0x70($s3) -/* 9F5968 80240F28 3C035555 */ lui $v1, 0x5555 -/* 9F596C 80240F2C 34635556 */ ori $v1, $v1, 0x5556 -/* 9F5970 80240F30 00430018 */ mult $v0, $v1 -/* 9F5974 80240F34 000227C3 */ sra $a0, $v0, 0x1f -/* 9F5978 80240F38 00004010 */ mfhi $t0 -/* 9F597C 80240F3C 01042023 */ subu $a0, $t0, $a0 -/* 9F5980 80240F40 00041840 */ sll $v1, $a0, 1 -/* 9F5984 80240F44 00641821 */ addu $v1, $v1, $a0 -/* 9F5988 80240F48 00431023 */ subu $v0, $v0, $v1 -/* 9F598C 80240F4C 24430002 */ addiu $v1, $v0, 2 -/* 9F5990 80240F50 AE630074 */ sw $v1, 0x74($s3) -/* 9F5994 80240F54 8E42002C */ lw $v0, 0x2c($s2) -/* 9F5998 80240F58 58400007 */ blezl $v0, .L80240F78 -/* 9F599C 80240F5C AE600070 */ sw $zero, 0x70($s3) -/* 9F59A0 80240F60 8E420008 */ lw $v0, 8($s2) -/* 9F59A4 80240F64 18400003 */ blez $v0, .L80240F74 -/* 9F59A8 80240F68 28620003 */ slti $v0, $v1, 3 -/* 9F59AC 80240F6C 10400002 */ beqz $v0, .L80240F78 -/* 9F59B0 80240F70 00000000 */ nop -.L80240F74: -/* 9F59B4 80240F74 AE600070 */ sw $zero, 0x70($s3) -.L80240F78: -/* 9F59B8 80240F78 8FBF0058 */ lw $ra, 0x58($sp) -/* 9F59BC 80240F7C 8FB50054 */ lw $s5, 0x54($sp) -/* 9F59C0 80240F80 8FB40050 */ lw $s4, 0x50($sp) -/* 9F59C4 80240F84 8FB3004C */ lw $s3, 0x4c($sp) -/* 9F59C8 80240F88 8FB20048 */ lw $s2, 0x48($sp) -/* 9F59CC 80240F8C 8FB10044 */ lw $s1, 0x44($sp) -/* 9F59D0 80240F90 8FB00040 */ lw $s0, 0x40($sp) -/* 9F59D4 80240F94 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 9F59D8 80240F98 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 9F59DC 80240F9C D7B60068 */ ldc1 $f22, 0x68($sp) -/* 9F59E0 80240FA0 D7B40060 */ ldc1 $f20, 0x60($sp) -/* 9F59E4 80240FA4 03E00008 */ jr $ra -/* 9F59E8 80240FA8 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s index 594b3e07cd..09376980cc 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s @@ -86,7 +86,7 @@ glabel func_80241AE0_9F6520 .L80241BFC_9F663C: /* 9F663C 80241BFC 0280202D */ daddu $a0, $s4, $zero /* 9F6640 80241C00 0200282D */ daddu $a1, $s0, $zero -/* 9F6644 80241C04 0C090261 */ jal func_80240984_9F53C4 +/* 9F6644 80241C04 0C090261 */ jal nok_11_UnkNpcAIFunc35 /* 9F6648 80241C08 0260302D */ daddu $a2, $s3, $zero /* 9F664C 80241C0C 0809072A */ j .L80241CA8 /* 9F6650 80241C10 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240000_A00600.s b/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240000_A00600.s deleted file mode 100644 index 7b8c79f687..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240000_A00600.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A00600 -/* A00600 80240000 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A00604 80240004 AFB00030 */ sw $s0, 0x30($sp) -/* A00608 80240008 0080802D */ daddu $s0, $a0, $zero -/* A0060C 8024000C AFBF0040 */ sw $ra, 0x40($sp) -/* A00610 80240010 AFB3003C */ sw $s3, 0x3c($sp) -/* A00614 80240014 AFB20038 */ sw $s2, 0x38($sp) -/* A00618 80240018 AFB10034 */ sw $s1, 0x34($sp) -/* A0061C 8024001C F7B60050 */ sdc1 $f22, 0x50($sp) -/* A00620 80240020 F7B40048 */ sdc1 $f20, 0x48($sp) -/* A00624 80240024 8E130148 */ lw $s3, 0x148($s0) -/* A00628 80240028 00A0882D */ daddu $s1, $a1, $zero -/* A0062C 8024002C 86640008 */ lh $a0, 8($s3) -/* A00630 80240030 0C00EABB */ jal get_npc_unsafe -/* A00634 80240034 00C0902D */ daddu $s2, $a2, $zero -/* A00638 80240038 0200202D */ daddu $a0, $s0, $zero -/* A0063C 8024003C 0220282D */ daddu $a1, $s1, $zero -/* A00640 80240040 0240302D */ daddu $a2, $s2, $zero -/* A00644 80240044 0C012568 */ jal func_800495A0 -/* A00648 80240048 0040802D */ daddu $s0, $v0, $zero -/* A0064C 8024004C 8E020000 */ lw $v0, ($s0) -/* A00650 80240050 2404002D */ addiu $a0, $zero, 0x2d -/* A00654 80240054 34420800 */ ori $v0, $v0, 0x800 -/* A00658 80240058 0C00A67F */ jal rand_int -/* A0065C 8024005C AE020000 */ sw $v0, ($s0) -/* A00660 80240060 0200202D */ daddu $a0, $s0, $zero -/* A00664 80240064 3C05B000 */ lui $a1, 0xb000 -/* A00668 80240068 34A50017 */ ori $a1, $a1, 0x17 -/* A0066C 8024006C 44820000 */ mtc1 $v0, $f0 -/* A00670 80240070 00000000 */ nop -/* A00674 80240074 46800021 */ cvt.d.w $f0, $f0 -/* A00678 80240078 3C014024 */ lui $at, 0x4024 -/* A0067C 8024007C 44811800 */ mtc1 $at, $f3 -/* A00680 80240080 44801000 */ mtc1 $zero, $f2 -/* A00684 80240084 3C014020 */ lui $at, 0x4020 -/* A00688 80240088 44812800 */ mtc1 $at, $f5 -/* A0068C 8024008C 44802000 */ mtc1 $zero, $f4 -/* A00690 80240090 46220003 */ div.d $f0, $f0, $f2 -/* A00694 80240094 46240000 */ add.d $f0, $f0, $f4 -/* A00698 80240098 3C013FC0 */ lui $at, 0x3fc0 -/* A0069C 8024009C 44811000 */ mtc1 $at, $f2 -/* A006A0 802400A0 0000302D */ daddu $a2, $zero, $zero -/* A006A4 802400A4 E6020014 */ swc1 $f2, 0x14($s0) -/* A006A8 802400A8 46200020 */ cvt.s.d $f0, $f0 -/* A006AC 802400AC 0C012530 */ jal ai_enemy_play_sound -/* A006B0 802400B0 E600001C */ swc1 $f0, 0x1c($s0) -/* A006B4 802400B4 8E6300D0 */ lw $v1, 0xd0($s3) -/* A006B8 802400B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* A006BC 802400BC C4620000 */ lwc1 $f2, ($v1) -/* A006C0 802400C0 468010A0 */ cvt.s.w $f2, $f2 -/* A006C4 802400C4 C4640008 */ lwc1 $f4, 8($v1) -/* A006C8 802400C8 46802120 */ cvt.s.w $f4, $f4 -/* A006CC 802400CC E7A00010 */ swc1 $f0, 0x10($sp) -/* A006D0 802400D0 8E6200D0 */ lw $v0, 0xd0($s3) -/* A006D4 802400D4 44051000 */ mfc1 $a1, $f2 -/* A006D8 802400D8 C440000C */ lwc1 $f0, 0xc($v0) -/* A006DC 802400DC 46800020 */ cvt.s.w $f0, $f0 -/* A006E0 802400E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* A006E4 802400E4 8E6200D0 */ lw $v0, 0xd0($s3) -/* A006E8 802400E8 44062000 */ mfc1 $a2, $f4 -/* A006EC 802400EC C4400010 */ lwc1 $f0, 0x10($v0) -/* A006F0 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* A006F4 802400F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* A006F8 802400F8 8C640018 */ lw $a0, 0x18($v1) -/* A006FC 802400FC 0C0123F5 */ jal is_point_within_region -/* A00700 80240100 8E070038 */ lw $a3, 0x38($s0) -/* A00704 80240104 10400035 */ beqz $v0, .L802401DC -/* A00708 80240108 00000000 */ nop -/* A0070C 8024010C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A00710 80240110 3C0141C8 */ lui $at, 0x41c8 -/* A00714 80240114 4481B000 */ mtc1 $at, $f22 -/* A00718 80240118 8E6200D0 */ lw $v0, 0xd0($s3) -/* A0071C 8024011C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A00720 80240120 C4480000 */ lwc1 $f8, ($v0) -/* A00724 80240124 46804220 */ cvt.s.w $f8, $f8 -/* A00728 80240128 44064000 */ mfc1 $a2, $f8 -/* A0072C 8024012C C4480008 */ lwc1 $f8, 8($v0) -/* A00730 80240130 46804220 */ cvt.s.w $f8, $f8 -/* A00734 80240134 44074000 */ mfc1 $a3, $f8 -/* A00738 80240138 3C01403E */ lui $at, 0x403e -/* A0073C 8024013C 4481A800 */ mtc1 $at, $f21 -/* A00740 80240140 4480A000 */ mtc1 $zero, $f20 -/* A00744 80240144 0C00A720 */ jal atan2 -/* A00748 80240148 0000882D */ daddu $s1, $zero, $zero -/* A0074C 8024014C C6020038 */ lwc1 $f2, 0x38($s0) -/* A00750 80240150 C604003C */ lwc1 $f4, 0x3c($s0) -/* A00754 80240154 C6060040 */ lwc1 $f6, 0x40($s0) -/* A00758 80240158 E600000C */ swc1 $f0, 0xc($s0) -/* A0075C 8024015C E7A20020 */ swc1 $f2, 0x20($sp) -/* A00760 80240160 E7A40024 */ swc1 $f4, 0x24($sp) -/* A00764 80240164 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240168: -/* A00768 80240168 E7B60010 */ swc1 $f22, 0x10($sp) -/* A0076C 8024016C C600000C */ lwc1 $f0, 0xc($s0) -/* A00770 80240170 E7A00014 */ swc1 $f0, 0x14($sp) -/* A00774 80240174 860200A8 */ lh $v0, 0xa8($s0) -/* A00778 80240178 27A50020 */ addiu $a1, $sp, 0x20 -/* A0077C 8024017C 44820000 */ mtc1 $v0, $f0 -/* A00780 80240180 00000000 */ nop -/* A00784 80240184 46800020 */ cvt.s.w $f0, $f0 -/* A00788 80240188 E7A00018 */ swc1 $f0, 0x18($sp) -/* A0078C 8024018C 860200A6 */ lh $v0, 0xa6($s0) -/* A00790 80240190 27A60024 */ addiu $a2, $sp, 0x24 -/* A00794 80240194 44820000 */ mtc1 $v0, $f0 -/* A00798 80240198 00000000 */ nop -/* A0079C 8024019C 46800020 */ cvt.s.w $f0, $f0 -/* A007A0 802401A0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A007A4 802401A4 8E040080 */ lw $a0, 0x80($s0) -/* A007A8 802401A8 0C037711 */ jal npc_test_move_simple_with_slipping -/* A007AC 802401AC 27A70028 */ addiu $a3, $sp, 0x28 -/* A007B0 802401B0 10400016 */ beqz $v0, .L8024020C -/* A007B4 802401B4 26310001 */ addiu $s1, $s1, 1 -/* A007B8 802401B8 C600000C */ lwc1 $f0, 0xc($s0) -/* A007BC 802401BC 46000021 */ cvt.d.s $f0, $f0 -/* A007C0 802401C0 46340000 */ add.d $f0, $f0, $f20 -/* A007C4 802401C4 2A220006 */ slti $v0, $s1, 6 -/* A007C8 802401C8 46200020 */ cvt.s.d $f0, $f0 -/* A007CC 802401CC 1440FFE6 */ bnez $v0, .L80240168 -/* A007D0 802401D0 E600000C */ swc1 $f0, 0xc($s0) -/* A007D4 802401D4 08090083 */ j .L8024020C -/* A007D8 802401D8 00000000 */ nop -.L802401DC: -/* A007DC 802401DC 0C00A67F */ jal rand_int -/* A007E0 802401E0 2404003C */ addiu $a0, $zero, 0x3c -/* A007E4 802401E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* A007E8 802401E8 44820000 */ mtc1 $v0, $f0 -/* A007EC 802401EC 00000000 */ nop -/* A007F0 802401F0 46800020 */ cvt.s.w $f0, $f0 -/* A007F4 802401F4 46006300 */ add.s $f12, $f12, $f0 -/* A007F8 802401F8 3C0141F0 */ lui $at, 0x41f0 -/* A007FC 802401FC 44810000 */ mtc1 $at, $f0 -/* A00800 80240200 0C00A6C9 */ jal clamp_angle -/* A00804 80240204 46006301 */ sub.s $f12, $f12, $f0 -/* A00808 80240208 E600000C */ swc1 $f0, 0xc($s0) -.L8024020C: -/* A0080C 8024020C 8FBF0040 */ lw $ra, 0x40($sp) -/* A00810 80240210 8FB3003C */ lw $s3, 0x3c($sp) -/* A00814 80240214 8FB20038 */ lw $s2, 0x38($sp) -/* A00818 80240218 8FB10034 */ lw $s1, 0x34($sp) -/* A0081C 8024021C 8FB00030 */ lw $s0, 0x30($sp) -/* A00820 80240220 D7B60050 */ ldc1 $f22, 0x50($sp) -/* A00824 80240224 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A00828 80240228 03E00008 */ jr $ra -/* A0082C 8024022C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s index 7a126957d4..ae811f636f 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s @@ -103,7 +103,7 @@ glabel func_80240BF0_A011F0 .L80240D54_A01354: /* A01354 80240D54 0260202D */ daddu $a0, $s3, $zero /* A01358 80240D58 0280282D */ daddu $a1, $s4, $zero -/* A0135C 80240D5C 0C090000 */ jal func_80240000_A00600 +/* A0135C 80240D5C 0C090000 */ jal nok_13_UnkNpcAIFunc36 /* A01360 80240D60 0200302D */ daddu $a2, $s0, $zero .L80240D64_A01364: /* A01364 80240D64 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s deleted file mode 100644 index 7b9a839c2e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244628_A06E68 -.double 0.09 - -dlabel D_80244630_A06E70 -.double 0.09 - -.section .text - -glabel func_80240B44_A03384 -/* A03384 80240B44 27BDFF80 */ addiu $sp, $sp, -0x80 -/* A03388 80240B48 AFB3004C */ sw $s3, 0x4c($sp) -/* A0338C 80240B4C 0080982D */ daddu $s3, $a0, $zero -/* A03390 80240B50 AFBF0058 */ sw $ra, 0x58($sp) -/* A03394 80240B54 AFB50054 */ sw $s5, 0x54($sp) -/* A03398 80240B58 AFB40050 */ sw $s4, 0x50($sp) -/* A0339C 80240B5C AFB20048 */ sw $s2, 0x48($sp) -/* A033A0 80240B60 AFB10044 */ sw $s1, 0x44($sp) -/* A033A4 80240B64 AFB00040 */ sw $s0, 0x40($sp) -/* A033A8 80240B68 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* A033AC 80240B6C F7B80070 */ sdc1 $f24, 0x70($sp) -/* A033B0 80240B70 F7B60068 */ sdc1 $f22, 0x68($sp) -/* A033B4 80240B74 F7B40060 */ sdc1 $f20, 0x60($sp) -/* A033B8 80240B78 8E710148 */ lw $s1, 0x148($s3) -/* A033BC 80240B7C 00A0902D */ daddu $s2, $a1, $zero -/* A033C0 80240B80 86240008 */ lh $a0, 8($s1) -/* A033C4 80240B84 0C00EABB */ jal get_npc_unsafe -/* A033C8 80240B88 00C0A82D */ daddu $s5, $a2, $zero -/* A033CC 80240B8C 0040802D */ daddu $s0, $v0, $zero -/* A033D0 80240B90 0000A02D */ daddu $s4, $zero, $zero -/* A033D4 80240B94 C624007C */ lwc1 $f4, 0x7c($s1) -/* A033D8 80240B98 46802120 */ cvt.s.w $f4, $f4 -/* A033DC 80240B9C C6220088 */ lwc1 $f2, 0x88($s1) -/* A033E0 80240BA0 468010A0 */ cvt.s.w $f2, $f2 -/* A033E4 80240BA4 460010A1 */ cvt.d.s $f2, $f2 -/* A033E8 80240BA8 46002121 */ cvt.d.s $f4, $f4 -/* A033EC 80240BAC C600003C */ lwc1 $f0, 0x3c($s0) -/* A033F0 80240BB0 3C014059 */ lui $at, 0x4059 -/* A033F4 80240BB4 44813800 */ mtc1 $at, $f7 -/* A033F8 80240BB8 44803000 */ mtc1 $zero, $f6 -/* A033FC 80240BBC 46000021 */ cvt.d.s $f0, $f0 -/* A03400 80240BC0 46260002 */ mul.d $f0, $f0, $f6 -/* A03404 80240BC4 00000000 */ nop -/* A03408 80240BC8 24020001 */ addiu $v0, $zero, 1 -/* A0340C 80240BCC 8E24006C */ lw $a0, 0x6c($s1) -/* A03410 80240BD0 46261083 */ div.d $f2, $f2, $f6 -/* A03414 80240BD4 462010A0 */ cvt.s.d $f2, $f2 -/* A03418 80240BD8 46262103 */ div.d $f4, $f4, $f6 -/* A0341C 80240BDC 46202520 */ cvt.s.d $f20, $f4 -/* A03420 80240BE0 30830011 */ andi $v1, $a0, 0x11 -/* A03424 80240BE4 4620020D */ trunc.w.d $f8, $f0 -/* A03428 80240BE8 E628007C */ swc1 $f8, 0x7c($s1) -/* A0342C 80240BEC C6200078 */ lwc1 $f0, 0x78($s1) -/* A03430 80240BF0 46800020 */ cvt.s.w $f0, $f0 -/* A03434 80240BF4 46000021 */ cvt.d.s $f0, $f0 -/* A03438 80240BF8 46260003 */ div.d $f0, $f0, $f6 -/* A0343C 80240BFC 462006A0 */ cvt.s.d $f26, $f0 -/* A03440 80240C00 C6200070 */ lwc1 $f0, 0x70($s1) -/* A03444 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* A03448 80240C08 46000021 */ cvt.d.s $f0, $f0 -/* A0344C 80240C0C 46260003 */ div.d $f0, $f0, $f6 -/* A03450 80240C10 462005A0 */ cvt.s.d $f22, $f0 -/* A03454 80240C14 14620025 */ bne $v1, $v0, .L80240CAC -/* A03458 80240C18 4602D600 */ add.s $f24, $f26, $f2 -/* A0345C 80240C1C 8E020000 */ lw $v0, ($s0) -/* A03460 80240C20 30420008 */ andi $v0, $v0, 8 -/* A03464 80240C24 10400009 */ beqz $v0, .L80240C4C -/* A03468 80240C28 27A50028 */ addiu $a1, $sp, 0x28 -/* A0346C 80240C2C C600003C */ lwc1 $f0, 0x3c($s0) -/* A03470 80240C30 4600C001 */ sub.s $f0, $f24, $f0 -/* A03474 80240C34 4600B03C */ c.lt.s $f22, $f0 -/* A03478 80240C38 00000000 */ nop -/* A0347C 80240C3C 4500001B */ bc1f .L80240CAC -/* A03480 80240C40 34820010 */ ori $v0, $a0, 0x10 -/* A03484 80240C44 0809032B */ j .L80240CAC -/* A03488 80240C48 AE22006C */ sw $v0, 0x6c($s1) -.L80240C4C: -/* A0348C 80240C4C 27A6002C */ addiu $a2, $sp, 0x2c -/* A03490 80240C50 C6000038 */ lwc1 $f0, 0x38($s0) -/* A03494 80240C54 C602003C */ lwc1 $f2, 0x3c($s0) -/* A03498 80240C58 C6040040 */ lwc1 $f4, 0x40($s0) -/* A0349C 80240C5C 3C01447A */ lui $at, 0x447a -/* A034A0 80240C60 44813000 */ mtc1 $at, $f6 -/* A034A4 80240C64 27A20034 */ addiu $v0, $sp, 0x34 -/* A034A8 80240C68 E7A00028 */ swc1 $f0, 0x28($sp) -/* A034AC 80240C6C E7A2002C */ swc1 $f2, 0x2c($sp) -/* A034B0 80240C70 E7A40030 */ swc1 $f4, 0x30($sp) -/* A034B4 80240C74 E7A60034 */ swc1 $f6, 0x34($sp) -/* A034B8 80240C78 AFA20010 */ sw $v0, 0x10($sp) -/* A034BC 80240C7C 8E040080 */ lw $a0, 0x80($s0) -/* A034C0 80240C80 0C0372DF */ jal npc_raycast_down_sides -/* A034C4 80240C84 27A70030 */ addiu $a3, $sp, 0x30 -/* A034C8 80240C88 C7A00034 */ lwc1 $f0, 0x34($sp) -/* A034CC 80240C8C 4600D001 */ sub.s $f0, $f26, $f0 -/* A034D0 80240C90 4600B03C */ c.lt.s $f22, $f0 -/* A034D4 80240C94 00000000 */ nop -/* A034D8 80240C98 45000004 */ bc1f .L80240CAC -/* A034DC 80240C9C 00000000 */ nop -/* A034E0 80240CA0 8E22006C */ lw $v0, 0x6c($s1) -/* A034E4 80240CA4 34420010 */ ori $v0, $v0, 0x10 -/* A034E8 80240CA8 AE22006C */ sw $v0, 0x6c($s1) -.L80240CAC: -/* A034EC 80240CAC 8E22006C */ lw $v0, 0x6c($s1) -/* A034F0 80240CB0 24030011 */ addiu $v1, $zero, 0x11 -/* A034F4 80240CB4 30420011 */ andi $v0, $v0, 0x11 -/* A034F8 80240CB8 14430039 */ bne $v0, $v1, .L80240DA0 -/* A034FC 80240CBC 00000000 */ nop -/* A03500 80240CC0 8E020000 */ lw $v0, ($s0) -/* A03504 80240CC4 30420008 */ andi $v0, $v0, 8 -/* A03508 80240CC8 1040000A */ beqz $v0, .L80240CF4 -/* A0350C 80240CCC 4600C106 */ mov.s $f4, $f24 -/* A03510 80240CD0 4614C081 */ sub.s $f2, $f24, $f20 -/* A03514 80240CD4 3C018024 */ lui $at, %hi(D_80244628_A06E68) -/* A03518 80240CD8 D4204628 */ ldc1 $f0, %lo(D_80244628_A06E68)($at) -/* A0351C 80240CDC 460010A1 */ cvt.d.s $f2, $f2 -/* A03520 80240CE0 46201082 */ mul.d $f2, $f2, $f0 -/* A03524 80240CE4 00000000 */ nop -/* A03528 80240CE8 4600A021 */ cvt.d.s $f0, $f20 -/* A0352C 80240CEC 08090356 */ j .L80240D58 -/* A03530 80240CF0 46220000 */ add.d $f0, $f0, $f2 -.L80240CF4: -/* A03534 80240CF4 27A50028 */ addiu $a1, $sp, 0x28 -/* A03538 80240CF8 27A6002C */ addiu $a2, $sp, 0x2c -/* A0353C 80240CFC C6000038 */ lwc1 $f0, 0x38($s0) -/* A03540 80240D00 C6020040 */ lwc1 $f2, 0x40($s0) -/* A03544 80240D04 3C01447A */ lui $at, 0x447a -/* A03548 80240D08 44812000 */ mtc1 $at, $f4 -/* A0354C 80240D0C 27A20034 */ addiu $v0, $sp, 0x34 -/* A03550 80240D10 E7B4002C */ swc1 $f20, 0x2c($sp) -/* A03554 80240D14 E7A00028 */ swc1 $f0, 0x28($sp) -/* A03558 80240D18 E7A20030 */ swc1 $f2, 0x30($sp) -/* A0355C 80240D1C E7A40034 */ swc1 $f4, 0x34($sp) -/* A03560 80240D20 AFA20010 */ sw $v0, 0x10($sp) -/* A03564 80240D24 8E040080 */ lw $a0, 0x80($s0) -/* A03568 80240D28 0C0372DF */ jal npc_raycast_down_sides -/* A0356C 80240D2C 27A70030 */ addiu $a3, $sp, 0x30 -/* A03570 80240D30 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* A03574 80240D34 461A2100 */ add.s $f4, $f4, $f26 -/* A03578 80240D38 46142081 */ sub.s $f2, $f4, $f20 -/* A0357C 80240D3C 3C018024 */ lui $at, %hi(D_80244630_A06E70) -/* A03580 80240D40 D4204630 */ ldc1 $f0, %lo(D_80244630_A06E70)($at) -/* A03584 80240D44 460010A1 */ cvt.d.s $f2, $f2 -/* A03588 80240D48 46201082 */ mul.d $f2, $f2, $f0 -/* A0358C 80240D4C 00000000 */ nop -/* A03590 80240D50 4600A021 */ cvt.d.s $f0, $f20 -/* A03594 80240D54 46220000 */ add.d $f0, $f0, $f2 -.L80240D58: -/* A03598 80240D58 46200020 */ cvt.s.d $f0, $f0 -/* A0359C 80240D5C E600003C */ swc1 $f0, 0x3c($s0) -/* A035A0 80240D60 C600003C */ lwc1 $f0, 0x3c($s0) -/* A035A4 80240D64 46002001 */ sub.s $f0, $f4, $f0 -/* A035A8 80240D68 3C013FF0 */ lui $at, 0x3ff0 -/* A035AC 80240D6C 44811800 */ mtc1 $at, $f3 -/* A035B0 80240D70 44801000 */ mtc1 $zero, $f2 -/* A035B4 80240D74 46000005 */ abs.s $f0, $f0 -/* A035B8 80240D78 46000021 */ cvt.d.s $f0, $f0 -/* A035BC 80240D7C 4622003C */ c.lt.d $f0, $f2 -/* A035C0 80240D80 00000000 */ nop -/* A035C4 80240D84 45000036 */ bc1f .L80240E60 -/* A035C8 80240D88 2403FFEF */ addiu $v1, $zero, -0x11 -/* A035CC 80240D8C E604003C */ swc1 $f4, 0x3c($s0) -/* A035D0 80240D90 8E22006C */ lw $v0, 0x6c($s1) -/* A035D4 80240D94 00431024 */ and $v0, $v0, $v1 -/* A035D8 80240D98 08090398 */ j .L80240E60 -/* A035DC 80240D9C AE22006C */ sw $v0, 0x6c($s1) -.L80240DA0: -/* A035E0 80240DA0 8E220070 */ lw $v0, 0x70($s1) -/* A035E4 80240DA4 1840002E */ blez $v0, .L80240E60 -/* A035E8 80240DA8 00000000 */ nop -/* A035EC 80240DAC C62C0074 */ lwc1 $f12, 0x74($s1) -/* A035F0 80240DB0 0C00A8BB */ jal sin_deg -/* A035F4 80240DB4 46806320 */ cvt.s.w $f12, $f12 -/* A035F8 80240DB8 8E020000 */ lw $v0, ($s0) -/* A035FC 80240DBC 30420008 */ andi $v0, $v0, 8 -/* A03600 80240DC0 10400003 */ beqz $v0, .L80240DD0 -/* A03604 80240DC4 46000506 */ mov.s $f20, $f0 -/* A03608 80240DC8 08090384 */ j .L80240E10 -/* A0360C 80240DCC 0000102D */ daddu $v0, $zero, $zero -.L80240DD0: -/* A03610 80240DD0 27A50028 */ addiu $a1, $sp, 0x28 -/* A03614 80240DD4 27A6002C */ addiu $a2, $sp, 0x2c -/* A03618 80240DD8 C6000038 */ lwc1 $f0, 0x38($s0) -/* A0361C 80240DDC C602003C */ lwc1 $f2, 0x3c($s0) -/* A03620 80240DE0 C6040040 */ lwc1 $f4, 0x40($s0) -/* A03624 80240DE4 3C01447A */ lui $at, 0x447a -/* A03628 80240DE8 44813000 */ mtc1 $at, $f6 -/* A0362C 80240DEC 27A20034 */ addiu $v0, $sp, 0x34 -/* A03630 80240DF0 E7A00028 */ swc1 $f0, 0x28($sp) -/* A03634 80240DF4 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A03638 80240DF8 E7A40030 */ swc1 $f4, 0x30($sp) -/* A0363C 80240DFC E7A60034 */ swc1 $f6, 0x34($sp) -/* A03640 80240E00 AFA20010 */ sw $v0, 0x10($sp) -/* A03644 80240E04 8E040080 */ lw $a0, 0x80($s0) -/* A03648 80240E08 0C0372DF */ jal npc_raycast_down_sides -/* A0364C 80240E0C 27A70030 */ addiu $a3, $sp, 0x30 -.L80240E10: -/* A03650 80240E10 10400007 */ beqz $v0, .L80240E30 -/* A03654 80240E14 00000000 */ nop -/* A03658 80240E18 4616A082 */ mul.s $f2, $f20, $f22 -/* A0365C 80240E1C 00000000 */ nop -/* A03660 80240E20 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A03664 80240E24 461A0000 */ add.s $f0, $f0, $f26 -/* A03668 80240E28 0809038F */ j .L80240E3C -/* A0366C 80240E2C 46020000 */ add.s $f0, $f0, $f2 -.L80240E30: -/* A03670 80240E30 4616A002 */ mul.s $f0, $f20, $f22 -/* A03674 80240E34 00000000 */ nop -/* A03678 80240E38 4600C000 */ add.s $f0, $f24, $f0 -.L80240E3C: -/* A0367C 80240E3C E600003C */ swc1 $f0, 0x3c($s0) -/* A03680 80240E40 8E220074 */ lw $v0, 0x74($s1) -/* A03684 80240E44 2442000A */ addiu $v0, $v0, 0xa -/* A03688 80240E48 44826000 */ mtc1 $v0, $f12 -/* A0368C 80240E4C 00000000 */ nop -/* A03690 80240E50 0C00A6C9 */ jal clamp_angle -/* A03694 80240E54 46806320 */ cvt.s.w $f12, $f12 -/* A03698 80240E58 4600020D */ trunc.w.s $f8, $f0 -/* A0369C 80240E5C E6280074 */ swc1 $f8, 0x74($s1) -.L80240E60: -/* A036A0 80240E60 8E220090 */ lw $v0, 0x90($s1) -/* A036A4 80240E64 1C40004A */ bgtz $v0, .L80240F90 -/* A036A8 80240E68 2442FFFF */ addiu $v0, $v0, -1 -/* A036AC 80240E6C 8E430014 */ lw $v1, 0x14($s2) -/* A036B0 80240E70 04600048 */ bltz $v1, .L80240F94 -/* A036B4 80240E74 00000000 */ nop -/* A036B8 80240E78 8E620074 */ lw $v0, 0x74($s3) -/* A036BC 80240E7C 1C400042 */ bgtz $v0, .L80240F88 -/* A036C0 80240E80 2442FFFF */ addiu $v0, $v0, -1 -/* A036C4 80240E84 AE630074 */ sw $v1, 0x74($s3) -/* A036C8 80240E88 860200A8 */ lh $v0, 0xa8($s0) -/* A036CC 80240E8C C602003C */ lwc1 $f2, 0x3c($s0) -/* A036D0 80240E90 44820000 */ mtc1 $v0, $f0 -/* A036D4 80240E94 00000000 */ nop -/* A036D8 80240E98 46800020 */ cvt.s.w $f0, $f0 -/* A036DC 80240E9C 46001080 */ add.s $f2, $f2, $f0 -/* A036E0 80240EA0 3C014024 */ lui $at, 0x4024 -/* A036E4 80240EA4 44810800 */ mtc1 $at, $f1 -/* A036E8 80240EA8 44800000 */ mtc1 $zero, $f0 -/* A036EC 80240EAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A036F0 80240EB0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A036F4 80240EB4 460010A1 */ cvt.d.s $f2, $f2 -/* A036F8 80240EB8 46201080 */ add.d $f2, $f2, $f0 -/* A036FC 80240EBC C440002C */ lwc1 $f0, 0x2c($v0) -/* A03700 80240EC0 46000021 */ cvt.d.s $f0, $f0 -/* A03704 80240EC4 4622003C */ c.lt.d $f0, $f2 -/* A03708 80240EC8 00000000 */ nop -/* A0370C 80240ECC 4500002C */ bc1f .L80240F80 -/* A03710 80240ED0 02A0202D */ daddu $a0, $s5, $zero -/* A03714 80240ED4 AFA00010 */ sw $zero, 0x10($sp) -/* A03718 80240ED8 8E46000C */ lw $a2, 0xc($s2) -/* A0371C 80240EDC 8E470010 */ lw $a3, 0x10($s2) -/* A03720 80240EE0 0C01242D */ jal func_800490B4 -/* A03724 80240EE4 0220282D */ daddu $a1, $s1, $zero -/* A03728 80240EE8 10400025 */ beqz $v0, .L80240F80 -/* A0372C 80240EEC 0000202D */ daddu $a0, $zero, $zero -/* A03730 80240EF0 0200282D */ daddu $a1, $s0, $zero -/* A03734 80240EF4 0000302D */ daddu $a2, $zero, $zero -/* A03738 80240EF8 2412000C */ addiu $s2, $zero, 0xc -/* A0373C 80240EFC 860300A8 */ lh $v1, 0xa8($s0) -/* A03740 80240F00 3C013F80 */ lui $at, 0x3f80 -/* A03744 80240F04 44810000 */ mtc1 $at, $f0 -/* A03748 80240F08 3C014000 */ lui $at, 0x4000 -/* A0374C 80240F0C 44811000 */ mtc1 $at, $f2 -/* A03750 80240F10 3C01C1A0 */ lui $at, 0xc1a0 -/* A03754 80240F14 44812000 */ mtc1 $at, $f4 -/* A03758 80240F18 44834000 */ mtc1 $v1, $f8 -/* A0375C 80240F1C 00000000 */ nop -/* A03760 80240F20 46804220 */ cvt.s.w $f8, $f8 -/* A03764 80240F24 44074000 */ mfc1 $a3, $f8 -/* A03768 80240F28 27A20038 */ addiu $v0, $sp, 0x38 -/* A0376C 80240F2C AFB2001C */ sw $s2, 0x1c($sp) -/* A03770 80240F30 AFA20020 */ sw $v0, 0x20($sp) -/* A03774 80240F34 E7A00010 */ swc1 $f0, 0x10($sp) -/* A03778 80240F38 E7A20014 */ swc1 $f2, 0x14($sp) -/* A0377C 80240F3C 0C01BFA4 */ jal fx_emote -/* A03780 80240F40 E7A40018 */ swc1 $f4, 0x18($sp) -/* A03784 80240F44 0200202D */ daddu $a0, $s0, $zero -/* A03788 80240F48 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A0378C 80240F4C C480003C */ lwc1 $f0, 0x3c($a0) -/* A03790 80240F50 3C060020 */ lui $a2, 0x20 -/* A03794 80240F54 0C012530 */ jal ai_enemy_play_sound -/* A03798 80240F58 E4800064 */ swc1 $f0, 0x64($a0) -/* A0379C 80240F5C 8E220018 */ lw $v0, 0x18($s1) -/* A037A0 80240F60 9442002A */ lhu $v0, 0x2a($v0) -/* A037A4 80240F64 30420001 */ andi $v0, $v0, 1 -/* A037A8 80240F68 10400003 */ beqz $v0, .L80240F78 -/* A037AC 80240F6C 2402000A */ addiu $v0, $zero, 0xa -/* A037B0 80240F70 0809044E */ j .L80241138 -/* A037B4 80240F74 AE620070 */ sw $v0, 0x70($s3) -.L80240F78: -/* A037B8 80240F78 0809044E */ j .L80241138 -/* A037BC 80240F7C AE720070 */ sw $s2, 0x70($s3) -.L80240F80: -/* A037C0 80240F80 8E620074 */ lw $v0, 0x74($s3) -/* A037C4 80240F84 2442FFFF */ addiu $v0, $v0, -1 -.L80240F88: -/* A037C8 80240F88 080903E5 */ j .L80240F94 -/* A037CC 80240F8C AE620074 */ sw $v0, 0x74($s3) -.L80240F90: -/* A037D0 80240F90 AE220090 */ sw $v0, 0x90($s1) -.L80240F94: -/* A037D4 80240F94 8E2300D0 */ lw $v1, 0xd0($s1) -/* A037D8 80240F98 C6000040 */ lwc1 $f0, 0x40($s0) -/* A037DC 80240F9C C4620000 */ lwc1 $f2, ($v1) -/* A037E0 80240FA0 468010A0 */ cvt.s.w $f2, $f2 -/* A037E4 80240FA4 C4640008 */ lwc1 $f4, 8($v1) -/* A037E8 80240FA8 46802120 */ cvt.s.w $f4, $f4 -/* A037EC 80240FAC E7A00010 */ swc1 $f0, 0x10($sp) -/* A037F0 80240FB0 8E2200D0 */ lw $v0, 0xd0($s1) -/* A037F4 80240FB4 44051000 */ mfc1 $a1, $f2 -/* A037F8 80240FB8 C440000C */ lwc1 $f0, 0xc($v0) -/* A037FC 80240FBC 46800020 */ cvt.s.w $f0, $f0 -/* A03800 80240FC0 E7A00014 */ swc1 $f0, 0x14($sp) -/* A03804 80240FC4 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03808 80240FC8 44062000 */ mfc1 $a2, $f4 -/* A0380C 80240FCC C4400010 */ lwc1 $f0, 0x10($v0) -/* A03810 80240FD0 46800020 */ cvt.s.w $f0, $f0 -/* A03814 80240FD4 E7A00018 */ swc1 $f0, 0x18($sp) -/* A03818 80240FD8 8C640018 */ lw $a0, 0x18($v1) -/* A0381C 80240FDC 0C0123F5 */ jal is_point_within_region -/* A03820 80240FE0 8E070038 */ lw $a3, 0x38($s0) -/* A03824 80240FE4 1040001A */ beqz $v0, .L80241050 -/* A03828 80240FE8 00000000 */ nop -/* A0382C 80240FEC 8E060038 */ lw $a2, 0x38($s0) -/* A03830 80240FF0 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03834 80240FF4 8E070040 */ lw $a3, 0x40($s0) -/* A03838 80240FF8 C44C0000 */ lwc1 $f12, ($v0) -/* A0383C 80240FFC 46806320 */ cvt.s.w $f12, $f12 -/* A03840 80241000 C44E0008 */ lwc1 $f14, 8($v0) -/* A03844 80241004 0C00A7B5 */ jal dist2D -/* A03848 80241008 468073A0 */ cvt.s.w $f14, $f14 -/* A0384C 8024100C C6020018 */ lwc1 $f2, 0x18($s0) -/* A03850 80241010 4600103C */ c.lt.s $f2, $f0 -/* A03854 80241014 00000000 */ nop -/* A03858 80241018 4500000D */ bc1f .L80241050 -/* A0385C 8024101C E7A00034 */ swc1 $f0, 0x34($sp) -/* A03860 80241020 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A03864 80241024 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03868 80241028 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A0386C 8024102C C4480000 */ lwc1 $f8, ($v0) -/* A03870 80241030 46804220 */ cvt.s.w $f8, $f8 -/* A03874 80241034 44064000 */ mfc1 $a2, $f8 -/* A03878 80241038 C4480008 */ lwc1 $f8, 8($v0) -/* A0387C 8024103C 46804220 */ cvt.s.w $f8, $f8 -/* A03880 80241040 44074000 */ mfc1 $a3, $f8 -/* A03884 80241044 0C00A720 */ jal atan2 -/* A03888 80241048 24140001 */ addiu $s4, $zero, 1 -/* A0388C 8024104C E600000C */ swc1 $f0, 0xc($s0) -.L80241050: -/* A03890 80241050 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03894 80241054 8C43000C */ lw $v1, 0xc($v0) -/* A03898 80241058 8C420010 */ lw $v0, 0x10($v0) -/* A0389C 8024105C 00621825 */ or $v1, $v1, $v0 -/* A038A0 80241060 00741825 */ or $v1, $v1, $s4 -/* A038A4 80241064 10600008 */ beqz $v1, .L80241088 -/* A038A8 80241068 00000000 */ nop -/* A038AC 8024106C 8602008C */ lh $v0, 0x8c($s0) -/* A038B0 80241070 14400031 */ bnez $v0, .L80241138 -/* A038B4 80241074 00000000 */ nop -/* A038B8 80241078 8E050018 */ lw $a1, 0x18($s0) -/* A038BC 8024107C 8E06000C */ lw $a2, 0xc($s0) -/* A038C0 80241080 0C00EA95 */ jal npc_move_heading -/* A038C4 80241084 0200202D */ daddu $a0, $s0, $zero -.L80241088: -/* A038C8 80241088 C600003C */ lwc1 $f0, 0x3c($s0) -/* A038CC 8024108C 3C014059 */ lui $at, 0x4059 -/* A038D0 80241090 44811800 */ mtc1 $at, $f3 -/* A038D4 80241094 44801000 */ mtc1 $zero, $f2 -/* A038D8 80241098 46000021 */ cvt.d.s $f0, $f0 -/* A038DC 8024109C 46220002 */ mul.d $f0, $f0, $f2 -/* A038E0 802410A0 00000000 */ nop -/* A038E4 802410A4 4620020D */ trunc.w.d $f8, $f0 -/* A038E8 802410A8 E628007C */ swc1 $f8, 0x7c($s1) -/* A038EC 802410AC 8E420004 */ lw $v0, 4($s2) -/* A038F0 802410B0 18400021 */ blez $v0, .L80241138 -/* A038F4 802410B4 00000000 */ nop -/* A038F8 802410B8 8602008E */ lh $v0, 0x8e($s0) -/* A038FC 802410BC 9603008E */ lhu $v1, 0x8e($s0) -/* A03900 802410C0 18400005 */ blez $v0, .L802410D8 -/* A03904 802410C4 2462FFFF */ addiu $v0, $v1, -1 -/* A03908 802410C8 A602008E */ sh $v0, 0x8e($s0) -/* A0390C 802410CC 00021400 */ sll $v0, $v0, 0x10 -/* A03910 802410D0 1C400019 */ bgtz $v0, .L80241138 -/* A03914 802410D4 00000000 */ nop -.L802410D8: -/* A03918 802410D8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A0391C 802410DC 24020002 */ addiu $v0, $zero, 2 -/* A03920 802410E0 0C00A67F */ jal rand_int -/* A03924 802410E4 AE620070 */ sw $v0, 0x70($s3) -/* A03928 802410E8 3C035555 */ lui $v1, 0x5555 -/* A0392C 802410EC 34635556 */ ori $v1, $v1, 0x5556 -/* A03930 802410F0 00430018 */ mult $v0, $v1 -/* A03934 802410F4 000227C3 */ sra $a0, $v0, 0x1f -/* A03938 802410F8 00004010 */ mfhi $t0 -/* A0393C 802410FC 01042023 */ subu $a0, $t0, $a0 -/* A03940 80241100 00041840 */ sll $v1, $a0, 1 -/* A03944 80241104 00641821 */ addu $v1, $v1, $a0 -/* A03948 80241108 00431023 */ subu $v0, $v0, $v1 -/* A0394C 8024110C 24430002 */ addiu $v1, $v0, 2 -/* A03950 80241110 AE630074 */ sw $v1, 0x74($s3) -/* A03954 80241114 8E42002C */ lw $v0, 0x2c($s2) -/* A03958 80241118 58400007 */ blezl $v0, .L80241138 -/* A0395C 8024111C AE600070 */ sw $zero, 0x70($s3) -/* A03960 80241120 8E420008 */ lw $v0, 8($s2) -/* A03964 80241124 18400003 */ blez $v0, .L80241134 -/* A03968 80241128 28620003 */ slti $v0, $v1, 3 -/* A0396C 8024112C 10400002 */ beqz $v0, .L80241138 -/* A03970 80241130 00000000 */ nop -.L80241134: -/* A03974 80241134 AE600070 */ sw $zero, 0x70($s3) -.L80241138: -/* A03978 80241138 8FBF0058 */ lw $ra, 0x58($sp) -/* A0397C 8024113C 8FB50054 */ lw $s5, 0x54($sp) -/* A03980 80241140 8FB40050 */ lw $s4, 0x50($sp) -/* A03984 80241144 8FB3004C */ lw $s3, 0x4c($sp) -/* A03988 80241148 8FB20048 */ lw $s2, 0x48($sp) -/* A0398C 8024114C 8FB10044 */ lw $s1, 0x44($sp) -/* A03990 80241150 8FB00040 */ lw $s0, 0x40($sp) -/* A03994 80241154 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* A03998 80241158 D7B80070 */ ldc1 $f24, 0x70($sp) -/* A0399C 8024115C D7B60068 */ ldc1 $f22, 0x68($sp) -/* A039A0 80241160 D7B40060 */ ldc1 $f20, 0x60($sp) -/* A039A4 80241164 03E00008 */ jr $ra -/* A039A8 80241168 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s index cafa5296b2..203425dffa 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s @@ -86,7 +86,7 @@ glabel func_80241CA0_A044E0 .L80241DBC_A045FC: /* A045FC 80241DBC 0280202D */ daddu $a0, $s4, $zero /* A04600 80241DC0 0200282D */ daddu $a1, $s0, $zero -/* A04604 80241DC4 0C0902D1 */ jal func_80240B44_A03384 +/* A04604 80241DC4 0C0902D1 */ jal nok_14_UnkNpcAIFunc35 /* A04608 80241DC8 0260302D */ daddu $a2, $s3, $zero /* A0460C 80241DCC 0809079A */ j .L80241E68 /* A04610 80241DD0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s index 1479f99675..92c7670d41 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s @@ -89,7 +89,7 @@ glabel func_802421CC_A04A0C .L802422F4_A04B34: /* A04B34 802422F4 0260202D */ daddu $a0, $s3, $zero /* A04B38 802422F8 0200282D */ daddu $a1, $s0, $zero -/* A04B3C 802422FC 0C0902D1 */ jal func_80240B44_A03384 +/* A04B3C 802422FC 0C0902D1 */ jal nok_14_UnkNpcAIFunc35 /* A04B40 80242300 0280302D */ daddu $a2, $s4, $zero /* A04B44 80242304 8E630070 */ lw $v1, 0x70($s3) /* A04B48 80242308 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s deleted file mode 100644 index 549a22c805..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244D58_A0BC58 -.double 0.09 - -dlabel D_80244D60_A0BC60 -.double 0.09 - -.section .text - -glabel func_80240C64_A07B64 -/* A07B64 80240C64 27BDFF80 */ addiu $sp, $sp, -0x80 -/* A07B68 80240C68 AFB3004C */ sw $s3, 0x4c($sp) -/* A07B6C 80240C6C 0080982D */ daddu $s3, $a0, $zero -/* A07B70 80240C70 AFBF0058 */ sw $ra, 0x58($sp) -/* A07B74 80240C74 AFB50054 */ sw $s5, 0x54($sp) -/* A07B78 80240C78 AFB40050 */ sw $s4, 0x50($sp) -/* A07B7C 80240C7C AFB20048 */ sw $s2, 0x48($sp) -/* A07B80 80240C80 AFB10044 */ sw $s1, 0x44($sp) -/* A07B84 80240C84 AFB00040 */ sw $s0, 0x40($sp) -/* A07B88 80240C88 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* A07B8C 80240C8C F7B80070 */ sdc1 $f24, 0x70($sp) -/* A07B90 80240C90 F7B60068 */ sdc1 $f22, 0x68($sp) -/* A07B94 80240C94 F7B40060 */ sdc1 $f20, 0x60($sp) -/* A07B98 80240C98 8E710148 */ lw $s1, 0x148($s3) -/* A07B9C 80240C9C 00A0902D */ daddu $s2, $a1, $zero -/* A07BA0 80240CA0 86240008 */ lh $a0, 8($s1) -/* A07BA4 80240CA4 0C00EABB */ jal get_npc_unsafe -/* A07BA8 80240CA8 00C0A82D */ daddu $s5, $a2, $zero -/* A07BAC 80240CAC 0040802D */ daddu $s0, $v0, $zero -/* A07BB0 80240CB0 0000A02D */ daddu $s4, $zero, $zero -/* A07BB4 80240CB4 C624007C */ lwc1 $f4, 0x7c($s1) -/* A07BB8 80240CB8 46802120 */ cvt.s.w $f4, $f4 -/* A07BBC 80240CBC C6220088 */ lwc1 $f2, 0x88($s1) -/* A07BC0 80240CC0 468010A0 */ cvt.s.w $f2, $f2 -/* A07BC4 80240CC4 460010A1 */ cvt.d.s $f2, $f2 -/* A07BC8 80240CC8 46002121 */ cvt.d.s $f4, $f4 -/* A07BCC 80240CCC C600003C */ lwc1 $f0, 0x3c($s0) -/* A07BD0 80240CD0 3C014059 */ lui $at, 0x4059 -/* A07BD4 80240CD4 44813800 */ mtc1 $at, $f7 -/* A07BD8 80240CD8 44803000 */ mtc1 $zero, $f6 -/* A07BDC 80240CDC 46000021 */ cvt.d.s $f0, $f0 -/* A07BE0 80240CE0 46260002 */ mul.d $f0, $f0, $f6 -/* A07BE4 80240CE4 00000000 */ nop -/* A07BE8 80240CE8 24020001 */ addiu $v0, $zero, 1 -/* A07BEC 80240CEC 8E24006C */ lw $a0, 0x6c($s1) -/* A07BF0 80240CF0 46261083 */ div.d $f2, $f2, $f6 -/* A07BF4 80240CF4 462010A0 */ cvt.s.d $f2, $f2 -/* A07BF8 80240CF8 46262103 */ div.d $f4, $f4, $f6 -/* A07BFC 80240CFC 46202520 */ cvt.s.d $f20, $f4 -/* A07C00 80240D00 30830011 */ andi $v1, $a0, 0x11 -/* A07C04 80240D04 4620020D */ trunc.w.d $f8, $f0 -/* A07C08 80240D08 E628007C */ swc1 $f8, 0x7c($s1) -/* A07C0C 80240D0C C6200078 */ lwc1 $f0, 0x78($s1) -/* A07C10 80240D10 46800020 */ cvt.s.w $f0, $f0 -/* A07C14 80240D14 46000021 */ cvt.d.s $f0, $f0 -/* A07C18 80240D18 46260003 */ div.d $f0, $f0, $f6 -/* A07C1C 80240D1C 462006A0 */ cvt.s.d $f26, $f0 -/* A07C20 80240D20 C6200070 */ lwc1 $f0, 0x70($s1) -/* A07C24 80240D24 46800020 */ cvt.s.w $f0, $f0 -/* A07C28 80240D28 46000021 */ cvt.d.s $f0, $f0 -/* A07C2C 80240D2C 46260003 */ div.d $f0, $f0, $f6 -/* A07C30 80240D30 462005A0 */ cvt.s.d $f22, $f0 -/* A07C34 80240D34 14620025 */ bne $v1, $v0, .L80240DCC -/* A07C38 80240D38 4602D600 */ add.s $f24, $f26, $f2 -/* A07C3C 80240D3C 8E020000 */ lw $v0, ($s0) -/* A07C40 80240D40 30420008 */ andi $v0, $v0, 8 -/* A07C44 80240D44 10400009 */ beqz $v0, .L80240D6C -/* A07C48 80240D48 27A50028 */ addiu $a1, $sp, 0x28 -/* A07C4C 80240D4C C600003C */ lwc1 $f0, 0x3c($s0) -/* A07C50 80240D50 4600C001 */ sub.s $f0, $f24, $f0 -/* A07C54 80240D54 4600B03C */ c.lt.s $f22, $f0 -/* A07C58 80240D58 00000000 */ nop -/* A07C5C 80240D5C 4500001B */ bc1f .L80240DCC -/* A07C60 80240D60 34820010 */ ori $v0, $a0, 0x10 -/* A07C64 80240D64 08090373 */ j .L80240DCC -/* A07C68 80240D68 AE22006C */ sw $v0, 0x6c($s1) -.L80240D6C: -/* A07C6C 80240D6C 27A6002C */ addiu $a2, $sp, 0x2c -/* A07C70 80240D70 C6000038 */ lwc1 $f0, 0x38($s0) -/* A07C74 80240D74 C602003C */ lwc1 $f2, 0x3c($s0) -/* A07C78 80240D78 C6040040 */ lwc1 $f4, 0x40($s0) -/* A07C7C 80240D7C 3C01447A */ lui $at, 0x447a -/* A07C80 80240D80 44813000 */ mtc1 $at, $f6 -/* A07C84 80240D84 27A20034 */ addiu $v0, $sp, 0x34 -/* A07C88 80240D88 E7A00028 */ swc1 $f0, 0x28($sp) -/* A07C8C 80240D8C E7A2002C */ swc1 $f2, 0x2c($sp) -/* A07C90 80240D90 E7A40030 */ swc1 $f4, 0x30($sp) -/* A07C94 80240D94 E7A60034 */ swc1 $f6, 0x34($sp) -/* A07C98 80240D98 AFA20010 */ sw $v0, 0x10($sp) -/* A07C9C 80240D9C 8E040080 */ lw $a0, 0x80($s0) -/* A07CA0 80240DA0 0C0372DF */ jal npc_raycast_down_sides -/* A07CA4 80240DA4 27A70030 */ addiu $a3, $sp, 0x30 -/* A07CA8 80240DA8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* A07CAC 80240DAC 4600D001 */ sub.s $f0, $f26, $f0 -/* A07CB0 80240DB0 4600B03C */ c.lt.s $f22, $f0 -/* A07CB4 80240DB4 00000000 */ nop -/* A07CB8 80240DB8 45000004 */ bc1f .L80240DCC -/* A07CBC 80240DBC 00000000 */ nop -/* A07CC0 80240DC0 8E22006C */ lw $v0, 0x6c($s1) -/* A07CC4 80240DC4 34420010 */ ori $v0, $v0, 0x10 -/* A07CC8 80240DC8 AE22006C */ sw $v0, 0x6c($s1) -.L80240DCC: -/* A07CCC 80240DCC 8E22006C */ lw $v0, 0x6c($s1) -/* A07CD0 80240DD0 24030011 */ addiu $v1, $zero, 0x11 -/* A07CD4 80240DD4 30420011 */ andi $v0, $v0, 0x11 -/* A07CD8 80240DD8 14430039 */ bne $v0, $v1, .L80240EC0 -/* A07CDC 80240DDC 00000000 */ nop -/* A07CE0 80240DE0 8E020000 */ lw $v0, ($s0) -/* A07CE4 80240DE4 30420008 */ andi $v0, $v0, 8 -/* A07CE8 80240DE8 1040000A */ beqz $v0, .L80240E14 -/* A07CEC 80240DEC 4600C106 */ mov.s $f4, $f24 -/* A07CF0 80240DF0 4614C081 */ sub.s $f2, $f24, $f20 -/* A07CF4 80240DF4 3C018024 */ lui $at, %hi(D_80244D58_A0BC58) -/* A07CF8 80240DF8 D4204D58 */ ldc1 $f0, %lo(D_80244D58_A0BC58)($at) -/* A07CFC 80240DFC 460010A1 */ cvt.d.s $f2, $f2 -/* A07D00 80240E00 46201082 */ mul.d $f2, $f2, $f0 -/* A07D04 80240E04 00000000 */ nop -/* A07D08 80240E08 4600A021 */ cvt.d.s $f0, $f20 -/* A07D0C 80240E0C 0809039E */ j .L80240E78 -/* A07D10 80240E10 46220000 */ add.d $f0, $f0, $f2 -.L80240E14: -/* A07D14 80240E14 27A50028 */ addiu $a1, $sp, 0x28 -/* A07D18 80240E18 27A6002C */ addiu $a2, $sp, 0x2c -/* A07D1C 80240E1C C6000038 */ lwc1 $f0, 0x38($s0) -/* A07D20 80240E20 C6020040 */ lwc1 $f2, 0x40($s0) -/* A07D24 80240E24 3C01447A */ lui $at, 0x447a -/* A07D28 80240E28 44812000 */ mtc1 $at, $f4 -/* A07D2C 80240E2C 27A20034 */ addiu $v0, $sp, 0x34 -/* A07D30 80240E30 E7B4002C */ swc1 $f20, 0x2c($sp) -/* A07D34 80240E34 E7A00028 */ swc1 $f0, 0x28($sp) -/* A07D38 80240E38 E7A20030 */ swc1 $f2, 0x30($sp) -/* A07D3C 80240E3C E7A40034 */ swc1 $f4, 0x34($sp) -/* A07D40 80240E40 AFA20010 */ sw $v0, 0x10($sp) -/* A07D44 80240E44 8E040080 */ lw $a0, 0x80($s0) -/* A07D48 80240E48 0C0372DF */ jal npc_raycast_down_sides -/* A07D4C 80240E4C 27A70030 */ addiu $a3, $sp, 0x30 -/* A07D50 80240E50 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* A07D54 80240E54 461A2100 */ add.s $f4, $f4, $f26 -/* A07D58 80240E58 46142081 */ sub.s $f2, $f4, $f20 -/* A07D5C 80240E5C 3C018024 */ lui $at, %hi(D_80244D60_A0BC60) -/* A07D60 80240E60 D4204D60 */ ldc1 $f0, %lo(D_80244D60_A0BC60)($at) -/* A07D64 80240E64 460010A1 */ cvt.d.s $f2, $f2 -/* A07D68 80240E68 46201082 */ mul.d $f2, $f2, $f0 -/* A07D6C 80240E6C 00000000 */ nop -/* A07D70 80240E70 4600A021 */ cvt.d.s $f0, $f20 -/* A07D74 80240E74 46220000 */ add.d $f0, $f0, $f2 -.L80240E78: -/* A07D78 80240E78 46200020 */ cvt.s.d $f0, $f0 -/* A07D7C 80240E7C E600003C */ swc1 $f0, 0x3c($s0) -/* A07D80 80240E80 C600003C */ lwc1 $f0, 0x3c($s0) -/* A07D84 80240E84 46002001 */ sub.s $f0, $f4, $f0 -/* A07D88 80240E88 3C013FF0 */ lui $at, 0x3ff0 -/* A07D8C 80240E8C 44811800 */ mtc1 $at, $f3 -/* A07D90 80240E90 44801000 */ mtc1 $zero, $f2 -/* A07D94 80240E94 46000005 */ abs.s $f0, $f0 -/* A07D98 80240E98 46000021 */ cvt.d.s $f0, $f0 -/* A07D9C 80240E9C 4622003C */ c.lt.d $f0, $f2 -/* A07DA0 80240EA0 00000000 */ nop -/* A07DA4 80240EA4 45000036 */ bc1f .L80240F80 -/* A07DA8 80240EA8 2403FFEF */ addiu $v1, $zero, -0x11 -/* A07DAC 80240EAC E604003C */ swc1 $f4, 0x3c($s0) -/* A07DB0 80240EB0 8E22006C */ lw $v0, 0x6c($s1) -/* A07DB4 80240EB4 00431024 */ and $v0, $v0, $v1 -/* A07DB8 80240EB8 080903E0 */ j .L80240F80 -/* A07DBC 80240EBC AE22006C */ sw $v0, 0x6c($s1) -.L80240EC0: -/* A07DC0 80240EC0 8E220070 */ lw $v0, 0x70($s1) -/* A07DC4 80240EC4 1840002E */ blez $v0, .L80240F80 -/* A07DC8 80240EC8 00000000 */ nop -/* A07DCC 80240ECC C62C0074 */ lwc1 $f12, 0x74($s1) -/* A07DD0 80240ED0 0C00A8BB */ jal sin_deg -/* A07DD4 80240ED4 46806320 */ cvt.s.w $f12, $f12 -/* A07DD8 80240ED8 8E020000 */ lw $v0, ($s0) -/* A07DDC 80240EDC 30420008 */ andi $v0, $v0, 8 -/* A07DE0 80240EE0 10400003 */ beqz $v0, .L80240EF0 -/* A07DE4 80240EE4 46000506 */ mov.s $f20, $f0 -/* A07DE8 80240EE8 080903CC */ j .L80240F30 -/* A07DEC 80240EEC 0000102D */ daddu $v0, $zero, $zero -.L80240EF0: -/* A07DF0 80240EF0 27A50028 */ addiu $a1, $sp, 0x28 -/* A07DF4 80240EF4 27A6002C */ addiu $a2, $sp, 0x2c -/* A07DF8 80240EF8 C6000038 */ lwc1 $f0, 0x38($s0) -/* A07DFC 80240EFC C602003C */ lwc1 $f2, 0x3c($s0) -/* A07E00 80240F00 C6040040 */ lwc1 $f4, 0x40($s0) -/* A07E04 80240F04 3C01447A */ lui $at, 0x447a -/* A07E08 80240F08 44813000 */ mtc1 $at, $f6 -/* A07E0C 80240F0C 27A20034 */ addiu $v0, $sp, 0x34 -/* A07E10 80240F10 E7A00028 */ swc1 $f0, 0x28($sp) -/* A07E14 80240F14 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A07E18 80240F18 E7A40030 */ swc1 $f4, 0x30($sp) -/* A07E1C 80240F1C E7A60034 */ swc1 $f6, 0x34($sp) -/* A07E20 80240F20 AFA20010 */ sw $v0, 0x10($sp) -/* A07E24 80240F24 8E040080 */ lw $a0, 0x80($s0) -/* A07E28 80240F28 0C0372DF */ jal npc_raycast_down_sides -/* A07E2C 80240F2C 27A70030 */ addiu $a3, $sp, 0x30 -.L80240F30: -/* A07E30 80240F30 10400007 */ beqz $v0, .L80240F50 -/* A07E34 80240F34 00000000 */ nop -/* A07E38 80240F38 4616A082 */ mul.s $f2, $f20, $f22 -/* A07E3C 80240F3C 00000000 */ nop -/* A07E40 80240F40 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A07E44 80240F44 461A0000 */ add.s $f0, $f0, $f26 -/* A07E48 80240F48 080903D7 */ j .L80240F5C -/* A07E4C 80240F4C 46020000 */ add.s $f0, $f0, $f2 -.L80240F50: -/* A07E50 80240F50 4616A002 */ mul.s $f0, $f20, $f22 -/* A07E54 80240F54 00000000 */ nop -/* A07E58 80240F58 4600C000 */ add.s $f0, $f24, $f0 -.L80240F5C: -/* A07E5C 80240F5C E600003C */ swc1 $f0, 0x3c($s0) -/* A07E60 80240F60 8E220074 */ lw $v0, 0x74($s1) -/* A07E64 80240F64 2442000A */ addiu $v0, $v0, 0xa -/* A07E68 80240F68 44826000 */ mtc1 $v0, $f12 -/* A07E6C 80240F6C 00000000 */ nop -/* A07E70 80240F70 0C00A6C9 */ jal clamp_angle -/* A07E74 80240F74 46806320 */ cvt.s.w $f12, $f12 -/* A07E78 80240F78 4600020D */ trunc.w.s $f8, $f0 -/* A07E7C 80240F7C E6280074 */ swc1 $f8, 0x74($s1) -.L80240F80: -/* A07E80 80240F80 8E220090 */ lw $v0, 0x90($s1) -/* A07E84 80240F84 1C40004A */ bgtz $v0, .L802410B0 -/* A07E88 80240F88 2442FFFF */ addiu $v0, $v0, -1 -/* A07E8C 80240F8C 8E430014 */ lw $v1, 0x14($s2) -/* A07E90 80240F90 04600048 */ bltz $v1, .L802410B4 -/* A07E94 80240F94 00000000 */ nop -/* A07E98 80240F98 8E620074 */ lw $v0, 0x74($s3) -/* A07E9C 80240F9C 1C400042 */ bgtz $v0, .L802410A8 -/* A07EA0 80240FA0 2442FFFF */ addiu $v0, $v0, -1 -/* A07EA4 80240FA4 AE630074 */ sw $v1, 0x74($s3) -/* A07EA8 80240FA8 860200A8 */ lh $v0, 0xa8($s0) -/* A07EAC 80240FAC C602003C */ lwc1 $f2, 0x3c($s0) -/* A07EB0 80240FB0 44820000 */ mtc1 $v0, $f0 -/* A07EB4 80240FB4 00000000 */ nop -/* A07EB8 80240FB8 46800020 */ cvt.s.w $f0, $f0 -/* A07EBC 80240FBC 46001080 */ add.s $f2, $f2, $f0 -/* A07EC0 80240FC0 3C014024 */ lui $at, 0x4024 -/* A07EC4 80240FC4 44810800 */ mtc1 $at, $f1 -/* A07EC8 80240FC8 44800000 */ mtc1 $zero, $f0 -/* A07ECC 80240FCC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A07ED0 80240FD0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A07ED4 80240FD4 460010A1 */ cvt.d.s $f2, $f2 -/* A07ED8 80240FD8 46201080 */ add.d $f2, $f2, $f0 -/* A07EDC 80240FDC C440002C */ lwc1 $f0, 0x2c($v0) -/* A07EE0 80240FE0 46000021 */ cvt.d.s $f0, $f0 -/* A07EE4 80240FE4 4622003C */ c.lt.d $f0, $f2 -/* A07EE8 80240FE8 00000000 */ nop -/* A07EEC 80240FEC 4500002C */ bc1f .L802410A0 -/* A07EF0 80240FF0 02A0202D */ daddu $a0, $s5, $zero -/* A07EF4 80240FF4 AFA00010 */ sw $zero, 0x10($sp) -/* A07EF8 80240FF8 8E46000C */ lw $a2, 0xc($s2) -/* A07EFC 80240FFC 8E470010 */ lw $a3, 0x10($s2) -/* A07F00 80241000 0C01242D */ jal func_800490B4 -/* A07F04 80241004 0220282D */ daddu $a1, $s1, $zero -/* A07F08 80241008 10400025 */ beqz $v0, .L802410A0 -/* A07F0C 8024100C 0000202D */ daddu $a0, $zero, $zero -/* A07F10 80241010 0200282D */ daddu $a1, $s0, $zero -/* A07F14 80241014 0000302D */ daddu $a2, $zero, $zero -/* A07F18 80241018 2412000C */ addiu $s2, $zero, 0xc -/* A07F1C 8024101C 860300A8 */ lh $v1, 0xa8($s0) -/* A07F20 80241020 3C013F80 */ lui $at, 0x3f80 -/* A07F24 80241024 44810000 */ mtc1 $at, $f0 -/* A07F28 80241028 3C014000 */ lui $at, 0x4000 -/* A07F2C 8024102C 44811000 */ mtc1 $at, $f2 -/* A07F30 80241030 3C01C1A0 */ lui $at, 0xc1a0 -/* A07F34 80241034 44812000 */ mtc1 $at, $f4 -/* A07F38 80241038 44834000 */ mtc1 $v1, $f8 -/* A07F3C 8024103C 00000000 */ nop -/* A07F40 80241040 46804220 */ cvt.s.w $f8, $f8 -/* A07F44 80241044 44074000 */ mfc1 $a3, $f8 -/* A07F48 80241048 27A20038 */ addiu $v0, $sp, 0x38 -/* A07F4C 8024104C AFB2001C */ sw $s2, 0x1c($sp) -/* A07F50 80241050 AFA20020 */ sw $v0, 0x20($sp) -/* A07F54 80241054 E7A00010 */ swc1 $f0, 0x10($sp) -/* A07F58 80241058 E7A20014 */ swc1 $f2, 0x14($sp) -/* A07F5C 8024105C 0C01BFA4 */ jal fx_emote -/* A07F60 80241060 E7A40018 */ swc1 $f4, 0x18($sp) -/* A07F64 80241064 0200202D */ daddu $a0, $s0, $zero -/* A07F68 80241068 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A07F6C 8024106C C480003C */ lwc1 $f0, 0x3c($a0) -/* A07F70 80241070 3C060020 */ lui $a2, 0x20 -/* A07F74 80241074 0C012530 */ jal ai_enemy_play_sound -/* A07F78 80241078 E4800064 */ swc1 $f0, 0x64($a0) -/* A07F7C 8024107C 8E220018 */ lw $v0, 0x18($s1) -/* A07F80 80241080 9442002A */ lhu $v0, 0x2a($v0) -/* A07F84 80241084 30420001 */ andi $v0, $v0, 1 -/* A07F88 80241088 10400003 */ beqz $v0, .L80241098 -/* A07F8C 8024108C 2402000A */ addiu $v0, $zero, 0xa -/* A07F90 80241090 08090496 */ j .L80241258 -/* A07F94 80241094 AE620070 */ sw $v0, 0x70($s3) -.L80241098: -/* A07F98 80241098 08090496 */ j .L80241258 -/* A07F9C 8024109C AE720070 */ sw $s2, 0x70($s3) -.L802410A0: -/* A07FA0 802410A0 8E620074 */ lw $v0, 0x74($s3) -/* A07FA4 802410A4 2442FFFF */ addiu $v0, $v0, -1 -.L802410A8: -/* A07FA8 802410A8 0809042D */ j .L802410B4 -/* A07FAC 802410AC AE620074 */ sw $v0, 0x74($s3) -.L802410B0: -/* A07FB0 802410B0 AE220090 */ sw $v0, 0x90($s1) -.L802410B4: -/* A07FB4 802410B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A07FB8 802410B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* A07FBC 802410BC C4620000 */ lwc1 $f2, ($v1) -/* A07FC0 802410C0 468010A0 */ cvt.s.w $f2, $f2 -/* A07FC4 802410C4 C4640008 */ lwc1 $f4, 8($v1) -/* A07FC8 802410C8 46802120 */ cvt.s.w $f4, $f4 -/* A07FCC 802410CC E7A00010 */ swc1 $f0, 0x10($sp) -/* A07FD0 802410D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* A07FD4 802410D4 44051000 */ mfc1 $a1, $f2 -/* A07FD8 802410D8 C440000C */ lwc1 $f0, 0xc($v0) -/* A07FDC 802410DC 46800020 */ cvt.s.w $f0, $f0 -/* A07FE0 802410E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* A07FE4 802410E4 8E2200D0 */ lw $v0, 0xd0($s1) -/* A07FE8 802410E8 44062000 */ mfc1 $a2, $f4 -/* A07FEC 802410EC C4400010 */ lwc1 $f0, 0x10($v0) -/* A07FF0 802410F0 46800020 */ cvt.s.w $f0, $f0 -/* A07FF4 802410F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* A07FF8 802410F8 8C640018 */ lw $a0, 0x18($v1) -/* A07FFC 802410FC 0C0123F5 */ jal is_point_within_region -/* A08000 80241100 8E070038 */ lw $a3, 0x38($s0) -/* A08004 80241104 1040001A */ beqz $v0, .L80241170 -/* A08008 80241108 00000000 */ nop -/* A0800C 8024110C 8E060038 */ lw $a2, 0x38($s0) -/* A08010 80241110 8E2200D0 */ lw $v0, 0xd0($s1) -/* A08014 80241114 8E070040 */ lw $a3, 0x40($s0) -/* A08018 80241118 C44C0000 */ lwc1 $f12, ($v0) -/* A0801C 8024111C 46806320 */ cvt.s.w $f12, $f12 -/* A08020 80241120 C44E0008 */ lwc1 $f14, 8($v0) -/* A08024 80241124 0C00A7B5 */ jal dist2D -/* A08028 80241128 468073A0 */ cvt.s.w $f14, $f14 -/* A0802C 8024112C C6020018 */ lwc1 $f2, 0x18($s0) -/* A08030 80241130 4600103C */ c.lt.s $f2, $f0 -/* A08034 80241134 00000000 */ nop -/* A08038 80241138 4500000D */ bc1f .L80241170 -/* A0803C 8024113C E7A00034 */ swc1 $f0, 0x34($sp) -/* A08040 80241140 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A08044 80241144 8E2200D0 */ lw $v0, 0xd0($s1) -/* A08048 80241148 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A0804C 8024114C C4480000 */ lwc1 $f8, ($v0) -/* A08050 80241150 46804220 */ cvt.s.w $f8, $f8 -/* A08054 80241154 44064000 */ mfc1 $a2, $f8 -/* A08058 80241158 C4480008 */ lwc1 $f8, 8($v0) -/* A0805C 8024115C 46804220 */ cvt.s.w $f8, $f8 -/* A08060 80241160 44074000 */ mfc1 $a3, $f8 -/* A08064 80241164 0C00A720 */ jal atan2 -/* A08068 80241168 24140001 */ addiu $s4, $zero, 1 -/* A0806C 8024116C E600000C */ swc1 $f0, 0xc($s0) -.L80241170: -/* A08070 80241170 8E2200D0 */ lw $v0, 0xd0($s1) -/* A08074 80241174 8C43000C */ lw $v1, 0xc($v0) -/* A08078 80241178 8C420010 */ lw $v0, 0x10($v0) -/* A0807C 8024117C 00621825 */ or $v1, $v1, $v0 -/* A08080 80241180 00741825 */ or $v1, $v1, $s4 -/* A08084 80241184 10600008 */ beqz $v1, .L802411A8 -/* A08088 80241188 00000000 */ nop -/* A0808C 8024118C 8602008C */ lh $v0, 0x8c($s0) -/* A08090 80241190 14400031 */ bnez $v0, .L80241258 -/* A08094 80241194 00000000 */ nop -/* A08098 80241198 8E050018 */ lw $a1, 0x18($s0) -/* A0809C 8024119C 8E06000C */ lw $a2, 0xc($s0) -/* A080A0 802411A0 0C00EA95 */ jal npc_move_heading -/* A080A4 802411A4 0200202D */ daddu $a0, $s0, $zero -.L802411A8: -/* A080A8 802411A8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A080AC 802411AC 3C014059 */ lui $at, 0x4059 -/* A080B0 802411B0 44811800 */ mtc1 $at, $f3 -/* A080B4 802411B4 44801000 */ mtc1 $zero, $f2 -/* A080B8 802411B8 46000021 */ cvt.d.s $f0, $f0 -/* A080BC 802411BC 46220002 */ mul.d $f0, $f0, $f2 -/* A080C0 802411C0 00000000 */ nop -/* A080C4 802411C4 4620020D */ trunc.w.d $f8, $f0 -/* A080C8 802411C8 E628007C */ swc1 $f8, 0x7c($s1) -/* A080CC 802411CC 8E420004 */ lw $v0, 4($s2) -/* A080D0 802411D0 18400021 */ blez $v0, .L80241258 -/* A080D4 802411D4 00000000 */ nop -/* A080D8 802411D8 8602008E */ lh $v0, 0x8e($s0) -/* A080DC 802411DC 9603008E */ lhu $v1, 0x8e($s0) -/* A080E0 802411E0 18400005 */ blez $v0, .L802411F8 -/* A080E4 802411E4 2462FFFF */ addiu $v0, $v1, -1 -/* A080E8 802411E8 A602008E */ sh $v0, 0x8e($s0) -/* A080EC 802411EC 00021400 */ sll $v0, $v0, 0x10 -/* A080F0 802411F0 1C400019 */ bgtz $v0, .L80241258 -/* A080F4 802411F4 00000000 */ nop -.L802411F8: -/* A080F8 802411F8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A080FC 802411FC 24020002 */ addiu $v0, $zero, 2 -/* A08100 80241200 0C00A67F */ jal rand_int -/* A08104 80241204 AE620070 */ sw $v0, 0x70($s3) -/* A08108 80241208 3C035555 */ lui $v1, 0x5555 -/* A0810C 8024120C 34635556 */ ori $v1, $v1, 0x5556 -/* A08110 80241210 00430018 */ mult $v0, $v1 -/* A08114 80241214 000227C3 */ sra $a0, $v0, 0x1f -/* A08118 80241218 00004010 */ mfhi $t0 -/* A0811C 8024121C 01042023 */ subu $a0, $t0, $a0 -/* A08120 80241220 00041840 */ sll $v1, $a0, 1 -/* A08124 80241224 00641821 */ addu $v1, $v1, $a0 -/* A08128 80241228 00431023 */ subu $v0, $v0, $v1 -/* A0812C 8024122C 24430002 */ addiu $v1, $v0, 2 -/* A08130 80241230 AE630074 */ sw $v1, 0x74($s3) -/* A08134 80241234 8E42002C */ lw $v0, 0x2c($s2) -/* A08138 80241238 58400007 */ blezl $v0, .L80241258 -/* A0813C 8024123C AE600070 */ sw $zero, 0x70($s3) -/* A08140 80241240 8E420008 */ lw $v0, 8($s2) -/* A08144 80241244 18400003 */ blez $v0, .L80241254 -/* A08148 80241248 28620003 */ slti $v0, $v1, 3 -/* A0814C 8024124C 10400002 */ beqz $v0, .L80241258 -/* A08150 80241250 00000000 */ nop -.L80241254: -/* A08154 80241254 AE600070 */ sw $zero, 0x70($s3) -.L80241258: -/* A08158 80241258 8FBF0058 */ lw $ra, 0x58($sp) -/* A0815C 8024125C 8FB50054 */ lw $s5, 0x54($sp) -/* A08160 80241260 8FB40050 */ lw $s4, 0x50($sp) -/* A08164 80241264 8FB3004C */ lw $s3, 0x4c($sp) -/* A08168 80241268 8FB20048 */ lw $s2, 0x48($sp) -/* A0816C 8024126C 8FB10044 */ lw $s1, 0x44($sp) -/* A08170 80241270 8FB00040 */ lw $s0, 0x40($sp) -/* A08174 80241274 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* A08178 80241278 D7B80070 */ ldc1 $f24, 0x70($sp) -/* A0817C 8024127C D7B60068 */ ldc1 $f22, 0x68($sp) -/* A08180 80241280 D7B40060 */ ldc1 $f20, 0x60($sp) -/* A08184 80241284 03E00008 */ jr $ra -/* A08188 80241288 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s index 7b17489b39..58dd4718c5 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s @@ -86,7 +86,7 @@ glabel func_80241DC0_A08CC0 .L80241EDC_A08DDC: /* A08DDC 80241EDC 0280202D */ daddu $a0, $s4, $zero /* A08DE0 80241EE0 0200282D */ daddu $a1, $s0, $zero -/* A08DE4 80241EE4 0C090319 */ jal func_80240C64_A07B64 +/* A08DE4 80241EE4 0C090319 */ jal nok_15_UnkNpcAIFunc35 /* A08DE8 80241EE8 0260302D */ daddu $a2, $s3, $zero /* A08DEC 80241EEC 080907E2 */ j .L80241F88 /* A08DF0 80241EF0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s index 0987556625..e5c561e3cc 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s @@ -89,7 +89,7 @@ glabel func_802422EC_A091EC .L80242414_A09314: /* A09314 80242414 0260202D */ daddu $a0, $s3, $zero /* A09318 80242418 0200282D */ daddu $a1, $s0, $zero -/* A0931C 8024241C 0C090319 */ jal func_80240C64_A07B64 +/* A0931C 8024241C 0C090319 */ jal nok_15_UnkNpcAIFunc35 /* A09320 80242420 0280302D */ daddu $a2, $s4, $zero /* A09324 80242424 8E630070 */ lw $v1, 0x70($s3) /* A09328 80242428 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s deleted file mode 100644 index 78772eae23..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244CB8_DB20B8 -.double 0.09 - -dlabel D_80244CC0_DB20C0 -.double 0.09 - -.section .text - -glabel func_80240550_DAD950 -/* DAD950 80240550 27BDFF80 */ addiu $sp, $sp, -0x80 -/* DAD954 80240554 AFB3004C */ sw $s3, 0x4c($sp) -/* DAD958 80240558 0080982D */ daddu $s3, $a0, $zero -/* DAD95C 8024055C AFBF0058 */ sw $ra, 0x58($sp) -/* DAD960 80240560 AFB50054 */ sw $s5, 0x54($sp) -/* DAD964 80240564 AFB40050 */ sw $s4, 0x50($sp) -/* DAD968 80240568 AFB20048 */ sw $s2, 0x48($sp) -/* DAD96C 8024056C AFB10044 */ sw $s1, 0x44($sp) -/* DAD970 80240570 AFB00040 */ sw $s0, 0x40($sp) -/* DAD974 80240574 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* DAD978 80240578 F7B80070 */ sdc1 $f24, 0x70($sp) -/* DAD97C 8024057C F7B60068 */ sdc1 $f22, 0x68($sp) -/* DAD980 80240580 F7B40060 */ sdc1 $f20, 0x60($sp) -/* DAD984 80240584 8E710148 */ lw $s1, 0x148($s3) -/* DAD988 80240588 00A0902D */ daddu $s2, $a1, $zero -/* DAD98C 8024058C 86240008 */ lh $a0, 8($s1) -/* DAD990 80240590 0C00EABB */ jal get_npc_unsafe -/* DAD994 80240594 00C0A82D */ daddu $s5, $a2, $zero -/* DAD998 80240598 0040802D */ daddu $s0, $v0, $zero -/* DAD99C 8024059C 0000A02D */ daddu $s4, $zero, $zero -/* DAD9A0 802405A0 C624007C */ lwc1 $f4, 0x7c($s1) -/* DAD9A4 802405A4 46802120 */ cvt.s.w $f4, $f4 -/* DAD9A8 802405A8 C6220088 */ lwc1 $f2, 0x88($s1) -/* DAD9AC 802405AC 468010A0 */ cvt.s.w $f2, $f2 -/* DAD9B0 802405B0 460010A1 */ cvt.d.s $f2, $f2 -/* DAD9B4 802405B4 46002121 */ cvt.d.s $f4, $f4 -/* DAD9B8 802405B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAD9BC 802405BC 3C014059 */ lui $at, 0x4059 -/* DAD9C0 802405C0 44813800 */ mtc1 $at, $f7 -/* DAD9C4 802405C4 44803000 */ mtc1 $zero, $f6 -/* DAD9C8 802405C8 46000021 */ cvt.d.s $f0, $f0 -/* DAD9CC 802405CC 46260002 */ mul.d $f0, $f0, $f6 -/* DAD9D0 802405D0 00000000 */ nop -/* DAD9D4 802405D4 24020001 */ addiu $v0, $zero, 1 -/* DAD9D8 802405D8 8E24006C */ lw $a0, 0x6c($s1) -/* DAD9DC 802405DC 46261083 */ div.d $f2, $f2, $f6 -/* DAD9E0 802405E0 462010A0 */ cvt.s.d $f2, $f2 -/* DAD9E4 802405E4 46262103 */ div.d $f4, $f4, $f6 -/* DAD9E8 802405E8 46202520 */ cvt.s.d $f20, $f4 -/* DAD9EC 802405EC 30830011 */ andi $v1, $a0, 0x11 -/* DAD9F0 802405F0 4620020D */ trunc.w.d $f8, $f0 -/* DAD9F4 802405F4 E628007C */ swc1 $f8, 0x7c($s1) -/* DAD9F8 802405F8 C6200078 */ lwc1 $f0, 0x78($s1) -/* DAD9FC 802405FC 46800020 */ cvt.s.w $f0, $f0 -/* DADA00 80240600 46000021 */ cvt.d.s $f0, $f0 -/* DADA04 80240604 46260003 */ div.d $f0, $f0, $f6 -/* DADA08 80240608 462006A0 */ cvt.s.d $f26, $f0 -/* DADA0C 8024060C C6200070 */ lwc1 $f0, 0x70($s1) -/* DADA10 80240610 46800020 */ cvt.s.w $f0, $f0 -/* DADA14 80240614 46000021 */ cvt.d.s $f0, $f0 -/* DADA18 80240618 46260003 */ div.d $f0, $f0, $f6 -/* DADA1C 8024061C 462005A0 */ cvt.s.d $f22, $f0 -/* DADA20 80240620 14620025 */ bne $v1, $v0, .L802406B8 -/* DADA24 80240624 4602D600 */ add.s $f24, $f26, $f2 -/* DADA28 80240628 8E020000 */ lw $v0, ($s0) -/* DADA2C 8024062C 30420008 */ andi $v0, $v0, 8 -/* DADA30 80240630 10400009 */ beqz $v0, .L80240658 -/* DADA34 80240634 27A50028 */ addiu $a1, $sp, 0x28 -/* DADA38 80240638 C600003C */ lwc1 $f0, 0x3c($s0) -/* DADA3C 8024063C 4600C001 */ sub.s $f0, $f24, $f0 -/* DADA40 80240640 4600B03C */ c.lt.s $f22, $f0 -/* DADA44 80240644 00000000 */ nop -/* DADA48 80240648 4500001B */ bc1f .L802406B8 -/* DADA4C 8024064C 34820010 */ ori $v0, $a0, 0x10 -/* DADA50 80240650 080901AE */ j .L802406B8 -/* DADA54 80240654 AE22006C */ sw $v0, 0x6c($s1) -.L80240658: -/* DADA58 80240658 27A6002C */ addiu $a2, $sp, 0x2c -/* DADA5C 8024065C C6000038 */ lwc1 $f0, 0x38($s0) -/* DADA60 80240660 C602003C */ lwc1 $f2, 0x3c($s0) -/* DADA64 80240664 C6040040 */ lwc1 $f4, 0x40($s0) -/* DADA68 80240668 3C01447A */ lui $at, 0x447a -/* DADA6C 8024066C 44813000 */ mtc1 $at, $f6 -/* DADA70 80240670 27A20034 */ addiu $v0, $sp, 0x34 -/* DADA74 80240674 E7A00028 */ swc1 $f0, 0x28($sp) -/* DADA78 80240678 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DADA7C 8024067C E7A40030 */ swc1 $f4, 0x30($sp) -/* DADA80 80240680 E7A60034 */ swc1 $f6, 0x34($sp) -/* DADA84 80240684 AFA20010 */ sw $v0, 0x10($sp) -/* DADA88 80240688 8E040080 */ lw $a0, 0x80($s0) -/* DADA8C 8024068C 0C0372DF */ jal npc_raycast_down_sides -/* DADA90 80240690 27A70030 */ addiu $a3, $sp, 0x30 -/* DADA94 80240694 C7A00034 */ lwc1 $f0, 0x34($sp) -/* DADA98 80240698 4600D001 */ sub.s $f0, $f26, $f0 -/* DADA9C 8024069C 4600B03C */ c.lt.s $f22, $f0 -/* DADAA0 802406A0 00000000 */ nop -/* DADAA4 802406A4 45000004 */ bc1f .L802406B8 -/* DADAA8 802406A8 00000000 */ nop -/* DADAAC 802406AC 8E22006C */ lw $v0, 0x6c($s1) -/* DADAB0 802406B0 34420010 */ ori $v0, $v0, 0x10 -/* DADAB4 802406B4 AE22006C */ sw $v0, 0x6c($s1) -.L802406B8: -/* DADAB8 802406B8 8E22006C */ lw $v0, 0x6c($s1) -/* DADABC 802406BC 24030011 */ addiu $v1, $zero, 0x11 -/* DADAC0 802406C0 30420011 */ andi $v0, $v0, 0x11 -/* DADAC4 802406C4 14430039 */ bne $v0, $v1, .L802407AC -/* DADAC8 802406C8 00000000 */ nop -/* DADACC 802406CC 8E020000 */ lw $v0, ($s0) -/* DADAD0 802406D0 30420008 */ andi $v0, $v0, 8 -/* DADAD4 802406D4 1040000A */ beqz $v0, .L80240700 -/* DADAD8 802406D8 4600C106 */ mov.s $f4, $f24 -/* DADADC 802406DC 4614C081 */ sub.s $f2, $f24, $f20 -/* DADAE0 802406E0 3C018024 */ lui $at, %hi(D_80244CB8_DB20B8) -/* DADAE4 802406E4 D4204CB8 */ ldc1 $f0, %lo(D_80244CB8_DB20B8)($at) -/* DADAE8 802406E8 460010A1 */ cvt.d.s $f2, $f2 -/* DADAEC 802406EC 46201082 */ mul.d $f2, $f2, $f0 -/* DADAF0 802406F0 00000000 */ nop -/* DADAF4 802406F4 4600A021 */ cvt.d.s $f0, $f20 -/* DADAF8 802406F8 080901D9 */ j .L80240764 -/* DADAFC 802406FC 46220000 */ add.d $f0, $f0, $f2 -.L80240700: -/* DADB00 80240700 27A50028 */ addiu $a1, $sp, 0x28 -/* DADB04 80240704 27A6002C */ addiu $a2, $sp, 0x2c -/* DADB08 80240708 C6000038 */ lwc1 $f0, 0x38($s0) -/* DADB0C 8024070C C6020040 */ lwc1 $f2, 0x40($s0) -/* DADB10 80240710 3C01447A */ lui $at, 0x447a -/* DADB14 80240714 44812000 */ mtc1 $at, $f4 -/* DADB18 80240718 27A20034 */ addiu $v0, $sp, 0x34 -/* DADB1C 8024071C E7B4002C */ swc1 $f20, 0x2c($sp) -/* DADB20 80240720 E7A00028 */ swc1 $f0, 0x28($sp) -/* DADB24 80240724 E7A20030 */ swc1 $f2, 0x30($sp) -/* DADB28 80240728 E7A40034 */ swc1 $f4, 0x34($sp) -/* DADB2C 8024072C AFA20010 */ sw $v0, 0x10($sp) -/* DADB30 80240730 8E040080 */ lw $a0, 0x80($s0) -/* DADB34 80240734 0C0372DF */ jal npc_raycast_down_sides -/* DADB38 80240738 27A70030 */ addiu $a3, $sp, 0x30 -/* DADB3C 8024073C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* DADB40 80240740 461A2100 */ add.s $f4, $f4, $f26 -/* DADB44 80240744 46142081 */ sub.s $f2, $f4, $f20 -/* DADB48 80240748 3C018024 */ lui $at, %hi(D_80244CC0_DB20C0) -/* DADB4C 8024074C D4204CC0 */ ldc1 $f0, %lo(D_80244CC0_DB20C0)($at) -/* DADB50 80240750 460010A1 */ cvt.d.s $f2, $f2 -/* DADB54 80240754 46201082 */ mul.d $f2, $f2, $f0 -/* DADB58 80240758 00000000 */ nop -/* DADB5C 8024075C 4600A021 */ cvt.d.s $f0, $f20 -/* DADB60 80240760 46220000 */ add.d $f0, $f0, $f2 -.L80240764: -/* DADB64 80240764 46200020 */ cvt.s.d $f0, $f0 -/* DADB68 80240768 E600003C */ swc1 $f0, 0x3c($s0) -/* DADB6C 8024076C C600003C */ lwc1 $f0, 0x3c($s0) -/* DADB70 80240770 46002001 */ sub.s $f0, $f4, $f0 -/* DADB74 80240774 3C013FF0 */ lui $at, 0x3ff0 -/* DADB78 80240778 44811800 */ mtc1 $at, $f3 -/* DADB7C 8024077C 44801000 */ mtc1 $zero, $f2 -/* DADB80 80240780 46000005 */ abs.s $f0, $f0 -/* DADB84 80240784 46000021 */ cvt.d.s $f0, $f0 -/* DADB88 80240788 4622003C */ c.lt.d $f0, $f2 -/* DADB8C 8024078C 00000000 */ nop -/* DADB90 80240790 45000036 */ bc1f .L8024086C -/* DADB94 80240794 2403FFEF */ addiu $v1, $zero, -0x11 -/* DADB98 80240798 E604003C */ swc1 $f4, 0x3c($s0) -/* DADB9C 8024079C 8E22006C */ lw $v0, 0x6c($s1) -/* DADBA0 802407A0 00431024 */ and $v0, $v0, $v1 -/* DADBA4 802407A4 0809021B */ j .L8024086C -/* DADBA8 802407A8 AE22006C */ sw $v0, 0x6c($s1) -.L802407AC: -/* DADBAC 802407AC 8E220070 */ lw $v0, 0x70($s1) -/* DADBB0 802407B0 1840002E */ blez $v0, .L8024086C -/* DADBB4 802407B4 00000000 */ nop -/* DADBB8 802407B8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* DADBBC 802407BC 0C00A8BB */ jal sin_deg -/* DADBC0 802407C0 46806320 */ cvt.s.w $f12, $f12 -/* DADBC4 802407C4 8E020000 */ lw $v0, ($s0) -/* DADBC8 802407C8 30420008 */ andi $v0, $v0, 8 -/* DADBCC 802407CC 10400003 */ beqz $v0, .L802407DC -/* DADBD0 802407D0 46000506 */ mov.s $f20, $f0 -/* DADBD4 802407D4 08090207 */ j .L8024081C -/* DADBD8 802407D8 0000102D */ daddu $v0, $zero, $zero -.L802407DC: -/* DADBDC 802407DC 27A50028 */ addiu $a1, $sp, 0x28 -/* DADBE0 802407E0 27A6002C */ addiu $a2, $sp, 0x2c -/* DADBE4 802407E4 C6000038 */ lwc1 $f0, 0x38($s0) -/* DADBE8 802407E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* DADBEC 802407EC C6040040 */ lwc1 $f4, 0x40($s0) -/* DADBF0 802407F0 3C01447A */ lui $at, 0x447a -/* DADBF4 802407F4 44813000 */ mtc1 $at, $f6 -/* DADBF8 802407F8 27A20034 */ addiu $v0, $sp, 0x34 -/* DADBFC 802407FC E7A00028 */ swc1 $f0, 0x28($sp) -/* DADC00 80240800 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DADC04 80240804 E7A40030 */ swc1 $f4, 0x30($sp) -/* DADC08 80240808 E7A60034 */ swc1 $f6, 0x34($sp) -/* DADC0C 8024080C AFA20010 */ sw $v0, 0x10($sp) -/* DADC10 80240810 8E040080 */ lw $a0, 0x80($s0) -/* DADC14 80240814 0C0372DF */ jal npc_raycast_down_sides -/* DADC18 80240818 27A70030 */ addiu $a3, $sp, 0x30 -.L8024081C: -/* DADC1C 8024081C 10400007 */ beqz $v0, .L8024083C -/* DADC20 80240820 00000000 */ nop -/* DADC24 80240824 4616A082 */ mul.s $f2, $f20, $f22 -/* DADC28 80240828 00000000 */ nop -/* DADC2C 8024082C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DADC30 80240830 461A0000 */ add.s $f0, $f0, $f26 -/* DADC34 80240834 08090212 */ j .L80240848 -/* DADC38 80240838 46020000 */ add.s $f0, $f0, $f2 -.L8024083C: -/* DADC3C 8024083C 4616A002 */ mul.s $f0, $f20, $f22 -/* DADC40 80240840 00000000 */ nop -/* DADC44 80240844 4600C000 */ add.s $f0, $f24, $f0 -.L80240848: -/* DADC48 80240848 E600003C */ swc1 $f0, 0x3c($s0) -/* DADC4C 8024084C 8E220074 */ lw $v0, 0x74($s1) -/* DADC50 80240850 2442000A */ addiu $v0, $v0, 0xa -/* DADC54 80240854 44826000 */ mtc1 $v0, $f12 -/* DADC58 80240858 00000000 */ nop -/* DADC5C 8024085C 0C00A6C9 */ jal clamp_angle -/* DADC60 80240860 46806320 */ cvt.s.w $f12, $f12 -/* DADC64 80240864 4600020D */ trunc.w.s $f8, $f0 -/* DADC68 80240868 E6280074 */ swc1 $f8, 0x74($s1) -.L8024086C: -/* DADC6C 8024086C 8E220090 */ lw $v0, 0x90($s1) -/* DADC70 80240870 1C40004A */ bgtz $v0, .L8024099C -/* DADC74 80240874 2442FFFF */ addiu $v0, $v0, -1 -/* DADC78 80240878 8E430014 */ lw $v1, 0x14($s2) -/* DADC7C 8024087C 04600048 */ bltz $v1, .L802409A0 -/* DADC80 80240880 00000000 */ nop -/* DADC84 80240884 8E620074 */ lw $v0, 0x74($s3) -/* DADC88 80240888 1C400042 */ bgtz $v0, .L80240994 -/* DADC8C 8024088C 2442FFFF */ addiu $v0, $v0, -1 -/* DADC90 80240890 AE630074 */ sw $v1, 0x74($s3) -/* DADC94 80240894 860200A8 */ lh $v0, 0xa8($s0) -/* DADC98 80240898 C602003C */ lwc1 $f2, 0x3c($s0) -/* DADC9C 8024089C 44820000 */ mtc1 $v0, $f0 -/* DADCA0 802408A0 00000000 */ nop -/* DADCA4 802408A4 46800020 */ cvt.s.w $f0, $f0 -/* DADCA8 802408A8 46001080 */ add.s $f2, $f2, $f0 -/* DADCAC 802408AC 3C014024 */ lui $at, 0x4024 -/* DADCB0 802408B0 44810800 */ mtc1 $at, $f1 -/* DADCB4 802408B4 44800000 */ mtc1 $zero, $f0 -/* DADCB8 802408B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DADCBC 802408BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DADCC0 802408C0 460010A1 */ cvt.d.s $f2, $f2 -/* DADCC4 802408C4 46201080 */ add.d $f2, $f2, $f0 -/* DADCC8 802408C8 C440002C */ lwc1 $f0, 0x2c($v0) -/* DADCCC 802408CC 46000021 */ cvt.d.s $f0, $f0 -/* DADCD0 802408D0 4622003C */ c.lt.d $f0, $f2 -/* DADCD4 802408D4 00000000 */ nop -/* DADCD8 802408D8 4500002C */ bc1f .L8024098C -/* DADCDC 802408DC 02A0202D */ daddu $a0, $s5, $zero -/* DADCE0 802408E0 AFA00010 */ sw $zero, 0x10($sp) -/* DADCE4 802408E4 8E46000C */ lw $a2, 0xc($s2) -/* DADCE8 802408E8 8E470010 */ lw $a3, 0x10($s2) -/* DADCEC 802408EC 0C01242D */ jal func_800490B4 -/* DADCF0 802408F0 0220282D */ daddu $a1, $s1, $zero -/* DADCF4 802408F4 10400025 */ beqz $v0, .L8024098C -/* DADCF8 802408F8 0000202D */ daddu $a0, $zero, $zero -/* DADCFC 802408FC 0200282D */ daddu $a1, $s0, $zero -/* DADD00 80240900 0000302D */ daddu $a2, $zero, $zero -/* DADD04 80240904 2412000C */ addiu $s2, $zero, 0xc -/* DADD08 80240908 860300A8 */ lh $v1, 0xa8($s0) -/* DADD0C 8024090C 3C013F80 */ lui $at, 0x3f80 -/* DADD10 80240910 44810000 */ mtc1 $at, $f0 -/* DADD14 80240914 3C014000 */ lui $at, 0x4000 -/* DADD18 80240918 44811000 */ mtc1 $at, $f2 -/* DADD1C 8024091C 3C01C1A0 */ lui $at, 0xc1a0 -/* DADD20 80240920 44812000 */ mtc1 $at, $f4 -/* DADD24 80240924 44834000 */ mtc1 $v1, $f8 -/* DADD28 80240928 00000000 */ nop -/* DADD2C 8024092C 46804220 */ cvt.s.w $f8, $f8 -/* DADD30 80240930 44074000 */ mfc1 $a3, $f8 -/* DADD34 80240934 27A20038 */ addiu $v0, $sp, 0x38 -/* DADD38 80240938 AFB2001C */ sw $s2, 0x1c($sp) -/* DADD3C 8024093C AFA20020 */ sw $v0, 0x20($sp) -/* DADD40 80240940 E7A00010 */ swc1 $f0, 0x10($sp) -/* DADD44 80240944 E7A20014 */ swc1 $f2, 0x14($sp) -/* DADD48 80240948 0C01BFA4 */ jal fx_emote -/* DADD4C 8024094C E7A40018 */ swc1 $f4, 0x18($sp) -/* DADD50 80240950 0200202D */ daddu $a0, $s0, $zero -/* DADD54 80240954 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DADD58 80240958 C480003C */ lwc1 $f0, 0x3c($a0) -/* DADD5C 8024095C 3C060020 */ lui $a2, 0x20 -/* DADD60 80240960 0C012530 */ jal ai_enemy_play_sound -/* DADD64 80240964 E4800064 */ swc1 $f0, 0x64($a0) -/* DADD68 80240968 8E220018 */ lw $v0, 0x18($s1) -/* DADD6C 8024096C 9442002A */ lhu $v0, 0x2a($v0) -/* DADD70 80240970 30420001 */ andi $v0, $v0, 1 -/* DADD74 80240974 10400003 */ beqz $v0, .L80240984 -/* DADD78 80240978 2402000A */ addiu $v0, $zero, 0xa -/* DADD7C 8024097C 080902D1 */ j .L80240B44 -/* DADD80 80240980 AE620070 */ sw $v0, 0x70($s3) -.L80240984: -/* DADD84 80240984 080902D1 */ j .L80240B44 -/* DADD88 80240988 AE720070 */ sw $s2, 0x70($s3) -.L8024098C: -/* DADD8C 8024098C 8E620074 */ lw $v0, 0x74($s3) -/* DADD90 80240990 2442FFFF */ addiu $v0, $v0, -1 -.L80240994: -/* DADD94 80240994 08090268 */ j .L802409A0 -/* DADD98 80240998 AE620074 */ sw $v0, 0x74($s3) -.L8024099C: -/* DADD9C 8024099C AE220090 */ sw $v0, 0x90($s1) -.L802409A0: -/* DADDA0 802409A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* DADDA4 802409A4 C6000040 */ lwc1 $f0, 0x40($s0) -/* DADDA8 802409A8 C4620000 */ lwc1 $f2, ($v1) -/* DADDAC 802409AC 468010A0 */ cvt.s.w $f2, $f2 -/* DADDB0 802409B0 C4640008 */ lwc1 $f4, 8($v1) -/* DADDB4 802409B4 46802120 */ cvt.s.w $f4, $f4 -/* DADDB8 802409B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* DADDBC 802409BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* DADDC0 802409C0 44051000 */ mfc1 $a1, $f2 -/* DADDC4 802409C4 C440000C */ lwc1 $f0, 0xc($v0) -/* DADDC8 802409C8 46800020 */ cvt.s.w $f0, $f0 -/* DADDCC 802409CC E7A00014 */ swc1 $f0, 0x14($sp) -/* DADDD0 802409D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* DADDD4 802409D4 44062000 */ mfc1 $a2, $f4 -/* DADDD8 802409D8 C4400010 */ lwc1 $f0, 0x10($v0) -/* DADDDC 802409DC 46800020 */ cvt.s.w $f0, $f0 -/* DADDE0 802409E0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DADDE4 802409E4 8C640018 */ lw $a0, 0x18($v1) -/* DADDE8 802409E8 0C0123F5 */ jal is_point_within_region -/* DADDEC 802409EC 8E070038 */ lw $a3, 0x38($s0) -/* DADDF0 802409F0 1040001A */ beqz $v0, .L80240A5C -/* DADDF4 802409F4 00000000 */ nop -/* DADDF8 802409F8 8E060038 */ lw $a2, 0x38($s0) -/* DADDFC 802409FC 8E2200D0 */ lw $v0, 0xd0($s1) -/* DADE00 80240A00 8E070040 */ lw $a3, 0x40($s0) -/* DADE04 80240A04 C44C0000 */ lwc1 $f12, ($v0) -/* DADE08 80240A08 46806320 */ cvt.s.w $f12, $f12 -/* DADE0C 80240A0C C44E0008 */ lwc1 $f14, 8($v0) -/* DADE10 80240A10 0C00A7B5 */ jal dist2D -/* DADE14 80240A14 468073A0 */ cvt.s.w $f14, $f14 -/* DADE18 80240A18 C6020018 */ lwc1 $f2, 0x18($s0) -/* DADE1C 80240A1C 4600103C */ c.lt.s $f2, $f0 -/* DADE20 80240A20 00000000 */ nop -/* DADE24 80240A24 4500000D */ bc1f .L80240A5C -/* DADE28 80240A28 E7A00034 */ swc1 $f0, 0x34($sp) -/* DADE2C 80240A2C C60C0038 */ lwc1 $f12, 0x38($s0) -/* DADE30 80240A30 8E2200D0 */ lw $v0, 0xd0($s1) -/* DADE34 80240A34 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DADE38 80240A38 C4480000 */ lwc1 $f8, ($v0) -/* DADE3C 80240A3C 46804220 */ cvt.s.w $f8, $f8 -/* DADE40 80240A40 44064000 */ mfc1 $a2, $f8 -/* DADE44 80240A44 C4480008 */ lwc1 $f8, 8($v0) -/* DADE48 80240A48 46804220 */ cvt.s.w $f8, $f8 -/* DADE4C 80240A4C 44074000 */ mfc1 $a3, $f8 -/* DADE50 80240A50 0C00A720 */ jal atan2 -/* DADE54 80240A54 24140001 */ addiu $s4, $zero, 1 -/* DADE58 80240A58 E600000C */ swc1 $f0, 0xc($s0) -.L80240A5C: -/* DADE5C 80240A5C 8E2200D0 */ lw $v0, 0xd0($s1) -/* DADE60 80240A60 8C43000C */ lw $v1, 0xc($v0) -/* DADE64 80240A64 8C420010 */ lw $v0, 0x10($v0) -/* DADE68 80240A68 00621825 */ or $v1, $v1, $v0 -/* DADE6C 80240A6C 00741825 */ or $v1, $v1, $s4 -/* DADE70 80240A70 10600008 */ beqz $v1, .L80240A94 -/* DADE74 80240A74 00000000 */ nop -/* DADE78 80240A78 8602008C */ lh $v0, 0x8c($s0) -/* DADE7C 80240A7C 14400031 */ bnez $v0, .L80240B44 -/* DADE80 80240A80 00000000 */ nop -/* DADE84 80240A84 8E050018 */ lw $a1, 0x18($s0) -/* DADE88 80240A88 8E06000C */ lw $a2, 0xc($s0) -/* DADE8C 80240A8C 0C00EA95 */ jal npc_move_heading -/* DADE90 80240A90 0200202D */ daddu $a0, $s0, $zero -.L80240A94: -/* DADE94 80240A94 C600003C */ lwc1 $f0, 0x3c($s0) -/* DADE98 80240A98 3C014059 */ lui $at, 0x4059 -/* DADE9C 80240A9C 44811800 */ mtc1 $at, $f3 -/* DADEA0 80240AA0 44801000 */ mtc1 $zero, $f2 -/* DADEA4 80240AA4 46000021 */ cvt.d.s $f0, $f0 -/* DADEA8 80240AA8 46220002 */ mul.d $f0, $f0, $f2 -/* DADEAC 80240AAC 00000000 */ nop -/* DADEB0 80240AB0 4620020D */ trunc.w.d $f8, $f0 -/* DADEB4 80240AB4 E628007C */ swc1 $f8, 0x7c($s1) -/* DADEB8 80240AB8 8E420004 */ lw $v0, 4($s2) -/* DADEBC 80240ABC 18400021 */ blez $v0, .L80240B44 -/* DADEC0 80240AC0 00000000 */ nop -/* DADEC4 80240AC4 8602008E */ lh $v0, 0x8e($s0) -/* DADEC8 80240AC8 9603008E */ lhu $v1, 0x8e($s0) -/* DADECC 80240ACC 18400005 */ blez $v0, .L80240AE4 -/* DADED0 80240AD0 2462FFFF */ addiu $v0, $v1, -1 -/* DADED4 80240AD4 A602008E */ sh $v0, 0x8e($s0) -/* DADED8 80240AD8 00021400 */ sll $v0, $v0, 0x10 -/* DADEDC 80240ADC 1C400019 */ bgtz $v0, .L80240B44 -/* DADEE0 80240AE0 00000000 */ nop -.L80240AE4: -/* DADEE4 80240AE4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DADEE8 80240AE8 24020002 */ addiu $v0, $zero, 2 -/* DADEEC 80240AEC 0C00A67F */ jal rand_int -/* DADEF0 80240AF0 AE620070 */ sw $v0, 0x70($s3) -/* DADEF4 80240AF4 3C035555 */ lui $v1, 0x5555 -/* DADEF8 80240AF8 34635556 */ ori $v1, $v1, 0x5556 -/* DADEFC 80240AFC 00430018 */ mult $v0, $v1 -/* DADF00 80240B00 000227C3 */ sra $a0, $v0, 0x1f -/* DADF04 80240B04 00004010 */ mfhi $t0 -/* DADF08 80240B08 01042023 */ subu $a0, $t0, $a0 -/* DADF0C 80240B0C 00041840 */ sll $v1, $a0, 1 -/* DADF10 80240B10 00641821 */ addu $v1, $v1, $a0 -/* DADF14 80240B14 00431023 */ subu $v0, $v0, $v1 -/* DADF18 80240B18 24430002 */ addiu $v1, $v0, 2 -/* DADF1C 80240B1C AE630074 */ sw $v1, 0x74($s3) -/* DADF20 80240B20 8E42002C */ lw $v0, 0x2c($s2) -/* DADF24 80240B24 58400007 */ blezl $v0, .L80240B44 -/* DADF28 80240B28 AE600070 */ sw $zero, 0x70($s3) -/* DADF2C 80240B2C 8E420008 */ lw $v0, 8($s2) -/* DADF30 80240B30 18400003 */ blez $v0, .L80240B40 -/* DADF34 80240B34 28620003 */ slti $v0, $v1, 3 -/* DADF38 80240B38 10400002 */ beqz $v0, .L80240B44 -/* DADF3C 80240B3C 00000000 */ nop -.L80240B40: -/* DADF40 80240B40 AE600070 */ sw $zero, 0x70($s3) -.L80240B44: -/* DADF44 80240B44 8FBF0058 */ lw $ra, 0x58($sp) -/* DADF48 80240B48 8FB50054 */ lw $s5, 0x54($sp) -/* DADF4C 80240B4C 8FB40050 */ lw $s4, 0x50($sp) -/* DADF50 80240B50 8FB3004C */ lw $s3, 0x4c($sp) -/* DADF54 80240B54 8FB20048 */ lw $s2, 0x48($sp) -/* DADF58 80240B58 8FB10044 */ lw $s1, 0x44($sp) -/* DADF5C 80240B5C 8FB00040 */ lw $s0, 0x40($sp) -/* DADF60 80240B60 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* DADF64 80240B64 D7B80070 */ ldc1 $f24, 0x70($sp) -/* DADF68 80240B68 D7B60068 */ ldc1 $f22, 0x68($sp) -/* DADF6C 80240B6C D7B40060 */ ldc1 $f20, 0x60($sp) -/* DADF70 80240B70 03E00008 */ jr $ra -/* DADF74 80240B74 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s index 17587e6064..27729a8706 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s @@ -86,7 +86,7 @@ glabel func_802416AC_DAEAAC .L802417C8_DAEBC8: /* DAEBC8 802417C8 0280202D */ daddu $a0, $s4, $zero /* DAEBCC 802417CC 0200282D */ daddu $a1, $s0, $zero -/* DAEBD0 802417D0 0C090154 */ jal func_80240550_DAD950 +/* DAEBD0 802417D0 0C090154 */ jal omo_04_UnkNpcAIFunc35 /* DAEBD4 802417D4 0260302D */ daddu $a2, $s3, $zero /* DAEBD8 802417D8 0809061D */ j .L80241874 /* DAEBDC 802417DC 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s deleted file mode 100644 index f57dbed229..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802455F8_DB78B8 -.double 0.09 - -dlabel D_80245600_DB78C0 -.byte 0x3F, 0xB7, 0x0A, 0x3D, 0x70, 0xA3, 0xD7, 0x0A - -.section .text - -glabel func_80240C04_DB2EC4 -/* DB2EC4 80240C04 27BDFF80 */ addiu $sp, $sp, -0x80 -/* DB2EC8 80240C08 AFB3004C */ sw $s3, 0x4c($sp) -/* DB2ECC 80240C0C 0080982D */ daddu $s3, $a0, $zero -/* DB2ED0 80240C10 AFBF0058 */ sw $ra, 0x58($sp) -/* DB2ED4 80240C14 AFB50054 */ sw $s5, 0x54($sp) -/* DB2ED8 80240C18 AFB40050 */ sw $s4, 0x50($sp) -/* DB2EDC 80240C1C AFB20048 */ sw $s2, 0x48($sp) -/* DB2EE0 80240C20 AFB10044 */ sw $s1, 0x44($sp) -/* DB2EE4 80240C24 AFB00040 */ sw $s0, 0x40($sp) -/* DB2EE8 80240C28 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* DB2EEC 80240C2C F7B80070 */ sdc1 $f24, 0x70($sp) -/* DB2EF0 80240C30 F7B60068 */ sdc1 $f22, 0x68($sp) -/* DB2EF4 80240C34 F7B40060 */ sdc1 $f20, 0x60($sp) -/* DB2EF8 80240C38 8E710148 */ lw $s1, 0x148($s3) -/* DB2EFC 80240C3C 00A0902D */ daddu $s2, $a1, $zero -/* DB2F00 80240C40 86240008 */ lh $a0, 8($s1) -/* DB2F04 80240C44 0C00EABB */ jal get_npc_unsafe -/* DB2F08 80240C48 00C0A82D */ daddu $s5, $a2, $zero -/* DB2F0C 80240C4C 0040802D */ daddu $s0, $v0, $zero -/* DB2F10 80240C50 0000A02D */ daddu $s4, $zero, $zero -/* DB2F14 80240C54 C624007C */ lwc1 $f4, 0x7c($s1) -/* DB2F18 80240C58 46802120 */ cvt.s.w $f4, $f4 -/* DB2F1C 80240C5C C6220088 */ lwc1 $f2, 0x88($s1) -/* DB2F20 80240C60 468010A0 */ cvt.s.w $f2, $f2 -/* DB2F24 80240C64 460010A1 */ cvt.d.s $f2, $f2 -/* DB2F28 80240C68 46002121 */ cvt.d.s $f4, $f4 -/* DB2F2C 80240C6C C600003C */ lwc1 $f0, 0x3c($s0) -/* DB2F30 80240C70 3C014059 */ lui $at, 0x4059 -/* DB2F34 80240C74 44813800 */ mtc1 $at, $f7 -/* DB2F38 80240C78 44803000 */ mtc1 $zero, $f6 -/* DB2F3C 80240C7C 46000021 */ cvt.d.s $f0, $f0 -/* DB2F40 80240C80 46260002 */ mul.d $f0, $f0, $f6 -/* DB2F44 80240C84 00000000 */ nop -/* DB2F48 80240C88 24020001 */ addiu $v0, $zero, 1 -/* DB2F4C 80240C8C 8E24006C */ lw $a0, 0x6c($s1) -/* DB2F50 80240C90 46261083 */ div.d $f2, $f2, $f6 -/* DB2F54 80240C94 462010A0 */ cvt.s.d $f2, $f2 -/* DB2F58 80240C98 46262103 */ div.d $f4, $f4, $f6 -/* DB2F5C 80240C9C 46202520 */ cvt.s.d $f20, $f4 -/* DB2F60 80240CA0 30830011 */ andi $v1, $a0, 0x11 -/* DB2F64 80240CA4 4620020D */ trunc.w.d $f8, $f0 -/* DB2F68 80240CA8 E628007C */ swc1 $f8, 0x7c($s1) -/* DB2F6C 80240CAC C6200078 */ lwc1 $f0, 0x78($s1) -/* DB2F70 80240CB0 46800020 */ cvt.s.w $f0, $f0 -/* DB2F74 80240CB4 46000021 */ cvt.d.s $f0, $f0 -/* DB2F78 80240CB8 46260003 */ div.d $f0, $f0, $f6 -/* DB2F7C 80240CBC 462006A0 */ cvt.s.d $f26, $f0 -/* DB2F80 80240CC0 C6200070 */ lwc1 $f0, 0x70($s1) -/* DB2F84 80240CC4 46800020 */ cvt.s.w $f0, $f0 -/* DB2F88 80240CC8 46000021 */ cvt.d.s $f0, $f0 -/* DB2F8C 80240CCC 46260003 */ div.d $f0, $f0, $f6 -/* DB2F90 80240CD0 462005A0 */ cvt.s.d $f22, $f0 -/* DB2F94 80240CD4 14620025 */ bne $v1, $v0, .L80240D6C -/* DB2F98 80240CD8 4602D600 */ add.s $f24, $f26, $f2 -/* DB2F9C 80240CDC 8E020000 */ lw $v0, ($s0) -/* DB2FA0 80240CE0 30420008 */ andi $v0, $v0, 8 -/* DB2FA4 80240CE4 10400009 */ beqz $v0, .L80240D0C -/* DB2FA8 80240CE8 27A50028 */ addiu $a1, $sp, 0x28 -/* DB2FAC 80240CEC C600003C */ lwc1 $f0, 0x3c($s0) -/* DB2FB0 80240CF0 4600C001 */ sub.s $f0, $f24, $f0 -/* DB2FB4 80240CF4 4600B03C */ c.lt.s $f22, $f0 -/* DB2FB8 80240CF8 00000000 */ nop -/* DB2FBC 80240CFC 4500001B */ bc1f .L80240D6C -/* DB2FC0 80240D00 34820010 */ ori $v0, $a0, 0x10 -/* DB2FC4 80240D04 0809035B */ j .L80240D6C -/* DB2FC8 80240D08 AE22006C */ sw $v0, 0x6c($s1) -.L80240D0C: -/* DB2FCC 80240D0C 27A6002C */ addiu $a2, $sp, 0x2c -/* DB2FD0 80240D10 C6000038 */ lwc1 $f0, 0x38($s0) -/* DB2FD4 80240D14 C602003C */ lwc1 $f2, 0x3c($s0) -/* DB2FD8 80240D18 C6040040 */ lwc1 $f4, 0x40($s0) -/* DB2FDC 80240D1C 3C01447A */ lui $at, 0x447a -/* DB2FE0 80240D20 44813000 */ mtc1 $at, $f6 -/* DB2FE4 80240D24 27A20034 */ addiu $v0, $sp, 0x34 -/* DB2FE8 80240D28 E7A00028 */ swc1 $f0, 0x28($sp) -/* DB2FEC 80240D2C E7A2002C */ swc1 $f2, 0x2c($sp) -/* DB2FF0 80240D30 E7A40030 */ swc1 $f4, 0x30($sp) -/* DB2FF4 80240D34 E7A60034 */ swc1 $f6, 0x34($sp) -/* DB2FF8 80240D38 AFA20010 */ sw $v0, 0x10($sp) -/* DB2FFC 80240D3C 8E040080 */ lw $a0, 0x80($s0) -/* DB3000 80240D40 0C0372DF */ jal npc_raycast_down_sides -/* DB3004 80240D44 27A70030 */ addiu $a3, $sp, 0x30 -/* DB3008 80240D48 C7A00034 */ lwc1 $f0, 0x34($sp) -/* DB300C 80240D4C 4600D001 */ sub.s $f0, $f26, $f0 -/* DB3010 80240D50 4600B03C */ c.lt.s $f22, $f0 -/* DB3014 80240D54 00000000 */ nop -/* DB3018 80240D58 45000004 */ bc1f .L80240D6C -/* DB301C 80240D5C 00000000 */ nop -/* DB3020 80240D60 8E22006C */ lw $v0, 0x6c($s1) -/* DB3024 80240D64 34420010 */ ori $v0, $v0, 0x10 -/* DB3028 80240D68 AE22006C */ sw $v0, 0x6c($s1) -.L80240D6C: -/* DB302C 80240D6C 8E22006C */ lw $v0, 0x6c($s1) -/* DB3030 80240D70 24030011 */ addiu $v1, $zero, 0x11 -/* DB3034 80240D74 30420011 */ andi $v0, $v0, 0x11 -/* DB3038 80240D78 14430039 */ bne $v0, $v1, .L80240E60 -/* DB303C 80240D7C 00000000 */ nop -/* DB3040 80240D80 8E020000 */ lw $v0, ($s0) -/* DB3044 80240D84 30420008 */ andi $v0, $v0, 8 -/* DB3048 80240D88 1040000A */ beqz $v0, .L80240DB4 -/* DB304C 80240D8C 4600C106 */ mov.s $f4, $f24 -/* DB3050 80240D90 4614C081 */ sub.s $f2, $f24, $f20 -/* DB3054 80240D94 3C018024 */ lui $at, %hi(D_802455F8_DB78B8) -/* DB3058 80240D98 D42055F8 */ ldc1 $f0, %lo(D_802455F8_DB78B8)($at) -/* DB305C 80240D9C 460010A1 */ cvt.d.s $f2, $f2 -/* DB3060 80240DA0 46201082 */ mul.d $f2, $f2, $f0 -/* DB3064 80240DA4 00000000 */ nop -/* DB3068 80240DA8 4600A021 */ cvt.d.s $f0, $f20 -/* DB306C 80240DAC 08090386 */ j .L80240E18 -/* DB3070 80240DB0 46220000 */ add.d $f0, $f0, $f2 -.L80240DB4: -/* DB3074 80240DB4 27A50028 */ addiu $a1, $sp, 0x28 -/* DB3078 80240DB8 27A6002C */ addiu $a2, $sp, 0x2c -/* DB307C 80240DBC C6000038 */ lwc1 $f0, 0x38($s0) -/* DB3080 80240DC0 C6020040 */ lwc1 $f2, 0x40($s0) -/* DB3084 80240DC4 3C01447A */ lui $at, 0x447a -/* DB3088 80240DC8 44812000 */ mtc1 $at, $f4 -/* DB308C 80240DCC 27A20034 */ addiu $v0, $sp, 0x34 -/* DB3090 80240DD0 E7B4002C */ swc1 $f20, 0x2c($sp) -/* DB3094 80240DD4 E7A00028 */ swc1 $f0, 0x28($sp) -/* DB3098 80240DD8 E7A20030 */ swc1 $f2, 0x30($sp) -/* DB309C 80240DDC E7A40034 */ swc1 $f4, 0x34($sp) -/* DB30A0 80240DE0 AFA20010 */ sw $v0, 0x10($sp) -/* DB30A4 80240DE4 8E040080 */ lw $a0, 0x80($s0) -/* DB30A8 80240DE8 0C0372DF */ jal npc_raycast_down_sides -/* DB30AC 80240DEC 27A70030 */ addiu $a3, $sp, 0x30 -/* DB30B0 80240DF0 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* DB30B4 80240DF4 461A2100 */ add.s $f4, $f4, $f26 -/* DB30B8 80240DF8 46142081 */ sub.s $f2, $f4, $f20 -/* DB30BC 80240DFC 3C018024 */ lui $at, %hi(D_80245600_DB78C0) -/* DB30C0 80240E00 D4205600 */ ldc1 $f0, %lo(D_80245600_DB78C0)($at) -/* DB30C4 80240E04 460010A1 */ cvt.d.s $f2, $f2 -/* DB30C8 80240E08 46201082 */ mul.d $f2, $f2, $f0 -/* DB30CC 80240E0C 00000000 */ nop -/* DB30D0 80240E10 4600A021 */ cvt.d.s $f0, $f20 -/* DB30D4 80240E14 46220000 */ add.d $f0, $f0, $f2 -.L80240E18: -/* DB30D8 80240E18 46200020 */ cvt.s.d $f0, $f0 -/* DB30DC 80240E1C E600003C */ swc1 $f0, 0x3c($s0) -/* DB30E0 80240E20 C600003C */ lwc1 $f0, 0x3c($s0) -/* DB30E4 80240E24 46002001 */ sub.s $f0, $f4, $f0 -/* DB30E8 80240E28 3C013FF0 */ lui $at, 0x3ff0 -/* DB30EC 80240E2C 44811800 */ mtc1 $at, $f3 -/* DB30F0 80240E30 44801000 */ mtc1 $zero, $f2 -/* DB30F4 80240E34 46000005 */ abs.s $f0, $f0 -/* DB30F8 80240E38 46000021 */ cvt.d.s $f0, $f0 -/* DB30FC 80240E3C 4622003C */ c.lt.d $f0, $f2 -/* DB3100 80240E40 00000000 */ nop -/* DB3104 80240E44 45000036 */ bc1f .L80240F20 -/* DB3108 80240E48 2403FFEF */ addiu $v1, $zero, -0x11 -/* DB310C 80240E4C E604003C */ swc1 $f4, 0x3c($s0) -/* DB3110 80240E50 8E22006C */ lw $v0, 0x6c($s1) -/* DB3114 80240E54 00431024 */ and $v0, $v0, $v1 -/* DB3118 80240E58 080903C8 */ j .L80240F20 -/* DB311C 80240E5C AE22006C */ sw $v0, 0x6c($s1) -.L80240E60: -/* DB3120 80240E60 8E220070 */ lw $v0, 0x70($s1) -/* DB3124 80240E64 1840002E */ blez $v0, .L80240F20 -/* DB3128 80240E68 00000000 */ nop -/* DB312C 80240E6C C62C0074 */ lwc1 $f12, 0x74($s1) -/* DB3130 80240E70 0C00A8BB */ jal sin_deg -/* DB3134 80240E74 46806320 */ cvt.s.w $f12, $f12 -/* DB3138 80240E78 8E020000 */ lw $v0, ($s0) -/* DB313C 80240E7C 30420008 */ andi $v0, $v0, 8 -/* DB3140 80240E80 10400003 */ beqz $v0, .L80240E90 -/* DB3144 80240E84 46000506 */ mov.s $f20, $f0 -/* DB3148 80240E88 080903B4 */ j .L80240ED0 -/* DB314C 80240E8C 0000102D */ daddu $v0, $zero, $zero -.L80240E90: -/* DB3150 80240E90 27A50028 */ addiu $a1, $sp, 0x28 -/* DB3154 80240E94 27A6002C */ addiu $a2, $sp, 0x2c -/* DB3158 80240E98 C6000038 */ lwc1 $f0, 0x38($s0) -/* DB315C 80240E9C C602003C */ lwc1 $f2, 0x3c($s0) -/* DB3160 80240EA0 C6040040 */ lwc1 $f4, 0x40($s0) -/* DB3164 80240EA4 3C01447A */ lui $at, 0x447a -/* DB3168 80240EA8 44813000 */ mtc1 $at, $f6 -/* DB316C 80240EAC 27A20034 */ addiu $v0, $sp, 0x34 -/* DB3170 80240EB0 E7A00028 */ swc1 $f0, 0x28($sp) -/* DB3174 80240EB4 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DB3178 80240EB8 E7A40030 */ swc1 $f4, 0x30($sp) -/* DB317C 80240EBC E7A60034 */ swc1 $f6, 0x34($sp) -/* DB3180 80240EC0 AFA20010 */ sw $v0, 0x10($sp) -/* DB3184 80240EC4 8E040080 */ lw $a0, 0x80($s0) -/* DB3188 80240EC8 0C0372DF */ jal npc_raycast_down_sides -/* DB318C 80240ECC 27A70030 */ addiu $a3, $sp, 0x30 -.L80240ED0: -/* DB3190 80240ED0 10400007 */ beqz $v0, .L80240EF0 -/* DB3194 80240ED4 00000000 */ nop -/* DB3198 80240ED8 4616A082 */ mul.s $f2, $f20, $f22 -/* DB319C 80240EDC 00000000 */ nop -/* DB31A0 80240EE0 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DB31A4 80240EE4 461A0000 */ add.s $f0, $f0, $f26 -/* DB31A8 80240EE8 080903BF */ j .L80240EFC -/* DB31AC 80240EEC 46020000 */ add.s $f0, $f0, $f2 -.L80240EF0: -/* DB31B0 80240EF0 4616A002 */ mul.s $f0, $f20, $f22 -/* DB31B4 80240EF4 00000000 */ nop -/* DB31B8 80240EF8 4600C000 */ add.s $f0, $f24, $f0 -.L80240EFC: -/* DB31BC 80240EFC E600003C */ swc1 $f0, 0x3c($s0) -/* DB31C0 80240F00 8E220074 */ lw $v0, 0x74($s1) -/* DB31C4 80240F04 2442000A */ addiu $v0, $v0, 0xa -/* DB31C8 80240F08 44826000 */ mtc1 $v0, $f12 -/* DB31CC 80240F0C 00000000 */ nop -/* DB31D0 80240F10 0C00A6C9 */ jal clamp_angle -/* DB31D4 80240F14 46806320 */ cvt.s.w $f12, $f12 -/* DB31D8 80240F18 4600020D */ trunc.w.s $f8, $f0 -/* DB31DC 80240F1C E6280074 */ swc1 $f8, 0x74($s1) -.L80240F20: -/* DB31E0 80240F20 8E220090 */ lw $v0, 0x90($s1) -/* DB31E4 80240F24 1C40004A */ bgtz $v0, .L80241050 -/* DB31E8 80240F28 2442FFFF */ addiu $v0, $v0, -1 -/* DB31EC 80240F2C 8E430014 */ lw $v1, 0x14($s2) -/* DB31F0 80240F30 04600048 */ bltz $v1, .L80241054 -/* DB31F4 80240F34 00000000 */ nop -/* DB31F8 80240F38 8E620074 */ lw $v0, 0x74($s3) -/* DB31FC 80240F3C 1C400042 */ bgtz $v0, .L80241048 -/* DB3200 80240F40 2442FFFF */ addiu $v0, $v0, -1 -/* DB3204 80240F44 AE630074 */ sw $v1, 0x74($s3) -/* DB3208 80240F48 860200A8 */ lh $v0, 0xa8($s0) -/* DB320C 80240F4C C602003C */ lwc1 $f2, 0x3c($s0) -/* DB3210 80240F50 44820000 */ mtc1 $v0, $f0 -/* DB3214 80240F54 00000000 */ nop -/* DB3218 80240F58 46800020 */ cvt.s.w $f0, $f0 -/* DB321C 80240F5C 46001080 */ add.s $f2, $f2, $f0 -/* DB3220 80240F60 3C014024 */ lui $at, 0x4024 -/* DB3224 80240F64 44810800 */ mtc1 $at, $f1 -/* DB3228 80240F68 44800000 */ mtc1 $zero, $f0 -/* DB322C 80240F6C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DB3230 80240F70 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DB3234 80240F74 460010A1 */ cvt.d.s $f2, $f2 -/* DB3238 80240F78 46201080 */ add.d $f2, $f2, $f0 -/* DB323C 80240F7C C440002C */ lwc1 $f0, 0x2c($v0) -/* DB3240 80240F80 46000021 */ cvt.d.s $f0, $f0 -/* DB3244 80240F84 4622003C */ c.lt.d $f0, $f2 -/* DB3248 80240F88 00000000 */ nop -/* DB324C 80240F8C 4500002C */ bc1f .L80241040 -/* DB3250 80240F90 02A0202D */ daddu $a0, $s5, $zero -/* DB3254 80240F94 AFA00010 */ sw $zero, 0x10($sp) -/* DB3258 80240F98 8E46000C */ lw $a2, 0xc($s2) -/* DB325C 80240F9C 8E470010 */ lw $a3, 0x10($s2) -/* DB3260 80240FA0 0C01242D */ jal func_800490B4 -/* DB3264 80240FA4 0220282D */ daddu $a1, $s1, $zero -/* DB3268 80240FA8 10400025 */ beqz $v0, .L80241040 -/* DB326C 80240FAC 0000202D */ daddu $a0, $zero, $zero -/* DB3270 80240FB0 0200282D */ daddu $a1, $s0, $zero -/* DB3274 80240FB4 0000302D */ daddu $a2, $zero, $zero -/* DB3278 80240FB8 2412000C */ addiu $s2, $zero, 0xc -/* DB327C 80240FBC 860300A8 */ lh $v1, 0xa8($s0) -/* DB3280 80240FC0 3C013F80 */ lui $at, 0x3f80 -/* DB3284 80240FC4 44810000 */ mtc1 $at, $f0 -/* DB3288 80240FC8 3C014000 */ lui $at, 0x4000 -/* DB328C 80240FCC 44811000 */ mtc1 $at, $f2 -/* DB3290 80240FD0 3C01C1A0 */ lui $at, 0xc1a0 -/* DB3294 80240FD4 44812000 */ mtc1 $at, $f4 -/* DB3298 80240FD8 44834000 */ mtc1 $v1, $f8 -/* DB329C 80240FDC 00000000 */ nop -/* DB32A0 80240FE0 46804220 */ cvt.s.w $f8, $f8 -/* DB32A4 80240FE4 44074000 */ mfc1 $a3, $f8 -/* DB32A8 80240FE8 27A20038 */ addiu $v0, $sp, 0x38 -/* DB32AC 80240FEC AFB2001C */ sw $s2, 0x1c($sp) -/* DB32B0 80240FF0 AFA20020 */ sw $v0, 0x20($sp) -/* DB32B4 80240FF4 E7A00010 */ swc1 $f0, 0x10($sp) -/* DB32B8 80240FF8 E7A20014 */ swc1 $f2, 0x14($sp) -/* DB32BC 80240FFC 0C01BFA4 */ jal fx_emote -/* DB32C0 80241000 E7A40018 */ swc1 $f4, 0x18($sp) -/* DB32C4 80241004 0200202D */ daddu $a0, $s0, $zero -/* DB32C8 80241008 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DB32CC 8024100C C480003C */ lwc1 $f0, 0x3c($a0) -/* DB32D0 80241010 3C060020 */ lui $a2, 0x20 -/* DB32D4 80241014 0C012530 */ jal ai_enemy_play_sound -/* DB32D8 80241018 E4800064 */ swc1 $f0, 0x64($a0) -/* DB32DC 8024101C 8E220018 */ lw $v0, 0x18($s1) -/* DB32E0 80241020 9442002A */ lhu $v0, 0x2a($v0) -/* DB32E4 80241024 30420001 */ andi $v0, $v0, 1 -/* DB32E8 80241028 10400003 */ beqz $v0, .L80241038 -/* DB32EC 8024102C 2402000A */ addiu $v0, $zero, 0xa -/* DB32F0 80241030 0809047E */ j .L802411F8 -/* DB32F4 80241034 AE620070 */ sw $v0, 0x70($s3) -.L80241038: -/* DB32F8 80241038 0809047E */ j .L802411F8 -/* DB32FC 8024103C AE720070 */ sw $s2, 0x70($s3) -.L80241040: -/* DB3300 80241040 8E620074 */ lw $v0, 0x74($s3) -/* DB3304 80241044 2442FFFF */ addiu $v0, $v0, -1 -.L80241048: -/* DB3308 80241048 08090415 */ j .L80241054 -/* DB330C 8024104C AE620074 */ sw $v0, 0x74($s3) -.L80241050: -/* DB3310 80241050 AE220090 */ sw $v0, 0x90($s1) -.L80241054: -/* DB3314 80241054 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB3318 80241058 C6000040 */ lwc1 $f0, 0x40($s0) -/* DB331C 8024105C C4620000 */ lwc1 $f2, ($v1) -/* DB3320 80241060 468010A0 */ cvt.s.w $f2, $f2 -/* DB3324 80241064 C4640008 */ lwc1 $f4, 8($v1) -/* DB3328 80241068 46802120 */ cvt.s.w $f4, $f4 -/* DB332C 8024106C E7A00010 */ swc1 $f0, 0x10($sp) -/* DB3330 80241070 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB3334 80241074 44051000 */ mfc1 $a1, $f2 -/* DB3338 80241078 C440000C */ lwc1 $f0, 0xc($v0) -/* DB333C 8024107C 46800020 */ cvt.s.w $f0, $f0 -/* DB3340 80241080 E7A00014 */ swc1 $f0, 0x14($sp) -/* DB3344 80241084 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB3348 80241088 44062000 */ mfc1 $a2, $f4 -/* DB334C 8024108C C4400010 */ lwc1 $f0, 0x10($v0) -/* DB3350 80241090 46800020 */ cvt.s.w $f0, $f0 -/* DB3354 80241094 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB3358 80241098 8C640018 */ lw $a0, 0x18($v1) -/* DB335C 8024109C 0C0123F5 */ jal is_point_within_region -/* DB3360 802410A0 8E070038 */ lw $a3, 0x38($s0) -/* DB3364 802410A4 1040001A */ beqz $v0, .L80241110 -/* DB3368 802410A8 00000000 */ nop -/* DB336C 802410AC 8E060038 */ lw $a2, 0x38($s0) -/* DB3370 802410B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB3374 802410B4 8E070040 */ lw $a3, 0x40($s0) -/* DB3378 802410B8 C44C0000 */ lwc1 $f12, ($v0) -/* DB337C 802410BC 46806320 */ cvt.s.w $f12, $f12 -/* DB3380 802410C0 C44E0008 */ lwc1 $f14, 8($v0) -/* DB3384 802410C4 0C00A7B5 */ jal dist2D -/* DB3388 802410C8 468073A0 */ cvt.s.w $f14, $f14 -/* DB338C 802410CC C6020018 */ lwc1 $f2, 0x18($s0) -/* DB3390 802410D0 4600103C */ c.lt.s $f2, $f0 -/* DB3394 802410D4 00000000 */ nop -/* DB3398 802410D8 4500000D */ bc1f .L80241110 -/* DB339C 802410DC E7A00034 */ swc1 $f0, 0x34($sp) -/* DB33A0 802410E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DB33A4 802410E4 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB33A8 802410E8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DB33AC 802410EC C4480000 */ lwc1 $f8, ($v0) -/* DB33B0 802410F0 46804220 */ cvt.s.w $f8, $f8 -/* DB33B4 802410F4 44064000 */ mfc1 $a2, $f8 -/* DB33B8 802410F8 C4480008 */ lwc1 $f8, 8($v0) -/* DB33BC 802410FC 46804220 */ cvt.s.w $f8, $f8 -/* DB33C0 80241100 44074000 */ mfc1 $a3, $f8 -/* DB33C4 80241104 0C00A720 */ jal atan2 -/* DB33C8 80241108 24140001 */ addiu $s4, $zero, 1 -/* DB33CC 8024110C E600000C */ swc1 $f0, 0xc($s0) -.L80241110: -/* DB33D0 80241110 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB33D4 80241114 8C43000C */ lw $v1, 0xc($v0) -/* DB33D8 80241118 8C420010 */ lw $v0, 0x10($v0) -/* DB33DC 8024111C 00621825 */ or $v1, $v1, $v0 -/* DB33E0 80241120 00741825 */ or $v1, $v1, $s4 -/* DB33E4 80241124 10600008 */ beqz $v1, .L80241148 -/* DB33E8 80241128 00000000 */ nop -/* DB33EC 8024112C 8602008C */ lh $v0, 0x8c($s0) -/* DB33F0 80241130 14400031 */ bnez $v0, .L802411F8 -/* DB33F4 80241134 00000000 */ nop -/* DB33F8 80241138 8E050018 */ lw $a1, 0x18($s0) -/* DB33FC 8024113C 8E06000C */ lw $a2, 0xc($s0) -/* DB3400 80241140 0C00EA95 */ jal npc_move_heading -/* DB3404 80241144 0200202D */ daddu $a0, $s0, $zero -.L80241148: -/* DB3408 80241148 C600003C */ lwc1 $f0, 0x3c($s0) -/* DB340C 8024114C 3C014059 */ lui $at, 0x4059 -/* DB3410 80241150 44811800 */ mtc1 $at, $f3 -/* DB3414 80241154 44801000 */ mtc1 $zero, $f2 -/* DB3418 80241158 46000021 */ cvt.d.s $f0, $f0 -/* DB341C 8024115C 46220002 */ mul.d $f0, $f0, $f2 -/* DB3420 80241160 00000000 */ nop -/* DB3424 80241164 4620020D */ trunc.w.d $f8, $f0 -/* DB3428 80241168 E628007C */ swc1 $f8, 0x7c($s1) -/* DB342C 8024116C 8E420004 */ lw $v0, 4($s2) -/* DB3430 80241170 18400021 */ blez $v0, .L802411F8 -/* DB3434 80241174 00000000 */ nop -/* DB3438 80241178 8602008E */ lh $v0, 0x8e($s0) -/* DB343C 8024117C 9603008E */ lhu $v1, 0x8e($s0) -/* DB3440 80241180 18400005 */ blez $v0, .L80241198 -/* DB3444 80241184 2462FFFF */ addiu $v0, $v1, -1 -/* DB3448 80241188 A602008E */ sh $v0, 0x8e($s0) -/* DB344C 8024118C 00021400 */ sll $v0, $v0, 0x10 -/* DB3450 80241190 1C400019 */ bgtz $v0, .L802411F8 -/* DB3454 80241194 00000000 */ nop -.L80241198: -/* DB3458 80241198 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DB345C 8024119C 24020002 */ addiu $v0, $zero, 2 -/* DB3460 802411A0 0C00A67F */ jal rand_int -/* DB3464 802411A4 AE620070 */ sw $v0, 0x70($s3) -/* DB3468 802411A8 3C035555 */ lui $v1, 0x5555 -/* DB346C 802411AC 34635556 */ ori $v1, $v1, 0x5556 -/* DB3470 802411B0 00430018 */ mult $v0, $v1 -/* DB3474 802411B4 000227C3 */ sra $a0, $v0, 0x1f -/* DB3478 802411B8 00004010 */ mfhi $t0 -/* DB347C 802411BC 01042023 */ subu $a0, $t0, $a0 -/* DB3480 802411C0 00041840 */ sll $v1, $a0, 1 -/* DB3484 802411C4 00641821 */ addu $v1, $v1, $a0 -/* DB3488 802411C8 00431023 */ subu $v0, $v0, $v1 -/* DB348C 802411CC 24430002 */ addiu $v1, $v0, 2 -/* DB3490 802411D0 AE630074 */ sw $v1, 0x74($s3) -/* DB3494 802411D4 8E42002C */ lw $v0, 0x2c($s2) -/* DB3498 802411D8 58400007 */ blezl $v0, .L802411F8 -/* DB349C 802411DC AE600070 */ sw $zero, 0x70($s3) -/* DB34A0 802411E0 8E420008 */ lw $v0, 8($s2) -/* DB34A4 802411E4 18400003 */ blez $v0, .L802411F4 -/* DB34A8 802411E8 28620003 */ slti $v0, $v1, 3 -/* DB34AC 802411EC 10400002 */ beqz $v0, .L802411F8 -/* DB34B0 802411F0 00000000 */ nop -.L802411F4: -/* DB34B4 802411F4 AE600070 */ sw $zero, 0x70($s3) -.L802411F8: -/* DB34B8 802411F8 8FBF0058 */ lw $ra, 0x58($sp) -/* DB34BC 802411FC 8FB50054 */ lw $s5, 0x54($sp) -/* DB34C0 80241200 8FB40050 */ lw $s4, 0x50($sp) -/* DB34C4 80241204 8FB3004C */ lw $s3, 0x4c($sp) -/* DB34C8 80241208 8FB20048 */ lw $s2, 0x48($sp) -/* DB34CC 8024120C 8FB10044 */ lw $s1, 0x44($sp) -/* DB34D0 80241210 8FB00040 */ lw $s0, 0x40($sp) -/* DB34D4 80241214 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* DB34D8 80241218 D7B80070 */ ldc1 $f24, 0x70($sp) -/* DB34DC 8024121C D7B60068 */ ldc1 $f22, 0x68($sp) -/* DB34E0 80241220 D7B40060 */ ldc1 $f20, 0x60($sp) -/* DB34E4 80241224 03E00008 */ jr $ra -/* DB34E8 80241228 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s index 4145de6557..cf175735fc 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s @@ -86,7 +86,7 @@ glabel func_80241D60_DB4020 .L80241E7C_DB413C: /* DB413C 80241E7C 0280202D */ daddu $a0, $s4, $zero /* DB4140 80241E80 0200282D */ daddu $a1, $s0, $zero -/* DB4144 80241E84 0C090301 */ jal func_80240C04_DB2EC4 +/* DB4144 80241E84 0C090301 */ jal omo_05_UnkNpcAIFunc35 /* DB4148 80241E88 0260302D */ daddu $a2, $s3, $zero /* DB414C 80241E8C 080907CA */ j .L80241F28 /* DB4150 80241E90 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241B28_DBEDD8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241B28_DBEDD8.s deleted file mode 100644 index 9918a3ca3b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241B28_DBEDD8.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802470B8_DC4368 -.double 0.09 - -dlabel D_802470C0_DC4370 -.double 0.09 - -.section .text - -glabel func_80241B28_DBEDD8 -/* DBEDD8 80241B28 27BDFF80 */ addiu $sp, $sp, -0x80 -/* DBEDDC 80241B2C AFB3004C */ sw $s3, 0x4c($sp) -/* DBEDE0 80241B30 0080982D */ daddu $s3, $a0, $zero -/* DBEDE4 80241B34 AFBF0058 */ sw $ra, 0x58($sp) -/* DBEDE8 80241B38 AFB50054 */ sw $s5, 0x54($sp) -/* DBEDEC 80241B3C AFB40050 */ sw $s4, 0x50($sp) -/* DBEDF0 80241B40 AFB20048 */ sw $s2, 0x48($sp) -/* DBEDF4 80241B44 AFB10044 */ sw $s1, 0x44($sp) -/* DBEDF8 80241B48 AFB00040 */ sw $s0, 0x40($sp) -/* DBEDFC 80241B4C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* DBEE00 80241B50 F7B80070 */ sdc1 $f24, 0x70($sp) -/* DBEE04 80241B54 F7B60068 */ sdc1 $f22, 0x68($sp) -/* DBEE08 80241B58 F7B40060 */ sdc1 $f20, 0x60($sp) -/* DBEE0C 80241B5C 8E710148 */ lw $s1, 0x148($s3) -/* DBEE10 80241B60 00A0902D */ daddu $s2, $a1, $zero -/* DBEE14 80241B64 86240008 */ lh $a0, 8($s1) -/* DBEE18 80241B68 0C00EABB */ jal get_npc_unsafe -/* DBEE1C 80241B6C 00C0A82D */ daddu $s5, $a2, $zero -/* DBEE20 80241B70 0040802D */ daddu $s0, $v0, $zero -/* DBEE24 80241B74 0000A02D */ daddu $s4, $zero, $zero -/* DBEE28 80241B78 C624007C */ lwc1 $f4, 0x7c($s1) -/* DBEE2C 80241B7C 46802120 */ cvt.s.w $f4, $f4 -/* DBEE30 80241B80 C6220088 */ lwc1 $f2, 0x88($s1) -/* DBEE34 80241B84 468010A0 */ cvt.s.w $f2, $f2 -/* DBEE38 80241B88 460010A1 */ cvt.d.s $f2, $f2 -/* DBEE3C 80241B8C 46002121 */ cvt.d.s $f4, $f4 -/* DBEE40 80241B90 C600003C */ lwc1 $f0, 0x3c($s0) -/* DBEE44 80241B94 3C014059 */ lui $at, 0x4059 -/* DBEE48 80241B98 44813800 */ mtc1 $at, $f7 -/* DBEE4C 80241B9C 44803000 */ mtc1 $zero, $f6 -/* DBEE50 80241BA0 46000021 */ cvt.d.s $f0, $f0 -/* DBEE54 80241BA4 46260002 */ mul.d $f0, $f0, $f6 -/* DBEE58 80241BA8 00000000 */ nop -/* DBEE5C 80241BAC 24020001 */ addiu $v0, $zero, 1 -/* DBEE60 80241BB0 8E24006C */ lw $a0, 0x6c($s1) -/* DBEE64 80241BB4 46261083 */ div.d $f2, $f2, $f6 -/* DBEE68 80241BB8 462010A0 */ cvt.s.d $f2, $f2 -/* DBEE6C 80241BBC 46262103 */ div.d $f4, $f4, $f6 -/* DBEE70 80241BC0 46202520 */ cvt.s.d $f20, $f4 -/* DBEE74 80241BC4 30830011 */ andi $v1, $a0, 0x11 -/* DBEE78 80241BC8 4620020D */ trunc.w.d $f8, $f0 -/* DBEE7C 80241BCC E628007C */ swc1 $f8, 0x7c($s1) -/* DBEE80 80241BD0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DBEE84 80241BD4 46800020 */ cvt.s.w $f0, $f0 -/* DBEE88 80241BD8 46000021 */ cvt.d.s $f0, $f0 -/* DBEE8C 80241BDC 46260003 */ div.d $f0, $f0, $f6 -/* DBEE90 80241BE0 462006A0 */ cvt.s.d $f26, $f0 -/* DBEE94 80241BE4 C6200070 */ lwc1 $f0, 0x70($s1) -/* DBEE98 80241BE8 46800020 */ cvt.s.w $f0, $f0 -/* DBEE9C 80241BEC 46000021 */ cvt.d.s $f0, $f0 -/* DBEEA0 80241BF0 46260003 */ div.d $f0, $f0, $f6 -/* DBEEA4 80241BF4 462005A0 */ cvt.s.d $f22, $f0 -/* DBEEA8 80241BF8 14620025 */ bne $v1, $v0, .L80241C90 -/* DBEEAC 80241BFC 4602D600 */ add.s $f24, $f26, $f2 -/* DBEEB0 80241C00 8E020000 */ lw $v0, ($s0) -/* DBEEB4 80241C04 30420008 */ andi $v0, $v0, 8 -/* DBEEB8 80241C08 10400009 */ beqz $v0, .L80241C30 -/* DBEEBC 80241C0C 27A50028 */ addiu $a1, $sp, 0x28 -/* DBEEC0 80241C10 C600003C */ lwc1 $f0, 0x3c($s0) -/* DBEEC4 80241C14 4600C001 */ sub.s $f0, $f24, $f0 -/* DBEEC8 80241C18 4600B03C */ c.lt.s $f22, $f0 -/* DBEECC 80241C1C 00000000 */ nop -/* DBEED0 80241C20 4500001B */ bc1f .L80241C90 -/* DBEED4 80241C24 34820010 */ ori $v0, $a0, 0x10 -/* DBEED8 80241C28 08090724 */ j .L80241C90 -/* DBEEDC 80241C2C AE22006C */ sw $v0, 0x6c($s1) -.L80241C30: -/* DBEEE0 80241C30 27A6002C */ addiu $a2, $sp, 0x2c -/* DBEEE4 80241C34 C6000038 */ lwc1 $f0, 0x38($s0) -/* DBEEE8 80241C38 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBEEEC 80241C3C C6040040 */ lwc1 $f4, 0x40($s0) -/* DBEEF0 80241C40 3C01447A */ lui $at, 0x447a -/* DBEEF4 80241C44 44813000 */ mtc1 $at, $f6 -/* DBEEF8 80241C48 27A20034 */ addiu $v0, $sp, 0x34 -/* DBEEFC 80241C4C E7A00028 */ swc1 $f0, 0x28($sp) -/* DBEF00 80241C50 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DBEF04 80241C54 E7A40030 */ swc1 $f4, 0x30($sp) -/* DBEF08 80241C58 E7A60034 */ swc1 $f6, 0x34($sp) -/* DBEF0C 80241C5C AFA20010 */ sw $v0, 0x10($sp) -/* DBEF10 80241C60 8E040080 */ lw $a0, 0x80($s0) -/* DBEF14 80241C64 0C0372DF */ jal npc_raycast_down_sides -/* DBEF18 80241C68 27A70030 */ addiu $a3, $sp, 0x30 -/* DBEF1C 80241C6C C7A00034 */ lwc1 $f0, 0x34($sp) -/* DBEF20 80241C70 4600D001 */ sub.s $f0, $f26, $f0 -/* DBEF24 80241C74 4600B03C */ c.lt.s $f22, $f0 -/* DBEF28 80241C78 00000000 */ nop -/* DBEF2C 80241C7C 45000004 */ bc1f .L80241C90 -/* DBEF30 80241C80 00000000 */ nop -/* DBEF34 80241C84 8E22006C */ lw $v0, 0x6c($s1) -/* DBEF38 80241C88 34420010 */ ori $v0, $v0, 0x10 -/* DBEF3C 80241C8C AE22006C */ sw $v0, 0x6c($s1) -.L80241C90: -/* DBEF40 80241C90 8E22006C */ lw $v0, 0x6c($s1) -/* DBEF44 80241C94 24030011 */ addiu $v1, $zero, 0x11 -/* DBEF48 80241C98 30420011 */ andi $v0, $v0, 0x11 -/* DBEF4C 80241C9C 14430039 */ bne $v0, $v1, .L80241D84 -/* DBEF50 80241CA0 00000000 */ nop -/* DBEF54 80241CA4 8E020000 */ lw $v0, ($s0) -/* DBEF58 80241CA8 30420008 */ andi $v0, $v0, 8 -/* DBEF5C 80241CAC 1040000A */ beqz $v0, .L80241CD8 -/* DBEF60 80241CB0 4600C106 */ mov.s $f4, $f24 -/* DBEF64 80241CB4 4614C081 */ sub.s $f2, $f24, $f20 -/* DBEF68 80241CB8 3C018024 */ lui $at, %hi(D_802470B8_DC4368) -/* DBEF6C 80241CBC D42070B8 */ ldc1 $f0, %lo(D_802470B8_DC4368)($at) -/* DBEF70 80241CC0 460010A1 */ cvt.d.s $f2, $f2 -/* DBEF74 80241CC4 46201082 */ mul.d $f2, $f2, $f0 -/* DBEF78 80241CC8 00000000 */ nop -/* DBEF7C 80241CCC 4600A021 */ cvt.d.s $f0, $f20 -/* DBEF80 80241CD0 0809074F */ j .L80241D3C -/* DBEF84 80241CD4 46220000 */ add.d $f0, $f0, $f2 -.L80241CD8: -/* DBEF88 80241CD8 27A50028 */ addiu $a1, $sp, 0x28 -/* DBEF8C 80241CDC 27A6002C */ addiu $a2, $sp, 0x2c -/* DBEF90 80241CE0 C6000038 */ lwc1 $f0, 0x38($s0) -/* DBEF94 80241CE4 C6020040 */ lwc1 $f2, 0x40($s0) -/* DBEF98 80241CE8 3C01447A */ lui $at, 0x447a -/* DBEF9C 80241CEC 44812000 */ mtc1 $at, $f4 -/* DBEFA0 80241CF0 27A20034 */ addiu $v0, $sp, 0x34 -/* DBEFA4 80241CF4 E7B4002C */ swc1 $f20, 0x2c($sp) -/* DBEFA8 80241CF8 E7A00028 */ swc1 $f0, 0x28($sp) -/* DBEFAC 80241CFC E7A20030 */ swc1 $f2, 0x30($sp) -/* DBEFB0 80241D00 E7A40034 */ swc1 $f4, 0x34($sp) -/* DBEFB4 80241D04 AFA20010 */ sw $v0, 0x10($sp) -/* DBEFB8 80241D08 8E040080 */ lw $a0, 0x80($s0) -/* DBEFBC 80241D0C 0C0372DF */ jal npc_raycast_down_sides -/* DBEFC0 80241D10 27A70030 */ addiu $a3, $sp, 0x30 -/* DBEFC4 80241D14 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* DBEFC8 80241D18 461A2100 */ add.s $f4, $f4, $f26 -/* DBEFCC 80241D1C 46142081 */ sub.s $f2, $f4, $f20 -/* DBEFD0 80241D20 3C018024 */ lui $at, %hi(D_802470C0_DC4370) -/* DBEFD4 80241D24 D42070C0 */ ldc1 $f0, %lo(D_802470C0_DC4370)($at) -/* DBEFD8 80241D28 460010A1 */ cvt.d.s $f2, $f2 -/* DBEFDC 80241D2C 46201082 */ mul.d $f2, $f2, $f0 -/* DBEFE0 80241D30 00000000 */ nop -/* DBEFE4 80241D34 4600A021 */ cvt.d.s $f0, $f20 -/* DBEFE8 80241D38 46220000 */ add.d $f0, $f0, $f2 -.L80241D3C: -/* DBEFEC 80241D3C 46200020 */ cvt.s.d $f0, $f0 -/* DBEFF0 80241D40 E600003C */ swc1 $f0, 0x3c($s0) -/* DBEFF4 80241D44 C600003C */ lwc1 $f0, 0x3c($s0) -/* DBEFF8 80241D48 46002001 */ sub.s $f0, $f4, $f0 -/* DBEFFC 80241D4C 3C013FF0 */ lui $at, 0x3ff0 -/* DBF000 80241D50 44811800 */ mtc1 $at, $f3 -/* DBF004 80241D54 44801000 */ mtc1 $zero, $f2 -/* DBF008 80241D58 46000005 */ abs.s $f0, $f0 -/* DBF00C 80241D5C 46000021 */ cvt.d.s $f0, $f0 -/* DBF010 80241D60 4622003C */ c.lt.d $f0, $f2 -/* DBF014 80241D64 00000000 */ nop -/* DBF018 80241D68 45000036 */ bc1f .L80241E44 -/* DBF01C 80241D6C 2403FFEF */ addiu $v1, $zero, -0x11 -/* DBF020 80241D70 E604003C */ swc1 $f4, 0x3c($s0) -/* DBF024 80241D74 8E22006C */ lw $v0, 0x6c($s1) -/* DBF028 80241D78 00431024 */ and $v0, $v0, $v1 -/* DBF02C 80241D7C 08090791 */ j .L80241E44 -/* DBF030 80241D80 AE22006C */ sw $v0, 0x6c($s1) -.L80241D84: -/* DBF034 80241D84 8E220070 */ lw $v0, 0x70($s1) -/* DBF038 80241D88 1840002E */ blez $v0, .L80241E44 -/* DBF03C 80241D8C 00000000 */ nop -/* DBF040 80241D90 C62C0074 */ lwc1 $f12, 0x74($s1) -/* DBF044 80241D94 0C00A8BB */ jal sin_deg -/* DBF048 80241D98 46806320 */ cvt.s.w $f12, $f12 -/* DBF04C 80241D9C 8E020000 */ lw $v0, ($s0) -/* DBF050 80241DA0 30420008 */ andi $v0, $v0, 8 -/* DBF054 80241DA4 10400003 */ beqz $v0, .L80241DB4 -/* DBF058 80241DA8 46000506 */ mov.s $f20, $f0 -/* DBF05C 80241DAC 0809077D */ j .L80241DF4 -/* DBF060 80241DB0 0000102D */ daddu $v0, $zero, $zero -.L80241DB4: -/* DBF064 80241DB4 27A50028 */ addiu $a1, $sp, 0x28 -/* DBF068 80241DB8 27A6002C */ addiu $a2, $sp, 0x2c -/* DBF06C 80241DBC C6000038 */ lwc1 $f0, 0x38($s0) -/* DBF070 80241DC0 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBF074 80241DC4 C6040040 */ lwc1 $f4, 0x40($s0) -/* DBF078 80241DC8 3C01447A */ lui $at, 0x447a -/* DBF07C 80241DCC 44813000 */ mtc1 $at, $f6 -/* DBF080 80241DD0 27A20034 */ addiu $v0, $sp, 0x34 -/* DBF084 80241DD4 E7A00028 */ swc1 $f0, 0x28($sp) -/* DBF088 80241DD8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DBF08C 80241DDC E7A40030 */ swc1 $f4, 0x30($sp) -/* DBF090 80241DE0 E7A60034 */ swc1 $f6, 0x34($sp) -/* DBF094 80241DE4 AFA20010 */ sw $v0, 0x10($sp) -/* DBF098 80241DE8 8E040080 */ lw $a0, 0x80($s0) -/* DBF09C 80241DEC 0C0372DF */ jal npc_raycast_down_sides -/* DBF0A0 80241DF0 27A70030 */ addiu $a3, $sp, 0x30 -.L80241DF4: -/* DBF0A4 80241DF4 10400007 */ beqz $v0, .L80241E14 -/* DBF0A8 80241DF8 00000000 */ nop -/* DBF0AC 80241DFC 4616A082 */ mul.s $f2, $f20, $f22 -/* DBF0B0 80241E00 00000000 */ nop -/* DBF0B4 80241E04 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DBF0B8 80241E08 461A0000 */ add.s $f0, $f0, $f26 -/* DBF0BC 80241E0C 08090788 */ j .L80241E20 -/* DBF0C0 80241E10 46020000 */ add.s $f0, $f0, $f2 -.L80241E14: -/* DBF0C4 80241E14 4616A002 */ mul.s $f0, $f20, $f22 -/* DBF0C8 80241E18 00000000 */ nop -/* DBF0CC 80241E1C 4600C000 */ add.s $f0, $f24, $f0 -.L80241E20: -/* DBF0D0 80241E20 E600003C */ swc1 $f0, 0x3c($s0) -/* DBF0D4 80241E24 8E220074 */ lw $v0, 0x74($s1) -/* DBF0D8 80241E28 2442000A */ addiu $v0, $v0, 0xa -/* DBF0DC 80241E2C 44826000 */ mtc1 $v0, $f12 -/* DBF0E0 80241E30 00000000 */ nop -/* DBF0E4 80241E34 0C00A6C9 */ jal clamp_angle -/* DBF0E8 80241E38 46806320 */ cvt.s.w $f12, $f12 -/* DBF0EC 80241E3C 4600020D */ trunc.w.s $f8, $f0 -/* DBF0F0 80241E40 E6280074 */ swc1 $f8, 0x74($s1) -.L80241E44: -/* DBF0F4 80241E44 8E220090 */ lw $v0, 0x90($s1) -/* DBF0F8 80241E48 1C40004A */ bgtz $v0, .L80241F74 -/* DBF0FC 80241E4C 2442FFFF */ addiu $v0, $v0, -1 -/* DBF100 80241E50 8E430014 */ lw $v1, 0x14($s2) -/* DBF104 80241E54 04600048 */ bltz $v1, .L80241F78 -/* DBF108 80241E58 00000000 */ nop -/* DBF10C 80241E5C 8E620074 */ lw $v0, 0x74($s3) -/* DBF110 80241E60 1C400042 */ bgtz $v0, .L80241F6C -/* DBF114 80241E64 2442FFFF */ addiu $v0, $v0, -1 -/* DBF118 80241E68 AE630074 */ sw $v1, 0x74($s3) -/* DBF11C 80241E6C 860200A8 */ lh $v0, 0xa8($s0) -/* DBF120 80241E70 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBF124 80241E74 44820000 */ mtc1 $v0, $f0 -/* DBF128 80241E78 00000000 */ nop -/* DBF12C 80241E7C 46800020 */ cvt.s.w $f0, $f0 -/* DBF130 80241E80 46001080 */ add.s $f2, $f2, $f0 -/* DBF134 80241E84 3C014024 */ lui $at, 0x4024 -/* DBF138 80241E88 44810800 */ mtc1 $at, $f1 -/* DBF13C 80241E8C 44800000 */ mtc1 $zero, $f0 -/* DBF140 80241E90 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBF144 80241E94 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBF148 80241E98 460010A1 */ cvt.d.s $f2, $f2 -/* DBF14C 80241E9C 46201080 */ add.d $f2, $f2, $f0 -/* DBF150 80241EA0 C440002C */ lwc1 $f0, 0x2c($v0) -/* DBF154 80241EA4 46000021 */ cvt.d.s $f0, $f0 -/* DBF158 80241EA8 4622003C */ c.lt.d $f0, $f2 -/* DBF15C 80241EAC 00000000 */ nop -/* DBF160 80241EB0 4500002C */ bc1f .L80241F64 -/* DBF164 80241EB4 02A0202D */ daddu $a0, $s5, $zero -/* DBF168 80241EB8 AFA00010 */ sw $zero, 0x10($sp) -/* DBF16C 80241EBC 8E46000C */ lw $a2, 0xc($s2) -/* DBF170 80241EC0 8E470010 */ lw $a3, 0x10($s2) -/* DBF174 80241EC4 0C01242D */ jal func_800490B4 -/* DBF178 80241EC8 0220282D */ daddu $a1, $s1, $zero -/* DBF17C 80241ECC 10400025 */ beqz $v0, .L80241F64 -/* DBF180 80241ED0 0000202D */ daddu $a0, $zero, $zero -/* DBF184 80241ED4 0200282D */ daddu $a1, $s0, $zero -/* DBF188 80241ED8 0000302D */ daddu $a2, $zero, $zero -/* DBF18C 80241EDC 2412000C */ addiu $s2, $zero, 0xc -/* DBF190 80241EE0 860300A8 */ lh $v1, 0xa8($s0) -/* DBF194 80241EE4 3C013F80 */ lui $at, 0x3f80 -/* DBF198 80241EE8 44810000 */ mtc1 $at, $f0 -/* DBF19C 80241EEC 3C014000 */ lui $at, 0x4000 -/* DBF1A0 80241EF0 44811000 */ mtc1 $at, $f2 -/* DBF1A4 80241EF4 3C01C1A0 */ lui $at, 0xc1a0 -/* DBF1A8 80241EF8 44812000 */ mtc1 $at, $f4 -/* DBF1AC 80241EFC 44834000 */ mtc1 $v1, $f8 -/* DBF1B0 80241F00 00000000 */ nop -/* DBF1B4 80241F04 46804220 */ cvt.s.w $f8, $f8 -/* DBF1B8 80241F08 44074000 */ mfc1 $a3, $f8 -/* DBF1BC 80241F0C 27A20038 */ addiu $v0, $sp, 0x38 -/* DBF1C0 80241F10 AFB2001C */ sw $s2, 0x1c($sp) -/* DBF1C4 80241F14 AFA20020 */ sw $v0, 0x20($sp) -/* DBF1C8 80241F18 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBF1CC 80241F1C E7A20014 */ swc1 $f2, 0x14($sp) -/* DBF1D0 80241F20 0C01BFA4 */ jal fx_emote -/* DBF1D4 80241F24 E7A40018 */ swc1 $f4, 0x18($sp) -/* DBF1D8 80241F28 0200202D */ daddu $a0, $s0, $zero -/* DBF1DC 80241F2C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DBF1E0 80241F30 C480003C */ lwc1 $f0, 0x3c($a0) -/* DBF1E4 80241F34 3C060020 */ lui $a2, 0x20 -/* DBF1E8 80241F38 0C012530 */ jal ai_enemy_play_sound -/* DBF1EC 80241F3C E4800064 */ swc1 $f0, 0x64($a0) -/* DBF1F0 80241F40 8E220018 */ lw $v0, 0x18($s1) -/* DBF1F4 80241F44 9442002A */ lhu $v0, 0x2a($v0) -/* DBF1F8 80241F48 30420001 */ andi $v0, $v0, 1 -/* DBF1FC 80241F4C 10400003 */ beqz $v0, .L80241F5C -/* DBF200 80241F50 2402000A */ addiu $v0, $zero, 0xa -/* DBF204 80241F54 08090847 */ j .L8024211C -/* DBF208 80241F58 AE620070 */ sw $v0, 0x70($s3) -.L80241F5C: -/* DBF20C 80241F5C 08090847 */ j .L8024211C -/* DBF210 80241F60 AE720070 */ sw $s2, 0x70($s3) -.L80241F64: -/* DBF214 80241F64 8E620074 */ lw $v0, 0x74($s3) -/* DBF218 80241F68 2442FFFF */ addiu $v0, $v0, -1 -.L80241F6C: -/* DBF21C 80241F6C 080907DE */ j .L80241F78 -/* DBF220 80241F70 AE620074 */ sw $v0, 0x74($s3) -.L80241F74: -/* DBF224 80241F74 AE220090 */ sw $v0, 0x90($s1) -.L80241F78: -/* DBF228 80241F78 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBF22C 80241F7C C6000040 */ lwc1 $f0, 0x40($s0) -/* DBF230 80241F80 C4620000 */ lwc1 $f2, ($v1) -/* DBF234 80241F84 468010A0 */ cvt.s.w $f2, $f2 -/* DBF238 80241F88 C4640008 */ lwc1 $f4, 8($v1) -/* DBF23C 80241F8C 46802120 */ cvt.s.w $f4, $f4 -/* DBF240 80241F90 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBF244 80241F94 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBF248 80241F98 44051000 */ mfc1 $a1, $f2 -/* DBF24C 80241F9C C440000C */ lwc1 $f0, 0xc($v0) -/* DBF250 80241FA0 46800020 */ cvt.s.w $f0, $f0 -/* DBF254 80241FA4 E7A00014 */ swc1 $f0, 0x14($sp) -/* DBF258 80241FA8 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBF25C 80241FAC 44062000 */ mfc1 $a2, $f4 -/* DBF260 80241FB0 C4400010 */ lwc1 $f0, 0x10($v0) -/* DBF264 80241FB4 46800020 */ cvt.s.w $f0, $f0 -/* DBF268 80241FB8 E7A00018 */ swc1 $f0, 0x18($sp) -/* DBF26C 80241FBC 8C640018 */ lw $a0, 0x18($v1) -/* DBF270 80241FC0 0C0123F5 */ jal is_point_within_region -/* DBF274 80241FC4 8E070038 */ lw $a3, 0x38($s0) -/* DBF278 80241FC8 1040001A */ beqz $v0, .L80242034 -/* DBF27C 80241FCC 00000000 */ nop -/* DBF280 80241FD0 8E060038 */ lw $a2, 0x38($s0) -/* DBF284 80241FD4 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBF288 80241FD8 8E070040 */ lw $a3, 0x40($s0) -/* DBF28C 80241FDC C44C0000 */ lwc1 $f12, ($v0) -/* DBF290 80241FE0 46806320 */ cvt.s.w $f12, $f12 -/* DBF294 80241FE4 C44E0008 */ lwc1 $f14, 8($v0) -/* DBF298 80241FE8 0C00A7B5 */ jal dist2D -/* DBF29C 80241FEC 468073A0 */ cvt.s.w $f14, $f14 -/* DBF2A0 80241FF0 C6020018 */ lwc1 $f2, 0x18($s0) -/* DBF2A4 80241FF4 4600103C */ c.lt.s $f2, $f0 -/* DBF2A8 80241FF8 00000000 */ nop -/* DBF2AC 80241FFC 4500000D */ bc1f .L80242034 -/* DBF2B0 80242000 E7A00034 */ swc1 $f0, 0x34($sp) -/* DBF2B4 80242004 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBF2B8 80242008 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBF2BC 8024200C C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBF2C0 80242010 C4480000 */ lwc1 $f8, ($v0) -/* DBF2C4 80242014 46804220 */ cvt.s.w $f8, $f8 -/* DBF2C8 80242018 44064000 */ mfc1 $a2, $f8 -/* DBF2CC 8024201C C4480008 */ lwc1 $f8, 8($v0) -/* DBF2D0 80242020 46804220 */ cvt.s.w $f8, $f8 -/* DBF2D4 80242024 44074000 */ mfc1 $a3, $f8 -/* DBF2D8 80242028 0C00A720 */ jal atan2 -/* DBF2DC 8024202C 24140001 */ addiu $s4, $zero, 1 -/* DBF2E0 80242030 E600000C */ swc1 $f0, 0xc($s0) -.L80242034: -/* DBF2E4 80242034 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBF2E8 80242038 8C43000C */ lw $v1, 0xc($v0) -/* DBF2EC 8024203C 8C420010 */ lw $v0, 0x10($v0) -/* DBF2F0 80242040 00621825 */ or $v1, $v1, $v0 -/* DBF2F4 80242044 00741825 */ or $v1, $v1, $s4 -/* DBF2F8 80242048 10600008 */ beqz $v1, .L8024206C -/* DBF2FC 8024204C 00000000 */ nop -/* DBF300 80242050 8602008C */ lh $v0, 0x8c($s0) -/* DBF304 80242054 14400031 */ bnez $v0, .L8024211C -/* DBF308 80242058 00000000 */ nop -/* DBF30C 8024205C 8E050018 */ lw $a1, 0x18($s0) -/* DBF310 80242060 8E06000C */ lw $a2, 0xc($s0) -/* DBF314 80242064 0C00EA95 */ jal npc_move_heading -/* DBF318 80242068 0200202D */ daddu $a0, $s0, $zero -.L8024206C: -/* DBF31C 8024206C C600003C */ lwc1 $f0, 0x3c($s0) -/* DBF320 80242070 3C014059 */ lui $at, 0x4059 -/* DBF324 80242074 44811800 */ mtc1 $at, $f3 -/* DBF328 80242078 44801000 */ mtc1 $zero, $f2 -/* DBF32C 8024207C 46000021 */ cvt.d.s $f0, $f0 -/* DBF330 80242080 46220002 */ mul.d $f0, $f0, $f2 -/* DBF334 80242084 00000000 */ nop -/* DBF338 80242088 4620020D */ trunc.w.d $f8, $f0 -/* DBF33C 8024208C E628007C */ swc1 $f8, 0x7c($s1) -/* DBF340 80242090 8E420004 */ lw $v0, 4($s2) -/* DBF344 80242094 18400021 */ blez $v0, .L8024211C -/* DBF348 80242098 00000000 */ nop -/* DBF34C 8024209C 8602008E */ lh $v0, 0x8e($s0) -/* DBF350 802420A0 9603008E */ lhu $v1, 0x8e($s0) -/* DBF354 802420A4 18400005 */ blez $v0, .L802420BC -/* DBF358 802420A8 2462FFFF */ addiu $v0, $v1, -1 -/* DBF35C 802420AC A602008E */ sh $v0, 0x8e($s0) -/* DBF360 802420B0 00021400 */ sll $v0, $v0, 0x10 -/* DBF364 802420B4 1C400019 */ bgtz $v0, .L8024211C -/* DBF368 802420B8 00000000 */ nop -.L802420BC: -/* DBF36C 802420BC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DBF370 802420C0 24020002 */ addiu $v0, $zero, 2 -/* DBF374 802420C4 0C00A67F */ jal rand_int -/* DBF378 802420C8 AE620070 */ sw $v0, 0x70($s3) -/* DBF37C 802420CC 3C035555 */ lui $v1, 0x5555 -/* DBF380 802420D0 34635556 */ ori $v1, $v1, 0x5556 -/* DBF384 802420D4 00430018 */ mult $v0, $v1 -/* DBF388 802420D8 000227C3 */ sra $a0, $v0, 0x1f -/* DBF38C 802420DC 00004010 */ mfhi $t0 -/* DBF390 802420E0 01042023 */ subu $a0, $t0, $a0 -/* DBF394 802420E4 00041840 */ sll $v1, $a0, 1 -/* DBF398 802420E8 00641821 */ addu $v1, $v1, $a0 -/* DBF39C 802420EC 00431023 */ subu $v0, $v0, $v1 -/* DBF3A0 802420F0 24430002 */ addiu $v1, $v0, 2 -/* DBF3A4 802420F4 AE630074 */ sw $v1, 0x74($s3) -/* DBF3A8 802420F8 8E42002C */ lw $v0, 0x2c($s2) -/* DBF3AC 802420FC 58400007 */ blezl $v0, .L8024211C -/* DBF3B0 80242100 AE600070 */ sw $zero, 0x70($s3) -/* DBF3B4 80242104 8E420008 */ lw $v0, 8($s2) -/* DBF3B8 80242108 18400003 */ blez $v0, .L80242118 -/* DBF3BC 8024210C 28620003 */ slti $v0, $v1, 3 -/* DBF3C0 80242110 10400002 */ beqz $v0, .L8024211C -/* DBF3C4 80242114 00000000 */ nop -.L80242118: -/* DBF3C8 80242118 AE600070 */ sw $zero, 0x70($s3) -.L8024211C: -/* DBF3CC 8024211C 8FBF0058 */ lw $ra, 0x58($sp) -/* DBF3D0 80242120 8FB50054 */ lw $s5, 0x54($sp) -/* DBF3D4 80242124 8FB40050 */ lw $s4, 0x50($sp) -/* DBF3D8 80242128 8FB3004C */ lw $s3, 0x4c($sp) -/* DBF3DC 8024212C 8FB20048 */ lw $s2, 0x48($sp) -/* DBF3E0 80242130 8FB10044 */ lw $s1, 0x44($sp) -/* DBF3E4 80242134 8FB00040 */ lw $s0, 0x40($sp) -/* DBF3E8 80242138 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* DBF3EC 8024213C D7B80070 */ ldc1 $f24, 0x70($sp) -/* DBF3F0 80242140 D7B60068 */ ldc1 $f22, 0x68($sp) -/* DBF3F4 80242144 D7B40060 */ ldc1 $f20, 0x60($sp) -/* DBF3F8 80242148 03E00008 */ jr $ra -/* DBF3FC 8024214C 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s index 4b11d0878a..f56d88d9eb 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s @@ -86,7 +86,7 @@ glabel func_80242C84_DBFF34 .L80242DA0_DC0050: /* DC0050 80242DA0 0280202D */ daddu $a0, $s4, $zero /* DC0054 80242DA4 0200282D */ daddu $a1, $s0, $zero -/* DC0058 80242DA8 0C0906CA */ jal func_80241B28_DBEDD8 +/* DC0058 80242DA8 0C0906CA */ jal omo_07_UnkNpcAIFunc35 /* DC005C 80242DAC 0260302D */ daddu $a2, $s3, $zero /* DC0060 80242DB0 08090B93 */ j .L80242E4C /* DC0064 80242DB4 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s deleted file mode 100644 index de2dbaa24f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247958_DF67F8 -.double 0.09 - -dlabel D_80247960_DF6800 -.double 0.09 - -.section .text - -glabel func_80241164_DF0004 -/* DF0004 80241164 27BDFF80 */ addiu $sp, $sp, -0x80 -/* DF0008 80241168 AFB3004C */ sw $s3, 0x4c($sp) -/* DF000C 8024116C 0080982D */ daddu $s3, $a0, $zero -/* DF0010 80241170 AFBF0058 */ sw $ra, 0x58($sp) -/* DF0014 80241174 AFB50054 */ sw $s5, 0x54($sp) -/* DF0018 80241178 AFB40050 */ sw $s4, 0x50($sp) -/* DF001C 8024117C AFB20048 */ sw $s2, 0x48($sp) -/* DF0020 80241180 AFB10044 */ sw $s1, 0x44($sp) -/* DF0024 80241184 AFB00040 */ sw $s0, 0x40($sp) -/* DF0028 80241188 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* DF002C 8024118C F7B80070 */ sdc1 $f24, 0x70($sp) -/* DF0030 80241190 F7B60068 */ sdc1 $f22, 0x68($sp) -/* DF0034 80241194 F7B40060 */ sdc1 $f20, 0x60($sp) -/* DF0038 80241198 8E710148 */ lw $s1, 0x148($s3) -/* DF003C 8024119C 00A0902D */ daddu $s2, $a1, $zero -/* DF0040 802411A0 86240008 */ lh $a0, 8($s1) -/* DF0044 802411A4 0C00EABB */ jal get_npc_unsafe -/* DF0048 802411A8 00C0A82D */ daddu $s5, $a2, $zero -/* DF004C 802411AC 0040802D */ daddu $s0, $v0, $zero -/* DF0050 802411B0 0000A02D */ daddu $s4, $zero, $zero -/* DF0054 802411B4 C624007C */ lwc1 $f4, 0x7c($s1) -/* DF0058 802411B8 46802120 */ cvt.s.w $f4, $f4 -/* DF005C 802411BC C6220088 */ lwc1 $f2, 0x88($s1) -/* DF0060 802411C0 468010A0 */ cvt.s.w $f2, $f2 -/* DF0064 802411C4 460010A1 */ cvt.d.s $f2, $f2 -/* DF0068 802411C8 46002121 */ cvt.d.s $f4, $f4 -/* DF006C 802411CC C600003C */ lwc1 $f0, 0x3c($s0) -/* DF0070 802411D0 3C014059 */ lui $at, 0x4059 -/* DF0074 802411D4 44813800 */ mtc1 $at, $f7 -/* DF0078 802411D8 44803000 */ mtc1 $zero, $f6 -/* DF007C 802411DC 46000021 */ cvt.d.s $f0, $f0 -/* DF0080 802411E0 46260002 */ mul.d $f0, $f0, $f6 -/* DF0084 802411E4 00000000 */ nop -/* DF0088 802411E8 24020001 */ addiu $v0, $zero, 1 -/* DF008C 802411EC 8E24006C */ lw $a0, 0x6c($s1) -/* DF0090 802411F0 46261083 */ div.d $f2, $f2, $f6 -/* DF0094 802411F4 462010A0 */ cvt.s.d $f2, $f2 -/* DF0098 802411F8 46262103 */ div.d $f4, $f4, $f6 -/* DF009C 802411FC 46202520 */ cvt.s.d $f20, $f4 -/* DF00A0 80241200 30830011 */ andi $v1, $a0, 0x11 -/* DF00A4 80241204 4620020D */ trunc.w.d $f8, $f0 -/* DF00A8 80241208 E628007C */ swc1 $f8, 0x7c($s1) -/* DF00AC 8024120C C6200078 */ lwc1 $f0, 0x78($s1) -/* DF00B0 80241210 46800020 */ cvt.s.w $f0, $f0 -/* DF00B4 80241214 46000021 */ cvt.d.s $f0, $f0 -/* DF00B8 80241218 46260003 */ div.d $f0, $f0, $f6 -/* DF00BC 8024121C 462006A0 */ cvt.s.d $f26, $f0 -/* DF00C0 80241220 C6200070 */ lwc1 $f0, 0x70($s1) -/* DF00C4 80241224 46800020 */ cvt.s.w $f0, $f0 -/* DF00C8 80241228 46000021 */ cvt.d.s $f0, $f0 -/* DF00CC 8024122C 46260003 */ div.d $f0, $f0, $f6 -/* DF00D0 80241230 462005A0 */ cvt.s.d $f22, $f0 -/* DF00D4 80241234 14620025 */ bne $v1, $v0, .L802412CC -/* DF00D8 80241238 4602D600 */ add.s $f24, $f26, $f2 -/* DF00DC 8024123C 8E020000 */ lw $v0, ($s0) -/* DF00E0 80241240 30420008 */ andi $v0, $v0, 8 -/* DF00E4 80241244 10400009 */ beqz $v0, .L8024126C -/* DF00E8 80241248 27A50028 */ addiu $a1, $sp, 0x28 -/* DF00EC 8024124C C600003C */ lwc1 $f0, 0x3c($s0) -/* DF00F0 80241250 4600C001 */ sub.s $f0, $f24, $f0 -/* DF00F4 80241254 4600B03C */ c.lt.s $f22, $f0 -/* DF00F8 80241258 00000000 */ nop -/* DF00FC 8024125C 4500001B */ bc1f .L802412CC -/* DF0100 80241260 34820010 */ ori $v0, $a0, 0x10 -/* DF0104 80241264 080904B3 */ j .L802412CC -/* DF0108 80241268 AE22006C */ sw $v0, 0x6c($s1) -.L8024126C: -/* DF010C 8024126C 27A6002C */ addiu $a2, $sp, 0x2c -/* DF0110 80241270 C6000038 */ lwc1 $f0, 0x38($s0) -/* DF0114 80241274 C602003C */ lwc1 $f2, 0x3c($s0) -/* DF0118 80241278 C6040040 */ lwc1 $f4, 0x40($s0) -/* DF011C 8024127C 3C01447A */ lui $at, 0x447a -/* DF0120 80241280 44813000 */ mtc1 $at, $f6 -/* DF0124 80241284 27A20034 */ addiu $v0, $sp, 0x34 -/* DF0128 80241288 E7A00028 */ swc1 $f0, 0x28($sp) -/* DF012C 8024128C E7A2002C */ swc1 $f2, 0x2c($sp) -/* DF0130 80241290 E7A40030 */ swc1 $f4, 0x30($sp) -/* DF0134 80241294 E7A60034 */ swc1 $f6, 0x34($sp) -/* DF0138 80241298 AFA20010 */ sw $v0, 0x10($sp) -/* DF013C 8024129C 8E040080 */ lw $a0, 0x80($s0) -/* DF0140 802412A0 0C0372DF */ jal npc_raycast_down_sides -/* DF0144 802412A4 27A70030 */ addiu $a3, $sp, 0x30 -/* DF0148 802412A8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* DF014C 802412AC 4600D001 */ sub.s $f0, $f26, $f0 -/* DF0150 802412B0 4600B03C */ c.lt.s $f22, $f0 -/* DF0154 802412B4 00000000 */ nop -/* DF0158 802412B8 45000004 */ bc1f .L802412CC -/* DF015C 802412BC 00000000 */ nop -/* DF0160 802412C0 8E22006C */ lw $v0, 0x6c($s1) -/* DF0164 802412C4 34420010 */ ori $v0, $v0, 0x10 -/* DF0168 802412C8 AE22006C */ sw $v0, 0x6c($s1) -.L802412CC: -/* DF016C 802412CC 8E22006C */ lw $v0, 0x6c($s1) -/* DF0170 802412D0 24030011 */ addiu $v1, $zero, 0x11 -/* DF0174 802412D4 30420011 */ andi $v0, $v0, 0x11 -/* DF0178 802412D8 14430039 */ bne $v0, $v1, .L802413C0 -/* DF017C 802412DC 00000000 */ nop -/* DF0180 802412E0 8E020000 */ lw $v0, ($s0) -/* DF0184 802412E4 30420008 */ andi $v0, $v0, 8 -/* DF0188 802412E8 1040000A */ beqz $v0, .L80241314 -/* DF018C 802412EC 4600C106 */ mov.s $f4, $f24 -/* DF0190 802412F0 4614C081 */ sub.s $f2, $f24, $f20 -/* DF0194 802412F4 3C018024 */ lui $at, %hi(D_80247958_DF67F8) -/* DF0198 802412F8 D4207958 */ ldc1 $f0, %lo(D_80247958_DF67F8)($at) -/* DF019C 802412FC 460010A1 */ cvt.d.s $f2, $f2 -/* DF01A0 80241300 46201082 */ mul.d $f2, $f2, $f0 -/* DF01A4 80241304 00000000 */ nop -/* DF01A8 80241308 4600A021 */ cvt.d.s $f0, $f20 -/* DF01AC 8024130C 080904DE */ j .L80241378 -/* DF01B0 80241310 46220000 */ add.d $f0, $f0, $f2 -.L80241314: -/* DF01B4 80241314 27A50028 */ addiu $a1, $sp, 0x28 -/* DF01B8 80241318 27A6002C */ addiu $a2, $sp, 0x2c -/* DF01BC 8024131C C6000038 */ lwc1 $f0, 0x38($s0) -/* DF01C0 80241320 C6020040 */ lwc1 $f2, 0x40($s0) -/* DF01C4 80241324 3C01447A */ lui $at, 0x447a -/* DF01C8 80241328 44812000 */ mtc1 $at, $f4 -/* DF01CC 8024132C 27A20034 */ addiu $v0, $sp, 0x34 -/* DF01D0 80241330 E7B4002C */ swc1 $f20, 0x2c($sp) -/* DF01D4 80241334 E7A00028 */ swc1 $f0, 0x28($sp) -/* DF01D8 80241338 E7A20030 */ swc1 $f2, 0x30($sp) -/* DF01DC 8024133C E7A40034 */ swc1 $f4, 0x34($sp) -/* DF01E0 80241340 AFA20010 */ sw $v0, 0x10($sp) -/* DF01E4 80241344 8E040080 */ lw $a0, 0x80($s0) -/* DF01E8 80241348 0C0372DF */ jal npc_raycast_down_sides -/* DF01EC 8024134C 27A70030 */ addiu $a3, $sp, 0x30 -/* DF01F0 80241350 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* DF01F4 80241354 461A2100 */ add.s $f4, $f4, $f26 -/* DF01F8 80241358 46142081 */ sub.s $f2, $f4, $f20 -/* DF01FC 8024135C 3C018024 */ lui $at, %hi(D_80247960_DF6800) -/* DF0200 80241360 D4207960 */ ldc1 $f0, %lo(D_80247960_DF6800)($at) -/* DF0204 80241364 460010A1 */ cvt.d.s $f2, $f2 -/* DF0208 80241368 46201082 */ mul.d $f2, $f2, $f0 -/* DF020C 8024136C 00000000 */ nop -/* DF0210 80241370 4600A021 */ cvt.d.s $f0, $f20 -/* DF0214 80241374 46220000 */ add.d $f0, $f0, $f2 -.L80241378: -/* DF0218 80241378 46200020 */ cvt.s.d $f0, $f0 -/* DF021C 8024137C E600003C */ swc1 $f0, 0x3c($s0) -/* DF0220 80241380 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF0224 80241384 46002001 */ sub.s $f0, $f4, $f0 -/* DF0228 80241388 3C013FF0 */ lui $at, 0x3ff0 -/* DF022C 8024138C 44811800 */ mtc1 $at, $f3 -/* DF0230 80241390 44801000 */ mtc1 $zero, $f2 -/* DF0234 80241394 46000005 */ abs.s $f0, $f0 -/* DF0238 80241398 46000021 */ cvt.d.s $f0, $f0 -/* DF023C 8024139C 4622003C */ c.lt.d $f0, $f2 -/* DF0240 802413A0 00000000 */ nop -/* DF0244 802413A4 45000036 */ bc1f .L80241480 -/* DF0248 802413A8 2403FFEF */ addiu $v1, $zero, -0x11 -/* DF024C 802413AC E604003C */ swc1 $f4, 0x3c($s0) -/* DF0250 802413B0 8E22006C */ lw $v0, 0x6c($s1) -/* DF0254 802413B4 00431024 */ and $v0, $v0, $v1 -/* DF0258 802413B8 08090520 */ j .L80241480 -/* DF025C 802413BC AE22006C */ sw $v0, 0x6c($s1) -.L802413C0: -/* DF0260 802413C0 8E220070 */ lw $v0, 0x70($s1) -/* DF0264 802413C4 1840002E */ blez $v0, .L80241480 -/* DF0268 802413C8 00000000 */ nop -/* DF026C 802413CC C62C0074 */ lwc1 $f12, 0x74($s1) -/* DF0270 802413D0 0C00A8BB */ jal sin_deg -/* DF0274 802413D4 46806320 */ cvt.s.w $f12, $f12 -/* DF0278 802413D8 8E020000 */ lw $v0, ($s0) -/* DF027C 802413DC 30420008 */ andi $v0, $v0, 8 -/* DF0280 802413E0 10400003 */ beqz $v0, .L802413F0 -/* DF0284 802413E4 46000506 */ mov.s $f20, $f0 -/* DF0288 802413E8 0809050C */ j .L80241430 -/* DF028C 802413EC 0000102D */ daddu $v0, $zero, $zero -.L802413F0: -/* DF0290 802413F0 27A50028 */ addiu $a1, $sp, 0x28 -/* DF0294 802413F4 27A6002C */ addiu $a2, $sp, 0x2c -/* DF0298 802413F8 C6000038 */ lwc1 $f0, 0x38($s0) -/* DF029C 802413FC C602003C */ lwc1 $f2, 0x3c($s0) -/* DF02A0 80241400 C6040040 */ lwc1 $f4, 0x40($s0) -/* DF02A4 80241404 3C01447A */ lui $at, 0x447a -/* DF02A8 80241408 44813000 */ mtc1 $at, $f6 -/* DF02AC 8024140C 27A20034 */ addiu $v0, $sp, 0x34 -/* DF02B0 80241410 E7A00028 */ swc1 $f0, 0x28($sp) -/* DF02B4 80241414 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DF02B8 80241418 E7A40030 */ swc1 $f4, 0x30($sp) -/* DF02BC 8024141C E7A60034 */ swc1 $f6, 0x34($sp) -/* DF02C0 80241420 AFA20010 */ sw $v0, 0x10($sp) -/* DF02C4 80241424 8E040080 */ lw $a0, 0x80($s0) -/* DF02C8 80241428 0C0372DF */ jal npc_raycast_down_sides -/* DF02CC 8024142C 27A70030 */ addiu $a3, $sp, 0x30 -.L80241430: -/* DF02D0 80241430 10400007 */ beqz $v0, .L80241450 -/* DF02D4 80241434 00000000 */ nop -/* DF02D8 80241438 4616A082 */ mul.s $f2, $f20, $f22 -/* DF02DC 8024143C 00000000 */ nop -/* DF02E0 80241440 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DF02E4 80241444 461A0000 */ add.s $f0, $f0, $f26 -/* DF02E8 80241448 08090517 */ j .L8024145C -/* DF02EC 8024144C 46020000 */ add.s $f0, $f0, $f2 -.L80241450: -/* DF02F0 80241450 4616A002 */ mul.s $f0, $f20, $f22 -/* DF02F4 80241454 00000000 */ nop -/* DF02F8 80241458 4600C000 */ add.s $f0, $f24, $f0 -.L8024145C: -/* DF02FC 8024145C E600003C */ swc1 $f0, 0x3c($s0) -/* DF0300 80241460 8E220074 */ lw $v0, 0x74($s1) -/* DF0304 80241464 2442000A */ addiu $v0, $v0, 0xa -/* DF0308 80241468 44826000 */ mtc1 $v0, $f12 -/* DF030C 8024146C 00000000 */ nop -/* DF0310 80241470 0C00A6C9 */ jal clamp_angle -/* DF0314 80241474 46806320 */ cvt.s.w $f12, $f12 -/* DF0318 80241478 4600020D */ trunc.w.s $f8, $f0 -/* DF031C 8024147C E6280074 */ swc1 $f8, 0x74($s1) -.L80241480: -/* DF0320 80241480 8E220090 */ lw $v0, 0x90($s1) -/* DF0324 80241484 1C40004A */ bgtz $v0, .L802415B0 -/* DF0328 80241488 2442FFFF */ addiu $v0, $v0, -1 -/* DF032C 8024148C 8E430014 */ lw $v1, 0x14($s2) -/* DF0330 80241490 04600048 */ bltz $v1, .L802415B4 -/* DF0334 80241494 00000000 */ nop -/* DF0338 80241498 8E620074 */ lw $v0, 0x74($s3) -/* DF033C 8024149C 1C400042 */ bgtz $v0, .L802415A8 -/* DF0340 802414A0 2442FFFF */ addiu $v0, $v0, -1 -/* DF0344 802414A4 AE630074 */ sw $v1, 0x74($s3) -/* DF0348 802414A8 860200A8 */ lh $v0, 0xa8($s0) -/* DF034C 802414AC C602003C */ lwc1 $f2, 0x3c($s0) -/* DF0350 802414B0 44820000 */ mtc1 $v0, $f0 -/* DF0354 802414B4 00000000 */ nop -/* DF0358 802414B8 46800020 */ cvt.s.w $f0, $f0 -/* DF035C 802414BC 46001080 */ add.s $f2, $f2, $f0 -/* DF0360 802414C0 3C014024 */ lui $at, 0x4024 -/* DF0364 802414C4 44810800 */ mtc1 $at, $f1 -/* DF0368 802414C8 44800000 */ mtc1 $zero, $f0 -/* DF036C 802414CC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF0370 802414D0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF0374 802414D4 460010A1 */ cvt.d.s $f2, $f2 -/* DF0378 802414D8 46201080 */ add.d $f2, $f2, $f0 -/* DF037C 802414DC C440002C */ lwc1 $f0, 0x2c($v0) -/* DF0380 802414E0 46000021 */ cvt.d.s $f0, $f0 -/* DF0384 802414E4 4622003C */ c.lt.d $f0, $f2 -/* DF0388 802414E8 00000000 */ nop -/* DF038C 802414EC 4500002C */ bc1f .L802415A0 -/* DF0390 802414F0 02A0202D */ daddu $a0, $s5, $zero -/* DF0394 802414F4 AFA00010 */ sw $zero, 0x10($sp) -/* DF0398 802414F8 8E46000C */ lw $a2, 0xc($s2) -/* DF039C 802414FC 8E470010 */ lw $a3, 0x10($s2) -/* DF03A0 80241500 0C01242D */ jal func_800490B4 -/* DF03A4 80241504 0220282D */ daddu $a1, $s1, $zero -/* DF03A8 80241508 10400025 */ beqz $v0, .L802415A0 -/* DF03AC 8024150C 0000202D */ daddu $a0, $zero, $zero -/* DF03B0 80241510 0200282D */ daddu $a1, $s0, $zero -/* DF03B4 80241514 0000302D */ daddu $a2, $zero, $zero -/* DF03B8 80241518 2412000C */ addiu $s2, $zero, 0xc -/* DF03BC 8024151C 860300A8 */ lh $v1, 0xa8($s0) -/* DF03C0 80241520 3C013F80 */ lui $at, 0x3f80 -/* DF03C4 80241524 44810000 */ mtc1 $at, $f0 -/* DF03C8 80241528 3C014000 */ lui $at, 0x4000 -/* DF03CC 8024152C 44811000 */ mtc1 $at, $f2 -/* DF03D0 80241530 3C01C1A0 */ lui $at, 0xc1a0 -/* DF03D4 80241534 44812000 */ mtc1 $at, $f4 -/* DF03D8 80241538 44834000 */ mtc1 $v1, $f8 -/* DF03DC 8024153C 00000000 */ nop -/* DF03E0 80241540 46804220 */ cvt.s.w $f8, $f8 -/* DF03E4 80241544 44074000 */ mfc1 $a3, $f8 -/* DF03E8 80241548 27A20038 */ addiu $v0, $sp, 0x38 -/* DF03EC 8024154C AFB2001C */ sw $s2, 0x1c($sp) -/* DF03F0 80241550 AFA20020 */ sw $v0, 0x20($sp) -/* DF03F4 80241554 E7A00010 */ swc1 $f0, 0x10($sp) -/* DF03F8 80241558 E7A20014 */ swc1 $f2, 0x14($sp) -/* DF03FC 8024155C 0C01BFA4 */ jal fx_emote -/* DF0400 80241560 E7A40018 */ swc1 $f4, 0x18($sp) -/* DF0404 80241564 0200202D */ daddu $a0, $s0, $zero -/* DF0408 80241568 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DF040C 8024156C C480003C */ lwc1 $f0, 0x3c($a0) -/* DF0410 80241570 3C060020 */ lui $a2, 0x20 -/* DF0414 80241574 0C012530 */ jal ai_enemy_play_sound -/* DF0418 80241578 E4800064 */ swc1 $f0, 0x64($a0) -/* DF041C 8024157C 8E220018 */ lw $v0, 0x18($s1) -/* DF0420 80241580 9442002A */ lhu $v0, 0x2a($v0) -/* DF0424 80241584 30420001 */ andi $v0, $v0, 1 -/* DF0428 80241588 10400003 */ beqz $v0, .L80241598 -/* DF042C 8024158C 2402000A */ addiu $v0, $zero, 0xa -/* DF0430 80241590 080905D6 */ j .L80241758 -/* DF0434 80241594 AE620070 */ sw $v0, 0x70($s3) -.L80241598: -/* DF0438 80241598 080905D6 */ j .L80241758 -/* DF043C 8024159C AE720070 */ sw $s2, 0x70($s3) -.L802415A0: -/* DF0440 802415A0 8E620074 */ lw $v0, 0x74($s3) -/* DF0444 802415A4 2442FFFF */ addiu $v0, $v0, -1 -.L802415A8: -/* DF0448 802415A8 0809056D */ j .L802415B4 -/* DF044C 802415AC AE620074 */ sw $v0, 0x74($s3) -.L802415B0: -/* DF0450 802415B0 AE220090 */ sw $v0, 0x90($s1) -.L802415B4: -/* DF0454 802415B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DF0458 802415B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* DF045C 802415BC C4620000 */ lwc1 $f2, ($v1) -/* DF0460 802415C0 468010A0 */ cvt.s.w $f2, $f2 -/* DF0464 802415C4 C4640008 */ lwc1 $f4, 8($v1) -/* DF0468 802415C8 46802120 */ cvt.s.w $f4, $f4 -/* DF046C 802415CC E7A00010 */ swc1 $f0, 0x10($sp) -/* DF0470 802415D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* DF0474 802415D4 44051000 */ mfc1 $a1, $f2 -/* DF0478 802415D8 C440000C */ lwc1 $f0, 0xc($v0) -/* DF047C 802415DC 46800020 */ cvt.s.w $f0, $f0 -/* DF0480 802415E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* DF0484 802415E4 8E2200D0 */ lw $v0, 0xd0($s1) -/* DF0488 802415E8 44062000 */ mfc1 $a2, $f4 -/* DF048C 802415EC C4400010 */ lwc1 $f0, 0x10($v0) -/* DF0490 802415F0 46800020 */ cvt.s.w $f0, $f0 -/* DF0494 802415F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* DF0498 802415F8 8C640018 */ lw $a0, 0x18($v1) -/* DF049C 802415FC 0C0123F5 */ jal is_point_within_region -/* DF04A0 80241600 8E070038 */ lw $a3, 0x38($s0) -/* DF04A4 80241604 1040001A */ beqz $v0, .L80241670 -/* DF04A8 80241608 00000000 */ nop -/* DF04AC 8024160C 8E060038 */ lw $a2, 0x38($s0) -/* DF04B0 80241610 8E2200D0 */ lw $v0, 0xd0($s1) -/* DF04B4 80241614 8E070040 */ lw $a3, 0x40($s0) -/* DF04B8 80241618 C44C0000 */ lwc1 $f12, ($v0) -/* DF04BC 8024161C 46806320 */ cvt.s.w $f12, $f12 -/* DF04C0 80241620 C44E0008 */ lwc1 $f14, 8($v0) -/* DF04C4 80241624 0C00A7B5 */ jal dist2D -/* DF04C8 80241628 468073A0 */ cvt.s.w $f14, $f14 -/* DF04CC 8024162C C6020018 */ lwc1 $f2, 0x18($s0) -/* DF04D0 80241630 4600103C */ c.lt.s $f2, $f0 -/* DF04D4 80241634 00000000 */ nop -/* DF04D8 80241638 4500000D */ bc1f .L80241670 -/* DF04DC 8024163C E7A00034 */ swc1 $f0, 0x34($sp) -/* DF04E0 80241640 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DF04E4 80241644 8E2200D0 */ lw $v0, 0xd0($s1) -/* DF04E8 80241648 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DF04EC 8024164C C4480000 */ lwc1 $f8, ($v0) -/* DF04F0 80241650 46804220 */ cvt.s.w $f8, $f8 -/* DF04F4 80241654 44064000 */ mfc1 $a2, $f8 -/* DF04F8 80241658 C4480008 */ lwc1 $f8, 8($v0) -/* DF04FC 8024165C 46804220 */ cvt.s.w $f8, $f8 -/* DF0500 80241660 44074000 */ mfc1 $a3, $f8 -/* DF0504 80241664 0C00A720 */ jal atan2 -/* DF0508 80241668 24140001 */ addiu $s4, $zero, 1 -/* DF050C 8024166C E600000C */ swc1 $f0, 0xc($s0) -.L80241670: -/* DF0510 80241670 8E2200D0 */ lw $v0, 0xd0($s1) -/* DF0514 80241674 8C43000C */ lw $v1, 0xc($v0) -/* DF0518 80241678 8C420010 */ lw $v0, 0x10($v0) -/* DF051C 8024167C 00621825 */ or $v1, $v1, $v0 -/* DF0520 80241680 00741825 */ or $v1, $v1, $s4 -/* DF0524 80241684 10600008 */ beqz $v1, .L802416A8 -/* DF0528 80241688 00000000 */ nop -/* DF052C 8024168C 8602008C */ lh $v0, 0x8c($s0) -/* DF0530 80241690 14400031 */ bnez $v0, .L80241758 -/* DF0534 80241694 00000000 */ nop -/* DF0538 80241698 8E050018 */ lw $a1, 0x18($s0) -/* DF053C 8024169C 8E06000C */ lw $a2, 0xc($s0) -/* DF0540 802416A0 0C00EA95 */ jal npc_move_heading -/* DF0544 802416A4 0200202D */ daddu $a0, $s0, $zero -.L802416A8: -/* DF0548 802416A8 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF054C 802416AC 3C014059 */ lui $at, 0x4059 -/* DF0550 802416B0 44811800 */ mtc1 $at, $f3 -/* DF0554 802416B4 44801000 */ mtc1 $zero, $f2 -/* DF0558 802416B8 46000021 */ cvt.d.s $f0, $f0 -/* DF055C 802416BC 46220002 */ mul.d $f0, $f0, $f2 -/* DF0560 802416C0 00000000 */ nop -/* DF0564 802416C4 4620020D */ trunc.w.d $f8, $f0 -/* DF0568 802416C8 E628007C */ swc1 $f8, 0x7c($s1) -/* DF056C 802416CC 8E420004 */ lw $v0, 4($s2) -/* DF0570 802416D0 18400021 */ blez $v0, .L80241758 -/* DF0574 802416D4 00000000 */ nop -/* DF0578 802416D8 8602008E */ lh $v0, 0x8e($s0) -/* DF057C 802416DC 9603008E */ lhu $v1, 0x8e($s0) -/* DF0580 802416E0 18400005 */ blez $v0, .L802416F8 -/* DF0584 802416E4 2462FFFF */ addiu $v0, $v1, -1 -/* DF0588 802416E8 A602008E */ sh $v0, 0x8e($s0) -/* DF058C 802416EC 00021400 */ sll $v0, $v0, 0x10 -/* DF0590 802416F0 1C400019 */ bgtz $v0, .L80241758 -/* DF0594 802416F4 00000000 */ nop -.L802416F8: -/* DF0598 802416F8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DF059C 802416FC 24020002 */ addiu $v0, $zero, 2 -/* DF05A0 80241700 0C00A67F */ jal rand_int -/* DF05A4 80241704 AE620070 */ sw $v0, 0x70($s3) -/* DF05A8 80241708 3C035555 */ lui $v1, 0x5555 -/* DF05AC 8024170C 34635556 */ ori $v1, $v1, 0x5556 -/* DF05B0 80241710 00430018 */ mult $v0, $v1 -/* DF05B4 80241714 000227C3 */ sra $a0, $v0, 0x1f -/* DF05B8 80241718 00004010 */ mfhi $t0 -/* DF05BC 8024171C 01042023 */ subu $a0, $t0, $a0 -/* DF05C0 80241720 00041840 */ sll $v1, $a0, 1 -/* DF05C4 80241724 00641821 */ addu $v1, $v1, $a0 -/* DF05C8 80241728 00431023 */ subu $v0, $v0, $v1 -/* DF05CC 8024172C 24430002 */ addiu $v1, $v0, 2 -/* DF05D0 80241730 AE630074 */ sw $v1, 0x74($s3) -/* DF05D4 80241734 8E42002C */ lw $v0, 0x2c($s2) -/* DF05D8 80241738 58400007 */ blezl $v0, .L80241758 -/* DF05DC 8024173C AE600070 */ sw $zero, 0x70($s3) -/* DF05E0 80241740 8E420008 */ lw $v0, 8($s2) -/* DF05E4 80241744 18400003 */ blez $v0, .L80241754 -/* DF05E8 80241748 28620003 */ slti $v0, $v1, 3 -/* DF05EC 8024174C 10400002 */ beqz $v0, .L80241758 -/* DF05F0 80241750 00000000 */ nop -.L80241754: -/* DF05F4 80241754 AE600070 */ sw $zero, 0x70($s3) -.L80241758: -/* DF05F8 80241758 8FBF0058 */ lw $ra, 0x58($sp) -/* DF05FC 8024175C 8FB50054 */ lw $s5, 0x54($sp) -/* DF0600 80241760 8FB40050 */ lw $s4, 0x50($sp) -/* DF0604 80241764 8FB3004C */ lw $s3, 0x4c($sp) -/* DF0608 80241768 8FB20048 */ lw $s2, 0x48($sp) -/* DF060C 8024176C 8FB10044 */ lw $s1, 0x44($sp) -/* DF0610 80241770 8FB00040 */ lw $s0, 0x40($sp) -/* DF0614 80241774 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* DF0618 80241778 D7B80070 */ ldc1 $f24, 0x70($sp) -/* DF061C 8024177C D7B60068 */ ldc1 $f22, 0x68($sp) -/* DF0620 80241780 D7B40060 */ ldc1 $f20, 0x60($sp) -/* DF0624 80241784 03E00008 */ jr $ra -/* DF0628 80241788 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s index c4e2c0593b..8a0d354810 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s @@ -86,7 +86,7 @@ glabel func_802422C0_DF1160 .L802423DC_DF127C: /* DF127C 802423DC 0280202D */ daddu $a0, $s4, $zero /* DF1280 802423E0 0200282D */ daddu $a1, $s0, $zero -/* DF1284 802423E4 0C090459 */ jal func_80241164_DF0004 +/* DF1284 802423E4 0C090459 */ jal omo_17_UnkNpcAIFunc35 /* DF1288 802423E8 0260302D */ daddu $a2, $s3, $zero /* DF128C 802423EC 08090922 */ j .L80242488 /* DF1290 802423F0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240700_D20590.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240700_D20590.s deleted file mode 100644 index 6f574eab51..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240700_D20590.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8024BE48_D2BCD8 -.double 0.09 - -dlabel D_8024BE50_D2BCE0 -.double 0.09 - -.section .text - -glabel func_80240700_D20590 -/* D20590 80240700 27BDFF80 */ addiu $sp, $sp, -0x80 -/* D20594 80240704 AFB3004C */ sw $s3, 0x4c($sp) -/* D20598 80240708 0080982D */ daddu $s3, $a0, $zero -/* D2059C 8024070C AFBF0058 */ sw $ra, 0x58($sp) -/* D205A0 80240710 AFB50054 */ sw $s5, 0x54($sp) -/* D205A4 80240714 AFB40050 */ sw $s4, 0x50($sp) -/* D205A8 80240718 AFB20048 */ sw $s2, 0x48($sp) -/* D205AC 8024071C AFB10044 */ sw $s1, 0x44($sp) -/* D205B0 80240720 AFB00040 */ sw $s0, 0x40($sp) -/* D205B4 80240724 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* D205B8 80240728 F7B80070 */ sdc1 $f24, 0x70($sp) -/* D205BC 8024072C F7B60068 */ sdc1 $f22, 0x68($sp) -/* D205C0 80240730 F7B40060 */ sdc1 $f20, 0x60($sp) -/* D205C4 80240734 8E710148 */ lw $s1, 0x148($s3) -/* D205C8 80240738 00A0902D */ daddu $s2, $a1, $zero -/* D205CC 8024073C 86240008 */ lh $a0, 8($s1) -/* D205D0 80240740 0C00EABB */ jal get_npc_unsafe -/* D205D4 80240744 00C0A82D */ daddu $s5, $a2, $zero -/* D205D8 80240748 0040802D */ daddu $s0, $v0, $zero -/* D205DC 8024074C 0000A02D */ daddu $s4, $zero, $zero -/* D205E0 80240750 C624007C */ lwc1 $f4, 0x7c($s1) -/* D205E4 80240754 46802120 */ cvt.s.w $f4, $f4 -/* D205E8 80240758 C6220088 */ lwc1 $f2, 0x88($s1) -/* D205EC 8024075C 468010A0 */ cvt.s.w $f2, $f2 -/* D205F0 80240760 460010A1 */ cvt.d.s $f2, $f2 -/* D205F4 80240764 46002121 */ cvt.d.s $f4, $f4 -/* D205F8 80240768 C600003C */ lwc1 $f0, 0x3c($s0) -/* D205FC 8024076C 3C014059 */ lui $at, 0x4059 -/* D20600 80240770 44813800 */ mtc1 $at, $f7 -/* D20604 80240774 44803000 */ mtc1 $zero, $f6 -/* D20608 80240778 46000021 */ cvt.d.s $f0, $f0 -/* D2060C 8024077C 46260002 */ mul.d $f0, $f0, $f6 -/* D20610 80240780 00000000 */ nop -/* D20614 80240784 24020001 */ addiu $v0, $zero, 1 -/* D20618 80240788 8E24006C */ lw $a0, 0x6c($s1) -/* D2061C 8024078C 46261083 */ div.d $f2, $f2, $f6 -/* D20620 80240790 462010A0 */ cvt.s.d $f2, $f2 -/* D20624 80240794 46262103 */ div.d $f4, $f4, $f6 -/* D20628 80240798 46202520 */ cvt.s.d $f20, $f4 -/* D2062C 8024079C 30830011 */ andi $v1, $a0, 0x11 -/* D20630 802407A0 4620020D */ trunc.w.d $f8, $f0 -/* D20634 802407A4 E628007C */ swc1 $f8, 0x7c($s1) -/* D20638 802407A8 C6200078 */ lwc1 $f0, 0x78($s1) -/* D2063C 802407AC 46800020 */ cvt.s.w $f0, $f0 -/* D20640 802407B0 46000021 */ cvt.d.s $f0, $f0 -/* D20644 802407B4 46260003 */ div.d $f0, $f0, $f6 -/* D20648 802407B8 462006A0 */ cvt.s.d $f26, $f0 -/* D2064C 802407BC C6200070 */ lwc1 $f0, 0x70($s1) -/* D20650 802407C0 46800020 */ cvt.s.w $f0, $f0 -/* D20654 802407C4 46000021 */ cvt.d.s $f0, $f0 -/* D20658 802407C8 46260003 */ div.d $f0, $f0, $f6 -/* D2065C 802407CC 462005A0 */ cvt.s.d $f22, $f0 -/* D20660 802407D0 14620025 */ bne $v1, $v0, .L80240868 -/* D20664 802407D4 4602D600 */ add.s $f24, $f26, $f2 -/* D20668 802407D8 8E020000 */ lw $v0, ($s0) -/* D2066C 802407DC 30420008 */ andi $v0, $v0, 8 -/* D20670 802407E0 10400009 */ beqz $v0, .L80240808 -/* D20674 802407E4 27A50028 */ addiu $a1, $sp, 0x28 -/* D20678 802407E8 C600003C */ lwc1 $f0, 0x3c($s0) -/* D2067C 802407EC 4600C001 */ sub.s $f0, $f24, $f0 -/* D20680 802407F0 4600B03C */ c.lt.s $f22, $f0 -/* D20684 802407F4 00000000 */ nop -/* D20688 802407F8 4500001B */ bc1f .L80240868 -/* D2068C 802407FC 34820010 */ ori $v0, $a0, 0x10 -/* D20690 80240800 0809021A */ j .L80240868 -/* D20694 80240804 AE22006C */ sw $v0, 0x6c($s1) -.L80240808: -/* D20698 80240808 27A6002C */ addiu $a2, $sp, 0x2c -/* D2069C 8024080C C6000038 */ lwc1 $f0, 0x38($s0) -/* D206A0 80240810 C602003C */ lwc1 $f2, 0x3c($s0) -/* D206A4 80240814 C6040040 */ lwc1 $f4, 0x40($s0) -/* D206A8 80240818 3C01447A */ lui $at, 0x447a -/* D206AC 8024081C 44813000 */ mtc1 $at, $f6 -/* D206B0 80240820 27A20034 */ addiu $v0, $sp, 0x34 -/* D206B4 80240824 E7A00028 */ swc1 $f0, 0x28($sp) -/* D206B8 80240828 E7A2002C */ swc1 $f2, 0x2c($sp) -/* D206BC 8024082C E7A40030 */ swc1 $f4, 0x30($sp) -/* D206C0 80240830 E7A60034 */ swc1 $f6, 0x34($sp) -/* D206C4 80240834 AFA20010 */ sw $v0, 0x10($sp) -/* D206C8 80240838 8E040080 */ lw $a0, 0x80($s0) -/* D206CC 8024083C 0C0372DF */ jal npc_raycast_down_sides -/* D206D0 80240840 27A70030 */ addiu $a3, $sp, 0x30 -/* D206D4 80240844 C7A00034 */ lwc1 $f0, 0x34($sp) -/* D206D8 80240848 4600D001 */ sub.s $f0, $f26, $f0 -/* D206DC 8024084C 4600B03C */ c.lt.s $f22, $f0 -/* D206E0 80240850 00000000 */ nop -/* D206E4 80240854 45000004 */ bc1f .L80240868 -/* D206E8 80240858 00000000 */ nop -/* D206EC 8024085C 8E22006C */ lw $v0, 0x6c($s1) -/* D206F0 80240860 34420010 */ ori $v0, $v0, 0x10 -/* D206F4 80240864 AE22006C */ sw $v0, 0x6c($s1) -.L80240868: -/* D206F8 80240868 8E22006C */ lw $v0, 0x6c($s1) -/* D206FC 8024086C 24030011 */ addiu $v1, $zero, 0x11 -/* D20700 80240870 30420011 */ andi $v0, $v0, 0x11 -/* D20704 80240874 14430039 */ bne $v0, $v1, .L8024095C -/* D20708 80240878 00000000 */ nop -/* D2070C 8024087C 8E020000 */ lw $v0, ($s0) -/* D20710 80240880 30420008 */ andi $v0, $v0, 8 -/* D20714 80240884 1040000A */ beqz $v0, .L802408B0 -/* D20718 80240888 4600C106 */ mov.s $f4, $f24 -/* D2071C 8024088C 4614C081 */ sub.s $f2, $f24, $f20 -/* D20720 80240890 3C018025 */ lui $at, %hi(D_8024BE48_D2BCD8) -/* D20724 80240894 D420BE48 */ ldc1 $f0, %lo(D_8024BE48_D2BCD8)($at) -/* D20728 80240898 460010A1 */ cvt.d.s $f2, $f2 -/* D2072C 8024089C 46201082 */ mul.d $f2, $f2, $f0 -/* D20730 802408A0 00000000 */ nop -/* D20734 802408A4 4600A021 */ cvt.d.s $f0, $f20 -/* D20738 802408A8 08090245 */ j .L80240914 -/* D2073C 802408AC 46220000 */ add.d $f0, $f0, $f2 -.L802408B0: -/* D20740 802408B0 27A50028 */ addiu $a1, $sp, 0x28 -/* D20744 802408B4 27A6002C */ addiu $a2, $sp, 0x2c -/* D20748 802408B8 C6000038 */ lwc1 $f0, 0x38($s0) -/* D2074C 802408BC C6020040 */ lwc1 $f2, 0x40($s0) -/* D20750 802408C0 3C01447A */ lui $at, 0x447a -/* D20754 802408C4 44812000 */ mtc1 $at, $f4 -/* D20758 802408C8 27A20034 */ addiu $v0, $sp, 0x34 -/* D2075C 802408CC E7B4002C */ swc1 $f20, 0x2c($sp) -/* D20760 802408D0 E7A00028 */ swc1 $f0, 0x28($sp) -/* D20764 802408D4 E7A20030 */ swc1 $f2, 0x30($sp) -/* D20768 802408D8 E7A40034 */ swc1 $f4, 0x34($sp) -/* D2076C 802408DC AFA20010 */ sw $v0, 0x10($sp) -/* D20770 802408E0 8E040080 */ lw $a0, 0x80($s0) -/* D20774 802408E4 0C0372DF */ jal npc_raycast_down_sides -/* D20778 802408E8 27A70030 */ addiu $a3, $sp, 0x30 -/* D2077C 802408EC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* D20780 802408F0 461A2100 */ add.s $f4, $f4, $f26 -/* D20784 802408F4 46142081 */ sub.s $f2, $f4, $f20 -/* D20788 802408F8 3C018025 */ lui $at, %hi(D_8024BE50_D2BCE0) -/* D2078C 802408FC D420BE50 */ ldc1 $f0, %lo(D_8024BE50_D2BCE0)($at) -/* D20790 80240900 460010A1 */ cvt.d.s $f2, $f2 -/* D20794 80240904 46201082 */ mul.d $f2, $f2, $f0 -/* D20798 80240908 00000000 */ nop -/* D2079C 8024090C 4600A021 */ cvt.d.s $f0, $f20 -/* D207A0 80240910 46220000 */ add.d $f0, $f0, $f2 -.L80240914: -/* D207A4 80240914 46200020 */ cvt.s.d $f0, $f0 -/* D207A8 80240918 E600003C */ swc1 $f0, 0x3c($s0) -/* D207AC 8024091C C600003C */ lwc1 $f0, 0x3c($s0) -/* D207B0 80240920 46002001 */ sub.s $f0, $f4, $f0 -/* D207B4 80240924 3C013FF0 */ lui $at, 0x3ff0 -/* D207B8 80240928 44811800 */ mtc1 $at, $f3 -/* D207BC 8024092C 44801000 */ mtc1 $zero, $f2 -/* D207C0 80240930 46000005 */ abs.s $f0, $f0 -/* D207C4 80240934 46000021 */ cvt.d.s $f0, $f0 -/* D207C8 80240938 4622003C */ c.lt.d $f0, $f2 -/* D207CC 8024093C 00000000 */ nop -/* D207D0 80240940 45000036 */ bc1f .L80240A1C -/* D207D4 80240944 2403FFEF */ addiu $v1, $zero, -0x11 -/* D207D8 80240948 E604003C */ swc1 $f4, 0x3c($s0) -/* D207DC 8024094C 8E22006C */ lw $v0, 0x6c($s1) -/* D207E0 80240950 00431024 */ and $v0, $v0, $v1 -/* D207E4 80240954 08090287 */ j .L80240A1C -/* D207E8 80240958 AE22006C */ sw $v0, 0x6c($s1) -.L8024095C: -/* D207EC 8024095C 8E220070 */ lw $v0, 0x70($s1) -/* D207F0 80240960 1840002E */ blez $v0, .L80240A1C -/* D207F4 80240964 00000000 */ nop -/* D207F8 80240968 C62C0074 */ lwc1 $f12, 0x74($s1) -/* D207FC 8024096C 0C00A8BB */ jal sin_deg -/* D20800 80240970 46806320 */ cvt.s.w $f12, $f12 -/* D20804 80240974 8E020000 */ lw $v0, ($s0) -/* D20808 80240978 30420008 */ andi $v0, $v0, 8 -/* D2080C 8024097C 10400003 */ beqz $v0, .L8024098C -/* D20810 80240980 46000506 */ mov.s $f20, $f0 -/* D20814 80240984 08090273 */ j .L802409CC -/* D20818 80240988 0000102D */ daddu $v0, $zero, $zero -.L8024098C: -/* D2081C 8024098C 27A50028 */ addiu $a1, $sp, 0x28 -/* D20820 80240990 27A6002C */ addiu $a2, $sp, 0x2c -/* D20824 80240994 C6000038 */ lwc1 $f0, 0x38($s0) -/* D20828 80240998 C602003C */ lwc1 $f2, 0x3c($s0) -/* D2082C 8024099C C6040040 */ lwc1 $f4, 0x40($s0) -/* D20830 802409A0 3C01447A */ lui $at, 0x447a -/* D20834 802409A4 44813000 */ mtc1 $at, $f6 -/* D20838 802409A8 27A20034 */ addiu $v0, $sp, 0x34 -/* D2083C 802409AC E7A00028 */ swc1 $f0, 0x28($sp) -/* D20840 802409B0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* D20844 802409B4 E7A40030 */ swc1 $f4, 0x30($sp) -/* D20848 802409B8 E7A60034 */ swc1 $f6, 0x34($sp) -/* D2084C 802409BC AFA20010 */ sw $v0, 0x10($sp) -/* D20850 802409C0 8E040080 */ lw $a0, 0x80($s0) -/* D20854 802409C4 0C0372DF */ jal npc_raycast_down_sides -/* D20858 802409C8 27A70030 */ addiu $a3, $sp, 0x30 -.L802409CC: -/* D2085C 802409CC 10400007 */ beqz $v0, .L802409EC -/* D20860 802409D0 00000000 */ nop -/* D20864 802409D4 4616A082 */ mul.s $f2, $f20, $f22 -/* D20868 802409D8 00000000 */ nop -/* D2086C 802409DC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* D20870 802409E0 461A0000 */ add.s $f0, $f0, $f26 -/* D20874 802409E4 0809027E */ j .L802409F8 -/* D20878 802409E8 46020000 */ add.s $f0, $f0, $f2 -.L802409EC: -/* D2087C 802409EC 4616A002 */ mul.s $f0, $f20, $f22 -/* D20880 802409F0 00000000 */ nop -/* D20884 802409F4 4600C000 */ add.s $f0, $f24, $f0 -.L802409F8: -/* D20888 802409F8 E600003C */ swc1 $f0, 0x3c($s0) -/* D2088C 802409FC 8E220074 */ lw $v0, 0x74($s1) -/* D20890 80240A00 2442000A */ addiu $v0, $v0, 0xa -/* D20894 80240A04 44826000 */ mtc1 $v0, $f12 -/* D20898 80240A08 00000000 */ nop -/* D2089C 80240A0C 0C00A6C9 */ jal clamp_angle -/* D208A0 80240A10 46806320 */ cvt.s.w $f12, $f12 -/* D208A4 80240A14 4600020D */ trunc.w.s $f8, $f0 -/* D208A8 80240A18 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A1C: -/* D208AC 80240A1C 8E220090 */ lw $v0, 0x90($s1) -/* D208B0 80240A20 1C40004A */ bgtz $v0, .L80240B4C -/* D208B4 80240A24 2442FFFF */ addiu $v0, $v0, -1 -/* D208B8 80240A28 8E430014 */ lw $v1, 0x14($s2) -/* D208BC 80240A2C 04600048 */ bltz $v1, .L80240B50 -/* D208C0 80240A30 00000000 */ nop -/* D208C4 80240A34 8E620074 */ lw $v0, 0x74($s3) -/* D208C8 80240A38 1C400042 */ bgtz $v0, .L80240B44 -/* D208CC 80240A3C 2442FFFF */ addiu $v0, $v0, -1 -/* D208D0 80240A40 AE630074 */ sw $v1, 0x74($s3) -/* D208D4 80240A44 860200A8 */ lh $v0, 0xa8($s0) -/* D208D8 80240A48 C602003C */ lwc1 $f2, 0x3c($s0) -/* D208DC 80240A4C 44820000 */ mtc1 $v0, $f0 -/* D208E0 80240A50 00000000 */ nop -/* D208E4 80240A54 46800020 */ cvt.s.w $f0, $f0 -/* D208E8 80240A58 46001080 */ add.s $f2, $f2, $f0 -/* D208EC 80240A5C 3C014024 */ lui $at, 0x4024 -/* D208F0 80240A60 44810800 */ mtc1 $at, $f1 -/* D208F4 80240A64 44800000 */ mtc1 $zero, $f0 -/* D208F8 80240A68 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D208FC 80240A6C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D20900 80240A70 460010A1 */ cvt.d.s $f2, $f2 -/* D20904 80240A74 46201080 */ add.d $f2, $f2, $f0 -/* D20908 80240A78 C440002C */ lwc1 $f0, 0x2c($v0) -/* D2090C 80240A7C 46000021 */ cvt.d.s $f0, $f0 -/* D20910 80240A80 4622003C */ c.lt.d $f0, $f2 -/* D20914 80240A84 00000000 */ nop -/* D20918 80240A88 4500002C */ bc1f .L80240B3C -/* D2091C 80240A8C 02A0202D */ daddu $a0, $s5, $zero -/* D20920 80240A90 AFA00010 */ sw $zero, 0x10($sp) -/* D20924 80240A94 8E46000C */ lw $a2, 0xc($s2) -/* D20928 80240A98 8E470010 */ lw $a3, 0x10($s2) -/* D2092C 80240A9C 0C01242D */ jal func_800490B4 -/* D20930 80240AA0 0220282D */ daddu $a1, $s1, $zero -/* D20934 80240AA4 10400025 */ beqz $v0, .L80240B3C -/* D20938 80240AA8 0000202D */ daddu $a0, $zero, $zero -/* D2093C 80240AAC 0200282D */ daddu $a1, $s0, $zero -/* D20940 80240AB0 0000302D */ daddu $a2, $zero, $zero -/* D20944 80240AB4 2412000C */ addiu $s2, $zero, 0xc -/* D20948 80240AB8 860300A8 */ lh $v1, 0xa8($s0) -/* D2094C 80240ABC 3C013F80 */ lui $at, 0x3f80 -/* D20950 80240AC0 44810000 */ mtc1 $at, $f0 -/* D20954 80240AC4 3C014000 */ lui $at, 0x4000 -/* D20958 80240AC8 44811000 */ mtc1 $at, $f2 -/* D2095C 80240ACC 3C01C1A0 */ lui $at, 0xc1a0 -/* D20960 80240AD0 44812000 */ mtc1 $at, $f4 -/* D20964 80240AD4 44834000 */ mtc1 $v1, $f8 -/* D20968 80240AD8 00000000 */ nop -/* D2096C 80240ADC 46804220 */ cvt.s.w $f8, $f8 -/* D20970 80240AE0 44074000 */ mfc1 $a3, $f8 -/* D20974 80240AE4 27A20038 */ addiu $v0, $sp, 0x38 -/* D20978 80240AE8 AFB2001C */ sw $s2, 0x1c($sp) -/* D2097C 80240AEC AFA20020 */ sw $v0, 0x20($sp) -/* D20980 80240AF0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D20984 80240AF4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D20988 80240AF8 0C01BFA4 */ jal fx_emote -/* D2098C 80240AFC E7A40018 */ swc1 $f4, 0x18($sp) -/* D20990 80240B00 0200202D */ daddu $a0, $s0, $zero -/* D20994 80240B04 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D20998 80240B08 C480003C */ lwc1 $f0, 0x3c($a0) -/* D2099C 80240B0C 3C060020 */ lui $a2, 0x20 -/* D209A0 80240B10 0C012530 */ jal ai_enemy_play_sound -/* D209A4 80240B14 E4800064 */ swc1 $f0, 0x64($a0) -/* D209A8 80240B18 8E220018 */ lw $v0, 0x18($s1) -/* D209AC 80240B1C 9442002A */ lhu $v0, 0x2a($v0) -/* D209B0 80240B20 30420001 */ andi $v0, $v0, 1 -/* D209B4 80240B24 10400003 */ beqz $v0, .L80240B34 -/* D209B8 80240B28 2402000A */ addiu $v0, $zero, 0xa -/* D209BC 80240B2C 0809033D */ j .L80240CF4 -/* D209C0 80240B30 AE620070 */ sw $v0, 0x70($s3) -.L80240B34: -/* D209C4 80240B34 0809033D */ j .L80240CF4 -/* D209C8 80240B38 AE720070 */ sw $s2, 0x70($s3) -.L80240B3C: -/* D209CC 80240B3C 8E620074 */ lw $v0, 0x74($s3) -/* D209D0 80240B40 2442FFFF */ addiu $v0, $v0, -1 -.L80240B44: -/* D209D4 80240B44 080902D4 */ j .L80240B50 -/* D209D8 80240B48 AE620074 */ sw $v0, 0x74($s3) -.L80240B4C: -/* D209DC 80240B4C AE220090 */ sw $v0, 0x90($s1) -.L80240B50: -/* D209E0 80240B50 8E2300D0 */ lw $v1, 0xd0($s1) -/* D209E4 80240B54 C6000040 */ lwc1 $f0, 0x40($s0) -/* D209E8 80240B58 C4620000 */ lwc1 $f2, ($v1) -/* D209EC 80240B5C 468010A0 */ cvt.s.w $f2, $f2 -/* D209F0 80240B60 C4640008 */ lwc1 $f4, 8($v1) -/* D209F4 80240B64 46802120 */ cvt.s.w $f4, $f4 -/* D209F8 80240B68 E7A00010 */ swc1 $f0, 0x10($sp) -/* D209FC 80240B6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20A00 80240B70 44051000 */ mfc1 $a1, $f2 -/* D20A04 80240B74 C440000C */ lwc1 $f0, 0xc($v0) -/* D20A08 80240B78 46800020 */ cvt.s.w $f0, $f0 -/* D20A0C 80240B7C E7A00014 */ swc1 $f0, 0x14($sp) -/* D20A10 80240B80 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20A14 80240B84 44062000 */ mfc1 $a2, $f4 -/* D20A18 80240B88 C4400010 */ lwc1 $f0, 0x10($v0) -/* D20A1C 80240B8C 46800020 */ cvt.s.w $f0, $f0 -/* D20A20 80240B90 E7A00018 */ swc1 $f0, 0x18($sp) -/* D20A24 80240B94 8C640018 */ lw $a0, 0x18($v1) -/* D20A28 80240B98 0C0123F5 */ jal is_point_within_region -/* D20A2C 80240B9C 8E070038 */ lw $a3, 0x38($s0) -/* D20A30 80240BA0 1040001A */ beqz $v0, .L80240C0C -/* D20A34 80240BA4 00000000 */ nop -/* D20A38 80240BA8 8E060038 */ lw $a2, 0x38($s0) -/* D20A3C 80240BAC 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20A40 80240BB0 8E070040 */ lw $a3, 0x40($s0) -/* D20A44 80240BB4 C44C0000 */ lwc1 $f12, ($v0) -/* D20A48 80240BB8 46806320 */ cvt.s.w $f12, $f12 -/* D20A4C 80240BBC C44E0008 */ lwc1 $f14, 8($v0) -/* D20A50 80240BC0 0C00A7B5 */ jal dist2D -/* D20A54 80240BC4 468073A0 */ cvt.s.w $f14, $f14 -/* D20A58 80240BC8 C6020018 */ lwc1 $f2, 0x18($s0) -/* D20A5C 80240BCC 4600103C */ c.lt.s $f2, $f0 -/* D20A60 80240BD0 00000000 */ nop -/* D20A64 80240BD4 4500000D */ bc1f .L80240C0C -/* D20A68 80240BD8 E7A00034 */ swc1 $f0, 0x34($sp) -/* D20A6C 80240BDC C60C0038 */ lwc1 $f12, 0x38($s0) -/* D20A70 80240BE0 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20A74 80240BE4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D20A78 80240BE8 C4480000 */ lwc1 $f8, ($v0) -/* D20A7C 80240BEC 46804220 */ cvt.s.w $f8, $f8 -/* D20A80 80240BF0 44064000 */ mfc1 $a2, $f8 -/* D20A84 80240BF4 C4480008 */ lwc1 $f8, 8($v0) -/* D20A88 80240BF8 46804220 */ cvt.s.w $f8, $f8 -/* D20A8C 80240BFC 44074000 */ mfc1 $a3, $f8 -/* D20A90 80240C00 0C00A720 */ jal atan2 -/* D20A94 80240C04 24140001 */ addiu $s4, $zero, 1 -/* D20A98 80240C08 E600000C */ swc1 $f0, 0xc($s0) -.L80240C0C: -/* D20A9C 80240C0C 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20AA0 80240C10 8C43000C */ lw $v1, 0xc($v0) -/* D20AA4 80240C14 8C420010 */ lw $v0, 0x10($v0) -/* D20AA8 80240C18 00621825 */ or $v1, $v1, $v0 -/* D20AAC 80240C1C 00741825 */ or $v1, $v1, $s4 -/* D20AB0 80240C20 10600008 */ beqz $v1, .L80240C44 -/* D20AB4 80240C24 00000000 */ nop -/* D20AB8 80240C28 8602008C */ lh $v0, 0x8c($s0) -/* D20ABC 80240C2C 14400031 */ bnez $v0, .L80240CF4 -/* D20AC0 80240C30 00000000 */ nop -/* D20AC4 80240C34 8E050018 */ lw $a1, 0x18($s0) -/* D20AC8 80240C38 8E06000C */ lw $a2, 0xc($s0) -/* D20ACC 80240C3C 0C00EA95 */ jal npc_move_heading -/* D20AD0 80240C40 0200202D */ daddu $a0, $s0, $zero -.L80240C44: -/* D20AD4 80240C44 C600003C */ lwc1 $f0, 0x3c($s0) -/* D20AD8 80240C48 3C014059 */ lui $at, 0x4059 -/* D20ADC 80240C4C 44811800 */ mtc1 $at, $f3 -/* D20AE0 80240C50 44801000 */ mtc1 $zero, $f2 -/* D20AE4 80240C54 46000021 */ cvt.d.s $f0, $f0 -/* D20AE8 80240C58 46220002 */ mul.d $f0, $f0, $f2 -/* D20AEC 80240C5C 00000000 */ nop -/* D20AF0 80240C60 4620020D */ trunc.w.d $f8, $f0 -/* D20AF4 80240C64 E628007C */ swc1 $f8, 0x7c($s1) -/* D20AF8 80240C68 8E420004 */ lw $v0, 4($s2) -/* D20AFC 80240C6C 18400021 */ blez $v0, .L80240CF4 -/* D20B00 80240C70 00000000 */ nop -/* D20B04 80240C74 8602008E */ lh $v0, 0x8e($s0) -/* D20B08 80240C78 9603008E */ lhu $v1, 0x8e($s0) -/* D20B0C 80240C7C 18400005 */ blez $v0, .L80240C94 -/* D20B10 80240C80 2462FFFF */ addiu $v0, $v1, -1 -/* D20B14 80240C84 A602008E */ sh $v0, 0x8e($s0) -/* D20B18 80240C88 00021400 */ sll $v0, $v0, 0x10 -/* D20B1C 80240C8C 1C400019 */ bgtz $v0, .L80240CF4 -/* D20B20 80240C90 00000000 */ nop -.L80240C94: -/* D20B24 80240C94 240403E8 */ addiu $a0, $zero, 0x3e8 -/* D20B28 80240C98 24020002 */ addiu $v0, $zero, 2 -/* D20B2C 80240C9C 0C00A67F */ jal rand_int -/* D20B30 80240CA0 AE620070 */ sw $v0, 0x70($s3) -/* D20B34 80240CA4 3C035555 */ lui $v1, 0x5555 -/* D20B38 80240CA8 34635556 */ ori $v1, $v1, 0x5556 -/* D20B3C 80240CAC 00430018 */ mult $v0, $v1 -/* D20B40 80240CB0 000227C3 */ sra $a0, $v0, 0x1f -/* D20B44 80240CB4 00004010 */ mfhi $t0 -/* D20B48 80240CB8 01042023 */ subu $a0, $t0, $a0 -/* D20B4C 80240CBC 00041840 */ sll $v1, $a0, 1 -/* D20B50 80240CC0 00641821 */ addu $v1, $v1, $a0 -/* D20B54 80240CC4 00431023 */ subu $v0, $v0, $v1 -/* D20B58 80240CC8 24430002 */ addiu $v1, $v0, 2 -/* D20B5C 80240CCC AE630074 */ sw $v1, 0x74($s3) -/* D20B60 80240CD0 8E42002C */ lw $v0, 0x2c($s2) -/* D20B64 80240CD4 58400007 */ blezl $v0, .L80240CF4 -/* D20B68 80240CD8 AE600070 */ sw $zero, 0x70($s3) -/* D20B6C 80240CDC 8E420008 */ lw $v0, 8($s2) -/* D20B70 80240CE0 18400003 */ blez $v0, .L80240CF0 -/* D20B74 80240CE4 28620003 */ slti $v0, $v1, 3 -/* D20B78 80240CE8 10400002 */ beqz $v0, .L80240CF4 -/* D20B7C 80240CEC 00000000 */ nop -.L80240CF0: -/* D20B80 80240CF0 AE600070 */ sw $zero, 0x70($s3) -.L80240CF4: -/* D20B84 80240CF4 8FBF0058 */ lw $ra, 0x58($sp) -/* D20B88 80240CF8 8FB50054 */ lw $s5, 0x54($sp) -/* D20B8C 80240CFC 8FB40050 */ lw $s4, 0x50($sp) -/* D20B90 80240D00 8FB3004C */ lw $s3, 0x4c($sp) -/* D20B94 80240D04 8FB20048 */ lw $s2, 0x48($sp) -/* D20B98 80240D08 8FB10044 */ lw $s1, 0x44($sp) -/* D20B9C 80240D0C 8FB00040 */ lw $s0, 0x40($sp) -/* D20BA0 80240D10 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* D20BA4 80240D14 D7B80070 */ ldc1 $f24, 0x70($sp) -/* D20BA8 80240D18 D7B60068 */ ldc1 $f22, 0x68($sp) -/* D20BAC 80240D1C D7B40060 */ ldc1 $f20, 0x60($sp) -/* D20BB0 80240D20 03E00008 */ jr $ra -/* D20BB4 80240D24 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s index 29a5214286..dd75df88ab 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s @@ -86,7 +86,7 @@ glabel func_8024185C_D216EC .L80241978_D21808: /* D21808 80241978 0280202D */ daddu $a0, $s4, $zero /* D2180C 8024197C 0200282D */ daddu $a1, $s0, $zero -/* D21810 80241980 0C0901C0 */ jal func_80240700_D20590 +/* D21810 80241980 0C0901C0 */ jal sam_06_UnkNpcAIFunc35 /* D21814 80241984 0260302D */ daddu $a2, $s3, $zero /* D21818 80241988 08090689 */ j .L80241A24 /* D2181C 8024198C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_802405F0_869AA0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_802405F0_869AA0.s deleted file mode 100644 index ad72389387..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_802405F0_869AA0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_869AA0 -/* 869AA0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 869AA4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 869AA8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 869AAC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 869AB0 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 869AB4 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 869AB8 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 869ABC 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 869AC0 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 869AC4 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 869AC8 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 869ACC 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 869AD0 80240620 0C0B1EAF */ jal evt_get_variable -/* 869AD4 80240624 8C450000 */ lw $a1, ($v0) -/* 869AD8 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 869ADC 8024062C 0C00EABB */ jal get_npc_unsafe -/* 869AE0 80240630 0040802D */ daddu $s0, $v0, $zero -/* 869AE4 80240634 0200202D */ daddu $a0, $s0, $zero -/* 869AE8 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 869AEC 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 869AF0 80240640 0C046B4C */ jal get_model_from_list_index -/* 869AF4 80240644 0040202D */ daddu $a0, $v0, $zero -/* 869AF8 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 869AFC 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 869B00 80240650 0040902D */ daddu $s2, $v0, $zero -/* 869B04 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 869B08 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 869B0C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 869B10 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 869B14 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 869B18 80240668 00000000 */ nop -/* 869B1C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 869B20 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 869B24 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 869B28 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 869B2C 8024067C 00000000 */ nop -/* 869B30 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 869B34 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 869B38 80240688 44820000 */ mtc1 $v0, $f0 -/* 869B3C 8024068C 00000000 */ nop -/* 869B40 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 869B44 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 869B48 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 869B4C 8024069C 44810000 */ mtc1 $at, $f0 -/* 869B50 802406A0 00000000 */ nop -/* 869B54 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 869B58 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 869B5C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 869B60 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 869B64 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 869B68 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 869B6C 802406BC 00000000 */ nop -/* 869B70 802406C0 45010004 */ bc1t .L802406D4 -/* 869B74 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 869B78 802406C8 0C0187BC */ jal sqrtf -/* 869B7C 802406CC 00000000 */ nop -/* 869B80 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 869B84 802406D4 44800000 */ mtc1 $zero, $f0 -/* 869B88 802406D8 00000000 */ nop -/* 869B8C 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 869B90 802406E0 00000000 */ nop -/* 869B94 802406E4 45000016 */ bc1f .L80240740 -/* 869B98 802406E8 46001106 */ mov.s $f4, $f2 -/* 869B9C 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 869BA0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 869BA4 802406F4 00000000 */ nop -/* 869BA8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 869BAC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 869BB0 80240700 00000000 */ nop -/* 869BB4 80240704 4500000E */ bc1f .L80240740 -/* 869BB8 80240708 00000000 */ nop -/* 869BBC 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 869BC0 80240710 3C013F00 */ lui $at, 0x3f00 -/* 869BC4 80240714 44811000 */ mtc1 $at, $f2 -/* 869BC8 80240718 44820000 */ mtc1 $v0, $f0 -/* 869BCC 8024071C 00000000 */ nop -/* 869BD0 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 869BD4 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 869BD8 80240728 00000000 */ nop -/* 869BDC 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 869BE0 80240730 00000000 */ nop -/* 869BE4 80240734 45000002 */ bc1f .L80240740 -/* 869BE8 80240738 24020001 */ addiu $v0, $zero, 1 -/* 869BEC 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 869BF0 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 869BF4 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 869BF8 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 869BFC 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 869C00 80240750 00000000 */ nop -/* 869C04 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 869C08 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 869C0C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 869C10 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 869C14 80240764 00000000 */ nop -/* 869C18 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 869C1C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 869C20 80240770 44820000 */ mtc1 $v0, $f0 -/* 869C24 80240774 00000000 */ nop -/* 869C28 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 869C2C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 869C30 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 869C34 80240784 44810000 */ mtc1 $at, $f0 -/* 869C38 80240788 00000000 */ nop -/* 869C3C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 869C40 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 869C44 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 869C48 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 869C4C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 869C50 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 869C54 802407A4 00000000 */ nop -/* 869C58 802407A8 45010004 */ bc1t .L802407BC -/* 869C5C 802407AC 00000000 */ nop -/* 869C60 802407B0 0C0187BC */ jal sqrtf -/* 869C64 802407B4 00000000 */ nop -/* 869C68 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 869C6C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 869C70 802407C0 00000000 */ nop -/* 869C74 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 869C78 802407C8 00000000 */ nop -/* 869C7C 802407CC 45000016 */ bc1f .L80240828 -/* 869C80 802407D0 46001106 */ mov.s $f4, $f2 -/* 869C84 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 869C88 802407D8 44820000 */ mtc1 $v0, $f0 -/* 869C8C 802407DC 00000000 */ nop -/* 869C90 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 869C94 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 869C98 802407E8 00000000 */ nop -/* 869C9C 802407EC 4500000F */ bc1f .L8024082C -/* 869CA0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 869CA4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 869CA8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 869CAC 802407FC 44811000 */ mtc1 $at, $f2 -/* 869CB0 80240800 44820000 */ mtc1 $v0, $f0 -/* 869CB4 80240804 00000000 */ nop -/* 869CB8 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 869CBC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 869CC0 80240810 00000000 */ nop -/* 869CC4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 869CC8 80240818 00000000 */ nop -/* 869CCC 8024081C 45000003 */ bc1f .L8024082C -/* 869CD0 80240820 24020001 */ addiu $v0, $zero, 1 -/* 869CD4 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 869CD8 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 869CDC 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 869CE0 80240830 4481D000 */ mtc1 $at, $f26 -/* 869CE4 80240834 4480C000 */ mtc1 $zero, $f24 -/* 869CE8 80240838 3C013F00 */ lui $at, 0x3f00 -/* 869CEC 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 869CF0 80240840 0C00EAD2 */ jal get_npc_safe -/* 869CF4 80240844 0220202D */ daddu $a0, $s1, $zero -/* 869CF8 80240848 0040802D */ daddu $s0, $v0, $zero -/* 869CFC 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 869D00 80240850 26310001 */ addiu $s1, $s1, 1 -/* 869D04 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 869D08 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 869D0C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 869D10 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 869D14 80240864 00000000 */ nop -/* 869D18 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 869D1C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 869D20 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 869D24 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 869D28 80240878 00000000 */ nop -/* 869D2C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 869D30 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 869D34 80240884 44820000 */ mtc1 $v0, $f0 -/* 869D38 80240888 00000000 */ nop -/* 869D3C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 869D40 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 869D44 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 869D48 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 869D4C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 869D50 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 869D54 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 869D58 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 869D5C 802408AC 00000000 */ nop -/* 869D60 802408B0 45010003 */ bc1t .L802408C0 -/* 869D64 802408B4 00000000 */ nop -/* 869D68 802408B8 0C0187BC */ jal sqrtf -/* 869D6C 802408BC 00000000 */ nop -.L802408C0: -/* 869D70 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 869D74 802408C4 00000000 */ nop -/* 869D78 802408C8 45000015 */ bc1f .L80240920 -/* 869D7C 802408CC 46000106 */ mov.s $f4, $f0 -/* 869D80 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 869D84 802408D4 44820000 */ mtc1 $v0, $f0 -/* 869D88 802408D8 00000000 */ nop -/* 869D8C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 869D90 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 869D94 802408E4 00000000 */ nop -/* 869D98 802408E8 4500000E */ bc1f .L80240924 -/* 869D9C 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 869DA0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 869DA4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 869DA8 802408F8 00000000 */ nop -/* 869DAC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 869DB0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 869DB4 80240904 00000000 */ nop -/* 869DB8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 869DBC 8024090C 00000000 */ nop -/* 869DC0 80240910 45000004 */ bc1f .L80240924 -/* 869DC4 80240914 24020001 */ addiu $v0, $zero, 1 -/* 869DC8 80240918 0809024C */ j .L80240930 -/* 869DCC 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 869DD0 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 869DD4 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 869DD8 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 869DDC 8024092C 00000000 */ nop -.L80240930: -/* 869DE0 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 869DE4 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 869DE8 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 869DEC 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 869DF0 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 869DF4 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 869DF8 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 869DFC 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 869E00 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 869E04 80240954 24020002 */ addiu $v0, $zero, 2 -/* 869E08 80240958 03E00008 */ jr $ra -/* 869E0C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0_86CD10.s b/ver/us/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0_86CD10.s deleted file mode 100644 index 366a2e72c1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0_86CD10.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D0_86CD10 -/* 86CD10 802405D0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 86CD14 802405D4 AFB3001C */ sw $s3, 0x1c($sp) -/* 86CD18 802405D8 0080982D */ daddu $s3, $a0, $zero -/* 86CD1C 802405DC AFBF0020 */ sw $ra, 0x20($sp) -/* 86CD20 802405E0 AFB20018 */ sw $s2, 0x18($sp) -/* 86CD24 802405E4 AFB10014 */ sw $s1, 0x14($sp) -/* 86CD28 802405E8 AFB00010 */ sw $s0, 0x10($sp) -/* 86CD2C 802405EC F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 86CD30 802405F0 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 86CD34 802405F4 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 86CD38 802405F8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 86CD3C 802405FC 8E62000C */ lw $v0, 0xc($s3) -/* 86CD40 80240600 0C0B1EAF */ jal evt_get_variable -/* 86CD44 80240604 8C450000 */ lw $a1, ($v0) -/* 86CD48 80240608 2404FFFC */ addiu $a0, $zero, -4 -/* 86CD4C 8024060C 0C00EABB */ jal get_npc_unsafe -/* 86CD50 80240610 0040802D */ daddu $s0, $v0, $zero -/* 86CD54 80240614 0200202D */ daddu $a0, $s0, $zero -/* 86CD58 80240618 0C046C04 */ jal get_model_list_index_from_tree_index -/* 86CD5C 8024061C 0040802D */ daddu $s0, $v0, $zero -/* 86CD60 80240620 0C046B4C */ jal get_model_from_list_index -/* 86CD64 80240624 0040202D */ daddu $a0, $v0, $zero -/* 86CD68 80240628 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 86CD6C 8024062C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 86CD70 80240630 0040902D */ daddu $s2, $v0, $zero -/* 86CD74 80240634 AE60008C */ sw $zero, 0x8c($s3) -/* 86CD78 80240638 C4620028 */ lwc1 $f2, 0x28($v1) -/* 86CD7C 8024063C C6400098 */ lwc1 $f0, 0x98($s2) -/* 86CD80 80240640 46001081 */ sub.s $f2, $f2, $f0 -/* 86CD84 80240644 46021182 */ mul.s $f6, $f2, $f2 -/* 86CD88 80240648 00000000 */ nop -/* 86CD8C 8024064C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 86CD90 80240650 C4620030 */ lwc1 $f2, 0x30($v1) -/* 86CD94 80240654 46001081 */ sub.s $f2, $f2, $f0 -/* 86CD98 80240658 46021102 */ mul.s $f4, $f2, $f2 -/* 86CD9C 8024065C 00000000 */ nop -/* 86CDA0 80240660 846200B0 */ lh $v0, 0xb0($v1) -/* 86CDA4 80240664 C462002C */ lwc1 $f2, 0x2c($v1) -/* 86CDA8 80240668 44820000 */ mtc1 $v0, $f0 -/* 86CDAC 8024066C 00000000 */ nop -/* 86CDB0 80240670 46800020 */ cvt.s.w $f0, $f0 -/* 86CDB4 80240674 46001080 */ add.s $f2, $f2, $f0 -/* 86CDB8 80240678 3C013FC0 */ lui $at, 0x3fc0 -/* 86CDBC 8024067C 44810000 */ mtc1 $at, $f0 -/* 86CDC0 80240680 00000000 */ nop -/* 86CDC4 80240684 46001081 */ sub.s $f2, $f2, $f0 -/* 86CDC8 80240688 46043300 */ add.s $f12, $f6, $f4 -/* 86CDCC 8024068C C640009C */ lwc1 $f0, 0x9c($s2) -/* 86CDD0 80240690 46001501 */ sub.s $f20, $f2, $f0 -/* 86CDD4 80240694 46006084 */ sqrt.s $f2, $f12 -/* 86CDD8 80240698 46021032 */ c.eq.s $f2, $f2 -/* 86CDDC 8024069C 00000000 */ nop -/* 86CDE0 802406A0 45010004 */ bc1t .L802406B4 -/* 86CDE4 802406A4 0060882D */ daddu $s1, $v1, $zero -/* 86CDE8 802406A8 0C0187BC */ jal sqrtf -/* 86CDEC 802406AC 00000000 */ nop -/* 86CDF0 802406B0 46000086 */ mov.s $f2, $f0 -.L802406B4: -/* 86CDF4 802406B4 44800000 */ mtc1 $zero, $f0 -/* 86CDF8 802406B8 00000000 */ nop -/* 86CDFC 802406BC 4614003C */ c.lt.s $f0, $f20 -/* 86CE00 802406C0 00000000 */ nop -/* 86CE04 802406C4 45000016 */ bc1f .L80240720 -/* 86CE08 802406C8 46001106 */ mov.s $f4, $f2 -/* 86CE0C 802406CC 862200B0 */ lh $v0, 0xb0($s1) -/* 86CE10 802406D0 44820000 */ mtc1 $v0, $f0 -/* 86CE14 802406D4 00000000 */ nop -/* 86CE18 802406D8 46800020 */ cvt.s.w $f0, $f0 -/* 86CE1C 802406DC 4600A03C */ c.lt.s $f20, $f0 -/* 86CE20 802406E0 00000000 */ nop -/* 86CE24 802406E4 4500000E */ bc1f .L80240720 -/* 86CE28 802406E8 00000000 */ nop -/* 86CE2C 802406EC 862200B2 */ lh $v0, 0xb2($s1) -/* 86CE30 802406F0 3C013F00 */ lui $at, 0x3f00 -/* 86CE34 802406F4 44811000 */ mtc1 $at, $f2 -/* 86CE38 802406F8 44820000 */ mtc1 $v0, $f0 -/* 86CE3C 802406FC 00000000 */ nop -/* 86CE40 80240700 46800020 */ cvt.s.w $f0, $f0 -/* 86CE44 80240704 46020002 */ mul.s $f0, $f0, $f2 -/* 86CE48 80240708 00000000 */ nop -/* 86CE4C 8024070C 4600203C */ c.lt.s $f4, $f0 -/* 86CE50 80240710 00000000 */ nop -/* 86CE54 80240714 45000002 */ bc1f .L80240720 -/* 86CE58 80240718 24020001 */ addiu $v0, $zero, 1 -/* 86CE5C 8024071C AE62008C */ sw $v0, 0x8c($s3) -.L80240720: -/* 86CE60 80240720 C6020038 */ lwc1 $f2, 0x38($s0) -/* 86CE64 80240724 C6400098 */ lwc1 $f0, 0x98($s2) -/* 86CE68 80240728 46001081 */ sub.s $f2, $f2, $f0 -/* 86CE6C 8024072C 46021182 */ mul.s $f6, $f2, $f2 -/* 86CE70 80240730 00000000 */ nop -/* 86CE74 80240734 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 86CE78 80240738 C6020040 */ lwc1 $f2, 0x40($s0) -/* 86CE7C 8024073C 46001081 */ sub.s $f2, $f2, $f0 -/* 86CE80 80240740 46021102 */ mul.s $f4, $f2, $f2 -/* 86CE84 80240744 00000000 */ nop -/* 86CE88 80240748 860200A8 */ lh $v0, 0xa8($s0) -/* 86CE8C 8024074C C602003C */ lwc1 $f2, 0x3c($s0) -/* 86CE90 80240750 44820000 */ mtc1 $v0, $f0 -/* 86CE94 80240754 00000000 */ nop -/* 86CE98 80240758 46800020 */ cvt.s.w $f0, $f0 -/* 86CE9C 8024075C 46001080 */ add.s $f2, $f2, $f0 -/* 86CEA0 80240760 3C013FC0 */ lui $at, 0x3fc0 -/* 86CEA4 80240764 44810000 */ mtc1 $at, $f0 -/* 86CEA8 80240768 00000000 */ nop -/* 86CEAC 8024076C 46001081 */ sub.s $f2, $f2, $f0 -/* 86CEB0 80240770 46043300 */ add.s $f12, $f6, $f4 -/* 86CEB4 80240774 C640009C */ lwc1 $f0, 0x9c($s2) -/* 86CEB8 80240778 46001501 */ sub.s $f20, $f2, $f0 -/* 86CEBC 8024077C 46006084 */ sqrt.s $f2, $f12 -/* 86CEC0 80240780 46021032 */ c.eq.s $f2, $f2 -/* 86CEC4 80240784 00000000 */ nop -/* 86CEC8 80240788 45010004 */ bc1t .L8024079C -/* 86CECC 8024078C 00000000 */ nop -/* 86CED0 80240790 0C0187BC */ jal sqrtf -/* 86CED4 80240794 00000000 */ nop -/* 86CED8 80240798 46000086 */ mov.s $f2, $f0 -.L8024079C: -/* 86CEDC 8024079C 44800000 */ mtc1 $zero, $f0 -/* 86CEE0 802407A0 00000000 */ nop -/* 86CEE4 802407A4 4614003C */ c.lt.s $f0, $f20 -/* 86CEE8 802407A8 00000000 */ nop -/* 86CEEC 802407AC 45000016 */ bc1f .L80240808 -/* 86CEF0 802407B0 46001106 */ mov.s $f4, $f2 -/* 86CEF4 802407B4 860200A8 */ lh $v0, 0xa8($s0) -/* 86CEF8 802407B8 44820000 */ mtc1 $v0, $f0 -/* 86CEFC 802407BC 00000000 */ nop -/* 86CF00 802407C0 46800020 */ cvt.s.w $f0, $f0 -/* 86CF04 802407C4 4600A03C */ c.lt.s $f20, $f0 -/* 86CF08 802407C8 00000000 */ nop -/* 86CF0C 802407CC 4500000F */ bc1f .L8024080C -/* 86CF10 802407D0 0000882D */ daddu $s1, $zero, $zero -/* 86CF14 802407D4 860200A6 */ lh $v0, 0xa6($s0) -/* 86CF18 802407D8 3C013F00 */ lui $at, 0x3f00 -/* 86CF1C 802407DC 44811000 */ mtc1 $at, $f2 -/* 86CF20 802407E0 44820000 */ mtc1 $v0, $f0 -/* 86CF24 802407E4 00000000 */ nop -/* 86CF28 802407E8 46800020 */ cvt.s.w $f0, $f0 -/* 86CF2C 802407EC 46020002 */ mul.s $f0, $f0, $f2 -/* 86CF30 802407F0 00000000 */ nop -/* 86CF34 802407F4 4600203C */ c.lt.s $f4, $f0 -/* 86CF38 802407F8 00000000 */ nop -/* 86CF3C 802407FC 45000003 */ bc1f .L8024080C -/* 86CF40 80240800 24020001 */ addiu $v0, $zero, 1 -/* 86CF44 80240804 AE62008C */ sw $v0, 0x8c($s3) -.L80240808: -/* 86CF48 80240808 0000882D */ daddu $s1, $zero, $zero -.L8024080C: -/* 86CF4C 8024080C 3C013FC0 */ lui $at, 0x3fc0 -/* 86CF50 80240810 4481D000 */ mtc1 $at, $f26 -/* 86CF54 80240814 4480C000 */ mtc1 $zero, $f24 -/* 86CF58 80240818 3C013F00 */ lui $at, 0x3f00 -/* 86CF5C 8024081C 4481B000 */ mtc1 $at, $f22 -.L80240820: -/* 86CF60 80240820 0C00EAD2 */ jal get_npc_safe -/* 86CF64 80240824 0220202D */ daddu $a0, $s1, $zero -/* 86CF68 80240828 0040802D */ daddu $s0, $v0, $zero -/* 86CF6C 8024082C 52000035 */ beql $s0, $zero, .L80240904 -/* 86CF70 80240830 26310001 */ addiu $s1, $s1, 1 -/* 86CF74 80240834 C6020038 */ lwc1 $f2, 0x38($s0) -/* 86CF78 80240838 C6400098 */ lwc1 $f0, 0x98($s2) -/* 86CF7C 8024083C 46001081 */ sub.s $f2, $f2, $f0 -/* 86CF80 80240840 46021182 */ mul.s $f6, $f2, $f2 -/* 86CF84 80240844 00000000 */ nop -/* 86CF88 80240848 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 86CF8C 8024084C C6020040 */ lwc1 $f2, 0x40($s0) -/* 86CF90 80240850 46001081 */ sub.s $f2, $f2, $f0 -/* 86CF94 80240854 46021102 */ mul.s $f4, $f2, $f2 -/* 86CF98 80240858 00000000 */ nop -/* 86CF9C 8024085C 860200A8 */ lh $v0, 0xa8($s0) -/* 86CFA0 80240860 C602003C */ lwc1 $f2, 0x3c($s0) -/* 86CFA4 80240864 44820000 */ mtc1 $v0, $f0 -/* 86CFA8 80240868 00000000 */ nop -/* 86CFAC 8024086C 46800020 */ cvt.s.w $f0, $f0 -/* 86CFB0 80240870 46001080 */ add.s $f2, $f2, $f0 -/* 86CFB4 80240874 461A1081 */ sub.s $f2, $f2, $f26 -/* 86CFB8 80240878 46043300 */ add.s $f12, $f6, $f4 -/* 86CFBC 8024087C C640009C */ lwc1 $f0, 0x9c($s2) -/* 86CFC0 80240880 46001501 */ sub.s $f20, $f2, $f0 -/* 86CFC4 80240884 46006004 */ sqrt.s $f0, $f12 -/* 86CFC8 80240888 46000032 */ c.eq.s $f0, $f0 -/* 86CFCC 8024088C 00000000 */ nop -/* 86CFD0 80240890 45010003 */ bc1t .L802408A0 -/* 86CFD4 80240894 00000000 */ nop -/* 86CFD8 80240898 0C0187BC */ jal sqrtf -/* 86CFDC 8024089C 00000000 */ nop -.L802408A0: -/* 86CFE0 802408A0 4614C03C */ c.lt.s $f24, $f20 -/* 86CFE4 802408A4 00000000 */ nop -/* 86CFE8 802408A8 45000015 */ bc1f .L80240900 -/* 86CFEC 802408AC 46000106 */ mov.s $f4, $f0 -/* 86CFF0 802408B0 860200A8 */ lh $v0, 0xa8($s0) -/* 86CFF4 802408B4 44820000 */ mtc1 $v0, $f0 -/* 86CFF8 802408B8 00000000 */ nop -/* 86CFFC 802408BC 46800020 */ cvt.s.w $f0, $f0 -/* 86D000 802408C0 4600A03C */ c.lt.s $f20, $f0 -/* 86D004 802408C4 00000000 */ nop -/* 86D008 802408C8 4500000E */ bc1f .L80240904 -/* 86D00C 802408CC 26310001 */ addiu $s1, $s1, 1 -/* 86D010 802408D0 860200A6 */ lh $v0, 0xa6($s0) -/* 86D014 802408D4 44820000 */ mtc1 $v0, $f0 -/* 86D018 802408D8 00000000 */ nop -/* 86D01C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 86D020 802408E0 46160002 */ mul.s $f0, $f0, $f22 -/* 86D024 802408E4 00000000 */ nop -/* 86D028 802408E8 4600203C */ c.lt.s $f4, $f0 -/* 86D02C 802408EC 00000000 */ nop -/* 86D030 802408F0 45000004 */ bc1f .L80240904 -/* 86D034 802408F4 24020001 */ addiu $v0, $zero, 1 -/* 86D038 802408F8 08090244 */ j .L80240910 -/* 86D03C 802408FC AE62008C */ sw $v0, 0x8c($s3) -.L80240900: -/* 86D040 80240900 26310001 */ addiu $s1, $s1, 1 -.L80240904: -/* 86D044 80240904 2A220040 */ slti $v0, $s1, 0x40 -/* 86D048 80240908 1440FFC5 */ bnez $v0, .L80240820 -/* 86D04C 8024090C 00000000 */ nop -.L80240910: -/* 86D050 80240910 8FBF0020 */ lw $ra, 0x20($sp) -/* 86D054 80240914 8FB3001C */ lw $s3, 0x1c($sp) -/* 86D058 80240918 8FB20018 */ lw $s2, 0x18($sp) -/* 86D05C 8024091C 8FB10014 */ lw $s1, 0x14($sp) -/* 86D060 80240920 8FB00010 */ lw $s0, 0x10($sp) -/* 86D064 80240924 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 86D068 80240928 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 86D06C 8024092C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 86D070 80240930 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 86D074 80240934 24020002 */ addiu $v0, $zero, 2 -/* 86D078 80240938 03E00008 */ jr $ra -/* 86D07C 8024093C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802405F0_86F0F0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802405F0_86F0F0.s deleted file mode 100644 index 8a9c0c05bc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802405F0_86F0F0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_86F0F0 -/* 86F0F0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 86F0F4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 86F0F8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 86F0FC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 86F100 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 86F104 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 86F108 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 86F10C 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 86F110 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 86F114 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 86F118 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 86F11C 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 86F120 80240620 0C0B1EAF */ jal evt_get_variable -/* 86F124 80240624 8C450000 */ lw $a1, ($v0) -/* 86F128 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 86F12C 8024062C 0C00EABB */ jal get_npc_unsafe -/* 86F130 80240630 0040802D */ daddu $s0, $v0, $zero -/* 86F134 80240634 0200202D */ daddu $a0, $s0, $zero -/* 86F138 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 86F13C 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 86F140 80240640 0C046B4C */ jal get_model_from_list_index -/* 86F144 80240644 0040202D */ daddu $a0, $v0, $zero -/* 86F148 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 86F14C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 86F150 80240650 0040902D */ daddu $s2, $v0, $zero -/* 86F154 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 86F158 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 86F15C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 86F160 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 86F164 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 86F168 80240668 00000000 */ nop -/* 86F16C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 86F170 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 86F174 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 86F178 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 86F17C 8024067C 00000000 */ nop -/* 86F180 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 86F184 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 86F188 80240688 44820000 */ mtc1 $v0, $f0 -/* 86F18C 8024068C 00000000 */ nop -/* 86F190 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 86F194 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 86F198 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 86F19C 8024069C 44810000 */ mtc1 $at, $f0 -/* 86F1A0 802406A0 00000000 */ nop -/* 86F1A4 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 86F1A8 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 86F1AC 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 86F1B0 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 86F1B4 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 86F1B8 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 86F1BC 802406BC 00000000 */ nop -/* 86F1C0 802406C0 45010004 */ bc1t .L802406D4 -/* 86F1C4 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 86F1C8 802406C8 0C0187BC */ jal sqrtf -/* 86F1CC 802406CC 00000000 */ nop -/* 86F1D0 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 86F1D4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 86F1D8 802406D8 00000000 */ nop -/* 86F1DC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 86F1E0 802406E0 00000000 */ nop -/* 86F1E4 802406E4 45000016 */ bc1f .L80240740 -/* 86F1E8 802406E8 46001106 */ mov.s $f4, $f2 -/* 86F1EC 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 86F1F0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 86F1F4 802406F4 00000000 */ nop -/* 86F1F8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 86F1FC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 86F200 80240700 00000000 */ nop -/* 86F204 80240704 4500000E */ bc1f .L80240740 -/* 86F208 80240708 00000000 */ nop -/* 86F20C 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 86F210 80240710 3C013F00 */ lui $at, 0x3f00 -/* 86F214 80240714 44811000 */ mtc1 $at, $f2 -/* 86F218 80240718 44820000 */ mtc1 $v0, $f0 -/* 86F21C 8024071C 00000000 */ nop -/* 86F220 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 86F224 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 86F228 80240728 00000000 */ nop -/* 86F22C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 86F230 80240730 00000000 */ nop -/* 86F234 80240734 45000002 */ bc1f .L80240740 -/* 86F238 80240738 24020001 */ addiu $v0, $zero, 1 -/* 86F23C 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 86F240 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 86F244 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 86F248 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 86F24C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 86F250 80240750 00000000 */ nop -/* 86F254 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 86F258 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 86F25C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 86F260 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 86F264 80240764 00000000 */ nop -/* 86F268 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 86F26C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 86F270 80240770 44820000 */ mtc1 $v0, $f0 -/* 86F274 80240774 00000000 */ nop -/* 86F278 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 86F27C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 86F280 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 86F284 80240784 44810000 */ mtc1 $at, $f0 -/* 86F288 80240788 00000000 */ nop -/* 86F28C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 86F290 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 86F294 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 86F298 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 86F29C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 86F2A0 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 86F2A4 802407A4 00000000 */ nop -/* 86F2A8 802407A8 45010004 */ bc1t .L802407BC -/* 86F2AC 802407AC 00000000 */ nop -/* 86F2B0 802407B0 0C0187BC */ jal sqrtf -/* 86F2B4 802407B4 00000000 */ nop -/* 86F2B8 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 86F2BC 802407BC 44800000 */ mtc1 $zero, $f0 -/* 86F2C0 802407C0 00000000 */ nop -/* 86F2C4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 86F2C8 802407C8 00000000 */ nop -/* 86F2CC 802407CC 45000016 */ bc1f .L80240828 -/* 86F2D0 802407D0 46001106 */ mov.s $f4, $f2 -/* 86F2D4 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 86F2D8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 86F2DC 802407DC 00000000 */ nop -/* 86F2E0 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 86F2E4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 86F2E8 802407E8 00000000 */ nop -/* 86F2EC 802407EC 4500000F */ bc1f .L8024082C -/* 86F2F0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 86F2F4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 86F2F8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 86F2FC 802407FC 44811000 */ mtc1 $at, $f2 -/* 86F300 80240800 44820000 */ mtc1 $v0, $f0 -/* 86F304 80240804 00000000 */ nop -/* 86F308 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 86F30C 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 86F310 80240810 00000000 */ nop -/* 86F314 80240814 4600203C */ c.lt.s $f4, $f0 -/* 86F318 80240818 00000000 */ nop -/* 86F31C 8024081C 45000003 */ bc1f .L8024082C -/* 86F320 80240820 24020001 */ addiu $v0, $zero, 1 -/* 86F324 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 86F328 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 86F32C 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 86F330 80240830 4481D000 */ mtc1 $at, $f26 -/* 86F334 80240834 4480C000 */ mtc1 $zero, $f24 -/* 86F338 80240838 3C013F00 */ lui $at, 0x3f00 -/* 86F33C 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 86F340 80240840 0C00EAD2 */ jal get_npc_safe -/* 86F344 80240844 0220202D */ daddu $a0, $s1, $zero -/* 86F348 80240848 0040802D */ daddu $s0, $v0, $zero -/* 86F34C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 86F350 80240850 26310001 */ addiu $s1, $s1, 1 -/* 86F354 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 86F358 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 86F35C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 86F360 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 86F364 80240864 00000000 */ nop -/* 86F368 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 86F36C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 86F370 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 86F374 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 86F378 80240878 00000000 */ nop -/* 86F37C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 86F380 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 86F384 80240884 44820000 */ mtc1 $v0, $f0 -/* 86F388 80240888 00000000 */ nop -/* 86F38C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 86F390 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 86F394 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 86F398 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 86F39C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 86F3A0 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 86F3A4 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 86F3A8 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 86F3AC 802408AC 00000000 */ nop -/* 86F3B0 802408B0 45010003 */ bc1t .L802408C0 -/* 86F3B4 802408B4 00000000 */ nop -/* 86F3B8 802408B8 0C0187BC */ jal sqrtf -/* 86F3BC 802408BC 00000000 */ nop -.L802408C0: -/* 86F3C0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 86F3C4 802408C4 00000000 */ nop -/* 86F3C8 802408C8 45000015 */ bc1f .L80240920 -/* 86F3CC 802408CC 46000106 */ mov.s $f4, $f0 -/* 86F3D0 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 86F3D4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 86F3D8 802408D8 00000000 */ nop -/* 86F3DC 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 86F3E0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 86F3E4 802408E4 00000000 */ nop -/* 86F3E8 802408E8 4500000E */ bc1f .L80240924 -/* 86F3EC 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 86F3F0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 86F3F4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 86F3F8 802408F8 00000000 */ nop -/* 86F3FC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 86F400 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 86F404 80240904 00000000 */ nop -/* 86F408 80240908 4600203C */ c.lt.s $f4, $f0 -/* 86F40C 8024090C 00000000 */ nop -/* 86F410 80240910 45000004 */ bc1f .L80240924 -/* 86F414 80240914 24020001 */ addiu $v0, $zero, 1 -/* 86F418 80240918 0809024C */ j .L80240930 -/* 86F41C 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 86F420 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 86F424 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 86F428 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 86F42C 8024092C 00000000 */ nop -.L80240930: -/* 86F430 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 86F434 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 86F438 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 86F43C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 86F440 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 86F444 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 86F448 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 86F44C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 86F450 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 86F454 80240954 24020002 */ addiu $v0, $zero, 2 -/* 86F458 80240958 03E00008 */ jr $ra -/* 86F45C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_04/872020/func_802405F0_872020.s b/ver/us/asm/nonmatchings/world/area_tik/tik_04/872020/func_802405F0_872020.s deleted file mode 100644 index 30b00a53da..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_04/872020/func_802405F0_872020.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_872020 -/* 872020 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 872024 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 872028 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 87202C 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 872030 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 872034 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 872038 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 87203C 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 872040 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 872044 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 872048 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 87204C 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 872050 80240620 0C0B1EAF */ jal evt_get_variable -/* 872054 80240624 8C450000 */ lw $a1, ($v0) -/* 872058 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 87205C 8024062C 0C00EABB */ jal get_npc_unsafe -/* 872060 80240630 0040802D */ daddu $s0, $v0, $zero -/* 872064 80240634 0200202D */ daddu $a0, $s0, $zero -/* 872068 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 87206C 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 872070 80240640 0C046B4C */ jal get_model_from_list_index -/* 872074 80240644 0040202D */ daddu $a0, $v0, $zero -/* 872078 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 87207C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 872080 80240650 0040902D */ daddu $s2, $v0, $zero -/* 872084 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 872088 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 87208C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 872090 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 872094 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 872098 80240668 00000000 */ nop -/* 87209C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8720A0 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 8720A4 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 8720A8 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 8720AC 8024067C 00000000 */ nop -/* 8720B0 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 8720B4 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 8720B8 80240688 44820000 */ mtc1 $v0, $f0 -/* 8720BC 8024068C 00000000 */ nop -/* 8720C0 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 8720C4 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 8720C8 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 8720CC 8024069C 44810000 */ mtc1 $at, $f0 -/* 8720D0 802406A0 00000000 */ nop -/* 8720D4 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 8720D8 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 8720DC 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 8720E0 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 8720E4 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 8720E8 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 8720EC 802406BC 00000000 */ nop -/* 8720F0 802406C0 45010004 */ bc1t .L802406D4 -/* 8720F4 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 8720F8 802406C8 0C0187BC */ jal sqrtf -/* 8720FC 802406CC 00000000 */ nop -/* 872100 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 872104 802406D4 44800000 */ mtc1 $zero, $f0 -/* 872108 802406D8 00000000 */ nop -/* 87210C 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 872110 802406E0 00000000 */ nop -/* 872114 802406E4 45000016 */ bc1f .L80240740 -/* 872118 802406E8 46001106 */ mov.s $f4, $f2 -/* 87211C 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 872120 802406F0 44820000 */ mtc1 $v0, $f0 -/* 872124 802406F4 00000000 */ nop -/* 872128 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 87212C 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 872130 80240700 00000000 */ nop -/* 872134 80240704 4500000E */ bc1f .L80240740 -/* 872138 80240708 00000000 */ nop -/* 87213C 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 872140 80240710 3C013F00 */ lui $at, 0x3f00 -/* 872144 80240714 44811000 */ mtc1 $at, $f2 -/* 872148 80240718 44820000 */ mtc1 $v0, $f0 -/* 87214C 8024071C 00000000 */ nop -/* 872150 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 872154 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 872158 80240728 00000000 */ nop -/* 87215C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 872160 80240730 00000000 */ nop -/* 872164 80240734 45000002 */ bc1f .L80240740 -/* 872168 80240738 24020001 */ addiu $v0, $zero, 1 -/* 87216C 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 872170 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 872174 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 872178 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 87217C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 872180 80240750 00000000 */ nop -/* 872184 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 872188 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 87218C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 872190 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 872194 80240764 00000000 */ nop -/* 872198 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 87219C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 8721A0 80240770 44820000 */ mtc1 $v0, $f0 -/* 8721A4 80240774 00000000 */ nop -/* 8721A8 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 8721AC 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 8721B0 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 8721B4 80240784 44810000 */ mtc1 $at, $f0 -/* 8721B8 80240788 00000000 */ nop -/* 8721BC 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 8721C0 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 8721C4 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8721C8 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 8721CC 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 8721D0 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 8721D4 802407A4 00000000 */ nop -/* 8721D8 802407A8 45010004 */ bc1t .L802407BC -/* 8721DC 802407AC 00000000 */ nop -/* 8721E0 802407B0 0C0187BC */ jal sqrtf -/* 8721E4 802407B4 00000000 */ nop -/* 8721E8 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 8721EC 802407BC 44800000 */ mtc1 $zero, $f0 -/* 8721F0 802407C0 00000000 */ nop -/* 8721F4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 8721F8 802407C8 00000000 */ nop -/* 8721FC 802407CC 45000016 */ bc1f .L80240828 -/* 872200 802407D0 46001106 */ mov.s $f4, $f2 -/* 872204 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 872208 802407D8 44820000 */ mtc1 $v0, $f0 -/* 87220C 802407DC 00000000 */ nop -/* 872210 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 872214 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 872218 802407E8 00000000 */ nop -/* 87221C 802407EC 4500000F */ bc1f .L8024082C -/* 872220 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 872224 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 872228 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 87222C 802407FC 44811000 */ mtc1 $at, $f2 -/* 872230 80240800 44820000 */ mtc1 $v0, $f0 -/* 872234 80240804 00000000 */ nop -/* 872238 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 87223C 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 872240 80240810 00000000 */ nop -/* 872244 80240814 4600203C */ c.lt.s $f4, $f0 -/* 872248 80240818 00000000 */ nop -/* 87224C 8024081C 45000003 */ bc1f .L8024082C -/* 872250 80240820 24020001 */ addiu $v0, $zero, 1 -/* 872254 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 872258 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 87225C 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 872260 80240830 4481D000 */ mtc1 $at, $f26 -/* 872264 80240834 4480C000 */ mtc1 $zero, $f24 -/* 872268 80240838 3C013F00 */ lui $at, 0x3f00 -/* 87226C 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 872270 80240840 0C00EAD2 */ jal get_npc_safe -/* 872274 80240844 0220202D */ daddu $a0, $s1, $zero -/* 872278 80240848 0040802D */ daddu $s0, $v0, $zero -/* 87227C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 872280 80240850 26310001 */ addiu $s1, $s1, 1 -/* 872284 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 872288 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87228C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 872290 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 872294 80240864 00000000 */ nop -/* 872298 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87229C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 8722A0 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 8722A4 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 8722A8 80240878 00000000 */ nop -/* 8722AC 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 8722B0 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8722B4 80240884 44820000 */ mtc1 $v0, $f0 -/* 8722B8 80240888 00000000 */ nop -/* 8722BC 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 8722C0 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 8722C4 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 8722C8 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 8722CC 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 8722D0 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 8722D4 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 8722D8 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 8722DC 802408AC 00000000 */ nop -/* 8722E0 802408B0 45010003 */ bc1t .L802408C0 -/* 8722E4 802408B4 00000000 */ nop -/* 8722E8 802408B8 0C0187BC */ jal sqrtf -/* 8722EC 802408BC 00000000 */ nop -.L802408C0: -/* 8722F0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 8722F4 802408C4 00000000 */ nop -/* 8722F8 802408C8 45000015 */ bc1f .L80240920 -/* 8722FC 802408CC 46000106 */ mov.s $f4, $f0 -/* 872300 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 872304 802408D4 44820000 */ mtc1 $v0, $f0 -/* 872308 802408D8 00000000 */ nop -/* 87230C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 872310 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 872314 802408E4 00000000 */ nop -/* 872318 802408E8 4500000E */ bc1f .L80240924 -/* 87231C 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 872320 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 872324 802408F4 44820000 */ mtc1 $v0, $f0 -/* 872328 802408F8 00000000 */ nop -/* 87232C 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 872330 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 872334 80240904 00000000 */ nop -/* 872338 80240908 4600203C */ c.lt.s $f4, $f0 -/* 87233C 8024090C 00000000 */ nop -/* 872340 80240910 45000004 */ bc1f .L80240924 -/* 872344 80240914 24020001 */ addiu $v0, $zero, 1 -/* 872348 80240918 0809024C */ j .L80240930 -/* 87234C 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 872350 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 872354 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 872358 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 87235C 8024092C 00000000 */ nop -.L80240930: -/* 872360 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 872364 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 872368 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 87236C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 872370 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 872374 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 872378 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 87237C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 872380 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 872384 80240954 24020002 */ addiu $v0, $zero, 2 -/* 872388 80240958 03E00008 */ jr $ra -/* 87238C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240310_8750D0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240310_8750D0.s deleted file mode 100644 index f2ee855410..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240310_8750D0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_8750D0 -/* 8750D0 80240310 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8750D4 80240314 AFB3001C */ sw $s3, 0x1c($sp) -/* 8750D8 80240318 0080982D */ daddu $s3, $a0, $zero -/* 8750DC 8024031C AFBF0020 */ sw $ra, 0x20($sp) -/* 8750E0 80240320 AFB20018 */ sw $s2, 0x18($sp) -/* 8750E4 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* 8750E8 80240328 AFB00010 */ sw $s0, 0x10($sp) -/* 8750EC 8024032C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8750F0 80240330 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8750F4 80240334 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8750F8 80240338 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8750FC 8024033C 8E62000C */ lw $v0, 0xc($s3) -/* 875100 80240340 0C0B1EAF */ jal evt_get_variable -/* 875104 80240344 8C450000 */ lw $a1, ($v0) -/* 875108 80240348 2404FFFC */ addiu $a0, $zero, -4 -/* 87510C 8024034C 0C00EABB */ jal get_npc_unsafe -/* 875110 80240350 0040802D */ daddu $s0, $v0, $zero -/* 875114 80240354 0200202D */ daddu $a0, $s0, $zero -/* 875118 80240358 0C046C04 */ jal get_model_list_index_from_tree_index -/* 87511C 8024035C 0040802D */ daddu $s0, $v0, $zero -/* 875120 80240360 0C046B4C */ jal get_model_from_list_index -/* 875124 80240364 0040202D */ daddu $a0, $v0, $zero -/* 875128 80240368 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 87512C 8024036C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 875130 80240370 0040902D */ daddu $s2, $v0, $zero -/* 875134 80240374 AE60008C */ sw $zero, 0x8c($s3) -/* 875138 80240378 C4620028 */ lwc1 $f2, 0x28($v1) -/* 87513C 8024037C C6400098 */ lwc1 $f0, 0x98($s2) -/* 875140 80240380 46001081 */ sub.s $f2, $f2, $f0 -/* 875144 80240384 46021182 */ mul.s $f6, $f2, $f2 -/* 875148 80240388 00000000 */ nop -/* 87514C 8024038C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 875150 80240390 C4620030 */ lwc1 $f2, 0x30($v1) -/* 875154 80240394 46001081 */ sub.s $f2, $f2, $f0 -/* 875158 80240398 46021102 */ mul.s $f4, $f2, $f2 -/* 87515C 8024039C 00000000 */ nop -/* 875160 802403A0 846200B0 */ lh $v0, 0xb0($v1) -/* 875164 802403A4 C462002C */ lwc1 $f2, 0x2c($v1) -/* 875168 802403A8 44820000 */ mtc1 $v0, $f0 -/* 87516C 802403AC 00000000 */ nop -/* 875170 802403B0 46800020 */ cvt.s.w $f0, $f0 -/* 875174 802403B4 46001080 */ add.s $f2, $f2, $f0 -/* 875178 802403B8 3C013FC0 */ lui $at, 0x3fc0 -/* 87517C 802403BC 44810000 */ mtc1 $at, $f0 -/* 875180 802403C0 00000000 */ nop -/* 875184 802403C4 46001081 */ sub.s $f2, $f2, $f0 -/* 875188 802403C8 46043300 */ add.s $f12, $f6, $f4 -/* 87518C 802403CC C640009C */ lwc1 $f0, 0x9c($s2) -/* 875190 802403D0 46001501 */ sub.s $f20, $f2, $f0 -/* 875194 802403D4 46006084 */ sqrt.s $f2, $f12 -/* 875198 802403D8 46021032 */ c.eq.s $f2, $f2 -/* 87519C 802403DC 00000000 */ nop -/* 8751A0 802403E0 45010004 */ bc1t .L802403F4 -/* 8751A4 802403E4 0060882D */ daddu $s1, $v1, $zero -/* 8751A8 802403E8 0C0187BC */ jal sqrtf -/* 8751AC 802403EC 00000000 */ nop -/* 8751B0 802403F0 46000086 */ mov.s $f2, $f0 -.L802403F4: -/* 8751B4 802403F4 44800000 */ mtc1 $zero, $f0 -/* 8751B8 802403F8 00000000 */ nop -/* 8751BC 802403FC 4614003C */ c.lt.s $f0, $f20 -/* 8751C0 80240400 00000000 */ nop -/* 8751C4 80240404 45000016 */ bc1f .L80240460 -/* 8751C8 80240408 46001106 */ mov.s $f4, $f2 -/* 8751CC 8024040C 862200B0 */ lh $v0, 0xb0($s1) -/* 8751D0 80240410 44820000 */ mtc1 $v0, $f0 -/* 8751D4 80240414 00000000 */ nop -/* 8751D8 80240418 46800020 */ cvt.s.w $f0, $f0 -/* 8751DC 8024041C 4600A03C */ c.lt.s $f20, $f0 -/* 8751E0 80240420 00000000 */ nop -/* 8751E4 80240424 4500000E */ bc1f .L80240460 -/* 8751E8 80240428 00000000 */ nop -/* 8751EC 8024042C 862200B2 */ lh $v0, 0xb2($s1) -/* 8751F0 80240430 3C013F00 */ lui $at, 0x3f00 -/* 8751F4 80240434 44811000 */ mtc1 $at, $f2 -/* 8751F8 80240438 44820000 */ mtc1 $v0, $f0 -/* 8751FC 8024043C 00000000 */ nop -/* 875200 80240440 46800020 */ cvt.s.w $f0, $f0 -/* 875204 80240444 46020002 */ mul.s $f0, $f0, $f2 -/* 875208 80240448 00000000 */ nop -/* 87520C 8024044C 4600203C */ c.lt.s $f4, $f0 -/* 875210 80240450 00000000 */ nop -/* 875214 80240454 45000002 */ bc1f .L80240460 -/* 875218 80240458 24020001 */ addiu $v0, $zero, 1 -/* 87521C 8024045C AE62008C */ sw $v0, 0x8c($s3) -.L80240460: -/* 875220 80240460 C6020038 */ lwc1 $f2, 0x38($s0) -/* 875224 80240464 C6400098 */ lwc1 $f0, 0x98($s2) -/* 875228 80240468 46001081 */ sub.s $f2, $f2, $f0 -/* 87522C 8024046C 46021182 */ mul.s $f6, $f2, $f2 -/* 875230 80240470 00000000 */ nop -/* 875234 80240474 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 875238 80240478 C6020040 */ lwc1 $f2, 0x40($s0) -/* 87523C 8024047C 46001081 */ sub.s $f2, $f2, $f0 -/* 875240 80240480 46021102 */ mul.s $f4, $f2, $f2 -/* 875244 80240484 00000000 */ nop -/* 875248 80240488 860200A8 */ lh $v0, 0xa8($s0) -/* 87524C 8024048C C602003C */ lwc1 $f2, 0x3c($s0) -/* 875250 80240490 44820000 */ mtc1 $v0, $f0 -/* 875254 80240494 00000000 */ nop -/* 875258 80240498 46800020 */ cvt.s.w $f0, $f0 -/* 87525C 8024049C 46001080 */ add.s $f2, $f2, $f0 -/* 875260 802404A0 3C013FC0 */ lui $at, 0x3fc0 -/* 875264 802404A4 44810000 */ mtc1 $at, $f0 -/* 875268 802404A8 00000000 */ nop -/* 87526C 802404AC 46001081 */ sub.s $f2, $f2, $f0 -/* 875270 802404B0 46043300 */ add.s $f12, $f6, $f4 -/* 875274 802404B4 C640009C */ lwc1 $f0, 0x9c($s2) -/* 875278 802404B8 46001501 */ sub.s $f20, $f2, $f0 -/* 87527C 802404BC 46006084 */ sqrt.s $f2, $f12 -/* 875280 802404C0 46021032 */ c.eq.s $f2, $f2 -/* 875284 802404C4 00000000 */ nop -/* 875288 802404C8 45010004 */ bc1t .L802404DC -/* 87528C 802404CC 00000000 */ nop -/* 875290 802404D0 0C0187BC */ jal sqrtf -/* 875294 802404D4 00000000 */ nop -/* 875298 802404D8 46000086 */ mov.s $f2, $f0 -.L802404DC: -/* 87529C 802404DC 44800000 */ mtc1 $zero, $f0 -/* 8752A0 802404E0 00000000 */ nop -/* 8752A4 802404E4 4614003C */ c.lt.s $f0, $f20 -/* 8752A8 802404E8 00000000 */ nop -/* 8752AC 802404EC 45000016 */ bc1f .L80240548 -/* 8752B0 802404F0 46001106 */ mov.s $f4, $f2 -/* 8752B4 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* 8752B8 802404F8 44820000 */ mtc1 $v0, $f0 -/* 8752BC 802404FC 00000000 */ nop -/* 8752C0 80240500 46800020 */ cvt.s.w $f0, $f0 -/* 8752C4 80240504 4600A03C */ c.lt.s $f20, $f0 -/* 8752C8 80240508 00000000 */ nop -/* 8752CC 8024050C 4500000F */ bc1f .L8024054C -/* 8752D0 80240510 0000882D */ daddu $s1, $zero, $zero -/* 8752D4 80240514 860200A6 */ lh $v0, 0xa6($s0) -/* 8752D8 80240518 3C013F00 */ lui $at, 0x3f00 -/* 8752DC 8024051C 44811000 */ mtc1 $at, $f2 -/* 8752E0 80240520 44820000 */ mtc1 $v0, $f0 -/* 8752E4 80240524 00000000 */ nop -/* 8752E8 80240528 46800020 */ cvt.s.w $f0, $f0 -/* 8752EC 8024052C 46020002 */ mul.s $f0, $f0, $f2 -/* 8752F0 80240530 00000000 */ nop -/* 8752F4 80240534 4600203C */ c.lt.s $f4, $f0 -/* 8752F8 80240538 00000000 */ nop -/* 8752FC 8024053C 45000003 */ bc1f .L8024054C -/* 875300 80240540 24020001 */ addiu $v0, $zero, 1 -/* 875304 80240544 AE62008C */ sw $v0, 0x8c($s3) -.L80240548: -/* 875308 80240548 0000882D */ daddu $s1, $zero, $zero -.L8024054C: -/* 87530C 8024054C 3C013FC0 */ lui $at, 0x3fc0 -/* 875310 80240550 4481D000 */ mtc1 $at, $f26 -/* 875314 80240554 4480C000 */ mtc1 $zero, $f24 -/* 875318 80240558 3C013F00 */ lui $at, 0x3f00 -/* 87531C 8024055C 4481B000 */ mtc1 $at, $f22 -.L80240560: -/* 875320 80240560 0C00EAD2 */ jal get_npc_safe -/* 875324 80240564 0220202D */ daddu $a0, $s1, $zero -/* 875328 80240568 0040802D */ daddu $s0, $v0, $zero -/* 87532C 8024056C 52000035 */ beql $s0, $zero, .L80240644 -/* 875330 80240570 26310001 */ addiu $s1, $s1, 1 -/* 875334 80240574 C6020038 */ lwc1 $f2, 0x38($s0) -/* 875338 80240578 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87533C 8024057C 46001081 */ sub.s $f2, $f2, $f0 -/* 875340 80240580 46021182 */ mul.s $f6, $f2, $f2 -/* 875344 80240584 00000000 */ nop -/* 875348 80240588 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87534C 8024058C C6020040 */ lwc1 $f2, 0x40($s0) -/* 875350 80240590 46001081 */ sub.s $f2, $f2, $f0 -/* 875354 80240594 46021102 */ mul.s $f4, $f2, $f2 -/* 875358 80240598 00000000 */ nop -/* 87535C 8024059C 860200A8 */ lh $v0, 0xa8($s0) -/* 875360 802405A0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 875364 802405A4 44820000 */ mtc1 $v0, $f0 -/* 875368 802405A8 00000000 */ nop -/* 87536C 802405AC 46800020 */ cvt.s.w $f0, $f0 -/* 875370 802405B0 46001080 */ add.s $f2, $f2, $f0 -/* 875374 802405B4 461A1081 */ sub.s $f2, $f2, $f26 -/* 875378 802405B8 46043300 */ add.s $f12, $f6, $f4 -/* 87537C 802405BC C640009C */ lwc1 $f0, 0x9c($s2) -/* 875380 802405C0 46001501 */ sub.s $f20, $f2, $f0 -/* 875384 802405C4 46006004 */ sqrt.s $f0, $f12 -/* 875388 802405C8 46000032 */ c.eq.s $f0, $f0 -/* 87538C 802405CC 00000000 */ nop -/* 875390 802405D0 45010003 */ bc1t .L802405E0 -/* 875394 802405D4 00000000 */ nop -/* 875398 802405D8 0C0187BC */ jal sqrtf -/* 87539C 802405DC 00000000 */ nop -.L802405E0: -/* 8753A0 802405E0 4614C03C */ c.lt.s $f24, $f20 -/* 8753A4 802405E4 00000000 */ nop -/* 8753A8 802405E8 45000015 */ bc1f .L80240640 -/* 8753AC 802405EC 46000106 */ mov.s $f4, $f0 -/* 8753B0 802405F0 860200A8 */ lh $v0, 0xa8($s0) -/* 8753B4 802405F4 44820000 */ mtc1 $v0, $f0 -/* 8753B8 802405F8 00000000 */ nop -/* 8753BC 802405FC 46800020 */ cvt.s.w $f0, $f0 -/* 8753C0 80240600 4600A03C */ c.lt.s $f20, $f0 -/* 8753C4 80240604 00000000 */ nop -/* 8753C8 80240608 4500000E */ bc1f .L80240644 -/* 8753CC 8024060C 26310001 */ addiu $s1, $s1, 1 -/* 8753D0 80240610 860200A6 */ lh $v0, 0xa6($s0) -/* 8753D4 80240614 44820000 */ mtc1 $v0, $f0 -/* 8753D8 80240618 00000000 */ nop -/* 8753DC 8024061C 46800020 */ cvt.s.w $f0, $f0 -/* 8753E0 80240620 46160002 */ mul.s $f0, $f0, $f22 -/* 8753E4 80240624 00000000 */ nop -/* 8753E8 80240628 4600203C */ c.lt.s $f4, $f0 -/* 8753EC 8024062C 00000000 */ nop -/* 8753F0 80240630 45000004 */ bc1f .L80240644 -/* 8753F4 80240634 24020001 */ addiu $v0, $zero, 1 -/* 8753F8 80240638 08090194 */ j .L80240650 -/* 8753FC 8024063C AE62008C */ sw $v0, 0x8c($s3) -.L80240640: -/* 875400 80240640 26310001 */ addiu $s1, $s1, 1 -.L80240644: -/* 875404 80240644 2A220040 */ slti $v0, $s1, 0x40 -/* 875408 80240648 1440FFC5 */ bnez $v0, .L80240560 -/* 87540C 8024064C 00000000 */ nop -.L80240650: -/* 875410 80240650 8FBF0020 */ lw $ra, 0x20($sp) -/* 875414 80240654 8FB3001C */ lw $s3, 0x1c($sp) -/* 875418 80240658 8FB20018 */ lw $s2, 0x18($sp) -/* 87541C 8024065C 8FB10014 */ lw $s1, 0x14($sp) -/* 875420 80240660 8FB00010 */ lw $s0, 0x10($sp) -/* 875424 80240664 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 875428 80240668 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 87542C 8024066C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 875430 80240670 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 875434 80240674 24020002 */ addiu $v0, $zero, 2 -/* 875438 80240678 03E00008 */ jr $ra -/* 87543C 8024067C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_06/8774D0/func_802405F0_8774D0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_06/8774D0/func_802405F0_8774D0.s deleted file mode 100644 index 85dc4e0125..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_06/8774D0/func_802405F0_8774D0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_8774D0 -/* 8774D0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8774D4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8774D8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 8774DC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 8774E0 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 8774E4 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 8774E8 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 8774EC 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8774F0 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8774F4 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8774F8 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8774FC 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 877500 80240620 0C0B1EAF */ jal evt_get_variable -/* 877504 80240624 8C450000 */ lw $a1, ($v0) -/* 877508 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 87750C 8024062C 0C00EABB */ jal get_npc_unsafe -/* 877510 80240630 0040802D */ daddu $s0, $v0, $zero -/* 877514 80240634 0200202D */ daddu $a0, $s0, $zero -/* 877518 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 87751C 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 877520 80240640 0C046B4C */ jal get_model_from_list_index -/* 877524 80240644 0040202D */ daddu $a0, $v0, $zero -/* 877528 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 87752C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 877530 80240650 0040902D */ daddu $s2, $v0, $zero -/* 877534 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 877538 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 87753C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 877540 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 877544 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 877548 80240668 00000000 */ nop -/* 87754C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 877550 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 877554 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 877558 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 87755C 8024067C 00000000 */ nop -/* 877560 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 877564 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 877568 80240688 44820000 */ mtc1 $v0, $f0 -/* 87756C 8024068C 00000000 */ nop -/* 877570 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 877574 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 877578 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 87757C 8024069C 44810000 */ mtc1 $at, $f0 -/* 877580 802406A0 00000000 */ nop -/* 877584 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 877588 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 87758C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 877590 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 877594 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 877598 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 87759C 802406BC 00000000 */ nop -/* 8775A0 802406C0 45010004 */ bc1t .L802406D4 -/* 8775A4 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 8775A8 802406C8 0C0187BC */ jal sqrtf -/* 8775AC 802406CC 00000000 */ nop -/* 8775B0 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 8775B4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 8775B8 802406D8 00000000 */ nop -/* 8775BC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 8775C0 802406E0 00000000 */ nop -/* 8775C4 802406E4 45000016 */ bc1f .L80240740 -/* 8775C8 802406E8 46001106 */ mov.s $f4, $f2 -/* 8775CC 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 8775D0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 8775D4 802406F4 00000000 */ nop -/* 8775D8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 8775DC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 8775E0 80240700 00000000 */ nop -/* 8775E4 80240704 4500000E */ bc1f .L80240740 -/* 8775E8 80240708 00000000 */ nop -/* 8775EC 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 8775F0 80240710 3C013F00 */ lui $at, 0x3f00 -/* 8775F4 80240714 44811000 */ mtc1 $at, $f2 -/* 8775F8 80240718 44820000 */ mtc1 $v0, $f0 -/* 8775FC 8024071C 00000000 */ nop -/* 877600 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 877604 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 877608 80240728 00000000 */ nop -/* 87760C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 877610 80240730 00000000 */ nop -/* 877614 80240734 45000002 */ bc1f .L80240740 -/* 877618 80240738 24020001 */ addiu $v0, $zero, 1 -/* 87761C 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 877620 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 877624 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 877628 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 87762C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 877630 80240750 00000000 */ nop -/* 877634 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 877638 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 87763C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 877640 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 877644 80240764 00000000 */ nop -/* 877648 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 87764C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 877650 80240770 44820000 */ mtc1 $v0, $f0 -/* 877654 80240774 00000000 */ nop -/* 877658 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 87765C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 877660 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 877664 80240784 44810000 */ mtc1 $at, $f0 -/* 877668 80240788 00000000 */ nop -/* 87766C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 877670 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 877674 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 877678 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 87767C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 877680 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 877684 802407A4 00000000 */ nop -/* 877688 802407A8 45010004 */ bc1t .L802407BC -/* 87768C 802407AC 00000000 */ nop -/* 877690 802407B0 0C0187BC */ jal sqrtf -/* 877694 802407B4 00000000 */ nop -/* 877698 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 87769C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 8776A0 802407C0 00000000 */ nop -/* 8776A4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 8776A8 802407C8 00000000 */ nop -/* 8776AC 802407CC 45000016 */ bc1f .L80240828 -/* 8776B0 802407D0 46001106 */ mov.s $f4, $f2 -/* 8776B4 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 8776B8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 8776BC 802407DC 00000000 */ nop -/* 8776C0 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 8776C4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 8776C8 802407E8 00000000 */ nop -/* 8776CC 802407EC 4500000F */ bc1f .L8024082C -/* 8776D0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 8776D4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 8776D8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 8776DC 802407FC 44811000 */ mtc1 $at, $f2 -/* 8776E0 80240800 44820000 */ mtc1 $v0, $f0 -/* 8776E4 80240804 00000000 */ nop -/* 8776E8 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 8776EC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 8776F0 80240810 00000000 */ nop -/* 8776F4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 8776F8 80240818 00000000 */ nop -/* 8776FC 8024081C 45000003 */ bc1f .L8024082C -/* 877700 80240820 24020001 */ addiu $v0, $zero, 1 -/* 877704 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 877708 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 87770C 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 877710 80240830 4481D000 */ mtc1 $at, $f26 -/* 877714 80240834 4480C000 */ mtc1 $zero, $f24 -/* 877718 80240838 3C013F00 */ lui $at, 0x3f00 -/* 87771C 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 877720 80240840 0C00EAD2 */ jal get_npc_safe -/* 877724 80240844 0220202D */ daddu $a0, $s1, $zero -/* 877728 80240848 0040802D */ daddu $s0, $v0, $zero -/* 87772C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 877730 80240850 26310001 */ addiu $s1, $s1, 1 -/* 877734 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 877738 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87773C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 877740 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 877744 80240864 00000000 */ nop -/* 877748 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87774C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 877750 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 877754 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 877758 80240878 00000000 */ nop -/* 87775C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 877760 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 877764 80240884 44820000 */ mtc1 $v0, $f0 -/* 877768 80240888 00000000 */ nop -/* 87776C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 877770 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 877774 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 877778 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 87777C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 877780 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 877784 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 877788 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 87778C 802408AC 00000000 */ nop -/* 877790 802408B0 45010003 */ bc1t .L802408C0 -/* 877794 802408B4 00000000 */ nop -/* 877798 802408B8 0C0187BC */ jal sqrtf -/* 87779C 802408BC 00000000 */ nop -.L802408C0: -/* 8777A0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 8777A4 802408C4 00000000 */ nop -/* 8777A8 802408C8 45000015 */ bc1f .L80240920 -/* 8777AC 802408CC 46000106 */ mov.s $f4, $f0 -/* 8777B0 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 8777B4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 8777B8 802408D8 00000000 */ nop -/* 8777BC 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 8777C0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 8777C4 802408E4 00000000 */ nop -/* 8777C8 802408E8 4500000E */ bc1f .L80240924 -/* 8777CC 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 8777D0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 8777D4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 8777D8 802408F8 00000000 */ nop -/* 8777DC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 8777E0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 8777E4 80240904 00000000 */ nop -/* 8777E8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 8777EC 8024090C 00000000 */ nop -/* 8777F0 80240910 45000004 */ bc1f .L80240924 -/* 8777F4 80240914 24020001 */ addiu $v0, $zero, 1 -/* 8777F8 80240918 0809024C */ j .L80240930 -/* 8777FC 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 877800 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 877804 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 877808 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 87780C 8024092C 00000000 */ nop -.L80240930: -/* 877810 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 877814 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 877818 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 87781C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 877820 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 877824 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 877828 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 87782C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 877830 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 877834 80240954 24020002 */ addiu $v0, $zero, 2 -/* 877838 80240958 03E00008 */ jr $ra -/* 87783C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020_87AC00.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020_87AC00.s deleted file mode 100644 index bcee01f96b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020_87AC00.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241020_87AC00 -/* 87AC00 80241020 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 87AC04 80241024 AFB3001C */ sw $s3, 0x1c($sp) -/* 87AC08 80241028 0080982D */ daddu $s3, $a0, $zero -/* 87AC0C 8024102C AFBF0020 */ sw $ra, 0x20($sp) -/* 87AC10 80241030 AFB20018 */ sw $s2, 0x18($sp) -/* 87AC14 80241034 AFB10014 */ sw $s1, 0x14($sp) -/* 87AC18 80241038 AFB00010 */ sw $s0, 0x10($sp) -/* 87AC1C 8024103C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 87AC20 80241040 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 87AC24 80241044 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 87AC28 80241048 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 87AC2C 8024104C 8E62000C */ lw $v0, 0xc($s3) -/* 87AC30 80241050 0C0B1EAF */ jal evt_get_variable -/* 87AC34 80241054 8C450000 */ lw $a1, ($v0) -/* 87AC38 80241058 2404FFFC */ addiu $a0, $zero, -4 -/* 87AC3C 8024105C 0C00EABB */ jal get_npc_unsafe -/* 87AC40 80241060 0040802D */ daddu $s0, $v0, $zero -/* 87AC44 80241064 0200202D */ daddu $a0, $s0, $zero -/* 87AC48 80241068 0C046C04 */ jal get_model_list_index_from_tree_index -/* 87AC4C 8024106C 0040802D */ daddu $s0, $v0, $zero -/* 87AC50 80241070 0C046B4C */ jal get_model_from_list_index -/* 87AC54 80241074 0040202D */ daddu $a0, $v0, $zero -/* 87AC58 80241078 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 87AC5C 8024107C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 87AC60 80241080 0040902D */ daddu $s2, $v0, $zero -/* 87AC64 80241084 AE60008C */ sw $zero, 0x8c($s3) -/* 87AC68 80241088 C4620028 */ lwc1 $f2, 0x28($v1) -/* 87AC6C 8024108C C6400098 */ lwc1 $f0, 0x98($s2) -/* 87AC70 80241090 46001081 */ sub.s $f2, $f2, $f0 -/* 87AC74 80241094 46021182 */ mul.s $f6, $f2, $f2 -/* 87AC78 80241098 00000000 */ nop -/* 87AC7C 8024109C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87AC80 802410A0 C4620030 */ lwc1 $f2, 0x30($v1) -/* 87AC84 802410A4 46001081 */ sub.s $f2, $f2, $f0 -/* 87AC88 802410A8 46021102 */ mul.s $f4, $f2, $f2 -/* 87AC8C 802410AC 00000000 */ nop -/* 87AC90 802410B0 846200B0 */ lh $v0, 0xb0($v1) -/* 87AC94 802410B4 C462002C */ lwc1 $f2, 0x2c($v1) -/* 87AC98 802410B8 44820000 */ mtc1 $v0, $f0 -/* 87AC9C 802410BC 00000000 */ nop -/* 87ACA0 802410C0 46800020 */ cvt.s.w $f0, $f0 -/* 87ACA4 802410C4 46001080 */ add.s $f2, $f2, $f0 -/* 87ACA8 802410C8 3C013FC0 */ lui $at, 0x3fc0 -/* 87ACAC 802410CC 44810000 */ mtc1 $at, $f0 -/* 87ACB0 802410D0 00000000 */ nop -/* 87ACB4 802410D4 46001081 */ sub.s $f2, $f2, $f0 -/* 87ACB8 802410D8 46043300 */ add.s $f12, $f6, $f4 -/* 87ACBC 802410DC C640009C */ lwc1 $f0, 0x9c($s2) -/* 87ACC0 802410E0 46001501 */ sub.s $f20, $f2, $f0 -/* 87ACC4 802410E4 46006084 */ sqrt.s $f2, $f12 -/* 87ACC8 802410E8 46021032 */ c.eq.s $f2, $f2 -/* 87ACCC 802410EC 00000000 */ nop -/* 87ACD0 802410F0 45010004 */ bc1t .L80241104 -/* 87ACD4 802410F4 0060882D */ daddu $s1, $v1, $zero -/* 87ACD8 802410F8 0C0187BC */ jal sqrtf -/* 87ACDC 802410FC 00000000 */ nop -/* 87ACE0 80241100 46000086 */ mov.s $f2, $f0 -.L80241104: -/* 87ACE4 80241104 44800000 */ mtc1 $zero, $f0 -/* 87ACE8 80241108 00000000 */ nop -/* 87ACEC 8024110C 4614003C */ c.lt.s $f0, $f20 -/* 87ACF0 80241110 00000000 */ nop -/* 87ACF4 80241114 45000016 */ bc1f .L80241170 -/* 87ACF8 80241118 46001106 */ mov.s $f4, $f2 -/* 87ACFC 8024111C 862200B0 */ lh $v0, 0xb0($s1) -/* 87AD00 80241120 44820000 */ mtc1 $v0, $f0 -/* 87AD04 80241124 00000000 */ nop -/* 87AD08 80241128 46800020 */ cvt.s.w $f0, $f0 -/* 87AD0C 8024112C 4600A03C */ c.lt.s $f20, $f0 -/* 87AD10 80241130 00000000 */ nop -/* 87AD14 80241134 4500000E */ bc1f .L80241170 -/* 87AD18 80241138 00000000 */ nop -/* 87AD1C 8024113C 862200B2 */ lh $v0, 0xb2($s1) -/* 87AD20 80241140 3C013F00 */ lui $at, 0x3f00 -/* 87AD24 80241144 44811000 */ mtc1 $at, $f2 -/* 87AD28 80241148 44820000 */ mtc1 $v0, $f0 -/* 87AD2C 8024114C 00000000 */ nop -/* 87AD30 80241150 46800020 */ cvt.s.w $f0, $f0 -/* 87AD34 80241154 46020002 */ mul.s $f0, $f0, $f2 -/* 87AD38 80241158 00000000 */ nop -/* 87AD3C 8024115C 4600203C */ c.lt.s $f4, $f0 -/* 87AD40 80241160 00000000 */ nop -/* 87AD44 80241164 45000002 */ bc1f .L80241170 -/* 87AD48 80241168 24020001 */ addiu $v0, $zero, 1 -/* 87AD4C 8024116C AE62008C */ sw $v0, 0x8c($s3) -.L80241170: -/* 87AD50 80241170 C6020038 */ lwc1 $f2, 0x38($s0) -/* 87AD54 80241174 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87AD58 80241178 46001081 */ sub.s $f2, $f2, $f0 -/* 87AD5C 8024117C 46021182 */ mul.s $f6, $f2, $f2 -/* 87AD60 80241180 00000000 */ nop -/* 87AD64 80241184 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87AD68 80241188 C6020040 */ lwc1 $f2, 0x40($s0) -/* 87AD6C 8024118C 46001081 */ sub.s $f2, $f2, $f0 -/* 87AD70 80241190 46021102 */ mul.s $f4, $f2, $f2 -/* 87AD74 80241194 00000000 */ nop -/* 87AD78 80241198 860200A8 */ lh $v0, 0xa8($s0) -/* 87AD7C 8024119C C602003C */ lwc1 $f2, 0x3c($s0) -/* 87AD80 802411A0 44820000 */ mtc1 $v0, $f0 -/* 87AD84 802411A4 00000000 */ nop -/* 87AD88 802411A8 46800020 */ cvt.s.w $f0, $f0 -/* 87AD8C 802411AC 46001080 */ add.s $f2, $f2, $f0 -/* 87AD90 802411B0 3C013FC0 */ lui $at, 0x3fc0 -/* 87AD94 802411B4 44810000 */ mtc1 $at, $f0 -/* 87AD98 802411B8 00000000 */ nop -/* 87AD9C 802411BC 46001081 */ sub.s $f2, $f2, $f0 -/* 87ADA0 802411C0 46043300 */ add.s $f12, $f6, $f4 -/* 87ADA4 802411C4 C640009C */ lwc1 $f0, 0x9c($s2) -/* 87ADA8 802411C8 46001501 */ sub.s $f20, $f2, $f0 -/* 87ADAC 802411CC 46006084 */ sqrt.s $f2, $f12 -/* 87ADB0 802411D0 46021032 */ c.eq.s $f2, $f2 -/* 87ADB4 802411D4 00000000 */ nop -/* 87ADB8 802411D8 45010004 */ bc1t .L802411EC -/* 87ADBC 802411DC 00000000 */ nop -/* 87ADC0 802411E0 0C0187BC */ jal sqrtf -/* 87ADC4 802411E4 00000000 */ nop -/* 87ADC8 802411E8 46000086 */ mov.s $f2, $f0 -.L802411EC: -/* 87ADCC 802411EC 44800000 */ mtc1 $zero, $f0 -/* 87ADD0 802411F0 00000000 */ nop -/* 87ADD4 802411F4 4614003C */ c.lt.s $f0, $f20 -/* 87ADD8 802411F8 00000000 */ nop -/* 87ADDC 802411FC 45000016 */ bc1f .L80241258 -/* 87ADE0 80241200 46001106 */ mov.s $f4, $f2 -/* 87ADE4 80241204 860200A8 */ lh $v0, 0xa8($s0) -/* 87ADE8 80241208 44820000 */ mtc1 $v0, $f0 -/* 87ADEC 8024120C 00000000 */ nop -/* 87ADF0 80241210 46800020 */ cvt.s.w $f0, $f0 -/* 87ADF4 80241214 4600A03C */ c.lt.s $f20, $f0 -/* 87ADF8 80241218 00000000 */ nop -/* 87ADFC 8024121C 4500000F */ bc1f .L8024125C -/* 87AE00 80241220 0000882D */ daddu $s1, $zero, $zero -/* 87AE04 80241224 860200A6 */ lh $v0, 0xa6($s0) -/* 87AE08 80241228 3C013F00 */ lui $at, 0x3f00 -/* 87AE0C 8024122C 44811000 */ mtc1 $at, $f2 -/* 87AE10 80241230 44820000 */ mtc1 $v0, $f0 -/* 87AE14 80241234 00000000 */ nop -/* 87AE18 80241238 46800020 */ cvt.s.w $f0, $f0 -/* 87AE1C 8024123C 46020002 */ mul.s $f0, $f0, $f2 -/* 87AE20 80241240 00000000 */ nop -/* 87AE24 80241244 4600203C */ c.lt.s $f4, $f0 -/* 87AE28 80241248 00000000 */ nop -/* 87AE2C 8024124C 45000003 */ bc1f .L8024125C -/* 87AE30 80241250 24020001 */ addiu $v0, $zero, 1 -/* 87AE34 80241254 AE62008C */ sw $v0, 0x8c($s3) -.L80241258: -/* 87AE38 80241258 0000882D */ daddu $s1, $zero, $zero -.L8024125C: -/* 87AE3C 8024125C 3C013FC0 */ lui $at, 0x3fc0 -/* 87AE40 80241260 4481D000 */ mtc1 $at, $f26 -/* 87AE44 80241264 4480C000 */ mtc1 $zero, $f24 -/* 87AE48 80241268 3C013F00 */ lui $at, 0x3f00 -/* 87AE4C 8024126C 4481B000 */ mtc1 $at, $f22 -.L80241270: -/* 87AE50 80241270 0C00EAD2 */ jal get_npc_safe -/* 87AE54 80241274 0220202D */ daddu $a0, $s1, $zero -/* 87AE58 80241278 0040802D */ daddu $s0, $v0, $zero -/* 87AE5C 8024127C 52000035 */ beql $s0, $zero, .L80241354 -/* 87AE60 80241280 26310001 */ addiu $s1, $s1, 1 -/* 87AE64 80241284 C6020038 */ lwc1 $f2, 0x38($s0) -/* 87AE68 80241288 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87AE6C 8024128C 46001081 */ sub.s $f2, $f2, $f0 -/* 87AE70 80241290 46021182 */ mul.s $f6, $f2, $f2 -/* 87AE74 80241294 00000000 */ nop -/* 87AE78 80241298 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87AE7C 8024129C C6020040 */ lwc1 $f2, 0x40($s0) -/* 87AE80 802412A0 46001081 */ sub.s $f2, $f2, $f0 -/* 87AE84 802412A4 46021102 */ mul.s $f4, $f2, $f2 -/* 87AE88 802412A8 00000000 */ nop -/* 87AE8C 802412AC 860200A8 */ lh $v0, 0xa8($s0) -/* 87AE90 802412B0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87AE94 802412B4 44820000 */ mtc1 $v0, $f0 -/* 87AE98 802412B8 00000000 */ nop -/* 87AE9C 802412BC 46800020 */ cvt.s.w $f0, $f0 -/* 87AEA0 802412C0 46001080 */ add.s $f2, $f2, $f0 -/* 87AEA4 802412C4 461A1081 */ sub.s $f2, $f2, $f26 -/* 87AEA8 802412C8 46043300 */ add.s $f12, $f6, $f4 -/* 87AEAC 802412CC C640009C */ lwc1 $f0, 0x9c($s2) -/* 87AEB0 802412D0 46001501 */ sub.s $f20, $f2, $f0 -/* 87AEB4 802412D4 46006004 */ sqrt.s $f0, $f12 -/* 87AEB8 802412D8 46000032 */ c.eq.s $f0, $f0 -/* 87AEBC 802412DC 00000000 */ nop -/* 87AEC0 802412E0 45010003 */ bc1t .L802412F0 -/* 87AEC4 802412E4 00000000 */ nop -/* 87AEC8 802412E8 0C0187BC */ jal sqrtf -/* 87AECC 802412EC 00000000 */ nop -.L802412F0: -/* 87AED0 802412F0 4614C03C */ c.lt.s $f24, $f20 -/* 87AED4 802412F4 00000000 */ nop -/* 87AED8 802412F8 45000015 */ bc1f .L80241350 -/* 87AEDC 802412FC 46000106 */ mov.s $f4, $f0 -/* 87AEE0 80241300 860200A8 */ lh $v0, 0xa8($s0) -/* 87AEE4 80241304 44820000 */ mtc1 $v0, $f0 -/* 87AEE8 80241308 00000000 */ nop -/* 87AEEC 8024130C 46800020 */ cvt.s.w $f0, $f0 -/* 87AEF0 80241310 4600A03C */ c.lt.s $f20, $f0 -/* 87AEF4 80241314 00000000 */ nop -/* 87AEF8 80241318 4500000E */ bc1f .L80241354 -/* 87AEFC 8024131C 26310001 */ addiu $s1, $s1, 1 -/* 87AF00 80241320 860200A6 */ lh $v0, 0xa6($s0) -/* 87AF04 80241324 44820000 */ mtc1 $v0, $f0 -/* 87AF08 80241328 00000000 */ nop -/* 87AF0C 8024132C 46800020 */ cvt.s.w $f0, $f0 -/* 87AF10 80241330 46160002 */ mul.s $f0, $f0, $f22 -/* 87AF14 80241334 00000000 */ nop -/* 87AF18 80241338 4600203C */ c.lt.s $f4, $f0 -/* 87AF1C 8024133C 00000000 */ nop -/* 87AF20 80241340 45000004 */ bc1f .L80241354 -/* 87AF24 80241344 24020001 */ addiu $v0, $zero, 1 -/* 87AF28 80241348 080904D8 */ j .L80241360 -/* 87AF2C 8024134C AE62008C */ sw $v0, 0x8c($s3) -.L80241350: -/* 87AF30 80241350 26310001 */ addiu $s1, $s1, 1 -.L80241354: -/* 87AF34 80241354 2A220040 */ slti $v0, $s1, 0x40 -/* 87AF38 80241358 1440FFC5 */ bnez $v0, .L80241270 -/* 87AF3C 8024135C 00000000 */ nop -.L80241360: -/* 87AF40 80241360 8FBF0020 */ lw $ra, 0x20($sp) -/* 87AF44 80241364 8FB3001C */ lw $s3, 0x1c($sp) -/* 87AF48 80241368 8FB20018 */ lw $s2, 0x18($sp) -/* 87AF4C 8024136C 8FB10014 */ lw $s1, 0x14($sp) -/* 87AF50 80241370 8FB00010 */ lw $s0, 0x10($sp) -/* 87AF54 80241374 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 87AF58 80241378 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 87AF5C 8024137C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 87AF60 80241380 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 87AF64 80241384 24020002 */ addiu $v0, $zero, 2 -/* 87AF68 80241388 03E00008 */ jr $ra -/* 87AF6C 8024138C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802415A0_87B180.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802415A0_87B180.s deleted file mode 100644 index ab27b3b47d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802415A0_87B180.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802451B8_87ED98 -.double 0.09 - -dlabel D_802451C0_87EDA0 -.double 0.09 - -.section .text - -glabel func_802415A0_87B180 -/* 87B180 802415A0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 87B184 802415A4 AFB3004C */ sw $s3, 0x4c($sp) -/* 87B188 802415A8 0080982D */ daddu $s3, $a0, $zero -/* 87B18C 802415AC AFBF0058 */ sw $ra, 0x58($sp) -/* 87B190 802415B0 AFB50054 */ sw $s5, 0x54($sp) -/* 87B194 802415B4 AFB40050 */ sw $s4, 0x50($sp) -/* 87B198 802415B8 AFB20048 */ sw $s2, 0x48($sp) -/* 87B19C 802415BC AFB10044 */ sw $s1, 0x44($sp) -/* 87B1A0 802415C0 AFB00040 */ sw $s0, 0x40($sp) -/* 87B1A4 802415C4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 87B1A8 802415C8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 87B1AC 802415CC F7B60068 */ sdc1 $f22, 0x68($sp) -/* 87B1B0 802415D0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 87B1B4 802415D4 8E710148 */ lw $s1, 0x148($s3) -/* 87B1B8 802415D8 00A0902D */ daddu $s2, $a1, $zero -/* 87B1BC 802415DC 86240008 */ lh $a0, 8($s1) -/* 87B1C0 802415E0 0C00EABB */ jal get_npc_unsafe -/* 87B1C4 802415E4 00C0A82D */ daddu $s5, $a2, $zero -/* 87B1C8 802415E8 0040802D */ daddu $s0, $v0, $zero -/* 87B1CC 802415EC 0000A02D */ daddu $s4, $zero, $zero -/* 87B1D0 802415F0 C624007C */ lwc1 $f4, 0x7c($s1) -/* 87B1D4 802415F4 46802120 */ cvt.s.w $f4, $f4 -/* 87B1D8 802415F8 C6220088 */ lwc1 $f2, 0x88($s1) -/* 87B1DC 802415FC 468010A0 */ cvt.s.w $f2, $f2 -/* 87B1E0 80241600 460010A1 */ cvt.d.s $f2, $f2 -/* 87B1E4 80241604 46002121 */ cvt.d.s $f4, $f4 -/* 87B1E8 80241608 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87B1EC 8024160C 3C014059 */ lui $at, 0x4059 -/* 87B1F0 80241610 44813800 */ mtc1 $at, $f7 -/* 87B1F4 80241614 44803000 */ mtc1 $zero, $f6 -/* 87B1F8 80241618 46000021 */ cvt.d.s $f0, $f0 -/* 87B1FC 8024161C 46260002 */ mul.d $f0, $f0, $f6 -/* 87B200 80241620 00000000 */ nop -/* 87B204 80241624 24020001 */ addiu $v0, $zero, 1 -/* 87B208 80241628 8E24006C */ lw $a0, 0x6c($s1) -/* 87B20C 8024162C 46261083 */ div.d $f2, $f2, $f6 -/* 87B210 80241630 462010A0 */ cvt.s.d $f2, $f2 -/* 87B214 80241634 46262103 */ div.d $f4, $f4, $f6 -/* 87B218 80241638 46202520 */ cvt.s.d $f20, $f4 -/* 87B21C 8024163C 30830011 */ andi $v1, $a0, 0x11 -/* 87B220 80241640 4620020D */ trunc.w.d $f8, $f0 -/* 87B224 80241644 E628007C */ swc1 $f8, 0x7c($s1) -/* 87B228 80241648 C6200078 */ lwc1 $f0, 0x78($s1) -/* 87B22C 8024164C 46800020 */ cvt.s.w $f0, $f0 -/* 87B230 80241650 46000021 */ cvt.d.s $f0, $f0 -/* 87B234 80241654 46260003 */ div.d $f0, $f0, $f6 -/* 87B238 80241658 462006A0 */ cvt.s.d $f26, $f0 -/* 87B23C 8024165C C6200070 */ lwc1 $f0, 0x70($s1) -/* 87B240 80241660 46800020 */ cvt.s.w $f0, $f0 -/* 87B244 80241664 46000021 */ cvt.d.s $f0, $f0 -/* 87B248 80241668 46260003 */ div.d $f0, $f0, $f6 -/* 87B24C 8024166C 462005A0 */ cvt.s.d $f22, $f0 -/* 87B250 80241670 14620025 */ bne $v1, $v0, .L80241708 -/* 87B254 80241674 4602D600 */ add.s $f24, $f26, $f2 -/* 87B258 80241678 8E020000 */ lw $v0, ($s0) -/* 87B25C 8024167C 30420008 */ andi $v0, $v0, 8 -/* 87B260 80241680 10400009 */ beqz $v0, .L802416A8 -/* 87B264 80241684 27A50028 */ addiu $a1, $sp, 0x28 -/* 87B268 80241688 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87B26C 8024168C 4600C001 */ sub.s $f0, $f24, $f0 -/* 87B270 80241690 4600B03C */ c.lt.s $f22, $f0 -/* 87B274 80241694 00000000 */ nop -/* 87B278 80241698 4500001B */ bc1f .L80241708 -/* 87B27C 8024169C 34820010 */ ori $v0, $a0, 0x10 -/* 87B280 802416A0 080905C2 */ j .L80241708 -/* 87B284 802416A4 AE22006C */ sw $v0, 0x6c($s1) -.L802416A8: -/* 87B288 802416A8 27A6002C */ addiu $a2, $sp, 0x2c -/* 87B28C 802416AC C6000038 */ lwc1 $f0, 0x38($s0) -/* 87B290 802416B0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87B294 802416B4 C6040040 */ lwc1 $f4, 0x40($s0) -/* 87B298 802416B8 3C01447A */ lui $at, 0x447a -/* 87B29C 802416BC 44813000 */ mtc1 $at, $f6 -/* 87B2A0 802416C0 27A20034 */ addiu $v0, $sp, 0x34 -/* 87B2A4 802416C4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 87B2A8 802416C8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 87B2AC 802416CC E7A40030 */ swc1 $f4, 0x30($sp) -/* 87B2B0 802416D0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 87B2B4 802416D4 AFA20010 */ sw $v0, 0x10($sp) -/* 87B2B8 802416D8 8E040080 */ lw $a0, 0x80($s0) -/* 87B2BC 802416DC 0C0372DF */ jal npc_raycast_down_sides -/* 87B2C0 802416E0 27A70030 */ addiu $a3, $sp, 0x30 -/* 87B2C4 802416E4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 87B2C8 802416E8 4600D001 */ sub.s $f0, $f26, $f0 -/* 87B2CC 802416EC 4600B03C */ c.lt.s $f22, $f0 -/* 87B2D0 802416F0 00000000 */ nop -/* 87B2D4 802416F4 45000004 */ bc1f .L80241708 -/* 87B2D8 802416F8 00000000 */ nop -/* 87B2DC 802416FC 8E22006C */ lw $v0, 0x6c($s1) -/* 87B2E0 80241700 34420010 */ ori $v0, $v0, 0x10 -/* 87B2E4 80241704 AE22006C */ sw $v0, 0x6c($s1) -.L80241708: -/* 87B2E8 80241708 8E22006C */ lw $v0, 0x6c($s1) -/* 87B2EC 8024170C 24030011 */ addiu $v1, $zero, 0x11 -/* 87B2F0 80241710 30420011 */ andi $v0, $v0, 0x11 -/* 87B2F4 80241714 14430039 */ bne $v0, $v1, .L802417FC -/* 87B2F8 80241718 00000000 */ nop -/* 87B2FC 8024171C 8E020000 */ lw $v0, ($s0) -/* 87B300 80241720 30420008 */ andi $v0, $v0, 8 -/* 87B304 80241724 1040000A */ beqz $v0, .L80241750 -/* 87B308 80241728 4600C106 */ mov.s $f4, $f24 -/* 87B30C 8024172C 4614C081 */ sub.s $f2, $f24, $f20 -/* 87B310 80241730 3C018024 */ lui $at, %hi(D_802451B8_87ED98) -/* 87B314 80241734 D42051B8 */ ldc1 $f0, %lo(D_802451B8_87ED98)($at) -/* 87B318 80241738 460010A1 */ cvt.d.s $f2, $f2 -/* 87B31C 8024173C 46201082 */ mul.d $f2, $f2, $f0 -/* 87B320 80241740 00000000 */ nop -/* 87B324 80241744 4600A021 */ cvt.d.s $f0, $f20 -/* 87B328 80241748 080905ED */ j .L802417B4 -/* 87B32C 8024174C 46220000 */ add.d $f0, $f0, $f2 -.L80241750: -/* 87B330 80241750 27A50028 */ addiu $a1, $sp, 0x28 -/* 87B334 80241754 27A6002C */ addiu $a2, $sp, 0x2c -/* 87B338 80241758 C6000038 */ lwc1 $f0, 0x38($s0) -/* 87B33C 8024175C C6020040 */ lwc1 $f2, 0x40($s0) -/* 87B340 80241760 3C01447A */ lui $at, 0x447a -/* 87B344 80241764 44812000 */ mtc1 $at, $f4 -/* 87B348 80241768 27A20034 */ addiu $v0, $sp, 0x34 -/* 87B34C 8024176C E7B4002C */ swc1 $f20, 0x2c($sp) -/* 87B350 80241770 E7A00028 */ swc1 $f0, 0x28($sp) -/* 87B354 80241774 E7A20030 */ swc1 $f2, 0x30($sp) -/* 87B358 80241778 E7A40034 */ swc1 $f4, 0x34($sp) -/* 87B35C 8024177C AFA20010 */ sw $v0, 0x10($sp) -/* 87B360 80241780 8E040080 */ lw $a0, 0x80($s0) -/* 87B364 80241784 0C0372DF */ jal npc_raycast_down_sides -/* 87B368 80241788 27A70030 */ addiu $a3, $sp, 0x30 -/* 87B36C 8024178C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 87B370 80241790 461A2100 */ add.s $f4, $f4, $f26 -/* 87B374 80241794 46142081 */ sub.s $f2, $f4, $f20 -/* 87B378 80241798 3C018024 */ lui $at, %hi(D_802451C0_87EDA0) -/* 87B37C 8024179C D42051C0 */ ldc1 $f0, %lo(D_802451C0_87EDA0)($at) -/* 87B380 802417A0 460010A1 */ cvt.d.s $f2, $f2 -/* 87B384 802417A4 46201082 */ mul.d $f2, $f2, $f0 -/* 87B388 802417A8 00000000 */ nop -/* 87B38C 802417AC 4600A021 */ cvt.d.s $f0, $f20 -/* 87B390 802417B0 46220000 */ add.d $f0, $f0, $f2 -.L802417B4: -/* 87B394 802417B4 46200020 */ cvt.s.d $f0, $f0 -/* 87B398 802417B8 E600003C */ swc1 $f0, 0x3c($s0) -/* 87B39C 802417BC C600003C */ lwc1 $f0, 0x3c($s0) -/* 87B3A0 802417C0 46002001 */ sub.s $f0, $f4, $f0 -/* 87B3A4 802417C4 3C013FF0 */ lui $at, 0x3ff0 -/* 87B3A8 802417C8 44811800 */ mtc1 $at, $f3 -/* 87B3AC 802417CC 44801000 */ mtc1 $zero, $f2 -/* 87B3B0 802417D0 46000005 */ abs.s $f0, $f0 -/* 87B3B4 802417D4 46000021 */ cvt.d.s $f0, $f0 -/* 87B3B8 802417D8 4622003C */ c.lt.d $f0, $f2 -/* 87B3BC 802417DC 00000000 */ nop -/* 87B3C0 802417E0 45000036 */ bc1f .L802418BC -/* 87B3C4 802417E4 2403FFEF */ addiu $v1, $zero, -0x11 -/* 87B3C8 802417E8 E604003C */ swc1 $f4, 0x3c($s0) -/* 87B3CC 802417EC 8E22006C */ lw $v0, 0x6c($s1) -/* 87B3D0 802417F0 00431024 */ and $v0, $v0, $v1 -/* 87B3D4 802417F4 0809062F */ j .L802418BC -/* 87B3D8 802417F8 AE22006C */ sw $v0, 0x6c($s1) -.L802417FC: -/* 87B3DC 802417FC 8E220070 */ lw $v0, 0x70($s1) -/* 87B3E0 80241800 1840002E */ blez $v0, .L802418BC -/* 87B3E4 80241804 00000000 */ nop -/* 87B3E8 80241808 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 87B3EC 8024180C 0C00A8BB */ jal sin_deg -/* 87B3F0 80241810 46806320 */ cvt.s.w $f12, $f12 -/* 87B3F4 80241814 8E020000 */ lw $v0, ($s0) -/* 87B3F8 80241818 30420008 */ andi $v0, $v0, 8 -/* 87B3FC 8024181C 10400003 */ beqz $v0, .L8024182C -/* 87B400 80241820 46000506 */ mov.s $f20, $f0 -/* 87B404 80241824 0809061B */ j .L8024186C -/* 87B408 80241828 0000102D */ daddu $v0, $zero, $zero -.L8024182C: -/* 87B40C 8024182C 27A50028 */ addiu $a1, $sp, 0x28 -/* 87B410 80241830 27A6002C */ addiu $a2, $sp, 0x2c -/* 87B414 80241834 C6000038 */ lwc1 $f0, 0x38($s0) -/* 87B418 80241838 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87B41C 8024183C C6040040 */ lwc1 $f4, 0x40($s0) -/* 87B420 80241840 3C01447A */ lui $at, 0x447a -/* 87B424 80241844 44813000 */ mtc1 $at, $f6 -/* 87B428 80241848 27A20034 */ addiu $v0, $sp, 0x34 -/* 87B42C 8024184C E7A00028 */ swc1 $f0, 0x28($sp) -/* 87B430 80241850 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 87B434 80241854 E7A40030 */ swc1 $f4, 0x30($sp) -/* 87B438 80241858 E7A60034 */ swc1 $f6, 0x34($sp) -/* 87B43C 8024185C AFA20010 */ sw $v0, 0x10($sp) -/* 87B440 80241860 8E040080 */ lw $a0, 0x80($s0) -/* 87B444 80241864 0C0372DF */ jal npc_raycast_down_sides -/* 87B448 80241868 27A70030 */ addiu $a3, $sp, 0x30 -.L8024186C: -/* 87B44C 8024186C 10400007 */ beqz $v0, .L8024188C -/* 87B450 80241870 00000000 */ nop -/* 87B454 80241874 4616A082 */ mul.s $f2, $f20, $f22 -/* 87B458 80241878 00000000 */ nop -/* 87B45C 8024187C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 87B460 80241880 461A0000 */ add.s $f0, $f0, $f26 -/* 87B464 80241884 08090626 */ j .L80241898 -/* 87B468 80241888 46020000 */ add.s $f0, $f0, $f2 -.L8024188C: -/* 87B46C 8024188C 4616A002 */ mul.s $f0, $f20, $f22 -/* 87B470 80241890 00000000 */ nop -/* 87B474 80241894 4600C000 */ add.s $f0, $f24, $f0 -.L80241898: -/* 87B478 80241898 E600003C */ swc1 $f0, 0x3c($s0) -/* 87B47C 8024189C 8E220074 */ lw $v0, 0x74($s1) -/* 87B480 802418A0 2442000A */ addiu $v0, $v0, 0xa -/* 87B484 802418A4 44826000 */ mtc1 $v0, $f12 -/* 87B488 802418A8 00000000 */ nop -/* 87B48C 802418AC 0C00A6C9 */ jal clamp_angle -/* 87B490 802418B0 46806320 */ cvt.s.w $f12, $f12 -/* 87B494 802418B4 4600020D */ trunc.w.s $f8, $f0 -/* 87B498 802418B8 E6280074 */ swc1 $f8, 0x74($s1) -.L802418BC: -/* 87B49C 802418BC 8E220090 */ lw $v0, 0x90($s1) -/* 87B4A0 802418C0 1C40004A */ bgtz $v0, .L802419EC -/* 87B4A4 802418C4 2442FFFF */ addiu $v0, $v0, -1 -/* 87B4A8 802418C8 8E430014 */ lw $v1, 0x14($s2) -/* 87B4AC 802418CC 04600048 */ bltz $v1, .L802419F0 -/* 87B4B0 802418D0 00000000 */ nop -/* 87B4B4 802418D4 8E620074 */ lw $v0, 0x74($s3) -/* 87B4B8 802418D8 1C400042 */ bgtz $v0, .L802419E4 -/* 87B4BC 802418DC 2442FFFF */ addiu $v0, $v0, -1 -/* 87B4C0 802418E0 AE630074 */ sw $v1, 0x74($s3) -/* 87B4C4 802418E4 860200A8 */ lh $v0, 0xa8($s0) -/* 87B4C8 802418E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87B4CC 802418EC 44820000 */ mtc1 $v0, $f0 -/* 87B4D0 802418F0 00000000 */ nop -/* 87B4D4 802418F4 46800020 */ cvt.s.w $f0, $f0 -/* 87B4D8 802418F8 46001080 */ add.s $f2, $f2, $f0 -/* 87B4DC 802418FC 3C014024 */ lui $at, 0x4024 -/* 87B4E0 80241900 44810800 */ mtc1 $at, $f1 -/* 87B4E4 80241904 44800000 */ mtc1 $zero, $f0 -/* 87B4E8 80241908 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 87B4EC 8024190C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 87B4F0 80241910 460010A1 */ cvt.d.s $f2, $f2 -/* 87B4F4 80241914 46201080 */ add.d $f2, $f2, $f0 -/* 87B4F8 80241918 C440002C */ lwc1 $f0, 0x2c($v0) -/* 87B4FC 8024191C 46000021 */ cvt.d.s $f0, $f0 -/* 87B500 80241920 4622003C */ c.lt.d $f0, $f2 -/* 87B504 80241924 00000000 */ nop -/* 87B508 80241928 4500002C */ bc1f .L802419DC -/* 87B50C 8024192C 02A0202D */ daddu $a0, $s5, $zero -/* 87B510 80241930 AFA00010 */ sw $zero, 0x10($sp) -/* 87B514 80241934 8E46000C */ lw $a2, 0xc($s2) -/* 87B518 80241938 8E470010 */ lw $a3, 0x10($s2) -/* 87B51C 8024193C 0C01242D */ jal func_800490B4 -/* 87B520 80241940 0220282D */ daddu $a1, $s1, $zero -/* 87B524 80241944 10400025 */ beqz $v0, .L802419DC -/* 87B528 80241948 0000202D */ daddu $a0, $zero, $zero -/* 87B52C 8024194C 0200282D */ daddu $a1, $s0, $zero -/* 87B530 80241950 0000302D */ daddu $a2, $zero, $zero -/* 87B534 80241954 2412000C */ addiu $s2, $zero, 0xc -/* 87B538 80241958 860300A8 */ lh $v1, 0xa8($s0) -/* 87B53C 8024195C 3C013F80 */ lui $at, 0x3f80 -/* 87B540 80241960 44810000 */ mtc1 $at, $f0 -/* 87B544 80241964 3C014000 */ lui $at, 0x4000 -/* 87B548 80241968 44811000 */ mtc1 $at, $f2 -/* 87B54C 8024196C 3C01C1A0 */ lui $at, 0xc1a0 -/* 87B550 80241970 44812000 */ mtc1 $at, $f4 -/* 87B554 80241974 44834000 */ mtc1 $v1, $f8 -/* 87B558 80241978 00000000 */ nop -/* 87B55C 8024197C 46804220 */ cvt.s.w $f8, $f8 -/* 87B560 80241980 44074000 */ mfc1 $a3, $f8 -/* 87B564 80241984 27A20038 */ addiu $v0, $sp, 0x38 -/* 87B568 80241988 AFB2001C */ sw $s2, 0x1c($sp) -/* 87B56C 8024198C AFA20020 */ sw $v0, 0x20($sp) -/* 87B570 80241990 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87B574 80241994 E7A20014 */ swc1 $f2, 0x14($sp) -/* 87B578 80241998 0C01BFA4 */ jal fx_emote -/* 87B57C 8024199C E7A40018 */ swc1 $f4, 0x18($sp) -/* 87B580 802419A0 0200202D */ daddu $a0, $s0, $zero -/* 87B584 802419A4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 87B588 802419A8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 87B58C 802419AC 3C060020 */ lui $a2, 0x20 -/* 87B590 802419B0 0C012530 */ jal ai_enemy_play_sound -/* 87B594 802419B4 E4800064 */ swc1 $f0, 0x64($a0) -/* 87B598 802419B8 8E220018 */ lw $v0, 0x18($s1) -/* 87B59C 802419BC 9442002A */ lhu $v0, 0x2a($v0) -/* 87B5A0 802419C0 30420001 */ andi $v0, $v0, 1 -/* 87B5A4 802419C4 10400003 */ beqz $v0, .L802419D4 -/* 87B5A8 802419C8 2402000A */ addiu $v0, $zero, 0xa -/* 87B5AC 802419CC 080906E5 */ j .L80241B94 -/* 87B5B0 802419D0 AE620070 */ sw $v0, 0x70($s3) -.L802419D4: -/* 87B5B4 802419D4 080906E5 */ j .L80241B94 -/* 87B5B8 802419D8 AE720070 */ sw $s2, 0x70($s3) -.L802419DC: -/* 87B5BC 802419DC 8E620074 */ lw $v0, 0x74($s3) -/* 87B5C0 802419E0 2442FFFF */ addiu $v0, $v0, -1 -.L802419E4: -/* 87B5C4 802419E4 0809067C */ j .L802419F0 -/* 87B5C8 802419E8 AE620074 */ sw $v0, 0x74($s3) -.L802419EC: -/* 87B5CC 802419EC AE220090 */ sw $v0, 0x90($s1) -.L802419F0: -/* 87B5D0 802419F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 87B5D4 802419F4 C6000040 */ lwc1 $f0, 0x40($s0) -/* 87B5D8 802419F8 C4620000 */ lwc1 $f2, ($v1) -/* 87B5DC 802419FC 468010A0 */ cvt.s.w $f2, $f2 -/* 87B5E0 80241A00 C4640008 */ lwc1 $f4, 8($v1) -/* 87B5E4 80241A04 46802120 */ cvt.s.w $f4, $f4 -/* 87B5E8 80241A08 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87B5EC 80241A0C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B5F0 80241A10 44051000 */ mfc1 $a1, $f2 -/* 87B5F4 80241A14 C440000C */ lwc1 $f0, 0xc($v0) -/* 87B5F8 80241A18 46800020 */ cvt.s.w $f0, $f0 -/* 87B5FC 80241A1C E7A00014 */ swc1 $f0, 0x14($sp) -/* 87B600 80241A20 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B604 80241A24 44062000 */ mfc1 $a2, $f4 -/* 87B608 80241A28 C4400010 */ lwc1 $f0, 0x10($v0) -/* 87B60C 80241A2C 46800020 */ cvt.s.w $f0, $f0 -/* 87B610 80241A30 E7A00018 */ swc1 $f0, 0x18($sp) -/* 87B614 80241A34 8C640018 */ lw $a0, 0x18($v1) -/* 87B618 80241A38 0C0123F5 */ jal is_point_within_region -/* 87B61C 80241A3C 8E070038 */ lw $a3, 0x38($s0) -/* 87B620 80241A40 1040001A */ beqz $v0, .L80241AAC -/* 87B624 80241A44 00000000 */ nop -/* 87B628 80241A48 8E060038 */ lw $a2, 0x38($s0) -/* 87B62C 80241A4C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B630 80241A50 8E070040 */ lw $a3, 0x40($s0) -/* 87B634 80241A54 C44C0000 */ lwc1 $f12, ($v0) -/* 87B638 80241A58 46806320 */ cvt.s.w $f12, $f12 -/* 87B63C 80241A5C C44E0008 */ lwc1 $f14, 8($v0) -/* 87B640 80241A60 0C00A7B5 */ jal dist2D -/* 87B644 80241A64 468073A0 */ cvt.s.w $f14, $f14 -/* 87B648 80241A68 C6020018 */ lwc1 $f2, 0x18($s0) -/* 87B64C 80241A6C 4600103C */ c.lt.s $f2, $f0 -/* 87B650 80241A70 00000000 */ nop -/* 87B654 80241A74 4500000D */ bc1f .L80241AAC -/* 87B658 80241A78 E7A00034 */ swc1 $f0, 0x34($sp) -/* 87B65C 80241A7C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 87B660 80241A80 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B664 80241A84 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 87B668 80241A88 C4480000 */ lwc1 $f8, ($v0) -/* 87B66C 80241A8C 46804220 */ cvt.s.w $f8, $f8 -/* 87B670 80241A90 44064000 */ mfc1 $a2, $f8 -/* 87B674 80241A94 C4480008 */ lwc1 $f8, 8($v0) -/* 87B678 80241A98 46804220 */ cvt.s.w $f8, $f8 -/* 87B67C 80241A9C 44074000 */ mfc1 $a3, $f8 -/* 87B680 80241AA0 0C00A720 */ jal atan2 -/* 87B684 80241AA4 24140001 */ addiu $s4, $zero, 1 -/* 87B688 80241AA8 E600000C */ swc1 $f0, 0xc($s0) -.L80241AAC: -/* 87B68C 80241AAC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B690 80241AB0 8C43000C */ lw $v1, 0xc($v0) -/* 87B694 80241AB4 8C420010 */ lw $v0, 0x10($v0) -/* 87B698 80241AB8 00621825 */ or $v1, $v1, $v0 -/* 87B69C 80241ABC 00741825 */ or $v1, $v1, $s4 -/* 87B6A0 80241AC0 10600008 */ beqz $v1, .L80241AE4 -/* 87B6A4 80241AC4 00000000 */ nop -/* 87B6A8 80241AC8 8602008C */ lh $v0, 0x8c($s0) -/* 87B6AC 80241ACC 14400031 */ bnez $v0, .L80241B94 -/* 87B6B0 80241AD0 00000000 */ nop -/* 87B6B4 80241AD4 8E050018 */ lw $a1, 0x18($s0) -/* 87B6B8 80241AD8 8E06000C */ lw $a2, 0xc($s0) -/* 87B6BC 80241ADC 0C00EA95 */ jal npc_move_heading -/* 87B6C0 80241AE0 0200202D */ daddu $a0, $s0, $zero -.L80241AE4: -/* 87B6C4 80241AE4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87B6C8 80241AE8 3C014059 */ lui $at, 0x4059 -/* 87B6CC 80241AEC 44811800 */ mtc1 $at, $f3 -/* 87B6D0 80241AF0 44801000 */ mtc1 $zero, $f2 -/* 87B6D4 80241AF4 46000021 */ cvt.d.s $f0, $f0 -/* 87B6D8 80241AF8 46220002 */ mul.d $f0, $f0, $f2 -/* 87B6DC 80241AFC 00000000 */ nop -/* 87B6E0 80241B00 4620020D */ trunc.w.d $f8, $f0 -/* 87B6E4 80241B04 E628007C */ swc1 $f8, 0x7c($s1) -/* 87B6E8 80241B08 8E420004 */ lw $v0, 4($s2) -/* 87B6EC 80241B0C 18400021 */ blez $v0, .L80241B94 -/* 87B6F0 80241B10 00000000 */ nop -/* 87B6F4 80241B14 8602008E */ lh $v0, 0x8e($s0) -/* 87B6F8 80241B18 9603008E */ lhu $v1, 0x8e($s0) -/* 87B6FC 80241B1C 18400005 */ blez $v0, .L80241B34 -/* 87B700 80241B20 2462FFFF */ addiu $v0, $v1, -1 -/* 87B704 80241B24 A602008E */ sh $v0, 0x8e($s0) -/* 87B708 80241B28 00021400 */ sll $v0, $v0, 0x10 -/* 87B70C 80241B2C 1C400019 */ bgtz $v0, .L80241B94 -/* 87B710 80241B30 00000000 */ nop -.L80241B34: -/* 87B714 80241B34 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 87B718 80241B38 24020002 */ addiu $v0, $zero, 2 -/* 87B71C 80241B3C 0C00A67F */ jal rand_int -/* 87B720 80241B40 AE620070 */ sw $v0, 0x70($s3) -/* 87B724 80241B44 3C035555 */ lui $v1, 0x5555 -/* 87B728 80241B48 34635556 */ ori $v1, $v1, 0x5556 -/* 87B72C 80241B4C 00430018 */ mult $v0, $v1 -/* 87B730 80241B50 000227C3 */ sra $a0, $v0, 0x1f -/* 87B734 80241B54 00004010 */ mfhi $t0 -/* 87B738 80241B58 01042023 */ subu $a0, $t0, $a0 -/* 87B73C 80241B5C 00041840 */ sll $v1, $a0, 1 -/* 87B740 80241B60 00641821 */ addu $v1, $v1, $a0 -/* 87B744 80241B64 00431023 */ subu $v0, $v0, $v1 -/* 87B748 80241B68 24430002 */ addiu $v1, $v0, 2 -/* 87B74C 80241B6C AE630074 */ sw $v1, 0x74($s3) -/* 87B750 80241B70 8E42002C */ lw $v0, 0x2c($s2) -/* 87B754 80241B74 58400007 */ blezl $v0, .L80241B94 -/* 87B758 80241B78 AE600070 */ sw $zero, 0x70($s3) -/* 87B75C 80241B7C 8E420008 */ lw $v0, 8($s2) -/* 87B760 80241B80 18400003 */ blez $v0, .L80241B90 -/* 87B764 80241B84 28620003 */ slti $v0, $v1, 3 -/* 87B768 80241B88 10400002 */ beqz $v0, .L80241B94 -/* 87B76C 80241B8C 00000000 */ nop -.L80241B90: -/* 87B770 80241B90 AE600070 */ sw $zero, 0x70($s3) -.L80241B94: -/* 87B774 80241B94 8FBF0058 */ lw $ra, 0x58($sp) -/* 87B778 80241B98 8FB50054 */ lw $s5, 0x54($sp) -/* 87B77C 80241B9C 8FB40050 */ lw $s4, 0x50($sp) -/* 87B780 80241BA0 8FB3004C */ lw $s3, 0x4c($sp) -/* 87B784 80241BA4 8FB20048 */ lw $s2, 0x48($sp) -/* 87B788 80241BA8 8FB10044 */ lw $s1, 0x44($sp) -/* 87B78C 80241BAC 8FB00040 */ lw $s0, 0x40($sp) -/* 87B790 80241BB0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 87B794 80241BB4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 87B798 80241BB8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 87B79C 80241BBC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 87B7A0 80241BC0 03E00008 */ jr $ra -/* 87B7A4 80241BC4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s index 5563e134d2..70e18a60f5 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s @@ -86,7 +86,7 @@ glabel func_802426FC_87C2DC .L80242818_87C3F8: /* 87C3F8 80242818 0280202D */ daddu $a0, $s4, $zero /* 87C3FC 8024281C 0200282D */ daddu $a1, $s0, $zero -/* 87C400 80242820 0C090568 */ jal func_802415A0_87B180 +/* 87C400 80242820 0C090568 */ jal tik_07_UnkNpcAIFunc35 /* 87C404 80242824 0260302D */ daddu $a2, $s3, $zero /* 87C408 80242828 08090A31 */ j .L802428C4 /* 87C40C 8024282C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_802405F0_87F3E0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_802405F0_87F3E0.s deleted file mode 100644 index 575ec58a8f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_802405F0_87F3E0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_87F3E0 -/* 87F3E0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 87F3E4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 87F3E8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 87F3EC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 87F3F0 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 87F3F4 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 87F3F8 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 87F3FC 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 87F400 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 87F404 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 87F408 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 87F40C 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 87F410 80240620 0C0B1EAF */ jal evt_get_variable -/* 87F414 80240624 8C450000 */ lw $a1, ($v0) -/* 87F418 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 87F41C 8024062C 0C00EABB */ jal get_npc_unsafe -/* 87F420 80240630 0040802D */ daddu $s0, $v0, $zero -/* 87F424 80240634 0200202D */ daddu $a0, $s0, $zero -/* 87F428 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 87F42C 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 87F430 80240640 0C046B4C */ jal get_model_from_list_index -/* 87F434 80240644 0040202D */ daddu $a0, $v0, $zero -/* 87F438 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 87F43C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 87F440 80240650 0040902D */ daddu $s2, $v0, $zero -/* 87F444 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 87F448 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 87F44C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 87F450 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 87F454 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 87F458 80240668 00000000 */ nop -/* 87F45C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87F460 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 87F464 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 87F468 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 87F46C 8024067C 00000000 */ nop -/* 87F470 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 87F474 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 87F478 80240688 44820000 */ mtc1 $v0, $f0 -/* 87F47C 8024068C 00000000 */ nop -/* 87F480 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 87F484 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 87F488 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 87F48C 8024069C 44810000 */ mtc1 $at, $f0 -/* 87F490 802406A0 00000000 */ nop -/* 87F494 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 87F498 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 87F49C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 87F4A0 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 87F4A4 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 87F4A8 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 87F4AC 802406BC 00000000 */ nop -/* 87F4B0 802406C0 45010004 */ bc1t .L802406D4 -/* 87F4B4 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 87F4B8 802406C8 0C0187BC */ jal sqrtf -/* 87F4BC 802406CC 00000000 */ nop -/* 87F4C0 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 87F4C4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 87F4C8 802406D8 00000000 */ nop -/* 87F4CC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 87F4D0 802406E0 00000000 */ nop -/* 87F4D4 802406E4 45000016 */ bc1f .L80240740 -/* 87F4D8 802406E8 46001106 */ mov.s $f4, $f2 -/* 87F4DC 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 87F4E0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 87F4E4 802406F4 00000000 */ nop -/* 87F4E8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 87F4EC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 87F4F0 80240700 00000000 */ nop -/* 87F4F4 80240704 4500000E */ bc1f .L80240740 -/* 87F4F8 80240708 00000000 */ nop -/* 87F4FC 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 87F500 80240710 3C013F00 */ lui $at, 0x3f00 -/* 87F504 80240714 44811000 */ mtc1 $at, $f2 -/* 87F508 80240718 44820000 */ mtc1 $v0, $f0 -/* 87F50C 8024071C 00000000 */ nop -/* 87F510 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 87F514 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 87F518 80240728 00000000 */ nop -/* 87F51C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 87F520 80240730 00000000 */ nop -/* 87F524 80240734 45000002 */ bc1f .L80240740 -/* 87F528 80240738 24020001 */ addiu $v0, $zero, 1 -/* 87F52C 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 87F530 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 87F534 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87F538 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 87F53C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 87F540 80240750 00000000 */ nop -/* 87F544 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87F548 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 87F54C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 87F550 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 87F554 80240764 00000000 */ nop -/* 87F558 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 87F55C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 87F560 80240770 44820000 */ mtc1 $v0, $f0 -/* 87F564 80240774 00000000 */ nop -/* 87F568 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 87F56C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 87F570 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 87F574 80240784 44810000 */ mtc1 $at, $f0 -/* 87F578 80240788 00000000 */ nop -/* 87F57C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 87F580 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 87F584 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 87F588 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 87F58C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 87F590 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 87F594 802407A4 00000000 */ nop -/* 87F598 802407A8 45010004 */ bc1t .L802407BC -/* 87F59C 802407AC 00000000 */ nop -/* 87F5A0 802407B0 0C0187BC */ jal sqrtf -/* 87F5A4 802407B4 00000000 */ nop -/* 87F5A8 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 87F5AC 802407BC 44800000 */ mtc1 $zero, $f0 -/* 87F5B0 802407C0 00000000 */ nop -/* 87F5B4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 87F5B8 802407C8 00000000 */ nop -/* 87F5BC 802407CC 45000016 */ bc1f .L80240828 -/* 87F5C0 802407D0 46001106 */ mov.s $f4, $f2 -/* 87F5C4 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 87F5C8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 87F5CC 802407DC 00000000 */ nop -/* 87F5D0 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 87F5D4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 87F5D8 802407E8 00000000 */ nop -/* 87F5DC 802407EC 4500000F */ bc1f .L8024082C -/* 87F5E0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 87F5E4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 87F5E8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 87F5EC 802407FC 44811000 */ mtc1 $at, $f2 -/* 87F5F0 80240800 44820000 */ mtc1 $v0, $f0 -/* 87F5F4 80240804 00000000 */ nop -/* 87F5F8 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 87F5FC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 87F600 80240810 00000000 */ nop -/* 87F604 80240814 4600203C */ c.lt.s $f4, $f0 -/* 87F608 80240818 00000000 */ nop -/* 87F60C 8024081C 45000003 */ bc1f .L8024082C -/* 87F610 80240820 24020001 */ addiu $v0, $zero, 1 -/* 87F614 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 87F618 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 87F61C 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 87F620 80240830 4481D000 */ mtc1 $at, $f26 -/* 87F624 80240834 4480C000 */ mtc1 $zero, $f24 -/* 87F628 80240838 3C013F00 */ lui $at, 0x3f00 -/* 87F62C 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 87F630 80240840 0C00EAD2 */ jal get_npc_safe -/* 87F634 80240844 0220202D */ daddu $a0, $s1, $zero -/* 87F638 80240848 0040802D */ daddu $s0, $v0, $zero -/* 87F63C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 87F640 80240850 26310001 */ addiu $s1, $s1, 1 -/* 87F644 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 87F648 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87F64C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 87F650 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 87F654 80240864 00000000 */ nop -/* 87F658 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87F65C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 87F660 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 87F664 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 87F668 80240878 00000000 */ nop -/* 87F66C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 87F670 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87F674 80240884 44820000 */ mtc1 $v0, $f0 -/* 87F678 80240888 00000000 */ nop -/* 87F67C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 87F680 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 87F684 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 87F688 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 87F68C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 87F690 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 87F694 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 87F698 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 87F69C 802408AC 00000000 */ nop -/* 87F6A0 802408B0 45010003 */ bc1t .L802408C0 -/* 87F6A4 802408B4 00000000 */ nop -/* 87F6A8 802408B8 0C0187BC */ jal sqrtf -/* 87F6AC 802408BC 00000000 */ nop -.L802408C0: -/* 87F6B0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 87F6B4 802408C4 00000000 */ nop -/* 87F6B8 802408C8 45000015 */ bc1f .L80240920 -/* 87F6BC 802408CC 46000106 */ mov.s $f4, $f0 -/* 87F6C0 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 87F6C4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 87F6C8 802408D8 00000000 */ nop -/* 87F6CC 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 87F6D0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 87F6D4 802408E4 00000000 */ nop -/* 87F6D8 802408E8 4500000E */ bc1f .L80240924 -/* 87F6DC 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 87F6E0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 87F6E4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 87F6E8 802408F8 00000000 */ nop -/* 87F6EC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 87F6F0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 87F6F4 80240904 00000000 */ nop -/* 87F6F8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 87F6FC 8024090C 00000000 */ nop -/* 87F700 80240910 45000004 */ bc1f .L80240924 -/* 87F704 80240914 24020001 */ addiu $v0, $zero, 1 -/* 87F708 80240918 0809024C */ j .L80240930 -/* 87F70C 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 87F710 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 87F714 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 87F718 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 87F71C 8024092C 00000000 */ nop -.L80240930: -/* 87F720 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 87F724 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 87F728 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 87F72C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 87F730 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 87F734 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 87F738 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 87F73C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 87F740 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 87F744 80240954 24020002 */ addiu $v0, $zero, 2 -/* 87F748 80240958 03E00008 */ jr $ra -/* 87F74C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_802405F0_8827B0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_802405F0_8827B0.s deleted file mode 100644 index 3f402094fb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_802405F0_8827B0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_8827B0 -/* 8827B0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8827B4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8827B8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 8827BC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 8827C0 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 8827C4 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 8827C8 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 8827CC 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8827D0 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8827D4 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8827D8 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8827DC 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 8827E0 80240620 0C0B1EAF */ jal evt_get_variable -/* 8827E4 80240624 8C450000 */ lw $a1, ($v0) -/* 8827E8 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 8827EC 8024062C 0C00EABB */ jal get_npc_unsafe -/* 8827F0 80240630 0040802D */ daddu $s0, $v0, $zero -/* 8827F4 80240634 0200202D */ daddu $a0, $s0, $zero -/* 8827F8 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8827FC 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 882800 80240640 0C046B4C */ jal get_model_from_list_index -/* 882804 80240644 0040202D */ daddu $a0, $v0, $zero -/* 882808 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 88280C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 882810 80240650 0040902D */ daddu $s2, $v0, $zero -/* 882814 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 882818 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 88281C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 882820 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 882824 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 882828 80240668 00000000 */ nop -/* 88282C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 882830 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 882834 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 882838 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 88283C 8024067C 00000000 */ nop -/* 882840 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 882844 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 882848 80240688 44820000 */ mtc1 $v0, $f0 -/* 88284C 8024068C 00000000 */ nop -/* 882850 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 882854 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 882858 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 88285C 8024069C 44810000 */ mtc1 $at, $f0 -/* 882860 802406A0 00000000 */ nop -/* 882864 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 882868 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 88286C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 882870 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 882874 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 882878 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 88287C 802406BC 00000000 */ nop -/* 882880 802406C0 45010004 */ bc1t .L802406D4 -/* 882884 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 882888 802406C8 0C0187BC */ jal sqrtf -/* 88288C 802406CC 00000000 */ nop -/* 882890 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 882894 802406D4 44800000 */ mtc1 $zero, $f0 -/* 882898 802406D8 00000000 */ nop -/* 88289C 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 8828A0 802406E0 00000000 */ nop -/* 8828A4 802406E4 45000016 */ bc1f .L80240740 -/* 8828A8 802406E8 46001106 */ mov.s $f4, $f2 -/* 8828AC 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 8828B0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 8828B4 802406F4 00000000 */ nop -/* 8828B8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 8828BC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 8828C0 80240700 00000000 */ nop -/* 8828C4 80240704 4500000E */ bc1f .L80240740 -/* 8828C8 80240708 00000000 */ nop -/* 8828CC 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 8828D0 80240710 3C013F00 */ lui $at, 0x3f00 -/* 8828D4 80240714 44811000 */ mtc1 $at, $f2 -/* 8828D8 80240718 44820000 */ mtc1 $v0, $f0 -/* 8828DC 8024071C 00000000 */ nop -/* 8828E0 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 8828E4 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 8828E8 80240728 00000000 */ nop -/* 8828EC 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 8828F0 80240730 00000000 */ nop -/* 8828F4 80240734 45000002 */ bc1f .L80240740 -/* 8828F8 80240738 24020001 */ addiu $v0, $zero, 1 -/* 8828FC 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 882900 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 882904 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 882908 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 88290C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 882910 80240750 00000000 */ nop -/* 882914 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 882918 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 88291C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 882920 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 882924 80240764 00000000 */ nop -/* 882928 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 88292C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 882930 80240770 44820000 */ mtc1 $v0, $f0 -/* 882934 80240774 00000000 */ nop -/* 882938 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 88293C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 882940 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 882944 80240784 44810000 */ mtc1 $at, $f0 -/* 882948 80240788 00000000 */ nop -/* 88294C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 882950 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 882954 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 882958 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 88295C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 882960 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 882964 802407A4 00000000 */ nop -/* 882968 802407A8 45010004 */ bc1t .L802407BC -/* 88296C 802407AC 00000000 */ nop -/* 882970 802407B0 0C0187BC */ jal sqrtf -/* 882974 802407B4 00000000 */ nop -/* 882978 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 88297C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 882980 802407C0 00000000 */ nop -/* 882984 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 882988 802407C8 00000000 */ nop -/* 88298C 802407CC 45000016 */ bc1f .L80240828 -/* 882990 802407D0 46001106 */ mov.s $f4, $f2 -/* 882994 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 882998 802407D8 44820000 */ mtc1 $v0, $f0 -/* 88299C 802407DC 00000000 */ nop -/* 8829A0 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 8829A4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 8829A8 802407E8 00000000 */ nop -/* 8829AC 802407EC 4500000F */ bc1f .L8024082C -/* 8829B0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 8829B4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 8829B8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 8829BC 802407FC 44811000 */ mtc1 $at, $f2 -/* 8829C0 80240800 44820000 */ mtc1 $v0, $f0 -/* 8829C4 80240804 00000000 */ nop -/* 8829C8 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 8829CC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 8829D0 80240810 00000000 */ nop -/* 8829D4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 8829D8 80240818 00000000 */ nop -/* 8829DC 8024081C 45000003 */ bc1f .L8024082C -/* 8829E0 80240820 24020001 */ addiu $v0, $zero, 1 -/* 8829E4 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 8829E8 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 8829EC 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 8829F0 80240830 4481D000 */ mtc1 $at, $f26 -/* 8829F4 80240834 4480C000 */ mtc1 $zero, $f24 -/* 8829F8 80240838 3C013F00 */ lui $at, 0x3f00 -/* 8829FC 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 882A00 80240840 0C00EAD2 */ jal get_npc_safe -/* 882A04 80240844 0220202D */ daddu $a0, $s1, $zero -/* 882A08 80240848 0040802D */ daddu $s0, $v0, $zero -/* 882A0C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 882A10 80240850 26310001 */ addiu $s1, $s1, 1 -/* 882A14 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 882A18 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 882A1C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 882A20 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 882A24 80240864 00000000 */ nop -/* 882A28 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 882A2C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 882A30 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 882A34 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 882A38 80240878 00000000 */ nop -/* 882A3C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 882A40 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 882A44 80240884 44820000 */ mtc1 $v0, $f0 -/* 882A48 80240888 00000000 */ nop -/* 882A4C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 882A50 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 882A54 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 882A58 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 882A5C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 882A60 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 882A64 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 882A68 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 882A6C 802408AC 00000000 */ nop -/* 882A70 802408B0 45010003 */ bc1t .L802408C0 -/* 882A74 802408B4 00000000 */ nop -/* 882A78 802408B8 0C0187BC */ jal sqrtf -/* 882A7C 802408BC 00000000 */ nop -.L802408C0: -/* 882A80 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 882A84 802408C4 00000000 */ nop -/* 882A88 802408C8 45000015 */ bc1f .L80240920 -/* 882A8C 802408CC 46000106 */ mov.s $f4, $f0 -/* 882A90 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 882A94 802408D4 44820000 */ mtc1 $v0, $f0 -/* 882A98 802408D8 00000000 */ nop -/* 882A9C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 882AA0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 882AA4 802408E4 00000000 */ nop -/* 882AA8 802408E8 4500000E */ bc1f .L80240924 -/* 882AAC 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 882AB0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 882AB4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 882AB8 802408F8 00000000 */ nop -/* 882ABC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 882AC0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 882AC4 80240904 00000000 */ nop -/* 882AC8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 882ACC 8024090C 00000000 */ nop -/* 882AD0 80240910 45000004 */ bc1f .L80240924 -/* 882AD4 80240914 24020001 */ addiu $v0, $zero, 1 -/* 882AD8 80240918 0809024C */ j .L80240930 -/* 882ADC 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 882AE0 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 882AE4 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 882AE8 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 882AEC 8024092C 00000000 */ nop -.L80240930: -/* 882AF0 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 882AF4 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 882AF8 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 882AFC 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 882B00 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 882B04 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 882B08 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 882B0C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 882B10 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 882B14 80240954 24020002 */ addiu $v0, $zero, 2 -/* 882B18 80240958 03E00008 */ jr $ra -/* 882B1C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240310_8866D0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240310_8866D0.s deleted file mode 100644 index 1a9e4d9196..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240310_8866D0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_8866D0 -/* 8866D0 80240310 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8866D4 80240314 AFB3001C */ sw $s3, 0x1c($sp) -/* 8866D8 80240318 0080982D */ daddu $s3, $a0, $zero -/* 8866DC 8024031C AFBF0020 */ sw $ra, 0x20($sp) -/* 8866E0 80240320 AFB20018 */ sw $s2, 0x18($sp) -/* 8866E4 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* 8866E8 80240328 AFB00010 */ sw $s0, 0x10($sp) -/* 8866EC 8024032C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8866F0 80240330 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8866F4 80240334 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8866F8 80240338 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8866FC 8024033C 8E62000C */ lw $v0, 0xc($s3) -/* 886700 80240340 0C0B1EAF */ jal evt_get_variable -/* 886704 80240344 8C450000 */ lw $a1, ($v0) -/* 886708 80240348 2404FFFC */ addiu $a0, $zero, -4 -/* 88670C 8024034C 0C00EABB */ jal get_npc_unsafe -/* 886710 80240350 0040802D */ daddu $s0, $v0, $zero -/* 886714 80240354 0200202D */ daddu $a0, $s0, $zero -/* 886718 80240358 0C046C04 */ jal get_model_list_index_from_tree_index -/* 88671C 8024035C 0040802D */ daddu $s0, $v0, $zero -/* 886720 80240360 0C046B4C */ jal get_model_from_list_index -/* 886724 80240364 0040202D */ daddu $a0, $v0, $zero -/* 886728 80240368 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 88672C 8024036C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 886730 80240370 0040902D */ daddu $s2, $v0, $zero -/* 886734 80240374 AE60008C */ sw $zero, 0x8c($s3) -/* 886738 80240378 C4620028 */ lwc1 $f2, 0x28($v1) -/* 88673C 8024037C C6400098 */ lwc1 $f0, 0x98($s2) -/* 886740 80240380 46001081 */ sub.s $f2, $f2, $f0 -/* 886744 80240384 46021182 */ mul.s $f6, $f2, $f2 -/* 886748 80240388 00000000 */ nop -/* 88674C 8024038C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 886750 80240390 C4620030 */ lwc1 $f2, 0x30($v1) -/* 886754 80240394 46001081 */ sub.s $f2, $f2, $f0 -/* 886758 80240398 46021102 */ mul.s $f4, $f2, $f2 -/* 88675C 8024039C 00000000 */ nop -/* 886760 802403A0 846200B0 */ lh $v0, 0xb0($v1) -/* 886764 802403A4 C462002C */ lwc1 $f2, 0x2c($v1) -/* 886768 802403A8 44820000 */ mtc1 $v0, $f0 -/* 88676C 802403AC 00000000 */ nop -/* 886770 802403B0 46800020 */ cvt.s.w $f0, $f0 -/* 886774 802403B4 46001080 */ add.s $f2, $f2, $f0 -/* 886778 802403B8 3C013FC0 */ lui $at, 0x3fc0 -/* 88677C 802403BC 44810000 */ mtc1 $at, $f0 -/* 886780 802403C0 00000000 */ nop -/* 886784 802403C4 46001081 */ sub.s $f2, $f2, $f0 -/* 886788 802403C8 46043300 */ add.s $f12, $f6, $f4 -/* 88678C 802403CC C640009C */ lwc1 $f0, 0x9c($s2) -/* 886790 802403D0 46001501 */ sub.s $f20, $f2, $f0 -/* 886794 802403D4 46006084 */ sqrt.s $f2, $f12 -/* 886798 802403D8 46021032 */ c.eq.s $f2, $f2 -/* 88679C 802403DC 00000000 */ nop -/* 8867A0 802403E0 45010004 */ bc1t .L802403F4 -/* 8867A4 802403E4 0060882D */ daddu $s1, $v1, $zero -/* 8867A8 802403E8 0C0187BC */ jal sqrtf -/* 8867AC 802403EC 00000000 */ nop -/* 8867B0 802403F0 46000086 */ mov.s $f2, $f0 -.L802403F4: -/* 8867B4 802403F4 44800000 */ mtc1 $zero, $f0 -/* 8867B8 802403F8 00000000 */ nop -/* 8867BC 802403FC 4614003C */ c.lt.s $f0, $f20 -/* 8867C0 80240400 00000000 */ nop -/* 8867C4 80240404 45000016 */ bc1f .L80240460 -/* 8867C8 80240408 46001106 */ mov.s $f4, $f2 -/* 8867CC 8024040C 862200B0 */ lh $v0, 0xb0($s1) -/* 8867D0 80240410 44820000 */ mtc1 $v0, $f0 -/* 8867D4 80240414 00000000 */ nop -/* 8867D8 80240418 46800020 */ cvt.s.w $f0, $f0 -/* 8867DC 8024041C 4600A03C */ c.lt.s $f20, $f0 -/* 8867E0 80240420 00000000 */ nop -/* 8867E4 80240424 4500000E */ bc1f .L80240460 -/* 8867E8 80240428 00000000 */ nop -/* 8867EC 8024042C 862200B2 */ lh $v0, 0xb2($s1) -/* 8867F0 80240430 3C013F00 */ lui $at, 0x3f00 -/* 8867F4 80240434 44811000 */ mtc1 $at, $f2 -/* 8867F8 80240438 44820000 */ mtc1 $v0, $f0 -/* 8867FC 8024043C 00000000 */ nop -/* 886800 80240440 46800020 */ cvt.s.w $f0, $f0 -/* 886804 80240444 46020002 */ mul.s $f0, $f0, $f2 -/* 886808 80240448 00000000 */ nop -/* 88680C 8024044C 4600203C */ c.lt.s $f4, $f0 -/* 886810 80240450 00000000 */ nop -/* 886814 80240454 45000002 */ bc1f .L80240460 -/* 886818 80240458 24020001 */ addiu $v0, $zero, 1 -/* 88681C 8024045C AE62008C */ sw $v0, 0x8c($s3) -.L80240460: -/* 886820 80240460 C6020038 */ lwc1 $f2, 0x38($s0) -/* 886824 80240464 C6400098 */ lwc1 $f0, 0x98($s2) -/* 886828 80240468 46001081 */ sub.s $f2, $f2, $f0 -/* 88682C 8024046C 46021182 */ mul.s $f6, $f2, $f2 -/* 886830 80240470 00000000 */ nop -/* 886834 80240474 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 886838 80240478 C6020040 */ lwc1 $f2, 0x40($s0) -/* 88683C 8024047C 46001081 */ sub.s $f2, $f2, $f0 -/* 886840 80240480 46021102 */ mul.s $f4, $f2, $f2 -/* 886844 80240484 00000000 */ nop -/* 886848 80240488 860200A8 */ lh $v0, 0xa8($s0) -/* 88684C 8024048C C602003C */ lwc1 $f2, 0x3c($s0) -/* 886850 80240490 44820000 */ mtc1 $v0, $f0 -/* 886854 80240494 00000000 */ nop -/* 886858 80240498 46800020 */ cvt.s.w $f0, $f0 -/* 88685C 8024049C 46001080 */ add.s $f2, $f2, $f0 -/* 886860 802404A0 3C013FC0 */ lui $at, 0x3fc0 -/* 886864 802404A4 44810000 */ mtc1 $at, $f0 -/* 886868 802404A8 00000000 */ nop -/* 88686C 802404AC 46001081 */ sub.s $f2, $f2, $f0 -/* 886870 802404B0 46043300 */ add.s $f12, $f6, $f4 -/* 886874 802404B4 C640009C */ lwc1 $f0, 0x9c($s2) -/* 886878 802404B8 46001501 */ sub.s $f20, $f2, $f0 -/* 88687C 802404BC 46006084 */ sqrt.s $f2, $f12 -/* 886880 802404C0 46021032 */ c.eq.s $f2, $f2 -/* 886884 802404C4 00000000 */ nop -/* 886888 802404C8 45010004 */ bc1t .L802404DC -/* 88688C 802404CC 00000000 */ nop -/* 886890 802404D0 0C0187BC */ jal sqrtf -/* 886894 802404D4 00000000 */ nop -/* 886898 802404D8 46000086 */ mov.s $f2, $f0 -.L802404DC: -/* 88689C 802404DC 44800000 */ mtc1 $zero, $f0 -/* 8868A0 802404E0 00000000 */ nop -/* 8868A4 802404E4 4614003C */ c.lt.s $f0, $f20 -/* 8868A8 802404E8 00000000 */ nop -/* 8868AC 802404EC 45000016 */ bc1f .L80240548 -/* 8868B0 802404F0 46001106 */ mov.s $f4, $f2 -/* 8868B4 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* 8868B8 802404F8 44820000 */ mtc1 $v0, $f0 -/* 8868BC 802404FC 00000000 */ nop -/* 8868C0 80240500 46800020 */ cvt.s.w $f0, $f0 -/* 8868C4 80240504 4600A03C */ c.lt.s $f20, $f0 -/* 8868C8 80240508 00000000 */ nop -/* 8868CC 8024050C 4500000F */ bc1f .L8024054C -/* 8868D0 80240510 0000882D */ daddu $s1, $zero, $zero -/* 8868D4 80240514 860200A6 */ lh $v0, 0xa6($s0) -/* 8868D8 80240518 3C013F00 */ lui $at, 0x3f00 -/* 8868DC 8024051C 44811000 */ mtc1 $at, $f2 -/* 8868E0 80240520 44820000 */ mtc1 $v0, $f0 -/* 8868E4 80240524 00000000 */ nop -/* 8868E8 80240528 46800020 */ cvt.s.w $f0, $f0 -/* 8868EC 8024052C 46020002 */ mul.s $f0, $f0, $f2 -/* 8868F0 80240530 00000000 */ nop -/* 8868F4 80240534 4600203C */ c.lt.s $f4, $f0 -/* 8868F8 80240538 00000000 */ nop -/* 8868FC 8024053C 45000003 */ bc1f .L8024054C -/* 886900 80240540 24020001 */ addiu $v0, $zero, 1 -/* 886904 80240544 AE62008C */ sw $v0, 0x8c($s3) -.L80240548: -/* 886908 80240548 0000882D */ daddu $s1, $zero, $zero -.L8024054C: -/* 88690C 8024054C 3C013FC0 */ lui $at, 0x3fc0 -/* 886910 80240550 4481D000 */ mtc1 $at, $f26 -/* 886914 80240554 4480C000 */ mtc1 $zero, $f24 -/* 886918 80240558 3C013F00 */ lui $at, 0x3f00 -/* 88691C 8024055C 4481B000 */ mtc1 $at, $f22 -.L80240560: -/* 886920 80240560 0C00EAD2 */ jal get_npc_safe -/* 886924 80240564 0220202D */ daddu $a0, $s1, $zero -/* 886928 80240568 0040802D */ daddu $s0, $v0, $zero -/* 88692C 8024056C 52000035 */ beql $s0, $zero, .L80240644 -/* 886930 80240570 26310001 */ addiu $s1, $s1, 1 -/* 886934 80240574 C6020038 */ lwc1 $f2, 0x38($s0) -/* 886938 80240578 C6400098 */ lwc1 $f0, 0x98($s2) -/* 88693C 8024057C 46001081 */ sub.s $f2, $f2, $f0 -/* 886940 80240580 46021182 */ mul.s $f6, $f2, $f2 -/* 886944 80240584 00000000 */ nop -/* 886948 80240588 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 88694C 8024058C C6020040 */ lwc1 $f2, 0x40($s0) -/* 886950 80240590 46001081 */ sub.s $f2, $f2, $f0 -/* 886954 80240594 46021102 */ mul.s $f4, $f2, $f2 -/* 886958 80240598 00000000 */ nop -/* 88695C 8024059C 860200A8 */ lh $v0, 0xa8($s0) -/* 886960 802405A0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 886964 802405A4 44820000 */ mtc1 $v0, $f0 -/* 886968 802405A8 00000000 */ nop -/* 88696C 802405AC 46800020 */ cvt.s.w $f0, $f0 -/* 886970 802405B0 46001080 */ add.s $f2, $f2, $f0 -/* 886974 802405B4 461A1081 */ sub.s $f2, $f2, $f26 -/* 886978 802405B8 46043300 */ add.s $f12, $f6, $f4 -/* 88697C 802405BC C640009C */ lwc1 $f0, 0x9c($s2) -/* 886980 802405C0 46001501 */ sub.s $f20, $f2, $f0 -/* 886984 802405C4 46006004 */ sqrt.s $f0, $f12 -/* 886988 802405C8 46000032 */ c.eq.s $f0, $f0 -/* 88698C 802405CC 00000000 */ nop -/* 886990 802405D0 45010003 */ bc1t .L802405E0 -/* 886994 802405D4 00000000 */ nop -/* 886998 802405D8 0C0187BC */ jal sqrtf -/* 88699C 802405DC 00000000 */ nop -.L802405E0: -/* 8869A0 802405E0 4614C03C */ c.lt.s $f24, $f20 -/* 8869A4 802405E4 00000000 */ nop -/* 8869A8 802405E8 45000015 */ bc1f .L80240640 -/* 8869AC 802405EC 46000106 */ mov.s $f4, $f0 -/* 8869B0 802405F0 860200A8 */ lh $v0, 0xa8($s0) -/* 8869B4 802405F4 44820000 */ mtc1 $v0, $f0 -/* 8869B8 802405F8 00000000 */ nop -/* 8869BC 802405FC 46800020 */ cvt.s.w $f0, $f0 -/* 8869C0 80240600 4600A03C */ c.lt.s $f20, $f0 -/* 8869C4 80240604 00000000 */ nop -/* 8869C8 80240608 4500000E */ bc1f .L80240644 -/* 8869CC 8024060C 26310001 */ addiu $s1, $s1, 1 -/* 8869D0 80240610 860200A6 */ lh $v0, 0xa6($s0) -/* 8869D4 80240614 44820000 */ mtc1 $v0, $f0 -/* 8869D8 80240618 00000000 */ nop -/* 8869DC 8024061C 46800020 */ cvt.s.w $f0, $f0 -/* 8869E0 80240620 46160002 */ mul.s $f0, $f0, $f22 -/* 8869E4 80240624 00000000 */ nop -/* 8869E8 80240628 4600203C */ c.lt.s $f4, $f0 -/* 8869EC 8024062C 00000000 */ nop -/* 8869F0 80240630 45000004 */ bc1f .L80240644 -/* 8869F4 80240634 24020001 */ addiu $v0, $zero, 1 -/* 8869F8 80240638 08090194 */ j .L80240650 -/* 8869FC 8024063C AE62008C */ sw $v0, 0x8c($s3) -.L80240640: -/* 886A00 80240640 26310001 */ addiu $s1, $s1, 1 -.L80240644: -/* 886A04 80240644 2A220040 */ slti $v0, $s1, 0x40 -/* 886A08 80240648 1440FFC5 */ bnez $v0, .L80240560 -/* 886A0C 8024064C 00000000 */ nop -.L80240650: -/* 886A10 80240650 8FBF0020 */ lw $ra, 0x20($sp) -/* 886A14 80240654 8FB3001C */ lw $s3, 0x1c($sp) -/* 886A18 80240658 8FB20018 */ lw $s2, 0x18($sp) -/* 886A1C 8024065C 8FB10014 */ lw $s1, 0x14($sp) -/* 886A20 80240660 8FB00010 */ lw $s0, 0x10($sp) -/* 886A24 80240664 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 886A28 80240668 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 886A2C 8024066C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 886A30 80240670 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 886A34 80240674 24020002 */ addiu $v0, $zero, 2 -/* 886A38 80240678 03E00008 */ jr $ra -/* 886A3C 8024067C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802405F0_8891C0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802405F0_8891C0.s deleted file mode 100644 index 9e43e5b8b6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802405F0_8891C0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_8891C0 -/* 8891C0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8891C4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8891C8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 8891CC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 8891D0 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 8891D4 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 8891D8 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 8891DC 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8891E0 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8891E4 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8891E8 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8891EC 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 8891F0 80240620 0C0B1EAF */ jal evt_get_variable -/* 8891F4 80240624 8C450000 */ lw $a1, ($v0) -/* 8891F8 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 8891FC 8024062C 0C00EABB */ jal get_npc_unsafe -/* 889200 80240630 0040802D */ daddu $s0, $v0, $zero -/* 889204 80240634 0200202D */ daddu $a0, $s0, $zero -/* 889208 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 88920C 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 889210 80240640 0C046B4C */ jal get_model_from_list_index -/* 889214 80240644 0040202D */ daddu $a0, $v0, $zero -/* 889218 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 88921C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 889220 80240650 0040902D */ daddu $s2, $v0, $zero -/* 889224 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 889228 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 88922C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 889230 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 889234 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 889238 80240668 00000000 */ nop -/* 88923C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 889240 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 889244 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 889248 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 88924C 8024067C 00000000 */ nop -/* 889250 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 889254 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 889258 80240688 44820000 */ mtc1 $v0, $f0 -/* 88925C 8024068C 00000000 */ nop -/* 889260 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 889264 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 889268 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 88926C 8024069C 44810000 */ mtc1 $at, $f0 -/* 889270 802406A0 00000000 */ nop -/* 889274 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 889278 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 88927C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 889280 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 889284 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 889288 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 88928C 802406BC 00000000 */ nop -/* 889290 802406C0 45010004 */ bc1t .L802406D4 -/* 889294 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 889298 802406C8 0C0187BC */ jal sqrtf -/* 88929C 802406CC 00000000 */ nop -/* 8892A0 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 8892A4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 8892A8 802406D8 00000000 */ nop -/* 8892AC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 8892B0 802406E0 00000000 */ nop -/* 8892B4 802406E4 45000016 */ bc1f .L80240740 -/* 8892B8 802406E8 46001106 */ mov.s $f4, $f2 -/* 8892BC 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 8892C0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 8892C4 802406F4 00000000 */ nop -/* 8892C8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 8892CC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 8892D0 80240700 00000000 */ nop -/* 8892D4 80240704 4500000E */ bc1f .L80240740 -/* 8892D8 80240708 00000000 */ nop -/* 8892DC 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 8892E0 80240710 3C013F00 */ lui $at, 0x3f00 -/* 8892E4 80240714 44811000 */ mtc1 $at, $f2 -/* 8892E8 80240718 44820000 */ mtc1 $v0, $f0 -/* 8892EC 8024071C 00000000 */ nop -/* 8892F0 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 8892F4 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 8892F8 80240728 00000000 */ nop -/* 8892FC 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 889300 80240730 00000000 */ nop -/* 889304 80240734 45000002 */ bc1f .L80240740 -/* 889308 80240738 24020001 */ addiu $v0, $zero, 1 -/* 88930C 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 889310 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 889314 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 889318 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 88931C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 889320 80240750 00000000 */ nop -/* 889324 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 889328 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 88932C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 889330 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 889334 80240764 00000000 */ nop -/* 889338 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 88933C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 889340 80240770 44820000 */ mtc1 $v0, $f0 -/* 889344 80240774 00000000 */ nop -/* 889348 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 88934C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 889350 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 889354 80240784 44810000 */ mtc1 $at, $f0 -/* 889358 80240788 00000000 */ nop -/* 88935C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 889360 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 889364 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 889368 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 88936C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 889370 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 889374 802407A4 00000000 */ nop -/* 889378 802407A8 45010004 */ bc1t .L802407BC -/* 88937C 802407AC 00000000 */ nop -/* 889380 802407B0 0C0187BC */ jal sqrtf -/* 889384 802407B4 00000000 */ nop -/* 889388 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 88938C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 889390 802407C0 00000000 */ nop -/* 889394 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 889398 802407C8 00000000 */ nop -/* 88939C 802407CC 45000016 */ bc1f .L80240828 -/* 8893A0 802407D0 46001106 */ mov.s $f4, $f2 -/* 8893A4 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 8893A8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 8893AC 802407DC 00000000 */ nop -/* 8893B0 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 8893B4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 8893B8 802407E8 00000000 */ nop -/* 8893BC 802407EC 4500000F */ bc1f .L8024082C -/* 8893C0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 8893C4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 8893C8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 8893CC 802407FC 44811000 */ mtc1 $at, $f2 -/* 8893D0 80240800 44820000 */ mtc1 $v0, $f0 -/* 8893D4 80240804 00000000 */ nop -/* 8893D8 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 8893DC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 8893E0 80240810 00000000 */ nop -/* 8893E4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 8893E8 80240818 00000000 */ nop -/* 8893EC 8024081C 45000003 */ bc1f .L8024082C -/* 8893F0 80240820 24020001 */ addiu $v0, $zero, 1 -/* 8893F4 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 8893F8 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 8893FC 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 889400 80240830 4481D000 */ mtc1 $at, $f26 -/* 889404 80240834 4480C000 */ mtc1 $zero, $f24 -/* 889408 80240838 3C013F00 */ lui $at, 0x3f00 -/* 88940C 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 889410 80240840 0C00EAD2 */ jal get_npc_safe -/* 889414 80240844 0220202D */ daddu $a0, $s1, $zero -/* 889418 80240848 0040802D */ daddu $s0, $v0, $zero -/* 88941C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 889420 80240850 26310001 */ addiu $s1, $s1, 1 -/* 889424 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 889428 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 88942C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 889430 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 889434 80240864 00000000 */ nop -/* 889438 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 88943C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 889440 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 889444 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 889448 80240878 00000000 */ nop -/* 88944C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 889450 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 889454 80240884 44820000 */ mtc1 $v0, $f0 -/* 889458 80240888 00000000 */ nop -/* 88945C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 889460 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 889464 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 889468 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 88946C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 889470 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 889474 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 889478 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 88947C 802408AC 00000000 */ nop -/* 889480 802408B0 45010003 */ bc1t .L802408C0 -/* 889484 802408B4 00000000 */ nop -/* 889488 802408B8 0C0187BC */ jal sqrtf -/* 88948C 802408BC 00000000 */ nop -.L802408C0: -/* 889490 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 889494 802408C4 00000000 */ nop -/* 889498 802408C8 45000015 */ bc1f .L80240920 -/* 88949C 802408CC 46000106 */ mov.s $f4, $f0 -/* 8894A0 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 8894A4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 8894A8 802408D8 00000000 */ nop -/* 8894AC 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 8894B0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 8894B4 802408E4 00000000 */ nop -/* 8894B8 802408E8 4500000E */ bc1f .L80240924 -/* 8894BC 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 8894C0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 8894C4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 8894C8 802408F8 00000000 */ nop -/* 8894CC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 8894D0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 8894D4 80240904 00000000 */ nop -/* 8894D8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 8894DC 8024090C 00000000 */ nop -/* 8894E0 80240910 45000004 */ bc1f .L80240924 -/* 8894E4 80240914 24020001 */ addiu $v0, $zero, 1 -/* 8894E8 80240918 0809024C */ j .L80240930 -/* 8894EC 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 8894F0 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 8894F4 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 8894F8 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 8894FC 8024092C 00000000 */ nop -.L80240930: -/* 889500 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 889504 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 889508 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 88950C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 889510 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 889514 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 889518 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 88951C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 889520 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 889524 80240954 24020002 */ addiu $v0, $zero, 2 -/* 889528 80240958 03E00008 */ jr $ra -/* 88952C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_14/88DBF0/func_802405F0_88DBF0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_14/88DBF0/func_802405F0_88DBF0.s deleted file mode 100644 index ddb1d794e7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_14/88DBF0/func_802405F0_88DBF0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_88DBF0 -/* 88DBF0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 88DBF4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 88DBF8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 88DBFC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 88DC00 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 88DC04 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 88DC08 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 88DC0C 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 88DC10 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 88DC14 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 88DC18 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 88DC1C 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 88DC20 80240620 0C0B1EAF */ jal evt_get_variable -/* 88DC24 80240624 8C450000 */ lw $a1, ($v0) -/* 88DC28 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 88DC2C 8024062C 0C00EABB */ jal get_npc_unsafe -/* 88DC30 80240630 0040802D */ daddu $s0, $v0, $zero -/* 88DC34 80240634 0200202D */ daddu $a0, $s0, $zero -/* 88DC38 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 88DC3C 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 88DC40 80240640 0C046B4C */ jal get_model_from_list_index -/* 88DC44 80240644 0040202D */ daddu $a0, $v0, $zero -/* 88DC48 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 88DC4C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 88DC50 80240650 0040902D */ daddu $s2, $v0, $zero -/* 88DC54 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 88DC58 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 88DC5C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 88DC60 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 88DC64 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 88DC68 80240668 00000000 */ nop -/* 88DC6C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 88DC70 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 88DC74 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 88DC78 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 88DC7C 8024067C 00000000 */ nop -/* 88DC80 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 88DC84 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 88DC88 80240688 44820000 */ mtc1 $v0, $f0 -/* 88DC8C 8024068C 00000000 */ nop -/* 88DC90 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 88DC94 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 88DC98 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 88DC9C 8024069C 44810000 */ mtc1 $at, $f0 -/* 88DCA0 802406A0 00000000 */ nop -/* 88DCA4 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 88DCA8 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 88DCAC 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 88DCB0 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 88DCB4 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 88DCB8 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 88DCBC 802406BC 00000000 */ nop -/* 88DCC0 802406C0 45010004 */ bc1t .L802406D4 -/* 88DCC4 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 88DCC8 802406C8 0C0187BC */ jal sqrtf -/* 88DCCC 802406CC 00000000 */ nop -/* 88DCD0 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 88DCD4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 88DCD8 802406D8 00000000 */ nop -/* 88DCDC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 88DCE0 802406E0 00000000 */ nop -/* 88DCE4 802406E4 45000016 */ bc1f .L80240740 -/* 88DCE8 802406E8 46001106 */ mov.s $f4, $f2 -/* 88DCEC 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 88DCF0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 88DCF4 802406F4 00000000 */ nop -/* 88DCF8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 88DCFC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 88DD00 80240700 00000000 */ nop -/* 88DD04 80240704 4500000E */ bc1f .L80240740 -/* 88DD08 80240708 00000000 */ nop -/* 88DD0C 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 88DD10 80240710 3C013F00 */ lui $at, 0x3f00 -/* 88DD14 80240714 44811000 */ mtc1 $at, $f2 -/* 88DD18 80240718 44820000 */ mtc1 $v0, $f0 -/* 88DD1C 8024071C 00000000 */ nop -/* 88DD20 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 88DD24 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 88DD28 80240728 00000000 */ nop -/* 88DD2C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 88DD30 80240730 00000000 */ nop -/* 88DD34 80240734 45000002 */ bc1f .L80240740 -/* 88DD38 80240738 24020001 */ addiu $v0, $zero, 1 -/* 88DD3C 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 88DD40 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 88DD44 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 88DD48 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 88DD4C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 88DD50 80240750 00000000 */ nop -/* 88DD54 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 88DD58 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 88DD5C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 88DD60 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 88DD64 80240764 00000000 */ nop -/* 88DD68 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 88DD6C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 88DD70 80240770 44820000 */ mtc1 $v0, $f0 -/* 88DD74 80240774 00000000 */ nop -/* 88DD78 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 88DD7C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 88DD80 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 88DD84 80240784 44810000 */ mtc1 $at, $f0 -/* 88DD88 80240788 00000000 */ nop -/* 88DD8C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 88DD90 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 88DD94 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 88DD98 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 88DD9C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 88DDA0 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 88DDA4 802407A4 00000000 */ nop -/* 88DDA8 802407A8 45010004 */ bc1t .L802407BC -/* 88DDAC 802407AC 00000000 */ nop -/* 88DDB0 802407B0 0C0187BC */ jal sqrtf -/* 88DDB4 802407B4 00000000 */ nop -/* 88DDB8 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 88DDBC 802407BC 44800000 */ mtc1 $zero, $f0 -/* 88DDC0 802407C0 00000000 */ nop -/* 88DDC4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 88DDC8 802407C8 00000000 */ nop -/* 88DDCC 802407CC 45000016 */ bc1f .L80240828 -/* 88DDD0 802407D0 46001106 */ mov.s $f4, $f2 -/* 88DDD4 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 88DDD8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 88DDDC 802407DC 00000000 */ nop -/* 88DDE0 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 88DDE4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 88DDE8 802407E8 00000000 */ nop -/* 88DDEC 802407EC 4500000F */ bc1f .L8024082C -/* 88DDF0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 88DDF4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 88DDF8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 88DDFC 802407FC 44811000 */ mtc1 $at, $f2 -/* 88DE00 80240800 44820000 */ mtc1 $v0, $f0 -/* 88DE04 80240804 00000000 */ nop -/* 88DE08 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 88DE0C 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 88DE10 80240810 00000000 */ nop -/* 88DE14 80240814 4600203C */ c.lt.s $f4, $f0 -/* 88DE18 80240818 00000000 */ nop -/* 88DE1C 8024081C 45000003 */ bc1f .L8024082C -/* 88DE20 80240820 24020001 */ addiu $v0, $zero, 1 -/* 88DE24 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 88DE28 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 88DE2C 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 88DE30 80240830 4481D000 */ mtc1 $at, $f26 -/* 88DE34 80240834 4480C000 */ mtc1 $zero, $f24 -/* 88DE38 80240838 3C013F00 */ lui $at, 0x3f00 -/* 88DE3C 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 88DE40 80240840 0C00EAD2 */ jal get_npc_safe -/* 88DE44 80240844 0220202D */ daddu $a0, $s1, $zero -/* 88DE48 80240848 0040802D */ daddu $s0, $v0, $zero -/* 88DE4C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 88DE50 80240850 26310001 */ addiu $s1, $s1, 1 -/* 88DE54 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 88DE58 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 88DE5C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 88DE60 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 88DE64 80240864 00000000 */ nop -/* 88DE68 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 88DE6C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 88DE70 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 88DE74 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 88DE78 80240878 00000000 */ nop -/* 88DE7C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 88DE80 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 88DE84 80240884 44820000 */ mtc1 $v0, $f0 -/* 88DE88 80240888 00000000 */ nop -/* 88DE8C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 88DE90 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 88DE94 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 88DE98 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 88DE9C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 88DEA0 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 88DEA4 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 88DEA8 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 88DEAC 802408AC 00000000 */ nop -/* 88DEB0 802408B0 45010003 */ bc1t .L802408C0 -/* 88DEB4 802408B4 00000000 */ nop -/* 88DEB8 802408B8 0C0187BC */ jal sqrtf -/* 88DEBC 802408BC 00000000 */ nop -.L802408C0: -/* 88DEC0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 88DEC4 802408C4 00000000 */ nop -/* 88DEC8 802408C8 45000015 */ bc1f .L80240920 -/* 88DECC 802408CC 46000106 */ mov.s $f4, $f0 -/* 88DED0 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 88DED4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 88DED8 802408D8 00000000 */ nop -/* 88DEDC 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 88DEE0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 88DEE4 802408E4 00000000 */ nop -/* 88DEE8 802408E8 4500000E */ bc1f .L80240924 -/* 88DEEC 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 88DEF0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 88DEF4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 88DEF8 802408F8 00000000 */ nop -/* 88DEFC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 88DF00 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 88DF04 80240904 00000000 */ nop -/* 88DF08 80240908 4600203C */ c.lt.s $f4, $f0 -/* 88DF0C 8024090C 00000000 */ nop -/* 88DF10 80240910 45000004 */ bc1f .L80240924 -/* 88DF14 80240914 24020001 */ addiu $v0, $zero, 1 -/* 88DF18 80240918 0809024C */ j .L80240930 -/* 88DF1C 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 88DF20 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 88DF24 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 88DF28 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 88DF2C 8024092C 00000000 */ nop -.L80240930: -/* 88DF30 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 88DF34 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 88DF38 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 88DF3C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 88DF40 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 88DF44 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 88DF48 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 88DF4C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 88DF50 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 88DF54 80240954 24020002 */ addiu $v0, $zero, 2 -/* 88DF58 80240958 03E00008 */ jr $ra -/* 88DF5C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_15/890190/func_802405F0_890190.s b/ver/us/asm/nonmatchings/world/area_tik/tik_15/890190/func_802405F0_890190.s deleted file mode 100644 index 20eeb0e463..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_15/890190/func_802405F0_890190.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_890190 -/* 890190 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 890194 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 890198 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 89019C 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 8901A0 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 8901A4 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 8901A8 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 8901AC 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8901B0 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8901B4 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8901B8 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8901BC 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 8901C0 80240620 0C0B1EAF */ jal evt_get_variable -/* 8901C4 80240624 8C450000 */ lw $a1, ($v0) -/* 8901C8 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 8901CC 8024062C 0C00EABB */ jal get_npc_unsafe -/* 8901D0 80240630 0040802D */ daddu $s0, $v0, $zero -/* 8901D4 80240634 0200202D */ daddu $a0, $s0, $zero -/* 8901D8 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8901DC 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 8901E0 80240640 0C046B4C */ jal get_model_from_list_index -/* 8901E4 80240644 0040202D */ daddu $a0, $v0, $zero -/* 8901E8 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8901EC 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8901F0 80240650 0040902D */ daddu $s2, $v0, $zero -/* 8901F4 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 8901F8 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 8901FC 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 890200 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 890204 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 890208 80240668 00000000 */ nop -/* 89020C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 890210 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 890214 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 890218 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 89021C 8024067C 00000000 */ nop -/* 890220 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 890224 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 890228 80240688 44820000 */ mtc1 $v0, $f0 -/* 89022C 8024068C 00000000 */ nop -/* 890230 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 890234 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 890238 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 89023C 8024069C 44810000 */ mtc1 $at, $f0 -/* 890240 802406A0 00000000 */ nop -/* 890244 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 890248 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 89024C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 890250 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 890254 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 890258 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 89025C 802406BC 00000000 */ nop -/* 890260 802406C0 45010004 */ bc1t .L802406D4 -/* 890264 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 890268 802406C8 0C0187BC */ jal sqrtf -/* 89026C 802406CC 00000000 */ nop -/* 890270 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 890274 802406D4 44800000 */ mtc1 $zero, $f0 -/* 890278 802406D8 00000000 */ nop -/* 89027C 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 890280 802406E0 00000000 */ nop -/* 890284 802406E4 45000016 */ bc1f .L80240740 -/* 890288 802406E8 46001106 */ mov.s $f4, $f2 -/* 89028C 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 890290 802406F0 44820000 */ mtc1 $v0, $f0 -/* 890294 802406F4 00000000 */ nop -/* 890298 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 89029C 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 8902A0 80240700 00000000 */ nop -/* 8902A4 80240704 4500000E */ bc1f .L80240740 -/* 8902A8 80240708 00000000 */ nop -/* 8902AC 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 8902B0 80240710 3C013F00 */ lui $at, 0x3f00 -/* 8902B4 80240714 44811000 */ mtc1 $at, $f2 -/* 8902B8 80240718 44820000 */ mtc1 $v0, $f0 -/* 8902BC 8024071C 00000000 */ nop -/* 8902C0 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 8902C4 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 8902C8 80240728 00000000 */ nop -/* 8902CC 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 8902D0 80240730 00000000 */ nop -/* 8902D4 80240734 45000002 */ bc1f .L80240740 -/* 8902D8 80240738 24020001 */ addiu $v0, $zero, 1 -/* 8902DC 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 8902E0 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8902E4 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8902E8 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 8902EC 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 8902F0 80240750 00000000 */ nop -/* 8902F4 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8902F8 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8902FC 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 890300 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 890304 80240764 00000000 */ nop -/* 890308 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 89030C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 890310 80240770 44820000 */ mtc1 $v0, $f0 -/* 890314 80240774 00000000 */ nop -/* 890318 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 89031C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 890320 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 890324 80240784 44810000 */ mtc1 $at, $f0 -/* 890328 80240788 00000000 */ nop -/* 89032C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 890330 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 890334 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 890338 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 89033C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 890340 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 890344 802407A4 00000000 */ nop -/* 890348 802407A8 45010004 */ bc1t .L802407BC -/* 89034C 802407AC 00000000 */ nop -/* 890350 802407B0 0C0187BC */ jal sqrtf -/* 890354 802407B4 00000000 */ nop -/* 890358 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 89035C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 890360 802407C0 00000000 */ nop -/* 890364 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 890368 802407C8 00000000 */ nop -/* 89036C 802407CC 45000016 */ bc1f .L80240828 -/* 890370 802407D0 46001106 */ mov.s $f4, $f2 -/* 890374 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 890378 802407D8 44820000 */ mtc1 $v0, $f0 -/* 89037C 802407DC 00000000 */ nop -/* 890380 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 890384 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 890388 802407E8 00000000 */ nop -/* 89038C 802407EC 4500000F */ bc1f .L8024082C -/* 890390 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 890394 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 890398 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 89039C 802407FC 44811000 */ mtc1 $at, $f2 -/* 8903A0 80240800 44820000 */ mtc1 $v0, $f0 -/* 8903A4 80240804 00000000 */ nop -/* 8903A8 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 8903AC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 8903B0 80240810 00000000 */ nop -/* 8903B4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 8903B8 80240818 00000000 */ nop -/* 8903BC 8024081C 45000003 */ bc1f .L8024082C -/* 8903C0 80240820 24020001 */ addiu $v0, $zero, 1 -/* 8903C4 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 8903C8 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 8903CC 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 8903D0 80240830 4481D000 */ mtc1 $at, $f26 -/* 8903D4 80240834 4480C000 */ mtc1 $zero, $f24 -/* 8903D8 80240838 3C013F00 */ lui $at, 0x3f00 -/* 8903DC 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 8903E0 80240840 0C00EAD2 */ jal get_npc_safe -/* 8903E4 80240844 0220202D */ daddu $a0, $s1, $zero -/* 8903E8 80240848 0040802D */ daddu $s0, $v0, $zero -/* 8903EC 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 8903F0 80240850 26310001 */ addiu $s1, $s1, 1 -/* 8903F4 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8903F8 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8903FC 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 890400 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 890404 80240864 00000000 */ nop -/* 890408 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89040C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 890410 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 890414 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 890418 80240878 00000000 */ nop -/* 89041C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 890420 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 890424 80240884 44820000 */ mtc1 $v0, $f0 -/* 890428 80240888 00000000 */ nop -/* 89042C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 890430 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 890434 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 890438 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 89043C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 890440 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 890444 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 890448 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 89044C 802408AC 00000000 */ nop -/* 890450 802408B0 45010003 */ bc1t .L802408C0 -/* 890454 802408B4 00000000 */ nop -/* 890458 802408B8 0C0187BC */ jal sqrtf -/* 89045C 802408BC 00000000 */ nop -.L802408C0: -/* 890460 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 890464 802408C4 00000000 */ nop -/* 890468 802408C8 45000015 */ bc1f .L80240920 -/* 89046C 802408CC 46000106 */ mov.s $f4, $f0 -/* 890470 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 890474 802408D4 44820000 */ mtc1 $v0, $f0 -/* 890478 802408D8 00000000 */ nop -/* 89047C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 890480 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 890484 802408E4 00000000 */ nop -/* 890488 802408E8 4500000E */ bc1f .L80240924 -/* 89048C 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 890490 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 890494 802408F4 44820000 */ mtc1 $v0, $f0 -/* 890498 802408F8 00000000 */ nop -/* 89049C 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 8904A0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 8904A4 80240904 00000000 */ nop -/* 8904A8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 8904AC 8024090C 00000000 */ nop -/* 8904B0 80240910 45000004 */ bc1f .L80240924 -/* 8904B4 80240914 24020001 */ addiu $v0, $zero, 1 -/* 8904B8 80240918 0809024C */ j .L80240930 -/* 8904BC 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 8904C0 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 8904C4 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 8904C8 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 8904CC 8024092C 00000000 */ nop -.L80240930: -/* 8904D0 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 8904D4 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 8904D8 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 8904DC 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 8904E0 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 8904E4 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 8904E8 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8904EC 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8904F0 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8904F4 80240954 24020002 */ addiu $v0, $zero, 2 -/* 8904F8 80240958 03E00008 */ jr $ra -/* 8904FC 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_18/8959F0/func_80240310_8959F0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_18/8959F0/func_80240310_8959F0.s deleted file mode 100644 index 733680b97a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_18/8959F0/func_80240310_8959F0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_8959F0 -/* 8959F0 80240310 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8959F4 80240314 AFB3001C */ sw $s3, 0x1c($sp) -/* 8959F8 80240318 0080982D */ daddu $s3, $a0, $zero -/* 8959FC 8024031C AFBF0020 */ sw $ra, 0x20($sp) -/* 895A00 80240320 AFB20018 */ sw $s2, 0x18($sp) -/* 895A04 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* 895A08 80240328 AFB00010 */ sw $s0, 0x10($sp) -/* 895A0C 8024032C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 895A10 80240330 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 895A14 80240334 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 895A18 80240338 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 895A1C 8024033C 8E62000C */ lw $v0, 0xc($s3) -/* 895A20 80240340 0C0B1EAF */ jal evt_get_variable -/* 895A24 80240344 8C450000 */ lw $a1, ($v0) -/* 895A28 80240348 2404FFFC */ addiu $a0, $zero, -4 -/* 895A2C 8024034C 0C00EABB */ jal get_npc_unsafe -/* 895A30 80240350 0040802D */ daddu $s0, $v0, $zero -/* 895A34 80240354 0200202D */ daddu $a0, $s0, $zero -/* 895A38 80240358 0C046C04 */ jal get_model_list_index_from_tree_index -/* 895A3C 8024035C 0040802D */ daddu $s0, $v0, $zero -/* 895A40 80240360 0C046B4C */ jal get_model_from_list_index -/* 895A44 80240364 0040202D */ daddu $a0, $v0, $zero -/* 895A48 80240368 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 895A4C 8024036C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 895A50 80240370 0040902D */ daddu $s2, $v0, $zero -/* 895A54 80240374 AE60008C */ sw $zero, 0x8c($s3) -/* 895A58 80240378 C4620028 */ lwc1 $f2, 0x28($v1) -/* 895A5C 8024037C C6400098 */ lwc1 $f0, 0x98($s2) -/* 895A60 80240380 46001081 */ sub.s $f2, $f2, $f0 -/* 895A64 80240384 46021182 */ mul.s $f6, $f2, $f2 -/* 895A68 80240388 00000000 */ nop -/* 895A6C 8024038C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 895A70 80240390 C4620030 */ lwc1 $f2, 0x30($v1) -/* 895A74 80240394 46001081 */ sub.s $f2, $f2, $f0 -/* 895A78 80240398 46021102 */ mul.s $f4, $f2, $f2 -/* 895A7C 8024039C 00000000 */ nop -/* 895A80 802403A0 846200B0 */ lh $v0, 0xb0($v1) -/* 895A84 802403A4 C462002C */ lwc1 $f2, 0x2c($v1) -/* 895A88 802403A8 44820000 */ mtc1 $v0, $f0 -/* 895A8C 802403AC 00000000 */ nop -/* 895A90 802403B0 46800020 */ cvt.s.w $f0, $f0 -/* 895A94 802403B4 46001080 */ add.s $f2, $f2, $f0 -/* 895A98 802403B8 3C013FC0 */ lui $at, 0x3fc0 -/* 895A9C 802403BC 44810000 */ mtc1 $at, $f0 -/* 895AA0 802403C0 00000000 */ nop -/* 895AA4 802403C4 46001081 */ sub.s $f2, $f2, $f0 -/* 895AA8 802403C8 46043300 */ add.s $f12, $f6, $f4 -/* 895AAC 802403CC C640009C */ lwc1 $f0, 0x9c($s2) -/* 895AB0 802403D0 46001501 */ sub.s $f20, $f2, $f0 -/* 895AB4 802403D4 46006084 */ sqrt.s $f2, $f12 -/* 895AB8 802403D8 46021032 */ c.eq.s $f2, $f2 -/* 895ABC 802403DC 00000000 */ nop -/* 895AC0 802403E0 45010004 */ bc1t .L802403F4 -/* 895AC4 802403E4 0060882D */ daddu $s1, $v1, $zero -/* 895AC8 802403E8 0C0187BC */ jal sqrtf -/* 895ACC 802403EC 00000000 */ nop -/* 895AD0 802403F0 46000086 */ mov.s $f2, $f0 -.L802403F4: -/* 895AD4 802403F4 44800000 */ mtc1 $zero, $f0 -/* 895AD8 802403F8 00000000 */ nop -/* 895ADC 802403FC 4614003C */ c.lt.s $f0, $f20 -/* 895AE0 80240400 00000000 */ nop -/* 895AE4 80240404 45000016 */ bc1f .L80240460 -/* 895AE8 80240408 46001106 */ mov.s $f4, $f2 -/* 895AEC 8024040C 862200B0 */ lh $v0, 0xb0($s1) -/* 895AF0 80240410 44820000 */ mtc1 $v0, $f0 -/* 895AF4 80240414 00000000 */ nop -/* 895AF8 80240418 46800020 */ cvt.s.w $f0, $f0 -/* 895AFC 8024041C 4600A03C */ c.lt.s $f20, $f0 -/* 895B00 80240420 00000000 */ nop -/* 895B04 80240424 4500000E */ bc1f .L80240460 -/* 895B08 80240428 00000000 */ nop -/* 895B0C 8024042C 862200B2 */ lh $v0, 0xb2($s1) -/* 895B10 80240430 3C013F00 */ lui $at, 0x3f00 -/* 895B14 80240434 44811000 */ mtc1 $at, $f2 -/* 895B18 80240438 44820000 */ mtc1 $v0, $f0 -/* 895B1C 8024043C 00000000 */ nop -/* 895B20 80240440 46800020 */ cvt.s.w $f0, $f0 -/* 895B24 80240444 46020002 */ mul.s $f0, $f0, $f2 -/* 895B28 80240448 00000000 */ nop -/* 895B2C 8024044C 4600203C */ c.lt.s $f4, $f0 -/* 895B30 80240450 00000000 */ nop -/* 895B34 80240454 45000002 */ bc1f .L80240460 -/* 895B38 80240458 24020001 */ addiu $v0, $zero, 1 -/* 895B3C 8024045C AE62008C */ sw $v0, 0x8c($s3) -.L80240460: -/* 895B40 80240460 C6020038 */ lwc1 $f2, 0x38($s0) -/* 895B44 80240464 C6400098 */ lwc1 $f0, 0x98($s2) -/* 895B48 80240468 46001081 */ sub.s $f2, $f2, $f0 -/* 895B4C 8024046C 46021182 */ mul.s $f6, $f2, $f2 -/* 895B50 80240470 00000000 */ nop -/* 895B54 80240474 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 895B58 80240478 C6020040 */ lwc1 $f2, 0x40($s0) -/* 895B5C 8024047C 46001081 */ sub.s $f2, $f2, $f0 -/* 895B60 80240480 46021102 */ mul.s $f4, $f2, $f2 -/* 895B64 80240484 00000000 */ nop -/* 895B68 80240488 860200A8 */ lh $v0, 0xa8($s0) -/* 895B6C 8024048C C602003C */ lwc1 $f2, 0x3c($s0) -/* 895B70 80240490 44820000 */ mtc1 $v0, $f0 -/* 895B74 80240494 00000000 */ nop -/* 895B78 80240498 46800020 */ cvt.s.w $f0, $f0 -/* 895B7C 8024049C 46001080 */ add.s $f2, $f2, $f0 -/* 895B80 802404A0 3C013FC0 */ lui $at, 0x3fc0 -/* 895B84 802404A4 44810000 */ mtc1 $at, $f0 -/* 895B88 802404A8 00000000 */ nop -/* 895B8C 802404AC 46001081 */ sub.s $f2, $f2, $f0 -/* 895B90 802404B0 46043300 */ add.s $f12, $f6, $f4 -/* 895B94 802404B4 C640009C */ lwc1 $f0, 0x9c($s2) -/* 895B98 802404B8 46001501 */ sub.s $f20, $f2, $f0 -/* 895B9C 802404BC 46006084 */ sqrt.s $f2, $f12 -/* 895BA0 802404C0 46021032 */ c.eq.s $f2, $f2 -/* 895BA4 802404C4 00000000 */ nop -/* 895BA8 802404C8 45010004 */ bc1t .L802404DC -/* 895BAC 802404CC 00000000 */ nop -/* 895BB0 802404D0 0C0187BC */ jal sqrtf -/* 895BB4 802404D4 00000000 */ nop -/* 895BB8 802404D8 46000086 */ mov.s $f2, $f0 -.L802404DC: -/* 895BBC 802404DC 44800000 */ mtc1 $zero, $f0 -/* 895BC0 802404E0 00000000 */ nop -/* 895BC4 802404E4 4614003C */ c.lt.s $f0, $f20 -/* 895BC8 802404E8 00000000 */ nop -/* 895BCC 802404EC 45000016 */ bc1f .L80240548 -/* 895BD0 802404F0 46001106 */ mov.s $f4, $f2 -/* 895BD4 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* 895BD8 802404F8 44820000 */ mtc1 $v0, $f0 -/* 895BDC 802404FC 00000000 */ nop -/* 895BE0 80240500 46800020 */ cvt.s.w $f0, $f0 -/* 895BE4 80240504 4600A03C */ c.lt.s $f20, $f0 -/* 895BE8 80240508 00000000 */ nop -/* 895BEC 8024050C 4500000F */ bc1f .L8024054C -/* 895BF0 80240510 0000882D */ daddu $s1, $zero, $zero -/* 895BF4 80240514 860200A6 */ lh $v0, 0xa6($s0) -/* 895BF8 80240518 3C013F00 */ lui $at, 0x3f00 -/* 895BFC 8024051C 44811000 */ mtc1 $at, $f2 -/* 895C00 80240520 44820000 */ mtc1 $v0, $f0 -/* 895C04 80240524 00000000 */ nop -/* 895C08 80240528 46800020 */ cvt.s.w $f0, $f0 -/* 895C0C 8024052C 46020002 */ mul.s $f0, $f0, $f2 -/* 895C10 80240530 00000000 */ nop -/* 895C14 80240534 4600203C */ c.lt.s $f4, $f0 -/* 895C18 80240538 00000000 */ nop -/* 895C1C 8024053C 45000003 */ bc1f .L8024054C -/* 895C20 80240540 24020001 */ addiu $v0, $zero, 1 -/* 895C24 80240544 AE62008C */ sw $v0, 0x8c($s3) -.L80240548: -/* 895C28 80240548 0000882D */ daddu $s1, $zero, $zero -.L8024054C: -/* 895C2C 8024054C 3C013FC0 */ lui $at, 0x3fc0 -/* 895C30 80240550 4481D000 */ mtc1 $at, $f26 -/* 895C34 80240554 4480C000 */ mtc1 $zero, $f24 -/* 895C38 80240558 3C013F00 */ lui $at, 0x3f00 -/* 895C3C 8024055C 4481B000 */ mtc1 $at, $f22 -.L80240560: -/* 895C40 80240560 0C00EAD2 */ jal get_npc_safe -/* 895C44 80240564 0220202D */ daddu $a0, $s1, $zero -/* 895C48 80240568 0040802D */ daddu $s0, $v0, $zero -/* 895C4C 8024056C 52000035 */ beql $s0, $zero, .L80240644 -/* 895C50 80240570 26310001 */ addiu $s1, $s1, 1 -/* 895C54 80240574 C6020038 */ lwc1 $f2, 0x38($s0) -/* 895C58 80240578 C6400098 */ lwc1 $f0, 0x98($s2) -/* 895C5C 8024057C 46001081 */ sub.s $f2, $f2, $f0 -/* 895C60 80240580 46021182 */ mul.s $f6, $f2, $f2 -/* 895C64 80240584 00000000 */ nop -/* 895C68 80240588 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 895C6C 8024058C C6020040 */ lwc1 $f2, 0x40($s0) -/* 895C70 80240590 46001081 */ sub.s $f2, $f2, $f0 -/* 895C74 80240594 46021102 */ mul.s $f4, $f2, $f2 -/* 895C78 80240598 00000000 */ nop -/* 895C7C 8024059C 860200A8 */ lh $v0, 0xa8($s0) -/* 895C80 802405A0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 895C84 802405A4 44820000 */ mtc1 $v0, $f0 -/* 895C88 802405A8 00000000 */ nop -/* 895C8C 802405AC 46800020 */ cvt.s.w $f0, $f0 -/* 895C90 802405B0 46001080 */ add.s $f2, $f2, $f0 -/* 895C94 802405B4 461A1081 */ sub.s $f2, $f2, $f26 -/* 895C98 802405B8 46043300 */ add.s $f12, $f6, $f4 -/* 895C9C 802405BC C640009C */ lwc1 $f0, 0x9c($s2) -/* 895CA0 802405C0 46001501 */ sub.s $f20, $f2, $f0 -/* 895CA4 802405C4 46006004 */ sqrt.s $f0, $f12 -/* 895CA8 802405C8 46000032 */ c.eq.s $f0, $f0 -/* 895CAC 802405CC 00000000 */ nop -/* 895CB0 802405D0 45010003 */ bc1t .L802405E0 -/* 895CB4 802405D4 00000000 */ nop -/* 895CB8 802405D8 0C0187BC */ jal sqrtf -/* 895CBC 802405DC 00000000 */ nop -.L802405E0: -/* 895CC0 802405E0 4614C03C */ c.lt.s $f24, $f20 -/* 895CC4 802405E4 00000000 */ nop -/* 895CC8 802405E8 45000015 */ bc1f .L80240640 -/* 895CCC 802405EC 46000106 */ mov.s $f4, $f0 -/* 895CD0 802405F0 860200A8 */ lh $v0, 0xa8($s0) -/* 895CD4 802405F4 44820000 */ mtc1 $v0, $f0 -/* 895CD8 802405F8 00000000 */ nop -/* 895CDC 802405FC 46800020 */ cvt.s.w $f0, $f0 -/* 895CE0 80240600 4600A03C */ c.lt.s $f20, $f0 -/* 895CE4 80240604 00000000 */ nop -/* 895CE8 80240608 4500000E */ bc1f .L80240644 -/* 895CEC 8024060C 26310001 */ addiu $s1, $s1, 1 -/* 895CF0 80240610 860200A6 */ lh $v0, 0xa6($s0) -/* 895CF4 80240614 44820000 */ mtc1 $v0, $f0 -/* 895CF8 80240618 00000000 */ nop -/* 895CFC 8024061C 46800020 */ cvt.s.w $f0, $f0 -/* 895D00 80240620 46160002 */ mul.s $f0, $f0, $f22 -/* 895D04 80240624 00000000 */ nop -/* 895D08 80240628 4600203C */ c.lt.s $f4, $f0 -/* 895D0C 8024062C 00000000 */ nop -/* 895D10 80240630 45000004 */ bc1f .L80240644 -/* 895D14 80240634 24020001 */ addiu $v0, $zero, 1 -/* 895D18 80240638 08090194 */ j .L80240650 -/* 895D1C 8024063C AE62008C */ sw $v0, 0x8c($s3) -.L80240640: -/* 895D20 80240640 26310001 */ addiu $s1, $s1, 1 -.L80240644: -/* 895D24 80240644 2A220040 */ slti $v0, $s1, 0x40 -/* 895D28 80240648 1440FFC5 */ bnez $v0, .L80240560 -/* 895D2C 8024064C 00000000 */ nop -.L80240650: -/* 895D30 80240650 8FBF0020 */ lw $ra, 0x20($sp) -/* 895D34 80240654 8FB3001C */ lw $s3, 0x1c($sp) -/* 895D38 80240658 8FB20018 */ lw $s2, 0x18($sp) -/* 895D3C 8024065C 8FB10014 */ lw $s1, 0x14($sp) -/* 895D40 80240660 8FB00010 */ lw $s0, 0x10($sp) -/* 895D44 80240664 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 895D48 80240668 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 895D4C 8024066C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 895D50 80240670 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 895D54 80240674 24020002 */ addiu $v0, $zero, 2 -/* 895D58 80240678 03E00008 */ jr $ra -/* 895D5C 8024067C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802405EC_89A93C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802405EC_89A93C.s deleted file mode 100644 index 6597b4ff08..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802405EC_89A93C.s +++ /dev/null @@ -1,235 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_89A93C -/* 89A93C 802405EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 89A940 802405F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 89A944 802405F4 0080982D */ daddu $s3, $a0, $zero -/* 89A948 802405F8 AFBF0020 */ sw $ra, 0x20($sp) -/* 89A94C 802405FC AFB20018 */ sw $s2, 0x18($sp) -/* 89A950 80240600 AFB10014 */ sw $s1, 0x14($sp) -/* 89A954 80240604 AFB00010 */ sw $s0, 0x10($sp) -/* 89A958 80240608 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 89A95C 8024060C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 89A960 80240610 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 89A964 80240614 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 89A968 80240618 8E62000C */ lw $v0, 0xc($s3) -/* 89A96C 8024061C 0C0B1EAF */ jal evt_get_variable -/* 89A970 80240620 8C450000 */ lw $a1, ($v0) -/* 89A974 80240624 2404FFFC */ addiu $a0, $zero, -4 -/* 89A978 80240628 0C00EABB */ jal get_npc_unsafe -/* 89A97C 8024062C 0040802D */ daddu $s0, $v0, $zero -/* 89A980 80240630 0200202D */ daddu $a0, $s0, $zero -/* 89A984 80240634 0C046C04 */ jal get_model_list_index_from_tree_index -/* 89A988 80240638 0040802D */ daddu $s0, $v0, $zero -/* 89A98C 8024063C 0C046B4C */ jal get_model_from_list_index -/* 89A990 80240640 0040202D */ daddu $a0, $v0, $zero -/* 89A994 80240644 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 89A998 80240648 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 89A99C 8024064C 0040902D */ daddu $s2, $v0, $zero -/* 89A9A0 80240650 AE60008C */ sw $zero, 0x8c($s3) -/* 89A9A4 80240654 C4620028 */ lwc1 $f2, 0x28($v1) -/* 89A9A8 80240658 C6400098 */ lwc1 $f0, 0x98($s2) -/* 89A9AC 8024065C 46001081 */ sub.s $f2, $f2, $f0 -/* 89A9B0 80240660 46021182 */ mul.s $f6, $f2, $f2 -/* 89A9B4 80240664 00000000 */ nop -/* 89A9B8 80240668 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89A9BC 8024066C C4620030 */ lwc1 $f2, 0x30($v1) -/* 89A9C0 80240670 46001081 */ sub.s $f2, $f2, $f0 -/* 89A9C4 80240674 46021102 */ mul.s $f4, $f2, $f2 -/* 89A9C8 80240678 00000000 */ nop -/* 89A9CC 8024067C 846200B0 */ lh $v0, 0xb0($v1) -/* 89A9D0 80240680 C462002C */ lwc1 $f2, 0x2c($v1) -/* 89A9D4 80240684 44820000 */ mtc1 $v0, $f0 -/* 89A9D8 80240688 00000000 */ nop -/* 89A9DC 8024068C 46800020 */ cvt.s.w $f0, $f0 -/* 89A9E0 80240690 46001080 */ add.s $f2, $f2, $f0 -/* 89A9E4 80240694 3C013FC0 */ lui $at, 0x3fc0 -/* 89A9E8 80240698 44810000 */ mtc1 $at, $f0 -/* 89A9EC 8024069C 00000000 */ nop -/* 89A9F0 802406A0 46001081 */ sub.s $f2, $f2, $f0 -/* 89A9F4 802406A4 46043300 */ add.s $f12, $f6, $f4 -/* 89A9F8 802406A8 C640009C */ lwc1 $f0, 0x9c($s2) -/* 89A9FC 802406AC 46001501 */ sub.s $f20, $f2, $f0 -/* 89AA00 802406B0 46006084 */ sqrt.s $f2, $f12 -/* 89AA04 802406B4 46021032 */ c.eq.s $f2, $f2 -/* 89AA08 802406B8 00000000 */ nop -/* 89AA0C 802406BC 45010004 */ bc1t .L802406D0 -/* 89AA10 802406C0 0060882D */ daddu $s1, $v1, $zero -/* 89AA14 802406C4 0C0187BC */ jal sqrtf -/* 89AA18 802406C8 00000000 */ nop -/* 89AA1C 802406CC 46000086 */ mov.s $f2, $f0 -.L802406D0: -/* 89AA20 802406D0 44800000 */ mtc1 $zero, $f0 -/* 89AA24 802406D4 00000000 */ nop -/* 89AA28 802406D8 4614003C */ c.lt.s $f0, $f20 -/* 89AA2C 802406DC 00000000 */ nop -/* 89AA30 802406E0 45000016 */ bc1f .L8024073C -/* 89AA34 802406E4 46001106 */ mov.s $f4, $f2 -/* 89AA38 802406E8 862200B0 */ lh $v0, 0xb0($s1) -/* 89AA3C 802406EC 44820000 */ mtc1 $v0, $f0 -/* 89AA40 802406F0 00000000 */ nop -/* 89AA44 802406F4 46800020 */ cvt.s.w $f0, $f0 -/* 89AA48 802406F8 4600A03C */ c.lt.s $f20, $f0 -/* 89AA4C 802406FC 00000000 */ nop -/* 89AA50 80240700 4500000E */ bc1f .L8024073C -/* 89AA54 80240704 00000000 */ nop -/* 89AA58 80240708 862200B2 */ lh $v0, 0xb2($s1) -/* 89AA5C 8024070C 3C013F00 */ lui $at, 0x3f00 -/* 89AA60 80240710 44811000 */ mtc1 $at, $f2 -/* 89AA64 80240714 44820000 */ mtc1 $v0, $f0 -/* 89AA68 80240718 00000000 */ nop -/* 89AA6C 8024071C 46800020 */ cvt.s.w $f0, $f0 -/* 89AA70 80240720 46020002 */ mul.s $f0, $f0, $f2 -/* 89AA74 80240724 00000000 */ nop -/* 89AA78 80240728 4600203C */ c.lt.s $f4, $f0 -/* 89AA7C 8024072C 00000000 */ nop -/* 89AA80 80240730 45000002 */ bc1f .L8024073C -/* 89AA84 80240734 24020001 */ addiu $v0, $zero, 1 -/* 89AA88 80240738 AE62008C */ sw $v0, 0x8c($s3) -.L8024073C: -/* 89AA8C 8024073C C6020038 */ lwc1 $f2, 0x38($s0) -/* 89AA90 80240740 C6400098 */ lwc1 $f0, 0x98($s2) -/* 89AA94 80240744 46001081 */ sub.s $f2, $f2, $f0 -/* 89AA98 80240748 46021182 */ mul.s $f6, $f2, $f2 -/* 89AA9C 8024074C 00000000 */ nop -/* 89AAA0 80240750 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89AAA4 80240754 C6020040 */ lwc1 $f2, 0x40($s0) -/* 89AAA8 80240758 46001081 */ sub.s $f2, $f2, $f0 -/* 89AAAC 8024075C 46021102 */ mul.s $f4, $f2, $f2 -/* 89AAB0 80240760 00000000 */ nop -/* 89AAB4 80240764 860200A8 */ lh $v0, 0xa8($s0) -/* 89AAB8 80240768 C602003C */ lwc1 $f2, 0x3c($s0) -/* 89AABC 8024076C 44820000 */ mtc1 $v0, $f0 -/* 89AAC0 80240770 00000000 */ nop -/* 89AAC4 80240774 46800020 */ cvt.s.w $f0, $f0 -/* 89AAC8 80240778 46001080 */ add.s $f2, $f2, $f0 -/* 89AACC 8024077C 3C013FC0 */ lui $at, 0x3fc0 -/* 89AAD0 80240780 44810000 */ mtc1 $at, $f0 -/* 89AAD4 80240784 00000000 */ nop -/* 89AAD8 80240788 46001081 */ sub.s $f2, $f2, $f0 -/* 89AADC 8024078C 46043300 */ add.s $f12, $f6, $f4 -/* 89AAE0 80240790 C640009C */ lwc1 $f0, 0x9c($s2) -/* 89AAE4 80240794 46001501 */ sub.s $f20, $f2, $f0 -/* 89AAE8 80240798 46006084 */ sqrt.s $f2, $f12 -/* 89AAEC 8024079C 46021032 */ c.eq.s $f2, $f2 -/* 89AAF0 802407A0 00000000 */ nop -/* 89AAF4 802407A4 45010004 */ bc1t .L802407B8 -/* 89AAF8 802407A8 00000000 */ nop -/* 89AAFC 802407AC 0C0187BC */ jal sqrtf -/* 89AB00 802407B0 00000000 */ nop -/* 89AB04 802407B4 46000086 */ mov.s $f2, $f0 -.L802407B8: -/* 89AB08 802407B8 44800000 */ mtc1 $zero, $f0 -/* 89AB0C 802407BC 00000000 */ nop -/* 89AB10 802407C0 4614003C */ c.lt.s $f0, $f20 -/* 89AB14 802407C4 00000000 */ nop -/* 89AB18 802407C8 45000016 */ bc1f .L80240824 -/* 89AB1C 802407CC 46001106 */ mov.s $f4, $f2 -/* 89AB20 802407D0 860200A8 */ lh $v0, 0xa8($s0) -/* 89AB24 802407D4 44820000 */ mtc1 $v0, $f0 -/* 89AB28 802407D8 00000000 */ nop -/* 89AB2C 802407DC 46800020 */ cvt.s.w $f0, $f0 -/* 89AB30 802407E0 4600A03C */ c.lt.s $f20, $f0 -/* 89AB34 802407E4 00000000 */ nop -/* 89AB38 802407E8 4500000F */ bc1f .L80240828 -/* 89AB3C 802407EC 0000882D */ daddu $s1, $zero, $zero -/* 89AB40 802407F0 860200A6 */ lh $v0, 0xa6($s0) -/* 89AB44 802407F4 3C013F00 */ lui $at, 0x3f00 -/* 89AB48 802407F8 44811000 */ mtc1 $at, $f2 -/* 89AB4C 802407FC 44820000 */ mtc1 $v0, $f0 -/* 89AB50 80240800 00000000 */ nop -/* 89AB54 80240804 46800020 */ cvt.s.w $f0, $f0 -/* 89AB58 80240808 46020002 */ mul.s $f0, $f0, $f2 -/* 89AB5C 8024080C 00000000 */ nop -/* 89AB60 80240810 4600203C */ c.lt.s $f4, $f0 -/* 89AB64 80240814 00000000 */ nop -/* 89AB68 80240818 45000003 */ bc1f .L80240828 -/* 89AB6C 8024081C 24020001 */ addiu $v0, $zero, 1 -/* 89AB70 80240820 AE62008C */ sw $v0, 0x8c($s3) -.L80240824: -/* 89AB74 80240824 0000882D */ daddu $s1, $zero, $zero -.L80240828: -/* 89AB78 80240828 3C013FC0 */ lui $at, 0x3fc0 -/* 89AB7C 8024082C 4481D000 */ mtc1 $at, $f26 -/* 89AB80 80240830 4480C000 */ mtc1 $zero, $f24 -/* 89AB84 80240834 3C013F00 */ lui $at, 0x3f00 -/* 89AB88 80240838 4481B000 */ mtc1 $at, $f22 -.L8024083C: -/* 89AB8C 8024083C 0C00EAD2 */ jal get_npc_safe -/* 89AB90 80240840 0220202D */ daddu $a0, $s1, $zero -/* 89AB94 80240844 0040802D */ daddu $s0, $v0, $zero -/* 89AB98 80240848 52000035 */ beql $s0, $zero, .L80240920 -/* 89AB9C 8024084C 26310001 */ addiu $s1, $s1, 1 -/* 89ABA0 80240850 C6020038 */ lwc1 $f2, 0x38($s0) -/* 89ABA4 80240854 C6400098 */ lwc1 $f0, 0x98($s2) -/* 89ABA8 80240858 46001081 */ sub.s $f2, $f2, $f0 -/* 89ABAC 8024085C 46021182 */ mul.s $f6, $f2, $f2 -/* 89ABB0 80240860 00000000 */ nop -/* 89ABB4 80240864 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89ABB8 80240868 C6020040 */ lwc1 $f2, 0x40($s0) -/* 89ABBC 8024086C 46001081 */ sub.s $f2, $f2, $f0 -/* 89ABC0 80240870 46021102 */ mul.s $f4, $f2, $f2 -/* 89ABC4 80240874 00000000 */ nop -/* 89ABC8 80240878 860200A8 */ lh $v0, 0xa8($s0) -/* 89ABCC 8024087C C602003C */ lwc1 $f2, 0x3c($s0) -/* 89ABD0 80240880 44820000 */ mtc1 $v0, $f0 -/* 89ABD4 80240884 00000000 */ nop -/* 89ABD8 80240888 46800020 */ cvt.s.w $f0, $f0 -/* 89ABDC 8024088C 46001080 */ add.s $f2, $f2, $f0 -/* 89ABE0 80240890 461A1081 */ sub.s $f2, $f2, $f26 -/* 89ABE4 80240894 46043300 */ add.s $f12, $f6, $f4 -/* 89ABE8 80240898 C640009C */ lwc1 $f0, 0x9c($s2) -/* 89ABEC 8024089C 46001501 */ sub.s $f20, $f2, $f0 -/* 89ABF0 802408A0 46006004 */ sqrt.s $f0, $f12 -/* 89ABF4 802408A4 46000032 */ c.eq.s $f0, $f0 -/* 89ABF8 802408A8 00000000 */ nop -/* 89ABFC 802408AC 45010003 */ bc1t .L802408BC -/* 89AC00 802408B0 00000000 */ nop -/* 89AC04 802408B4 0C0187BC */ jal sqrtf -/* 89AC08 802408B8 00000000 */ nop -.L802408BC: -/* 89AC0C 802408BC 4614C03C */ c.lt.s $f24, $f20 -/* 89AC10 802408C0 00000000 */ nop -/* 89AC14 802408C4 45000015 */ bc1f .L8024091C -/* 89AC18 802408C8 46000106 */ mov.s $f4, $f0 -/* 89AC1C 802408CC 860200A8 */ lh $v0, 0xa8($s0) -/* 89AC20 802408D0 44820000 */ mtc1 $v0, $f0 -/* 89AC24 802408D4 00000000 */ nop -/* 89AC28 802408D8 46800020 */ cvt.s.w $f0, $f0 -/* 89AC2C 802408DC 4600A03C */ c.lt.s $f20, $f0 -/* 89AC30 802408E0 00000000 */ nop -/* 89AC34 802408E4 4500000E */ bc1f .L80240920 -/* 89AC38 802408E8 26310001 */ addiu $s1, $s1, 1 -/* 89AC3C 802408EC 860200A6 */ lh $v0, 0xa6($s0) -/* 89AC40 802408F0 44820000 */ mtc1 $v0, $f0 -/* 89AC44 802408F4 00000000 */ nop -/* 89AC48 802408F8 46800020 */ cvt.s.w $f0, $f0 -/* 89AC4C 802408FC 46160002 */ mul.s $f0, $f0, $f22 -/* 89AC50 80240900 00000000 */ nop -/* 89AC54 80240904 4600203C */ c.lt.s $f4, $f0 -/* 89AC58 80240908 00000000 */ nop -/* 89AC5C 8024090C 45000004 */ bc1f .L80240920 -/* 89AC60 80240910 24020001 */ addiu $v0, $zero, 1 -/* 89AC64 80240914 0809024B */ j .L8024092C -/* 89AC68 80240918 AE62008C */ sw $v0, 0x8c($s3) -.L8024091C: -/* 89AC6C 8024091C 26310001 */ addiu $s1, $s1, 1 -.L80240920: -/* 89AC70 80240920 2A220040 */ slti $v0, $s1, 0x40 -/* 89AC74 80240924 1440FFC5 */ bnez $v0, .L8024083C -/* 89AC78 80240928 00000000 */ nop -.L8024092C: -/* 89AC7C 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* 89AC80 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* 89AC84 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* 89AC88 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* 89AC8C 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* 89AC90 80240940 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 89AC94 80240944 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 89AC98 80240948 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 89AC9C 8024094C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 89ACA0 80240950 24020002 */ addiu $v0, $zero, 2 -/* 89ACA4 80240954 03E00008 */ jr $ra -/* 89ACA8 80240958 27BD0048 */ addiu $sp, $sp, 0x48 -/* 89ACAC 8024095C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802405EC_89DD8C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802405EC_89DD8C.s deleted file mode 100644 index 53a650bc66..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802405EC_89DD8C.s +++ /dev/null @@ -1,235 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_89DD8C -/* 89DD8C 802405EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 89DD90 802405F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 89DD94 802405F4 0080982D */ daddu $s3, $a0, $zero -/* 89DD98 802405F8 AFBF0020 */ sw $ra, 0x20($sp) -/* 89DD9C 802405FC AFB20018 */ sw $s2, 0x18($sp) -/* 89DDA0 80240600 AFB10014 */ sw $s1, 0x14($sp) -/* 89DDA4 80240604 AFB00010 */ sw $s0, 0x10($sp) -/* 89DDA8 80240608 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 89DDAC 8024060C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 89DDB0 80240610 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 89DDB4 80240614 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 89DDB8 80240618 8E62000C */ lw $v0, 0xc($s3) -/* 89DDBC 8024061C 0C0B1EAF */ jal evt_get_variable -/* 89DDC0 80240620 8C450000 */ lw $a1, ($v0) -/* 89DDC4 80240624 2404FFFC */ addiu $a0, $zero, -4 -/* 89DDC8 80240628 0C00EABB */ jal get_npc_unsafe -/* 89DDCC 8024062C 0040802D */ daddu $s0, $v0, $zero -/* 89DDD0 80240630 0200202D */ daddu $a0, $s0, $zero -/* 89DDD4 80240634 0C046C04 */ jal get_model_list_index_from_tree_index -/* 89DDD8 80240638 0040802D */ daddu $s0, $v0, $zero -/* 89DDDC 8024063C 0C046B4C */ jal get_model_from_list_index -/* 89DDE0 80240640 0040202D */ daddu $a0, $v0, $zero -/* 89DDE4 80240644 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 89DDE8 80240648 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 89DDEC 8024064C 0040902D */ daddu $s2, $v0, $zero -/* 89DDF0 80240650 AE60008C */ sw $zero, 0x8c($s3) -/* 89DDF4 80240654 C4620028 */ lwc1 $f2, 0x28($v1) -/* 89DDF8 80240658 C6400098 */ lwc1 $f0, 0x98($s2) -/* 89DDFC 8024065C 46001081 */ sub.s $f2, $f2, $f0 -/* 89DE00 80240660 46021182 */ mul.s $f6, $f2, $f2 -/* 89DE04 80240664 00000000 */ nop -/* 89DE08 80240668 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89DE0C 8024066C C4620030 */ lwc1 $f2, 0x30($v1) -/* 89DE10 80240670 46001081 */ sub.s $f2, $f2, $f0 -/* 89DE14 80240674 46021102 */ mul.s $f4, $f2, $f2 -/* 89DE18 80240678 00000000 */ nop -/* 89DE1C 8024067C 846200B0 */ lh $v0, 0xb0($v1) -/* 89DE20 80240680 C462002C */ lwc1 $f2, 0x2c($v1) -/* 89DE24 80240684 44820000 */ mtc1 $v0, $f0 -/* 89DE28 80240688 00000000 */ nop -/* 89DE2C 8024068C 46800020 */ cvt.s.w $f0, $f0 -/* 89DE30 80240690 46001080 */ add.s $f2, $f2, $f0 -/* 89DE34 80240694 3C013FC0 */ lui $at, 0x3fc0 -/* 89DE38 80240698 44810000 */ mtc1 $at, $f0 -/* 89DE3C 8024069C 00000000 */ nop -/* 89DE40 802406A0 46001081 */ sub.s $f2, $f2, $f0 -/* 89DE44 802406A4 46043300 */ add.s $f12, $f6, $f4 -/* 89DE48 802406A8 C640009C */ lwc1 $f0, 0x9c($s2) -/* 89DE4C 802406AC 46001501 */ sub.s $f20, $f2, $f0 -/* 89DE50 802406B0 46006084 */ sqrt.s $f2, $f12 -/* 89DE54 802406B4 46021032 */ c.eq.s $f2, $f2 -/* 89DE58 802406B8 00000000 */ nop -/* 89DE5C 802406BC 45010004 */ bc1t .L802406D0 -/* 89DE60 802406C0 0060882D */ daddu $s1, $v1, $zero -/* 89DE64 802406C4 0C0187BC */ jal sqrtf -/* 89DE68 802406C8 00000000 */ nop -/* 89DE6C 802406CC 46000086 */ mov.s $f2, $f0 -.L802406D0: -/* 89DE70 802406D0 44800000 */ mtc1 $zero, $f0 -/* 89DE74 802406D4 00000000 */ nop -/* 89DE78 802406D8 4614003C */ c.lt.s $f0, $f20 -/* 89DE7C 802406DC 00000000 */ nop -/* 89DE80 802406E0 45000016 */ bc1f .L8024073C -/* 89DE84 802406E4 46001106 */ mov.s $f4, $f2 -/* 89DE88 802406E8 862200B0 */ lh $v0, 0xb0($s1) -/* 89DE8C 802406EC 44820000 */ mtc1 $v0, $f0 -/* 89DE90 802406F0 00000000 */ nop -/* 89DE94 802406F4 46800020 */ cvt.s.w $f0, $f0 -/* 89DE98 802406F8 4600A03C */ c.lt.s $f20, $f0 -/* 89DE9C 802406FC 00000000 */ nop -/* 89DEA0 80240700 4500000E */ bc1f .L8024073C -/* 89DEA4 80240704 00000000 */ nop -/* 89DEA8 80240708 862200B2 */ lh $v0, 0xb2($s1) -/* 89DEAC 8024070C 3C013F00 */ lui $at, 0x3f00 -/* 89DEB0 80240710 44811000 */ mtc1 $at, $f2 -/* 89DEB4 80240714 44820000 */ mtc1 $v0, $f0 -/* 89DEB8 80240718 00000000 */ nop -/* 89DEBC 8024071C 46800020 */ cvt.s.w $f0, $f0 -/* 89DEC0 80240720 46020002 */ mul.s $f0, $f0, $f2 -/* 89DEC4 80240724 00000000 */ nop -/* 89DEC8 80240728 4600203C */ c.lt.s $f4, $f0 -/* 89DECC 8024072C 00000000 */ nop -/* 89DED0 80240730 45000002 */ bc1f .L8024073C -/* 89DED4 80240734 24020001 */ addiu $v0, $zero, 1 -/* 89DED8 80240738 AE62008C */ sw $v0, 0x8c($s3) -.L8024073C: -/* 89DEDC 8024073C C6020038 */ lwc1 $f2, 0x38($s0) -/* 89DEE0 80240740 C6400098 */ lwc1 $f0, 0x98($s2) -/* 89DEE4 80240744 46001081 */ sub.s $f2, $f2, $f0 -/* 89DEE8 80240748 46021182 */ mul.s $f6, $f2, $f2 -/* 89DEEC 8024074C 00000000 */ nop -/* 89DEF0 80240750 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89DEF4 80240754 C6020040 */ lwc1 $f2, 0x40($s0) -/* 89DEF8 80240758 46001081 */ sub.s $f2, $f2, $f0 -/* 89DEFC 8024075C 46021102 */ mul.s $f4, $f2, $f2 -/* 89DF00 80240760 00000000 */ nop -/* 89DF04 80240764 860200A8 */ lh $v0, 0xa8($s0) -/* 89DF08 80240768 C602003C */ lwc1 $f2, 0x3c($s0) -/* 89DF0C 8024076C 44820000 */ mtc1 $v0, $f0 -/* 89DF10 80240770 00000000 */ nop -/* 89DF14 80240774 46800020 */ cvt.s.w $f0, $f0 -/* 89DF18 80240778 46001080 */ add.s $f2, $f2, $f0 -/* 89DF1C 8024077C 3C013FC0 */ lui $at, 0x3fc0 -/* 89DF20 80240780 44810000 */ mtc1 $at, $f0 -/* 89DF24 80240784 00000000 */ nop -/* 89DF28 80240788 46001081 */ sub.s $f2, $f2, $f0 -/* 89DF2C 8024078C 46043300 */ add.s $f12, $f6, $f4 -/* 89DF30 80240790 C640009C */ lwc1 $f0, 0x9c($s2) -/* 89DF34 80240794 46001501 */ sub.s $f20, $f2, $f0 -/* 89DF38 80240798 46006084 */ sqrt.s $f2, $f12 -/* 89DF3C 8024079C 46021032 */ c.eq.s $f2, $f2 -/* 89DF40 802407A0 00000000 */ nop -/* 89DF44 802407A4 45010004 */ bc1t .L802407B8 -/* 89DF48 802407A8 00000000 */ nop -/* 89DF4C 802407AC 0C0187BC */ jal sqrtf -/* 89DF50 802407B0 00000000 */ nop -/* 89DF54 802407B4 46000086 */ mov.s $f2, $f0 -.L802407B8: -/* 89DF58 802407B8 44800000 */ mtc1 $zero, $f0 -/* 89DF5C 802407BC 00000000 */ nop -/* 89DF60 802407C0 4614003C */ c.lt.s $f0, $f20 -/* 89DF64 802407C4 00000000 */ nop -/* 89DF68 802407C8 45000016 */ bc1f .L80240824 -/* 89DF6C 802407CC 46001106 */ mov.s $f4, $f2 -/* 89DF70 802407D0 860200A8 */ lh $v0, 0xa8($s0) -/* 89DF74 802407D4 44820000 */ mtc1 $v0, $f0 -/* 89DF78 802407D8 00000000 */ nop -/* 89DF7C 802407DC 46800020 */ cvt.s.w $f0, $f0 -/* 89DF80 802407E0 4600A03C */ c.lt.s $f20, $f0 -/* 89DF84 802407E4 00000000 */ nop -/* 89DF88 802407E8 4500000F */ bc1f .L80240828 -/* 89DF8C 802407EC 0000882D */ daddu $s1, $zero, $zero -/* 89DF90 802407F0 860200A6 */ lh $v0, 0xa6($s0) -/* 89DF94 802407F4 3C013F00 */ lui $at, 0x3f00 -/* 89DF98 802407F8 44811000 */ mtc1 $at, $f2 -/* 89DF9C 802407FC 44820000 */ mtc1 $v0, $f0 -/* 89DFA0 80240800 00000000 */ nop -/* 89DFA4 80240804 46800020 */ cvt.s.w $f0, $f0 -/* 89DFA8 80240808 46020002 */ mul.s $f0, $f0, $f2 -/* 89DFAC 8024080C 00000000 */ nop -/* 89DFB0 80240810 4600203C */ c.lt.s $f4, $f0 -/* 89DFB4 80240814 00000000 */ nop -/* 89DFB8 80240818 45000003 */ bc1f .L80240828 -/* 89DFBC 8024081C 24020001 */ addiu $v0, $zero, 1 -/* 89DFC0 80240820 AE62008C */ sw $v0, 0x8c($s3) -.L80240824: -/* 89DFC4 80240824 0000882D */ daddu $s1, $zero, $zero -.L80240828: -/* 89DFC8 80240828 3C013FC0 */ lui $at, 0x3fc0 -/* 89DFCC 8024082C 4481D000 */ mtc1 $at, $f26 -/* 89DFD0 80240830 4480C000 */ mtc1 $zero, $f24 -/* 89DFD4 80240834 3C013F00 */ lui $at, 0x3f00 -/* 89DFD8 80240838 4481B000 */ mtc1 $at, $f22 -.L8024083C: -/* 89DFDC 8024083C 0C00EAD2 */ jal get_npc_safe -/* 89DFE0 80240840 0220202D */ daddu $a0, $s1, $zero -/* 89DFE4 80240844 0040802D */ daddu $s0, $v0, $zero -/* 89DFE8 80240848 52000035 */ beql $s0, $zero, .L80240920 -/* 89DFEC 8024084C 26310001 */ addiu $s1, $s1, 1 -/* 89DFF0 80240850 C6020038 */ lwc1 $f2, 0x38($s0) -/* 89DFF4 80240854 C6400098 */ lwc1 $f0, 0x98($s2) -/* 89DFF8 80240858 46001081 */ sub.s $f2, $f2, $f0 -/* 89DFFC 8024085C 46021182 */ mul.s $f6, $f2, $f2 -/* 89E000 80240860 00000000 */ nop -/* 89E004 80240864 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89E008 80240868 C6020040 */ lwc1 $f2, 0x40($s0) -/* 89E00C 8024086C 46001081 */ sub.s $f2, $f2, $f0 -/* 89E010 80240870 46021102 */ mul.s $f4, $f2, $f2 -/* 89E014 80240874 00000000 */ nop -/* 89E018 80240878 860200A8 */ lh $v0, 0xa8($s0) -/* 89E01C 8024087C C602003C */ lwc1 $f2, 0x3c($s0) -/* 89E020 80240880 44820000 */ mtc1 $v0, $f0 -/* 89E024 80240884 00000000 */ nop -/* 89E028 80240888 46800020 */ cvt.s.w $f0, $f0 -/* 89E02C 8024088C 46001080 */ add.s $f2, $f2, $f0 -/* 89E030 80240890 461A1081 */ sub.s $f2, $f2, $f26 -/* 89E034 80240894 46043300 */ add.s $f12, $f6, $f4 -/* 89E038 80240898 C640009C */ lwc1 $f0, 0x9c($s2) -/* 89E03C 8024089C 46001501 */ sub.s $f20, $f2, $f0 -/* 89E040 802408A0 46006004 */ sqrt.s $f0, $f12 -/* 89E044 802408A4 46000032 */ c.eq.s $f0, $f0 -/* 89E048 802408A8 00000000 */ nop -/* 89E04C 802408AC 45010003 */ bc1t .L802408BC -/* 89E050 802408B0 00000000 */ nop -/* 89E054 802408B4 0C0187BC */ jal sqrtf -/* 89E058 802408B8 00000000 */ nop -.L802408BC: -/* 89E05C 802408BC 4614C03C */ c.lt.s $f24, $f20 -/* 89E060 802408C0 00000000 */ nop -/* 89E064 802408C4 45000015 */ bc1f .L8024091C -/* 89E068 802408C8 46000106 */ mov.s $f4, $f0 -/* 89E06C 802408CC 860200A8 */ lh $v0, 0xa8($s0) -/* 89E070 802408D0 44820000 */ mtc1 $v0, $f0 -/* 89E074 802408D4 00000000 */ nop -/* 89E078 802408D8 46800020 */ cvt.s.w $f0, $f0 -/* 89E07C 802408DC 4600A03C */ c.lt.s $f20, $f0 -/* 89E080 802408E0 00000000 */ nop -/* 89E084 802408E4 4500000E */ bc1f .L80240920 -/* 89E088 802408E8 26310001 */ addiu $s1, $s1, 1 -/* 89E08C 802408EC 860200A6 */ lh $v0, 0xa6($s0) -/* 89E090 802408F0 44820000 */ mtc1 $v0, $f0 -/* 89E094 802408F4 00000000 */ nop -/* 89E098 802408F8 46800020 */ cvt.s.w $f0, $f0 -/* 89E09C 802408FC 46160002 */ mul.s $f0, $f0, $f22 -/* 89E0A0 80240900 00000000 */ nop -/* 89E0A4 80240904 4600203C */ c.lt.s $f4, $f0 -/* 89E0A8 80240908 00000000 */ nop -/* 89E0AC 8024090C 45000004 */ bc1f .L80240920 -/* 89E0B0 80240910 24020001 */ addiu $v0, $zero, 1 -/* 89E0B4 80240914 0809024B */ j .L8024092C -/* 89E0B8 80240918 AE62008C */ sw $v0, 0x8c($s3) -.L8024091C: -/* 89E0BC 8024091C 26310001 */ addiu $s1, $s1, 1 -.L80240920: -/* 89E0C0 80240920 2A220040 */ slti $v0, $s1, 0x40 -/* 89E0C4 80240924 1440FFC5 */ bnez $v0, .L8024083C -/* 89E0C8 80240928 00000000 */ nop -.L8024092C: -/* 89E0CC 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* 89E0D0 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* 89E0D4 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* 89E0D8 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* 89E0DC 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* 89E0E0 80240940 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 89E0E4 80240944 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 89E0E8 80240948 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 89E0EC 8024094C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 89E0F0 80240950 24020002 */ addiu $v0, $zero, 2 -/* 89E0F4 80240954 03E00008 */ jr $ra -/* 89E0F8 80240958 27BD0048 */ addiu $sp, $sp, 0x48 -/* 89E0FC 8024095C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640_8A0500.s b/ver/us/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640_8A0500.s deleted file mode 100644 index 52ea685332..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640_8A0500.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240640_8A0500 -/* 8A0500 80240640 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8A0504 80240644 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A0508 80240648 0080982D */ daddu $s3, $a0, $zero -/* 8A050C 8024064C AFBF0020 */ sw $ra, 0x20($sp) -/* 8A0510 80240650 AFB20018 */ sw $s2, 0x18($sp) -/* 8A0514 80240654 AFB10014 */ sw $s1, 0x14($sp) -/* 8A0518 80240658 AFB00010 */ sw $s0, 0x10($sp) -/* 8A051C 8024065C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8A0520 80240660 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8A0524 80240664 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8A0528 80240668 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8A052C 8024066C 8E62000C */ lw $v0, 0xc($s3) -/* 8A0530 80240670 0C0B1EAF */ jal evt_get_variable -/* 8A0534 80240674 8C450000 */ lw $a1, ($v0) -/* 8A0538 80240678 2404FFFC */ addiu $a0, $zero, -4 -/* 8A053C 8024067C 0C00EABB */ jal get_npc_unsafe -/* 8A0540 80240680 0040802D */ daddu $s0, $v0, $zero -/* 8A0544 80240684 0200202D */ daddu $a0, $s0, $zero -/* 8A0548 80240688 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8A054C 8024068C 0040802D */ daddu $s0, $v0, $zero -/* 8A0550 80240690 0C046B4C */ jal get_model_from_list_index -/* 8A0554 80240694 0040202D */ daddu $a0, $v0, $zero -/* 8A0558 80240698 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8A055C 8024069C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8A0560 802406A0 0040902D */ daddu $s2, $v0, $zero -/* 8A0564 802406A4 AE60008C */ sw $zero, 0x8c($s3) -/* 8A0568 802406A8 C4620028 */ lwc1 $f2, 0x28($v1) -/* 8A056C 802406AC C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A0570 802406B0 46001081 */ sub.s $f2, $f2, $f0 -/* 8A0574 802406B4 46021182 */ mul.s $f6, $f2, $f2 -/* 8A0578 802406B8 00000000 */ nop -/* 8A057C 802406BC C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A0580 802406C0 C4620030 */ lwc1 $f2, 0x30($v1) -/* 8A0584 802406C4 46001081 */ sub.s $f2, $f2, $f0 -/* 8A0588 802406C8 46021102 */ mul.s $f4, $f2, $f2 -/* 8A058C 802406CC 00000000 */ nop -/* 8A0590 802406D0 846200B0 */ lh $v0, 0xb0($v1) -/* 8A0594 802406D4 C462002C */ lwc1 $f2, 0x2c($v1) -/* 8A0598 802406D8 44820000 */ mtc1 $v0, $f0 -/* 8A059C 802406DC 00000000 */ nop -/* 8A05A0 802406E0 46800020 */ cvt.s.w $f0, $f0 -/* 8A05A4 802406E4 46001080 */ add.s $f2, $f2, $f0 -/* 8A05A8 802406E8 3C013FC0 */ lui $at, 0x3fc0 -/* 8A05AC 802406EC 44810000 */ mtc1 $at, $f0 -/* 8A05B0 802406F0 00000000 */ nop -/* 8A05B4 802406F4 46001081 */ sub.s $f2, $f2, $f0 -/* 8A05B8 802406F8 46043300 */ add.s $f12, $f6, $f4 -/* 8A05BC 802406FC C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A05C0 80240700 46001501 */ sub.s $f20, $f2, $f0 -/* 8A05C4 80240704 46006084 */ sqrt.s $f2, $f12 -/* 8A05C8 80240708 46021032 */ c.eq.s $f2, $f2 -/* 8A05CC 8024070C 00000000 */ nop -/* 8A05D0 80240710 45010004 */ bc1t .L80240724 -/* 8A05D4 80240714 0060882D */ daddu $s1, $v1, $zero -/* 8A05D8 80240718 0C0187BC */ jal sqrtf -/* 8A05DC 8024071C 00000000 */ nop -/* 8A05E0 80240720 46000086 */ mov.s $f2, $f0 -.L80240724: -/* 8A05E4 80240724 44800000 */ mtc1 $zero, $f0 -/* 8A05E8 80240728 00000000 */ nop -/* 8A05EC 8024072C 4614003C */ c.lt.s $f0, $f20 -/* 8A05F0 80240730 00000000 */ nop -/* 8A05F4 80240734 45000016 */ bc1f .L80240790 -/* 8A05F8 80240738 46001106 */ mov.s $f4, $f2 -/* 8A05FC 8024073C 862200B0 */ lh $v0, 0xb0($s1) -/* 8A0600 80240740 44820000 */ mtc1 $v0, $f0 -/* 8A0604 80240744 00000000 */ nop -/* 8A0608 80240748 46800020 */ cvt.s.w $f0, $f0 -/* 8A060C 8024074C 4600A03C */ c.lt.s $f20, $f0 -/* 8A0610 80240750 00000000 */ nop -/* 8A0614 80240754 4500000E */ bc1f .L80240790 -/* 8A0618 80240758 00000000 */ nop -/* 8A061C 8024075C 862200B2 */ lh $v0, 0xb2($s1) -/* 8A0620 80240760 3C013F00 */ lui $at, 0x3f00 -/* 8A0624 80240764 44811000 */ mtc1 $at, $f2 -/* 8A0628 80240768 44820000 */ mtc1 $v0, $f0 -/* 8A062C 8024076C 00000000 */ nop -/* 8A0630 80240770 46800020 */ cvt.s.w $f0, $f0 -/* 8A0634 80240774 46020002 */ mul.s $f0, $f0, $f2 -/* 8A0638 80240778 00000000 */ nop -/* 8A063C 8024077C 4600203C */ c.lt.s $f4, $f0 -/* 8A0640 80240780 00000000 */ nop -/* 8A0644 80240784 45000002 */ bc1f .L80240790 -/* 8A0648 80240788 24020001 */ addiu $v0, $zero, 1 -/* 8A064C 8024078C AE62008C */ sw $v0, 0x8c($s3) -.L80240790: -/* 8A0650 80240790 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A0654 80240794 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A0658 80240798 46001081 */ sub.s $f2, $f2, $f0 -/* 8A065C 8024079C 46021182 */ mul.s $f6, $f2, $f2 -/* 8A0660 802407A0 00000000 */ nop -/* 8A0664 802407A4 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A0668 802407A8 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A066C 802407AC 46001081 */ sub.s $f2, $f2, $f0 -/* 8A0670 802407B0 46021102 */ mul.s $f4, $f2, $f2 -/* 8A0674 802407B4 00000000 */ nop -/* 8A0678 802407B8 860200A8 */ lh $v0, 0xa8($s0) -/* 8A067C 802407BC C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A0680 802407C0 44820000 */ mtc1 $v0, $f0 -/* 8A0684 802407C4 00000000 */ nop -/* 8A0688 802407C8 46800020 */ cvt.s.w $f0, $f0 -/* 8A068C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* 8A0690 802407D0 3C013FC0 */ lui $at, 0x3fc0 -/* 8A0694 802407D4 44810000 */ mtc1 $at, $f0 -/* 8A0698 802407D8 00000000 */ nop -/* 8A069C 802407DC 46001081 */ sub.s $f2, $f2, $f0 -/* 8A06A0 802407E0 46043300 */ add.s $f12, $f6, $f4 -/* 8A06A4 802407E4 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A06A8 802407E8 46001501 */ sub.s $f20, $f2, $f0 -/* 8A06AC 802407EC 46006084 */ sqrt.s $f2, $f12 -/* 8A06B0 802407F0 46021032 */ c.eq.s $f2, $f2 -/* 8A06B4 802407F4 00000000 */ nop -/* 8A06B8 802407F8 45010004 */ bc1t .L8024080C -/* 8A06BC 802407FC 00000000 */ nop -/* 8A06C0 80240800 0C0187BC */ jal sqrtf -/* 8A06C4 80240804 00000000 */ nop -/* 8A06C8 80240808 46000086 */ mov.s $f2, $f0 -.L8024080C: -/* 8A06CC 8024080C 44800000 */ mtc1 $zero, $f0 -/* 8A06D0 80240810 00000000 */ nop -/* 8A06D4 80240814 4614003C */ c.lt.s $f0, $f20 -/* 8A06D8 80240818 00000000 */ nop -/* 8A06DC 8024081C 45000016 */ bc1f .L80240878 -/* 8A06E0 80240820 46001106 */ mov.s $f4, $f2 -/* 8A06E4 80240824 860200A8 */ lh $v0, 0xa8($s0) -/* 8A06E8 80240828 44820000 */ mtc1 $v0, $f0 -/* 8A06EC 8024082C 00000000 */ nop -/* 8A06F0 80240830 46800020 */ cvt.s.w $f0, $f0 -/* 8A06F4 80240834 4600A03C */ c.lt.s $f20, $f0 -/* 8A06F8 80240838 00000000 */ nop -/* 8A06FC 8024083C 4500000F */ bc1f .L8024087C -/* 8A0700 80240840 0000882D */ daddu $s1, $zero, $zero -/* 8A0704 80240844 860200A6 */ lh $v0, 0xa6($s0) -/* 8A0708 80240848 3C013F00 */ lui $at, 0x3f00 -/* 8A070C 8024084C 44811000 */ mtc1 $at, $f2 -/* 8A0710 80240850 44820000 */ mtc1 $v0, $f0 -/* 8A0714 80240854 00000000 */ nop -/* 8A0718 80240858 46800020 */ cvt.s.w $f0, $f0 -/* 8A071C 8024085C 46020002 */ mul.s $f0, $f0, $f2 -/* 8A0720 80240860 00000000 */ nop -/* 8A0724 80240864 4600203C */ c.lt.s $f4, $f0 -/* 8A0728 80240868 00000000 */ nop -/* 8A072C 8024086C 45000003 */ bc1f .L8024087C -/* 8A0730 80240870 24020001 */ addiu $v0, $zero, 1 -/* 8A0734 80240874 AE62008C */ sw $v0, 0x8c($s3) -.L80240878: -/* 8A0738 80240878 0000882D */ daddu $s1, $zero, $zero -.L8024087C: -/* 8A073C 8024087C 3C013FC0 */ lui $at, 0x3fc0 -/* 8A0740 80240880 4481D000 */ mtc1 $at, $f26 -/* 8A0744 80240884 4480C000 */ mtc1 $zero, $f24 -/* 8A0748 80240888 3C013F00 */ lui $at, 0x3f00 -/* 8A074C 8024088C 4481B000 */ mtc1 $at, $f22 -.L80240890: -/* 8A0750 80240890 0C00EAD2 */ jal get_npc_safe -/* 8A0754 80240894 0220202D */ daddu $a0, $s1, $zero -/* 8A0758 80240898 0040802D */ daddu $s0, $v0, $zero -/* 8A075C 8024089C 52000035 */ beql $s0, $zero, .L80240974 -/* 8A0760 802408A0 26310001 */ addiu $s1, $s1, 1 -/* 8A0764 802408A4 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A0768 802408A8 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A076C 802408AC 46001081 */ sub.s $f2, $f2, $f0 -/* 8A0770 802408B0 46021182 */ mul.s $f6, $f2, $f2 -/* 8A0774 802408B4 00000000 */ nop -/* 8A0778 802408B8 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A077C 802408BC C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A0780 802408C0 46001081 */ sub.s $f2, $f2, $f0 -/* 8A0784 802408C4 46021102 */ mul.s $f4, $f2, $f2 -/* 8A0788 802408C8 00000000 */ nop -/* 8A078C 802408CC 860200A8 */ lh $v0, 0xa8($s0) -/* 8A0790 802408D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A0794 802408D4 44820000 */ mtc1 $v0, $f0 -/* 8A0798 802408D8 00000000 */ nop -/* 8A079C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 8A07A0 802408E0 46001080 */ add.s $f2, $f2, $f0 -/* 8A07A4 802408E4 461A1081 */ sub.s $f2, $f2, $f26 -/* 8A07A8 802408E8 46043300 */ add.s $f12, $f6, $f4 -/* 8A07AC 802408EC C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A07B0 802408F0 46001501 */ sub.s $f20, $f2, $f0 -/* 8A07B4 802408F4 46006004 */ sqrt.s $f0, $f12 -/* 8A07B8 802408F8 46000032 */ c.eq.s $f0, $f0 -/* 8A07BC 802408FC 00000000 */ nop -/* 8A07C0 80240900 45010003 */ bc1t .L80240910 -/* 8A07C4 80240904 00000000 */ nop -/* 8A07C8 80240908 0C0187BC */ jal sqrtf -/* 8A07CC 8024090C 00000000 */ nop -.L80240910: -/* 8A07D0 80240910 4614C03C */ c.lt.s $f24, $f20 -/* 8A07D4 80240914 00000000 */ nop -/* 8A07D8 80240918 45000015 */ bc1f .L80240970 -/* 8A07DC 8024091C 46000106 */ mov.s $f4, $f0 -/* 8A07E0 80240920 860200A8 */ lh $v0, 0xa8($s0) -/* 8A07E4 80240924 44820000 */ mtc1 $v0, $f0 -/* 8A07E8 80240928 00000000 */ nop -/* 8A07EC 8024092C 46800020 */ cvt.s.w $f0, $f0 -/* 8A07F0 80240930 4600A03C */ c.lt.s $f20, $f0 -/* 8A07F4 80240934 00000000 */ nop -/* 8A07F8 80240938 4500000E */ bc1f .L80240974 -/* 8A07FC 8024093C 26310001 */ addiu $s1, $s1, 1 -/* 8A0800 80240940 860200A6 */ lh $v0, 0xa6($s0) -/* 8A0804 80240944 44820000 */ mtc1 $v0, $f0 -/* 8A0808 80240948 00000000 */ nop -/* 8A080C 8024094C 46800020 */ cvt.s.w $f0, $f0 -/* 8A0810 80240950 46160002 */ mul.s $f0, $f0, $f22 -/* 8A0814 80240954 00000000 */ nop -/* 8A0818 80240958 4600203C */ c.lt.s $f4, $f0 -/* 8A081C 8024095C 00000000 */ nop -/* 8A0820 80240960 45000004 */ bc1f .L80240974 -/* 8A0824 80240964 24020001 */ addiu $v0, $zero, 1 -/* 8A0828 80240968 08090260 */ j .L80240980 -/* 8A082C 8024096C AE62008C */ sw $v0, 0x8c($s3) -.L80240970: -/* 8A0830 80240970 26310001 */ addiu $s1, $s1, 1 -.L80240974: -/* 8A0834 80240974 2A220040 */ slti $v0, $s1, 0x40 -/* 8A0838 80240978 1440FFC5 */ bnez $v0, .L80240890 -/* 8A083C 8024097C 00000000 */ nop -.L80240980: -/* 8A0840 80240980 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A0844 80240984 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A0848 80240988 8FB20018 */ lw $s2, 0x18($sp) -/* 8A084C 8024098C 8FB10014 */ lw $s1, 0x14($sp) -/* 8A0850 80240990 8FB00010 */ lw $s0, 0x10($sp) -/* 8A0854 80240994 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 8A0858 80240998 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8A085C 8024099C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8A0860 802409A0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8A0864 802409A4 24020002 */ addiu $v0, $zero, 2 -/* 8A0868 802409A8 03E00008 */ jr $ra -/* 8A086C 802409AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802405EC_8A29BC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802405EC_8A29BC.s deleted file mode 100644 index c9e7e76f85..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802405EC_8A29BC.s +++ /dev/null @@ -1,235 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_8A29BC -/* 8A29BC 802405EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8A29C0 802405F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A29C4 802405F4 0080982D */ daddu $s3, $a0, $zero -/* 8A29C8 802405F8 AFBF0020 */ sw $ra, 0x20($sp) -/* 8A29CC 802405FC AFB20018 */ sw $s2, 0x18($sp) -/* 8A29D0 80240600 AFB10014 */ sw $s1, 0x14($sp) -/* 8A29D4 80240604 AFB00010 */ sw $s0, 0x10($sp) -/* 8A29D8 80240608 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8A29DC 8024060C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8A29E0 80240610 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8A29E4 80240614 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8A29E8 80240618 8E62000C */ lw $v0, 0xc($s3) -/* 8A29EC 8024061C 0C0B1EAF */ jal evt_get_variable -/* 8A29F0 80240620 8C450000 */ lw $a1, ($v0) -/* 8A29F4 80240624 2404FFFC */ addiu $a0, $zero, -4 -/* 8A29F8 80240628 0C00EABB */ jal get_npc_unsafe -/* 8A29FC 8024062C 0040802D */ daddu $s0, $v0, $zero -/* 8A2A00 80240630 0200202D */ daddu $a0, $s0, $zero -/* 8A2A04 80240634 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8A2A08 80240638 0040802D */ daddu $s0, $v0, $zero -/* 8A2A0C 8024063C 0C046B4C */ jal get_model_from_list_index -/* 8A2A10 80240640 0040202D */ daddu $a0, $v0, $zero -/* 8A2A14 80240644 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8A2A18 80240648 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8A2A1C 8024064C 0040902D */ daddu $s2, $v0, $zero -/* 8A2A20 80240650 AE60008C */ sw $zero, 0x8c($s3) -/* 8A2A24 80240654 C4620028 */ lwc1 $f2, 0x28($v1) -/* 8A2A28 80240658 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A2A2C 8024065C 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2A30 80240660 46021182 */ mul.s $f6, $f2, $f2 -/* 8A2A34 80240664 00000000 */ nop -/* 8A2A38 80240668 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A2A3C 8024066C C4620030 */ lwc1 $f2, 0x30($v1) -/* 8A2A40 80240670 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2A44 80240674 46021102 */ mul.s $f4, $f2, $f2 -/* 8A2A48 80240678 00000000 */ nop -/* 8A2A4C 8024067C 846200B0 */ lh $v0, 0xb0($v1) -/* 8A2A50 80240680 C462002C */ lwc1 $f2, 0x2c($v1) -/* 8A2A54 80240684 44820000 */ mtc1 $v0, $f0 -/* 8A2A58 80240688 00000000 */ nop -/* 8A2A5C 8024068C 46800020 */ cvt.s.w $f0, $f0 -/* 8A2A60 80240690 46001080 */ add.s $f2, $f2, $f0 -/* 8A2A64 80240694 3C013FC0 */ lui $at, 0x3fc0 -/* 8A2A68 80240698 44810000 */ mtc1 $at, $f0 -/* 8A2A6C 8024069C 00000000 */ nop -/* 8A2A70 802406A0 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2A74 802406A4 46043300 */ add.s $f12, $f6, $f4 -/* 8A2A78 802406A8 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A2A7C 802406AC 46001501 */ sub.s $f20, $f2, $f0 -/* 8A2A80 802406B0 46006084 */ sqrt.s $f2, $f12 -/* 8A2A84 802406B4 46021032 */ c.eq.s $f2, $f2 -/* 8A2A88 802406B8 00000000 */ nop -/* 8A2A8C 802406BC 45010004 */ bc1t .L802406D0 -/* 8A2A90 802406C0 0060882D */ daddu $s1, $v1, $zero -/* 8A2A94 802406C4 0C0187BC */ jal sqrtf -/* 8A2A98 802406C8 00000000 */ nop -/* 8A2A9C 802406CC 46000086 */ mov.s $f2, $f0 -.L802406D0: -/* 8A2AA0 802406D0 44800000 */ mtc1 $zero, $f0 -/* 8A2AA4 802406D4 00000000 */ nop -/* 8A2AA8 802406D8 4614003C */ c.lt.s $f0, $f20 -/* 8A2AAC 802406DC 00000000 */ nop -/* 8A2AB0 802406E0 45000016 */ bc1f .L8024073C -/* 8A2AB4 802406E4 46001106 */ mov.s $f4, $f2 -/* 8A2AB8 802406E8 862200B0 */ lh $v0, 0xb0($s1) -/* 8A2ABC 802406EC 44820000 */ mtc1 $v0, $f0 -/* 8A2AC0 802406F0 00000000 */ nop -/* 8A2AC4 802406F4 46800020 */ cvt.s.w $f0, $f0 -/* 8A2AC8 802406F8 4600A03C */ c.lt.s $f20, $f0 -/* 8A2ACC 802406FC 00000000 */ nop -/* 8A2AD0 80240700 4500000E */ bc1f .L8024073C -/* 8A2AD4 80240704 00000000 */ nop -/* 8A2AD8 80240708 862200B2 */ lh $v0, 0xb2($s1) -/* 8A2ADC 8024070C 3C013F00 */ lui $at, 0x3f00 -/* 8A2AE0 80240710 44811000 */ mtc1 $at, $f2 -/* 8A2AE4 80240714 44820000 */ mtc1 $v0, $f0 -/* 8A2AE8 80240718 00000000 */ nop -/* 8A2AEC 8024071C 46800020 */ cvt.s.w $f0, $f0 -/* 8A2AF0 80240720 46020002 */ mul.s $f0, $f0, $f2 -/* 8A2AF4 80240724 00000000 */ nop -/* 8A2AF8 80240728 4600203C */ c.lt.s $f4, $f0 -/* 8A2AFC 8024072C 00000000 */ nop -/* 8A2B00 80240730 45000002 */ bc1f .L8024073C -/* 8A2B04 80240734 24020001 */ addiu $v0, $zero, 1 -/* 8A2B08 80240738 AE62008C */ sw $v0, 0x8c($s3) -.L8024073C: -/* 8A2B0C 8024073C C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A2B10 80240740 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A2B14 80240744 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2B18 80240748 46021182 */ mul.s $f6, $f2, $f2 -/* 8A2B1C 8024074C 00000000 */ nop -/* 8A2B20 80240750 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A2B24 80240754 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A2B28 80240758 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2B2C 8024075C 46021102 */ mul.s $f4, $f2, $f2 -/* 8A2B30 80240760 00000000 */ nop -/* 8A2B34 80240764 860200A8 */ lh $v0, 0xa8($s0) -/* 8A2B38 80240768 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A2B3C 8024076C 44820000 */ mtc1 $v0, $f0 -/* 8A2B40 80240770 00000000 */ nop -/* 8A2B44 80240774 46800020 */ cvt.s.w $f0, $f0 -/* 8A2B48 80240778 46001080 */ add.s $f2, $f2, $f0 -/* 8A2B4C 8024077C 3C013FC0 */ lui $at, 0x3fc0 -/* 8A2B50 80240780 44810000 */ mtc1 $at, $f0 -/* 8A2B54 80240784 00000000 */ nop -/* 8A2B58 80240788 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2B5C 8024078C 46043300 */ add.s $f12, $f6, $f4 -/* 8A2B60 80240790 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A2B64 80240794 46001501 */ sub.s $f20, $f2, $f0 -/* 8A2B68 80240798 46006084 */ sqrt.s $f2, $f12 -/* 8A2B6C 8024079C 46021032 */ c.eq.s $f2, $f2 -/* 8A2B70 802407A0 00000000 */ nop -/* 8A2B74 802407A4 45010004 */ bc1t .L802407B8 -/* 8A2B78 802407A8 00000000 */ nop -/* 8A2B7C 802407AC 0C0187BC */ jal sqrtf -/* 8A2B80 802407B0 00000000 */ nop -/* 8A2B84 802407B4 46000086 */ mov.s $f2, $f0 -.L802407B8: -/* 8A2B88 802407B8 44800000 */ mtc1 $zero, $f0 -/* 8A2B8C 802407BC 00000000 */ nop -/* 8A2B90 802407C0 4614003C */ c.lt.s $f0, $f20 -/* 8A2B94 802407C4 00000000 */ nop -/* 8A2B98 802407C8 45000016 */ bc1f .L80240824 -/* 8A2B9C 802407CC 46001106 */ mov.s $f4, $f2 -/* 8A2BA0 802407D0 860200A8 */ lh $v0, 0xa8($s0) -/* 8A2BA4 802407D4 44820000 */ mtc1 $v0, $f0 -/* 8A2BA8 802407D8 00000000 */ nop -/* 8A2BAC 802407DC 46800020 */ cvt.s.w $f0, $f0 -/* 8A2BB0 802407E0 4600A03C */ c.lt.s $f20, $f0 -/* 8A2BB4 802407E4 00000000 */ nop -/* 8A2BB8 802407E8 4500000F */ bc1f .L80240828 -/* 8A2BBC 802407EC 0000882D */ daddu $s1, $zero, $zero -/* 8A2BC0 802407F0 860200A6 */ lh $v0, 0xa6($s0) -/* 8A2BC4 802407F4 3C013F00 */ lui $at, 0x3f00 -/* 8A2BC8 802407F8 44811000 */ mtc1 $at, $f2 -/* 8A2BCC 802407FC 44820000 */ mtc1 $v0, $f0 -/* 8A2BD0 80240800 00000000 */ nop -/* 8A2BD4 80240804 46800020 */ cvt.s.w $f0, $f0 -/* 8A2BD8 80240808 46020002 */ mul.s $f0, $f0, $f2 -/* 8A2BDC 8024080C 00000000 */ nop -/* 8A2BE0 80240810 4600203C */ c.lt.s $f4, $f0 -/* 8A2BE4 80240814 00000000 */ nop -/* 8A2BE8 80240818 45000003 */ bc1f .L80240828 -/* 8A2BEC 8024081C 24020001 */ addiu $v0, $zero, 1 -/* 8A2BF0 80240820 AE62008C */ sw $v0, 0x8c($s3) -.L80240824: -/* 8A2BF4 80240824 0000882D */ daddu $s1, $zero, $zero -.L80240828: -/* 8A2BF8 80240828 3C013FC0 */ lui $at, 0x3fc0 -/* 8A2BFC 8024082C 4481D000 */ mtc1 $at, $f26 -/* 8A2C00 80240830 4480C000 */ mtc1 $zero, $f24 -/* 8A2C04 80240834 3C013F00 */ lui $at, 0x3f00 -/* 8A2C08 80240838 4481B000 */ mtc1 $at, $f22 -.L8024083C: -/* 8A2C0C 8024083C 0C00EAD2 */ jal get_npc_safe -/* 8A2C10 80240840 0220202D */ daddu $a0, $s1, $zero -/* 8A2C14 80240844 0040802D */ daddu $s0, $v0, $zero -/* 8A2C18 80240848 52000035 */ beql $s0, $zero, .L80240920 -/* 8A2C1C 8024084C 26310001 */ addiu $s1, $s1, 1 -/* 8A2C20 80240850 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A2C24 80240854 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A2C28 80240858 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2C2C 8024085C 46021182 */ mul.s $f6, $f2, $f2 -/* 8A2C30 80240860 00000000 */ nop -/* 8A2C34 80240864 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A2C38 80240868 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A2C3C 8024086C 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2C40 80240870 46021102 */ mul.s $f4, $f2, $f2 -/* 8A2C44 80240874 00000000 */ nop -/* 8A2C48 80240878 860200A8 */ lh $v0, 0xa8($s0) -/* 8A2C4C 8024087C C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A2C50 80240880 44820000 */ mtc1 $v0, $f0 -/* 8A2C54 80240884 00000000 */ nop -/* 8A2C58 80240888 46800020 */ cvt.s.w $f0, $f0 -/* 8A2C5C 8024088C 46001080 */ add.s $f2, $f2, $f0 -/* 8A2C60 80240890 461A1081 */ sub.s $f2, $f2, $f26 -/* 8A2C64 80240894 46043300 */ add.s $f12, $f6, $f4 -/* 8A2C68 80240898 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A2C6C 8024089C 46001501 */ sub.s $f20, $f2, $f0 -/* 8A2C70 802408A0 46006004 */ sqrt.s $f0, $f12 -/* 8A2C74 802408A4 46000032 */ c.eq.s $f0, $f0 -/* 8A2C78 802408A8 00000000 */ nop -/* 8A2C7C 802408AC 45010003 */ bc1t .L802408BC -/* 8A2C80 802408B0 00000000 */ nop -/* 8A2C84 802408B4 0C0187BC */ jal sqrtf -/* 8A2C88 802408B8 00000000 */ nop -.L802408BC: -/* 8A2C8C 802408BC 4614C03C */ c.lt.s $f24, $f20 -/* 8A2C90 802408C0 00000000 */ nop -/* 8A2C94 802408C4 45000015 */ bc1f .L8024091C -/* 8A2C98 802408C8 46000106 */ mov.s $f4, $f0 -/* 8A2C9C 802408CC 860200A8 */ lh $v0, 0xa8($s0) -/* 8A2CA0 802408D0 44820000 */ mtc1 $v0, $f0 -/* 8A2CA4 802408D4 00000000 */ nop -/* 8A2CA8 802408D8 46800020 */ cvt.s.w $f0, $f0 -/* 8A2CAC 802408DC 4600A03C */ c.lt.s $f20, $f0 -/* 8A2CB0 802408E0 00000000 */ nop -/* 8A2CB4 802408E4 4500000E */ bc1f .L80240920 -/* 8A2CB8 802408E8 26310001 */ addiu $s1, $s1, 1 -/* 8A2CBC 802408EC 860200A6 */ lh $v0, 0xa6($s0) -/* 8A2CC0 802408F0 44820000 */ mtc1 $v0, $f0 -/* 8A2CC4 802408F4 00000000 */ nop -/* 8A2CC8 802408F8 46800020 */ cvt.s.w $f0, $f0 -/* 8A2CCC 802408FC 46160002 */ mul.s $f0, $f0, $f22 -/* 8A2CD0 80240900 00000000 */ nop -/* 8A2CD4 80240904 4600203C */ c.lt.s $f4, $f0 -/* 8A2CD8 80240908 00000000 */ nop -/* 8A2CDC 8024090C 45000004 */ bc1f .L80240920 -/* 8A2CE0 80240910 24020001 */ addiu $v0, $zero, 1 -/* 8A2CE4 80240914 0809024B */ j .L8024092C -/* 8A2CE8 80240918 AE62008C */ sw $v0, 0x8c($s3) -.L8024091C: -/* 8A2CEC 8024091C 26310001 */ addiu $s1, $s1, 1 -.L80240920: -/* 8A2CF0 80240920 2A220040 */ slti $v0, $s1, 0x40 -/* 8A2CF4 80240924 1440FFC5 */ bnez $v0, .L8024083C -/* 8A2CF8 80240928 00000000 */ nop -.L8024092C: -/* 8A2CFC 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A2D00 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A2D04 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* 8A2D08 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* 8A2D0C 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* 8A2D10 80240940 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 8A2D14 80240944 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8A2D18 80240948 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8A2D1C 8024094C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8A2D20 80240950 24020002 */ addiu $v0, $zero, 2 -/* 8A2D24 80240954 03E00008 */ jr $ra -/* 8A2D28 80240958 27BD0048 */ addiu $sp, $sp, 0x48 -/* 8A2D2C 8024095C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360_8A5DE0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360_8A5DE0.s deleted file mode 100644 index 6c80573739..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360_8A5DE0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240360_8A5DE0 -/* 8A5DE0 80240360 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8A5DE4 80240364 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A5DE8 80240368 0080982D */ daddu $s3, $a0, $zero -/* 8A5DEC 8024036C AFBF0020 */ sw $ra, 0x20($sp) -/* 8A5DF0 80240370 AFB20018 */ sw $s2, 0x18($sp) -/* 8A5DF4 80240374 AFB10014 */ sw $s1, 0x14($sp) -/* 8A5DF8 80240378 AFB00010 */ sw $s0, 0x10($sp) -/* 8A5DFC 8024037C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8A5E00 80240380 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8A5E04 80240384 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8A5E08 80240388 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8A5E0C 8024038C 8E62000C */ lw $v0, 0xc($s3) -/* 8A5E10 80240390 0C0B1EAF */ jal evt_get_variable -/* 8A5E14 80240394 8C450000 */ lw $a1, ($v0) -/* 8A5E18 80240398 2404FFFC */ addiu $a0, $zero, -4 -/* 8A5E1C 8024039C 0C00EABB */ jal get_npc_unsafe -/* 8A5E20 802403A0 0040802D */ daddu $s0, $v0, $zero -/* 8A5E24 802403A4 0200202D */ daddu $a0, $s0, $zero -/* 8A5E28 802403A8 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8A5E2C 802403AC 0040802D */ daddu $s0, $v0, $zero -/* 8A5E30 802403B0 0C046B4C */ jal get_model_from_list_index -/* 8A5E34 802403B4 0040202D */ daddu $a0, $v0, $zero -/* 8A5E38 802403B8 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8A5E3C 802403BC 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8A5E40 802403C0 0040902D */ daddu $s2, $v0, $zero -/* 8A5E44 802403C4 AE60008C */ sw $zero, 0x8c($s3) -/* 8A5E48 802403C8 C4620028 */ lwc1 $f2, 0x28($v1) -/* 8A5E4C 802403CC C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A5E50 802403D0 46001081 */ sub.s $f2, $f2, $f0 -/* 8A5E54 802403D4 46021182 */ mul.s $f6, $f2, $f2 -/* 8A5E58 802403D8 00000000 */ nop -/* 8A5E5C 802403DC C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A5E60 802403E0 C4620030 */ lwc1 $f2, 0x30($v1) -/* 8A5E64 802403E4 46001081 */ sub.s $f2, $f2, $f0 -/* 8A5E68 802403E8 46021102 */ mul.s $f4, $f2, $f2 -/* 8A5E6C 802403EC 00000000 */ nop -/* 8A5E70 802403F0 846200B0 */ lh $v0, 0xb0($v1) -/* 8A5E74 802403F4 C462002C */ lwc1 $f2, 0x2c($v1) -/* 8A5E78 802403F8 44820000 */ mtc1 $v0, $f0 -/* 8A5E7C 802403FC 00000000 */ nop -/* 8A5E80 80240400 46800020 */ cvt.s.w $f0, $f0 -/* 8A5E84 80240404 46001080 */ add.s $f2, $f2, $f0 -/* 8A5E88 80240408 3C013FC0 */ lui $at, 0x3fc0 -/* 8A5E8C 8024040C 44810000 */ mtc1 $at, $f0 -/* 8A5E90 80240410 00000000 */ nop -/* 8A5E94 80240414 46001081 */ sub.s $f2, $f2, $f0 -/* 8A5E98 80240418 46043300 */ add.s $f12, $f6, $f4 -/* 8A5E9C 8024041C C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A5EA0 80240420 46001501 */ sub.s $f20, $f2, $f0 -/* 8A5EA4 80240424 46006084 */ sqrt.s $f2, $f12 -/* 8A5EA8 80240428 46021032 */ c.eq.s $f2, $f2 -/* 8A5EAC 8024042C 00000000 */ nop -/* 8A5EB0 80240430 45010004 */ bc1t .L80240444 -/* 8A5EB4 80240434 0060882D */ daddu $s1, $v1, $zero -/* 8A5EB8 80240438 0C0187BC */ jal sqrtf -/* 8A5EBC 8024043C 00000000 */ nop -/* 8A5EC0 80240440 46000086 */ mov.s $f2, $f0 -.L80240444: -/* 8A5EC4 80240444 44800000 */ mtc1 $zero, $f0 -/* 8A5EC8 80240448 00000000 */ nop -/* 8A5ECC 8024044C 4614003C */ c.lt.s $f0, $f20 -/* 8A5ED0 80240450 00000000 */ nop -/* 8A5ED4 80240454 45000016 */ bc1f .L802404B0 -/* 8A5ED8 80240458 46001106 */ mov.s $f4, $f2 -/* 8A5EDC 8024045C 862200B0 */ lh $v0, 0xb0($s1) -/* 8A5EE0 80240460 44820000 */ mtc1 $v0, $f0 -/* 8A5EE4 80240464 00000000 */ nop -/* 8A5EE8 80240468 46800020 */ cvt.s.w $f0, $f0 -/* 8A5EEC 8024046C 4600A03C */ c.lt.s $f20, $f0 -/* 8A5EF0 80240470 00000000 */ nop -/* 8A5EF4 80240474 4500000E */ bc1f .L802404B0 -/* 8A5EF8 80240478 00000000 */ nop -/* 8A5EFC 8024047C 862200B2 */ lh $v0, 0xb2($s1) -/* 8A5F00 80240480 3C013F00 */ lui $at, 0x3f00 -/* 8A5F04 80240484 44811000 */ mtc1 $at, $f2 -/* 8A5F08 80240488 44820000 */ mtc1 $v0, $f0 -/* 8A5F0C 8024048C 00000000 */ nop -/* 8A5F10 80240490 46800020 */ cvt.s.w $f0, $f0 -/* 8A5F14 80240494 46020002 */ mul.s $f0, $f0, $f2 -/* 8A5F18 80240498 00000000 */ nop -/* 8A5F1C 8024049C 4600203C */ c.lt.s $f4, $f0 -/* 8A5F20 802404A0 00000000 */ nop -/* 8A5F24 802404A4 45000002 */ bc1f .L802404B0 -/* 8A5F28 802404A8 24020001 */ addiu $v0, $zero, 1 -/* 8A5F2C 802404AC AE62008C */ sw $v0, 0x8c($s3) -.L802404B0: -/* 8A5F30 802404B0 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A5F34 802404B4 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A5F38 802404B8 46001081 */ sub.s $f2, $f2, $f0 -/* 8A5F3C 802404BC 46021182 */ mul.s $f6, $f2, $f2 -/* 8A5F40 802404C0 00000000 */ nop -/* 8A5F44 802404C4 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A5F48 802404C8 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A5F4C 802404CC 46001081 */ sub.s $f2, $f2, $f0 -/* 8A5F50 802404D0 46021102 */ mul.s $f4, $f2, $f2 -/* 8A5F54 802404D4 00000000 */ nop -/* 8A5F58 802404D8 860200A8 */ lh $v0, 0xa8($s0) -/* 8A5F5C 802404DC C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A5F60 802404E0 44820000 */ mtc1 $v0, $f0 -/* 8A5F64 802404E4 00000000 */ nop -/* 8A5F68 802404E8 46800020 */ cvt.s.w $f0, $f0 -/* 8A5F6C 802404EC 46001080 */ add.s $f2, $f2, $f0 -/* 8A5F70 802404F0 3C013FC0 */ lui $at, 0x3fc0 -/* 8A5F74 802404F4 44810000 */ mtc1 $at, $f0 -/* 8A5F78 802404F8 00000000 */ nop -/* 8A5F7C 802404FC 46001081 */ sub.s $f2, $f2, $f0 -/* 8A5F80 80240500 46043300 */ add.s $f12, $f6, $f4 -/* 8A5F84 80240504 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A5F88 80240508 46001501 */ sub.s $f20, $f2, $f0 -/* 8A5F8C 8024050C 46006084 */ sqrt.s $f2, $f12 -/* 8A5F90 80240510 46021032 */ c.eq.s $f2, $f2 -/* 8A5F94 80240514 00000000 */ nop -/* 8A5F98 80240518 45010004 */ bc1t .L8024052C -/* 8A5F9C 8024051C 00000000 */ nop -/* 8A5FA0 80240520 0C0187BC */ jal sqrtf -/* 8A5FA4 80240524 00000000 */ nop -/* 8A5FA8 80240528 46000086 */ mov.s $f2, $f0 -.L8024052C: -/* 8A5FAC 8024052C 44800000 */ mtc1 $zero, $f0 -/* 8A5FB0 80240530 00000000 */ nop -/* 8A5FB4 80240534 4614003C */ c.lt.s $f0, $f20 -/* 8A5FB8 80240538 00000000 */ nop -/* 8A5FBC 8024053C 45000016 */ bc1f .L80240598 -/* 8A5FC0 80240540 46001106 */ mov.s $f4, $f2 -/* 8A5FC4 80240544 860200A8 */ lh $v0, 0xa8($s0) -/* 8A5FC8 80240548 44820000 */ mtc1 $v0, $f0 -/* 8A5FCC 8024054C 00000000 */ nop -/* 8A5FD0 80240550 46800020 */ cvt.s.w $f0, $f0 -/* 8A5FD4 80240554 4600A03C */ c.lt.s $f20, $f0 -/* 8A5FD8 80240558 00000000 */ nop -/* 8A5FDC 8024055C 4500000F */ bc1f .L8024059C -/* 8A5FE0 80240560 0000882D */ daddu $s1, $zero, $zero -/* 8A5FE4 80240564 860200A6 */ lh $v0, 0xa6($s0) -/* 8A5FE8 80240568 3C013F00 */ lui $at, 0x3f00 -/* 8A5FEC 8024056C 44811000 */ mtc1 $at, $f2 -/* 8A5FF0 80240570 44820000 */ mtc1 $v0, $f0 -/* 8A5FF4 80240574 00000000 */ nop -/* 8A5FF8 80240578 46800020 */ cvt.s.w $f0, $f0 -/* 8A5FFC 8024057C 46020002 */ mul.s $f0, $f0, $f2 -/* 8A6000 80240580 00000000 */ nop -/* 8A6004 80240584 4600203C */ c.lt.s $f4, $f0 -/* 8A6008 80240588 00000000 */ nop -/* 8A600C 8024058C 45000003 */ bc1f .L8024059C -/* 8A6010 80240590 24020001 */ addiu $v0, $zero, 1 -/* 8A6014 80240594 AE62008C */ sw $v0, 0x8c($s3) -.L80240598: -/* 8A6018 80240598 0000882D */ daddu $s1, $zero, $zero -.L8024059C: -/* 8A601C 8024059C 3C013FC0 */ lui $at, 0x3fc0 -/* 8A6020 802405A0 4481D000 */ mtc1 $at, $f26 -/* 8A6024 802405A4 4480C000 */ mtc1 $zero, $f24 -/* 8A6028 802405A8 3C013F00 */ lui $at, 0x3f00 -/* 8A602C 802405AC 4481B000 */ mtc1 $at, $f22 -.L802405B0: -/* 8A6030 802405B0 0C00EAD2 */ jal get_npc_safe -/* 8A6034 802405B4 0220202D */ daddu $a0, $s1, $zero -/* 8A6038 802405B8 0040802D */ daddu $s0, $v0, $zero -/* 8A603C 802405BC 52000035 */ beql $s0, $zero, .L80240694 -/* 8A6040 802405C0 26310001 */ addiu $s1, $s1, 1 -/* 8A6044 802405C4 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A6048 802405C8 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A604C 802405CC 46001081 */ sub.s $f2, $f2, $f0 -/* 8A6050 802405D0 46021182 */ mul.s $f6, $f2, $f2 -/* 8A6054 802405D4 00000000 */ nop -/* 8A6058 802405D8 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A605C 802405DC C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A6060 802405E0 46001081 */ sub.s $f2, $f2, $f0 -/* 8A6064 802405E4 46021102 */ mul.s $f4, $f2, $f2 -/* 8A6068 802405E8 00000000 */ nop -/* 8A606C 802405EC 860200A8 */ lh $v0, 0xa8($s0) -/* 8A6070 802405F0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A6074 802405F4 44820000 */ mtc1 $v0, $f0 -/* 8A6078 802405F8 00000000 */ nop -/* 8A607C 802405FC 46800020 */ cvt.s.w $f0, $f0 -/* 8A6080 80240600 46001080 */ add.s $f2, $f2, $f0 -/* 8A6084 80240604 461A1081 */ sub.s $f2, $f2, $f26 -/* 8A6088 80240608 46043300 */ add.s $f12, $f6, $f4 -/* 8A608C 8024060C C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A6090 80240610 46001501 */ sub.s $f20, $f2, $f0 -/* 8A6094 80240614 46006004 */ sqrt.s $f0, $f12 -/* 8A6098 80240618 46000032 */ c.eq.s $f0, $f0 -/* 8A609C 8024061C 00000000 */ nop -/* 8A60A0 80240620 45010003 */ bc1t .L80240630 -/* 8A60A4 80240624 00000000 */ nop -/* 8A60A8 80240628 0C0187BC */ jal sqrtf -/* 8A60AC 8024062C 00000000 */ nop -.L80240630: -/* 8A60B0 80240630 4614C03C */ c.lt.s $f24, $f20 -/* 8A60B4 80240634 00000000 */ nop -/* 8A60B8 80240638 45000015 */ bc1f .L80240690 -/* 8A60BC 8024063C 46000106 */ mov.s $f4, $f0 -/* 8A60C0 80240640 860200A8 */ lh $v0, 0xa8($s0) -/* 8A60C4 80240644 44820000 */ mtc1 $v0, $f0 -/* 8A60C8 80240648 00000000 */ nop -/* 8A60CC 8024064C 46800020 */ cvt.s.w $f0, $f0 -/* 8A60D0 80240650 4600A03C */ c.lt.s $f20, $f0 -/* 8A60D4 80240654 00000000 */ nop -/* 8A60D8 80240658 4500000E */ bc1f .L80240694 -/* 8A60DC 8024065C 26310001 */ addiu $s1, $s1, 1 -/* 8A60E0 80240660 860200A6 */ lh $v0, 0xa6($s0) -/* 8A60E4 80240664 44820000 */ mtc1 $v0, $f0 -/* 8A60E8 80240668 00000000 */ nop -/* 8A60EC 8024066C 46800020 */ cvt.s.w $f0, $f0 -/* 8A60F0 80240670 46160002 */ mul.s $f0, $f0, $f22 -/* 8A60F4 80240674 00000000 */ nop -/* 8A60F8 80240678 4600203C */ c.lt.s $f4, $f0 -/* 8A60FC 8024067C 00000000 */ nop -/* 8A6100 80240680 45000004 */ bc1f .L80240694 -/* 8A6104 80240684 24020001 */ addiu $v0, $zero, 1 -/* 8A6108 80240688 080901A8 */ j .L802406A0 -/* 8A610C 8024068C AE62008C */ sw $v0, 0x8c($s3) -.L80240690: -/* 8A6110 80240690 26310001 */ addiu $s1, $s1, 1 -.L80240694: -/* 8A6114 80240694 2A220040 */ slti $v0, $s1, 0x40 -/* 8A6118 80240698 1440FFC5 */ bnez $v0, .L802405B0 -/* 8A611C 8024069C 00000000 */ nop -.L802406A0: -/* 8A6120 802406A0 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A6124 802406A4 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A6128 802406A8 8FB20018 */ lw $s2, 0x18($sp) -/* 8A612C 802406AC 8FB10014 */ lw $s1, 0x14($sp) -/* 8A6130 802406B0 8FB00010 */ lw $s0, 0x10($sp) -/* 8A6134 802406B4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 8A6138 802406B8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8A613C 802406BC D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8A6140 802406C0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8A6144 802406C4 24020002 */ addiu $v0, $zero, 2 -/* 8A6148 802406C8 03E00008 */ jr $ra -/* 8A614C 802406CC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_8024030C_8A828C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_8024030C_8A828C.s deleted file mode 100644 index b3afa9deb2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_8024030C_8A828C.s +++ /dev/null @@ -1,235 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_8A828C -/* 8A828C 8024030C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8A8290 80240310 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A8294 80240314 0080982D */ daddu $s3, $a0, $zero -/* 8A8298 80240318 AFBF0020 */ sw $ra, 0x20($sp) -/* 8A829C 8024031C AFB20018 */ sw $s2, 0x18($sp) -/* 8A82A0 80240320 AFB10014 */ sw $s1, 0x14($sp) -/* 8A82A4 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* 8A82A8 80240328 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8A82AC 8024032C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8A82B0 80240330 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8A82B4 80240334 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8A82B8 80240338 8E62000C */ lw $v0, 0xc($s3) -/* 8A82BC 8024033C 0C0B1EAF */ jal evt_get_variable -/* 8A82C0 80240340 8C450000 */ lw $a1, ($v0) -/* 8A82C4 80240344 2404FFFC */ addiu $a0, $zero, -4 -/* 8A82C8 80240348 0C00EABB */ jal get_npc_unsafe -/* 8A82CC 8024034C 0040802D */ daddu $s0, $v0, $zero -/* 8A82D0 80240350 0200202D */ daddu $a0, $s0, $zero -/* 8A82D4 80240354 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8A82D8 80240358 0040802D */ daddu $s0, $v0, $zero -/* 8A82DC 8024035C 0C046B4C */ jal get_model_from_list_index -/* 8A82E0 80240360 0040202D */ daddu $a0, $v0, $zero -/* 8A82E4 80240364 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8A82E8 80240368 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8A82EC 8024036C 0040902D */ daddu $s2, $v0, $zero -/* 8A82F0 80240370 AE60008C */ sw $zero, 0x8c($s3) -/* 8A82F4 80240374 C4620028 */ lwc1 $f2, 0x28($v1) -/* 8A82F8 80240378 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A82FC 8024037C 46001081 */ sub.s $f2, $f2, $f0 -/* 8A8300 80240380 46021182 */ mul.s $f6, $f2, $f2 -/* 8A8304 80240384 00000000 */ nop -/* 8A8308 80240388 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A830C 8024038C C4620030 */ lwc1 $f2, 0x30($v1) -/* 8A8310 80240390 46001081 */ sub.s $f2, $f2, $f0 -/* 8A8314 80240394 46021102 */ mul.s $f4, $f2, $f2 -/* 8A8318 80240398 00000000 */ nop -/* 8A831C 8024039C 846200B0 */ lh $v0, 0xb0($v1) -/* 8A8320 802403A0 C462002C */ lwc1 $f2, 0x2c($v1) -/* 8A8324 802403A4 44820000 */ mtc1 $v0, $f0 -/* 8A8328 802403A8 00000000 */ nop -/* 8A832C 802403AC 46800020 */ cvt.s.w $f0, $f0 -/* 8A8330 802403B0 46001080 */ add.s $f2, $f2, $f0 -/* 8A8334 802403B4 3C013FC0 */ lui $at, 0x3fc0 -/* 8A8338 802403B8 44810000 */ mtc1 $at, $f0 -/* 8A833C 802403BC 00000000 */ nop -/* 8A8340 802403C0 46001081 */ sub.s $f2, $f2, $f0 -/* 8A8344 802403C4 46043300 */ add.s $f12, $f6, $f4 -/* 8A8348 802403C8 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A834C 802403CC 46001501 */ sub.s $f20, $f2, $f0 -/* 8A8350 802403D0 46006084 */ sqrt.s $f2, $f12 -/* 8A8354 802403D4 46021032 */ c.eq.s $f2, $f2 -/* 8A8358 802403D8 00000000 */ nop -/* 8A835C 802403DC 45010004 */ bc1t .L802403F0 -/* 8A8360 802403E0 0060882D */ daddu $s1, $v1, $zero -/* 8A8364 802403E4 0C0187BC */ jal sqrtf -/* 8A8368 802403E8 00000000 */ nop -/* 8A836C 802403EC 46000086 */ mov.s $f2, $f0 -.L802403F0: -/* 8A8370 802403F0 44800000 */ mtc1 $zero, $f0 -/* 8A8374 802403F4 00000000 */ nop -/* 8A8378 802403F8 4614003C */ c.lt.s $f0, $f20 -/* 8A837C 802403FC 00000000 */ nop -/* 8A8380 80240400 45000016 */ bc1f .L8024045C -/* 8A8384 80240404 46001106 */ mov.s $f4, $f2 -/* 8A8388 80240408 862200B0 */ lh $v0, 0xb0($s1) -/* 8A838C 8024040C 44820000 */ mtc1 $v0, $f0 -/* 8A8390 80240410 00000000 */ nop -/* 8A8394 80240414 46800020 */ cvt.s.w $f0, $f0 -/* 8A8398 80240418 4600A03C */ c.lt.s $f20, $f0 -/* 8A839C 8024041C 00000000 */ nop -/* 8A83A0 80240420 4500000E */ bc1f .L8024045C -/* 8A83A4 80240424 00000000 */ nop -/* 8A83A8 80240428 862200B2 */ lh $v0, 0xb2($s1) -/* 8A83AC 8024042C 3C013F00 */ lui $at, 0x3f00 -/* 8A83B0 80240430 44811000 */ mtc1 $at, $f2 -/* 8A83B4 80240434 44820000 */ mtc1 $v0, $f0 -/* 8A83B8 80240438 00000000 */ nop -/* 8A83BC 8024043C 46800020 */ cvt.s.w $f0, $f0 -/* 8A83C0 80240440 46020002 */ mul.s $f0, $f0, $f2 -/* 8A83C4 80240444 00000000 */ nop -/* 8A83C8 80240448 4600203C */ c.lt.s $f4, $f0 -/* 8A83CC 8024044C 00000000 */ nop -/* 8A83D0 80240450 45000002 */ bc1f .L8024045C -/* 8A83D4 80240454 24020001 */ addiu $v0, $zero, 1 -/* 8A83D8 80240458 AE62008C */ sw $v0, 0x8c($s3) -.L8024045C: -/* 8A83DC 8024045C C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A83E0 80240460 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A83E4 80240464 46001081 */ sub.s $f2, $f2, $f0 -/* 8A83E8 80240468 46021182 */ mul.s $f6, $f2, $f2 -/* 8A83EC 8024046C 00000000 */ nop -/* 8A83F0 80240470 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A83F4 80240474 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A83F8 80240478 46001081 */ sub.s $f2, $f2, $f0 -/* 8A83FC 8024047C 46021102 */ mul.s $f4, $f2, $f2 -/* 8A8400 80240480 00000000 */ nop -/* 8A8404 80240484 860200A8 */ lh $v0, 0xa8($s0) -/* 8A8408 80240488 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A840C 8024048C 44820000 */ mtc1 $v0, $f0 -/* 8A8410 80240490 00000000 */ nop -/* 8A8414 80240494 46800020 */ cvt.s.w $f0, $f0 -/* 8A8418 80240498 46001080 */ add.s $f2, $f2, $f0 -/* 8A841C 8024049C 3C013FC0 */ lui $at, 0x3fc0 -/* 8A8420 802404A0 44810000 */ mtc1 $at, $f0 -/* 8A8424 802404A4 00000000 */ nop -/* 8A8428 802404A8 46001081 */ sub.s $f2, $f2, $f0 -/* 8A842C 802404AC 46043300 */ add.s $f12, $f6, $f4 -/* 8A8430 802404B0 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A8434 802404B4 46001501 */ sub.s $f20, $f2, $f0 -/* 8A8438 802404B8 46006084 */ sqrt.s $f2, $f12 -/* 8A843C 802404BC 46021032 */ c.eq.s $f2, $f2 -/* 8A8440 802404C0 00000000 */ nop -/* 8A8444 802404C4 45010004 */ bc1t .L802404D8 -/* 8A8448 802404C8 00000000 */ nop -/* 8A844C 802404CC 0C0187BC */ jal sqrtf -/* 8A8450 802404D0 00000000 */ nop -/* 8A8454 802404D4 46000086 */ mov.s $f2, $f0 -.L802404D8: -/* 8A8458 802404D8 44800000 */ mtc1 $zero, $f0 -/* 8A845C 802404DC 00000000 */ nop -/* 8A8460 802404E0 4614003C */ c.lt.s $f0, $f20 -/* 8A8464 802404E4 00000000 */ nop -/* 8A8468 802404E8 45000016 */ bc1f .L80240544 -/* 8A846C 802404EC 46001106 */ mov.s $f4, $f2 -/* 8A8470 802404F0 860200A8 */ lh $v0, 0xa8($s0) -/* 8A8474 802404F4 44820000 */ mtc1 $v0, $f0 -/* 8A8478 802404F8 00000000 */ nop -/* 8A847C 802404FC 46800020 */ cvt.s.w $f0, $f0 -/* 8A8480 80240500 4600A03C */ c.lt.s $f20, $f0 -/* 8A8484 80240504 00000000 */ nop -/* 8A8488 80240508 4500000F */ bc1f .L80240548 -/* 8A848C 8024050C 0000882D */ daddu $s1, $zero, $zero -/* 8A8490 80240510 860200A6 */ lh $v0, 0xa6($s0) -/* 8A8494 80240514 3C013F00 */ lui $at, 0x3f00 -/* 8A8498 80240518 44811000 */ mtc1 $at, $f2 -/* 8A849C 8024051C 44820000 */ mtc1 $v0, $f0 -/* 8A84A0 80240520 00000000 */ nop -/* 8A84A4 80240524 46800020 */ cvt.s.w $f0, $f0 -/* 8A84A8 80240528 46020002 */ mul.s $f0, $f0, $f2 -/* 8A84AC 8024052C 00000000 */ nop -/* 8A84B0 80240530 4600203C */ c.lt.s $f4, $f0 -/* 8A84B4 80240534 00000000 */ nop -/* 8A84B8 80240538 45000003 */ bc1f .L80240548 -/* 8A84BC 8024053C 24020001 */ addiu $v0, $zero, 1 -/* 8A84C0 80240540 AE62008C */ sw $v0, 0x8c($s3) -.L80240544: -/* 8A84C4 80240544 0000882D */ daddu $s1, $zero, $zero -.L80240548: -/* 8A84C8 80240548 3C013FC0 */ lui $at, 0x3fc0 -/* 8A84CC 8024054C 4481D000 */ mtc1 $at, $f26 -/* 8A84D0 80240550 4480C000 */ mtc1 $zero, $f24 -/* 8A84D4 80240554 3C013F00 */ lui $at, 0x3f00 -/* 8A84D8 80240558 4481B000 */ mtc1 $at, $f22 -.L8024055C: -/* 8A84DC 8024055C 0C00EAD2 */ jal get_npc_safe -/* 8A84E0 80240560 0220202D */ daddu $a0, $s1, $zero -/* 8A84E4 80240564 0040802D */ daddu $s0, $v0, $zero -/* 8A84E8 80240568 52000035 */ beql $s0, $zero, .L80240640 -/* 8A84EC 8024056C 26310001 */ addiu $s1, $s1, 1 -/* 8A84F0 80240570 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A84F4 80240574 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A84F8 80240578 46001081 */ sub.s $f2, $f2, $f0 -/* 8A84FC 8024057C 46021182 */ mul.s $f6, $f2, $f2 -/* 8A8500 80240580 00000000 */ nop -/* 8A8504 80240584 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A8508 80240588 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A850C 8024058C 46001081 */ sub.s $f2, $f2, $f0 -/* 8A8510 80240590 46021102 */ mul.s $f4, $f2, $f2 -/* 8A8514 80240594 00000000 */ nop -/* 8A8518 80240598 860200A8 */ lh $v0, 0xa8($s0) -/* 8A851C 8024059C C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A8520 802405A0 44820000 */ mtc1 $v0, $f0 -/* 8A8524 802405A4 00000000 */ nop -/* 8A8528 802405A8 46800020 */ cvt.s.w $f0, $f0 -/* 8A852C 802405AC 46001080 */ add.s $f2, $f2, $f0 -/* 8A8530 802405B0 461A1081 */ sub.s $f2, $f2, $f26 -/* 8A8534 802405B4 46043300 */ add.s $f12, $f6, $f4 -/* 8A8538 802405B8 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A853C 802405BC 46001501 */ sub.s $f20, $f2, $f0 -/* 8A8540 802405C0 46006004 */ sqrt.s $f0, $f12 -/* 8A8544 802405C4 46000032 */ c.eq.s $f0, $f0 -/* 8A8548 802405C8 00000000 */ nop -/* 8A854C 802405CC 45010003 */ bc1t .L802405DC -/* 8A8550 802405D0 00000000 */ nop -/* 8A8554 802405D4 0C0187BC */ jal sqrtf -/* 8A8558 802405D8 00000000 */ nop -.L802405DC: -/* 8A855C 802405DC 4614C03C */ c.lt.s $f24, $f20 -/* 8A8560 802405E0 00000000 */ nop -/* 8A8564 802405E4 45000015 */ bc1f .L8024063C -/* 8A8568 802405E8 46000106 */ mov.s $f4, $f0 -/* 8A856C 802405EC 860200A8 */ lh $v0, 0xa8($s0) -/* 8A8570 802405F0 44820000 */ mtc1 $v0, $f0 -/* 8A8574 802405F4 00000000 */ nop -/* 8A8578 802405F8 46800020 */ cvt.s.w $f0, $f0 -/* 8A857C 802405FC 4600A03C */ c.lt.s $f20, $f0 -/* 8A8580 80240600 00000000 */ nop -/* 8A8584 80240604 4500000E */ bc1f .L80240640 -/* 8A8588 80240608 26310001 */ addiu $s1, $s1, 1 -/* 8A858C 8024060C 860200A6 */ lh $v0, 0xa6($s0) -/* 8A8590 80240610 44820000 */ mtc1 $v0, $f0 -/* 8A8594 80240614 00000000 */ nop -/* 8A8598 80240618 46800020 */ cvt.s.w $f0, $f0 -/* 8A859C 8024061C 46160002 */ mul.s $f0, $f0, $f22 -/* 8A85A0 80240620 00000000 */ nop -/* 8A85A4 80240624 4600203C */ c.lt.s $f4, $f0 -/* 8A85A8 80240628 00000000 */ nop -/* 8A85AC 8024062C 45000004 */ bc1f .L80240640 -/* 8A85B0 80240630 24020001 */ addiu $v0, $zero, 1 -/* 8A85B4 80240634 08090193 */ j .L8024064C -/* 8A85B8 80240638 AE62008C */ sw $v0, 0x8c($s3) -.L8024063C: -/* 8A85BC 8024063C 26310001 */ addiu $s1, $s1, 1 -.L80240640: -/* 8A85C0 80240640 2A220040 */ slti $v0, $s1, 0x40 -/* 8A85C4 80240644 1440FFC5 */ bnez $v0, .L8024055C -/* 8A85C8 80240648 00000000 */ nop -.L8024064C: -/* 8A85CC 8024064C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A85D0 80240650 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A85D4 80240654 8FB20018 */ lw $s2, 0x18($sp) -/* 8A85D8 80240658 8FB10014 */ lw $s1, 0x14($sp) -/* 8A85DC 8024065C 8FB00010 */ lw $s0, 0x10($sp) -/* 8A85E0 80240660 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 8A85E4 80240664 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8A85E8 80240668 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8A85EC 8024066C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8A85F0 80240670 24020002 */ addiu $v0, $zero, 2 -/* 8A85F4 80240674 03E00008 */ jr $ra -/* 8A85F8 80240678 27BD0048 */ addiu $sp, $sp, 0x48 -/* 8A85FC 8024067C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s deleted file mode 100644 index f50ea0e46b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80246278_9AE668 -.double 0.09 - -dlabel D_80246280_9AE670 -.double 0.09 - -.section .text - -glabel func_80241FC8_9AA3B8 -/* 9AA3B8 80241FC8 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 9AA3BC 80241FCC AFB3004C */ sw $s3, 0x4c($sp) -/* 9AA3C0 80241FD0 0080982D */ daddu $s3, $a0, $zero -/* 9AA3C4 80241FD4 AFBF0058 */ sw $ra, 0x58($sp) -/* 9AA3C8 80241FD8 AFB50054 */ sw $s5, 0x54($sp) -/* 9AA3CC 80241FDC AFB40050 */ sw $s4, 0x50($sp) -/* 9AA3D0 80241FE0 AFB20048 */ sw $s2, 0x48($sp) -/* 9AA3D4 80241FE4 AFB10044 */ sw $s1, 0x44($sp) -/* 9AA3D8 80241FE8 AFB00040 */ sw $s0, 0x40($sp) -/* 9AA3DC 80241FEC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 9AA3E0 80241FF0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 9AA3E4 80241FF4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 9AA3E8 80241FF8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 9AA3EC 80241FFC 8E710148 */ lw $s1, 0x148($s3) -/* 9AA3F0 80242000 00A0902D */ daddu $s2, $a1, $zero -/* 9AA3F4 80242004 86240008 */ lh $a0, 8($s1) -/* 9AA3F8 80242008 0C00EABB */ jal get_npc_unsafe -/* 9AA3FC 8024200C 00C0A82D */ daddu $s5, $a2, $zero -/* 9AA400 80242010 0040802D */ daddu $s0, $v0, $zero -/* 9AA404 80242014 0000A02D */ daddu $s4, $zero, $zero -/* 9AA408 80242018 C624007C */ lwc1 $f4, 0x7c($s1) -/* 9AA40C 8024201C 46802120 */ cvt.s.w $f4, $f4 -/* 9AA410 80242020 C6220088 */ lwc1 $f2, 0x88($s1) -/* 9AA414 80242024 468010A0 */ cvt.s.w $f2, $f2 -/* 9AA418 80242028 460010A1 */ cvt.d.s $f2, $f2 -/* 9AA41C 8024202C 46002121 */ cvt.d.s $f4, $f4 -/* 9AA420 80242030 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AA424 80242034 3C014059 */ lui $at, 0x4059 -/* 9AA428 80242038 44813800 */ mtc1 $at, $f7 -/* 9AA42C 8024203C 44803000 */ mtc1 $zero, $f6 -/* 9AA430 80242040 46000021 */ cvt.d.s $f0, $f0 -/* 9AA434 80242044 46260002 */ mul.d $f0, $f0, $f6 -/* 9AA438 80242048 00000000 */ nop -/* 9AA43C 8024204C 24020001 */ addiu $v0, $zero, 1 -/* 9AA440 80242050 8E24006C */ lw $a0, 0x6c($s1) -/* 9AA444 80242054 46261083 */ div.d $f2, $f2, $f6 -/* 9AA448 80242058 462010A0 */ cvt.s.d $f2, $f2 -/* 9AA44C 8024205C 46262103 */ div.d $f4, $f4, $f6 -/* 9AA450 80242060 46202520 */ cvt.s.d $f20, $f4 -/* 9AA454 80242064 30830011 */ andi $v1, $a0, 0x11 -/* 9AA458 80242068 4620020D */ trunc.w.d $f8, $f0 -/* 9AA45C 8024206C E628007C */ swc1 $f8, 0x7c($s1) -/* 9AA460 80242070 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9AA464 80242074 46800020 */ cvt.s.w $f0, $f0 -/* 9AA468 80242078 46000021 */ cvt.d.s $f0, $f0 -/* 9AA46C 8024207C 46260003 */ div.d $f0, $f0, $f6 -/* 9AA470 80242080 462006A0 */ cvt.s.d $f26, $f0 -/* 9AA474 80242084 C6200070 */ lwc1 $f0, 0x70($s1) -/* 9AA478 80242088 46800020 */ cvt.s.w $f0, $f0 -/* 9AA47C 8024208C 46000021 */ cvt.d.s $f0, $f0 -/* 9AA480 80242090 46260003 */ div.d $f0, $f0, $f6 -/* 9AA484 80242094 462005A0 */ cvt.s.d $f22, $f0 -/* 9AA488 80242098 14620025 */ bne $v1, $v0, .L80242130 -/* 9AA48C 8024209C 4602D600 */ add.s $f24, $f26, $f2 -/* 9AA490 802420A0 8E020000 */ lw $v0, ($s0) -/* 9AA494 802420A4 30420008 */ andi $v0, $v0, 8 -/* 9AA498 802420A8 10400009 */ beqz $v0, .L802420D0 -/* 9AA49C 802420AC 27A50028 */ addiu $a1, $sp, 0x28 -/* 9AA4A0 802420B0 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AA4A4 802420B4 4600C001 */ sub.s $f0, $f24, $f0 -/* 9AA4A8 802420B8 4600B03C */ c.lt.s $f22, $f0 -/* 9AA4AC 802420BC 00000000 */ nop -/* 9AA4B0 802420C0 4500001B */ bc1f .L80242130 -/* 9AA4B4 802420C4 34820010 */ ori $v0, $a0, 0x10 -/* 9AA4B8 802420C8 0809084C */ j .L80242130 -/* 9AA4BC 802420CC AE22006C */ sw $v0, 0x6c($s1) -.L802420D0: -/* 9AA4C0 802420D0 27A6002C */ addiu $a2, $sp, 0x2c -/* 9AA4C4 802420D4 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AA4C8 802420D8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AA4CC 802420DC C6040040 */ lwc1 $f4, 0x40($s0) -/* 9AA4D0 802420E0 3C01447A */ lui $at, 0x447a -/* 9AA4D4 802420E4 44813000 */ mtc1 $at, $f6 -/* 9AA4D8 802420E8 27A20034 */ addiu $v0, $sp, 0x34 -/* 9AA4DC 802420EC E7A00028 */ swc1 $f0, 0x28($sp) -/* 9AA4E0 802420F0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9AA4E4 802420F4 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9AA4E8 802420F8 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9AA4EC 802420FC AFA20010 */ sw $v0, 0x10($sp) -/* 9AA4F0 80242100 8E040080 */ lw $a0, 0x80($s0) -/* 9AA4F4 80242104 0C0372DF */ jal npc_raycast_down_sides -/* 9AA4F8 80242108 27A70030 */ addiu $a3, $sp, 0x30 -/* 9AA4FC 8024210C C7A00034 */ lwc1 $f0, 0x34($sp) -/* 9AA500 80242110 4600D001 */ sub.s $f0, $f26, $f0 -/* 9AA504 80242114 4600B03C */ c.lt.s $f22, $f0 -/* 9AA508 80242118 00000000 */ nop -/* 9AA50C 8024211C 45000004 */ bc1f .L80242130 -/* 9AA510 80242120 00000000 */ nop -/* 9AA514 80242124 8E22006C */ lw $v0, 0x6c($s1) -/* 9AA518 80242128 34420010 */ ori $v0, $v0, 0x10 -/* 9AA51C 8024212C AE22006C */ sw $v0, 0x6c($s1) -.L80242130: -/* 9AA520 80242130 8E22006C */ lw $v0, 0x6c($s1) -/* 9AA524 80242134 24030011 */ addiu $v1, $zero, 0x11 -/* 9AA528 80242138 30420011 */ andi $v0, $v0, 0x11 -/* 9AA52C 8024213C 14430039 */ bne $v0, $v1, .L80242224 -/* 9AA530 80242140 00000000 */ nop -/* 9AA534 80242144 8E020000 */ lw $v0, ($s0) -/* 9AA538 80242148 30420008 */ andi $v0, $v0, 8 -/* 9AA53C 8024214C 1040000A */ beqz $v0, .L80242178 -/* 9AA540 80242150 4600C106 */ mov.s $f4, $f24 -/* 9AA544 80242154 4614C081 */ sub.s $f2, $f24, $f20 -/* 9AA548 80242158 3C018024 */ lui $at, %hi(D_80246278_9AE668) -/* 9AA54C 8024215C D4206278 */ ldc1 $f0, %lo(D_80246278_9AE668)($at) -/* 9AA550 80242160 460010A1 */ cvt.d.s $f2, $f2 -/* 9AA554 80242164 46201082 */ mul.d $f2, $f2, $f0 -/* 9AA558 80242168 00000000 */ nop -/* 9AA55C 8024216C 4600A021 */ cvt.d.s $f0, $f20 -/* 9AA560 80242170 08090877 */ j .L802421DC -/* 9AA564 80242174 46220000 */ add.d $f0, $f0, $f2 -.L80242178: -/* 9AA568 80242178 27A50028 */ addiu $a1, $sp, 0x28 -/* 9AA56C 8024217C 27A6002C */ addiu $a2, $sp, 0x2c -/* 9AA570 80242180 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AA574 80242184 C6020040 */ lwc1 $f2, 0x40($s0) -/* 9AA578 80242188 3C01447A */ lui $at, 0x447a -/* 9AA57C 8024218C 44812000 */ mtc1 $at, $f4 -/* 9AA580 80242190 27A20034 */ addiu $v0, $sp, 0x34 -/* 9AA584 80242194 E7B4002C */ swc1 $f20, 0x2c($sp) -/* 9AA588 80242198 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9AA58C 8024219C E7A20030 */ swc1 $f2, 0x30($sp) -/* 9AA590 802421A0 E7A40034 */ swc1 $f4, 0x34($sp) -/* 9AA594 802421A4 AFA20010 */ sw $v0, 0x10($sp) -/* 9AA598 802421A8 8E040080 */ lw $a0, 0x80($s0) -/* 9AA59C 802421AC 0C0372DF */ jal npc_raycast_down_sides -/* 9AA5A0 802421B0 27A70030 */ addiu $a3, $sp, 0x30 -/* 9AA5A4 802421B4 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 9AA5A8 802421B8 461A2100 */ add.s $f4, $f4, $f26 -/* 9AA5AC 802421BC 46142081 */ sub.s $f2, $f4, $f20 -/* 9AA5B0 802421C0 3C018024 */ lui $at, %hi(D_80246280_9AE670) -/* 9AA5B4 802421C4 D4206280 */ ldc1 $f0, %lo(D_80246280_9AE670)($at) -/* 9AA5B8 802421C8 460010A1 */ cvt.d.s $f2, $f2 -/* 9AA5BC 802421CC 46201082 */ mul.d $f2, $f2, $f0 -/* 9AA5C0 802421D0 00000000 */ nop -/* 9AA5C4 802421D4 4600A021 */ cvt.d.s $f0, $f20 -/* 9AA5C8 802421D8 46220000 */ add.d $f0, $f0, $f2 -.L802421DC: -/* 9AA5CC 802421DC 46200020 */ cvt.s.d $f0, $f0 -/* 9AA5D0 802421E0 E600003C */ swc1 $f0, 0x3c($s0) -/* 9AA5D4 802421E4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AA5D8 802421E8 46002001 */ sub.s $f0, $f4, $f0 -/* 9AA5DC 802421EC 3C013FF0 */ lui $at, 0x3ff0 -/* 9AA5E0 802421F0 44811800 */ mtc1 $at, $f3 -/* 9AA5E4 802421F4 44801000 */ mtc1 $zero, $f2 -/* 9AA5E8 802421F8 46000005 */ abs.s $f0, $f0 -/* 9AA5EC 802421FC 46000021 */ cvt.d.s $f0, $f0 -/* 9AA5F0 80242200 4622003C */ c.lt.d $f0, $f2 -/* 9AA5F4 80242204 00000000 */ nop -/* 9AA5F8 80242208 45000036 */ bc1f .L802422E4 -/* 9AA5FC 8024220C 2403FFEF */ addiu $v1, $zero, -0x11 -/* 9AA600 80242210 E604003C */ swc1 $f4, 0x3c($s0) -/* 9AA604 80242214 8E22006C */ lw $v0, 0x6c($s1) -/* 9AA608 80242218 00431024 */ and $v0, $v0, $v1 -/* 9AA60C 8024221C 080908B9 */ j .L802422E4 -/* 9AA610 80242220 AE22006C */ sw $v0, 0x6c($s1) -.L80242224: -/* 9AA614 80242224 8E220070 */ lw $v0, 0x70($s1) -/* 9AA618 80242228 1840002E */ blez $v0, .L802422E4 -/* 9AA61C 8024222C 00000000 */ nop -/* 9AA620 80242230 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 9AA624 80242234 0C00A8BB */ jal sin_deg -/* 9AA628 80242238 46806320 */ cvt.s.w $f12, $f12 -/* 9AA62C 8024223C 8E020000 */ lw $v0, ($s0) -/* 9AA630 80242240 30420008 */ andi $v0, $v0, 8 -/* 9AA634 80242244 10400003 */ beqz $v0, .L80242254 -/* 9AA638 80242248 46000506 */ mov.s $f20, $f0 -/* 9AA63C 8024224C 080908A5 */ j .L80242294 -/* 9AA640 80242250 0000102D */ daddu $v0, $zero, $zero -.L80242254: -/* 9AA644 80242254 27A50028 */ addiu $a1, $sp, 0x28 -/* 9AA648 80242258 27A6002C */ addiu $a2, $sp, 0x2c -/* 9AA64C 8024225C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AA650 80242260 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AA654 80242264 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9AA658 80242268 3C01447A */ lui $at, 0x447a -/* 9AA65C 8024226C 44813000 */ mtc1 $at, $f6 -/* 9AA660 80242270 27A20034 */ addiu $v0, $sp, 0x34 -/* 9AA664 80242274 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9AA668 80242278 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9AA66C 8024227C E7A40030 */ swc1 $f4, 0x30($sp) -/* 9AA670 80242280 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9AA674 80242284 AFA20010 */ sw $v0, 0x10($sp) -/* 9AA678 80242288 8E040080 */ lw $a0, 0x80($s0) -/* 9AA67C 8024228C 0C0372DF */ jal npc_raycast_down_sides -/* 9AA680 80242290 27A70030 */ addiu $a3, $sp, 0x30 -.L80242294: -/* 9AA684 80242294 10400007 */ beqz $v0, .L802422B4 -/* 9AA688 80242298 00000000 */ nop -/* 9AA68C 8024229C 4616A082 */ mul.s $f2, $f20, $f22 -/* 9AA690 802422A0 00000000 */ nop -/* 9AA694 802422A4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9AA698 802422A8 461A0000 */ add.s $f0, $f0, $f26 -/* 9AA69C 802422AC 080908B0 */ j .L802422C0 -/* 9AA6A0 802422B0 46020000 */ add.s $f0, $f0, $f2 -.L802422B4: -/* 9AA6A4 802422B4 4616A002 */ mul.s $f0, $f20, $f22 -/* 9AA6A8 802422B8 00000000 */ nop -/* 9AA6AC 802422BC 4600C000 */ add.s $f0, $f24, $f0 -.L802422C0: -/* 9AA6B0 802422C0 E600003C */ swc1 $f0, 0x3c($s0) -/* 9AA6B4 802422C4 8E220074 */ lw $v0, 0x74($s1) -/* 9AA6B8 802422C8 2442000A */ addiu $v0, $v0, 0xa -/* 9AA6BC 802422CC 44826000 */ mtc1 $v0, $f12 -/* 9AA6C0 802422D0 00000000 */ nop -/* 9AA6C4 802422D4 0C00A6C9 */ jal clamp_angle -/* 9AA6C8 802422D8 46806320 */ cvt.s.w $f12, $f12 -/* 9AA6CC 802422DC 4600020D */ trunc.w.s $f8, $f0 -/* 9AA6D0 802422E0 E6280074 */ swc1 $f8, 0x74($s1) -.L802422E4: -/* 9AA6D4 802422E4 8E220090 */ lw $v0, 0x90($s1) -/* 9AA6D8 802422E8 1C40004A */ bgtz $v0, .L80242414 -/* 9AA6DC 802422EC 2442FFFF */ addiu $v0, $v0, -1 -/* 9AA6E0 802422F0 8E430014 */ lw $v1, 0x14($s2) -/* 9AA6E4 802422F4 04600048 */ bltz $v1, .L80242418 -/* 9AA6E8 802422F8 00000000 */ nop -/* 9AA6EC 802422FC 8E620074 */ lw $v0, 0x74($s3) -/* 9AA6F0 80242300 1C400042 */ bgtz $v0, .L8024240C -/* 9AA6F4 80242304 2442FFFF */ addiu $v0, $v0, -1 -/* 9AA6F8 80242308 AE630074 */ sw $v1, 0x74($s3) -/* 9AA6FC 8024230C 860200A8 */ lh $v0, 0xa8($s0) -/* 9AA700 80242310 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AA704 80242314 44820000 */ mtc1 $v0, $f0 -/* 9AA708 80242318 00000000 */ nop -/* 9AA70C 8024231C 46800020 */ cvt.s.w $f0, $f0 -/* 9AA710 80242320 46001080 */ add.s $f2, $f2, $f0 -/* 9AA714 80242324 3C014024 */ lui $at, 0x4024 -/* 9AA718 80242328 44810800 */ mtc1 $at, $f1 -/* 9AA71C 8024232C 44800000 */ mtc1 $zero, $f0 -/* 9AA720 80242330 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9AA724 80242334 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9AA728 80242338 460010A1 */ cvt.d.s $f2, $f2 -/* 9AA72C 8024233C 46201080 */ add.d $f2, $f2, $f0 -/* 9AA730 80242340 C440002C */ lwc1 $f0, 0x2c($v0) -/* 9AA734 80242344 46000021 */ cvt.d.s $f0, $f0 -/* 9AA738 80242348 4622003C */ c.lt.d $f0, $f2 -/* 9AA73C 8024234C 00000000 */ nop -/* 9AA740 80242350 4500002C */ bc1f .L80242404 -/* 9AA744 80242354 02A0202D */ daddu $a0, $s5, $zero -/* 9AA748 80242358 AFA00010 */ sw $zero, 0x10($sp) -/* 9AA74C 8024235C 8E46000C */ lw $a2, 0xc($s2) -/* 9AA750 80242360 8E470010 */ lw $a3, 0x10($s2) -/* 9AA754 80242364 0C01242D */ jal func_800490B4 -/* 9AA758 80242368 0220282D */ daddu $a1, $s1, $zero -/* 9AA75C 8024236C 10400025 */ beqz $v0, .L80242404 -/* 9AA760 80242370 0000202D */ daddu $a0, $zero, $zero -/* 9AA764 80242374 0200282D */ daddu $a1, $s0, $zero -/* 9AA768 80242378 0000302D */ daddu $a2, $zero, $zero -/* 9AA76C 8024237C 2412000C */ addiu $s2, $zero, 0xc -/* 9AA770 80242380 860300A8 */ lh $v1, 0xa8($s0) -/* 9AA774 80242384 3C013F80 */ lui $at, 0x3f80 -/* 9AA778 80242388 44810000 */ mtc1 $at, $f0 -/* 9AA77C 8024238C 3C014000 */ lui $at, 0x4000 -/* 9AA780 80242390 44811000 */ mtc1 $at, $f2 -/* 9AA784 80242394 3C01C1A0 */ lui $at, 0xc1a0 -/* 9AA788 80242398 44812000 */ mtc1 $at, $f4 -/* 9AA78C 8024239C 44834000 */ mtc1 $v1, $f8 -/* 9AA790 802423A0 00000000 */ nop -/* 9AA794 802423A4 46804220 */ cvt.s.w $f8, $f8 -/* 9AA798 802423A8 44074000 */ mfc1 $a3, $f8 -/* 9AA79C 802423AC 27A20038 */ addiu $v0, $sp, 0x38 -/* 9AA7A0 802423B0 AFB2001C */ sw $s2, 0x1c($sp) -/* 9AA7A4 802423B4 AFA20020 */ sw $v0, 0x20($sp) -/* 9AA7A8 802423B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9AA7AC 802423BC E7A20014 */ swc1 $f2, 0x14($sp) -/* 9AA7B0 802423C0 0C01BFA4 */ jal fx_emote -/* 9AA7B4 802423C4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9AA7B8 802423C8 0200202D */ daddu $a0, $s0, $zero -/* 9AA7BC 802423CC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9AA7C0 802423D0 C480003C */ lwc1 $f0, 0x3c($a0) -/* 9AA7C4 802423D4 3C060020 */ lui $a2, 0x20 -/* 9AA7C8 802423D8 0C012530 */ jal ai_enemy_play_sound -/* 9AA7CC 802423DC E4800064 */ swc1 $f0, 0x64($a0) -/* 9AA7D0 802423E0 8E220018 */ lw $v0, 0x18($s1) -/* 9AA7D4 802423E4 9442002A */ lhu $v0, 0x2a($v0) -/* 9AA7D8 802423E8 30420001 */ andi $v0, $v0, 1 -/* 9AA7DC 802423EC 10400003 */ beqz $v0, .L802423FC -/* 9AA7E0 802423F0 2402000A */ addiu $v0, $zero, 0xa -/* 9AA7E4 802423F4 0809096F */ j .L802425BC -/* 9AA7E8 802423F8 AE620070 */ sw $v0, 0x70($s3) -.L802423FC: -/* 9AA7EC 802423FC 0809096F */ j .L802425BC -/* 9AA7F0 80242400 AE720070 */ sw $s2, 0x70($s3) -.L80242404: -/* 9AA7F4 80242404 8E620074 */ lw $v0, 0x74($s3) -/* 9AA7F8 80242408 2442FFFF */ addiu $v0, $v0, -1 -.L8024240C: -/* 9AA7FC 8024240C 08090906 */ j .L80242418 -/* 9AA800 80242410 AE620074 */ sw $v0, 0x74($s3) -.L80242414: -/* 9AA804 80242414 AE220090 */ sw $v0, 0x90($s1) -.L80242418: -/* 9AA808 80242418 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9AA80C 8024241C C6000040 */ lwc1 $f0, 0x40($s0) -/* 9AA810 80242420 C4620000 */ lwc1 $f2, ($v1) -/* 9AA814 80242424 468010A0 */ cvt.s.w $f2, $f2 -/* 9AA818 80242428 C4640008 */ lwc1 $f4, 8($v1) -/* 9AA81C 8024242C 46802120 */ cvt.s.w $f4, $f4 -/* 9AA820 80242430 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9AA824 80242434 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA828 80242438 44051000 */ mfc1 $a1, $f2 -/* 9AA82C 8024243C C440000C */ lwc1 $f0, 0xc($v0) -/* 9AA830 80242440 46800020 */ cvt.s.w $f0, $f0 -/* 9AA834 80242444 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9AA838 80242448 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA83C 8024244C 44062000 */ mfc1 $a2, $f4 -/* 9AA840 80242450 C4400010 */ lwc1 $f0, 0x10($v0) -/* 9AA844 80242454 46800020 */ cvt.s.w $f0, $f0 -/* 9AA848 80242458 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9AA84C 8024245C 8C640018 */ lw $a0, 0x18($v1) -/* 9AA850 80242460 0C0123F5 */ jal is_point_within_region -/* 9AA854 80242464 8E070038 */ lw $a3, 0x38($s0) -/* 9AA858 80242468 1040001A */ beqz $v0, .L802424D4 -/* 9AA85C 8024246C 00000000 */ nop -/* 9AA860 80242470 8E060038 */ lw $a2, 0x38($s0) -/* 9AA864 80242474 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA868 80242478 8E070040 */ lw $a3, 0x40($s0) -/* 9AA86C 8024247C C44C0000 */ lwc1 $f12, ($v0) -/* 9AA870 80242480 46806320 */ cvt.s.w $f12, $f12 -/* 9AA874 80242484 C44E0008 */ lwc1 $f14, 8($v0) -/* 9AA878 80242488 0C00A7B5 */ jal dist2D -/* 9AA87C 8024248C 468073A0 */ cvt.s.w $f14, $f14 -/* 9AA880 80242490 C6020018 */ lwc1 $f2, 0x18($s0) -/* 9AA884 80242494 4600103C */ c.lt.s $f2, $f0 -/* 9AA888 80242498 00000000 */ nop -/* 9AA88C 8024249C 4500000D */ bc1f .L802424D4 -/* 9AA890 802424A0 E7A00034 */ swc1 $f0, 0x34($sp) -/* 9AA894 802424A4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9AA898 802424A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA89C 802424AC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9AA8A0 802424B0 C4480000 */ lwc1 $f8, ($v0) -/* 9AA8A4 802424B4 46804220 */ cvt.s.w $f8, $f8 -/* 9AA8A8 802424B8 44064000 */ mfc1 $a2, $f8 -/* 9AA8AC 802424BC C4480008 */ lwc1 $f8, 8($v0) -/* 9AA8B0 802424C0 46804220 */ cvt.s.w $f8, $f8 -/* 9AA8B4 802424C4 44074000 */ mfc1 $a3, $f8 -/* 9AA8B8 802424C8 0C00A720 */ jal atan2 -/* 9AA8BC 802424CC 24140001 */ addiu $s4, $zero, 1 -/* 9AA8C0 802424D0 E600000C */ swc1 $f0, 0xc($s0) -.L802424D4: -/* 9AA8C4 802424D4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA8C8 802424D8 8C43000C */ lw $v1, 0xc($v0) -/* 9AA8CC 802424DC 8C420010 */ lw $v0, 0x10($v0) -/* 9AA8D0 802424E0 00621825 */ or $v1, $v1, $v0 -/* 9AA8D4 802424E4 00741825 */ or $v1, $v1, $s4 -/* 9AA8D8 802424E8 10600008 */ beqz $v1, .L8024250C -/* 9AA8DC 802424EC 00000000 */ nop -/* 9AA8E0 802424F0 8602008C */ lh $v0, 0x8c($s0) -/* 9AA8E4 802424F4 14400031 */ bnez $v0, .L802425BC -/* 9AA8E8 802424F8 00000000 */ nop -/* 9AA8EC 802424FC 8E050018 */ lw $a1, 0x18($s0) -/* 9AA8F0 80242500 8E06000C */ lw $a2, 0xc($s0) -/* 9AA8F4 80242504 0C00EA95 */ jal npc_move_heading -/* 9AA8F8 80242508 0200202D */ daddu $a0, $s0, $zero -.L8024250C: -/* 9AA8FC 8024250C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AA900 80242510 3C014059 */ lui $at, 0x4059 -/* 9AA904 80242514 44811800 */ mtc1 $at, $f3 -/* 9AA908 80242518 44801000 */ mtc1 $zero, $f2 -/* 9AA90C 8024251C 46000021 */ cvt.d.s $f0, $f0 -/* 9AA910 80242520 46220002 */ mul.d $f0, $f0, $f2 -/* 9AA914 80242524 00000000 */ nop -/* 9AA918 80242528 4620020D */ trunc.w.d $f8, $f0 -/* 9AA91C 8024252C E628007C */ swc1 $f8, 0x7c($s1) -/* 9AA920 80242530 8E420004 */ lw $v0, 4($s2) -/* 9AA924 80242534 18400021 */ blez $v0, .L802425BC -/* 9AA928 80242538 00000000 */ nop -/* 9AA92C 8024253C 8602008E */ lh $v0, 0x8e($s0) -/* 9AA930 80242540 9603008E */ lhu $v1, 0x8e($s0) -/* 9AA934 80242544 18400005 */ blez $v0, .L8024255C -/* 9AA938 80242548 2462FFFF */ addiu $v0, $v1, -1 -/* 9AA93C 8024254C A602008E */ sh $v0, 0x8e($s0) -/* 9AA940 80242550 00021400 */ sll $v0, $v0, 0x10 -/* 9AA944 80242554 1C400019 */ bgtz $v0, .L802425BC -/* 9AA948 80242558 00000000 */ nop -.L8024255C: -/* 9AA94C 8024255C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9AA950 80242560 24020002 */ addiu $v0, $zero, 2 -/* 9AA954 80242564 0C00A67F */ jal rand_int -/* 9AA958 80242568 AE620070 */ sw $v0, 0x70($s3) -/* 9AA95C 8024256C 3C035555 */ lui $v1, 0x5555 -/* 9AA960 80242570 34635556 */ ori $v1, $v1, 0x5556 -/* 9AA964 80242574 00430018 */ mult $v0, $v1 -/* 9AA968 80242578 000227C3 */ sra $a0, $v0, 0x1f -/* 9AA96C 8024257C 00004010 */ mfhi $t0 -/* 9AA970 80242580 01042023 */ subu $a0, $t0, $a0 -/* 9AA974 80242584 00041840 */ sll $v1, $a0, 1 -/* 9AA978 80242588 00641821 */ addu $v1, $v1, $a0 -/* 9AA97C 8024258C 00431023 */ subu $v0, $v0, $v1 -/* 9AA980 80242590 24430002 */ addiu $v1, $v0, 2 -/* 9AA984 80242594 AE630074 */ sw $v1, 0x74($s3) -/* 9AA988 80242598 8E42002C */ lw $v0, 0x2c($s2) -/* 9AA98C 8024259C 58400007 */ blezl $v0, .L802425BC -/* 9AA990 802425A0 AE600070 */ sw $zero, 0x70($s3) -/* 9AA994 802425A4 8E420008 */ lw $v0, 8($s2) -/* 9AA998 802425A8 18400003 */ blez $v0, .L802425B8 -/* 9AA99C 802425AC 28620003 */ slti $v0, $v1, 3 -/* 9AA9A0 802425B0 10400002 */ beqz $v0, .L802425BC -/* 9AA9A4 802425B4 00000000 */ nop -.L802425B8: -/* 9AA9A8 802425B8 AE600070 */ sw $zero, 0x70($s3) -.L802425BC: -/* 9AA9AC 802425BC 8FBF0058 */ lw $ra, 0x58($sp) -/* 9AA9B0 802425C0 8FB50054 */ lw $s5, 0x54($sp) -/* 9AA9B4 802425C4 8FB40050 */ lw $s4, 0x50($sp) -/* 9AA9B8 802425C8 8FB3004C */ lw $s3, 0x4c($sp) -/* 9AA9BC 802425CC 8FB20048 */ lw $s2, 0x48($sp) -/* 9AA9C0 802425D0 8FB10044 */ lw $s1, 0x44($sp) -/* 9AA9C4 802425D4 8FB00040 */ lw $s0, 0x40($sp) -/* 9AA9C8 802425D8 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 9AA9CC 802425DC D7B80070 */ ldc1 $f24, 0x70($sp) -/* 9AA9D0 802425E0 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 9AA9D4 802425E4 D7B40060 */ ldc1 $f20, 0x60($sp) -/* 9AA9D8 802425E8 03E00008 */ jr $ra -/* 9AA9DC 802425EC 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s index b214e231cc..fa20dacbd1 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s @@ -86,7 +86,7 @@ glabel func_80243124_9AB514 .L80243240_9AB630: /* 9AB630 80243240 0280202D */ daddu $a0, $s4, $zero /* 9AB634 80243244 0200282D */ daddu $a1, $s0, $zero -/* 9AB638 80243248 0C0907F2 */ jal func_80241FC8_9AA3B8 +/* 9AB638 80243248 0C0907F2 */ jal trd_04_UnkNpcAIFunc35 /* 9AB63C 8024324C 0260302D */ daddu $a2, $s3, $zero /* 9AB640 80243250 08090CBB */ j .L802432EC /* 9AB644 80243254 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s index 0d6ae5e0f2..1568cb15b7 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s @@ -89,7 +89,7 @@ glabel func_80243650_9ABA40 .L80243778_9ABB68: /* 9ABB68 80243778 0260202D */ daddu $a0, $s3, $zero /* 9ABB6C 8024377C 0200282D */ daddu $a1, $s0, $zero -/* 9ABB70 80243780 0C0907F2 */ jal func_80241FC8_9AA3B8 +/* 9ABB70 80243780 0C0907F2 */ jal trd_04_UnkNpcAIFunc35 /* 9ABB74 80243784 0280302D */ daddu $a2, $s4, $zero /* 9ABB78 80243788 8E630070 */ lw $v1, 0x70($s3) /* 9ABB7C 8024378C 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240C94_9B7614.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240C94_9B7614.s deleted file mode 100644 index d7bda41a56..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240C94_9B7614.s +++ /dev/null @@ -1,428 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244888_9BB208 -.double 0.09 - -dlabel D_80244890_9BB210 -.double 0.09 - -.section .text - -glabel func_80240C94_9B7614 -/* 9B7614 80240C94 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 9B7618 80240C98 AFB3004C */ sw $s3, 0x4c($sp) -/* 9B761C 80240C9C 0080982D */ daddu $s3, $a0, $zero -/* 9B7620 80240CA0 AFBF0058 */ sw $ra, 0x58($sp) -/* 9B7624 80240CA4 AFB50054 */ sw $s5, 0x54($sp) -/* 9B7628 80240CA8 AFB40050 */ sw $s4, 0x50($sp) -/* 9B762C 80240CAC AFB20048 */ sw $s2, 0x48($sp) -/* 9B7630 80240CB0 AFB10044 */ sw $s1, 0x44($sp) -/* 9B7634 80240CB4 AFB00040 */ sw $s0, 0x40($sp) -/* 9B7638 80240CB8 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 9B763C 80240CBC F7B80070 */ sdc1 $f24, 0x70($sp) -/* 9B7640 80240CC0 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 9B7644 80240CC4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 9B7648 80240CC8 8E710148 */ lw $s1, 0x148($s3) -/* 9B764C 80240CCC 00A0902D */ daddu $s2, $a1, $zero -/* 9B7650 80240CD0 86240008 */ lh $a0, 8($s1) -/* 9B7654 80240CD4 0C00EABB */ jal get_npc_unsafe -/* 9B7658 80240CD8 00C0A82D */ daddu $s5, $a2, $zero -/* 9B765C 80240CDC 0040802D */ daddu $s0, $v0, $zero -/* 9B7660 80240CE0 0000A02D */ daddu $s4, $zero, $zero -/* 9B7664 80240CE4 C624007C */ lwc1 $f4, 0x7c($s1) -/* 9B7668 80240CE8 46802120 */ cvt.s.w $f4, $f4 -/* 9B766C 80240CEC C6220088 */ lwc1 $f2, 0x88($s1) -/* 9B7670 80240CF0 468010A0 */ cvt.s.w $f2, $f2 -/* 9B7674 80240CF4 460010A1 */ cvt.d.s $f2, $f2 -/* 9B7678 80240CF8 46002121 */ cvt.d.s $f4, $f4 -/* 9B767C 80240CFC C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B7680 80240D00 3C014059 */ lui $at, 0x4059 -/* 9B7684 80240D04 44813800 */ mtc1 $at, $f7 -/* 9B7688 80240D08 44803000 */ mtc1 $zero, $f6 -/* 9B768C 80240D0C 46000021 */ cvt.d.s $f0, $f0 -/* 9B7690 80240D10 46260002 */ mul.d $f0, $f0, $f6 -/* 9B7694 80240D14 00000000 */ nop -/* 9B7698 80240D18 24020001 */ addiu $v0, $zero, 1 -/* 9B769C 80240D1C 8E24006C */ lw $a0, 0x6c($s1) -/* 9B76A0 80240D20 46261083 */ div.d $f2, $f2, $f6 -/* 9B76A4 80240D24 462010A0 */ cvt.s.d $f2, $f2 -/* 9B76A8 80240D28 46262103 */ div.d $f4, $f4, $f6 -/* 9B76AC 80240D2C 46202520 */ cvt.s.d $f20, $f4 -/* 9B76B0 80240D30 30830011 */ andi $v1, $a0, 0x11 -/* 9B76B4 80240D34 4620020D */ trunc.w.d $f8, $f0 -/* 9B76B8 80240D38 E628007C */ swc1 $f8, 0x7c($s1) -/* 9B76BC 80240D3C C6200078 */ lwc1 $f0, 0x78($s1) -/* 9B76C0 80240D40 46800020 */ cvt.s.w $f0, $f0 -/* 9B76C4 80240D44 46000021 */ cvt.d.s $f0, $f0 -/* 9B76C8 80240D48 46260003 */ div.d $f0, $f0, $f6 -/* 9B76CC 80240D4C 462006A0 */ cvt.s.d $f26, $f0 -/* 9B76D0 80240D50 C6200070 */ lwc1 $f0, 0x70($s1) -/* 9B76D4 80240D54 46800020 */ cvt.s.w $f0, $f0 -/* 9B76D8 80240D58 46000021 */ cvt.d.s $f0, $f0 -/* 9B76DC 80240D5C 46260003 */ div.d $f0, $f0, $f6 -/* 9B76E0 80240D60 462005A0 */ cvt.s.d $f22, $f0 -/* 9B76E4 80240D64 14620025 */ bne $v1, $v0, .L80240DFC -/* 9B76E8 80240D68 4602D600 */ add.s $f24, $f26, $f2 -/* 9B76EC 80240D6C 8E020000 */ lw $v0, ($s0) -/* 9B76F0 80240D70 30420008 */ andi $v0, $v0, 8 -/* 9B76F4 80240D74 10400009 */ beqz $v0, .L80240D9C -/* 9B76F8 80240D78 27A50028 */ addiu $a1, $sp, 0x28 -/* 9B76FC 80240D7C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B7700 80240D80 4600C001 */ sub.s $f0, $f24, $f0 -/* 9B7704 80240D84 4600B03C */ c.lt.s $f22, $f0 -/* 9B7708 80240D88 00000000 */ nop -/* 9B770C 80240D8C 4500001B */ bc1f .L80240DFC -/* 9B7710 80240D90 34820010 */ ori $v0, $a0, 0x10 -/* 9B7714 80240D94 0809037F */ j .L80240DFC -/* 9B7718 80240D98 AE22006C */ sw $v0, 0x6c($s1) -.L80240D9C: -/* 9B771C 80240D9C 27A6002C */ addiu $a2, $sp, 0x2c -/* 9B7720 80240DA0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B7724 80240DA4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B7728 80240DA8 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9B772C 80240DAC 3C01447A */ lui $at, 0x447a -/* 9B7730 80240DB0 44813000 */ mtc1 $at, $f6 -/* 9B7734 80240DB4 27A20034 */ addiu $v0, $sp, 0x34 -/* 9B7738 80240DB8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9B773C 80240DBC E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9B7740 80240DC0 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9B7744 80240DC4 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9B7748 80240DC8 AFA20010 */ sw $v0, 0x10($sp) -/* 9B774C 80240DCC 8E040080 */ lw $a0, 0x80($s0) -/* 9B7750 80240DD0 0C0372DF */ jal npc_raycast_down_sides -/* 9B7754 80240DD4 27A70030 */ addiu $a3, $sp, 0x30 -/* 9B7758 80240DD8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 9B775C 80240DDC 4600D001 */ sub.s $f0, $f26, $f0 -/* 9B7760 80240DE0 4600B03C */ c.lt.s $f22, $f0 -/* 9B7764 80240DE4 00000000 */ nop -/* 9B7768 80240DE8 45000004 */ bc1f .L80240DFC -/* 9B776C 80240DEC 00000000 */ nop -/* 9B7770 80240DF0 8E22006C */ lw $v0, 0x6c($s1) -/* 9B7774 80240DF4 34420010 */ ori $v0, $v0, 0x10 -/* 9B7778 80240DF8 AE22006C */ sw $v0, 0x6c($s1) -.L80240DFC: -/* 9B777C 80240DFC 8E22006C */ lw $v0, 0x6c($s1) -/* 9B7780 80240E00 24030011 */ addiu $v1, $zero, 0x11 -/* 9B7784 80240E04 30420011 */ andi $v0, $v0, 0x11 -/* 9B7788 80240E08 14430039 */ bne $v0, $v1, .L80240EF0 -/* 9B778C 80240E0C 00000000 */ nop -/* 9B7790 80240E10 8E020000 */ lw $v0, ($s0) -/* 9B7794 80240E14 30420008 */ andi $v0, $v0, 8 -/* 9B7798 80240E18 1040000A */ beqz $v0, .L80240E44 -/* 9B779C 80240E1C 4600C106 */ mov.s $f4, $f24 -/* 9B77A0 80240E20 4614C081 */ sub.s $f2, $f24, $f20 -/* 9B77A4 80240E24 3C018024 */ lui $at, %hi(D_80244888_9BB208) -/* 9B77A8 80240E28 D4204888 */ ldc1 $f0, %lo(D_80244888_9BB208)($at) -/* 9B77AC 80240E2C 460010A1 */ cvt.d.s $f2, $f2 -/* 9B77B0 80240E30 46201082 */ mul.d $f2, $f2, $f0 -/* 9B77B4 80240E34 00000000 */ nop -/* 9B77B8 80240E38 4600A021 */ cvt.d.s $f0, $f20 -/* 9B77BC 80240E3C 080903AA */ j .L80240EA8 -/* 9B77C0 80240E40 46220000 */ add.d $f0, $f0, $f2 -.L80240E44: -/* 9B77C4 80240E44 27A50028 */ addiu $a1, $sp, 0x28 -/* 9B77C8 80240E48 27A6002C */ addiu $a2, $sp, 0x2c -/* 9B77CC 80240E4C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B77D0 80240E50 C6020040 */ lwc1 $f2, 0x40($s0) -/* 9B77D4 80240E54 3C01447A */ lui $at, 0x447a -/* 9B77D8 80240E58 44812000 */ mtc1 $at, $f4 -/* 9B77DC 80240E5C 27A20034 */ addiu $v0, $sp, 0x34 -/* 9B77E0 80240E60 E7B4002C */ swc1 $f20, 0x2c($sp) -/* 9B77E4 80240E64 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9B77E8 80240E68 E7A20030 */ swc1 $f2, 0x30($sp) -/* 9B77EC 80240E6C E7A40034 */ swc1 $f4, 0x34($sp) -/* 9B77F0 80240E70 AFA20010 */ sw $v0, 0x10($sp) -/* 9B77F4 80240E74 8E040080 */ lw $a0, 0x80($s0) -/* 9B77F8 80240E78 0C0372DF */ jal npc_raycast_down_sides -/* 9B77FC 80240E7C 27A70030 */ addiu $a3, $sp, 0x30 -/* 9B7800 80240E80 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 9B7804 80240E84 461A2100 */ add.s $f4, $f4, $f26 -/* 9B7808 80240E88 46142081 */ sub.s $f2, $f4, $f20 -/* 9B780C 80240E8C 3C018024 */ lui $at, %hi(D_80244890_9BB210) -/* 9B7810 80240E90 D4204890 */ ldc1 $f0, %lo(D_80244890_9BB210)($at) -/* 9B7814 80240E94 460010A1 */ cvt.d.s $f2, $f2 -/* 9B7818 80240E98 46201082 */ mul.d $f2, $f2, $f0 -/* 9B781C 80240E9C 00000000 */ nop -/* 9B7820 80240EA0 4600A021 */ cvt.d.s $f0, $f20 -/* 9B7824 80240EA4 46220000 */ add.d $f0, $f0, $f2 -.L80240EA8: -/* 9B7828 80240EA8 46200020 */ cvt.s.d $f0, $f0 -/* 9B782C 80240EAC E600003C */ swc1 $f0, 0x3c($s0) -/* 9B7830 80240EB0 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B7834 80240EB4 46002001 */ sub.s $f0, $f4, $f0 -/* 9B7838 80240EB8 3C013FF0 */ lui $at, 0x3ff0 -/* 9B783C 80240EBC 44811800 */ mtc1 $at, $f3 -/* 9B7840 80240EC0 44801000 */ mtc1 $zero, $f2 -/* 9B7844 80240EC4 46000005 */ abs.s $f0, $f0 -/* 9B7848 80240EC8 46000021 */ cvt.d.s $f0, $f0 -/* 9B784C 80240ECC 4622003C */ c.lt.d $f0, $f2 -/* 9B7850 80240ED0 00000000 */ nop -/* 9B7854 80240ED4 45000036 */ bc1f .L80240FB0 -/* 9B7858 80240ED8 2403FFEF */ addiu $v1, $zero, -0x11 -/* 9B785C 80240EDC E604003C */ swc1 $f4, 0x3c($s0) -/* 9B7860 80240EE0 8E22006C */ lw $v0, 0x6c($s1) -/* 9B7864 80240EE4 00431024 */ and $v0, $v0, $v1 -/* 9B7868 80240EE8 080903EC */ j .L80240FB0 -/* 9B786C 80240EEC AE22006C */ sw $v0, 0x6c($s1) -.L80240EF0: -/* 9B7870 80240EF0 8E220070 */ lw $v0, 0x70($s1) -/* 9B7874 80240EF4 1840002E */ blez $v0, .L80240FB0 -/* 9B7878 80240EF8 00000000 */ nop -/* 9B787C 80240EFC C62C0074 */ lwc1 $f12, 0x74($s1) -/* 9B7880 80240F00 0C00A8BB */ jal sin_deg -/* 9B7884 80240F04 46806320 */ cvt.s.w $f12, $f12 -/* 9B7888 80240F08 8E020000 */ lw $v0, ($s0) -/* 9B788C 80240F0C 30420008 */ andi $v0, $v0, 8 -/* 9B7890 80240F10 10400003 */ beqz $v0, .L80240F20 -/* 9B7894 80240F14 46000506 */ mov.s $f20, $f0 -/* 9B7898 80240F18 080903D8 */ j .L80240F60 -/* 9B789C 80240F1C 0000102D */ daddu $v0, $zero, $zero -.L80240F20: -/* 9B78A0 80240F20 27A50028 */ addiu $a1, $sp, 0x28 -/* 9B78A4 80240F24 27A6002C */ addiu $a2, $sp, 0x2c -/* 9B78A8 80240F28 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B78AC 80240F2C C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B78B0 80240F30 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9B78B4 80240F34 3C01447A */ lui $at, 0x447a -/* 9B78B8 80240F38 44813000 */ mtc1 $at, $f6 -/* 9B78BC 80240F3C 27A20034 */ addiu $v0, $sp, 0x34 -/* 9B78C0 80240F40 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9B78C4 80240F44 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9B78C8 80240F48 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9B78CC 80240F4C E7A60034 */ swc1 $f6, 0x34($sp) -/* 9B78D0 80240F50 AFA20010 */ sw $v0, 0x10($sp) -/* 9B78D4 80240F54 8E040080 */ lw $a0, 0x80($s0) -/* 9B78D8 80240F58 0C0372DF */ jal npc_raycast_down_sides -/* 9B78DC 80240F5C 27A70030 */ addiu $a3, $sp, 0x30 -.L80240F60: -/* 9B78E0 80240F60 10400007 */ beqz $v0, .L80240F80 -/* 9B78E4 80240F64 00000000 */ nop -/* 9B78E8 80240F68 4616A082 */ mul.s $f2, $f20, $f22 -/* 9B78EC 80240F6C 00000000 */ nop -/* 9B78F0 80240F70 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9B78F4 80240F74 461A0000 */ add.s $f0, $f0, $f26 -/* 9B78F8 80240F78 080903E3 */ j .L80240F8C -/* 9B78FC 80240F7C 46020000 */ add.s $f0, $f0, $f2 -.L80240F80: -/* 9B7900 80240F80 4616A002 */ mul.s $f0, $f20, $f22 -/* 9B7904 80240F84 00000000 */ nop -/* 9B7908 80240F88 4600C000 */ add.s $f0, $f24, $f0 -.L80240F8C: -/* 9B790C 80240F8C E600003C */ swc1 $f0, 0x3c($s0) -/* 9B7910 80240F90 8E220074 */ lw $v0, 0x74($s1) -/* 9B7914 80240F94 2442000A */ addiu $v0, $v0, 0xa -/* 9B7918 80240F98 44826000 */ mtc1 $v0, $f12 -/* 9B791C 80240F9C 00000000 */ nop -/* 9B7920 80240FA0 0C00A6C9 */ jal clamp_angle -/* 9B7924 80240FA4 46806320 */ cvt.s.w $f12, $f12 -/* 9B7928 80240FA8 4600020D */ trunc.w.s $f8, $f0 -/* 9B792C 80240FAC E6280074 */ swc1 $f8, 0x74($s1) -.L80240FB0: -/* 9B7930 80240FB0 8E220090 */ lw $v0, 0x90($s1) -/* 9B7934 80240FB4 1C40004A */ bgtz $v0, .L802410E0 -/* 9B7938 80240FB8 2442FFFF */ addiu $v0, $v0, -1 -/* 9B793C 80240FBC 8E430014 */ lw $v1, 0x14($s2) -/* 9B7940 80240FC0 04600048 */ bltz $v1, .L802410E4 -/* 9B7944 80240FC4 00000000 */ nop -/* 9B7948 80240FC8 8E620074 */ lw $v0, 0x74($s3) -/* 9B794C 80240FCC 1C400042 */ bgtz $v0, .L802410D8 -/* 9B7950 80240FD0 2442FFFF */ addiu $v0, $v0, -1 -/* 9B7954 80240FD4 AE630074 */ sw $v1, 0x74($s3) -/* 9B7958 80240FD8 860200A8 */ lh $v0, 0xa8($s0) -/* 9B795C 80240FDC C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B7960 80240FE0 44820000 */ mtc1 $v0, $f0 -/* 9B7964 80240FE4 00000000 */ nop -/* 9B7968 80240FE8 46800020 */ cvt.s.w $f0, $f0 -/* 9B796C 80240FEC 46001080 */ add.s $f2, $f2, $f0 -/* 9B7970 80240FF0 3C014024 */ lui $at, 0x4024 -/* 9B7974 80240FF4 44810800 */ mtc1 $at, $f1 -/* 9B7978 80240FF8 44800000 */ mtc1 $zero, $f0 -/* 9B797C 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B7980 80241000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B7984 80241004 460010A1 */ cvt.d.s $f2, $f2 -/* 9B7988 80241008 46201080 */ add.d $f2, $f2, $f0 -/* 9B798C 8024100C C440002C */ lwc1 $f0, 0x2c($v0) -/* 9B7990 80241010 46000021 */ cvt.d.s $f0, $f0 -/* 9B7994 80241014 4622003C */ c.lt.d $f0, $f2 -/* 9B7998 80241018 00000000 */ nop -/* 9B799C 8024101C 4500002C */ bc1f .L802410D0 -/* 9B79A0 80241020 02A0202D */ daddu $a0, $s5, $zero -/* 9B79A4 80241024 AFA00010 */ sw $zero, 0x10($sp) -/* 9B79A8 80241028 8E46000C */ lw $a2, 0xc($s2) -/* 9B79AC 8024102C 8E470010 */ lw $a3, 0x10($s2) -/* 9B79B0 80241030 0C01242D */ jal func_800490B4 -/* 9B79B4 80241034 0220282D */ daddu $a1, $s1, $zero -/* 9B79B8 80241038 10400025 */ beqz $v0, .L802410D0 -/* 9B79BC 8024103C 0000202D */ daddu $a0, $zero, $zero -/* 9B79C0 80241040 0200282D */ daddu $a1, $s0, $zero -/* 9B79C4 80241044 0000302D */ daddu $a2, $zero, $zero -/* 9B79C8 80241048 2412000C */ addiu $s2, $zero, 0xc -/* 9B79CC 8024104C 860300A8 */ lh $v1, 0xa8($s0) -/* 9B79D0 80241050 3C013F80 */ lui $at, 0x3f80 -/* 9B79D4 80241054 44810000 */ mtc1 $at, $f0 -/* 9B79D8 80241058 3C014000 */ lui $at, 0x4000 -/* 9B79DC 8024105C 44811000 */ mtc1 $at, $f2 -/* 9B79E0 80241060 3C01C1A0 */ lui $at, 0xc1a0 -/* 9B79E4 80241064 44812000 */ mtc1 $at, $f4 -/* 9B79E8 80241068 44834000 */ mtc1 $v1, $f8 -/* 9B79EC 8024106C 00000000 */ nop -/* 9B79F0 80241070 46804220 */ cvt.s.w $f8, $f8 -/* 9B79F4 80241074 44074000 */ mfc1 $a3, $f8 -/* 9B79F8 80241078 27A20038 */ addiu $v0, $sp, 0x38 -/* 9B79FC 8024107C AFB2001C */ sw $s2, 0x1c($sp) -/* 9B7A00 80241080 AFA20020 */ sw $v0, 0x20($sp) -/* 9B7A04 80241084 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9B7A08 80241088 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9B7A0C 8024108C 0C01BFA4 */ jal fx_emote -/* 9B7A10 80241090 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9B7A14 80241094 0200202D */ daddu $a0, $s0, $zero -/* 9B7A18 80241098 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9B7A1C 8024109C C480003C */ lwc1 $f0, 0x3c($a0) -/* 9B7A20 802410A0 3C060020 */ lui $a2, 0x20 -/* 9B7A24 802410A4 0C012530 */ jal ai_enemy_play_sound -/* 9B7A28 802410A8 E4800064 */ swc1 $f0, 0x64($a0) -/* 9B7A2C 802410AC 8E220018 */ lw $v0, 0x18($s1) -/* 9B7A30 802410B0 9442002A */ lhu $v0, 0x2a($v0) -/* 9B7A34 802410B4 30420001 */ andi $v0, $v0, 1 -/* 9B7A38 802410B8 10400003 */ beqz $v0, .L802410C8 -/* 9B7A3C 802410BC 2402000A */ addiu $v0, $zero, 0xa -/* 9B7A40 802410C0 080904A2 */ j .L80241288 -/* 9B7A44 802410C4 AE620070 */ sw $v0, 0x70($s3) -.L802410C8: -/* 9B7A48 802410C8 080904A2 */ j .L80241288 -/* 9B7A4C 802410CC AE720070 */ sw $s2, 0x70($s3) -.L802410D0: -/* 9B7A50 802410D0 8E620074 */ lw $v0, 0x74($s3) -/* 9B7A54 802410D4 2442FFFF */ addiu $v0, $v0, -1 -.L802410D8: -/* 9B7A58 802410D8 08090439 */ j .L802410E4 -/* 9B7A5C 802410DC AE620074 */ sw $v0, 0x74($s3) -.L802410E0: -/* 9B7A60 802410E0 AE220090 */ sw $v0, 0x90($s1) -.L802410E4: -/* 9B7A64 802410E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B7A68 802410E8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9B7A6C 802410EC C4620000 */ lwc1 $f2, ($v1) -/* 9B7A70 802410F0 468010A0 */ cvt.s.w $f2, $f2 -/* 9B7A74 802410F4 C4640008 */ lwc1 $f4, 8($v1) -/* 9B7A78 802410F8 46802120 */ cvt.s.w $f4, $f4 -/* 9B7A7C 802410FC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9B7A80 80241100 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7A84 80241104 44051000 */ mfc1 $a1, $f2 -/* 9B7A88 80241108 C440000C */ lwc1 $f0, 0xc($v0) -/* 9B7A8C 8024110C 46800020 */ cvt.s.w $f0, $f0 -/* 9B7A90 80241110 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9B7A94 80241114 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7A98 80241118 44062000 */ mfc1 $a2, $f4 -/* 9B7A9C 8024111C C4400010 */ lwc1 $f0, 0x10($v0) -/* 9B7AA0 80241120 46800020 */ cvt.s.w $f0, $f0 -/* 9B7AA4 80241124 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B7AA8 80241128 8C640018 */ lw $a0, 0x18($v1) -/* 9B7AAC 8024112C 0C0123F5 */ jal is_point_within_region -/* 9B7AB0 80241130 8E070038 */ lw $a3, 0x38($s0) -/* 9B7AB4 80241134 1040001A */ beqz $v0, .L802411A0 -/* 9B7AB8 80241138 00000000 */ nop -/* 9B7ABC 8024113C 8E060038 */ lw $a2, 0x38($s0) -/* 9B7AC0 80241140 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7AC4 80241144 8E070040 */ lw $a3, 0x40($s0) -/* 9B7AC8 80241148 C44C0000 */ lwc1 $f12, ($v0) -/* 9B7ACC 8024114C 46806320 */ cvt.s.w $f12, $f12 -/* 9B7AD0 80241150 C44E0008 */ lwc1 $f14, 8($v0) -/* 9B7AD4 80241154 0C00A7B5 */ jal dist2D -/* 9B7AD8 80241158 468073A0 */ cvt.s.w $f14, $f14 -/* 9B7ADC 8024115C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9B7AE0 80241160 4600103C */ c.lt.s $f2, $f0 -/* 9B7AE4 80241164 00000000 */ nop -/* 9B7AE8 80241168 4500000D */ bc1f .L802411A0 -/* 9B7AEC 8024116C E7A00034 */ swc1 $f0, 0x34($sp) -/* 9B7AF0 80241170 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B7AF4 80241174 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7AF8 80241178 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B7AFC 8024117C C4480000 */ lwc1 $f8, ($v0) -/* 9B7B00 80241180 46804220 */ cvt.s.w $f8, $f8 -/* 9B7B04 80241184 44064000 */ mfc1 $a2, $f8 -/* 9B7B08 80241188 C4480008 */ lwc1 $f8, 8($v0) -/* 9B7B0C 8024118C 46804220 */ cvt.s.w $f8, $f8 -/* 9B7B10 80241190 44074000 */ mfc1 $a3, $f8 -/* 9B7B14 80241194 0C00A720 */ jal atan2 -/* 9B7B18 80241198 24140001 */ addiu $s4, $zero, 1 -/* 9B7B1C 8024119C E600000C */ swc1 $f0, 0xc($s0) -.L802411A0: -/* 9B7B20 802411A0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7B24 802411A4 8C43000C */ lw $v1, 0xc($v0) -/* 9B7B28 802411A8 8C420010 */ lw $v0, 0x10($v0) -/* 9B7B2C 802411AC 00621825 */ or $v1, $v1, $v0 -/* 9B7B30 802411B0 00741825 */ or $v1, $v1, $s4 -/* 9B7B34 802411B4 10600008 */ beqz $v1, .L802411D8 -/* 9B7B38 802411B8 00000000 */ nop -/* 9B7B3C 802411BC 8602008C */ lh $v0, 0x8c($s0) -/* 9B7B40 802411C0 14400031 */ bnez $v0, .L80241288 -/* 9B7B44 802411C4 00000000 */ nop -/* 9B7B48 802411C8 8E050018 */ lw $a1, 0x18($s0) -/* 9B7B4C 802411CC 8E06000C */ lw $a2, 0xc($s0) -/* 9B7B50 802411D0 0C00EA95 */ jal npc_move_heading -/* 9B7B54 802411D4 0200202D */ daddu $a0, $s0, $zero -.L802411D8: -/* 9B7B58 802411D8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B7B5C 802411DC 3C014059 */ lui $at, 0x4059 -/* 9B7B60 802411E0 44811800 */ mtc1 $at, $f3 -/* 9B7B64 802411E4 44801000 */ mtc1 $zero, $f2 -/* 9B7B68 802411E8 46000021 */ cvt.d.s $f0, $f0 -/* 9B7B6C 802411EC 46220002 */ mul.d $f0, $f0, $f2 -/* 9B7B70 802411F0 00000000 */ nop -/* 9B7B74 802411F4 4620020D */ trunc.w.d $f8, $f0 -/* 9B7B78 802411F8 E628007C */ swc1 $f8, 0x7c($s1) -/* 9B7B7C 802411FC 8E420004 */ lw $v0, 4($s2) -/* 9B7B80 80241200 18400021 */ blez $v0, .L80241288 -/* 9B7B84 80241204 00000000 */ nop -/* 9B7B88 80241208 8602008E */ lh $v0, 0x8e($s0) -/* 9B7B8C 8024120C 9603008E */ lhu $v1, 0x8e($s0) -/* 9B7B90 80241210 18400005 */ blez $v0, .L80241228 -/* 9B7B94 80241214 2462FFFF */ addiu $v0, $v1, -1 -/* 9B7B98 80241218 A602008E */ sh $v0, 0x8e($s0) -/* 9B7B9C 8024121C 00021400 */ sll $v0, $v0, 0x10 -/* 9B7BA0 80241220 1C400019 */ bgtz $v0, .L80241288 -/* 9B7BA4 80241224 00000000 */ nop -.L80241228: -/* 9B7BA8 80241228 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9B7BAC 8024122C 24020002 */ addiu $v0, $zero, 2 -/* 9B7BB0 80241230 0C00A67F */ jal rand_int -/* 9B7BB4 80241234 AE620070 */ sw $v0, 0x70($s3) -/* 9B7BB8 80241238 3C035555 */ lui $v1, 0x5555 -/* 9B7BBC 8024123C 34635556 */ ori $v1, $v1, 0x5556 -/* 9B7BC0 80241240 00430018 */ mult $v0, $v1 -/* 9B7BC4 80241244 000227C3 */ sra $a0, $v0, 0x1f -/* 9B7BC8 80241248 00004010 */ mfhi $t0 -/* 9B7BCC 8024124C 01042023 */ subu $a0, $t0, $a0 -/* 9B7BD0 80241250 00041840 */ sll $v1, $a0, 1 -/* 9B7BD4 80241254 00641821 */ addu $v1, $v1, $a0 -/* 9B7BD8 80241258 00431023 */ subu $v0, $v0, $v1 -/* 9B7BDC 8024125C 24430002 */ addiu $v1, $v0, 2 -/* 9B7BE0 80241260 AE630074 */ sw $v1, 0x74($s3) -/* 9B7BE4 80241264 8E42002C */ lw $v0, 0x2c($s2) -/* 9B7BE8 80241268 58400007 */ blezl $v0, .L80241288 -/* 9B7BEC 8024126C AE600070 */ sw $zero, 0x70($s3) -/* 9B7BF0 80241270 8E420008 */ lw $v0, 8($s2) -/* 9B7BF4 80241274 18400003 */ blez $v0, .L80241284 -/* 9B7BF8 80241278 28620003 */ slti $v0, $v1, 3 -/* 9B7BFC 8024127C 10400002 */ beqz $v0, .L80241288 -/* 9B7C00 80241280 00000000 */ nop -.L80241284: -/* 9B7C04 80241284 AE600070 */ sw $zero, 0x70($s3) -.L80241288: -/* 9B7C08 80241288 8FBF0058 */ lw $ra, 0x58($sp) -/* 9B7C0C 8024128C 8FB50054 */ lw $s5, 0x54($sp) -/* 9B7C10 80241290 8FB40050 */ lw $s4, 0x50($sp) -/* 9B7C14 80241294 8FB3004C */ lw $s3, 0x4c($sp) -/* 9B7C18 80241298 8FB20048 */ lw $s2, 0x48($sp) -/* 9B7C1C 8024129C 8FB10044 */ lw $s1, 0x44($sp) -/* 9B7C20 802412A0 8FB00040 */ lw $s0, 0x40($sp) -/* 9B7C24 802412A4 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 9B7C28 802412A8 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 9B7C2C 802412AC D7B60068 */ ldc1 $f22, 0x68($sp) -/* 9B7C30 802412B0 D7B40060 */ ldc1 $f20, 0x60($sp) -/* 9B7C34 802412B4 03E00008 */ jr $ra -/* 9B7C38 802412B8 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s index 89592a7706..abd1fc4f34 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s @@ -86,7 +86,7 @@ glabel func_80241DF0_9B8770 .L80241F0C_9B888C: /* 9B888C 80241F0C 0280202D */ daddu $a0, $s4, $zero /* 9B8890 80241F10 0200282D */ daddu $a1, $s0, $zero -/* 9B8894 80241F14 0C090325 */ jal func_80240C94_9B7614 +/* 9B8894 80241F14 0C090325 */ jal trd_07_UnkNpcAIFunc35 /* 9B8898 80241F18 0260302D */ daddu $a2, $s3, $zero /* 9B889C 80241F1C 080907EE */ j .L80241FB8 /* 9B88A0 80241F20 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s index fb58d7841a..4583ccd7e9 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s @@ -89,7 +89,7 @@ glabel func_8024231C_9B8C9C .L80242444_9B8DC4: /* 9B8DC4 80242444 0260202D */ daddu $a0, $s3, $zero /* 9B8DC8 80242448 0200282D */ daddu $a1, $s0, $zero -/* 9B8DCC 8024244C 0C090325 */ jal func_80240C94_9B7614 +/* 9B8DCC 8024244C 0C090325 */ jal trd_07_UnkNpcAIFunc35 /* 9B8DD0 80242450 0280302D */ daddu $a2, $s4, $zero /* 9B8DD4 80242454 8E630070 */ lw $v1, 0x70($s3) /* 9B8DD8 80242458 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 8ba0462c37..160fbaba58 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -2291,7 +2291,7 @@ segments: vram: 0xE001A000 subsegments: - [0x32FE30, c, effect_13] - - [0x330440, data] + - [0x330440] - [0x330460, bin] # effect 13 gfx - name: effect_14 dir: effects @@ -2300,7 +2300,7 @@ segments: vram: 0xE001C000 subsegments: - [0x330910, c, effect_14] - - [0x330EF0, data] + - [0x330EF0] - [0x330F00, bin] # effect 14 gfx - name: effect_15 dir: effects @@ -2309,7 +2309,7 @@ segments: vram: 0xE001E000 subsegments: - [0x331940, c, effect_15] - - [0x332690, data] + - [0x332690] - [0x3326A0, bin] # effect 15 gfx - name: effect_16 dir: effects @@ -2318,7 +2318,7 @@ segments: vram: 0xE0020000 subsegments: - [0x333EC0, c, effect_16] - - [0x334B50, data] + - [0x334B50] - [0x334C70, bin] # effect 16 gfx - name: effect_17 dir: effects @@ -11337,7 +11337,8 @@ segments: - [0xEE65B0, c] - [0xEE70C0, c] - [0xEE8940, c] - - [0xEE8970, data] # Has rodata followed by a script...but doesn't seem to be a new segment + - [0xEE8970, data] + - [0xEEB900] - type: code start: 0xEED100 vram: 0x80240000 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 0e12fab6cb..a35d1e7c73 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -5517,6 +5517,7 @@ fx_13_init = 0xE001A21C; // type:func rom:0x33004C fx_13_update = 0xE001A224; // type:func rom:0x330054 fx_13_render = 0xE001A3FC; // type:func rom:0x33022C fx_13_appendGfx = 0xE001A440; // type:func rom:0x330270 +D_E001A610 = 0xE001A610; // type:data rom:0x330440 fx_14_main = 0xE001C000; // type:func rom:0x330910 fx_14_init = 0xE001C120; // type:func rom:0x330A30 fx_14_update = 0xE001C128; // type:func rom:0x330A38 @@ -5533,6 +5534,15 @@ fx_16_init = 0xE0020460; // type:func rom:0x334320 fx_16_update = 0xE0020468; // type:func rom:0x334328 fx_16_render = 0xE002058C; // type:func rom:0x33444C fx_16_appendGfx = 0xE00205D0; // type:func rom:0x334490 +D_E0020C90 = 0xE0020C90; // type:data rom:0x334B50 +D_E0020CA4 = 0xE0020CA4; // type:data rom:0x334B64 +D_E0020CB8 = 0xE0020CB8; // type:data rom:0x334B78 +D_E0020CE0 = 0xE0020CE0; // type:data rom:0x334BA0 +D_E0020CFC = 0xE0020CFC; // type:data rom:0x334BBC +D_E0020D24 = 0xE0020D24; // type:data rom:0x334BE4 +D_E0020D30 = 0xE0020D30; // type:data rom:0x334BF0 +D_E0020D80 = 0xE0020D80; // type:data rom:0x334C40 +D_E0020D94 = 0xE0020D94; // type:data rom:0x334C54 fx_17_main = 0xE0022000; // type:func rom:0x337240 fx_17_init = 0xE0022544; // type:func rom:0x337784 fx_17_update = 0xE002254C; // type:func rom:0x33778C @@ -8947,7 +8957,7 @@ tik_01_UnkFunc25 = 0x80240340; // type:func rom:0x8697F0 tik_01_GetEntryPos = 0x802403FC; // type:func rom:0x8698AC tik_01_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x86998C tik_01_SomeXYZFunc2 = 0x80240548; // type:func rom:0x8699F8 -func_802405F0_869AA0 = 0x802405F0; // type:func rom:0x869AA0 +tik_01_UnkPosFunc2 = 0x802405F0; // type:func rom:0x869AA0 tik_01_SetEntityPosition = 0x80240960; // type:func rom:0x869E10 func_80240A30_869EE0 = 0x80240A30; // type:func rom:0x869EE0 D_80242B7E_86C02E = 0x80242B7E; // type:data rom:0x86C02E @@ -8957,7 +8967,7 @@ func_80240310_86CA50 = 0x80240310; // type:func rom:0x86CA50 tik_02_GetItemName = 0x802403C4; // type:func rom:0x86CB04 tik_02_SomeItemEntityFunc = 0x80240428; // type:func rom:0x86CB68 tik_02_CheckItemFlags40 = 0x80240578; // type:func rom:0x86CCB8 -func_802405D0_86CD10 = 0x802405D0; // type:func rom:0x86CD10 +tik_02_UnkPosFunc2 = 0x802405D0; // type:func rom:0x86CD10 func_80240940_86D080 = 0x80240940; // type:func rom:0x86D080 D_802410C0_86D800 = 0x802410C0; // type:data rom:0x86D800 D_80241BAE_86E2EE = 0x80241BAE; // type:data rom:0x86E2EE @@ -8969,7 +8979,7 @@ tik_03_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x86ECD0 tik_03_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x86ED3C tik_03_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x86EDE0 tik_03_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x86EF04 -func_802405F0_86F0F0 = 0x802405F0; // type:func rom:0x86F0F0 +tik_03_UnkPosFunc2 = 0x802405F0; // type:func rom:0x86F0F0 func_80240960_86F460 = 0x80240960; // type:func rom:0x86F460 func_802409C0_86F4C0 = 0x802409C0; // type:func rom:0x86F4C0 func_802409E0_86F4E0 = 0x802409E0; // type:func rom:0x86F4E0 @@ -8983,14 +8993,14 @@ tik_04_UnkFunc25 = 0x80240340; // type:func rom:0x871D70 tik_04_GetEntryPos = 0x802403FC; // type:func rom:0x871E2C tik_04_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x871F0C tik_04_SomeXYZFunc2 = 0x80240548; // type:func rom:0x871F78 -func_802405F0_872020 = 0x802405F0; // type:func rom:0x872020 +tik_04_UnkPosFunc2 = 0x802405F0; // type:func rom:0x872020 func_80240960_872390 = 0x80240960; // type:func rom:0x872390 func_80240A00_872430 = 0x80240A00; // type:func rom:0x872430 tik_04_GetFloorCollider = 0x80240BF4; // type:func rom:0x872624 func_80240C20_872650 = 0x80240C20; // type:func rom:0x872650 tik_05_UnkTexturePanFunc = 0x80240000; // type:func rom:0x874DC0 tik_05_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x874EE4 -func_80240310_8750D0 = 0x80240310; // type:func rom:0x8750D0 +tik_05_UnkPosFunc2 = 0x80240310; // type:func rom:0x8750D0 func_80240680_875440 = 0x80240680; // type:func rom:0x875440 tik_05_GetItemName = 0x80240734; // type:func rom:0x8754F4 tik_05_SomeItemEntityFunc = 0x80240798; // type:func rom:0x875558 @@ -9006,7 +9016,7 @@ tik_06_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8770B0 tik_06_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x87711C tik_06_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8771C0 tik_06_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8772E4 -func_802405F0_8774D0 = 0x802405F0; // type:func rom:0x8774D0 +tik_06_UnkPosFunc2 = 0x802405F0; // type:func rom:0x8774D0 tik_07_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x879BE0 tik_07_GetCurrentFloor = 0x80240020; // type:func rom:0x879C00 tik_07_UnkFunc25 = 0x80240034; // type:func rom:0x879C14 @@ -9031,10 +9041,10 @@ tik_07_UnkFunc23 = 0x80240E18; // type:func rom:0x87A9F8 tik_07_UnkPartnerPosFunc = 0x80240F58; // type:func rom:0x87AB38 tik_07_UnkPartnerPosFunc2 = 0x80240FA0; // type:func rom:0x87AB80 tik_07_UnkFunc40 = 0x80240FE8; // type:func rom:0x87ABC8 -func_80241020_87AC00 = 0x80241020; // type:func rom:0x87AC00 +tik_07_UnkPosFunc2 = 0x80241020; // type:func rom:0x87AC00 func_80241390_87AF70 = 0x80241390; // type:func rom:0x87AF70 tik_07_UnkNpcAIFunc23 = 0x802413F0; // type:func rom:0x87AFD0 -func_802415A0_87B180 = 0x802415A0; // type:func rom:0x87B180 +tik_07_UnkNpcAIFunc35 = 0x802415A0; // type:func rom:0x87B180 tik_07_UnkNpcAIFunc1 = 0x80241BC8; // type:func rom:0x87B7A8 tik_07_UnkFunc4 = 0x80241C88; // type:func rom:0x87B868 tik_07_UnkNpcAIFunc2 = 0x80241FCC; // type:func rom:0x87BBAC @@ -9061,7 +9071,7 @@ tik_08_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x87EFC0 tik_08_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x87F02C tik_08_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x87F0D0 tik_08_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x87F1F4 -func_802405F0_87F3E0 = 0x802405F0; // type:func rom:0x87F3E0 +tik_08_UnkPosFunc2 = 0x802405F0; // type:func rom:0x87F3E0 tik_08_SetEntityPosition = 0x80240960; // type:func rom:0x87F750 tik_08_GetFloorCollider = 0x80240A30; // type:func rom:0x87F820 func_80240A5C_87F84C = 0x80240A5C; // type:func rom:0x87F84C @@ -9074,7 +9084,7 @@ tik_09_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x882390 tik_09_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8823FC tik_09_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8824A0 tik_09_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8825C4 -func_802405F0_8827B0 = 0x802405F0; // type:func rom:0x8827B0 +tik_09_UnkPosFunc2 = 0x802405F0; // type:func rom:0x8827B0 tik_09_SetEntityPosition = 0x80240960; // type:func rom:0x882B20 tik_09_set_script_owner_npc_anim = 0x80240A30; // type:func rom:0x882BF0 tik_09_UnkDistFunc = 0x80240AAC; // type:func rom:0x882C6C @@ -9085,7 +9095,7 @@ func_80241204_8833C4 = 0x80241204; // type:func rom:0x8833C4 D_802441A0_886360 = 0x802441A0; // type:data rom:0x886360 tik_10_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8863C0 tik_10_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x8864E4 -func_80240310_8866D0 = 0x80240310; // type:func rom:0x8866D0 +tik_10_UnkPosFunc2 = 0x80240310; // type:func rom:0x8866D0 tik_10_SetOverrideFlags_40 = 0x80240680; // type:func rom:0x886A40 tik_10_UnkFunc17 = 0x8024069C; // type:func rom:0x886A5C func_802406BC_886A7C = 0x802406BC; // type:func rom:0x886A7C @@ -9116,7 +9126,7 @@ tik_12_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x888DA0 tik_12_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x888E0C tik_12_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x888EB0 tik_12_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x888FD4 -func_802405F0_8891C0 = 0x802405F0; // type:func rom:0x8891C0 +tik_12_UnkPosFunc2 = 0x802405F0; // type:func rom:0x8891C0 func_80240960_889530 = 0x80240960; // type:func rom:0x889530 tik_12_GetItemName = 0x80240A14; // type:func rom:0x8895E4 tik_12_SomeItemEntityFunc = 0x80240A78; // type:func rom:0x889648 @@ -9161,7 +9171,7 @@ tik_14_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x88D7D0 tik_14_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x88D83C tik_14_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x88D8E0 tik_14_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x88DA04 -func_802405F0_88DBF0 = 0x802405F0; // type:func rom:0x88DBF0 +tik_14_UnkPosFunc2 = 0x802405F0; // type:func rom:0x88DBF0 tik_15_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x88FBA0 tik_15_GetCurrentFloor = 0x80240020; // type:func rom:0x88FBC0 tik_15_UnkFunc25 = 0x80240034; // type:func rom:0x88FBD4 @@ -9170,7 +9180,7 @@ tik_15_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x88FD70 tik_15_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x88FDDC tik_15_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x88FE80 tik_15_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x88FFA4 -func_802405F0_890190 = 0x802405F0; // type:func rom:0x890190 +tik_15_UnkPosFunc2 = 0x802405F0; // type:func rom:0x890190 func_80240960_890500 = 0x80240960; // type:func rom:0x890500 tik_15_GetItemName = 0x80240A14; // type:func rom:0x8905B4 func_80240A78_890618 = 0x80240A78; // type:func rom:0x890618 @@ -9211,7 +9221,7 @@ D_80241438_893E58 = 0x80241438; // type:data rom:0x893E58 D_80241478_893E98 = 0x80241478; // type:data rom:0x893E98 tik_18_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8956E0 tik_18_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x895804 -func_80240310_8959F0 = 0x80240310; // type:func rom:0x8959F0 +tik_18_UnkPosFunc2 = 0x80240310; // type:func rom:0x8959F0 func_80240680_895D60 = 0x80240680; // type:func rom:0x895D60 tik_19_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8975E0 tik_19_GetCurrentFloor = 0x80240020; // type:func rom:0x897600 @@ -9251,7 +9261,7 @@ tik_20_UnkFunc25 = 0x80240340; // type:func rom:0x89A690 tik_20_GetEntryPos = 0x802403FC; // type:func rom:0x89A74C tik_20_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x89A82C tik_20_SomeXYZFunc2 = 0x80240548; // type:func rom:0x89A898 -func_802405EC_89A93C = 0x802405EC; // type:func rom:0x89A93C +tik_20_UnkPosFunc2 = 0x802405EC; // type:func rom:0x89A93C tik_20_set_script_owner_npc_anim = 0x80240960; // type:func rom:0x89ACB0 tik_20_UnkDistFunc = 0x802409DC; // type:func rom:0x89AD2C tik_20_UnkNpcAIFunc12 = 0x80240B10; // type:func rom:0x89AE60 @@ -9266,7 +9276,7 @@ tik_21_UnkFunc25 = 0x80240340; // type:func rom:0x89DAE0 tik_21_GetEntryPos = 0x802403FC; // type:func rom:0x89DB9C tik_21_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x89DC7C tik_21_SomeXYZFunc2 = 0x80240548; // type:func rom:0x89DCE8 -func_802405EC_89DD8C = 0x802405EC; // type:func rom:0x89DD8C +tik_21_UnkPosFunc2 = 0x802405EC; // type:func rom:0x89DD8C func_80240000_89FEC0 = 0x80240000; // type:func rom:0x89FEC0 tik_22_UnkTexturePanFunc = 0x80240030; // type:func rom:0x89FEF0 tik_22_UnkTexturePanFunc2 = 0x80240154; // type:func rom:0x8A0014 @@ -9277,7 +9287,7 @@ tik_22_GetEntryPos = 0x8024042C; // type:func rom:0x8A02EC tik_22_GetCurrentCameraYawClamped180 = 0x8024050C; // type:func rom:0x8A03CC tik_22_SomeXYZFunc2 = 0x80240578; // type:func rom:0x8A0438 func_8024061C_8A04DC = 0x8024061C; // type:func rom:0x8A04DC -func_80240640_8A0500 = 0x80240640; // type:func rom:0x8A0500 +tik_22_UnkPosFunc2 = 0x80240640; // type:func rom:0x8A0500 tik_23_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8A23D0 tik_23_GetCurrentFloor = 0x80240020; // type:func rom:0x8A23F0 tik_23_UnkFunc25 = 0x80240034; // type:func rom:0x8A2404 @@ -9286,7 +9296,7 @@ tik_23_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8A25A0 tik_23_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8A260C tik_23_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8A26B0 tik_23_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8A27D4 -func_802405EC_8A29BC = 0x802405EC; // type:func rom:0x8A29BC +tik_23_UnkPosFunc2 = 0x802405EC; // type:func rom:0x8A29BC tik_23_set_script_owner_npc_anim = 0x80240960; // type:func rom:0x8A2D30 tik_23_UnkDistFunc = 0x802409DC; // type:func rom:0x8A2DAC tik_23_UnkNpcAIFunc12 = 0x80240B10; // type:func rom:0x8A2EE0 @@ -9296,7 +9306,7 @@ D_80243650_8A5A20 = 0x80243650; // type:data rom:0x8A5A20 func_80240000_8A5A80 = 0x80240000; // type:func rom:0x8A5A80 tik_24_UnkTexturePanFunc = 0x80240050; // type:func rom:0x8A5AD0 tik_24_UnkTexturePanFunc2 = 0x80240174; // type:func rom:0x8A5BF4 -func_80240360_8A5DE0 = 0x80240360; // type:func rom:0x8A5DE0 +tik_24_UnkPosFunc2 = 0x80240360; // type:func rom:0x8A5DE0 tik_24_set_script_owner_npc_anim = 0x802406D0; // type:func rom:0x8A6150 tik_24_UnkDistFunc = 0x8024074C; // type:func rom:0x8A61CC tik_24_UnkNpcAIFunc12 = 0x80240880; // type:func rom:0x8A6300 @@ -9307,7 +9317,7 @@ D_80242480_8A7F00 = 0x80242480; // type:data rom:0x8A7F00 D_802424A0_8A7F20 = 0x802424A0; // type:data rom:0x8A7F20 tik_25_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8A7F80 tik_25_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x8A80A4 -func_8024030C_8A828C = 0x8024030C; // type:func rom:0x8A828C +tik_25_UnkPosFunc2 = 0x8024030C; // type:func rom:0x8A828C func_80240680_8A8600 = 0x80240680; // type:func rom:0x8A8600 tik_25_SetEntityPosition = 0x802406AC; // type:func rom:0x8A862C func_80240770_8A86F0 = 0x80240770; // type:func rom:0x8A86F0 @@ -9505,7 +9515,7 @@ D_80241BF0_8CC4F0 = 0x80241BF0; // type:data rom:0x8CC4F0 D_80242070_8CC970 = 0x80242070; // type:data rom:0x8CC970 D_802429F4_8CD2F4 = 0x802429F4; // type:data rom:0x8CD2F4 kmr_05_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0x8CE070 -func_802401B0_8CE220 = 0x802401B0; // type:func rom:0x8CE220 +kmr_05_UnkNpcAIFunc35 = 0x802401B0; // type:func rom:0x8CE220 kmr_05_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0x8CE848 kmr_05_UnkFunc4 = 0x80240898; // type:func rom:0x8CE908 kmr_05_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0x8CEC4C @@ -9523,7 +9533,7 @@ D_80243440_8D14B0 = 0x80243440; // type:data rom:0x8D14B0 D_80243448_8D14B8 = 0x80243448; // type:data rom:0x8D14B8 D_80243450_8D14C0 = 0x80243450; // type:data rom:0x8D14C0 kmr_06_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0x8D1510 -func_802401B0_8D16C0 = 0x802401B0; // type:func rom:0x8D16C0 +kmr_06_UnkNpcAIFunc35 = 0x802401B0; // type:func rom:0x8D16C0 kmr_06_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0x8D1CE8 kmr_06_UnkFunc4 = 0x80240898; // type:func rom:0x8D1DA8 kmr_06_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0x8D20EC @@ -9560,7 +9570,7 @@ D_80241E90_8D5C50 = 0x80241E90; // type:data rom:0x8D5C50 D_80241E98_8D5C58 = 0x80241E98; // type:data rom:0x8D5C58 D_80241EA0_8D5C60 = 0x80241EA0; // type:data rom:0x8D5C60 kmr_09_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0x8D5E00 -func_802401B0_8D5FB0 = 0x802401B0; // type:func rom:0x8D5FB0 +kmr_09_UnkNpcAIFunc35 = 0x802401B0; // type:func rom:0x8D5FB0 kmr_09_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0x8D65D8 kmr_09_UnkFunc4 = 0x80240898; // type:func rom:0x8D6698 kmr_09_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0x8D69DC @@ -10194,7 +10204,7 @@ dro_01_UnkNpcAIFunc13 = 0x80240DFC; // type:func rom:0x95BFFC dro_01_UnkFunc15 = 0x80240F2C; // type:func rom:0x95C12C dro_01_UnkNpcDurationFlagFunc = 0x8024104C; // type:func rom:0x95C24C dro_01_UnkFunc16 = 0x802410B4; // type:func rom:0x95C2B4 -dro_01_func_80241174_95C374 = 0x80241174; // type:func rom:0x95C374 +dro_01_UnkNpcAIMainFunc = 0x80241174; // type:func rom:0x95C374 dro_01_func_80241470_95C670 = 0x80241470; // type:func rom:0x95C670 dro_01_GetItemName = 0x80241524; // type:func rom:0x95C724 dro_01_Set80151310_1 = 0x80241588; // type:func rom:0x95C788 @@ -10847,7 +10857,7 @@ trd_04_UnkFunc16 = 0x80241758; // type:func rom:0x9A9B48 func_80241818_9A9C08 = 0x80241818; // type:func rom:0x9A9C08 func_80241B14_9A9F04 = 0x80241B14; // type:func rom:0x9A9F04 trd_04_UnkNpcAIFunc23 = 0x80241E18; // type:func rom:0x9AA208 -func_80241FC8_9AA3B8 = 0x80241FC8; // type:func rom:0x9AA3B8 +trd_04_UnkNpcAIFunc35 = 0x80241FC8; // type:func rom:0x9AA3B8 dup_trd_04_UnkNpcAIFunc1 = 0x802425F0; // type:func rom:0x9AA9E0 trd_04_UnkFunc4 = 0x802426B0; // type:func rom:0x9AAAA0 trd_04_UnkNpcAIFunc2 = 0x802429F4; // type:func rom:0x9AADE4 @@ -10901,7 +10911,7 @@ trd_07_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0x9B6E40 trd_07_set_script_owner_npc_col_height = 0x80240624; // type:func rom:0x9B6FA4 func_802406A4_9B7024 = 0x802406A4; // type:func rom:0x9B7024 trd_07_UnkNpcAIFunc23 = 0x80240AE4; // type:func rom:0x9B7464 -func_80240C94_9B7614 = 0x80240C94; // type:func rom:0x9B7614 +trd_07_UnkNpcAIFunc35 = 0x80240C94; // type:func rom:0x9B7614 trd_07_UnkNpcAIFunc1 = 0x802412BC; // type:func rom:0x9B7C3C trd_07_UnkFunc4 = 0x8024137C; // type:func rom:0x9B7CFC trd_07_UnkNpcAIFunc2 = 0x802416C0; // type:func rom:0x9B8040 @@ -11170,7 +11180,7 @@ nok_11_UnkNpcAIFunc12 = 0x802401B0; // type:func rom:0x9F4BF0 nok_11_set_script_owner_npc_col_height = 0x80240314; // type:func rom:0x9F4D54 func_80240394_9F4DD4 = 0x80240394; // type:func rom:0x9F4DD4 nok_11_UnkNpcAIFunc23 = 0x802407D4; // type:func rom:0x9F5214 -func_80240984_9F53C4 = 0x80240984; // type:func rom:0x9F53C4 +nok_11_UnkNpcAIFunc35 = 0x80240984; // type:func rom:0x9F53C4 nok_11_UnkNpcAIFunc1 = 0x80240FAC; // type:func rom:0x9F59EC nok_11_UnkFunc4 = 0x8024106C; // type:func rom:0x9F5AAC nok_11_UnkNpcAIFunc2 = 0x802413B0; // type:func rom:0x9F5DF0 @@ -11243,7 +11253,7 @@ nok_14_UnkNpcAIFunc12 = 0x80240370; // type:func rom:0xA02BB0 nok_14_set_script_owner_npc_col_height = 0x802404D4; // type:func rom:0xA02D14 func_80240554_A02D94 = 0x80240554; // type:func rom:0xA02D94 nok_14_UnkNpcAIFunc23 = 0x80240994; // type:func rom:0xA031D4 -func_80240B44_A03384 = 0x80240B44; // type:func rom:0xA03384 +nok_14_UnkNpcAIFunc35 = 0x80240B44; // type:func rom:0xA03384 nok_14_UnkNpcAIFunc1 = 0x8024116C; // type:func rom:0xA039AC nok_14_UnkFunc4 = 0x8024122C; // type:func rom:0xA03A6C nok_14_UnkNpcAIFunc2 = 0x80241570; // type:func rom:0xA03DB0 @@ -11275,7 +11285,7 @@ nok_15_UnkNpcAIFunc12 = 0x80240490; // type:func rom:0xA07390 nok_15_set_script_owner_npc_col_height = 0x802405F4; // type:func rom:0xA074F4 func_80240674_A07574 = 0x80240674; // type:func rom:0xA07574 nok_15_UnkNpcAIFunc23 = 0x80240AB4; // type:func rom:0xA079B4 -func_80240C64_A07B64 = 0x80240C64; // type:func rom:0xA07B64 +nok_15_UnkNpcAIFunc35 = 0x80240C64; // type:func rom:0xA07B64 nok_15_UnkNpcAIFunc1 = 0x8024128C; // type:func rom:0xA0818C nok_15_UnkFunc4 = 0x8024134C; // type:func rom:0xA0824C nok_15_UnkNpcAIFunc2 = 0x80241690; // type:func rom:0xA08590 @@ -11355,7 +11365,7 @@ func_80240EF4_A17114 = 0x80240EF4; // type:func rom:0xA17114 func_80240F68_A17188 = 0x80240F68; // type:func rom:0xA17188 func_80240FD0_A171F0 = 0x80240FD0; // type:func rom:0xA171F0 hos_02_UnkNpcAIFunc23 = 0x80240FF0; // type:func rom:0xA17210 -func_802411A0_A173C0 = 0x802411A0; // type:func rom:0xA173C0 +hos_02_UnkNpcAIFunc35 = 0x802411A0; // type:func rom:0xA173C0 hos_02_UnkNpcAIFunc1 = 0x802417C8; // type:func rom:0xA179E8 hos_02_UnkFunc4 = 0x80241888; // type:func rom:0xA17AA8 hos_02_UnkNpcAIFunc2 = 0x80241BCC; // type:func rom:0xA17DEC @@ -11398,7 +11408,7 @@ func_80240A50_A1BB50 = 0x80240A50; // type:func rom:0xA1BB50 hos_03_foliage_setup_shear_mtx = 0x80240A70; // type:func rom:0xA1BB70 hos_03_TransformFoliage = 0x80240AE0; // type:func rom:0xA1BBE0 hos_03_UnkNpcAIFunc23 = 0x80240CB0; // type:func rom:0xA1BDB0 -func_80240E60_A1BF60 = 0x80240E60; // type:func rom:0xA1BF60 +hos_03_UnkNpcAIFunc35 = 0x80240E60; // type:func rom:0xA1BF60 hos_03_UnkNpcAIFunc1 = 0x80241488; // type:func rom:0xA1C588 hos_03_UnkFunc4 = 0x80241548; // type:func rom:0xA1C648 hos_03_UnkNpcAIFunc2 = 0x8024188C; // type:func rom:0xA1C98C @@ -12932,7 +12942,7 @@ jan_11_UnkFunc25 = 0x8024018C; // type:func rom:0xB709EC jan_11_GetEntryPos = 0x80240248; // type:func rom:0xB70AA8 jan_11_GetCurrentCameraYawClamped180 = 0x80240328; // type:func rom:0xB70B88 jan_11_SomeXYZFunc2 = 0x80240394; // type:func rom:0xB70BF4 -func_80240438_B70C98 = 0x80240438; // type:func rom:0xB70C98 +jan_11_UnkPosFunc2 = 0x80240438; // type:func rom:0xB70C98 jan_11_GetFloorCollider = 0x802407B0; // type:func rom:0xB71010 func_802407DC_B7103C = 0x802407DC; // type:func rom:0xB7103C func_80240000_B730B0 = 0x80240000; // type:func rom:0xB730B0 @@ -13163,7 +13173,7 @@ D_802437B0_BAD8F0 = 0x802437B0; // type:data rom:0xBAD8F0 mim_08_SetForeverForestFog = 0x80240000; // type:func rom:0xBAD940 func_80240068_BAD9A8 = 0x80240068; // type:func rom:0xBAD9A8 mim_08_UnkNpcAIFunc23 = 0x802400A0; // type:func rom:0xBAD9E0 -func_80240250_BADB90 = 0x80240250; // type:func rom:0xBADB90 +mim_08_UnkNpcAIFunc35 = 0x80240250; // type:func rom:0xBADB90 mim_08_UnkNpcAIFunc1 = 0x80240878; // type:func rom:0xBAE1B8 mim_08_UnkFunc4 = 0x80240938; // type:func rom:0xBAE278 mim_08_UnkNpcAIFunc2 = 0x80240C7C; // type:func rom:0xBAE5BC @@ -13437,7 +13447,7 @@ arn_03_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBDF5AC arn_03_UnkFunc15 = 0x8024094C; // type:func rom:0xBDF6DC arn_03_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xBDF7FC arn_03_UnkFunc16 = 0x80240AD4; // type:func rom:0xBDF864 -arn_03_func_80240B94_BDF924 = 0x80240B94; // type:func rom:0xBDF924 +arn_03_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xBDF924 arn_03_func_80240E90_BDFC20 = 0x80240E90; // type:func rom:0xBDFC20 arn_03_func_80241068_BDFDF8 = 0x80241068; // type:func rom:0xBDFDF8 arn_03_func_8024113C_BDFECC = 0x8024113C; // type:func rom:0xBDFECC @@ -13501,7 +13511,7 @@ arn_03_makeEntities = 0x802447E0; // type:data rom:0xBE3570 D_80244860_BE35F0 = 0x80244860; // type:data rom:0xBE35F0 D_80244868_BE35F8 = 0x80244868; // type:data rom:0xBE35F8 arn_04_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xBE37B0 -arn_04_func_80240158_BE3908 = 0x80240158; // type:func rom:0xBE3908 +arn_04_UnkFunc13 = 0x80240158; // type:func rom:0xBE3908 arn_04_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xBE3BB0 arn_04_UnkFunc14 = 0x802404C0; // type:func rom:0xBE3C70 arn_04_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xBE3E2C @@ -13511,9 +13521,9 @@ arn_04_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBE3FCC arn_04_UnkFunc15 = 0x8024094C; // type:func rom:0xBE40FC arn_04_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xBE421C arn_04_UnkFunc16 = 0x80240AD4; // type:func rom:0xBE4284 -arn_04_func_80240B94_BE4344 = 0x80240B94; // type:func rom:0xBE4344 +arn_04_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xBE4344 arn_04_UnkNpcAIFunc23 = 0x80240E90; // type:func rom:0xBE4640 -arn_04_func_80241040_BE47F0 = 0x80241040; // type:func rom:0xBE47F0 +arn_04_UnkNpcAIFunc35 = 0x80241040; // type:func rom:0xBE47F0 arn_04_UnkNpcAIFunc1_copy = 0x80241668; // type:func rom:0xBE4E18 arn_04_UnkFunc4 = 0x80241728; // type:func rom:0xBE4ED8 arn_04_UnkNpcAIFunc2 = 0x80241A6C; // type:func rom:0xBE521C @@ -13584,7 +13594,7 @@ arn_05_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBE83FC arn_05_UnkFunc15 = 0x8024094C; // type:func rom:0xBE852C arn_05_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xBE864C arn_05_UnkFunc16 = 0x80240AD4; // type:func rom:0xBE86B4 -arn_05_func_80240B94_BE8774 = 0x80240B94; // type:func rom:0xBE8774 +arn_05_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xBE8774 arn_05_func_80240E90_BE8A70 = 0x80240E90; // type:func rom:0xBE8A70 arn_05_func_80241068_BE8C48 = 0x80241068; // type:func rom:0xBE8C48 arn_05_func_8024113C_BE8D1C = 0x8024113C; // type:func rom:0xBE8D1C @@ -13645,7 +13655,7 @@ arn_07_func_80240800_BED5F0 = 0x80240800; // type:func rom:0xBED5F0 arn_07_SetEntityFlags100000 = 0x80240870; // type:func rom:0xBED660 arn_07_GetEntityPosition = 0x802408A4; // type:func rom:0xBED694 arn_07_UnkNpcAIFunc23 = 0x80240950; // type:func rom:0xBED740 -arn_07_func_80240B00_BED8F0 = 0x80240B00; // type:func rom:0xBED8F0 +arn_07_UnkNpcAIFunc35 = 0x80240B00; // type:func rom:0xBED8F0 arn_07_UnkNpcAIFunc1 = 0x80241128; // type:func rom:0xBEDF18 arn_07_UnkFunc4 = 0x802411E8; // type:func rom:0xBEDFD8 arn_07_UnkNpcAIFunc2 = 0x8024152C; // type:func rom:0xBEE31C @@ -13919,7 +13929,7 @@ dgb_01_func_80240000_BFD880 = 0x80240000; // type:func rom:0xBFD880 dgb_01_SetEntityFlags100000 = 0x80240040; // type:func rom:0xBFD8C0 dgb_01_GetEntityPosition = 0x80240074; // type:func rom:0xBFD8F4 dgb_01_UnkNpcAIFunc23 = 0x80240120; // type:func rom:0xBFD9A0 -func_802402D0_BFDB50 = 0x802402D0; // type:func rom:0xBFDB50 +dgb_01_UnkNpcAIFunc35 = 0x802402D0; // type:func rom:0xBFDB50 dgb_01_UnkNpcAIFunc1 = 0x802408F8; // type:func rom:0xBFE178 dgb_01_UnkFunc4 = 0x802409B8; // type:func rom:0xBFE238 dgb_01_UnkNpcAIFunc2 = 0x80240CFC; // type:func rom:0xBFE57C @@ -14701,7 +14711,7 @@ dgb_03_UnkNpcAIFunc13 = 0x8024133C; // type:func rom:0xC3281C dgb_03_UnkFunc15 = 0x8024146C; // type:func rom:0xC3294C dgb_03_UnkNpcDurationFlagFunc = 0x8024158C; // type:func rom:0xC32A6C dgb_03_UnkFunc16 = 0x802415F4; // type:func rom:0xC32AD4 -dgb_03_func_802416B4_C32B94 = 0x802416B4; // type:func rom:0xC32B94 +dgb_03_UnkNpcAIMainFunc = 0x802416B4; // type:func rom:0xC32B94 dgb_03_func_802419B0_C32E90 = 0x802419B0; // type:func rom:0xC32E90 dgb_03_func_80241C7C_C3315C = 0x80241C7C; // type:func rom:0xC3315C dgb_03_func_80241D04_C331E4 = 0x80241D04; // type:func rom:0xC331E4 @@ -14756,7 +14766,7 @@ D_80244B88_C36068 = 0x80244B88; // type:data rom:0xC36068 D_80244B90_C36070 = 0x80244B90; // type:data rom:0xC36070 D_80244EB8_C36398 = 0x80244EB8; // type:data rom:0xC36398 dgb_04_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0xC36530 -dgb_04_func_802401B0_C366E0 = 0x802401B0; // type:func rom:0xC366E0 +dgb_04_UnkNpcAIFunc35 = 0x802401B0; // type:func rom:0xC366E0 dgb_04_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0xC36D08 dgb_04_UnkFunc4 = 0x80240898; // type:func rom:0xC36DC8 dgb_04_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0xC3710C @@ -14938,7 +14948,7 @@ dgb_08_UnkNpcAIFunc26 = 0x80241098; // type:func rom:0xC40E48 dgb_08_UnkFunc7 = 0x8024124C; // type:func rom:0xC40FFC dgb_08_func_802414AC_C4125C = 0x802414AC; // type:func rom:0xC4125C dgb_08_UnkNpcAIFunc23 = 0x80241760; // type:func rom:0xC41510 -dgb_08_func_80241910_C416C0 = 0x80241910; // type:func rom:0xC416C0 +dgb_08_UnkNpcAIFunc35 = 0x80241910; // type:func rom:0xC416C0 dgb_08_UnkNpcAIFunc1_copy = 0x80241F38; // type:func rom:0xC41CE8 dgb_08_UnkFunc4 = 0x80241FF8; // type:func rom:0xC41DA8 dgb_08_UnkNpcAIFunc2 = 0x8024233C; // type:func rom:0xC420EC @@ -15042,7 +15052,7 @@ dgb_09_func_80240F00_C47AE0 = 0x80240F00; // type:func rom:0xC47AE0 dgb_09_func_80241078_C47C58 = 0x80241078; // type:func rom:0xC47C58 dgb_09_func_802410D4_C47CB4 = 0x802410D4; // type:func rom:0xC47CB4 dgb_09_UnkNpcAIFunc23 = 0x80241424; // type:func rom:0xC48004 -dgb_09_func_802415D4_C481B4 = 0x802415D4; // type:func rom:0xC481B4 +dgb_09_UnkNpcAIFunc35 = 0x802415D4; // type:func rom:0xC481B4 dgb_09_UnkNpcAIFunc1 = 0x80241BFC; // type:func rom:0xC487DC dgb_09_UnkFunc4 = 0x80241CBC; // type:func rom:0xC4889C dgb_09_UnkNpcAIFunc2 = 0x80242000; // type:func rom:0xC48BE0 @@ -15343,7 +15353,7 @@ kzn_02_GetFloorCollider = 0x80240384; // type:func rom:0xC5AAC4 func_802403B0_C5AAF0 = 0x802403B0; // type:func rom:0xC5AAF0 func_802403DC_C5AB1C = 0x802403DC; // type:func rom:0xC5AB1C kzn_02_UnkNpcAIFunc23 = 0x802404E0; // type:func rom:0xC5AC20 -func_80240690_C5ADD0 = 0x80240690; // type:func rom:0xC5ADD0 +kzn_02_UnkNpcAIFunc35 = 0x80240690; // type:func rom:0xC5ADD0 kzn_02_UnkNpcAIFunc1 = 0x80240CB8; // type:func rom:0xC5B3F8 kzn_02_UnkFunc4 = 0x80240D78; // type:func rom:0xC5B4B8 kzn_02_UnkNpcAIFunc2 = 0x802410BC; // type:func rom:0xC5B7FC @@ -15480,7 +15490,7 @@ kzn_07_UnkTexturePanFunc2 = 0x80240530; // type:func rom:0xC6E860 func_80240720_C6EA50 = 0x80240720; // type:func rom:0xC6EA50 func_802407F4_C6EB24 = 0x802407F4; // type:func rom:0xC6EB24 kzn_07_UnkNpcAIFunc23 = 0x80240820; // type:func rom:0xC6EB50 -func_802409D0_C6ED00 = 0x802409D0; // type:func rom:0xC6ED00 +kzn_07_UnkNpcAIFunc35 = 0x802409D0; // type:func rom:0xC6ED00 kzn_07_UnkNpcAIFunc1 = 0x80240FF8; // type:func rom:0xC6F328 kzn_07_UnkFunc4 = 0x802410B8; // type:func rom:0xC6F3E8 kzn_07_UnkNpcAIFunc2 = 0x802413FC; // type:func rom:0xC6F72C @@ -15512,7 +15522,7 @@ kzn_08_GetItemName = 0x80240844; // type:func rom:0xC71CC4 kzn_08_SomeItemEntityFunc = 0x802408A8; // type:func rom:0xC71D28 kzn_08_CheckItemFlags40 = 0x802409F8; // type:func rom:0xC71E78 kzn_08_UnkNpcAIFunc23 = 0x80240A50; // type:func rom:0xC71ED0 -func_80240C00_C72080 = 0x80240C00; // type:func rom:0xC72080 +kzn_08_UnkNpcAIFunc35 = 0x80240C00; // type:func rom:0xC72080 kzn_08_UnkNpcAIFunc1 = 0x80241228; // type:func rom:0xC726A8 kzn_08_UnkFunc4 = 0x802412E8; // type:func rom:0xC72768 kzn_08_UnkNpcAIFunc2 = 0x8024162C; // type:func rom:0xC72AAC @@ -15648,7 +15658,7 @@ func_80240310_C804B0 = 0x80240310; // type:func rom:0xC804B0 kzn_11_GetFloorCollider = 0x80240408; // type:func rom:0xC805A8 func_80240434_C805D4 = 0x80240434; // type:func rom:0xC805D4 kzn_11_UnkNpcAIFunc23 = 0x80240460; // type:func rom:0xC80600 -func_80240610_C807B0 = 0x80240610; // type:func rom:0xC807B0 +kzn_11_UnkNpcAIFunc35 = 0x80240610; // type:func rom:0xC807B0 kzn_11_UnkNpcAIFunc1 = 0x80240C38; // type:func rom:0xC80DD8 kzn_11_UnkFunc4 = 0x80240CF8; // type:func rom:0xC80E98 kzn_11_UnkNpcAIFunc2 = 0x8024103C; // type:func rom:0xC811DC @@ -15813,7 +15823,7 @@ flo_00_UnkNpcAIFunc13 = 0x8024085C; // type:func rom:0xC9E77C flo_00_UnkFunc15 = 0x8024098C; // type:func rom:0xC9E8AC flo_00_UnkNpcDurationFlagFunc = 0x80240AAC; // type:func rom:0xC9E9CC flo_00_UnkFunc16 = 0x80240B14; // type:func rom:0xC9EA34 -flo_00_func_80240BD4_C9EAF4 = 0x80240BD4; // type:func rom:0xC9EAF4 +flo_00_UnkNpcAIMainFunc = 0x80240BD4; // type:func rom:0xC9EAF4 flo_00_PostChapter6StatUpdate = 0x80240ED0; // type:func rom:0xC9EDF0 flo_00_func_80240F10_C9EE30 = 0x80240F10; // type:func rom:0xC9EE30 flo_00_func_80240F80_C9EEA0 = 0x80240F80; // type:func rom:0xC9EEA0 @@ -16093,7 +16103,7 @@ flo_09_UnkFunc43 = 0x80240040; // type:func rom:0xCB5040 flo_09_foliage_setup_shear_mtx = 0x802400E0; // type:func rom:0xCB50E0 flo_09_TransformFoliage = 0x80240150; // type:func rom:0xCB5150 flo_09_UnkNpcAIFunc23 = 0x80240320; // type:func rom:0xCB5320 -flo_09_func_802404D0_CB54D0 = 0x802404D0; // type:func rom:0xCB54D0 +flo_09_UnkNpcAIFunc35 = 0x802404D0; // type:func rom:0xCB54D0 flo_09_UnkNpcAIFunc1 = 0x80240AF8; // type:func rom:0xCB5AF8 flo_09_UnkFunc4 = 0x80240BB8; // type:func rom:0xCB5BB8 flo_09_UnkNpcAIFunc2 = 0x80240EFC; // type:func rom:0xCB5EFC @@ -16302,7 +16312,7 @@ flo_12_npcGroupList_802429B8 = 0x802429B8; // type:data rom:0xCC37E8 flo_13_func_80240000_CC3810 = 0x80240000; // type:func rom:0xCC3810 flo_13_UnkFunc41 = 0x80240040; // type:func rom:0xCC3850 flo_13_UnkNpcAIFunc23 = 0x802401C4; // type:func rom:0xCC39D4 -flo_13_func_80240374_CC3B84 = 0x80240374; // type:func rom:0xCC3B84 +flo_13_UnkNpcAIFunc35 = 0x80240374; // type:func rom:0xCC3B84 flo_13_UnkNpcAIFunc1 = 0x8024099C; // type:func rom:0xCC41AC flo_13_UnkFunc4 = 0x80240A5C; // type:func rom:0xCC426C flo_13_UnkNpcAIFunc2 = 0x80240DA0; // type:func rom:0xCC45B0 @@ -16393,7 +16403,7 @@ flo_14_func_8024046C_CCB77C = 0x8024046C; // type:func rom:0xCCB77C func_80240504_CCB814 = 0x80240504; // type:func rom:0xCCB814 flo_14_func_802407D4_CCBAE4 = 0x802407D4; // type:func rom:0xCCBAE4 flo_14_UnkNpcAIFunc23 = 0x80240B10; // type:func rom:0xCCBE20 -flo_14_func_80240CC0_CCBFD0 = 0x80240CC0; // type:func rom:0xCCBFD0 +flo_14_UnkNpcAIFunc35 = 0x80240CC0; // type:func rom:0xCCBFD0 flo_14_UnkNpcAIFunc1 = 0x802412E8; // type:func rom:0xCCC5F8 flo_14_UnkFunc4 = 0x802413A8; // type:func rom:0xCCC6B8 flo_14_UnkNpcAIFunc2 = 0x802416EC; // type:func rom:0xCCC9FC @@ -16501,7 +16511,7 @@ flo_16_UnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xCD2BD0 flo_16_UnkFunc24 = 0x80240DE8; // type:func rom:0xCD2C18 flo_16_UnkFunc44 = 0x80240E18; // type:func rom:0xCD2C48 flo_16_UnkNpcAIFunc23 = 0x80240E50; // type:func rom:0xCD2C80 -flo_16_func_80241000_CD2E30 = 0x80241000; // type:func rom:0xCD2E30 +flo_16_UnkNpcAIFunc35 = 0x80241000; // type:func rom:0xCD2E30 flo_16_UnkNpcAIFunc1 = 0x80241628; // type:func rom:0xCD3458 flo_16_UnkFunc4 = 0x802416E8; // type:func rom:0xCD3518 flo_16_UnkNpcAIFunc2 = 0x80241A2C; // type:func rom:0xCD385C @@ -16555,7 +16565,7 @@ D_80245448_CD7278 = 0x80245448; // type:data rom:0xCD7278 flo_17_func_80240000_CD72E0 = 0x80240000; // type:func rom:0xCD72E0 flo_17_func_80240040_CD7320 = 0x80240040; // type:func rom:0xCD7320 flo_17_UnkNpcAIFunc23 = 0x80240070; // type:func rom:0xCD7350 -flo_17_func_80240220_CD7500 = 0x80240220; // type:func rom:0xCD7500 +flo_17_UnkNpcAIFunc35 = 0x80240220; // type:func rom:0xCD7500 flo_17_UnkNpcAIFunc1 = 0x80240848; // type:func rom:0xCD7B28 flo_17_UnkFunc4 = 0x80240908; // type:func rom:0xCD7BE8 flo_17_UnkNpcAIFunc2 = 0x80240C4C; // type:func rom:0xCD7F2C @@ -16870,7 +16880,7 @@ flo_24_makeEntities = 0x802421B0; // type:data rom:0xCF2AF0 flo_24_flo_10_name_hack = 0x80242280; // type:data rom:0xCF2BC0 flo_25_func_80240000_CF2BD0 = 0x80240000; // type:func rom:0xCF2BD0 flo_25_UnkNpcAIFunc23 = 0x80240040; // type:func rom:0xCF2C10 -flo_25_func_802401F0_CF2DC0 = 0x802401F0; // type:func rom:0xCF2DC0 +flo_25_UnkNpcAIFunc35 = 0x802401F0; // type:func rom:0xCF2DC0 flo_25_UnkNpcAIFunc1 = 0x80240818; // type:func rom:0xCF33E8 flo_25_UnkFunc4 = 0x802408D8; // type:func rom:0xCF34A8 flo_25_UnkNpcAIFunc2 = 0x80240C1C; // type:func rom:0xCF37EC @@ -17090,7 +17100,7 @@ sam_06_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xD1FFB4 sam_06_foliage_setup_shear_mtx = 0x8024030C; // type:func rom:0xD2019C sam_06_TransformFoliage = 0x8024037C; // type:func rom:0xD2020C sam_06_UnkNpcAIFunc23 = 0x80240550; // type:func rom:0xD203E0 -func_80240700_D20590 = 0x80240700; // type:func rom:0xD20590 +sam_06_UnkNpcAIFunc35 = 0x80240700; // type:func rom:0xD20590 sam_06_UnkNpcAIFunc1 = 0x80240D28; // type:func rom:0xD20BB8 sam_06_UnkFunc4 = 0x80240DE8; // type:func rom:0xD20C78 sam_06_UnkNpcAIFunc2 = 0x8024112C; // type:func rom:0xD20FBC @@ -17918,7 +17928,7 @@ omo_04_UnsetCamera0MoveFlag1 = 0x802402BC; // type:func rom:0xDAD6BC omo_04_SetCamera0MoveFlag1 = 0x802402D8; // type:func rom:0xDAD6D8 func_802402F4_DAD6F4 = 0x802402F4; // type:func rom:0xDAD6F4 omo_04_UnkNpcAIFunc23 = 0x802403A0; // type:func rom:0xDAD7A0 -func_80240550_DAD950 = 0x80240550; // type:func rom:0xDAD950 +omo_04_UnkNpcAIFunc35 = 0x80240550; // type:func rom:0xDAD950 omo_04_UnkNpcAIFunc1 = 0x80240B78; // type:func rom:0xDADF78 omo_04_UnkFunc4 = 0x80240C38; // type:func rom:0xDAE038 omo_04_UnkNpcAIFunc2 = 0x80240F7C; // type:func rom:0xDAE37C @@ -17952,7 +17962,7 @@ omo_05_UnkNpcAIFunc4 = 0x8024056C; // type:func rom:0xDB282C func_802405BC_DB287C = 0x802405BC; // type:func rom:0xDB287C func_80240780_DB2A40 = 0x80240780; // type:func rom:0xDB2A40 omo_05_UnkNpcAIFunc23 = 0x80240A54; // type:func rom:0xDB2D14 -func_80240C04_DB2EC4 = 0x80240C04; // type:func rom:0xDB2EC4 +omo_05_UnkNpcAIFunc35 = 0x80240C04; // type:func rom:0xDB2EC4 omo_05_UnkNpcAIFunc1 = 0x8024122C; // type:func rom:0xDB34EC omo_05_UnkFunc4 = 0x802412EC; // type:func rom:0xDB35AC omo_05_UnkNpcAIFunc2 = 0x80241630; // type:func rom:0xDB38F0 @@ -18019,7 +18029,7 @@ func_8024153C_DBE7EC = 0x8024153C; // type:func rom:0xDBE7EC dup_omo_07_UnkNpcDurationAnimationFunc = 0x802415D4; // type:func rom:0xDBE884 func_80241634_DBE8E4 = 0x80241634; // type:func rom:0xDBE8E4 omo_07_UnkNpcAIFunc23 = 0x80241978; // type:func rom:0xDBEC28 -func_80241B28_DBEDD8 = 0x80241B28; // type:func rom:0xDBEDD8 +omo_07_UnkNpcAIFunc35 = 0x80241B28; // type:func rom:0xDBEDD8 dup_omo_07_UnkNpcAIFunc1 = 0x80242150; // type:func rom:0xDBF400 omo_07_UnkFunc4 = 0x80242210; // type:func rom:0xDBF4C0 omo_07_UnkNpcAIFunc2 = 0x80242554; // type:func rom:0xDBF804 @@ -18239,7 +18249,7 @@ omo_17_UnkNpcAIFunc4 = 0x80240ACC; // type:func rom:0xDEF96C func_80240B1C_DEF9BC = 0x80240B1C; // type:func rom:0xDEF9BC func_80240CE0_DEFB80 = 0x80240CE0; // type:func rom:0xDEFB80 omo_17_UnkNpcAIFunc23 = 0x80240FB4; // type:func rom:0xDEFE54 -func_80241164_DF0004 = 0x80241164; // type:func rom:0xDF0004 +omo_17_UnkNpcAIFunc35 = 0x80241164; // type:func rom:0xDF0004 omo_17_UnkNpcAIFunc1 = 0x8024178C; // type:func rom:0xDF062C omo_17_UnkFunc4 = 0x8024184C; // type:func rom:0xDF06EC omo_17_UnkNpcAIFunc2 = 0x80241B90; // type:func rom:0xDF0A30 @@ -18923,7 +18933,7 @@ ED0030_UnkFunc43 = 0x80240040; // type:func rom:0xED0030 ED00D0_foliage_setup_shear_mtx = 0x802400E0; // type:func rom:0xED00D0 ED00D0_TransformFoliage = 0x80240150; // type:func rom:0xED0140 ED0310_UnkNpcAIFunc23 = 0x80240320; // type:func rom:0xED0310 -func_802404D0_ED04C0 = 0x802404D0; // type:func rom:0xED04C0 +ED0310_UnkNpcAIFunc35 = 0x802404D0; // type:func rom:0xED04C0 ED0310_UnkNpcAIFunc1 = 0x80240AF8; // type:func rom:0xED0AE8 ED0310_UnkFunc4 = 0x80240BB8; // type:func rom:0xED0BA8 ED0310_UnkNpcAIFunc2 = 0x80240EFC; // type:func rom:0xED0EEC @@ -18975,7 +18985,7 @@ D_80241854_EDD834 = 0x80241854; // type:data rom:0xEDD834 func_80240000_EDE9C0 = 0x80240000; // type:func rom:0xEDE9C0 EDEA00_UnkFunc41 = 0x80240040; // type:func rom:0xEDEA00 EDEA00_UnkNpcAIFunc23 = 0x802401C4; // type:func rom:0xEDEB84 -func_80240374_EDED34 = 0x80240374; // type:func rom:0xEDED34 +EDEA00_UnkNpcAIFunc35 = 0x80240374; // type:func rom:0xEDED34 EDEA00_UnkNpcAIFunc1 = 0x8024099C; // type:func rom:0xEDF35C EDEA00_UnkFunc4 = 0x80240A5C; // type:func rom:0xEDF41C EDEA00_UnkNpcAIFunc2 = 0x80240DA0; // type:func rom:0xEDF760 @@ -19017,7 +19027,7 @@ func_8024046C_EE6A1C = 0x8024046C; // type:func rom:0xEE6A1C func_80240504_EE6AB4 = 0x80240504; // type:func rom:0xEE6AB4 func_802407D4_EE6D84 = 0x802407D4; // type:func rom:0xEE6D84 func_80240B10_EE70C0 = 0x80240B10; // type:func rom:0xEE70C0 -func_80240CC0_EE7270 = 0x80240CC0; // type:func rom:0xEE7270 +EE70C0_UnkNpcAIFunc35 = 0x80240CC0; // type:func rom:0xEE7270 EE70C0_UnkNpcAIFunc1 = 0x802412E8; // type:func rom:0xEE7898 EE70C0_UnkFunc4 = 0x802413A8; // type:func rom:0xEE7958 EE70C0_UnkNpcAIFunc2 = 0x802416EC; // type:func rom:0xEE7C9C @@ -19071,7 +19081,7 @@ EED1E0_UnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xEEDEA0 EED1E0_UnkFunc40 = 0x80240DE8; // type:func rom:0xEEDEE8 EED1E0_UnkFunc44 = 0x80240E18; // type:func rom:0xEEDF18 EEDF50_UnkNpcAIFunc23 = 0x80240E50; // type:func rom:0xEEDF50 -func_80241000_EEE100 = 0x80241000; // type:func rom:0xEEE100 +EEDF50_UnkNpcAIFunc35 = 0x80241000; // type:func rom:0xEEE100 EEDF50_UnkNpcAIFunc1 = 0x80241628; // type:func rom:0xEEE728 EEDF50_UnkFunc4 = 0x802416E8; // type:func rom:0xEEE7E8 EEDF50_UnkNpcAIFunc2 = 0x80241A2C; // type:func rom:0xEEEB2C @@ -19098,7 +19108,7 @@ D_802454A8_EF25A8 = 0x802454A8; // type:data rom:0xEF25A8 EF2610_DeadUnkFunc1 = 0x80240000; // type:func rom:0xEF2610 func_80240040_EF2650 = 0x80240040; // type:func rom:0xEF2650 EF2680_UnkNpcAIFunc23 = 0x80240070; // type:func rom:0xEF2680 -func_80240220_EF2830 = 0x80240220; // type:func rom:0xEF2830 +EF2680_UnkNpcAIFunc35 = 0x80240220; // type:func rom:0xEF2830 EF2680_UnkNpcAIFunc1 = 0x80240848; // type:func rom:0xEF2E58 EF2680_UnkFunc4 = 0x80240908; // type:func rom:0xEF2F18 EF2680_UnkNpcAIFunc2 = 0x80240C4C; // type:func rom:0xEF325C @@ -19178,24 +19188,46 @@ D_090000E0 = 0x90000E0; // type:data D_090001B8 = 0x90001B8; // type:data D_09000240 = 0x9000240; // type:data D_090002C0 = 0x90002C0; // type:data +D_090002F0 = 0x90002F0; // type:data D_09000330 = 0x9000330; // type:data D_09000370 = 0x9000370; // type:data D_090003B0 = 0x90003B0; // type:data D_090003F0 = 0x90003F0; // type:data D_09000430 = 0x9000430; // type:data D_09000470 = 0x9000470; // type:data +D_09000900 = 0x9000900; // type:data +D_090009E8 = 0x90009E8; // type:data D_09000E08 = 0x9000E08; // type:data D_09000E20 = 0x9000E20; // type:data D_09000E38 = 0x9000E38; // type:data +D_09000FA0 = 0x9000FA0; // type:data +D_09001060 = 0x9001060; // type:data +D_09001120 = 0x9001120; // type:data +D_090011E0 = 0x90011E0; // type:data D_09001280 = 0x9001280; // type:data +D_090012A0 = 0x90012A0; // type:data D_09001358 = 0x9001358; // type:data +D_09001360 = 0x9001360; // type:data +D_09001420 = 0x9001420; // type:data D_09001430 = 0x9001430; // type:data D_09001508 = 0x9001508; // type:data +D_09002170 = 0x9002170; // type:data +D_09002238 = 0x9002238; // type:data +D_090022E0 = 0x90022E0; // type:data +D_09002308 = 0x9002308; // type:data +D_090023B0 = 0x90023B0; // type:data +D_090023D8 = 0x90023D8; // type:data +D_09002480 = 0x9002480; // type:data +D_090024A8 = 0x90024A8; // type:data +D_09002550 = 0x9002550; // type:data +D_09002578 = 0x9002578; // type:data D_09002780 = 0x9002780; // type:data D_09002868 = 0x9002868; // type:data D_09002950 = 0x9002950; // type:data +D_09002A38 = 0x9002A38; // type:data D_09002B20 = 0x9002B20; // type:data D_09002B40 = 0x9002B40; // type:data +D_09002B60 = 0x9002B60; // type:data D_0A000328 = 0xA000328; // type:data D_0A000380 = 0xA000380; // type:data D_0A000740 = 0xA000740; // type:data @@ -21295,18 +21327,11 @@ D_E0016728 = 0xE0016728; // type:data D_E0016730 = 0xE0016730; // type:data D_E0016738 = 0xE0016738; // type:data D_E0016740 = 0xE0016740; // type:data -D_E001A610 = 0xE001A610; // type:data D_E001A620 = 0xE001A620; // type:data D_E001A628 = 0xE001A628; // type:data D_E001C5E0 = 0xE001C5E0; // type:data D_E001ED50 = 0xE001ED50; // type:data D_E001ED58 = 0xE001ED58; // type:data -D_E0020C90 = 0xE0020C90; // type:data -D_E0020CA4 = 0xE0020CA4; // type:data -D_E0020D80 = 0xE0020D80; // type:data -D_E0020D94 = 0xE0020D94; // type:data -D_E0020D95 = 0xE0020D95; // type:data -D_E0020D96 = 0xE0020D96; // type:data D_E0022CD0 = 0xE0022CD0; // type:data D_E0022CF0 = 0xE0022CF0; // type:data D_E0022D14 = 0xE0022D14; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 845576660b..3151af8835 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -1213,6 +1213,24 @@ heap_battleHead = 0x803DA800; D_802510B0 = 0x802510B0; D_8026A2B0 = 0x8026A2B0; +// effect_1 +D_09000FA0 = 0x09000FA0; +D_09001060 = 0x09001060; +D_09001120 = 0x09001120; +D_090011E0 = 0x090011E0; +D_090012A0 = 0x090012A0; +D_09001360 = 0x09001360; +D_09001420 = 0x09001420; + +// effect_6 +D_09002780 = 0x09002780; +D_09002868 = 0x09002868; +D_09002950 = 0x09002950; +D_09002A38 = 0x09002A38; +D_09002B20 = 0x09002B20; +D_09002B40 = 0x09002B40; +D_09002B60 = 0x09002B60; + // effect_7 D_09002780 = 0x09002780; D_09002868 = 0x09002868; @@ -1234,6 +1252,25 @@ D_090001B8 = 0x090001B8; // effect_12 D_09000240 = 0x09000240; +// effect_13 +D_090002F0 = 0x090002F0; + +// effect_14 +D_09000900 = 0x09000900; +D_090009E8 = 0x090009E8; + +// effect_16 +D_09002170 = 0x09002170; +D_09002238 = 0x09002238; +D_090022E0 = 0x090022E0; +D_09002308 = 0x09002308; +D_090023B0 = 0x090023B0; +D_090023D8 = 0x090023D8; +D_09002480 = 0x09002480; +D_090024A8 = 0x090024A8; +D_09002550 = 0x09002550; +D_09002578 = 0x09002578; + // effect_73 D_090002C0 = 0x090002C0; D_09000330 = 0x09000330;