diff --git a/coverage.py b/coverage.py index be961efeee..a0bcdb0819 100755 --- a/coverage.py +++ b/coverage.py @@ -53,7 +53,6 @@ def stuff(version): matched = [f for f in matched if not f in partial_matched] matched_but_undeleted_asm = set([f for f in matched if f in non_matched and not f in partial_matched]) orphan_asm = set(non_matched) - set(asm) - matched_but_undeleted_asm - missing_asm = set(asm) - set(non_matched) to_delete = matched_but_undeleted_asm | orphan_asm @@ -63,17 +62,8 @@ def stuff(version): print("--delete delete obsolete .s functions without asking") exit() - if len(matched_but_undeleted_asm) > 0: - print(f"The following functions have been matched but their .s files remain: {matched_but_undeleted_asm}") - """ - if len(set(asm)) != len(set(non_matched)): - if len(set(non_matched)) > len(set(asm)) and len(orphan_asm) > 0: - print(f"The following functions are unmatched but are also unINCLUDEd: {orphan_asm}") - elif len(missing_asm) > 0: - print(f"warning: The following .s files are INCLUDEd but don't exist: {missing_asm}") - """ - if len(to_delete) > 0: + print(f"The following functions can be deleted: {to_delete}") if "--fail-undeleted" in sys.argv: exit(1) elif "--delete" in sys.argv or input("Delete them [y/N]? ").upper() == "Y": diff --git a/src/code_1A5830.c b/src/code_1A5830.c index 4ee9443047..5db7c6b6d9 100644 --- a/src/code_1A5830.c +++ b/src/code_1A5830.c @@ -402,7 +402,6 @@ ApiStatus func_8027CC10(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "code_1A5830", EnemyDamageTarget); -//INCLUDE_ASM(s32, "code_1A5830", EnemyFollowupAfflictTarget); ApiStatus EnemyFollowupAfflictTarget(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; BattleStatus* anotherBattleStatus = &gBattleStatus; diff --git a/src/code_3CF80.c b/src/code_3CF80.c deleted file mode 100644 index 54468a7e3f..0000000000 --- a/src/code_3CF80.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3CF80", osContInit, OSMesgQueue* arg0, u8* arg1, OSContStatus* arg2); - -INCLUDE_ASM(s32, "code_3CF80", osContGetInitData); - -INCLUDE_ASM(s32, "code_3CF80", osPackRequestData); diff --git a/src/code_3FEA0.c b/src/code_3FEA0.c deleted file mode 100644 index 9369d74276..0000000000 --- a/src/code_3FEA0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3FEA0", _Printf); - -INCLUDE_ASM(s32, "code_3FEA0", _Putfld); - -INCLUDE_ASM(int, "code_3FEA0", sprintf, char* s, const char* fmt, ...); - -INCLUDE_ASM(s32, "code_3FEA0", proutSprintf); diff --git a/src/code_40E10.c b/src/code_40E10.c deleted file mode 100644 index ab0648719c..0000000000 --- a/src/code_40E10.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "code_40E10", osSpTaskLoad, OSTask* tp); - -INCLUDE_ASM(void, "code_40E10", osSpTaskStartGo, OSTask* tp); diff --git a/src/code_41880.c b/src/code_41880.c deleted file mode 100644 index 5c2fb083e5..0000000000 --- a/src/code_41880.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_41880", osTimerServicesInit); - -INCLUDE_ASM(s32, "code_41880", osTimerInterrupt); - -INCLUDE_ASM(s32, "code_41880", osSetTimerIntr); - -INCLUDE_ASM(s32, "code_41880", osInsertTimer); diff --git a/src/code_42e0_len_1f60.c b/src/code_42e0_len_1f60.c index fd86c135cc..05faf36752 100644 --- a/src/code_42e0_len_1f60.c +++ b/src/code_42e0_len_1f60.c @@ -6,61 +6,6 @@ u16 D_80074260 = 0; s32 D_80074264 = 0; -// probably padding -s32 D_80074268[2] = {0, 0}; - -s32 D_80074270 = 0; - -f32 D_80074274[] = { - 0.0f, 0.017452f, 0.034899f, 0.052336f, 0.069756f, 0.087156f, 0.104528f, 0.121869f, 0.139173f, - 0.156434f, 0.173648f, 0.190809f, 0.207912f, 0.224951f, 0.241922f, 0.258819f, 0.275637f, 0.292372f, 0.309017f, - 0.325568f, 0.34202f, 0.358368f, 0.374607f, 0.390731f, 0.406737f, 0.422618f, 0.438371f, 0.45399f, 0.469472f, - 0.48481f, 0.5f, 0.515038f, 0.529919f, 0.544639f, 0.559193f, 0.573576f, 0.587785f, 0.601815f, 0.615661f, 0.62932f, - 0.642788f, 0.656059f, 0.669131f, 0.681998f, 0.694658f, 0.707107f, 0.71934f, 0.731354f, 0.743145f, 0.75471f, - 0.766044f, 0.777146f, 0.788011f, 0.798636f, 0.809017f, 0.819152f, 0.829038f, 0.838671f, 0.848048f, 0.857167f, - 0.866025f, 0.87462f, 0.882948f, 0.891007f, 0.898794f, 0.906308f, 0.913545f, 0.920505f, 0.927184f, 0.93358f, - 0.939693f, 0.945519f, 0.951057f, 0.956305f, 0.961262f, 0.965926f, 0.970296f, 0.97437f, 0.978148f, 0.981627f, - 0.984808f, 0.987688f, 0.990268f, 0.992546f, 0.994522f, 0.996195f, 0.997564f, 0.99863f, 0.999391f, 0.999848f, 1.0f -}; - -s8 D_800743E0[] = { - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, - 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -s32 gRandSeed = 1; - -f32 D_80074414[] = { - 1.0f, 1.273187f, 1.27303f, 1.272768f, 1.272402f, 1.271932f, 1.271358f, 1.270681f, 1.269902f, 1.269021f, 1.268038f, - 1.266956f, 1.265774f, 1.264494f, 1.263116f, 1.261643f, 1.260075f, 1.258413f, 1.256659f, 1.254815f, 1.252881f, - 1.250859f, 1.248752f, 1.24656f, 1.244285f, 1.241929f, 1.239494f, 1.236981f, 1.234393f, 1.231731f, 1.228997f, - 1.226192f, 1.22332f, 1.220382f, 1.217379f, 1.214315f, 1.211189f, 1.208006f, 1.204766f, 1.201471f, 1.198124f, - 1.194727f, 1.191281f, 1.187787f, 1.18425f, 1.180669f, 1.177047f, 1.173386f, 1.169687f, 1.165952f, 1.162184f, - 1.158384f, 1.154553f, 1.150693f, 1.146806f, 1.142893f, 1.138957f, 1.134998f, 1.131018f, 1.127019f, 1.123002f, - 1.118969f, 1.11492f, 1.110858f, 1.106783f, 1.102697f, 1.098601f, 1.094496f, 1.090384f, 1.086266f, 1.082142f, - 1.078014f, 1.073883f, 1.06975f, 1.065616f, 1.061482f, 1.057348f, 1.053216f, 1.049087f, 1.04496f, 1.040838f, - 1.036721f, 1.03261f, 1.028504f, 1.024406f, 1.020316f, 1.016234f, 1.01216f, 1.008097f, 1.004043f, 1.0f -}; - -Gfx D_80074580[] = { - gsDPPipeSync(), - gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_OFF), - gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetTexturePersp(G_TP_NONE), - gsDPSetTextureDetail(G_TD_CLAMP), - gsDPSetTextureLOD(G_TL_TILE), - gsDPSetTextureFilter(G_TF_POINT), - gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureConvert(G_TC_FILT), - gsSPEndDisplayList(), -}; - -void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta); -void func_80029860(s32 romStart, s32 vramDest, s32 length); - -#define ROM_CHUNK_SIZE 0x2000 - void poll_rumble(void) { nuContRmbCheck(0); nuContRmbModeSet(0, 2); @@ -103,316 +48,3 @@ void update_max_rumble_duration(void) { void reset_max_rumble_duration(void) { D_80074260 = 300; } - -f32 length2D(f32 x, f32 y) { - return sqrtf(SQ(x) + SQ(y)); -} - -HeapNode* _heap_create(s32* addr, u32 size) { - if (size < 32) { - return (HeapNode*) - 1; - } else { - HeapNode* heapNode = ALIGN16((s32)addr); - - size -= ((s8*)heapNode - (s8*)addr); - heapNode->next = NULL; - heapNode->length = size - sizeof(HeapNode); - heapNode->allocated = 0; - heapNode->capacity = size; - return heapNode; - } -} - -INCLUDE_ASM(s32, "code_42e0_len_1f60", _heap_malloc); - -INCLUDE_ASM(s32, "code_42e0_len_1f60", _heap_malloc_tail); - -INCLUDE_ASM(s32, "code_42e0_len_1f60", _heap_free); - -INCLUDE_ASM(s32, "code_42e0_len_1f60", _heap_realloc); - -INCLUDE_ASM(s32, "code_42e0_len_1f60", cosine); - -s32 sign(s32 val) { - s32 sign = -1; - - if (val >= 0) { - sign = val > 0; - } - return sign; -} - -INCLUDE_ASM(s32, "code_42e0_len_1f60", int_to_string); - -// should maybe be called bzero -void mem_clear(s8* data, s32 numBytes) { - while (numBytes > 0) { - *data = 0; - data++; - numBytes--; - } -} - -INCLUDE_ASM(s32, "code_42e0_len_1f60", transform_point); - -void copy_matrix(Matrix4f* src, Matrix4f* dest) { - bcopy(src, dest, sizeof(Matrix4f)); -} - -s32 dma_copy(s32 romStart, s32 romEnd, void* vramDest) { - u32 length = romEnd - romStart; - s32 i; - - osInvalICache(vramDest, length); - - for (i = 0; i + ROM_CHUNK_SIZE < length; i += ROM_CHUNK_SIZE) { - nuPiReadRom(romStart + i, vramDest + i, ROM_CHUNK_SIZE); - } - - if (i != length) { - nuPiReadRom(romStart + i, vramDest + i, length - i); - } - - return length; -} - -s32 func_800297D4(s32 romStart, s32 romEnd, void* vramDest) { - u32 length = romEnd - romStart; - s32 i; - - for (i = 0; i + ROM_CHUNK_SIZE < length; i += ROM_CHUNK_SIZE) { - func_80029860(romStart + i, vramDest + i, ROM_CHUNK_SIZE); - } - - if (i != length) { - func_80029860(romStart + i, vramDest + i, length - i); - } - - return length; -} - -void func_80029860(s32 dramAddr, s32 devAddr, s32 size) { - OSIoMesg osIoMesg; - OSMesg osMesg; - OSMesgQueue osMesgQueue; - - osWritebackDCache(dramAddr, size); - osCreateMesgQueue(&osMesgQueue, &osMesg, 1); - - osIoMesg.hdr.pri = 0; - osIoMesg.hdr.retQueue = &osMesgQueue; - osIoMesg.dramAddr = dramAddr; - osIoMesg.devAddr = devAddr; - osIoMesg.size = size; - - osEPiStartDma(carthandle, &osIoMesg, 1); - osRecvMesg(&osMesgQueue, &osMesg, 1); -} - -s32 _advance_rng(void) { - s32* rngVal = &gRandSeed; - - (*gGameStatusPtr)->nextRNG = *rngVal = (*rngVal * 0x5D588B65) + 1; - - return *rngVal; -} - -f32 func_80029934(void) { - s32 temp_v0 = _advance_rng() & 0x7FFF; - f64 temp_f2 = temp_v0; - - if (temp_v0 < 0) { - temp_f2 += 4294967296.0; - } - - return temp_f2 * 3.0517578125e-05; -} - -s32 func_80029994(s32 arg0) { - u32 div = -1; - s32 plusOne = arg0 + 1; - u32 result; - - div /= plusOne; - if (div == 0) { - div = 1; - } - - do { - result = _advance_rng() / div; - } while (result >= plusOne); - - return result; -} - -// Issue with the negation at the beginning -#ifdef NON_MATCHING -s32 rand_int(s32 arg0) { - s32 ret; - - if (arg0 < 0) { - arg0 = -arg0; - } - - ret = 0; - if (arg0 != 0) { - if (arg0 == 1) { - return (func_80029994(1000) < 501) ^ 1; - } - if (arg0 != 100) { - return func_80029994(arg0); - } - ret = func_80029994(1009) / 10; - } - - return ret; -} -#else -INCLUDE_ASM(s32, "code_42e0_len_1f60", rand_int, s32 arg0); -#endif - -f32 signF(f32 val) { - f32 sign; - - if (!(val > 0.0f)) { - sign = -1.0f; - if (!(val < 0.0f)) { - sign = 0.0f; - } - } else { - sign = 1.0f; - } - - return sign; -} - -s32 round(f32 arg0) { - if (!(arg0 >= 0.0f)) { - return -(s32)(0.5 - arg0); - } else { - return (s32)(0.5 + arg0); - } -} - -INCLUDE_ASM(f32, "code_42e0_len_1f60", clamp_angle, f32 theta); - -f32 get_clamped_angle_diff(f32 a, f32 b) { - if (fabsf(b - a) >= 180.0f) { - if (b < a) { - b += 360.0f; - } else { - b -= 360.0f; - } - } - return b - a; -} - -INCLUDE_ASM(f32, "code_42e0_len_1f60", atan2, f32 startX, f32 startZ, f32 endX, f32 endZ); - -f32 get_player_normal_yaw(void) { - return atan2(0, 0, (*gGameStatusPtr)->playerTraceNormal.x, (*gGameStatusPtr)->playerTraceNormal.z); -} - -f32 get_player_normal_pitch(void) { - f32 traceNormalX = (*gGameStatusPtr)->playerTraceNormal.x; - f32 traceNormalZ = (*gGameStatusPtr)->playerTraceNormal.z; - f32 sqrt = sqrtf(SQ(traceNormalX) + SQ(traceNormalZ)); - - return atan2(0.0f, 0.0f, sqrt, -(*gGameStatusPtr)->playerTraceNormal.y); -} - -f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by) { - f32 xDiff = bx - ax; - f32 yDiff = by - ay; - - return sqrtf(SQ(xDiff) + SQ(yDiff)); -} - -f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz) { - f32 xDiff = bx - ax; - f32 yDiff = by - ay; - f32 zDiff = bz - az; - - return sqrtf(SQ(xDiff) + SQ(yDiff) + SQ(zDiff)); -} - -void add_vec2D_polar(f32* x, f32* y, f32 r, f32 theta) { - f32 sinTheta; - f32 cosTheta; - - sin_cos_rad((theta * 6.28318f) / 360.0f, &sinTheta, &cosTheta); - *x += r * sinTheta; - *y -= r * cosTheta; -} - -u16 _wrap_trig_lookup_value(f32 theta) { - f32 ret = theta; - - if (theta >= 1048576.0f || theta <= -1048576.0f) { - ret = theta * 0.0000009536743f; - ret = theta - ((s32) ret) * 1048576.0f; - } - - return (s32) ret; -} - -void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta) { - u16 theta = _wrap_trig_lookup_value(rad * 10430.378f); - - *outSinTheta = sins(theta) * 3.051851e-05; - *outCosTheta = coss(theta) * 3.051851e-05; -} - -f32 sin_rad(f32 angle) { - return sins(_wrap_trig_lookup_value(angle * 10430.378f)) * 3.051851e-05; -} - -f32 cos_rad(f32 angle) { - return coss(_wrap_trig_lookup_value(angle * 10430.378f)) * 3.051851e-05; -} - -void sin_cos_deg(f32 rad, f32* outSinTheta, f32* outCosTheta) { - u16 theta = _wrap_trig_lookup_value(rad * 182.04445f); - - *outSinTheta = sins(theta) * 3.051851e-05; - *outCosTheta = coss(theta) * 3.051851e-05; -} - -f32 sin_deg(f32 angle) { - return sins(_wrap_trig_lookup_value(angle * 182.04445f)) * 3.051851e-05; -} - -f32 cos_deg(f32 angle) { - return coss(_wrap_trig_lookup_value(angle * 182.04445f)) * 3.051851e-05; -} - -INCLUDE_ASM(f32, "code_42e0_len_1f60", update_lerp, Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); - -//void func_8002A904(u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7); -INCLUDE_ASM(void, "code_42e0_len_1f60", func_8002A904, u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7); - -INCLUDE_ASM(s32, "code_42e0_len_1f60", func_8002AAC4); -// void func_8002AAC4(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7) { -// s16 phi_t0; -// s16 phi_t1; -// s16 phi_t2; -// s16 phi_t3; - -// phi_t0 = arg0; -// phi_t2 = arg2; -// if (arg2 < arg0) { -// phi_t0 = arg2; -// phi_t2 = arg0; -// } - -// phi_t1 = arg1; -// phi_t3 = arg3; -// if (arg3 < arg1) { -// phi_t1 = arg3; -// phi_t3 = arg1; -// } - -// func_8002A904(arg4, arg5, arg6, arg7, phi_t0, phi_t1, phi_t2, phi_t3); -// } - -INCLUDE_ASM(s32, "code_42e0_len_1f60", func_8002AB5C); diff --git a/src/code_43590.c b/src/code_43590.c deleted file mode 100644 index f5cf5e4732..0000000000 --- a/src/code_43590.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_43590", osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, - int unk5, s32* unk6); - -INCLUDE_ASM(s32, "code_43590", osPfsDeclearPage); diff --git a/src/code_43F0.c b/src/code_43F0.c new file mode 100644 index 0000000000..556f169312 --- /dev/null +++ b/src/code_43F0.c @@ -0,0 +1,366 @@ +#include "common.h" + +s32 D_80074270 = 0; + +f32 D_80074274[] = { + 0.0f, 0.017452f, 0.034899f, 0.052336f, 0.069756f, 0.087156f, 0.104528f, 0.121869f, 0.139173f, + 0.156434f, 0.173648f, 0.190809f, 0.207912f, 0.224951f, 0.241922f, 0.258819f, 0.275637f, 0.292372f, 0.309017f, + 0.325568f, 0.34202f, 0.358368f, 0.374607f, 0.390731f, 0.406737f, 0.422618f, 0.438371f, 0.45399f, 0.469472f, + 0.48481f, 0.5f, 0.515038f, 0.529919f, 0.544639f, 0.559193f, 0.573576f, 0.587785f, 0.601815f, 0.615661f, 0.62932f, + 0.642788f, 0.656059f, 0.669131f, 0.681998f, 0.694658f, 0.707107f, 0.71934f, 0.731354f, 0.743145f, 0.75471f, + 0.766044f, 0.777146f, 0.788011f, 0.798636f, 0.809017f, 0.819152f, 0.829038f, 0.838671f, 0.848048f, 0.857167f, + 0.866025f, 0.87462f, 0.882948f, 0.891007f, 0.898794f, 0.906308f, 0.913545f, 0.920505f, 0.927184f, 0.93358f, + 0.939693f, 0.945519f, 0.951057f, 0.956305f, 0.961262f, 0.965926f, 0.970296f, 0.97437f, 0.978148f, 0.981627f, + 0.984808f, 0.987688f, 0.990268f, 0.992546f, 0.994522f, 0.996195f, 0.997564f, 0.99863f, 0.999391f, 0.999848f, 1.0f +}; + +s8 D_800743E0[] = { + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, + 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + +s32 gRandSeed = 1; + +f32 D_80074414[] = { + 1.0f, 1.273187f, 1.27303f, 1.272768f, 1.272402f, 1.271932f, 1.271358f, 1.270681f, 1.269902f, 1.269021f, 1.268038f, + 1.266956f, 1.265774f, 1.264494f, 1.263116f, 1.261643f, 1.260075f, 1.258413f, 1.256659f, 1.254815f, 1.252881f, + 1.250859f, 1.248752f, 1.24656f, 1.244285f, 1.241929f, 1.239494f, 1.236981f, 1.234393f, 1.231731f, 1.228997f, + 1.226192f, 1.22332f, 1.220382f, 1.217379f, 1.214315f, 1.211189f, 1.208006f, 1.204766f, 1.201471f, 1.198124f, + 1.194727f, 1.191281f, 1.187787f, 1.18425f, 1.180669f, 1.177047f, 1.173386f, 1.169687f, 1.165952f, 1.162184f, + 1.158384f, 1.154553f, 1.150693f, 1.146806f, 1.142893f, 1.138957f, 1.134998f, 1.131018f, 1.127019f, 1.123002f, + 1.118969f, 1.11492f, 1.110858f, 1.106783f, 1.102697f, 1.098601f, 1.094496f, 1.090384f, 1.086266f, 1.082142f, + 1.078014f, 1.073883f, 1.06975f, 1.065616f, 1.061482f, 1.057348f, 1.053216f, 1.049087f, 1.04496f, 1.040838f, + 1.036721f, 1.03261f, 1.028504f, 1.024406f, 1.020316f, 1.016234f, 1.01216f, 1.008097f, 1.004043f, 1.0f +}; + +Gfx D_80074580[] = { + gsDPPipeSync(), + gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetTexturePersp(G_TP_NONE), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureFilter(G_TF_POINT), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta); +void func_80029860(s32 romStart, s32 vramDest, s32 length); + +#define ROM_CHUNK_SIZE 0x2000 + +f32 length2D(f32 x, f32 y) { + return sqrtf(SQ(x) + SQ(y)); +} + +HeapNode* _heap_create(s32* addr, u32 size) { + if (size < 32) { + return (HeapNode*) - 1; + } else { + HeapNode* heapNode = ALIGN16((s32)addr); + + size -= ((s8*)heapNode - (s8*)addr); + heapNode->next = NULL; + heapNode->length = size - sizeof(HeapNode); + heapNode->allocated = 0; + heapNode->capacity = size; + return heapNode; + } +} + +INCLUDE_ASM(s32, "code_43F0", _heap_malloc); + +INCLUDE_ASM(s32, "code_43F0", _heap_malloc_tail); + +INCLUDE_ASM(s32, "code_43F0", _heap_free); + +INCLUDE_ASM(s32, "code_43F0", _heap_realloc); + +INCLUDE_ASM(s32, "code_43F0", cosine); + +s32 sign(s32 val) { + s32 sign = -1; + + if (val >= 0) { + sign = val > 0; + } + return sign; +} + +INCLUDE_ASM(s32, "code_43F0", int_to_string); + +// should maybe be called bzero +void mem_clear(s8* data, s32 numBytes) { + while (numBytes > 0) { + *data = 0; + data++; + numBytes--; + } +} + +INCLUDE_ASM(s32, "code_43F0", transform_point); + +void copy_matrix(Matrix4f* src, Matrix4f* dest) { + bcopy(src, dest, sizeof(Matrix4f)); +} + +s32 dma_copy(s32 romStart, s32 romEnd, void* vramDest) { + u32 length = romEnd - romStart; + s32 i; + + osInvalICache(vramDest, length); + + for (i = 0; i + ROM_CHUNK_SIZE < length; i += ROM_CHUNK_SIZE) { + nuPiReadRom(romStart + i, vramDest + i, ROM_CHUNK_SIZE); + } + + if (i != length) { + nuPiReadRom(romStart + i, vramDest + i, length - i); + } + + return length; +} + +s32 func_800297D4(s32 romStart, s32 romEnd, void* vramDest) { + u32 length = romEnd - romStart; + s32 i; + + for (i = 0; i + ROM_CHUNK_SIZE < length; i += ROM_CHUNK_SIZE) { + func_80029860(romStart + i, vramDest + i, ROM_CHUNK_SIZE); + } + + if (i != length) { + func_80029860(romStart + i, vramDest + i, length - i); + } + + return length; +} + +void func_80029860(s32 dramAddr, s32 devAddr, s32 size) { + OSIoMesg osIoMesg; + OSMesg osMesg; + OSMesgQueue osMesgQueue; + + osWritebackDCache(dramAddr, size); + osCreateMesgQueue(&osMesgQueue, &osMesg, 1); + + osIoMesg.hdr.pri = 0; + osIoMesg.hdr.retQueue = &osMesgQueue; + osIoMesg.dramAddr = dramAddr; + osIoMesg.devAddr = devAddr; + osIoMesg.size = size; + + osEPiStartDma(carthandle, &osIoMesg, 1); + osRecvMesg(&osMesgQueue, &osMesg, 1); +} + +s32 _advance_rng(void) { + s32* rngVal = &gRandSeed; + + (*gGameStatusPtr)->nextRNG = *rngVal = (*rngVal * 0x5D588B65) + 1; + + return *rngVal; +} + +f32 func_80029934(void) { + s32 temp_v0 = _advance_rng() & 0x7FFF; + f64 temp_f2 = temp_v0; + + if (temp_v0 < 0) { + temp_f2 += 4294967296.0; + } + + return temp_f2 * 3.0517578125e-05; +} + +s32 func_80029994(s32 arg0) { + u32 div = -1; + s32 plusOne = arg0 + 1; + u32 result; + + div /= plusOne; + if (div == 0) { + div = 1; + } + + do { + result = _advance_rng() / div; + } while (result >= plusOne); + + return result; +} + +// Issue with the negation at the beginning +#ifdef NON_MATCHING +s32 rand_int(s32 arg0) { + s32 ret; + + if (arg0 < 0) { + arg0 = -arg0; + } + + ret = 0; + if (arg0 != 0) { + if (arg0 == 1) { + return (func_80029994(1000) < 501) ^ 1; + } + if (arg0 != 100) { + return func_80029994(arg0); + } + ret = func_80029994(1009) / 10; + } + + return ret; +} +#else +INCLUDE_ASM(s32, "code_43F0", rand_int, s32 arg0); +#endif + +f32 signF(f32 val) { + f32 sign; + + if (!(val > 0.0f)) { + sign = -1.0f; + if (!(val < 0.0f)) { + sign = 0.0f; + } + } else { + sign = 1.0f; + } + + return sign; +} + +s32 round(f32 arg0) { + if (!(arg0 >= 0.0f)) { + return -(s32)(0.5 - arg0); + } else { + return (s32)(0.5 + arg0); + } +} + +INCLUDE_ASM(f32, "code_43F0", clamp_angle, f32 theta); + +f32 get_clamped_angle_diff(f32 a, f32 b) { + if (fabsf(b - a) >= 180.0f) { + if (b < a) { + b += 360.0f; + } else { + b -= 360.0f; + } + } + return b - a; +} + +INCLUDE_ASM(f32, "code_43F0", atan2, f32 startX, f32 startZ, f32 endX, f32 endZ); + +f32 get_player_normal_yaw(void) { + return atan2(0, 0, (*gGameStatusPtr)->playerTraceNormal.x, (*gGameStatusPtr)->playerTraceNormal.z); +} + +f32 get_player_normal_pitch(void) { + f32 traceNormalX = (*gGameStatusPtr)->playerTraceNormal.x; + f32 traceNormalZ = (*gGameStatusPtr)->playerTraceNormal.z; + f32 sqrt = sqrtf(SQ(traceNormalX) + SQ(traceNormalZ)); + + return atan2(0.0f, 0.0f, sqrt, -(*gGameStatusPtr)->playerTraceNormal.y); +} + +f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by) { + f32 xDiff = bx - ax; + f32 yDiff = by - ay; + + return sqrtf(SQ(xDiff) + SQ(yDiff)); +} + +f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz) { + f32 xDiff = bx - ax; + f32 yDiff = by - ay; + f32 zDiff = bz - az; + + return sqrtf(SQ(xDiff) + SQ(yDiff) + SQ(zDiff)); +} + +void add_vec2D_polar(f32* x, f32* y, f32 r, f32 theta) { + f32 sinTheta; + f32 cosTheta; + + sin_cos_rad((theta * 6.28318f) / 360.0f, &sinTheta, &cosTheta); + *x += r * sinTheta; + *y -= r * cosTheta; +} + +u16 _wrap_trig_lookup_value(f32 theta) { + f32 ret = theta; + + if (theta >= 1048576.0f || theta <= -1048576.0f) { + ret = theta * 0.0000009536743f; + ret = theta - ((s32) ret) * 1048576.0f; + } + + return (s32) ret; +} + +void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta) { + u16 theta = _wrap_trig_lookup_value(rad * 10430.378f); + + *outSinTheta = sins(theta) * 3.051851e-05; + *outCosTheta = coss(theta) * 3.051851e-05; +} + +f32 sin_rad(f32 angle) { + return sins(_wrap_trig_lookup_value(angle * 10430.378f)) * 3.051851e-05; +} + +f32 cos_rad(f32 angle) { + return coss(_wrap_trig_lookup_value(angle * 10430.378f)) * 3.051851e-05; +} + +void sin_cos_deg(f32 rad, f32* outSinTheta, f32* outCosTheta) { + u16 theta = _wrap_trig_lookup_value(rad * 182.04445f); + + *outSinTheta = sins(theta) * 3.051851e-05; + *outCosTheta = coss(theta) * 3.051851e-05; +} + +f32 sin_deg(f32 angle) { + return sins(_wrap_trig_lookup_value(angle * 182.04445f)) * 3.051851e-05; +} + +f32 cos_deg(f32 angle) { + return coss(_wrap_trig_lookup_value(angle * 182.04445f)) * 3.051851e-05; +} + +INCLUDE_ASM(f32, "code_43F0", update_lerp, Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); + +//void func_8002A904(u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7); +INCLUDE_ASM(void, "code_43F0", func_8002A904, u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7); + +INCLUDE_ASM(s32, "code_43F0", func_8002AAC4); +// void func_8002AAC4(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7) { +// s16 phi_t0; +// s16 phi_t1; +// s16 phi_t2; +// s16 phi_t3; + +// phi_t0 = arg0; +// phi_t2 = arg2; +// if (arg2 < arg0) { +// phi_t0 = arg2; +// phi_t2 = arg0; +// } + +// phi_t1 = arg1; +// phi_t3 = arg3; +// if (arg3 < arg1) { +// phi_t1 = arg3; +// phi_t3 = arg1; +// } + +// func_8002A904(arg4, arg5, arg6, arg7, phi_t0, phi_t1, phi_t2, phi_t3); +// } + +INCLUDE_ASM(s32, "code_43F0", func_8002AB5C); diff --git a/src/code_44490.c b/src/code_44490.c deleted file mode 100644 index d20d0dad30..0000000000 --- a/src/code_44490.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_44490", osPfsNumFiles, OSPfs* pfs, s32* unk1, s32* unk2); - -INCLUDE_ASM(s32, "code_44490", osPfsInitPak, OSMesgQueue* queue, OSPfs* pfs, int unk1); - -INCLUDE_ASM(s32, "code_44490", osPfsCheckRamArea); diff --git a/src/jp/main_1000.c b/src/jp/main_1000.c deleted file mode 100644 index 48a803e289..0000000000 --- a/src/jp/main_1000.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_1000", func_80025C00); - -INCLUDE_ASM(s32, "main_1000", func_80025C60); - -INCLUDE_ASM(s32, "main_1000", func_80025CC0); - -INCLUDE_ASM(s32, "main_1000", func_80025CFC); - -INCLUDE_ASM(s32, "main_1000", func_80025D38); - -INCLUDE_ASM(s32, "main_1000", func_80025D74); - -INCLUDE_ASM(s32, "main_1000", func_80025F44); - -INCLUDE_ASM(s32, "main_1000", func_80026148); - -INCLUDE_ASM(s32, "main_1000", func_800266E8); - -INCLUDE_ASM(s32, "main_1000", func_80026710); - -INCLUDE_ASM(s32, "main_1000", func_800269C0); - -INCLUDE_ASM(s32, "main_1000", func_80026AD4); - -INCLUDE_ASM(s32, "main_1000", func_80026DA8); - -INCLUDE_ASM(s32, "main_1000", func_80027054); - -INCLUDE_ASM(s32, "main_1000", func_8002715C); diff --git a/src/jp/main_1060.c b/src/jp/main_1060.c new file mode 100644 index 0000000000..ff8e176be1 --- /dev/null +++ b/src/jp/main_1060.c @@ -0,0 +1,88 @@ +#include "common.h" +#include "stdlib/stdarg.h" + +u32 func_80025D74(void* arg0, const unsigned char* str, s32 count); + +void func_80025C60(void) { + OSPiHandle** handle = &carthandle; + + osEPiWriteIo(*handle, 0xB3FF0014, 0); + osEPiWriteIo(*handle, 0xB3FF0004, 0); + osEPiWriteIo(*handle, 0xB3FF0000, ASCII_TO_U32('I', 'S', '6', '4')); +} + +void func_80025CC0(const char* fmt, ...) { + va_list args; + va_start(args, fmt); + + _Printf(&func_80025D74, NULL, fmt, args); +} + +void func_80025CFC(const char* fmt, ...) { + va_list args; + va_start(args, fmt); + + _Printf(&func_80025D74, NULL, fmt, args); +} + +void func_80025D38(const char* fmt, ...) { + va_list args; + va_start(args, fmt); + + _Printf(&func_80025D74, NULL, fmt, args); +} + +u32 func_80025D74(void* arg0, const unsigned char* str, s32 count) { + u32 data; + s32 pos; + s32 start; + s32 end; + OSPiHandle** handle = &carthandle; + + osEPiReadIo(*handle, 0xB3FF0000, &data); + if (data != ASCII_TO_U32('I', 'S', '6', '4')) { + return 1; + } + osEPiReadIo(*handle, 0xB3FF0004, &data); + pos = data; + osEPiReadIo(*handle, 0xB3FF0014, &data); + start = data; + end = start + count; + if (end >= 0xffe0) { + end -= 0xffe0; + if (pos < end || start < pos) { + return 1; + } + } else { + if (start < pos && pos < end) { + return 1; + } + } + while (count) { + if (*str) { + u32 addr = 0xB3FF0020 + (start & 0xffffffc); + s32 shift = ((3 - (start & 3)) * 8); + OSPiHandle** handle2 = &carthandle; + + osEPiReadIo(*handle2, addr, &data); + osEPiWriteIo(*handle2, addr, (data & ~(0xff << shift)) | (*str << shift)); + + start++; + if (start >= 0xffe0) { + start -= 0xffe0; + } + } + count--; + str++; + } + osEPiWriteIo(carthandle, 0xB3FF0014, start); + return 1; +} + + +extern const char D_80097D10[]; // "File:%s Line:%d %s \n\0\0\0" + +void func_80025F44(char* arg0, char* file, s32 line, char* arg3) { + func_80025CFC(D_80097D10, file, line, arg0); + PANIC(); +} diff --git a/src/jp/main_1370.c b/src/jp/main_1370.c new file mode 100644 index 0000000000..15d364223e --- /dev/null +++ b/src/jp/main_1370.c @@ -0,0 +1,12 @@ +#include "common.h" + +extern s32* D_80073DE0; + +INCLUDE_ASM(s32, "main_1370", func_80025F70); + +INCLUDE_ASM(s32, "main_1370", func_80026148); + +void gfxPreNMI_Callback(void) { + D_80073DE0 = 1; + nuContRmbForceStop(); +} diff --git a/src/jp/main_1B10.c b/src/jp/main_1B10.c new file mode 100644 index 0000000000..1256527b17 --- /dev/null +++ b/src/jp/main_1B10.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(s32, "main_1B10", func_80026710); + +INCLUDE_ASM(s32, "main_1B10", func_800269C0); + +INCLUDE_ASM(s32, "main_1B10", func_80026AD4); + +INCLUDE_ASM(s32, "main_1B10", func_80026DA8); + +INCLUDE_ASM(s32, "main_1B10", func_80027054); + +INCLUDE_ASM(s32, "main_1B10", func_8002715C); diff --git a/src/jp/main_3B150.c b/src/jp/main_3B150.c deleted file mode 100644 index 7314a92262..0000000000 --- a/src/jp/main_3B150.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3B150", func_8005FD50); - -INCLUDE_ASM(s32, "main_3B150", func_8005FD70); - -INCLUDE_ASM(s32, "main_3B150", func_8005FD90); diff --git a/src/jp/main_3C130.c b/src/jp/main_3C130.c deleted file mode 100644 index 3095d86de4..0000000000 --- a/src/jp/main_3C130.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3C130", func_80060D30); diff --git a/src/jp/main_3C190.c b/src/jp/main_3C190.c deleted file mode 100644 index 06de3aac8d..0000000000 --- a/src/jp/main_3C190.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3C190", func_80060D90); diff --git a/src/jp/main_3FE70.c b/src/jp/main_3FE70.c index 7b6dc4cade..5e3388b97a 100644 --- a/src/jp/main_3FE70.c +++ b/src/jp/main_3FE70.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "main_3FE70", func_80064A70); +INCLUDE_ASM(s32, "main_3FE70", _Printf); INCLUDE_ASM(s32, "main_3FE70", func_80064FF0); diff --git a/src/jp/os/nusys/code_3B150.c b/src/jp/os/nusys/code_3B150.c new file mode 100644 index 0000000000..97de98ed9d --- /dev/null +++ b/src/jp/os/nusys/code_3B150.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/nusys/code_3B150", nuContRmbForceStop); + +INCLUDE_ASM(s32, "os/nusys/code_3B150", func_8005FD70); + +INCLUDE_ASM(s32, "os/nusys/code_3B150", func_8005FD90); diff --git a/src/jp/os/osEPiReadIo.c b/src/jp/os/osEPiReadIo.c new file mode 100644 index 0000000000..e7c8e44a87 --- /dev/null +++ b/src/jp/os/osEPiReadIo.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/osEPiReadIo", osEPiReadIo, OSPiHandle* handle, u32 size, u32* out); diff --git a/src/jp/os/osEPiWriteIo.c b/src/jp/os/osEPiWriteIo.c new file mode 100644 index 0000000000..96891c5d44 --- /dev/null +++ b/src/jp/os/osEPiWriteIo.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/osEPiWriteIo", osEPiWriteIo, OSPiHandle* handle, u32 devAddr, u32 data); diff --git a/src/os/code_3CF80.c b/src/os/code_3CF80.c new file mode 100644 index 0000000000..9cb5695bd1 --- /dev/null +++ b/src/os/code_3CF80.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/code_3CF80", osContInit, OSMesgQueue* arg0, u8* arg1, OSContStatus* arg2); + +INCLUDE_ASM(s32, "os/code_3CF80", osContGetInitData); + +INCLUDE_ASM(s32, "os/code_3CF80", osPackRequestData); diff --git a/src/os/code_3FEA0.c b/src/os/code_3FEA0.c new file mode 100644 index 0000000000..8757e13159 --- /dev/null +++ b/src/os/code_3FEA0.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/code_3FEA0", _Printf); + +INCLUDE_ASM(s32, "os/code_3FEA0", _Putfld); + +INCLUDE_ASM(int, "os/code_3FEA0", sprintf, char* s, const char* fmt, ...); + +INCLUDE_ASM(s32, "os/code_3FEA0", proutSprintf); diff --git a/src/os/code_41880.c b/src/os/code_41880.c new file mode 100644 index 0000000000..b7c7bb1965 --- /dev/null +++ b/src/os/code_41880.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/code_41880", osTimerServicesInit); + +INCLUDE_ASM(s32, "os/code_41880", osTimerInterrupt); + +INCLUDE_ASM(s32, "os/code_41880", osSetTimerIntr); + +INCLUDE_ASM(s32, "os/code_41880", osInsertTimer); diff --git a/src/os/code_43590.c b/src/os/code_43590.c new file mode 100644 index 0000000000..af255c9469 --- /dev/null +++ b/src/os/code_43590.c @@ -0,0 +1,6 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/code_43590", osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, + int unk5, s32* unk6); + +INCLUDE_ASM(s32, "os/code_43590", osPfsDeclearPage); diff --git a/src/os/code_44490.c b/src/os/code_44490.c new file mode 100644 index 0000000000..9770d9be49 --- /dev/null +++ b/src/os/code_44490.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/code_44490", osPfsNumFiles, OSPfs* pfs, s32* unk1, s32* unk2); + +INCLUDE_ASM(s32, "os/code_44490", osPfsInitPak, OSMesgQueue* queue, OSPfs* pfs, int unk1); + +INCLUDE_ASM(s32, "os/code_44490", osPfsCheckRamArea); diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo index 0b7fc59059..102361d21b 100644 --- a/tools/splat/.gitrepo +++ b/tools/splat/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/ethteck/splat.git branch = master - commit = c56195a9c53db272350ee7796535c1b50174d62d - parent = b82530ae1f4d1dc90072317b9e5b63ad1d06ddb2 + commit = 97e51bdf2124a90a856fcb0c695f01fa15360e5d + parent = 1af3672136ec6d609d9ce31f23fb472cf1e359f0 method = merge cmdver = 0.4.3 diff --git a/tools/splat/create_config.py b/tools/splat/create_config.py index 00850e711c..02db313a86 100755 --- a/tools/splat/create_config.py +++ b/tools/splat/create_config.py @@ -18,7 +18,10 @@ def main(rom_path): basename: {2} options: find_file_boundaries: True - compiler: "IDO" + compiler: IDO + platform: n64 + out_dir: . + target_path: baserom.z64 """.format(rom.name.title(), rom.get_country_name(), basename) with open(rom_path, "rb") as f: @@ -31,9 +34,6 @@ options: - name: header type: header start: 0x0 - vram: 0 - files: - - [0x0, header, header] - name: boot type: bin start: 0x40 @@ -41,7 +41,7 @@ options: type: code start: 0x1000 vram: 0x{:X} - files: + subsections: - [0x1000, asm] - type: bin start: 0x{:X} diff --git a/tools/splat/segtypes/n64/code.py b/tools/splat/segtypes/n64/code.py index dc0fcf79b2..331ba14178 100644 --- a/tools/splat/segtypes/n64/code.py +++ b/tools/splat/segtypes/n64/code.py @@ -655,11 +655,11 @@ class N64SegCode(N64Segment): for insn in funcs[func]: insn_addr = insn[0].address # Add a label if we need one - if insn_addr in self.labels_to_add: - self.labels_to_add.remove(insn_addr) - func_text.append(".L{:X}:".format(insn_addr)) if insn_addr in self.jtbl_glabels_to_add: func_text.append(f"glabel L{insn_addr:X}_{insn[3]:X}") + elif insn_addr in self.labels_to_add: + self.labels_to_add.remove(insn_addr) + func_text.append(".L{:X}:".format(insn_addr)) if rom_addr_padding: rom_str = "{0:0{1}X}".format(insn[3], rom_addr_padding) @@ -673,6 +673,12 @@ class N64SegCode(N64Segment): else: op_str = insn[2] + if self.is_branch_insn(insn[0].mnemonic): + branch_addr = int(insn[0].op_str.split(",")[-1].strip(), 0) + if branch_addr in self.jtbl_glabels_to_add: + label_str = f"L{branch_addr:X}_{self.ram_to_rom(branch_addr):X}" + op_str = ", ".join(insn[2].split(", ")[:-1] + [label_str]) + insn_text = insn[1] if indent_next: indent_next = False diff --git a/tools/splat/segtypes/n64/palette.py b/tools/splat/segtypes/n64/palette.py index 1cfe03b344..f934d2a5d0 100644 --- a/tools/splat/segtypes/n64/palette.py +++ b/tools/splat/segtypes/n64/palette.py @@ -3,6 +3,7 @@ from segtypes.n64.segment import N64Segment from util.color import unpack_color from util.n64 import Yay0decompress from util.iter import iter_in_groups +import sys class N64SegPalette(N64Segment): require_unique_name = False @@ -20,6 +21,13 @@ class N64SegPalette(N64Segment): self.compressed = segment.get("compressed", False) if type( segment) is dict else False + if self.max_length(): + expected_len = int(self.max_length()) + actual_len = self.rom_end - self.rom_start + if actual_len > expected_len: + print(f"Error: {self.name} should end at 0x{self.rom_start + expected_len:X}, but it ends at 0x{self.rom_end:X}\n(hint: add a 'bin' segment after it)") + sys.exit(1) + def should_run(self): return super().should_run() or ( "img" in self.options["modes"] or diff --git a/tools/splat/segtypes/n64/rgba16.py b/tools/splat/segtypes/n64/rgba16.py index 5b8cce901c..d15e1f8d07 100644 --- a/tools/splat/segtypes/n64/rgba16.py +++ b/tools/splat/segtypes/n64/rgba16.py @@ -23,6 +23,13 @@ class N64SegRgba16(N64Segment): self.height = segment[4] self.flip = "noflip" + if self.max_length(): + expected_len = int(self.max_length()) + actual_len = self.rom_end - self.rom_start + if actual_len > expected_len: + print(f"Error: {self.name} should end at 0x{self.rom_start + expected_len:X}, but it ends at 0x{self.rom_end:X}\n(hint: add a 'bin' segment after it)") + sys.exit(1) + @property def flip_vertical(self): return self.flip == "both" or self.flip.startswith("v") or self.flip == "y" diff --git a/tools/splat/segtypes/segment.py b/tools/splat/segtypes/segment.py index 61ebae414f..9d87f6664b 100644 --- a/tools/splat/segtypes/segment.py +++ b/tools/splat/segtypes/segment.py @@ -1,6 +1,7 @@ from pathlib import Path, PurePath from util import log import re +import sys default_subalign = 16 @@ -59,14 +60,9 @@ class Segment: self.warnings = [] self.did_run = False - def check(self): if self.rom_start > self.rom_end: - self.warn(f"out-of-order (starts at 0x{self.rom_start:X}, but next segment starts at 0x{self.rom_end:X})") - elif self.max_length(): - expected_len = int(self.max_length()) - actual_len = self.rom_end - self.rom_start - if actual_len > expected_len: - print(f"should end at 0x{self.rom_start + expected_len:X}, but it ends at 0x{self.rom_end:X}\n(hint: add a 'bin' segment after {self.name})") + print(f"Error: segments out of order - ({self.name} starts at 0x{self.rom_start:X}, but next segment starts at 0x{self.rom_end:X})") + sys.exit(1) @property def size(self): diff --git a/tools/splat/split.py b/tools/splat/split.py index b582a0f66f..115b4cca18 100755 --- a/tools/splat/split.py +++ b/tools/splat/split.py @@ -312,8 +312,6 @@ def main(config_path, out_dir, target_path, modes, verbose, ignore_cache=False): segment.all_symbols = all_symbols segment.symbol_ranges = symbol_ranges - segment.check() - typ = segment.type if segment.type == "bin" and segment.is_name_default(): typ = "unk" diff --git a/ver/jp/asm/nonmatchings/main_1000/func_80025C00.s b/ver/jp/asm/entry_point.s similarity index 90% rename from ver/jp/asm/nonmatchings/main_1000/func_80025C00.s rename to ver/jp/asm/entry_point.s index 2e261df70f..66b551cf98 100644 --- a/ver/jp/asm/nonmatchings/main_1000/func_80025C00.s +++ b/ver/jp/asm/entry_point.s @@ -1,5 +1,11 @@ +.include "macro.inc" + +# assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +.section .text, "ax" glabel func_80025C00 /* 1000 80025C00 3C08800A */ lui $t0, %hi(D_8009A590) diff --git a/ver/jp/asm/nonmatchings/main_1000/func_80025C60.s b/ver/jp/asm/nonmatchings/main_1000/func_80025C60.s deleted file mode 100644 index 80b599e2f5..0000000000 --- a/ver/jp/asm/nonmatchings/main_1000/func_80025C60.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80025C60 -/* 1060 80025C60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1064 80025C64 3C05B3FF */ lui $a1, 0xb3ff -/* 1068 80025C68 34A50014 */ ori $a1, $a1, 0x14 -/* 106C 80025C6C AFB00010 */ sw $s0, 0x10($sp) -/* 1070 80025C70 3C10800A */ lui $s0, %hi(D_8009A618) -/* 1074 80025C74 2610A618 */ addiu $s0, $s0, %lo(D_8009A618) -/* 1078 80025C78 AFBF0014 */ sw $ra, 0x14($sp) -/* 107C 80025C7C 8E040000 */ lw $a0, ($s0) -/* 1080 80025C80 0C01834C */ jal func_80060D30 -/* 1084 80025C84 0000302D */ daddu $a2, $zero, $zero -/* 1088 80025C88 3C05B3FF */ lui $a1, 0xb3ff -/* 108C 80025C8C 34A50004 */ ori $a1, $a1, 4 -/* 1090 80025C90 8E040000 */ lw $a0, ($s0) -/* 1094 80025C94 0C01834C */ jal func_80060D30 -/* 1098 80025C98 0000302D */ daddu $a2, $zero, $zero -/* 109C 80025C9C 3C05B3FF */ lui $a1, 0xb3ff -/* 10A0 80025CA0 3C064953 */ lui $a2, 0x4953 -/* 10A4 80025CA4 8E040000 */ lw $a0, ($s0) -/* 10A8 80025CA8 0C01834C */ jal func_80060D30 -/* 10AC 80025CAC 34C63634 */ ori $a2, $a2, 0x3634 -/* 10B0 80025CB0 8FBF0014 */ lw $ra, 0x14($sp) -/* 10B4 80025CB4 8FB00010 */ lw $s0, 0x10($sp) -/* 10B8 80025CB8 03E00008 */ jr $ra -/* 10BC 80025CBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/jp/asm/nonmatchings/main_1000/func_80025CC0.s b/ver/jp/asm/nonmatchings/main_1000/func_80025CC0.s deleted file mode 100644 index 2facd1c2f0..0000000000 --- a/ver/jp/asm/nonmatchings/main_1000/func_80025CC0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80025CC0 -/* 10C0 80025CC0 AFA40000 */ sw $a0, ($sp) -/* 10C4 80025CC4 AFA50004 */ sw $a1, 4($sp) -/* 10C8 80025CC8 AFA60008 */ sw $a2, 8($sp) -/* 10CC 80025CCC AFA7000C */ sw $a3, 0xc($sp) -/* 10D0 80025CD0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 10D4 80025CD4 0080302D */ daddu $a2, $a0, $zero -/* 10D8 80025CD8 3C048002 */ lui $a0, %hi(func_80025D74) -/* 10DC 80025CDC 24845D74 */ addiu $a0, $a0, %lo(func_80025D74) -/* 10E0 80025CE0 0000282D */ daddu $a1, $zero, $zero -/* 10E4 80025CE4 AFBF0010 */ sw $ra, 0x10($sp) -/* 10E8 80025CE8 0C01929C */ jal func_80064A70 -/* 10EC 80025CEC 27A7001C */ addiu $a3, $sp, 0x1c -/* 10F0 80025CF0 8FBF0010 */ lw $ra, 0x10($sp) -/* 10F4 80025CF4 03E00008 */ jr $ra -/* 10F8 80025CF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/jp/asm/nonmatchings/main_1000/func_80025CFC.s b/ver/jp/asm/nonmatchings/main_1000/func_80025CFC.s deleted file mode 100644 index d826cc4f39..0000000000 --- a/ver/jp/asm/nonmatchings/main_1000/func_80025CFC.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80025CFC -/* 10FC 80025CFC AFA40000 */ sw $a0, ($sp) -/* 1100 80025D00 AFA50004 */ sw $a1, 4($sp) -/* 1104 80025D04 AFA60008 */ sw $a2, 8($sp) -/* 1108 80025D08 AFA7000C */ sw $a3, 0xc($sp) -/* 110C 80025D0C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1110 80025D10 0080302D */ daddu $a2, $a0, $zero -/* 1114 80025D14 3C048002 */ lui $a0, %hi(func_80025D74) -/* 1118 80025D18 24845D74 */ addiu $a0, $a0, %lo(func_80025D74) -/* 111C 80025D1C 0000282D */ daddu $a1, $zero, $zero -/* 1120 80025D20 AFBF0010 */ sw $ra, 0x10($sp) -/* 1124 80025D24 0C01929C */ jal func_80064A70 -/* 1128 80025D28 27A7001C */ addiu $a3, $sp, 0x1c -/* 112C 80025D2C 8FBF0010 */ lw $ra, 0x10($sp) -/* 1130 80025D30 03E00008 */ jr $ra -/* 1134 80025D34 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/jp/asm/nonmatchings/main_1000/func_80025D38.s b/ver/jp/asm/nonmatchings/main_1000/func_80025D38.s deleted file mode 100644 index 7cbbef90a6..0000000000 --- a/ver/jp/asm/nonmatchings/main_1000/func_80025D38.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80025D38 -/* 1138 80025D38 AFA40000 */ sw $a0, ($sp) -/* 113C 80025D3C AFA50004 */ sw $a1, 4($sp) -/* 1140 80025D40 AFA60008 */ sw $a2, 8($sp) -/* 1144 80025D44 AFA7000C */ sw $a3, 0xc($sp) -/* 1148 80025D48 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 114C 80025D4C 0080302D */ daddu $a2, $a0, $zero -/* 1150 80025D50 3C048002 */ lui $a0, %hi(func_80025D74) -/* 1154 80025D54 24845D74 */ addiu $a0, $a0, %lo(func_80025D74) -/* 1158 80025D58 0000282D */ daddu $a1, $zero, $zero -/* 115C 80025D5C AFBF0010 */ sw $ra, 0x10($sp) -/* 1160 80025D60 0C01929C */ jal func_80064A70 -/* 1164 80025D64 27A7001C */ addiu $a3, $sp, 0x1c -/* 1168 80025D68 8FBF0010 */ lw $ra, 0x10($sp) -/* 116C 80025D6C 03E00008 */ jr $ra -/* 1170 80025D70 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/jp/asm/nonmatchings/main_1000/func_80025D74.s b/ver/jp/asm/nonmatchings/main_1000/func_80025D74.s deleted file mode 100644 index f5b13be2db..0000000000 --- a/ver/jp/asm/nonmatchings/main_1000/func_80025D74.s +++ /dev/null @@ -1,126 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80025D74 -/* 1174 80025D74 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 1178 80025D78 AFB30024 */ sw $s3, 0x24($sp) -/* 117C 80025D7C 00A0982D */ daddu $s3, $a1, $zero -/* 1180 80025D80 AFB40028 */ sw $s4, 0x28($sp) -/* 1184 80025D84 00C0A02D */ daddu $s4, $a2, $zero -/* 1188 80025D88 3C05B3FF */ lui $a1, 0xb3ff -/* 118C 80025D8C AFB1001C */ sw $s1, 0x1c($sp) -/* 1190 80025D90 3C11800A */ lui $s1, %hi(D_8009A618) -/* 1194 80025D94 2631A618 */ addiu $s1, $s1, %lo(D_8009A618) -/* 1198 80025D98 AFB00018 */ sw $s0, 0x18($sp) -/* 119C 80025D9C 27B00010 */ addiu $s0, $sp, 0x10 -/* 11A0 80025DA0 AFBF003C */ sw $ra, 0x3c($sp) -/* 11A4 80025DA4 AFBE0038 */ sw $fp, 0x38($sp) -/* 11A8 80025DA8 AFB70034 */ sw $s7, 0x34($sp) -/* 11AC 80025DAC AFB60030 */ sw $s6, 0x30($sp) -/* 11B0 80025DB0 AFB5002C */ sw $s5, 0x2c($sp) -/* 11B4 80025DB4 AFB20020 */ sw $s2, 0x20($sp) -/* 11B8 80025DB8 8E240000 */ lw $a0, ($s1) -/* 11BC 80025DBC 0C018364 */ jal func_80060D90 -/* 11C0 80025DC0 0200302D */ daddu $a2, $s0, $zero -/* 11C4 80025DC4 3C034953 */ lui $v1, 0x4953 -/* 11C8 80025DC8 8FA20010 */ lw $v0, 0x10($sp) -/* 11CC 80025DCC 34633634 */ ori $v1, $v1, 0x3634 -/* 11D0 80025DD0 14430050 */ bne $v0, $v1, .L80025F14 -/* 11D4 80025DD4 24020001 */ addiu $v0, $zero, 1 -/* 11D8 80025DD8 3C05B3FF */ lui $a1, 0xb3ff -/* 11DC 80025DDC 34A50004 */ ori $a1, $a1, 4 -/* 11E0 80025DE0 8E240000 */ lw $a0, ($s1) -/* 11E4 80025DE4 0C018364 */ jal func_80060D90 -/* 11E8 80025DE8 0200302D */ daddu $a2, $s0, $zero -/* 11EC 80025DEC 3C05B3FF */ lui $a1, 0xb3ff -/* 11F0 80025DF0 0200302D */ daddu $a2, $s0, $zero -/* 11F4 80025DF4 8E240000 */ lw $a0, ($s1) -/* 11F8 80025DF8 8FB00010 */ lw $s0, 0x10($sp) -/* 11FC 80025DFC 0C018364 */ jal func_80060D90 -/* 1200 80025E00 34A50014 */ ori $a1, $a1, 0x14 -/* 1204 80025E04 8FB20010 */ lw $s2, 0x10($sp) -/* 1208 80025E08 3402FFDF */ ori $v0, $zero, 0xffdf -/* 120C 80025E0C 02541821 */ addu $v1, $s2, $s4 -/* 1210 80025E10 0043102A */ slt $v0, $v0, $v1 -/* 1214 80025E14 1040000B */ beqz $v0, .L80025E44 -/* 1218 80025E18 3C02FFFF */ lui $v0, 0xffff -/* 121C 80025E1C 34420020 */ ori $v0, $v0, 0x20 -/* 1220 80025E20 00621821 */ addu $v1, $v1, $v0 -/* 1224 80025E24 0203102A */ slt $v0, $s0, $v1 -/* 1228 80025E28 1440003A */ bnez $v0, .L80025F14 -/* 122C 80025E2C 24020001 */ addiu $v0, $zero, 1 -/* 1230 80025E30 0250102A */ slt $v0, $s2, $s0 -/* 1234 80025E34 10400008 */ beqz $v0, .L80025E58 -/* 1238 80025E38 24020001 */ addiu $v0, $zero, 1 -/* 123C 80025E3C 080097C5 */ j .L80025F14 -/* 1240 80025E40 00000000 */ nop -.L80025E44: -/* 1244 80025E44 0250102A */ slt $v0, $s2, $s0 -/* 1248 80025E48 10400003 */ beqz $v0, .L80025E58 -/* 124C 80025E4C 0203102A */ slt $v0, $s0, $v1 -/* 1250 80025E50 14400030 */ bnez $v0, .L80025F14 -/* 1254 80025E54 24020001 */ addiu $v0, $zero, 1 -.L80025E58: -/* 1258 80025E58 12800027 */ beqz $s4, .L80025EF8 -/* 125C 80025E5C 3C1E0FFF */ lui $fp, 0xfff -/* 1260 80025E60 37DEFFFC */ ori $fp, $fp, 0xfffc -/* 1264 80025E64 3C17B3FF */ lui $s7, 0xb3ff -/* 1268 80025E68 36F70020 */ ori $s7, $s7, 0x20 -/* 126C 80025E6C 3C15800A */ lui $s5, %hi(D_8009A618) -/* 1270 80025E70 26B5A618 */ addiu $s5, $s5, %lo(D_8009A618) -/* 1274 80025E74 3C16FFFF */ lui $s6, 0xffff -/* 1278 80025E78 36D60020 */ ori $s6, $s6, 0x20 -.L80025E7C: -/* 127C 80025E7C 92620000 */ lbu $v0, ($s3) -/* 1280 80025E80 1040001A */ beqz $v0, .L80025EEC -/* 1284 80025E84 025E8824 */ and $s1, $s2, $fp -/* 1288 80025E88 02378821 */ addu $s1, $s1, $s7 -/* 128C 80025E8C 0220282D */ daddu $a1, $s1, $zero -/* 1290 80025E90 27A60010 */ addiu $a2, $sp, 0x10 -/* 1294 80025E94 32500003 */ andi $s0, $s2, 3 -/* 1298 80025E98 26520001 */ addiu $s2, $s2, 1 -/* 129C 80025E9C 24070003 */ addiu $a3, $zero, 3 -/* 12A0 80025EA0 00F08023 */ subu $s0, $a3, $s0 -/* 12A4 80025EA4 8EA40000 */ lw $a0, ($s5) -/* 12A8 80025EA8 0C018364 */ jal func_80060D90 -/* 12AC 80025EAC 00F08004 */ sllv $s0, $s0, $a3 -/* 12B0 80025EB0 0220282D */ daddu $a1, $s1, $zero -/* 12B4 80025EB4 240700FF */ addiu $a3, $zero, 0xff -/* 12B8 80025EB8 02071004 */ sllv $v0, $a3, $s0 -/* 12BC 80025EBC 00021027 */ nor $v0, $zero, $v0 -/* 12C0 80025EC0 8EA40000 */ lw $a0, ($s5) -/* 12C4 80025EC4 8FA30010 */ lw $v1, 0x10($sp) -/* 12C8 80025EC8 92660000 */ lbu $a2, ($s3) -/* 12CC 80025ECC 00621824 */ and $v1, $v1, $v0 -/* 12D0 80025ED0 02063004 */ sllv $a2, $a2, $s0 -/* 12D4 80025ED4 0C01834C */ jal func_80060D30 -/* 12D8 80025ED8 00663025 */ or $a2, $v1, $a2 -/* 12DC 80025EDC 3407FFDF */ ori $a3, $zero, 0xffdf -/* 12E0 80025EE0 00F2102A */ slt $v0, $a3, $s2 -/* 12E4 80025EE4 54400001 */ bnel $v0, $zero, .L80025EEC -/* 12E8 80025EE8 02569021 */ addu $s2, $s2, $s6 -.L80025EEC: -/* 12EC 80025EEC 2694FFFF */ addiu $s4, $s4, -1 -/* 12F0 80025EF0 1680FFE2 */ bnez $s4, .L80025E7C -/* 12F4 80025EF4 26730001 */ addiu $s3, $s3, 1 -.L80025EF8: -/* 12F8 80025EF8 3C04800A */ lui $a0, %hi(D_8009A618) -/* 12FC 80025EFC 8C84A618 */ lw $a0, %lo(D_8009A618)($a0) -/* 1300 80025F00 3C05B3FF */ lui $a1, 0xb3ff -/* 1304 80025F04 34A50014 */ ori $a1, $a1, 0x14 -/* 1308 80025F08 0C01834C */ jal func_80060D30 -/* 130C 80025F0C 0240302D */ daddu $a2, $s2, $zero -/* 1310 80025F10 24020001 */ addiu $v0, $zero, 1 -.L80025F14: -/* 1314 80025F14 8FBF003C */ lw $ra, 0x3c($sp) -/* 1318 80025F18 8FBE0038 */ lw $fp, 0x38($sp) -/* 131C 80025F1C 8FB70034 */ lw $s7, 0x34($sp) -/* 1320 80025F20 8FB60030 */ lw $s6, 0x30($sp) -/* 1324 80025F24 8FB5002C */ lw $s5, 0x2c($sp) -/* 1328 80025F28 8FB40028 */ lw $s4, 0x28($sp) -/* 132C 80025F2C 8FB30024 */ lw $s3, 0x24($sp) -/* 1330 80025F30 8FB20020 */ lw $s2, 0x20($sp) -/* 1334 80025F34 8FB1001C */ lw $s1, 0x1c($sp) -/* 1338 80025F38 8FB00018 */ lw $s0, 0x18($sp) -/* 133C 80025F3C 03E00008 */ jr $ra -/* 1340 80025F40 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/jp/asm/nonmatchings/main_1000/func_800266E8.s b/ver/jp/asm/nonmatchings/main_1000/func_800266E8.s deleted file mode 100644 index e774adbb66..0000000000 --- a/ver/jp/asm/nonmatchings/main_1000/func_800266E8.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800266E8 -/* 1AE8 800266E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1AEC 800266EC 24020001 */ addiu $v0, $zero, 1 -/* 1AF0 800266F0 AFBF0010 */ sw $ra, 0x10($sp) -/* 1AF4 800266F4 3C018007 */ lui $at, %hi(D_80073DE0) -/* 1AF8 800266F8 AC223DE0 */ sw $v0, %lo(D_80073DE0)($at) -/* 1AFC 800266FC 0C017F54 */ jal func_8005FD50 -/* 1B00 80026700 00000000 */ nop -/* 1B04 80026704 8FBF0010 */ lw $ra, 0x10($sp) -/* 1B08 80026708 03E00008 */ jr $ra -/* 1B0C 8002670C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/jp/asm/nonmatchings/main_1000/func_80026148.s b/ver/jp/asm/nonmatchings/main_1060/func_80026148.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1000/func_80026148.s rename to ver/jp/asm/nonmatchings/main_1060/func_80026148.s diff --git a/ver/jp/asm/nonmatchings/main_1000/func_80026710.s b/ver/jp/asm/nonmatchings/main_1060/func_80026710.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1000/func_80026710.s rename to ver/jp/asm/nonmatchings/main_1060/func_80026710.s diff --git a/ver/jp/asm/nonmatchings/main_1000/func_800269C0.s b/ver/jp/asm/nonmatchings/main_1060/func_800269C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1000/func_800269C0.s rename to ver/jp/asm/nonmatchings/main_1060/func_800269C0.s diff --git a/ver/jp/asm/nonmatchings/main_1000/func_80026AD4.s b/ver/jp/asm/nonmatchings/main_1060/func_80026AD4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1000/func_80026AD4.s rename to ver/jp/asm/nonmatchings/main_1060/func_80026AD4.s diff --git a/ver/jp/asm/nonmatchings/main_1000/func_80026DA8.s b/ver/jp/asm/nonmatchings/main_1060/func_80026DA8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1000/func_80026DA8.s rename to ver/jp/asm/nonmatchings/main_1060/func_80026DA8.s diff --git a/ver/jp/asm/nonmatchings/main_1000/func_80027054.s b/ver/jp/asm/nonmatchings/main_1060/func_80027054.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1000/func_80027054.s rename to ver/jp/asm/nonmatchings/main_1060/func_80027054.s diff --git a/ver/jp/asm/nonmatchings/main_1000/func_8002715C.s b/ver/jp/asm/nonmatchings/main_1060/func_8002715C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1000/func_8002715C.s rename to ver/jp/asm/nonmatchings/main_1060/func_8002715C.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_80035DFC.s b/ver/jp/asm/nonmatchings/main_10E70/func_80035DFC.s index f29ea8ebe1..3b9ca368a9 100644 --- a/ver/jp/asm/nonmatchings/main_10E70/func_80035DFC.s +++ b/ver/jp/asm/nonmatchings/main_10E70/func_80035DFC.s @@ -41,7 +41,7 @@ glabel func_80035DFC /* 1128C 80035E8C 2463A630 */ addiu $v1, $v1, %lo(D_8009A630) /* 11290 80035E90 8C620000 */ lw $v0, ($v1) /* 11294 80035E94 34420008 */ ori $v0, $v0, 8 -/* 11298 80035E98 0C017F54 */ jal func_8005FD50 +/* 11298 80035E98 0C017F54 */ jal nuContRmbForceStop /* 1129C 80035E9C AC620000 */ sw $v0, ($v1) /* 112A0 80035EA0 3C04800A */ lui $a0, %hi(D_8009E754) /* 112A4 80035EA4 2484E754 */ addiu $a0, $a0, %lo(D_8009E754) diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_800360EC.s b/ver/jp/asm/nonmatchings/main_10E70/func_800360EC.s index 382a52e2b8..82c05a2b63 100644 --- a/ver/jp/asm/nonmatchings/main_10E70/func_800360EC.s +++ b/ver/jp/asm/nonmatchings/main_10E70/func_800360EC.s @@ -31,7 +31,7 @@ glabel func_800360EC /* 1154C 8003614C 2463A630 */ addiu $v1, $v1, %lo(D_8009A630) /* 11550 80036150 8C620000 */ lw $v0, ($v1) /* 11554 80036154 34420008 */ ori $v0, $v0, 8 -/* 11558 80036158 0C017F54 */ jal func_8005FD50 +/* 11558 80036158 0C017F54 */ jal nuContRmbForceStop /* 1155C 8003615C AC620000 */ sw $v0, ($v1) /* 11560 80036160 96020000 */ lhu $v0, ($s0) /* 11564 80036164 24030004 */ addiu $v1, $zero, 4 diff --git a/ver/jp/asm/nonmatchings/main_1000/func_80025F44.s b/ver/jp/asm/nonmatchings/main_1370/func_80025F70.s similarity index 89% rename from ver/jp/asm/nonmatchings/main_1000/func_80025F44.s rename to ver/jp/asm/nonmatchings/main_1370/func_80025F70.s index c235665ea5..5f6b0001cc 100644 --- a/ver/jp/asm/nonmatchings/main_1000/func_80025F44.s +++ b/ver/jp/asm/nonmatchings/main_1370/func_80025F70.s @@ -1,19 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80025F44 -/* 1344 80025F44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1348 80025F48 AFBF0010 */ sw $ra, 0x10($sp) -/* 134C 80025F4C 0080382D */ daddu $a3, $a0, $zero -/* 1350 80025F50 3C048009 */ lui $a0, %hi(D_80097D10) -/* 1354 80025F54 24847D10 */ addiu $a0, $a0, %lo(D_80097D10) -/* 1358 80025F58 0C00973F */ jal func_80025CFC -/* 135C 80025F5C 00000000 */ nop -.L80025F60: -/* 1360 80025F60 080097D8 */ j .L80025F60 -/* 1364 80025F64 00000000 */ nop -/* 1368 80025F68 00000000 */ nop -/* 136C 80025F6C 00000000 */ nop +glabel func_80025F70 /* 1370 80025F70 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 1374 80025F74 3C038000 */ lui $v1, %hi(D_80000300) /* 1378 80025F78 8C630300 */ lw $v1, %lo(D_80000300)($v1) @@ -54,8 +42,8 @@ glabel func_80025F44 /* 13FC 80025FFC 24846040 */ addiu $a0, $a0, %lo(D_80026040) /* 1400 80026000 0C017BC0 */ jal func_8005EF00 /* 1404 80026004 00000000 */ nop -/* 1408 80026008 3C048002 */ lui $a0, %hi(func_800266E8) -/* 140C 8002600C 248466E8 */ addiu $a0, $a0, %lo(func_800266E8) +/* 1408 80026008 3C048002 */ lui $a0, %hi(gfxPreNMI_Callback) +/* 140C 8002600C 248466E8 */ addiu $a0, $a0, %lo(gfxPreNMI_Callback) /* 1410 80026010 0C017BD0 */ jal func_8005EF40 /* 1414 80026014 00000000 */ nop /* 1418 80026018 0C019674 */ jal func_800659D0 diff --git a/ver/jp/asm/nonmatchings/main_1370/func_80026148.s b/ver/jp/asm/nonmatchings/main_1370/func_80026148.s new file mode 100644 index 0000000000..aa1979e3c0 --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1370/func_80026148.s @@ -0,0 +1,368 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80026148 +/* 1548 80026148 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 154C 8002614C 3C038007 */ lui $v1, %hi(D_800741D4) +/* 1550 80026150 8C6341D4 */ lw $v1, %lo(D_800741D4)($v1) +/* 1554 80026154 3C048016 */ lui $a0, %hi(D_80164000) +/* 1558 80026158 24844000 */ addiu $a0, $a0, %lo(D_80164000) +/* 155C 8002615C AFB20020 */ sw $s2, 0x20($sp) +/* 1560 80026160 3C12800A */ lui $s2, %hi(D_8009A64C) +/* 1564 80026164 2652A64C */ addiu $s2, $s2, %lo(D_8009A64C) +/* 1568 80026168 AFBF003C */ sw $ra, 0x3c($sp) +/* 156C 8002616C AFBE0038 */ sw $fp, 0x38($sp) +/* 1570 80026170 AFB70034 */ sw $s7, 0x34($sp) +/* 1574 80026174 AFB60030 */ sw $s6, 0x30($sp) +/* 1578 80026178 AFB5002C */ sw $s5, 0x2c($sp) +/* 157C 8002617C AFB40028 */ sw $s4, 0x28($sp) +/* 1580 80026180 AFB30024 */ sw $s3, 0x24($sp) +/* 1584 80026184 AFB1001C */ sw $s1, 0x1c($sp) +/* 1588 80026188 AFB00018 */ sw $s0, 0x18($sp) +/* 158C 8002618C 3C018007 */ lui $at, %hi(D_800741D0) +/* 1590 80026190 A42041D0 */ sh $zero, %lo(D_800741D0)($at) +/* 1594 80026194 00031040 */ sll $v0, $v1, 1 +/* 1598 80026198 00431021 */ addu $v0, $v0, $v1 +/* 159C 8002619C 00021940 */ sll $v1, $v0, 5 +/* 15A0 800261A0 00431021 */ addu $v0, $v0, $v1 +/* 15A4 800261A4 00021980 */ sll $v1, $v0, 6 +/* 15A8 800261A8 00431021 */ addu $v0, $v0, $v1 +/* 15AC 800261AC 00021100 */ sll $v0, $v0, 4 +/* 15B0 800261B0 00441021 */ addu $v0, $v0, $a0 +/* 15B4 800261B4 3C01800A */ lui $at, %hi(D_8009A654) +/* 15B8 800261B8 AC22A654 */ sw $v0, %lo(D_8009A654)($at) +/* 15BC 800261BC 24420230 */ addiu $v0, $v0, 0x230 +/* 15C0 800261C0 AE420000 */ sw $v0, ($s2) +/* 15C4 800261C4 3C118007 */ lui $s1, %hi(D_80073DE4) +/* 15C8 800261C8 8E313DE4 */ lw $s1, %lo(D_80073DE4)($s1) +/* 15CC 800261CC 0C009C5C */ jal func_80027170 +/* 15D0 800261D0 3C13070F */ lui $s3, 0x70f +/* 15D4 800261D4 3C06FF10 */ lui $a2, 0xff10 +/* 15D8 800261D8 34C6013F */ ori $a2, $a2, 0x13f +/* 15DC 800261DC 3C02FE00 */ lui $v0, 0xfe00 +/* 15E0 800261E0 8E500000 */ lw $s0, ($s2) +/* 15E4 800261E4 3C038000 */ lui $v1, 0x8000 +/* 15E8 800261E8 0200282D */ daddu $a1, $s0, $zero +/* 15EC 800261EC 26100008 */ addiu $s0, $s0, 8 +/* 15F0 800261F0 AE500000 */ sw $s0, ($s2) +/* 15F4 800261F4 ACA20000 */ sw $v0, ($a1) +/* 15F8 800261F8 3C02800A */ lui $v0, %hi(D_8009A5BC) +/* 15FC 800261FC 8C42A5BC */ lw $v0, %lo(D_8009A5BC)($v0) +/* 1600 80026200 0220202D */ daddu $a0, $s1, $zero +/* 1604 80026204 00431021 */ addu $v0, $v0, $v1 +/* 1608 80026208 ACA20004 */ sw $v0, 4($a1) +/* 160C 8002620C 26020008 */ addiu $v0, $s0, 8 +/* 1610 80026210 AE420000 */ sw $v0, ($s2) +/* 1614 80026214 0C018798 */ jal func_80061E60 +/* 1618 80026218 AE060000 */ sw $a2, ($s0) +/* 161C 8002621C 3C050050 */ lui $a1, 0x50 +/* 1620 80026220 34A503C0 */ ori $a1, $a1, 0x3c0 +/* 1624 80026224 3C06D700 */ lui $a2, 0xd700 +/* 1628 80026228 34C60002 */ ori $a2, $a2, 2 +/* 162C 8002622C 3C07E300 */ lui $a3, 0xe300 +/* 1630 80026230 34E70A01 */ ori $a3, $a3, 0xa01 +/* 1634 80026234 3C08E300 */ lui $t0, 0xe300 +/* 1638 80026238 35080C00 */ ori $t0, $t0, 0xc00 +/* 163C 8002623C 3C09E300 */ lui $t1, 0xe300 +/* 1640 80026240 35291001 */ ori $t1, $t1, 0x1001 +/* 1644 80026244 3C0BE200 */ lui $t3, 0xe200 +/* 1648 80026248 356B001C */ ori $t3, $t3, 0x1c +/* 164C 8002624C 3C0A0F0A */ lui $t2, 0xf0a +/* 1650 80026250 354A4000 */ ori $t2, $t2, 0x4000 +/* 1654 80026254 3C0CE300 */ lui $t4, 0xe300 +/* 1658 80026258 358C1201 */ ori $t4, $t4, 0x1201 +/* 165C 8002625C 3C0DFCFF */ lui $t5, 0xfcff +/* 1660 80026260 35ADFFFF */ ori $t5, $t5, 0xffff +/* 1664 80026264 3C0EE200 */ lui $t6, 0xe200 +/* 1668 80026268 35CE1E01 */ ori $t6, $t6, 0x1e01 +/* 166C 8002626C 3C0FFD88 */ lui $t7, 0xfd88 +/* 1670 80026270 35EF003F */ ori $t7, $t7, 0x3f +/* 1674 80026274 3C11F588 */ lui $s1, 0xf588 +/* 1678 80026278 36311000 */ ori $s1, $s1, 0x1000 +/* 167C 8002627C 3673E01C */ ori $s3, $s3, 0xe01c +/* 1680 80026280 3C14F580 */ lui $s4, 0xf580 +/* 1684 80026284 36941000 */ ori $s4, $s4, 0x1000 +/* 1688 80026288 3C15001F */ lui $s5, 0x1f +/* 168C 8002628C 36B5C01C */ ori $s5, $s5, 0xc01c +/* 1690 80026290 0000B02D */ daddu $s6, $zero, $zero +/* 1694 80026294 3C17E400 */ lui $s7, 0xe400 +/* 1698 80026298 3C19E100 */ lui $t9, 0xe100 +/* 169C 8002629C 3C18F100 */ lui $t8, 0xf100 +/* 16A0 800262A0 8E430000 */ lw $v1, ($s2) +/* 16A4 800262A4 241E0098 */ addiu $fp, $zero, 0x98 +/* 16A8 800262A8 AE020004 */ sw $v0, 4($s0) +/* 16AC 800262AC 3C02ED00 */ lui $v0, 0xed00 +/* 16B0 800262B0 0060202D */ daddu $a0, $v1, $zero +/* 16B4 800262B4 24630008 */ addiu $v1, $v1, 8 +/* 16B8 800262B8 AE430000 */ sw $v1, ($s2) +/* 16BC 800262BC AC820000 */ sw $v0, ($a0) +/* 16C0 800262C0 24620008 */ addiu $v0, $v1, 8 +/* 16C4 800262C4 AC850004 */ sw $a1, 4($a0) +/* 16C8 800262C8 AE420000 */ sw $v0, ($s2) +/* 16CC 800262CC 2402FFFF */ addiu $v0, $zero, -1 +/* 16D0 800262D0 AC620004 */ sw $v0, 4($v1) +/* 16D4 800262D4 24620010 */ addiu $v0, $v1, 0x10 +/* 16D8 800262D8 AC660000 */ sw $a2, ($v1) +/* 16DC 800262DC AE420000 */ sw $v0, ($s2) +/* 16E0 800262E0 24620018 */ addiu $v0, $v1, 0x18 +/* 16E4 800262E4 AC670008 */ sw $a3, 8($v1) +/* 16E8 800262E8 AC60000C */ sw $zero, 0xc($v1) +/* 16EC 800262EC AE420000 */ sw $v0, ($s2) +/* 16F0 800262F0 24620020 */ addiu $v0, $v1, 0x20 +/* 16F4 800262F4 AC680010 */ sw $t0, 0x10($v1) +/* 16F8 800262F8 AC600014 */ sw $zero, 0x14($v1) +/* 16FC 800262FC AE420000 */ sw $v0, ($s2) +/* 1700 80026300 24620028 */ addiu $v0, $v1, 0x28 +/* 1704 80026304 AC690018 */ sw $t1, 0x18($v1) +/* 1708 80026308 AC60001C */ sw $zero, 0x1c($v1) +/* 170C 8002630C AE420000 */ sw $v0, ($s2) +/* 1710 80026310 24620030 */ addiu $v0, $v1, 0x30 +/* 1714 80026314 AC6B0020 */ sw $t3, 0x20($v1) +/* 1718 80026318 AC6A0024 */ sw $t2, 0x24($v1) +/* 171C 8002631C AE420000 */ sw $v0, ($s2) +/* 1720 80026320 24620038 */ addiu $v0, $v1, 0x38 +/* 1724 80026324 AC6C0028 */ sw $t4, 0x28($v1) +/* 1728 80026328 AC60002C */ sw $zero, 0x2c($v1) +/* 172C 8002632C AE420000 */ sw $v0, ($s2) +/* 1730 80026330 2402F3F9 */ addiu $v0, $zero, -0xc07 +/* 1734 80026334 AC620034 */ sw $v0, 0x34($v1) +/* 1738 80026338 24620040 */ addiu $v0, $v1, 0x40 +/* 173C 8002633C AC6D0030 */ sw $t5, 0x30($v1) +/* 1740 80026340 AE420000 */ sw $v0, ($s2) +/* 1744 80026344 24020001 */ addiu $v0, $zero, 1 +/* 1748 80026348 AC62003C */ sw $v0, 0x3c($v1) +/* 174C 8002634C 24620048 */ addiu $v0, $v1, 0x48 +/* 1750 80026350 AC6E0038 */ sw $t6, 0x38($v1) +/* 1754 80026354 AE420000 */ sw $v0, ($s2) +/* 1758 80026358 3C02F900 */ lui $v0, 0xf900 +/* 175C 8002635C AC620040 */ sw $v0, 0x40($v1) +/* 1760 80026360 2402007F */ addiu $v0, $zero, 0x7f +/* 1764 80026364 AC620044 */ sw $v0, 0x44($v1) +/* 1768 80026368 24620050 */ addiu $v0, $v1, 0x50 +/* 176C 8002636C AE420000 */ sw $v0, ($s2) +/* 1770 80026370 3C028007 */ lui $v0, %hi(D_80073DF0) +/* 1774 80026374 24423DF0 */ addiu $v0, $v0, %lo(D_80073DF0) +/* 1778 80026378 AC6F0048 */ sw $t7, 0x48($v1) +/* 177C 8002637C AC62004C */ sw $v0, 0x4c($v1) +/* 1780 80026380 24620058 */ addiu $v0, $v1, 0x58 +/* 1784 80026384 AE420000 */ sw $v0, ($s2) +/* 1788 80026388 3C020700 */ lui $v0, 0x700 +/* 178C 8002638C AC620054 */ sw $v0, 0x54($v1) +/* 1790 80026390 24620060 */ addiu $v0, $v1, 0x60 +/* 1794 80026394 AC710050 */ sw $s1, 0x50($v1) +/* 1798 80026398 AE420000 */ sw $v0, ($s2) +/* 179C 8002639C 3C02E600 */ lui $v0, 0xe600 +/* 17A0 800263A0 AC620058 */ sw $v0, 0x58($v1) +/* 17A4 800263A4 24620068 */ addiu $v0, $v1, 0x68 +/* 17A8 800263A8 AC60005C */ sw $zero, 0x5c($v1) +/* 17AC 800263AC AE420000 */ sw $v0, ($s2) +/* 17B0 800263B0 3C02F400 */ lui $v0, 0xf400 +/* 17B4 800263B4 AC620060 */ sw $v0, 0x60($v1) +/* 17B8 800263B8 24620070 */ addiu $v0, $v1, 0x70 +/* 17BC 800263BC AC730064 */ sw $s3, 0x64($v1) +/* 17C0 800263C0 AE420000 */ sw $v0, ($s2) +/* 17C4 800263C4 3C02E700 */ lui $v0, 0xe700 +/* 17C8 800263C8 AC620068 */ sw $v0, 0x68($v1) +/* 17CC 800263CC 24620078 */ addiu $v0, $v1, 0x78 +/* 17D0 800263D0 AC60006C */ sw $zero, 0x6c($v1) +/* 17D4 800263D4 AE420000 */ sw $v0, ($s2) +/* 17D8 800263D8 24620080 */ addiu $v0, $v1, 0x80 +/* 17DC 800263DC AC740070 */ sw $s4, 0x70($v1) +/* 17E0 800263E0 AC600074 */ sw $zero, 0x74($v1) +/* 17E4 800263E4 AE420000 */ sw $v0, ($s2) +/* 17E8 800263E8 3C02F200 */ lui $v0, 0xf200 +/* 17EC 800263EC AC620078 */ sw $v0, 0x78($v1) +/* 17F0 800263F0 AC75007C */ sw $s5, 0x7c($v1) +/* 17F4 800263F4 0000702D */ daddu $t6, $zero, $zero +.L800263F8: +/* 17F8 800263F8 00161C00 */ sll $v1, $s6, 0x10 +/* 17FC 800263FC 00031C03 */ sra $v1, $v1, 0x10 +/* 1800 80026400 2474000E */ addiu $s4, $v1, 0xe +/* 1804 80026404 000318C0 */ sll $v1, $v1, 3 +/* 1808 80026408 246200A8 */ addiu $v0, $v1, 0xa8 +/* 180C 8002640C 00021080 */ sll $v0, $v0, 2 +/* 1810 80026410 30420FFF */ andi $v0, $v0, 0xfff +/* 1814 80026414 00029B00 */ sll $s3, $v0, 0xc +/* 1818 80026418 246200A0 */ addiu $v0, $v1, 0xa0 +/* 181C 8002641C 00021080 */ sll $v0, $v0, 2 +/* 1820 80026420 30420FFF */ andi $v0, $v0, 0xfff +/* 1824 80026424 00028B00 */ sll $s1, $v0, 0xc +/* 1828 80026428 241500A0 */ addiu $s5, $zero, 0xa0 +/* 182C 8002642C 02A31023 */ subu $v0, $s5, $v1 +/* 1830 80026430 00021080 */ sll $v0, $v0, 2 +/* 1834 80026434 30420FFF */ andi $v0, $v0, 0xfff +/* 1838 80026438 00028300 */ sll $s0, $v0, 0xc +/* 183C 8002643C 03C31823 */ subu $v1, $fp, $v1 +/* 1840 80026440 00031880 */ sll $v1, $v1, 2 +/* 1844 80026444 30630FFF */ andi $v1, $v1, 0xfff +/* 1848 80026448 00037B00 */ sll $t7, $v1, 0xc +/* 184C 8002644C 000E1400 */ sll $v0, $t6, 0x10 +.L80026450: +/* 1850 80026450 00023C03 */ sra $a3, $v0, 0x10 +/* 1854 80026454 02871823 */ subu $v1, $s4, $a3 +/* 1858 80026458 24020021 */ addiu $v0, $zero, 0x21 +/* 185C 8002645C 00431023 */ subu $v0, $v0, $v1 +/* 1860 80026460 00021FC2 */ srl $v1, $v0, 0x1f +/* 1864 80026464 00431021 */ addu $v0, $v0, $v1 +/* 1868 80026468 3C038007 */ lui $v1, %hi(D_80073FF0) +/* 186C 8002646C 94633FF0 */ lhu $v1, %lo(D_80073FF0)($v1) +/* 1870 80026470 00021043 */ sra $v0, $v0, 1 +/* 1874 80026474 2463FFF1 */ addiu $v1, $v1, -0xf +/* 1878 80026478 00431023 */ subu $v0, $v0, $v1 +/* 187C 8002647C 00021400 */ sll $v0, $v0, 0x10 +/* 1880 80026480 00026C03 */ sra $t5, $v0, 0x10 +/* 1884 80026484 29A20010 */ slti $v0, $t5, 0x10 +/* 1888 80026488 1040005C */ beqz $v0, .L800265FC +/* 188C 8002648C 25C20001 */ addiu $v0, $t6, 1 +/* 1890 80026490 05A2005B */ bltzl $t5, .L80026600 +/* 1894 80026494 0040702D */ daddu $t6, $v0, $zero +/* 1898 80026498 3C060400 */ lui $a2, 0x400 +/* 189C 8002649C 34C60400 */ ori $a2, $a2, 0x400 +/* 18A0 800264A0 3C0A0400 */ lui $t2, 0x400 +/* 18A4 800264A4 354AFC00 */ ori $t2, $t2, 0xfc00 +/* 18A8 800264A8 3C0BFC00 */ lui $t3, 0xfc00 +/* 18AC 800264AC 356B0400 */ ori $t3, $t3, 0x400 +/* 18B0 800264B0 3C0CFC00 */ lui $t4, 0xfc00 +/* 18B4 800264B4 358CFC00 */ ori $t4, $t4, 0xfc00 +/* 18B8 800264B8 000748C0 */ sll $t1, $a3, 3 +/* 18BC 800264BC 25240008 */ addiu $a0, $t1, 8 +/* 18C0 800264C0 00042080 */ sll $a0, $a0, 2 +/* 18C4 800264C4 30840FFF */ andi $a0, $a0, 0xfff +/* 18C8 800264C8 00972025 */ or $a0, $a0, $s7 +/* 18CC 800264CC 02641025 */ or $v0, $s3, $a0 +/* 18D0 800264D0 00073940 */ sll $a3, $a3, 5 +/* 18D4 800264D4 30E70FFF */ andi $a3, $a3, 0xfff +/* 18D8 800264D8 000D4600 */ sll $t0, $t5, 0x18 +/* 18DC 800264DC 8E430000 */ lw $v1, ($s2) +/* 18E0 800264E0 02042025 */ or $a0, $s0, $a0 +/* 18E4 800264E4 0060282D */ daddu $a1, $v1, $zero +/* 18E8 800264E8 24630008 */ addiu $v1, $v1, 8 +/* 18EC 800264EC AE430000 */ sw $v1, ($s2) +/* 18F0 800264F0 ACA20000 */ sw $v0, ($a1) +/* 18F4 800264F4 02271025 */ or $v0, $s1, $a3 +/* 18F8 800264F8 ACA20004 */ sw $v0, 4($a1) +/* 18FC 800264FC 24620008 */ addiu $v0, $v1, 8 +/* 1900 80026500 AE420000 */ sw $v0, ($s2) +/* 1904 80026504 24620010 */ addiu $v0, $v1, 0x10 +/* 1908 80026508 AC790000 */ sw $t9, ($v1) +/* 190C 8002650C AC680004 */ sw $t0, 4($v1) +/* 1910 80026510 AE420000 */ sw $v0, ($s2) +/* 1914 80026514 24620018 */ addiu $v0, $v1, 0x18 +/* 1918 80026518 240500F0 */ addiu $a1, $zero, 0xf0 +/* 191C 8002651C 00A92823 */ subu $a1, $a1, $t1 +/* 1920 80026520 00052880 */ sll $a1, $a1, 2 +/* 1924 80026524 30A50FFF */ andi $a1, $a1, 0xfff +/* 1928 80026528 00B72825 */ or $a1, $a1, $s7 +/* 192C 8002652C AC780008 */ sw $t8, 8($v1) +/* 1930 80026530 AC66000C */ sw $a2, 0xc($v1) +/* 1934 80026534 AE420000 */ sw $v0, ($s2) +/* 1938 80026538 02651025 */ or $v0, $s3, $a1 +/* 193C 8002653C 240600E8 */ addiu $a2, $zero, 0xe8 +/* 1940 80026540 00C93023 */ subu $a2, $a2, $t1 +/* 1944 80026544 00063080 */ sll $a2, $a2, 2 +/* 1948 80026548 30C60FFF */ andi $a2, $a2, 0xfff +/* 194C 8002654C AC620010 */ sw $v0, 0x10($v1) +/* 1950 80026550 02261025 */ or $v0, $s1, $a2 +/* 1954 80026554 AC620014 */ sw $v0, 0x14($v1) +/* 1958 80026558 24620020 */ addiu $v0, $v1, 0x20 +/* 195C 8002655C 350800E0 */ ori $t0, $t0, 0xe0 +/* 1960 80026560 AE420000 */ sw $v0, ($s2) +/* 1964 80026564 24620028 */ addiu $v0, $v1, 0x28 +/* 1968 80026568 AC790018 */ sw $t9, 0x18($v1) +/* 196C 8002656C AC68001C */ sw $t0, 0x1c($v1) +/* 1970 80026570 AE420000 */ sw $v0, ($s2) +/* 1974 80026574 24620030 */ addiu $v0, $v1, 0x30 +/* 1978 80026578 01E73825 */ or $a3, $t7, $a3 +/* 197C 8002657C AC780020 */ sw $t8, 0x20($v1) +/* 1980 80026580 AC6A0024 */ sw $t2, 0x24($v1) +/* 1984 80026584 AE420000 */ sw $v0, ($s2) +/* 1988 80026588 24620038 */ addiu $v0, $v1, 0x38 +/* 198C 8002658C AC640028 */ sw $a0, 0x28($v1) +/* 1990 80026590 000D2200 */ sll $a0, $t5, 8 +/* 1994 80026594 348400E0 */ ori $a0, $a0, 0xe0 +/* 1998 80026598 00042400 */ sll $a0, $a0, 0x10 +/* 199C 8002659C AC67002C */ sw $a3, 0x2c($v1) +/* 19A0 800265A0 AE420000 */ sw $v0, ($s2) +/* 19A4 800265A4 24620040 */ addiu $v0, $v1, 0x40 +/* 19A8 800265A8 AC790030 */ sw $t9, 0x30($v1) +/* 19AC 800265AC AC640034 */ sw $a0, 0x34($v1) +/* 19B0 800265B0 AE420000 */ sw $v0, ($s2) +/* 19B4 800265B4 24620048 */ addiu $v0, $v1, 0x48 +/* 19B8 800265B8 02052825 */ or $a1, $s0, $a1 +/* 19BC 800265BC 01E63025 */ or $a2, $t7, $a2 +/* 19C0 800265C0 AC780038 */ sw $t8, 0x38($v1) +/* 19C4 800265C4 AC6B003C */ sw $t3, 0x3c($v1) +/* 19C8 800265C8 AE420000 */ sw $v0, ($s2) +/* 19CC 800265CC 24620050 */ addiu $v0, $v1, 0x50 +/* 19D0 800265D0 348400E0 */ ori $a0, $a0, 0xe0 +/* 19D4 800265D4 AC650040 */ sw $a1, 0x40($v1) +/* 19D8 800265D8 AC660044 */ sw $a2, 0x44($v1) +/* 19DC 800265DC AE420000 */ sw $v0, ($s2) +/* 19E0 800265E0 24620058 */ addiu $v0, $v1, 0x58 +/* 19E4 800265E4 AC790048 */ sw $t9, 0x48($v1) +/* 19E8 800265E8 AC64004C */ sw $a0, 0x4c($v1) +/* 19EC 800265EC AE420000 */ sw $v0, ($s2) +/* 19F0 800265F0 AC780050 */ sw $t8, 0x50($v1) +/* 19F4 800265F4 AC6C0054 */ sw $t4, 0x54($v1) +/* 19F8 800265F8 25C20001 */ addiu $v0, $t6, 1 +.L800265FC: +/* 19FC 800265FC 0040702D */ daddu $t6, $v0, $zero +.L80026600: +/* 1A00 80026600 00021400 */ sll $v0, $v0, 0x10 +/* 1A04 80026604 00021403 */ sra $v0, $v0, 0x10 +/* 1A08 80026608 2842000F */ slti $v0, $v0, 0xf +/* 1A0C 8002660C 1440FF90 */ bnez $v0, .L80026450 +/* 1A10 80026610 000E1400 */ sll $v0, $t6, 0x10 +/* 1A14 80026614 26C20001 */ addiu $v0, $s6, 1 +/* 1A18 80026618 0040B02D */ daddu $s6, $v0, $zero +/* 1A1C 8002661C 00021400 */ sll $v0, $v0, 0x10 +/* 1A20 80026620 00021403 */ sra $v0, $v0, 0x10 +/* 1A24 80026624 28420014 */ slti $v0, $v0, 0x14 +/* 1A28 80026628 1440FF73 */ bnez $v0, .L800263F8 +/* 1A2C 8002662C 0000702D */ daddu $t6, $zero, $zero +/* 1A30 80026630 3C06800A */ lui $a2, %hi(D_8009A64C) +/* 1A34 80026634 24C6A64C */ addiu $a2, $a2, %lo(D_8009A64C) +/* 1A38 80026638 3C038007 */ lui $v1, %hi(D_80073FF0) +/* 1A3C 8002663C 24633FF0 */ addiu $v1, $v1, %lo(D_80073FF0) +/* 1A40 80026640 8CC50000 */ lw $a1, ($a2) +/* 1A44 80026644 3C08800A */ lui $t0, %hi(D_8009A654) +/* 1A48 80026648 8D08A654 */ lw $t0, %lo(D_8009A654)($t0) +/* 1A4C 8002664C 94620000 */ lhu $v0, ($v1) +/* 1A50 80026650 00A0382D */ daddu $a3, $a1, $zero +/* 1A54 80026654 24A50008 */ addiu $a1, $a1, 8 +/* 1A58 80026658 25040230 */ addiu $a0, $t0, 0x230 +/* 1A5C 8002665C 24420001 */ addiu $v0, $v0, 1 +/* 1A60 80026660 A4620000 */ sh $v0, ($v1) +/* 1A64 80026664 3C02E900 */ lui $v0, 0xe900 +/* 1A68 80026668 ACC50000 */ sw $a1, ($a2) +/* 1A6C 8002666C ACE20000 */ sw $v0, ($a3) +/* 1A70 80026670 24A20008 */ addiu $v0, $a1, 8 +/* 1A74 80026674 ACE00004 */ sw $zero, 4($a3) +/* 1A78 80026678 ACC20000 */ sw $v0, ($a2) +/* 1A7C 8002667C 3C02DF00 */ lui $v0, 0xdf00 +/* 1A80 80026680 ACA20000 */ sw $v0, ($a1) +/* 1A84 80026684 ACA00004 */ sw $zero, 4($a1) +/* 1A88 80026688 24A5FDD8 */ addiu $a1, $a1, -0x228 +/* 1A8C 8002668C 00A82823 */ subu $a1, $a1, $t0 +/* 1A90 80026690 000528C3 */ sra $a1, $a1, 3 +/* 1A94 80026694 000528C0 */ sll $a1, $a1, 3 +/* 1A98 80026698 0000302D */ daddu $a2, $zero, $zero +/* 1A9C 8002669C 0C00B3C9 */ jal func_8002CF24 +/* 1AA0 800266A0 3C070004 */ lui $a3, 4 +/* 1AA4 800266A4 3C038007 */ lui $v1, %hi(D_800741D4) +/* 1AA8 800266A8 246341D4 */ addiu $v1, $v1, %lo(D_800741D4) +/* 1AAC 800266AC 8C620000 */ lw $v0, ($v1) +/* 1AB0 800266B0 38420001 */ xori $v0, $v0, 1 +/* 1AB4 800266B4 AC620000 */ sw $v0, ($v1) +/* 1AB8 800266B8 8FBF003C */ lw $ra, 0x3c($sp) +/* 1ABC 800266BC 8FBE0038 */ lw $fp, 0x38($sp) +/* 1AC0 800266C0 8FB70034 */ lw $s7, 0x34($sp) +/* 1AC4 800266C4 8FB60030 */ lw $s6, 0x30($sp) +/* 1AC8 800266C8 8FB5002C */ lw $s5, 0x2c($sp) +/* 1ACC 800266CC 8FB40028 */ lw $s4, 0x28($sp) +/* 1AD0 800266D0 8FB30024 */ lw $s3, 0x24($sp) +/* 1AD4 800266D4 8FB20020 */ lw $s2, 0x20($sp) +/* 1AD8 800266D8 8FB1001C */ lw $s1, 0x1c($sp) +/* 1ADC 800266DC 8FB00018 */ lw $s0, 0x18($sp) +/* 1AE0 800266E0 03E00008 */ jr $ra +/* 1AE4 800266E4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/jp/asm/nonmatchings/main_1370/func_80026710.s b/ver/jp/asm/nonmatchings/main_1370/func_80026710.s new file mode 100644 index 0000000000..914140ba19 --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1370/func_80026710.s @@ -0,0 +1,188 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80026710 +/* 1B10 80026710 3C038007 */ lui $v1, %hi(D_8007417C) +/* 1B14 80026714 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 1B18 80026718 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 1B1C 8002671C AFBF0018 */ sw $ra, 0x18($sp) +/* 1B20 80026720 AFB10014 */ sw $s1, 0x14($sp) +/* 1B24 80026724 AFB00010 */ sw $s0, 0x10($sp) +/* 1B28 80026728 94620134 */ lhu $v0, 0x134($v1) +/* 1B2C 8002672C 3C040CDF */ lui $a0, 0xcdf +/* 1B30 80026730 24420001 */ addiu $v0, $v0, 1 +/* 1B34 80026734 A4620134 */ sh $v0, 0x134($v1) +/* 1B38 80026738 3C038011 */ lui $v1, %hi(D_8010F450) +/* 1B3C 8002673C 2463F450 */ addiu $v1, $v1, %lo(D_8010F450) +/* 1B40 80026740 8C6202BC */ lw $v0, 0x2bc($v1) +/* 1B44 80026744 3484E5FF */ ori $a0, $a0, 0xe5ff +/* 1B48 80026748 24420002 */ addiu $v0, $v0, 2 +/* 1B4C 8002674C AC6202BC */ sw $v0, 0x2bc($v1) +/* 1B50 80026750 0082102B */ sltu $v0, $a0, $v0 +/* 1B54 80026754 54400001 */ bnel $v0, $zero, .L8002675C +/* 1B58 80026758 AC6402BC */ sw $a0, 0x2bc($v1) +.L8002675C: +/* 1B5C 8002675C 0C00A211 */ jal func_80028844 +/* 1B60 80026760 00000000 */ nop +/* 1B64 80026764 0C00A3D3 */ jal func_80028F4C +/* 1B68 80026768 00000000 */ nop +/* 1B6C 8002676C 3C048007 */ lui $a0, %hi(D_80074001) +/* 1B70 80026770 24844001 */ addiu $a0, $a0, %lo(D_80074001) +/* 1B74 80026774 80820000 */ lb $v0, ($a0) +/* 1B78 80026778 90830000 */ lbu $v1, ($a0) +/* 1B7C 8002677C 10400008 */ beqz $v0, .L800267A0 +/* 1B80 80026780 2462FFFF */ addiu $v0, $v1, -1 +/* 1B84 80026784 A0820000 */ sb $v0, ($a0) +/* 1B88 80026788 00021600 */ sll $v0, $v0, 0x18 +/* 1B8C 8002678C 14400087 */ bnez $v0, .L800269AC +/* 1B90 80026790 00000000 */ nop +/* 1B94 80026794 3C028007 */ lui $v0, %hi(D_80074000) +/* 1B98 80026798 90424000 */ lbu $v0, %lo(D_80074000)($v0) +/* 1B9C 8002679C A0820000 */ sb $v0, ($a0) +.L800267A0: +/* 1BA0 800267A0 0C04833E */ jal func_80120CF8 +/* 1BA4 800267A4 00000000 */ nop +/* 1BA8 800267A8 0C00E08F */ jal func_8003823C +/* 1BAC 800267AC 00000000 */ nop +/* 1BB0 800267B0 0C04A185 */ jal func_80128614 +/* 1BB4 800267B4 00000000 */ nop +/* 1BB8 800267B8 0C052A44 */ jal func_8014A910 +/* 1BBC 800267BC 00000000 */ nop +/* 1BC0 800267C0 0C0B0F5D */ jal func_802C3D74 +/* 1BC4 800267C4 00000000 */ nop +/* 1BC8 800267C8 0C04A298 */ jal func_80128A60 +/* 1BCC 800267CC 00000000 */ nop +/* 1BD0 800267D0 0C0519B0 */ jal func_801466C0 +/* 1BD4 800267D4 00000000 */ nop +/* 1BD8 800267D8 0C046022 */ jal func_80118088 +/* 1BDC 800267DC 00000000 */ nop +/* 1BE0 800267E0 0C045238 */ jal func_801148E0 +/* 1BE4 800267E4 00000000 */ nop +/* 1BE8 800267E8 0C04F492 */ jal func_8013D248 +/* 1BEC 800267EC 00000000 */ nop +/* 1BF0 800267F0 0C053D7E */ jal func_8014F5F8 +/* 1BF4 800267F4 00000000 */ nop +/* 1BF8 800267F8 0C0530C5 */ jal func_8014C314 +/* 1BFC 800267FC 00000000 */ nop +/* 1C00 80026800 0C0539F9 */ jal func_8014E7E4 +/* 1C04 80026804 00000000 */ nop +/* 1C08 80026808 0C053131 */ jal func_8014C4C4 +/* 1C0C 8002680C 00000000 */ nop +/* 1C10 80026810 0C00AE8E */ jal func_8002BA38 +/* 1C14 80026814 00000000 */ nop +/* 1C18 80026818 3C10800A */ lui $s0, %hi(D_8009A630) +/* 1C1C 8002681C 2610A630 */ addiu $s0, $s0, %lo(D_8009A630) +/* 1C20 80026820 8E040000 */ lw $a0, ($s0) +/* 1C24 80026824 30820020 */ andi $v0, $a0, 0x20 +/* 1C28 80026828 10400035 */ beqz $v0, .L80026900 +/* 1C2C 8002682C 00000000 */ nop +/* 1C30 80026830 3C118007 */ lui $s1, %hi(D_80074182) +/* 1C34 80026834 26314182 */ addiu $s1, $s1, %lo(D_80074182) +/* 1C38 80026838 86230000 */ lh $v1, ($s1) +/* 1C3C 8002683C 10600005 */ beqz $v1, .L80026854 +/* 1C40 80026840 24020001 */ addiu $v0, $zero, 1 +/* 1C44 80026844 1062001C */ beq $v1, $v0, .L800268B8 +/* 1C48 80026848 34840008 */ ori $a0, $a0, 8 +/* 1C4C 8002684C 08009A44 */ j .L80026910 +/* 1C50 80026850 00000000 */ nop +.L80026854: +/* 1C54 80026854 34820200 */ ori $v0, $a0, 0x200 +/* 1C58 80026858 0C038056 */ jal func_800E0158 +/* 1C5C 8002685C AE020000 */ sw $v0, ($s0) +/* 1C60 80026860 3C048007 */ lui $a0, %hi(D_80074180) +/* 1C64 80026864 24844180 */ addiu $a0, $a0, %lo(D_80074180) +/* 1C68 80026868 240500FF */ addiu $a1, $zero, 0xff +/* 1C6C 8002686C 84820000 */ lh $v0, ($a0) +/* 1C70 80026870 94830000 */ lhu $v1, ($a0) +/* 1C74 80026874 14450008 */ bne $v0, $a1, .L80026898 +/* 1C78 80026878 2462000A */ addiu $v0, $v1, 0xa +/* 1C7C 8002687C 24020001 */ addiu $v0, $zero, 1 +/* 1C80 80026880 A6220000 */ sh $v0, ($s1) +/* 1C84 80026884 24020003 */ addiu $v0, $zero, 3 +/* 1C88 80026888 3C01800A */ lui $at, %hi(D_8009A670) +/* 1C8C 8002688C A422A670 */ sh $v0, %lo(D_8009A670)($at) +/* 1C90 80026890 08009A44 */ j .L80026910 +/* 1C94 80026894 00000000 */ nop +.L80026898: +/* 1C98 80026898 A4820000 */ sh $v0, ($a0) +/* 1C9C 8002689C 00021400 */ sll $v0, $v0, 0x10 +/* 1CA0 800268A0 00021403 */ sra $v0, $v0, 0x10 +/* 1CA4 800268A4 28420100 */ slti $v0, $v0, 0x100 +/* 1CA8 800268A8 50400019 */ beql $v0, $zero, .L80026910 +/* 1CAC 800268AC A4850000 */ sh $a1, ($a0) +/* 1CB0 800268B0 08009A44 */ j .L80026910 +/* 1CB4 800268B4 00000000 */ nop +.L800268B8: +/* 1CB8 800268B8 3C02800A */ lui $v0, %hi(D_8009A670) +/* 1CBC 800268BC 2442A670 */ addiu $v0, $v0, %lo(D_8009A670) +/* 1CC0 800268C0 94430000 */ lhu $v1, ($v0) +/* 1CC4 800268C4 AE040000 */ sw $a0, ($s0) +/* 1CC8 800268C8 2463FFFF */ addiu $v1, $v1, -1 +/* 1CCC 800268CC A4430000 */ sh $v1, ($v0) +/* 1CD0 800268D0 00031C00 */ sll $v1, $v1, 0x10 +/* 1CD4 800268D4 1460000E */ bnez $v1, .L80026910 +/* 1CD8 800268D8 00000000 */ nop +/* 1CDC 800268DC 0C053A3A */ jal func_8014E8E8 +/* 1CE0 800268E0 00000000 */ nop +/* 1CE4 800268E4 0C00CC60 */ jal func_80033180 +/* 1CE8 800268E8 0000202D */ daddu $a0, $zero, $zero +/* 1CEC 800268EC 8E020000 */ lw $v0, ($s0) +/* 1CF0 800268F0 2403FFDF */ addiu $v1, $zero, -0x21 +/* 1CF4 800268F4 00431024 */ and $v0, $v0, $v1 +/* 1CF8 800268F8 08009A44 */ j .L80026910 +/* 1CFC 800268FC AE020000 */ sw $v0, ($s0) +.L80026900: +/* 1D00 80026900 3C018007 */ lui $at, %hi(D_80074180) +/* 1D04 80026904 A4204180 */ sh $zero, %lo(D_80074180)($at) +/* 1D08 80026908 3C018007 */ lui $at, %hi(D_80074182) +/* 1D0C 8002690C A4204182 */ sh $zero, %lo(D_80074182)($at) +.L80026910: +/* 1D10 80026910 3C04800A */ lui $a0, %hi(D_8009A630) +/* 1D14 80026914 2484A630 */ addiu $a0, $a0, %lo(D_8009A630) +/* 1D18 80026918 8C830000 */ lw $v1, ($a0) +/* 1D1C 8002691C 30620100 */ andi $v0, $v1, 0x100 +/* 1D20 80026920 14400003 */ bnez $v0, .L80026930 +/* 1D24 80026924 34621000 */ ori $v0, $v1, 0x1000 +/* 1D28 80026928 2402EFFF */ addiu $v0, $zero, -0x1001 +/* 1D2C 8002692C 00621024 */ and $v0, $v1, $v0 +.L80026930: +/* 1D30 80026930 AC820000 */ sw $v0, ($a0) +/* 1D34 80026934 3C04800A */ lui $a0, %hi(D_8009A630) +/* 1D38 80026938 2484A630 */ addiu $a0, $a0, %lo(D_8009A630) +/* 1D3C 8002693C 8C830000 */ lw $v1, ($a0) +/* 1D40 80026940 30620200 */ andi $v0, $v1, 0x200 +/* 1D44 80026944 14400003 */ bnez $v0, .L80026954 +/* 1D48 80026948 34622000 */ ori $v0, $v1, 0x2000 +/* 1D4C 8002694C 2402DFFF */ addiu $v0, $zero, -0x2001 +/* 1D50 80026950 00621024 */ and $v0, $v1, $v0 +.L80026954: +/* 1D54 80026954 AC820000 */ sw $v0, ($a0) +/* 1D58 80026958 3C04800A */ lui $a0, %hi(D_8009A630) +/* 1D5C 8002695C 2484A630 */ addiu $a0, $a0, %lo(D_8009A630) +/* 1D60 80026960 8C830000 */ lw $v1, ($a0) +/* 1D64 80026964 30620400 */ andi $v0, $v1, 0x400 +/* 1D68 80026968 14400003 */ bnez $v0, .L80026978 +/* 1D6C 8002696C 34624000 */ ori $v0, $v1, 0x4000 +/* 1D70 80026970 2402BFFF */ addiu $v0, $zero, -0x4001 +/* 1D74 80026974 00621024 */ and $v0, $v1, $v0 +.L80026978: +/* 1D78 80026978 AC820000 */ sw $v0, ($a0) +/* 1D7C 8002697C 3C04800A */ lui $a0, %hi(D_8009A630) +/* 1D80 80026980 2484A630 */ addiu $a0, $a0, %lo(D_8009A630) +/* 1D84 80026984 8C830000 */ lw $v1, ($a0) +/* 1D88 80026988 30620800 */ andi $v0, $v1, 0x800 +/* 1D8C 8002698C 14400004 */ bnez $v0, .L800269A0 +/* 1D90 80026990 34628000 */ ori $v0, $v1, 0x8000 +/* 1D94 80026994 3C02FFFF */ lui $v0, 0xffff +/* 1D98 80026998 34427FFF */ ori $v0, $v0, 0x7fff +/* 1D9C 8002699C 00621024 */ and $v0, $v1, $v0 +.L800269A0: +/* 1DA0 800269A0 AC820000 */ sw $v0, ($a0) +/* 1DA4 800269A4 0C00A66F */ jal func_800299BC +/* 1DA8 800269A8 24040001 */ addiu $a0, $zero, 1 +.L800269AC: +/* 1DAC 800269AC 8FBF0018 */ lw $ra, 0x18($sp) +/* 1DB0 800269B0 8FB10014 */ lw $s1, 0x14($sp) +/* 1DB4 800269B4 8FB00010 */ lw $s0, 0x10($sp) +/* 1DB8 800269B8 03E00008 */ jr $ra +/* 1DBC 800269BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/jp/asm/nonmatchings/main_1370/func_800269C0.s b/ver/jp/asm/nonmatchings/main_1370/func_800269C0.s new file mode 100644 index 0000000000..532f9826d6 --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1370/func_800269C0.s @@ -0,0 +1,75 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_800269C0 +/* 1DC0 800269C0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 1DC4 800269C4 AFB20018 */ sw $s2, 0x18($sp) +/* 1DC8 800269C8 3C120001 */ lui $s2, 1 +/* 1DCC 800269CC 36520230 */ ori $s2, $s2, 0x230 +/* 1DD0 800269D0 AFB10014 */ sw $s1, 0x14($sp) +/* 1DD4 800269D4 3C11800A */ lui $s1, %hi(D_8009A654) +/* 1DD8 800269D8 2631A654 */ addiu $s1, $s1, %lo(D_8009A654) +/* 1DDC 800269DC 3C038007 */ lui $v1, %hi(D_800741D4) +/* 1DE0 800269E0 8C6341D4 */ lw $v1, %lo(D_800741D4)($v1) +/* 1DE4 800269E4 3C048016 */ lui $a0, %hi(D_80164000) +/* 1DE8 800269E8 24844000 */ addiu $a0, $a0, %lo(D_80164000) +/* 1DEC 800269EC AFB00010 */ sw $s0, 0x10($sp) +/* 1DF0 800269F0 3C10800A */ lui $s0, %hi(D_8009A64C) +/* 1DF4 800269F4 2610A64C */ addiu $s0, $s0, %lo(D_8009A64C) +/* 1DF8 800269F8 AFBF001C */ sw $ra, 0x1c($sp) +/* 1DFC 800269FC 00031040 */ sll $v0, $v1, 1 +/* 1E00 80026A00 00431021 */ addu $v0, $v0, $v1 +/* 1E04 80026A04 00021940 */ sll $v1, $v0, 5 +/* 1E08 80026A08 00431021 */ addu $v0, $v0, $v1 +/* 1E0C 80026A0C 00021980 */ sll $v1, $v0, 6 +/* 1E10 80026A10 00431021 */ addu $v0, $v0, $v1 +/* 1E14 80026A14 00021100 */ sll $v0, $v0, 4 +/* 1E18 80026A18 00441021 */ addu $v0, $v0, $a0 +/* 1E1C 80026A1C AE220000 */ sw $v0, ($s1) +/* 1E20 80026A20 00521021 */ addu $v0, $v0, $s2 +/* 1E24 80026A24 0C009C5C */ jal func_80027170 +/* 1E28 80026A28 AE020000 */ sw $v0, ($s0) +/* 1E2C 80026A2C 0C009F78 */ jal func_80027DE0 +/* 1E30 80026A30 00000000 */ nop +/* 1E34 80026A34 8E030000 */ lw $v1, ($s0) +/* 1E38 80026A38 3C02E900 */ lui $v0, 0xe900 +/* 1E3C 80026A3C 0060202D */ daddu $a0, $v1, $zero +/* 1E40 80026A40 24630008 */ addiu $v1, $v1, 8 +/* 1E44 80026A44 AE030000 */ sw $v1, ($s0) +/* 1E48 80026A48 AC820000 */ sw $v0, ($a0) +/* 1E4C 80026A4C 24620008 */ addiu $v0, $v1, 8 +/* 1E50 80026A50 AC800004 */ sw $zero, 4($a0) +/* 1E54 80026A54 3C04DF00 */ lui $a0, 0xdf00 +/* 1E58 80026A58 AE020000 */ sw $v0, ($s0) +/* 1E5C 80026A5C AC640000 */ sw $a0, ($v1) +/* 1E60 80026A60 AC600004 */ sw $zero, 4($v1) +/* 1E64 80026A64 8E230000 */ lw $v1, ($s1) +/* 1E68 80026A68 00521023 */ subu $v0, $v0, $s2 +/* 1E6C 80026A6C 00431023 */ subu $v0, $v0, $v1 +/* 1E70 80026A70 000210C2 */ srl $v0, $v0, 3 +/* 1E74 80026A74 28420200 */ slti $v0, $v0, 0x200 +/* 1E78 80026A78 14400003 */ bnez $v0, .L80026A88 +/* 1E7C 80026A7C 3C040001 */ lui $a0, 1 +.L80026A80: +/* 1E80 80026A80 08009AA0 */ j .L80026A80 +/* 1E84 80026A84 00000000 */ nop +.L80026A88: +/* 1E88 80026A88 34840230 */ ori $a0, $a0, 0x230 +/* 1E8C 80026A8C 0000302D */ daddu $a2, $zero, $zero +/* 1E90 80026A90 00C0382D */ daddu $a3, $a2, $zero +/* 1E94 80026A94 3C05800A */ lui $a1, %hi(D_8009A64C) +/* 1E98 80026A98 8CA5A64C */ lw $a1, %lo(D_8009A64C)($a1) +/* 1E9C 80026A9C 3C02800A */ lui $v0, %hi(D_8009A654) +/* 1EA0 80026AA0 8C42A654 */ lw $v0, %lo(D_8009A654)($v0) +/* 1EA4 80026AA4 00A42823 */ subu $a1, $a1, $a0 +/* 1EA8 80026AA8 00A22823 */ subu $a1, $a1, $v0 +/* 1EAC 80026AAC 000528C3 */ sra $a1, $a1, 3 +/* 1EB0 80026AB0 00442021 */ addu $a0, $v0, $a0 +/* 1EB4 80026AB4 0C00B3C9 */ jal func_8002CF24 +/* 1EB8 80026AB8 000528C0 */ sll $a1, $a1, 3 +/* 1EBC 80026ABC 8FBF001C */ lw $ra, 0x1c($sp) +/* 1EC0 80026AC0 8FB20018 */ lw $s2, 0x18($sp) +/* 1EC4 80026AC4 8FB10014 */ lw $s1, 0x14($sp) +/* 1EC8 80026AC8 8FB00010 */ lw $s0, 0x10($sp) +/* 1ECC 80026ACC 03E00008 */ jr $ra +/* 1ED0 80026AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/jp/asm/nonmatchings/main_1370/func_80026AD4.s b/ver/jp/asm/nonmatchings/main_1370/func_80026AD4.s new file mode 100644 index 0000000000..7dd8d2611c --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1370/func_80026AD4.s @@ -0,0 +1,197 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80026AD4 +/* 1ED4 80026AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 1ED8 80026AD8 3C04800A */ lui $a0, %hi(D_8009A654) +/* 1EDC 80026ADC 8C84A654 */ lw $a0, %lo(D_8009A654)($a0) +/* 1EE0 80026AE0 3C05800A */ lui $a1, %hi(D_8009A64C) +/* 1EE4 80026AE4 24A5A64C */ addiu $a1, $a1, %lo(D_8009A64C) +/* 1EE8 80026AE8 AFB00010 */ sw $s0, 0x10($sp) +/* 1EEC 80026AEC 3C10800A */ lui $s0, %hi(D_8009A630) +/* 1EF0 80026AF0 2610A630 */ addiu $s0, $s0, %lo(D_8009A630) +/* 1EF4 80026AF4 AFBF0018 */ sw $ra, 0x18($sp) +/* 1EF8 80026AF8 AFB10014 */ sw $s1, 0x14($sp) +/* 1EFC 80026AFC 3C018007 */ lui $at, %hi(D_800741D0) +/* 1F00 80026B00 A42041D0 */ sh $zero, %lo(D_800741D0)($at) +/* 1F04 80026B04 8E020000 */ lw $v0, ($s0) +/* 1F08 80026B08 24830230 */ addiu $v1, $a0, 0x230 +/* 1F0C 80026B0C 30420008 */ andi $v0, $v0, 8 +/* 1F10 80026B10 10400007 */ beqz $v0, .L80026B30 +/* 1F14 80026B14 ACA30000 */ sw $v1, ($a1) +/* 1F18 80026B18 3C038007 */ lui $v1, %hi(D_800741D4) +/* 1F1C 80026B1C 246341D4 */ addiu $v1, $v1, %lo(D_800741D4) +/* 1F20 80026B20 8C620000 */ lw $v0, ($v1) +/* 1F24 80026B24 38420001 */ xori $v0, $v0, 1 +/* 1F28 80026B28 08009B65 */ j .L80026D94 +/* 1F2C 80026B2C AC620000 */ sw $v0, ($v1) +.L80026B30: +/* 1F30 80026B30 3C03DA38 */ lui $v1, 0xda38 +/* 1F34 80026B34 34630003 */ ori $v1, $v1, 3 +/* 1F38 80026B38 24820238 */ addiu $v0, $a0, 0x238 +/* 1F3C 80026B3C ACA20000 */ sw $v0, ($a1) +/* 1F40 80026B40 3C028007 */ lui $v0, %hi(D_80074188) +/* 1F44 80026B44 24424188 */ addiu $v0, $v0, %lo(D_80074188) +/* 1F48 80026B48 AC830230 */ sw $v1, 0x230($a0) +/* 1F4C 80026B4C 0C04456C */ jal func_801115B0 +/* 1F50 80026B50 AC820234 */ sw $v0, 0x234($a0) +/* 1F54 80026B54 8E020000 */ lw $v0, ($s0) +/* 1F58 80026B58 30420002 */ andi $v0, $v0, 2 +/* 1F5C 80026B5C 14400003 */ bnez $v0, .L80026B6C +/* 1F60 80026B60 00000000 */ nop +/* 1F64 80026B64 0C00B4F3 */ jal func_8002D3CC +/* 1F68 80026B68 0000202D */ daddu $a0, $zero, $zero +.L80026B6C: +/* 1F6C 80026B6C 0C038090 */ jal func_800E0240 +/* 1F70 80026B70 00000000 */ nop +/* 1F74 80026B74 0C0B0FB9 */ jal func_802C3EE4 +/* 1F78 80026B78 00000000 */ nop +/* 1F7C 80026B7C 0C04F4B4 */ jal func_8013D2D0 +/* 1F80 80026B80 00000000 */ nop +/* 1F84 80026B84 0C04A1D8 */ jal func_80128760 +/* 1F88 80026B88 00000000 */ nop +/* 1F8C 80026B8C 0C051CB0 */ jal func_801472C0 +/* 1F90 80026B90 00000000 */ nop +/* 1F94 80026B94 0C016711 */ jal func_80059C44 +/* 1F98 80026B98 00000000 */ nop +/* 1F9C 80026B9C 0C04605A */ jal func_80118168 +/* 1FA0 80026BA0 00000000 */ nop +/* 1FA4 80026BA4 8E020000 */ lw $v0, ($s0) +/* 1FA8 80026BA8 3C030001 */ lui $v1, 1 +/* 1FAC 80026BAC 00431024 */ and $v0, $v0, $v1 +/* 1FB0 80026BB0 14400003 */ bnez $v0, .L80026BC0 +/* 1FB4 80026BB4 00000000 */ nop +/* 1FB8 80026BB8 0C0532DD */ jal func_8014CB74 +/* 1FBC 80026BBC 00000000 */ nop +.L80026BC0: +/* 1FC0 80026BC0 8E020000 */ lw $v0, ($s0) +/* 1FC4 80026BC4 30420002 */ andi $v0, $v0, 2 +/* 1FC8 80026BC8 14400009 */ bnez $v0, .L80026BF0 +/* 1FCC 80026BCC 3C100010 */ lui $s0, 0x10 +/* 1FD0 80026BD0 3C028007 */ lui $v0, %hi(D_8007417C) +/* 1FD4 80026BD4 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1FD8 80026BD8 80420078 */ lb $v0, 0x78($v0) +/* 1FDC 80026BDC 14400004 */ bnez $v0, .L80026BF0 +/* 1FE0 80026BE0 00000000 */ nop +/* 1FE4 80026BE4 0C00B4F3 */ jal func_8002D3CC +/* 1FE8 80026BE8 24040001 */ addiu $a0, $zero, 1 +/* 1FEC 80026BEC 3C100010 */ lui $s0, 0x10 +.L80026BF0: +/* 1FF0 80026BF0 3C11800A */ lui $s1, %hi(D_8009A630) +/* 1FF4 80026BF4 2631A630 */ addiu $s1, $s1, %lo(D_8009A630) +/* 1FF8 80026BF8 8E220000 */ lw $v0, ($s1) +/* 1FFC 80026BFC 36100010 */ ori $s0, $s0, 0x10 +/* 2000 80026C00 00501024 */ and $v0, $v0, $s0 +/* 2004 80026C04 14400003 */ bnez $v0, .L80026C14 +/* 2008 80026C08 00000000 */ nop +/* 200C 80026C0C 0C04A523 */ jal func_8012948C +/* 2010 80026C10 00000000 */ nop +.L80026C14: +/* 2014 80026C14 0C04A1BC */ jal func_801286F0 +/* 2018 80026C18 00000000 */ nop +/* 201C 80026C1C 0C051DF3 */ jal func_801477CC +/* 2020 80026C20 00000000 */ nop +/* 2024 80026C24 0C04F494 */ jal func_8013D250 +/* 2028 80026C28 00000000 */ nop +/* 202C 80026C2C 8E220000 */ lw $v0, ($s1) +/* 2030 80026C30 24030010 */ addiu $v1, $zero, 0x10 +/* 2034 80026C34 00501024 */ and $v0, $v0, $s0 +/* 2038 80026C38 14430003 */ bne $v0, $v1, .L80026C48 +/* 203C 80026C3C 00000000 */ nop +/* 2040 80026C40 0C04A523 */ jal func_8012948C +/* 2044 80026C44 00000000 */ nop +.L80026C48: +/* 2048 80026C48 0C00AE90 */ jal func_8002BA40 +/* 204C 80026C4C 00000000 */ nop +/* 2050 80026C50 8E220000 */ lw $v0, ($s1) +/* 2054 80026C54 3C030010 */ lui $v1, 0x10 +/* 2058 80026C58 00431024 */ and $v0, $v0, $v1 +/* 205C 80026C5C 10400003 */ beqz $v0, .L80026C6C +/* 2060 80026C60 00000000 */ nop +/* 2064 80026C64 0C04A523 */ jal func_8012948C +/* 2068 80026C68 00000000 */ nop +.L80026C6C: +/* 206C 80026C6C 8E220000 */ lw $v0, ($s1) +/* 2070 80026C70 3C030001 */ lui $v1, 1 +/* 2074 80026C74 00431024 */ and $v0, $v0, $v1 +/* 2078 80026C78 10400003 */ beqz $v0, .L80026C88 +/* 207C 80026C7C 00000000 */ nop +/* 2080 80026C80 0C0532DD */ jal func_8014CB74 +/* 2084 80026C84 00000000 */ nop +.L80026C88: +/* 2088 80026C88 0C046075 */ jal func_801181D4 +/* 208C 80026C8C 00000000 */ nop +/* 2090 80026C90 8E220000 */ lw $v0, ($s1) +/* 2094 80026C94 30420020 */ andi $v0, $v0, 0x20 +/* 2098 80026C98 10400010 */ beqz $v0, .L80026CDC +/* 209C 80026C9C 00000000 */ nop +/* 20A0 80026CA0 3C038007 */ lui $v1, %hi(D_80074182) +/* 20A4 80026CA4 84634182 */ lh $v1, %lo(D_80074182)($v1) +/* 20A8 80026CA8 28620002 */ slti $v0, $v1, 2 +/* 20AC 80026CAC 1040000B */ beqz $v0, .L80026CDC +/* 20B0 80026CB0 00000000 */ nop +/* 20B4 80026CB4 04600009 */ bltz $v1, .L80026CDC +/* 20B8 80026CB8 24040007 */ addiu $a0, $zero, 7 +/* 20BC 80026CBC 3C028007 */ lui $v0, %hi(D_80074180) +/* 20C0 80026CC0 84424180 */ lh $v0, %lo(D_80074180)($v0) +/* 20C4 80026CC4 44820000 */ mtc1 $v0, $f0 +/* 20C8 80026CC8 00000000 */ nop +/* 20CC 80026CCC 46800020 */ cvt.s.w $f0, $f0 +/* 20D0 80026CD0 44050000 */ mfc1 $a1, $f0 +/* 20D4 80026CD4 0C04EECC */ jal func_8013BB30 +/* 20D8 80026CD8 0000302D */ daddu $a2, $zero, $zero +.L80026CDC: +/* 20DC 80026CDC 3C02800A */ lui $v0, %hi(D_8009A64C) +/* 20E0 80026CE0 8C42A64C */ lw $v0, %lo(D_8009A64C)($v0) +/* 20E4 80026CE4 3C03800A */ lui $v1, %hi(D_8009A654) +/* 20E8 80026CE8 8C63A654 */ lw $v1, %lo(D_8009A654)($v1) +/* 20EC 80026CEC 2442FDD0 */ addiu $v0, $v0, -0x230 +/* 20F0 80026CF0 00431023 */ subu $v0, $v0, $v1 +/* 20F4 80026CF4 000210C2 */ srl $v0, $v0, 3 +/* 20F8 80026CF8 28422000 */ slti $v0, $v0, 0x2000 +/* 20FC 80026CFC 54400003 */ bnel $v0, $zero, .L80026D0C +/* 2100 80026D00 0000302D */ daddu $a2, $zero, $zero +.L80026D04: +/* 2104 80026D04 08009B41 */ j .L80026D04 +/* 2108 80026D08 00000000 */ nop +.L80026D0C: +/* 210C 80026D0C 3C070004 */ lui $a3, 4 +/* 2110 80026D10 3C08800A */ lui $t0, %hi(D_8009A64C) +/* 2114 80026D14 2508A64C */ addiu $t0, $t0, %lo(D_8009A64C) +/* 2118 80026D18 34E70001 */ ori $a3, $a3, 1 +/* 211C 80026D1C 8D030000 */ lw $v1, ($t0) +/* 2120 80026D20 3C02800A */ lui $v0, %hi(D_8009A654) +/* 2124 80026D24 8C42A654 */ lw $v0, %lo(D_8009A654)($v0) +/* 2128 80026D28 0060482D */ daddu $t1, $v1, $zero +/* 212C 80026D2C 24630008 */ addiu $v1, $v1, 8 +/* 2130 80026D30 24440230 */ addiu $a0, $v0, 0x230 +/* 2134 80026D34 2465FDD8 */ addiu $a1, $v1, -0x228 +/* 2138 80026D38 00A22823 */ subu $a1, $a1, $v0 +/* 213C 80026D3C 000528C3 */ sra $a1, $a1, 3 +/* 2140 80026D40 000528C0 */ sll $a1, $a1, 3 +/* 2144 80026D44 3C02E900 */ lui $v0, 0xe900 +/* 2148 80026D48 AD030000 */ sw $v1, ($t0) +/* 214C 80026D4C AD220000 */ sw $v0, ($t1) +/* 2150 80026D50 24620008 */ addiu $v0, $v1, 8 +/* 2154 80026D54 AD200004 */ sw $zero, 4($t1) +/* 2158 80026D58 AD020000 */ sw $v0, ($t0) +/* 215C 80026D5C 3C02DF00 */ lui $v0, 0xdf00 +/* 2160 80026D60 AC620000 */ sw $v0, ($v1) +/* 2164 80026D64 0C00B3C9 */ jal func_8002CF24 +/* 2168 80026D68 AC600004 */ sw $zero, 4($v1) +/* 216C 80026D6C 24050140 */ addiu $a1, $zero, 0x140 +/* 2170 80026D70 240600F0 */ addiu $a2, $zero, 0xf0 +/* 2174 80026D74 3C038007 */ lui $v1, %hi(D_800741D4) +/* 2178 80026D78 246341D4 */ addiu $v1, $v1, %lo(D_800741D4) +/* 217C 80026D7C 8C620000 */ lw $v0, ($v1) +/* 2180 80026D80 3C04800A */ lui $a0, %hi(D_8009A62C) +/* 2184 80026D84 8C84A62C */ lw $a0, %lo(D_8009A62C)($a0) +/* 2188 80026D88 38420001 */ xori $v0, $v0, 1 +/* 218C 80026D8C 0C00B214 */ jal func_8002C850 +/* 2190 80026D90 AC620000 */ sw $v0, ($v1) +.L80026D94: +/* 2194 80026D94 8FBF0018 */ lw $ra, 0x18($sp) +/* 2198 80026D98 8FB10014 */ lw $s1, 0x14($sp) +/* 219C 80026D9C 8FB00010 */ lw $s0, 0x10($sp) +/* 21A0 80026DA0 03E00008 */ jr $ra +/* 21A4 80026DA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/jp/asm/nonmatchings/main_1370/func_80026DA8.s b/ver/jp/asm/nonmatchings/main_1370/func_80026DA8.s new file mode 100644 index 0000000000..bf8be950c8 --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1370/func_80026DA8.s @@ -0,0 +1,176 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80026DA8 +/* 21A8 80026DA8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 21AC 80026DAC 3C04000A */ lui $a0, 0xa +/* 21B0 80026DB0 24845F90 */ addiu $a0, $a0, 0x5f90 +/* 21B4 80026DB4 3C05000B */ lui $a1, 0xb +/* 21B8 80026DB8 24A59770 */ addiu $a1, $a1, -0x6890 +/* 21BC 80026DBC 3C068011 */ lui $a2, %hi(D_8010F890) +/* 21C0 80026DC0 24C6F890 */ addiu $a2, $a2, %lo(D_8010F890) +/* 21C4 80026DC4 AFBF0014 */ sw $ra, 0x14($sp) +/* 21C8 80026DC8 0C00A5BF */ jal func_800296FC +/* 21CC 80026DCC AFB00010 */ sw $s0, 0x10($sp) +/* 21D0 80026DD0 3C040007 */ lui $a0, 7 +/* 21D4 80026DD4 24845990 */ addiu $a0, $a0, 0x5990 +/* 21D8 80026DD8 3C05000A */ lui $a1, 0xa +/* 21DC 80026DDC 24A55F90 */ addiu $a1, $a1, 0x5f90 +/* 21E0 80026DE0 3C06800E */ lui $a2, %hi(D_800DC4E0) +/* 21E4 80026DE4 24C6C4E0 */ addiu $a2, $a2, %lo(D_800DC4E0) +/* 21E8 80026DE8 0C00A5BF */ jal func_800296FC +/* 21EC 80026DEC 00000000 */ nop +/* 21F0 80026DF0 3C04000F */ lui $a0, 0xf +/* 21F4 80026DF4 2484B1A0 */ addiu $a0, $a0, -0x4e60 +/* 21F8 80026DF8 3C050010 */ lui $a1, 0x10 +/* 21FC 80026DFC 24A52620 */ addiu $a1, $a1, 0x2620 +/* 2200 80026E00 3C06802C */ lui $a2, %hi(D_802C3000) +/* 2204 80026E04 24C63000 */ addiu $a2, $a2, %lo(D_802C3000) +/* 2208 80026E08 0C00A5BF */ jal func_800296FC +/* 220C 80026E0C 00000000 */ nop +/* 2210 80026E10 3C040010 */ lui $a0, 0x10 +/* 2214 80026E14 24842620 */ addiu $a0, $a0, 0x2620 +/* 2218 80026E18 3C050011 */ lui $a1, 0x11 +/* 221C 80026E1C 24A5CC20 */ addiu $a1, $a1, -0x33e0 +/* 2220 80026E20 3C06802E */ lui $a2, %hi(D_802DBD40) +/* 2224 80026E24 24C6BD40 */ addiu $a2, $a2, %lo(D_802DBD40) +/* 2228 80026E28 0C00A5BF */ jal func_800296FC +/* 222C 80026E2C 00000000 */ nop +/* 2230 80026E30 3C04000B */ lui $a0, 0xb +/* 2234 80026E34 24849770 */ addiu $a0, $a0, -0x6890 +/* 2238 80026E38 3C05000F */ lui $a1, 0xf +/* 223C 80026E3C 24A5B1A0 */ addiu $a1, $a1, -0x4e60 +/* 2240 80026E40 3C068011 */ lui $a2, %hi(func_801148E0) +/* 2244 80026E44 24C648E0 */ addiu $a2, $a2, %lo(func_801148E0) +/* 2248 80026E48 0C00A5BF */ jal func_800296FC +/* 224C 80026E4C 00000000 */ nop +/* 2250 80026E50 3C040011 */ lui $a0, 0x11 +/* 2254 80026E54 2484CC20 */ addiu $a0, $a0, -0x33e0 +/* 2258 80026E58 3C050011 */ lui $a1, 0x11 +/* 225C 80026E5C 24A5F330 */ addiu $a1, $a1, -0xcd0 +/* 2260 80026E60 3C06802E */ lui $a2, %hi(D_802E6380) +/* 2264 80026E64 24C66380 */ addiu $a2, $a2, %lo(D_802E6380) +/* 2268 80026E68 0C00A5BF */ jal func_800296FC +/* 226C 80026E6C 00000000 */ nop +/* 2270 80026E70 3C108007 */ lui $s0, %hi(D_8007417C) +/* 2274 80026E74 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 2278 80026E78 8E020000 */ lw $v0, ($s0) +/* 227C 80026E7C 3C01800A */ lui $at, %hi(D_8009A630) +/* 2280 80026E80 AC20A630 */ sw $zero, %lo(D_8009A630)($at) +/* 2284 80026E84 A0400079 */ sb $zero, 0x79($v0) +/* 2288 80026E88 8E030000 */ lw $v1, ($s0) +/* 228C 80026E8C 24040001 */ addiu $a0, $zero, 1 +/* 2290 80026E90 A064007A */ sb $a0, 0x7a($v1) +/* 2294 80026E94 8E020000 */ lw $v0, ($s0) +/* 2298 80026E98 A4600148 */ sh $zero, 0x148($v1) +/* 229C 80026E9C A044007C */ sb $a0, 0x7c($v0) +/* 22A0 80026EA0 8E030000 */ lw $v1, ($s0) +/* 22A4 80026EA4 2402FFFF */ addiu $v0, $zero, -1 +/* 22A8 80026EA8 A06200A8 */ sb $v0, 0xa8($v1) +/* 22AC 80026EAC 8E020000 */ lw $v0, ($s0) +/* 22B0 80026EB0 A04000AA */ sb $zero, 0xaa($v0) +/* 22B4 80026EB4 8E020000 */ lw $v0, ($s0) +/* 22B8 80026EB8 A0400081 */ sb $zero, 0x81($v0) +/* 22BC 80026EBC 8E030000 */ lw $v1, ($s0) +/* 22C0 80026EC0 2402FFF8 */ addiu $v0, $zero, -8 +/* 22C4 80026EC4 A0620082 */ sb $v0, 0x82($v1) +/* 22C8 80026EC8 8E030000 */ lw $v1, ($s0) +/* 22CC 80026ECC 24020004 */ addiu $v0, $zero, 4 +/* 22D0 80026ED0 A0620083 */ sb $v0, 0x83($v1) +/* 22D4 80026ED4 8E020000 */ lw $v0, ($s0) +/* 22D8 80026ED8 3C01800A */ lui $at, %hi(D_8009A5B8) +/* 22DC 80026EDC AC20A5B8 */ sw $zero, %lo(D_8009A5B8)($at) +/* 22E0 80026EE0 A440013C */ sh $zero, 0x13c($v0) +/* 22E4 80026EE4 A0400075 */ sb $zero, 0x75($v0) +/* 22E8 80026EE8 8E030000 */ lw $v1, ($s0) +/* 22EC 80026EEC 24020005 */ addiu $v0, $zero, 5 +/* 22F0 80026EF0 3C018007 */ lui $at, %hi(D_80074001) +/* 22F4 80026EF4 A0224001 */ sb $v0, %lo(D_80074001)($at) +/* 22F8 80026EF8 0C00AE03 */ jal func_8002B80C +/* 22FC 80026EFC AC600168 */ sw $zero, 0x168($v1) +/* 2300 80026F00 0C00A202 */ jal func_80028808 +/* 2304 80026F04 00000000 */ nop +/* 2308 80026F08 0C00AAF0 */ jal func_8002ABC0 +/* 230C 80026F0C 00000000 */ nop +/* 2310 80026F10 0C048AA8 */ jal func_80122AA0 +/* 2314 80026F14 00000000 */ nop +/* 2318 80026F18 0C04A0B2 */ jal func_801282C8 +/* 231C 80026F1C 00000000 */ nop +/* 2320 80026F20 0C0B0C77 */ jal func_802C31DC +/* 2324 80026F24 00000000 */ nop +/* 2328 80026F28 0C00B6E1 */ jal func_8002DB84 +/* 232C 80026F2C 00000000 */ nop +/* 2330 80026F30 0C037F0C */ jal func_800DFC30 +/* 2334 80026F34 00000000 */ nop +/* 2338 80026F38 0C044512 */ jal func_80111448 +/* 233C 80026F3C 0000202D */ daddu $a0, $zero, $zero +/* 2340 80026F40 0C049770 */ jal func_80125DC0 +/* 2344 80026F44 00000000 */ nop +/* 2348 80026F48 0C048D0D */ jal func_80123434 +/* 234C 80026F4C 00000000 */ nop +/* 2350 80026F50 0C046BD5 */ jal func_8011AF54 +/* 2354 80026F54 00000000 */ nop +/* 2358 80026F58 0C05343C */ jal func_8014D0F0 +/* 235C 80026F5C 00000000 */ nop +/* 2360 80026F60 0C052BAA */ jal func_8014AEA8 +/* 2364 80026F64 00000000 */ nop +/* 2368 80026F68 0C04A21C */ jal func_80128870 +/* 236C 80026F6C 00000000 */ nop +/* 2370 80026F70 0C04A221 */ jal func_80128884 +/* 2374 80026F74 00000000 */ nop +/* 2378 80026F78 0C045F6A */ jal func_80117DA8 +/* 237C 80026F7C 00000000 */ nop +/* 2380 80026F80 0C00E05F */ jal func_8003817C +/* 2384 80026F84 00000000 */ nop +/* 2388 80026F88 0C05186C */ jal func_801461B0 +/* 238C 80026F8C 00000000 */ nop +/* 2390 80026F90 0C0529CC */ jal func_8014A730 +/* 2394 80026F94 00000000 */ nop +/* 2398 80026F98 0C0457B2 */ jal func_80115EC8 +/* 239C 80026F9C 0000202D */ daddu $a0, $zero, $zero +/* 23A0 80026FA0 0C039CD0 */ jal func_800E7340 +/* 23A4 80026FA4 00000000 */ nop +/* 23A8 80026FA8 0C00F7FE */ jal func_8003DFF8 +/* 23AC 80026FAC 00000000 */ nop +/* 23B0 80026FB0 0C04F46E */ jal func_8013D1B8 +/* 23B4 80026FB4 00000000 */ nop +/* 23B8 80026FB8 0C016653 */ jal func_8005994C +/* 23BC 80026FBC 00000000 */ nop +/* 23C0 80026FC0 0C0528F4 */ jal func_8014A3D0 +/* 23C4 80026FC4 00000000 */ nop +/* 23C8 80026FC8 0C04D85C */ jal func_80136170 +/* 23CC 80026FCC 00000000 */ nop +/* 23D0 80026FD0 0C053D52 */ jal func_8014F548 +/* 23D4 80026FD4 00000000 */ nop +/* 23D8 80026FD8 0C0530B8 */ jal func_8014C2E0 +/* 23DC 80026FDC 00000000 */ nop +/* 23E0 80026FE0 0C0539B2 */ jal func_8014E6C8 +/* 23E4 80026FE4 00000000 */ nop +/* 23E8 80026FE8 0C053128 */ jal func_8014C4A0 +/* 23EC 80026FEC 00000000 */ nop +/* 23F0 80026FF0 0C00AE80 */ jal func_8002BA00 +/* 23F4 80026FF4 00000000 */ nop +/* 23F8 80026FF8 0C00A3AC */ jal func_80028EB0 +/* 23FC 80026FFC 00000000 */ nop +/* 2400 80027000 0000182D */ daddu $v1, $zero, $zero +/* 2404 80027004 24050003 */ addiu $a1, $zero, 3 +/* 2408 80027008 2404000C */ addiu $a0, $zero, 0xc +/* 240C 8002700C 8E100000 */ lw $s0, ($s0) +.L80027010: +/* 2410 80027010 A6050050 */ sh $a1, 0x50($s0) +/* 2414 80027014 A6040048 */ sh $a0, 0x48($s0) +/* 2418 80027018 24630001 */ addiu $v1, $v1, 1 +/* 241C 8002701C 28620004 */ slti $v0, $v1, 4 +/* 2420 80027020 1440FFFB */ bnez $v0, .L80027010 +/* 2424 80027024 26100002 */ addiu $s0, $s0, 2 +/* 2428 80027028 3C03800A */ lui $v1, %hi(D_8009A630) +/* 242C 8002702C 2463A630 */ addiu $v1, $v1, %lo(D_8009A630) +/* 2430 80027030 8C620000 */ lw $v0, ($v1) +/* 2434 80027034 0000202D */ daddu $a0, $zero, $zero +/* 2438 80027038 34420008 */ ori $v0, $v0, 8 +/* 243C 8002703C 0C00CC60 */ jal func_80033180 +/* 2440 80027040 AC620000 */ sw $v0, ($v1) +/* 2444 80027044 8FBF0014 */ lw $ra, 0x14($sp) +/* 2448 80027048 8FB00010 */ lw $s0, 0x10($sp) +/* 244C 8002704C 03E00008 */ jr $ra +/* 2450 80027050 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/jp/asm/nonmatchings/main_1370/func_80027054.s b/ver/jp/asm/nonmatchings/main_1370/func_80027054.s new file mode 100644 index 0000000000..f90575bdca --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1370/func_80027054.s @@ -0,0 +1,72 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80027054 +/* 2454 80027054 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 2458 80027058 0080282D */ daddu $a1, $a0, $zero +/* 245C 8002705C 2CA20005 */ sltiu $v0, $a1, 5 +/* 2460 80027060 1040003B */ beqz $v0, .L80027150 +/* 2464 80027064 AFBF0010 */ sw $ra, 0x10($sp) +/* 2468 80027068 00051080 */ sll $v0, $a1, 2 +/* 246C 8002706C 3C018009 */ lui $at, %hi(D_80097D28) +/* 2470 80027070 00220821 */ addu $at, $at, $v0 +/* 2474 80027074 8C227D28 */ lw $v0, %lo(D_80097D28)($at) +/* 2478 80027078 00400008 */ jr $v0 +/* 247C 8002707C 00000000 */ nop +/* 2480 80027080 24040003 */ addiu $a0, $zero, 3 +/* 2484 80027084 3C02800A */ lui $v0, %hi(D_8009A630) +/* 2488 80027088 2442A630 */ addiu $v0, $v0, %lo(D_8009A630) +/* 248C 8002708C 3C01800A */ lui $at, %hi(D_8009A5B8) +/* 2490 80027090 AC25A5B8 */ sw $a1, %lo(D_8009A5B8)($at) +/* 2494 80027094 8C430000 */ lw $v1, ($v0) +/* 2498 80027098 2405F0FF */ addiu $a1, $zero, -0xf01 +/* 249C 8002709C 00651824 */ and $v1, $v1, $a1 +/* 24A0 800270A0 0C0B1192 */ jal func_802C4648 +/* 24A4 800270A4 AC430000 */ sw $v1, ($v0) +/* 24A8 800270A8 08009C54 */ j .L80027150 +/* 24AC 800270AC 00000000 */ nop +/* 24B0 800270B0 24040001 */ addiu $a0, $zero, 1 +/* 24B4 800270B4 3C02800A */ lui $v0, %hi(D_8009A630) +/* 24B8 800270B8 2442A630 */ addiu $v0, $v0, %lo(D_8009A630) +/* 24BC 800270BC 3C01800A */ lui $at, %hi(D_8009A5B8) +/* 24C0 800270C0 AC25A5B8 */ sw $a1, %lo(D_8009A5B8)($at) +/* 24C4 800270C4 8C430000 */ lw $v1, ($v0) +/* 24C8 800270C8 2405F1FF */ addiu $a1, $zero, -0xe01 +/* 24CC 800270CC 00651824 */ and $v1, $v1, $a1 +/* 24D0 800270D0 08009C49 */ j .L80027124 +/* 24D4 800270D4 34630100 */ ori $v1, $v1, 0x100 +/* 24D8 800270D8 24040002 */ addiu $a0, $zero, 2 +/* 24DC 800270DC 3C02800A */ lui $v0, %hi(D_8009A630) +/* 24E0 800270E0 2442A630 */ addiu $v0, $v0, %lo(D_8009A630) +/* 24E4 800270E4 3C01800A */ lui $at, %hi(D_8009A5B8) +/* 24E8 800270E8 AC25A5B8 */ sw $a1, %lo(D_8009A5B8)($at) +/* 24EC 800270EC 8C430000 */ lw $v1, ($v0) +/* 24F0 800270F0 2405F3FF */ addiu $a1, $zero, -0xc01 +/* 24F4 800270F4 00651824 */ and $v1, $v1, $a1 +/* 24F8 800270F8 08009C49 */ j .L80027124 +/* 24FC 800270FC 34630300 */ ori $v1, $v1, 0x300 +/* 2500 80027100 24040002 */ addiu $a0, $zero, 2 +/* 2504 80027104 3C02800A */ lui $v0, %hi(D_8009A630) +/* 2508 80027108 2442A630 */ addiu $v0, $v0, %lo(D_8009A630) +/* 250C 8002710C 3C01800A */ lui $at, %hi(D_8009A5B8) +/* 2510 80027110 AC25A5B8 */ sw $a1, %lo(D_8009A5B8)($at) +/* 2514 80027114 8C430000 */ lw $v1, ($v0) +/* 2518 80027118 2405F7FF */ addiu $a1, $zero, -0x801 +/* 251C 8002711C 00651824 */ and $v1, $v1, $a1 +/* 2520 80027120 34630700 */ ori $v1, $v1, 0x700 +.L80027124: +/* 2524 80027124 0C0B117A */ jal func_802C45E8 +/* 2528 80027128 AC430000 */ sw $v1, ($v0) +/* 252C 8002712C 08009C54 */ j .L80027150 +/* 2530 80027130 00000000 */ nop +/* 2534 80027134 3C03800A */ lui $v1, %hi(D_8009A630) +/* 2538 80027138 2463A630 */ addiu $v1, $v1, %lo(D_8009A630) +/* 253C 8002713C 8C620000 */ lw $v0, ($v1) +/* 2540 80027140 3C01800A */ lui $at, %hi(D_8009A5B8) +/* 2544 80027144 AC25A5B8 */ sw $a1, %lo(D_8009A5B8)($at) +/* 2548 80027148 34420F00 */ ori $v0, $v0, 0xf00 +/* 254C 8002714C AC620000 */ sw $v0, ($v1) +.L80027150: +/* 2550 80027150 8FBF0010 */ lw $ra, 0x10($sp) +/* 2554 80027154 03E00008 */ jr $ra +/* 2558 80027158 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/jp/asm/nonmatchings/main_1370/func_8002715C.s b/ver/jp/asm/nonmatchings/main_1370/func_8002715C.s new file mode 100644 index 0000000000..c88bd23709 --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1370/func_8002715C.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8002715C +/* 255C 8002715C 3C02800A */ lui $v0, %hi(D_8009A5B8) +/* 2560 80027160 8C42A5B8 */ lw $v0, %lo(D_8009A5B8)($v0) +/* 2564 80027164 03E00008 */ jr $ra +/* 2568 80027168 00000000 */ nop +/* 256C 8002716C 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/main_1B10/func_80026710.s b/ver/jp/asm/nonmatchings/main_1B10/func_80026710.s new file mode 100644 index 0000000000..914140ba19 --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1B10/func_80026710.s @@ -0,0 +1,188 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80026710 +/* 1B10 80026710 3C038007 */ lui $v1, %hi(D_8007417C) +/* 1B14 80026714 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 1B18 80026718 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 1B1C 8002671C AFBF0018 */ sw $ra, 0x18($sp) +/* 1B20 80026720 AFB10014 */ sw $s1, 0x14($sp) +/* 1B24 80026724 AFB00010 */ sw $s0, 0x10($sp) +/* 1B28 80026728 94620134 */ lhu $v0, 0x134($v1) +/* 1B2C 8002672C 3C040CDF */ lui $a0, 0xcdf +/* 1B30 80026730 24420001 */ addiu $v0, $v0, 1 +/* 1B34 80026734 A4620134 */ sh $v0, 0x134($v1) +/* 1B38 80026738 3C038011 */ lui $v1, %hi(D_8010F450) +/* 1B3C 8002673C 2463F450 */ addiu $v1, $v1, %lo(D_8010F450) +/* 1B40 80026740 8C6202BC */ lw $v0, 0x2bc($v1) +/* 1B44 80026744 3484E5FF */ ori $a0, $a0, 0xe5ff +/* 1B48 80026748 24420002 */ addiu $v0, $v0, 2 +/* 1B4C 8002674C AC6202BC */ sw $v0, 0x2bc($v1) +/* 1B50 80026750 0082102B */ sltu $v0, $a0, $v0 +/* 1B54 80026754 54400001 */ bnel $v0, $zero, .L8002675C +/* 1B58 80026758 AC6402BC */ sw $a0, 0x2bc($v1) +.L8002675C: +/* 1B5C 8002675C 0C00A211 */ jal func_80028844 +/* 1B60 80026760 00000000 */ nop +/* 1B64 80026764 0C00A3D3 */ jal func_80028F4C +/* 1B68 80026768 00000000 */ nop +/* 1B6C 8002676C 3C048007 */ lui $a0, %hi(D_80074001) +/* 1B70 80026770 24844001 */ addiu $a0, $a0, %lo(D_80074001) +/* 1B74 80026774 80820000 */ lb $v0, ($a0) +/* 1B78 80026778 90830000 */ lbu $v1, ($a0) +/* 1B7C 8002677C 10400008 */ beqz $v0, .L800267A0 +/* 1B80 80026780 2462FFFF */ addiu $v0, $v1, -1 +/* 1B84 80026784 A0820000 */ sb $v0, ($a0) +/* 1B88 80026788 00021600 */ sll $v0, $v0, 0x18 +/* 1B8C 8002678C 14400087 */ bnez $v0, .L800269AC +/* 1B90 80026790 00000000 */ nop +/* 1B94 80026794 3C028007 */ lui $v0, %hi(D_80074000) +/* 1B98 80026798 90424000 */ lbu $v0, %lo(D_80074000)($v0) +/* 1B9C 8002679C A0820000 */ sb $v0, ($a0) +.L800267A0: +/* 1BA0 800267A0 0C04833E */ jal func_80120CF8 +/* 1BA4 800267A4 00000000 */ nop +/* 1BA8 800267A8 0C00E08F */ jal func_8003823C +/* 1BAC 800267AC 00000000 */ nop +/* 1BB0 800267B0 0C04A185 */ jal func_80128614 +/* 1BB4 800267B4 00000000 */ nop +/* 1BB8 800267B8 0C052A44 */ jal func_8014A910 +/* 1BBC 800267BC 00000000 */ nop +/* 1BC0 800267C0 0C0B0F5D */ jal func_802C3D74 +/* 1BC4 800267C4 00000000 */ nop +/* 1BC8 800267C8 0C04A298 */ jal func_80128A60 +/* 1BCC 800267CC 00000000 */ nop +/* 1BD0 800267D0 0C0519B0 */ jal func_801466C0 +/* 1BD4 800267D4 00000000 */ nop +/* 1BD8 800267D8 0C046022 */ jal func_80118088 +/* 1BDC 800267DC 00000000 */ nop +/* 1BE0 800267E0 0C045238 */ jal func_801148E0 +/* 1BE4 800267E4 00000000 */ nop +/* 1BE8 800267E8 0C04F492 */ jal func_8013D248 +/* 1BEC 800267EC 00000000 */ nop +/* 1BF0 800267F0 0C053D7E */ jal func_8014F5F8 +/* 1BF4 800267F4 00000000 */ nop +/* 1BF8 800267F8 0C0530C5 */ jal func_8014C314 +/* 1BFC 800267FC 00000000 */ nop +/* 1C00 80026800 0C0539F9 */ jal func_8014E7E4 +/* 1C04 80026804 00000000 */ nop +/* 1C08 80026808 0C053131 */ jal func_8014C4C4 +/* 1C0C 8002680C 00000000 */ nop +/* 1C10 80026810 0C00AE8E */ jal func_8002BA38 +/* 1C14 80026814 00000000 */ nop +/* 1C18 80026818 3C10800A */ lui $s0, %hi(D_8009A630) +/* 1C1C 8002681C 2610A630 */ addiu $s0, $s0, %lo(D_8009A630) +/* 1C20 80026820 8E040000 */ lw $a0, ($s0) +/* 1C24 80026824 30820020 */ andi $v0, $a0, 0x20 +/* 1C28 80026828 10400035 */ beqz $v0, .L80026900 +/* 1C2C 8002682C 00000000 */ nop +/* 1C30 80026830 3C118007 */ lui $s1, %hi(D_80074182) +/* 1C34 80026834 26314182 */ addiu $s1, $s1, %lo(D_80074182) +/* 1C38 80026838 86230000 */ lh $v1, ($s1) +/* 1C3C 8002683C 10600005 */ beqz $v1, .L80026854 +/* 1C40 80026840 24020001 */ addiu $v0, $zero, 1 +/* 1C44 80026844 1062001C */ beq $v1, $v0, .L800268B8 +/* 1C48 80026848 34840008 */ ori $a0, $a0, 8 +/* 1C4C 8002684C 08009A44 */ j .L80026910 +/* 1C50 80026850 00000000 */ nop +.L80026854: +/* 1C54 80026854 34820200 */ ori $v0, $a0, 0x200 +/* 1C58 80026858 0C038056 */ jal func_800E0158 +/* 1C5C 8002685C AE020000 */ sw $v0, ($s0) +/* 1C60 80026860 3C048007 */ lui $a0, %hi(D_80074180) +/* 1C64 80026864 24844180 */ addiu $a0, $a0, %lo(D_80074180) +/* 1C68 80026868 240500FF */ addiu $a1, $zero, 0xff +/* 1C6C 8002686C 84820000 */ lh $v0, ($a0) +/* 1C70 80026870 94830000 */ lhu $v1, ($a0) +/* 1C74 80026874 14450008 */ bne $v0, $a1, .L80026898 +/* 1C78 80026878 2462000A */ addiu $v0, $v1, 0xa +/* 1C7C 8002687C 24020001 */ addiu $v0, $zero, 1 +/* 1C80 80026880 A6220000 */ sh $v0, ($s1) +/* 1C84 80026884 24020003 */ addiu $v0, $zero, 3 +/* 1C88 80026888 3C01800A */ lui $at, %hi(D_8009A670) +/* 1C8C 8002688C A422A670 */ sh $v0, %lo(D_8009A670)($at) +/* 1C90 80026890 08009A44 */ j .L80026910 +/* 1C94 80026894 00000000 */ nop +.L80026898: +/* 1C98 80026898 A4820000 */ sh $v0, ($a0) +/* 1C9C 8002689C 00021400 */ sll $v0, $v0, 0x10 +/* 1CA0 800268A0 00021403 */ sra $v0, $v0, 0x10 +/* 1CA4 800268A4 28420100 */ slti $v0, $v0, 0x100 +/* 1CA8 800268A8 50400019 */ beql $v0, $zero, .L80026910 +/* 1CAC 800268AC A4850000 */ sh $a1, ($a0) +/* 1CB0 800268B0 08009A44 */ j .L80026910 +/* 1CB4 800268B4 00000000 */ nop +.L800268B8: +/* 1CB8 800268B8 3C02800A */ lui $v0, %hi(D_8009A670) +/* 1CBC 800268BC 2442A670 */ addiu $v0, $v0, %lo(D_8009A670) +/* 1CC0 800268C0 94430000 */ lhu $v1, ($v0) +/* 1CC4 800268C4 AE040000 */ sw $a0, ($s0) +/* 1CC8 800268C8 2463FFFF */ addiu $v1, $v1, -1 +/* 1CCC 800268CC A4430000 */ sh $v1, ($v0) +/* 1CD0 800268D0 00031C00 */ sll $v1, $v1, 0x10 +/* 1CD4 800268D4 1460000E */ bnez $v1, .L80026910 +/* 1CD8 800268D8 00000000 */ nop +/* 1CDC 800268DC 0C053A3A */ jal func_8014E8E8 +/* 1CE0 800268E0 00000000 */ nop +/* 1CE4 800268E4 0C00CC60 */ jal func_80033180 +/* 1CE8 800268E8 0000202D */ daddu $a0, $zero, $zero +/* 1CEC 800268EC 8E020000 */ lw $v0, ($s0) +/* 1CF0 800268F0 2403FFDF */ addiu $v1, $zero, -0x21 +/* 1CF4 800268F4 00431024 */ and $v0, $v0, $v1 +/* 1CF8 800268F8 08009A44 */ j .L80026910 +/* 1CFC 800268FC AE020000 */ sw $v0, ($s0) +.L80026900: +/* 1D00 80026900 3C018007 */ lui $at, %hi(D_80074180) +/* 1D04 80026904 A4204180 */ sh $zero, %lo(D_80074180)($at) +/* 1D08 80026908 3C018007 */ lui $at, %hi(D_80074182) +/* 1D0C 8002690C A4204182 */ sh $zero, %lo(D_80074182)($at) +.L80026910: +/* 1D10 80026910 3C04800A */ lui $a0, %hi(D_8009A630) +/* 1D14 80026914 2484A630 */ addiu $a0, $a0, %lo(D_8009A630) +/* 1D18 80026918 8C830000 */ lw $v1, ($a0) +/* 1D1C 8002691C 30620100 */ andi $v0, $v1, 0x100 +/* 1D20 80026920 14400003 */ bnez $v0, .L80026930 +/* 1D24 80026924 34621000 */ ori $v0, $v1, 0x1000 +/* 1D28 80026928 2402EFFF */ addiu $v0, $zero, -0x1001 +/* 1D2C 8002692C 00621024 */ and $v0, $v1, $v0 +.L80026930: +/* 1D30 80026930 AC820000 */ sw $v0, ($a0) +/* 1D34 80026934 3C04800A */ lui $a0, %hi(D_8009A630) +/* 1D38 80026938 2484A630 */ addiu $a0, $a0, %lo(D_8009A630) +/* 1D3C 8002693C 8C830000 */ lw $v1, ($a0) +/* 1D40 80026940 30620200 */ andi $v0, $v1, 0x200 +/* 1D44 80026944 14400003 */ bnez $v0, .L80026954 +/* 1D48 80026948 34622000 */ ori $v0, $v1, 0x2000 +/* 1D4C 8002694C 2402DFFF */ addiu $v0, $zero, -0x2001 +/* 1D50 80026950 00621024 */ and $v0, $v1, $v0 +.L80026954: +/* 1D54 80026954 AC820000 */ sw $v0, ($a0) +/* 1D58 80026958 3C04800A */ lui $a0, %hi(D_8009A630) +/* 1D5C 8002695C 2484A630 */ addiu $a0, $a0, %lo(D_8009A630) +/* 1D60 80026960 8C830000 */ lw $v1, ($a0) +/* 1D64 80026964 30620400 */ andi $v0, $v1, 0x400 +/* 1D68 80026968 14400003 */ bnez $v0, .L80026978 +/* 1D6C 8002696C 34624000 */ ori $v0, $v1, 0x4000 +/* 1D70 80026970 2402BFFF */ addiu $v0, $zero, -0x4001 +/* 1D74 80026974 00621024 */ and $v0, $v1, $v0 +.L80026978: +/* 1D78 80026978 AC820000 */ sw $v0, ($a0) +/* 1D7C 8002697C 3C04800A */ lui $a0, %hi(D_8009A630) +/* 1D80 80026980 2484A630 */ addiu $a0, $a0, %lo(D_8009A630) +/* 1D84 80026984 8C830000 */ lw $v1, ($a0) +/* 1D88 80026988 30620800 */ andi $v0, $v1, 0x800 +/* 1D8C 8002698C 14400004 */ bnez $v0, .L800269A0 +/* 1D90 80026990 34628000 */ ori $v0, $v1, 0x8000 +/* 1D94 80026994 3C02FFFF */ lui $v0, 0xffff +/* 1D98 80026998 34427FFF */ ori $v0, $v0, 0x7fff +/* 1D9C 8002699C 00621024 */ and $v0, $v1, $v0 +.L800269A0: +/* 1DA0 800269A0 AC820000 */ sw $v0, ($a0) +/* 1DA4 800269A4 0C00A66F */ jal func_800299BC +/* 1DA8 800269A8 24040001 */ addiu $a0, $zero, 1 +.L800269AC: +/* 1DAC 800269AC 8FBF0018 */ lw $ra, 0x18($sp) +/* 1DB0 800269B0 8FB10014 */ lw $s1, 0x14($sp) +/* 1DB4 800269B4 8FB00010 */ lw $s0, 0x10($sp) +/* 1DB8 800269B8 03E00008 */ jr $ra +/* 1DBC 800269BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/jp/asm/nonmatchings/main_1B10/func_800269C0.s b/ver/jp/asm/nonmatchings/main_1B10/func_800269C0.s new file mode 100644 index 0000000000..532f9826d6 --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1B10/func_800269C0.s @@ -0,0 +1,75 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_800269C0 +/* 1DC0 800269C0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 1DC4 800269C4 AFB20018 */ sw $s2, 0x18($sp) +/* 1DC8 800269C8 3C120001 */ lui $s2, 1 +/* 1DCC 800269CC 36520230 */ ori $s2, $s2, 0x230 +/* 1DD0 800269D0 AFB10014 */ sw $s1, 0x14($sp) +/* 1DD4 800269D4 3C11800A */ lui $s1, %hi(D_8009A654) +/* 1DD8 800269D8 2631A654 */ addiu $s1, $s1, %lo(D_8009A654) +/* 1DDC 800269DC 3C038007 */ lui $v1, %hi(D_800741D4) +/* 1DE0 800269E0 8C6341D4 */ lw $v1, %lo(D_800741D4)($v1) +/* 1DE4 800269E4 3C048016 */ lui $a0, %hi(D_80164000) +/* 1DE8 800269E8 24844000 */ addiu $a0, $a0, %lo(D_80164000) +/* 1DEC 800269EC AFB00010 */ sw $s0, 0x10($sp) +/* 1DF0 800269F0 3C10800A */ lui $s0, %hi(D_8009A64C) +/* 1DF4 800269F4 2610A64C */ addiu $s0, $s0, %lo(D_8009A64C) +/* 1DF8 800269F8 AFBF001C */ sw $ra, 0x1c($sp) +/* 1DFC 800269FC 00031040 */ sll $v0, $v1, 1 +/* 1E00 80026A00 00431021 */ addu $v0, $v0, $v1 +/* 1E04 80026A04 00021940 */ sll $v1, $v0, 5 +/* 1E08 80026A08 00431021 */ addu $v0, $v0, $v1 +/* 1E0C 80026A0C 00021980 */ sll $v1, $v0, 6 +/* 1E10 80026A10 00431021 */ addu $v0, $v0, $v1 +/* 1E14 80026A14 00021100 */ sll $v0, $v0, 4 +/* 1E18 80026A18 00441021 */ addu $v0, $v0, $a0 +/* 1E1C 80026A1C AE220000 */ sw $v0, ($s1) +/* 1E20 80026A20 00521021 */ addu $v0, $v0, $s2 +/* 1E24 80026A24 0C009C5C */ jal func_80027170 +/* 1E28 80026A28 AE020000 */ sw $v0, ($s0) +/* 1E2C 80026A2C 0C009F78 */ jal func_80027DE0 +/* 1E30 80026A30 00000000 */ nop +/* 1E34 80026A34 8E030000 */ lw $v1, ($s0) +/* 1E38 80026A38 3C02E900 */ lui $v0, 0xe900 +/* 1E3C 80026A3C 0060202D */ daddu $a0, $v1, $zero +/* 1E40 80026A40 24630008 */ addiu $v1, $v1, 8 +/* 1E44 80026A44 AE030000 */ sw $v1, ($s0) +/* 1E48 80026A48 AC820000 */ sw $v0, ($a0) +/* 1E4C 80026A4C 24620008 */ addiu $v0, $v1, 8 +/* 1E50 80026A50 AC800004 */ sw $zero, 4($a0) +/* 1E54 80026A54 3C04DF00 */ lui $a0, 0xdf00 +/* 1E58 80026A58 AE020000 */ sw $v0, ($s0) +/* 1E5C 80026A5C AC640000 */ sw $a0, ($v1) +/* 1E60 80026A60 AC600004 */ sw $zero, 4($v1) +/* 1E64 80026A64 8E230000 */ lw $v1, ($s1) +/* 1E68 80026A68 00521023 */ subu $v0, $v0, $s2 +/* 1E6C 80026A6C 00431023 */ subu $v0, $v0, $v1 +/* 1E70 80026A70 000210C2 */ srl $v0, $v0, 3 +/* 1E74 80026A74 28420200 */ slti $v0, $v0, 0x200 +/* 1E78 80026A78 14400003 */ bnez $v0, .L80026A88 +/* 1E7C 80026A7C 3C040001 */ lui $a0, 1 +.L80026A80: +/* 1E80 80026A80 08009AA0 */ j .L80026A80 +/* 1E84 80026A84 00000000 */ nop +.L80026A88: +/* 1E88 80026A88 34840230 */ ori $a0, $a0, 0x230 +/* 1E8C 80026A8C 0000302D */ daddu $a2, $zero, $zero +/* 1E90 80026A90 00C0382D */ daddu $a3, $a2, $zero +/* 1E94 80026A94 3C05800A */ lui $a1, %hi(D_8009A64C) +/* 1E98 80026A98 8CA5A64C */ lw $a1, %lo(D_8009A64C)($a1) +/* 1E9C 80026A9C 3C02800A */ lui $v0, %hi(D_8009A654) +/* 1EA0 80026AA0 8C42A654 */ lw $v0, %lo(D_8009A654)($v0) +/* 1EA4 80026AA4 00A42823 */ subu $a1, $a1, $a0 +/* 1EA8 80026AA8 00A22823 */ subu $a1, $a1, $v0 +/* 1EAC 80026AAC 000528C3 */ sra $a1, $a1, 3 +/* 1EB0 80026AB0 00442021 */ addu $a0, $v0, $a0 +/* 1EB4 80026AB4 0C00B3C9 */ jal func_8002CF24 +/* 1EB8 80026AB8 000528C0 */ sll $a1, $a1, 3 +/* 1EBC 80026ABC 8FBF001C */ lw $ra, 0x1c($sp) +/* 1EC0 80026AC0 8FB20018 */ lw $s2, 0x18($sp) +/* 1EC4 80026AC4 8FB10014 */ lw $s1, 0x14($sp) +/* 1EC8 80026AC8 8FB00010 */ lw $s0, 0x10($sp) +/* 1ECC 80026ACC 03E00008 */ jr $ra +/* 1ED0 80026AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/jp/asm/nonmatchings/main_1B10/func_80026AD4.s b/ver/jp/asm/nonmatchings/main_1B10/func_80026AD4.s new file mode 100644 index 0000000000..7dd8d2611c --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1B10/func_80026AD4.s @@ -0,0 +1,197 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80026AD4 +/* 1ED4 80026AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 1ED8 80026AD8 3C04800A */ lui $a0, %hi(D_8009A654) +/* 1EDC 80026ADC 8C84A654 */ lw $a0, %lo(D_8009A654)($a0) +/* 1EE0 80026AE0 3C05800A */ lui $a1, %hi(D_8009A64C) +/* 1EE4 80026AE4 24A5A64C */ addiu $a1, $a1, %lo(D_8009A64C) +/* 1EE8 80026AE8 AFB00010 */ sw $s0, 0x10($sp) +/* 1EEC 80026AEC 3C10800A */ lui $s0, %hi(D_8009A630) +/* 1EF0 80026AF0 2610A630 */ addiu $s0, $s0, %lo(D_8009A630) +/* 1EF4 80026AF4 AFBF0018 */ sw $ra, 0x18($sp) +/* 1EF8 80026AF8 AFB10014 */ sw $s1, 0x14($sp) +/* 1EFC 80026AFC 3C018007 */ lui $at, %hi(D_800741D0) +/* 1F00 80026B00 A42041D0 */ sh $zero, %lo(D_800741D0)($at) +/* 1F04 80026B04 8E020000 */ lw $v0, ($s0) +/* 1F08 80026B08 24830230 */ addiu $v1, $a0, 0x230 +/* 1F0C 80026B0C 30420008 */ andi $v0, $v0, 8 +/* 1F10 80026B10 10400007 */ beqz $v0, .L80026B30 +/* 1F14 80026B14 ACA30000 */ sw $v1, ($a1) +/* 1F18 80026B18 3C038007 */ lui $v1, %hi(D_800741D4) +/* 1F1C 80026B1C 246341D4 */ addiu $v1, $v1, %lo(D_800741D4) +/* 1F20 80026B20 8C620000 */ lw $v0, ($v1) +/* 1F24 80026B24 38420001 */ xori $v0, $v0, 1 +/* 1F28 80026B28 08009B65 */ j .L80026D94 +/* 1F2C 80026B2C AC620000 */ sw $v0, ($v1) +.L80026B30: +/* 1F30 80026B30 3C03DA38 */ lui $v1, 0xda38 +/* 1F34 80026B34 34630003 */ ori $v1, $v1, 3 +/* 1F38 80026B38 24820238 */ addiu $v0, $a0, 0x238 +/* 1F3C 80026B3C ACA20000 */ sw $v0, ($a1) +/* 1F40 80026B40 3C028007 */ lui $v0, %hi(D_80074188) +/* 1F44 80026B44 24424188 */ addiu $v0, $v0, %lo(D_80074188) +/* 1F48 80026B48 AC830230 */ sw $v1, 0x230($a0) +/* 1F4C 80026B4C 0C04456C */ jal func_801115B0 +/* 1F50 80026B50 AC820234 */ sw $v0, 0x234($a0) +/* 1F54 80026B54 8E020000 */ lw $v0, ($s0) +/* 1F58 80026B58 30420002 */ andi $v0, $v0, 2 +/* 1F5C 80026B5C 14400003 */ bnez $v0, .L80026B6C +/* 1F60 80026B60 00000000 */ nop +/* 1F64 80026B64 0C00B4F3 */ jal func_8002D3CC +/* 1F68 80026B68 0000202D */ daddu $a0, $zero, $zero +.L80026B6C: +/* 1F6C 80026B6C 0C038090 */ jal func_800E0240 +/* 1F70 80026B70 00000000 */ nop +/* 1F74 80026B74 0C0B0FB9 */ jal func_802C3EE4 +/* 1F78 80026B78 00000000 */ nop +/* 1F7C 80026B7C 0C04F4B4 */ jal func_8013D2D0 +/* 1F80 80026B80 00000000 */ nop +/* 1F84 80026B84 0C04A1D8 */ jal func_80128760 +/* 1F88 80026B88 00000000 */ nop +/* 1F8C 80026B8C 0C051CB0 */ jal func_801472C0 +/* 1F90 80026B90 00000000 */ nop +/* 1F94 80026B94 0C016711 */ jal func_80059C44 +/* 1F98 80026B98 00000000 */ nop +/* 1F9C 80026B9C 0C04605A */ jal func_80118168 +/* 1FA0 80026BA0 00000000 */ nop +/* 1FA4 80026BA4 8E020000 */ lw $v0, ($s0) +/* 1FA8 80026BA8 3C030001 */ lui $v1, 1 +/* 1FAC 80026BAC 00431024 */ and $v0, $v0, $v1 +/* 1FB0 80026BB0 14400003 */ bnez $v0, .L80026BC0 +/* 1FB4 80026BB4 00000000 */ nop +/* 1FB8 80026BB8 0C0532DD */ jal func_8014CB74 +/* 1FBC 80026BBC 00000000 */ nop +.L80026BC0: +/* 1FC0 80026BC0 8E020000 */ lw $v0, ($s0) +/* 1FC4 80026BC4 30420002 */ andi $v0, $v0, 2 +/* 1FC8 80026BC8 14400009 */ bnez $v0, .L80026BF0 +/* 1FCC 80026BCC 3C100010 */ lui $s0, 0x10 +/* 1FD0 80026BD0 3C028007 */ lui $v0, %hi(D_8007417C) +/* 1FD4 80026BD4 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1FD8 80026BD8 80420078 */ lb $v0, 0x78($v0) +/* 1FDC 80026BDC 14400004 */ bnez $v0, .L80026BF0 +/* 1FE0 80026BE0 00000000 */ nop +/* 1FE4 80026BE4 0C00B4F3 */ jal func_8002D3CC +/* 1FE8 80026BE8 24040001 */ addiu $a0, $zero, 1 +/* 1FEC 80026BEC 3C100010 */ lui $s0, 0x10 +.L80026BF0: +/* 1FF0 80026BF0 3C11800A */ lui $s1, %hi(D_8009A630) +/* 1FF4 80026BF4 2631A630 */ addiu $s1, $s1, %lo(D_8009A630) +/* 1FF8 80026BF8 8E220000 */ lw $v0, ($s1) +/* 1FFC 80026BFC 36100010 */ ori $s0, $s0, 0x10 +/* 2000 80026C00 00501024 */ and $v0, $v0, $s0 +/* 2004 80026C04 14400003 */ bnez $v0, .L80026C14 +/* 2008 80026C08 00000000 */ nop +/* 200C 80026C0C 0C04A523 */ jal func_8012948C +/* 2010 80026C10 00000000 */ nop +.L80026C14: +/* 2014 80026C14 0C04A1BC */ jal func_801286F0 +/* 2018 80026C18 00000000 */ nop +/* 201C 80026C1C 0C051DF3 */ jal func_801477CC +/* 2020 80026C20 00000000 */ nop +/* 2024 80026C24 0C04F494 */ jal func_8013D250 +/* 2028 80026C28 00000000 */ nop +/* 202C 80026C2C 8E220000 */ lw $v0, ($s1) +/* 2030 80026C30 24030010 */ addiu $v1, $zero, 0x10 +/* 2034 80026C34 00501024 */ and $v0, $v0, $s0 +/* 2038 80026C38 14430003 */ bne $v0, $v1, .L80026C48 +/* 203C 80026C3C 00000000 */ nop +/* 2040 80026C40 0C04A523 */ jal func_8012948C +/* 2044 80026C44 00000000 */ nop +.L80026C48: +/* 2048 80026C48 0C00AE90 */ jal func_8002BA40 +/* 204C 80026C4C 00000000 */ nop +/* 2050 80026C50 8E220000 */ lw $v0, ($s1) +/* 2054 80026C54 3C030010 */ lui $v1, 0x10 +/* 2058 80026C58 00431024 */ and $v0, $v0, $v1 +/* 205C 80026C5C 10400003 */ beqz $v0, .L80026C6C +/* 2060 80026C60 00000000 */ nop +/* 2064 80026C64 0C04A523 */ jal func_8012948C +/* 2068 80026C68 00000000 */ nop +.L80026C6C: +/* 206C 80026C6C 8E220000 */ lw $v0, ($s1) +/* 2070 80026C70 3C030001 */ lui $v1, 1 +/* 2074 80026C74 00431024 */ and $v0, $v0, $v1 +/* 2078 80026C78 10400003 */ beqz $v0, .L80026C88 +/* 207C 80026C7C 00000000 */ nop +/* 2080 80026C80 0C0532DD */ jal func_8014CB74 +/* 2084 80026C84 00000000 */ nop +.L80026C88: +/* 2088 80026C88 0C046075 */ jal func_801181D4 +/* 208C 80026C8C 00000000 */ nop +/* 2090 80026C90 8E220000 */ lw $v0, ($s1) +/* 2094 80026C94 30420020 */ andi $v0, $v0, 0x20 +/* 2098 80026C98 10400010 */ beqz $v0, .L80026CDC +/* 209C 80026C9C 00000000 */ nop +/* 20A0 80026CA0 3C038007 */ lui $v1, %hi(D_80074182) +/* 20A4 80026CA4 84634182 */ lh $v1, %lo(D_80074182)($v1) +/* 20A8 80026CA8 28620002 */ slti $v0, $v1, 2 +/* 20AC 80026CAC 1040000B */ beqz $v0, .L80026CDC +/* 20B0 80026CB0 00000000 */ nop +/* 20B4 80026CB4 04600009 */ bltz $v1, .L80026CDC +/* 20B8 80026CB8 24040007 */ addiu $a0, $zero, 7 +/* 20BC 80026CBC 3C028007 */ lui $v0, %hi(D_80074180) +/* 20C0 80026CC0 84424180 */ lh $v0, %lo(D_80074180)($v0) +/* 20C4 80026CC4 44820000 */ mtc1 $v0, $f0 +/* 20C8 80026CC8 00000000 */ nop +/* 20CC 80026CCC 46800020 */ cvt.s.w $f0, $f0 +/* 20D0 80026CD0 44050000 */ mfc1 $a1, $f0 +/* 20D4 80026CD4 0C04EECC */ jal func_8013BB30 +/* 20D8 80026CD8 0000302D */ daddu $a2, $zero, $zero +.L80026CDC: +/* 20DC 80026CDC 3C02800A */ lui $v0, %hi(D_8009A64C) +/* 20E0 80026CE0 8C42A64C */ lw $v0, %lo(D_8009A64C)($v0) +/* 20E4 80026CE4 3C03800A */ lui $v1, %hi(D_8009A654) +/* 20E8 80026CE8 8C63A654 */ lw $v1, %lo(D_8009A654)($v1) +/* 20EC 80026CEC 2442FDD0 */ addiu $v0, $v0, -0x230 +/* 20F0 80026CF0 00431023 */ subu $v0, $v0, $v1 +/* 20F4 80026CF4 000210C2 */ srl $v0, $v0, 3 +/* 20F8 80026CF8 28422000 */ slti $v0, $v0, 0x2000 +/* 20FC 80026CFC 54400003 */ bnel $v0, $zero, .L80026D0C +/* 2100 80026D00 0000302D */ daddu $a2, $zero, $zero +.L80026D04: +/* 2104 80026D04 08009B41 */ j .L80026D04 +/* 2108 80026D08 00000000 */ nop +.L80026D0C: +/* 210C 80026D0C 3C070004 */ lui $a3, 4 +/* 2110 80026D10 3C08800A */ lui $t0, %hi(D_8009A64C) +/* 2114 80026D14 2508A64C */ addiu $t0, $t0, %lo(D_8009A64C) +/* 2118 80026D18 34E70001 */ ori $a3, $a3, 1 +/* 211C 80026D1C 8D030000 */ lw $v1, ($t0) +/* 2120 80026D20 3C02800A */ lui $v0, %hi(D_8009A654) +/* 2124 80026D24 8C42A654 */ lw $v0, %lo(D_8009A654)($v0) +/* 2128 80026D28 0060482D */ daddu $t1, $v1, $zero +/* 212C 80026D2C 24630008 */ addiu $v1, $v1, 8 +/* 2130 80026D30 24440230 */ addiu $a0, $v0, 0x230 +/* 2134 80026D34 2465FDD8 */ addiu $a1, $v1, -0x228 +/* 2138 80026D38 00A22823 */ subu $a1, $a1, $v0 +/* 213C 80026D3C 000528C3 */ sra $a1, $a1, 3 +/* 2140 80026D40 000528C0 */ sll $a1, $a1, 3 +/* 2144 80026D44 3C02E900 */ lui $v0, 0xe900 +/* 2148 80026D48 AD030000 */ sw $v1, ($t0) +/* 214C 80026D4C AD220000 */ sw $v0, ($t1) +/* 2150 80026D50 24620008 */ addiu $v0, $v1, 8 +/* 2154 80026D54 AD200004 */ sw $zero, 4($t1) +/* 2158 80026D58 AD020000 */ sw $v0, ($t0) +/* 215C 80026D5C 3C02DF00 */ lui $v0, 0xdf00 +/* 2160 80026D60 AC620000 */ sw $v0, ($v1) +/* 2164 80026D64 0C00B3C9 */ jal func_8002CF24 +/* 2168 80026D68 AC600004 */ sw $zero, 4($v1) +/* 216C 80026D6C 24050140 */ addiu $a1, $zero, 0x140 +/* 2170 80026D70 240600F0 */ addiu $a2, $zero, 0xf0 +/* 2174 80026D74 3C038007 */ lui $v1, %hi(D_800741D4) +/* 2178 80026D78 246341D4 */ addiu $v1, $v1, %lo(D_800741D4) +/* 217C 80026D7C 8C620000 */ lw $v0, ($v1) +/* 2180 80026D80 3C04800A */ lui $a0, %hi(D_8009A62C) +/* 2184 80026D84 8C84A62C */ lw $a0, %lo(D_8009A62C)($a0) +/* 2188 80026D88 38420001 */ xori $v0, $v0, 1 +/* 218C 80026D8C 0C00B214 */ jal func_8002C850 +/* 2190 80026D90 AC620000 */ sw $v0, ($v1) +.L80026D94: +/* 2194 80026D94 8FBF0018 */ lw $ra, 0x18($sp) +/* 2198 80026D98 8FB10014 */ lw $s1, 0x14($sp) +/* 219C 80026D9C 8FB00010 */ lw $s0, 0x10($sp) +/* 21A0 80026DA0 03E00008 */ jr $ra +/* 21A4 80026DA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/jp/asm/nonmatchings/main_1B10/func_80026DA8.s b/ver/jp/asm/nonmatchings/main_1B10/func_80026DA8.s new file mode 100644 index 0000000000..bf8be950c8 --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1B10/func_80026DA8.s @@ -0,0 +1,176 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80026DA8 +/* 21A8 80026DA8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 21AC 80026DAC 3C04000A */ lui $a0, 0xa +/* 21B0 80026DB0 24845F90 */ addiu $a0, $a0, 0x5f90 +/* 21B4 80026DB4 3C05000B */ lui $a1, 0xb +/* 21B8 80026DB8 24A59770 */ addiu $a1, $a1, -0x6890 +/* 21BC 80026DBC 3C068011 */ lui $a2, %hi(D_8010F890) +/* 21C0 80026DC0 24C6F890 */ addiu $a2, $a2, %lo(D_8010F890) +/* 21C4 80026DC4 AFBF0014 */ sw $ra, 0x14($sp) +/* 21C8 80026DC8 0C00A5BF */ jal func_800296FC +/* 21CC 80026DCC AFB00010 */ sw $s0, 0x10($sp) +/* 21D0 80026DD0 3C040007 */ lui $a0, 7 +/* 21D4 80026DD4 24845990 */ addiu $a0, $a0, 0x5990 +/* 21D8 80026DD8 3C05000A */ lui $a1, 0xa +/* 21DC 80026DDC 24A55F90 */ addiu $a1, $a1, 0x5f90 +/* 21E0 80026DE0 3C06800E */ lui $a2, %hi(D_800DC4E0) +/* 21E4 80026DE4 24C6C4E0 */ addiu $a2, $a2, %lo(D_800DC4E0) +/* 21E8 80026DE8 0C00A5BF */ jal func_800296FC +/* 21EC 80026DEC 00000000 */ nop +/* 21F0 80026DF0 3C04000F */ lui $a0, 0xf +/* 21F4 80026DF4 2484B1A0 */ addiu $a0, $a0, -0x4e60 +/* 21F8 80026DF8 3C050010 */ lui $a1, 0x10 +/* 21FC 80026DFC 24A52620 */ addiu $a1, $a1, 0x2620 +/* 2200 80026E00 3C06802C */ lui $a2, %hi(D_802C3000) +/* 2204 80026E04 24C63000 */ addiu $a2, $a2, %lo(D_802C3000) +/* 2208 80026E08 0C00A5BF */ jal func_800296FC +/* 220C 80026E0C 00000000 */ nop +/* 2210 80026E10 3C040010 */ lui $a0, 0x10 +/* 2214 80026E14 24842620 */ addiu $a0, $a0, 0x2620 +/* 2218 80026E18 3C050011 */ lui $a1, 0x11 +/* 221C 80026E1C 24A5CC20 */ addiu $a1, $a1, -0x33e0 +/* 2220 80026E20 3C06802E */ lui $a2, %hi(D_802DBD40) +/* 2224 80026E24 24C6BD40 */ addiu $a2, $a2, %lo(D_802DBD40) +/* 2228 80026E28 0C00A5BF */ jal func_800296FC +/* 222C 80026E2C 00000000 */ nop +/* 2230 80026E30 3C04000B */ lui $a0, 0xb +/* 2234 80026E34 24849770 */ addiu $a0, $a0, -0x6890 +/* 2238 80026E38 3C05000F */ lui $a1, 0xf +/* 223C 80026E3C 24A5B1A0 */ addiu $a1, $a1, -0x4e60 +/* 2240 80026E40 3C068011 */ lui $a2, %hi(func_801148E0) +/* 2244 80026E44 24C648E0 */ addiu $a2, $a2, %lo(func_801148E0) +/* 2248 80026E48 0C00A5BF */ jal func_800296FC +/* 224C 80026E4C 00000000 */ nop +/* 2250 80026E50 3C040011 */ lui $a0, 0x11 +/* 2254 80026E54 2484CC20 */ addiu $a0, $a0, -0x33e0 +/* 2258 80026E58 3C050011 */ lui $a1, 0x11 +/* 225C 80026E5C 24A5F330 */ addiu $a1, $a1, -0xcd0 +/* 2260 80026E60 3C06802E */ lui $a2, %hi(D_802E6380) +/* 2264 80026E64 24C66380 */ addiu $a2, $a2, %lo(D_802E6380) +/* 2268 80026E68 0C00A5BF */ jal func_800296FC +/* 226C 80026E6C 00000000 */ nop +/* 2270 80026E70 3C108007 */ lui $s0, %hi(D_8007417C) +/* 2274 80026E74 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 2278 80026E78 8E020000 */ lw $v0, ($s0) +/* 227C 80026E7C 3C01800A */ lui $at, %hi(D_8009A630) +/* 2280 80026E80 AC20A630 */ sw $zero, %lo(D_8009A630)($at) +/* 2284 80026E84 A0400079 */ sb $zero, 0x79($v0) +/* 2288 80026E88 8E030000 */ lw $v1, ($s0) +/* 228C 80026E8C 24040001 */ addiu $a0, $zero, 1 +/* 2290 80026E90 A064007A */ sb $a0, 0x7a($v1) +/* 2294 80026E94 8E020000 */ lw $v0, ($s0) +/* 2298 80026E98 A4600148 */ sh $zero, 0x148($v1) +/* 229C 80026E9C A044007C */ sb $a0, 0x7c($v0) +/* 22A0 80026EA0 8E030000 */ lw $v1, ($s0) +/* 22A4 80026EA4 2402FFFF */ addiu $v0, $zero, -1 +/* 22A8 80026EA8 A06200A8 */ sb $v0, 0xa8($v1) +/* 22AC 80026EAC 8E020000 */ lw $v0, ($s0) +/* 22B0 80026EB0 A04000AA */ sb $zero, 0xaa($v0) +/* 22B4 80026EB4 8E020000 */ lw $v0, ($s0) +/* 22B8 80026EB8 A0400081 */ sb $zero, 0x81($v0) +/* 22BC 80026EBC 8E030000 */ lw $v1, ($s0) +/* 22C0 80026EC0 2402FFF8 */ addiu $v0, $zero, -8 +/* 22C4 80026EC4 A0620082 */ sb $v0, 0x82($v1) +/* 22C8 80026EC8 8E030000 */ lw $v1, ($s0) +/* 22CC 80026ECC 24020004 */ addiu $v0, $zero, 4 +/* 22D0 80026ED0 A0620083 */ sb $v0, 0x83($v1) +/* 22D4 80026ED4 8E020000 */ lw $v0, ($s0) +/* 22D8 80026ED8 3C01800A */ lui $at, %hi(D_8009A5B8) +/* 22DC 80026EDC AC20A5B8 */ sw $zero, %lo(D_8009A5B8)($at) +/* 22E0 80026EE0 A440013C */ sh $zero, 0x13c($v0) +/* 22E4 80026EE4 A0400075 */ sb $zero, 0x75($v0) +/* 22E8 80026EE8 8E030000 */ lw $v1, ($s0) +/* 22EC 80026EEC 24020005 */ addiu $v0, $zero, 5 +/* 22F0 80026EF0 3C018007 */ lui $at, %hi(D_80074001) +/* 22F4 80026EF4 A0224001 */ sb $v0, %lo(D_80074001)($at) +/* 22F8 80026EF8 0C00AE03 */ jal func_8002B80C +/* 22FC 80026EFC AC600168 */ sw $zero, 0x168($v1) +/* 2300 80026F00 0C00A202 */ jal func_80028808 +/* 2304 80026F04 00000000 */ nop +/* 2308 80026F08 0C00AAF0 */ jal func_8002ABC0 +/* 230C 80026F0C 00000000 */ nop +/* 2310 80026F10 0C048AA8 */ jal func_80122AA0 +/* 2314 80026F14 00000000 */ nop +/* 2318 80026F18 0C04A0B2 */ jal func_801282C8 +/* 231C 80026F1C 00000000 */ nop +/* 2320 80026F20 0C0B0C77 */ jal func_802C31DC +/* 2324 80026F24 00000000 */ nop +/* 2328 80026F28 0C00B6E1 */ jal func_8002DB84 +/* 232C 80026F2C 00000000 */ nop +/* 2330 80026F30 0C037F0C */ jal func_800DFC30 +/* 2334 80026F34 00000000 */ nop +/* 2338 80026F38 0C044512 */ jal func_80111448 +/* 233C 80026F3C 0000202D */ daddu $a0, $zero, $zero +/* 2340 80026F40 0C049770 */ jal func_80125DC0 +/* 2344 80026F44 00000000 */ nop +/* 2348 80026F48 0C048D0D */ jal func_80123434 +/* 234C 80026F4C 00000000 */ nop +/* 2350 80026F50 0C046BD5 */ jal func_8011AF54 +/* 2354 80026F54 00000000 */ nop +/* 2358 80026F58 0C05343C */ jal func_8014D0F0 +/* 235C 80026F5C 00000000 */ nop +/* 2360 80026F60 0C052BAA */ jal func_8014AEA8 +/* 2364 80026F64 00000000 */ nop +/* 2368 80026F68 0C04A21C */ jal func_80128870 +/* 236C 80026F6C 00000000 */ nop +/* 2370 80026F70 0C04A221 */ jal func_80128884 +/* 2374 80026F74 00000000 */ nop +/* 2378 80026F78 0C045F6A */ jal func_80117DA8 +/* 237C 80026F7C 00000000 */ nop +/* 2380 80026F80 0C00E05F */ jal func_8003817C +/* 2384 80026F84 00000000 */ nop +/* 2388 80026F88 0C05186C */ jal func_801461B0 +/* 238C 80026F8C 00000000 */ nop +/* 2390 80026F90 0C0529CC */ jal func_8014A730 +/* 2394 80026F94 00000000 */ nop +/* 2398 80026F98 0C0457B2 */ jal func_80115EC8 +/* 239C 80026F9C 0000202D */ daddu $a0, $zero, $zero +/* 23A0 80026FA0 0C039CD0 */ jal func_800E7340 +/* 23A4 80026FA4 00000000 */ nop +/* 23A8 80026FA8 0C00F7FE */ jal func_8003DFF8 +/* 23AC 80026FAC 00000000 */ nop +/* 23B0 80026FB0 0C04F46E */ jal func_8013D1B8 +/* 23B4 80026FB4 00000000 */ nop +/* 23B8 80026FB8 0C016653 */ jal func_8005994C +/* 23BC 80026FBC 00000000 */ nop +/* 23C0 80026FC0 0C0528F4 */ jal func_8014A3D0 +/* 23C4 80026FC4 00000000 */ nop +/* 23C8 80026FC8 0C04D85C */ jal func_80136170 +/* 23CC 80026FCC 00000000 */ nop +/* 23D0 80026FD0 0C053D52 */ jal func_8014F548 +/* 23D4 80026FD4 00000000 */ nop +/* 23D8 80026FD8 0C0530B8 */ jal func_8014C2E0 +/* 23DC 80026FDC 00000000 */ nop +/* 23E0 80026FE0 0C0539B2 */ jal func_8014E6C8 +/* 23E4 80026FE4 00000000 */ nop +/* 23E8 80026FE8 0C053128 */ jal func_8014C4A0 +/* 23EC 80026FEC 00000000 */ nop +/* 23F0 80026FF0 0C00AE80 */ jal func_8002BA00 +/* 23F4 80026FF4 00000000 */ nop +/* 23F8 80026FF8 0C00A3AC */ jal func_80028EB0 +/* 23FC 80026FFC 00000000 */ nop +/* 2400 80027000 0000182D */ daddu $v1, $zero, $zero +/* 2404 80027004 24050003 */ addiu $a1, $zero, 3 +/* 2408 80027008 2404000C */ addiu $a0, $zero, 0xc +/* 240C 8002700C 8E100000 */ lw $s0, ($s0) +.L80027010: +/* 2410 80027010 A6050050 */ sh $a1, 0x50($s0) +/* 2414 80027014 A6040048 */ sh $a0, 0x48($s0) +/* 2418 80027018 24630001 */ addiu $v1, $v1, 1 +/* 241C 8002701C 28620004 */ slti $v0, $v1, 4 +/* 2420 80027020 1440FFFB */ bnez $v0, .L80027010 +/* 2424 80027024 26100002 */ addiu $s0, $s0, 2 +/* 2428 80027028 3C03800A */ lui $v1, %hi(D_8009A630) +/* 242C 8002702C 2463A630 */ addiu $v1, $v1, %lo(D_8009A630) +/* 2430 80027030 8C620000 */ lw $v0, ($v1) +/* 2434 80027034 0000202D */ daddu $a0, $zero, $zero +/* 2438 80027038 34420008 */ ori $v0, $v0, 8 +/* 243C 8002703C 0C00CC60 */ jal func_80033180 +/* 2440 80027040 AC620000 */ sw $v0, ($v1) +/* 2444 80027044 8FBF0014 */ lw $ra, 0x14($sp) +/* 2448 80027048 8FB00010 */ lw $s0, 0x10($sp) +/* 244C 8002704C 03E00008 */ jr $ra +/* 2450 80027050 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/jp/asm/nonmatchings/main_1B10/func_80027054.s b/ver/jp/asm/nonmatchings/main_1B10/func_80027054.s new file mode 100644 index 0000000000..f90575bdca --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1B10/func_80027054.s @@ -0,0 +1,72 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80027054 +/* 2454 80027054 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 2458 80027058 0080282D */ daddu $a1, $a0, $zero +/* 245C 8002705C 2CA20005 */ sltiu $v0, $a1, 5 +/* 2460 80027060 1040003B */ beqz $v0, .L80027150 +/* 2464 80027064 AFBF0010 */ sw $ra, 0x10($sp) +/* 2468 80027068 00051080 */ sll $v0, $a1, 2 +/* 246C 8002706C 3C018009 */ lui $at, %hi(D_80097D28) +/* 2470 80027070 00220821 */ addu $at, $at, $v0 +/* 2474 80027074 8C227D28 */ lw $v0, %lo(D_80097D28)($at) +/* 2478 80027078 00400008 */ jr $v0 +/* 247C 8002707C 00000000 */ nop +/* 2480 80027080 24040003 */ addiu $a0, $zero, 3 +/* 2484 80027084 3C02800A */ lui $v0, %hi(D_8009A630) +/* 2488 80027088 2442A630 */ addiu $v0, $v0, %lo(D_8009A630) +/* 248C 8002708C 3C01800A */ lui $at, %hi(D_8009A5B8) +/* 2490 80027090 AC25A5B8 */ sw $a1, %lo(D_8009A5B8)($at) +/* 2494 80027094 8C430000 */ lw $v1, ($v0) +/* 2498 80027098 2405F0FF */ addiu $a1, $zero, -0xf01 +/* 249C 8002709C 00651824 */ and $v1, $v1, $a1 +/* 24A0 800270A0 0C0B1192 */ jal func_802C4648 +/* 24A4 800270A4 AC430000 */ sw $v1, ($v0) +/* 24A8 800270A8 08009C54 */ j .L80027150 +/* 24AC 800270AC 00000000 */ nop +/* 24B0 800270B0 24040001 */ addiu $a0, $zero, 1 +/* 24B4 800270B4 3C02800A */ lui $v0, %hi(D_8009A630) +/* 24B8 800270B8 2442A630 */ addiu $v0, $v0, %lo(D_8009A630) +/* 24BC 800270BC 3C01800A */ lui $at, %hi(D_8009A5B8) +/* 24C0 800270C0 AC25A5B8 */ sw $a1, %lo(D_8009A5B8)($at) +/* 24C4 800270C4 8C430000 */ lw $v1, ($v0) +/* 24C8 800270C8 2405F1FF */ addiu $a1, $zero, -0xe01 +/* 24CC 800270CC 00651824 */ and $v1, $v1, $a1 +/* 24D0 800270D0 08009C49 */ j .L80027124 +/* 24D4 800270D4 34630100 */ ori $v1, $v1, 0x100 +/* 24D8 800270D8 24040002 */ addiu $a0, $zero, 2 +/* 24DC 800270DC 3C02800A */ lui $v0, %hi(D_8009A630) +/* 24E0 800270E0 2442A630 */ addiu $v0, $v0, %lo(D_8009A630) +/* 24E4 800270E4 3C01800A */ lui $at, %hi(D_8009A5B8) +/* 24E8 800270E8 AC25A5B8 */ sw $a1, %lo(D_8009A5B8)($at) +/* 24EC 800270EC 8C430000 */ lw $v1, ($v0) +/* 24F0 800270F0 2405F3FF */ addiu $a1, $zero, -0xc01 +/* 24F4 800270F4 00651824 */ and $v1, $v1, $a1 +/* 24F8 800270F8 08009C49 */ j .L80027124 +/* 24FC 800270FC 34630300 */ ori $v1, $v1, 0x300 +/* 2500 80027100 24040002 */ addiu $a0, $zero, 2 +/* 2504 80027104 3C02800A */ lui $v0, %hi(D_8009A630) +/* 2508 80027108 2442A630 */ addiu $v0, $v0, %lo(D_8009A630) +/* 250C 8002710C 3C01800A */ lui $at, %hi(D_8009A5B8) +/* 2510 80027110 AC25A5B8 */ sw $a1, %lo(D_8009A5B8)($at) +/* 2514 80027114 8C430000 */ lw $v1, ($v0) +/* 2518 80027118 2405F7FF */ addiu $a1, $zero, -0x801 +/* 251C 8002711C 00651824 */ and $v1, $v1, $a1 +/* 2520 80027120 34630700 */ ori $v1, $v1, 0x700 +.L80027124: +/* 2524 80027124 0C0B117A */ jal func_802C45E8 +/* 2528 80027128 AC430000 */ sw $v1, ($v0) +/* 252C 8002712C 08009C54 */ j .L80027150 +/* 2530 80027130 00000000 */ nop +/* 2534 80027134 3C03800A */ lui $v1, %hi(D_8009A630) +/* 2538 80027138 2463A630 */ addiu $v1, $v1, %lo(D_8009A630) +/* 253C 8002713C 8C620000 */ lw $v0, ($v1) +/* 2540 80027140 3C01800A */ lui $at, %hi(D_8009A5B8) +/* 2544 80027144 AC25A5B8 */ sw $a1, %lo(D_8009A5B8)($at) +/* 2548 80027148 34420F00 */ ori $v0, $v0, 0xf00 +/* 254C 8002714C AC620000 */ sw $v0, ($v1) +.L80027150: +/* 2550 80027150 8FBF0010 */ lw $ra, 0x10($sp) +/* 2554 80027154 03E00008 */ jr $ra +/* 2558 80027158 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/jp/asm/nonmatchings/main_1B10/func_8002715C.s b/ver/jp/asm/nonmatchings/main_1B10/func_8002715C.s new file mode 100644 index 0000000000..c88bd23709 --- /dev/null +++ b/ver/jp/asm/nonmatchings/main_1B10/func_8002715C.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8002715C +/* 255C 8002715C 3C02800A */ lui $v0, %hi(D_8009A5B8) +/* 2560 80027160 8C42A5B8 */ lw $v0, %lo(D_8009A5B8)($v0) +/* 2564 80027164 03E00008 */ jr $ra +/* 2568 80027168 00000000 */ nop +/* 256C 8002716C 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/main_25BB0/func_8004AAB8.s b/ver/jp/asm/nonmatchings/main_25BB0/func_8004AAB8.s index ae589bb570..daf5f2d1aa 100644 --- a/ver/jp/asm/nonmatchings/main_25BB0/func_8004AAB8.s +++ b/ver/jp/asm/nonmatchings/main_25BB0/func_8004AAB8.s @@ -267,8 +267,8 @@ glabel func_8004AAB8 /* 26278 8004AE78 AE22000C */ sw $v0, 0xc($s1) /* 2627C 8004AE7C AC830000 */ sw $v1, ($a0) /* 26280 8004AE80 A0A00002 */ sb $zero, 2($a1) -/* 26284 8004AE84 3C04800A */ lui $a0, %hi(D_8009A618) -/* 26288 8004AE88 8C84A618 */ lw $a0, %lo(D_8009A618)($a0) +/* 26284 8004AE84 3C04800A */ lui $a0, %hi(carthandle) +/* 26288 8004AE88 8C84A618 */ lw $a0, %lo(carthandle)($a0) /* 2628C 8004AE8C 3C02800A */ lui $v0, %hi(D_800A1450) /* 26290 8004AE90 24421450 */ addiu $v0, $v0, %lo(D_800A1450) /* 26294 8004AE94 ACA20004 */ sw $v0, 4($a1) diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005E5BC.s b/ver/jp/asm/nonmatchings/main_39960/func_8005E5BC.s index 11992484d3..e06fbd067f 100644 --- a/ver/jp/asm/nonmatchings/main_39960/func_8005E5BC.s +++ b/ver/jp/asm/nonmatchings/main_39960/func_8005E5BC.s @@ -21,8 +21,8 @@ glabel func_8005E5BC /* 399FC 8005E5FC 24428570 */ addiu $v0, $v0, %lo(D_800B8570) /* 39A00 8005E600 AFA20010 */ sw $v0, 0x10($sp) /* 39A04 8005E604 2402000A */ addiu $v0, $zero, 0xa -/* 39A08 8005E608 3C068002 */ lui $a2, %hi(D_80025F70) -/* 39A0C 8005E60C 24C65F70 */ addiu $a2, $a2, %lo(D_80025F70) +/* 39A08 8005E608 3C068002 */ lui $a2, %hi(func_80025F70) +/* 39A0C 8005E60C 24C65F70 */ addiu $a2, $a2, %lo(func_80025F70) /* 39A10 8005E610 0000382D */ daddu $a3, $zero, $zero /* 39A14 8005E614 0C01978C */ jal func_80065E30 /* 39A18 8005E618 AFA20014 */ sw $v0, 0x14($sp) diff --git a/ver/jp/asm/nonmatchings/main_3A500/func_8005F100.s b/ver/jp/asm/nonmatchings/main_3A500/func_8005F100.s index 1d89976a61..ebb19d8aa7 100644 --- a/ver/jp/asm/nonmatchings/main_3A500/func_8005F100.s +++ b/ver/jp/asm/nonmatchings/main_3A500/func_8005F100.s @@ -14,7 +14,7 @@ glabel func_8005F100 /* 3A524 8005F124 0C0183B8 */ jal func_80060EE0 /* 3A528 8005F128 00000000 */ nop /* 3A52C 8005F12C 8FBF0010 */ lw $ra, 0x10($sp) -/* 3A530 8005F130 3C01800A */ lui $at, %hi(D_8009A618) -/* 3A534 8005F134 AC22A618 */ sw $v0, %lo(D_8009A618)($at) +/* 3A530 8005F130 3C01800A */ lui $at, %hi(carthandle) +/* 3A534 8005F134 AC22A618 */ sw $v0, %lo(carthandle)($at) /* 3A538 8005F138 03E00008 */ jr $ra /* 3A53C 8005F13C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/jp/asm/nonmatchings/main_3A500/func_8005F140.s b/ver/jp/asm/nonmatchings/main_3A500/func_8005F140.s index 0661dfacd1..976e544388 100644 --- a/ver/jp/asm/nonmatchings/main_3A500/func_8005F140.s +++ b/ver/jp/asm/nonmatchings/main_3A500/func_8005F140.s @@ -33,8 +33,8 @@ glabel func_8005F140 /* 3A5AC 8005F1AC 24104000 */ addiu $s0, $zero, 0x4000 .L8005F1B0: /* 3A5B0 8005F1B0 27A50010 */ addiu $a1, $sp, 0x10 -/* 3A5B4 8005F1B4 3C04800A */ lui $a0, %hi(D_8009A618) -/* 3A5B8 8005F1B8 8C84A618 */ lw $a0, %lo(D_8009A618)($a0) +/* 3A5B4 8005F1B4 3C04800A */ lui $a0, %hi(carthandle) +/* 3A5B8 8005F1B8 8C84A618 */ lw $a0, %lo(carthandle)($a0) /* 3A5BC 8005F1BC 0000302D */ daddu $a2, $zero, $zero /* 3A5C0 8005F1C0 AFB20018 */ sw $s2, 0x18($sp) /* 3A5C4 8005F1C4 AFB3001C */ sw $s3, 0x1c($sp) diff --git a/ver/jp/asm/nonmatchings/main_3FE70/func_80064A70.s b/ver/jp/asm/nonmatchings/main_3FE70/_Printf.s similarity index 99% rename from ver/jp/asm/nonmatchings/main_3FE70/func_80064A70.s rename to ver/jp/asm/nonmatchings/main_3FE70/_Printf.s index 83a945dde1..eee496371b 100644 --- a/ver/jp/asm/nonmatchings/main_3FE70/func_80064A70.s +++ b/ver/jp/asm/nonmatchings/main_3FE70/_Printf.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80064A70 +glabel _Printf /* 3FE70 80064A70 27BDFF50 */ addiu $sp, $sp, -0xb0 /* 3FE74 80064A74 AFB400A0 */ sw $s4, 0xa0($sp) /* 3FE78 80064A78 0080A021 */ addu $s4, $a0, $zero diff --git a/ver/jp/asm/nonmatchings/main_3FE70/func_800654C0.s b/ver/jp/asm/nonmatchings/main_3FE70/func_800654C0.s index 2ec3b8f99f..14b76bc30d 100644 --- a/ver/jp/asm/nonmatchings/main_3FE70/func_800654C0.s +++ b/ver/jp/asm/nonmatchings/main_3FE70/func_800654C0.s @@ -13,7 +13,7 @@ glabel func_800654C0 /* 408E0 800654E0 24845518 */ addiu $a0, $a0, %lo(func_80065518) /* 408E4 800654E4 02002821 */ addu $a1, $s0, $zero /* 408E8 800654E8 AFBF0014 */ sw $ra, 0x14($sp) -/* 408EC 800654EC 0C01929C */ jal func_80064A70 +/* 408EC 800654EC 0C01929C */ jal _Printf /* 408F0 800654F0 27A70020 */ addiu $a3, $sp, 0x20 /* 408F4 800654F4 00401821 */ addu $v1, $v0, $zero /* 408F8 800654F8 04600002 */ bltz $v1, .L80065504 diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029820.s b/ver/jp/asm/nonmatchings/main_42B0/func_80029820.s index 6dcf820d1b..fb7f67c09b 100644 --- a/ver/jp/asm/nonmatchings/main_42B0/func_80029820.s +++ b/ver/jp/asm/nonmatchings/main_42B0/func_80029820.s @@ -21,8 +21,8 @@ glabel func_80029820 /* 4C60 80029860 0C019554 */ jal func_80065550 /* 4C64 80029864 24060001 */ addiu $a2, $zero, 1 /* 4C68 80029868 27A50010 */ addiu $a1, $sp, 0x10 -/* 4C6C 8002986C 3C04800A */ lui $a0, %hi(D_8009A618) -/* 4C70 80029870 8C84A618 */ lw $a0, %lo(D_8009A618)($a0) +/* 4C6C 8002986C 3C04800A */ lui $a0, %hi(carthandle) +/* 4C70 80029870 8C84A618 */ lw $a0, %lo(carthandle)($a0) /* 4C74 80029874 24060001 */ addiu $a2, $zero, 1 /* 4C78 80029878 A3A00012 */ sb $zero, 0x12($sp) /* 4C7C 8002987C AFB00014 */ sw $s0, 0x14($sp) diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F098.s b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F098.s index ceed299294..9a20891a35 100644 --- a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F098.s +++ b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F098.s @@ -13,14 +13,14 @@ glabel func_8006F098 /* 4A4B8 8006F0B8 00A17025 */ or $t6, $a1, $at /* 4A4BC 8006F0BC 01C02825 */ or $a1, $t6, $zero /* 4A4C0 8006F0C0 3C06D200 */ lui $a2, 0xd200 -/* 4A4C4 8006F0C4 0C01834C */ jal func_80060D30 +/* 4A4C4 8006F0C4 0C01834C */ jal osEPiWriteIo /* 4A4C8 8006F0C8 00000000 */ nop /* 4A4CC 8006F0CC 3C04800B */ lui $a0, %hi(D_800B0C50) /* 4A4D0 8006F0D0 24840C50 */ addiu $a0, $a0, %lo(D_800B0C50) /* 4A4D4 8006F0D4 3C05800B */ lui $a1, %hi(D_800B0C5C) /* 4A4D8 8006F0D8 8CA50C5C */ lw $a1, %lo(D_800B0C5C)($a1) /* 4A4DC 8006F0DC 27A6001C */ addiu $a2, $sp, 0x1c -/* 4A4E0 8006F0E0 0C018364 */ jal func_80060D90 +/* 4A4E0 8006F0E0 0C018364 */ jal osEPiReadIo /* 4A4E4 8006F0E4 00000000 */ nop /* 4A4E8 8006F0E8 3C04800B */ lui $a0, %hi(D_800B0C50) /* 4A4EC 8006F0EC 24840C50 */ addiu $a0, $a0, %lo(D_800B0C50) @@ -30,14 +30,14 @@ glabel func_8006F098 /* 4A4FC 8006F0FC 00A17825 */ or $t7, $a1, $at /* 4A500 8006F100 01E02825 */ or $a1, $t7, $zero /* 4A504 8006F104 3C06D200 */ lui $a2, 0xd200 -/* 4A508 8006F108 0C01834C */ jal func_80060D30 +/* 4A508 8006F108 0C01834C */ jal osEPiWriteIo /* 4A50C 8006F10C 00000000 */ nop /* 4A510 8006F110 3C04800B */ lui $a0, %hi(D_800B0C50) /* 4A514 8006F114 24840C50 */ addiu $a0, $a0, %lo(D_800B0C50) /* 4A518 8006F118 3C05800B */ lui $a1, %hi(D_800B0C5C) /* 4A51C 8006F11C 8CA50C5C */ lw $a1, %lo(D_800B0C5C)($a1) /* 4A520 8006F120 27A6001C */ addiu $a2, $sp, 0x1c -/* 4A524 8006F124 0C018364 */ jal func_80060D90 +/* 4A524 8006F124 0C018364 */ jal osEPiReadIo /* 4A528 8006F128 00000000 */ nop /* 4A52C 8006F12C 8FB8001C */ lw $t8, 0x1c($sp) /* 4A530 8006F130 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F164.s b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F164.s index 3e1a902e2a..585a561047 100644 --- a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F164.s +++ b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F164.s @@ -17,7 +17,7 @@ glabel func_8006F164 /* 4A594 8006F194 00A17025 */ or $t6, $a1, $at /* 4A598 8006F198 01C02825 */ or $a1, $t6, $zero /* 4A59C 8006F19C 3C06E100 */ lui $a2, 0xe100 -/* 4A5A0 8006F1A0 0C01834C */ jal func_80060D30 +/* 4A5A0 8006F1A0 0C01834C */ jal osEPiWriteIo /* 4A5A4 8006F1A4 00000000 */ nop /* 4A5A8 8006F1A8 3C01800B */ lui $at, %hi(D_800B0C22) /* 4A5AC 8006F1AC A0200C22 */ sb $zero, %lo(D_800B0C22)($at) diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F27C.s b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F27C.s index 97697d03c3..10be0a8943 100644 --- a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F27C.s +++ b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F27C.s @@ -12,14 +12,14 @@ glabel func_8006F27C /* 4A698 8006F298 00A17025 */ or $t6, $a1, $at /* 4A69C 8006F29C 01C02825 */ or $a1, $t6, $zero /* 4A6A0 8006F2A0 3C06D200 */ lui $a2, 0xd200 -/* 4A6A4 8006F2A4 0C01834C */ jal func_80060D30 +/* 4A6A4 8006F2A4 0C01834C */ jal osEPiWriteIo /* 4A6A8 8006F2A8 00000000 */ nop /* 4A6AC 8006F2AC 3C04800B */ lui $a0, %hi(D_800B0C50) /* 4A6B0 8006F2B0 24840C50 */ addiu $a0, $a0, %lo(D_800B0C50) /* 4A6B4 8006F2B4 3C05800B */ lui $a1, %hi(D_800B0C5C) /* 4A6B8 8006F2B8 8CA50C5C */ lw $a1, %lo(D_800B0C5C)($a1) /* 4A6BC 8006F2BC 00003025 */ or $a2, $zero, $zero -/* 4A6C0 8006F2C0 0C01834C */ jal func_80060D30 +/* 4A6C0 8006F2C0 0C01834C */ jal osEPiWriteIo /* 4A6C4 8006F2C4 00000000 */ nop /* 4A6C8 8006F2C8 10000003 */ b .L8006F2D8 /* 4A6CC 8006F2CC 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F2E8.s b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F2E8.s index 2f00cbe5e0..d160a7acab 100644 --- a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F2E8.s +++ b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F2E8.s @@ -12,7 +12,7 @@ glabel func_8006F2E8 /* 4A704 8006F304 00A17025 */ or $t6, $a1, $at /* 4A708 8006F308 01C02825 */ or $a1, $t6, $zero /* 4A70C 8006F30C 3C063C00 */ lui $a2, 0x3c00 -/* 4A710 8006F310 0C01834C */ jal func_80060D30 +/* 4A710 8006F310 0C01834C */ jal osEPiWriteIo /* 4A714 8006F314 00000000 */ nop /* 4A718 8006F318 3C04800B */ lui $a0, %hi(D_800B0C50) /* 4A71C 8006F31C 24840C50 */ addiu $a0, $a0, %lo(D_800B0C50) @@ -22,7 +22,7 @@ glabel func_8006F2E8 /* 4A72C 8006F32C 00A17825 */ or $t7, $a1, $at /* 4A730 8006F330 01E02825 */ or $a1, $t7, $zero /* 4A734 8006F334 3C067800 */ lui $a2, 0x7800 -/* 4A738 8006F338 0C01834C */ jal func_80060D30 +/* 4A738 8006F338 0C01834C */ jal osEPiWriteIo /* 4A73C 8006F33C 00000000 */ nop .L8006F340: /* 4A740 8006F340 3C04800B */ lui $a0, %hi(D_800B0C50) @@ -30,7 +30,7 @@ glabel func_8006F2E8 /* 4A748 8006F348 3C05800B */ lui $a1, %hi(D_800B0C5C) /* 4A74C 8006F34C 8CA50C5C */ lw $a1, %lo(D_800B0C5C)($a1) /* 4A750 8006F350 27A6001C */ addiu $a2, $sp, 0x1c -/* 4A754 8006F354 0C018364 */ jal func_80060D90 +/* 4A754 8006F354 0C018364 */ jal osEPiReadIo /* 4A758 8006F358 00000000 */ nop /* 4A75C 8006F35C 8FB8001C */ lw $t8, 0x1c($sp) /* 4A760 8006F360 00000000 */ nop @@ -43,7 +43,7 @@ glabel func_8006F2E8 /* 4A77C 8006F37C 3C05800B */ lui $a1, %hi(D_800B0C5C) /* 4A780 8006F380 8CA50C5C */ lw $a1, %lo(D_800B0C5C)($a1) /* 4A784 8006F384 27A6001C */ addiu $a2, $sp, 0x1c -/* 4A788 8006F388 0C018364 */ jal func_80060D90 +/* 4A788 8006F388 0C018364 */ jal osEPiReadIo /* 4A78C 8006F38C 00000000 */ nop /* 4A790 8006F390 0C01BC9F */ jal func_8006F27C /* 4A794 8006F394 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F404.s b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F404.s index b550e2e033..b03a0052bc 100644 --- a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F404.s +++ b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F404.s @@ -16,7 +16,7 @@ glabel func_8006F404 /* 4A830 8006F430 3C014B00 */ lui $at, 0x4b00 /* 4A834 8006F434 00C17825 */ or $t7, $a2, $at /* 4A838 8006F438 01E03025 */ or $a2, $t7, $zero -/* 4A83C 8006F43C 0C01834C */ jal func_80060D30 +/* 4A83C 8006F43C 0C01834C */ jal osEPiWriteIo /* 4A840 8006F440 00000000 */ nop /* 4A844 8006F444 3C04800B */ lui $a0, %hi(D_800B0C50) /* 4A848 8006F448 24840C50 */ addiu $a0, $a0, %lo(D_800B0C50) @@ -26,7 +26,7 @@ glabel func_8006F404 /* 4A858 8006F458 00A1C025 */ or $t8, $a1, $at /* 4A85C 8006F45C 03002825 */ or $a1, $t8, $zero /* 4A860 8006F460 3C067800 */ lui $a2, 0x7800 -/* 4A864 8006F464 0C01834C */ jal func_80060D30 +/* 4A864 8006F464 0C01834C */ jal osEPiWriteIo /* 4A868 8006F468 00000000 */ nop .L8006F46C: /* 4A86C 8006F46C 3C04800B */ lui $a0, %hi(D_800B0C50) @@ -34,7 +34,7 @@ glabel func_8006F404 /* 4A874 8006F474 3C05800B */ lui $a1, %hi(D_800B0C5C) /* 4A878 8006F478 8CA50C5C */ lw $a1, %lo(D_800B0C5C)($a1) /* 4A87C 8006F47C 27A6001C */ addiu $a2, $sp, 0x1c -/* 4A880 8006F480 0C018364 */ jal func_80060D90 +/* 4A880 8006F480 0C018364 */ jal osEPiReadIo /* 4A884 8006F484 00000000 */ nop /* 4A888 8006F488 8FB9001C */ lw $t9, 0x1c($sp) /* 4A88C 8006F48C 00000000 */ nop @@ -47,7 +47,7 @@ glabel func_8006F404 /* 4A8A8 8006F4A8 3C05800B */ lui $a1, %hi(D_800B0C5C) /* 4A8AC 8006F4AC 8CA50C5C */ lw $a1, %lo(D_800B0C5C)($a1) /* 4A8B0 8006F4B0 27A6001C */ addiu $a2, $sp, 0x1c -/* 4A8B4 8006F4B4 0C018364 */ jal func_80060D90 +/* 4A8B4 8006F4B4 0C018364 */ jal osEPiReadIo /* 4A8B8 8006F4B8 00000000 */ nop /* 4A8BC 8006F4BC 0C01BC9F */ jal func_8006F27C /* 4A8C0 8006F4C0 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F530.s b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F530.s index 971c050481..9c3ae88a96 100644 --- a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F530.s +++ b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F530.s @@ -16,7 +16,7 @@ glabel func_8006F530 /* 4A95C 8006F55C 00A17025 */ or $t6, $a1, $at /* 4A960 8006F560 01C02825 */ or $a1, $t6, $zero /* 4A964 8006F564 3C06B400 */ lui $a2, 0xb400 -/* 4A968 8006F568 0C01834C */ jal func_80060D30 +/* 4A968 8006F568 0C01834C */ jal osEPiWriteIo /* 4A96C 8006F56C 00000000 */ nop /* 4A970 8006F570 8FAF0024 */ lw $t7, 0x24($sp) /* 4A974 8006F574 8FB80020 */ lw $t8, 0x20($sp) diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F5FC.s b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F5FC.s index 22c64c8fb1..545192e41a 100644 --- a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F5FC.s +++ b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F5FC.s @@ -18,7 +18,7 @@ glabel func_8006F5FC /* 4AA30 8006F630 00A17825 */ or $t7, $a1, $at /* 4AA34 8006F634 01E02825 */ or $a1, $t7, $zero /* 4AA38 8006F638 3C06B400 */ lui $a2, 0xb400 -/* 4AA3C 8006F63C 0C01834C */ jal func_80060D30 +/* 4AA3C 8006F63C 0C01834C */ jal osEPiWriteIo /* 4AA40 8006F640 00000000 */ nop .L8006F644: /* 4AA44 8006F644 3C04800B */ lui $a0, %hi(D_800B0C50) @@ -32,7 +32,7 @@ glabel func_8006F5FC /* 4AA64 8006F664 3C01A500 */ lui $at, 0xa500 /* 4AA68 8006F668 00C1C825 */ or $t9, $a2, $at /* 4AA6C 8006F66C 03203025 */ or $a2, $t9, $zero -/* 4AA70 8006F670 0C01834C */ jal func_80060D30 +/* 4AA70 8006F670 0C01834C */ jal osEPiWriteIo /* 4AA74 8006F674 00000000 */ nop .L8006F678: /* 4AA78 8006F678 3C04800B */ lui $a0, %hi(D_800B0C50) @@ -40,7 +40,7 @@ glabel func_8006F5FC /* 4AA80 8006F680 3C05800B */ lui $a1, %hi(D_800B0C5C) /* 4AA84 8006F684 8CA50C5C */ lw $a1, %lo(D_800B0C5C)($a1) /* 4AA88 8006F688 27A6001C */ addiu $a2, $sp, 0x1c -/* 4AA8C 8006F68C 0C018364 */ jal func_80060D90 +/* 4AA8C 8006F68C 0C018364 */ jal osEPiReadIo /* 4AA90 8006F690 00000000 */ nop /* 4AA94 8006F694 8FA8001C */ lw $t0, 0x1c($sp) /* 4AA98 8006F698 00000000 */ nop @@ -53,7 +53,7 @@ glabel func_8006F5FC /* 4AAB4 8006F6B4 3C05800B */ lui $a1, %hi(D_800B0C5C) /* 4AAB8 8006F6B8 8CA50C5C */ lw $a1, %lo(D_800B0C5C)($a1) /* 4AABC 8006F6BC 27A6001C */ addiu $a2, $sp, 0x1c -/* 4AAC0 8006F6C0 0C018364 */ jal func_80060D90 +/* 4AAC0 8006F6C0 0C018364 */ jal osEPiReadIo /* 4AAC4 8006F6C4 00000000 */ nop /* 4AAC8 8006F6C8 0C01BC9F */ jal func_8006F27C /* 4AACC 8006F6CC 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F73C.s b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F73C.s index a467ce5172..0bbbfd8e80 100644 --- a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F73C.s +++ b/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F73C.s @@ -16,14 +16,14 @@ glabel func_8006F73C /* 4AB68 8006F768 00A17025 */ or $t6, $a1, $at /* 4AB6C 8006F76C 01C02825 */ or $a1, $t6, $zero /* 4AB70 8006F770 3C06F000 */ lui $a2, 0xf000 -/* 4AB74 8006F774 0C01834C */ jal func_80060D30 +/* 4AB74 8006F774 0C01834C */ jal osEPiWriteIo /* 4AB78 8006F778 00000000 */ nop /* 4AB7C 8006F77C 3C04800B */ lui $a0, %hi(D_800B0C50) /* 4AB80 8006F780 24840C50 */ addiu $a0, $a0, %lo(D_800B0C50) /* 4AB84 8006F784 3C05800B */ lui $a1, %hi(D_800B0C5C) /* 4AB88 8006F788 8CA50C5C */ lw $a1, %lo(D_800B0C5C)($a1) /* 4AB8C 8006F78C 27A60018 */ addiu $a2, $sp, 0x18 -/* 4AB90 8006F790 0C018364 */ jal func_80060D90 +/* 4AB90 8006F790 0C018364 */ jal osEPiReadIo /* 4AB94 8006F794 00000000 */ nop /* 4AB98 8006F798 8FAF0024 */ lw $t7, 0x24($sp) /* 4AB9C 8006F79C 8FB80020 */ lw $t8, 0x20($sp) diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C1C8.s b/ver/jp/asm/nonmatchings/main_7300/func_8002C1C8.s index 10bc30746d..2b38e50280 100644 --- a/ver/jp/asm/nonmatchings/main_7300/func_8002C1C8.s +++ b/ver/jp/asm/nonmatchings/main_7300/func_8002C1C8.s @@ -17,7 +17,7 @@ glabel func_8002C1C8 /* 75F8 8002C1F8 AFB40120 */ sw $s4, 0x120($sp) /* 75FC 8002C1FC AFB3011C */ sw $s3, 0x11c($sp) /* 7600 8002C200 AFB10114 */ sw $s1, 0x114($sp) -/* 7604 8002C204 0C01929C */ jal func_80064A70 +/* 7604 8002C204 0C01929C */ jal _Printf /* 7608 8002C208 AFB00110 */ sw $s0, 0x110($sp) /* 760C 8002C20C 0040802D */ daddu $s0, $v0, $zero /* 7610 8002C210 1A000010 */ blez $s0, .L8002C254 diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C90C.s b/ver/jp/asm/nonmatchings/main_7300/func_8002C90C.s index 0d5be45d6b..57c1c0778a 100644 --- a/ver/jp/asm/nonmatchings/main_7300/func_8002C90C.s +++ b/ver/jp/asm/nonmatchings/main_7300/func_8002C90C.s @@ -18,7 +18,7 @@ glabel func_8002C90C /* 7D40 8002C940 AFBF0128 */ sw $ra, 0x128($sp) /* 7D44 8002C944 AFB50124 */ sw $s5, 0x124($sp) /* 7D48 8002C948 AFB40120 */ sw $s4, 0x120($sp) -/* 7D4C 8002C94C 0C01929C */ jal func_80064A70 +/* 7D4C 8002C94C 0C01929C */ jal _Printf /* 7D50 8002C950 AFB10114 */ sw $s1, 0x114($sp) /* 7D54 8002C954 0040882D */ daddu $s1, $v0, $zero /* 7D58 8002C958 1A20001D */ blez $s1, .L8002C9D0 diff --git a/ver/jp/asm/nonmatchings/main_7E00/func_8002CA00.s b/ver/jp/asm/nonmatchings/main_7E00/func_8002CA00.s index a156973c2a..621e2408c5 100644 --- a/ver/jp/asm/nonmatchings/main_7E00/func_8002CA00.s +++ b/ver/jp/asm/nonmatchings/main_7E00/func_8002CA00.s @@ -16,14 +16,14 @@ glabel func_8002CA00 /* 7E2C 8002CA2C 0000802D */ daddu $s0, $zero, $zero /* 7E30 8002CA30 3C05B000 */ lui $a1, 0xb000 /* 7E34 8002CA34 34A50D10 */ ori $a1, $a1, 0xd10 -/* 7E38 8002CA38 3C04800A */ lui $a0, %hi(D_8009A618) -/* 7E3C 8002CA3C 8C84A618 */ lw $a0, %lo(D_8009A618)($a0) +/* 7E38 8002CA38 3C04800A */ lui $a0, %hi(carthandle) +/* 7E3C 8002CA3C 8C84A618 */ lw $a0, %lo(carthandle)($a0) /* 7E40 8002CA40 27A60010 */ addiu $a2, $sp, 0x10 /* 7E44 8002CA44 AFB20020 */ sw $s2, 0x20($sp) /* 7E48 8002CA48 0200902D */ daddu $s2, $s0, $zero /* 7E4C 8002CA4C AFB40028 */ sw $s4, 0x28($sp) -/* 7E50 8002CA50 3C148006 */ lui $s4, %hi(func_80060D90) -/* 7E54 8002CA54 26940D90 */ addiu $s4, $s4, %lo(func_80060D90) +/* 7E50 8002CA50 3C148006 */ lui $s4, %hi(osEPiReadIo) +/* 7E54 8002CA54 26940D90 */ addiu $s4, $s4, %lo(osEPiReadIo) /* 7E58 8002CA58 AFBF003C */ sw $ra, 0x3c($sp) /* 7E5C 8002CA5C AFBE0038 */ sw $fp, 0x38($sp) /* 7E60 8002CA60 AFB70034 */ sw $s7, 0x34($sp) @@ -41,8 +41,8 @@ glabel func_8002CA00 /* 7E90 8002CA90 0060B82D */ daddu $s7, $v1, $zero .L8002CA94: /* 7E94 8002CA94 0220282D */ daddu $a1, $s1, $zero -/* 7E98 8002CA98 3C04800A */ lui $a0, %hi(D_8009A618) -/* 7E9C 8002CA9C 8C84A618 */ lw $a0, %lo(D_8009A618)($a0) +/* 7E98 8002CA98 3C04800A */ lui $a0, %hi(carthandle) +/* 7E9C 8002CA9C 8C84A618 */ lw $a0, %lo(carthandle)($a0) /* 7EA0 8002CAA0 0280F809 */ jalr $s4 /* 7EA4 8002CAA4 27A60010 */ addiu $a2, $sp, 0x10 /* 7EA8 8002CAA8 8FA30010 */ lw $v1, 0x10($sp) @@ -96,10 +96,10 @@ glabel func_8002CA00 /* 7F58 8002CB58 3C05B000 */ lui $a1, 0xb000 /* 7F5C 8002CB5C 34A50E38 */ ori $a1, $a1, 0xe38 /* 7F60 8002CB60 27A60014 */ addiu $a2, $sp, 0x14 -/* 7F64 8002CB64 3C04800A */ lui $a0, %hi(D_8009A618) -/* 7F68 8002CB68 8C84A618 */ lw $a0, %lo(D_8009A618)($a0) -/* 7F6C 8002CB6C 3C148006 */ lui $s4, %hi(func_80060D90) -/* 7F70 8002CB70 26940D90 */ addiu $s4, $s4, %lo(func_80060D90) +/* 7F64 8002CB64 3C04800A */ lui $a0, %hi(carthandle) +/* 7F68 8002CB68 8C84A618 */ lw $a0, %lo(carthandle)($a0) +/* 7F6C 8002CB6C 3C148006 */ lui $s4, %hi(osEPiReadIo) +/* 7F70 8002CB70 26940D90 */ addiu $s4, $s4, %lo(osEPiReadIo) /* 7F74 8002CB74 0280F809 */ jalr $s4 /* 7F78 8002CB78 0200902D */ daddu $s2, $s0, $zero /* 7F7C 8002CB7C 3C110032 */ lui $s1, 0x32 @@ -114,8 +114,8 @@ glabel func_8002CA00 /* 7FA0 8002CBA0 0060B82D */ daddu $s7, $v1, $zero .L8002CBA4: /* 7FA4 8002CBA4 0220282D */ daddu $a1, $s1, $zero -/* 7FA8 8002CBA8 3C04800A */ lui $a0, %hi(D_8009A618) -/* 7FAC 8002CBAC 8C84A618 */ lw $a0, %lo(D_8009A618)($a0) +/* 7FA8 8002CBA8 3C04800A */ lui $a0, %hi(carthandle) +/* 7FAC 8002CBAC 8C84A618 */ lw $a0, %lo(carthandle)($a0) /* 7FB0 8002CBB0 0280F809 */ jalr $s4 /* 7FB4 8002CBB4 27A60014 */ addiu $a2, $sp, 0x14 /* 7FB8 8002CBB8 8FA30014 */ lw $v1, 0x14($sp) diff --git a/ver/jp/asm/nonmatchings/main_E860/func_80033574.s b/ver/jp/asm/nonmatchings/main_E860/func_80033574.s index 6897e677a5..66f2cf07c7 100644 --- a/ver/jp/asm/nonmatchings/main_E860/func_80033574.s +++ b/ver/jp/asm/nonmatchings/main_E860/func_80033574.s @@ -23,7 +23,7 @@ glabel func_80033574 /* E9BC 800335BC 8C430000 */ lw $v1, ($v0) /* E9C0 800335C0 A2040000 */ sb $a0, ($s0) /* E9C4 800335C4 34630008 */ ori $v1, $v1, 8 -/* E9C8 800335C8 0C017F54 */ jal func_8005FD50 +/* E9C8 800335C8 0C017F54 */ jal nuContRmbForceStop /* E9CC 800335CC AC430000 */ sw $v1, ($v0) .L800335D0: /* E9D0 800335D0 82030000 */ lb $v1, ($s0) diff --git a/ver/jp/asm/nonmatchings/main_E860/func_80033818.s b/ver/jp/asm/nonmatchings/main_E860/func_80033818.s index 1a08e9292d..2e520c6755 100644 --- a/ver/jp/asm/nonmatchings/main_E860/func_80033818.s +++ b/ver/jp/asm/nonmatchings/main_E860/func_80033818.s @@ -8,7 +8,7 @@ glabel func_80033818 /* EC24 80033824 AFBF0010 */ sw $ra, 0x10($sp) /* EC28 80033828 8C430000 */ lw $v1, ($v0) /* EC2C 8003382C 34630008 */ ori $v1, $v1, 8 -/* EC30 80033830 0C017F54 */ jal func_8005FD50 +/* EC30 80033830 0C017F54 */ jal nuContRmbForceStop /* EC34 80033834 AC430000 */ sw $v1, ($v0) /* EC38 80033838 8FBF0010 */ lw $ra, 0x10($sp) /* EC3C 8003383C 24020005 */ addiu $v0, $zero, 5 diff --git a/ver/jp/asm/nonmatchings/main_EF00/func_80033B00.s b/ver/jp/asm/nonmatchings/main_EF00/func_80033B00.s index 4280d1f971..e183640306 100644 --- a/ver/jp/asm/nonmatchings/main_EF00/func_80033B00.s +++ b/ver/jp/asm/nonmatchings/main_EF00/func_80033B00.s @@ -45,7 +45,7 @@ glabel func_80033B00 /* EFA0 80033BA0 AC23E724 */ sw $v1, %lo(D_8009E724)($at) /* EFA4 80033BA4 3C01800A */ lui $at, %hi(D_8009E72C) /* EFA8 80033BA8 AC22E72C */ sw $v0, %lo(D_8009E72C)($at) -/* EFAC 80033BAC 0C017F54 */ jal func_8005FD50 +/* EFAC 80033BAC 0C017F54 */ jal nuContRmbForceStop /* EFB0 80033BB0 00000000 */ nop /* EFB4 80033BB4 0C00B6E1 */ jal func_8002DB84 /* EFB8 80033BB8 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/main_EF00/func_800345FC.s b/ver/jp/asm/nonmatchings/main_EF00/func_800345FC.s index dc93aa7efc..0fe53684ce 100644 --- a/ver/jp/asm/nonmatchings/main_EF00/func_800345FC.s +++ b/ver/jp/asm/nonmatchings/main_EF00/func_800345FC.s @@ -79,7 +79,7 @@ glabel func_800345FC /* FB18 80034718 A0510070 */ sb $s1, 0x70($v0) /* FB1C 8003471C 0C00AB18 */ jal func_8002AC60 /* FB20 80034720 00000000 */ nop -/* FB24 80034724 0C017F54 */ jal func_8005FD50 +/* FB24 80034724 0C017F54 */ jal nuContRmbForceStop /* FB28 80034728 00000000 */ nop /* FB2C 8003472C 0C0539C8 */ jal func_8014E720 /* FB30 80034730 0000202D */ daddu $a0, $zero, $zero diff --git a/ver/jp/asm/nonmatchings/main_3B150/func_8005FD70.s b/ver/jp/asm/nonmatchings/os/nusys/code_3B150/func_8005FD70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B150/func_8005FD70.s rename to ver/jp/asm/nonmatchings/os/nusys/code_3B150/func_8005FD70.s diff --git a/ver/jp/asm/nonmatchings/main_3B150/func_8005FD90.s b/ver/jp/asm/nonmatchings/os/nusys/code_3B150/func_8005FD90.s similarity index 96% rename from ver/jp/asm/nonmatchings/main_3B150/func_8005FD90.s rename to ver/jp/asm/nonmatchings/os/nusys/code_3B150/func_8005FD90.s index 8d28468145..333a6547c1 100644 --- a/ver/jp/asm/nonmatchings/main_3B150/func_8005FD90.s +++ b/ver/jp/asm/nonmatchings/os/nusys/code_3B150/func_8005FD90.s @@ -40,8 +40,8 @@ glabel func_8005FD90 /* 3B218 8005FE18 24104000 */ addiu $s0, $zero, 0x4000 .L8005FE1C: /* 3B21C 8005FE1C 27A50010 */ addiu $a1, $sp, 0x10 -/* 3B220 8005FE20 3C04800A */ lui $a0, %hi(D_8009A618) -/* 3B224 8005FE24 8C84A618 */ lw $a0, %lo(D_8009A618)($a0) +/* 3B220 8005FE20 3C04800A */ lui $a0, %hi(carthandle) +/* 3B224 8005FE24 8C84A618 */ lw $a0, %lo(carthandle)($a0) /* 3B228 8005FE28 0000302D */ daddu $a2, $zero, $zero /* 3B22C 8005FE2C AFB30018 */ sw $s3, 0x18($sp) /* 3B230 8005FE30 AFB2001C */ sw $s2, 0x1c($sp) diff --git a/ver/jp/asm/nonmatchings/main_3B150/func_8005FD50.s b/ver/jp/asm/nonmatchings/os/nusys/code_3B150/nuContRmbForceStop.s similarity index 95% rename from ver/jp/asm/nonmatchings/main_3B150/func_8005FD50.s rename to ver/jp/asm/nonmatchings/os/nusys/code_3B150/nuContRmbForceStop.s index d0178d3f26..3cbaf58243 100644 --- a/ver/jp/asm/nonmatchings/main_3B150/func_8005FD50.s +++ b/ver/jp/asm/nonmatchings/os/nusys/code_3B150/nuContRmbForceStop.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8005FD50 +glabel nuContRmbForceStop /* 3B150 8005FD50 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3B154 8005FD54 24040304 */ addiu $a0, $zero, 0x304 /* 3B158 8005FD58 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/ver/jp/asm/nonmatchings/main_3C190/func_80060D90.s b/ver/jp/asm/nonmatchings/os/osEPiReadIo/osEPiReadIo.s similarity index 98% rename from ver/jp/asm/nonmatchings/main_3C190/func_80060D90.s rename to ver/jp/asm/nonmatchings/os/osEPiReadIo/osEPiReadIo.s index 5b3c2f6378..23e0e927c0 100644 --- a/ver/jp/asm/nonmatchings/main_3C190/func_80060D90.s +++ b/ver/jp/asm/nonmatchings/os/osEPiReadIo/osEPiReadIo.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80060D90 +glabel osEPiReadIo /* 3C190 80060D90 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 3C194 80060D94 AFB00010 */ sw $s0, 0x10($sp) /* 3C198 80060D98 00808021 */ addu $s0, $a0, $zero diff --git a/ver/jp/asm/nonmatchings/main_3C130/func_80060D30.s b/ver/jp/asm/nonmatchings/os/osEPiWriteIo/osEPiWriteIo.s similarity index 98% rename from ver/jp/asm/nonmatchings/main_3C130/func_80060D30.s rename to ver/jp/asm/nonmatchings/os/osEPiWriteIo/osEPiWriteIo.s index 8b5ea6c67c..001c1f9b17 100644 --- a/ver/jp/asm/nonmatchings/main_3C130/func_80060D30.s +++ b/ver/jp/asm/nonmatchings/os/osEPiWriteIo/osEPiWriteIo.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80060D30 +glabel osEPiWriteIo /* 3C130 80060D30 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 3C134 80060D34 AFB00010 */ sw $s0, 0x10($sp) /* 3C138 80060D38 00808021 */ addu $s0, $a0, $zero diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index 1b8adb6d6e..2791b26741 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -17,9 +17,6 @@ segments: - name: header type: header start: 0x00 - vram: 0 - subsections: - - [0x0000, header, header] - [0x0040, bin] - name: main type: code @@ -27,13 +24,16 @@ segments: vram: 0x80025C00 subalign: 8 subsections: - - [0x1000, c] + - [0x1000, hasm, entry_point] + - [0x1060, c] # 1060 (identical) + - [0x1370, c] # 1370 + - [0x1B10, c] # 1B40 - [0x2570, c] - [0x3BC0, c] - [0x42B0, c] - [0x5FC0, c] - [0x6200, c] - - [0x6E00, c] + - [0x6E00, c] # 6E40? - [0x7300, c] - [0x7E00, c] - [0x80A0, c] @@ -86,7 +86,7 @@ segments: - [0x3AF40, c] - [0x3AFA0, c] - [0x3B040, c] - - [0x3B150, c] + - [0x3B150, c, os/nusys/code_3B150] # 3b4a0 - [0x3B2A0, c] - [0x3B400, c] - [0x3B420, c] @@ -94,8 +94,8 @@ segments: - [0x3B7C0, c] - [0x3B8E0, c] - [0x3BCF0, c] - - [0x3C130, c] - - [0x3C190, c] + - [0x3C130, c, os/osEPiWriteIo] + - [0x3C190, c, os/osEPiReadIo] - [0x3C1F0, c] - [0x3C290, c] - [0x3C2E0, c] diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index e69de29bb2..ba93b38f99 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -0,0 +1,6 @@ +gfxPreNMI_Callback = 0x800266E8; // type:func +nuContRmbForceStop = 0x8005FD50; // type:func +osEPiWriteIo = 0x80060D30; // type:func rom:0x3C130 +osEPiReadIo = 0x80060D90; // type:func rom:0x3C190 +_Printf = 0x80064A70; // type:func rom:0x3FE70 +carthandle = 0x8009A618; // diff --git a/ver/jp/undefined_syms_auto.txt b/ver/jp/undefined_syms_auto.txt index cade71e35a..7f66229a32 100644 --- a/ver/jp/undefined_syms_auto.txt +++ b/ver/jp/undefined_syms_auto.txt @@ -1,7 +1,7 @@ +carthandle = 0x8009A618; D_8009A590 = 0x8009A590; D_800B6570 = 0x800B6570; D_8005E560 = 0x8005E560; -D_8009A618 = 0x8009A618; D_80097D10 = 0x80097D10; D_80000300 = 0x80000300; D_80095800 = 0x80095800; @@ -541,7 +541,6 @@ D_800A2080 = 0x800A2080; D_800A43E0 = 0x800A43E0; D_8009A610 = 0x8009A610; D_800A2230 = 0x800A2230; -D_80025F70 = 0x80025F70; D_800DAA8C = 0x800DAA8C; D_800DA494 = 0x800DA494; D_80094680 = 0x80094680; diff --git a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802195F4_6BD184.s b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802195F4_6BD184.s index cb8be198d3..ec86e9780c 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802195F4_6BD184.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802195F4_6BD184.s @@ -15,7 +15,7 @@ glabel func_802195F4_6BD184 /* 6BD1AC 8021961C 0040182D */ daddu $v1, $v0, $zero /* 6BD1B0 80219620 2610FFFF */ addiu $s0, $s0, -1 /* 6BD1B4 80219624 2E020009 */ sltiu $v0, $s0, 9 -/* 6BD1B8 80219628 1040001E */ beqz $v0, .L802196A4 +/* 6BD1B8 80219628 1040001E */ beqz $v0, L802196A4_6BD234 /* 6BD1BC 8021962C 0000202D */ daddu $a0, $zero, $zero /* 6BD1C0 80219630 00101080 */ sll $v0, $s0, 2 /* 6BD1C4 80219634 3C018023 */ lui $at, %hi(jtbl_80228450_6CBFE0) @@ -25,36 +25,35 @@ glabel func_802195F4_6BD184 /* 6BD1D4 80219644 00000000 */ nop glabel L80219648_6BD1D8 /* 6BD1D8 80219648 3C048022 */ lui $a0, %hi(D_8021E990_6C2520) -/* 6BD1DC 8021964C 080865A9 */ j .L802196A4 +/* 6BD1DC 8021964C 080865A9 */ j L802196A4_6BD234 /* 6BD1E0 80219650 2484E990 */ addiu $a0, $a0, %lo(D_8021E990_6C2520) glabel L80219654_6BD1E4 /* 6BD1E4 80219654 3C048022 */ lui $a0, %hi(D_80220644_6C41D4) -/* 6BD1E8 80219658 080865A9 */ j .L802196A4 +/* 6BD1E8 80219658 080865A9 */ j L802196A4_6BD234 /* 6BD1EC 8021965C 24840644 */ addiu $a0, $a0, %lo(D_80220644_6C41D4) glabel L80219660_6BD1F0 /* 6BD1F0 80219660 3C048022 */ lui $a0, %hi(D_802218A4_6C5434) -/* 6BD1F4 80219664 080865A9 */ j .L802196A4 +/* 6BD1F4 80219664 080865A9 */ j L802196A4_6BD234 /* 6BD1F8 80219668 248418A4 */ addiu $a0, $a0, %lo(D_802218A4_6C5434) glabel L8021966C_6BD1FC /* 6BD1FC 8021966C 3C048022 */ lui $a0, %hi(D_80222830_6C63C0) -/* 6BD200 80219670 080865A9 */ j .L802196A4 +/* 6BD200 80219670 080865A9 */ j L802196A4_6BD234 /* 6BD204 80219674 24842830 */ addiu $a0, $a0, %lo(D_80222830_6C63C0) glabel L80219678_6BD208 /* 6BD208 80219678 3C048022 */ lui $a0, %hi(D_80223C00_6C7790) -/* 6BD20C 8021967C 080865A9 */ j .L802196A4 +/* 6BD20C 8021967C 080865A9 */ j L802196A4_6BD234 /* 6BD210 80219680 24843C00 */ addiu $a0, $a0, %lo(D_80223C00_6C7790) glabel L80219684_6BD214 /* 6BD214 80219684 3C048022 */ lui $a0, %hi(D_80224AFC_6C868C) -/* 6BD218 80219688 080865A9 */ j .L802196A4 +/* 6BD218 80219688 080865A9 */ j L802196A4_6BD234 /* 6BD21C 8021968C 24844AFC */ addiu $a0, $a0, %lo(D_80224AFC_6C868C) glabel L80219690_6BD220 /* 6BD220 80219690 3C048022 */ lui $a0, %hi(D_80226494_6CA024) -/* 6BD224 80219694 080865A9 */ j .L802196A4 +/* 6BD224 80219694 080865A9 */ j L802196A4_6BD234 /* 6BD228 80219698 24846494 */ addiu $a0, $a0, %lo(D_80226494_6CA024) glabel L8021969C_6BD22C /* 6BD22C 8021969C 3C048022 */ lui $a0, %hi(D_80227734_6CB2C4) /* 6BD230 802196A0 24847734 */ addiu $a0, $a0, %lo(D_80227734_6CB2C4) -.L802196A4: glabel L802196A4_6BD234 /* 6BD234 802196A4 806301F1 */ lb $v1, 0x1f1($v1) /* 6BD238 802196A8 AC830008 */ sw $v1, 8($a0) diff --git a/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80219824_465CB4.s b/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80219824_465CB4.s index 397393d5c5..732027d887 100644 --- a/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80219824_465CB4.s +++ b/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80219824_465CB4.s @@ -15,7 +15,7 @@ glabel func_80219824_465CB4 /* 465CDC 8021984C 0040182D */ daddu $v1, $v0, $zero /* 465CE0 80219850 2610FFFF */ addiu $s0, $s0, -1 /* 465CE4 80219854 2E020009 */ sltiu $v0, $s0, 9 -/* 465CE8 80219858 1040001E */ beqz $v0, .L802198D4 +/* 465CE8 80219858 1040001E */ beqz $v0, L802198D4_465D64 /* 465CEC 8021985C 0000202D */ daddu $a0, $zero, $zero /* 465CF0 80219860 00101080 */ sll $v0, $s0, 2 /* 465CF4 80219864 3C018023 */ lui $at, %hi(jtbl_80232B40_47EFD0) @@ -25,36 +25,35 @@ glabel func_80219824_465CB4 /* 465D04 80219874 00000000 */ nop glabel L80219878_465D08 /* 465D08 80219878 3C048022 */ lui $a0, %hi(D_80220524_46C9B4) -/* 465D0C 8021987C 08086635 */ j .L802198D4 +/* 465D0C 8021987C 08086635 */ j L802198D4_465D64 /* 465D10 80219880 24840524 */ addiu $a0, $a0, %lo(D_80220524_46C9B4) glabel L80219884_465D14 /* 465D14 80219884 3C048022 */ lui $a0, %hi(D_80222274_46E704) -/* 465D18 80219888 08086635 */ j .L802198D4 +/* 465D18 80219888 08086635 */ j L802198D4_465D64 /* 465D1C 8021988C 24842274 */ addiu $a0, $a0, %lo(D_80222274_46E704) glabel L80219890_465D20 /* 465D20 80219890 3C048022 */ lui $a0, %hi(D_8022336C_46F7FC) -/* 465D24 80219894 08086635 */ j .L802198D4 +/* 465D24 80219894 08086635 */ j L802198D4_465D64 /* 465D28 80219898 2484336C */ addiu $a0, $a0, %lo(D_8022336C_46F7FC) glabel L8021989C_465D2C /* 465D2C 8021989C 3C048022 */ lui $a0, %hi(D_802243F4_470884) -/* 465D30 802198A0 08086635 */ j .L802198D4 +/* 465D30 802198A0 08086635 */ j L802198D4_465D64 /* 465D34 802198A4 248443F4 */ addiu $a0, $a0, %lo(D_802243F4_470884) glabel L802198A8_465D38 /* 465D38 802198A8 3C048022 */ lui $a0, %hi(D_80225958_471DE8) -/* 465D3C 802198AC 08086635 */ j .L802198D4 +/* 465D3C 802198AC 08086635 */ j L802198D4_465D64 /* 465D40 802198B0 24845958 */ addiu $a0, $a0, %lo(D_80225958_471DE8) glabel L802198B4_465D44 /* 465D44 802198B4 3C048022 */ lui $a0, %hi(D_80226960_472DF0) -/* 465D48 802198B8 08086635 */ j .L802198D4 +/* 465D48 802198B8 08086635 */ j L802198D4_465D64 /* 465D4C 802198BC 24846960 */ addiu $a0, $a0, %lo(D_80226960_472DF0) glabel L802198C0_465D50 /* 465D50 802198C0 3C048023 */ lui $a0, %hi(D_802283F0_474880) -/* 465D54 802198C4 08086635 */ j .L802198D4 +/* 465D54 802198C4 08086635 */ j L802198D4_465D64 /* 465D58 802198C8 248483F0 */ addiu $a0, $a0, %lo(D_802283F0_474880) glabel L802198CC_465D5C /* 465D5C 802198CC 3C048023 */ lui $a0, %hi(D_8022972C_475BBC) /* 465D60 802198D0 2484972C */ addiu $a0, $a0, %lo(D_8022972C_475BBC) -.L802198D4: glabel L802198D4_465D64 /* 465D64 802198D4 806301F1 */ lb $v1, 0x1f1($v1) /* 465D68 802198D8 2463000A */ addiu $v1, $v1, 0xa diff --git a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80219524_66B2A4.s b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80219524_66B2A4.s index 08eecbe4df..5cce9d9768 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80219524_66B2A4.s +++ b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80219524_66B2A4.s @@ -15,7 +15,7 @@ glabel func_80219524_66B2A4 /* 66B2CC 8021954C 0040182D */ daddu $v1, $v0, $zero /* 66B2D0 80219550 2610FFFF */ addiu $s0, $s0, -1 /* 66B2D4 80219554 2E020009 */ sltiu $v0, $s0, 9 -/* 66B2D8 80219558 1040001E */ beqz $v0, .L802195D4 +/* 66B2D8 80219558 1040001E */ beqz $v0, L802195D4_66B354 /* 66B2DC 8021955C 0000202D */ daddu $a0, $zero, $zero /* 66B2E0 80219560 00101080 */ sll $v0, $s0, 2 /* 66B2E4 80219564 3C018023 */ lui $at, %hi(jtbl_80232A20_6847A0) @@ -25,36 +25,35 @@ glabel func_80219524_66B2A4 /* 66B2F4 80219574 00000000 */ nop glabel L80219578_66B2F8 /* 66B2F8 80219578 3C048022 */ lui $a0, %hi(D_8021D6E0_66F460) -/* 66B2FC 8021957C 08086575 */ j .L802195D4 +/* 66B2FC 8021957C 08086575 */ j L802195D4_66B354 /* 66B300 80219580 2484D6E0 */ addiu $a0, $a0, %lo(D_8021D6E0_66F460) glabel L80219584_66B304 /* 66B304 80219584 3C048022 */ lui $a0, %hi(D_8021F394_671114) -/* 66B308 80219588 08086575 */ j .L802195D4 +/* 66B308 80219588 08086575 */ j L802195D4_66B354 /* 66B30C 8021958C 2484F394 */ addiu $a0, $a0, %lo(D_8021F394_671114) glabel L80219590_66B310 /* 66B310 80219590 3C048022 */ lui $a0, %hi(D_802205F4_672374) -/* 66B314 80219594 08086575 */ j .L802195D4 +/* 66B314 80219594 08086575 */ j L802195D4_66B354 /* 66B318 80219598 248405F4 */ addiu $a0, $a0, %lo(D_802205F4_672374) glabel L8021959C_66B31C /* 66B31C 8021959C 3C048022 */ lui $a0, %hi(D_80221580_673300) -/* 66B320 802195A0 08086575 */ j .L802195D4 +/* 66B320 802195A0 08086575 */ j L802195D4_66B354 /* 66B324 802195A4 24841580 */ addiu $a0, $a0, %lo(D_80221580_673300) glabel L802195A8_66B328 /* 66B328 802195A8 3C048022 */ lui $a0, %hi(D_80222950_6746D0) -/* 66B32C 802195AC 08086575 */ j .L802195D4 +/* 66B32C 802195AC 08086575 */ j L802195D4_66B354 /* 66B330 802195B0 24842950 */ addiu $a0, $a0, %lo(D_80222950_6746D0) glabel L802195B4_66B334 /* 66B334 802195B4 3C048022 */ lui $a0, %hi(D_8022384C_6755CC) -/* 66B338 802195B8 08086575 */ j .L802195D4 +/* 66B338 802195B8 08086575 */ j L802195D4_66B354 /* 66B33C 802195BC 2484384C */ addiu $a0, $a0, %lo(D_8022384C_6755CC) glabel L802195C0_66B340 /* 66B340 802195C0 3C048022 */ lui $a0, %hi(D_802251E4_676F64) -/* 66B344 802195C4 08086575 */ j .L802195D4 +/* 66B344 802195C4 08086575 */ j L802195D4_66B354 /* 66B348 802195C8 248451E4 */ addiu $a0, $a0, %lo(D_802251E4_676F64) glabel L802195CC_66B34C /* 66B34C 802195CC 3C048022 */ lui $a0, %hi(D_80226484_678204) /* 66B350 802195D0 24846484 */ addiu $a0, $a0, %lo(D_80226484_678204) -.L802195D4: glabel L802195D4_66B354 /* 66B354 802195D4 806301F1 */ lb $v1, 0x1f1($v1) /* 66B358 802195D8 AC830008 */ sw $v1, 8($a0) diff --git a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80219524_6250C4.s b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80219524_6250C4.s index 1026f9414b..6a5551e6ff 100644 --- a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80219524_6250C4.s +++ b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80219524_6250C4.s @@ -15,7 +15,7 @@ glabel func_80219524_6250C4 /* 6250EC 8021954C 0040182D */ daddu $v1, $v0, $zero /* 6250F0 80219550 2610FFFF */ addiu $s0, $s0, -1 /* 6250F4 80219554 2E020009 */ sltiu $v0, $s0, 9 -/* 6250F8 80219558 1040001E */ beqz $v0, .L802195D4 +/* 6250F8 80219558 1040001E */ beqz $v0, L802195D4_625174 /* 6250FC 8021955C 0000202D */ daddu $a0, $zero, $zero /* 625100 80219560 00101080 */ sll $v0, $s0, 2 /* 625104 80219564 3C018023 */ lui $at, %hi(jtbl_80231320_63CEC0) @@ -25,36 +25,35 @@ glabel func_80219524_6250C4 /* 625114 80219574 00000000 */ nop glabel L80219578_625118 /* 625118 80219578 3C048022 */ lui $a0, %hi(D_8021E660_62A200) -/* 62511C 8021957C 08086575 */ j .L802195D4 +/* 62511C 8021957C 08086575 */ j L802195D4_625174 /* 625120 80219580 2484E660 */ addiu $a0, $a0, %lo(D_8021E660_62A200) glabel L80219584_625124 /* 625124 80219584 3C048022 */ lui $a0, %hi(D_80220314_62BEB4) -/* 625128 80219588 08086575 */ j .L802195D4 +/* 625128 80219588 08086575 */ j L802195D4_625174 /* 62512C 8021958C 24840314 */ addiu $a0, $a0, %lo(D_80220314_62BEB4) glabel L80219590_625130 /* 625130 80219590 3C048022 */ lui $a0, %hi(D_80221574_62D114) -/* 625134 80219594 08086575 */ j .L802195D4 +/* 625134 80219594 08086575 */ j L802195D4_625174 /* 625138 80219598 24841574 */ addiu $a0, $a0, %lo(D_80221574_62D114) glabel L8021959C_62513C /* 62513C 8021959C 3C048022 */ lui $a0, %hi(D_80222500_62E0A0) -/* 625140 802195A0 08086575 */ j .L802195D4 +/* 625140 802195A0 08086575 */ j L802195D4_625174 /* 625144 802195A4 24842500 */ addiu $a0, $a0, %lo(D_80222500_62E0A0) glabel L802195A8_625148 /* 625148 802195A8 3C048022 */ lui $a0, %hi(D_802238D0_62F470) -/* 62514C 802195AC 08086575 */ j .L802195D4 +/* 62514C 802195AC 08086575 */ j L802195D4_625174 /* 625150 802195B0 248438D0 */ addiu $a0, $a0, %lo(D_802238D0_62F470) glabel L802195B4_625154 /* 625154 802195B4 3C048022 */ lui $a0, %hi(D_802247CC_63036C) -/* 625158 802195B8 08086575 */ j .L802195D4 +/* 625158 802195B8 08086575 */ j L802195D4_625174 /* 62515C 802195BC 248447CC */ addiu $a0, $a0, %lo(D_802247CC_63036C) glabel L802195C0_625160 /* 625160 802195C0 3C048022 */ lui $a0, %hi(D_80226164_631D04) -/* 625164 802195C4 08086575 */ j .L802195D4 +/* 625164 802195C4 08086575 */ j L802195D4_625174 /* 625168 802195C8 24846164 */ addiu $a0, $a0, %lo(D_80226164_631D04) glabel L802195CC_62516C /* 62516C 802195CC 3C048022 */ lui $a0, %hi(D_80227404_632FA4) /* 625170 802195D0 24847404 */ addiu $a0, $a0, %lo(D_80227404_632FA4) -.L802195D4: glabel L802195D4_625174 /* 625174 802195D4 806301F1 */ lb $v1, 0x1f1($v1) /* 625178 802195D8 AC830008 */ sw $v1, 8($a0) diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1518_799CC8.s b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1518_799CC8.s index 468a8e6c91..dd440f6594 100644 --- a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1518_799CC8.s +++ b/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1518_799CC8.s @@ -250,7 +250,7 @@ glabel func_802A1518_799CC8 .L802A1890: /* 79A040 802A1890 2C620016 */ sltiu $v0, $v1, 0x16 .L802A1894: -/* 79A044 802A1894 104002E1 */ beqz $v0, .L802A241C +/* 79A044 802A1894 104002E1 */ beqz $v0, L802A241C_79ABCC /* 79A048 802A1898 00031080 */ sll $v0, $v1, 2 /* 79A04C 802A189C 3C01802A */ lui $at, %hi(jtbl_802A3790_79BF40) /* 79A050 802A18A0 00220821 */ addu $at, $at, $v0 @@ -345,7 +345,7 @@ glabel L802A18B0_79A060 /* 79A19C 802A19EC 0C05272D */ jal play_sound /* 79A1A0 802A19F0 00000000 */ nop /* 79A1A4 802A19F4 24020001 */ addiu $v0, $zero, 1 -/* 79A1A8 802A19F8 080A8907 */ j .L802A241C +/* 79A1A8 802A19F8 080A8907 */ j L802A241C_79ABCC /* 79A1AC 802A19FC AFC20070 */ sw $v0, 0x70($fp) glabel L802A1A00_79A1B0 /* 79A1B0 802A1A00 C6200010 */ lwc1 $f0, 0x10($s1) @@ -380,7 +380,7 @@ glabel L802A1A00_79A1B0 /* 79A224 802A1A74 24020014 */ addiu $v0, $zero, 0x14 /* 79A228 802A1A78 AFC20074 */ sw $v0, 0x74($fp) /* 79A22C 802A1A7C 24020002 */ addiu $v0, $zero, 2 -/* 79A230 802A1A80 080A8907 */ j .L802A241C +/* 79A230 802A1A80 080A8907 */ j L802A241C_79ABCC /* 79A234 802A1A84 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1A88_79A238 /* 79A238 802A1A88 8FC20074 */ lw $v0, 0x74($fp) @@ -393,7 +393,7 @@ glabel L802A1A88_79A238 /* 79A254 802A1AA4 2402000F */ addiu $v0, $zero, 0xf /* 79A258 802A1AA8 AFC20074 */ sw $v0, 0x74($fp) /* 79A25C 802A1AAC 24020003 */ addiu $v0, $zero, 3 -/* 79A260 802A1AB0 080A8907 */ j .L802A241C +/* 79A260 802A1AB0 080A8907 */ j L802A241C_79ABCC /* 79A264 802A1AB4 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1AB8_79A268 /* 79A268 802A1AB8 C624004C */ lwc1 $f4, 0x4c($s1) @@ -435,7 +435,7 @@ glabel L802A1AB8_79A268 /* 79A2F0 802A1B40 0C05272D */ jal play_sound /* 79A2F4 802A1B44 00000000 */ nop /* 79A2F8 802A1B48 24020004 */ addiu $v0, $zero, 4 -/* 79A2FC 802A1B4C 080A8907 */ j .L802A241C +/* 79A2FC 802A1B4C 080A8907 */ j L802A241C_79ABCC /* 79A300 802A1B50 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1B54_79A304 /* 79A304 802A1B54 C624004C */ lwc1 $f4, 0x4c($s1) @@ -572,7 +572,7 @@ glabel L802A1B54_79A304 /* 79A4F4 802A1D44 AC400008 */ sw $zero, 8($v0) /* 79A4F8 802A1D48 8C62000C */ lw $v0, 0xc($v1) /* 79A4FC 802A1D4C C6200008 */ lwc1 $f0, 8($s1) -/* 79A500 802A1D50 16E001B2 */ bnez $s7, .L802A241C +/* 79A500 802A1D50 16E001B2 */ bnez $s7, L802A241C_79ABCC /* 79A504 802A1D54 E440000C */ swc1 $f0, 0xc($v0) /* 79A508 802A1D58 C620000C */ lwc1 $f0, 0xc($s1) /* 79A50C 802A1D5C C6220010 */ lwc1 $f2, 0x10($s1) @@ -630,7 +630,7 @@ glabel L802A1B54_79A304 /* 79A5D0 802A1E20 2402000F */ addiu $v0, $zero, 0xf /* 79A5D4 802A1E24 AFC20074 */ sw $v0, 0x74($fp) /* 79A5D8 802A1E28 24020005 */ addiu $v0, $zero, 5 -/* 79A5DC 802A1E2C 080A8907 */ j .L802A241C +/* 79A5DC 802A1E2C 080A8907 */ j L802A241C_79ABCC /* 79A5E0 802A1E30 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1E34_79A5E4 /* 79A5E4 802A1E34 8FC20074 */ lw $v0, 0x74($fp) @@ -686,7 +686,7 @@ glabel L802A1E34_79A5E4 /* 79A6A8 802A1EF8 2402002D */ addiu $v0, $zero, 0x2d /* 79A6AC 802A1EFC AFC20074 */ sw $v0, 0x74($fp) /* 79A6B0 802A1F00 24020006 */ addiu $v0, $zero, 6 -/* 79A6B4 802A1F04 080A8907 */ j .L802A241C +/* 79A6B4 802A1F04 080A8907 */ j L802A241C_79ABCC /* 79A6B8 802A1F08 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1F0C_79A6BC /* 79A6BC 802A1F0C 96220064 */ lhu $v0, 0x64($s1) @@ -730,14 +730,14 @@ glabel L802A1F0C_79A6BC /* 79A750 802A1FA0 00431024 */ and $v0, $v0, $v1 /* 79A754 802A1FA4 10400003 */ beqz $v0, .L802A1FB4 /* 79A758 802A1FA8 24020014 */ addiu $v0, $zero, 0x14 -/* 79A75C 802A1FAC 080A8907 */ j .L802A241C +/* 79A75C 802A1FAC 080A8907 */ j L802A241C_79ABCC /* 79A760 802A1FB0 AFC20070 */ sw $v0, 0x70($fp) .L802A1FB4: /* 79A764 802A1FB4 2402000F */ addiu $v0, $zero, 0xf .L802A1FB8: /* 79A768 802A1FB8 AFC20074 */ sw $v0, 0x74($fp) /* 79A76C 802A1FBC 24020007 */ addiu $v0, $zero, 7 -/* 79A770 802A1FC0 080A8907 */ j .L802A241C +/* 79A770 802A1FC0 080A8907 */ j L802A241C_79ABCC /* 79A774 802A1FC4 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1FC8_79A778 /* 79A778 802A1FC8 8FC20074 */ lw $v0, 0x74($fp) @@ -746,7 +746,7 @@ glabel L802A1FC8_79A778 /* 79A784 802A1FD4 2402000A */ addiu $v0, $zero, 0xa /* 79A788 802A1FD8 AFC20074 */ sw $v0, 0x74($fp) /* 79A78C 802A1FDC 24020008 */ addiu $v0, $zero, 8 -/* 79A790 802A1FE0 080A8907 */ j .L802A241C +/* 79A790 802A1FE0 080A8907 */ j L802A241C_79ABCC /* 79A794 802A1FE4 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1FE8_79A798 /* 79A798 802A1FE8 96220064 */ lhu $v0, 0x64($s1) @@ -770,14 +770,14 @@ glabel L802A1FE8_79A798 /* 79A7DC 802A202C 2402000A */ addiu $v0, $zero, 0xa /* 79A7E0 802A2030 AFC20074 */ sw $v0, 0x74($fp) /* 79A7E4 802A2034 24020009 */ addiu $v0, $zero, 9 -/* 79A7E8 802A2038 080A8907 */ j .L802A241C +/* 79A7E8 802A2038 080A8907 */ j L802A241C_79ABCC /* 79A7EC 802A203C AFC20070 */ sw $v0, 0x70($fp) glabel L802A2040_79A7F0 /* 79A7F0 802A2040 8FC20074 */ lw $v0, 0x74($fp) /* 79A7F4 802A2044 10400003 */ beqz $v0, .L802A2054 /* 79A7F8 802A2048 2442FFFF */ addiu $v0, $v0, -1 .L802A204C: -/* 79A7FC 802A204C 080A8907 */ j .L802A241C +/* 79A7FC 802A204C 080A8907 */ j L802A241C_79ABCC /* 79A800 802A2050 AFC20074 */ sw $v0, 0x74($fp) .L802A2054: /* 79A804 802A2054 3C01432A */ lui $at, 0x432a @@ -789,7 +789,7 @@ glabel L802A2040_79A7F0 /* 79A81C 802A206C E6200010 */ swc1 $f0, 0x10($s1) /* 79A820 802A2070 AFC20074 */ sw $v0, 0x74($fp) /* 79A824 802A2074 2402000A */ addiu $v0, $zero, 0xa -/* 79A828 802A2078 080A8907 */ j .L802A241C +/* 79A828 802A2078 080A8907 */ j L802A241C_79ABCC /* 79A82C 802A207C AFC20070 */ sw $v0, 0x70($fp) glabel L802A2080_79A830 /* 79A830 802A2080 8FC20074 */ lw $v0, 0x74($fp) @@ -895,7 +895,7 @@ glabel L802A219C_79A94C /* 79A994 802A21E4 0C05269B */ jal func_80149A6C /* 79A998 802A21E8 0000282D */ daddu $a1, $zero, $zero /* 79A99C 802A21EC 24020015 */ addiu $v0, $zero, 0x15 -/* 79A9A0 802A21F0 080A8907 */ j .L802A241C +/* 79A9A0 802A21F0 080A8907 */ j L802A241C_79ABCC /* 79A9A4 802A21F4 AFC20070 */ sw $v0, 0x70($fp) glabel L802A21F8_79A9A8 /* 79A9A8 802A21F8 0000B82D */ daddu $s7, $zero, $zero @@ -1044,7 +1044,6 @@ glabel L802A21F8_79A9A8 /* 79ABC0 802A2410 34840010 */ ori $a0, $a0, 0x10 /* 79ABC4 802A2414 080A8908 */ j .L802A2420 /* 79ABC8 802A2418 AC640000 */ sw $a0, ($v1) -.L802A241C: glabel L802A241C_79ABCC /* 79ABCC 802A241C 0000102D */ daddu $v0, $zero, $zero .L802A2420: diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1518_7974D8.s b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1518_7974D8.s index c75eab1ad4..1dc25d934e 100644 --- a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1518_7974D8.s +++ b/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1518_7974D8.s @@ -250,7 +250,7 @@ glabel func_802A1518_7974D8 .L802A1890: /* 797850 802A1890 2C620016 */ sltiu $v0, $v1, 0x16 .L802A1894: -/* 797854 802A1894 104002E1 */ beqz $v0, .L802A241C +/* 797854 802A1894 104002E1 */ beqz $v0, L802A241C_7983DC /* 797858 802A1898 00031080 */ sll $v0, $v1, 2 /* 79785C 802A189C 3C01802A */ lui $at, %hi(jtbl_802A3790_799750) /* 797860 802A18A0 00220821 */ addu $at, $at, $v0 @@ -345,7 +345,7 @@ glabel L802A18B0_797870 /* 7979AC 802A19EC 0C05272D */ jal play_sound /* 7979B0 802A19F0 00000000 */ nop /* 7979B4 802A19F4 24020001 */ addiu $v0, $zero, 1 -/* 7979B8 802A19F8 080A8907 */ j .L802A241C +/* 7979B8 802A19F8 080A8907 */ j L802A241C_7983DC /* 7979BC 802A19FC AFC20070 */ sw $v0, 0x70($fp) glabel L802A1A00_7979C0 /* 7979C0 802A1A00 C6200010 */ lwc1 $f0, 0x10($s1) @@ -380,7 +380,7 @@ glabel L802A1A00_7979C0 /* 797A34 802A1A74 24020014 */ addiu $v0, $zero, 0x14 /* 797A38 802A1A78 AFC20074 */ sw $v0, 0x74($fp) /* 797A3C 802A1A7C 24020002 */ addiu $v0, $zero, 2 -/* 797A40 802A1A80 080A8907 */ j .L802A241C +/* 797A40 802A1A80 080A8907 */ j L802A241C_7983DC /* 797A44 802A1A84 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1A88_797A48 /* 797A48 802A1A88 8FC20074 */ lw $v0, 0x74($fp) @@ -393,7 +393,7 @@ glabel L802A1A88_797A48 /* 797A64 802A1AA4 2402000F */ addiu $v0, $zero, 0xf /* 797A68 802A1AA8 AFC20074 */ sw $v0, 0x74($fp) /* 797A6C 802A1AAC 24020003 */ addiu $v0, $zero, 3 -/* 797A70 802A1AB0 080A8907 */ j .L802A241C +/* 797A70 802A1AB0 080A8907 */ j L802A241C_7983DC /* 797A74 802A1AB4 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1AB8_797A78 /* 797A78 802A1AB8 C624004C */ lwc1 $f4, 0x4c($s1) @@ -435,7 +435,7 @@ glabel L802A1AB8_797A78 /* 797B00 802A1B40 0C05272D */ jal play_sound /* 797B04 802A1B44 00000000 */ nop /* 797B08 802A1B48 24020004 */ addiu $v0, $zero, 4 -/* 797B0C 802A1B4C 080A8907 */ j .L802A241C +/* 797B0C 802A1B4C 080A8907 */ j L802A241C_7983DC /* 797B10 802A1B50 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1B54_797B14 /* 797B14 802A1B54 C624004C */ lwc1 $f4, 0x4c($s1) @@ -572,7 +572,7 @@ glabel L802A1B54_797B14 /* 797D04 802A1D44 AC400008 */ sw $zero, 8($v0) /* 797D08 802A1D48 8C62000C */ lw $v0, 0xc($v1) /* 797D0C 802A1D4C C6200008 */ lwc1 $f0, 8($s1) -/* 797D10 802A1D50 16E001B2 */ bnez $s7, .L802A241C +/* 797D10 802A1D50 16E001B2 */ bnez $s7, L802A241C_7983DC /* 797D14 802A1D54 E440000C */ swc1 $f0, 0xc($v0) /* 797D18 802A1D58 C620000C */ lwc1 $f0, 0xc($s1) /* 797D1C 802A1D5C C6220010 */ lwc1 $f2, 0x10($s1) @@ -630,7 +630,7 @@ glabel L802A1B54_797B14 /* 797DE0 802A1E20 2402000F */ addiu $v0, $zero, 0xf /* 797DE4 802A1E24 AFC20074 */ sw $v0, 0x74($fp) /* 797DE8 802A1E28 24020005 */ addiu $v0, $zero, 5 -/* 797DEC 802A1E2C 080A8907 */ j .L802A241C +/* 797DEC 802A1E2C 080A8907 */ j L802A241C_7983DC /* 797DF0 802A1E30 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1E34_797DF4 /* 797DF4 802A1E34 8FC20074 */ lw $v0, 0x74($fp) @@ -686,7 +686,7 @@ glabel L802A1E34_797DF4 /* 797EB8 802A1EF8 2402002D */ addiu $v0, $zero, 0x2d /* 797EBC 802A1EFC AFC20074 */ sw $v0, 0x74($fp) /* 797EC0 802A1F00 24020006 */ addiu $v0, $zero, 6 -/* 797EC4 802A1F04 080A8907 */ j .L802A241C +/* 797EC4 802A1F04 080A8907 */ j L802A241C_7983DC /* 797EC8 802A1F08 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1F0C_797ECC /* 797ECC 802A1F0C 96220064 */ lhu $v0, 0x64($s1) @@ -730,14 +730,14 @@ glabel L802A1F0C_797ECC /* 797F60 802A1FA0 00431024 */ and $v0, $v0, $v1 /* 797F64 802A1FA4 10400003 */ beqz $v0, .L802A1FB4 /* 797F68 802A1FA8 24020014 */ addiu $v0, $zero, 0x14 -/* 797F6C 802A1FAC 080A8907 */ j .L802A241C +/* 797F6C 802A1FAC 080A8907 */ j L802A241C_7983DC /* 797F70 802A1FB0 AFC20070 */ sw $v0, 0x70($fp) .L802A1FB4: /* 797F74 802A1FB4 2402000F */ addiu $v0, $zero, 0xf .L802A1FB8: /* 797F78 802A1FB8 AFC20074 */ sw $v0, 0x74($fp) /* 797F7C 802A1FBC 24020007 */ addiu $v0, $zero, 7 -/* 797F80 802A1FC0 080A8907 */ j .L802A241C +/* 797F80 802A1FC0 080A8907 */ j L802A241C_7983DC /* 797F84 802A1FC4 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1FC8_797F88 /* 797F88 802A1FC8 8FC20074 */ lw $v0, 0x74($fp) @@ -746,7 +746,7 @@ glabel L802A1FC8_797F88 /* 797F94 802A1FD4 2402000A */ addiu $v0, $zero, 0xa /* 797F98 802A1FD8 AFC20074 */ sw $v0, 0x74($fp) /* 797F9C 802A1FDC 24020008 */ addiu $v0, $zero, 8 -/* 797FA0 802A1FE0 080A8907 */ j .L802A241C +/* 797FA0 802A1FE0 080A8907 */ j L802A241C_7983DC /* 797FA4 802A1FE4 AFC20070 */ sw $v0, 0x70($fp) glabel L802A1FE8_797FA8 /* 797FA8 802A1FE8 96220064 */ lhu $v0, 0x64($s1) @@ -770,14 +770,14 @@ glabel L802A1FE8_797FA8 /* 797FEC 802A202C 2402000A */ addiu $v0, $zero, 0xa /* 797FF0 802A2030 AFC20074 */ sw $v0, 0x74($fp) /* 797FF4 802A2034 24020009 */ addiu $v0, $zero, 9 -/* 797FF8 802A2038 080A8907 */ j .L802A241C +/* 797FF8 802A2038 080A8907 */ j L802A241C_7983DC /* 797FFC 802A203C AFC20070 */ sw $v0, 0x70($fp) glabel L802A2040_798000 /* 798000 802A2040 8FC20074 */ lw $v0, 0x74($fp) /* 798004 802A2044 10400003 */ beqz $v0, .L802A2054 /* 798008 802A2048 2442FFFF */ addiu $v0, $v0, -1 .L802A204C: -/* 79800C 802A204C 080A8907 */ j .L802A241C +/* 79800C 802A204C 080A8907 */ j L802A241C_7983DC /* 798010 802A2050 AFC20074 */ sw $v0, 0x74($fp) .L802A2054: /* 798014 802A2054 3C01432A */ lui $at, 0x432a @@ -789,7 +789,7 @@ glabel L802A2040_798000 /* 79802C 802A206C E6200010 */ swc1 $f0, 0x10($s1) /* 798030 802A2070 AFC20074 */ sw $v0, 0x74($fp) /* 798034 802A2074 2402000A */ addiu $v0, $zero, 0xa -/* 798038 802A2078 080A8907 */ j .L802A241C +/* 798038 802A2078 080A8907 */ j L802A241C_7983DC /* 79803C 802A207C AFC20070 */ sw $v0, 0x70($fp) glabel L802A2080_798040 /* 798040 802A2080 8FC20074 */ lw $v0, 0x74($fp) @@ -895,7 +895,7 @@ glabel L802A219C_79815C /* 7981A4 802A21E4 0C05269B */ jal func_80149A6C /* 7981A8 802A21E8 0000282D */ daddu $a1, $zero, $zero /* 7981AC 802A21EC 24020015 */ addiu $v0, $zero, 0x15 -/* 7981B0 802A21F0 080A8907 */ j .L802A241C +/* 7981B0 802A21F0 080A8907 */ j L802A241C_7983DC /* 7981B4 802A21F4 AFC20070 */ sw $v0, 0x70($fp) glabel L802A21F8_7981B8 /* 7981B8 802A21F8 0000B82D */ daddu $s7, $zero, $zero @@ -1044,7 +1044,6 @@ glabel L802A21F8_7981B8 /* 7983D0 802A2410 34840010 */ ori $a0, $a0, 0x10 /* 7983D4 802A2414 080A8908 */ j .L802A2420 /* 7983D8 802A2418 AC640000 */ sw $a0, ($v1) -.L802A241C: glabel L802A241C_7983DC /* 7983DC 802A241C 0000102D */ daddu $v0, $zero, $zero .L802A2420: diff --git a/ver/us/asm/nonmatchings/code_11a50_len_7a0/step_intro.s b/ver/us/asm/nonmatchings/code_11a50_len_7a0/step_intro.s index 48edb017d2..224d62bc1d 100644 --- a/ver/us/asm/nonmatchings/code_11a50_len_7a0/step_intro.s +++ b/ver/us/asm/nonmatchings/code_11a50_len_7a0/step_intro.s @@ -71,7 +71,7 @@ glabel step_intro /* 11D44 80036944 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 11D48 80036948 804300AC */ lb $v1, 0xac($v0) /* 11D4C 8003694C 2C620016 */ sltiu $v0, $v1, 0x16 -/* 11D50 80036950 10400109 */ beqz $v0, .L80036D78 +/* 11D50 80036950 10400109 */ beqz $v0, L80036D78_12178 /* 11D54 80036954 00031080 */ sll $v0, $v1, 2 /* 11D58 80036958 3C01800A */ lui $at, %hi(jtbl_80098338) /* 11D5C 8003695C 00220821 */ addu $at, $at, $v0 @@ -97,13 +97,13 @@ glabel L8003696C_11D6C /* 11DA8 800369A8 84840956 */ lh $a0, %lo(D_800A0956)($a0) /* 11DAC 800369AC 0C00CE0C */ jal intro_logos_fade_out /* 11DB0 800369B0 00000000 */ nop -/* 11DB4 800369B4 104000F0 */ beqz $v0, .L80036D78 +/* 11DB4 800369B4 104000F0 */ beqz $v0, L80036D78_12178 /* 11DB8 800369B8 24020001 */ addiu $v0, $zero, 1 /* 11DBC 800369BC 0000202D */ daddu $a0, $zero, $zero /* 11DC0 800369C0 8E030000 */ lw $v1, ($s0) /* 11DC4 800369C4 0C00AFC1 */ jal set_curtain_draw_callback /* 11DC8 800369C8 A06200AC */ sb $v0, 0xac($v1) -/* 11DCC 800369CC 0800DB5E */ j .L80036D78 +/* 11DCC 800369CC 0800DB5E */ j L80036D78_12178 /* 11DD0 800369D0 00000000 */ nop .L800369D4: /* 11DD4 800369D4 3C05800A */ lui $a1, %hi(D_800A0954) @@ -116,14 +116,14 @@ glabel L8003696C_11D6C /* 11DF0 800369F0 00021400 */ sll $v0, $v0, 0x10 /* 11DF4 800369F4 00021403 */ sra $v0, $v0, 0x10 /* 11DF8 800369F8 284200FF */ slti $v0, $v0, 0xff -/* 11DFC 800369FC 144000DE */ bnez $v0, .L80036D78 +/* 11DFC 800369FC 144000DE */ bnez $v0, L80036D78_12178 /* 11E00 80036A00 240200FF */ addiu $v0, $zero, 0xff /* 11E04 80036A04 0000202D */ daddu $a0, $zero, $zero /* 11E08 80036A08 A4A20000 */ sh $v0, ($a1) /* 11E0C 80036A0C 24020001 */ addiu $v0, $zero, 1 /* 11E10 80036A10 0C00AFC1 */ jal set_curtain_draw_callback /* 11E14 80036A14 A0C200AC */ sb $v0, 0xac($a2) -/* 11E18 80036A18 0800DB5E */ j .L80036D78 +/* 11E18 80036A18 0800DB5E */ j L80036D78_12178 /* 11E1C 80036A1C 00000000 */ nop glabel L80036A20_11E20 /* 11E20 80036A20 3C04800A */ lui $a0, %hi(D_8009A650) @@ -137,7 +137,7 @@ glabel L80036A20_11E20 /* 11E40 80036A40 3C03800A */ lui $v1, %hi(D_800A0960) /* 11E44 80036A44 8C630960 */ lw $v1, %lo(D_800A0960)($v1) /* 11E48 80036A48 2402000E */ addiu $v0, $zero, 0xe -/* 11E4C 80036A4C 106200CA */ beq $v1, $v0, .L80036D78 +/* 11E4C 80036A4C 106200CA */ beq $v1, $v0, L80036D78_12178 /* 11E50 80036A50 00000000 */ nop /* 11E54 80036A54 0800DAA3 */ j .L80036A8C /* 11E58 80036A58 00000000 */ nop @@ -146,7 +146,7 @@ glabel L80036A5C_11E5C /* 11E60 80036A60 24630950 */ addiu $v1, $v1, %lo(D_800A0950) /* 11E64 80036A64 8C620000 */ lw $v0, ($v1) /* 11E68 80036A68 2442FFFF */ addiu $v0, $v0, -1 -/* 11E6C 80036A6C 1C4000C2 */ bgtz $v0, .L80036D78 +/* 11E6C 80036A6C 1C4000C2 */ bgtz $v0, L80036D78_12178 /* 11E70 80036A70 AC620000 */ sw $v0, ($v1) /* 11E74 80036A74 3C04800A */ lui $a0, %hi(D_8009A650) /* 11E78 80036A78 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) @@ -158,7 +158,7 @@ glabel L80036A5C_11E5C /* 11E8C 80036A8C 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 11E90 80036A90 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 11E94 80036A94 24020002 */ addiu $v0, $zero, 2 -/* 11E98 80036A98 0800DB5E */ j .L80036D78 +/* 11E98 80036A98 0800DB5E */ j L80036D78_12178 /* 11E9C 80036A9C A06200AC */ sb $v0, 0xac($v1) glabel L80036AA0_11EA0 /* 11EA0 80036AA0 0C00AFC1 */ jal set_curtain_draw_callback @@ -265,7 +265,7 @@ glabel L80036AA0_11EA0 /* 1202C 80036C2C 24020003 */ addiu $v0, $zero, 3 /* 12030 80036C30 0C03805E */ jal disable_player_input /* 12034 80036C34 A06200AC */ sb $v0, 0xac($v1) -/* 12038 80036C38 0800DB5E */ j .L80036D78 +/* 12038 80036C38 0800DB5E */ j L80036D78_12178 /* 1203C 80036C3C 00000000 */ nop glabel L80036C40_12040 /* 12040 80036C40 3C04800A */ lui $a0, %hi(D_800A0960) @@ -316,7 +316,7 @@ glabel L80036C40_12040 /* 120F0 80036CF0 8E020000 */ lw $v0, ($s0) /* 120F4 80036CF4 94440086 */ lhu $a0, 0x86($v0) /* 120F8 80036CF8 A04300AC */ sb $v1, 0xac($v0) -/* 120FC 80036CFC 0800DB5E */ j .L80036D78 +/* 120FC 80036CFC 0800DB5E */ j L80036D78_12178 /* 12100 80036D00 A4440088 */ sh $a0, 0x88($v0) glabel L80036D04_12104 /* 12104 80036D04 0C016754 */ jal update_effects @@ -339,7 +339,7 @@ glabel L80036D04_12104 /* 12148 80036D48 4405A000 */ mfc1 $a1, $f20 /* 1214C 80036D4C 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 12150 80036D50 240400FF */ addiu $a0, $zero, 0xff -/* 12154 80036D54 0800DB5E */ j .L80036D78 +/* 12154 80036D54 0800DB5E */ j L80036D78_12178 /* 12158 80036D58 00000000 */ nop .L80036D5C: /* 1215C 80036D5C 3C02800A */ lui $v0, %hi(D_800A0958) @@ -347,9 +347,8 @@ glabel L80036D04_12104 /* 12164 80036D64 00621023 */ subu $v0, $v1, $v0 /* 12168 80036D68 A4820000 */ sh $v0, ($a0) /* 1216C 80036D6C 00021400 */ sll $v0, $v0, 0x10 -/* 12170 80036D70 04420001 */ bltzl $v0, .L80036D78 +/* 12170 80036D70 04420001 */ bltzl $v0, L80036D78_12178 /* 12174 80036D74 A4800000 */ sh $zero, ($a0) -.L80036D78: glabel L80036D78_12178 /* 12178 80036D78 3C02800A */ lui $v0, %hi(D_800A0954) /* 1217C 80036D7C 84420954 */ lh $v0, %lo(D_800A0954)($v0) diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s b/ver/us/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s index 4a3da46a83..ac7d9f5170 100644 --- a/ver/us/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s +++ b/ver/us/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s @@ -8,7 +8,7 @@ glabel func_800375A4 /* 129B0 800375B0 AFBF0010 */ sw $ra, 0x10($sp) /* 129B4 800375B4 804300AC */ lb $v1, 0xac($v0) /* 129B8 800375B8 2C620006 */ sltiu $v0, $v1, 6 -/* 129BC 800375BC 1040001B */ beqz $v0, .L8003762C +/* 129BC 800375BC 1040001B */ beqz $v0, L8003762C_12A2C /* 129C0 800375C0 00031080 */ sll $v0, $v1, 2 /* 129C4 800375C4 3C01800A */ lui $at, %hi(jtbl_800983C8) /* 129C8 800375C8 00220821 */ addu $at, $at, $v0 @@ -21,7 +21,7 @@ glabel L800375D8_129D8 /* 129E0 800375E0 3C018007 */ lui $at, %hi(D_80077A2C) /* 129E4 800375E4 AC207A2C */ sw $zero, %lo(D_80077A2C)($at) /* 129E8 800375E8 3C018007 */ lui $at, %hi(D_80077A30) -/* 129EC 800375EC 0800DD89 */ j .L80037624 +/* 129EC 800375EC 0800DD89 */ j L80037624_12A24 /* 129F0 800375F0 AC207A30 */ sw $zero, %lo(D_80077A30)($at) glabel L800375F4_129F4 /* 129F4 800375F4 0C00DE58 */ jal func_80037960 @@ -30,17 +30,15 @@ glabel L800375F4_129F4 /* 12A00 80037600 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 12A04 80037604 90420073 */ lbu $v0, 0x73($v0) /* 12A08 80037608 30420001 */ andi $v0, $v0, 1 -/* 12A0C 8003760C 10400007 */ beqz $v0, .L8003762C +/* 12A0C 8003760C 10400007 */ beqz $v0, L8003762C_12A2C /* 12A10 80037610 00000000 */ nop /* 12A14 80037614 0C00DEF2 */ jal title_draw_press_start /* 12A18 80037618 00000000 */ nop -/* 12A1C 8003761C 0800DD8B */ j .L8003762C +/* 12A1C 8003761C 0800DD8B */ j L8003762C_12A2C /* 12A20 80037620 00000000 */ nop -.L80037624: glabel L80037624_12A24 /* 12A24 80037624 0C00DE58 */ jal func_80037960 /* 12A28 80037628 00000000 */ nop -.L8003762C: glabel L8003762C_12A2C /* 12A2C 8003762C 8FBF0010 */ lw $ra, 0x10($sp) /* 12A30 80037630 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s b/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s index 04ff0c2319..75f4c5d58c 100644 --- a/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s +++ b/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s @@ -27,7 +27,7 @@ glabel step_title_screen /* 12508 80037108 8E020000 */ lw $v0, ($s0) /* 1250C 8003710C 804300AC */ lb $v1, 0xac($v0) /* 12510 80037110 2C620007 */ sltiu $v0, $v1, 7 -/* 12514 80037114 10400115 */ beqz $v0, .L8003756C +/* 12514 80037114 10400115 */ beqz $v0, L8003756C_1296C /* 12518 80037118 00031080 */ sll $v0, $v1, 2 /* 1251C 8003711C 3C01800A */ lui $at, %hi(jtbl_800983A8) /* 12520 80037120 00220821 */ addu $at, $at, $v0 @@ -54,7 +54,7 @@ glabel L80037130_12530 /* 12570 80037170 8C830000 */ lw $v1, ($a0) /* 12574 80037174 906200AC */ lbu $v0, 0xac($v1) /* 12578 80037178 24420001 */ addiu $v0, $v0, 1 -/* 1257C 8003717C 0800DD5B */ j .L8003756C +/* 1257C 8003717C 0800DD5B */ j L8003756C_1296C /* 12580 80037180 A06200AC */ sb $v0, 0xac($v1) glabel L80037184_12584 /* 12584 80037184 3C04800A */ lui $a0, %hi(D_800A0970) @@ -63,7 +63,7 @@ glabel L80037184_12584 /* 12590 80037190 94830000 */ lhu $v1, ($a0) /* 12594 80037194 10400003 */ beqz $v0, .L800371A4 /* 12598 80037198 2462FFFF */ addiu $v0, $v1, -1 -/* 1259C 8003719C 0800DD5B */ j .L8003756C +/* 1259C 8003719C 0800DD5B */ j L8003756C_1296C /* 125A0 800371A0 A4820000 */ sh $v0, ($a0) .L800371A4: /* 125A4 800371A4 3C108007 */ lui $s0, %hi(gGameStatusPtr) @@ -130,7 +130,7 @@ glabel L80037204_12604 /* 12688 80037288 0800DD64 */ j .L80037590 /* 1268C 8003728C AC620000 */ sw $v0, ($v1) .L80037290: -/* 12690 80037290 104000B6 */ beqz $v0, .L8003756C +/* 12690 80037290 104000B6 */ beqz $v0, L8003756C_1296C /* 12694 80037294 24020004 */ addiu $v0, $zero, 4 /* 12698 80037298 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 1269C 8003729C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) @@ -174,7 +174,7 @@ glabel L800372DC_126DC /* 12728 80037328 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 1272C 8003732C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 12730 80037330 906200B0 */ lbu $v0, 0xb0($v1) -/* 12734 80037334 0800DD5B */ j .L8003756C +/* 12734 80037334 0800DD5B */ j L8003756C_1296C /* 12738 80037338 A06200AF */ sb $v0, 0xaf($v1) glabel L8003733C_1273C /* 1273C 8003733C 3C038007 */ lui $v1, %hi(D_800779C0) @@ -212,7 +212,7 @@ glabel L8003733C_1273C .L800373B8: /* 127B8 800373B8 0C00CE1D */ jal intro_logos_update_fade /* 127BC 800373BC 00000000 */ nop -/* 127C0 800373C0 0800DD5B */ j .L8003756C +/* 127C0 800373C0 0800DD5B */ j L8003756C_1296C /* 127C4 800373C4 00000000 */ nop .L800373C8: /* 127C8 800373C8 00021403 */ sra $v0, $v0, 0x10 @@ -249,7 +249,7 @@ glabel L8003733C_1273C /* 12840 80037440 8C830000 */ lw $v1, ($a0) /* 12844 80037444 24020006 */ addiu $v0, $zero, 6 .L80037448: -/* 12848 80037448 0800DD5B */ j .L8003756C +/* 12848 80037448 0800DD5B */ j L8003756C_1296C /* 1284C 8003744C A06200AC */ sb $v0, 0xac($v1) glabel L80037450_12850 /* 12850 80037450 3C108007 */ lui $s0, %hi(gGameStatusPtr) @@ -260,7 +260,7 @@ glabel L80037450_12850 /* 12864 80037464 10400003 */ beqz $v0, .L80037474 /* 12868 80037468 2462FFFF */ addiu $v0, $v1, -1 .L8003746C: -/* 1286C 8003746C 0800DD5B */ j .L8003756C +/* 1286C 8003746C 0800DD5B */ j L8003756C_1296C /* 12870 80037470 A08200AF */ sb $v0, 0xaf($a0) .L80037474: /* 12874 80037474 0C00AB00 */ jal general_heap_create @@ -329,7 +329,6 @@ glabel L80037450_12850 /* 12960 80037560 A4A0008E */ sh $zero, 0x8e($a1) /* 12964 80037564 0800DD64 */ j .L80037590 /* 12968 80037568 00000000 */ nop -.L8003756C: glabel L8003756C_1296C /* 1296C 8003756C 3C02800A */ lui $v0, %hi(D_8009A650) /* 12970 80037570 8C42A650 */ lw $v0, %lo(D_8009A650)($v0) diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s b/ver/us/asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s index 36fcd0627e..4f187bc3b6 100644 --- a/ver/us/asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s +++ b/ver/us/asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s @@ -16,7 +16,7 @@ glabel title_append_gfx /* 12A64 80037664 AFB00010 */ sw $s0, 0x10($sp) /* 12A68 80037668 804300AC */ lb $v1, 0xac($v0) /* 12A6C 8003766C 2C620006 */ sltiu $v0, $v1, 6 -/* 12A70 80037670 10400029 */ beqz $v0, .L80037718 +/* 12A70 80037670 10400029 */ beqz $v0, L80037718_12B18 /* 12A74 80037674 00031080 */ sll $v0, $v1, 2 /* 12A78 80037678 3C01800A */ lui $at, %hi(jtbl_800983E0) /* 12A7C 8003767C 00220821 */ addu $at, $at, $v0 @@ -64,7 +64,6 @@ glabel L800376D4_12AD4 .L80037710: /* 12B10 80037710 0C00DE5A */ jal title_draw_images /* 12B14 80037714 46006386 */ mov.s $f14, $f12 -.L80037718: glabel L80037718_12B18 /* 12B18 80037718 3C03FF10 */ lui $v1, 0xff10 /* 12B1C 8003771C 3463013F */ ori $v1, $v1, 0x13f diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/draw_encounter_ui.s b/ver/us/asm/nonmatchings/code_13870_len_6980/draw_encounter_ui.s index 17260f3292..f22ba46f47 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/draw_encounter_ui.s +++ b/ver/us/asm/nonmatchings/code_13870_len_6980/draw_encounter_ui.s @@ -6,7 +6,7 @@ glabel draw_encounter_ui /* 199B4 8003E5B4 8C63A600 */ lw $v1, %lo(gGameState)($v1) /* 199B8 8003E5B8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 199BC 8003E5BC 2C620006 */ sltiu $v0, $v1, 6 -/* 199C0 8003E5C0 10400019 */ beqz $v0, .L8003E628 +/* 199C0 8003E5C0 10400019 */ beqz $v0, L8003E628_19A28 /* 199C4 8003E5C4 AFBF0010 */ sw $ra, 0x10($sp) /* 199C8 8003E5C8 00031080 */ sll $v0, $v1, 2 /* 199CC 8003E5CC 3C01800A */ lui $at, %hi(jtbl_800985D8) @@ -17,27 +17,26 @@ glabel draw_encounter_ui glabel L8003E5E0_199E0 /* 199E0 8003E5E0 0C011050 */ jal init_encounters_ui /* 199E4 8003E5E4 00000000 */ nop -/* 199E8 8003E5E8 0800F98A */ j .L8003E628 +/* 199E8 8003E5E8 0800F98A */ j L8003E628_19A28 /* 199EC 8003E5EC 00000000 */ nop glabel L8003E5F0_199F0 /* 199F0 8003E5F0 0C0104D7 */ jal draw_encounters_neutral /* 199F4 8003E5F4 00000000 */ nop -/* 199F8 8003E5F8 0800F98A */ j .L8003E628 +/* 199F8 8003E5F8 0800F98A */ j L8003E628_19A28 /* 199FC 8003E5FC 00000000 */ nop glabel L8003E600_19A00 /* 19A00 8003E600 0C010659 */ jal draw_encounters_pre_battle /* 19A04 8003E604 00000000 */ nop -/* 19A08 8003E608 0800F98A */ j .L8003E628 +/* 19A08 8003E608 0800F98A */ j L8003E628_19A28 /* 19A0C 8003E60C 00000000 */ nop glabel L8003E610_19A10 /* 19A10 8003E610 0C010C75 */ jal draw_encounters_conversation /* 19A14 8003E614 00000000 */ nop -/* 19A18 8003E618 0800F98A */ j .L8003E628 +/* 19A18 8003E618 0800F98A */ j L8003E628_19A28 /* 19A1C 8003E61C 00000000 */ nop glabel L8003E620_19A20 /* 19A20 8003E620 0C010C13 */ jal draw_encounters_post_battle /* 19A24 8003E624 00000000 */ nop -.L8003E628: glabel L8003E628_19A28 /* 19A28 8003E628 0C01170A */ jal draw_merlee_messages /* 19A2C 8003E62C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s index 296921b2f8..0e53c2497b 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s +++ b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s @@ -27,7 +27,7 @@ glabel func_8003D3BC /* 18814 8003D414 0C0B7A25 */ jal func_802DE894 /* 18818 8003D418 00A0382D */ daddu $a3, $a1, $zero /* 1881C 8003D41C 2E820011 */ sltiu $v0, $s4, 0x11 -/* 18820 8003D420 10400076 */ beqz $v0, .L8003D5FC +/* 18820 8003D420 10400076 */ beqz $v0, L8003D5FC_189FC /* 18824 8003D424 00141080 */ sll $v0, $s4, 2 /* 18828 8003D428 3C01800A */ lui $at, %hi(jtbl_80098548) /* 1882C 8003D42C 00220821 */ addu $at, $at, $v0 @@ -162,7 +162,6 @@ glabel L8003D5D0_189D0 .L8003D5F4: /* 189F4 8003D5F4 0C0B7A25 */ jal func_802DE894 /* 189F8 8003D5F8 00000000 */ nop -.L8003D5FC: glabel L8003D5FC_189FC /* 189FC 8003D5FC 8FBF003C */ lw $ra, 0x3c($sp) /* 18A00 8003D600 8FB60038 */ lw $s6, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D660.s b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D660.s index 5cd49f250a..0e6e0dd651 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D660.s +++ b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D660.s @@ -29,7 +29,7 @@ glabel func_8003D660 /* 18AC0 8003D6C0 304200FF */ andi $v0, $v0, 0xff /* 18AC4 8003D6C4 2443FFFF */ addiu $v1, $v0, -1 /* 18AC8 8003D6C8 2C620009 */ sltiu $v0, $v1, 9 -/* 18ACC 8003D6CC 10400025 */ beqz $v0, .L8003D764 +/* 18ACC 8003D6CC 10400025 */ beqz $v0, L8003D764_18B64 /* 18AD0 8003D6D0 00031080 */ sll $v0, $v1, 2 /* 18AD4 8003D6D4 3C01800A */ lui $at, %hi(jtbl_80098590) /* 18AD8 8003D6D8 00220821 */ addu $at, $at, $v0 @@ -73,7 +73,6 @@ glabel L8003D750_18B50 /* 18B58 8003D758 0220282D */ daddu $a1, $s1, $zero /* 18B5C 8003D75C 0800F5DC */ j .L8003D770 /* 18B60 8003D760 00000000 */ nop -.L8003D764: glabel L8003D764_18B64 /* 18B64 8003D764 0200202D */ daddu $a0, $s0, $zero /* 18B68 8003D768 0C00F5E2 */ jal func_8003D788 diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/update_counters.s b/ver/us/asm/nonmatchings/code_13870_len_6980/update_counters.s index 9f38c3f5d6..b9f3bbd178 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/update_counters.s +++ b/ver/us/asm/nonmatchings/code_13870_len_6980/update_counters.s @@ -6,7 +6,7 @@ glabel update_counters /* 19928 8003E528 8C63A600 */ lw $v1, %lo(gGameState)($v1) /* 1992C 8003E52C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 19930 8003E530 2C620006 */ sltiu $v0, $v1, 6 -/* 19934 8003E534 10400019 */ beqz $v0, .L8003E59C +/* 19934 8003E534 10400019 */ beqz $v0, L8003E59C_1999C /* 19938 8003E538 AFBF0010 */ sw $ra, 0x10($sp) /* 1993C 8003E53C 00031080 */ sll $v0, $v1, 2 /* 19940 8003E540 3C01800A */ lui $at, %hi(jtbl_800985C0) @@ -17,27 +17,26 @@ glabel update_counters glabel L8003E554_19954 /* 19954 8003E554 0C010DAC */ jal create_encounters /* 19958 8003E558 00000000 */ nop -/* 1995C 8003E55C 0800F967 */ j .L8003E59C +/* 1995C 8003E55C 0800F967 */ j L8003E59C_1999C /* 19960 8003E560 00000000 */ nop glabel L8003E564_19964 /* 19964 8003E564 0C00FDF3 */ jal update_encounters_neutral /* 19968 8003E568 00000000 */ nop -/* 1996C 8003E56C 0800F967 */ j .L8003E59C +/* 1996C 8003E56C 0800F967 */ j L8003E59C_1999C /* 19970 8003E570 00000000 */ nop glabel L8003E574_19974 /* 19974 8003E574 0C0104D9 */ jal update_encounters_pre_battle /* 19978 8003E578 00000000 */ nop -/* 1997C 8003E57C 0800F967 */ j .L8003E59C +/* 1997C 8003E57C 0800F967 */ j L8003E59C_1999C /* 19980 8003E580 00000000 */ nop glabel L8003E584_19984 /* 19984 8003E584 0C010C27 */ jal update_encounters_conversation /* 19988 8003E588 00000000 */ nop -/* 1998C 8003E58C 0800F967 */ j .L8003E59C +/* 1998C 8003E58C 0800F967 */ j L8003E59C_1999C /* 19990 8003E590 00000000 */ nop glabel L8003E594_19994 /* 19994 8003E594 0C0107C4 */ jal update_encounters_post_battle /* 19998 8003E598 00000000 */ nop -.L8003E59C: glabel L8003E59C_1999C /* 1999C 8003E59C 0C0116DA */ jal update_merlee_messages /* 199A0 8003E5A0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_165490/func_80244C30.s b/ver/us/asm/nonmatchings/code_165490/func_80244C30.s index ce37a62b4e..c3ef01bd03 100644 --- a/ver/us/asm/nonmatchings/code_165490/func_80244C30.s +++ b/ver/us/asm/nonmatchings/code_165490/func_80244C30.s @@ -11,7 +11,7 @@ glabel func_80244C30 /* 1654A8 80244C48 AFB00018 */ sw $s0, 0x18($sp) /* 1654AC 80244C4C 80830004 */ lb $v1, 4($a0) /* 1654B0 80244C50 2C620005 */ sltiu $v0, $v1, 5 -/* 1654B4 80244C54 10400013 */ beqz $v0, .L80244CA4 +/* 1654B4 80244C54 10400013 */ beqz $v0, L80244CA4_165504 /* 1654B8 80244C58 00C0982D */ daddu $s3, $a2, $zero /* 1654BC 80244C5C 00031080 */ sll $v0, $v1, 2 /* 1654C0 80244C60 3C018025 */ lui $at, %hi(jtbl_8024BF70) @@ -35,7 +35,6 @@ glabel L80244C98_1654F8 /* 1654F8 80244C98 24040005 */ addiu $a0, $zero, 5 /* 1654FC 80244C9C 0809132B */ j .L80244CAC /* 165500 80244CA0 24110010 */ addiu $s1, $zero, 0x10 -.L80244CA4: glabel L80244CA4_165504 /* 165504 80244CA4 24040003 */ addiu $a0, $zero, 3 /* 165508 80244CA8 2411000A */ addiu $s1, $zero, 0xa diff --git a/ver/us/asm/nonmatchings/code_168590/func_80248BF4.s b/ver/us/asm/nonmatchings/code_168590/func_80248BF4.s index 20aedb2d36..cc39dbf127 100644 --- a/ver/us/asm/nonmatchings/code_168590/func_80248BF4.s +++ b/ver/us/asm/nonmatchings/code_168590/func_80248BF4.s @@ -174,7 +174,7 @@ glabel L80248E34_169694 glabel L80248E64_1696C4 /* 1696C4 80248E64 82020004 */ lb $v0, 4($s0) /* 1696C8 80248E68 24110001 */ addiu $s1, $zero, 1 -/* 1696CC 80248E6C 10510071 */ beq $v0, $s1, .L80249034 +/* 1696CC 80248E6C 10510071 */ beq $v0, $s1, L80249034_169894 /* 1696D0 80248E70 00000000 */ nop /* 1696D4 80248E74 0C05272D */ jal play_sound /* 1696D8 80248E78 24042105 */ addiu $a0, $zero, 0x2105 @@ -185,7 +185,7 @@ glabel L80248E64_1696C4 /* 1696EC 80248E8C A2110004 */ sb $s1, 4($s0) glabel L80248E90_1696F0 /* 1696F0 80248E90 82020004 */ lb $v0, 4($s0) -/* 1696F4 80248E94 10400067 */ beqz $v0, .L80249034 +/* 1696F4 80248E94 10400067 */ beqz $v0, L80249034_169894 /* 1696F8 80248E98 00000000 */ nop /* 1696FC 80248E9C 0C05272D */ jal play_sound /* 169700 80248EA0 24042105 */ addiu $a0, $zero, 0x2105 @@ -200,7 +200,7 @@ glabel L80248E90_1696F0 /* 169720 80248EC0 24A58170 */ addiu $a1, $a1, %lo(func_80248170) /* 169724 80248EC4 0C051F9F */ jal set_window_update /* 169728 80248EC8 24040031 */ addiu $a0, $zero, 0x31 -/* 16972C 80248ECC 0809240D */ j .L80249034 +/* 16972C 80248ECC 0809240D */ j L80249034_169894 /* 169730 80248ED0 00000000 */ nop glabel L80248ED4_169734 /* 169734 80248ED4 0000182D */ daddu $v1, $zero, $zero @@ -222,7 +222,7 @@ glabel L80248ED4_169734 /* 16976C 80248F0C 00000000 */ nop /* 169770 80248F10 0C05272D */ jal play_sound /* 169774 80248F14 2404021D */ addiu $a0, $zero, 0x21d -/* 169778 80248F18 0809240D */ j .L80249034 +/* 169778 80248F18 0809240D */ j L80249034_169894 /* 16977C 80248F1C 00000000 */ nop .L80248F20: /* 169780 80248F20 0C05272D */ jal play_sound @@ -283,7 +283,7 @@ glabel L80248ED4_169734 /* 169850 80248FF0 92020003 */ lbu $v0, 3($s0) /* 169854 80248FF4 3C018025 */ lui $at, %hi(D_8024C117) /* 169858 80248FF8 A022C117 */ sb $v0, %lo(D_8024C117)($at) -/* 16985C 80248FFC 0809240D */ j .L80249034 +/* 16985C 80248FFC 0809240D */ j L80249034_169894 /* 169860 80249000 00000000 */ nop .L80249004: /* 169864 80249004 92020003 */ lbu $v0, 3($s0) @@ -297,9 +297,8 @@ glabel L80248ED4_169734 /* 169880 80249020 00021600 */ sll $v0, $v0, 0x18 /* 169884 80249024 00021603 */ sra $v0, $v0, 0x18 /* 169888 80249028 28420009 */ slti $v0, $v0, 9 -/* 16988C 8024902C 50400001 */ beql $v0, $zero, .L80249034 +/* 16988C 8024902C 50400001 */ beql $v0, $zero, L80249034_169894 /* 169890 80249030 A0850000 */ sb $a1, ($a0) -.L80249034: glabel L80249034_169894 /* 169894 80249034 92020003 */ lbu $v0, 3($s0) /* 169898 80249038 24420039 */ addiu $v0, $v0, 0x39 diff --git a/ver/us/asm/nonmatchings/code_16F740/begin_battle.s b/ver/us/asm/nonmatchings/code_16F740/begin_battle.s index ba3559cf47..baa778550b 100644 --- a/ver/us/asm/nonmatchings/code_16F740/begin_battle.s +++ b/ver/us/asm/nonmatchings/code_16F740/begin_battle.s @@ -36,7 +36,7 @@ glabel begin_battle /* 16FB68 80241288 3C03800E */ lui $v1, %hi(gBattleStatus+0x46C) /* 16FB6C 8024128C 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) /* 16FB70 80241290 2C620009 */ sltiu $v0, $v1, 9 -/* 16FB74 80241294 104001FC */ beqz $v0, .L80241A88 +/* 16FB74 80241294 104001FC */ beqz $v0, L80241A88_170368 /* 16FB78 80241298 AE950438 */ sw $s5, 0x438($s4) /* 16FB7C 8024129C 00031080 */ sll $v0, $v1, 2 /* 16FB80 802412A0 3C01802A */ lui $at, %hi(jtbl_8029CA88) @@ -234,13 +234,13 @@ glabel L802412B4_16FB94 /* 16FE5C 8024157C 8C620144 */ lw $v0, 0x144($v1) /* 16FE60 80241580 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 16FE64 80241584 AC30C4DC */ sw $s0, %lo(gBattleStatus+0x46C)($at) -/* 16FE68 80241588 080906A2 */ j .L80241A88 +/* 16FE68 80241588 080906A2 */ j L80241A88_170368 /* 16FE6C 8024158C AE8200C8 */ sw $v0, 0xc8($s4) glabel L80241590_16FE70 /* 16FE70 80241590 8E8400C8 */ lw $a0, 0xc8($s4) /* 16FE74 80241594 0C0B1059 */ jal does_script_exist /* 16FE78 80241598 00000000 */ nop -/* 16FE7C 8024159C 1440013A */ bnez $v0, .L80241A88 +/* 16FE7C 8024159C 1440013A */ bnez $v0, L80241A88_170368 /* 16FE80 802415A0 00000000 */ nop /* 16FE84 802415A4 8EA4000C */ lw $a0, 0xc($s5) /* 16FE88 802415A8 10800009 */ beqz $a0, .L802415D0 @@ -395,7 +395,7 @@ glabel L80241590_16FE70 /* 1700A0 802417C0 24020004 */ addiu $v0, $zero, 4 /* 1700A4 802417C4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1700A8 802417C8 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -/* 1700AC 802417CC 080906A2 */ j .L80241A88 +/* 1700AC 802417CC 080906A2 */ j L80241A88_170368 /* 1700B0 802417D0 00000000 */ nop .L802417D4: /* 1700B4 802417D4 08090608 */ j .L80241820 @@ -420,12 +420,12 @@ glabel L802417DC_1700BC /* 1700F8 80241818 1440FFF6 */ bnez $v0, .L802417F4 /* 1700FC 8024181C AE0001D4 */ sw $zero, 0x1d4($s0) .L80241820: -/* 170100 80241820 16600099 */ bnez $s3, .L80241A88 +/* 170100 80241820 16600099 */ bnez $s3, L80241A88_170368 /* 170104 80241824 00000000 */ nop /* 170108 80241828 8E9000D8 */ lw $s0, 0xd8($s4) /* 17010C 8024182C 0C0B1059 */ jal does_script_exist /* 170110 80241830 8E0401E4 */ lw $a0, 0x1e4($s0) -/* 170114 80241834 14400094 */ bnez $v0, .L80241A88 +/* 170114 80241834 14400094 */ bnez $v0, L80241A88_170368 /* 170118 80241838 00000000 */ nop /* 17011C 8024183C AE0001D4 */ sw $zero, 0x1d4($s0) /* 170120 80241840 8E9000DC */ lw $s0, 0xdc($s4) @@ -433,7 +433,7 @@ glabel L802417DC_1700BC /* 170128 80241848 00000000 */ nop /* 17012C 8024184C 0C0B1059 */ jal does_script_exist /* 170130 80241850 8E0401E4 */ lw $a0, 0x1e4($s0) -/* 170134 80241854 1440008C */ bnez $v0, .L80241A88 +/* 170134 80241854 1440008C */ bnez $v0, L80241A88_170368 /* 170138 80241858 00000000 */ nop /* 17013C 8024185C AE0001D4 */ sw $zero, 0x1d4($s0) .L80241860: @@ -535,7 +535,7 @@ glabel L802417DC_1700BC /* 170298 802419B8 AC20F248 */ sw $zero, %lo(D_8029F248)($at) /* 17029C 802419BC 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1702A0 802419C0 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -/* 1702A4 802419C4 080906A2 */ j .L80241A88 +/* 1702A4 802419C4 080906A2 */ j L80241A88_170368 /* 1702A8 802419C8 00000000 */ nop glabel L802419CC_1702AC /* 1702AC 802419CC 3C108028 */ lui $s0, %hi(D_80280A30) @@ -545,7 +545,7 @@ glabel L802419CC_1702AC /* 1702BC 802419DC 24020008 */ addiu $v0, $zero, 8 /* 1702C0 802419E0 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1702C4 802419E4 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -/* 1702C8 802419E8 080906A2 */ j .L80241A88 +/* 1702C8 802419E8 080906A2 */ j L80241A88_170368 /* 1702CC 802419EC 00000000 */ nop .L802419F0: /* 1702D0 802419F0 3C02802A */ lui $v0, %hi(D_8029F248) @@ -576,13 +576,13 @@ glabel L802419CC_1702AC /* 170328 80241A48 3C038028 */ lui $v1, %hi(D_80280A30) /* 17032C 80241A4C 24630A30 */ addiu $v1, $v1, %lo(D_80280A30) /* 170330 80241A50 8C620000 */ lw $v0, ($v1) -/* 170334 80241A54 0442000C */ bltzl $v0, .L80241A88 +/* 170334 80241A54 0442000C */ bltzl $v0, L80241A88_170368 /* 170338 80241A58 AC600000 */ sw $zero, ($v1) -/* 17033C 80241A5C 080906A2 */ j .L80241A88 +/* 17033C 80241A5C 080906A2 */ j L80241A88_170368 /* 170340 80241A60 00000000 */ nop glabel L80241A64_170344 /* 170344 80241A64 8282008C */ lb $v0, 0x8c($s4) -/* 170348 80241A68 14400007 */ bnez $v0, .L80241A88 +/* 170348 80241A68 14400007 */ bnez $v0, L80241A88_170368 /* 17034C 80241A6C 00000000 */ nop /* 170350 80241A70 3C05BF80 */ lui $a1, 0xbf80 /* 170354 80241A74 0C04DF62 */ jal set_transition_stencil_zoom_0 @@ -591,7 +591,6 @@ glabel L80241A64_170344 .L80241A80: /* 170360 80241A80 0C090464 */ jal func_80241190 /* 170364 80241A84 00000000 */ nop -.L80241A88: glabel L80241A88_170368 /* 170368 80241A88 8FBF0044 */ lw $ra, 0x44($sp) /* 17036C 80241A8C 8FBE0040 */ lw $fp, 0x40($sp) diff --git a/ver/us/asm/nonmatchings/code_16F740/update_enemy_action.s b/ver/us/asm/nonmatchings/code_16F740/update_enemy_action.s index 5e78c37dac..4cf2d4f2bd 100644 --- a/ver/us/asm/nonmatchings/code_16F740/update_enemy_action.s +++ b/ver/us/asm/nonmatchings/code_16F740/update_enemy_action.s @@ -18,7 +18,7 @@ glabel update_enemy_action /* 175E84 802475A4 8ED500D8 */ lw $s5, 0xd8($s6) /* 175E88 802475A8 8ED400DC */ lw $s4, 0xdc($s6) /* 175E8C 802475AC 2C62000D */ sltiu $v0, $v1, 0xd -/* 175E90 802475B0 10400106 */ beqz $v0, .L802479CC +/* 175E90 802475B0 10400106 */ beqz $v0, L802479CC_1762AC /* 175E94 802475B4 00031080 */ sll $v0, $v1, 2 /* 175E98 802475B8 3C01802A */ lui $at, %hi(jtbl_8029CB88) /* 175E9C 802475BC 00220821 */ addu $at, $at, $v0 @@ -123,7 +123,7 @@ glabel L80247720_176000 /* 176008 80247728 00000000 */ nop /* 17600C 8024772C 0C0B1059 */ jal does_script_exist /* 176010 80247730 8EA401E4 */ lw $a0, 0x1e4($s5) -/* 176014 80247734 144000A5 */ bnez $v0, .L802479CC +/* 176014 80247734 144000A5 */ bnez $v0, L802479CC_1762AC /* 176018 80247738 00000000 */ nop .L8024773C: /* 17601C 8024773C 8EA201D8 */ lw $v0, 0x1d8($s5) @@ -132,7 +132,7 @@ glabel L80247720_176000 /* 176028 80247748 8EA401E8 */ lw $a0, 0x1e8($s5) /* 17602C 8024774C 0C0B1059 */ jal does_script_exist /* 176030 80247750 00000000 */ nop -/* 176034 80247754 1440009D */ bnez $v0, .L802479CC +/* 176034 80247754 1440009D */ bnez $v0, L802479CC_1762AC /* 176038 80247758 00000000 */ nop .L8024775C: /* 17603C 8024775C 1280000A */ beqz $s4, .L80247788 @@ -143,7 +143,7 @@ glabel L80247720_176000 /* 176050 80247770 8E8401E8 */ lw $a0, 0x1e8($s4) /* 176054 80247774 0C0B1059 */ jal does_script_exist /* 176058 80247778 00000000 */ nop -/* 17605C 8024777C 14400093 */ bnez $v0, .L802479CC +/* 17605C 8024777C 14400093 */ bnez $v0, L802479CC_1762AC /* 176060 80247780 00000000 */ nop /* 176064 80247784 AE8001D8 */ sw $zero, 0x1d8($s4) .L80247788: @@ -169,7 +169,7 @@ glabel L80247720_176000 /* 1760A8 802477C8 2A220018 */ slti $v0, $s1, 0x18 /* 1760AC 802477CC 1440FFF1 */ bnez $v0, .L80247794 /* 1760B0 802477D0 26520004 */ addiu $s2, $s2, 4 -/* 1760B4 802477D4 1660007D */ bnez $s3, .L802479CC +/* 1760B4 802477D4 1660007D */ bnez $s3, L802479CC_1762AC /* 1760B8 802477D8 00000000 */ nop /* 1760BC 802477DC 0C098D19 */ jal func_80263464 /* 1760C0 802477E0 00000000 */ nop @@ -200,7 +200,7 @@ glabel L80247720_176000 /* 176118 80247838 3C02800E */ lui $v0, %hi(gBattleStatus) /* 17611C 8024783C 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 176120 80247840 00431024 */ and $v0, $v0, $v1 -/* 176124 80247844 10400061 */ beqz $v0, .L802479CC +/* 176124 80247844 10400061 */ beqz $v0, L802479CC_1762AC /* 176128 80247848 00000000 */ nop .L8024784C: /* 17612C 8024784C 3C04800E */ lui $a0, %hi(gBattleStatus) @@ -217,7 +217,7 @@ glabel L80247720_176000 /* 176158 80247878 14400096 */ bnez $v0, .L80247AD4 /* 17615C 8024787C 00000000 */ nop /* 176160 80247880 82C2008C */ lb $v0, 0x8c($s6) -/* 176164 80247884 14400051 */ bnez $v0, .L802479CC +/* 176164 80247884 14400051 */ bnez $v0, L802479CC_1762AC /* 176168 80247888 00000000 */ nop /* 17616C 8024788C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 176170 80247890 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -227,7 +227,7 @@ glabel L80247720_176000 /* 176180 802478A0 00000000 */ nop /* 176184 802478A4 0C090464 */ jal func_80241190 /* 176188 802478A8 24040023 */ addiu $a0, $zero, 0x23 -/* 17618C 802478AC 08091E73 */ j .L802479CC +/* 17618C 802478AC 08091E73 */ j L802479CC_1762AC /* 176190 802478B0 00000000 */ nop .L802478B4: /* 176194 802478B4 0C099DDF */ jal func_8026777C @@ -250,7 +250,7 @@ glabel L80247720_176000 /* 1761D4 802478F4 00021600 */ sll $v0, $v0, 0x18 /* 1761D8 802478F8 00021E03 */ sra $v1, $v0, 0x18 /* 1761DC 802478FC 2C620007 */ sltiu $v0, $v1, 7 -/* 1761E0 80247900 10400012 */ beqz $v0, .L8024794C +/* 1761E0 80247900 10400012 */ beqz $v0, L8024794C_17622C /* 1761E4 80247904 00031080 */ sll $v0, $v1, 2 /* 1761E8 80247908 3C01802A */ lui $at, %hi(jtbl_8029CBC0) /* 1761EC 8024790C 00220821 */ addu $at, $at, $v0 @@ -275,7 +275,6 @@ glabel L8024793C_17621C glabel L80247944_176224 /* 176224 80247944 08091E57 */ j .L8024795C /* 176228 80247948 2404000F */ addiu $a0, $zero, 0xf -.L8024794C: glabel L8024794C_17622C /* 17622C 8024794C 0000202D */ daddu $a0, $zero, $zero /* 176230 80247950 24020014 */ addiu $v0, $zero, 0x14 @@ -290,7 +289,7 @@ glabel L8024794C_17622C glabel L80247970_176250 /* 176250 80247970 0C093EAD */ jal is_popup_displayed /* 176254 80247974 00000000 */ nop -/* 176258 80247978 14400014 */ bnez $v0, .L802479CC +/* 176258 80247978 14400014 */ bnez $v0, L802479CC_1762AC /* 17625C 8024797C 00000000 */ nop /* 176260 80247980 0C093903 */ jal func_8024E40C /* 176264 80247984 24040002 */ addiu $a0, $zero, 2 @@ -307,14 +306,13 @@ glabel L802479A4_176284 /* 17628C 802479AC 8C620000 */ lw $v0, ($v1) /* 176290 802479B0 10400003 */ beqz $v0, .L802479C0 /* 176294 802479B4 2442FFFF */ addiu $v0, $v0, -1 -/* 176298 802479B8 08091E73 */ j .L802479CC +/* 176298 802479B8 08091E73 */ j L802479CC_1762AC /* 17629C 802479BC AC620000 */ sw $v0, ($v1) .L802479C0: /* 1762A0 802479C0 24020014 */ addiu $v0, $zero, 0x14 .L802479C4: /* 1762A4 802479C4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1762A8 802479C8 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -.L802479CC: glabel L802479CC_1762AC /* 1762AC 802479CC 3C10800E */ lui $s0, %hi(gBattleStatus+0x46C) /* 1762B0 802479D0 2610C4DC */ addiu $s0, $s0, %lo(gBattleStatus+0x46C) diff --git a/ver/us/asm/nonmatchings/code_16F740/update_partner_action.s b/ver/us/asm/nonmatchings/code_16F740/update_partner_action.s index 1721465075..0b0f6b239c 100644 --- a/ver/us/asm/nonmatchings/code_16F740/update_partner_action.s +++ b/ver/us/asm/nonmatchings/code_16F740/update_partner_action.s @@ -17,7 +17,7 @@ glabel update_partner_action /* 175444 80246B64 8EB200D8 */ lw $s2, 0xd8($s5) /* 175448 80246B68 8EB400DC */ lw $s4, 0xdc($s5) /* 17544C 80246B6C 2C62000D */ sltiu $v0, $v1, 0xd -/* 175450 80246B70 10400122 */ beqz $v0, .L80246FFC +/* 175450 80246B70 10400122 */ beqz $v0, L80246FFC_1758DC /* 175454 80246B74 00031080 */ sll $v0, $v1, 2 /* 175458 80246B78 3C01802A */ lui $at, %hi(jtbl_8029CB30) /* 17545C 80246B7C 00220821 */ addu $at, $at, $v0 @@ -29,7 +29,7 @@ glabel L80246B8C_17546C /* 175470 80246B90 2402007F */ addiu $v0, $zero, 0x7f /* 175474 80246B94 0C090464 */ jal func_80241190 /* 175478 80246B98 24040009 */ addiu $a0, $zero, 9 -/* 17547C 80246B9C 08091BFF */ j .L80246FFC +/* 17547C 80246B9C 08091BFF */ j L80246FFC_1758DC /* 175480 80246BA0 00000000 */ nop .L80246BA4: /* 175484 80246BA4 3C10800E */ lui $s0, %hi(gBattleStatus) @@ -121,7 +121,7 @@ glabel L80246C5C_17553C /* 1755C8 80246CE8 AC23C4DC */ sw $v1, %lo(gBattleStatus+0x46C)($at) /* 1755CC 80246CEC 24030100 */ addiu $v1, $zero, 0x100 /* 1755D0 80246CF0 AE8401E4 */ sw $a0, 0x1e4($s4) -/* 1755D4 80246CF4 08091BFF */ j .L80246FFC +/* 1755D4 80246CF4 08091BFF */ j L80246FFC_1758DC /* 1755D8 80246CF8 AC430148 */ sw $v1, 0x148($v0) glabel L80246CFC_1755DC /* 1755DC 80246CFC 3C02800E */ lui $v0, %hi(gBattleStatus) @@ -136,7 +136,7 @@ glabel L80246CFC_1755DC /* 175600 80246D20 8E8401E4 */ lw $a0, 0x1e4($s4) /* 175604 80246D24 0C0B1059 */ jal does_script_exist /* 175608 80246D28 00000000 */ nop -/* 17560C 80246D2C 144000B3 */ bnez $v0, .L80246FFC +/* 17560C 80246D2C 144000B3 */ bnez $v0, L80246FFC_1758DC /* 175610 80246D30 00000000 */ nop /* 175614 80246D34 AE8001D4 */ sw $zero, 0x1d4($s4) .L80246D38: @@ -152,7 +152,7 @@ glabel L80246CFC_1755DC /* 17563C 80246D5C 8E8401E8 */ lw $a0, 0x1e8($s4) /* 175640 80246D60 0C0B1059 */ jal does_script_exist /* 175644 80246D64 00000000 */ nop -/* 175648 80246D68 144000A4 */ bnez $v0, .L80246FFC +/* 175648 80246D68 144000A4 */ bnez $v0, L80246FFC_1758DC /* 17564C 80246D6C 00000000 */ nop /* 175650 80246D70 AE8001D8 */ sw $zero, 0x1d8($s4) .L80246D74: @@ -162,7 +162,7 @@ glabel L80246CFC_1755DC /* 175660 80246D80 8E4401E8 */ lw $a0, 0x1e8($s2) /* 175664 80246D84 0C0B1059 */ jal does_script_exist /* 175668 80246D88 00000000 */ nop -/* 17566C 80246D8C 1440009B */ bnez $v0, .L80246FFC +/* 17566C 80246D8C 1440009B */ bnez $v0, L80246FFC_1758DC /* 175670 80246D90 00000000 */ nop /* 175674 80246D94 AE4001D8 */ sw $zero, 0x1d8($s2) .L80246D98: @@ -188,7 +188,7 @@ glabel L80246CFC_1755DC /* 1756B8 80246DD8 2A220018 */ slti $v0, $s1, 0x18 /* 1756BC 80246DDC 1440FFF1 */ bnez $v0, .L80246DA4 /* 1756C0 80246DE0 26520004 */ addiu $s2, $s2, 4 -/* 1756C4 80246DE4 16600085 */ bnez $s3, .L80246FFC +/* 1756C4 80246DE4 16600085 */ bnez $s3, L80246FFC_1758DC /* 1756C8 80246DE8 0000882D */ daddu $s1, $zero, $zero /* 1756CC 80246DEC 02A0902D */ daddu $s2, $s5, $zero .L80246DF0: @@ -210,7 +210,7 @@ glabel L80246CFC_1755DC /* 175704 80246E24 2A220018 */ slti $v0, $s1, 0x18 /* 175708 80246E28 1440FFF1 */ bnez $v0, .L80246DF0 /* 17570C 80246E2C 26520004 */ addiu $s2, $s2, 4 -/* 175710 80246E30 16600072 */ bnez $s3, .L80246FFC +/* 175710 80246E30 16600072 */ bnez $s3, L80246FFC_1758DC /* 175714 80246E34 0000882D */ daddu $s1, $zero, $zero /* 175718 80246E38 3C04FFF7 */ lui $a0, 0xfff7 /* 17571C 80246E3C 3484FFFF */ ori $a0, $a0, 0xffff @@ -227,7 +227,7 @@ glabel L80246CFC_1755DC /* 175740 80246E60 1440FFF8 */ bnez $v0, .L80246E44 /* 175744 80246E64 24630004 */ addiu $v1, $v1, 4 /* 175748 80246E68 82A2008C */ lb $v0, 0x8c($s5) -/* 17574C 80246E6C 14400063 */ bnez $v0, .L80246FFC +/* 17574C 80246E6C 14400063 */ bnez $v0, L80246FFC_1758DC /* 175750 80246E70 00000000 */ nop /* 175754 80246E74 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 175758 80246E78 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -237,7 +237,7 @@ glabel L80246CFC_1755DC /* 175768 80246E88 00000000 */ nop /* 17576C 80246E8C 0C090464 */ jal func_80241190 /* 175770 80246E90 24040023 */ addiu $a0, $zero, 0x23 -/* 175774 80246E94 08091BFF */ j .L80246FFC +/* 175774 80246E94 08091BFF */ j L80246FFC_1758DC /* 175778 80246E98 00000000 */ nop .L80246E9C: /* 17577C 80246E9C 0C03A6CC */ jal decrement_status_menu_disabled @@ -306,12 +306,12 @@ glabel L80246CFC_1755DC /* 17586C 80246F8C 8E820000 */ lw $v0, ($s4) /* 175870 80246F90 3C030800 */ lui $v1, 0x800 /* 175874 80246F94 00431025 */ or $v0, $v0, $v1 -/* 175878 80246F98 08091BFF */ j .L80246FFC +/* 175878 80246F98 08091BFF */ j L80246FFC_1758DC /* 17587C 80246F9C AE820000 */ sw $v0, ($s4) glabel L80246FA0_175880 /* 175880 80246FA0 0C093EAD */ jal is_popup_displayed /* 175884 80246FA4 00000000 */ nop -/* 175888 80246FA8 14400014 */ bnez $v0, .L80246FFC +/* 175888 80246FA8 14400014 */ bnez $v0, L80246FFC_1758DC /* 17588C 80246FAC 00000000 */ nop /* 175890 80246FB0 0C093903 */ jal func_8024E40C /* 175894 80246FB4 24040002 */ addiu $a0, $zero, 2 @@ -328,14 +328,13 @@ glabel L80246FD4_1758B4 /* 1758BC 80246FDC 8C620000 */ lw $v0, ($v1) /* 1758C0 80246FE0 10400003 */ beqz $v0, .L80246FF0 /* 1758C4 80246FE4 2442FFFF */ addiu $v0, $v0, -1 -/* 1758C8 80246FE8 08091BFF */ j .L80246FFC +/* 1758C8 80246FE8 08091BFF */ j L80246FFC_1758DC /* 1758CC 80246FEC AC620000 */ sw $v0, ($v1) .L80246FF0: /* 1758D0 80246FF0 24020014 */ addiu $v0, $zero, 0x14 .L80246FF4: /* 1758D4 80246FF4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1758D8 80246FF8 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -.L80246FFC: glabel L80246FFC_1758DC /* 1758DC 80246FFC 3C10800E */ lui $s0, %hi(gBattleStatus+0x46C) /* 1758E0 80247000 2610C4DC */ addiu $s0, $s0, %lo(gBattleStatus+0x46C) diff --git a/ver/us/asm/nonmatchings/code_16F740/update_player_action.s b/ver/us/asm/nonmatchings/code_16F740/update_player_action.s index f356d52c2d..ce1ab741db 100644 --- a/ver/us/asm/nonmatchings/code_16F740/update_player_action.s +++ b/ver/us/asm/nonmatchings/code_16F740/update_player_action.s @@ -584,7 +584,7 @@ glabel L802461CC_174AAC /* 174BC8 802462E8 00021600 */ sll $v0, $v0, 0x18 /* 174BCC 802462EC 00021E03 */ sra $v1, $v0, 0x18 /* 174BD0 802462F0 2C620008 */ sltiu $v0, $v1, 8 -/* 174BD4 802462F4 10400014 */ beqz $v0, .L80246348 +/* 174BD4 802462F4 10400014 */ beqz $v0, L80246348_174C28 /* 174BD8 802462F8 00031080 */ sll $v0, $v1, 2 /* 174BDC 802462FC 3C01802A */ lui $at, %hi(jtbl_8029CB10) /* 174BE0 80246300 00220821 */ addu $at, $at, $v0 @@ -612,7 +612,6 @@ glabel L80246338_174C18 glabel L80246340_174C20 /* 174C20 80246340 080918D6 */ j .L80246358 /* 174C24 80246344 24100010 */ addiu $s0, $zero, 0x10 -.L80246348: glabel L80246348_174C28 /* 174C28 80246348 0000802D */ daddu $s0, $zero, $zero /* 174C2C 8024634C 2402001E */ addiu $v0, $zero, 0x1e diff --git a/ver/us/asm/nonmatchings/code_16F740/update_swap_partner.s b/ver/us/asm/nonmatchings/code_16F740/update_swap_partner.s index 872c54cbbc..5d7d956c40 100644 --- a/ver/us/asm/nonmatchings/code_16F740/update_swap_partner.s +++ b/ver/us/asm/nonmatchings/code_16F740/update_swap_partner.s @@ -15,7 +15,7 @@ glabel update_swap_partner /* 174000 80245720 3C03800E */ lui $v1, %hi(gBattleStatus+0x46C) /* 174004 80245724 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) /* 174008 80245728 2C620008 */ sltiu $v0, $v1, 8 -/* 17400C 8024572C 104000DF */ beqz $v0, .L80245AAC +/* 17400C 8024572C 104000DF */ beqz $v0, L80245AAC_17438C /* 174010 80245730 2613000C */ addiu $s3, $s0, 0xc /* 174014 80245734 00031080 */ sll $v0, $v1, 2 /* 174018 80245738 3C01802A */ lui $at, %hi(jtbl_8029CAD0) @@ -87,7 +87,7 @@ glabel L80245828_174108 /* 174110 80245830 8C620000 */ lw $v0, ($v1) /* 174114 80245834 10400003 */ beqz $v0, .L80245844 /* 174118 80245838 2442FFFF */ addiu $v0, $v0, -1 -/* 17411C 8024583C 080916AB */ j .L80245AAC +/* 17411C 8024583C 080916AB */ j L80245AAC_17438C /* 174120 80245840 AC620000 */ sw $v0, ($v1) .L80245844: /* 174124 80245844 0C098EF2 */ jal deduct_current_move_fp @@ -110,13 +110,13 @@ glabel L80245828_174108 /* 174168 80245888 24020003 */ addiu $v0, $zero, 3 /* 17416C 8024588C 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 174170 80245890 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -/* 174174 80245894 080916AB */ j .L80245AAC +/* 174174 80245894 080916AB */ j L80245AAC_17438C /* 174178 80245898 E6600020 */ swc1 $f0, 0x20($s3) glabel L8024589C_17417C /* 17417C 8024589C 8E4400C0 */ lw $a0, 0xc0($s2) /* 174180 802458A0 0C0B1059 */ jal does_script_exist /* 174184 802458A4 00000000 */ nop -/* 174188 802458A8 14400080 */ bnez $v0, .L80245AAC +/* 174188 802458A8 14400080 */ bnez $v0, L80245AAC_17438C /* 17418C 802458AC 00000000 */ nop /* 174190 802458B0 0C0902EF */ jal delete_actor /* 174194 802458B4 0220202D */ daddu $a0, $s1, $zero @@ -150,7 +150,7 @@ glabel L8024589C_17417C /* 174204 80245924 24020004 */ addiu $v0, $zero, 4 /* 174208 80245928 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 17420C 8024592C AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -/* 174210 80245930 080916AB */ j .L80245AAC +/* 174210 80245930 080916AB */ j L80245AAC_17438C /* 174214 80245934 E620014C */ swc1 $f0, 0x14c($s1) glabel L80245938_174218 /* 174218 80245938 8E5100DC */ lw $s1, 0xdc($s2) @@ -158,7 +158,7 @@ glabel L80245938_174218 /* 174220 80245940 00000000 */ nop /* 174224 80245944 0C0B1059 */ jal does_script_exist /* 174228 80245948 8E2401E4 */ lw $a0, 0x1e4($s1) -/* 17422C 8024594C 14400057 */ bnez $v0, .L80245AAC +/* 17422C 8024594C 14400057 */ bnez $v0, L80245AAC_17438C /* 174230 80245950 00000000 */ nop /* 174234 80245954 AE2001D4 */ sw $zero, 0x1d4($s1) .L80245958: @@ -175,13 +175,13 @@ glabel L80245938_174218 /* 174260 80245980 AC23C4DC */ sw $v1, %lo(gBattleStatus+0x46C)($at) /* 174264 80245984 AE4200C0 */ sw $v0, 0xc0($s2) /* 174268 80245988 24020100 */ addiu $v0, $zero, 0x100 -/* 17426C 8024598C 080916AB */ j .L80245AAC +/* 17426C 8024598C 080916AB */ j L80245AAC_17438C /* 174270 80245990 AC820148 */ sw $v0, 0x148($a0) glabel L80245994_174274 /* 174274 80245994 8E4400C0 */ lw $a0, 0xc0($s2) /* 174278 80245998 0C0B1059 */ jal does_script_exist /* 17427C 8024599C 00000000 */ nop -/* 174280 802459A0 14400042 */ bnez $v0, .L80245AAC +/* 174280 802459A0 14400042 */ bnez $v0, L80245AAC_17438C /* 174284 802459A4 00000000 */ nop /* 174288 802459A8 8E5100DC */ lw $s1, 0xdc($s2) /* 17428C 802459AC 12200010 */ beqz $s1, .L802459F0 @@ -205,7 +205,7 @@ glabel L80245994_174274 .L802459F0: /* 1742D0 802459F0 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1742D4 802459F4 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -/* 1742D8 802459F8 080916AB */ j .L80245AAC +/* 1742D8 802459F8 080916AB */ j L80245AAC_17438C /* 1742DC 802459FC 00000000 */ nop glabel L80245A00_1742E0 /* 1742E0 80245A00 8E5100DC */ lw $s1, 0xdc($s2) @@ -216,7 +216,7 @@ glabel L80245A00_1742E0 /* 1742F4 80245A14 00000000 */ nop /* 1742F8 80245A18 0C0B1059 */ jal does_script_exist /* 1742FC 80245A1C 8E2401EC */ lw $a0, 0x1ec($s1) -/* 174300 80245A20 14400022 */ bnez $v0, .L80245AAC +/* 174300 80245A20 14400022 */ bnez $v0, L80245AAC_17438C /* 174304 80245A24 00000000 */ nop .L80245A28: /* 174308 80245A28 0C093903 */ jal func_8024E40C @@ -224,11 +224,11 @@ glabel L80245A00_1742E0 /* 174310 80245A30 24020007 */ addiu $v0, $zero, 7 /* 174314 80245A34 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 174318 80245A38 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -/* 17431C 80245A3C 080916AB */ j .L80245AAC +/* 17431C 80245A3C 080916AB */ j L80245AAC_17438C /* 174320 80245A40 00000000 */ nop glabel L80245A44_174324 /* 174324 80245A44 8242008C */ lb $v0, 0x8c($s2) -/* 174328 80245A48 14400018 */ bnez $v0, .L80245AAC +/* 174328 80245A48 14400018 */ bnez $v0, L80245AAC_17438C /* 17432C 80245A4C 2403FFEF */ addiu $v1, $zero, -0x11 /* 174330 80245A50 3C04800E */ lui $a0, %hi(gBattleStatus) /* 174334 80245A54 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) @@ -255,7 +255,6 @@ glabel L80245A44_174324 .L80245AA4: /* 174384 80245AA4 0C090464 */ jal func_80241190 /* 174388 80245AA8 00000000 */ nop -.L80245AAC: glabel L80245AAC_17438C /* 17438C 80245AAC 8FBF0020 */ lw $ra, 0x20($sp) /* 174390 80245AB0 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s b/ver/us/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s index b95eebf270..95f2d1aa1b 100644 --- a/ver/us/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s +++ b/ver/us/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s @@ -36,10 +36,10 @@ glabel draw_main_battle_ui /* 16D3CC 8023EAEC 00000000 */ nop /* 16D3D0 8023EAF0 0C08FFE8 */ jal draw_enemy_health_bars /* 16D3D4 8023EAF4 00000000 */ nop -/* 16D3D8 8023EAF8 1620008F */ bnez $s1, .L8023ED38 +/* 16D3D8 8023EAF8 1620008F */ bnez $s1, L8023ED38_16D618 /* 16D3DC 8023EAFC 2603FFFF */ addiu $v1, $s0, -1 /* 16D3E0 8023EB00 2C620023 */ sltiu $v0, $v1, 0x23 -/* 16D3E4 8023EB04 1040008C */ beqz $v0, .L8023ED38 +/* 16D3E4 8023EB04 1040008C */ beqz $v0, L8023ED38_16D618 /* 16D3E8 8023EB08 00031080 */ sll $v0, $v1, 2 /* 16D3EC 8023EB0C 3C01802A */ lui $at, %hi(jtbl_8029C9F8) /* 16D3F0 8023EB10 00220821 */ addu $at, $at, $v0 @@ -49,172 +49,171 @@ glabel draw_main_battle_ui glabel L8023EB20_16D400 /* 16D400 8023EB20 0C0906AE */ jal func_80241AB8 /* 16D404 8023EB24 00000000 */ nop -/* 16D408 8023EB28 0808FB4E */ j .L8023ED38 +/* 16D408 8023EB28 0808FB4E */ j L8023ED38_16D618 /* 16D40C 8023EB2C 00000000 */ nop glabel L8023EB30_16D410 /* 16D410 8023EB30 0C090AB0 */ jal func_80242AC0 /* 16D414 8023EB34 00000000 */ nop -/* 16D418 8023EB38 0808FB4E */ j .L8023ED38 +/* 16D418 8023EB38 0808FB4E */ j L8023ED38_16D618 /* 16D41C 8023EB3C 00000000 */ nop glabel L8023EB40_16D420 /* 16D420 8023EB40 0C090BBE */ jal func_80242EF8 /* 16D424 8023EB44 00000000 */ nop -/* 16D428 8023EB48 0808FB4E */ j .L8023ED38 +/* 16D428 8023EB48 0808FB4E */ j L8023ED38_16D618 /* 16D42C 8023EB4C 00000000 */ nop glabel L8023EB50_16D430 /* 16D430 8023EB50 0C090E44 */ jal func_80243910 /* 16D434 8023EB54 00000000 */ nop -/* 16D438 8023EB58 0808FB4E */ j .L8023ED38 +/* 16D438 8023EB58 0808FB4E */ j L8023ED38_16D618 /* 16D43C 8023EB5C 00000000 */ nop glabel L8023EB60_16D440 /* 16D440 8023EB60 0C090807 */ jal func_8024201C /* 16D444 8023EB64 00000000 */ nop -/* 16D448 8023EB68 0808FB4E */ j .L8023ED38 +/* 16D448 8023EB68 0808FB4E */ j L8023ED38_16D618 /* 16D44C 8023EB6C 00000000 */ nop glabel L8023EB70_16D450 /* 16D450 8023EB70 0C090FF5 */ jal func_80243FD4 /* 16D454 8023EB74 00000000 */ nop -/* 16D458 8023EB78 0808FB4E */ j .L8023ED38 +/* 16D458 8023EB78 0808FB4E */ j L8023ED38_16D618 /* 16D45C 8023EB7C 00000000 */ nop glabel L8023EB80_16D460 /* 16D460 8023EB80 0C090AEA */ jal func_80242BA8 /* 16D464 8023EB84 00000000 */ nop -/* 16D468 8023EB88 0808FB4E */ j .L8023ED38 +/* 16D468 8023EB88 0808FB4E */ j L8023ED38_16D618 /* 16D46C 8023EB8C 00000000 */ nop glabel L8023EB90_16D470 /* 16D470 8023EB90 0C090BF6 */ jal func_80242FD8 /* 16D474 8023EB94 00000000 */ nop -/* 16D478 8023EB98 0808FB4E */ j .L8023ED38 +/* 16D478 8023EB98 0808FB4E */ j L8023ED38_16D618 /* 16D47C 8023EB9C 00000000 */ nop glabel L8023EBA0_16D480 /* 16D480 8023EBA0 0C090E74 */ jal func_802439D0 /* 16D484 8023EBA4 00000000 */ nop -/* 16D488 8023EBA8 0808FB4E */ j .L8023ED38 +/* 16D488 8023EBA8 0808FB4E */ j L8023ED38_16D618 /* 16D48C 8023EBAC 00000000 */ nop glabel L8023EBB0_16D490 /* 16D490 8023EBB0 0C0AA060 */ jal func_802A8180 /* 16D494 8023EBB4 00000000 */ nop -/* 16D498 8023EBB8 0808FB4E */ j .L8023ED38 +/* 16D498 8023EBB8 0808FB4E */ j L8023ED38_16D618 /* 16D49C 8023EBBC 00000000 */ nop glabel L8023EBC0_16D4A0 /* 16D4A0 8023EBC0 0C0AA6BA */ jal func_802A9AE8 /* 16D4A4 8023EBC4 00000000 */ nop -/* 16D4A8 8023EBC8 0808FB4E */ j .L8023ED38 +/* 16D4A8 8023EBC8 0808FB4E */ j L8023ED38_16D618 /* 16D4AC 8023EBCC 00000000 */ nop glabel L8023EBD0_16D4B0 /* 16D4B0 8023EBD0 0C0AA990 */ jal func_802AA640 /* 16D4B4 8023EBD4 00000000 */ nop -/* 16D4B8 8023EBD8 0808FB4E */ j .L8023ED38 +/* 16D4B8 8023EBD8 0808FB4E */ j L8023ED38_16D618 /* 16D4BC 8023EBDC 00000000 */ nop glabel L8023EBE0_16D4C0 /* 16D4C0 8023EBE0 0C0AA817 */ jal func_802AA05C /* 16D4C4 8023EBE4 00000000 */ nop -/* 16D4C8 8023EBE8 0808FB4E */ j .L8023ED38 +/* 16D4C8 8023EBE8 0808FB4E */ j L8023ED38_16D618 /* 16D4CC 8023EBEC 00000000 */ nop glabel L8023EBF0_16D4D0 /* 16D4D0 8023EBF0 0C0AAB36 */ jal func_802AACD8 /* 16D4D4 8023EBF4 00000000 */ nop -/* 16D4D8 8023EBF8 0808FB4E */ j .L8023ED38 +/* 16D4D8 8023EBF8 0808FB4E */ j L8023ED38_16D618 /* 16D4DC 8023EBFC 00000000 */ nop glabel L8023EC00_16D4E0 /* 16D4E0 8023EC00 0C091912 */ jal func_80246448 /* 16D4E4 8023EC04 00000000 */ nop -/* 16D4E8 8023EC08 0808FB4E */ j .L8023ED38 +/* 16D4E8 8023EC08 0808FB4E */ j L8023ED38_16D618 /* 16D4EC 8023EC0C 00000000 */ nop glabel L8023EC10_16D4F0 /* 16D4F0 8023EC10 0C09203C */ jal func_802480F0 /* 16D4F4 8023EC14 00000000 */ nop -/* 16D4F8 8023EC18 0808FB4E */ j .L8023ED38 +/* 16D4F8 8023EC18 0808FB4E */ j L8023ED38_16D618 /* 16D4FC 8023EC1C 00000000 */ nop glabel L8023EC20_16D500 /* 16D500 8023EC20 0C091ACB */ jal func_80246B2C_code /* 16D504 8023EC24 00000000 */ nop -/* 16D508 8023EC28 0808FB4E */ j .L8023ED38 +/* 16D508 8023EC28 0808FB4E */ j L8023ED38_16D618 /* 16D50C 8023EC2C 00000000 */ nop glabel L8023EC30_16D510 /* 16D510 8023EC30 0C091CA9 */ jal func_802472A4 /* 16D514 8023EC34 00000000 */ nop -/* 16D518 8023EC38 0808FB4E */ j .L8023ED38 +/* 16D518 8023EC38 0808FB4E */ j L8023ED38_16D618 /* 16D51C 8023EC3C 00000000 */ nop glabel L8023EC40_16D520 /* 16D520 8023EC40 0C09217F */ jal func_802485FC /* 16D524 8023EC44 00000000 */ nop -/* 16D528 8023EC48 0808FB4E */ j .L8023ED38 +/* 16D528 8023EC48 0808FB4E */ j L8023ED38_16D618 /* 16D52C 8023EC4C 00000000 */ nop glabel L8023EC50_16D530 /* 16D530 8023EC50 0C091EBF */ jal func_80247AFC /* 16D534 8023EC54 00000000 */ nop -/* 16D538 8023EC58 0808FB4E */ j .L8023ED38 +/* 16D538 8023EC58 0808FB4E */ j L8023ED38_16D618 /* 16D53C 8023EC5C 00000000 */ nop glabel L8023EC60_16D540 /* 16D540 8023EC60 0C091D5A */ jal func_80247568 /* 16D544 8023EC64 00000000 */ nop -/* 16D548 8023EC68 0808FB4E */ j .L8023ED38 +/* 16D548 8023EC68 0808FB4E */ j L8023ED38_16D618 /* 16D54C 8023EC6C 00000000 */ nop glabel L8023EC70_16D550 /* 16D550 8023EC70 0C091C85 */ jal func_80247214 /* 16D554 8023EC74 00000000 */ nop -/* 16D558 8023EC78 0808FB4E */ j .L8023ED38 +/* 16D558 8023EC78 0808FB4E */ j L8023ED38_16D618 /* 16D55C 8023EC7C 00000000 */ nop glabel L8023EC80_16D560 /* 16D560 8023EC80 0C0911C2 */ jal func_80244708 /* 16D564 8023EC84 00000000 */ nop -/* 16D568 8023EC88 0808FB4E */ j .L8023ED38 +/* 16D568 8023EC88 0808FB4E */ j L8023ED38_16D618 /* 16D56C 8023EC8C 00000000 */ nop glabel L8023EC90_16D570 /* 16D570 8023EC90 0C091364 */ jal func_80244D90 /* 16D574 8023EC94 00000000 */ nop -/* 16D578 8023EC98 0808FB4E */ j .L8023ED38 +/* 16D578 8023EC98 0808FB4E */ j L8023ED38_16D618 /* 16D57C 8023EC9C 00000000 */ nop glabel L8023ECA0_16D580 /* 16D580 8023ECA0 0C0916B2 */ jal func_80245AC8 /* 16D584 8023ECA4 00000000 */ nop -/* 16D588 8023ECA8 0808FB4E */ j .L8023ED38 +/* 16D588 8023ECA8 0808FB4E */ j L8023ED38_16D618 /* 16D58C 8023ECAC 00000000 */ nop glabel L8023ECB0_16D590 /* 16D590 8023ECB0 0C09150E */ jal func_80245438 /* 16D594 8023ECB4 00000000 */ nop -/* 16D598 8023ECB8 0808FB4E */ j .L8023ED38 +/* 16D598 8023ECB8 0808FB4E */ j L8023ED38_16D618 /* 16D59C 8023ECBC 00000000 */ nop glabel L8023ECC0_16D5A0 /* 16D5A0 8023ECC0 0C0913BE */ jal func_80244EF8 /* 16D5A4 8023ECC4 00000000 */ nop -/* 16D5A8 8023ECC8 0808FB4E */ j .L8023ED38 +/* 16D5A8 8023ECC8 0808FB4E */ j L8023ED38_16D618 /* 16D5AC 8023ECCC 00000000 */ nop glabel L8023ECD0_16D5B0 /* 16D5B0 8023ECD0 0C0915AC */ jal func_802456B0 /* 16D5B4 8023ECD4 00000000 */ nop -/* 16D5B8 8023ECD8 0808FB4E */ j .L8023ED38 +/* 16D5B8 8023ECD8 0808FB4E */ j L8023ED38_16D618 /* 16D5BC 8023ECDC 00000000 */ nop glabel L8023ECE0_16D5C0 /* 16D5C0 8023ECE0 0C091000 */ jal func_80244000 /* 16D5C4 8023ECE4 00000000 */ nop -/* 16D5C8 8023ECE8 0808FB4E */ j .L8023ED38 +/* 16D5C8 8023ECE8 0808FB4E */ j L8023ED38_16D618 /* 16D5CC 8023ECEC 00000000 */ nop glabel L8023ECF0_16D5D0 /* 16D5D0 8023ECF0 0C091292 */ jal func_80244A48 /* 16D5D4 8023ECF4 00000000 */ nop -/* 16D5D8 8023ECF8 0808FB4E */ j .L8023ED38 +/* 16D5D8 8023ECF8 0808FB4E */ j L8023ED38_16D618 /* 16D5DC 8023ECFC 00000000 */ nop glabel L8023ED00_16D5E0 /* 16D5E0 8023ED00 0C0922A9 */ jal func_80248AA4 /* 16D5E4 8023ED04 00000000 */ nop -/* 16D5E8 8023ED08 0808FB4E */ j .L8023ED38 +/* 16D5E8 8023ED08 0808FB4E */ j L8023ED38_16D618 /* 16D5EC 8023ED0C 00000000 */ nop glabel L8023ED10_16D5F0 /* 16D5F0 8023ED10 0C0AACCE */ jal func_802AB338 /* 16D5F4 8023ED14 00000000 */ nop -/* 16D5F8 8023ED18 0808FB4E */ j .L8023ED38 +/* 16D5F8 8023ED18 0808FB4E */ j L8023ED38_16D618 /* 16D5FC 8023ED1C 00000000 */ nop glabel L8023ED20_16D600 /* 16D600 8023ED20 0C09806F */ jal func_802601BC /* 16D604 8023ED24 00000000 */ nop -/* 16D608 8023ED28 0808FB4E */ j .L8023ED38 +/* 16D608 8023ED28 0808FB4E */ j L8023ED38_16D618 /* 16D60C 8023ED2C 00000000 */ nop glabel L8023ED30_16D610 /* 16D610 8023ED30 0C09235E */ jal func_80248D78 /* 16D614 8023ED34 00000000 */ nop -.L8023ED38: glabel L8023ED38_16D618 /* 16D618 8023ED38 0C093BC2 */ jal func_8024EF08 /* 16D61C 8023ED3C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_16c8e0/update_battle_state.s b/ver/us/asm/nonmatchings/code_16c8e0/update_battle_state.s index 08ceafcea7..cd05789cbd 100644 --- a/ver/us/asm/nonmatchings/code_16c8e0/update_battle_state.s +++ b/ver/us/asm/nonmatchings/code_16c8e0/update_battle_state.s @@ -94,14 +94,14 @@ glabel update_battle_state /* 16CE6C 8023E58C 24110001 */ addiu $s1, $zero, 1 /* 16CE70 8023E590 3C02800E */ lui $v0, %hi(gBattleState) /* 16CE74 8023E594 8C42C068 */ lw $v0, %lo(gBattleState)($v0) -/* 16CE78 8023E598 10620092 */ beq $v1, $v0, .L8023E7E4 +/* 16CE78 8023E598 10620092 */ beq $v1, $v0, L8023E7E4_16D0C4 /* 16CE7C 8023E59C 00000000 */ nop .L8023E5A0: /* 16CE80 8023E5A0 3C02800E */ lui $v0, %hi(gBattleState) /* 16CE84 8023E5A4 8C42C068 */ lw $v0, %lo(gBattleState)($v0) /* 16CE88 8023E5A8 24430001 */ addiu $v1, $v0, 1 /* 16CE8C 8023E5AC 2C620025 */ sltiu $v0, $v1, 0x25 -/* 16CE90 8023E5B0 1040008C */ beqz $v0, .L8023E7E4 +/* 16CE90 8023E5B0 1040008C */ beqz $v0, L8023E7E4_16D0C4 /* 16CE94 8023E5B4 00031080 */ sll $v0, $v1, 2 /* 16CE98 8023E5B8 3C01802A */ lui $at, %hi(jtbl_8029C960) /* 16CE9C 8023E5BC 00220821 */ addu $at, $at, $v0 @@ -111,172 +111,171 @@ glabel update_battle_state glabel L8023E5CC_16CEAC /* 16CEAC 8023E5CC 0C090486 */ jal begin_battle /* 16CEB0 8023E5D0 0000882D */ daddu $s1, $zero, $zero -/* 16CEB4 8023E5D4 0808F9F9 */ j .L8023E7E4 +/* 16CEB4 8023E5D4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CEB8 8023E5D8 00000000 */ nop glabel L8023E5DC_16CEBC /* 16CEBC 8023E5DC 0C090809 */ jal update_heroes_start_turn /* 16CEC0 8023E5E0 00000000 */ nop -/* 16CEC4 8023E5E4 0808F9F9 */ j .L8023E7E4 +/* 16CEC4 8023E5E4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CEC8 8023E5E8 00000000 */ nop glabel L8023E5EC_16CECC /* 16CECC 8023E5EC 0C090AEC */ jal update_end_player_turn /* 16CED0 8023E5F0 00000000 */ nop -/* 16CED4 8023E5F4 0808F9F9 */ j .L8023E7E4 +/* 16CED4 8023E5F4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CED8 8023E5F8 00000000 */ nop glabel L8023E5FC_16CEDC /* 16CEDC 8023E5FC 0C090BF8 */ jal func_80242FE0 /* 16CEE0 8023E600 00000000 */ nop -/* 16CEE4 8023E604 0808F9F9 */ j .L8023E7E4 +/* 16CEE4 8023E604 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CEE8 8023E608 00000000 */ nop glabel L8023E60C_16CEEC /* 16CEEC 8023E60C 0C0906C5 */ jal func_80241B14 /* 16CEF0 8023E610 00000000 */ nop -/* 16CEF4 8023E614 0808F9F9 */ j .L8023E7E4 +/* 16CEF4 8023E614 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CEF8 8023E618 00000000 */ nop glabel L8023E61C_16CEFC /* 16CEFC 8023E61C 0C090E76 */ jal func_802439D8 /* 16CF00 8023E620 00000000 */ nop -/* 16CF04 8023E624 0808F9F9 */ j .L8023E7E4 +/* 16CF04 8023E624 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CF08 8023E628 00000000 */ nop glabel L8023E62C_16CF0C /* 16CF0C 8023E62C 0C090AB2 */ jal switch_to_player /* 16CF10 8023E630 00000000 */ nop -/* 16CF14 8023E634 0808F9F9 */ j .L8023E7E4 +/* 16CF14 8023E634 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CF18 8023E638 00000000 */ nop glabel L8023E63C_16CF1C /* 16CF1C 8023E63C 0C090BC0 */ jal switch_to_partner /* 16CF20 8023E640 00000000 */ nop -/* 16CF24 8023E644 0808F9F9 */ j .L8023E7E4 +/* 16CF24 8023E644 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CF28 8023E648 00000000 */ nop glabel L8023E64C_16CF2C /* 16CF2C 8023E64C 0C090E46 */ jal switch_order /* 16CF30 8023E650 00000000 */ nop -/* 16CF34 8023E654 0808F9F9 */ j .L8023E7E4 +/* 16CF34 8023E654 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CF38 8023E658 00000000 */ nop glabel L8023E65C_16CF3C /* 16CF3C 8023E65C 0C0A9662 */ jal update_player_menu /* 16CF40 8023E660 00000000 */ nop -/* 16CF44 8023E664 0808F9F9 */ j .L8023E7E4 +/* 16CF44 8023E664 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CF48 8023E668 00000000 */ nop glabel L8023E66C_16CF4C /* 16CF4C 8023E66C 0C0AA072 */ jal update_partner_menu /* 16CF50 8023E670 00000000 */ nop -/* 16CF54 8023E674 0808F9F9 */ j .L8023E7E4 +/* 16CF54 8023E674 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CF58 8023E678 00000000 */ nop glabel L8023E67C_16CF5C /* 16CF5C 8023E67C 0C0AA82E */ jal func_802AA0B8 /* 16CF60 8023E680 00000000 */ nop -/* 16CF64 8023E684 0808F9F9 */ j .L8023E7E4 +/* 16CF64 8023E684 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CF68 8023E688 00000000 */ nop glabel L8023E68C_16CF6C /* 16CF6C 8023E68C 0C0AA6D1 */ jal func_802A9B44 /* 16CF70 8023E690 00000000 */ nop -/* 16CF74 8023E694 0808F9F9 */ j .L8023E7E4 +/* 16CF74 8023E694 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CF78 8023E698 00000000 */ nop glabel L8023E69C_16CF7C /* 16CF7C 8023E69C 0C0AA9A2 */ jal update_targeting_enemies /* 16CF80 8023E6A0 00000000 */ nop -/* 16CF84 8023E6A4 0808F9F9 */ j .L8023E7E4 +/* 16CF84 8023E6A4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CF88 8023E6A8 00000000 */ nop glabel L8023E6AC_16CF8C /* 16CF8C 8023E6AC 0C0916B4 */ jal update_player_action /* 16CF90 8023E6B0 00000000 */ nop -/* 16CF94 8023E6B4 0808F9F9 */ j .L8023E7E4 +/* 16CF94 8023E6B4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CF98 8023E6B8 00000000 */ nop glabel L8023E6BC_16CF9C /* 16CF9C 8023E6BC 0C091EC1 */ jal func_80247B04 /* 16CFA0 8023E6C0 00000000 */ nop -/* 16CFA4 8023E6C4 0808F9F9 */ j .L8023E7E4 +/* 16CFA4 8023E6C4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CFA8 8023E6C8 00000000 */ nop glabel L8023E6CC_16CFAC /* 16CFAC 8023E6CC 0C091914 */ jal update_player_change_turn /* 16CFB0 8023E6D0 00000000 */ nop -/* 16CFB4 8023E6D4 0808F9F9 */ j .L8023E7E4 +/* 16CFB4 8023E6D4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CFB8 8023E6D8 00000000 */ nop glabel L8023E6DC_16CFBC /* 16CFBC 8023E6DC 0C091C87 */ jal func_8024721C /* 16CFC0 8023E6E0 00000000 */ nop -/* 16CFC4 8023E6E4 0808F9F9 */ j .L8023E7E4 +/* 16CFC4 8023E6E4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CFC8 8023E6E8 00000000 */ nop glabel L8023E6EC_16CFCC /* 16CFCC 8023E6EC 0C091D5C */ jal update_enemy_action /* 16CFD0 8023E6F0 00000000 */ nop -/* 16CFD4 8023E6F4 0808F9F9 */ j .L8023E7E4 +/* 16CFD4 8023E6F4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CFD8 8023E6F8 00000000 */ nop glabel L8023E6FC_16CFDC /* 16CFDC 8023E6FC 0C092064 */ jal func_80248190 /* 16CFE0 8023E700 00000000 */ nop -/* 16CFE4 8023E704 0808F9F9 */ j .L8023E7E4 +/* 16CFE4 8023E704 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CFE8 8023E708 00000000 */ nop glabel L8023E70C_16CFEC /* 16CFEC 8023E70C 0C091CAB */ jal update_enemy_change_turn /* 16CFF0 8023E710 00000000 */ nop -/* 16CFF4 8023E714 0808F9F9 */ j .L8023E7E4 +/* 16CFF4 8023E714 0808F9F9 */ j L8023E7E4_16D0C4 /* 16CFF8 8023E718 00000000 */ nop glabel L8023E71C_16CFFC /* 16CFFC 8023E71C 0C091ACD */ jal update_partner_action /* 16D000 8023E720 00000000 */ nop -/* 16D004 8023E724 0808F9F9 */ j .L8023E7E4 +/* 16D004 8023E724 0808F9F9 */ j L8023E7E4_16D0C4 /* 16D008 8023E728 00000000 */ nop glabel L8023E72C_16D00C /* 16D00C 8023E72C 0C091002 */ jal func_80244008 /* 16D010 8023E730 00000000 */ nop -/* 16D014 8023E734 0808F9F9 */ j .L8023E7E4 +/* 16D014 8023E734 0808F9F9 */ j L8023E7E4_16D0C4 /* 16D018 8023E738 00000000 */ nop glabel L8023E73C_16D01C /* 16D01C 8023E73C 0C091294 */ jal end_battle /* 16D020 8023E740 00000000 */ nop -/* 16D024 8023E744 0808F9F9 */ j .L8023E7E4 +/* 16D024 8023E744 0808F9F9 */ j L8023E7E4_16D0C4 /* 16D028 8023E748 00000000 */ nop glabel L8023E74C_16D02C /* 16D02C 8023E74C 0C0915BE */ jal update_swap_partner /* 16D030 8023E750 00000000 */ nop -/* 16D034 8023E754 0808F9F9 */ j .L8023E7E4 +/* 16D034 8023E754 0808F9F9 */ j L8023E7E4_16D0C4 /* 16D038 8023E758 00000000 */ nop glabel L8023E75C_16D03C /* 16D03C 8023E75C 0C0913C0 */ jal update_run_away /* 16D040 8023E760 00000000 */ nop -/* 16D044 8023E764 0808F9F9 */ j .L8023E7E4 +/* 16D044 8023E764 0808F9F9 */ j L8023E7E4_16D0C4 /* 16D048 8023E768 00000000 */ nop glabel L8023E76C_16D04C /* 16D04C 8023E76C 0C09138E */ jal func_80244E38 /* 16D050 8023E770 00000000 */ nop -/* 16D054 8023E774 0808F9F9 */ j .L8023E7E4 +/* 16D054 8023E774 0808F9F9 */ j L8023E7E4_16D0C4 /* 16D058 8023E778 00000000 */ nop glabel L8023E77C_16D05C /* 16D05C 8023E77C 0C091510 */ jal func_80245440 /* 16D060 8023E780 00000000 */ nop -/* 16D064 8023E784 0808F9F9 */ j .L8023E7E4 +/* 16D064 8023E784 0808F9F9 */ j L8023E7E4_16D0C4 /* 16D068 8023E788 00000000 */ nop glabel L8023E78C_16D06C /* 16D06C 8023E78C 0C090FF7 */ jal func_80243FDC /* 16D070 8023E790 00000000 */ nop -/* 16D074 8023E794 0808F9F9 */ j .L8023E7E4 +/* 16D074 8023E794 0808F9F9 */ j L8023E7E4_16D0C4 /* 16D078 8023E798 00000000 */ nop glabel L8023E79C_16D07C /* 16D07C 8023E79C 0C0911C4 */ jal func_80244710 /* 16D080 8023E7A0 00000000 */ nop -/* 16D084 8023E7A4 0808F9F9 */ j .L8023E7E4 +/* 16D084 8023E7A4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16D088 8023E7A8 00000000 */ nop glabel L8023E7AC_16D08C /* 16D08C 8023E7AC 0C092198 */ jal func_80248660 /* 16D090 8023E7B0 00000000 */ nop -/* 16D094 8023E7B4 0808F9F9 */ j .L8023E7E4 +/* 16D094 8023E7B4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16D098 8023E7B8 00000000 */ nop glabel L8023E7BC_16D09C /* 16D09C 8023E7BC 0C0AACCC */ jal func_802AB330 /* 16D0A0 8023E7C0 00000000 */ nop -/* 16D0A4 8023E7C4 0808F9F9 */ j .L8023E7E4 +/* 16D0A4 8023E7C4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16D0A8 8023E7C8 00000000 */ nop glabel L8023E7CC_16D0AC /* 16D0AC 8023E7CC 0C097864 */ jal func_8025E190 /* 16D0B0 8023E7D0 00000000 */ nop -/* 16D0B4 8023E7D4 0808F9F9 */ j .L8023E7E4 +/* 16D0B4 8023E7D4 0808F9F9 */ j L8023E7E4_16D0C4 /* 16D0B8 8023E7D8 00000000 */ nop glabel L8023E7DC_16D0BC /* 16D0BC 8023E7DC 0C0922C2 */ jal func_80248B08 /* 16D0C0 8023E7E0 0000882D */ daddu $s1, $zero, $zero -.L8023E7E4: glabel L8023E7E4_16D0C4 /* 16D0C4 8023E7E4 96020090 */ lhu $v0, 0x90($s0) /* 16D0C8 8023E7E8 24030028 */ addiu $v1, $zero, 0x28 @@ -301,7 +300,7 @@ glabel L8023E7E4_16D0C4 /* 16D110 8023E830 00000000 */ nop /* 16D114 8023E834 82030432 */ lb $v1, 0x432($s0) /* 16D118 8023E838 2402FFFE */ addiu $v0, $zero, -2 -/* 16D11C 8023E83C 10620089 */ beq $v1, $v0, .L8023EA64 +/* 16D11C 8023E83C 10620089 */ beq $v1, $v0, L8023EA64_16D344 /* 16D120 8023E840 27A50018 */ addiu $a1, $sp, 0x18 /* 16D124 8023E844 24040001 */ addiu $a0, $zero, 1 /* 16D128 8023E848 0C04DF70 */ jal func_80137DC0 @@ -386,7 +385,7 @@ glabel L8023E7E4_16D0C4 /* 16D244 8023E964 2402FFFF */ addiu $v0, $zero, -1 /* 16D248 8023E968 3C038028 */ lui $v1, %hi(D_802809F6) /* 16D24C 8023E96C 846309F6 */ lh $v1, %lo(D_802809F6)($v1) -/* 16D250 8023E970 1062003C */ beq $v1, $v0, .L8023EA64 +/* 16D250 8023E970 1062003C */ beq $v1, $v0, L8023EA64_16D344 /* 16D254 8023E974 00000000 */ nop .L8023E978: /* 16D258 8023E978 3C108028 */ lui $s0, %hi(D_802809F6) @@ -400,20 +399,20 @@ glabel L8023E7E4_16D0C4 /* 16D278 8023E998 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 16D27C 8023E99C 80430071 */ lb $v1, 0x71($v0) /* 16D280 8023E9A0 24020002 */ addiu $v0, $zero, 2 -/* 16D284 8023E9A4 1462002F */ bne $v1, $v0, .L8023EA64 +/* 16D284 8023E9A4 1462002F */ bne $v1, $v0, L8023EA64_16D344 /* 16D288 8023E9A8 27A50020 */ addiu $a1, $sp, 0x20 /* 16D28C 8023E9AC 0000202D */ daddu $a0, $zero, $zero /* 16D290 8023E9B0 0C04DF70 */ jal func_80137DC0 /* 16D294 8023E9B4 27A60024 */ addiu $a2, $sp, 0x24 /* 16D298 8023E9B8 93A30020 */ lbu $v1, 0x20($sp) /* 16D29C 8023E9BC 240200FF */ addiu $v0, $zero, 0xff -/* 16D2A0 8023E9C0 14620028 */ bne $v1, $v0, .L8023EA64 +/* 16D2A0 8023E9C0 14620028 */ bne $v1, $v0, L8023EA64_16D344 /* 16D2A4 8023E9C4 00000000 */ nop /* 16D2A8 8023E9C8 A6000000 */ sh $zero, ($s0) /* 16D2AC 8023E9CC 0000202D */ daddu $a0, $zero, $zero /* 16D2B0 8023E9D0 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 16D2B4 8023E9D4 0000282D */ daddu $a1, $zero, $zero -/* 16D2B8 8023E9D8 0808FA99 */ j .L8023EA64 +/* 16D2B8 8023E9D8 0808FA99 */ j L8023EA64_16D344 /* 16D2BC 8023E9DC 00000000 */ nop .L8023E9E0: /* 16D2C0 8023E9E0 1485000A */ bne $a0, $a1, .L8023EA0C @@ -421,11 +420,11 @@ glabel L8023E7E4_16D0C4 /* 16D2C8 8023E9E8 3C03800E */ lui $v1, %hi(gBattleState) /* 16D2CC 8023E9EC 8C63C068 */ lw $v1, %lo(gBattleState)($v1) /* 16D2D0 8023E9F0 24020023 */ addiu $v0, $zero, 0x23 -/* 16D2D4 8023E9F4 1062001B */ beq $v1, $v0, .L8023EA64 +/* 16D2D4 8023E9F4 1062001B */ beq $v1, $v0, L8023EA64_16D344 /* 16D2D8 8023E9F8 00000000 */ nop /* 16D2DC 8023E9FC 0C090464 */ jal func_80241190 /* 16D2E0 8023EA00 0040202D */ daddu $a0, $v0, $zero -/* 16D2E4 8023EA04 0808FA99 */ j .L8023EA64 +/* 16D2E4 8023EA04 0808FA99 */ j L8023EA64_16D344 /* 16D2E8 8023EA08 00000000 */ nop .L8023EA0C: /* 16D2EC 8023EA0C A6020000 */ sh $v0, ($s0) @@ -451,7 +450,6 @@ glabel L8023E7E4_16D0C4 /* 16D338 8023EA58 240400FF */ addiu $a0, $zero, 0xff /* 16D33C 8023EA5C 0C00CDF8 */ jal intro_logos_set_fade_color /* 16D340 8023EA60 240400E0 */ addiu $a0, $zero, 0xe0 -.L8023EA64: glabel L8023EA64_16D344 /* 16D344 8023EA64 8FBF0034 */ lw $ra, 0x34($sp) /* 16D348 8023EA68 8FB20030 */ lw $s2, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024FB3C.s b/ver/us/asm/nonmatchings/code_17D6A0/func_8024FB3C.s index b82b7f3805..dacf96526b 100644 --- a/ver/us/asm/nonmatchings/code_17D6A0/func_8024FB3C.s +++ b/ver/us/asm/nonmatchings/code_17D6A0/func_8024FB3C.s @@ -77,7 +77,7 @@ glabel L8024FBDC_17E4BC /* 17E520 8024FC40 00021400 */ sll $v0, $v0, 0x10 /* 17E524 8024FC44 00021C03 */ sra $v1, $v0, 0x10 /* 17E528 8024FC48 2C620015 */ sltiu $v0, $v1, 0x15 -/* 17E52C 8024FC4C 104002D6 */ beqz $v0, .L802507A8 +/* 17E52C 8024FC4C 104002D6 */ beqz $v0, L802507A8_17F088 /* 17E530 8024FC50 00031080 */ sll $v0, $v1, 2 /* 17E534 8024FC54 3C01802A */ lui $at, %hi(jtbl_8029CF08) /* 17E538 8024FC58 00220821 */ addu $at, $at, $v0 @@ -657,9 +657,9 @@ glabel L802504A4_17ED84 .L802504BC: /* 17ED9C 802504BC 86230014 */ lh $v1, 0x14($s1) /* 17EDA0 802504C0 2402FFFF */ addiu $v0, $zero, -1 -/* 17EDA4 802504C4 1062006C */ beq $v1, $v0, .L80250678 +/* 17EDA4 802504C4 1062006C */ beq $v1, $v0, L80250678_17EF58 /* 17EDA8 802504C8 2402001E */ addiu $v0, $zero, 0x1e -/* 17EDAC 802504CC 0809419E */ j .L80250678 +/* 17EDAC 802504CC 0809419E */ j L80250678_17EF58 /* 17EDB0 802504D0 A6220014 */ sh $v0, 0x14($s1) .L802504D4: /* 17EDB4 802504D4 14830006 */ bne $a0, $v1, .L802504F0 @@ -777,7 +777,6 @@ glabel L80250654_17EF34 /* 17EF4C 8025066C 8C22D010 */ lw $v0, %lo(jtbl_8029D010)($at) /* 17EF50 80250670 00400008 */ jr $v0 /* 17EF54 80250674 00000000 */ nop -.L80250678: glabel L80250678_17EF58 /* 17EF58 80250678 24020002 */ addiu $v0, $zero, 2 /* 17EF5C 8025067C 080941F7 */ j .L802507DC @@ -813,7 +812,7 @@ glabel L802506BC_17EF9C /* 17EFC0 802506E0 00021400 */ sll $v0, $v0, 0x10 /* 17EFC4 802506E4 00021C03 */ sra $v1, $v0, 0x10 /* 17EFC8 802506E8 2C620007 */ sltiu $v0, $v1, 7 -/* 17EFCC 802506EC 1040002E */ beqz $v0, .L802507A8 +/* 17EFCC 802506EC 1040002E */ beqz $v0, L802507A8_17F088 /* 17EFD0 802506F0 00031080 */ sll $v0, $v1, 2 /* 17EFD4 802506F4 3C01802A */ lui $at, %hi(jtbl_8029D028) /* 17EFD8 802506F8 00220821 */ addu $at, $at, $v0 @@ -871,7 +870,6 @@ glabel L80250768_17F048 /* 17F07C 8025079C 86040000 */ lh $a0, ($s0) /* 17F080 802507A0 0C051261 */ jal set_icon_render_pos /* 17F084 802507A4 00A0302D */ daddu $a2, $a1, $zero -.L802507A8: glabel L802507A8_17F088 /* 17F088 802507A8 24020001 */ addiu $v0, $zero, 1 .L802507AC: diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_80250818.s b/ver/us/asm/nonmatchings/code_17D6A0/func_80250818.s index b6348d13d8..655afd1d3f 100644 --- a/ver/us/asm/nonmatchings/code_17D6A0/func_80250818.s +++ b/ver/us/asm/nonmatchings/code_17D6A0/func_80250818.s @@ -14,7 +14,7 @@ glabel func_80250818 /* 17F11C 8025083C F7B40030 */ sdc1 $f20, 0x30($sp) /* 17F120 80250840 86630012 */ lh $v1, 0x12($s3) /* 17F124 80250844 2C620055 */ sltiu $v0, $v1, 0x55 -/* 17F128 80250848 1040018D */ beqz $v0, .L80250E80 +/* 17F128 80250848 1040018D */ beqz $v0, L80250E80_17F760 /* 17F12C 8025084C 24D10006 */ addiu $s1, $a2, 6 /* 17F130 80250850 00031080 */ sll $v0, $v1, 2 /* 17F134 80250854 3C01802A */ lui $at, %hi(jtbl_8029D048) @@ -43,7 +43,7 @@ glabel L80250868_17F148 /* 17F18C 802508AC AFA00014 */ sw $zero, 0x14($sp) /* 17F190 802508B0 0C04993B */ jal draw_msg /* 17F194 802508B4 02263021 */ addu $a2, $s1, $a2 -/* 17F198 802508B8 080943A0 */ j .L80250E80 +/* 17F198 802508B8 080943A0 */ j L80250E80_17F760 /* 17F19C 802508BC 00000000 */ nop glabel L802508C0_17F1A0 /* 17F1A0 802508C0 86620012 */ lh $v0, 0x12($s3) @@ -96,7 +96,7 @@ glabel L8025090C_17F1EC /* 17F254 80250974 AFA20010 */ sw $v0, 0x10($sp) /* 17F258 80250978 0C04993B */ jal draw_msg /* 17F25C 8025097C AFA00014 */ sw $zero, 0x14($sp) -/* 17F260 80250980 080943A0 */ j .L80250E80 +/* 17F260 80250980 080943A0 */ j L80250E80_17F760 /* 17F264 80250984 00000000 */ nop glabel L80250988_17F268 /* 17F268 80250988 2645001D */ addiu $a1, $s2, 0x1d @@ -159,7 +159,7 @@ glabel L802509DC_17F2BC /* 17F340 80250A60 00021400 */ sll $v0, $v0, 0x10 /* 17F344 80250A64 00021C03 */ sra $v1, $v0, 0x10 /* 17F348 80250A68 2C620014 */ sltiu $v0, $v1, 0x14 -/* 17F34C 80250A6C 10400104 */ beqz $v0, .L80250E80 +/* 17F34C 80250A6C 10400104 */ beqz $v0, L80250E80_17F760 /* 17F350 80250A70 00031080 */ sll $v0, $v1, 2 /* 17F354 80250A74 3C01802A */ lui $at, %hi(jtbl_8029D1A0) /* 17F358 80250A78 00220821 */ addu $at, $at, $v0 @@ -414,7 +414,7 @@ glabel L80250D60_17F640 /* 17F708 80250E28 86040000 */ lh $a0, ($s0) /* 17F70C 80250E2C 0C051086 */ jal func_80144218 /* 17F710 80250E30 00000000 */ nop -/* 17F714 80250E34 080943A0 */ j .L80250E80 +/* 17F714 80250E34 080943A0 */ j L80250E80_17F760 /* 17F718 80250E38 00000000 */ nop glabel L80250E3C_17F71C /* 17F71C 80250E3C 26450040 */ addiu $a1, $s2, 0x40 @@ -438,7 +438,6 @@ glabel L80250E3C_17F71C /* 17F754 80250E74 86040000 */ lh $a0, ($s0) /* 17F758 80250E78 0C0511EA */ jal draw_icon_0 /* 17F75C 80250E7C 00000000 */ nop -.L80250E80: glabel L80250E80_17F760 /* 17F760 80250E80 8FBF002C */ lw $ra, 0x2c($sp) /* 17F764 80250E84 8FB40028 */ lw $s4, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/code_182B30/func_802591EC.s b/ver/us/asm/nonmatchings/code_182B30/func_802591EC.s index 3b5a38d8a6..42c8bc522f 100644 --- a/ver/us/asm/nonmatchings/code_182B30/func_802591EC.s +++ b/ver/us/asm/nonmatchings/code_182B30/func_802591EC.s @@ -72,7 +72,7 @@ glabel func_802591EC /* 187BB8 802592D8 8D2200C0 */ lw $v0, 0xc0($t1) /* 187BBC 802592DC 804306C0 */ lb $v1, 0x6c0($v0) /* 187BC0 802592E0 2C620011 */ sltiu $v0, $v1, 0x11 -/* 187BC4 802592E4 10400067 */ beqz $v0, .L80259484 +/* 187BC4 802592E4 10400067 */ beqz $v0, L80259484_187D64 /* 187BC8 802592E8 00031080 */ sll $v0, $v1, 2 /* 187BCC 802592EC 3C01802A */ lui $at, %hi(jtbl_8029D3A0) /* 187BD0 802592F0 00220821 */ addu $at, $at, $v0 @@ -191,7 +191,6 @@ glabel L80259470_187D50 /* 187D58 80259478 0140302D */ daddu $a2, $t2, $zero /* 187D5C 8025947C 0C097048 */ jal func_8025C120 /* 187D60 80259480 0160382D */ daddu $a3, $t3, $zero -.L80259484: glabel L80259484_187D64 /* 187D64 80259484 0000102D */ daddu $v0, $zero, $zero .L80259488: diff --git a/ver/us/asm/nonmatchings/code_18C790/func_8025E190.s b/ver/us/asm/nonmatchings/code_18C790/func_8025E190.s index 5c070c7886..a4f3f16d6f 100644 --- a/ver/us/asm/nonmatchings/code_18C790/func_8025E190.s +++ b/ver/us/asm/nonmatchings/code_18C790/func_8025E190.s @@ -22,7 +22,7 @@ glabel func_8025E190 /* 18CAB4 8025E1D4 8FD100D8 */ lw $s1, 0xd8($fp) /* 18CAB8 8025E1D8 8FD200DC */ lw $s2, 0xdc($fp) /* 18CABC 8025E1DC 2C620017 */ sltiu $v0, $v1, 0x17 -/* 18CAC0 8025E1E0 10400759 */ beqz $v0, .L8025FF48 +/* 18CAC0 8025E1E0 10400759 */ beqz $v0, L8025FF48_18E828 /* 18CAC4 8025E1E4 00031080 */ sll $v0, $v1, 2 /* 18CAC8 8025E1E8 3C01802A */ lui $at, %hi(jtbl_8029D4F0) /* 18CACC 8025E1EC 00220821 */ addu $at, $at, $v0 @@ -31,7 +31,7 @@ glabel func_8025E190 /* 18CAD8 8025E1F8 00000000 */ nop glabel L8025E1FC_18CADC /* 18CADC 8025E1FC 83C20079 */ lb $v0, 0x79($fp) -/* 18CAE0 8025E200 1C400751 */ bgtz $v0, .L8025FF48 +/* 18CAE0 8025E200 1C400751 */ bgtz $v0, L8025FF48_18E828 /* 18CAE4 8025E204 3C03F7FF */ lui $v1, 0xf7ff /* 18CAE8 8025E208 8E220000 */ lw $v0, ($s1) /* 18CAEC 8025E20C 3463FFFF */ ori $v1, $v1, 0xffff @@ -90,7 +90,7 @@ glabel L8025E1FC_18CADC /* 18CBB8 8025E2D8 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 18CBBC 8025E2DC AC24C4DC */ sw $a0, %lo(gBattleStatus+0x46C)($at) /* 18CBC0 8025E2E0 00641825 */ or $v1, $v1, $a0 -/* 18CBC4 8025E2E4 08097FD2 */ j .L8025FF48 +/* 18CBC4 8025E2E4 08097FD2 */ j L8025FF48_18E828 /* 18CBC8 8025E2E8 AC430004 */ sw $v1, 4($v0) glabel L8025E2EC_18CBCC /* 18CBCC 8025E2EC 3C10802A */ lui $s0, %hi(D_8029FB4C) @@ -98,12 +98,12 @@ glabel L8025E2EC_18CBCC /* 18CBD4 8025E2F4 8E020000 */ lw $v0, ($s0) /* 18CBD8 8025E2F8 10400003 */ beqz $v0, .L8025E308 /* 18CBDC 8025E2FC 2442FFFF */ addiu $v0, $v0, -1 -/* 18CBE0 8025E300 08097FD2 */ j .L8025FF48 +/* 18CBE0 8025E300 08097FD2 */ j L8025FF48_18E828 /* 18CBE4 8025E304 AE020000 */ sw $v0, ($s0) .L8025E308: /* 18CBE8 8025E308 0C093961 */ jal func_8024E584 /* 18CBEC 8025E30C 00000000 */ nop -/* 18CBF0 8025E310 1040070D */ beqz $v0, .L8025FF48 +/* 18CBF0 8025E310 1040070D */ beqz $v0, L8025FF48_18E828 /* 18CBF4 8025E314 00000000 */ nop /* 18CBF8 8025E318 3C04007B */ lui $a0, 0x7b /* 18CBFC 8025E31C 248489A0 */ addiu $a0, $a0, -0x7660 @@ -149,7 +149,7 @@ glabel L8025E2EC_18CBCC /* 18CC94 8025E3B4 ACA00148 */ sw $zero, 0x148($a1) /* 18CC98 8025E3B8 3C01802A */ lui $at, %hi(D_8029FB70) /* 18CC9C 8025E3BC AC24FB70 */ sw $a0, %lo(D_8029FB70)($at) -/* 18CCA0 8025E3C0 08097FD2 */ j .L8025FF48 +/* 18CCA0 8025E3C0 08097FD2 */ j L8025FF48_18E828 /* 18CCA4 8025E3C4 00000000 */ nop glabel L8025E3C8_18CCA8 /* 18CCA8 8025E3C8 3C03802A */ lui $v1, %hi(D_8029FB4C) @@ -225,7 +225,7 @@ glabel L8025E3C8_18CCA8 /* 18CDB0 8025E4D0 A2A00010 */ sb $zero, 0x10($s5) .L8025E4D4: /* 18CDB4 8025E4D4 83C20078 */ lb $v0, 0x78($fp) -/* 18CDB8 8025E4D8 1440069B */ bnez $v0, .L8025FF48 +/* 18CDB8 8025E4D8 1440069B */ bnez $v0, L8025FF48_18E828 /* 18CDBC 8025E4DC 00000000 */ nop /* 18CDC0 8025E4E0 3C03802A */ lui $v1, %hi(D_8029FB54) /* 18CDC4 8025E4E4 2463FB54 */ addiu $v1, $v1, %lo(D_8029FB54) @@ -291,7 +291,7 @@ glabel L8025E5C0_18CEA0 /* 18CEA4 8025E5C4 2610FB84 */ addiu $s0, $s0, %lo(D_8029FB84) /* 18CEA8 8025E5C8 8E020000 */ lw $v0, ($s0) /* 18CEAC 8025E5CC 28420063 */ slti $v0, $v0, 0x63 -/* 18CEB0 8025E5D0 1440065D */ bnez $v0, .L8025FF48 +/* 18CEB0 8025E5D0 1440065D */ bnez $v0, L8025FF48_18E828 /* 18CEB4 8025E5D4 00000000 */ nop /* 18CEB8 8025E5D8 92A20009 */ lbu $v0, 9($s5) /* 18CEBC 8025E5DC 24040002 */ addiu $a0, $zero, 2 @@ -342,7 +342,7 @@ glabel L8025E62C_18CF0C /* 18CF6C 8025E68C 24020001 */ addiu $v0, $zero, 1 /* 18CF70 8025E690 0C046F97 */ jal set_background_color_blend /* 18CF74 8025E694 A0620000 */ sb $v0, ($v1) -/* 18CF78 8025E698 08097FD2 */ j .L8025FF48 +/* 18CF78 8025E698 08097FD2 */ j L8025FF48_18E828 /* 18CF7C 8025E69C 00000000 */ nop glabel L8025E6A0_18CF80 /* 18CF80 8025E6A0 3C10802A */ lui $s0, %hi(D_8029FB4C) @@ -433,7 +433,7 @@ glabel L8025E6A0_18CF80 /* 18D0D0 8025E7F0 1040000E */ beqz $v0, .L8025E82C /* 18D0D4 8025E7F4 2443FFFF */ addiu $v1, $v0, -1 /* 18D0D8 8025E7F8 2862000A */ slti $v0, $v1, 0xa -/* 18D0DC 8025E7FC 104005D2 */ beqz $v0, .L8025FF48 +/* 18D0DC 8025E7FC 104005D2 */ beqz $v0, L8025FF48_18E828 /* 18D0E0 8025E800 AE030000 */ sw $v1, ($s0) /* 18D0E4 8025E804 0000202D */ daddu $a0, $zero, $zero /* 18D0E8 8025E808 0080282D */ daddu $a1, $a0, $zero @@ -443,7 +443,7 @@ glabel L8025E6A0_18CF80 /* 18D0F8 8025E818 00073900 */ sll $a3, $a3, 4 /* 18D0FC 8025E81C 0C046F97 */ jal set_background_color_blend /* 18D100 8025E820 30E700F0 */ andi $a3, $a3, 0xf0 -/* 18D104 8025E824 08097FD2 */ j .L8025FF48 +/* 18D104 8025E824 08097FD2 */ j L8025FF48_18E828 /* 18D108 8025E828 00000000 */ nop .L8025E82C: /* 18D10C 8025E82C 3C04802B */ lui $a0, %hi(D_802A9F0C) @@ -1461,7 +1461,7 @@ glabel L8025F5F4_18DED4 /* 18E080 8025F7A0 2463FB4C */ addiu $v1, $v1, %lo(D_8029FB4C) /* 18E084 8025F7A4 8C620000 */ lw $v0, ($v1) /* 18E088 8025F7A8 2442FFFF */ addiu $v0, $v0, -1 -/* 18E08C 8025F7AC 144001E6 */ bnez $v0, .L8025FF48 +/* 18E08C 8025F7AC 144001E6 */ bnez $v0, L8025FF48_18E828 /* 18E090 8025F7B0 AC620000 */ sw $v0, ($v1) /* 18E094 8025F7B4 0280202D */ daddu $a0, $s4, $zero /* 18E098 8025F7B8 24050080 */ addiu $a1, $zero, 0x80 @@ -1549,7 +1549,7 @@ glabel L8025F824_18E104 /* 18E1C0 8025F8E0 24420001 */ addiu $v0, $v0, 1 /* 18E1C4 8025F8E4 AE020000 */ sw $v0, ($s0) /* 18E1C8 8025F8E8 28420065 */ slti $v0, $v0, 0x65 -/* 18E1CC 8025F8EC 14400196 */ bnez $v0, .L8025FF48 +/* 18E1CC 8025F8EC 14400196 */ bnez $v0, L8025FF48_18E828 /* 18E1D0 8025F8F0 24020078 */ addiu $v0, $zero, 0x78 /* 18E1D4 8025F8F4 24040003 */ addiu $a0, $zero, 3 /* 18E1D8 8025F8F8 44800000 */ mtc1 $zero, $f0 @@ -1561,7 +1561,7 @@ glabel L8025F824_18E104 /* 18E1F0 8025F910 00A0382D */ daddu $a3, $a1, $zero /* 18E1F4 8025F914 0C01C484 */ jal func_80071210 /* 18E1F8 8025F918 E7A00010 */ swc1 $f0, 0x10($sp) -/* 18E1FC 8025F91C 08097FD2 */ j .L8025FF48 +/* 18E1FC 8025F91C 08097FD2 */ j L8025FF48_18E828 /* 18E200 8025F920 AE000000 */ sw $zero, ($s0) glabel L8025F924_18E204 /* 18E204 8025F924 3C04802A */ lui $a0, %hi(D_8029FAE8) @@ -1867,7 +1867,7 @@ glabel L8025FD2C_18E60C /* 18E638 8025FD58 10400003 */ beqz $v0, .L8025FD68 /* 18E63C 8025FD5C 2442FFFF */ addiu $v0, $v0, -1 .L8025FD60: -/* 18E640 8025FD60 08097FD2 */ j .L8025FF48 +/* 18E640 8025FD60 08097FD2 */ j L8025FF48_18E828 /* 18E644 8025FD64 AC620000 */ sw $v0, ($v1) .L8025FD68: /* 18E648 8025FD68 24040009 */ addiu $a0, $zero, 9 @@ -1886,7 +1886,7 @@ glabel L8025FD7C_18E65C /* 18E674 8025FD94 3C02802A */ lui $v0, %hi(D_8029FB84) /* 18E678 8025FD98 8C42FB84 */ lw $v0, %lo(D_8029FB84)($v0) /* 18E67C 8025FD9C 28420063 */ slti $v0, $v0, 0x63 -/* 18E680 8025FDA0 14400069 */ bnez $v0, .L8025FF48 +/* 18E680 8025FDA0 14400069 */ bnez $v0, L8025FF48_18E828 /* 18E684 8025FDA4 3C030200 */ lui $v1, 0x200 /* 18E688 8025FDA8 3C02800E */ lui $v0, %hi(gBattleStatus+0x4) /* 18E68C 8025FDAC 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) @@ -1976,9 +1976,9 @@ glabel L8025FE58_18E738 .L8025FEE4: /* 18E7C4 8025FEE4 AC620000 */ sw $v0, ($v1) /* 18E7C8 8025FEE8 28420100 */ slti $v0, $v0, 0x100 -/* 18E7CC 8025FEEC 50400016 */ beql $v0, $zero, .L8025FF48 +/* 18E7CC 8025FEEC 50400016 */ beql $v0, $zero, L8025FF48_18E828 /* 18E7D0 8025FEF0 AC640000 */ sw $a0, ($v1) -/* 18E7D4 8025FEF4 08097FD2 */ j .L8025FF48 +/* 18E7D4 8025FEF4 08097FD2 */ j L8025FF48_18E828 /* 18E7D8 8025FEF8 00000000 */ nop glabel L8025FEFC_18E7DC /* 18E7DC 8025FEFC 0C0B1059 */ jal does_script_exist @@ -2003,7 +2003,6 @@ glabel L8025FEFC_18E7DC .L8025FF40: /* 18E820 8025FF40 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 18E824 8025FF44 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -.L8025FF48: glabel L8025FF48_18E828 /* 18E828 8025FF48 3C03802A */ lui $v1, %hi(D_8029FB84) /* 18E82C 8025FF4C 2463FB84 */ addiu $v1, $v1, %lo(D_8029FB84) diff --git a/ver/us/asm/nonmatchings/code_18C790/func_802601BC.s b/ver/us/asm/nonmatchings/code_18C790/func_802601BC.s index 4282c986f8..2aa539a022 100644 --- a/ver/us/asm/nonmatchings/code_18C790/func_802601BC.s +++ b/ver/us/asm/nonmatchings/code_18C790/func_802601BC.s @@ -13,7 +13,7 @@ glabel func_802601BC /* 18EABC 802601DC AFB10014 */ sw $s1, 0x14($sp) /* 18EAC0 802601E0 2443FFF9 */ addiu $v1, $v0, -7 /* 18EAC4 802601E4 2C62000F */ sltiu $v0, $v1, 0xf -/* 18EAC8 802601E8 10400193 */ beqz $v0, .L80260838 +/* 18EAC8 802601E8 10400193 */ beqz $v0, L80260838_18F118 /* 18EACC 802601EC AFB00010 */ sw $s0, 0x10($sp) /* 18EAD0 802601F0 00031080 */ sll $v0, $v1, 2 /* 18EAD4 802601F4 3C01802A */ lui $at, %hi(jtbl_8029D550) @@ -84,7 +84,7 @@ glabel L80260208_18EAE8 /* 18EBCC 802602EC 2A620003 */ slti $v0, $s3, 3 /* 18EBD0 802602F0 1440FFED */ bnez $v0, .L802602A8 /* 18EBD4 802602F4 2694001C */ addiu $s4, $s4, 0x1c -/* 18EBD8 802602F8 0809820E */ j .L80260838 +/* 18EBD8 802602F8 0809820E */ j L80260838_18F118 /* 18EBDC 802602FC 00000000 */ nop glabel L80260300_18EBE0 /* 18EBE0 80260300 3C02800E */ lui $v0, %hi(gBattleStatus) @@ -388,7 +388,7 @@ glabel L80260300_18EBE0 /* 18F040 80260760 00A0302D */ daddu $a2, $a1, $zero /* 18F044 80260764 0C05108E */ jal func_80144238 /* 18F048 80260768 0220202D */ daddu $a0, $s1, $zero -/* 18F04C 8026076C 0809820E */ j .L80260838 +/* 18F04C 8026076C 0809820E */ j L80260838_18F118 /* 18F050 80260770 00000000 */ nop glabel L80260774_18F054 /* 18F054 80260774 0C097FE3 */ jal func_8025FF8C @@ -436,7 +436,7 @@ glabel L80260800_18F0E0 glabel L80260810_18F0F0 /* 18F0F0 80260810 3C058028 */ lui $a1, %hi(D_80284150) /* 18F0F4 80260814 8CA54150 */ lw $a1, %lo(D_80284150)($a1) -/* 18F0F8 80260818 10A00007 */ beqz $a1, .L80260838 +/* 18F0F8 80260818 10A00007 */ beqz $a1, L80260838_18F118 /* 18F0FC 8026081C 00000000 */ nop /* 18F100 80260820 44851000 */ mtc1 $a1, $f2 /* 18F104 80260824 00000000 */ nop @@ -445,7 +445,6 @@ glabel L80260810_18F0F0 /* 18F10C 8026082C 44051000 */ mfc1 $a1, $f2 /* 18F110 80260830 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 18F114 80260834 0000202D */ daddu $a0, $zero, $zero -.L80260838: glabel L80260838_18F118 /* 18F118 80260838 3C03800E */ lui $v1, %hi(gBattleStatus+0x46C) /* 18F11C 8026083C 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) diff --git a/ver/us/asm/nonmatchings/code_190B20/inflict_status.s b/ver/us/asm/nonmatchings/code_190B20/inflict_status.s index 9595d91cd0..9afe316bdd 100644 --- a/ver/us/asm/nonmatchings/code_190B20/inflict_status.s +++ b/ver/us/asm/nonmatchings/code_190B20/inflict_status.s @@ -10,7 +10,7 @@ glabel inflict_status /* 194834 80265F54 AFB20020 */ sw $s2, 0x20($sp) /* 194838 80265F58 00C0902D */ daddu $s2, $a2, $zero /* 19483C 80265F5C 2E22000F */ sltiu $v0, $s1, 0xf -/* 194840 80265F60 104000B5 */ beqz $v0, .L80266238 +/* 194840 80265F60 104000B5 */ beqz $v0, L80266238_194B18 /* 194844 80265F64 AFBF0024 */ sw $ra, 0x24($sp) /* 194848 80265F68 00111080 */ sll $v0, $s1, 2 /* 19484C 80265F6C 3C01802A */ lui $at, %hi(jtbl_8029D5E0) @@ -58,7 +58,7 @@ glabel L80265F80_194860 .L80266008: /* 1948E8 80266008 2625FFFD */ addiu $a1, $s1, -3 /* 1948EC 8026600C 2CA20008 */ sltiu $v0, $a1, 8 -/* 1948F0 80266010 10400089 */ beqz $v0, .L80266238 +/* 1948F0 80266010 10400089 */ beqz $v0, L80266238_194B18 /* 1948F4 80266014 00051080 */ sll $v0, $a1, 2 /* 1948F8 80266018 3C01802A */ lui $at, %hi(jtbl_8029D620) /* 1948FC 8026601C 00220821 */ addu $at, $at, $v0 @@ -143,7 +143,7 @@ glabel L80266124_194A04 glabel L80266138_194A18 /* 194A18 80266138 86030192 */ lh $v1, 0x192($s0) /* 194A1C 8026613C 24020100 */ addiu $v0, $zero, 0x100 -/* 194A20 80266140 1062003D */ beq $v1, $v0, .L80266238 +/* 194A20 80266140 1062003D */ beq $v1, $v0, L80266238_194B18 /* 194A24 80266144 00121600 */ sll $v0, $s2, 0x18 /* 194A28 80266148 00021603 */ sra $v0, $v0, 0x18 /* 194A2C 8026614C 2842000A */ slti $v0, $v0, 0xa @@ -166,7 +166,7 @@ glabel L80266138_194A18 glabel L8026618C_194A6C /* 194A6C 8026618C 86030192 */ lh $v1, 0x192($s0) /* 194A70 80266190 24020100 */ addiu $v0, $zero, 0x100 -/* 194A74 80266194 10620028 */ beq $v1, $v0, .L80266238 +/* 194A74 80266194 10620028 */ beq $v1, $v0, L80266238_194B18 /* 194A78 80266198 2403000C */ addiu $v1, $zero, 0xc /* 194A7C 8026619C 00121600 */ sll $v0, $s2, 0x18 /* 194A80 802661A0 00021603 */ sra $v0, $v0, 0x18 @@ -180,7 +180,7 @@ glabel L8026618C_194A6C glabel L802661C0_194AA0 /* 194AA0 802661C0 82020216 */ lb $v0, 0x216($s0) /* 194AA4 802661C4 0051102A */ slt $v0, $v0, $s1 -/* 194AA8 802661C8 1040001B */ beqz $v0, .L80266238 +/* 194AA8 802661C8 1040001B */ beqz $v0, L80266238_194B18 /* 194AAC 802661CC 2403000D */ addiu $v1, $zero, 0xd /* 194AB0 802661D0 00121600 */ sll $v0, $s2, 0x18 /* 194AB4 802661D4 00021603 */ sra $v0, $v0, 0x18 @@ -191,12 +191,12 @@ glabel L802661C0_194AA0 /* 194AC8 802661E8 24020009 */ addiu $v0, $zero, 9 /* 194ACC 802661EC A2020217 */ sb $v0, 0x217($s0) .L802661F0: -/* 194AD0 802661F0 0809988E */ j .L80266238 +/* 194AD0 802661F0 0809988E */ j L80266238_194B18 /* 194AD4 802661F4 A203021C */ sb $v1, 0x21c($s0) glabel L802661F8_194AD8 /* 194AD8 802661F8 86030192 */ lh $v1, 0x192($s0) /* 194ADC 802661FC 24020100 */ addiu $v0, $zero, 0x100 -/* 194AE0 80266200 1062000D */ beq $v1, $v0, .L80266238 +/* 194AE0 80266200 1062000D */ beq $v1, $v0, L80266238_194B18 /* 194AE4 80266204 2403000E */ addiu $v1, $zero, 0xe /* 194AE8 80266208 00121600 */ sll $v0, $s2, 0x18 /* 194AEC 8026620C 00021603 */ sra $v0, $v0, 0x18 @@ -211,7 +211,6 @@ glabel L802661F8_194AD8 /* 194B0C 8026622C 2405000E */ addiu $a1, $zero, 0xe /* 194B10 80266230 0C011E8C */ jal func_80047A30 /* 194B14 80266234 A203021C */ sb $v1, 0x21c($s0) -.L80266238: glabel L80266238_194B18 /* 194B18 80266238 24020001 */ addiu $v0, $zero, 1 .L8026623C: diff --git a/ver/us/asm/nonmatchings/code_190B20/start_rumble_type.s b/ver/us/asm/nonmatchings/code_190B20/start_rumble_type.s index 4e450a2823..cc716c9b21 100644 --- a/ver/us/asm/nonmatchings/code_190B20/start_rumble_type.s +++ b/ver/us/asm/nonmatchings/code_190B20/start_rumble_type.s @@ -13,7 +13,7 @@ glabel start_rumble_type /* 1966F4 80267E14 00000000 */ nop .L80267E18: /* 1966F8 80267E18 2E02000C */ sltiu $v0, $s0, 0xc -/* 1966FC 80267E1C 10400026 */ beqz $v0, .L80267EB8 +/* 1966FC 80267E1C 10400026 */ beqz $v0, L80267EB8_196798 /* 196700 80267E20 00101080 */ sll $v0, $s0, 2 /* 196704 80267E24 3C01802A */ lui $at, %hi(jtbl_8029D670) /* 196708 80267E28 00220821 */ addu $at, $at, $v0 @@ -60,7 +60,6 @@ glabel L80267E98_196778 /* 19678C 80267EAC 8C420144 */ lw $v0, 0x144($v0) /* 196790 80267EB0 3C018029 */ lui $at, %hi(D_802939C0) /* 196794 80267EB4 AC2239C0 */ sw $v0, %lo(D_802939C0)($at) -.L80267EB8: glabel L80267EB8_196798 /* 196798 80267EB8 8FBF0014 */ lw $ra, 0x14($sp) /* 19679C 80267EBC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268938.s b/ver/us/asm/nonmatchings/code_196AA0/func_80268938.s index 70172b9891..9ba06525b1 100644 --- a/ver/us/asm/nonmatchings/code_196AA0/func_80268938.s +++ b/ver/us/asm/nonmatchings/code_196AA0/func_80268938.s @@ -15,7 +15,7 @@ glabel func_80268938 /* 19723C 8026895C 2442FBE0 */ addiu $v0, $v0, %lo(D_8029FBE0) /* 197240 80268960 8443004A */ lh $v1, 0x4a($v0) /* 197244 80268964 2C620018 */ sltiu $v0, $v1, 0x18 -/* 197248 80268968 10400060 */ beqz $v0, .L80268AEC +/* 197248 80268968 10400060 */ beqz $v0, L80268AEC_1973CC /* 19724C 8026896C 00031080 */ sll $v0, $v1, 2 /* 197250 80268970 3C01802A */ lui $at, %hi(jtbl_8029D6A0) /* 197254 80268974 00220821 */ addu $at, $at, $v0 @@ -25,117 +25,116 @@ glabel func_80268938 glabel L80268984_197264 /* 197264 80268984 0C0AA48D */ jal func_802A9234_421C24 /* 197268 80268988 00000000 */ nop -/* 19726C 8026898C 0809A2BB */ j .L80268AEC +/* 19726C 8026898C 0809A2BB */ j L80268AEC_1973CC /* 197270 80268990 00000000 */ nop glabel L80268994_197274 /* 197274 80268994 0C0AA4DB */ jal func_802A936C_42236C /* 197278 80268998 00000000 */ nop -/* 19727C 8026899C 0809A2BB */ j .L80268AEC +/* 19727C 8026899C 0809A2BB */ j L80268AEC_1973CC /* 197280 802689A0 00000000 */ nop glabel L802689A4_197284 /* 197284 802689A4 0C0AA4DE */ jal func_802A9378_422E48 /* 197288 802689A8 00000000 */ nop -/* 19728C 802689AC 0809A2BB */ j .L80268AEC +/* 19728C 802689AC 0809A2BB */ j L80268AEC_1973CC /* 197290 802689B0 00000000 */ nop glabel L802689B4_197294 /* 197294 802689B4 0C0AA4B7 */ jal func_802A92DC_4236CC /* 197298 802689B8 00000000 */ nop -/* 19729C 802689BC 0809A2BB */ j .L80268AEC +/* 19729C 802689BC 0809A2BB */ j L80268AEC_1973CC /* 1972A0 802689C0 00000000 */ nop glabel L802689C4_1972A4 /* 1972A4 802689C4 0C0AA4BC */ jal func_802A92F0_423F60 /* 1972A8 802689C8 00000000 */ nop -/* 1972AC 802689CC 0809A2BB */ j .L80268AEC +/* 1972AC 802689CC 0809A2BB */ j L80268AEC_1973CC /* 1972B0 802689D0 00000000 */ nop glabel L802689D4_1972B4 /* 1972B4 802689D4 0C0AA47E */ jal func_802A91F8_425788 /* 1972B8 802689D8 00000000 */ nop -/* 1972BC 802689DC 0809A2BB */ j .L80268AEC +/* 1972BC 802689DC 0809A2BB */ j L80268AEC_1973CC /* 1972C0 802689E0 00000000 */ nop glabel L802689E4_1972C4 /* 1972C4 802689E4 0C0AA48A */ jal func_802A9228_425D78 /* 1972C8 802689E8 00000000 */ nop -/* 1972CC 802689EC 0809A2BB */ j .L80268AEC +/* 1972CC 802689EC 0809A2BB */ j L80268AEC_1973CC /* 1972D0 802689F0 00000000 */ nop glabel L802689F4_1972D4 /* 1972D4 802689F4 0C0AA4A3 */ jal func_802A928C_4263FC /* 1972D8 802689F8 00000000 */ nop -/* 1972DC 802689FC 0809A2BB */ j .L80268AEC +/* 1972DC 802689FC 0809A2BB */ j L80268AEC_1973CC /* 1972E0 80268A00 00000000 */ nop glabel L80268A04_1972E4 /* 1972E4 80268A04 0C0AA4A5 */ jal func_802A9294_426C64 /* 1972E8 80268A08 00000000 */ nop -/* 1972EC 80268A0C 0809A2BB */ j .L80268AEC +/* 1972EC 80268A0C 0809A2BB */ j L80268AEC_1973CC /* 1972F0 80268A10 00000000 */ nop glabel L80268A14_1972F4 /* 1972F4 80268A14 0C0AA4A3 */ jal func_802A928C_4263FC /* 1972F8 80268A18 00000000 */ nop -/* 1972FC 80268A1C 0809A2BB */ j .L80268AEC +/* 1972FC 80268A1C 0809A2BB */ j L80268AEC_1973CC /* 197300 80268A20 00000000 */ nop glabel L80268A24_197304 /* 197304 80268A24 0C0AA4A3 */ jal func_802A928C_4263FC /* 197308 80268A28 00000000 */ nop -/* 19730C 80268A2C 0809A2BB */ j .L80268AEC +/* 19730C 80268A2C 0809A2BB */ j L80268AEC_1973CC /* 197310 80268A30 00000000 */ nop glabel L80268A34_197314 /* 197314 80268A34 0C0AA4B5 */ jal func_802A92D4_4285B4 /* 197318 80268A38 00000000 */ nop -/* 19731C 80268A3C 0809A2BB */ j .L80268AEC +/* 19731C 80268A3C 0809A2BB */ j L80268AEC_1973CC /* 197320 80268A40 00000000 */ nop glabel L80268A44_197324 /* 197324 80268A44 0C0AA49E */ jal func_802A9278_428CE8 /* 197328 80268A48 00000000 */ nop -/* 19732C 80268A4C 0809A2BB */ j .L80268AEC +/* 19732C 80268A4C 0809A2BB */ j L80268AEC_1973CC /* 197330 80268A50 00000000 */ nop glabel L80268A54_197334 /* 197334 80268A54 0C0AA4A5 */ jal func_802A9294_426C64 /* 197338 80268A58 00000000 */ nop -/* 19733C 80268A5C 0809A2BB */ j .L80268AEC +/* 19733C 80268A5C 0809A2BB */ j L80268AEC_1973CC /* 197340 80268A60 00000000 */ nop glabel L80268A64_197344 /* 197344 80268A64 0C0AA482 */ jal func_802A9208_429F28 /* 197348 80268A68 00000000 */ nop -/* 19734C 80268A6C 0809A2BB */ j .L80268AEC +/* 19734C 80268A6C 0809A2BB */ j L80268AEC_1973CC /* 197350 80268A70 00000000 */ nop glabel L80268A74_197354 /* 197354 80268A74 0C0AA4C4 */ jal func_802A9310_42D220 /* 197358 80268A78 00000000 */ nop -/* 19735C 80268A7C 0809A2BB */ j .L80268AEC +/* 19735C 80268A7C 0809A2BB */ j L80268AEC_1973CC /* 197360 80268A80 00000000 */ nop glabel L80268A84_197364 /* 197364 80268A84 0C0AA4A8 */ jal func_802A92A0_422D70 /* 197368 80268A88 00000000 */ nop -/* 19736C 80268A8C 0809A2BB */ j .L80268AEC +/* 19736C 80268A8C 0809A2BB */ j L80268AEC_1973CC /* 197370 80268A90 00000000 */ nop glabel L80268A94_197374 /* 197374 80268A94 0C0AA4A6 */ jal func_802A9298_42E638 /* 197378 80268A98 00000000 */ nop -/* 19737C 80268A9C 0809A2BB */ j .L80268AEC +/* 19737C 80268A9C 0809A2BB */ j L80268AEC_1973CC /* 197380 80268AA0 00000000 */ nop glabel L80268AA4_197384 /* 197384 80268AA4 0C0AA495 */ jal func_802A9254_42F074 /* 197388 80268AA8 00000000 */ nop -/* 19738C 80268AAC 0809A2BB */ j .L80268AEC +/* 19738C 80268AAC 0809A2BB */ j L80268AEC_1973CC /* 197390 80268AB0 00000000 */ nop glabel L80268AB4_197394 /* 197394 80268AB4 0C0AA4A8 */ jal func_802A92A0_422D70 /* 197398 80268AB8 00000000 */ nop -/* 19739C 80268ABC 0809A2BB */ j .L80268AEC +/* 19739C 80268ABC 0809A2BB */ j L80268AEC_1973CC /* 1973A0 80268AC0 00000000 */ nop glabel L80268AC4_1973A4 /* 1973A4 80268AC4 0C0AA4A6 */ jal func_802A9298_42E638 /* 1973A8 80268AC8 00000000 */ nop -/* 1973AC 80268ACC 0809A2BB */ j .L80268AEC +/* 1973AC 80268ACC 0809A2BB */ j L80268AEC_1973CC /* 1973B0 80268AD0 00000000 */ nop glabel L80268AD4_1973B4 /* 1973B4 80268AD4 0C0AA523 */ jal func_802A948C_42A97C /* 1973B8 80268AD8 00000000 */ nop -/* 1973BC 80268ADC 0809A2BB */ j .L80268AEC +/* 1973BC 80268ADC 0809A2BB */ j L80268AEC_1973CC /* 1973C0 80268AE0 00000000 */ nop glabel L80268AE4_1973C4 /* 1973C4 80268AE4 0C0AA48A */ jal func_802A9228_425D78 /* 1973C8 80268AE8 00000000 */ nop -.L80268AEC: glabel L80268AEC_1973CC /* 1973CC 80268AEC 8FBF0010 */ lw $ra, 0x10($sp) /* 1973D0 80268AF0 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268AF8.s b/ver/us/asm/nonmatchings/code_196AA0/func_80268AF8.s index 6d082cbb0a..a0bafbb5e1 100644 --- a/ver/us/asm/nonmatchings/code_196AA0/func_80268AF8.s +++ b/ver/us/asm/nonmatchings/code_196AA0/func_80268AF8.s @@ -6,7 +6,7 @@ glabel func_80268AF8 /* 1973DC 80268AFC 8463FC2A */ lh $v1, %lo(D_8029FC2A)($v1) /* 1973E0 80268B00 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 1973E4 80268B04 2C620018 */ sltiu $v0, $v1, 0x18 -/* 1973E8 80268B08 10400061 */ beqz $v0, .L80268C90 +/* 1973E8 80268B08 10400061 */ beqz $v0, L80268C90_197570 /* 1973EC 80268B0C AFBF0010 */ sw $ra, 0x10($sp) /* 1973F0 80268B10 00031080 */ sll $v0, $v1, 2 /* 1973F4 80268B14 3C01802A */ lui $at, %hi(jtbl_8029D700) @@ -17,117 +17,116 @@ glabel func_80268AF8 glabel L80268B28_197408 /* 197408 80268B28 0C0AA551 */ jal func_802A9544_421F34 /* 19740C 80268B2C 00000000 */ nop -/* 197410 80268B30 0809A324 */ j .L80268C90 +/* 197410 80268B30 0809A324 */ j L80268C90_197570 /* 197414 80268B34 00000000 */ nop glabel L80268B38_197418 /* 197418 80268B38 0C0AA675 */ jal func_802A99D4_4229D4 /* 19741C 80268B3C 00000000 */ nop -/* 197420 80268B40 0809A324 */ j .L80268C90 +/* 197420 80268B40 0809A324 */ j L80268C90_197570 /* 197424 80268B44 00000000 */ nop glabel L80268B48_197428 /* 197428 80268B48 0C0AA5BD */ jal func_802A96F4_4231C4 /* 19742C 80268B4C 00000000 */ nop -/* 197430 80268B50 0809A324 */ j .L80268C90 +/* 197430 80268B50 0809A324 */ j L80268C90_197570 /* 197434 80268B54 00000000 */ nop glabel L80268B58_197438 /* 197438 80268B58 0C0AA5AE */ jal func_802A96B8_423AA8 /* 19743C 80268B5C 00000000 */ nop -/* 197440 80268B60 0809A324 */ j .L80268C90 +/* 197440 80268B60 0809A324 */ j L80268C90_197570 /* 197444 80268B64 00000000 */ nop glabel L80268B68_197448 /* 197448 80268B68 0C0AA5D1 */ jal func_802A9744_4243B4 /* 19744C 80268B6C 00000000 */ nop -/* 197450 80268B70 0809A324 */ j .L80268C90 +/* 197450 80268B70 0809A324 */ j L80268C90_197570 /* 197454 80268B74 00000000 */ nop glabel L80268B78_197458 /* 197458 80268B78 0C0AA529 */ jal func_802A94A4_425A34 /* 19745C 80268B7C 00000000 */ nop -/* 197460 80268B80 0809A324 */ j .L80268C90 +/* 197460 80268B80 0809A324 */ j L80268C90_197570 /* 197464 80268B84 00000000 */ nop glabel L80268B88_197468 /* 197468 80268B88 0C0AA536 */ jal func_802A94D8_426028 /* 19746C 80268B8C 00000000 */ nop -/* 197470 80268B90 0809A324 */ j .L80268C90 +/* 197470 80268B90 0809A324 */ j L80268C90_197570 /* 197474 80268B94 00000000 */ nop glabel L80268B98_197478 /* 197478 80268B98 0C0AA5B7 */ jal func_802A96DC_42684C /* 19747C 80268B9C 00000000 */ nop -/* 197480 80268BA0 0809A324 */ j .L80268C90 +/* 197480 80268BA0 0809A324 */ j L80268C90_197570 /* 197484 80268BA4 00000000 */ nop glabel L80268BA8_197488 /* 197488 80268BA8 0C0AA60D */ jal func_802A9834_427204 /* 19748C 80268BAC 00000000 */ nop -/* 197490 80268BB0 0809A324 */ j .L80268C90 +/* 197490 80268BB0 0809A324 */ j L80268C90_197570 /* 197494 80268BB4 00000000 */ nop glabel L80268BB8_197498 /* 197498 80268BB8 0C0AA557 */ jal func_802A955C_42790C /* 19749C 80268BBC 00000000 */ nop -/* 1974A0 80268BC0 0809A324 */ j .L80268C90 +/* 1974A0 80268BC0 0809A324 */ j L80268C90_197570 /* 1974A4 80268BC4 00000000 */ nop glabel L80268BC8_1974A8 /* 1974A8 80268BC8 0C0AA5BB */ jal func_802A96EC_42815C /* 1974AC 80268BCC 00000000 */ nop -/* 1974B0 80268BD0 0809A324 */ j .L80268C90 +/* 1974B0 80268BD0 0809A324 */ j L80268C90_197570 /* 1974B4 80268BD4 00000000 */ nop glabel L80268BD8_1974B8 /* 1974B8 80268BD8 0C0AA599 */ jal func_802A9664_428944 /* 1974BC 80268BDC 00000000 */ nop -/* 1974C0 80268BE0 0809A324 */ j .L80268C90 +/* 1974C0 80268BE0 0809A324 */ j L80268C90_197570 /* 1974C4 80268BE4 00000000 */ nop glabel L80268BE8_1974C8 /* 1974C8 80268BE8 0C0AA5BB */ jal func_802A96EC_42815C /* 1974CC 80268BEC 00000000 */ nop -/* 1974D0 80268BF0 0809A324 */ j .L80268C90 +/* 1974D0 80268BF0 0809A324 */ j L80268C90_197570 /* 1974D4 80268BF4 00000000 */ nop glabel L80268BF8_1974D8 /* 1974D8 80268BF8 0C0AA613 */ jal func_802A984C_429B6C /* 1974DC 80268BFC 00000000 */ nop -/* 1974E0 80268C00 0809A324 */ j .L80268C90 +/* 1974E0 80268C00 0809A324 */ j L80268C90_197570 /* 1974E4 80268C04 00000000 */ nop glabel L80268C08_1974E8 /* 1974E8 80268C08 0C0AA58D */ jal func_802A9634_42A354 /* 1974EC 80268C0C 00000000 */ nop -/* 1974F0 80268C10 0809A324 */ j .L80268C90 +/* 1974F0 80268C10 0809A324 */ j L80268C90_197570 /* 1974F4 80268C14 00000000 */ nop glabel L80268C18_1974F8 /* 1974F8 80268C18 0C0AA634 */ jal func_802A98D0_42D7E0 /* 1974FC 80268C1C 00000000 */ nop -/* 197500 80268C20 0809A324 */ j .L80268C90 +/* 197500 80268C20 0809A324 */ j L80268C90_197570 /* 197504 80268C24 00000000 */ nop glabel L80268C28_197508 /* 197508 80268C28 0C0AA5FE */ jal func_802A97F8_42E208 /* 19750C 80268C2C 00000000 */ nop -/* 197510 80268C30 0809A324 */ j .L80268C90 +/* 197510 80268C30 0809A324 */ j L80268C90_197570 /* 197514 80268C34 00000000 */ nop glabel L80268C38_197518 /* 197518 80268C38 0C0AA62C */ jal func_802A98B0_42EC50 /* 19751C 80268C3C 00000000 */ nop -/* 197520 80268C40 0809A324 */ j .L80268C90 +/* 197520 80268C40 0809A324 */ j L80268C90_197570 /* 197524 80268C44 00000000 */ nop glabel L80268C48_197528 /* 197528 80268C48 0C0AA5CF */ jal func_802A973C_42F55C /* 19752C 80268C4C 00000000 */ nop -/* 197530 80268C50 0809A324 */ j .L80268C90 +/* 197530 80268C50 0809A324 */ j L80268C90_197570 /* 197534 80268C54 00000000 */ nop glabel L80268C58_197538 /* 197538 80268C58 0C0AA5EB */ jal func_802A97AC_42FE8C /* 19753C 80268C5C 00000000 */ nop -/* 197540 80268C60 0809A324 */ j .L80268C90 +/* 197540 80268C60 0809A324 */ j L80268C90_197570 /* 197544 80268C64 00000000 */ nop glabel L80268C68_197548 /* 197548 80268C68 0C0AA5FF */ jal func_802A97FC_423BEC /* 19754C 80268C6C 00000000 */ nop -/* 197550 80268C70 0809A324 */ j .L80268C90 +/* 197550 80268C70 0809A324 */ j L80268C90_197570 /* 197554 80268C74 00000000 */ nop glabel L80268C78_197558 /* 197558 80268C78 0C0AA805 */ jal func_802AA014_42B504 /* 19755C 80268C7C 00000000 */ nop -/* 197560 80268C80 0809A324 */ j .L80268C90 +/* 197560 80268C80 0809A324 */ j L80268C90_197570 /* 197564 80268C84 00000000 */ nop glabel L80268C88_197568 /* 197568 80268C88 0C0AA5C6 */ jal func_802A9718_42CE08 /* 19756C 80268C8C 00000000 */ nop -.L80268C90: glabel L80268C90_197570 /* 197570 80268C90 8FBF0010 */ lw $ra, 0x10($sp) /* 197574 80268C94 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268C9C.s b/ver/us/asm/nonmatchings/code_196AA0/func_80268C9C.s index 5248d48150..773a34b51d 100644 --- a/ver/us/asm/nonmatchings/code_196AA0/func_80268C9C.s +++ b/ver/us/asm/nonmatchings/code_196AA0/func_80268C9C.s @@ -9,7 +9,7 @@ glabel func_80268C9C /* 19758C 80268CAC AFBF0014 */ sw $ra, 0x14($sp) /* 197590 80268CB0 8603004A */ lh $v1, 0x4a($s0) /* 197594 80268CB4 2C620018 */ sltiu $v0, $v1, 0x18 -/* 197598 80268CB8 10400060 */ beqz $v0, .L80268E3C +/* 197598 80268CB8 10400060 */ beqz $v0, L80268E3C_19771C /* 19759C 80268CBC 00031080 */ sll $v0, $v1, 2 /* 1975A0 80268CC0 3C01802A */ lui $at, %hi(jtbl_8029D760) /* 1975A4 80268CC4 00220821 */ addu $at, $at, $v0 @@ -129,7 +129,6 @@ glabel L80268E24_197704 glabel L80268E34_197714 /* 197714 80268E34 0C0AA5D9 */ jal func_802A9764_42CE54 /* 197718 80268E38 00000000 */ nop -.L80268E3C: glabel L80268E3C_19771C /* 19771C 80268E3C 3C05FFFF */ lui $a1, 0xffff .L80268E40: diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s index 668fa96101..1004a43f80 100644 --- a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s +++ b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s @@ -524,7 +524,7 @@ glabel update_encounters_neutral /* 1B374 8003FF74 00021600 */ sll $v0, $v0, 0x18 /* 1B378 8003FF78 00021E03 */ sra $v1, $v0, 0x18 /* 1B37C 8003FF7C 2C620010 */ sltiu $v0, $v1, 0x10 -/* 1B380 8003FF80 10400184 */ beqz $v0, .L80040594 +/* 1B380 8003FF80 10400184 */ beqz $v0, L80040594_1B994 /* 1B384 8003FF84 46000586 */ mov.s $f22, $f0 /* 1B388 8003FF88 00031080 */ sll $v0, $v1, 2 /* 1B38C 8003FF8C 3C01800A */ lui $at, %hi(jtbl_800985F8) @@ -608,12 +608,12 @@ glabel L8003FFA0_1B3A0 /* 1B4B0 800400B0 8E220000 */ lw $v0, ($s1) /* 1B4B4 800400B4 3C030400 */ lui $v1, 0x400 /* 1B4B8 800400B8 00431024 */ and $v0, $v0, $v1 -/* 1B4BC 800400BC 14400135 */ bnez $v0, .L80040594 +/* 1B4BC 800400BC 14400135 */ bnez $v0, L80040594_1B994 /* 1B4C0 800400C0 46000586 */ mov.s $f22, $f0 /* 1B4C4 800400C4 8E820000 */ lw $v0, ($s4) /* 1B4C8 800400C8 3C030100 */ lui $v1, 0x100 /* 1B4CC 800400CC 00431024 */ and $v0, $v0, $v1 -/* 1B4D0 800400D0 10400130 */ beqz $v0, .L80040594 +/* 1B4D0 800400D0 10400130 */ beqz $v0, L80040594_1B994 /* 1B4D4 800400D4 00000000 */ nop /* 1B4D8 800400D8 3C014160 */ lui $at, 0x4160 /* 1B4DC 800400DC 44819000 */ mtc1 $at, $f18 @@ -621,12 +621,12 @@ glabel L8003FFA0_1B3A0 /* 1B4E4 800400E4 461E9000 */ add.s $f0, $f18, $f30 /* 1B4E8 800400E8 4616003E */ c.le.s $f0, $f22 /* 1B4EC 800400EC 00000000 */ nop -/* 1B4F0 800400F0 45010128 */ bc1t .L80040594 +/* 1B4F0 800400F0 45010128 */ bc1t L80040594_1B994 /* 1B4F4 800400F4 00000000 */ nop /* 1B4F8 800400F8 461CD000 */ add.s $f0, $f26, $f28 /* 1B4FC 800400FC 4614003C */ c.lt.s $f0, $f20 /* 1B500 80040100 00000000 */ nop -/* 1B504 80040104 45010123 */ bc1t .L80040594 +/* 1B504 80040104 45010123 */ bc1t L80040594_1B994 /* 1B508 80040108 00000000 */ nop /* 1B50C 8004010C 3C014190 */ lui $at, 0x4190 /* 1B510 80040110 44818000 */ mtc1 $at, $f16 @@ -634,7 +634,7 @@ glabel L8003FFA0_1B3A0 /* 1B518 80040118 4610A000 */ add.s $f0, $f20, $f16 /* 1B51C 8004011C 461A003C */ c.lt.s $f0, $f26 /* 1B520 80040120 00000000 */ nop -/* 1B524 80040124 4501011B */ bc1t .L80040594 +/* 1B524 80040124 4501011B */ bc1t L80040594_1B994 /* 1B528 80040128 00000000 */ nop /* 1B52C 8004012C 8FA60050 */ lw $a2, 0x50($sp) /* 1B530 80040130 8FA70058 */ lw $a3, 0x58($sp) @@ -675,7 +675,7 @@ glabel L8003FFA0_1B3A0 /* 1B5BC 800401BC E7BC0018 */ swc1 $f28, 0x18($sp) /* 1B5C0 800401C0 0C0376B9 */ jal func_800DDAE4 /* 1B5C4 800401C4 E7B4001C */ swc1 $f20, 0x1c($sp) -/* 1B5C8 800401C8 144000F2 */ bnez $v0, .L80040594 +/* 1B5C8 800401C8 144000F2 */ bnez $v0, L80040594_1B994 /* 1B5CC 800401CC 00000000 */ nop .L800401D0: /* 1B5D0 800401D0 82220007 */ lb $v0, 7($s1) @@ -752,7 +752,7 @@ glabel L8003FFA0_1B3A0 /* 1B6E0 800402E0 45030001 */ bc1tl .L800402E8 /* 1B6E4 800402E4 24100001 */ addiu $s0, $zero, 1 .L800402E8: -/* 1B6E8 800402E8 120000AA */ beqz $s0, .L80040594 +/* 1B6E8 800402E8 120000AA */ beqz $s0, L80040594_1B994 /* 1B6EC 800402EC 240400E1 */ addiu $a0, $zero, 0xe1 /* 1B6F0 800402F0 8E860028 */ lw $a2, 0x28($s4) /* 1B6F4 800402F4 8E87002C */ lw $a3, 0x2c($s4) @@ -774,7 +774,7 @@ glabel L80040320_1B720 /* 1B730 80040330 8E220000 */ lw $v0, ($s1) /* 1B734 80040334 3C030200 */ lui $v1, 0x200 /* 1B738 80040338 00431024 */ and $v0, $v0, $v1 -/* 1B73C 8004033C 14400095 */ bnez $v0, .L80040594 +/* 1B73C 8004033C 14400095 */ bnez $v0, L80040594_1B994 /* 1B740 80040340 00000000 */ nop /* 1B744 80040344 3C014160 */ lui $at, 0x4160 /* 1B748 80040348 44818000 */ mtc1 $at, $f16 @@ -837,7 +837,7 @@ glabel L80040320_1B720 /* 1B82C 8004042C E7BC0018 */ swc1 $f28, 0x18($sp) /* 1B830 80040430 0C0376B9 */ jal func_800DDAE4 /* 1B834 80040434 E7B4001C */ swc1 $f20, 0x1c($sp) -/* 1B838 80040438 14400056 */ bnez $v0, .L80040594 +/* 1B838 80040438 14400056 */ bnez $v0, L80040594_1B994 /* 1B83C 8004043C 00000000 */ nop .L80040440: /* 1B840 80040440 3C014214 */ lui $at, 0x4214 @@ -888,7 +888,7 @@ glabel L80040320_1B720 /* 1B8EC 800404EC 45030001 */ bc1tl .L800404F4 /* 1B8F0 800404F0 0000802D */ daddu $s0, $zero, $zero .L800404F4: -/* 1B8F4 800404F4 12000027 */ beqz $s0, .L80040594 +/* 1B8F4 800404F4 12000027 */ beqz $s0, L80040594_1B994 /* 1B8F8 800404F8 00000000 */ nop /* 1B8FC 800404FC 3C028011 */ lui $v0, %hi(gPlayerData) /* 1B900 80040500 8042F290 */ lb $v0, %lo(gPlayerData)($v0) @@ -900,7 +900,7 @@ glabel L80040320_1B720 /* 1B918 80040518 00021600 */ sll $v0, $v0, 0x18 /* 1B91C 8004051C 00021E03 */ sra $v1, $v0, 0x18 /* 1B920 80040520 2C62000E */ sltiu $v0, $v1, 0xe -/* 1B924 80040524 1040000D */ beqz $v0, .L8004055C +/* 1B924 80040524 1040000D */ beqz $v0, L8004055C_1B95C /* 1B928 80040528 00031080 */ sll $v0, $v1, 2 /* 1B92C 8004052C 3C01800A */ lui $at, %hi(jtbl_80098638) /* 1B930 80040530 00220821 */ addu $at, $at, $v0 @@ -908,16 +908,15 @@ glabel L80040320_1B720 /* 1B938 80040538 00400008 */ jr $v0 /* 1B93C 8004053C 00000000 */ nop glabel L80040540_1B940 -/* 1B940 80040540 08010157 */ j .L8004055C +/* 1B940 80040540 08010157 */ j L8004055C_1B95C /* 1B944 80040544 A2600006 */ sb $zero, 6($s3) glabel L80040548_1B948 /* 1B948 80040548 24080001 */ addiu $t0, $zero, 1 -/* 1B94C 8004054C 08010157 */ j .L8004055C +/* 1B94C 8004054C 08010157 */ j L8004055C_1B95C /* 1B950 80040550 A2680006 */ sb $t0, 6($s3) glabel L80040554_1B954 /* 1B954 80040554 24020002 */ addiu $v0, $zero, 2 /* 1B958 80040558 A2620006 */ sb $v0, 6($s3) -.L8004055C: glabel L8004055C_1B95C /* 1B95C 8004055C 240400E1 */ addiu $a0, $zero, 0xe1 /* 1B960 80040560 8E860028 */ lw $a2, 0x28($s4) @@ -934,7 +933,6 @@ glabel L8004055C_1B95C /* 1B988 80040588 AE71008C */ sw $s1, 0x8c($s3) /* 1B98C 8004058C 0801023D */ j .L800408F4 /* 1B990 80040590 A2680004 */ sb $t0, 4($s3) -.L80040594: glabel L80040594_1B994 /* 1B994 80040594 8E220000 */ lw $v0, ($s1) /* 1B998 80040598 3C030100 */ lui $v1, 0x100 @@ -1166,7 +1164,7 @@ glabel L80040594_1B994 /* 1BCF4 800408F4 82630005 */ lb $v1, 5($s3) .L800408F8: /* 1BCF8 800408F8 2C620007 */ sltiu $v0, $v1, 7 -/* 1BCFC 800408FC 10400285 */ beqz $v0, .L80041314 +/* 1BCFC 800408FC 10400285 */ beqz $v0, L80041314_1C714 /* 1BD00 80040900 00031080 */ sll $v0, $v1, 2 /* 1BD04 80040904 3C01800A */ lui $at, %hi(jtbl_80098678) /* 1BD08 80040908 00220821 */ addu $at, $at, $v0 @@ -1372,7 +1370,7 @@ glabel L80040ABC_1BEBC /* 1BFE0 80040BE0 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1BFE4 80040BE4 AC20A5D0 */ sw $zero, %lo(D_8009A5D0)($at) /* 1BFE8 80040BE8 00431025 */ or $v0, $v0, $v1 -/* 1BFEC 80040BEC 080104C5 */ j .L80041314 +/* 1BFEC 80040BEC 080104C5 */ j L80041314_1C714 /* 1BFF0 80040BF0 AE820000 */ sw $v0, ($s4) glabel L80040BF4_1BFF4 /* 1BFF4 80040BF4 8E71008C */ lw $s1, 0x8c($s3) @@ -1866,7 +1864,6 @@ glabel L8004115C_1C55C /* 1C708 80041308 AC22A678 */ sw $v0, %lo(D_8009A678)($at) /* 1C70C 8004130C 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1C710 80041310 AC20A5D0 */ sw $zero, %lo(D_8009A5D0)($at) -.L80041314: glabel L80041314_1C714 /* 1C714 80041314 8FBF008C */ lw $ra, 0x8c($sp) /* 1C718 80041318 8FBE0088 */ lw $fp, 0x88($sp) diff --git a/ver/us/asm/nonmatchings/code_328110/func_E000C160.s b/ver/us/asm/nonmatchings/code_328110/func_E000C160.s index a04691d38d..929bf820a3 100644 --- a/ver/us/asm/nonmatchings/code_328110/func_E000C160.s +++ b/ver/us/asm/nonmatchings/code_328110/func_E000C160.s @@ -101,7 +101,7 @@ glabel LE000C29C_3283AC /* 3283C0 E000C2B0 E6360008 */ swc1 $f22, 8($s1) /* 3283C4 E000C2B4 E638000C */ swc1 $f24, 0xc($s1) /* 3283C8 E000C2B8 2E420005 */ sltiu $v0, $s2, 5 -/* 3283CC E000C2BC 104000D5 */ beqz $v0, .LE000C614 +/* 3283CC E000C2BC 104000D5 */ beqz $v0, LE000C614_328724 /* 3283D0 E000C2C0 26310044 */ addiu $s1, $s1, 0x44 /* 3283D4 E000C2C4 00121080 */ sll $v0, $s2, 2 /* 3283D8 E000C2C8 3C01E001 */ lui $at, %hi(jtbl_E000CD58) @@ -112,7 +112,7 @@ glabel LE000C29C_3283AC glabel LE000C2DC_3283EC /* 3283EC E000C2DC 24120001 */ addiu $s2, $zero, 1 /* 3283F0 E000C2E0 0253102A */ slt $v0, $s2, $s3 -/* 3283F4 E000C2E4 104000CB */ beqz $v0, .LE000C614 +/* 3283F4 E000C2E4 104000CB */ beqz $v0, LE000C614_328724 /* 3283F8 E000C2E8 26300034 */ addiu $s0, $s1, 0x34 /* 3283FC E000C2EC 2411005A */ addiu $s1, $zero, 0x5a /* 328400 E000C2F0 3C01C040 */ lui $at, 0xc040 @@ -155,12 +155,12 @@ glabel LE000C2DC_3283EC /* 328490 E000C380 0253102A */ slt $v0, $s2, $s3 /* 328494 E000C384 1440FFE6 */ bnez $v0, .LE000C320 /* 328498 E000C388 26100044 */ addiu $s0, $s0, 0x44 -/* 32849C E000C38C 08003185 */ j .LE000C614 +/* 32849C E000C38C 08003185 */ j LE000C614_328724 /* 3284A0 E000C390 00000000 */ nop glabel LE000C394_3284A4 /* 3284A4 E000C394 24120001 */ addiu $s2, $zero, 1 /* 3284A8 E000C398 0253102A */ slt $v0, $s2, $s3 -/* 3284AC E000C39C 1040009D */ beqz $v0, .LE000C614 +/* 3284AC E000C39C 1040009D */ beqz $v0, LE000C614_328724 /* 3284B0 E000C3A0 26300034 */ addiu $s0, $s1, 0x34 /* 3284B4 E000C3A4 3C0141C8 */ lui $at, 0x41c8 /* 3284B8 E000C3A8 4481B000 */ mtc1 $at, $f22 @@ -259,12 +259,12 @@ glabel LE000C394_3284A4 /* 328610 E000C500 0253102A */ slt $v0, $s2, $s3 /* 328614 E000C504 1440FFAF */ bnez $v0, .LE000C3C4 /* 328618 E000C508 26100044 */ addiu $s0, $s0, 0x44 -/* 32861C E000C50C 08003185 */ j .LE000C614 +/* 32861C E000C50C 08003185 */ j LE000C614_328724 /* 328620 E000C510 00000000 */ nop glabel LE000C514_328624 /* 328624 E000C514 24120001 */ addiu $s2, $zero, 1 /* 328628 E000C518 0253102A */ slt $v0, $s2, $s3 -/* 32862C E000C51C 1040003D */ beqz $v0, .LE000C614 +/* 32862C E000C51C 1040003D */ beqz $v0, LE000C614_328724 /* 328630 E000C520 2674FFFF */ addiu $s4, $s3, -1 /* 328634 E000C524 26300034 */ addiu $s0, $s1, 0x34 /* 328638 E000C528 0000882D */ daddu $s1, $zero, $zero @@ -329,7 +329,6 @@ glabel LE000C514_328624 /* 328718 E000C608 0253102A */ slt $v0, $s2, $s3 /* 32871C E000C60C 1440FFD4 */ bnez $v0, .LE000C560 /* 328720 E000C610 26100044 */ addiu $s0, $s0, 0x44 -.LE000C614: glabel LE000C614_328724 /* 328724 E000C614 8FBF003C */ lw $ra, 0x3c($sp) /* 328728 E000C618 8FB40038 */ lw $s4, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/code_354F60/func_E004491C.s b/ver/us/asm/nonmatchings/code_354F60/func_E004491C.s index 6e657aac21..0dd63fda40 100644 --- a/ver/us/asm/nonmatchings/code_354F60/func_E004491C.s +++ b/ver/us/asm/nonmatchings/code_354F60/func_E004491C.s @@ -81,7 +81,7 @@ glabel func_E004491C /* 3559AC E0044A4C 0C080114 */ jal func_E0200450 /* 3559B0 E0044A50 27A60098 */ addiu $a2, $sp, 0x98 /* 3559B4 E0044A54 2E42001F */ sltiu $v0, $s2, 0x1f -/* 3559B8 E0044A58 1040002E */ beqz $v0, .LE0044B14 +/* 3559B8 E0044A58 1040002E */ beqz $v0, LE0044B14_355A74 /* 3559BC E0044A5C 00121080 */ sll $v0, $s2, 2 /* 3559C0 E0044A60 3C01E004 */ lui $at, %hi(jtbl_E0044F00) /* 3559C4 E0044A64 00220821 */ addu $at, $at, $v0 @@ -131,7 +131,6 @@ glabel LE0044AF4_355A54 /* 355A68 E0044B08 4481A000 */ mtc1 $at, $f20 /* 355A6C E0044B0C 080112CC */ j .LE0044B30 /* 355A70 E0044B10 4600B606 */ mov.s $f24, $f22 -.LE0044B14: glabel LE0044B14_355A74 /* 355A74 E0044B14 3C013F33 */ lui $at, 0x3f33 /* 355A78 E0044B18 34213333 */ ori $at, $at, 0x3333 diff --git a/ver/us/asm/nonmatchings/code_3584C0/func_E004A000.s b/ver/us/asm/nonmatchings/code_3584C0/func_E004A000.s index d7b15bcdab..86b3256713 100644 --- a/ver/us/asm/nonmatchings/code_3584C0/func_E004A000.s +++ b/ver/us/asm/nonmatchings/code_3584C0/func_E004A000.s @@ -115,7 +115,7 @@ glabel func_E004A000 /* 358640 E004A180 A6320000 */ sh $s2, ($s1) /* 358644 E004A184 E6340004 */ swc1 $f20, 4($s1) /* 358648 E004A188 E6360008 */ swc1 $f22, 8($s1) -/* 35864C E004A18C 10400033 */ beqz $v0, .LE004A25C +/* 35864C E004A18C 10400033 */ beqz $v0, LE004A25C_35871C /* 358650 E004A190 E638000C */ swc1 $f24, 0xc($s1) /* 358654 E004A194 00121080 */ sll $v0, $s2, 2 /* 358658 E004A198 3C01E005 */ lui $at, %hi(jtbl_E004AE80) @@ -171,7 +171,6 @@ glabel LE004A22C_3586EC /* 358710 E004A250 A2220054 */ sb $v0, 0x54($s1) /* 358714 E004A254 080128A4 */ j .LE004A290 /* 358718 E004A258 240200AB */ addiu $v0, $zero, 0xab -.LE004A25C: glabel LE004A25C_35871C /* 35871C E004A25C 24020032 */ addiu $v0, $zero, 0x32 /* 358720 E004A260 AE220028 */ sw $v0, 0x28($s1) diff --git a/ver/us/asm/nonmatchings/code_366030/func_E0066000.s b/ver/us/asm/nonmatchings/code_366030/func_E0066000.s index cbbeb780ad..293f7df37c 100644 --- a/ver/us/asm/nonmatchings/code_366030/func_E0066000.s +++ b/ver/us/asm/nonmatchings/code_366030/func_E0066000.s @@ -83,7 +83,7 @@ glabel func_E0066000 /* 366160 E0066130 E4800058 */ swc1 $f0, 0x58($a0) /* 366164 E0066134 E4800050 */ swc1 $f0, 0x50($a0) /* 366168 E0066138 E4800054 */ swc1 $f0, 0x54($a0) -/* 36616C E006613C 104000BB */ beqz $v0, .LE006642C +/* 36616C E006613C 104000BB */ beqz $v0, LE006642C_36645C /* 366170 E0066140 E4800064 */ swc1 $f0, 0x64($a0) /* 366174 E0066144 00111080 */ sll $v0, $s1, 2 /* 366178 E0066148 3C01E006 */ lui $at, %hi(jtbl_E0066CE0) @@ -287,7 +287,6 @@ glabel LE00663F8_366428 /* 366450 E0066420 E484003C */ swc1 $f4, 0x3c($a0) /* 366454 E0066424 0801991A */ j .LE0066468 /* 366458 E0066428 E486004C */ swc1 $f6, 0x4c($a0) -.LE006642C: glabel LE006642C_36645C /* 36645C E006642C 3C014080 */ lui $at, 0x4080 /* 366460 E0066430 44810000 */ mtc1 $at, $f0 diff --git a/ver/us/asm/nonmatchings/code_38ADF0/func_E008817C.s b/ver/us/asm/nonmatchings/code_38ADF0/func_E008817C.s index 8149d46406..c5419103f4 100644 --- a/ver/us/asm/nonmatchings/code_38ADF0/func_E008817C.s +++ b/ver/us/asm/nonmatchings/code_38ADF0/func_E008817C.s @@ -24,7 +24,7 @@ glabel func_E008817C /* 38AFB8 E00881C8 F7BE0080 */ sdc1 $f30, 0x80($sp) /* 38AFBC E00881CC F7BC0078 */ sdc1 $f28, 0x78($sp) /* 38AFC0 E00881D0 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 38AFC4 E00881D4 1040000D */ beqz $v0, .LE008820C +/* 38AFC4 E00881D4 1040000D */ beqz $v0, LE008820C_38AFFC /* 38AFC8 E00881D8 27A40010 */ addiu $a0, $sp, 0x10 /* 38AFCC E00881DC 00151080 */ sll $v0, $s5, 2 /* 38AFD0 E00881E0 3C01E009 */ lui $at, %hi(jtbl_E0088D30) @@ -41,12 +41,11 @@ glabel LE00881FC_38AFEC glabel LE0088204_38AFF4 /* 38AFF4 E0088204 08022084 */ j .LE0088210 /* 38AFF8 E0088208 24130018 */ addiu $s3, $zero, 0x18 -.LE008820C: glabel LE008820C_38AFFC /* 38AFFC E008820C 24130030 */ addiu $s3, $zero, 0x30 .LE0088210: /* 38B000 E0088210 2EA20007 */ sltiu $v0, $s5, 7 -/* 38B004 E0088214 1040000E */ beqz $v0, .LE0088250 +/* 38B004 E0088214 1040000E */ beqz $v0, LE0088250_38B040 /* 38B008 E0088218 00151080 */ sll $v0, $s5, 2 /* 38B00C E008821C 3C01E009 */ lui $at, %hi(jtbl_E0088D50) /* 38B010 E0088220 00220821 */ addu $at, $at, $v0 @@ -63,7 +62,6 @@ glabel LE0088240_38B030 /* 38B034 E0088244 44818000 */ mtc1 $at, $f16 /* 38B038 E0088248 08022098 */ j .LE0088260 /* 38B03C E008824C E7B00028 */ swc1 $f16, 0x28($sp) -.LE0088250: glabel LE0088250_38B040 /* 38B040 E0088250 3C0140A0 */ lui $at, 0x40a0 /* 38B044 E0088254 44818000 */ mtc1 $at, $f16 diff --git a/ver/us/asm/nonmatchings/code_3D1690/func_E00CC258.s b/ver/us/asm/nonmatchings/code_3D1690/func_E00CC258.s index 36eb990eb3..1e89937836 100644 --- a/ver/us/asm/nonmatchings/code_3D1690/func_E00CC258.s +++ b/ver/us/asm/nonmatchings/code_3D1690/func_E00CC258.s @@ -94,7 +94,7 @@ glabel func_E00CC258 /* 3D1A3C E00CC3AC 46001081 */ sub.s $f2, $f2, $f0 /* 3D1A40 E00CC3B0 2C620015 */ sltiu $v0, $v1, 0x15 /* 3D1A44 E00CC3B4 E6200414 */ swc1 $f0, 0x414($s1) -/* 3D1A48 E00CC3B8 10400159 */ beqz $v0, .LE00CC920 +/* 3D1A48 E00CC3B8 10400159 */ beqz $v0, LE00CC920_3D1FB0 /* 3D1A4C E00CC3BC E62203B0 */ swc1 $f2, 0x3b0($s1) /* 3D1A50 E00CC3C0 00031080 */ sll $v0, $v1, 2 /* 3D1A54 E00CC3C4 3C01E00D */ lui $at, %hi(jtbl_E00CCE78) @@ -112,7 +112,7 @@ glabel LE00CC3D8_3D1A68 /* 3D1A80 E00CC3F0 10400004 */ beqz $v0, .LE00CC404 /* 3D1A84 E00CC3F4 E62004DC */ swc1 $f0, 0x4dc($s1) /* 3D1A88 E00CC3F8 2442FFFF */ addiu $v0, $v0, -1 -/* 3D1A8C E00CC3FC 08033248 */ j .LE00CC920 +/* 3D1A8C E00CC3FC 08033248 */ j LE00CC920_3D1FB0 /* 3D1A90 E00CC400 AE22066C */ sw $v0, 0x66c($s1) .LE00CC404: /* 3D1A94 E00CC404 8E230734 */ lw $v1, 0x734($s1) @@ -130,7 +130,7 @@ glabel LE00CC3D8_3D1A68 /* 3D1AC4 E00CC434 AE220734 */ sw $v0, 0x734($s1) /* 3D1AC8 E00CC438 46200020 */ cvt.s.d $f0, $f0 /* 3D1ACC E00CC43C E6200414 */ swc1 $f0, 0x414($s1) -/* 3D1AD0 E00CC440 08033248 */ j .LE00CC920 +/* 3D1AD0 E00CC440 08033248 */ j LE00CC920_3D1FB0 /* 3D1AD4 E00CC444 E62003B0 */ swc1 $f0, 0x3b0($s1) glabel LE00CC448_3D1AD8 /* 3D1AD8 E00CC448 8E220734 */ lw $v0, 0x734($s1) @@ -150,7 +150,7 @@ glabel LE00CC448_3D1AD8 /* 3D1B10 E00CC480 E62204DC */ swc1 $f2, 0x4dc($s1) /* 3D1B14 E00CC484 46200020 */ cvt.s.d $f0, $f0 /* 3D1B18 E00CC488 E6200414 */ swc1 $f0, 0x414($s1) -/* 3D1B1C E00CC48C 14400124 */ bnez $v0, .LE00CC920 +/* 3D1B1C E00CC48C 14400124 */ bnez $v0, LE00CC920_3D1FB0 /* 3D1B20 E00CC490 E62003B0 */ swc1 $f0, 0x3b0($s1) /* 3D1B24 E00CC494 17C00050 */ bnez $fp, .LE00CC5D8 /* 3D1B28 E00CC498 24020014 */ addiu $v0, $zero, 0x14 @@ -232,12 +232,12 @@ glabel LE00CC53C_3D1BCC /* 3D1C50 E00CC5C0 46005000 */ add.s $f0, $f10, $f0 /* 3D1C54 E00CC5C4 E624002C */ swc1 $f4, 0x2c($s1) /* 3D1C58 E00CC5C8 E6220090 */ swc1 $f2, 0x90($s1) -/* 3D1C5C E00CC5CC 144000D4 */ bnez $v0, .LE00CC920 +/* 3D1C5C E00CC5CC 144000D4 */ bnez $v0, LE00CC920_3D1FB0 /* 3D1C60 E00CC5D0 E62000F4 */ swc1 $f0, 0xf4($s1) /* 3D1C64 E00CC5D4 24020003 */ addiu $v0, $zero, 3 .LE00CC5D8: /* 3D1C68 E00CC5D8 AE2206D0 */ sw $v0, 0x6d0($s1) -/* 3D1C6C E00CC5DC 08033248 */ j .LE00CC920 +/* 3D1C6C E00CC5DC 08033248 */ j LE00CC920_3D1FB0 /* 3D1C70 E00CC5E0 AE200734 */ sw $zero, 0x734($s1) glabel LE00CC5E4_3D1C74 /* 3D1C74 E00CC5E4 24020018 */ addiu $v0, $zero, 0x18 @@ -348,7 +348,7 @@ glabel LE00CC614_3D1CA4 /* 3D1E0C E00CC77C 46200020 */ cvt.s.d $f0, $f0 /* 3D1E10 E00CC780 E6240540 */ swc1 $f4, 0x540($s1) /* 3D1E14 E00CC784 E62205A4 */ swc1 $f2, 0x5a4($s1) -/* 3D1E18 E00CC788 08033248 */ j .LE00CC920 +/* 3D1E18 E00CC788 08033248 */ j LE00CC920_3D1FB0 /* 3D1E1C E00CC78C E6200608 */ swc1 $f0, 0x608($s1) glabel LE00CC790_3D1E20 /* 3D1E20 E00CC790 C6260540 */ lwc1 $f6, 0x540($s1) @@ -406,7 +406,7 @@ glabel LE00CC790_3D1E20 /* 3D1EEC E00CC85C 46220002 */ mul.d $f0, $f0, $f2 /* 3D1EF0 E00CC860 00000000 */ nop /* 3D1EF4 E00CC864 46200020 */ cvt.s.d $f0, $f0 -/* 3D1EF8 E00CC868 08033248 */ j .LE00CC920 +/* 3D1EF8 E00CC868 08033248 */ j LE00CC920_3D1FB0 /* 3D1EFC E00CC86C E6200478 */ swc1 $f0, 0x478($s1) glabel LE00CC870_3D1F00 /* 3D1F00 E00CC870 0C080150 */ jal func_E0200540 @@ -453,7 +453,6 @@ glabel LE00CC870_3D1F00 /* 3D1FA4 E00CC914 AC400030 */ sw $zero, 0x30($v0) /* 3D1FA8 E00CC918 24020007 */ addiu $v0, $zero, 7 /* 3D1FAC E00CC91C AE2206D0 */ sw $v0, 0x6d0($s1) -.LE00CC920: glabel LE00CC920_3D1FB0 /* 3D1FB0 E00CC920 26310004 */ addiu $s1, $s1, 4 .LE00CC924: diff --git a/ver/us/asm/nonmatchings/code_3FEAE0/func_E01140DC.s b/ver/us/asm/nonmatchings/code_3FEAE0/func_E01140DC.s index 9490bcfe9a..20fabb65e0 100644 --- a/ver/us/asm/nonmatchings/code_3FEAE0/func_E01140DC.s +++ b/ver/us/asm/nonmatchings/code_3FEAE0/func_E01140DC.s @@ -22,7 +22,7 @@ glabel func_E01140DC /* 3FEBFC E011411C 922300FA */ lbu $v1, 0xfa($s1) /* 3FEC00 E0114120 8230013C */ lb $s0, 0x13c($s1) /* 3FEC04 E0114124 2C620006 */ sltiu $v0, $v1, 6 -/* 3FEC08 E0114128 10400050 */ beqz $v0, .LE011426C +/* 3FEC08 E0114128 10400050 */ beqz $v0, LE011426C_3FED4C /* 3FEC0C E011412C 0000982D */ daddu $s3, $zero, $zero /* 3FEC10 E0114130 00031080 */ sll $v0, $v1, 2 /* 3FEC14 E0114134 3C01E011 */ lui $at, %hi(jtbl_E0114750) @@ -111,7 +111,6 @@ glabel LE0114210_3FECF0 /* 3FED40 E0114260 00000000 */ nop /* 3FED44 E0114264 080450B0 */ j .LE01142C0 /* 3FED48 E0114268 2A020009 */ slti $v0, $s0, 9 -.LE011426C: glabel LE011426C_3FED4C /* 3FED4C E011426C 06010002 */ bgez $s0, .LE0114278 /* 3FED50 E0114270 0200102D */ daddu $v0, $s0, $zero diff --git a/ver/us/asm/nonmatchings/code_402640/func_E011618C.s b/ver/us/asm/nonmatchings/code_402640/func_E011618C.s index d78969f129..99b69508e0 100644 --- a/ver/us/asm/nonmatchings/code_402640/func_E011618C.s +++ b/ver/us/asm/nonmatchings/code_402640/func_E011618C.s @@ -119,7 +119,7 @@ glabel func_E011618C /* 402984 E0116344 46163580 */ add.s $f22, $f6, $f22 /* 402988 E0116348 2443FFFF */ addiu $v1, $v0, -1 /* 40298C E011634C 2C620005 */ sltiu $v0, $v1, 5 -/* 402990 E0116350 104000B8 */ beqz $v0, .LE0116634 +/* 402990 E0116350 104000B8 */ beqz $v0, LE0116634_402C74 /* 402994 E0116354 E616FFF8 */ swc1 $f22, -8($s0) /* 402998 E0116358 00031080 */ sll $v0, $v1, 2 /* 40299C E011635C 3C01E011 */ lui $at, %hi(jtbl_E0116D98) @@ -281,7 +281,7 @@ glabel LE0116380_4029C0 /* 402BC4 E0116584 46220002 */ mul.d $f0, $f0, $f2 /* 402BC8 E0116588 00000000 */ nop /* 402BCC E011658C 46200020 */ cvt.s.d $f0, $f0 -/* 402BD0 E0116590 0804598D */ j .LE0116634 +/* 402BD0 E0116590 0804598D */ j LE0116634_402C74 /* 402BD4 E0116594 E6000004 */ swc1 $f0, 4($s0) glabel LE0116598_402BD8 /* 402BD8 E0116598 92020015 */ lbu $v0, 0x15($s0) @@ -325,7 +325,6 @@ glabel LE01165A8_402BE8 /* 402C68 E0116628 AE000018 */ sw $zero, 0x18($s0) /* 402C6C E011662C 24420001 */ addiu $v0, $v0, 1 /* 402C70 E0116630 A2020015 */ sb $v0, 0x15($s0) -.LE0116634: glabel LE0116634_402C74 /* 402C74 E0116634 26520003 */ addiu $s2, $s2, 3 .LE0116638: diff --git a/ver/us/asm/nonmatchings/code_404220/func_E011A104.s b/ver/us/asm/nonmatchings/code_404220/func_E011A104.s index b66b79523c..6dbd49bbfb 100644 --- a/ver/us/asm/nonmatchings/code_404220/func_E011A104.s +++ b/ver/us/asm/nonmatchings/code_404220/func_E011A104.s @@ -69,7 +69,7 @@ glabel func_E011A104 .LE011A1F0: /* 404410 E011A1F0 86030006 */ lh $v1, 6($s0) /* 404414 E011A1F4 2C620029 */ sltiu $v0, $v1, 0x29 -/* 404418 E011A1F8 10400059 */ beqz $v0, .LE011A360 +/* 404418 E011A1F8 10400059 */ beqz $v0, LE011A360_404580 /* 40441C E011A1FC 00031080 */ sll $v0, $v1, 2 /* 404420 E011A200 3C01E012 */ lui $at, %hi(jtbl_E011AC70) /* 404424 E011A204 00220821 */ addu $at, $at, $v0 @@ -86,26 +86,26 @@ glabel LE011A214_404434 /* 40444C E011A22C 0083102A */ slt $v0, $a0, $v1 /* 404450 E011A230 10400003 */ beqz $v0, .LE011A240 /* 404454 E011A234 0064102A */ slt $v0, $v1, $a0 -/* 404458 E011A238 080468D8 */ j .LE011A360 +/* 404458 E011A238 080468D8 */ j LE011A360_404580 /* 40445C E011A23C A6140006 */ sh $s4, 6($s0) .LE011A240: /* 404460 E011A240 10400003 */ beqz $v0, .LE011A250 /* 404464 E011A244 24020002 */ addiu $v0, $zero, 2 -/* 404468 E011A248 080468D8 */ j .LE011A360 +/* 404468 E011A248 080468D8 */ j LE011A360_404580 /* 40446C E011A24C A6020006 */ sh $v0, 6($s0) .LE011A250: /* 404470 E011A250 54600044 */ bnel $v1, $zero, .LE011A364 /* 404474 E011A254 26730001 */ addiu $s3, $s3, 1 /* 404478 E011A258 24020003 */ addiu $v0, $zero, 3 -/* 40447C E011A25C 080468D8 */ j .LE011A360 +/* 40447C E011A25C 080468D8 */ j LE011A360_404580 /* 404480 E011A260 A6020006 */ sh $v0, 6($s0) .LE011A264: /* 404484 E011A264 5460003F */ bnel $v1, $zero, .LE011A364 /* 404488 E011A268 26730001 */ addiu $s3, $s3, 1 /* 40448C E011A26C 86020004 */ lh $v0, 4($s0) -/* 404490 E011A270 1840003B */ blez $v0, .LE011A360 +/* 404490 E011A270 1840003B */ blez $v0, LE011A360_404580 /* 404494 E011A274 24020004 */ addiu $v0, $zero, 4 -/* 404498 E011A278 080468D8 */ j .LE011A360 +/* 404498 E011A278 080468D8 */ j LE011A360_404580 /* 40449C E011A27C A6020006 */ sh $v0, 6($s0) glabel LE011A280_4044A0 /* 4044A0 E011A280 2402000A */ addiu $v0, $zero, 0xa @@ -124,7 +124,7 @@ glabel LE011A28C_4044AC /* 4044D0 E011A2B0 A6000008 */ sh $zero, 8($s0) /* 4044D4 E011A2B4 A6000006 */ sh $zero, 6($s0) /* 4044D8 E011A2B8 2442FFFF */ addiu $v0, $v0, -1 -/* 4044DC E011A2BC 080468D8 */ j .LE011A360 +/* 4044DC E011A2BC 080468D8 */ j LE011A360_404580 /* 4044E0 E011A2C0 A6020002 */ sh $v0, 2($s0) glabel LE011A2C4_4044E4 /* 4044E4 E011A2C4 24020014 */ addiu $v0, $zero, 0x14 @@ -142,7 +142,7 @@ glabel LE011A2D0_4044F0 /* 404510 E011A2F0 96020004 */ lhu $v0, 4($s0) /* 404514 E011A2F4 A6000008 */ sh $zero, 8($s0) /* 404518 E011A2F8 A6000006 */ sh $zero, 6($s0) -/* 40451C E011A2FC 080468D8 */ j .LE011A360 +/* 40451C E011A2FC 080468D8 */ j LE011A360_404580 /* 404520 E011A300 A6020002 */ sh $v0, 2($s0) glabel LE011A304_404524 /* 404524 E011A304 96020000 */ lhu $v0, ($s0) @@ -171,7 +171,6 @@ glabel LE011A334_404554 /* 404578 E011A358 A6020000 */ sh $v0, ($s0) .LE011A35C: /* 40457C E011A35C A6000006 */ sh $zero, 6($s0) -.LE011A360: glabel LE011A360_404580 /* 404580 E011A360 26730001 */ addiu $s3, $s3, 1 .LE011A364: diff --git a/ver/us/asm/nonmatchings/code_40E10/osSpTaskLoad.s b/ver/us/asm/nonmatchings/code_40E10/osSpTaskLoad.s deleted file mode 100644 index ef02ce804e..0000000000 --- a/ver/us/asm/nonmatchings/code_40E10/osSpTaskLoad.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osSpTaskLoad -/* 40E10 80065A10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 40E14 80065A14 AFB00010 */ sw $s0, 0x10($sp) -/* 40E18 80065A18 00808021 */ addu $s0, $a0, $zero -/* 40E1C 80065A1C AFB10014 */ sw $s1, 0x14($sp) -/* 40E20 80065A20 3C11800B */ lui $s1, %hi(D_800AF8C0) -/* 40E24 80065A24 2631F8C0 */ addiu $s1, $s1, %lo(D_800AF8C0) -/* 40E28 80065A28 02202821 */ addu $a1, $s1, $zero -/* 40E2C 80065A2C AFBF0018 */ sw $ra, 0x18($sp) -/* 40E30 80065A30 0C019194 */ jal bcopy -/* 40E34 80065A34 24060040 */ addiu $a2, $zero, 0x40 -/* 40E38 80065A38 3C04800B */ lui $a0, %hi(D_800AF8D0) -/* 40E3C 80065A3C 8C84F8D0 */ lw $a0, %lo(D_800AF8D0)($a0) -/* 40E40 80065A40 10800005 */ beqz $a0, .L80065A58 -/* 40E44 80065A44 00000000 */ nop -/* 40E48 80065A48 0C0187A4 */ jal osVirtualToPhysical -/* 40E4C 80065A4C 00000000 */ nop -/* 40E50 80065A50 3C01800B */ lui $at, %hi(D_800AF8D0) -/* 40E54 80065A54 AC22F8D0 */ sw $v0, %lo(D_800AF8D0)($at) -.L80065A58: -/* 40E58 80065A58 3C04800B */ lui $a0, %hi(D_800AF8D8) -/* 40E5C 80065A5C 8C84F8D8 */ lw $a0, %lo(D_800AF8D8)($a0) -/* 40E60 80065A60 10800005 */ beqz $a0, .L80065A78 -/* 40E64 80065A64 00000000 */ nop -/* 40E68 80065A68 0C0187A4 */ jal osVirtualToPhysical -/* 40E6C 80065A6C 00000000 */ nop -/* 40E70 80065A70 3C01800B */ lui $at, %hi(D_800AF8D8) -/* 40E74 80065A74 AC22F8D8 */ sw $v0, %lo(D_800AF8D8)($at) -.L80065A78: -/* 40E78 80065A78 3C04800B */ lui $a0, %hi(D_800AF8E0) -/* 40E7C 80065A7C 8C84F8E0 */ lw $a0, %lo(D_800AF8E0)($a0) -/* 40E80 80065A80 10800005 */ beqz $a0, .L80065A98 -/* 40E84 80065A84 00000000 */ nop -/* 40E88 80065A88 0C0187A4 */ jal osVirtualToPhysical -/* 40E8C 80065A8C 00000000 */ nop -/* 40E90 80065A90 3C01800B */ lui $at, %hi(D_800AF8E0) -/* 40E94 80065A94 AC22F8E0 */ sw $v0, %lo(D_800AF8E0)($at) -.L80065A98: -/* 40E98 80065A98 3C04800B */ lui $a0, %hi(D_800AF8E8) -/* 40E9C 80065A9C 8C84F8E8 */ lw $a0, %lo(D_800AF8E8)($a0) -/* 40EA0 80065AA0 10800005 */ beqz $a0, .L80065AB8 -/* 40EA4 80065AA4 00000000 */ nop -/* 40EA8 80065AA8 0C0187A4 */ jal osVirtualToPhysical -/* 40EAC 80065AAC 00000000 */ nop -/* 40EB0 80065AB0 3C01800B */ lui $at, %hi(D_800AF8E8) -/* 40EB4 80065AB4 AC22F8E8 */ sw $v0, %lo(D_800AF8E8)($at) -.L80065AB8: -/* 40EB8 80065AB8 3C04800B */ lui $a0, %hi(D_800AF8EC) -/* 40EBC 80065ABC 8C84F8EC */ lw $a0, %lo(D_800AF8EC)($a0) -/* 40EC0 80065AC0 10800005 */ beqz $a0, .L80065AD8 -/* 40EC4 80065AC4 00000000 */ nop -/* 40EC8 80065AC8 0C0187A4 */ jal osVirtualToPhysical -/* 40ECC 80065ACC 00000000 */ nop -/* 40ED0 80065AD0 3C01800B */ lui $at, %hi(D_800AF8EC) -/* 40ED4 80065AD4 AC22F8EC */ sw $v0, %lo(D_800AF8EC)($at) -.L80065AD8: -/* 40ED8 80065AD8 3C04800B */ lui $a0, %hi(D_800AF8F0) -/* 40EDC 80065ADC 8C84F8F0 */ lw $a0, %lo(D_800AF8F0)($a0) -/* 40EE0 80065AE0 10800005 */ beqz $a0, .L80065AF8 -/* 40EE4 80065AE4 00000000 */ nop -/* 40EE8 80065AE8 0C0187A4 */ jal osVirtualToPhysical -/* 40EEC 80065AEC 00000000 */ nop -/* 40EF0 80065AF0 3C01800B */ lui $at, %hi(D_800AF8F0) -/* 40EF4 80065AF4 AC22F8F0 */ sw $v0, %lo(D_800AF8F0)($at) -.L80065AF8: -/* 40EF8 80065AF8 3C04800B */ lui $a0, %hi(D_800AF8F8) -/* 40EFC 80065AFC 8C84F8F8 */ lw $a0, %lo(D_800AF8F8)($a0) -/* 40F00 80065B00 10800005 */ beqz $a0, .L80065B18 -/* 40F04 80065B04 00000000 */ nop -/* 40F08 80065B08 0C0187A4 */ jal osVirtualToPhysical -/* 40F0C 80065B0C 00000000 */ nop -/* 40F10 80065B10 3C01800B */ lui $at, %hi(D_800AF8F8) -/* 40F14 80065B14 AC22F8F8 */ sw $v0, %lo(D_800AF8F8)($at) -.L80065B18: -/* 40F18 80065B18 3C02800B */ lui $v0, %hi(D_800AF8C4) -/* 40F1C 80065B1C 8C42F8C4 */ lw $v0, %lo(D_800AF8C4)($v0) -/* 40F20 80065B20 30420001 */ andi $v0, $v0, 1 -/* 40F24 80065B24 10400019 */ beqz $v0, .L80065B8C -/* 40F28 80065B28 02202021 */ addu $a0, $s1, $zero -/* 40F2C 80065B2C 3C02800B */ lui $v0, %hi(D_800AF8F8) -/* 40F30 80065B30 8C42F8F8 */ lw $v0, %lo(D_800AF8F8)($v0) -/* 40F34 80065B34 3C03800B */ lui $v1, %hi(D_800AF8FC) -/* 40F38 80065B38 8C63F8FC */ lw $v1, %lo(D_800AF8FC)($v1) -/* 40F3C 80065B3C 3C01800B */ lui $at, %hi(D_800AF8D8) -/* 40F40 80065B40 AC22F8D8 */ sw $v0, %lo(D_800AF8D8)($at) -/* 40F44 80065B44 3C01800B */ lui $at, %hi(D_800AF8DC) -/* 40F48 80065B48 AC23F8DC */ sw $v1, %lo(D_800AF8DC)($at) -/* 40F4C 80065B4C 8E020004 */ lw $v0, 4($s0) -/* 40F50 80065B50 2403FFFE */ addiu $v1, $zero, -2 -/* 40F54 80065B54 00431024 */ and $v0, $v0, $v1 -/* 40F58 80065B58 AE020004 */ sw $v0, 4($s0) -/* 40F5C 80065B5C 3C02800B */ lui $v0, %hi(D_800AF8C4) -/* 40F60 80065B60 8C42F8C4 */ lw $v0, %lo(D_800AF8C4)($v0) -/* 40F64 80065B64 30420004 */ andi $v0, $v0, 4 -/* 40F68 80065B68 10400008 */ beqz $v0, .L80065B8C -/* 40F6C 80065B6C 3C03A000 */ lui $v1, 0xa000 -/* 40F70 80065B70 8E020038 */ lw $v0, 0x38($s0) -/* 40F74 80065B74 24420BFC */ addiu $v0, $v0, 0xbfc -/* 40F78 80065B78 00431025 */ or $v0, $v0, $v1 -/* 40F7C 80065B7C 8C420000 */ lw $v0, ($v0) -/* 40F80 80065B80 3C01800B */ lui $at, %hi(D_800AF8D0) -/* 40F84 80065B84 AC22F8D0 */ sw $v0, %lo(D_800AF8D0)($at) -/* 40F88 80065B88 02202021 */ addu $a0, $s1, $zero -.L80065B8C: -/* 40F8C 80065B8C 0C018614 */ jal osWritebackDCache -/* 40F90 80065B90 24050040 */ addiu $a1, $zero, 0x40 -/* 40F94 80065B94 0C01B1BC */ jal osSpSetStatus -/* 40F98 80065B98 24042B00 */ addiu $a0, $zero, 0x2b00 -/* 40F9C 80065B9C 2410FFFF */ addiu $s0, $zero, -1 -/* 40FA0 80065BA0 3C040400 */ lui $a0, 0x400 -.L80065BA4: -/* 40FA4 80065BA4 0C01B1C0 */ jal osSpSetPc -/* 40FA8 80065BA8 34841000 */ ori $a0, $a0, 0x1000 -/* 40FAC 80065BAC 1050FFFD */ beq $v0, $s0, .L80065BA4 -/* 40FB0 80065BB0 3C040400 */ lui $a0, 0x400 -/* 40FB4 80065BB4 2410FFFF */ addiu $s0, $zero, -1 -/* 40FB8 80065BB8 24040001 */ addiu $a0, $zero, 1 -.L80065BBC: -/* 40FBC 80065BBC 3C050400 */ lui $a1, 0x400 -/* 40FC0 80065BC0 34A50FC0 */ ori $a1, $a1, 0xfc0 -/* 40FC4 80065BC4 02203021 */ addu $a2, $s1, $zero -/* 40FC8 80065BC8 0C01B1CC */ jal osSpRawStartDma -/* 40FCC 80065BCC 24070040 */ addiu $a3, $zero, 0x40 -/* 40FD0 80065BD0 1050FFFA */ beq $v0, $s0, .L80065BBC -/* 40FD4 80065BD4 24040001 */ addiu $a0, $zero, 1 -.L80065BD8: -/* 40FD8 80065BD8 0C01B1B0 */ jal osSpDeviceBusy -/* 40FDC 80065BDC 00000000 */ nop -/* 40FE0 80065BE0 1440FFFD */ bnez $v0, .L80065BD8 -/* 40FE4 80065BE4 24040001 */ addiu $a0, $zero, 1 -/* 40FE8 80065BE8 2410FFFF */ addiu $s0, $zero, -1 -.L80065BEC: -/* 40FEC 80065BEC 8E260008 */ lw $a2, 8($s1) -/* 40FF0 80065BF0 8E27000C */ lw $a3, 0xc($s1) -/* 40FF4 80065BF4 3C050400 */ lui $a1, 0x400 -/* 40FF8 80065BF8 0C01B1CC */ jal osSpRawStartDma -/* 40FFC 80065BFC 34A51000 */ ori $a1, $a1, 0x1000 -/* 41000 80065C00 1050FFFA */ beq $v0, $s0, .L80065BEC -/* 41004 80065C04 24040001 */ addiu $a0, $zero, 1 -/* 41008 80065C08 8FBF0018 */ lw $ra, 0x18($sp) -/* 4100C 80065C0C 8FB10014 */ lw $s1, 0x14($sp) -/* 41010 80065C10 8FB00010 */ lw $s0, 0x10($sp) -/* 41014 80065C14 03E00008 */ jr $ra -/* 41018 80065C18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/code_40E10/osSpTaskStartGo.s b/ver/us/asm/nonmatchings/code_40E10/osSpTaskStartGo.s deleted file mode 100644 index 5c63f5a265..0000000000 --- a/ver/us/asm/nonmatchings/code_40E10/osSpTaskStartGo.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osSpTaskStartGo -/* 4101C 80065C1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 41020 80065C20 AFBF0010 */ sw $ra, 0x10($sp) -.L80065C24: -/* 41024 80065C24 0C01B1B0 */ jal osSpDeviceBusy -/* 41028 80065C28 00000000 */ nop -/* 4102C 80065C2C 1440FFFD */ bnez $v0, .L80065C24 -/* 41030 80065C30 00000000 */ nop -/* 41034 80065C34 0C01B1BC */ jal osSpSetStatus -/* 41038 80065C38 24040125 */ addiu $a0, $zero, 0x125 -/* 4103C 80065C3C 8FBF0010 */ lw $ra, 0x10($sp) -/* 41040 80065C40 03E00008 */ jr $ra -/* 41044 80065C44 27BD0018 */ addiu $sp, $sp, 0x18 -/* 41048 80065C48 00000000 */ nop -/* 4104C 80065C4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_415D90/draw_battle_wheel.s b/ver/us/asm/nonmatchings/code_415D90/draw_battle_wheel.s index 3efd227151..57f5c7d1ae 100644 --- a/ver/us/asm/nonmatchings/code_415D90/draw_battle_wheel.s +++ b/ver/us/asm/nonmatchings/code_415D90/draw_battle_wheel.s @@ -23,7 +23,7 @@ glabel draw_battle_wheel /* 416A2C 802A1C9C 00021600 */ sll $v0, $v0, 0x18 /* 416A30 802A1CA0 00021E03 */ sra $v1, $v0, 0x18 /* 416A34 802A1CA4 2C620020 */ sltiu $v0, $v1, 0x20 -/* 416A38 802A1CA8 10400266 */ beqz $v0, .L802A2644 +/* 416A38 802A1CA8 10400266 */ beqz $v0, L802A2644_4173D4 /* 416A3C 802A1CAC 00031080 */ sll $v0, $v1, 2 /* 416A40 802A1CB0 3C01802B */ lui $at, %hi(jtbl_802AB770) /* 416A44 802A1CB4 00220821 */ addu $at, $at, $v0 @@ -89,7 +89,7 @@ glabel L802A1CC4_416A54 /* 416B30 802A1DA0 24C600D4 */ addiu $a2, $a2, 0xd4 /* 416B34 802A1DA4 0C05108E */ jal func_80144238 /* 416B38 802A1DA8 0260202D */ daddu $a0, $s3, $zero -/* 416B3C 802A1DAC 080A8991 */ j .L802A2644 +/* 416B3C 802A1DAC 080A8991 */ j L802A2644_4173D4 /* 416B40 802A1DB0 00000000 */ nop glabel L802A1DB4_416B44 /* 416B44 802A1DB4 3C03802B */ lui $v1, %hi(D_802AD006) @@ -617,7 +617,7 @@ glabel L802A1DB4_416B44 .L802A2598: /* 417328 802A2598 3C02802B */ lui $v0, %hi(D_802AD104) /* 41732C 802A259C 8C42D104 */ lw $v0, %lo(D_802AD104)($v0) -/* 417330 802A25A0 10400028 */ beqz $v0, .L802A2644 +/* 417330 802A25A0 10400028 */ beqz $v0, L802A2644_4173D4 /* 417334 802A25A4 3C028080 */ lui $v0, 0x8080 /* 417338 802A25A8 34428081 */ ori $v0, $v0, 0x8081 /* 41733C 802A25AC 00152840 */ sll $a1, $s5, 1 @@ -658,7 +658,6 @@ glabel L802A1DB4_416B44 /* 4173C8 802A2638 0260202D */ daddu $a0, $s3, $zero /* 4173CC 802A263C 0C0511EA */ jal draw_icon_0 /* 4173D0 802A2640 0260202D */ daddu $a0, $s3, $zero -.L802A2644: glabel L802A2644_4173D4 /* 4173D4 802A2644 8FBF0054 */ lw $ra, 0x54($sp) /* 4173D8 802A2648 8FBE0050 */ lw $fp, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A2C84.s b/ver/us/asm/nonmatchings/code_415D90/func_802A2C84.s index e94120002b..a9fed8f70d 100644 --- a/ver/us/asm/nonmatchings/code_415D90/func_802A2C84.s +++ b/ver/us/asm/nonmatchings/code_415D90/func_802A2C84.s @@ -18,7 +18,7 @@ glabel func_802A2C84 /* 417A48 802A2CB8 00021600 */ sll $v0, $v0, 0x18 /* 417A4C 802A2CBC 00021E03 */ sra $v1, $v0, 0x18 /* 417A50 802A2CC0 2C62002D */ sltiu $v0, $v1, 0x2d -/* 417A54 802A2CC4 104003E9 */ beqz $v0, .L802A3C6C +/* 417A54 802A2CC4 104003E9 */ beqz $v0, L802A3C6C_4189FC /* 417A58 802A2CC8 AFB00028 */ sw $s0, 0x28($sp) /* 417A5C 802A2CCC 00031080 */ sll $v0, $v1, 2 /* 417A60 802A2CD0 3C01802B */ lui $at, %hi(jtbl_802AB808) @@ -825,12 +825,12 @@ glabel L802A3718_4184A8 /* 418618 802A3888 00000000 */ nop /* 41861C 802A388C 0C03A674 */ jal status_menu_stop_blinking_fp /* 418620 802A3890 00000000 */ nop -/* 418624 802A3894 080A8E5D */ j .L802A3974 +/* 418624 802A3894 080A8E5D */ j L802A3974_418704 /* 418628 802A3898 00000000 */ nop .L802A389C: /* 41862C 802A389C 0C03A6A5 */ jal status_menu_stop_blinking_sp /* 418630 802A38A0 00000000 */ nop -/* 418634 802A38A4 080A8E5D */ j .L802A3974 +/* 418634 802A38A4 080A8E5D */ j L802A3974_418704 /* 418638 802A38A8 00000000 */ nop glabel L802A38AC_41863C /* 41863C 802A38AC 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) @@ -889,7 +889,6 @@ glabel L802A38DC_41866C /* 4186F8 802A3968 8C22D1F8 */ lw $v0, %lo(battle_menu_moveOptionIndexMap)($at) /* 4186FC 802A396C 080A8E82 */ j .L802A3A08 /* 418700 802A3970 2403000B */ addiu $v1, $zero, 0xb -.L802A3974: glabel L802A3974_418704 /* 418704 802A3974 3C03802B */ lui $v1, %hi(battle_menu_moveCursorPos) /* 418708 802A3978 8063D109 */ lb $v1, %lo(battle_menu_moveCursorPos)($v1) @@ -1099,7 +1098,6 @@ glabel L802A3BC0_418950 .L802A3C64: /* 4189F4 802A3C64 3C01802B */ lui $at, %hi(battle_menu_moveState) /* 4189F8 802A3C68 A022D108 */ sb $v0, %lo(battle_menu_moveState)($at) -.L802A3C6C: glabel L802A3C6C_4189FC /* 4189FC 802A3C6C 0000102D */ daddu $v0, $zero, $zero .L802A3C70: diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A3C98.s b/ver/us/asm/nonmatchings/code_415D90/func_802A3C98.s index 23c89ce4cd..bdb43c69c8 100644 --- a/ver/us/asm/nonmatchings/code_415D90/func_802A3C98.s +++ b/ver/us/asm/nonmatchings/code_415D90/func_802A3C98.s @@ -20,7 +20,7 @@ glabel func_802A3C98 /* 418A64 802A3CD4 00021600 */ sll $v0, $v0, 0x18 /* 418A68 802A3CD8 00021E03 */ sra $v1, $v0, 0x18 /* 418A6C 802A3CDC 2C62002B */ sltiu $v0, $v1, 0x2b -/* 418A70 802A3CE0 104001B2 */ beqz $v0, .L802A43AC +/* 418A70 802A3CE0 104001B2 */ beqz $v0, L802A43AC_41913C /* 418A74 802A3CE4 AFA60050 */ sw $a2, 0x50($sp) /* 418A78 802A3CE8 00031080 */ sll $v0, $v1, 2 /* 418A7C 802A3CEC 3C01802B */ lui $at, %hi(jtbl_802AB8C0) @@ -472,7 +472,7 @@ glabel L802A3D00_418A90 /* 419100 802A4370 3C03802B */ lui $v1, %hi(battle_menu_moveState) /* 419104 802A4374 8063D108 */ lb $v1, %lo(battle_menu_moveState)($v1) /* 419108 802A4378 2402FFFF */ addiu $v0, $zero, -1 -/* 41910C 802A437C 1462000B */ bne $v1, $v0, .L802A43AC +/* 41910C 802A437C 1462000B */ bne $v1, $v0, L802A43AC_41913C /* 419110 802A4380 00000000 */ nop /* 419114 802A4384 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) /* 419118 802A4388 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) @@ -480,12 +480,11 @@ glabel L802A3D00_418A90 /* 419120 802A4390 00000000 */ nop /* 419124 802A4394 0C03A674 */ jal status_menu_stop_blinking_fp /* 419128 802A4398 00000000 */ nop -/* 41912C 802A439C 080A90EB */ j .L802A43AC +/* 41912C 802A439C 080A90EB */ j L802A43AC_41913C /* 419130 802A43A0 00000000 */ nop .L802A43A4: /* 419134 802A43A4 0C03A6A5 */ jal status_menu_stop_blinking_sp /* 419138 802A43A8 00000000 */ nop -.L802A43AC: glabel L802A43AC_41913C /* 41913C 802A43AC 8FBF0044 */ lw $ra, 0x44($sp) /* 419140 802A43B0 8FBE0040 */ lw $fp, 0x40($sp) diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A4494.s b/ver/us/asm/nonmatchings/code_415D90/func_802A4494.s index 7f14bd1180..3fd5bf5c78 100644 --- a/ver/us/asm/nonmatchings/code_415D90/func_802A4494.s +++ b/ver/us/asm/nonmatchings/code_415D90/func_802A4494.s @@ -9,7 +9,7 @@ glabel func_802A4494 /* 419234 802A44A4 00021600 */ sll $v0, $v0, 0x18 /* 419238 802A44A8 00021E03 */ sra $v1, $v0, 0x18 /* 41923C 802A44AC 2C620020 */ sltiu $v0, $v1, 0x20 -/* 419240 802A44B0 1040001D */ beqz $v0, .L802A4528 +/* 419240 802A44B0 1040001D */ beqz $v0, L802A4528_4192B8 /* 419244 802A44B4 AFBF0018 */ sw $ra, 0x18($sp) /* 419248 802A44B8 00031080 */ sll $v0, $v1, 2 /* 41924C 802A44BC 3C01802B */ lui $at, %hi(jtbl_802AB970) @@ -20,7 +20,7 @@ glabel func_802A4494 glabel L802A44D0_419260 /* 419260 802A44D0 3C02802B */ lui $v0, %hi(D_802AD10F) /* 419264 802A44D4 8042D10F */ lb $v0, %lo(D_802AD10F)($v0) -/* 419268 802A44D8 10400013 */ beqz $v0, .L802A4528 +/* 419268 802A44D8 10400013 */ beqz $v0, L802A4528_4192B8 /* 41926C 802A44DC 00000000 */ nop /* 419270 802A44E0 3C02802B */ lui $v0, %hi(battle_menu_moveCursorPos) /* 419274 802A44E4 8042D109 */ lb $v0, %lo(battle_menu_moveCursorPos)($v0) @@ -40,7 +40,6 @@ glabel L802A44D0_419260 /* 4192AC 802A451C 8C84D570 */ lw $a0, %lo(battle_menu_moveOptionDescriptions)($a0) /* 4192B0 802A4520 0C04993B */ jal draw_msg /* 4192B4 802A4524 24A50008 */ addiu $a1, $a1, 8 -.L802A4528: glabel L802A4528_4192B8 /* 4192B8 802A4528 8FBF0018 */ lw $ra, 0x18($sp) /* 4192BC 802A452C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A4A54.s b/ver/us/asm/nonmatchings/code_415D90/func_802A4A54.s index b2bba1e50c..c391cbceea 100644 --- a/ver/us/asm/nonmatchings/code_415D90/func_802A4A54.s +++ b/ver/us/asm/nonmatchings/code_415D90/func_802A4A54.s @@ -15,7 +15,7 @@ glabel func_802A4A54 /* 41980C 802A4A7C 00021600 */ sll $v0, $v0, 0x18 /* 419810 802A4A80 00021E03 */ sra $v1, $v0, 0x18 /* 419814 802A4A84 2C62002D */ sltiu $v0, $v1, 0x2d -/* 419818 802A4A88 104001F9 */ beqz $v0, .L802A5270 +/* 419818 802A4A88 104001F9 */ beqz $v0, L802A5270_41A000 /* 41981C 802A4A8C AFB00028 */ sw $s0, 0x28($sp) /* 419820 802A4A90 00031080 */ sll $v0, $v1, 2 /* 419824 802A4A94 3C01802B */ lui $at, %hi(jtbl_802AB9F0) @@ -403,7 +403,7 @@ glabel L802A4F74_419D04 /* 419DD0 802A5040 24040008 */ addiu $a0, $zero, 8 /* 419DD4 802A5044 0C051F9F */ jal set_window_update /* 419DD8 802A5048 24050002 */ addiu $a1, $zero, 2 -/* 419DDC 802A504C 080A9424 */ j .L802A5090 +/* 419DDC 802A504C 080A9424 */ j L802A5090_419E20 /* 419DE0 802A5050 00000000 */ nop glabel L802A5054_419DE4 /* 419DE4 802A5054 080A949D */ j .L802A5274 @@ -422,7 +422,6 @@ glabel L802A505C_419DEC /* 419E14 802A5084 8042D605 */ lb $v0, %lo(D_802AD605)($v0) /* 419E18 802A5088 080A9434 */ j .L802A50D0 /* 419E1C 802A508C 2403000B */ addiu $v1, $zero, 0xb -.L802A5090: glabel L802A5090_419E20 /* 419E20 802A5090 3C02802B */ lui $v0, %hi(D_802AD605) /* 419E24 802A5094 8042D605 */ lb $v0, %lo(D_802AD605)($v0) @@ -555,7 +554,6 @@ glabel L802A51F0_419F80 .L802A5268: /* 419FF8 802A5268 3C01802B */ lui $at, %hi(D_802AD604) /* 419FFC 802A526C A022D604 */ sb $v0, %lo(D_802AD604)($at) -.L802A5270: glabel L802A5270_41A000 /* 41A000 802A5270 0000102D */ daddu $v0, $zero, $zero .L802A5274: diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A5290.s b/ver/us/asm/nonmatchings/code_415D90/func_802A5290.s index 99787c1381..ca687b1020 100644 --- a/ver/us/asm/nonmatchings/code_415D90/func_802A5290.s +++ b/ver/us/asm/nonmatchings/code_415D90/func_802A5290.s @@ -20,7 +20,7 @@ glabel func_802A5290 /* 41A05C 802A52CC 00021600 */ sll $v0, $v0, 0x18 /* 41A060 802A52D0 00021E03 */ sra $v1, $v0, 0x18 /* 41A064 802A52D4 2C62002B */ sltiu $v0, $v1, 0x2b -/* 41A068 802A52D8 104000FB */ beqz $v0, .L802A56C8 +/* 41A068 802A52D8 104000FB */ beqz $v0, L802A56C8_41A458 /* 41A06C 802A52DC AFA60048 */ sw $a2, 0x48($sp) /* 41A070 802A52E0 00031080 */ sll $v0, $v1, 2 /* 41A074 802A52E4 3C01802B */ lui $at, %hi(jtbl_802ABAA8) @@ -270,7 +270,7 @@ glabel L802A52F8_41A088 /* 41A418 802A5688 3C03802B */ lui $v1, %hi(D_802AD66C) /* 41A41C 802A568C 8C63D66C */ lw $v1, %lo(D_802AD66C)($v1) /* 41A420 802A5690 0043102A */ slt $v0, $v0, $v1 -/* 41A424 802A5694 1040000C */ beqz $v0, .L802A56C8 +/* 41A424 802A5694 1040000C */ beqz $v0, L802A56C8_41A458 /* 41A428 802A5698 26E50043 */ addiu $a1, $s7, 0x43 /* 41A42C 802A569C 8FA90048 */ lw $t1, 0x48($sp) /* 41A430 802A56A0 3C10802B */ lui $s0, %hi(D_802AD620) @@ -283,7 +283,6 @@ glabel L802A52F8_41A088 /* 41A44C 802A56BC 0200202D */ daddu $a0, $s0, $zero /* 41A450 802A56C0 0C0511EA */ jal draw_icon_0 /* 41A454 802A56C4 0200202D */ daddu $a0, $s0, $zero -.L802A56C8: glabel L802A56C8_41A458 /* 41A458 802A56C8 8FBF003C */ lw $ra, 0x3c($sp) /* 41A45C 802A56CC 8FBE0038 */ lw $fp, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A5738.s b/ver/us/asm/nonmatchings/code_415D90/func_802A5738.s index 59980a010b..847bb53959 100644 --- a/ver/us/asm/nonmatchings/code_415D90/func_802A5738.s +++ b/ver/us/asm/nonmatchings/code_415D90/func_802A5738.s @@ -9,7 +9,7 @@ glabel func_802A5738 /* 41A4D8 802A5748 00021600 */ sll $v0, $v0, 0x18 /* 41A4DC 802A574C 00021E03 */ sra $v1, $v0, 0x18 /* 41A4E0 802A5750 2C620020 */ sltiu $v0, $v1, 0x20 -/* 41A4E4 802A5754 10400019 */ beqz $v0, .L802A57BC +/* 41A4E4 802A5754 10400019 */ beqz $v0, L802A57BC_41A54C /* 41A4E8 802A5758 AFBF0018 */ sw $ra, 0x18($sp) /* 41A4EC 802A575C 00031080 */ sll $v0, $v1, 2 /* 41A4F0 802A5760 3C01802B */ lui $at, %hi(jtbl_802ABB58) @@ -20,7 +20,7 @@ glabel func_802A5738 glabel L802A5774_41A504 /* 41A504 802A5774 3C02802B */ lui $v0, %hi(D_802AD60B) /* 41A508 802A5778 8042D60B */ lb $v0, %lo(D_802AD60B)($v0) -/* 41A50C 802A577C 1040000F */ beqz $v0, .L802A57BC +/* 41A50C 802A577C 1040000F */ beqz $v0, L802A57BC_41A54C /* 41A510 802A5780 00000000 */ nop /* 41A514 802A5784 3C02802B */ lui $v0, %hi(D_802AD605) /* 41A518 802A5788 8042D605 */ lb $v0, %lo(D_802AD605)($v0) @@ -36,7 +36,6 @@ glabel L802A5774_41A504 /* 41A540 802A57B0 8C84D6C0 */ lw $a0, %lo(D_802AD6C0)($a0) /* 41A544 802A57B4 0C04993B */ jal draw_msg /* 41A548 802A57B8 24A50008 */ addiu $a1, $a1, 8 -.L802A57BC: glabel L802A57BC_41A54C /* 41A54C 802A57BC 8FBF0018 */ lw $ra, 0x18($sp) /* 41A550 802A57C0 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A9B44.s b/ver/us/asm/nonmatchings/code_415D90/func_802A9B44.s index 79aabe2799..54e8e4db1f 100644 --- a/ver/us/asm/nonmatchings/code_415D90/func_802A9B44.s +++ b/ver/us/asm/nonmatchings/code_415D90/func_802A9B44.s @@ -17,7 +17,7 @@ glabel func_802A9B44 /* 41E904 802A9B74 8E5000D8 */ lw $s0, 0xd8($s2) /* 41E908 802A9B78 8E5100DC */ lw $s1, 0xdc($s2) /* 41E90C 802A9B7C 2C62000C */ sltiu $v0, $v1, 0xc -/* 41E910 802A9B80 1040012D */ beqz $v0, .L802AA038 +/* 41E910 802A9B80 1040012D */ beqz $v0, L802AA038_41EDC8 /* 41E914 802A9B84 00031080 */ sll $v0, $v1, 2 /* 41E918 802A9B88 3C01802B */ lui $at, %hi(jtbl_802ACBB0) /* 41E91C 802A9B8C 00220821 */ addu $at, $at, $v0 @@ -50,7 +50,7 @@ glabel L802A9B9C_41E92C /* 41E980 802A9BF0 24020004 */ addiu $v0, $zero, 4 /* 41E984 802A9BF4 A6020070 */ sh $v0, 0x70($s0) /* 41E988 802A9BF8 AE000054 */ sw $zero, 0x54($s0) -/* 41E98C 802A9BFC 080AA80E */ j .L802AA038 +/* 41E98C 802A9BFC 080AA80E */ j L802AA038_41EDC8 /* 41E990 802A9C00 E6000020 */ swc1 $f0, 0x20($s0) glabel L802A9C04_41E994 /* 41E994 802A9C04 86020070 */ lh $v0, 0x70($s0) @@ -135,7 +135,7 @@ glabel L802A9C04_41E994 /* 41EACC 802A9D3C 10400004 */ beqz $v0, .L802A9D50 /* 41EAD0 802A9D40 E6000054 */ swc1 $f0, 0x54($s0) /* 41EAD4 802A9D44 2462FFFF */ addiu $v0, $v1, -1 -/* 41EAD8 802A9D48 080AA80E */ j .L802AA038 +/* 41EAD8 802A9D48 080AA80E */ j L802AA038_41EDC8 /* 41EADC 802A9D4C A6020070 */ sh $v0, 0x70($s0) .L802A9D50: /* 41EAE0 802A9D50 C6000018 */ lwc1 $f0, 0x18($s0) @@ -254,10 +254,10 @@ glabel L802A9ED4_41EC64 /* 41EC8C 802A9EFC 10600004 */ beqz $v1, .L802A9F10 /* 41EC90 802A9F00 0040802D */ daddu $s0, $v0, $zero /* 41EC94 802A9F04 2462FFFF */ addiu $v0, $v1, -1 -/* 41EC98 802A9F08 080AA80E */ j .L802AA038 +/* 41EC98 802A9F08 080AA80E */ j L802AA038_41EDC8 /* 41EC9C 802A9F0C AE220000 */ sw $v0, ($s1) .L802A9F10: -/* 41ECA0 802A9F10 12000049 */ beqz $s0, .L802AA038 +/* 41ECA0 802A9F10 12000049 */ beqz $s0, L802AA038_41EDC8 /* 41ECA4 802A9F14 0000202D */ daddu $a0, $zero, $zero /* 41ECA8 802A9F18 0080282D */ daddu $a1, $a0, $zero /* 41ECAC 802A9F1C 3C06000A */ lui $a2, 0xa @@ -280,7 +280,7 @@ glabel L802A9ED4_41EC64 glabel L802A9F60_41ECF0 /* 41ECF0 802A9F60 0C0A846C */ jal func_802A11B0 /* 41ECF4 802A9F64 00000000 */ nop -/* 41ECF8 802A9F68 10400033 */ beqz $v0, .L802AA038 +/* 41ECF8 802A9F68 10400033 */ beqz $v0, L802AA038_41EDC8 /* 41ECFC 802A9F6C 24040011 */ addiu $a0, $zero, 0x11 /* 41ED00 802A9F70 24020004 */ addiu $v0, $zero, 4 /* 41ED04 802A9F74 A642006C */ sh $v0, 0x6c($s2) @@ -296,7 +296,7 @@ glabel L802A9F60_41ECF0 /* 41ED2C 802A9F9C A642017A */ sh $v0, 0x17a($s2) /* 41ED30 802A9FA0 0C090464 */ jal func_80241190 /* 41ED34 802A9FA4 AE430184 */ sw $v1, 0x184($s2) -/* 41ED38 802A9FA8 080AA80E */ j .L802AA038 +/* 41ED38 802A9FA8 080AA80E */ j L802AA038_41EDC8 /* 41ED3C 802A9FAC 00000000 */ nop glabel L802A9FB0_41ED40 /* 41ED40 802A9FB0 0C0A8414 */ jal func_802A1050 @@ -308,12 +308,12 @@ glabel L802A9FB0_41ED40 /* 41ED58 802A9FC8 00000000 */ nop /* 41ED5C 802A9FCC 0C0AA6D1 */ jal func_802A9B44 /* 41ED60 802A9FD0 00000000 */ nop -/* 41ED64 802A9FD4 080AA80E */ j .L802AA038 +/* 41ED64 802A9FD4 080AA80E */ j L802AA038_41EDC8 /* 41ED68 802A9FD8 00000000 */ nop glabel L802A9FDC_41ED6C /* 41ED6C 802A9FDC 0C0A842E */ jal func_802A10B8 /* 41ED70 802A9FE0 00000000 */ nop -/* 41ED74 802A9FE4 080AA80E */ j .L802AA038 +/* 41ED74 802A9FE4 080AA80E */ j L802AA038_41EDC8 /* 41ED78 802A9FE8 00000000 */ nop glabel L802A9FEC_41ED7C /* 41ED7C 802A9FEC 24040050 */ addiu $a0, $zero, 0x50 @@ -328,7 +328,7 @@ glabel L802A9FEC_41ED7C glabel L802AA010_41EDA0 /* 41EDA0 802AA010 0C093EAD */ jal is_popup_displayed /* 41EDA4 802AA014 00000000 */ nop -/* 41EDA8 802AA018 14400007 */ bnez $v0, .L802AA038 +/* 41EDA8 802AA018 14400007 */ bnez $v0, L802AA038_41EDC8 /* 41EDAC 802AA01C 24020001 */ addiu $v0, $zero, 1 /* 41EDB0 802AA020 3C01802B */ lui $at, %hi(D_802AD607) /* 41EDB4 802AA024 A020D607 */ sb $zero, %lo(D_802AD607)($at) @@ -337,7 +337,6 @@ glabel L802AA010_41EDA0 .L802AA030: /* 41EDC0 802AA030 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41EDC4 802AA034 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -.L802AA038: glabel L802AA038_41EDC8 /* 41EDC8 802AA038 8FBF001C */ lw $ra, 0x1c($sp) /* 41EDCC 802AA03C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802AA0B8.s b/ver/us/asm/nonmatchings/code_415D90/func_802AA0B8.s index 580fc78527..9f50a227f5 100644 --- a/ver/us/asm/nonmatchings/code_415D90/func_802AA0B8.s +++ b/ver/us/asm/nonmatchings/code_415D90/func_802AA0B8.s @@ -17,7 +17,7 @@ glabel func_802AA0B8 /* 41EE78 802AA0E8 8E5000D8 */ lw $s0, 0xd8($s2) /* 41EE7C 802AA0EC 8E5100DC */ lw $s1, 0xdc($s2) /* 41EE80 802AA0F0 2C62000C */ sltiu $v0, $v1, 0xc -/* 41EE84 802AA0F4 10400149 */ beqz $v0, .L802AA61C +/* 41EE84 802AA0F4 10400149 */ beqz $v0, L802AA61C_41F3AC /* 41EE88 802AA0F8 00031080 */ sll $v0, $v1, 2 /* 41EE8C 802AA0FC 3C01802B */ lui $at, %hi(jtbl_802ACC08) /* 41EE90 802AA100 00220821 */ addu $at, $at, $v0 @@ -62,7 +62,7 @@ glabel L802AA110_41EEA0 /* 41EF0C 802AA17C 00000000 */ nop /* 41EF10 802AA180 0C090464 */ jal func_80241190 /* 41EF14 802AA184 24040016 */ addiu $a0, $zero, 0x16 -/* 41EF18 802AA188 080AA987 */ j .L802AA61C +/* 41EF18 802AA188 080AA987 */ j L802AA61C_41F3AC /* 41EF1C 802AA18C 00000000 */ nop .L802AA190: /* 41EF20 802AA190 0C093903 */ jal func_8024E40C @@ -87,7 +87,7 @@ glabel L802AA110_41EEA0 /* 41EF6C 802AA1DC AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41EF70 802AA1E0 A6120070 */ sh $s2, 0x70($s0) /* 41EF74 802AA1E4 AE000054 */ sw $zero, 0x54($s0) -/* 41EF78 802AA1E8 080AA987 */ j .L802AA61C +/* 41EF78 802AA1E8 080AA987 */ j L802AA61C_41F3AC /* 41EF7C 802AA1EC E6000020 */ swc1 $f0, 0x20($s0) glabel L802AA1F0_41EF80 /* 41EF80 802AA1F0 86020070 */ lh $v0, 0x70($s0) @@ -172,7 +172,7 @@ glabel L802AA1F0_41EF80 /* 41F0B8 802AA328 10400004 */ beqz $v0, .L802AA33C /* 41F0BC 802AA32C E6000054 */ swc1 $f0, 0x54($s0) /* 41F0C0 802AA330 2462FFFF */ addiu $v0, $v1, -1 -/* 41F0C4 802AA334 080AA987 */ j .L802AA61C +/* 41F0C4 802AA334 080AA987 */ j L802AA61C_41F3AC /* 41F0C8 802AA338 A6020070 */ sh $v0, 0x70($s0) .L802AA33C: /* 41F0CC 802AA33C C6000018 */ lwc1 $f0, 0x18($s0) @@ -290,10 +290,10 @@ glabel L802AA4BC_41F24C /* 41F274 802AA4E4 10600004 */ beqz $v1, .L802AA4F8 /* 41F278 802AA4E8 0040802D */ daddu $s0, $v0, $zero /* 41F27C 802AA4EC 2462FFFF */ addiu $v0, $v1, -1 -/* 41F280 802AA4F0 080AA987 */ j .L802AA61C +/* 41F280 802AA4F0 080AA987 */ j L802AA61C_41F3AC /* 41F284 802AA4F4 AE220000 */ sw $v0, ($s1) .L802AA4F8: -/* 41F288 802AA4F8 12000048 */ beqz $s0, .L802AA61C +/* 41F288 802AA4F8 12000048 */ beqz $s0, L802AA61C_41F3AC /* 41F28C 802AA4FC 24040100 */ addiu $a0, $zero, 0x100 /* 41F290 802AA500 0000282D */ daddu $a1, $zero, $zero /* 41F294 802AA504 3C060020 */ lui $a2, 0x20 @@ -316,7 +316,7 @@ glabel L802AA4BC_41F24C glabel L802AA548_41F2D8 /* 41F2D8 802AA548 0C0A846C */ jal func_802A11B0 /* 41F2DC 802AA54C 00000000 */ nop -/* 41F2E0 802AA550 10400032 */ beqz $v0, .L802AA61C +/* 41F2E0 802AA550 10400032 */ beqz $v0, L802AA61C_41F3AC /* 41F2E4 802AA554 24040011 */ addiu $a0, $zero, 0x11 /* 41F2E8 802AA558 24020004 */ addiu $v0, $zero, 4 /* 41F2EC 802AA55C A642006C */ sh $v0, 0x6c($s2) @@ -331,7 +331,7 @@ glabel L802AA548_41F2D8 /* 41F310 802AA580 A640017A */ sh $zero, 0x17a($s2) /* 41F314 802AA584 0C090464 */ jal func_80241190 /* 41F318 802AA588 AE430184 */ sw $v1, 0x184($s2) -/* 41F31C 802AA58C 080AA987 */ j .L802AA61C +/* 41F31C 802AA58C 080AA987 */ j L802AA61C_41F3AC /* 41F320 802AA590 00000000 */ nop glabel L802AA594_41F324 /* 41F324 802AA594 0C0A8414 */ jal func_802A1050 @@ -343,12 +343,12 @@ glabel L802AA594_41F324 /* 41F33C 802AA5AC 00000000 */ nop /* 41F340 802AA5B0 0C0AA82E */ jal func_802AA0B8 /* 41F344 802AA5B4 00000000 */ nop -/* 41F348 802AA5B8 080AA987 */ j .L802AA61C +/* 41F348 802AA5B8 080AA987 */ j L802AA61C_41F3AC /* 41F34C 802AA5BC 00000000 */ nop glabel L802AA5C0_41F350 /* 41F350 802AA5C0 0C0A842E */ jal func_802A10B8 /* 41F354 802AA5C4 00000000 */ nop -/* 41F358 802AA5C8 080AA987 */ j .L802AA61C +/* 41F358 802AA5C8 080AA987 */ j L802AA61C_41F3AC /* 41F35C 802AA5CC 00000000 */ nop glabel L802AA5D0_41F360 /* 41F360 802AA5D0 24040050 */ addiu $a0, $zero, 0x50 @@ -363,7 +363,7 @@ glabel L802AA5D0_41F360 glabel L802AA5F4_41F384 /* 41F384 802AA5F4 0C093EAD */ jal is_popup_displayed /* 41F388 802AA5F8 00000000 */ nop -/* 41F38C 802AA5FC 14400007 */ bnez $v0, .L802AA61C +/* 41F38C 802AA5FC 14400007 */ bnez $v0, L802AA61C_41F3AC /* 41F390 802AA600 24020001 */ addiu $v0, $zero, 1 /* 41F394 802AA604 3C01802B */ lui $at, %hi(D_802AD607) /* 41F398 802AA608 A020D607 */ sb $zero, %lo(D_802AD607)($at) @@ -372,7 +372,6 @@ glabel L802AA5F4_41F384 .L802AA614: /* 41F3A4 802AA614 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41F3A8 802AA618 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -.L802AA61C: glabel L802AA61C_41F3AC /* 41F3AC 802AA61C 8FBF001C */ lw $ra, 0x1c($sp) /* 41F3B0 802AA620 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_415D90/update_partner_menu.s b/ver/us/asm/nonmatchings/code_415D90/update_partner_menu.s index d951d846eb..01c5aa3258 100644 --- a/ver/us/asm/nonmatchings/code_415D90/update_partner_menu.s +++ b/ver/us/asm/nonmatchings/code_415D90/update_partner_menu.s @@ -196,7 +196,7 @@ glabel update_partner_menu /* 41D238 802A84A8 8C42C4DC */ lw $v0, %lo(gBattleStatus+0x46C)($v0) /* 41D23C 802A84AC 2443FFFE */ addiu $v1, $v0, -2 /* 41D240 802A84B0 2C62012D */ sltiu $v0, $v1, 0x12d -/* 41D244 802A84B4 1040057D */ beqz $v0, .L802A9AAC +/* 41D244 802A84B4 1040057D */ beqz $v0, L802A9AAC_41E83C /* 41D248 802A84B8 00031080 */ sll $v0, $v1, 2 /* 41D24C 802A84BC 3C01802B */ lui $at, %hi(jtbl_802AC3C8) /* 41D250 802A84C0 00220821 */ addu $at, $at, $v0 @@ -442,10 +442,10 @@ glabel L802A8780_41D510 /* 41D5CC 802A883C 8C620000 */ lw $v0, ($v1) /* 41D5D0 802A8840 10400003 */ beqz $v0, .L802A8850 /* 41D5D4 802A8844 2442FFFF */ addiu $v0, $v0, -1 -/* 41D5D8 802A8848 080AA6AB */ j .L802A9AAC +/* 41D5D8 802A8848 080AA6AB */ j L802A9AAC_41E83C /* 41D5DC 802A884C AC620000 */ sw $v0, ($v1) .L802A8850: -/* 41D5E0 802A8850 12000496 */ beqz $s0, .L802A9AAC +/* 41D5E0 802A8850 12000496 */ beqz $s0, L802A9AAC_41E83C /* 41D5E4 802A8854 24040100 */ addiu $a0, $zero, 0x100 /* 41D5E8 802A8858 82E20012 */ lb $v0, 0x12($s7) /* 41D5EC 802A885C 00021080 */ sll $v0, $v0, 2 @@ -506,7 +506,7 @@ glabel L802A88F8_41D688 /* 41D6B0 802A8920 080AA6A9 */ j .L802A9AA4 /* 41D6B4 802A8924 24020005 */ addiu $v0, $zero, 5 .L802A8928: -/* 41D6B8 802A8928 12000460 */ beqz $s0, .L802A9AAC +/* 41D6B8 802A8928 12000460 */ beqz $s0, L802A9AAC_41E83C /* 41D6BC 802A892C 24040011 */ addiu $a0, $zero, 0x11 .L802A8930: /* 41D6C0 802A8930 24020008 */ addiu $v0, $zero, 8 @@ -520,7 +520,7 @@ glabel L802A88F8_41D688 glabel L802A8950_41D6E0 /* 41D6E0 802A8950 0C0A846C */ jal func_802A11B0 /* 41D6E4 802A8954 00000000 */ nop -/* 41D6E8 802A8958 10400454 */ beqz $v0, .L802A9AAC +/* 41D6E8 802A8958 10400454 */ beqz $v0, L802A9AAC_41E83C /* 41D6EC 802A895C 24020008 */ addiu $v0, $zero, 8 /* 41D6F0 802A8960 3C01802B */ lui $at, %hi(D_802ACC60) /* 41D6F4 802A8964 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -552,7 +552,7 @@ glabel L802A898C_41D71C glabel L802A89C0_41D750 /* 41D750 802A89C0 0C093EAD */ jal is_popup_displayed /* 41D754 802A89C4 00000000 */ nop -/* 41D758 802A89C8 14400438 */ bnez $v0, .L802A9AAC +/* 41D758 802A89C8 14400438 */ bnez $v0, L802A9AAC_41E83C /* 41D75C 802A89CC 24020004 */ addiu $v0, $zero, 4 /* 41D760 802A89D0 3C01802B */ lui $at, %hi(D_802ACC6C) /* 41D764 802A89D4 AC22CC6C */ sw $v0, %lo(D_802ACC6C)($at) @@ -718,7 +718,7 @@ glabel L802A8C1C_41D9AC /* 41D9B8 802A8C28 2402FFFF */ addiu $v0, $zero, -1 /* 41D9BC 802A8C2C 1202039D */ beq $s0, $v0, .L802A9AA4 /* 41D9C0 802A8C30 24020010 */ addiu $v0, $zero, 0x10 -/* 41D9C4 802A8C34 1200039D */ beqz $s0, .L802A9AAC +/* 41D9C4 802A8C34 1200039D */ beqz $s0, L802A9AAC_41E83C /* 41D9C8 802A8C38 240200FF */ addiu $v0, $zero, 0xff /* 41D9CC 802A8C3C 5602000B */ bnel $s0, $v0, .L802A8C6C /* 41D9D0 802A8C40 2602FFFF */ addiu $v0, $s0, -1 @@ -757,7 +757,7 @@ glabel L802A8C84_41DA14 .L802A8CBC: /* 41DA4C 802A8CBC 0C0A846C */ jal func_802A11B0 /* 41DA50 802A8CC0 00000000 */ nop -/* 41DA54 802A8CC4 10400379 */ beqz $v0, .L802A9AAC +/* 41DA54 802A8CC4 10400379 */ beqz $v0, L802A9AAC_41E83C /* 41DA58 802A8CC8 24030006 */ addiu $v1, $zero, 6 /* 41DA5C 802A8CCC 8282004B */ lb $v0, 0x4b($s4) /* 41DA60 802A8CD0 A2830178 */ sb $v1, 0x178($s4) @@ -785,14 +785,14 @@ glabel L802A8C84_41DA14 .L802A8D28: /* 41DAB8 802A8D28 0C090464 */ jal func_80241190 /* 41DABC 802A8D2C AE830184 */ sw $v1, 0x184($s4) -/* 41DAC0 802A8D30 080AA6AB */ j .L802A9AAC +/* 41DAC0 802A8D30 080AA6AB */ j L802A9AAC_41E83C /* 41DAC4 802A8D34 00000000 */ nop glabel L802A8D38_41DAC8 /* 41DAC8 802A8D38 0C0A8B21 */ jal func_802A2C84 /* 41DACC 802A8D3C 00000000 */ nop /* 41DAD0 802A8D40 0C0A846C */ jal func_802A11B0 /* 41DAD4 802A8D44 00000000 */ nop -/* 41DAD8 802A8D48 10400358 */ beqz $v0, .L802A9AAC +/* 41DAD8 802A8D48 10400358 */ beqz $v0, L802A9AAC_41E83C /* 41DADC 802A8D4C 2402000B */ addiu $v0, $zero, 0xb /* 41DAE0 802A8D50 080AA6A9 */ j .L802A9AA4 /* 41DAE4 802A8D54 00000000 */ nop @@ -807,7 +807,7 @@ glabel L802A8D70_41DB00 /* 41DB00 802A8D70 0C0A8B21 */ jal func_802A2C84 /* 41DB04 802A8D74 00000000 */ nop /* 41DB08 802A8D78 2403FFFF */ addiu $v1, $zero, -1 -/* 41DB0C 802A8D7C 1043034B */ beq $v0, $v1, .L802A9AAC +/* 41DB0C 802A8D7C 1043034B */ beq $v0, $v1, L802A9AAC_41E83C /* 41DB10 802A8D80 2402000B */ addiu $v0, $zero, 0xb /* 41DB14 802A8D84 080AA6A9 */ j .L802A9AA4 /* 41DB18 802A8D88 00000000 */ nop @@ -868,7 +868,7 @@ glabel L802A8D8C_41DB1C /* 41DBE0 802A8E50 24020029 */ addiu $v0, $zero, 0x29 glabel L802A8E54_41DBE4 /* 41DBE4 802A8E54 8643032C */ lh $v1, 0x32c($s2) -/* 41DBE8 802A8E58 10600314 */ beqz $v1, .L802A9AAC +/* 41DBE8 802A8E58 10600314 */ beqz $v1, L802A9AAC_41E83C /* 41DBEC 802A8E5C 240200FF */ addiu $v0, $zero, 0xff /* 41DBF0 802A8E60 5462000B */ bnel $v1, $v0, .L802A8E90 /* 41DBF4 802A8E64 2402002C */ addiu $v0, $zero, 0x2c @@ -928,16 +928,16 @@ glabel L802A8F00_41DC90 .L802A8F34: /* 41DCC4 802A8F34 0C0A846C */ jal func_802A11B0 /* 41DCC8 802A8F38 00000000 */ nop -/* 41DCCC 802A8F3C 104002DB */ beqz $v0, .L802A9AAC +/* 41DCCC 802A8F3C 104002DB */ beqz $v0, L802A9AAC_41E83C /* 41DCD0 802A8F40 00000000 */ nop /* 41DCD4 802A8F44 0C090464 */ jal func_80241190 /* 41DCD8 802A8F48 24040011 */ addiu $a0, $zero, 0x11 -/* 41DCDC 802A8F4C 080AA6AB */ j .L802A9AAC +/* 41DCDC 802A8F4C 080AA6AB */ j L802A9AAC_41E83C /* 41DCE0 802A8F50 00000000 */ nop glabel L802A8F54_41DCE4 /* 41DCE4 802A8F54 0C0A846C */ jal func_802A11B0 /* 41DCE8 802A8F58 00000000 */ nop -/* 41DCEC 802A8F5C 104002D3 */ beqz $v0, .L802A9AAC +/* 41DCEC 802A8F5C 104002D3 */ beqz $v0, L802A9AAC_41E83C /* 41DCF0 802A8F60 24020029 */ addiu $v0, $zero, 0x29 /* 41DCF4 802A8F64 080AA6A9 */ j .L802A9AA4 /* 41DCF8 802A8F68 00000000 */ nop @@ -1024,7 +1024,7 @@ glabel L802A908C_41DE1C /* 41DE20 802A9090 2402FFFF */ addiu $v0, $zero, -1 /* 41DE24 802A9094 10620283 */ beq $v1, $v0, .L802A9AA4 /* 41DE28 802A9098 24020038 */ addiu $v0, $zero, 0x38 -/* 41DE2C 802A909C 10600283 */ beqz $v1, .L802A9AAC +/* 41DE2C 802A909C 10600283 */ beqz $v1, L802A9AAC_41E83C /* 41DE30 802A90A0 240200FF */ addiu $v0, $zero, 0xff /* 41DE34 802A90A4 5462000B */ bnel $v1, $v0, .L802A90D4 /* 41DE38 802A90A8 24020036 */ addiu $v0, $zero, 0x36 @@ -1082,7 +1082,7 @@ glabel L802A913C_41DECC glabel L802A9170_41DF00 /* 41DF00 802A9170 0C0A846C */ jal func_802A11B0 /* 41DF04 802A9174 00000000 */ nop -/* 41DF08 802A9178 1040024C */ beqz $v0, .L802A9AAC +/* 41DF08 802A9178 1040024C */ beqz $v0, L802A9AAC_41E83C /* 41DF0C 802A917C 24020033 */ addiu $v0, $zero, 0x33 /* 41DF10 802A9180 080AA6A9 */ j .L802A9AA4 /* 41DF14 802A9184 00000000 */ nop @@ -1096,16 +1096,15 @@ glabel L802A9188_41DF18 glabel L802A91A0_41DF30 /* 41DF30 802A91A0 0C03C54E */ jal func_800F1538 /* 41DF34 802A91A4 00000000 */ nop -.L802A91A8: glabel L802A91A8_41DF38 /* 41DF38 802A91A8 0C0A842E */ jal func_802A10B8 /* 41DF3C 802A91AC 00000000 */ nop -/* 41DF40 802A91B0 080AA6AB */ j .L802A9AAC +/* 41DF40 802A91B0 080AA6AB */ j L802A9AAC_41E83C /* 41DF44 802A91B4 00000000 */ nop glabel L802A91B8_41DF48 /* 41DF48 802A91B8 8643032C */ lh $v1, 0x32c($s2) /* 41DF4C 802A91BC 2402FFFF */ addiu $v0, $zero, -1 -/* 41DF50 802A91C0 1062023A */ beq $v1, $v0, .L802A9AAC +/* 41DF50 802A91C0 1062023A */ beq $v1, $v0, L802A9AAC_41E83C /* 41DF54 802A91C4 24020033 */ addiu $v0, $zero, 0x33 /* 41DF58 802A91C8 080AA6A9 */ j .L802A9AA4 /* 41DF5C 802A91CC 00000000 */ nop @@ -1217,7 +1216,7 @@ glabel L802A935C_41E0EC /* 41E0EC 802A935C 0C0A8B21 */ jal func_802A2C84 /* 41E0F0 802A9360 00000000 */ nop /* 41E0F4 802A9364 0040802D */ daddu $s0, $v0, $zero -/* 41E0F8 802A9368 120001D0 */ beqz $s0, .L802A9AAC +/* 41E0F8 802A9368 120001D0 */ beqz $s0, L802A9AAC_41E83C /* 41E0FC 802A936C 240200FF */ addiu $v0, $zero, 0xff /* 41E100 802A9370 5602000B */ bnel $s0, $v0, .L802A93A0 /* 41E104 802A9374 2602FFFF */ addiu $v0, $s0, -1 @@ -1260,7 +1259,7 @@ glabel L802A93C8_41E158 .L802A9400: /* 41E190 802A9400 0C0A846C */ jal func_802A11B0 /* 41E194 802A9404 00000000 */ nop -/* 41E198 802A9408 104001A8 */ beqz $v0, .L802A9AAC +/* 41E198 802A9408 104001A8 */ beqz $v0, L802A9AAC_41E83C /* 41E19C 802A940C 24020040 */ addiu $v0, $zero, 0x40 /* 41E1A0 802A9410 A682006C */ sh $v0, 0x6c($s4) /* 41E1A4 802A9414 24020041 */ addiu $v0, $zero, 0x41 @@ -1290,14 +1289,14 @@ glabel L802A93C8_41E158 /* 41E204 802A9474 A2820062 */ sb $v0, 0x62($s4) /* 41E208 802A9478 0C090464 */ jal func_80241190 /* 41E20C 802A947C AE850184 */ sw $a1, 0x184($s4) -/* 41E210 802A9480 080AA6AB */ j .L802A9AAC +/* 41E210 802A9480 080AA6AB */ j L802A9AAC_41E83C /* 41E214 802A9484 00000000 */ nop glabel L802A9488_41E218 /* 41E218 802A9488 0C0A8B21 */ jal func_802A2C84 /* 41E21C 802A948C 00000000 */ nop /* 41E220 802A9490 0C0A846C */ jal func_802A11B0 /* 41E224 802A9494 00000000 */ nop -/* 41E228 802A9498 10400184 */ beqz $v0, .L802A9AAC +/* 41E228 802A9498 10400184 */ beqz $v0, L802A9AAC_41E83C /* 41E22C 802A949C 2402003D */ addiu $v0, $zero, 0x3d /* 41E230 802A94A0 080AA6A9 */ j .L802A9AA4 /* 41E234 802A94A4 00000000 */ nop @@ -1311,7 +1310,7 @@ glabel L802A94A8_41E238 glabel L802A94C0_41E250 /* 41E250 802A94C0 0C0A89F9 */ jal func_802A27E4 /* 41E254 802A94C4 00000000 */ nop -/* 41E258 802A94C8 080AA46A */ j .L802A91A8 +/* 41E258 802A94C8 080AA46A */ j L802A91A8_41DF38 /* 41E25C 802A94CC 00000000 */ nop glabel L802A94D0_41E260 /* 41E260 802A94D0 0C098C9A */ jal func_80263268 @@ -1397,7 +1396,7 @@ glabel L802A9600_41E390 /* 41E390 802A9600 0C0A9295 */ jal func_802A4A54 /* 41E394 802A9604 00000000 */ nop /* 41E398 802A9608 0040802D */ daddu $s0, $v0, $zero -/* 41E39C 802A960C 12000127 */ beqz $s0, .L802A9AAC +/* 41E39C 802A960C 12000127 */ beqz $s0, L802A9AAC_41E83C /* 41E3A0 802A9610 240200FF */ addiu $v0, $zero, 0xff /* 41E3A4 802A9614 1602000B */ bne $s0, $v0, .L802A9644 /* 41E3A8 802A9618 2603FFFF */ addiu $v1, $s0, -1 @@ -1446,7 +1445,7 @@ glabel L802A9684_41E414 .L802A96BC: /* 41E44C 802A96BC 0C0A846C */ jal func_802A11B0 /* 41E450 802A96C0 00000000 */ nop -/* 41E454 802A96C4 104000F9 */ beqz $v0, .L802A9AAC +/* 41E454 802A96C4 104000F9 */ beqz $v0, L802A9AAC_41E83C /* 41E458 802A96C8 240200CC */ addiu $v0, $zero, 0xcc /* 41E45C 802A96CC 8290004A */ lb $s0, 0x4a($s4) /* 41E460 802A96D0 A682006C */ sh $v0, 0x6c($s4) @@ -1459,13 +1458,13 @@ glabel L802A9684_41E414 /* 41E47C 802A96EC 24020003 */ addiu $v0, $zero, 3 /* 41E480 802A96F0 12020011 */ beq $s0, $v0, .L802A9738 /* 41E484 802A96F4 240200CD */ addiu $v0, $zero, 0xcd -/* 41E488 802A96F8 080AA6AB */ j .L802A9AAC +/* 41E488 802A96F8 080AA6AB */ j L802A9AAC_41E83C /* 41E48C 802A96FC 00000000 */ nop .L802A9700: /* 41E490 802A9700 2402000A */ addiu $v0, $zero, 0xa /* 41E494 802A9704 12020017 */ beq $s0, $v0, .L802A9764 /* 41E498 802A9708 240200CD */ addiu $v0, $zero, 0xcd -/* 41E49C 802A970C 080AA6AB */ j .L802A9AAC +/* 41E49C 802A970C 080AA6AB */ j L802A9AAC_41E83C /* 41E4A0 802A9710 00000000 */ nop .L802A9714: /* 41E4A4 802A9714 240200CD */ addiu $v0, $zero, 0xcd @@ -1475,7 +1474,7 @@ glabel L802A9684_41E414 /* 41E4B4 802A9724 00000000 */ nop /* 41E4B8 802A9728 0C090464 */ jal func_80241190 /* 41E4BC 802A972C 24040017 */ addiu $a0, $zero, 0x17 -/* 41E4C0 802A9730 080AA6AB */ j .L802A9AAC +/* 41E4C0 802A9730 080AA6AB */ j L802A9AAC_41E83C /* 41E4C4 802A9734 00000000 */ nop .L802A9738: /* 41E4C8 802A9738 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) @@ -1487,7 +1486,7 @@ glabel L802A9684_41E414 /* 41E4E0 802A9750 A2900178 */ sb $s0, 0x178($s4) /* 41E4E4 802A9754 0C090464 */ jal func_80241190 /* 41E4E8 802A9758 A682017C */ sh $v0, 0x17c($s4) -/* 41E4EC 802A975C 080AA6AB */ j .L802A9AAC +/* 41E4EC 802A975C 080AA6AB */ j L802A9AAC_41E83C /* 41E4F0 802A9760 00000000 */ nop .L802A9764: /* 41E4F4 802A9764 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) @@ -1497,14 +1496,14 @@ glabel L802A9684_41E414 .L802A9774: /* 41E504 802A9774 0C090464 */ jal func_80241190 /* 41E508 802A9778 2404000A */ addiu $a0, $zero, 0xa -/* 41E50C 802A977C 080AA6AB */ j .L802A9AAC +/* 41E50C 802A977C 080AA6AB */ j L802A9AAC_41E83C /* 41E510 802A9780 00000000 */ nop glabel L802A9784_41E514 /* 41E514 802A9784 0C0A9295 */ jal func_802A4A54 /* 41E518 802A9788 00000000 */ nop /* 41E51C 802A978C 0C0A846C */ jal func_802A11B0 /* 41E520 802A9790 00000000 */ nop -/* 41E524 802A9794 104000C5 */ beqz $v0, .L802A9AAC +/* 41E524 802A9794 104000C5 */ beqz $v0, L802A9AAC_41E83C /* 41E528 802A9798 24020008 */ addiu $v0, $zero, 8 /* 41E52C 802A979C 3C01802B */ lui $at, %hi(D_802ACC60) /* 41E530 802A97A0 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -1596,7 +1595,7 @@ glabel L802A98D8_41E668 /* 41E66C 802A98DC 2402FFFF */ addiu $v0, $zero, -1 /* 41E670 802A98E0 10620070 */ beq $v1, $v0, .L802A9AA4 /* 41E674 802A98E4 24020024 */ addiu $v0, $zero, 0x24 -/* 41E678 802A98E8 10600070 */ beqz $v1, .L802A9AAC +/* 41E678 802A98E8 10600070 */ beqz $v1, L802A9AAC_41E83C /* 41E67C 802A98EC 240200FF */ addiu $v0, $zero, 0xff /* 41E680 802A98F0 1462000C */ bne $v1, $v0, .L802A9924 /* 41E684 802A98F4 24020022 */ addiu $v0, $zero, 0x22 @@ -1610,7 +1609,7 @@ glabel L802A98D8_41E668 /* 41E6A0 802A9910 00000000 */ nop /* 41E6A4 802A9914 0C0AA072 */ jal update_partner_menu /* 41E6A8 802A9918 00000000 */ nop -/* 41E6AC 802A991C 080AA6AB */ j .L802A9AAC +/* 41E6AC 802A991C 080AA6AB */ j L802A9AAC_41E83C /* 41E6B0 802A9920 00000000 */ nop .L802A9924: /* 41E6B4 802A9924 A682006C */ sh $v0, 0x6c($s4) @@ -1663,7 +1662,7 @@ glabel L802A9994_41E724 .L802A99D8: /* 41E768 802A99D8 0C0A846C */ jal func_802A11B0 /* 41E76C 802A99DC 00000000 */ nop -/* 41E770 802A99E0 10400032 */ beqz $v0, .L802A9AAC +/* 41E770 802A99E0 10400032 */ beqz $v0, L802A9AAC_41E83C /* 41E774 802A99E4 00000000 */ nop /* 41E778 802A99E8 8682006E */ lh $v0, 0x6e($s4) /* 41E77C 802A99EC 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) @@ -1672,14 +1671,14 @@ glabel L802A9994_41E724 /* 41E788 802A99F8 00000000 */ nop /* 41E78C 802A99FC 0C090464 */ jal func_80241190 /* 41E790 802A9A00 2404001D */ addiu $a0, $zero, 0x1d -/* 41E794 802A9A04 080AA6AB */ j .L802A9AAC +/* 41E794 802A9A04 080AA6AB */ j L802A9AAC_41E83C /* 41E798 802A9A08 00000000 */ nop glabel L802A9A0C_41E79C /* 41E79C 802A9A0C 0C0A9295 */ jal func_802A4A54 /* 41E7A0 802A9A10 00000000 */ nop /* 41E7A4 802A9A14 0C0A846C */ jal func_802A11B0 /* 41E7A8 802A9A18 00000000 */ nop -/* 41E7AC 802A9A1C 10400023 */ beqz $v0, .L802A9AAC +/* 41E7AC 802A9A1C 10400023 */ beqz $v0, L802A9AAC_41E83C /* 41E7B0 802A9A20 2402001F */ addiu $v0, $zero, 0x1f /* 41E7B4 802A9A24 080AA6A9 */ j .L802A9AA4 /* 41E7B8 802A9A28 00000000 */ nop @@ -1698,7 +1697,7 @@ glabel L802A9A4C_41E7DC glabel L802A9A54_41E7E4 /* 41E7E4 802A9A54 0C0A91CB */ jal func_802A472C /* 41E7E8 802A9A58 00000000 */ nop -/* 41E7EC 802A9A5C 080AA46A */ j .L802A91A8 +/* 41E7EC 802A9A5C 080AA46A */ j L802A91A8_41DF38 /* 41E7F0 802A9A60 00000000 */ nop glabel L802A9A64_41E7F4 /* 41E7F4 802A9A64 24040006 */ addiu $a0, $zero, 6 @@ -1709,7 +1708,7 @@ glabel L802A9A64_41E7F4 /* 41E808 802A9A78 24050002 */ addiu $a1, $zero, 2 /* 41E80C 802A9A7C 8643032C */ lh $v1, 0x32c($s2) /* 41E810 802A9A80 2402FFFF */ addiu $v0, $zero, -1 -/* 41E814 802A9A84 10620009 */ beq $v1, $v0, .L802A9AAC +/* 41E814 802A9A84 10620009 */ beq $v1, $v0, L802A9AAC_41E83C /* 41E818 802A9A88 24040006 */ addiu $a0, $zero, 6 /* 41E81C 802A9A8C 0C051F9F */ jal set_window_update /* 41E820 802A9A90 24050009 */ addiu $a1, $zero, 9 @@ -1720,7 +1719,6 @@ glabel L802A9A64_41E7F4 .L802A9AA4: /* 41E834 802A9AA4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41E838 802A9AA8 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -.L802A9AAC: glabel L802A9AAC_41E83C /* 41E83C 802A9AAC 8FBF0034 */ lw $ra, 0x34($sp) /* 41E840 802A9AB0 8FBE0030 */ lw $fp, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/code_415D90/update_player_menu.s b/ver/us/asm/nonmatchings/code_415D90/update_player_menu.s index 9871a0907d..e5e09a28cb 100644 --- a/ver/us/asm/nonmatchings/code_415D90/update_player_menu.s +++ b/ver/us/asm/nonmatchings/code_415D90/update_player_menu.s @@ -179,7 +179,7 @@ glabel update_player_menu /* 41A9B8 802A5C28 8C42C4DC */ lw $v0, %lo(gBattleStatus+0x46C)($v0) /* 41A9BC 802A5C2C 2443FFFF */ addiu $v1, $v0, -1 /* 41A9C0 802A5C30 2C62012E */ sltiu $v0, $v1, 0x12e -/* 41A9C4 802A5C34 10400943 */ beqz $v0, .L802A8144 +/* 41A9C4 802A5C34 10400943 */ beqz $v0, L802A8144_41CED4 /* 41A9C8 802A5C38 00031080 */ sll $v0, $v1, 2 /* 41A9CC 802A5C3C 3C01802B */ lui $at, %hi(jtbl_802ABBD8) /* 41A9D0 802A5C40 00220821 */ addu $at, $at, $v0 @@ -603,14 +603,14 @@ glabel L802A6170_41AF00 /* 41AFE0 802A6250 080A9F71 */ j .L802A7DC4 /* 41AFE4 802A6254 00000000 */ nop .L802A6258: -/* 41AFE8 802A6258 122007BA */ beqz $s1, .L802A8144 +/* 41AFE8 802A6258 122007BA */ beqz $s1, L802A8144_41CED4 /* 41AFEC 802A625C 3C030020 */ lui $v1, 0x20 /* 41AFF0 802A6260 8E220000 */ lw $v0, ($s1) /* 41AFF4 802A6264 00431024 */ and $v0, $v0, $v1 -/* 41AFF8 802A6268 144007B6 */ bnez $v0, .L802A8144 +/* 41AFF8 802A6268 144007B6 */ bnez $v0, L802A8144_41CED4 /* 41AFFC 802A626C 24020001 */ addiu $v0, $zero, 1 /* 41B000 802A6270 82C3008B */ lb $v1, 0x8b($s6) -/* 41B004 802A6274 106207B3 */ beq $v1, $v0, .L802A8144 +/* 41B004 802A6274 106207B3 */ beq $v1, $v0, L802A8144_41CED4 /* 41B008 802A6278 00000000 */ nop /* 41B00C 802A627C 0C05272D */ jal play_sound /* 41B010 802A6280 2404021D */ addiu $a0, $zero, 0x21d @@ -622,7 +622,7 @@ glabel L802A6170_41AF00 /* 41B024 802A6294 8C620000 */ lw $v0, ($v1) /* 41B028 802A6298 5440058D */ bnel $v0, $zero, .L802A78D0 /* 41B02C 802A629C 2442FFFF */ addiu $v0, $v0, -1 -/* 41B030 802A62A0 120007A8 */ beqz $s0, .L802A8144 +/* 41B030 802A62A0 120007A8 */ beqz $s0, L802A8144_41CED4 /* 41B034 802A62A4 0000202D */ daddu $a0, $zero, $zero /* 41B038 802A62A8 0080282D */ daddu $a1, $a0, $zero /* 41B03C 802A62AC 3C060001 */ lui $a2, 1 @@ -936,7 +936,7 @@ glabel L802A6170_41AF00 /* 41B490 802A6700 A6C0017A */ sh $zero, 0x17a($s6) /* 41B494 802A6704 0C090464 */ jal func_80241190 /* 41B498 802A6708 A6C0017C */ sh $zero, 0x17c($s6) -/* 41B49C 802A670C 080AA051 */ j .L802A8144 +/* 41B49C 802A670C 080AA051 */ j L802A8144_41CED4 /* 41B4A0 802A6710 00000000 */ nop .L802A6714: /* 41B4A4 802A6714 92C2020E */ lbu $v0, 0x20e($s6) @@ -1125,7 +1125,7 @@ glabel L802A69A0_41B730 /* 41B73C 802A69AC 2402FFFF */ addiu $v0, $zero, -1 /* 41B740 802A69B0 120205E2 */ beq $s0, $v0, .L802A813C /* 41B744 802A69B4 24020007 */ addiu $v0, $zero, 7 -/* 41B748 802A69B8 120005E2 */ beqz $s0, .L802A8144 +/* 41B748 802A69B8 120005E2 */ beqz $s0, L802A8144_41CED4 /* 41B74C 802A69BC 240200FF */ addiu $v0, $zero, 0xff /* 41B750 802A69C0 5602000B */ bnel $s0, $v0, .L802A69F0 /* 41B754 802A69C4 2602FFFF */ addiu $v0, $s0, -1 @@ -1199,7 +1199,7 @@ glabel L802A6A88_41B818 .L802A6AC0: /* 41B850 802A6AC0 0C0A846C */ jal func_802A11B0 /* 41B854 802A6AC4 00000000 */ nop -/* 41B858 802A6AC8 1040059E */ beqz $v0, .L802A8144 +/* 41B858 802A6AC8 1040059E */ beqz $v0, L802A8144_41CED4 /* 41B85C 802A6ACC 24020005 */ addiu $v0, $zero, 5 /* 41B860 802A6AD0 A6C2006C */ sh $v0, 0x6c($s6) /* 41B864 802A6AD4 82C20049 */ lb $v0, 0x49($s6) @@ -1226,12 +1226,12 @@ glabel L802A6A88_41B818 /* 41B8B8 802A6B28 24020004 */ addiu $v0, $zero, 4 /* 41B8BC 802A6B2C 12000007 */ beqz $s0, .L802A6B4C /* 41B8C0 802A6B30 24040011 */ addiu $a0, $zero, 0x11 -/* 41B8C4 802A6B34 080AA051 */ j .L802A8144 +/* 41B8C4 802A6B34 080AA051 */ j L802A8144_41CED4 /* 41B8C8 802A6B38 00000000 */ nop .L802A6B3C: /* 41B8CC 802A6B3C 1202000F */ beq $s0, $v0, .L802A6B7C /* 41B8D0 802A6B40 00000000 */ nop -/* 41B8D4 802A6B44 080AA051 */ j .L802A8144 +/* 41B8D4 802A6B44 080AA051 */ j L802A8144_41CED4 /* 41B8D8 802A6B48 00000000 */ nop .L802A6B4C: /* 41B8DC 802A6B4C 92A20000 */ lbu $v0, ($s5) @@ -1246,7 +1246,7 @@ glabel L802A6A88_41B818 /* 41B8F8 802A6B68 00021603 */ sra $v0, $v0, 0x18 /* 41B8FC 802A6B6C 0C090464 */ jal func_80241190 /* 41B900 802A6B70 A6C2017A */ sh $v0, 0x17a($s6) -/* 41B904 802A6B74 080AA051 */ j .L802A8144 +/* 41B904 802A6B74 080AA051 */ j L802A8144_41CED4 /* 41B908 802A6B78 00000000 */ nop .L802A6B7C: /* 41B90C 802A6B7C 86C2006E */ lh $v0, 0x6e($s6) @@ -1261,7 +1261,7 @@ glabel L802A6B98_41B928 /* 41B92C 802A6B9C 00000000 */ nop /* 41B930 802A6BA0 0C0A846C */ jal func_802A11B0 /* 41B934 802A6BA4 00000000 */ nop -/* 41B938 802A6BA8 10400566 */ beqz $v0, .L802A8144 +/* 41B938 802A6BA8 10400566 */ beqz $v0, L802A8144_41CED4 /* 41B93C 802A6BAC 24020002 */ addiu $v0, $zero, 2 /* 41B940 802A6BB0 080AA04F */ j .L802A813C /* 41B944 802A6BB4 00000000 */ nop @@ -1276,7 +1276,7 @@ glabel L802A6BD0_41B960 /* 41B960 802A6BD0 0C0A8B21 */ jal func_802A2C84 /* 41B964 802A6BD4 00000000 */ nop /* 41B968 802A6BD8 2403FFFF */ addiu $v1, $zero, -1 -/* 41B96C 802A6BDC 10430559 */ beq $v0, $v1, .L802A8144 +/* 41B96C 802A6BDC 10430559 */ beq $v0, $v1, L802A8144_41CED4 /* 41B970 802A6BE0 24020002 */ addiu $v0, $zero, 2 /* 41B974 802A6BE4 080AA04F */ j .L802A813C /* 41B978 802A6BE8 00000000 */ nop @@ -1304,7 +1304,7 @@ glabel L802A6BEC_41B97C glabel L802A6C34_41B9C4 /* 41B9C4 802A6C34 0C093EAD */ jal is_popup_displayed /* 41B9C8 802A6C38 00000000 */ nop -/* 41B9CC 802A6C3C 14400541 */ bnez $v0, .L802A8144 +/* 41B9CC 802A6C3C 14400541 */ bnez $v0, L802A8144_41CED4 /* 41B9D0 802A6C40 24020004 */ addiu $v0, $zero, 4 /* 41B9D4 802A6C44 3C01802B */ lui $at, %hi(D_802ACC6C) /* 41B9D8 802A6C48 AC22CC6C */ sw $v0, %lo(D_802ACC6C)($at) @@ -1333,7 +1333,7 @@ glabel L802A6C74_41BA04 /* 41BA2C 802A6C9C 080AA04F */ j .L802A813C /* 41BA30 802A6CA0 2402000C */ addiu $v0, $zero, 0xc .L802A6CA4: -/* 41BA34 802A6CA4 12000527 */ beqz $s0, .L802A8144 +/* 41BA34 802A6CA4 12000527 */ beqz $s0, L802A8144_41CED4 /* 41BA38 802A6CA8 00000000 */ nop .L802A6CAC: /* 41BA3C 802A6CAC 82C40048 */ lb $a0, 0x48($s6) @@ -1345,7 +1345,7 @@ glabel L802A6C74_41BA04 /* 41BA54 802A6CC4 24020001 */ addiu $v0, $zero, 1 /* 41BA58 802A6CC8 1082000C */ beq $a0, $v0, .L802A6CFC /* 41BA5C 802A6CCC 00000000 */ nop -/* 41BA60 802A6CD0 080A9B56 */ j .L802A6D58 +/* 41BA60 802A6CD0 080A9B56 */ j L802A6D58_41BAE8 /* 41BA64 802A6CD4 00000000 */ nop .L802A6CD8: /* 41BA68 802A6CD8 92A30000 */ lbu $v1, ($s5) @@ -1380,13 +1380,12 @@ glabel L802A6C74_41BA04 /* 41BAD4 802A6D44 24040011 */ addiu $a0, $zero, 0x11 /* 41BAD8 802A6D48 0C090464 */ jal func_80241190 /* 41BADC 802A6D4C AEC20184 */ sw $v0, 0x184($s6) -/* 41BAE0 802A6D50 080AA051 */ j .L802A8144 +/* 41BAE0 802A6D50 080AA051 */ j L802A8144_41CED4 /* 41BAE4 802A6D54 00000000 */ nop -.L802A6D58: glabel L802A6D58_41BAE8 /* 41BAE8 802A6D58 0C0A846C */ jal func_802A11B0 /* 41BAEC 802A6D5C 00000000 */ nop -/* 41BAF0 802A6D60 104004F8 */ beqz $v0, .L802A8144 +/* 41BAF0 802A6D60 104004F8 */ beqz $v0, L802A8144_41CED4 /* 41BAF4 802A6D64 24020008 */ addiu $v0, $zero, 8 /* 41BAF8 802A6D68 3C01802B */ lui $at, %hi(D_802ACC60) /* 41BAFC 802A6D6C AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -1511,7 +1510,7 @@ glabel L802A6D94_41BB24 glabel L802A6F1C_41BCAC /* 41BCAC 802A6F1C 3C03802B */ lui $v1, %hi(D_802ACFFC) /* 41BCB0 802A6F20 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) -/* 41BCB4 802A6F24 10600487 */ beqz $v1, .L802A8144 +/* 41BCB4 802A6F24 10600487 */ beqz $v1, L802A8144_41CED4 /* 41BCB8 802A6F28 240200FF */ addiu $v0, $zero, 0xff /* 41BCBC 802A6F2C 14620007 */ bne $v1, $v0, .L802A6F4C /* 41BCC0 802A6F30 24020018 */ addiu $v0, $zero, 0x18 @@ -1580,7 +1579,7 @@ glabel L802A6FD4_41BD64 .L802A7020: /* 41BDB0 802A7020 0C0A846C */ jal func_802A11B0 /* 41BDB4 802A7024 00000000 */ nop -/* 41BDB8 802A7028 10400446 */ beqz $v0, .L802A8144 +/* 41BDB8 802A7028 10400446 */ beqz $v0, L802A8144_41CED4 /* 41BDBC 802A702C 00000000 */ nop /* 41BDC0 802A7030 080A9E2B */ j .L802A78AC /* 41BDC4 802A7034 00000000 */ nop @@ -1589,7 +1588,7 @@ glabel L802A7038_41BDC8 /* 41BDCC 802A703C 00000000 */ nop /* 41BDD0 802A7040 0C0A846C */ jal func_802A11B0 /* 41BDD4 802A7044 00000000 */ nop -/* 41BDD8 802A7048 1040043E */ beqz $v0, .L802A8144 +/* 41BDD8 802A7048 1040043E */ beqz $v0, L802A8144_41CED4 /* 41BDDC 802A704C 24020015 */ addiu $v0, $zero, 0x15 /* 41BDE0 802A7050 080AA04F */ j .L802A813C /* 41BDE4 802A7054 00000000 */ nop @@ -1607,7 +1606,7 @@ glabel L802A7058_41BDE8 glabel L802A7080_41BE10 /* 41BE10 802A7080 0C03C54E */ jal func_800F1538 /* 41BE14 802A7084 00000000 */ nop -/* 41BE18 802A7088 080A9D8B */ j .L802A762C +/* 41BE18 802A7088 080A9D8B */ j L802A762C_41C3BC /* 41BE1C 802A708C 00000000 */ nop glabel L802A7090_41BE20 /* 41BE20 802A7090 0000A02D */ daddu $s4, $zero, $zero @@ -1684,7 +1683,7 @@ glabel L802A7090_41BE20 glabel L802A7198_41BF28 /* 41BF28 802A7198 3C03802B */ lui $v1, %hi(D_802ACFFC) /* 41BF2C 802A719C 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) -/* 41BF30 802A71A0 106003E8 */ beqz $v1, .L802A8144 +/* 41BF30 802A71A0 106003E8 */ beqz $v1, L802A8144_41CED4 /* 41BF34 802A71A4 240200FF */ addiu $v0, $zero, 0xff /* 41BF38 802A71A8 5462000B */ bnel $v1, $v0, .L802A71D8 /* 41BF3C 802A71AC 2402002C */ addiu $v0, $zero, 0x2c @@ -1752,7 +1751,7 @@ glabel L802A7264_41BFF4 glabel L802A729C_41C02C /* 41C02C 802A729C 0C0A846C */ jal func_802A11B0 /* 41C030 802A72A0 00000000 */ nop -/* 41C034 802A72A4 104003A7 */ beqz $v0, .L802A8144 +/* 41C034 802A72A4 104003A7 */ beqz $v0, L802A8144_41CED4 /* 41C038 802A72A8 24020029 */ addiu $v0, $zero, 0x29 /* 41C03C 802A72AC 080AA04F */ j .L802A813C /* 41C040 802A72B0 00000000 */ nop @@ -1766,11 +1765,10 @@ glabel L802A72B4_41C044 glabel L802A72CC_41C05C /* 41C05C 802A72CC 0C03C54E */ jal func_800F1538 /* 41C060 802A72D0 00000000 */ nop -.L802A72D4: glabel L802A72D4_41C064 /* 41C064 802A72D4 0C0A842E */ jal func_802A10B8 /* 41C068 802A72D8 00000000 */ nop -/* 41C06C 802A72DC 080AA051 */ j .L802A8144 +/* 41C06C 802A72DC 080AA051 */ j L802A8144_41CED4 /* 41C070 802A72E0 00000000 */ nop glabel L802A72E4_41C074 /* 41C074 802A72E4 92C2020E */ lbu $v0, 0x20e($s6) @@ -1900,7 +1898,7 @@ glabel L802A74A4_41C234 /* 41C240 802A74B0 2402FFFF */ addiu $v0, $zero, -1 /* 41C244 802A74B4 12020321 */ beq $s0, $v0, .L802A813C /* 41C248 802A74B8 24020042 */ addiu $v0, $zero, 0x42 -/* 41C24C 802A74BC 12000321 */ beqz $s0, .L802A8144 +/* 41C24C 802A74BC 12000321 */ beqz $s0, L802A8144_41CED4 /* 41C250 802A74C0 240200FF */ addiu $v0, $zero, 0xff /* 41C254 802A74C4 5602000B */ bnel $s0, $v0, .L802A74F4 /* 41C258 802A74C8 2602FFFF */ addiu $v0, $s0, -1 @@ -1946,7 +1944,7 @@ glabel L802A7528_41C2B8 .L802A7560: /* 41C2F0 802A7560 0C0A846C */ jal func_802A11B0 /* 41C2F4 802A7564 00000000 */ nop -/* 41C2F8 802A7568 104002F6 */ beqz $v0, .L802A8144 +/* 41C2F8 802A7568 104002F6 */ beqz $v0, L802A8144_41CED4 /* 41C2FC 802A756C 24020040 */ addiu $v0, $zero, 0x40 /* 41C300 802A7570 A6C2006C */ sh $v0, 0x6c($s6) /* 41C304 802A7574 24020041 */ addiu $v0, $zero, 0x41 @@ -1986,7 +1984,7 @@ glabel L802A75F4_41C384 /* 41C388 802A75F8 00000000 */ nop /* 41C38C 802A75FC 0C0A846C */ jal func_802A11B0 /* 41C390 802A7600 00000000 */ nop -/* 41C394 802A7604 104002CF */ beqz $v0, .L802A8144 +/* 41C394 802A7604 104002CF */ beqz $v0, L802A8144_41CED4 /* 41C398 802A7608 2402003D */ addiu $v0, $zero, 0x3d /* 41C39C 802A760C 080AA04F */ j .L802A813C /* 41C3A0 802A7610 00000000 */ nop @@ -1997,17 +1995,16 @@ glabel L802A7614_41C3A4 /* 41C3B0 802A7620 00000000 */ nop /* 41C3B4 802A7624 080AA04F */ j .L802A813C /* 41C3B8 802A7628 2402003F */ addiu $v0, $zero, 0x3f -.L802A762C: glabel L802A762C_41C3BC /* 41C3BC 802A762C 0C0A89F9 */ jal func_802A27E4 /* 41C3C0 802A7630 00000000 */ nop -/* 41C3C4 802A7634 080A9CB5 */ j .L802A72D4 +/* 41C3C4 802A7634 080A9CB5 */ j L802A72D4_41C064 /* 41C3C8 802A7638 00000000 */ nop glabel L802A763C_41C3CC /* 41C3CC 802A763C 0C0A8B21 */ jal func_802A2C84 /* 41C3D0 802A7640 00000000 */ nop /* 41C3D4 802A7644 2403FFFF */ addiu $v1, $zero, -1 -/* 41C3D8 802A7648 104302BE */ beq $v0, $v1, .L802A8144 +/* 41C3D8 802A7648 104302BE */ beq $v0, $v1, L802A8144_41CED4 /* 41C3DC 802A764C 2402003D */ addiu $v0, $zero, 0x3d /* 41C3E0 802A7650 080AA04F */ j .L802A813C /* 41C3E4 802A7654 00000000 */ nop @@ -2126,7 +2123,7 @@ glabel L802A7658_41C3E8 glabel L802A77F0_41C580 /* 41C580 802A77F0 3C03802B */ lui $v1, %hi(D_802ACFFC) /* 41C584 802A77F4 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) -/* 41C588 802A77F8 10600252 */ beqz $v1, .L802A8144 +/* 41C588 802A77F8 10600252 */ beqz $v1, L802A8144_41CED4 /* 41C58C 802A77FC 240200FF */ addiu $v0, $zero, 0xff /* 41C590 802A7800 14620004 */ bne $v1, $v0, .L802A7814 /* 41C594 802A7804 2402004A */ addiu $v0, $zero, 0x4a @@ -2176,7 +2173,7 @@ glabel L802A7898_41C628 .L802A78AC: /* 41C63C 802A78AC 0C090464 */ jal func_80241190 /* 41C640 802A78B0 24040011 */ addiu $a0, $zero, 0x11 -/* 41C644 802A78B4 080AA051 */ j .L802A8144 +/* 41C644 802A78B4 080AA051 */ j L802A8144_41CED4 /* 41C648 802A78B8 00000000 */ nop glabel L802A78BC_41C64C /* 41C64C 802A78BC 3C03802B */ lui $v1, %hi(D_802ACC60) @@ -2185,7 +2182,7 @@ glabel L802A78BC_41C64C /* 41C658 802A78C8 10400003 */ beqz $v0, .L802A78D8 /* 41C65C 802A78CC 2442FFFF */ addiu $v0, $v0, -1 .L802A78D0: -/* 41C660 802A78D0 080AA051 */ j .L802A8144 +/* 41C660 802A78D0 080AA051 */ j L802A8144_41CED4 /* 41C664 802A78D4 AC620000 */ sw $v0, ($v1) .L802A78D8: /* 41C668 802A78D8 080AA04F */ j .L802A813C @@ -2201,7 +2198,7 @@ glabel L802A78E0_41C670 glabel L802A78FC_41C68C /* 41C68C 802A78FC 0C03C54E */ jal func_800F1538 /* 41C690 802A7900 00000000 */ nop -/* 41C694 802A7904 080AA051 */ j .L802A8144 +/* 41C694 802A7904 080AA051 */ j L802A8144_41CED4 /* 41C698 802A7908 00000000 */ nop glabel L802A790C_41C69C /* 41C69C 802A790C 82A20000 */ lb $v0, ($s5) @@ -2238,7 +2235,7 @@ glabel L802A790C_41C69C /* 41C708 802A7978 A2C20178 */ sb $v0, 0x178($s6) /* 41C70C 802A797C 0C090464 */ jal func_80241190 /* 41C710 802A7980 A2C00095 */ sb $zero, 0x95($s6) -/* 41C714 802A7984 080AA051 */ j .L802A8144 +/* 41C714 802A7984 080AA051 */ j L802A8144_41CED4 /* 41C718 802A7988 00000000 */ nop .L802A798C: /* 41C71C 802A798C 1E200002 */ bgtz $s1, .L802A7998 @@ -2281,7 +2278,7 @@ glabel L802A790C_41C69C /* 41C7A0 802A7A10 00000000 */ nop /* 41C7A4 802A7A14 0C090464 */ jal func_80241190 /* 41C7A8 802A7A18 24040012 */ addiu $a0, $zero, 0x12 -/* 41C7AC 802A7A1C 080AA051 */ j .L802A8144 +/* 41C7AC 802A7A1C 080AA051 */ j L802A8144_41CED4 /* 41C7B0 802A7A20 00000000 */ nop glabel L802A7A24_41C7B4 /* 41C7B4 802A7A24 0C098C9A */ jal func_80263268 @@ -2409,7 +2406,7 @@ glabel L802A7BEC_41C97C /* 41C988 802A7BF8 2402FFFF */ addiu $v0, $zero, -1 /* 41C98C 802A7BFC 1202014F */ beq $s0, $v0, .L802A813C /* 41C990 802A7C00 240200CF */ addiu $v0, $zero, 0xcf -/* 41C994 802A7C04 1200014F */ beqz $s0, .L802A8144 +/* 41C994 802A7C04 1200014F */ beqz $s0, L802A8144_41CED4 /* 41C998 802A7C08 240200FF */ addiu $v0, $zero, 0xff /* 41C99C 802A7C0C 1602000B */ bne $s0, $v0, .L802A7C3C /* 41C9A0 802A7C10 2603FFFF */ addiu $v1, $s0, -1 @@ -2458,7 +2455,7 @@ glabel L802A7C7C_41CA0C .L802A7CB4: /* 41CA44 802A7CB4 0C0A846C */ jal func_802A11B0 /* 41CA48 802A7CB8 00000000 */ nop -/* 41CA4C 802A7CBC 10400121 */ beqz $v0, .L802A8144 +/* 41CA4C 802A7CBC 10400121 */ beqz $v0, L802A8144_41CED4 /* 41CA50 802A7CC0 240200CC */ addiu $v0, $zero, 0xcc /* 41CA54 802A7CC4 82D00048 */ lb $s0, 0x48($s6) /* 41CA58 802A7CC8 A6C2006C */ sh $v0, 0x6c($s6) @@ -2471,7 +2468,7 @@ glabel L802A7C7C_41CA0C /* 41CA74 802A7CE4 24020003 */ addiu $v0, $zero, 3 /* 41CA78 802A7CE8 1202000A */ beq $s0, $v0, .L802A7D14 /* 41CA7C 802A7CEC 240200CD */ addiu $v0, $zero, 0xcd -/* 41CA80 802A7CF0 080AA051 */ j .L802A8144 +/* 41CA80 802A7CF0 080AA051 */ j L802A8144_41CED4 /* 41CA84 802A7CF4 00000000 */ nop .L802A7CF8: /* 41CA88 802A7CF8 24020009 */ addiu $v0, $zero, 9 @@ -2479,7 +2476,7 @@ glabel L802A7C7C_41CA0C /* 41CA90 802A7D00 2402000A */ addiu $v0, $zero, 0xa /* 41CA94 802A7D04 1202002B */ beq $s0, $v0, .L802A7DB4 /* 41CA98 802A7D08 240200CD */ addiu $v0, $zero, 0xcd -/* 41CA9C 802A7D0C 080AA051 */ j .L802A8144 +/* 41CA9C 802A7D0C 080AA051 */ j L802A8144_41CED4 /* 41CAA0 802A7D10 00000000 */ nop .L802A7D14: /* 41CAA4 802A7D14 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) @@ -2491,7 +2488,7 @@ glabel L802A7C7C_41CA0C /* 41CABC 802A7D2C A2D00178 */ sb $s0, 0x178($s6) /* 41CAC0 802A7D30 0C090464 */ jal func_80241190 /* 41CAC4 802A7D34 A6C2017C */ sh $v0, 0x17c($s6) -/* 41CAC8 802A7D38 080AA051 */ j .L802A8144 +/* 41CAC8 802A7D38 080AA051 */ j L802A8144_41CED4 /* 41CACC 802A7D3C 00000000 */ nop .L802A7D40: /* 41CAD0 802A7D40 3C05FBFF */ lui $a1, 0xfbff @@ -2510,7 +2507,7 @@ glabel L802A7C7C_41CA0C .L802A7D74: /* 41CB04 802A7D74 0C090464 */ jal func_80241190 /* 41CB08 802A7D78 24040016 */ addiu $a0, $zero, 0x16 -/* 41CB0C 802A7D7C 080AA051 */ j .L802A8144 +/* 41CB0C 802A7D7C 080AA051 */ j L802A8144_41CED4 /* 41CB10 802A7D80 00000000 */ nop .L802A7D84: /* 41CB14 802A7D84 240200CD */ addiu $v0, $zero, 0xcd @@ -2524,7 +2521,7 @@ glabel L802A7C7C_41CA0C .L802A7DA4: /* 41CB34 802A7DA4 0C090464 */ jal func_80241190 /* 41CB38 802A7DA8 A2D00178 */ sb $s0, 0x178($s6) -/* 41CB3C 802A7DAC 080AA051 */ j .L802A8144 +/* 41CB3C 802A7DAC 080AA051 */ j L802A8144_41CED4 /* 41CB40 802A7DB0 00000000 */ nop .L802A7DB4: /* 41CB44 802A7DB4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) @@ -2534,14 +2531,14 @@ glabel L802A7C7C_41CA0C .L802A7DC4: /* 41CB54 802A7DC4 0C090464 */ jal func_80241190 /* 41CB58 802A7DC8 2404000B */ addiu $a0, $zero, 0xb -/* 41CB5C 802A7DCC 080AA051 */ j .L802A8144 +/* 41CB5C 802A7DCC 080AA051 */ j L802A8144_41CED4 /* 41CB60 802A7DD0 00000000 */ nop glabel L802A7DD4_41CB64 /* 41CB64 802A7DD4 0C0A9295 */ jal func_802A4A54 /* 41CB68 802A7DD8 00000000 */ nop /* 41CB6C 802A7DDC 0C0A846C */ jal func_802A11B0 /* 41CB70 802A7DE0 00000000 */ nop -/* 41CB74 802A7DE4 104000D7 */ beqz $v0, .L802A8144 +/* 41CB74 802A7DE4 104000D7 */ beqz $v0, L802A8144_41CED4 /* 41CB78 802A7DE8 24020008 */ addiu $v0, $zero, 8 /* 41CB7C 802A7DEC 3C01802B */ lui $at, %hi(D_802ACC60) /* 41CB80 802A7DF0 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -2561,7 +2558,7 @@ glabel L802A7E20_41CBB0 /* 41CBB0 802A7E20 0C0A9295 */ jal func_802A4A54 /* 41CBB4 802A7E24 00000000 */ nop /* 41CBB8 802A7E28 2403FFFF */ addiu $v1, $zero, -1 -/* 41CBBC 802A7E2C 104300C5 */ beq $v0, $v1, .L802A8144 +/* 41CBBC 802A7E2C 104300C5 */ beq $v0, $v1, L802A8144_41CED4 /* 41CBC0 802A7E30 240200C9 */ addiu $v0, $zero, 0xc9 /* 41CBC4 802A7E34 080AA04F */ j .L802A813C /* 41CBC8 802A7E38 00000000 */ nop @@ -2646,7 +2643,7 @@ glabel L802A7F54_41CCE4 /* 41CCEC 802A7F5C 2402FFFF */ addiu $v0, $zero, -1 /* 41CCF0 802A7F60 10620076 */ beq $v1, $v0, .L802A813C /* 41CCF4 802A7F64 24020024 */ addiu $v0, $zero, 0x24 -/* 41CCF8 802A7F68 10600076 */ beqz $v1, .L802A8144 +/* 41CCF8 802A7F68 10600076 */ beqz $v1, L802A8144_41CED4 /* 41CCFC 802A7F6C 240200FF */ addiu $v0, $zero, 0xff /* 41CD00 802A7F70 1462000C */ bne $v1, $v0, .L802A7FA4 /* 41CD04 802A7F74 24020022 */ addiu $v0, $zero, 0x22 @@ -2660,7 +2657,7 @@ glabel L802A7F54_41CCE4 /* 41CD20 802A7F90 00000000 */ nop /* 41CD24 802A7F94 0C0A9662 */ jal update_player_menu /* 41CD28 802A7F98 00000000 */ nop -/* 41CD2C 802A7F9C 080AA051 */ j .L802A8144 +/* 41CD2C 802A7F9C 080AA051 */ j L802A8144_41CED4 /* 41CD30 802A7FA0 00000000 */ nop .L802A7FA4: /* 41CD34 802A7FA4 24030023 */ addiu $v1, $zero, 0x23 @@ -2717,7 +2714,7 @@ glabel L802A8024_41CDB4 /* 41CDF8 802A8068 00000000 */ nop /* 41CDFC 802A806C 0C0A846C */ jal func_802A11B0 /* 41CE00 802A8070 00000000 */ nop -/* 41CE04 802A8074 10400033 */ beqz $v0, .L802A8144 +/* 41CE04 802A8074 10400033 */ beqz $v0, L802A8144_41CED4 /* 41CE08 802A8078 00000000 */ nop /* 41CE0C 802A807C 86C2006E */ lh $v0, 0x6e($s6) /* 41CE10 802A8080 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) @@ -2726,14 +2723,14 @@ glabel L802A8024_41CDB4 /* 41CE1C 802A808C 00000000 */ nop /* 41CE20 802A8090 0C090464 */ jal func_80241190 /* 41CE24 802A8094 2404001D */ addiu $a0, $zero, 0x1d -/* 41CE28 802A8098 080AA051 */ j .L802A8144 +/* 41CE28 802A8098 080AA051 */ j L802A8144_41CED4 /* 41CE2C 802A809C 00000000 */ nop glabel L802A80A0_41CE30 /* 41CE30 802A80A0 0C0A9295 */ jal func_802A4A54 /* 41CE34 802A80A4 00000000 */ nop /* 41CE38 802A80A8 0C0A846C */ jal func_802A11B0 /* 41CE3C 802A80AC 00000000 */ nop -/* 41CE40 802A80B0 10400024 */ beqz $v0, .L802A8144 +/* 41CE40 802A80B0 10400024 */ beqz $v0, L802A8144_41CED4 /* 41CE44 802A80B4 2402001F */ addiu $v0, $zero, 0x1f /* 41CE48 802A80B8 080AA04F */ j .L802A813C /* 41CE4C 802A80BC 00000000 */ nop @@ -2752,7 +2749,7 @@ glabel L802A80E0_41CE70 glabel L802A80E8_41CE78 /* 41CE78 802A80E8 0C0A91CB */ jal func_802A472C /* 41CE7C 802A80EC 00000000 */ nop -/* 41CE80 802A80F0 080A9CB5 */ j .L802A72D4 +/* 41CE80 802A80F0 080A9CB5 */ j L802A72D4_41C064 /* 41CE84 802A80F4 00000000 */ nop glabel L802A80F8_41CE88 /* 41CE88 802A80F8 24040006 */ addiu $a0, $zero, 6 @@ -2764,7 +2761,7 @@ glabel L802A80F8_41CE88 /* 41CEA0 802A8110 3C03802B */ lui $v1, %hi(D_802ACFFC) /* 41CEA4 802A8114 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) /* 41CEA8 802A8118 2402FFFF */ addiu $v0, $zero, -1 -/* 41CEAC 802A811C 10620009 */ beq $v1, $v0, .L802A8144 +/* 41CEAC 802A811C 10620009 */ beq $v1, $v0, L802A8144_41CED4 /* 41CEB0 802A8120 24040006 */ addiu $a0, $zero, 6 /* 41CEB4 802A8124 0C051F9F */ jal set_window_update /* 41CEB8 802A8128 24050009 */ addiu $a1, $zero, 9 @@ -2775,7 +2772,6 @@ glabel L802A80F8_41CE88 .L802A813C: /* 41CECC 802A813C 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41CED0 802A8140 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) -.L802A8144: glabel L802A8144_41CED4 /* 41CED4 802A8144 8FBF0034 */ lw $ra, 0x34($sp) /* 41CED8 802A8148 8FBE0030 */ lw $fp, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/code_4219F0/func_802A9234_421C24.s b/ver/us/asm/nonmatchings/code_4219F0/func_802A9234_421C24.s index 9e3e9c57d0..fcfdd3df7c 100644 --- a/ver/us/asm/nonmatchings/code_4219F0/func_802A9234_421C24.s +++ b/ver/us/asm/nonmatchings/code_4219F0/func_802A9234_421C24.s @@ -13,7 +13,7 @@ glabel func_802A9234_421C24 /* 421C44 802A9254 3C12800E */ lui $s2, %hi(gBattleStatus) /* 421C48 802A9258 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) /* 421C4C 802A925C 2C62000D */ sltiu $v0, $v1, 0xd -/* 421C50 802A9260 104000B2 */ beqz $v0, .L802A952C +/* 421C50 802A9260 104000B2 */ beqz $v0, L802A952C_421F1C /* 421C54 802A9264 00031080 */ sll $v0, $v1, 2 /* 421C58 802A9268 3C01802B */ lui $at, %hi(jtbl_802A95D0_421FC0) /* 421C5C 802A926C 00220821 */ addu $at, $at, $v0 @@ -29,7 +29,7 @@ glabel L802A927C_421C6C /* 421C80 802A9290 24040063 */ addiu $a0, $zero, 0x63 /* 421C84 802A9294 24020001 */ addiu $v0, $zero, 1 .L802A9298: -/* 421C88 802A9298 080AA54B */ j .L802A952C +/* 421C88 802A9298 080AA54B */ j L802A952C_421F1C /* 421C8C 802A929C A622004C */ sh $v0, 0x4c($s1) glabel L802A92A0_421C90 /* 421C90 802A92A0 82430083 */ lb $v1, 0x83($s2) @@ -61,7 +61,7 @@ glabel L802A92A0_421C90 /* 421CF0 802A9300 24050002 */ addiu $a1, $zero, 2 .L802A9304: /* 421CF4 802A9304 8222005E */ lb $v0, 0x5e($s1) -/* 421CF8 802A9308 10400088 */ beqz $v0, .L802A952C +/* 421CF8 802A9308 10400088 */ beqz $v0, L802A952C_421F1C /* 421CFC 802A930C 00000000 */ nop /* 421D00 802A9310 8E300008 */ lw $s0, 8($s1) /* 421D04 802A9314 86260058 */ lh $a2, 0x58($s1) @@ -70,11 +70,11 @@ glabel L802A92A0_421C90 /* 421D10 802A9320 0C051261 */ jal set_icon_render_pos /* 421D14 802A9324 24A50032 */ addiu $a1, $a1, 0x32 /* 421D18 802A9328 82220061 */ lb $v0, 0x61($s1) -/* 421D1C 802A932C 1040007F */ beqz $v0, .L802A952C +/* 421D1C 802A932C 1040007F */ beqz $v0, L802A952C_421F1C /* 421D20 802A9330 0200202D */ daddu $a0, $s0, $zero /* 421D24 802A9334 0C05128B */ jal clear_icon_flags /* 421D28 802A9338 24050002 */ addiu $a1, $zero, 2 -/* 421D2C 802A933C 080AA54B */ j .L802A952C +/* 421D2C 802A933C 080AA54B */ j L802A952C_421F1C /* 421D30 802A9340 00000000 */ nop glabel L802A9344_421D34 /* 421D34 802A9344 82430083 */ lb $v1, 0x83($s2) @@ -116,7 +116,7 @@ glabel L802A9344_421D34 /* 421DB8 802A93C8 00501023 */ subu $v0, $v0, $s0 /* 421DBC 802A93CC 18400003 */ blez $v0, .L802A93DC /* 421DC0 802A93D0 2462FFFF */ addiu $v0, $v1, -1 -/* 421DC4 802A93D4 080AA54B */ j .L802A952C +/* 421DC4 802A93D4 080AA54B */ j L802A952C_421F1C /* 421DC8 802A93D8 A622004E */ sh $v0, 0x4e($s1) .L802A93DC: /* 421DCC 802A93DC 86220050 */ lh $v0, 0x50($s1) @@ -142,7 +142,7 @@ glabel L802A9404_421DF4 /* 421E14 802A9424 14400006 */ bnez $v0, .L802A9440 /* 421E18 802A9428 00000000 */ nop /* 421E1C 802A942C 86220054 */ lh $v0, 0x54($s1) -/* 421E20 802A9430 1040003E */ beqz $v0, .L802A952C +/* 421E20 802A9430 1040003E */ beqz $v0, L802A952C_421F1C /* 421E24 802A9434 00000000 */ nop /* 421E28 802A9438 080AA519 */ j .L802A9464 /* 421E2C 802A943C 00000000 */ nop @@ -203,7 +203,7 @@ glabel L802A9404_421DF4 .L802A94FC: /* 421EEC 802A94FC A6220054 */ sh $v0, 0x54($s1) /* 421EF0 802A9500 2402000C */ addiu $v0, $zero, 0xc -/* 421EF4 802A9504 080AA54B */ j .L802A952C +/* 421EF4 802A9504 080AA54B */ j L802A952C_421F1C /* 421EF8 802A9508 A622004C */ sh $v0, 0x4c($s1) glabel L802A950C_421EFC /* 421EFC 802A950C 86220054 */ lh $v0, 0x54($s1) @@ -211,12 +211,11 @@ glabel L802A950C_421EFC /* 421F04 802A9514 10400003 */ beqz $v0, .L802A9524 /* 421F08 802A9518 2462FFFF */ addiu $v0, $v1, -1 .L802A951C: -/* 421F0C 802A951C 080AA54B */ j .L802A952C +/* 421F0C 802A951C 080AA54B */ j L802A952C_421F1C /* 421F10 802A9520 A6220054 */ sh $v0, 0x54($s1) .L802A9524: /* 421F14 802A9524 0C09A327 */ jal func_80268C9C /* 421F18 802A9528 00000000 */ nop -.L802A952C: glabel L802A952C_421F1C /* 421F1C 802A952C 8FBF001C */ lw $ra, 0x1c($sp) /* 421F20 802A9530 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_422000/func_802A936C_42236C.s b/ver/us/asm/nonmatchings/code_422000/func_802A936C_42236C.s index a605d39387..27c1718d93 100644 --- a/ver/us/asm/nonmatchings/code_422000/func_802A936C_42236C.s +++ b/ver/us/asm/nonmatchings/code_422000/func_802A936C_42236C.s @@ -15,7 +15,7 @@ glabel func_802A936C_42236C /* 422394 802A9394 3C12800E */ lui $s2, %hi(gBattleStatus) /* 422398 802A9398 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) /* 42239C 802A939C 2C62000D */ sltiu $v0, $v1, 0xd -/* 4223A0 802A93A0 10400184 */ beqz $v0, .L802A99B4 +/* 4223A0 802A93A0 10400184 */ beqz $v0, L802A99B4_4229B4 /* 4223A4 802A93A4 00031080 */ sll $v0, $v1, 2 /* 4223A8 802A93A8 3C01802B */ lui $at, %hi(jtbl_802A9A90_422A90) /* 4223AC 802A93AC 00220821 */ addu $at, $at, $v0 @@ -86,7 +86,7 @@ glabel L802A93BC_4223BC /* 422494 802A9494 0C0513AC */ jal icon_set_opacity /* 422498 802A9498 240500FF */ addiu $a1, $zero, 0xff /* 42249C 802A949C 24020001 */ addiu $v0, $zero, 1 -/* 4224A0 802A94A0 080AA66D */ j .L802A99B4 +/* 4224A0 802A94A0 080AA66D */ j L802A99B4_4229B4 /* 4224A4 802A94A4 A622004C */ sh $v0, 0x4c($s1) glabel L802A94A8_4224A8 /* 4224A8 802A94A8 0C093EB1 */ jal set_popup_duration @@ -135,7 +135,7 @@ glabel L802A94A8_4224A8 /* 422550 802A9550 0C051261 */ jal set_icon_render_pos /* 422554 802A9554 24C6FFE9 */ addiu $a2, $a2, -0x17 /* 422558 802A9558 8222005E */ lb $v0, 0x5e($s1) -/* 42255C 802A955C 10400115 */ beqz $v0, .L802A99B4 +/* 42255C 802A955C 10400115 */ beqz $v0, L802A99B4_4229B4 /* 422560 802A9560 00000000 */ nop /* 422564 802A9564 8E30001C */ lw $s0, 0x1c($s1) /* 422568 802A9568 86260058 */ lh $a2, 0x58($s1) @@ -144,11 +144,11 @@ glabel L802A94A8_4224A8 /* 422574 802A9574 0C051261 */ jal set_icon_render_pos /* 422578 802A9578 24A50032 */ addiu $a1, $a1, 0x32 /* 42257C 802A957C 82220061 */ lb $v0, 0x61($s1) -/* 422580 802A9580 1040010C */ beqz $v0, .L802A99B4 +/* 422580 802A9580 1040010C */ beqz $v0, L802A99B4_4229B4 /* 422584 802A9584 0200202D */ daddu $a0, $s0, $zero /* 422588 802A9588 0C05128B */ jal clear_icon_flags /* 42258C 802A958C 24050002 */ addiu $a1, $zero, 2 -/* 422590 802A9590 080AA66D */ j .L802A99B4 +/* 422590 802A9590 080AA66D */ j L802A99B4_4229B4 /* 422594 802A9594 00000000 */ nop glabel L802A9598_422598 /* 422598 802A9598 0C093EB1 */ jal set_popup_duration @@ -180,7 +180,7 @@ glabel L802A9598_422598 /* 4225FC 802A95FC 9623004E */ lhu $v1, 0x4e($s1) /* 422600 802A9600 10400003 */ beqz $v0, .L802A9610 /* 422604 802A9604 2462FFFF */ addiu $v0, $v1, -1 -/* 422608 802A9608 080AA66D */ j .L802A99B4 +/* 422608 802A9608 080AA66D */ j L802A99B4_4229B4 /* 42260C 802A960C A622004E */ sh $v0, 0x4e($s1) .L802A9610: /* 422610 802A9610 A6200054 */ sh $zero, 0x54($s1) @@ -202,7 +202,7 @@ glabel L802A9644_422644 /* 422644 802A9644 0C093EB1 */ jal set_popup_duration /* 422648 802A9648 24040063 */ addiu $a0, $zero, 0x63 /* 42264C 802A964C 82420083 */ lb $v0, 0x83($s2) -/* 422650 802A9650 044000D8 */ bltz $v0, .L802A99B4 +/* 422650 802A9650 044000D8 */ bltz $v0, L802A99B4_4229B4 /* 422654 802A9654 3C045555 */ lui $a0, 0x5555 /* 422658 802A9658 34845556 */ ori $a0, $a0, 0x5556 /* 42265C 802A965C 86220050 */ lh $v0, 0x50($s1) @@ -399,7 +399,7 @@ glabel L802A9644_422644 /* 422918 802A9918 00000000 */ nop /* 42291C 802A991C 86230054 */ lh $v1, 0x54($s1) /* 422920 802A9920 86220052 */ lh $v0, 0x52($s1) -/* 422924 802A9924 10620023 */ beq $v1, $v0, .L802A99B4 +/* 422924 802A9924 10620023 */ beq $v1, $v0, L802A99B4_4229B4 /* 422928 802A9928 00000000 */ nop .L802A992C: /* 42292C 802A992C 96220054 */ lhu $v0, 0x54($s1) @@ -409,7 +409,7 @@ glabel L802A9644_422644 /* 42293C 802A993C 00021400 */ sll $v0, $v0, 0x10 /* 422940 802A9940 00021403 */ sra $v0, $v0, 0x10 /* 422944 802A9944 0062182A */ slt $v1, $v1, $v0 -/* 422948 802A9948 1060001A */ beqz $v1, .L802A99B4 +/* 422948 802A9948 1060001A */ beqz $v1, L802A99B4_4229B4 /* 42294C 802A994C 00000000 */ nop /* 422950 802A9950 82420081 */ lb $v0, 0x81($s2) /* 422954 802A9954 14400002 */ bnez $v0, .L802A9960 @@ -428,19 +428,18 @@ glabel L802A9644_422644 /* 422980 802A9980 24020005 */ addiu $v0, $zero, 5 /* 422984 802A9984 A6220054 */ sh $v0, 0x54($s1) /* 422988 802A9988 2402000C */ addiu $v0, $zero, 0xc -/* 42298C 802A998C 080AA66D */ j .L802A99B4 +/* 42298C 802A998C 080AA66D */ j L802A99B4_4229B4 /* 422990 802A9990 A622004C */ sh $v0, 0x4c($s1) glabel L802A9994_422994 /* 422994 802A9994 86220054 */ lh $v0, 0x54($s1) /* 422998 802A9998 96230054 */ lhu $v1, 0x54($s1) /* 42299C 802A999C 10400003 */ beqz $v0, .L802A99AC /* 4229A0 802A99A0 2462FFFF */ addiu $v0, $v1, -1 -/* 4229A4 802A99A4 080AA66D */ j .L802A99B4 +/* 4229A4 802A99A4 080AA66D */ j L802A99B4_4229B4 /* 4229A8 802A99A8 A6220054 */ sh $v0, 0x54($s1) .L802A99AC: /* 4229AC 802A99AC 0C09A327 */ jal func_80268C9C /* 4229B0 802A99B0 00000000 */ nop -.L802A99B4: glabel L802A99B4_4229B4 /* 4229B4 802A99B4 8FBF001C */ lw $ra, 0x1c($sp) /* 4229B8 802A99B8 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s b/ver/us/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s index e901f1e1c2..e07295deee 100644 --- a/ver/us/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s +++ b/ver/us/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s @@ -62,7 +62,7 @@ glabel L802A93C0_422E90 /* 422F1C 802A944C 24050002 */ addiu $a1, $zero, 2 .L802A9450: /* 422F20 802A9450 24020001 */ addiu $v0, $zero, 1 -/* 422F24 802A9454 080AA593 */ j .L802A964C +/* 422F24 802A9454 080AA593 */ j L802A964C_42311C /* 422F28 802A9458 A622004C */ sh $v0, 0x4c($s1) glabel L802A945C_422F2C /* 422F2C 802A945C 96220056 */ lhu $v0, 0x56($s1) @@ -84,14 +84,14 @@ glabel L802A945C_422F2C /* 422F68 802A9498 86250056 */ lh $a1, 0x56($s1) /* 422F6C 802A949C 0C051261 */ jal set_icon_render_pos /* 422F70 802A94A0 24C6001C */ addiu $a2, $a2, 0x1c -/* 422F74 802A94A4 080AA593 */ j .L802A964C +/* 422F74 802A94A4 080AA593 */ j L802A964C_42311C /* 422F78 802A94A8 00000000 */ nop glabel L802A94AC_422F7C /* 422F7C 802A94AC 8622004E */ lh $v0, 0x4e($s1) /* 422F80 802A94B0 9623004E */ lhu $v1, 0x4e($s1) /* 422F84 802A94B4 10400003 */ beqz $v0, .L802A94C4 /* 422F88 802A94B8 2462FFFF */ addiu $v0, $v1, -1 -/* 422F8C 802A94BC 080AA593 */ j .L802A964C +/* 422F8C 802A94BC 080AA593 */ j L802A964C_42311C /* 422F90 802A94C0 A622004E */ sh $v0, 0x4e($s1) .L802A94C4: /* 422F94 802A94C4 8E240004 */ lw $a0, 4($s1) @@ -187,7 +187,7 @@ glabel L802A94F4_422FC4 /* 4230E8 802A9618 24020014 */ addiu $v0, $zero, 0x14 /* 4230EC 802A961C A6220054 */ sh $v0, 0x54($s1) /* 4230F0 802A9620 2402000C */ addiu $v0, $zero, 0xc -/* 4230F4 802A9624 080AA593 */ j .L802A964C +/* 4230F4 802A9624 080AA593 */ j L802A964C_42311C /* 4230F8 802A9628 A622004C */ sh $v0, 0x4c($s1) glabel L802A962C_4230FC /* 4230FC 802A962C 86220054 */ lh $v0, 0x54($s1) @@ -195,12 +195,11 @@ glabel L802A962C_4230FC /* 423104 802A9634 10400003 */ beqz $v0, .L802A9644 /* 423108 802A9638 2462FFFF */ addiu $v0, $v1, -1 .L802A963C: -/* 42310C 802A963C 080AA593 */ j .L802A964C +/* 42310C 802A963C 080AA593 */ j L802A964C_42311C /* 423110 802A9640 A6220054 */ sh $v0, 0x54($s1) .L802A9644: /* 423114 802A9644 0C09A327 */ jal func_80268C9C /* 423118 802A9648 00000000 */ nop -.L802A964C: glabel L802A964C_42311C /* 42311C 802A964C 8623004C */ lh $v1, 0x4c($s1) .L802A9650: diff --git a/ver/us/asm/nonmatchings/code_4233F0/func_802A92DC_4236CC.s b/ver/us/asm/nonmatchings/code_4233F0/func_802A92DC_4236CC.s index b5c73a6095..195a65b86a 100644 --- a/ver/us/asm/nonmatchings/code_4233F0/func_802A92DC_4236CC.s +++ b/ver/us/asm/nonmatchings/code_4233F0/func_802A92DC_4236CC.s @@ -12,7 +12,7 @@ glabel func_802A92DC_4236CC /* 4236E8 802A92F8 3C10800E */ lui $s0, %hi(gBattleStatus) /* 4236EC 802A92FC 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) /* 4236F0 802A9300 2C62000D */ sltiu $v0, $v1, 0xd -/* 4236F4 802A9304 104000E7 */ beqz $v0, .L802A96A4 +/* 4236F4 802A9304 104000E7 */ beqz $v0, L802A96A4_423A94 /* 4236F8 802A9308 00031080 */ sll $v0, $v1, 2 /* 4236FC 802A930C 3C01802B */ lui $at, %hi(jtbl_802A9840_423C30) /* 423700 802A9310 00220821 */ addu $at, $at, $v0 @@ -63,7 +63,7 @@ glabel L802A9320_423710 /* 4237A4 802A93B4 24050002 */ addiu $a1, $zero, 2 .L802A93B8: /* 4237A8 802A93B8 24020001 */ addiu $v0, $zero, 1 -/* 4237AC 802A93BC 080AA5A9 */ j .L802A96A4 +/* 4237AC 802A93BC 080AA5A9 */ j L802A96A4_423A94 /* 4237B0 802A93C0 A622004C */ sh $v0, 0x4c($s1) glabel L802A93C4_4237B4 /* 4237B4 802A93C4 0C093EB1 */ jal set_popup_duration @@ -99,7 +99,7 @@ glabel L802A93C4_4237B4 /* 423828 802A9438 24A5001F */ addiu $a1, $a1, 0x1f /* 42382C 802A943C 0C051261 */ jal set_icon_render_pos /* 423830 802A9440 24C60011 */ addiu $a2, $a2, 0x11 -/* 423834 802A9444 080AA5A9 */ j .L802A96A4 +/* 423834 802A9444 080AA5A9 */ j L802A96A4_423A94 /* 423838 802A9448 00000000 */ nop glabel L802A944C_42383C /* 42383C 802A944C 0C093EB1 */ jal set_popup_duration @@ -108,7 +108,7 @@ glabel L802A944C_42383C /* 423848 802A9458 9623004E */ lhu $v1, 0x4e($s1) /* 42384C 802A945C 10400003 */ beqz $v0, .L802A946C /* 423850 802A9460 2462FFFF */ addiu $v0, $v1, -1 -/* 423854 802A9464 080AA5A9 */ j .L802A96A4 +/* 423854 802A9464 080AA5A9 */ j L802A96A4_423A94 /* 423858 802A9468 A622004E */ sh $v0, 0x4e($s1) .L802A946C: /* 42385C 802A946C 8E240004 */ lw $a0, 4($s1) @@ -231,7 +231,7 @@ glabel L802A9490_423880 /* 423A00 802A9610 96240054 */ lhu $a0, 0x54($s1) /* 423A04 802A9614 10400003 */ beqz $v0, .L802A9624 /* 423A08 802A9618 2482FFFF */ addiu $v0, $a0, -1 -/* 423A0C 802A961C 080AA5A9 */ j .L802A96A4 +/* 423A0C 802A961C 080AA5A9 */ j L802A96A4_423A94 /* 423A10 802A9620 A6220054 */ sh $v0, 0x54($s1) .L802A9624: /* 423A14 802A9624 00031E00 */ sll $v1, $v1, 0x18 @@ -258,19 +258,18 @@ glabel L802A9490_423880 /* 423A60 802A9670 24020014 */ addiu $v0, $zero, 0x14 /* 423A64 802A9674 A6220054 */ sh $v0, 0x54($s1) /* 423A68 802A9678 2402000C */ addiu $v0, $zero, 0xc -/* 423A6C 802A967C 080AA5A9 */ j .L802A96A4 +/* 423A6C 802A967C 080AA5A9 */ j L802A96A4_423A94 /* 423A70 802A9680 A622004C */ sh $v0, 0x4c($s1) glabel L802A9684_423A74 /* 423A74 802A9684 86220054 */ lh $v0, 0x54($s1) /* 423A78 802A9688 96230054 */ lhu $v1, 0x54($s1) /* 423A7C 802A968C 10400003 */ beqz $v0, .L802A969C /* 423A80 802A9690 2462FFFF */ addiu $v0, $v1, -1 -/* 423A84 802A9694 080AA5A9 */ j .L802A96A4 +/* 423A84 802A9694 080AA5A9 */ j L802A96A4_423A94 /* 423A88 802A9698 A6220054 */ sh $v0, 0x54($s1) .L802A969C: /* 423A8C 802A969C 0C09A327 */ jal func_80268C9C /* 423A90 802A96A0 00000000 */ nop -.L802A96A4: glabel L802A96A4_423A94 /* 423A94 802A96A4 8FBF0018 */ lw $ra, 0x18($sp) /* 423A98 802A96A8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/code_423C70/func_802A92F0_423F60.s b/ver/us/asm/nonmatchings/code_423C70/func_802A92F0_423F60.s index b61a4fd4c8..1d360edf85 100644 --- a/ver/us/asm/nonmatchings/code_423C70/func_802A92F0_423F60.s +++ b/ver/us/asm/nonmatchings/code_423C70/func_802A92F0_423F60.s @@ -13,7 +13,7 @@ glabel func_802A92F0_423F60 /* 423F80 802A9310 3C12800E */ lui $s2, %hi(gBattleStatus) /* 423F84 802A9314 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) /* 423F88 802A9318 2C62000D */ sltiu $v0, $v1, 0xd -/* 423F8C 802A931C 10400103 */ beqz $v0, .L802A972C +/* 423F8C 802A931C 10400103 */ beqz $v0, L802A972C_42439C /* 423F90 802A9320 00031080 */ sll $v0, $v1, 2 /* 423F94 802A9324 3C01802B */ lui $at, %hi(jtbl_802AA8E0_425550) /* 423F98 802A9328 00220821 */ addu $at, $at, $v0 @@ -64,7 +64,7 @@ glabel L802A9338_423FA8 /* 42403C 802A93CC 24050002 */ addiu $a1, $zero, 2 .L802A93D0: /* 424040 802A93D0 24020001 */ addiu $v0, $zero, 1 -/* 424044 802A93D4 080AA5CB */ j .L802A972C +/* 424044 802A93D4 080AA5CB */ j L802A972C_42439C /* 424048 802A93D8 A622004C */ sh $v0, 0x4c($s1) glabel L802A93DC_42404C /* 42404C 802A93DC 0C093EB1 */ jal set_popup_duration @@ -100,7 +100,7 @@ glabel L802A93DC_42404C /* 4240C0 802A9450 24A5003C */ addiu $a1, $a1, 0x3c /* 4240C4 802A9454 0C051261 */ jal set_icon_render_pos /* 4240C8 802A9458 24C60017 */ addiu $a2, $a2, 0x17 -/* 4240CC 802A945C 080AA5CB */ j .L802A972C +/* 4240CC 802A945C 080AA5CB */ j L802A972C_42439C /* 4240D0 802A9460 00000000 */ nop glabel L802A9464_4240D4 /* 4240D4 802A9464 0C093EB1 */ jal set_popup_duration @@ -109,7 +109,7 @@ glabel L802A9464_4240D4 /* 4240E0 802A9470 9623004E */ lhu $v1, 0x4e($s1) /* 4240E4 802A9474 10400003 */ beqz $v0, .L802A9484 /* 4240E8 802A9478 2462FFFF */ addiu $v0, $v1, -1 -/* 4240EC 802A947C 080AA5CB */ j .L802A972C +/* 4240EC 802A947C 080AA5CB */ j L802A972C_42439C /* 4240F0 802A9480 A622004E */ sh $v0, 0x4e($s1) .L802A9484: /* 4240F4 802A9484 8E240004 */ lw $a0, 4($s1) @@ -287,7 +287,7 @@ glabel L802A94AC_42411C /* 424368 802A96F8 24020005 */ addiu $v0, $zero, 5 /* 42436C 802A96FC A6220054 */ sh $v0, 0x54($s1) /* 424370 802A9700 2402000C */ addiu $v0, $zero, 0xc -/* 424374 802A9704 080AA5CB */ j .L802A972C +/* 424374 802A9704 080AA5CB */ j L802A972C_42439C /* 424378 802A9708 A622004C */ sh $v0, 0x4c($s1) glabel L802A970C_42437C /* 42437C 802A970C 86220054 */ lh $v0, 0x54($s1) @@ -295,12 +295,11 @@ glabel L802A970C_42437C /* 424384 802A9714 10400003 */ beqz $v0, .L802A9724 /* 424388 802A9718 2462FFFF */ addiu $v0, $v1, -1 .L802A971C: -/* 42438C 802A971C 080AA5CB */ j .L802A972C +/* 42438C 802A971C 080AA5CB */ j L802A972C_42439C /* 424390 802A9720 A6220054 */ sh $v0, 0x54($s1) .L802A9724: /* 424394 802A9724 0C09A327 */ jal func_80268C9C /* 424398 802A9728 00000000 */ nop -.L802A972C: glabel L802A972C_42439C /* 42439C 802A972C 8FBF001C */ lw $ra, 0x1c($sp) /* 4243A0 802A9730 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_425590/func_802A91F8_425788.s b/ver/us/asm/nonmatchings/code_425590/func_802A91F8_425788.s index 71a2d13757..4410d31487 100644 --- a/ver/us/asm/nonmatchings/code_425590/func_802A91F8_425788.s +++ b/ver/us/asm/nonmatchings/code_425590/func_802A91F8_425788.s @@ -12,7 +12,7 @@ glabel func_802A91F8_425788 /* 4257A4 802A9214 3C10800E */ lui $s0, %hi(gBattleStatus) /* 4257A8 802A9218 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) /* 4257AC 802A921C 2C62000D */ sltiu $v0, $v1, 0xd -/* 4257B0 802A9220 1040009B */ beqz $v0, .L802A9490 +/* 4257B0 802A9220 1040009B */ beqz $v0, L802A9490_425A20 /* 4257B4 802A9224 00031080 */ sll $v0, $v1, 2 /* 4257B8 802A9228 3C01802B */ lui $at, %hi(jtbl_802A9580_425B10) /* 4257BC 802A922C 00220821 */ addu $at, $at, $v0 @@ -43,7 +43,7 @@ glabel L802A923C_4257CC /* 425818 802A9288 24050002 */ addiu $a1, $zero, 2 .L802A928C: /* 42581C 802A928C 24020001 */ addiu $v0, $zero, 1 -/* 425820 802A9290 080AA524 */ j .L802A9490 +/* 425820 802A9290 080AA524 */ j L802A9490_425A20 /* 425824 802A9294 A622004C */ sh $v0, 0x4c($s1) glabel L802A9298_425828 /* 425828 802A9298 0C093EB1 */ jal set_popup_duration @@ -67,7 +67,7 @@ glabel L802A9298_425828 /* 42586C 802A92DC 86250056 */ lh $a1, 0x56($s1) /* 425870 802A92E0 0C051261 */ jal set_icon_render_pos /* 425874 802A92E4 24C6001C */ addiu $a2, $a2, 0x1c -/* 425878 802A92E8 080AA524 */ j .L802A9490 +/* 425878 802A92E8 080AA524 */ j L802A9490_425A20 /* 42587C 802A92EC 00000000 */ nop glabel L802A92F0_425880 /* 425880 802A92F0 0C093EB1 */ jal set_popup_duration @@ -76,7 +76,7 @@ glabel L802A92F0_425880 /* 42588C 802A92FC 9623004E */ lhu $v1, 0x4e($s1) /* 425890 802A9300 10400003 */ beqz $v0, .L802A9310 /* 425894 802A9304 2462FFFF */ addiu $v0, $v1, -1 -/* 425898 802A9308 080AA524 */ j .L802A9490 +/* 425898 802A9308 080AA524 */ j L802A9490_425A20 /* 42589C 802A930C A622004E */ sh $v0, 0x4e($s1) .L802A9310: /* 4258A0 802A9310 8E240004 */ lw $a0, 4($s1) @@ -167,7 +167,7 @@ glabel L802A9338_4258C8 /* 4259E0 802A9450 24020005 */ addiu $v0, $zero, 5 /* 4259E4 802A9454 A6220054 */ sh $v0, 0x54($s1) /* 4259E8 802A9458 2402000C */ addiu $v0, $zero, 0xc -/* 4259EC 802A945C 080AA524 */ j .L802A9490 +/* 4259EC 802A945C 080AA524 */ j L802A9490_425A20 /* 4259F0 802A9460 A622004C */ sh $v0, 0x4c($s1) glabel L802A9464_4259F4 /* 4259F4 802A9464 86220054 */ lh $v0, 0x54($s1) @@ -175,7 +175,7 @@ glabel L802A9464_4259F4 /* 4259FC 802A946C 10400003 */ beqz $v0, .L802A947C /* 425A00 802A9470 2462FFFF */ addiu $v0, $v1, -1 .L802A9474: -/* 425A04 802A9474 080AA524 */ j .L802A9490 +/* 425A04 802A9474 080AA524 */ j L802A9490_425A20 /* 425A08 802A9478 A6220054 */ sh $v0, 0x54($s1) .L802A947C: /* 425A0C 802A947C 24020001 */ addiu $v0, $zero, 1 @@ -183,7 +183,6 @@ glabel L802A9464_4259F4 /* 425A14 802A9484 2402007F */ addiu $v0, $zero, 0x7f /* 425A18 802A9488 0C09A327 */ jal func_80268C9C /* 425A1C 802A948C A2020086 */ sb $v0, 0x86($s0) -.L802A9490: glabel L802A9490_425A20 /* 425A20 802A9490 8FBF0018 */ lw $ra, 0x18($sp) /* 425A24 802A9494 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/code_425B50/func_802A9228_425D78.s b/ver/us/asm/nonmatchings/code_425B50/func_802A9228_425D78.s index e177a3b7b4..6a1253a625 100644 --- a/ver/us/asm/nonmatchings/code_425B50/func_802A9228_425D78.s +++ b/ver/us/asm/nonmatchings/code_425B50/func_802A9228_425D78.s @@ -12,7 +12,7 @@ glabel func_802A9228_425D78 /* 425D94 802A9244 3C10800E */ lui $s0, %hi(gBattleStatus) /* 425D98 802A9248 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) /* 425D9C 802A924C 2C62000D */ sltiu $v0, $v1, 0xd -/* 425DA0 802A9250 1040009C */ beqz $v0, .L802A94C4 +/* 425DA0 802A9250 1040009C */ beqz $v0, L802A94C4_426014 /* 425DA4 802A9254 00031080 */ sll $v0, $v1, 2 /* 425DA8 802A9258 3C01802B */ lui $at, %hi(jtbl_802A95E0_426130) /* 425DAC 802A925C 00220821 */ addu $at, $at, $v0 @@ -53,7 +53,7 @@ glabel L802A926C_425DBC /* 425E2C 802A92DC 24050002 */ addiu $a1, $zero, 2 .L802A92E0: /* 425E30 802A92E0 24020001 */ addiu $v0, $zero, 1 -/* 425E34 802A92E4 080AA531 */ j .L802A94C4 +/* 425E34 802A92E4 080AA531 */ j L802A94C4_426014 /* 425E38 802A92E8 A622004C */ sh $v0, 0x4c($s1) glabel L802A92EC_425E3C /* 425E3C 802A92EC 0C093EB1 */ jal set_popup_duration @@ -83,7 +83,7 @@ glabel L802A92EC_425E3C /* 425E98 802A9348 24A5001F */ addiu $a1, $a1, 0x1f /* 425E9C 802A934C 0C051261 */ jal set_icon_render_pos /* 425EA0 802A9350 24C6000E */ addiu $a2, $a2, 0xe -/* 425EA4 802A9354 080AA531 */ j .L802A94C4 +/* 425EA4 802A9354 080AA531 */ j L802A94C4_426014 /* 425EA8 802A9358 00000000 */ nop glabel L802A935C_425EAC /* 425EAC 802A935C 0C093EB1 */ jal set_popup_duration @@ -92,7 +92,7 @@ glabel L802A935C_425EAC /* 425EB8 802A9368 9623004E */ lhu $v1, 0x4e($s1) /* 425EBC 802A936C 10400003 */ beqz $v0, .L802A937C /* 425EC0 802A9370 2462FFFF */ addiu $v0, $v1, -1 -/* 425EC4 802A9374 080AA531 */ j .L802A94C4 +/* 425EC4 802A9374 080AA531 */ j L802A94C4_426014 /* 425EC8 802A9378 A622004E */ sh $v0, 0x4e($s1) .L802A937C: /* 425ECC 802A937C 8E240004 */ lw $a0, 4($s1) @@ -172,7 +172,7 @@ glabel L802A93B4_425F04 /* 425FE0 802A9490 24020005 */ addiu $v0, $zero, 5 /* 425FE4 802A9494 A6220054 */ sh $v0, 0x54($s1) /* 425FE8 802A9498 2402000C */ addiu $v0, $zero, 0xc -/* 425FEC 802A949C 080AA531 */ j .L802A94C4 +/* 425FEC 802A949C 080AA531 */ j L802A94C4_426014 /* 425FF0 802A94A0 A622004C */ sh $v0, 0x4c($s1) glabel L802A94A4_425FF4 /* 425FF4 802A94A4 86220054 */ lh $v0, 0x54($s1) @@ -180,12 +180,11 @@ glabel L802A94A4_425FF4 /* 425FFC 802A94AC 10400003 */ beqz $v0, .L802A94BC /* 426000 802A94B0 2462FFFF */ addiu $v0, $v1, -1 .L802A94B4: -/* 426004 802A94B4 080AA531 */ j .L802A94C4 +/* 426004 802A94B4 080AA531 */ j L802A94C4_426014 /* 426008 802A94B8 A6220054 */ sh $v0, 0x54($s1) .L802A94BC: /* 42600C 802A94BC 0C09A327 */ jal func_80268C9C /* 426010 802A94C0 00000000 */ nop -.L802A94C4: glabel L802A94C4_426014 /* 426014 802A94C4 8FBF0018 */ lw $ra, 0x18($sp) /* 426018 802A94C8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/code_426170/func_802A928C_4263FC.s b/ver/us/asm/nonmatchings/code_426170/func_802A928C_4263FC.s index 9a1f1ed490..83921eaefe 100644 --- a/ver/us/asm/nonmatchings/code_426170/func_802A928C_4263FC.s +++ b/ver/us/asm/nonmatchings/code_426170/func_802A928C_4263FC.s @@ -13,7 +13,7 @@ glabel func_802A928C_4263FC /* 42641C 802A92AC 3C12800E */ lui $s2, %hi(gBattleStatus) /* 426420 802A92B0 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) /* 426424 802A92B4 2C62000D */ sltiu $v0, $v1, 0xd -/* 426428 802A92B8 10400102 */ beqz $v0, .L802A96C4 +/* 426428 802A92B8 10400102 */ beqz $v0, L802A96C4_426834 /* 42642C 802A92BC 00031080 */ sll $v0, $v1, 2 /* 426430 802A92C0 3C01802B */ lui $at, %hi(jtbl_802A9820_426990) /* 426434 802A92C4 00220821 */ addu $at, $at, $v0 @@ -44,7 +44,7 @@ glabel L802A92D4_426444 /* 426490 802A9320 24050002 */ addiu $a1, $zero, 2 .L802A9324: /* 426494 802A9324 24020001 */ addiu $v0, $zero, 1 -/* 426498 802A9328 080AA5B1 */ j .L802A96C4 +/* 426498 802A9328 080AA5B1 */ j L802A96C4_426834 /* 42649C 802A932C A622004C */ sh $v0, 0x4c($s1) glabel L802A9330_4264A0 /* 4264A0 802A9330 0C093EB1 */ jal set_popup_duration @@ -68,7 +68,7 @@ glabel L802A9330_4264A0 /* 4264E4 802A9374 86250056 */ lh $a1, 0x56($s1) /* 4264E8 802A9378 0C051261 */ jal set_icon_render_pos /* 4264EC 802A937C 24C6001C */ addiu $a2, $a2, 0x1c -/* 4264F0 802A9380 080AA5B1 */ j .L802A96C4 +/* 4264F0 802A9380 080AA5B1 */ j L802A96C4_426834 /* 4264F4 802A9384 00000000 */ nop glabel L802A9388_4264F8 /* 4264F8 802A9388 0C093EB1 */ jal set_popup_duration @@ -77,7 +77,7 @@ glabel L802A9388_4264F8 /* 426504 802A9394 9623004E */ lhu $v1, 0x4e($s1) /* 426508 802A9398 10400003 */ beqz $v0, .L802A93A8 /* 42650C 802A939C 2462FFFF */ addiu $v0, $v1, -1 -/* 426510 802A93A0 080AA5B1 */ j .L802A96C4 +/* 426510 802A93A0 080AA5B1 */ j L802A96C4_426834 /* 426514 802A93A4 A622004E */ sh $v0, 0x4e($s1) .L802A93A8: /* 426518 802A93A8 8E240004 */ lw $a0, 4($s1) @@ -275,7 +275,7 @@ glabel L802A93E8_426558 /* 4267DC 802A966C 24020005 */ addiu $v0, $zero, 5 /* 4267E0 802A9670 A6220054 */ sh $v0, 0x54($s1) /* 4267E4 802A9674 2402000C */ addiu $v0, $zero, 0xc -/* 4267E8 802A9678 080AA5B1 */ j .L802A96C4 +/* 4267E8 802A9678 080AA5B1 */ j L802A96C4_426834 /* 4267EC 802A967C A622004C */ sh $v0, 0x4c($s1) glabel L802A9680_4267F0 /* 4267F0 802A9680 86220064 */ lh $v0, 0x64($s1) @@ -293,12 +293,11 @@ glabel L802A9680_4267F0 /* 42681C 802A96AC 10400003 */ beqz $v0, .L802A96BC /* 426820 802A96B0 2462FFFF */ addiu $v0, $v1, -1 .L802A96B4: -/* 426824 802A96B4 080AA5B1 */ j .L802A96C4 +/* 426824 802A96B4 080AA5B1 */ j L802A96C4_426834 /* 426828 802A96B8 A6220054 */ sh $v0, 0x54($s1) .L802A96BC: /* 42682C 802A96BC 0C09A327 */ jal func_80268C9C /* 426830 802A96C0 00000000 */ nop -.L802A96C4: glabel L802A96C4_426834 /* 426834 802A96C4 8FBF001C */ lw $ra, 0x1c($sp) /* 426838 802A96C8 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s b/ver/us/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s index 38a87c37f1..882d66951a 100644 --- a/ver/us/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s +++ b/ver/us/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s @@ -15,7 +15,7 @@ glabel func_802A9294_426C64 /* 426C8C 802A92BC 8623004C */ lh $v1, 0x4c($s1) /* 426C90 802A92C0 8E5300DC */ lw $s3, 0xdc($s2) /* 426C94 802A92C4 2C62000D */ sltiu $v0, $v1, 0xd -/* 426C98 802A92C8 10400153 */ beqz $v0, .L802A9818 +/* 426C98 802A92C8 10400153 */ beqz $v0, L802A9818_4271E8 /* 426C9C 802A92CC 00031080 */ sll $v0, $v1, 2 /* 426CA0 802A92D0 3C01802B */ lui $at, %hi(jtbl_802A99A0_427370) /* 426CA4 802A92D4 00220821 */ addu $at, $at, $v0 @@ -46,7 +46,7 @@ glabel L802A92E4_426CB4 /* 426D00 802A9330 24050002 */ addiu $a1, $zero, 2 .L802A9334: /* 426D04 802A9334 24020001 */ addiu $v0, $zero, 1 -/* 426D08 802A9338 080AA606 */ j .L802A9818 +/* 426D08 802A9338 080AA606 */ j L802A9818_4271E8 /* 426D0C 802A933C A622004C */ sh $v0, 0x4c($s1) glabel L802A9340_426D10 /* 426D10 802A9340 0C093EB1 */ jal set_popup_duration @@ -70,7 +70,7 @@ glabel L802A9340_426D10 /* 426D54 802A9384 86250056 */ lh $a1, 0x56($s1) /* 426D58 802A9388 0C051261 */ jal set_icon_render_pos /* 426D5C 802A938C 24C6001C */ addiu $a2, $a2, 0x1c -/* 426D60 802A9390 080AA606 */ j .L802A9818 +/* 426D60 802A9390 080AA606 */ j L802A9818_4271E8 /* 426D64 802A9394 00000000 */ nop glabel L802A9398_426D68 /* 426D68 802A9398 0C093EB1 */ jal set_popup_duration @@ -79,7 +79,7 @@ glabel L802A9398_426D68 /* 426D74 802A93A4 9623004E */ lhu $v1, 0x4e($s1) /* 426D78 802A93A8 10400003 */ beqz $v0, .L802A93B8 /* 426D7C 802A93AC 2462FFFF */ addiu $v0, $v1, -1 -/* 426D80 802A93B0 080AA606 */ j .L802A9818 +/* 426D80 802A93B0 080AA606 */ j L802A9818_4271E8 /* 426D84 802A93B4 A622004E */ sh $v0, 0x4e($s1) .L802A93B8: /* 426D88 802A93B8 8E240004 */ lw $a0, 4($s1) @@ -371,7 +371,7 @@ glabel L802A9400_426DD0 /* 4271B4 802A97E4 24020005 */ addiu $v0, $zero, 5 /* 4271B8 802A97E8 A6220054 */ sh $v0, 0x54($s1) /* 4271BC 802A97EC 2402000C */ addiu $v0, $zero, 0xc -/* 4271C0 802A97F0 080AA606 */ j .L802A9818 +/* 4271C0 802A97F0 080AA606 */ j L802A9818_4271E8 /* 4271C4 802A97F4 A622004C */ sh $v0, 0x4c($s1) glabel L802A97F8_4271C8 /* 4271C8 802A97F8 86220054 */ lh $v0, 0x54($s1) @@ -379,12 +379,11 @@ glabel L802A97F8_4271C8 /* 4271D0 802A9800 10400003 */ beqz $v0, .L802A9810 /* 4271D4 802A9804 2462FFFF */ addiu $v0, $v1, -1 .L802A9808: -/* 4271D8 802A9808 080AA606 */ j .L802A9818 +/* 4271D8 802A9808 080AA606 */ j L802A9818_4271E8 /* 4271DC 802A980C A6220054 */ sh $v0, 0x54($s1) .L802A9810: /* 4271E0 802A9810 0C09A327 */ jal func_80268C9C /* 4271E4 802A9814 00000000 */ nop -.L802A9818: glabel L802A9818_4271E8 /* 4271E8 802A9818 8FBF0020 */ lw $ra, 0x20($sp) /* 4271EC 802A981C 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s b/ver/us/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s index b517c71cbb..1f50980cde 100644 --- a/ver/us/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s +++ b/ver/us/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s @@ -13,7 +13,7 @@ glabel func_802A928C_42763C /* 42765C 802A92AC 3C12800E */ lui $s2, %hi(gBattleStatus) /* 427660 802A92B0 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) /* 427664 802A92B4 2C62000D */ sltiu $v0, $v1, 0xd -/* 427668 802A92B8 104000A2 */ beqz $v0, .L802A9544 +/* 427668 802A92B8 104000A2 */ beqz $v0, L802A9544_4278F4 /* 42766C 802A92BC 00031080 */ sll $v0, $v1, 2 /* 427670 802A92C0 3C01802B */ lui $at, %hi(jtbl_802A9680_427A30) /* 427674 802A92C4 00220821 */ addu $at, $at, $v0 @@ -44,7 +44,7 @@ glabel L802A92D4_427684 /* 4276D0 802A9320 24050002 */ addiu $a1, $zero, 2 .L802A9324: /* 4276D4 802A9324 24020001 */ addiu $v0, $zero, 1 -/* 4276D8 802A9328 080AA551 */ j .L802A9544 +/* 4276D8 802A9328 080AA551 */ j L802A9544_4278F4 /* 4276DC 802A932C A622004C */ sh $v0, 0x4c($s1) glabel L802A9330_4276E0 /* 4276E0 802A9330 0C093EB1 */ jal set_popup_duration @@ -68,7 +68,7 @@ glabel L802A9330_4276E0 /* 427724 802A9374 86250056 */ lh $a1, 0x56($s1) /* 427728 802A9378 0C051261 */ jal set_icon_render_pos /* 42772C 802A937C 24C6001C */ addiu $a2, $a2, 0x1c -/* 427730 802A9380 080AA551 */ j .L802A9544 +/* 427730 802A9380 080AA551 */ j L802A9544_4278F4 /* 427734 802A9384 00000000 */ nop glabel L802A9388_427738 /* 427738 802A9388 0C093EB1 */ jal set_popup_duration @@ -77,7 +77,7 @@ glabel L802A9388_427738 /* 427744 802A9394 9623004E */ lhu $v1, 0x4e($s1) /* 427748 802A9398 10400003 */ beqz $v0, .L802A93A8 /* 42774C 802A939C 2462FFFF */ addiu $v0, $v1, -1 -/* 427750 802A93A0 080AA551 */ j .L802A9544 +/* 427750 802A93A0 080AA551 */ j L802A9544_4278F4 /* 427754 802A93A4 A622004E */ sh $v0, 0x4e($s1) .L802A93A8: /* 427758 802A93A8 8E240004 */ lw $a0, 4($s1) @@ -180,7 +180,7 @@ glabel L802A93D0_427780 /* 4278C0 802A9510 24020005 */ addiu $v0, $zero, 5 /* 4278C4 802A9514 A6220054 */ sh $v0, 0x54($s1) /* 4278C8 802A9518 2402000C */ addiu $v0, $zero, 0xc -/* 4278CC 802A951C 080AA551 */ j .L802A9544 +/* 4278CC 802A951C 080AA551 */ j L802A9544_4278F4 /* 4278D0 802A9520 A622004C */ sh $v0, 0x4c($s1) glabel L802A9524_4278D4 /* 4278D4 802A9524 86220054 */ lh $v0, 0x54($s1) @@ -188,12 +188,11 @@ glabel L802A9524_4278D4 /* 4278DC 802A952C 10400003 */ beqz $v0, .L802A953C /* 4278E0 802A9530 2462FFFF */ addiu $v0, $v1, -1 .L802A9534: -/* 4278E4 802A9534 080AA551 */ j .L802A9544 +/* 4278E4 802A9534 080AA551 */ j L802A9544_4278F4 /* 4278E8 802A9538 A6220054 */ sh $v0, 0x54($s1) .L802A953C: /* 4278EC 802A953C 0C09A327 */ jal func_80268C9C /* 4278F0 802A9540 00000000 */ nop -.L802A9544: glabel L802A9544_4278F4 /* 4278F4 802A9544 8FBF001C */ lw $ra, 0x1c($sp) /* 4278F8 802A9548 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s b/ver/us/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s index 266a5270e0..d63ae41895 100644 --- a/ver/us/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s +++ b/ver/us/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s @@ -13,7 +13,7 @@ glabel func_802A928C_427CFC /* 427D1C 802A92AC 3C12800E */ lui $s2, %hi(gBattleStatus) /* 427D20 802A92B0 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) /* 427D24 802A92B4 2C62000D */ sltiu $v0, $v1, 0xd -/* 427D28 802A92B8 10400106 */ beqz $v0, .L802A96D4 +/* 427D28 802A92B8 10400106 */ beqz $v0, L802A96D4_428144 /* 427D2C 802A92BC 00031080 */ sll $v0, $v1, 2 /* 427D30 802A92C0 3C01802B */ lui $at, %hi(jtbl_802A9830_4282A0) /* 427D34 802A92C4 00220821 */ addu $at, $at, $v0 @@ -44,7 +44,7 @@ glabel L802A92D4_427D44 /* 427D90 802A9320 24050002 */ addiu $a1, $zero, 2 .L802A9324: /* 427D94 802A9324 24020001 */ addiu $v0, $zero, 1 -/* 427D98 802A9328 080AA5B5 */ j .L802A96D4 +/* 427D98 802A9328 080AA5B5 */ j L802A96D4_428144 /* 427D9C 802A932C A622004C */ sh $v0, 0x4c($s1) glabel L802A9330_427DA0 /* 427DA0 802A9330 0C093EB1 */ jal set_popup_duration @@ -68,7 +68,7 @@ glabel L802A9330_427DA0 /* 427DE4 802A9374 86250056 */ lh $a1, 0x56($s1) /* 427DE8 802A9378 0C051261 */ jal set_icon_render_pos /* 427DEC 802A937C 24C6001C */ addiu $a2, $a2, 0x1c -/* 427DF0 802A9380 080AA5B5 */ j .L802A96D4 +/* 427DF0 802A9380 080AA5B5 */ j L802A96D4_428144 /* 427DF4 802A9384 00000000 */ nop glabel L802A9388_427DF8 /* 427DF8 802A9388 0C093EB1 */ jal set_popup_duration @@ -77,7 +77,7 @@ glabel L802A9388_427DF8 /* 427E04 802A9394 9623004E */ lhu $v1, 0x4e($s1) /* 427E08 802A9398 10400003 */ beqz $v0, .L802A93A8 /* 427E0C 802A939C 2462FFFF */ addiu $v0, $v1, -1 -/* 427E10 802A93A0 080AA5B5 */ j .L802A96D4 +/* 427E10 802A93A0 080AA5B5 */ j L802A96D4_428144 /* 427E14 802A93A4 A622004E */ sh $v0, 0x4e($s1) .L802A93A8: /* 427E18 802A93A8 8E240004 */ lw $a0, 4($s1) @@ -289,7 +289,7 @@ glabel L802A93E8_427E58 /* 428110 802A96A0 24020005 */ addiu $v0, $zero, 5 /* 428114 802A96A4 A6220054 */ sh $v0, 0x54($s1) /* 428118 802A96A8 2402000C */ addiu $v0, $zero, 0xc -/* 42811C 802A96AC 080AA5B5 */ j .L802A96D4 +/* 42811C 802A96AC 080AA5B5 */ j L802A96D4_428144 /* 428120 802A96B0 A622004C */ sh $v0, 0x4c($s1) glabel L802A96B4_428124 /* 428124 802A96B4 86220054 */ lh $v0, 0x54($s1) @@ -297,12 +297,11 @@ glabel L802A96B4_428124 /* 42812C 802A96BC 10400003 */ beqz $v0, .L802A96CC /* 428130 802A96C0 2462FFFF */ addiu $v0, $v1, -1 .L802A96C4: -/* 428134 802A96C4 080AA5B5 */ j .L802A96D4 +/* 428134 802A96C4 080AA5B5 */ j L802A96D4_428144 /* 428138 802A96C8 A6220054 */ sh $v0, 0x54($s1) .L802A96CC: /* 42813C 802A96CC 0C09A327 */ jal func_80268C9C /* 428140 802A96D0 00000000 */ nop -.L802A96D4: glabel L802A96D4_428144 /* 428144 802A96D4 8FBF001C */ lw $ra, 0x1c($sp) /* 428148 802A96D8 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s b/ver/us/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s index 34361b4ea6..0398bcf56c 100644 --- a/ver/us/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s +++ b/ver/us/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s @@ -12,7 +12,7 @@ glabel func_802A92D4_4285B4 /* 4285D0 802A92F0 3C10800E */ lui $s0, %hi(gBattleStatus) /* 4285D4 802A92F4 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) /* 4285D8 802A92F8 2C62000D */ sltiu $v0, $v1, 0xd -/* 4285DC 802A92FC 104000D4 */ beqz $v0, .L802A9650 +/* 4285DC 802A92FC 104000D4 */ beqz $v0, L802A9650_428930 /* 4285E0 802A9300 00031080 */ sll $v0, $v1, 2 /* 4285E4 802A9304 3C01802B */ lui $at, %hi(jtbl_802A9750_428A30) /* 4285E8 802A9308 00220821 */ addu $at, $at, $v0 @@ -63,7 +63,7 @@ glabel L802A9318_4285F8 /* 42868C 802A93AC 24050002 */ addiu $a1, $zero, 2 .L802A93B0: /* 428690 802A93B0 24020001 */ addiu $v0, $zero, 1 -/* 428694 802A93B4 080AA594 */ j .L802A9650 +/* 428694 802A93B4 080AA594 */ j L802A9650_428930 /* 428698 802A93B8 A622004C */ sh $v0, 0x4c($s1) glabel L802A93BC_42869C /* 42869C 802A93BC 0C093EB1 */ jal set_popup_duration @@ -99,7 +99,7 @@ glabel L802A93BC_42869C /* 428710 802A9430 24A5002A */ addiu $a1, $a1, 0x2a /* 428714 802A9434 0C051261 */ jal set_icon_render_pos /* 428718 802A9438 24C60018 */ addiu $a2, $a2, 0x18 -/* 42871C 802A943C 080AA594 */ j .L802A9650 +/* 42871C 802A943C 080AA594 */ j L802A9650_428930 /* 428720 802A9440 00000000 */ nop glabel L802A9444_428724 /* 428724 802A9444 0C093EB1 */ jal set_popup_duration @@ -108,7 +108,7 @@ glabel L802A9444_428724 /* 428730 802A9450 9623004E */ lhu $v1, 0x4e($s1) /* 428734 802A9454 10400003 */ beqz $v0, .L802A9464 /* 428738 802A9458 2462FFFF */ addiu $v0, $v1, -1 -/* 42873C 802A945C 080AA594 */ j .L802A9650 +/* 42873C 802A945C 080AA594 */ j L802A9650_428930 /* 428740 802A9460 A622004E */ sh $v0, 0x4e($s1) .L802A9464: /* 428744 802A9464 8E240004 */ lw $a0, 4($s1) @@ -190,7 +190,7 @@ glabel L802A94A8_428788 /* 428868 802A9588 96230054 */ lhu $v1, 0x54($s1) /* 42886C 802A958C 10400005 */ beqz $v0, .L802A95A4 /* 428870 802A9590 2462FFFF */ addiu $v0, $v1, -1 -/* 428874 802A9594 080AA594 */ j .L802A9650 +/* 428874 802A9594 080AA594 */ j L802A9650_428930 /* 428878 802A9598 A6220054 */ sh $v0, 0x54($s1) .L802A959C: /* 42887C 802A959C 080AA57B */ j .L802A95EC @@ -231,19 +231,18 @@ glabel L802A94A8_428788 /* 4288FC 802A961C 24020005 */ addiu $v0, $zero, 5 /* 428900 802A9620 A6220054 */ sh $v0, 0x54($s1) /* 428904 802A9624 2402000C */ addiu $v0, $zero, 0xc -/* 428908 802A9628 080AA594 */ j .L802A9650 +/* 428908 802A9628 080AA594 */ j L802A9650_428930 /* 42890C 802A962C A622004C */ sh $v0, 0x4c($s1) glabel L802A9630_428910 /* 428910 802A9630 86220054 */ lh $v0, 0x54($s1) /* 428914 802A9634 96230054 */ lhu $v1, 0x54($s1) /* 428918 802A9638 10400003 */ beqz $v0, .L802A9648 /* 42891C 802A963C 2462FFFF */ addiu $v0, $v1, -1 -/* 428920 802A9640 080AA594 */ j .L802A9650 +/* 428920 802A9640 080AA594 */ j L802A9650_428930 /* 428924 802A9644 A6220054 */ sh $v0, 0x54($s1) .L802A9648: /* 428928 802A9648 0C09A327 */ jal func_80268C9C /* 42892C 802A964C 00000000 */ nop -.L802A9650: glabel L802A9650_428930 /* 428930 802A9650 8FBF0018 */ lw $ra, 0x18($sp) /* 428934 802A9654 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s b/ver/us/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s index 38b61d912d..632a29a2be 100644 --- a/ver/us/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s +++ b/ver/us/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s @@ -13,7 +13,7 @@ glabel func_802A9278_428CE8 /* 428D08 802A9298 3C12800E */ lui $s2, %hi(gBattleStatus) /* 428D0C 802A929C 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) /* 428D10 802A92A0 2C62000D */ sltiu $v0, $v1, 0xd -/* 428D14 802A92A4 1040010B */ beqz $v0, .L802A96D4 +/* 428D14 802A92A4 1040010B */ beqz $v0, L802A96D4_429144 /* 428D18 802A92A8 00031080 */ sll $v0, $v1, 2 /* 428D1C 802A92AC 3C01802B */ lui $at, %hi(jtbl_802A9870_4292E0) /* 428D20 802A92B0 00220821 */ addu $at, $at, $v0 @@ -44,7 +44,7 @@ glabel L802A92C0_428D30 /* 428D7C 802A930C 24050002 */ addiu $a1, $zero, 2 .L802A9310: /* 428D80 802A9310 24020001 */ addiu $v0, $zero, 1 -/* 428D84 802A9314 080AA5B5 */ j .L802A96D4 +/* 428D84 802A9314 080AA5B5 */ j L802A96D4_429144 /* 428D88 802A9318 A622004C */ sh $v0, 0x4c($s1) glabel L802A931C_428D8C /* 428D8C 802A931C 0C093EB1 */ jal set_popup_duration @@ -53,7 +53,7 @@ glabel L802A931C_428D8C /* 428D98 802A9328 9623006C */ lhu $v1, 0x6c($s1) /* 428D9C 802A932C 10400003 */ beqz $v0, .L802A933C /* 428DA0 802A9330 2462FFFF */ addiu $v0, $v1, -1 -/* 428DA4 802A9334 080AA5B5 */ j .L802A96D4 +/* 428DA4 802A9334 080AA5B5 */ j L802A96D4_429144 /* 428DA8 802A9338 A622006C */ sh $v0, 0x6c($s1) .L802A933C: /* 428DAC 802A933C 96220056 */ lhu $v0, 0x56($s1) @@ -75,7 +75,7 @@ glabel L802A931C_428D8C /* 428DE8 802A9378 86250056 */ lh $a1, 0x56($s1) /* 428DEC 802A937C 0C051261 */ jal set_icon_render_pos /* 428DF0 802A9380 24C6001C */ addiu $a2, $a2, 0x1c -/* 428DF4 802A9384 080AA5B5 */ j .L802A96D4 +/* 428DF4 802A9384 080AA5B5 */ j L802A96D4_429144 /* 428DF8 802A9388 00000000 */ nop glabel L802A938C_428DFC /* 428DFC 802A938C 0C093EB1 */ jal set_popup_duration @@ -84,7 +84,7 @@ glabel L802A938C_428DFC /* 428E08 802A9398 9623004E */ lhu $v1, 0x4e($s1) /* 428E0C 802A939C 10400003 */ beqz $v0, .L802A93AC /* 428E10 802A93A0 2462FFFF */ addiu $v0, $v1, -1 -/* 428E14 802A93A4 080AA5B5 */ j .L802A96D4 +/* 428E14 802A93A4 080AA5B5 */ j L802A96D4_429144 /* 428E18 802A93A8 A622004E */ sh $v0, 0x4e($s1) .L802A93AC: /* 428E1C 802A93AC 8E240004 */ lw $a0, 4($s1) @@ -285,7 +285,7 @@ glabel L802A93F4_428E64 /* 4290EC 802A967C 24020014 */ addiu $v0, $zero, 0x14 /* 4290F0 802A9680 A6220054 */ sh $v0, 0x54($s1) /* 4290F4 802A9684 2402000C */ addiu $v0, $zero, 0xc -/* 4290F8 802A9688 080AA5B5 */ j .L802A96D4 +/* 4290F8 802A9688 080AA5B5 */ j L802A96D4_429144 /* 4290FC 802A968C A622004C */ sh $v0, 0x4c($s1) glabel L802A9690_429100 /* 429100 802A9690 8622005A */ lh $v0, 0x5a($s1) @@ -303,12 +303,11 @@ glabel L802A9690_429100 /* 42912C 802A96BC 10400003 */ beqz $v0, .L802A96CC /* 429130 802A96C0 2462FFFF */ addiu $v0, $v1, -1 .L802A96C4: -/* 429134 802A96C4 080AA5B5 */ j .L802A96D4 +/* 429134 802A96C4 080AA5B5 */ j L802A96D4_429144 /* 429138 802A96C8 A6220054 */ sh $v0, 0x54($s1) .L802A96CC: /* 42913C 802A96CC 0C09A327 */ jal func_80268C9C /* 429140 802A96D0 00000000 */ nop -.L802A96D4: glabel L802A96D4_429144 /* 429144 802A96D4 8FBF001C */ lw $ra, 0x1c($sp) /* 429148 802A96D8 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_429320/func_802A9294_4295B4.s b/ver/us/asm/nonmatchings/code_429320/func_802A9294_4295B4.s index d732b1c7f3..aae98a602f 100644 --- a/ver/us/asm/nonmatchings/code_429320/func_802A9294_4295B4.s +++ b/ver/us/asm/nonmatchings/code_429320/func_802A9294_4295B4.s @@ -15,7 +15,7 @@ glabel func_802A9294_4295B4 /* 4295DC 802A92BC 8623004C */ lh $v1, 0x4c($s1) /* 4295E0 802A92C0 8E5300DC */ lw $s3, 0xdc($s2) /* 4295E4 802A92C4 2C62000D */ sltiu $v0, $v1, 0xd -/* 4295E8 802A92C8 10400159 */ beqz $v0, .L802A9830 +/* 4295E8 802A92C8 10400159 */ beqz $v0, L802A9830_429B50 /* 4295EC 802A92CC 00031080 */ sll $v0, $v1, 2 /* 4295F0 802A92D0 3C01802B */ lui $at, %hi(jtbl_802A99C0_429CE0) /* 4295F4 802A92D4 00220821 */ addu $at, $at, $v0 @@ -46,7 +46,7 @@ glabel L802A92E4_429604 /* 429650 802A9330 24050002 */ addiu $a1, $zero, 2 .L802A9334: /* 429654 802A9334 24020001 */ addiu $v0, $zero, 1 -/* 429658 802A9338 080AA60C */ j .L802A9830 +/* 429658 802A9338 080AA60C */ j L802A9830_429B50 /* 42965C 802A933C A622004C */ sh $v0, 0x4c($s1) glabel L802A9340_429660 /* 429660 802A9340 0C093EB1 */ jal set_popup_duration @@ -55,7 +55,7 @@ glabel L802A9340_429660 /* 42966C 802A934C 9623006C */ lhu $v1, 0x6c($s1) /* 429670 802A9350 10400003 */ beqz $v0, .L802A9360 /* 429674 802A9354 2462FFFF */ addiu $v0, $v1, -1 -/* 429678 802A9358 080AA60C */ j .L802A9830 +/* 429678 802A9358 080AA60C */ j L802A9830_429B50 /* 42967C 802A935C A622006C */ sh $v0, 0x6c($s1) .L802A9360: /* 429680 802A9360 96220056 */ lhu $v0, 0x56($s1) @@ -77,7 +77,7 @@ glabel L802A9340_429660 /* 4296BC 802A939C 86250056 */ lh $a1, 0x56($s1) /* 4296C0 802A93A0 0C051261 */ jal set_icon_render_pos /* 4296C4 802A93A4 24C6001C */ addiu $a2, $a2, 0x1c -/* 4296C8 802A93A8 080AA60C */ j .L802A9830 +/* 4296C8 802A93A8 080AA60C */ j L802A9830_429B50 /* 4296CC 802A93AC 00000000 */ nop glabel L802A93B0_4296D0 /* 4296D0 802A93B0 0C093EB1 */ jal set_popup_duration @@ -86,7 +86,7 @@ glabel L802A93B0_4296D0 /* 4296DC 802A93BC 9623004E */ lhu $v1, 0x4e($s1) /* 4296E0 802A93C0 10400003 */ beqz $v0, .L802A93D0 /* 4296E4 802A93C4 2462FFFF */ addiu $v0, $v1, -1 -/* 4296E8 802A93C8 080AA60C */ j .L802A9830 +/* 4296E8 802A93C8 080AA60C */ j L802A9830_429B50 /* 4296EC 802A93CC A622004E */ sh $v0, 0x4e($s1) .L802A93D0: /* 4296F0 802A93D0 8E240004 */ lw $a0, 4($s1) @@ -378,7 +378,7 @@ glabel L802A9418_429738 /* 429B1C 802A97FC 24020005 */ addiu $v0, $zero, 5 /* 429B20 802A9800 A6220054 */ sh $v0, 0x54($s1) /* 429B24 802A9804 2402000C */ addiu $v0, $zero, 0xc -/* 429B28 802A9808 080AA60C */ j .L802A9830 +/* 429B28 802A9808 080AA60C */ j L802A9830_429B50 /* 429B2C 802A980C A622004C */ sh $v0, 0x4c($s1) glabel L802A9810_429B30 /* 429B30 802A9810 86220054 */ lh $v0, 0x54($s1) @@ -386,12 +386,11 @@ glabel L802A9810_429B30 /* 429B38 802A9818 10400003 */ beqz $v0, .L802A9828 /* 429B3C 802A981C 2462FFFF */ addiu $v0, $v1, -1 .L802A9820: -/* 429B40 802A9820 080AA60C */ j .L802A9830 +/* 429B40 802A9820 080AA60C */ j L802A9830_429B50 /* 429B44 802A9824 A6220054 */ sh $v0, 0x54($s1) .L802A9828: /* 429B48 802A9828 0C09A327 */ jal func_80268C9C /* 429B4C 802A982C 00000000 */ nop -.L802A9830: glabel L802A9830_429B50 /* 429B50 802A9830 8FBF0020 */ lw $ra, 0x20($sp) /* 429B54 802A9834 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/code_429D20/func_802A9208_429F28.s b/ver/us/asm/nonmatchings/code_429D20/func_802A9208_429F28.s index 3eae06f806..7fdf840421 100644 --- a/ver/us/asm/nonmatchings/code_429D20/func_802A9208_429F28.s +++ b/ver/us/asm/nonmatchings/code_429D20/func_802A9208_429F28.s @@ -14,7 +14,7 @@ glabel func_802A9208_429F28 /* 429F4C 802A922C 3C13800E */ lui $s3, %hi(gBattleStatus) /* 429F50 802A9230 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) /* 429F54 802A9234 2C62000D */ sltiu $v0, $v1, 0xd -/* 429F58 802A9238 104000F7 */ beqz $v0, .L802A9618 +/* 429F58 802A9238 104000F7 */ beqz $v0, L802A9618_42A338 /* 429F5C 802A923C 00031080 */ sll $v0, $v1, 2 /* 429F60 802A9240 3C01802B */ lui $at, %hi(jtbl_802A9790_42A4B0) /* 429F64 802A9244 00220821 */ addu $at, $at, $v0 @@ -45,7 +45,7 @@ glabel L802A9254_429F74 /* 429FC0 802A92A0 24050002 */ addiu $a1, $zero, 2 .L802A92A4: /* 429FC4 802A92A4 24020001 */ addiu $v0, $zero, 1 -/* 429FC8 802A92A8 080AA586 */ j .L802A9618 +/* 429FC8 802A92A8 080AA586 */ j L802A9618_42A338 /* 429FCC 802A92AC A622004C */ sh $v0, 0x4c($s1) glabel L802A92B0_429FD0 /* 429FD0 802A92B0 0C093EB1 */ jal set_popup_duration @@ -69,7 +69,7 @@ glabel L802A92B0_429FD0 /* 42A014 802A92F4 86250056 */ lh $a1, 0x56($s1) /* 42A018 802A92F8 0C051261 */ jal set_icon_render_pos /* 42A01C 802A92FC 24C6001C */ addiu $a2, $a2, 0x1c -/* 42A020 802A9300 080AA586 */ j .L802A9618 +/* 42A020 802A9300 080AA586 */ j L802A9618_42A338 /* 42A024 802A9304 00000000 */ nop glabel L802A9308_42A028 /* 42A028 802A9308 0C093EB1 */ jal set_popup_duration @@ -78,7 +78,7 @@ glabel L802A9308_42A028 /* 42A034 802A9314 9623004E */ lhu $v1, 0x4e($s1) /* 42A038 802A9318 10400003 */ beqz $v0, .L802A9328 /* 42A03C 802A931C 2462FFFF */ addiu $v0, $v1, -1 -/* 42A040 802A9320 080AA586 */ j .L802A9618 +/* 42A040 802A9320 080AA586 */ j L802A9618_42A338 /* 42A044 802A9324 A622004E */ sh $v0, 0x4e($s1) .L802A9328: /* 42A048 802A9328 8E240004 */ lw $a0, 4($s1) @@ -272,7 +272,7 @@ glabel L802A936C_42A08C /* 42A304 802A95E4 24020005 */ addiu $v0, $zero, 5 /* 42A308 802A95E8 A6220054 */ sh $v0, 0x54($s1) /* 42A30C 802A95EC 2402000C */ addiu $v0, $zero, 0xc -/* 42A310 802A95F0 080AA586 */ j .L802A9618 +/* 42A310 802A95F0 080AA586 */ j L802A9618_42A338 /* 42A314 802A95F4 A622004C */ sh $v0, 0x4c($s1) glabel L802A95F8_42A318 /* 42A318 802A95F8 86220054 */ lh $v0, 0x54($s1) @@ -280,12 +280,11 @@ glabel L802A95F8_42A318 /* 42A320 802A9600 10400003 */ beqz $v0, .L802A9610 /* 42A324 802A9604 2462FFFF */ addiu $v0, $v1, -1 .L802A9608: -/* 42A328 802A9608 080AA586 */ j .L802A9618 +/* 42A328 802A9608 080AA586 */ j L802A9618_42A338 /* 42A32C 802A960C A6220054 */ sh $v0, 0x54($s1) .L802A9610: /* 42A330 802A9610 0C09A327 */ jal func_80268C9C /* 42A334 802A9614 00000000 */ nop -.L802A9618: glabel L802A9618_42A338 /* 42A338 802A9618 8FBF0020 */ lw $ra, 0x20($sp) /* 42A33C 802A961C 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s b/ver/us/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s index 4d15453428..1a12414846 100644 --- a/ver/us/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s +++ b/ver/us/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s @@ -12,7 +12,7 @@ glabel func_802A948C_42A97C /* 42A998 802A94A8 3C10800E */ lui $s0, %hi(gBattleStatus) /* 42A99C 802A94AC 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) /* 42A9A0 802A94B0 2C620012 */ sltiu $v0, $v1, 0x12 -/* 42A9A4 802A94B4 104002D2 */ beqz $v0, .L802AA000 +/* 42A9A4 802A94B4 104002D2 */ beqz $v0, L802AA000_42B4F0 /* 42A9A8 802A94B8 00031080 */ sll $v0, $v1, 2 /* 42A9AC 802A94BC 3C01802B */ lui $at, %hi(jtbl_802AB1B0_42C6A0) /* 42A9B0 802A94C0 00220821 */ addu $at, $at, $v0 @@ -113,7 +113,7 @@ glabel L802A94D0_42A9C0 /* 42AB08 802A9618 24050002 */ addiu $a1, $zero, 2 .L802A961C: /* 42AB0C 802A961C 24020001 */ addiu $v0, $zero, 1 -/* 42AB10 802A9620 080AA800 */ j .L802AA000 +/* 42AB10 802A9620 080AA800 */ j L802AA000_42B4F0 /* 42AB14 802A9624 A622004C */ sh $v0, 0x4c($s1) glabel L802A9628_42AB18 /* 42AB18 802A9628 0C093EB1 */ jal set_popup_duration @@ -122,7 +122,7 @@ glabel L802A9628_42AB18 /* 42AB24 802A9634 9623006C */ lhu $v1, 0x6c($s1) /* 42AB28 802A9638 10400003 */ beqz $v0, .L802A9648 /* 42AB2C 802A963C 2462FFFF */ addiu $v0, $v1, -1 -/* 42AB30 802A9640 080AA800 */ j .L802AA000 +/* 42AB30 802A9640 080AA800 */ j L802AA000_42B4F0 /* 42AB34 802A9644 A622006C */ sh $v0, 0x6c($s1) .L802A9648: /* 42AB38 802A9648 96220056 */ lhu $v0, 0x56($s1) @@ -214,7 +214,7 @@ glabel L802A9628_42AB18 /* 42AC74 802A9784 24A5005C */ addiu $a1, $a1, 0x5c /* 42AC78 802A9788 0C051261 */ jal set_icon_render_pos /* 42AC7C 802A978C 24C60017 */ addiu $a2, $a2, 0x17 -/* 42AC80 802A9790 080AA800 */ j .L802AA000 +/* 42AC80 802A9790 080AA800 */ j L802AA000_42B4F0 /* 42AC84 802A9794 00000000 */ nop glabel L802A9798_42AC88 /* 42AC88 802A9798 0C093EB1 */ jal set_popup_duration @@ -223,7 +223,7 @@ glabel L802A9798_42AC88 /* 42AC94 802A97A4 9623004E */ lhu $v1, 0x4e($s1) /* 42AC98 802A97A8 10400003 */ beqz $v0, .L802A97B8 /* 42AC9C 802A97AC 2462FFFF */ addiu $v0, $v1, -1 -/* 42ACA0 802A97B0 080AA800 */ j .L802AA000 +/* 42ACA0 802A97B0 080AA800 */ j L802AA000_42B4F0 /* 42ACA4 802A97B4 A622004E */ sh $v0, 0x4e($s1) .L802A97B8: /* 42ACA8 802A97B8 96220052 */ lhu $v0, 0x52($s1) @@ -286,7 +286,7 @@ glabel L802A97E4_42ACD4 /* 42AD78 802A9888 2442FFFF */ addiu $v0, $v0, -1 /* 42AD7C 802A988C A6220054 */ sh $v0, 0x54($s1) /* 42AD80 802A9890 00021400 */ sll $v0, $v0, 0x10 -/* 42AD84 802A9894 144001DA */ bnez $v0, .L802AA000 +/* 42AD84 802A9894 144001DA */ bnez $v0, L802AA000_42B4F0 /* 42AD88 802A9898 24020014 */ addiu $v0, $zero, 0x14 /* 42AD8C 802A989C A6220054 */ sh $v0, 0x54($s1) /* 42AD90 802A98A0 080AA75A */ j .L802A9D68 @@ -455,7 +455,7 @@ glabel L802A98A8_42AD98 /* 42AFD4 802A9AE4 2442FFFF */ addiu $v0, $v0, -1 /* 42AFD8 802A9AE8 A6220054 */ sh $v0, 0x54($s1) /* 42AFDC 802A9AEC 00021400 */ sll $v0, $v0, 0x10 -/* 42AFE0 802A9AF0 14400143 */ bnez $v0, .L802AA000 +/* 42AFE0 802A9AF0 14400143 */ bnez $v0, L802AA000_42B4F0 /* 42AFE4 802A9AF4 24020014 */ addiu $v0, $zero, 0x14 /* 42AFE8 802A9AF8 A6220054 */ sh $v0, 0x54($s1) /* 42AFEC 802A9AFC 080AA75A */ j .L802A9D68 @@ -628,7 +628,7 @@ glabel L802A9B04_42AFF4 /* 42B23C 802A9D4C 2442FFFF */ addiu $v0, $v0, -1 /* 42B240 802A9D50 A6220054 */ sh $v0, 0x54($s1) /* 42B244 802A9D54 00021400 */ sll $v0, $v0, 0x10 -/* 42B248 802A9D58 144000A9 */ bnez $v0, .L802AA000 +/* 42B248 802A9D58 144000A9 */ bnez $v0, L802AA000_42B4F0 /* 42B24C 802A9D5C 24020014 */ addiu $v0, $zero, 0x14 /* 42B250 802A9D60 A6220054 */ sh $v0, 0x54($s1) /* 42B254 802A9D64 2402000E */ addiu $v0, $zero, 0xe @@ -636,7 +636,7 @@ glabel L802A9B04_42AFF4 /* 42B258 802A9D68 A220005D */ sb $zero, 0x5d($s1) /* 42B25C 802A9D6C A622004C */ sh $v0, 0x4c($s1) /* 42B260 802A9D70 A220005C */ sb $zero, 0x5c($s1) -/* 42B264 802A9D74 080AA800 */ j .L802AA000 +/* 42B264 802A9D74 080AA800 */ j L802AA000_42B4F0 /* 42B268 802A9D78 A2200060 */ sb $zero, 0x60($s1) glabel L802A9D7C_42B26C /* 42B26C 802A9D7C 0C093EB1 */ jal set_popup_duration @@ -783,10 +783,10 @@ glabel L802A9D7C_42B26C /* 42B460 802A9F70 0C0511FF */ jal set_menu_icon_script /* 42B464 802A9F74 00000000 */ nop /* 42B468 802A9F78 24020010 */ addiu $v0, $zero, 0x10 -/* 42B46C 802A9F7C 080AA800 */ j .L802AA000 +/* 42B46C 802A9F7C 080AA800 */ j L802AA000_42B4F0 /* 42B470 802A9F80 A622004C */ sh $v0, 0x4c($s1) .L802A9F84: -/* 42B474 802A9F84 080AA800 */ j .L802AA000 +/* 42B474 802A9F84 080AA800 */ j L802AA000_42B4F0 /* 42B478 802A9F88 A222005D */ sb $v0, 0x5d($s1) glabel L802A9F8C_42B47C /* 42B47C 802A9F8C 82020084 */ lb $v0, 0x84($s0) @@ -810,19 +810,18 @@ glabel L802A9F8C_42B47C /* 42B4BC 802A9FCC 24020005 */ addiu $v0, $zero, 5 /* 42B4C0 802A9FD0 A6220054 */ sh $v0, 0x54($s1) /* 42B4C4 802A9FD4 24020011 */ addiu $v0, $zero, 0x11 -/* 42B4C8 802A9FD8 080AA800 */ j .L802AA000 +/* 42B4C8 802A9FD8 080AA800 */ j L802AA000_42B4F0 /* 42B4CC 802A9FDC A622004C */ sh $v0, 0x4c($s1) glabel L802A9FE0_42B4D0 /* 42B4D0 802A9FE0 86220054 */ lh $v0, 0x54($s1) /* 42B4D4 802A9FE4 96230054 */ lhu $v1, 0x54($s1) /* 42B4D8 802A9FE8 10400003 */ beqz $v0, .L802A9FF8 /* 42B4DC 802A9FEC 2462FFFF */ addiu $v0, $v1, -1 -/* 42B4E0 802A9FF0 080AA800 */ j .L802AA000 +/* 42B4E0 802A9FF0 080AA800 */ j L802AA000_42B4F0 /* 42B4E4 802A9FF4 A6220054 */ sh $v0, 0x54($s1) .L802A9FF8: /* 42B4E8 802A9FF8 0C09A327 */ jal func_80268C9C /* 42B4EC 802A9FFC 00000000 */ nop -.L802AA000: glabel L802AA000_42B4F0 /* 42B4F0 802AA000 8FBF0018 */ lw $ra, 0x18($sp) /* 42B4F4 802AA004 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s b/ver/us/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s index f8346039cc..91062861c9 100644 --- a/ver/us/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s +++ b/ver/us/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s @@ -19,7 +19,7 @@ glabel func_802A9228_42C918 /* 42C950 802A9260 3C17800E */ lui $s7, %hi(gBattleStatus) /* 42C954 802A9264 26F7C070 */ addiu $s7, $s7, %lo(gBattleStatus) /* 42C958 802A9268 2C62000F */ sltiu $v0, $v1, 0xf -/* 42C95C 802A926C 1040011E */ beqz $v0, .L802A96E8 +/* 42C95C 802A926C 1040011E */ beqz $v0, L802A96E8_42CDD8 /* 42C960 802A9270 00031080 */ sll $v0, $v1, 2 /* 42C964 802A9274 3C01802B */ lui $at, %hi(jtbl_802A97E0_42CED0) /* 42C968 802A9278 00220821 */ addu $at, $at, $v0 @@ -40,7 +40,7 @@ glabel L802A9288_42C978 /* 42C99C 802A92AC 0C0513AC */ jal icon_set_opacity /* 42C9A0 802A92B0 240500FF */ addiu $a1, $zero, 0xff /* 42C9A4 802A92B4 24020001 */ addiu $v0, $zero, 1 -/* 42C9A8 802A92B8 080AA5BA */ j .L802A96E8 +/* 42C9A8 802A92B8 080AA5BA */ j L802A96E8_42CDD8 /* 42C9AC 802A92BC A622004C */ sh $v0, 0x4c($s1) glabel L802A92C0_42C9B0 /* 42C9B0 802A92C0 0C093EB1 */ jal set_popup_duration @@ -61,7 +61,7 @@ glabel L802A92C0_42C9B0 /* 42C9E8 802A92F8 24A50015 */ addiu $a1, $a1, 0x15 /* 42C9EC 802A92FC 0C051261 */ jal set_icon_render_pos /* 42C9F0 802A9300 24C6001C */ addiu $a2, $a2, 0x1c -/* 42C9F4 802A9304 080AA5BA */ j .L802A96E8 +/* 42C9F4 802A9304 080AA5BA */ j L802A96E8_42CDD8 /* 42C9F8 802A9308 00000000 */ nop glabel L802A930C_42C9FC /* 42C9FC 802A930C 0C093EB1 */ jal set_popup_duration @@ -70,7 +70,7 @@ glabel L802A930C_42C9FC /* 42CA08 802A9318 9623004E */ lhu $v1, 0x4e($s1) /* 42CA0C 802A931C 10400003 */ beqz $v0, .L802A932C /* 42CA10 802A9320 2462FFFF */ addiu $v0, $v1, -1 -/* 42CA14 802A9324 080AA5BA */ j .L802A96E8 +/* 42CA14 802A9324 080AA5BA */ j L802A96E8_42CDD8 /* 42CA18 802A9328 A622004E */ sh $v0, 0x4e($s1) .L802A932C: /* 42CA1C 802A932C 24040002 */ addiu $a0, $zero, 2 @@ -135,11 +135,11 @@ glabel L802A93F4_42CAE4 /* 42CAFC 802A940C 14400004 */ bnez $v0, .L802A9420 /* 42CB00 802A9410 2402000F */ addiu $v0, $zero, 0xf /* 42CB04 802A9414 2402000D */ addiu $v0, $zero, 0xd -/* 42CB08 802A9418 080AA5BA */ j .L802A96E8 +/* 42CB08 802A9418 080AA5BA */ j L802A96E8_42CDD8 /* 42CB0C 802A941C A622004C */ sh $v0, 0x4c($s1) .L802A9420: /* 42CB10 802A9420 8223005D */ lb $v1, 0x5d($s1) -/* 42CB14 802A9424 106200B0 */ beq $v1, $v0, .L802A96E8 +/* 42CB14 802A9424 106200B0 */ beq $v1, $v0, L802A96E8_42CDD8 /* 42CB18 802A9428 00000000 */ nop /* 42CB1C 802A942C 96220070 */ lhu $v0, 0x70($s1) /* 42CB20 802A9430 2442FFFF */ addiu $v0, $v0, -1 @@ -147,7 +147,7 @@ glabel L802A93F4_42CAE4 /* 42CB28 802A9438 96220072 */ lhu $v0, 0x72($s1) /* 42CB2C 802A943C 86230070 */ lh $v1, 0x70($s1) /* 42CB30 802A9440 2442FFFF */ addiu $v0, $v0, -1 -/* 42CB34 802A9444 1C6000A8 */ bgtz $v1, .L802A96E8 +/* 42CB34 802A9444 1C6000A8 */ bgtz $v1, L802A96E8_42CDD8 /* 42CB38 802A9448 A6220072 */ sh $v0, 0x72($s1) /* 42CB3C 802A944C 04610002 */ bgez $v1, .L802A9458 /* 42CB40 802A9450 0060A82D */ daddu $s5, $v1, $zero @@ -165,7 +165,7 @@ glabel L802A93F4_42CAE4 /* 42CB64 802A9474 52A00001 */ beql $s5, $zero, .L802A947C /* 42CB68 802A9478 24150001 */ addiu $s5, $zero, 1 .L802A947C: -/* 42CB6C 802A947C 1AA0009A */ blez $s5, .L802A96E8 +/* 42CB6C 802A947C 1AA0009A */ blez $s5, L802A96E8_42CDD8 /* 42CB70 802A9480 0000A02D */ daddu $s4, $zero, $zero /* 42CB74 802A9484 24160001 */ addiu $s6, $zero, 1 /* 42CB78 802A9488 3C1E802B */ lui $fp, %hi(D_802A97CC_42CEBC) @@ -180,7 +180,7 @@ glabel L802A93F4_42CAE4 /* 42CB98 802A94A8 2673FFC0 */ addiu $s3, $s3, -0x40 .L802A94AC: /* 42CB9C 802A94AC 86220072 */ lh $v0, 0x72($s1) -/* 42CBA0 802A94B0 1C40008D */ bgtz $v0, .L802A96E8 +/* 42CBA0 802A94B0 1C40008D */ bgtz $v0, L802A96E8_42CDD8 /* 42CBA4 802A94B4 0000802D */ daddu $s0, $zero, $zero /* 42CBA8 802A94B8 8223005C */ lb $v1, 0x5c($s1) /* 42CBAC 802A94BC 10760018 */ beq $v1, $s6, .L802A9520 @@ -294,14 +294,14 @@ glabel L802A93F4_42CAE4 /* 42CD3C 802A964C 24630001 */ addiu $v1, $v1, 1 /* 42CD40 802A9650 0C05272D */ jal play_sound /* 42CD44 802A9654 A2E30084 */ sb $v1, 0x84($s7) -/* 42CD48 802A9658 080AA5BA */ j .L802A96E8 +/* 42CD48 802A9658 080AA5BA */ j L802A96E8_42CDD8 /* 42CD4C 802A965C 00000000 */ nop .L802A9660: /* 42CD50 802A9660 26940001 */ addiu $s4, $s4, 1 /* 42CD54 802A9664 0295102A */ slt $v0, $s4, $s5 /* 42CD58 802A9668 1440FF8B */ bnez $v0, .L802A9498 /* 42CD5C 802A966C 26730001 */ addiu $s3, $s3, 1 -/* 42CD60 802A9670 080AA5BA */ j .L802A96E8 +/* 42CD60 802A9670 080AA5BA */ j L802A96E8_42CDD8 /* 42CD64 802A9674 00000000 */ nop glabel L802A9678_42CD68 /* 42CD68 802A9678 82E20084 */ lb $v0, 0x84($s7) @@ -324,19 +324,18 @@ glabel L802A9678_42CD68 /* 42CDA4 802A96B4 24020005 */ addiu $v0, $zero, 5 /* 42CDA8 802A96B8 A6220054 */ sh $v0, 0x54($s1) /* 42CDAC 802A96BC 2402000E */ addiu $v0, $zero, 0xe -/* 42CDB0 802A96C0 080AA5BA */ j .L802A96E8 +/* 42CDB0 802A96C0 080AA5BA */ j L802A96E8_42CDD8 /* 42CDB4 802A96C4 A622004C */ sh $v0, 0x4c($s1) glabel L802A96C8_42CDB8 /* 42CDB8 802A96C8 86220054 */ lh $v0, 0x54($s1) /* 42CDBC 802A96CC 96230054 */ lhu $v1, 0x54($s1) /* 42CDC0 802A96D0 10400003 */ beqz $v0, .L802A96E0 /* 42CDC4 802A96D4 2462FFFF */ addiu $v0, $v1, -1 -/* 42CDC8 802A96D8 080AA5BA */ j .L802A96E8 +/* 42CDC8 802A96D8 080AA5BA */ j L802A96E8_42CDD8 /* 42CDCC 802A96DC A6220054 */ sh $v0, 0x54($s1) .L802A96E0: /* 42CDD0 802A96E0 0C09A327 */ jal func_80268C9C /* 42CDD4 802A96E4 00000000 */ nop -.L802A96E8: glabel L802A96E8_42CDD8 /* 42CDD8 802A96E8 8FBF0034 */ lw $ra, 0x34($sp) /* 42CDDC 802A96EC 8FBE0030 */ lw $fp, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s b/ver/us/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s index 228e8355ee..f8f0325f42 100644 --- a/ver/us/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s +++ b/ver/us/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s @@ -54,7 +54,7 @@ glabel L802A9358_42D268 /* 42D2D8 802A93C8 24050002 */ addiu $a1, $zero, 2 .L802A93CC: /* 42D2DC 802A93CC 24020001 */ addiu $v0, $zero, 1 -/* 42D2E0 802A93D0 080AA60E */ j .L802A9838 +/* 42D2E0 802A93D0 080AA60E */ j L802A9838_42D748 /* 42D2E4 802A93D4 A622004C */ sh $v0, 0x4c($s1) glabel L802A93D8_42D2E8 /* 42D2E8 802A93D8 0C093EB1 */ jal set_popup_duration @@ -63,7 +63,7 @@ glabel L802A93D8_42D2E8 /* 42D2F4 802A93E4 9623006C */ lhu $v1, 0x6c($s1) /* 42D2F8 802A93E8 10400003 */ beqz $v0, .L802A93F8 /* 42D2FC 802A93EC 2462FFFF */ addiu $v0, $v1, -1 -/* 42D300 802A93F0 080AA60E */ j .L802A9838 +/* 42D300 802A93F0 080AA60E */ j L802A9838_42D748 /* 42D304 802A93F4 A622006C */ sh $v0, 0x6c($s1) .L802A93F8: /* 42D308 802A93F8 96220056 */ lhu $v0, 0x56($s1) @@ -106,7 +106,7 @@ glabel L802A93D8_42D2E8 /* 42D398 802A9488 00A32823 */ subu $a1, $a1, $v1 /* 42D39C 802A948C 0C051261 */ jal set_icon_render_pos /* 42D3A0 802A9490 00452823 */ subu $a1, $v0, $a1 -/* 42D3A4 802A9494 080AA60E */ j .L802A9838 +/* 42D3A4 802A9494 080AA60E */ j L802A9838_42D748 /* 42D3A8 802A9498 00000000 */ nop glabel L802A949C_42D3AC /* 42D3AC 802A949C 0C093EB1 */ jal set_popup_duration @@ -115,7 +115,7 @@ glabel L802A949C_42D3AC /* 42D3B8 802A94A8 9623004E */ lhu $v1, 0x4e($s1) /* 42D3BC 802A94AC 10400003 */ beqz $v0, .L802A94BC /* 42D3C0 802A94B0 2462FFFF */ addiu $v0, $v1, -1 -/* 42D3C4 802A94B4 080AA60E */ j .L802A9838 +/* 42D3C4 802A94B4 080AA60E */ j L802A9838_42D748 /* 42D3C8 802A94B8 A622004E */ sh $v0, 0x4e($s1) .L802A94BC: /* 42D3CC 802A94BC 8E240004 */ lw $a0, 4($s1) @@ -337,7 +337,7 @@ glabel L802A950C_42D41C /* 42D6F0 802A97E0 24020005 */ addiu $v0, $zero, 5 /* 42D6F4 802A97E4 A6220054 */ sh $v0, 0x54($s1) /* 42D6F8 802A97E8 2402000C */ addiu $v0, $zero, 0xc -/* 42D6FC 802A97EC 080AA60E */ j .L802A9838 +/* 42D6FC 802A97EC 080AA60E */ j L802A9838_42D748 /* 42D700 802A97F0 A622004C */ sh $v0, 0x4c($s1) glabel L802A97F4_42D704 /* 42D704 802A97F4 86220064 */ lh $v0, 0x64($s1) @@ -355,12 +355,11 @@ glabel L802A97F4_42D704 /* 42D730 802A9820 10400003 */ beqz $v0, .L802A9830 /* 42D734 802A9824 2462FFFF */ addiu $v0, $v1, -1 .L802A9828: -/* 42D738 802A9828 080AA60E */ j .L802A9838 +/* 42D738 802A9828 080AA60E */ j L802A9838_42D748 /* 42D73C 802A982C A6220054 */ sh $v0, 0x54($s1) .L802A9830: /* 42D740 802A9830 0C09A327 */ jal func_80268C9C /* 42D744 802A9834 00000000 */ nop -.L802A9838: glabel L802A9838_42D748 /* 42D748 802A9838 8623004C */ lh $v1, 0x4c($s1) .L802A983C: diff --git a/ver/us/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s b/ver/us/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s index 5f5628f3d1..b746a755b6 100644 --- a/ver/us/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s +++ b/ver/us/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s @@ -13,7 +13,7 @@ glabel func_802A92A0_42DCB0 /* 42DCD0 802A92C0 3C12800E */ lui $s2, %hi(gBattleStatus) /* 42DCD4 802A92C4 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) /* 42DCD8 802A92C8 2C62000D */ sltiu $v0, $v1, 0xd -/* 42DCDC 802A92CC 10400144 */ beqz $v0, .L802A97E0 +/* 42DCDC 802A92CC 10400144 */ beqz $v0, L802A97E0_42E1F0 /* 42DCE0 802A92D0 00031080 */ sll $v0, $v1, 2 /* 42DCE4 802A92D4 3C01802B */ lui $at, %hi(jtbl_802A9950_42E360) /* 42DCE8 802A92D8 00220821 */ addu $at, $at, $v0 @@ -54,7 +54,7 @@ glabel L802A92E8_42DCF8 /* 42DD68 802A9358 24050002 */ addiu $a1, $zero, 2 .L802A935C: /* 42DD6C 802A935C 24020001 */ addiu $v0, $zero, 1 -/* 42DD70 802A9360 080AA5F8 */ j .L802A97E0 +/* 42DD70 802A9360 080AA5F8 */ j L802A97E0_42E1F0 /* 42DD74 802A9364 A622004C */ sh $v0, 0x4c($s1) glabel L802A9368_42DD78 /* 42DD78 802A9368 0C093EB1 */ jal set_popup_duration @@ -63,7 +63,7 @@ glabel L802A9368_42DD78 /* 42DD84 802A9374 9623006C */ lhu $v1, 0x6c($s1) /* 42DD88 802A9378 10400003 */ beqz $v0, .L802A9388 /* 42DD8C 802A937C 2462FFFF */ addiu $v0, $v1, -1 -/* 42DD90 802A9380 080AA5F8 */ j .L802A97E0 +/* 42DD90 802A9380 080AA5F8 */ j L802A97E0_42E1F0 /* 42DD94 802A9384 A622006C */ sh $v0, 0x6c($s1) .L802A9388: /* 42DD98 802A9388 96220056 */ lhu $v0, 0x56($s1) @@ -91,7 +91,7 @@ glabel L802A9368_42DD78 /* 42DDEC 802A93DC 86250056 */ lh $a1, 0x56($s1) /* 42DDF0 802A93E0 0C051261 */ jal set_icon_render_pos /* 42DDF4 802A93E4 24C6001C */ addiu $a2, $a2, 0x1c -/* 42DDF8 802A93E8 080AA5F8 */ j .L802A97E0 +/* 42DDF8 802A93E8 080AA5F8 */ j L802A97E0_42E1F0 /* 42DDFC 802A93EC 00000000 */ nop glabel L802A93F0_42DE00 /* 42DE00 802A93F0 0C093EB1 */ jal set_popup_duration @@ -100,7 +100,7 @@ glabel L802A93F0_42DE00 /* 42DE0C 802A93FC 9623004E */ lhu $v1, 0x4e($s1) /* 42DE10 802A9400 10400003 */ beqz $v0, .L802A9410 /* 42DE14 802A9404 2462FFFF */ addiu $v0, $v1, -1 -/* 42DE18 802A9408 080AA5F8 */ j .L802A97E0 +/* 42DE18 802A9408 080AA5F8 */ j L802A97E0_42E1F0 /* 42DE1C 802A940C A622004E */ sh $v0, 0x4e($s1) .L802A9410: /* 42DE20 802A9410 8E240004 */ lw $a0, 4($s1) @@ -350,7 +350,7 @@ glabel L802A9468_42DE78 /* 42E198 802A9788 24020005 */ addiu $v0, $zero, 5 /* 42E19C 802A978C A6220054 */ sh $v0, 0x54($s1) /* 42E1A0 802A9790 2402000C */ addiu $v0, $zero, 0xc -/* 42E1A4 802A9794 080AA5F8 */ j .L802A97E0 +/* 42E1A4 802A9794 080AA5F8 */ j L802A97E0_42E1F0 /* 42E1A8 802A9798 A622004C */ sh $v0, 0x4c($s1) glabel L802A979C_42E1AC /* 42E1AC 802A979C 86220064 */ lh $v0, 0x64($s1) @@ -368,12 +368,11 @@ glabel L802A979C_42E1AC /* 42E1D8 802A97C8 10400003 */ beqz $v0, .L802A97D8 /* 42E1DC 802A97CC 2462FFFF */ addiu $v0, $v1, -1 .L802A97D0: -/* 42E1E0 802A97D0 080AA5F8 */ j .L802A97E0 +/* 42E1E0 802A97D0 080AA5F8 */ j L802A97E0_42E1F0 /* 42E1E4 802A97D4 A6220054 */ sh $v0, 0x54($s1) .L802A97D8: /* 42E1E8 802A97D8 0C09A327 */ jal func_80268C9C /* 42E1EC 802A97DC 00000000 */ nop -.L802A97E0: glabel L802A97E0_42E1F0 /* 42E1F0 802A97E0 8FBF001C */ lw $ra, 0x1c($sp) /* 42E1F4 802A97E4 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s b/ver/us/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s index e168cb5503..afdd2f045d 100644 --- a/ver/us/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s +++ b/ver/us/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s @@ -15,7 +15,7 @@ glabel func_802A9298_42E638 /* 42E660 802A92C0 8623004C */ lh $v1, 0x4c($s1) /* 42E664 802A92C4 8E5300DC */ lw $s3, 0xdc($s2) /* 42E668 802A92C8 2C62000D */ sltiu $v0, $v1, 0xd -/* 42E66C 802A92CC 10400171 */ beqz $v0, .L802A9894 +/* 42E66C 802A92CC 10400171 */ beqz $v0, L802A9894_42EC34 /* 42E670 802A92D0 00031080 */ sll $v0, $v1, 2 /* 42E674 802A92D4 3C01802B */ lui $at, %hi(jtbl_802A9A40_42EDE0) /* 42E678 802A92D8 00220821 */ addu $at, $at, $v0 @@ -46,7 +46,7 @@ glabel L802A92E8_42E688 /* 42E6D4 802A9334 24050002 */ addiu $a1, $zero, 2 .L802A9338: /* 42E6D8 802A9338 24020001 */ addiu $v0, $zero, 1 -/* 42E6DC 802A933C 080AA625 */ j .L802A9894 +/* 42E6DC 802A933C 080AA625 */ j L802A9894_42EC34 /* 42E6E0 802A9340 A622004C */ sh $v0, 0x4c($s1) glabel L802A9344_42E6E4 /* 42E6E4 802A9344 0C093EB1 */ jal set_popup_duration @@ -55,7 +55,7 @@ glabel L802A9344_42E6E4 /* 42E6F0 802A9350 9623006C */ lhu $v1, 0x6c($s1) /* 42E6F4 802A9354 10400003 */ beqz $v0, .L802A9364 /* 42E6F8 802A9358 2462FFFF */ addiu $v0, $v1, -1 -/* 42E6FC 802A935C 080AA625 */ j .L802A9894 +/* 42E6FC 802A935C 080AA625 */ j L802A9894_42EC34 /* 42E700 802A9360 A622006C */ sh $v0, 0x6c($s1) .L802A9364: /* 42E704 802A9364 96220056 */ lhu $v0, 0x56($s1) @@ -77,7 +77,7 @@ glabel L802A9344_42E6E4 /* 42E740 802A93A0 86250056 */ lh $a1, 0x56($s1) /* 42E744 802A93A4 0C051261 */ jal set_icon_render_pos /* 42E748 802A93A8 24C6001C */ addiu $a2, $a2, 0x1c -/* 42E74C 802A93AC 080AA625 */ j .L802A9894 +/* 42E74C 802A93AC 080AA625 */ j L802A9894_42EC34 /* 42E750 802A93B0 00000000 */ nop glabel L802A93B4_42E754 /* 42E754 802A93B4 0C093EB1 */ jal set_popup_duration @@ -86,7 +86,7 @@ glabel L802A93B4_42E754 /* 42E760 802A93C0 9623004E */ lhu $v1, 0x4e($s1) /* 42E764 802A93C4 10400003 */ beqz $v0, .L802A93D4 /* 42E768 802A93C8 2462FFFF */ addiu $v0, $v1, -1 -/* 42E76C 802A93CC 080AA625 */ j .L802A9894 +/* 42E76C 802A93CC 080AA625 */ j L802A9894_42EC34 /* 42E770 802A93D0 A622004E */ sh $v0, 0x4e($s1) .L802A93D4: /* 42E774 802A93D4 8E240004 */ lw $a0, 4($s1) @@ -405,7 +405,7 @@ glabel L802A941C_42E7BC /* 42EC00 802A9860 24020005 */ addiu $v0, $zero, 5 /* 42EC04 802A9864 A6220054 */ sh $v0, 0x54($s1) /* 42EC08 802A9868 2402000C */ addiu $v0, $zero, 0xc -/* 42EC0C 802A986C 080AA625 */ j .L802A9894 +/* 42EC0C 802A986C 080AA625 */ j L802A9894_42EC34 /* 42EC10 802A9870 A622004C */ sh $v0, 0x4c($s1) glabel L802A9874_42EC14 /* 42EC14 802A9874 86220054 */ lh $v0, 0x54($s1) @@ -413,12 +413,11 @@ glabel L802A9874_42EC14 /* 42EC1C 802A987C 10400003 */ beqz $v0, .L802A988C /* 42EC20 802A9880 2462FFFF */ addiu $v0, $v1, -1 .L802A9884: -/* 42EC24 802A9884 080AA625 */ j .L802A9894 +/* 42EC24 802A9884 080AA625 */ j L802A9894_42EC34 /* 42EC28 802A9888 A6220054 */ sh $v0, 0x54($s1) .L802A988C: /* 42EC2C 802A988C 0C09A327 */ jal func_80268C9C /* 42EC30 802A9890 00000000 */ nop -.L802A9894: glabel L802A9894_42EC34 /* 42EC34 802A9894 8FBF0020 */ lw $ra, 0x20($sp) /* 42EC38 802A9898 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s b/ver/us/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s index 91aea6cc50..b661954e39 100644 --- a/ver/us/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s +++ b/ver/us/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s @@ -13,7 +13,7 @@ glabel func_802A9254_42F074 /* 42F094 802A9274 3C12800E */ lui $s2, %hi(gBattleStatus) /* 42F098 802A9278 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) /* 42F09C 802A927C 2C62000D */ sltiu $v0, $v1, 0xd -/* 42F0A0 802A9280 10400128 */ beqz $v0, .L802A9724 +/* 42F0A0 802A9280 10400128 */ beqz $v0, L802A9724_42F544 /* 42F0A4 802A9284 00031080 */ sll $v0, $v1, 2 /* 42F0A8 802A9288 3C01802B */ lui $at, %hi(jtbl_802A9880_42F6A0) /* 42F0AC 802A928C 00220821 */ addu $at, $at, $v0 @@ -44,7 +44,7 @@ glabel L802A929C_42F0BC /* 42F108 802A92E8 24050002 */ addiu $a1, $zero, 2 .L802A92EC: /* 42F10C 802A92EC 24020001 */ addiu $v0, $zero, 1 -/* 42F110 802A92F0 080AA5C9 */ j .L802A9724 +/* 42F110 802A92F0 080AA5C9 */ j L802A9724_42F544 /* 42F114 802A92F4 A622004C */ sh $v0, 0x4c($s1) glabel L802A92F8_42F118 /* 42F118 802A92F8 0C093EB1 */ jal set_popup_duration @@ -53,7 +53,7 @@ glabel L802A92F8_42F118 /* 42F124 802A9304 9623006C */ lhu $v1, 0x6c($s1) /* 42F128 802A9308 10400003 */ beqz $v0, .L802A9318 /* 42F12C 802A930C 2462FFFF */ addiu $v0, $v1, -1 -/* 42F130 802A9310 080AA5C9 */ j .L802A9724 +/* 42F130 802A9310 080AA5C9 */ j L802A9724_42F544 /* 42F134 802A9314 A622006C */ sh $v0, 0x6c($s1) .L802A9318: /* 42F138 802A9318 96220056 */ lhu $v0, 0x56($s1) @@ -75,7 +75,7 @@ glabel L802A92F8_42F118 /* 42F174 802A9354 86250056 */ lh $a1, 0x56($s1) /* 42F178 802A9358 0C051261 */ jal set_icon_render_pos /* 42F17C 802A935C 24C6001C */ addiu $a2, $a2, 0x1c -/* 42F180 802A9360 080AA5C9 */ j .L802A9724 +/* 42F180 802A9360 080AA5C9 */ j L802A9724_42F544 /* 42F184 802A9364 00000000 */ nop glabel L802A9368_42F188 /* 42F188 802A9368 0C093EB1 */ jal set_popup_duration @@ -84,7 +84,7 @@ glabel L802A9368_42F188 /* 42F194 802A9374 9623004E */ lhu $v1, 0x4e($s1) /* 42F198 802A9378 10400003 */ beqz $v0, .L802A9388 /* 42F19C 802A937C 2462FFFF */ addiu $v0, $v1, -1 -/* 42F1A0 802A9380 080AA5C9 */ j .L802A9724 +/* 42F1A0 802A9380 080AA5C9 */ j L802A9724_42F544 /* 42F1A4 802A9384 A622004E */ sh $v0, 0x4e($s1) .L802A9388: /* 42F1A8 802A9388 8E240004 */ lw $a0, 4($s1) @@ -323,7 +323,7 @@ glabel L802A93D0_42F1F0 /* 42F510 802A96F0 24020005 */ addiu $v0, $zero, 5 /* 42F514 802A96F4 A6220054 */ sh $v0, 0x54($s1) /* 42F518 802A96F8 2402000C */ addiu $v0, $zero, 0xc -/* 42F51C 802A96FC 080AA5C9 */ j .L802A9724 +/* 42F51C 802A96FC 080AA5C9 */ j L802A9724_42F544 /* 42F520 802A9700 A622004C */ sh $v0, 0x4c($s1) glabel L802A9704_42F524 /* 42F524 802A9704 86220054 */ lh $v0, 0x54($s1) @@ -331,12 +331,11 @@ glabel L802A9704_42F524 /* 42F52C 802A970C 10400003 */ beqz $v0, .L802A971C /* 42F530 802A9710 2462FFFF */ addiu $v0, $v1, -1 .L802A9714: -/* 42F534 802A9714 080AA5C9 */ j .L802A9724 +/* 42F534 802A9714 080AA5C9 */ j L802A9724_42F544 /* 42F538 802A9718 A6220054 */ sh $v0, 0x54($s1) .L802A971C: /* 42F53C 802A971C 0C09A327 */ jal func_80268C9C /* 42F540 802A9720 00000000 */ nop -.L802A9724: glabel L802A9724_42F544 /* 42F544 802A9724 8FBF001C */ lw $ra, 0x1c($sp) /* 42F548 802A9728 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_42F6E0/func_802A92A0_42F980.s b/ver/us/asm/nonmatchings/code_42F6E0/func_802A92A0_42F980.s index 3ceae50f3d..5f0113b262 100644 --- a/ver/us/asm/nonmatchings/code_42F6E0/func_802A92A0_42F980.s +++ b/ver/us/asm/nonmatchings/code_42F6E0/func_802A92A0_42F980.s @@ -13,7 +13,7 @@ glabel func_802A92A0_42F980 /* 42F9A0 802A92C0 3C12800E */ lui $s2, %hi(gBattleStatus) /* 42F9A4 802A92C4 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) /* 42F9A8 802A92C8 2C62000D */ sltiu $v0, $v1, 0xd -/* 42F9AC 802A92CC 10400131 */ beqz $v0, .L802A9794 +/* 42F9AC 802A92CC 10400131 */ beqz $v0, L802A9794_42FE74 /* 42F9B0 802A92D0 00031080 */ sll $v0, $v1, 2 /* 42F9B4 802A92D4 3C01802B */ lui $at, %hi(jtbl_802A9900_42FFE0) /* 42F9B8 802A92D8 00220821 */ addu $at, $at, $v0 @@ -54,7 +54,7 @@ glabel L802A92E8_42F9C8 /* 42FA38 802A9358 24050002 */ addiu $a1, $zero, 2 .L802A935C: /* 42FA3C 802A935C 24020001 */ addiu $v0, $zero, 1 -/* 42FA40 802A9360 080AA5E5 */ j .L802A9794 +/* 42FA40 802A9360 080AA5E5 */ j L802A9794_42FE74 /* 42FA44 802A9364 A622004C */ sh $v0, 0x4c($s1) glabel L802A9368_42FA48 /* 42FA48 802A9368 0C093EB1 */ jal set_popup_duration @@ -63,7 +63,7 @@ glabel L802A9368_42FA48 /* 42FA54 802A9374 9623006C */ lhu $v1, 0x6c($s1) /* 42FA58 802A9378 10400003 */ beqz $v0, .L802A9388 /* 42FA5C 802A937C 2462FFFF */ addiu $v0, $v1, -1 -/* 42FA60 802A9380 080AA5E5 */ j .L802A9794 +/* 42FA60 802A9380 080AA5E5 */ j L802A9794_42FE74 /* 42FA64 802A9384 A622006C */ sh $v0, 0x6c($s1) .L802A9388: /* 42FA68 802A9388 96220056 */ lhu $v0, 0x56($s1) @@ -91,7 +91,7 @@ glabel L802A9368_42FA48 /* 42FABC 802A93DC 86250056 */ lh $a1, 0x56($s1) /* 42FAC0 802A93E0 0C051261 */ jal set_icon_render_pos /* 42FAC4 802A93E4 24C6001C */ addiu $a2, $a2, 0x1c -/* 42FAC8 802A93E8 080AA5E5 */ j .L802A9794 +/* 42FAC8 802A93E8 080AA5E5 */ j L802A9794_42FE74 /* 42FACC 802A93EC 00000000 */ nop glabel L802A93F0_42FAD0 /* 42FAD0 802A93F0 0C093EB1 */ jal set_popup_duration @@ -100,7 +100,7 @@ glabel L802A93F0_42FAD0 /* 42FADC 802A93FC 9623004E */ lhu $v1, 0x4e($s1) /* 42FAE0 802A9400 10400003 */ beqz $v0, .L802A9410 /* 42FAE4 802A9404 2462FFFF */ addiu $v0, $v1, -1 -/* 42FAE8 802A9408 080AA5E5 */ j .L802A9794 +/* 42FAE8 802A9408 080AA5E5 */ j L802A9794_42FE74 /* 42FAEC 802A940C A622004E */ sh $v0, 0x4e($s1) .L802A9410: /* 42FAF0 802A9410 8E240004 */ lw $a0, 4($s1) @@ -331,7 +331,7 @@ glabel L802A9450_42FB30 /* 42FE1C 802A973C 24020005 */ addiu $v0, $zero, 5 /* 42FE20 802A9740 A6220054 */ sh $v0, 0x54($s1) /* 42FE24 802A9744 2402000C */ addiu $v0, $zero, 0xc -/* 42FE28 802A9748 080AA5E5 */ j .L802A9794 +/* 42FE28 802A9748 080AA5E5 */ j L802A9794_42FE74 /* 42FE2C 802A974C A622004C */ sh $v0, 0x4c($s1) glabel L802A9750_42FE30 /* 42FE30 802A9750 86220064 */ lh $v0, 0x64($s1) @@ -349,12 +349,11 @@ glabel L802A9750_42FE30 /* 42FE5C 802A977C 10400003 */ beqz $v0, .L802A978C /* 42FE60 802A9780 2462FFFF */ addiu $v0, $v1, -1 .L802A9784: -/* 42FE64 802A9784 080AA5E5 */ j .L802A9794 +/* 42FE64 802A9784 080AA5E5 */ j L802A9794_42FE74 /* 42FE68 802A9788 A6220054 */ sh $v0, 0x54($s1) .L802A978C: /* 42FE6C 802A978C 0C09A327 */ jal func_80268C9C /* 42FE70 802A9790 00000000 */ nop -.L802A9794: glabel L802A9794_42FE74 /* 42FE74 802A9794 8FBF001C */ lw $ra, 0x1c($sp) /* 42FE78 802A9798 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_430020/func_802A9298_4302B8.s b/ver/us/asm/nonmatchings/code_430020/func_802A9298_4302B8.s index ebd91e5a49..517291d8c8 100644 --- a/ver/us/asm/nonmatchings/code_430020/func_802A9298_4302B8.s +++ b/ver/us/asm/nonmatchings/code_430020/func_802A9298_4302B8.s @@ -13,7 +13,7 @@ glabel func_802A9298_4302B8 /* 4302D8 802A92B8 3C12800E */ lui $s2, %hi(gBattleStatus) /* 4302DC 802A92BC 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) /* 4302E0 802A92C0 2C62000D */ sltiu $v0, $v1, 0xd -/* 4302E4 802A92C4 10400147 */ beqz $v0, .L802A97E4 +/* 4302E4 802A92C4 10400147 */ beqz $v0, L802A97E4_430804 /* 4302E8 802A92C8 00031080 */ sll $v0, $v1, 2 /* 4302EC 802A92CC 3C01802B */ lui $at, %hi(jtbl_802A9940_430960) /* 4302F0 802A92D0 00220821 */ addu $at, $at, $v0 @@ -44,7 +44,7 @@ glabel L802A92E0_430300 /* 43034C 802A932C 24050002 */ addiu $a1, $zero, 2 .L802A9330: /* 430350 802A9330 24020001 */ addiu $v0, $zero, 1 -/* 430354 802A9334 080AA5F9 */ j .L802A97E4 +/* 430354 802A9334 080AA5F9 */ j L802A97E4_430804 /* 430358 802A9338 A622004C */ sh $v0, 0x4c($s1) glabel L802A933C_43035C /* 43035C 802A933C 0C093EB1 */ jal set_popup_duration @@ -68,7 +68,7 @@ glabel L802A933C_43035C /* 4303A0 802A9380 86250056 */ lh $a1, 0x56($s1) /* 4303A4 802A9384 0C051261 */ jal set_icon_render_pos /* 4303A8 802A9388 24C6001C */ addiu $a2, $a2, 0x1c -/* 4303AC 802A938C 080AA5F9 */ j .L802A97E4 +/* 4303AC 802A938C 080AA5F9 */ j L802A97E4_430804 /* 4303B0 802A9390 00000000 */ nop glabel L802A9394_4303B4 /* 4303B4 802A9394 0C093EB1 */ jal set_popup_duration @@ -77,7 +77,7 @@ glabel L802A9394_4303B4 /* 4303C0 802A93A0 9623004E */ lhu $v1, 0x4e($s1) /* 4303C4 802A93A4 10400003 */ beqz $v0, .L802A93B4 /* 4303C8 802A93A8 2462FFFF */ addiu $v0, $v1, -1 -/* 4303CC 802A93AC 080AA5F9 */ j .L802A97E4 +/* 4303CC 802A93AC 080AA5F9 */ j L802A97E4_430804 /* 4303D0 802A93B0 A622004E */ sh $v0, 0x4e($s1) .L802A93B4: /* 4303D4 802A93B4 8E240004 */ lw $a0, 4($s1) @@ -349,7 +349,7 @@ glabel L802A93FC_43041C /* 4307AC 802A978C 24020005 */ addiu $v0, $zero, 5 /* 4307B0 802A9790 A6220054 */ sh $v0, 0x54($s1) /* 4307B4 802A9794 2402000C */ addiu $v0, $zero, 0xc -/* 4307B8 802A9798 080AA5F9 */ j .L802A97E4 +/* 4307B8 802A9798 080AA5F9 */ j L802A97E4_430804 /* 4307BC 802A979C A622004C */ sh $v0, 0x4c($s1) glabel L802A97A0_4307C0 /* 4307C0 802A97A0 86220064 */ lh $v0, 0x64($s1) @@ -367,12 +367,11 @@ glabel L802A97A0_4307C0 /* 4307EC 802A97CC 10400003 */ beqz $v0, .L802A97DC /* 4307F0 802A97D0 2462FFFF */ addiu $v0, $v1, -1 .L802A97D4: -/* 4307F4 802A97D4 080AA5F9 */ j .L802A97E4 +/* 4307F4 802A97D4 080AA5F9 */ j L802A97E4_430804 /* 4307F8 802A97D8 A6220054 */ sh $v0, 0x54($s1) .L802A97DC: /* 4307FC 802A97DC 0C09A327 */ jal func_80268C9C /* 430800 802A97E0 00000000 */ nop -.L802A97E4: glabel L802A97E4_430804 /* 430804 802A97E4 8FBF001C */ lw $ra, 0x1c($sp) /* 430808 802A97E8 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/_heap_free.s b/ver/us/asm/nonmatchings/code_43F0/_heap_free.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/_heap_free.s rename to ver/us/asm/nonmatchings/code_43F0/_heap_free.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc.s b/ver/us/asm/nonmatchings/code_43F0/_heap_malloc.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc.s rename to ver/us/asm/nonmatchings/code_43F0/_heap_malloc.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc_tail.s b/ver/us/asm/nonmatchings/code_43F0/_heap_malloc_tail.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc_tail.s rename to ver/us/asm/nonmatchings/code_43F0/_heap_malloc_tail.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/_heap_realloc.s b/ver/us/asm/nonmatchings/code_43F0/_heap_realloc.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/_heap_realloc.s rename to ver/us/asm/nonmatchings/code_43F0/_heap_realloc.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/atan2.s b/ver/us/asm/nonmatchings/code_43F0/atan2.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/atan2.s rename to ver/us/asm/nonmatchings/code_43F0/atan2.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/clamp_angle.s b/ver/us/asm/nonmatchings/code_43F0/clamp_angle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/clamp_angle.s rename to ver/us/asm/nonmatchings/code_43F0/clamp_angle.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/cosine.s b/ver/us/asm/nonmatchings/code_43F0/cosine.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/cosine.s rename to ver/us/asm/nonmatchings/code_43F0/cosine.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s b/ver/us/asm/nonmatchings/code_43F0/func_8002A904.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s rename to ver/us/asm/nonmatchings/code_43F0/func_8002A904.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/func_8002AAC4.s b/ver/us/asm/nonmatchings/code_43F0/func_8002AAC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/func_8002AAC4.s rename to ver/us/asm/nonmatchings/code_43F0/func_8002AAC4.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/func_8002AB5C.s b/ver/us/asm/nonmatchings/code_43F0/func_8002AB5C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/func_8002AB5C.s rename to ver/us/asm/nonmatchings/code_43F0/func_8002AB5C.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/int_to_string.s b/ver/us/asm/nonmatchings/code_43F0/int_to_string.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/int_to_string.s rename to ver/us/asm/nonmatchings/code_43F0/int_to_string.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/rand_int.s b/ver/us/asm/nonmatchings/code_43F0/rand_int.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/rand_int.s rename to ver/us/asm/nonmatchings/code_43F0/rand_int.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/transform_point.s b/ver/us/asm/nonmatchings/code_43F0/transform_point.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/transform_point.s rename to ver/us/asm/nonmatchings/code_43F0/transform_point.s diff --git a/ver/us/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s b/ver/us/asm/nonmatchings/code_43F0/update_lerp.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s rename to ver/us/asm/nonmatchings/code_43F0/update_lerp.s diff --git a/ver/us/asm/nonmatchings/code_77480/check_for_interactables.s b/ver/us/asm/nonmatchings/code_77480/check_for_interactables.s index 0ab902f50d..17129d9502 100644 --- a/ver/us/asm/nonmatchings/code_77480/check_for_interactables.s +++ b/ver/us/asm/nonmatchings/code_77480/check_for_interactables.s @@ -52,7 +52,7 @@ glabel check_for_interactables /* 79D80 800E08D0 0080802D */ daddu $s0, $a0, $zero /* 79D84 800E08D4 2443FFFD */ addiu $v1, $v0, -3 /* 79D88 800E08D8 2C620031 */ sltiu $v0, $v1, 0x31 -/* 79D8C 800E08DC 10400038 */ beqz $v0, .L800E09C0 +/* 79D8C 800E08DC 10400038 */ beqz $v0, L800E09C0_79E70 /* 79D90 800E08E0 00031080 */ sll $v0, $v1, 2 /* 79D94 800E08E4 3C018011 */ lui $at, %hi(jtbl_8010BC60) /* 79D98 800E08E8 00220821 */ addu $at, $at, $v0 @@ -60,7 +60,7 @@ glabel check_for_interactables /* 79DA0 800E08F0 00400008 */ jr $v0 /* 79DA4 800E08F4 00000000 */ nop glabel L800E08F8_79DA8 -/* 79DA8 800E08F8 08038270 */ j .L800E09C0 +/* 79DA8 800E08F8 08038270 */ j L800E09C0_79E70 /* 79DAC 800E08FC 2410FFFF */ addiu $s0, $zero, -1 .L800E0900: /* 79DB0 800E0900 3C020200 */ lui $v0, 0x200 @@ -81,7 +81,7 @@ glabel L800E08F8_79DA8 /* 79DEC 800E093C 34502000 */ ori $s0, $v0, 0x2000 /* 79DF0 800E0940 1070005C */ beq $v1, $s0, .L800E0AB4 /* 79DF4 800E0944 0000902D */ daddu $s2, $zero, $zero -/* 79DF8 800E0948 08038270 */ j .L800E09C0 +/* 79DF8 800E0948 08038270 */ j L800E09C0_79E70 /* 79DFC 800E094C 00000000 */ nop .L800E0950: /* 79E00 800E0950 3442FFFF */ ori $v0, $v0, 0xffff @@ -94,18 +94,18 @@ glabel L800E08F8_79DA8 .L800E096C: /* 79E1C 800E096C 14400009 */ bnez $v0, .L800E0994 /* 79E20 800E0970 32022000 */ andi $v0, $s0, 0x2000 -/* 79E24 800E0974 14400012 */ bnez $v0, .L800E09C0 +/* 79E24 800E0974 14400012 */ bnez $v0, L800E09C0_79E70 /* 79E28 800E0978 0000902D */ daddu $s2, $zero, $zero /* 79E2C 800E097C 0C05173A */ jal should_collider_allow_interact /* 79E30 800E0980 0200202D */ daddu $a0, $s0, $zero -/* 79E34 800E0984 1440000E */ bnez $v0, .L800E09C0 +/* 79E34 800E0984 1440000E */ bnez $v0, L800E09C0_79E70 /* 79E38 800E0988 3C03F7FF */ lui $v1, 0xf7ff /* 79E3C 800E098C 0803826A */ j .L800E09A8 /* 79E40 800E0990 00000000 */ nop .L800E0994: /* 79E44 800E0994 0C0394BE */ jal can_player_interact /* 79E48 800E0998 00000000 */ nop -/* 79E4C 800E099C 14400008 */ bnez $v0, .L800E09C0 +/* 79E4C 800E099C 14400008 */ bnez $v0, L800E09C0_79E70 /* 79E50 800E09A0 24120001 */ addiu $s2, $zero, 1 /* 79E54 800E09A4 3C03F7FF */ lui $v1, 0xf7ff .L800E09A8: @@ -115,7 +115,6 @@ glabel L800E08F8_79DA8 /* 79E64 800E09B4 00431024 */ and $v0, $v0, $v1 /* 79E68 800E09B8 080382AD */ j .L800E0AB4 /* 79E6C 800E09BC AE220000 */ sw $v0, ($s1) -.L800E09C0: glabel L800E09C0_79E70 /* 79E70 800E09C0 862200C6 */ lh $v0, 0xc6($s1) /* 79E74 800E09C4 14500008 */ bne $v0, $s0, .L800E09E8 diff --git a/ver/us/asm/nonmatchings/code_7B440/func_800E24F8.s b/ver/us/asm/nonmatchings/code_7B440/func_800E24F8.s index 529e77ee4f..17bcacc068 100644 --- a/ver/us/asm/nonmatchings/code_7B440/func_800E24F8.s +++ b/ver/us/asm/nonmatchings/code_7B440/func_800E24F8.s @@ -35,7 +35,7 @@ glabel func_800E24F8 /* 7BA1C 800E256C 00021600 */ sll $v0, $v0, 0x18 /* 7BA20 800E2570 00021E03 */ sra $v1, $v0, 0x18 /* 7BA24 800E2574 2C620011 */ sltiu $v0, $v1, 0x11 -/* 7BA28 800E2578 1040002D */ beqz $v0, .L800E2630 +/* 7BA28 800E2578 1040002D */ beqz $v0, L800E2630_7BAE0 /* 7BA2C 800E257C 00031080 */ sll $v0, $v1, 2 /* 7BA30 800E2580 3C018011 */ lui $at, %hi(jtbl_8010BD38) /* 7BA34 800E2584 00220821 */ addu $at, $at, $v0 @@ -86,7 +86,6 @@ glabel L800E2620_7BAD0 /* 7BAD4 800E2624 44812000 */ mtc1 $at, $f4 /* 7BAD8 800E2628 080389A5 */ j .L800E2694 /* 7BADC 800E262C E4A4049C */ swc1 $f4, 0x49c($a1) -.L800E2630: glabel L800E2630_7BAE0 /* 7BAE0 800E2630 C4A0049C */ lwc1 $f0, 0x49c($a1) /* 7BAE4 800E2634 3C014000 */ lui $at, 0x4000 diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s index d570e434cb..5a9e052f05 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s +++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s @@ -9,7 +9,7 @@ glabel func_800E2F60 /* 7C420 800E2F70 00021600 */ sll $v0, $v0, 0x18 /* 7C424 800E2F74 00021E03 */ sra $v1, $v0, 0x18 /* 7C428 800E2F78 2C620015 */ sltiu $v0, $v1, 0x15 -/* 7C42C 800E2F7C 10400039 */ beqz $v0, .L800E3064 +/* 7C42C 800E2F7C 10400039 */ beqz $v0, L800E3064_7C514 /* 7C430 800E2F80 00031080 */ sll $v0, $v1, 2 /* 7C434 800E2F84 3C018011 */ lui $at, %hi(jtbl_8010BDE8) /* 7C438 800E2F88 00220821 */ addu $at, $at, $v0 @@ -70,7 +70,6 @@ glabel L800E2FD0_7C480 /* 7C508 800E3058 E4A60074 */ swc1 $f6, 0x74($a1) /* 7C50C 800E305C E4A40078 */ swc1 $f4, 0x78($a1) /* 7C510 800E3060 E4A0007C */ swc1 $f0, 0x7c($a1) -.L800E3064: glabel L800E3064_7C514 /* 7C514 800E3064 03E00008 */ jr $ra /* 7C518 800E3068 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s index dba3a91136..6240ae5709 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s +++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s @@ -21,12 +21,12 @@ glabel func_800E5530 /* 7EA20 800E5570 24020001 */ addiu $v0, $zero, 1 /* 7EA24 800E5574 8462008C */ lh $v0, 0x8c($v1) /* 7EA28 800E5578 38420004 */ xori $v0, $v0, 4 -/* 7EA2C 800E557C 08039610 */ j .L800E5840 +/* 7EA2C 800E557C 08039610 */ j L800E5840_7ECF0 /* 7EA30 800E5580 0002802B */ sltu $s0, $zero, $v0 .L800E5584: /* 7EA34 800E5584 8463008C */ lh $v1, 0x8c($v1) /* 7EA38 800E5588 2C62000C */ sltiu $v0, $v1, 0xc -/* 7EA3C 800E558C 104000AC */ beqz $v0, .L800E5840 +/* 7EA3C 800E558C 104000AC */ beqz $v0, L800E5840_7ECF0 /* 7EA40 800E5590 00031080 */ sll $v0, $v1, 2 /* 7EA44 800E5594 3C018011 */ lui $at, %hi(jtbl_8010BF00) /* 7EA48 800E5598 00220821 */ addu $at, $at, $v0 @@ -44,9 +44,9 @@ glabel L800E55A8_7EA58 /* 7EA74 800E55C4 00000000 */ nop /* 7EA78 800E55C8 4600103E */ c.le.s $f2, $f0 /* 7EA7C 800E55CC 00000000 */ nop -/* 7EA80 800E55D0 4500009A */ bc1f .L800E583C +/* 7EA80 800E55D0 4500009A */ bc1f L800E583C_7ECEC /* 7EA84 800E55D4 24020001 */ addiu $v0, $zero, 1 -/* 7EA88 800E55D8 0803960F */ j .L800E583C +/* 7EA88 800E55D8 0803960F */ j L800E583C_7ECEC /* 7EA8C 800E55DC A4620000 */ sh $v0, ($v1) .L800E55E0: /* 7EA90 800E55E0 C4A2002C */ lwc1 $f2, 0x2c($a1) @@ -72,7 +72,7 @@ glabel L800E5618_7EAC8 /* 7EAD4 800E5624 00000000 */ nop /* 7EAD8 800E5628 4602003C */ c.lt.s $f0, $f2 /* 7EADC 800E562C 00000000 */ nop -/* 7EAE0 800E5630 45030083 */ bc1tl .L800E5840 +/* 7EAE0 800E5630 45030083 */ bc1tl L800E5840_7ECF0 /* 7EAE4 800E5634 0000802D */ daddu $s0, $zero, $zero /* 7EAE8 800E5638 3C01C3F7 */ lui $at, 0xc3f7 /* 7EAEC 800E563C 34218000 */ ori $at, $at, 0x8000 @@ -88,7 +88,7 @@ glabel L800E5654_7EB04 /* 7EB10 800E5660 00000000 */ nop /* 7EB14 800E5664 4602003C */ c.lt.s $f0, $f2 /* 7EB18 800E5668 00000000 */ nop -/* 7EB1C 800E566C 45030074 */ bc1tl .L800E5840 +/* 7EB1C 800E566C 45030074 */ bc1tl L800E5840_7ECF0 /* 7EB20 800E5670 0000802D */ daddu $s0, $zero, $zero /* 7EB24 800E5674 3C01C3B9 */ lui $at, 0xc3b9 /* 7EB28 800E5678 44810000 */ mtc1 $at, $f0 @@ -100,7 +100,7 @@ glabel L800E568C_7EB3C /* 7EB3C 800E568C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 7EB40 800E5690 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 7EB44 800E5694 8442008E */ lh $v0, 0x8e($v0) -/* 7EB48 800E5698 54400069 */ bnel $v0, $zero, .L800E5840 +/* 7EB48 800E5698 54400069 */ bnel $v0, $zero, L800E5840_7ECF0 /* 7EB4C 800E569C 24100002 */ addiu $s0, $zero, 2 /* 7EB50 800E56A0 3C038011 */ lui $v1, %hi(D_8010C9B0) /* 7EB54 800E56A4 2463C9B0 */ addiu $v1, $v1, %lo(D_8010C9B0) @@ -112,7 +112,7 @@ glabel L800E568C_7EB3C /* 7EB6C 800E56BC 00000000 */ nop /* 7EB70 800E56C0 4602003C */ c.lt.s $f0, $f2 /* 7EB74 800E56C4 00000000 */ nop -/* 7EB78 800E56C8 4503005D */ bc1tl .L800E5840 +/* 7EB78 800E56C8 4503005D */ bc1tl L800E5840_7ECF0 /* 7EB7C 800E56CC 24100002 */ addiu $s0, $zero, 2 /* 7EB80 800E56D0 24020001 */ addiu $v0, $zero, 1 /* 7EB84 800E56D4 A4620000 */ sh $v0, ($v1) @@ -125,7 +125,7 @@ glabel L800E56E8_7EB98 /* 7EB98 800E56E8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 7EB9C 800E56EC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 7EBA0 800E56F0 8442008E */ lh $v0, 0x8e($v0) -/* 7EBA4 800E56F4 54400052 */ bnel $v0, $zero, .L800E5840 +/* 7EBA4 800E56F4 54400052 */ bnel $v0, $zero, L800E5840_7ECF0 /* 7EBA8 800E56F8 24100002 */ addiu $s0, $zero, 2 /* 7EBAC 800E56FC 3C038011 */ lui $v1, %hi(D_8010C9B0) /* 7EBB0 800E5700 2463C9B0 */ addiu $v1, $v1, %lo(D_8010C9B0) @@ -138,7 +138,7 @@ glabel L800E56E8_7EB98 /* 7EBCC 800E571C 00000000 */ nop /* 7EBD0 800E5720 4602003C */ c.lt.s $f0, $f2 /* 7EBD4 800E5724 00000000 */ nop -/* 7EBD8 800E5728 45030045 */ bc1tl .L800E5840 +/* 7EBD8 800E5728 45030045 */ bc1tl L800E5840_7ECF0 /* 7EBDC 800E572C 24100002 */ addiu $s0, $zero, 2 /* 7EBE0 800E5730 24020001 */ addiu $v0, $zero, 1 /* 7EBE4 800E5734 A4620000 */ sh $v0, ($v1) @@ -160,7 +160,7 @@ glabel L800E574C_7EBFC /* 7EC1C 800E576C 00000000 */ nop /* 7EC20 800E5770 4602003C */ c.lt.s $f0, $f2 /* 7EC24 800E5774 00000000 */ nop -/* 7EC28 800E5778 45030031 */ bc1tl .L800E5840 +/* 7EC28 800E5778 45030031 */ bc1tl L800E5840_7ECF0 /* 7EC2C 800E577C 24100002 */ addiu $s0, $zero, 2 /* 7EC30 800E5780 24020001 */ addiu $v0, $zero, 1 /* 7EC34 800E5784 A4620000 */ sh $v0, ($v1) @@ -194,7 +194,7 @@ glabel L800E57B0_7EC60 /* 7EC94 800E57E4 00000000 */ nop /* 7EC98 800E57E8 4602003C */ c.lt.s $f0, $f2 /* 7EC9C 800E57EC 00000000 */ nop -/* 7ECA0 800E57F0 45030013 */ bc1tl .L800E5840 +/* 7ECA0 800E57F0 45030013 */ bc1tl L800E5840_7ECF0 /* 7ECA4 800E57F4 24100002 */ addiu $s0, $zero, 2 /* 7ECA8 800E57F8 24020001 */ addiu $v0, $zero, 1 /* 7ECAC 800E57FC A4620000 */ sh $v0, ($v1) @@ -216,10 +216,8 @@ glabel L800E57B0_7EC60 /* 7ECE0 800E5830 2842FFC6 */ slti $v0, $v0, -0x3a /* 7ECE4 800E5834 14400003 */ bnez $v0, .L800E5844 /* 7ECE8 800E5838 24020001 */ addiu $v0, $zero, 1 -.L800E583C: glabel L800E583C_7ECEC /* 7ECEC 800E583C 24100002 */ addiu $s0, $zero, 2 -.L800E5840: glabel L800E5840_7ECF0 /* 7ECF0 800E5840 24020001 */ addiu $v0, $zero, 1 .L800E5844: diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s index dda74d7fc5..5f20a0c778 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s +++ b/ver/us/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s @@ -16,7 +16,7 @@ glabel update_fall_state /* 7C1F4 800E2D44 00021600 */ sll $v0, $v0, 0x18 /* 7C1F8 800E2D48 00021E03 */ sra $v1, $v0, 0x18 /* 7C1FC 800E2D4C 2C620014 */ sltiu $v0, $v1, 0x14 -/* 7C200 800E2D50 10400045 */ beqz $v0, .L800E2E68 +/* 7C200 800E2D50 10400045 */ beqz $v0, L800E2E68_7C318 /* 7C204 800E2D54 00031080 */ sll $v0, $v1, 2 /* 7C208 800E2D58 3C018011 */ lui $at, %hi(jtbl_8010BD98) /* 7C20C 800E2D5C 00220821 */ addu $at, $at, $v0 @@ -26,12 +26,12 @@ glabel update_fall_state glabel L800E2D6C_7C21C /* 7C21C 800E2D6C 0C038AEC */ jal func_800E2BB0 /* 7C220 800E2D70 00000000 */ nop -/* 7C224 800E2D74 08038BD3 */ j .L800E2F4C +/* 7C224 800E2D74 08038BD3 */ j L800E2F4C_7C3FC /* 7C228 800E2D78 00000000 */ nop glabel L800E2D7C_7C22C /* 7C22C 800E2D7C 0C038A72 */ jal func_800E29C8 /* 7C230 800E2D80 00000000 */ nop -/* 7C234 800E2D84 08038BD3 */ j .L800E2F4C +/* 7C234 800E2D84 08038BD3 */ j L800E2F4C_7C3FC /* 7C238 800E2D88 00000000 */ nop glabel L800E2D8C_7C23C /* 7C23C 800E2D8C 0C038D12 */ jal integrate_gravity @@ -43,7 +43,7 @@ glabel L800E2D8C_7C23C /* 7C254 800E2DA4 00000000 */ nop /* 7C258 800E2DA8 4614103E */ c.le.s $f2, $f20 /* 7C25C 800E2DAC 00000000 */ nop -/* 7C260 800E2DB0 45000066 */ bc1f .L800E2F4C +/* 7C260 800E2DB0 45000066 */ bc1f L800E2F4C_7C3FC /* 7C264 800E2DB4 E600002C */ swc1 $f0, 0x2c($s0) /* 7C268 800E2DB8 0C0389AC */ jal func_800E26B0 /* 7C26C 800E2DBC 00000000 */ nop @@ -78,7 +78,7 @@ glabel L800E2DFC_7C2AC /* 7C2DC 800E2E2C 00000000 */ nop /* 7C2E0 800E2E30 4600203E */ c.le.s $f4, $f0 /* 7C2E4 800E2E34 00000000 */ nop -/* 7C2E8 800E2E38 45000044 */ bc1f .L800E2F4C +/* 7C2E8 800E2E38 45000044 */ bc1f L800E2F4C_7C3FC /* 7C2EC 800E2E3C E602002C */ swc1 $f2, 0x2c($s0) /* 7C2F0 800E2E40 0C0389AC */ jal func_800E26B0 /* 7C2F4 800E2E44 00000000 */ nop @@ -90,9 +90,8 @@ glabel L800E2DFC_7C2AC /* 7C304 800E2E54 00000000 */ nop /* 7C308 800E2E58 0C039769 */ jal set_action_state /* 7C30C 800E2E5C 24040008 */ addiu $a0, $zero, 8 -/* 7C310 800E2E60 08038BD3 */ j .L800E2F4C +/* 7C310 800E2E60 08038BD3 */ j L800E2F4C_7C3FC /* 7C314 800E2E64 00000000 */ nop -.L800E2E68: glabel L800E2E68_7C318 /* 7C318 800E2E68 8E0200DC */ lw $v0, 0xdc($s0) /* 7C31C 800E2E6C 30428000 */ andi $v0, $v0, 0x8000 @@ -154,7 +153,6 @@ glabel L800E2E68_7C318 /* 7C3F0 800E2F40 C6020070 */ lwc1 $f2, 0x70($s0) /* 7C3F4 800E2F44 46020000 */ add.s $f0, $f0, $f2 /* 7C3F8 800E2F48 E600002C */ swc1 $f0, 0x2c($s0) -.L800E2F4C: glabel L800E2F4C_7C3FC /* 7C3FC 800E2F4C 8FBF0014 */ lw $ra, 0x14($sp) /* 7C400 800E2F50 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s b/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s index 6241fa6473..cf089327d4 100644 --- a/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s +++ b/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s @@ -18,17 +18,17 @@ glabel check_input_open_menus /* 801C8 800E6D18 80620078 */ lb $v0, 0x78($v1) /* 801CC 800E6D1C 3C128011 */ lui $s2, %hi(D_8010C9C8) /* 801D0 800E6D20 2652C9C8 */ addiu $s2, $s2, %lo(D_8010C9C8) -/* 801D4 800E6D24 14400151 */ bnez $v0, .L800E726C +/* 801D4 800E6D24 14400151 */ bnez $v0, L800E726C_8071C /* 801D8 800E6D28 00000000 */ nop /* 801DC 800E6D2C 9062007E */ lbu $v0, 0x7e($v1) /* 801E0 800E6D30 30420001 */ andi $v0, $v0, 1 -/* 801E4 800E6D34 1440014D */ bnez $v0, .L800E726C +/* 801E4 800E6D34 1440014D */ bnez $v0, L800E726C_8071C /* 801E8 800E6D38 0000202D */ daddu $a0, $zero, $zero /* 801EC 800E6D3C 3C05F5DE */ lui $a1, 0xf5de /* 801F0 800E6D40 0C0B1EAF */ jal get_variable /* 801F4 800E6D44 34A50180 */ ori $a1, $a1, 0x180 /* 801F8 800E6D48 2403FF80 */ addiu $v1, $zero, -0x80 -/* 801FC 800E6D4C 10430147 */ beq $v0, $v1, .L800E726C +/* 801FC 800E6D4C 10430147 */ beq $v0, $v1, L800E726C_8071C /* 80200 800E6D50 00000000 */ nop /* 80204 800E6D54 82620000 */ lb $v0, ($s3) /* 80208 800E6D58 1040000A */ beqz $v0, .L800E6D84 @@ -59,7 +59,7 @@ glabel check_input_open_menus /* 80260 800E6DB0 3C038011 */ lui $v1, %hi(D_8010CD00) /* 80264 800E6DB4 8463CD00 */ lh $v1, %lo(D_8010CD00)($v1) /* 80268 800E6DB8 2C62000B */ sltiu $v0, $v1, 0xb -/* 8026C 800E6DBC 1040012B */ beqz $v0, .L800E726C +/* 8026C 800E6DBC 1040012B */ beqz $v0, L800E726C_8071C /* 80270 800E6DC0 00031080 */ sll $v0, $v1, 2 /* 80274 800E6DC4 3C018011 */ lui $at, %hi(jtbl_8010BF30) /* 80278 800E6DC8 00220821 */ addu $at, $at, $v0 @@ -70,7 +70,7 @@ glabel L800E6DD8_80288 /* 80288 800E6DD8 0220202D */ daddu $a0, $s1, $zero /* 8028C 800E6DDC 0C039A77 */ jal can_pause /* 80290 800E6DE0 0200282D */ daddu $a1, $s0, $zero -/* 80294 800E6DE4 10400121 */ beqz $v0, .L800E726C +/* 80294 800E6DE4 10400121 */ beqz $v0, L800E726C_8071C /* 80298 800E6DE8 24020001 */ addiu $v0, $zero, 1 /* 8029C 800E6DEC 3C038011 */ lui $v1, %hi(D_8010CCF8) /* 802A0 800E6DF0 2463CCF8 */ addiu $v1, $v1, %lo(D_8010CCF8) @@ -104,14 +104,14 @@ glabel L800E6DD8_80288 /* 80300 800E6E50 2404021D */ addiu $a0, $zero, 0x21d /* 80304 800E6E54 3C028011 */ lui $v0, %hi(D_8010C9C0) /* 80308 800E6E58 8442C9C0 */ lh $v0, %lo(D_8010C9C0)($v0) -/* 8030C 800E6E5C 10400103 */ beqz $v0, .L800E726C +/* 8030C 800E6E5C 10400103 */ beqz $v0, L800E726C_8071C /* 80310 800E6E60 00000000 */ nop /* 80314 800E6E64 08039C72 */ j .L800E71C8 /* 80318 800E6E68 00000000 */ nop .L800E6E6C: /* 8031C 800E6E6C 0C039ADE */ jal setup_partner_popup /* 80320 800E6E70 0240202D */ daddu $a0, $s2, $zero -/* 80324 800E6E74 104000FD */ beqz $v0, .L800E726C +/* 80324 800E6E74 104000FD */ beqz $v0, L800E726C_8071C /* 80328 800E6E78 24030001 */ addiu $v1, $zero, 1 /* 8032C 800E6E7C AE420324 */ sw $v0, 0x324($s2) /* 80330 800E6E80 3C028011 */ lui $v0, %hi(gPlayerData) @@ -128,7 +128,7 @@ glabel L800E6DD8_80288 .L800E6EAC: /* 8035C 800E6EAC 0C039B11 */ jal setup_item_popup /* 80360 800E6EB0 0240202D */ daddu $a0, $s2, $zero -/* 80364 800E6EB4 104000ED */ beqz $v0, .L800E726C +/* 80364 800E6EB4 104000ED */ beqz $v0, L800E726C_8071C /* 80368 800E6EB8 00000000 */ nop /* 8036C 800E6EBC AE400318 */ sw $zero, 0x318($s2) /* 80370 800E6EC0 AE420324 */ sw $v0, 0x324($s2) @@ -151,7 +151,7 @@ glabel L800E6DD8_80288 /* 803B0 800E6F00 00021603 */ sra $v0, $v0, 0x18 /* 803B4 800E6F04 3C018011 */ lui $at, %hi(D_8010CCFE) /* 803B8 800E6F08 A422CCFE */ sh $v0, %lo(D_8010CCFE)($at) -/* 803BC 800E6F0C 08039C9B */ j .L800E726C +/* 803BC 800E6F0C 08039C9B */ j L800E726C_8071C /* 803C0 800E6F10 00000000 */ nop glabel L800E6F14_803C4 /* 803C4 800E6F14 0C039A41 */ jal func_800E6904 @@ -180,7 +180,7 @@ glabel L800E6F14_803C4 /* 8041C 800E6F6C 8442C9C0 */ lh $v0, %lo(D_8010C9C0)($v0) /* 80420 800E6F70 3C018011 */ lui $at, %hi(D_8010CD00) /* 80424 800E6F74 A420CD00 */ sh $zero, %lo(D_8010CD00)($at) -/* 80428 800E6F78 104000BC */ beqz $v0, .L800E726C +/* 80428 800E6F78 104000BC */ beqz $v0, L800E726C_8071C /* 8042C 800E6F7C 00000000 */ nop /* 80430 800E6F80 08039C72 */ j .L800E71C8 /* 80434 800E6F84 00000000 */ nop @@ -191,7 +191,7 @@ glabel L800E6F14_803C4 /* 80444 800E6F94 2442FFFF */ addiu $v0, $v0, -1 /* 80448 800E6F98 A4620000 */ sh $v0, ($v1) /* 8044C 800E6F9C 00021400 */ sll $v0, $v0, 0x10 -/* 80450 800E6FA0 144000B2 */ bnez $v0, .L800E726C +/* 80450 800E6FA0 144000B2 */ bnez $v0, L800E726C_8071C /* 80454 800E6FA4 24040002 */ addiu $a0, $zero, 2 /* 80458 800E6FA8 3C02800A */ lui $v0, %hi(D_8009A650) /* 8045C 800E6FAC 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) @@ -199,7 +199,7 @@ glabel L800E6F14_803C4 /* 80464 800E6FB4 3C018011 */ lui $at, %hi(D_8010CD00) /* 80468 800E6FB8 A424CD00 */ sh $a0, %lo(D_8010CD00)($at) /* 8046C 800E6FBC 34630040 */ ori $v1, $v1, 0x40 -/* 80470 800E6FC0 08039C9B */ j .L800E726C +/* 80470 800E6FC0 08039C9B */ j L800E726C_8071C /* 80474 800E6FC4 AC430000 */ sw $v1, ($v0) glabel L800E6FC8_80478 /* 80478 800E6FC8 3C038011 */ lui $v1, %hi(D_8010CCF8) @@ -216,7 +216,7 @@ glabel L800E6FC8_80478 /* 804A4 800E6FF4 A422CCFA */ sh $v0, %lo(D_8010CCFA)($at) /* 804A8 800E6FF8 3C018011 */ lui $at, %hi(D_8010CD00) /* 804AC 800E6FFC A422CD00 */ sh $v0, %lo(D_8010CD00)($at) -/* 804B0 800E7000 08039C9B */ j .L800E726C +/* 804B0 800E7000 08039C9B */ j L800E726C_8071C /* 804B4 800E7004 00000000 */ nop .L800E7008: /* 804B8 800E7008 0C03D390 */ jal func_800F4E40 @@ -233,16 +233,16 @@ glabel L800E6FC8_80478 /* 804E0 800E7030 2463CD00 */ addiu $v1, $v1, %lo(D_8010CD00) /* 804E4 800E7034 94620000 */ lhu $v0, ($v1) /* 804E8 800E7038 24420001 */ addiu $v0, $v0, 1 -/* 804EC 800E703C 08039C9B */ j .L800E726C +/* 804EC 800E703C 08039C9B */ j L800E726C_8071C /* 804F0 800E7040 A4620000 */ sh $v0, ($v1) glabel L800E7044_804F4 /* 804F4 800E7044 2402FFFF */ addiu $v0, $zero, -1 /* 804F8 800E7048 8643032C */ lh $v1, 0x32c($s2) -/* 804FC 800E704C 10620087 */ beq $v1, $v0, .L800E726C +/* 804FC 800E704C 10620087 */ beq $v1, $v0, L800E726C_8071C /* 80500 800E7050 9644032C */ lhu $a0, 0x32c($s2) /* 80504 800E7054 3C018011 */ lui $at, %hi(D_8010CCFC) /* 80508 800E7058 A424CCFC */ sh $a0, %lo(D_8010CCFC)($at) -/* 8050C 800E705C 10600083 */ beqz $v1, .L800E726C +/* 8050C 800E705C 10600083 */ beqz $v1, L800E726C_8071C /* 80510 800E7060 00000000 */ nop /* 80514 800E7064 0C03C4EC */ jal func_800F13B0 /* 80518 800E7068 00000000 */ nop @@ -253,7 +253,7 @@ glabel L800E7044_804F4 /* 8052C 800E707C 3C018011 */ lui $at, %hi(D_8010CCFA) /* 80530 800E7080 A424CCFA */ sh $a0, %lo(D_8010CCFA)($at) /* 80534 800E7084 24630001 */ addiu $v1, $v1, 1 -/* 80538 800E7088 08039C9B */ j .L800E726C +/* 80538 800E7088 08039C9B */ j L800E726C_8071C /* 8053C 800E708C A4430000 */ sh $v1, ($v0) glabel L800E7090_80540 /* 80540 800E7090 3C038011 */ lui $v1, %hi(D_8010CCFA) @@ -262,7 +262,7 @@ glabel L800E7090_80540 /* 8054C 800E709C 2442FFFF */ addiu $v0, $v0, -1 /* 80550 800E70A0 A4620000 */ sh $v0, ($v1) /* 80554 800E70A4 00021400 */ sll $v0, $v0, 0x10 -/* 80558 800E70A8 14400070 */ bnez $v0, .L800E726C +/* 80558 800E70A8 14400070 */ bnez $v0, L800E726C_8071C /* 8055C 800E70AC 00000000 */ nop /* 80560 800E70B0 0C03C54E */ jal func_800F1538 /* 80564 800E70B4 00000000 */ nop @@ -357,7 +357,7 @@ glabel L800E7090_80540 /* 806A4 800E71F4 00431024 */ and $v0, $v0, $v1 /* 806A8 800E71F8 0C009C22 */ jal func_80027088 /* 806AC 800E71FC ACA20000 */ sw $v0, ($a1) -/* 806B0 800E7200 08039C9B */ j .L800E726C +/* 806B0 800E7200 08039C9B */ j L800E726C_8071C /* 806B4 800E7204 00000000 */ nop glabel L800E7208_806B8 /* 806B8 800E7208 3C038011 */ lui $v1, %hi(D_8010CCFA) @@ -366,7 +366,7 @@ glabel L800E7208_806B8 /* 806C4 800E7214 2442FFFF */ addiu $v0, $v0, -1 /* 806C8 800E7218 A4620000 */ sh $v0, ($v1) /* 806CC 800E721C 00021400 */ sll $v0, $v0, 0x10 -/* 806D0 800E7220 14400012 */ bnez $v0, .L800E726C +/* 806D0 800E7220 14400012 */ bnez $v0, L800E726C_8071C /* 806D4 800E7224 00000000 */ nop /* 806D8 800E7228 0C039A18 */ jal func_800E6860 /* 806DC 800E722C 00000000 */ nop @@ -385,7 +385,6 @@ glabel L800E7208_806B8 /* 80710 800E7260 AC820000 */ sw $v0, ($a0) /* 80714 800E7264 0C03BD80 */ jal func_800EF600 /* 80718 800E7268 00000000 */ nop -.L800E726C: glabel L800E726C_8071C /* 8071C 800E726C 8FBF0024 */ lw $ra, 0x24($sp) /* 80720 800E7270 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/code_8800/update_cameras.s b/ver/us/asm/nonmatchings/code_8800/update_cameras.s index 4e667d3c87..fe36559e34 100644 --- a/ver/us/asm/nonmatchings/code_8800/update_cameras.s +++ b/ver/us/asm/nonmatchings/code_8800/update_cameras.s @@ -34,7 +34,7 @@ glabel update_cameras /* 8870 8002D470 3C01800A */ lui $at, %hi(D_8009A634) /* 8874 8002D474 A433A634 */ sh $s3, %lo(D_8009A634)($at) /* 8878 8002D478 2C620007 */ sltiu $v0, $v1, 7 -/* 887C 8002D47C 1040001E */ beqz $v0, .L8002D4F8 +/* 887C 8002D47C 1040001E */ beqz $v0, L8002D4F8_88F8 /* 8880 8002D480 00031080 */ sll $v0, $v1, 2 /* 8884 8002D484 3C01800A */ lui $at, %hi(jtbl_800981E0) /* 8888 8002D488 00220821 */ addu $at, $at, $v0 @@ -71,7 +71,6 @@ glabel L8002D4E8_88E8 /* 88EC 8002D4EC 0200202D */ daddu $a0, $s0, $zero /* 88F0 8002D4F0 0800B540 */ j .L8002D500 /* 88F4 8002D4F4 00000000 */ nop -.L8002D4F8: glabel L8002D4F8_88F8 /* 88F8 8002D4F8 0C00BE64 */ jal do_camera_type_6 /* 88FC 8002D4FC 0200202D */ daddu $a0, $s0, $zero diff --git a/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s b/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s index 8281a87f86..173b638e52 100644 --- a/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s +++ b/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s @@ -43,7 +43,7 @@ glabel func_800EFD08 /* 89244 800EFD94 3C018011 */ lui $at, %hi(D_8010CFF0) /* 89248 800EFD98 AC22CFF0 */ sw $v0, %lo(D_8010CFF0)($at) /* 8924C 800EFD9C 2C620009 */ sltiu $v0, $v1, 9 -/* 89250 800EFDA0 1040001A */ beqz $v0, .L800EFE0C +/* 89250 800EFDA0 1040001A */ beqz $v0, L800EFE0C_892BC /* 89254 800EFDA4 00031080 */ sll $v0, $v1, 2 /* 89258 800EFDA8 3C018011 */ lui $at, %hi(jtbl_8010C2E8) /* 8925C 800EFDAC 00220821 */ addu $at, $at, $v0 @@ -75,7 +75,6 @@ glabel L800EFDFC_892AC /* 892B0 800EFE00 00000000 */ nop /* 892B4 800EFE04 0803BF85 */ j .L800EFE14 /* 892B8 800EFE08 00000000 */ nop -.L800EFE0C: glabel L800EFE0C_892BC /* 892BC 800EFE0C 0C03BF8B */ jal func_800EFE2C /* 892C0 800EFE10 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s index 2d60ee3ff1..fd1dd81d95 100644 --- a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s +++ b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s @@ -11,7 +11,7 @@ glabel func_800F1A10 /* 8AED8 800F1A28 AFB1002C */ sw $s1, 0x2c($sp) /* 8AEDC 800F1A2C 24430007 */ addiu $v1, $v0, 7 /* 8AEE0 800F1A30 2C62006F */ sltiu $v0, $v1, 0x6f -/* 8AEE4 800F1A34 10400707 */ beqz $v0, .L800F3654 +/* 8AEE4 800F1A34 10400707 */ beqz $v0, L800F3654_8CB04 /* 8AEE8 800F1A38 AFB00028 */ sw $s0, 0x28($sp) /* 8AEEC 800F1A3C 00031080 */ sll $v0, $v1, 2 /* 8AEF0 800F1A40 3C018011 */ lui $at, %hi(jtbl_8010C410) @@ -981,7 +981,7 @@ glabel L800F2860_8BD10 /* 8BD18 800F2868 8C620000 */ lw $v0, ($v1) /* 8BD1C 800F286C 10400003 */ beqz $v0, .L800F287C /* 8BD20 800F2870 2442FFFF */ addiu $v0, $v0, -1 -/* 8BD24 800F2874 0803CD95 */ j .L800F3654 +/* 8BD24 800F2874 0803CD95 */ j L800F3654_8CB04 /* 8BD28 800F2878 AC620000 */ sw $v0, ($v1) .L800F287C: /* 8BD2C 800F287C 3C060001 */ lui $a2, 1 @@ -1188,16 +1188,16 @@ glabel L800F2860_8BD10 .L800F2B60: /* 8C010 800F2B60 3C028011 */ lui $v0, %hi(D_8010D68E) /* 8C014 800F2B64 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) -/* 8C018 800F2B68 104002BA */ beqz $v0, .L800F3654 +/* 8C018 800F2B68 104002BA */ beqz $v0, L800F3654_8CB04 /* 8C01C 800F2B6C 00000000 */ nop /* 8C020 800F2B70 10600003 */ beqz $v1, .L800F2B80 /* 8C024 800F2B74 24020003 */ addiu $v0, $zero, 3 -/* 8C028 800F2B78 146202B6 */ bne $v1, $v0, .L800F3654 +/* 8C028 800F2B78 146202B6 */ bne $v1, $v0, L800F3654_8CB04 /* 8C02C 800F2B7C 00000000 */ nop .L800F2B80: /* 8C030 800F2B80 0C05272D */ jal play_sound /* 8C034 800F2B84 2404021D */ addiu $a0, $zero, 0x21d -/* 8C038 800F2B88 0803CD95 */ j .L800F3654 +/* 8C038 800F2B88 0803CD95 */ j L800F3654_8CB04 /* 8C03C 800F2B8C 00000000 */ nop .L800F2B90: /* 8C040 800F2B90 3C028011 */ lui $v0, %hi(D_8010D69C) @@ -1274,13 +1274,13 @@ glabel L800F2BEC_8C09C .L800F2C88: /* 8C138 800F2C88 3C028011 */ lui $v0, %hi(D_8010D68E) /* 8C13C 800F2C8C 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) -/* 8C140 800F2C90 10400270 */ beqz $v0, .L800F3654 +/* 8C140 800F2C90 10400270 */ beqz $v0, L800F3654_8CB04 /* 8C144 800F2C94 00000000 */ nop /* 8C148 800F2C98 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 8C14C 800F2C9C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 8C150 800F2CA0 8C420010 */ lw $v0, 0x10($v0) /* 8C154 800F2CA4 00431024 */ and $v0, $v0, $v1 -/* 8C158 800F2CA8 1040026A */ beqz $v0, .L800F3654 +/* 8C158 800F2CA8 1040026A */ beqz $v0, L800F3654_8CB04 /* 8C15C 800F2CAC 00000000 */ nop /* 8C160 800F2CB0 0C05272D */ jal play_sound /* 8C164 800F2CB4 240400CA */ addiu $a0, $zero, 0xca @@ -1481,7 +1481,7 @@ glabel L800F2F74_8C424 /* 8C428 800F2F78 2463D644 */ addiu $v1, $v1, %lo(D_8010D644) /* 8C42C 800F2F7C 8C620000 */ lw $v0, ($v1) /* 8C430 800F2F80 2442FFFF */ addiu $v0, $v0, -1 -/* 8C434 800F2F84 144001B3 */ bnez $v0, .L800F3654 +/* 8C434 800F2F84 144001B3 */ bnez $v0, L800F3654_8CB04 /* 8C438 800F2F88 AC620000 */ sw $v0, ($v1) /* 8C43C 800F2F8C 3C048011 */ lui $a0, %hi(D_8010D648) /* 8C440 800F2F90 2484D648 */ addiu $a0, $a0, %lo(D_8010D648) @@ -1503,7 +1503,7 @@ glabel L800F2FB8_8C468 /* 8C47C 800F2FCC 24630001 */ addiu $v1, $v1, 1 /* 8C480 800F2FD0 AC430000 */ sw $v1, ($v0) /* 8C484 800F2FD4 0064182A */ slt $v1, $v1, $a0 -/* 8C488 800F2FD8 1460019E */ bnez $v1, .L800F3654 +/* 8C488 800F2FD8 1460019E */ bnez $v1, L800F3654_8CB04 /* 8C48C 800F2FDC 24030001 */ addiu $v1, $zero, 1 /* 8C490 800F2FE0 3C048011 */ lui $a0, %hi(D_8010D648) /* 8C494 800F2FE4 2484D648 */ addiu $a0, $a0, %lo(D_8010D648) @@ -1616,7 +1616,7 @@ glabel L800F30EC_8C59C /* 8C620 800F3170 24020001 */ addiu $v0, $zero, 1 /* 8C624 800F3174 3C018011 */ lui $at, %hi(D_8010D640) /* 8C628 800F3178 AC22D640 */ sw $v0, %lo(D_8010D640)($at) -/* 8C62C 800F317C 0803CD95 */ j .L800F3654 +/* 8C62C 800F317C 0803CD95 */ j L800F3654_8CB04 /* 8C630 800F3180 A460032C */ sh $zero, 0x32c($v1) glabel L800F3184_8C634 /* 8C634 800F3184 240500A0 */ addiu $a1, $zero, 0xa0 @@ -1800,7 +1800,7 @@ glabel L800F341C_8C8CC /* 8C8CC 800F341C 3C108011 */ lui $s0, %hi(D_8010D6A4) /* 8C8D0 800F3420 8E10D6A4 */ lw $s0, %lo(D_8010D6A4)($s0) /* 8C8D4 800F3424 24020001 */ addiu $v0, $zero, 1 -/* 8C8D8 800F3428 1602008A */ bne $s0, $v0, .L800F3654 +/* 8C8D8 800F3428 1602008A */ bne $s0, $v0, L800F3654_8CB04 /* 8C8DC 800F342C 24040015 */ addiu $a0, $zero, 0x15 /* 8C8E0 800F3430 0C051F9F */ jal set_window_update /* 8C8E4 800F3434 24050002 */ addiu $a1, $zero, 2 @@ -1811,7 +1811,7 @@ glabel L800F341C_8C8CC /* 8C8F8 800F3448 24020066 */ addiu $v0, $zero, 0x66 /* 8C8FC 800F344C 1050007F */ beq $v0, $s0, .L800F364C /* 8C900 800F3450 24020067 */ addiu $v0, $zero, 0x67 -/* 8C904 800F3454 0803CD95 */ j .L800F3654 +/* 8C904 800F3454 0803CD95 */ j L800F3654_8CB04 /* 8C908 800F3458 00000000 */ nop glabel L800F345C_8C90C /* 8C90C 800F345C 0803CD93 */ j .L800F364C @@ -1952,7 +1952,6 @@ glabel L800F3630_8CAE0 .L800F364C: /* 8CAFC 800F364C 3C018011 */ lui $at, %hi(D_8010D640) /* 8CB00 800F3650 AC22D640 */ sw $v0, %lo(D_8010D640)($at) -.L800F3654: glabel L800F3654_8CB04 /* 8CB04 800F3654 3C038011 */ lui $v1, %hi(D_8010D69C) /* 8CB08 800F3658 8C63D69C */ lw $v1, %lo(D_8010D69C)($v1) diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s index ba782481ae..7b27347197 100644 --- a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s +++ b/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s @@ -989,7 +989,7 @@ glabel L800F43E8_8D898 /* 8D974 800F44C4 8C420318 */ lw $v0, 0x318($v0) /* 8D978 800F44C8 2443FFFF */ addiu $v1, $v0, -1 /* 8D97C 800F44CC 2C62000D */ sltiu $v0, $v1, 0xd -/* 8D980 800F44D0 10400012 */ beqz $v0, .L800F451C +/* 8D980 800F44D0 10400012 */ beqz $v0, L800F451C_8D9CC /* 8D984 800F44D4 00031080 */ sll $v0, $v1, 2 /* 8D988 800F44D8 3C018011 */ lui $at, %hi(jtbl_8010C870) /* 8D98C 800F44DC 00220821 */ addu $at, $at, $v0 @@ -1013,7 +1013,6 @@ glabel L800F4508_8D9B8 glabel L800F4514_8D9C4 /* 8D9C4 800F4514 0803D150 */ j .L800F4540 /* 8D9C8 800F4518 240B001F */ addiu $t3, $zero, 0x1f -.L800F451C: glabel L800F451C_8D9CC /* 8D9CC 800F451C 240A0025 */ addiu $t2, $zero, 0x25 /* 8D9D0 800F4520 0803D151 */ j .L800F4544 diff --git a/ver/us/asm/nonmatchings/code_B0E0/update_camera_from_zone.s b/ver/us/asm/nonmatchings/code_B0E0/update_camera_from_zone.s index 6f58546ffe..2777133826 100644 --- a/ver/us/asm/nonmatchings/code_B0E0/update_camera_from_zone.s +++ b/ver/us/asm/nonmatchings/code_B0E0/update_camera_from_zone.s @@ -30,18 +30,18 @@ glabel update_camera_from_zone /* B960 80030560 8FB700B4 */ lw $s7, 0xb4($sp) /* B964 80030564 26020002 */ addiu $v0, $s0, 2 /* B968 80030568 2C420002 */ sltiu $v0, $v0, 2 -/* B96C 8003056C 144000C4 */ bnez $v0, .L80030880 +/* B96C 8003056C 144000C4 */ bnez $v0, L80030880_BC80 /* B970 80030570 0240882D */ daddu $s1, $s2, $zero /* B974 80030574 16000005 */ bnez $s0, .L8003058C /* B978 80030578 00000000 */ nop /* B97C 8003057C E6580010 */ swc1 $f24, 0x10($s2) /* B980 80030580 E65E0014 */ swc1 $f30, 0x14($s2) -/* B984 80030584 0800C220 */ j .L80030880 +/* B984 80030584 0800C220 */ j L80030880_BC80 /* B988 80030588 E65A0018 */ swc1 $f26, 0x18($s2) .L8003058C: /* B98C 8003058C 8E030000 */ lw $v1, ($s0) /* B990 80030590 2C620007 */ sltiu $v0, $v1, 7 -/* B994 80030594 104000BA */ beqz $v0, .L80030880 +/* B994 80030594 104000BA */ beqz $v0, L80030880_BC80 /* B998 80030598 00031080 */ sll $v0, $v1, 2 /* B99C 8003059C 3C01800A */ lui $at, %hi(jtbl_80098210) /* B9A0 800305A0 00220821 */ addu $at, $at, $v0 @@ -84,7 +84,7 @@ glabel L800305B0_B9B0 /* BA30 80030630 46062100 */ add.s $f4, $f4, $f6 /* BA34 80030634 E63E0014 */ swc1 $f30, 0x14($s1) /* BA38 80030638 E6280010 */ swc1 $f8, 0x10($s1) -/* BA3C 8003063C 0800C220 */ j .L80030880 +/* BA3C 8003063C 0800C220 */ j L80030880_BC80 /* BA40 80030640 E6240018 */ swc1 $f4, 0x18($s1) glabel L80030644_BA44 /* BA44 80030644 C60E000C */ lwc1 $f14, 0xc($s0) @@ -161,7 +161,7 @@ glabel L80030644_BA44 /* BB58 80030758 E6300010 */ swc1 $f16, 0x10($s1) .L8003075C: /* BB5C 8003075C E63E0014 */ swc1 $f30, 0x14($s1) -/* BB60 80030760 0800C220 */ j .L80030880 +/* BB60 80030760 0800C220 */ j L80030880_BC80 /* BB64 80030764 E62A0018 */ swc1 $f10, 0x18($s1) glabel L80030768_BB68 /* BB68 80030768 8E020028 */ lw $v0, 0x28($s0) @@ -180,7 +180,7 @@ glabel L80030768_BB68 /* BB9C 8003079C 00000000 */ nop /* BBA0 800307A0 4600C032 */ c.eq.s $f24, $f0 /* BBA4 800307A4 00000000 */ nop -/* BBA8 800307A8 45010035 */ bc1t .L80030880 +/* BBA8 800307A8 45010035 */ bc1t L80030880_BC80 /* BBAC 800307AC 00000000 */ nop /* BBB0 800307B0 4600C184 */ sqrt.s $f6, $f24 /* BBB4 800307B4 46063032 */ c.eq.s $f6, $f6 @@ -228,18 +228,17 @@ glabel L80030768_BB68 /* BC54 80030854 E6220010 */ swc1 $f2, 0x10($s1) /* BC58 80030858 C6000014 */ lwc1 $f0, 0x14($s0) /* BC5C 8003085C 46040000 */ add.s $f0, $f0, $f4 -/* BC60 80030860 0800C220 */ j .L80030880 +/* BC60 80030860 0800C220 */ j L80030880_BC80 /* BC64 80030864 E6200018 */ swc1 $f0, 0x18($s1) glabel L80030868_BC68 /* BC68 80030868 2402FFFF */ addiu $v0, $zero, -1 -/* BC6C 8003086C 0800C220 */ j .L80030880 +/* BC6C 8003086C 0800C220 */ j L80030880_BC80 /* BC70 80030870 AE820000 */ sw $v0, ($s4) glabel L80030874_BC74 /* BC74 80030874 E6380010 */ swc1 $f24, 0x10($s1) .L80030878: /* BC78 80030878 E63E0014 */ swc1 $f30, 0x14($s1) /* BC7C 8003087C E63A0018 */ swc1 $f26, 0x18($s1) -.L80030880: glabel L80030880_BC80 /* BC80 80030880 8FA20090 */ lw $v0, 0x90($sp) /* BC84 80030884 C7B800A0 */ lwc1 $f24, 0xa0($sp) diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011EBF0.s b/ver/us/asm/nonmatchings/code_B4580/func_8011EBF0.s index 5662162fd5..7542cedaea 100644 --- a/ver/us/asm/nonmatchings/code_B4580/func_8011EBF0.s +++ b/ver/us/asm/nonmatchings/code_B4580/func_8011EBF0.s @@ -13,7 +13,7 @@ glabel func_8011EBF0 /* B5310 8011EC10 8E300008 */ lw $s0, 8($s1) /* B5314 8011EC14 86030000 */ lh $v1, ($s0) /* B5318 8011EC18 2C620014 */ sltiu $v0, $v1, 0x14 -/* B531C 8011EC1C 10400105 */ beqz $v0, .L8011F034 +/* B531C 8011EC1C 10400105 */ beqz $v0, L8011F034_B5734 /* B5320 8011EC20 26100002 */ addiu $s0, $s0, 2 /* B5324 8011EC24 00031080 */ sll $v0, $v1, 2 /* B5328 8011EC28 3C018015 */ lui $at, %hi(jtbl_8014FE60) @@ -38,7 +38,7 @@ glabel L8011EC5C_B535C /* B5368 8011EC68 44820000 */ mtc1 $v0, $f0 /* B536C 8011EC6C 00000000 */ nop /* B5370 8011EC70 46800020 */ cvt.s.w $f0, $f0 -/* B5374 8011EC74 08047C0D */ j .L8011F034 +/* B5374 8011EC74 08047C0D */ j L8011F034_B5734 /* B5378 8011EC78 E6200090 */ swc1 $f0, 0x90($s1) glabel L8011EC7C_B537C /* B537C 8011EC7C 8E23000C */ lw $v1, 0xc($s1) @@ -298,7 +298,6 @@ glabel L8011EF6C_B566C /* B5728 8011F028 E4B600AC */ swc1 $f22, 0xac($a1) /* B572C 8011F02C 08047C0E */ j .L8011F038 /* B5730 8011F030 E4B400B0 */ swc1 $f20, 0xb0($a1) -.L8011F034: glabel L8011F034_B5734 /* B5734 8011F034 0000102D */ daddu $v0, $zero, $zero .L8011F038: diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011F4D4.s b/ver/us/asm/nonmatchings/code_B4580/func_8011F4D4.s index 376e08800b..d59f9a1c0f 100644 --- a/ver/us/asm/nonmatchings/code_B4580/func_8011F4D4.s +++ b/ver/us/asm/nonmatchings/code_B4580/func_8011F4D4.s @@ -88,7 +88,7 @@ glabel func_8011F4D4 /* B5D14 8011F614 00021600 */ sll $v0, $v0, 0x18 /* B5D18 8011F618 00021E03 */ sra $v1, $v0, 0x18 /* B5D1C 8011F61C 2C620026 */ sltiu $v0, $v1, 0x26 -/* B5D20 8011F620 104000F6 */ beqz $v0, .L8011F9FC +/* B5D20 8011F620 104000F6 */ beqz $v0, L8011F9FC_B60FC /* B5D24 8011F624 00031080 */ sll $v0, $v1, 2 /* B5D28 8011F628 3C018015 */ lui $at, %hi(jtbl_8014FEE0) /* B5D2C 8011F62C 00220821 */ addu $at, $at, $v0 @@ -106,7 +106,7 @@ glabel L8011F63C_B5D3C /* B5D58 8011F658 AC820000 */ sw $v0, ($a0) /* B5D5C 8011F65C 3C028015 */ lui $v0, %hi(D_8014B7F8) /* B5D60 8011F660 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) -/* B5D64 8011F664 08047E7F */ j .L8011F9FC +/* B5D64 8011F664 08047E7F */ j L8011F9FC_B60FC /* B5D68 8011F668 AC820004 */ sw $v0, 4($a0) glabel L8011F66C_B5D6C /* B5D6C 8011F66C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -119,7 +119,7 @@ glabel L8011F66C_B5D6C /* B5D88 8011F688 AC820000 */ sw $v0, ($a0) /* B5D8C 8011F68C 3C028015 */ lui $v0, %hi(D_8014B820) /* B5D90 8011F690 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) -/* B5D94 8011F694 08047E7F */ j .L8011F9FC +/* B5D94 8011F694 08047E7F */ j L8011F9FC_B60FC /* B5D98 8011F698 AC820004 */ sw $v0, 4($a0) glabel L8011F69C_B5D9C /* B5D9C 8011F69C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -132,7 +132,7 @@ glabel L8011F69C_B5D9C /* B5DB8 8011F6B8 AC820000 */ sw $v0, ($a0) /* B5DBC 8011F6BC 3C028015 */ lui $v0, %hi(D_8014B848) /* B5DC0 8011F6C0 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) -/* B5DC4 8011F6C4 08047E7F */ j .L8011F9FC +/* B5DC4 8011F6C4 08047E7F */ j L8011F9FC_B60FC /* B5DC8 8011F6C8 AC820004 */ sw $v0, 4($a0) glabel L8011F6CC_B5DCC /* B5DCC 8011F6CC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -145,7 +145,7 @@ glabel L8011F6CC_B5DCC /* B5DE8 8011F6E8 AC820000 */ sw $v0, ($a0) /* B5DEC 8011F6EC 3C028015 */ lui $v0, %hi(D_8014B870) /* B5DF0 8011F6F0 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) -/* B5DF4 8011F6F4 08047E7F */ j .L8011F9FC +/* B5DF4 8011F6F4 08047E7F */ j L8011F9FC_B60FC /* B5DF8 8011F6F8 AC820004 */ sw $v0, 4($a0) glabel L8011F6FC_B5DFC /* B5DFC 8011F6FC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -158,7 +158,7 @@ glabel L8011F6FC_B5DFC /* B5E18 8011F718 AC820000 */ sw $v0, ($a0) /* B5E1C 8011F71C 3C028015 */ lui $v0, %hi(D_8014B898) /* B5E20 8011F720 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) -/* B5E24 8011F724 08047E7F */ j .L8011F9FC +/* B5E24 8011F724 08047E7F */ j L8011F9FC_B60FC /* B5E28 8011F728 AC820004 */ sw $v0, 4($a0) glabel L8011F72C_B5E2C /* B5E2C 8011F72C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -171,7 +171,7 @@ glabel L8011F72C_B5E2C /* B5E48 8011F748 AC820000 */ sw $v0, ($a0) /* B5E4C 8011F74C 3C028015 */ lui $v0, %hi(D_8014B8C0) /* B5E50 8011F750 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) -/* B5E54 8011F754 08047E7F */ j .L8011F9FC +/* B5E54 8011F754 08047E7F */ j L8011F9FC_B60FC /* B5E58 8011F758 AC820004 */ sw $v0, 4($a0) glabel L8011F75C_B5E5C /* B5E5C 8011F75C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -184,7 +184,7 @@ glabel L8011F75C_B5E5C /* B5E78 8011F778 AC820000 */ sw $v0, ($a0) /* B5E7C 8011F77C 3C028015 */ lui $v0, %hi(D_8014B8E8) /* B5E80 8011F780 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) -/* B5E84 8011F784 08047E7F */ j .L8011F9FC +/* B5E84 8011F784 08047E7F */ j L8011F9FC_B60FC /* B5E88 8011F788 AC820004 */ sw $v0, 4($a0) .L8011F78C: /* B5E8C 8011F78C 92020004 */ lbu $v0, 4($s0) @@ -192,7 +192,7 @@ glabel L8011F75C_B5E5C /* B5E94 8011F794 00021600 */ sll $v0, $v0, 0x18 /* B5E98 8011F798 00021E03 */ sra $v1, $v0, 0x18 /* B5E9C 8011F79C 2C620026 */ sltiu $v0, $v1, 0x26 -/* B5EA0 8011F7A0 10400059 */ beqz $v0, .L8011F908 +/* B5EA0 8011F7A0 10400059 */ beqz $v0, L8011F908_B6008 /* B5EA4 8011F7A4 00031080 */ sll $v0, $v1, 2 /* B5EA8 8011F7A8 3C018015 */ lui $at, %hi(jtbl_8014FF78) /* B5EAC 8011F7AC 00220821 */ addu $at, $at, $v0 @@ -210,7 +210,7 @@ glabel L8011F7BC_B5EBC /* B5ED8 8011F7D8 AC820000 */ sw $v0, ($a0) /* B5EDC 8011F7DC 3C028015 */ lui $v0, %hi(D_8014BE78) /* B5EE0 8011F7E0 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) -/* B5EE4 8011F7E4 08047E42 */ j .L8011F908 +/* B5EE4 8011F7E4 08047E42 */ j L8011F908_B6008 /* B5EE8 8011F7E8 AC820004 */ sw $v0, 4($a0) glabel L8011F7EC_B5EEC /* B5EEC 8011F7EC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -223,7 +223,7 @@ glabel L8011F7EC_B5EEC /* B5F08 8011F808 AC820000 */ sw $v0, ($a0) /* B5F0C 8011F80C 3C028015 */ lui $v0, %hi(D_8014BEA0) /* B5F10 8011F810 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) -/* B5F14 8011F814 08047E42 */ j .L8011F908 +/* B5F14 8011F814 08047E42 */ j L8011F908_B6008 /* B5F18 8011F818 AC820004 */ sw $v0, 4($a0) glabel L8011F81C_B5F1C /* B5F1C 8011F81C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -236,7 +236,7 @@ glabel L8011F81C_B5F1C /* B5F38 8011F838 AC820000 */ sw $v0, ($a0) /* B5F3C 8011F83C 3C028015 */ lui $v0, %hi(D_8014BEC8) /* B5F40 8011F840 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) -/* B5F44 8011F844 08047E42 */ j .L8011F908 +/* B5F44 8011F844 08047E42 */ j L8011F908_B6008 /* B5F48 8011F848 AC820004 */ sw $v0, 4($a0) glabel L8011F84C_B5F4C /* B5F4C 8011F84C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -249,7 +249,7 @@ glabel L8011F84C_B5F4C /* B5F68 8011F868 AC820000 */ sw $v0, ($a0) /* B5F6C 8011F86C 3C028015 */ lui $v0, %hi(D_8014BEF0) /* B5F70 8011F870 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) -/* B5F74 8011F874 08047E42 */ j .L8011F908 +/* B5F74 8011F874 08047E42 */ j L8011F908_B6008 /* B5F78 8011F878 AC820004 */ sw $v0, 4($a0) glabel L8011F87C_B5F7C /* B5F7C 8011F87C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -262,7 +262,7 @@ glabel L8011F87C_B5F7C /* B5F98 8011F898 AC820000 */ sw $v0, ($a0) /* B5F9C 8011F89C 3C028015 */ lui $v0, %hi(D_8014BF18) /* B5FA0 8011F8A0 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) -/* B5FA4 8011F8A4 08047E42 */ j .L8011F908 +/* B5FA4 8011F8A4 08047E42 */ j L8011F908_B6008 /* B5FA8 8011F8A8 AC820004 */ sw $v0, 4($a0) glabel L8011F8AC_B5FAC /* B5FAC 8011F8AC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -275,7 +275,7 @@ glabel L8011F8AC_B5FAC /* B5FC8 8011F8C8 AC820000 */ sw $v0, ($a0) /* B5FCC 8011F8CC 3C028015 */ lui $v0, %hi(D_8014BF40) /* B5FD0 8011F8D0 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) -/* B5FD4 8011F8D4 08047E42 */ j .L8011F908 +/* B5FD4 8011F8D4 08047E42 */ j L8011F908_B6008 /* B5FD8 8011F8D8 AC820004 */ sw $v0, 4($a0) glabel L8011F8DC_B5FDC /* B5FDC 8011F8DC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -289,7 +289,6 @@ glabel L8011F8DC_B5FDC /* B5FFC 8011F8FC 3C028015 */ lui $v0, %hi(D_8014BF68) /* B6000 8011F900 2442BF68 */ addiu $v0, $v0, %lo(D_8014BF68) /* B6004 8011F904 AC820004 */ sw $v0, 4($a0) -.L8011F908: glabel L8011F908_B6008 /* B6008 8011F908 3C070001 */ lui $a3, 1 /* B600C 8011F90C 3C028015 */ lui $v0, %hi(D_80153A5C) @@ -356,7 +355,6 @@ glabel L8011F908_B6008 /* B60F0 8011F9F0 30A5FFFF */ andi $a1, $a1, 0xffff /* B60F4 8011F9F4 00E53825 */ or $a3, $a3, $a1 /* B60F8 8011F9F8 ACC70004 */ sw $a3, 4($a2) -.L8011F9FC: glabel L8011F9FC_B60FC /* B60FC 8011F9FC 27A40010 */ addiu $a0, $sp, 0x10 .L8011FA00: diff --git a/ver/us/asm/nonmatchings/code_B4580/func_801206F8.s b/ver/us/asm/nonmatchings/code_B4580/func_801206F8.s index 7cfde55beb..0b04ee6ea7 100644 --- a/ver/us/asm/nonmatchings/code_B4580/func_801206F8.s +++ b/ver/us/asm/nonmatchings/code_B4580/func_801206F8.s @@ -14,7 +14,7 @@ glabel func_801206F8 /* B6E1C 8012071C 8E320008 */ lw $s2, 8($s1) /* B6E20 80120720 86430000 */ lh $v1, ($s2) /* B6E24 80120724 2C620014 */ sltiu $v0, $v1, 0x14 -/* B6E28 80120728 10400114 */ beqz $v0, .L80120B7C +/* B6E28 80120728 10400114 */ beqz $v0, L80120B7C_B727C /* B6E2C 8012072C 26500002 */ addiu $s0, $s2, 2 /* B6E30 80120730 00031080 */ sll $v0, $v1, 2 /* B6E34 80120734 3C018015 */ lui $at, %hi(jtbl_80150030) @@ -51,7 +51,7 @@ glabel L80120798_B6E98 /* B6E98 80120798 8E22000C */ lw $v0, 0xc($s1) /* B6E9C 8012079C 8E2302D0 */ lw $v1, 0x2d0($s1) /* B6EA0 801207A0 AE220008 */ sw $v0, 8($s1) -/* B6EA4 801207A4 080482DF */ j .L80120B7C +/* B6EA4 801207A4 080482DF */ j L80120B7C_B727C /* B6EA8 801207A8 AE2302CC */ sw $v1, 0x2cc($s1) glabel L801207AC_B6EAC /* B6EAC 801207AC 8E2302CC */ lw $v1, 0x2cc($s1) @@ -309,7 +309,6 @@ glabel L80120AA0_B71A0 /* B7270 80120B70 AE320008 */ sw $s2, 8($s1) /* B7274 80120B74 24420001 */ addiu $v0, $v0, 1 /* B7278 80120B78 AE2202CC */ sw $v0, 0x2cc($s1) -.L80120B7C: glabel L80120B7C_B727C /* B727C 80120B7C 0000102D */ daddu $v0, $zero, $zero .L80120B80: diff --git a/ver/us/asm/nonmatchings/code_B9D60/_update_message.s b/ver/us/asm/nonmatchings/code_B9D60/_update_message.s index f4ceb77bf6..8978d7a5ec 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/_update_message.s +++ b/ver/us/asm/nonmatchings/code_B9D60/_update_message.s @@ -76,7 +76,7 @@ glabel _update_message .L801239A4: /* BA0A4 801239A4 8E0604FC */ lw $a2, 0x4fc($s0) /* BA0A8 801239A8 30C20040 */ andi $v0, $a2, 0x40 -/* BA0AC 801239AC 144001F1 */ bnez $v0, .L80124174 +/* BA0AC 801239AC 144001F1 */ bnez $v0, L80124174_BA874 /* BA0B0 801239B0 0000882D */ daddu $s1, $zero, $zero /* BA0B4 801239B4 30C20030 */ andi $v0, $a2, 0x30 /* BA0B8 801239B8 144000F3 */ bnez $v0, .L80123D88 @@ -395,7 +395,7 @@ glabel _update_message /* BA528 80123E28 920204F8 */ lbu $v0, 0x4f8($s0) /* BA52C 80123E2C 2443FFFF */ addiu $v1, $v0, -1 /* BA530 80123E30 2C62000E */ sltiu $v0, $v1, 0xe -/* BA534 80123E34 104000CF */ beqz $v0, .L80124174 +/* BA534 80123E34 104000CF */ beqz $v0, L80124174_BA874 /* BA538 80123E38 00031080 */ sll $v0, $v1, 2 /* BA53C 80123E3C 3C018015 */ lui $at, %hi(jtbl_80150380) /* BA540 80123E40 00220821 */ addu $at, $at, $v0 @@ -457,13 +457,13 @@ glabel L80123E98_BA598 /* BA604 80123F04 2442FFFF */ addiu $v0, $v0, -1 /* BA608 80123F08 A602000E */ sh $v0, 0xe($s0) /* BA60C 80123F0C 3042FFFF */ andi $v0, $v0, 0xffff -/* BA610 80123F10 14400098 */ bnez $v0, .L80124174 +/* BA610 80123F10 14400098 */ bnez $v0, L80124174_BA874 /* BA614 80123F14 00000000 */ nop .L80123F18: /* BA618 80123F18 0200202D */ daddu $a0, $s0, $zero /* BA61C 80123F1C 0C04915C */ jal func_80124570 /* BA620 80123F20 0000302D */ daddu $a2, $zero, $zero -/* BA624 80123F24 0804905D */ j .L80124174 +/* BA624 80123F24 0804905D */ j L80124174_BA874 /* BA628 80123F28 00000000 */ nop glabel L80123F2C_BA62C /* BA62C 80123F2C 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -501,7 +501,7 @@ glabel L80123F2C_BA62C /* BA6A0 80123FA0 96030466 */ lhu $v1, 0x466($s0) /* BA6A4 80123FA4 8E020460 */ lw $v0, 0x460($s0) /* BA6A8 80123FA8 0043102A */ slt $v0, $v0, $v1 -/* BA6AC 80123FAC 14400071 */ bnez $v0, .L80124174 +/* BA6AC 80123FAC 14400071 */ bnez $v0, L80124174_BA874 /* BA6B0 80123FB0 24020004 */ addiu $v0, $zero, 4 /* BA6B4 80123FB4 A20204F8 */ sb $v0, 0x4f8($s0) /* BA6B8 80123FB8 8E0204FC */ lw $v0, 0x4fc($s0) @@ -529,7 +529,7 @@ glabel L80123F2C_BA62C /* BA704 80124004 96030462 */ lhu $v1, 0x462($s0) /* BA708 80124008 00021040 */ sll $v0, $v0, 1 /* BA70C 8012400C 02021021 */ addu $v0, $s0, $v0 -/* BA710 80124010 0804905D */ j .L80124174 +/* BA710 80124010 0804905D */ j L80124174_BA874 /* BA714 80124014 A4430488 */ sh $v1, 0x488($v0) glabel L80124018_BA718 /* BA718 80124018 960204CC */ lhu $v0, 0x4cc($s0) @@ -604,11 +604,11 @@ glabel L80124018_BA718 /* BA808 80124108 02021021 */ addu $v0, $s0, $v0 /* BA80C 8012410C 94420488 */ lhu $v0, 0x488($v0) /* BA810 80124110 0043182A */ slt $v1, $v0, $v1 -/* BA814 80124114 14600017 */ bnez $v1, .L80124174 +/* BA814 80124114 14600017 */ bnez $v1, L80124174_BA874 /* BA818 80124118 00000000 */ nop /* BA81C 8012411C AE020460 */ sw $v0, 0x460($s0) /* BA820 80124120 2402000C */ addiu $v0, $zero, 0xc -/* BA824 80124124 0804905D */ j .L80124174 +/* BA824 80124124 0804905D */ j L80124174_BA874 /* BA828 80124128 A20204F8 */ sb $v0, 0x4f8($s0) .L8012412C: /* BA82C 8012412C 92020487 */ lbu $v0, 0x487($s0) @@ -617,19 +617,18 @@ glabel L80124018_BA718 /* BA838 80124138 02021021 */ addu $v0, $s0, $v0 /* BA83C 8012413C 94420488 */ lhu $v0, 0x488($v0) /* BA840 80124140 0062182A */ slt $v1, $v1, $v0 -/* BA844 80124144 1460000B */ bnez $v1, .L80124174 +/* BA844 80124144 1460000B */ bnez $v1, L80124174_BA874 /* BA848 80124148 00000000 */ nop /* BA84C 8012414C 92040487 */ lbu $a0, 0x487($s0) /* BA850 80124150 92030486 */ lbu $v1, 0x486($s0) /* BA854 80124154 AE020460 */ sw $v0, 0x460($s0) /* BA858 80124158 2402000C */ addiu $v0, $zero, 0xc -/* BA85C 8012415C 14830005 */ bne $a0, $v1, .L80124174 +/* BA85C 8012415C 14830005 */ bne $a0, $v1, L80124174_BA874 /* BA860 80124160 A20204F8 */ sb $v0, 0x4f8($s0) /* BA864 80124164 24020005 */ addiu $v0, $zero, 5 /* BA868 80124168 A20204F8 */ sb $v0, 0x4f8($s0) /* BA86C 8012416C A200047C */ sb $zero, 0x47c($s0) /* BA870 80124170 A600047E */ sh $zero, 0x47e($s0) -.L80124174: glabel L80124174_BA874 /* BA874 80124174 8E0204FC */ lw $v0, 0x4fc($s0) /* BA878 80124178 30420001 */ andi $v0, $v0, 1 diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s b/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s index a56715ffd8..73d814f5bb 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s +++ b/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s @@ -32,7 +32,7 @@ glabel func_80124570 /* BACD8 801245D8 92660000 */ lbu $a2, ($s3) /* BACDC 801245DC 24A3FF10 */ addiu $v1, $a1, -0xf0 /* BACE0 801245E0 2C620010 */ sltiu $v0, $v1, 0x10 -/* BACE4 801245E4 104003EF */ beqz $v0, .L801255A4 +/* BACE4 801245E4 104003EF */ beqz $v0, L801255A4_BBCA4 /* BACE8 801245E8 00031080 */ sll $v0, $v1, 2 /* BACEC 801245EC 3C018015 */ lui $at, %hi(jtbl_801503B8) /* BACF0 801245F0 00220821 */ addu $at, $at, $v0 @@ -65,7 +65,7 @@ glabel L80124600_BAD00 /* BAD50 80124650 8FA80018 */ lw $t0, 0x18($sp) /* BAD54 80124654 91020000 */ lbu $v0, ($t0) /* BAD58 80124658 00431021 */ addu $v0, $v0, $v1 -/* BAD5C 8012465C 08049580 */ j .L80125600 +/* BAD5C 8012465C 08049580 */ j L80125600_BBD00 /* BAD60 80124660 A1020000 */ sb $v0, ($t0) glabel L80124664_BAD64 /* BAD64 80124664 96830500 */ lhu $v1, 0x500($s4) @@ -84,13 +84,13 @@ glabel L80124664_BAD64 /* BAD98 80124698 AE8304FC */ sw $v1, 0x4fc($s4) /* BAD9C 8012469C 92830508 */ lbu $v1, 0x508($s4) /* BADA0 801246A0 2402000F */ addiu $v0, $zero, 0xf -/* BADA4 801246A4 106203D6 */ beq $v1, $v0, .L80125600 +/* BADA4 801246A4 106203D6 */ beq $v1, $v0, L80125600_BBD00 /* BADA8 801246A8 240400CB */ addiu $a0, $zero, 0xcb /* BADAC 801246AC 0000282D */ daddu $a1, $zero, $zero /* BADB0 801246B0 00A0302D */ daddu $a2, $a1, $zero /* BADB4 801246B4 0C0526AE */ jal _play_sound /* BADB8 801246B8 00A0382D */ daddu $a3, $a1, $zero -/* BADBC 801246BC 08049580 */ j .L80125600 +/* BADBC 801246BC 08049580 */ j L80125600_BBD00 /* BADC0 801246C0 00000000 */ nop glabel L801246C4_BADC4 /* BADC4 801246C4 96820500 */ lhu $v0, 0x500($s4) @@ -108,7 +108,7 @@ glabel L801246EC_BADEC /* BADF0 801246F0 A2420000 */ sb $v0, ($s2) /* BADF4 801246F4 26520001 */ addiu $s2, $s2, 1 /* BADF8 801246F8 24A2000D */ addiu $v0, $a1, 0xd -/* BADFC 801246FC 08049580 */ j .L80125600 +/* BADFC 801246FC 08049580 */ j L80125600_BBD00 /* BAE00 80124700 A2820455 */ sb $v0, 0x455($s4) glabel L80124704_BAE04 /* BAE04 80124704 08049556 */ j .L80125558 @@ -123,11 +123,11 @@ glabel L8012471C_BAE1C /* BAE1C 8012471C 240200F9 */ addiu $v0, $zero, 0xf9 /* BAE20 80124720 A2420000 */ sb $v0, ($s2) /* BAE24 80124724 26520001 */ addiu $s2, $s2, 1 -/* BAE28 80124728 08049580 */ j .L80125600 +/* BAE28 80124728 08049580 */ j L80125600_BBD00 /* BAE2C 8012472C 26B5FFFF */ addiu $s5, $s5, -1 glabel L80124730_BAE30 /* BAE30 80124730 92820468 */ lbu $v0, 0x468($s4) -/* BAE34 80124734 504003B2 */ beql $v0, $zero, .L80125600 +/* BAE34 80124734 504003B2 */ beql $v0, $zero, L80125600_BBD00 /* BAE38 80124738 A2800468 */ sb $zero, 0x468($s4) /* BAE3C 8012473C 92820486 */ lbu $v0, 0x486($s4) /* BAE40 80124740 96830462 */ lhu $v1, 0x462($s4) @@ -163,7 +163,7 @@ glabel L80124730_BAE30 /* BAEB8 801247B8 00004012 */ mflo $t0 /* BAEBC 801247BC 00681821 */ addu $v1, $v1, $t0 /* BAEC0 801247C0 A6830466 */ sh $v1, 0x466($s4) -/* BAEC4 801247C4 08049580 */ j .L80125600 +/* BAEC4 801247C4 08049580 */ j L80125600_BBD00 /* BAEC8 801247C8 A2800468 */ sb $zero, 0x468($s4) glabel L801247CC_BAECC /* BAECC 801247CC 240200F8 */ addiu $v0, $zero, 0xf8 @@ -381,7 +381,7 @@ glabel L80124AE8_BB1E8 .L80124AF0: /* BB1F0 80124AF0 96830500 */ lhu $v1, 0x500($s4) /* BB1F4 80124AF4 30620001 */ andi $v0, $v1, 1 -/* BB1F8 80124AF8 104002C1 */ beqz $v0, .L80125600 +/* BB1F8 80124AF8 104002C1 */ beqz $v0, L80125600_BBD00 /* BB1FC 80124AFC 30620006 */ andi $v0, $v1, 6 /* BB200 80124B00 080493E6 */ j .L80124F98 /* BB204 80124B04 00000000 */ nop @@ -417,12 +417,12 @@ glabel L80124B08_BB208 /* BB268 80124B68 96820500 */ lhu $v0, 0x500($s4) /* BB26C 80124B6C 34420001 */ ori $v0, $v0, 1 /* BB270 80124B70 3042FFFD */ andi $v0, $v0, 0xfffd -/* BB274 80124B74 08049580 */ j .L80125600 +/* BB274 80124B74 08049580 */ j L80125600_BBD00 /* BB278 80124B78 A6820500 */ sh $v0, 0x500($s4) glabel L80124B7C_BB27C /* BB27C 80124B7C 92630000 */ lbu $v1, ($s3) /* BB280 80124B80 2C620030 */ sltiu $v0, $v1, 0x30 -/* BB284 80124B84 1040029E */ beqz $v0, .L80125600 +/* BB284 80124B84 1040029E */ beqz $v0, L80125600_BBD00 /* BB288 80124B88 26730001 */ addiu $s3, $s3, 1 /* BB28C 80124B8C 00031080 */ sll $v0, $v1, 2 /* BB290 80124B90 3C018015 */ lui $at, %hi(jtbl_80150438) @@ -477,7 +477,7 @@ glabel L80124C28_BB328 glabel L80124C38_BB338 /* BB338 80124C38 96820500 */ lhu $v0, 0x500($s4) /* BB33C 80124C3C 34420002 */ ori $v0, $v0, 2 -/* BB340 80124C40 08049580 */ j .L80125600 +/* BB340 80124C40 08049580 */ j L80125600_BBD00 /* BB344 80124C44 A6820500 */ sh $v0, 0x500($s4) glabel L80124C48_BB348 /* BB348 80124C48 96820500 */ lhu $v0, 0x500($s4) @@ -519,7 +519,7 @@ glabel L80124C54_BB354 /* BB3D4 80124CD4 A6820500 */ sh $v0, 0x500($s4) /* BB3D8 80124CD8 00004012 */ mflo $t0 /* BB3DC 80124CDC 00681821 */ addu $v1, $v1, $t0 -/* BB3E0 80124CE0 08049580 */ j .L80125600 +/* BB3E0 80124CE0 08049580 */ j L80125600_BBD00 /* BB3E4 80124CE4 A6830466 */ sh $v1, 0x466($s4) glabel L80124CE8_BB3E8 /* BB3E8 80124CE8 A2560000 */ sb $s6, ($s2) @@ -558,7 +558,7 @@ glabel L80124D54_BB454 /* BB468 80124D68 A2420000 */ sb $v0, ($s2) .L80124D6C: /* BB46C 80124D6C 26520001 */ addiu $s2, $s2, 1 -/* BB470 80124D70 08049580 */ j .L80125600 +/* BB470 80124D70 08049580 */ j L80125600_BBD00 /* BB474 80124D74 E6800540 */ swc1 $f0, 0x540($s4) glabel L80124D78_BB478 /* BB478 80124D78 92620000 */ lbu $v0, ($s3) @@ -566,7 +566,7 @@ glabel L80124D78_BB478 /* BB480 80124D80 A282045E */ sb $v0, 0x45e($s4) /* BB484 80124D84 92620000 */ lbu $v0, ($s3) /* BB488 80124D88 26730001 */ addiu $s3, $s3, 1 -/* BB48C 80124D8C 08049580 */ j .L80125600 +/* BB48C 80124D8C 08049580 */ j L80125600_BBD00 /* BB490 80124D90 A282045F */ sb $v0, 0x45f($s4) glabel L80124D94_BB494 /* BB494 80124D94 A2560000 */ sb $s6, ($s2) @@ -711,7 +711,7 @@ glabel L80124F18_BB618 .L80124F98: /* BB698 80124F98 1040019D */ beqz $v0, .L80125610 /* BB69C 80124F9C 3062FFFE */ andi $v0, $v1, 0xfffe -/* BB6A0 80124FA0 08049580 */ j .L80125600 +/* BB6A0 80124FA0 08049580 */ j L80125600_BBD00 /* BB6A4 80124FA4 A6820500 */ sh $v0, 0x500($s4) glabel L80124FA8_BB6A8 /* BB6A8 80124FA8 92700000 */ lbu $s0, ($s3) @@ -719,10 +719,10 @@ glabel L80124FA8_BB6A8 /* BB6B0 80124FB0 26730001 */ addiu $s3, $s3, 1 /* BB6B4 80124FB4 A2970533 */ sb $s7, 0x533($s4) /* BB6B8 80124FB8 A2900532 */ sb $s0, 0x532($s4) -/* BB6BC 80124FBC 08049580 */ j .L80125600 +/* BB6BC 80124FBC 08049580 */ j L80125600_BBD00 /* BB6C0 80124FC0 A6800534 */ sh $zero, 0x534($s4) .L80124FC4: -/* BB6C4 80124FC4 08049580 */ j .L80125600 +/* BB6C4 80124FC4 08049580 */ j L80125600_BBD00 /* BB6C8 80124FC8 A680052C */ sh $zero, 0x52c($s4) glabel L80124FCC_BB6CC /* BB6CC 80124FCC A2560000 */ sb $s6, ($s2) @@ -744,7 +744,7 @@ glabel L80124FCC_BB6CC /* BB70C 8012500C 96820500 */ lhu $v0, 0x500($s4) /* BB710 80125010 26520001 */ addiu $s2, $s2, 1 /* BB714 80125014 34420004 */ ori $v0, $v0, 4 -/* BB718 80125018 08049580 */ j .L80125600 +/* BB718 80125018 08049580 */ j L80125600_BBD00 /* BB71C 8012501C A6820500 */ sh $v0, 0x500($s4) glabel L80125020_BB720 /* BB720 80125020 A2560000 */ sb $s6, ($s2) @@ -768,11 +768,11 @@ glabel L80125040_BB740 /* BB764 80125064 96820500 */ lhu $v0, 0x500($s4) /* BB768 80125068 26520001 */ addiu $s2, $s2, 1 /* BB76C 8012506C 3042FFFB */ andi $v0, $v0, 0xfffb -/* BB770 80125070 1EA00163 */ bgtz $s5, .L80125600 +/* BB770 80125070 1EA00163 */ bgtz $s5, L80125600_BBD00 /* BB774 80125074 A6820500 */ sh $v0, 0x500($s4) .L80125078: /* BB778 80125078 34420001 */ ori $v0, $v0, 1 -/* BB77C 8012507C 08049580 */ j .L80125600 +/* BB77C 8012507C 08049580 */ j L80125600_BBD00 /* BB780 80125080 A6820500 */ sh $v0, 0x500($s4) glabel L80125084_BB784 /* BB784 80125084 92700000 */ lbu $s0, ($s3) @@ -789,7 +789,7 @@ glabel L80125084_BB784 /* BB7B0 801250B0 00831825 */ or $v1, $a0, $v1 /* BB7B4 801250B4 A44304D0 */ sh $v1, 0x4d0($v0) /* BB7B8 801250B8 30C300FF */ andi $v1, $a2, 0xff -/* BB7BC 801250BC 08049580 */ j .L80125600 +/* BB7BC 801250BC 08049580 */ j L80125600_BBD00 /* BB7C0 801250C0 A44304DC */ sh $v1, 0x4dc($v0) glabel L801250C4_BB7C4 /* BB7C4 801250C4 A2560000 */ sb $s6, ($s2) @@ -812,12 +812,12 @@ glabel L801250D4_BB7D4 /* BB804 80125104 A28204F8 */ sb $v0, 0x4f8($s4) /* BB808 80125108 34630001 */ ori $v1, $v1, 1 /* BB80C 8012510C A28404CE */ sb $a0, 0x4ce($s4) -/* BB810 80125110 08049580 */ j .L80125600 +/* BB810 80125110 08049580 */ j L80125600_BBD00 /* BB814 80125114 A6830500 */ sh $v1, 0x500($s4) glabel L80125118_BB818 /* BB818 80125118 92620000 */ lbu $v0, ($s3) /* BB81C 8012511C 26730001 */ addiu $s3, $s3, 1 -/* BB820 80125120 08049580 */ j .L80125600 +/* BB820 80125120 08049580 */ j L80125600_BBD00 /* BB824 80125124 A28204EA */ sb $v0, 0x4ea($s4) glabel L80125128_BB828 /* BB828 80125128 A2560000 */ sb $s6, ($s2) @@ -843,7 +843,7 @@ glabel L80125148_BB848 /* BB870 80125170 00621824 */ and $v1, $v1, $v0 /* BB874 80125174 2402FEFF */ addiu $v0, $zero, -0x101 /* BB878 80125178 00621824 */ and $v1, $v1, $v0 -/* BB87C 8012517C 08049580 */ j .L80125600 +/* BB87C 8012517C 08049580 */ j L80125600_BBD00 /* BB880 80125180 AE8304FC */ sw $v1, 0x4fc($s4) glabel L80125184_BB884 /* BB884 80125184 A2560000 */ sb $s6, ($s2) @@ -874,7 +874,7 @@ glabel L801251C4_BB8C4 /* BB8D8 801251D8 92700000 */ lbu $s0, ($s3) /* BB8DC 801251DC 320300FF */ andi $v1, $s0, 0xff /* BB8E0 801251E0 2C62000F */ sltiu $v0, $v1, 0xf -/* BB8E4 801251E4 10400106 */ beqz $v0, .L80125600 +/* BB8E4 801251E4 10400106 */ beqz $v0, L80125600_BBD00 /* BB8E8 801251E8 26730001 */ addiu $s3, $s3, 1 /* BB8EC 801251EC 00031080 */ sll $v0, $v1, 2 /* BB8F0 801251F0 3C018015 */ lui $at, %hi(jtbl_801504F8) @@ -884,7 +884,7 @@ glabel L801251C4_BB8C4 /* BB900 80125200 00000000 */ nop glabel L80125204_BB904 /* BB904 80125204 A2500000 */ sb $s0, ($s2) -/* BB908 80125208 08049580 */ j .L80125600 +/* BB908 80125208 08049580 */ j L80125600_BBD00 /* BB90C 8012520C 26520001 */ addiu $s2, $s2, 1 glabel L80125210_BB910 /* BB910 80125210 08049553 */ j .L8012554C @@ -1071,12 +1071,12 @@ glabel L8012546C_BBB6C /* BBB9C 8012549C AE830524 */ sw $v1, 0x524($s4) /* BBBA0 801254A0 9442000A */ lhu $v0, 0xa($v0) /* BBBA4 801254A4 26730001 */ addiu $s3, $s3, 1 -/* BBBA8 801254A8 08049580 */ j .L80125600 +/* BBBA8 801254A8 08049580 */ j L80125600_BBD00 /* BBBAC 801254AC A682051C */ sh $v0, 0x51c($s4) glabel L801254B0_BBBB0 /* BBBB0 801254B0 92620000 */ lbu $v0, ($s3) /* BBBB4 801254B4 26730001 */ addiu $s3, $s3, 1 -/* BBBB8 801254B8 08049580 */ j .L80125600 +/* BBBB8 801254B8 08049580 */ j L80125600_BBD00 /* BBBBC 801254BC A2820519 */ sb $v0, 0x519($s4) glabel L801254C0_BBBC0 /* BBBC0 801254C0 92700000 */ lbu $s0, ($s3) @@ -1108,7 +1108,7 @@ glabel L801254C0_BBBC0 /* BBC28 80125528 00041A00 */ sll $v1, $a0, 8 /* BBC2C 8012552C 00431021 */ addu $v0, $v0, $v1 /* BBC30 80125530 00C21025 */ or $v0, $a2, $v0 -/* BBC34 80125534 08049580 */ j .L80125600 +/* BBC34 80125534 08049580 */ j L80125600_BBD00 /* BBC38 80125538 AE820524 */ sw $v0, 0x524($s4) glabel L8012553C_BBC3C /* BBC3C 8012553C A2560000 */ sb $s6, ($s2) @@ -1122,7 +1122,7 @@ glabel L8012553C_BBC3C /* BBC54 80125554 26730001 */ addiu $s3, $s3, 1 .L80125558: /* BBC58 80125558 A2420000 */ sb $v0, ($s2) -/* BBC5C 8012555C 08049580 */ j .L80125600 +/* BBC5C 8012555C 08049580 */ j L80125600_BBD00 /* BBC60 80125560 26520001 */ addiu $s2, $s2, 1 glabel L80125564_BBC64 /* BBC64 80125564 92620000 */ lbu $v0, ($s3) @@ -1143,7 +1143,6 @@ glabel L80125594_BBC94 /* BBC98 80125598 3C030008 */ lui $v1, 8 /* BBC9C 8012559C 0804957F */ j .L801255FC /* BBCA0 801255A0 00431025 */ or $v0, $v0, $v1 -.L801255A4: glabel L801255A4_BBCA4 /* BBCA4 801255A4 A2450000 */ sb $a1, ($s2) /* BBCA8 801255A8 26520001 */ addiu $s2, $s2, 1 @@ -1168,11 +1167,10 @@ glabel L801255A4_BBCA4 /* BBCE8 801255E8 8E8304FC */ lw $v1, 0x4fc($s4) /* BBCEC 801255EC 3C020080 */ lui $v0, 0x80 /* BBCF0 801255F0 00621024 */ and $v0, $v1, $v0 -/* BBCF4 801255F4 10400002 */ beqz $v0, .L80125600 +/* BBCF4 801255F4 10400002 */ beqz $v0, L80125600_BBD00 /* BBCF8 801255F8 34620080 */ ori $v0, $v1, 0x80 .L801255FC: /* BBCFC 801255FC AE8204FC */ sw $v0, 0x4fc($s4) -.L80125600: glabel L80125600_BBD00 /* BBD00 80125600 96820500 */ lhu $v0, 0x500($s4) /* BBD04 80125604 30420006 */ andi $v0, $v0, 6 diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80127D90.s b/ver/us/asm/nonmatchings/code_B9D60/func_80127D90.s index bf2d70cec3..88d237c8c7 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/func_80127D90.s +++ b/ver/us/asm/nonmatchings/code_B9D60/func_80127D90.s @@ -135,7 +135,7 @@ glabel func_80127D90 /* BE684 80127F84 90420000 */ lbu $v0, ($v0) /* BE688 80127F88 2443FF10 */ addiu $v1, $v0, -0xf0 /* BE68C 80127F8C 2C620010 */ sltiu $v0, $v1, 0x10 -/* BE690 80127F90 10400AF2 */ beqz $v0, .L8012AB5C +/* BE690 80127F90 10400AF2 */ beqz $v0, L8012AB5C_C125C /* BE694 80127F94 00031080 */ sll $v0, $v1, 2 /* BE698 80127F98 3C018015 */ lui $at, %hi(jtbl_80150730) /* BE69C 80127F9C 00220821 */ addu $at, $at, $v0 @@ -175,9 +175,9 @@ glabel L80127FAC_BE6AC /* BE720 80128020 00431021 */ addu $v0, $v0, $v1 /* BE724 80128024 A4820044 */ sh $v0, 0x44($a0) /* BE728 80128028 30A20040 */ andi $v0, $a1, 0x40 -/* BE72C 8012802C 104009A5 */ beqz $v0, .L8012A6C4 +/* BE72C 8012802C 104009A5 */ beqz $v0, L8012A6C4_C0DC4 /* BE730 80128030 34A20080 */ ori $v0, $a1, 0x80 -/* BE734 80128034 0804A9B1 */ j .L8012A6C4 +/* BE734 80128034 0804A9B1 */ j L8012A6C4_C0DC4 /* BE738 80128038 A4820034 */ sh $v0, 0x34($a0) glabel L8012803C_BE73C /* BE73C 8012803C 3C048015 */ lui $a0, %hi(D_80155D74) @@ -189,7 +189,7 @@ glabel L8012803C_BE73C /* BE754 80128054 24420001 */ addiu $v0, $v0, 1 /* BE758 80128058 AC820020 */ sw $v0, 0x20($a0) /* BE75C 8012805C 2463FF0F */ addiu $v1, $v1, -0xf1 -/* BE760 80128060 0804AFDC */ j .L8012BF70 +/* BE760 80128060 0804AFDC */ j L8012BF70_C2670 /* BE764 80128064 A483003E */ sh $v1, 0x3e($a0) glabel L80128068_BE768 /* BE768 80128068 3C078015 */ lui $a3, %hi(D_80155D74) @@ -215,7 +215,7 @@ glabel L801280A0_BE7A0 /* BE7B4 801280B4 90420001 */ lbu $v0, 1($v0) /* BE7B8 801280B8 2443FFFF */ addiu $v1, $v0, -1 /* BE7BC 801280BC 2C62000F */ sltiu $v0, $v1, 0xf -/* BE7C0 801280C0 10400FAB */ beqz $v0, .L8012BF70 +/* BE7C0 801280C0 10400FAB */ beqz $v0, L8012BF70_C2670 /* BE7C4 801280C4 00031080 */ sll $v0, $v1, 2 /* BE7C8 801280C8 3C018015 */ lui $at, %hi(jtbl_80150770) /* BE7CC 801280CC 00220821 */ addu $at, $at, $v0 @@ -1045,7 +1045,7 @@ glabel L8012897C_BF07C /* BF414 80128D14 24420002 */ addiu $v0, $v0, 2 /* BF418 80128D18 34630010 */ ori $v1, $v1, 0x10 /* BF41C 80128D1C AC820020 */ sw $v0, 0x20($a0) -/* BF420 80128D20 0804AFDC */ j .L8012BF70 +/* BF420 80128D20 0804AFDC */ j L8012BF70_C2670 /* BF424 80128D24 A4830034 */ sh $v1, 0x34($a0) glabel L80128D28_BF428 /* BF428 80128D28 3C058015 */ lui $a1, %hi(D_80155D74) @@ -1938,7 +1938,7 @@ glabel L80129A40_C0140 .L80129ACC: /* C01CC 80129ACC 0C04B0B8 */ jal func_8012C2E0 /* C01D0 80129AD0 00000000 */ nop -/* C01D4 80129AD4 0804AAD1 */ j .L8012AB44 +/* C01D4 80129AD4 0804AAD1 */ j L8012AB44_C1244 /* C01D8 80129AD8 00000000 */ nop glabel L80129ADC_C01DC /* C01DC 80129ADC 93C304F8 */ lbu $v1, 0x4f8($fp) @@ -2016,11 +2016,11 @@ glabel L80129ADC_C01DC /* C02E4 80129BE4 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C02E8 80129BE8 90620050 */ lbu $v0, 0x50($v1) /* C02EC 80129BEC 24420001 */ addiu $v0, $v0, 1 -/* C02F0 80129BF0 0804A9B1 */ j .L8012A6C4 +/* C02F0 80129BF0 0804A9B1 */ j L8012A6C4_C0DC4 /* C02F4 80129BF4 A0620050 */ sb $v0, 0x50($v1) glabel L80129BF8_C02F8 /* C02F8 80129BF8 24180001 */ addiu $t8, $zero, 1 -/* C02FC 80129BFC 0804AFDC */ j .L8012BF70 +/* C02FC 80129BFC 0804AFDC */ j L8012BF70_C2670 /* C0300 80129C00 A7B80080 */ sh $t8, 0x80($sp) glabel L80129C04_C0304 /* C0304 80129C04 3C038015 */ lui $v1, %hi(D_80155D74) @@ -2032,7 +2032,7 @@ glabel L80129C04_C0304 /* C031C 80129C1C AC620020 */ sw $v0, 0x20($v1) /* C0320 80129C20 90830000 */ lbu $v1, ($a0) /* C0324 80129C24 2C62001F */ sltiu $v0, $v1, 0x1f -/* C0328 80129C28 104008D1 */ beqz $v0, .L8012BF70 +/* C0328 80129C28 104008D1 */ beqz $v0, L8012BF70_C2670 /* C032C 80129C2C 00031080 */ sll $v0, $v1, 2 /* C0330 80129C30 3C018015 */ lui $at, %hi(jtbl_801507E0) /* C0334 80129C34 00220821 */ addu $at, $at, $v0 @@ -2052,7 +2052,7 @@ glabel L80129C44_C0344 /* C0368 80129C68 34630010 */ ori $v1, $v1, 0x10 /* C036C 80129C6C AC820020 */ sw $v0, 0x20($a0) /* C0370 80129C70 A4830034 */ sh $v1, 0x34($a0) -/* C0374 80129C74 0804AFDC */ j .L8012BF70 +/* C0374 80129C74 0804AFDC */ j L8012BF70_C2670 /* C0378 80129C78 A485003C */ sh $a1, 0x3c($a0) glabel L80129C7C_C037C /* C037C 80129C7C 3C048015 */ lui $a0, %hi(D_80155D74) @@ -2064,7 +2064,7 @@ glabel L80129C7C_C037C /* C0394 80129C94 90630001 */ lbu $v1, 1($v1) /* C0398 80129C98 24420002 */ addiu $v0, $v0, 2 /* C039C 80129C9C AC820020 */ sw $v0, 0x20($a0) -/* C03A0 80129CA0 0804AFDC */ j .L8012BF70 +/* C03A0 80129CA0 0804AFDC */ j L8012BF70_C2670 /* C03A4 80129CA4 A483003E */ sh $v1, 0x3e($a0) glabel L80129CA8_C03A8 /* C03A8 80129CA8 3C048015 */ lui $a0, %hi(D_80155D74) @@ -2079,7 +2079,7 @@ glabel L80129CA8_C03A8 /* C03CC 80129CCC 24630002 */ addiu $v1, $v1, 2 /* C03D0 80129CD0 A4820034 */ sh $v0, 0x34($a0) /* C03D4 80129CD4 AC830020 */ sw $v1, 0x20($a0) -/* C03D8 80129CD8 0804AFDC */ j .L8012BF70 +/* C03D8 80129CD8 0804AFDC */ j L8012BF70_C2670 /* C03DC 80129CDC A485004A */ sh $a1, 0x4a($a0) glabel L80129CE0_C03E0 /* C03E0 80129CE0 3C048015 */ lui $a0, %hi(D_80155D74) @@ -2088,7 +2088,7 @@ glabel L80129CE0_C03E0 /* C03EC 80129CEC 8C83004C */ lw $v1, 0x4c($a0) /* C03F0 80129CF0 00431021 */ addu $v0, $v0, $v1 /* C03F4 80129CF4 90420001 */ lbu $v0, 1($v0) -/* C03F8 80129CF8 0804AAD1 */ j .L8012AB44 +/* C03F8 80129CF8 0804AAD1 */ j L8012AB44_C1244 /* C03FC 80129CFC A0820040 */ sb $v0, 0x40($a0) glabel L80129D00_C0400 /* C0400 80129D00 3C048015 */ lui $a0, %hi(D_80155D74) @@ -2151,7 +2151,7 @@ glabel L80129D00_C0400 /* C04E0 80129DE0 24630008 */ addiu $v1, $v1, 8 /* C04E4 80129DE4 AEE30000 */ sw $v1, ($s7) /* C04E8 80129DE8 AC820000 */ sw $v0, ($a0) -/* C04EC 80129DEC 0804AFDC */ j .L8012BF70 +/* C04EC 80129DEC 0804AFDC */ j L8012BF70_C2670 /* C04F0 80129DF0 AC800004 */ sw $zero, 4($a0) .L80129DF4: /* C04F4 80129DF4 462C203C */ c.lt.d $f4, $f12 @@ -2160,7 +2160,7 @@ glabel L80129D00_C0400 /* C0500 80129E00 3C04E300 */ lui $a0, 0xe300 /* C0504 80129E04 462C003C */ c.lt.d $f0, $f12 /* C0508 80129E08 00000000 */ nop -/* C050C 80129E0C 45000858 */ bc1f .L8012BF70 +/* C050C 80129E0C 45000858 */ bc1f L8012BF70_C2670 /* C0510 80129E10 00000000 */ nop .L80129E14: /* C0514 80129E14 8EE20000 */ lw $v0, ($s7) @@ -2170,7 +2170,7 @@ glabel L80129D00_C0400 /* C0524 80129E24 AEE20000 */ sw $v0, ($s7) /* C0528 80129E28 24023000 */ addiu $v0, $zero, 0x3000 /* C052C 80129E2C AC640000 */ sw $a0, ($v1) -/* C0530 80129E30 0804AFDC */ j .L8012BF70 +/* C0530 80129E30 0804AFDC */ j L8012BF70_C2670 /* C0534 80129E34 AC620004 */ sw $v0, 4($v1) glabel L80129E38_C0538 /* C0538 80129E38 3C06E300 */ lui $a2, 0xe300 @@ -2190,7 +2190,7 @@ glabel L80129E38_C0538 /* C0570 80129E70 24023000 */ addiu $v0, $zero, 0x3000 /* C0574 80129E74 AC830020 */ sw $v1, 0x20($a0) /* C0578 80129E78 ACA60000 */ sw $a2, ($a1) -/* C057C 80129E7C 0804AFDC */ j .L8012BF70 +/* C057C 80129E7C 0804AFDC */ j L8012BF70_C2670 /* C0580 80129E80 ACA20004 */ sw $v0, 4($a1) glabel L80129E84_C0584 /* C0584 80129E84 3C058015 */ lui $a1, %hi(D_80155D74) @@ -2205,7 +2205,7 @@ glabel L80129E84_C0584 /* C05A8 80129EA8 00042200 */ sll $a0, $a0, 8 /* C05AC 80129EAC 00641821 */ addu $v1, $v1, $a0 /* C05B0 80129EB0 ACA20020 */ sw $v0, 0x20($a1) -/* C05B4 80129EB4 0804AFDC */ j .L8012BF70 +/* C05B4 80129EB4 0804AFDC */ j L8012BF70_C2670 /* C05B8 80129EB8 A4A30042 */ sh $v1, 0x42($a1) glabel L80129EBC_C05BC /* C05BC 80129EBC 3C048015 */ lui $a0, %hi(D_80155D74) @@ -2229,7 +2229,7 @@ glabel L80129EE0_C05E0 /* C0600 80129F00 24420002 */ addiu $v0, $v0, 2 /* C0604 80129F04 00651821 */ addu $v1, $v1, $a1 /* C0608 80129F08 AC820020 */ sw $v0, 0x20($a0) -/* C060C 80129F0C 0804AFDC */ j .L8012BF70 +/* C060C 80129F0C 0804AFDC */ j L8012BF70_C2670 /* C0610 80129F10 A4830042 */ sh $v1, 0x42($a0) glabel L80129F14_C0614 /* C0614 80129F14 3C048015 */ lui $a0, %hi(D_80155D74) @@ -2256,7 +2256,7 @@ glabel L80129F40_C0640 /* C0664 80129F64 00651823 */ subu $v1, $v1, $a1 .L80129F68: /* C0668 80129F68 AC820020 */ sw $v0, 0x20($a0) -/* C066C 80129F6C 0804AFDC */ j .L8012BF70 +/* C066C 80129F6C 0804AFDC */ j L8012BF70_C2670 /* C0670 80129F70 A4830044 */ sh $v1, 0x44($a0) glabel L80129F74_C0674 /* C0674 80129F74 3C0B8015 */ lui $t3, %hi(D_80155D74) @@ -2343,7 +2343,7 @@ glabel L80129F74_C0674 /* C07B4 8012A0B4 34420012 */ ori $v0, $v0, 0x12 /* C07B8 8012A0B8 24630002 */ addiu $v1, $v1, 2 /* C07BC 8012A0BC A4820034 */ sh $v0, 0x34($a0) -/* C07C0 8012A0C0 0804AFDC */ j .L8012BF70 +/* C07C0 8012A0C0 0804AFDC */ j L8012BF70_C2670 /* C07C4 8012A0C4 AC830020 */ sw $v1, 0x20($a0) glabel L8012A0C8_C07C8 /* C07C8 8012A0C8 97B0008E */ lhu $s0, 0x8e($sp) @@ -2435,7 +2435,7 @@ glabel L8012A0C8_C07C8 glabel L8012A21C_C091C /* C091C 8012A21C 3C028015 */ lui $v0, %hi(D_8015131C) /* C0920 8012A220 8C42131C */ lw $v0, %lo(D_8015131C)($v0) -/* C0924 8012A224 10400127 */ beqz $v0, .L8012A6C4 +/* C0924 8012A224 10400127 */ beqz $v0, L8012A6C4_C0DC4 /* C0928 8012A228 00000000 */ nop /* C092C 8012A22C 97AB008E */ lhu $t3, 0x8e($sp) /* C0930 8012A230 000B1400 */ sll $v0, $t3, 0x10 @@ -2509,7 +2509,7 @@ glabel L8012A21C_C091C /* C0A3C 8012A33C 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C0A40 8012A340 94620034 */ lhu $v0, 0x34($v1) /* C0A44 8012A344 34420010 */ ori $v0, $v0, 0x10 -/* C0A48 8012A348 0804A9B1 */ j .L8012A6C4 +/* C0A48 8012A348 0804A9B1 */ j L8012A6C4_C0DC4 /* C0A4C 8012A34C A4620034 */ sh $v0, 0x34($v1) glabel L8012A350_C0A50 /* C0A50 8012A350 3C028015 */ lui $v0, %hi(D_80155D74) @@ -2620,13 +2620,13 @@ glabel L8012A350_C0A50 /* C0BD4 8012A4D4 24020011 */ addiu $v0, $zero, 0x11 /* C0BD8 8012A4D8 10620008 */ beq $v1, $v0, .L8012A4FC /* C0BDC 8012A4DC 00071040 */ sll $v0, $a3, 1 -/* C0BE0 8012A4E0 0804AFDC */ j .L8012BF70 +/* C0BE0 8012A4E0 0804AFDC */ j L8012BF70_C2670 /* C0BE4 8012A4E4 00000000 */ nop .L8012A4E8: /* C0BE8 8012A4E8 24020013 */ addiu $v0, $zero, 0x13 /* C0BEC 8012A4EC 10620015 */ beq $v1, $v0, .L8012A544 /* C0BF0 8012A4F0 24820002 */ addiu $v0, $a0, 2 -/* C0BF4 8012A4F4 0804AFDC */ j .L8012BF70 +/* C0BF4 8012A4F4 0804AFDC */ j L8012BF70_C2670 /* C0BF8 8012A4F8 00000000 */ nop .L8012A4FC: /* C0BFC 8012A4FC 03C21821 */ addu $v1, $fp, $v0 @@ -2644,21 +2644,21 @@ glabel L8012A350_C0A50 /* C0C24 8012A524 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C0C28 8012A528 8C620020 */ lw $v0, 0x20($v1) /* C0C2C 8012A52C 24420004 */ addiu $v0, $v0, 4 -/* C0C30 8012A530 0804AFDC */ j .L8012BF70 +/* C0C30 8012A530 0804AFDC */ j L8012BF70_C2670 /* C0C34 8012A534 AC620020 */ sw $v0, 0x20($v1) .L8012A538: /* C0C38 8012A538 24820003 */ addiu $v0, $a0, 3 -/* C0C3C 8012A53C 0804AFDC */ j .L8012BF70 +/* C0C3C 8012A53C 0804AFDC */ j L8012BF70_C2670 /* C0C40 8012A540 ACA20020 */ sw $v0, 0x20($a1) .L8012A544: -/* C0C44 8012A544 0804AFDC */ j .L8012BF70 +/* C0C44 8012A544 0804AFDC */ j L8012BF70_C2670 /* C0C48 8012A548 ACA20020 */ sw $v0, 0x20($a1) glabel L8012A54C_C0C4C /* C0C4C 8012A54C 3C038015 */ lui $v1, %hi(D_80155D74) /* C0C50 8012A550 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C0C54 8012A554 8C620020 */ lw $v0, 0x20($v1) /* C0C58 8012A558 24420003 */ addiu $v0, $v0, 3 -/* C0C5C 8012A55C 0804AFDC */ j .L8012BF70 +/* C0C5C 8012A55C 0804AFDC */ j L8012BF70_C2670 /* C0C60 8012A560 AC620020 */ sw $v0, 0x20($v1) glabel L8012A564_C0C64 /* C0C64 8012A564 3C058015 */ lui $a1, %hi(D_80155D74) @@ -2713,7 +2713,7 @@ glabel L8012A5E0_C0CE0 /* C0D20 8012A620 34630020 */ ori $v1, $v1, 0x20 /* C0D24 8012A624 2484000E */ addiu $a0, $a0, 0xe /* C0D28 8012A628 A4430034 */ sh $v1, 0x34($v0) -/* C0D2C 8012A62C 0804AAD1 */ j .L8012AB44 +/* C0D2C 8012A62C 0804AAD1 */ j L8012AB44_C1244 /* C0D30 8012A630 A4440042 */ sh $a0, 0x42($v0) glabel L8012A634_C0D34 /* C0D34 8012A634 3C048015 */ lui $a0, %hi(D_80155D74) @@ -2722,12 +2722,12 @@ glabel L8012A634_C0D34 /* C0D40 8012A640 8C83004C */ lw $v1, 0x4c($a0) /* C0D44 8012A644 00431021 */ addu $v0, $v0, $v1 /* C0D48 8012A648 90420001 */ lbu $v0, 1($v0) -/* C0D4C 8012A64C 0804AAD1 */ j .L8012AB44 +/* C0D4C 8012A64C 0804AAD1 */ j L8012AB44_C1244 /* C0D50 8012A650 A082002B */ sb $v0, 0x2b($a0) glabel L8012A654_C0D54 /* C0D54 8012A654 0C04B0B8 */ jal func_8012C2E0 /* C0D58 8012A658 00000000 */ nop -/* C0D5C 8012A65C 0804A9B1 */ j .L8012A6C4 +/* C0D5C 8012A65C 0804A9B1 */ j L8012A6C4_C0DC4 /* C0D60 8012A660 00000000 */ nop glabel L8012A664_C0D64 /* C0D64 8012A664 3C028015 */ lui $v0, %hi(D_80155D74) @@ -2738,7 +2738,7 @@ glabel L8012A664_C0D64 /* C0D78 8012A678 24630001 */ addiu $v1, $v1, 1 /* C0D7C 8012A67C A4440024 */ sh $a0, 0x24($v0) /* C0D80 8012A680 A4450026 */ sh $a1, 0x26($v0) -/* C0D84 8012A684 0804AFDC */ j .L8012BF70 +/* C0D84 8012A684 0804AFDC */ j L8012BF70_C2670 /* C0D88 8012A688 AC430020 */ sw $v1, 0x20($v0) glabel L8012A68C_C0D8C /* C0D8C 8012A68C 3C028015 */ lui $v0, %hi(D_80155D74) @@ -2749,20 +2749,19 @@ glabel L8012A68C_C0D8C /* C0DA0 8012A6A0 24630001 */ addiu $v1, $v1, 1 /* C0DA4 8012A6A4 A4440042 */ sh $a0, 0x42($v0) /* C0DA8 8012A6A8 A4450044 */ sh $a1, 0x44($v0) -/* C0DAC 8012A6AC 0804AFDC */ j .L8012BF70 +/* C0DAC 8012A6AC 0804AFDC */ j L8012BF70_C2670 /* C0DB0 8012A6B0 AC430020 */ sw $v1, 0x20($v0) glabel L8012A6B4_C0DB4 /* C0DB4 8012A6B4 3C038015 */ lui $v1, %hi(D_80155D74) /* C0DB8 8012A6B8 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C0DBC 8012A6BC 9062004B */ lbu $v0, 0x4b($v1) /* C0DC0 8012A6C0 A0620028 */ sb $v0, 0x28($v1) -.L8012A6C4: glabel L8012A6C4_C0DC4 /* C0DC4 8012A6C4 3C038015 */ lui $v1, %hi(D_80155D74) /* C0DC8 8012A6C8 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C0DCC 8012A6CC 8C620020 */ lw $v0, 0x20($v1) /* C0DD0 8012A6D0 24420001 */ addiu $v0, $v0, 1 -/* C0DD4 8012A6D4 0804AFDC */ j .L8012BF70 +/* C0DD4 8012A6D4 0804AFDC */ j L8012BF70_C2670 /* C0DD8 8012A6D8 AC620020 */ sw $v0, 0x20($v1) glabel L8012A6DC_C0DDC /* C0DDC 8012A6DC 3C028015 */ lui $v0, %hi(D_80155D74) @@ -2771,7 +2770,7 @@ glabel L8012A6DC_C0DDC /* C0DE8 8012A6E8 90440028 */ lbu $a0, 0x28($v0) /* C0DEC 8012A6EC 24630001 */ addiu $v1, $v1, 1 /* C0DF0 8012A6F0 A444004A */ sh $a0, 0x4a($v0) -/* C0DF4 8012A6F4 0804AFDC */ j .L8012BF70 +/* C0DF4 8012A6F4 0804AFDC */ j L8012BF70_C2670 /* C0DF8 8012A6F8 AC430020 */ sw $v1, 0x20($v0) glabel L8012A6FC_C0DFC /* C0DFC 8012A6FC 3C038015 */ lui $v1, %hi(D_80155D74) @@ -2781,7 +2780,7 @@ glabel L8012A6FC_C0DFC /* C0E0C 8012A70C 00431021 */ addu $v0, $v0, $v1 /* C0E10 8012A710 90430001 */ lbu $v1, 1($v0) /* C0E14 8012A714 2C62000F */ sltiu $v0, $v1, 0xf -/* C0E18 8012A718 10400615 */ beqz $v0, .L8012BF70 +/* C0E18 8012A718 10400615 */ beqz $v0, L8012BF70_C2670 /* C0E1C 8012A71C 00031080 */ sll $v0, $v1, 2 /* C0E20 8012A720 3C018015 */ lui $at, %hi(jtbl_80150878) /* C0E24 8012A724 00220821 */ addu $at, $at, $v0 @@ -2820,7 +2819,7 @@ glabel L8012A764_C0E64 /* C0E9C 8012A79C AEE40000 */ sw $a0, ($s7) /* C0EA0 8012A7A0 24420002 */ addiu $v0, $v0, 2 .L8012A7A4: -/* C0EA4 8012A7A4 0804AFDC */ j .L8012BF70 +/* C0EA4 8012A7A4 0804AFDC */ j L8012BF70_C2670 /* C0EA8 8012A7A8 ACA20020 */ sw $v0, 0x20($a1) glabel L8012A7AC_C0EAC /* C0EAC 8012A7AC 3C09FC72 */ lui $t1, 0xfc72 @@ -2855,7 +2854,7 @@ glabel L8012A7AC_C0EAC /* C0F20 8012A820 24A50008 */ addiu $a1, $a1, 8 /* C0F24 8012A824 AEE50000 */ sw $a1, ($s7) /* C0F28 8012A828 24420003 */ addiu $v0, $v0, 3 -/* C0F2C 8012A82C 0804AFDC */ j .L8012BF70 +/* C0F2C 8012A82C 0804AFDC */ j L8012BF70_C2670 /* C0F30 8012A830 ACC20020 */ sw $v0, 0x20($a2) glabel L8012A834_C0F34 /* C0F34 8012A834 3C058015 */ lui $a1, %hi(D_80155D74) @@ -2941,7 +2940,7 @@ glabel L8012A93C_C103C .L8012A950: /* C1050 8012A950 24840002 */ addiu $a0, $a0, 2 /* C1054 8012A954 AC430038 */ sw $v1, 0x38($v0) -/* C1058 8012A958 0804AFDC */ j .L8012BF70 +/* C1058 8012A958 0804AFDC */ j L8012BF70_C2670 /* C105C 8012A95C AC440020 */ sw $a0, 0x20($v0) glabel L8012A960_C1060 /* C1060 8012A960 3C038015 */ lui $v1, %hi(D_80155D74) @@ -2951,7 +2950,7 @@ glabel L8012A960_C1060 /* C1070 8012A970 00431021 */ addu $v0, $v0, $v1 /* C1074 8012A974 90430001 */ lbu $v1, 1($v0) /* C1078 8012A978 2C62000F */ sltiu $v0, $v1, 0xf -/* C107C 8012A97C 10400071 */ beqz $v0, .L8012AB44 +/* C107C 8012A97C 10400071 */ beqz $v0, L8012AB44_C1244 /* C1080 8012A980 00031080 */ sll $v0, $v1, 2 /* C1084 8012A984 3C018015 */ lui $at, %hi(jtbl_801508B8) /* C1088 8012A988 00220821 */ addu $at, $at, $v0 @@ -3016,7 +3015,7 @@ glabel L8012AA38_C1138 /* C114C 8012AA4C 00451024 */ and $v0, $v0, $a1 /* C1150 8012AA50 34630010 */ ori $v1, $v1, 0x10 /* C1154 8012AA54 AC820038 */ sw $v0, 0x38($a0) -/* C1158 8012AA58 0804AAD1 */ j .L8012AB44 +/* C1158 8012AA58 0804AAD1 */ j L8012AB44_C1244 /* C115C 8012AA5C A4830034 */ sh $v1, 0x34($a0) glabel L8012AA60_C1160 /* C1160 8012AA60 3C028015 */ lui $v0, %hi(D_80155D74) @@ -3043,7 +3042,7 @@ glabel L8012AA9C_C119C /* C11A8 8012AAA8 2404BFFF */ addiu $a0, $zero, -0x4001 .L8012AAAC: /* C11AC 8012AAAC 00641824 */ and $v1, $v1, $a0 -/* C11B0 8012AAB0 0804AAD1 */ j .L8012AB44 +/* C11B0 8012AAB0 0804AAD1 */ j L8012AB44_C1244 /* C11B4 8012AAB4 AC430038 */ sw $v1, 0x38($v0) glabel L8012AAB8_C11B8 /* C11B8 8012AAB8 3C048015 */ lui $a0, %hi(D_80155D74) @@ -3053,7 +3052,7 @@ glabel L8012AAB8_C11B8 /* C11C8 8012AAC8 34637FFF */ ori $v1, $v1, 0x7fff .L8012AACC: /* C11CC 8012AACC 00431024 */ and $v0, $v0, $v1 -/* C11D0 8012AAD0 0804AAD1 */ j .L8012AB44 +/* C11D0 8012AAD0 0804AAD1 */ j L8012AB44_C1244 /* C11D4 8012AAD4 AC820038 */ sw $v0, 0x38($a0) glabel L8012AAD8_C11D8 /* C11D8 8012AAD8 3C048015 */ lui $a0, %hi(D_80155D74) @@ -3078,7 +3077,7 @@ glabel L8012AAD8_C11D8 .L8012AB24: /* C1224 8012AB24 94620034 */ lhu $v0, 0x34($v1) /* C1228 8012AB28 344200C0 */ ori $v0, $v0, 0xc0 -/* C122C 8012AB2C 0804AAD1 */ j .L8012AB44 +/* C122C 8012AB2C 0804AAD1 */ j L8012AB44_C1244 /* C1230 8012AB30 A4620034 */ sh $v0, 0x34($v1) .L8012AB34: /* C1234 8012AB34 94820034 */ lhu $v0, 0x34($a0) @@ -3086,16 +3085,14 @@ glabel L8012AAD8_C11D8 /* C123C 8012AB3C 3042FF3F */ andi $v0, $v0, 0xff3f .L8012AB40: /* C1240 8012AB40 A4820034 */ sh $v0, 0x34($a0) -.L8012AB44: glabel L8012AB44_C1244 /* C1244 8012AB44 3C038015 */ lui $v1, %hi(D_80155D74) /* C1248 8012AB48 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C124C 8012AB4C 8C620020 */ lw $v0, 0x20($v1) .L8012AB50: /* C1250 8012AB50 24420002 */ addiu $v0, $v0, 2 -/* C1254 8012AB54 0804AFDC */ j .L8012BF70 +/* C1254 8012AB54 0804AFDC */ j L8012BF70_C2670 /* C1258 8012AB58 AC620020 */ sw $v0, 0x20($v1) -.L8012AB5C: glabel L8012AB5C_C125C /* C125C 8012AB5C 3C028015 */ lui $v0, %hi(D_80155D74) /* C1260 8012AB60 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) @@ -4191,18 +4188,18 @@ glabel L8012AB5C_C125C /* C22DC 8012BBDC 93C204F8 */ lbu $v0, 0x4f8($fp) /* C22E0 8012BBE0 2442FFF5 */ addiu $v0, $v0, -0xb /* C22E4 8012BBE4 2C420002 */ sltiu $v0, $v0, 2 -/* C22E8 8012BBE8 10400020 */ beqz $v0, .L8012BC6C +/* C22E8 8012BBE8 10400020 */ beqz $v0, L8012BC6C_C236C /* C22EC 8012BBEC 00000000 */ nop /* C22F0 8012BBF0 93C20508 */ lbu $v0, 0x508($fp) /* C22F4 8012BBF4 2442FFFF */ addiu $v0, $v0, -1 /* C22F8 8012BBF8 2C420004 */ sltiu $v0, $v0, 4 -/* C22FC 8012BBFC 1040001B */ beqz $v0, .L8012BC6C +/* C22FC 8012BBFC 1040001B */ beqz $v0, L8012BC6C_C236C /* C2300 8012BC00 00000000 */ nop /* C2304 8012BC04 97B900A6 */ lhu $t9, 0xa6($sp) /* C2308 8012BC08 00191400 */ sll $v0, $t9, 0x10 /* C230C 8012BC0C 00021C03 */ sra $v1, $v0, 0x10 /* C2310 8012BC10 2C620026 */ sltiu $v0, $v1, 0x26 -/* C2314 8012BC14 10400013 */ beqz $v0, .L8012BC64 +/* C2314 8012BC14 10400013 */ beqz $v0, L8012BC64_C2364 /* C2318 8012BC18 00031080 */ sll $v0, $v1, 2 /* C231C 8012BC1C 3C018015 */ lui $at, %hi(jtbl_80150960) /* C2320 8012BC20 00220821 */ addu $at, $at, $v0 @@ -4211,28 +4208,26 @@ glabel L8012AB5C_C125C /* C232C 8012BC2C 00000000 */ nop glabel L8012BC30_C2330 /* C2330 8012BC30 24180040 */ addiu $t8, $zero, 0x40 -/* C2334 8012BC34 0804AF1B */ j .L8012BC6C +/* C2334 8012BC34 0804AF1B */ j L8012BC6C_C236C /* C2338 8012BC38 A7B800A6 */ sh $t8, 0xa6($sp) glabel L8012BC3C_C233C /* C233C 8012BC3C 0804AF1A */ j .L8012BC68 /* C2340 8012BC40 24190041 */ addiu $t9, $zero, 0x41 glabel L8012BC44_C2344 /* C2344 8012BC44 24180042 */ addiu $t8, $zero, 0x42 -/* C2348 8012BC48 0804AF1B */ j .L8012BC6C +/* C2348 8012BC48 0804AF1B */ j L8012BC6C_C236C /* C234C 8012BC4C A7B800A6 */ sh $t8, 0xa6($sp) glabel L8012BC50_C2350 /* C2350 8012BC50 0804AF1A */ j .L8012BC68 /* C2354 8012BC54 24190043 */ addiu $t9, $zero, 0x43 glabel L8012BC58_C2358 /* C2358 8012BC58 24180044 */ addiu $t8, $zero, 0x44 -/* C235C 8012BC5C 0804AF1B */ j .L8012BC6C +/* C235C 8012BC5C 0804AF1B */ j L8012BC6C_C236C /* C2360 8012BC60 A7B800A6 */ sh $t8, 0xa6($sp) -.L8012BC64: glabel L8012BC64_C2364 /* C2364 8012BC64 24190040 */ addiu $t9, $zero, 0x40 .L8012BC68: /* C2368 8012BC68 A7B900A6 */ sh $t9, 0xa6($sp) -.L8012BC6C: glabel L8012BC6C_C236C /* C236C 8012BC6C 97B800A6 */ lhu $t8, 0xa6($sp) /* C2370 8012BC70 97B9009E */ lhu $t9, 0x9e($sp) @@ -4437,7 +4432,6 @@ glabel L8012BC6C_C236C /* C2668 8012BF68 A4A30042 */ sh $v1, 0x42($a1) .L8012BF6C: /* C266C 8012BF6C ACA40020 */ sw $a0, 0x20($a1) -.L8012BF70: glabel L8012BF70_C2670 /* C2670 8012BF70 97A20080 */ lhu $v0, 0x80($sp) /* C2674 8012BF74 1040EFFE */ beqz $v0, .L80127F70 diff --git a/ver/us/asm/nonmatchings/code_B9D60/get_string_properties.s b/ver/us/asm/nonmatchings/code_B9D60/get_string_properties.s index a4cebcb263..098263c306 100644 --- a/ver/us/asm/nonmatchings/code_B9D60/get_string_properties.s +++ b/ver/us/asm/nonmatchings/code_B9D60/get_string_properties.s @@ -65,7 +65,7 @@ glabel get_string_properties /* BC748 80126048 90440000 */ lbu $a0, ($v0) /* BC74C 8012604C 2483FF10 */ addiu $v1, $a0, -0xf0 /* BC750 80126050 2C620010 */ sltiu $v0, $v1, 0x10 -/* BC754 80126054 10400092 */ beqz $v0, .L801262A0 +/* BC754 80126054 10400092 */ beqz $v0, L801262A0_BC9A0 /* BC758 80126058 26100001 */ addiu $s0, $s0, 1 /* BC75C 8012605C 00031080 */ sll $v0, $v1, 2 /* BC760 80126060 3C018015 */ lui $at, %hi(jtbl_80150588) @@ -75,10 +75,10 @@ glabel get_string_properties /* BC770 80126070 00000000 */ nop glabel L80126074_BC774 /* BC774 80126074 2484FF0D */ addiu $a0, $a0, -0xf3 -/* BC778 80126078 080498BA */ j .L801262E8 +/* BC778 80126078 080498BA */ j L801262E8_BC9E8 /* BC77C 8012607C A7A400E6 */ sh $a0, 0xe6($sp) glabel L80126080_BC780 -/* BC780 80126080 12C00099 */ beqz $s6, .L801262E8 +/* BC780 80126080 12C00099 */ beqz $s6, L801262E8_BC9E8 /* BC784 80126084 32E2FFFF */ andi $v0, $s7, 0xffff /* BC788 80126088 00021040 */ sll $v0, $v0, 1 /* BC78C 8012608C 03A21021 */ addu $v0, $sp, $v0 @@ -89,7 +89,7 @@ glabel L80126080_BC780 /* BC7A0 801260A0 50400001 */ beql $v0, $zero, .L801260A8 /* BC7A4 801260A4 24140001 */ addiu $s4, $zero, 1 .L801260A8: -/* BC7A8 801260A8 080498BA */ j .L801262E8 +/* BC7A8 801260A8 080498BA */ j L801262E8_BC9E8 /* BC7AC 801260AC 0000B02D */ daddu $s6, $zero, $zero glabel L801260B0_BC7B0 /* BC7B0 801260B0 3243FFFF */ andi $v1, $s2, 0xffff @@ -108,14 +108,14 @@ glabel L801260B0_BC7B0 .L801260E4: /* BC7E4 801260E4 0000982D */ daddu $s3, $zero, $zero /* BC7E8 801260E8 0260A82D */ daddu $s5, $s3, $zero -/* BC7EC 801260EC 080498BA */ j .L801262E8 +/* BC7EC 801260EC 080498BA */ j L801262E8_BC9E8 /* BC7F0 801260F0 241E0001 */ addiu $fp, $zero, 1 glabel L801260F4_BC7F4 /* BC7F4 801260F4 02301021 */ addu $v0, $s1, $s0 /* BC7F8 801260F8 90420000 */ lbu $v0, ($v0) /* BC7FC 801260FC 2443FFFF */ addiu $v1, $v0, -1 /* BC800 80126100 2C62000B */ sltiu $v0, $v1, 0xb -/* BC804 80126104 10400078 */ beqz $v0, .L801262E8 +/* BC804 80126104 10400078 */ beqz $v0, L801262E8_BC9E8 /* BC808 80126108 26100001 */ addiu $s0, $s0, 1 /* BC80C 8012610C 00031080 */ sll $v0, $v1, 2 /* BC810 80126110 3C018015 */ lui $at, %hi(jtbl_801505C8) @@ -124,7 +124,7 @@ glabel L801260F4_BC7F4 /* BC81C 8012611C 00400008 */ jr $v0 /* BC820 80126120 00000000 */ nop glabel L80126124_BC824 -/* BC824 80126124 080498BA */ j .L801262E8 +/* BC824 80126124 080498BA */ j L801262E8_BC9E8 /* BC828 80126128 26100004 */ addiu $s0, $s0, 4 glabel L8012612C_BC82C /* BC82C 8012612C 3243FFFF */ andi $v1, $s2, 0xffff @@ -136,13 +136,13 @@ glabel L8012612C_BC82C /* BC844 80126144 8FA80118 */ lw $t0, 0x118($sp) /* BC848 80126148 24140001 */ addiu $s4, $zero, 1 /* BC84C 8012614C 01031821 */ addu $v1, $t0, $v1 -/* BC850 80126150 080498BA */ j .L801262E8 +/* BC850 80126150 080498BA */ j L801262E8_BC9E8 /* BC854 80126154 A4750000 */ sh $s5, ($v1) glabel L80126158_BC858 /* BC858 80126158 02301021 */ addu $v0, $s1, $s0 /* BC85C 8012615C 90430000 */ lbu $v1, ($v0) /* BC860 80126160 2C620030 */ sltiu $v0, $v1, 0x30 -/* BC864 80126164 1040001C */ beqz $v0, .L801261D8 +/* BC864 80126164 1040001C */ beqz $v0, L801261D8_BC8D8 /* BC868 80126168 26100001 */ addiu $s0, $s0, 1 /* BC86C 8012616C 00031080 */ sll $v0, $v1, 2 /* BC870 80126170 3C018015 */ lui $at, %hi(jtbl_801505F8) @@ -154,7 +154,7 @@ glabel L80126184_BC884 /* BC884 80126184 02301021 */ addu $v0, $s1, $s0 /* BC888 80126188 90420000 */ lbu $v0, ($v0) /* BC88C 8012618C 26100001 */ addiu $s0, $s0, 1 -/* BC890 80126190 080498BA */ j .L801262E8 +/* BC890 80126190 080498BA */ j L801262E8_BC9E8 /* BC894 80126194 A7A200EE */ sh $v0, 0xee($sp) glabel L80126198_BC898 /* BC898 80126198 26100001 */ addiu $s0, $s0, 1 @@ -163,14 +163,14 @@ glabel L8012619C_BC89C glabel L801261A0_BC8A0 /* BC8A0 801261A0 26100001 */ addiu $s0, $s0, 1 glabel L801261A4_BC8A4 -/* BC8A4 801261A4 08049898 */ j .L80126260 +/* BC8A4 801261A4 08049898 */ j L80126260_BC960 /* BC8A8 801261A8 26100001 */ addiu $s0, $s0, 1 glabel L801261AC_BC8AC /* BC8AC 801261AC 02301021 */ addu $v0, $s1, $s0 /* BC8B0 801261B0 90420000 */ lbu $v0, ($v0) -/* BC8B4 801261B4 5040002A */ beql $v0, $zero, .L80126260 +/* BC8B4 801261B4 5040002A */ beql $v0, $zero, L80126260_BC960 /* BC8B8 801261B8 24140001 */ addiu $s4, $zero, 1 -/* BC8BC 801261BC 080498BA */ j .L801262E8 +/* BC8BC 801261BC 080498BA */ j L801262E8_BC9E8 /* BC8C0 801261C0 26100001 */ addiu $s0, $s0, 1 glabel L801261C4_BC8C4 /* BC8C4 801261C4 02301021 */ addu $v0, $s1, $s0 @@ -178,9 +178,8 @@ glabel L801261C4_BC8C4 /* BC8CC 801261CC 240200FD */ addiu $v0, $zero, 0xfd /* BC8D0 801261D0 14620046 */ bne $v1, $v0, .L801262EC /* BC8D4 801261D4 328200FF */ andi $v0, $s4, 0xff -.L801261D8: glabel L801261D8_BC8D8 -/* BC8D8 801261D8 080498BA */ j .L801262E8 +/* BC8D8 801261D8 080498BA */ j L801262E8_BC9E8 /* BC8DC 801261DC 24140001 */ addiu $s4, $zero, 1 glabel L801261E0_BC8E0 /* BC8E0 801261E0 02111021 */ addu $v0, $s0, $s1 @@ -198,7 +197,7 @@ glabel L801261E0_BC8E0 /* BC910 80126210 44820000 */ mtc1 $v0, $f0 /* BC914 80126214 00000000 */ nop /* BC918 80126218 46800020 */ cvt.s.w $f0, $f0 -/* BC91C 8012621C 080498BA */ j .L801262E8 +/* BC91C 8012621C 080498BA */ j L801262E8_BC9E8 /* BC920 80126220 46020500 */ add.s $f20, $f0, $f2 glabel L80126224_BC924 /* BC924 80126224 3C013F80 */ lui $at, 0x3f80 @@ -209,7 +208,7 @@ glabel L80126234_BC934 /* BC934 80126234 02301021 */ addu $v0, $s1, $s0 /* BC938 80126238 90430000 */ lbu $v1, ($v0) /* BC93C 8012623C 2C62000F */ sltiu $v0, $v1, 0xf -/* BC940 80126240 10400029 */ beqz $v0, .L801262E8 +/* BC940 80126240 10400029 */ beqz $v0, L801262E8_BC9E8 /* BC944 80126244 26100001 */ addiu $s0, $s0, 1 /* BC948 80126248 00031080 */ sll $v0, $v1, 2 /* BC94C 8012624C 3C018015 */ lui $at, %hi(jtbl_801506B8) @@ -217,9 +216,8 @@ glabel L80126234_BC934 /* BC954 80126254 8C2206B8 */ lw $v0, %lo(jtbl_801506B8)($at) /* BC958 80126258 00400008 */ jr $v0 /* BC95C 8012625C 00000000 */ nop -.L80126260: glabel L80126260_BC960 -/* BC960 80126260 080498BA */ j .L801262E8 +/* BC960 80126260 080498BA */ j L801262E8_BC9E8 /* BC964 80126264 26100001 */ addiu $s0, $s0, 1 glabel L80126268_BC968 /* BC968 80126268 02301021 */ addu $v0, $s1, $s0 @@ -231,13 +229,12 @@ glabel L80126268_BC968 /* BC980 80126280 00042140 */ sll $a0, $a0, 5 /* BC984 80126284 0C04991D */ jal get_string_width /* BC988 80126288 00892021 */ addu $a0, $a0, $t1 -/* BC98C 8012628C 080498BA */ j .L801262E8 +/* BC98C 8012628C 080498BA */ j L801262E8_BC9E8 /* BC990 80126290 02629821 */ addu $s3, $s3, $v0 glabel L80126294_BC994 /* BC994 80126294 97A80116 */ lhu $t0, 0x116($sp) /* BC998 80126298 25080001 */ addiu $t0, $t0, 1 /* BC99C 8012629C A7A80116 */ sh $t0, 0x116($sp) -.L801262A0: glabel L801262A0_BC9A0 /* BC9A0 801262A0 33C2FFFF */ andi $v0, $fp, 0xffff /* BC9A4 801262A4 10400006 */ beqz $v0, .L801262C0 @@ -258,7 +255,6 @@ glabel L801262A0_BC9A0 /* BC9DC 801262DC 0C049721 */ jal func_80125C84 /* BC9E0 801262E0 0100282D */ daddu $a1, $t0, $zero /* BC9E4 801262E4 02629821 */ addu $s3, $s3, $v0 -.L801262E8: glabel L801262E8_BC9E8 /* BC9E8 801262E8 328200FF */ andi $v0, $s4, 0xff .L801262EC: diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80130A04.s b/ver/us/asm/nonmatchings/code_C50A0/func_80130A04.s index 5f6e4b97c8..9d2d794a1d 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/func_80130A04.s +++ b/ver/us/asm/nonmatchings/code_C50A0/func_80130A04.s @@ -5,7 +5,7 @@ glabel func_80130A04 /* C7104 80130A04 8C830040 */ lw $v1, 0x40($a0) /* C7108 80130A08 8C650000 */ lw $a1, ($v1) /* C710C 80130A0C 2CA20008 */ sltiu $v0, $a1, 8 -/* C7110 80130A10 1040002C */ beqz $v0, .L80130AC4 +/* C7110 80130A10 1040002C */ beqz $v0, L80130AC4_C71C4 /* C7114 80130A14 24630004 */ addiu $v1, $v1, 4 /* C7118 80130A18 00051080 */ sll $v0, $a1, 2 /* C711C 80130A1C 3C018015 */ lui $at, %hi(jtbl_80150A60) @@ -20,7 +20,7 @@ glabel L80130A30_C7130 /* C713C 80130A3C 8C620000 */ lw $v0, ($v1) /* C7140 80130A40 24630004 */ addiu $v1, $v1, 4 /* C7144 80130A44 AC830040 */ sw $v1, 0x40($a0) -/* C7148 80130A48 0804C2B1 */ j .L80130AC4 +/* C7148 80130A48 0804C2B1 */ j L80130AC4_C71C4 /* C714C 80130A4C AC820044 */ sw $v0, 0x44($a0) glabel L80130A50_C7150 /* C7150 80130A50 8C830048 */ lw $v1, 0x48($a0) @@ -48,7 +48,7 @@ glabel L80130A70_C7170 /* C71A0 80130AA0 8C620000 */ lw $v0, ($v1) /* C71A4 80130AA4 24630004 */ addiu $v1, $v1, 4 /* C71A8 80130AA8 AC830040 */ sw $v1, 0x40($a0) -/* C71AC 80130AAC 0804C2B1 */ j .L80130AC4 +/* C71AC 80130AAC 0804C2B1 */ j L80130AC4_C71C4 /* C71B0 80130AB0 AC820058 */ sw $v0, 0x58($a0) glabel L80130AB4_C71B4 /* C71B4 80130AB4 24630004 */ addiu $v1, $v1, 4 @@ -56,7 +56,6 @@ glabel L80130AB4_C71B4 glabel L80130ABC_C71BC /* C71BC 80130ABC 03E00008 */ jr $ra /* C71C0 80130AC0 24020001 */ addiu $v0, $zero, 1 -.L80130AC4: glabel L80130AC4_C71C4 /* C71C4 80130AC4 03E00008 */ jr $ra /* C71C8 80130AC8 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80131128.s b/ver/us/asm/nonmatchings/code_C50A0/func_80131128.s index 53b971af4c..951c05cf59 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/func_80131128.s +++ b/ver/us/asm/nonmatchings/code_C50A0/func_80131128.s @@ -26,11 +26,10 @@ glabel func_80131128 /* C787C 8013117C 26D6C310 */ addiu $s6, $s6, -0x3cf0 /* C7880 80131180 AFD00024 */ sw $s0, 0x24($fp) /* C7884 80131184 AFD00028 */ sw $s0, 0x28($fp) -.L80131188: glabel L80131188_C7888 /* C7888 80131188 8E030000 */ lw $v1, ($s0) /* C788C 8013118C 2C620005 */ sltiu $v0, $v1, 5 -/* C7890 80131190 1040FFFD */ beqz $v0, .L80131188 +/* C7890 80131190 1040FFFD */ beqz $v0, L80131188_C7888 /* C7894 80131194 26100004 */ addiu $s0, $s0, 4 /* C7898 80131198 00031080 */ sll $v0, $v1, 2 /* C789C 8013119C 3C018015 */ lui $at, %hi(jtbl_80150A80) @@ -39,7 +38,7 @@ glabel L80131188_C7888 /* C78A8 801311A8 00400008 */ jr $v0 /* C78AC 801311AC 00000000 */ nop glabel L801311B0_C78B0 -/* C78B0 801311B0 0804C462 */ j .L80131188 +/* C78B0 801311B0 0804C462 */ j L80131188_C7888 /* C78B4 801311B4 26100008 */ addiu $s0, $s0, 8 glabel L801311B8_C78B8 /* C78B8 801311B8 26100004 */ addiu $s0, $s0, 4 @@ -181,7 +180,7 @@ glabel L801311B8_C78B8 /* C7A98 80131398 00521025 */ or $v0, $v0, $s2 /* C7A9C 8013139C AE020000 */ sw $v0, ($s0) .L801313A0: -/* C7AA0 801313A0 0804C462 */ j .L80131188 +/* C7AA0 801313A0 0804C462 */ j L80131188_C7888 /* C7AA4 801313A4 26100004 */ addiu $s0, $s0, 4 .L801313A8: /* C7AA8 801313A8 24630008 */ addiu $v1, $v1, 8 diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_8013673C.s b/ver/us/asm/nonmatchings/code_C50A0/func_8013673C.s index 05e3e864ab..912121901d 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/func_8013673C.s +++ b/ver/us/asm/nonmatchings/code_C50A0/func_8013673C.s @@ -20,7 +20,7 @@ glabel func_8013673C /* CCE78 80136778 00021600 */ sll $v0, $v0, 0x18 /* CCE7C 8013677C 00021E03 */ sra $v1, $v0, 0x18 /* CCE80 80136780 2C62000D */ sltiu $v0, $v1, 0xd -/* CCE84 80136784 1040008B */ beqz $v0, .L801369B4 +/* CCE84 80136784 1040008B */ beqz $v0, L801369B4_CD0B4 /* CCE88 80136788 00C0982D */ daddu $s3, $a2, $zero /* CCE8C 8013678C 00031080 */ sll $v0, $v1, 2 /* CCE90 80136790 3C018015 */ lui $at, %hi(jtbl_80150E60) @@ -134,7 +134,7 @@ glabel L801367A4_CCEA4 /* CD008 80136908 AFA20010 */ sw $v0, 0x10($sp) /* CD00C 8013690C 0C04993B */ jal draw_msg /* CD010 80136910 AFA00014 */ sw $zero, 0x14($sp) -/* CD014 80136914 0804DA6D */ j .L801369B4 +/* CD014 80136914 0804DA6D */ j L801369B4_CD0B4 /* CD018 80136918 00000000 */ nop .L8013691C: /* CD01C 8013691C 02663021 */ addu $a2, $s3, $a2 @@ -145,7 +145,7 @@ glabel L801367A4_CCEA4 /* CD030 80136930 AFA00014 */ sw $zero, 0x14($sp) /* CD034 80136934 96220006 */ lhu $v0, 6($s1) /* CD038 80136938 30420030 */ andi $v0, $v0, 0x30 -/* CD03C 8013693C 1440001D */ bnez $v0, .L801369B4 +/* CD03C 8013693C 1440001D */ bnez $v0, L801369B4_CD0B4 /* CD040 80136940 26450014 */ addiu $a1, $s2, 0x14 /* CD044 80136944 0804DA65 */ j .L80136994 /* CD048 80136948 00000000 */ nop @@ -177,7 +177,6 @@ glabel L8013694C_CD04C /* CD0A8 801369A8 8E040000 */ lw $a0, ($s0) /* CD0AC 801369AC 0C0511F1 */ jal draw_icon_1 /* CD0B0 801369B0 00000000 */ nop -.L801369B4: glabel L801369B4_CD0B4 /* CD0B4 801369B4 8FBF0028 */ lw $ra, 0x28($sp) /* CD0B8 801369B8 8FB30024 */ lw $s3, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/code_C50A0/make_item_entity.s b/ver/us/asm/nonmatchings/code_C50A0/make_item_entity.s index 3a25c25a23..bb63815da2 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/make_item_entity.s +++ b/ver/us/asm/nonmatchings/code_C50A0/make_item_entity.s @@ -23,9 +23,9 @@ glabel make_item_entity /* C7B3C 8013143C 3442A480 */ ori $v0, $v0, 0xa480 /* C7B40 80131440 02228821 */ addu $s1, $s1, $v0 .L80131444: -/* C7B44 80131444 1A20000C */ blez $s1, .L80131478 +/* C7B44 80131444 1A20000C */ blez $s1, L80131478_C7B78 /* C7B48 80131448 2E620017 */ sltiu $v0, $s3, 0x17 -/* C7B4C 8013144C 1040000A */ beqz $v0, .L80131478 +/* C7B4C 8013144C 1040000A */ beqz $v0, L80131478_C7B78 /* C7B50 80131450 00131080 */ sll $v0, $s3, 2 /* C7B54 80131454 3C018015 */ lui $at, %hi(jtbl_80150A98) /* C7B58 80131458 00220821 */ addu $at, $at, $v0 @@ -37,7 +37,6 @@ glabel L80131468_C7B68 /* C7B6C 8013146C 0220202D */ daddu $a0, $s1, $zero /* C7B70 80131470 14400180 */ bnez $v0, .L80131A74 /* C7B74 80131474 2402FFFF */ addiu $v0, $zero, -1 -.L80131478: glabel L80131478_C7B78 /* C7B78 80131478 0000182D */ daddu $v1, $zero, $zero /* C7B7C 8013147C 3C048015 */ lui $a0, %hi(D_801565A0) @@ -377,7 +376,7 @@ glabel L801318E4_C7FE4 /* C8008 80131908 8203001B */ lb $v1, 0x1b($s0) .L8013190C: /* C800C 8013190C 2C620015 */ sltiu $v0, $v1, 0x15 -/* C8010 80131910 1040003E */ beqz $v0, .L80131A0C +/* C8010 80131910 1040003E */ beqz $v0, L80131A0C_C810C /* C8014 80131914 00031080 */ sll $v0, $v1, 2 /* C8018 80131918 3C018015 */ lui $at, %hi(jtbl_80150B68) /* C801C 8013191C 00220821 */ addu $at, $at, $v0 @@ -442,7 +441,6 @@ glabel L8013192C_C802C /* C8100 80131A00 0220202D */ daddu $a0, $s1, $zero /* C8104 80131A04 0C044A17 */ jal set_standard_shadow_scale /* C8108 80131A08 E4800030 */ swc1 $f0, 0x30($a0) -.L80131A0C: glabel L80131A0C_C810C /* C810C 80131A0C 9202001C */ lbu $v0, 0x1c($s0) /* C8110 80131A10 10400003 */ beqz $v0, .L80131A20 diff --git a/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_index.s b/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_index.s index 1ff9807624..9e9b7d715b 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_index.s +++ b/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_index.s @@ -14,7 +14,7 @@ glabel remove_item_entity_by_index /* CA120 80133A20 8C630000 */ lw $v1, ($v1) /* CA124 80133A24 8064001B */ lb $a0, 0x1b($v1) /* CA128 80133A28 2C82001D */ sltiu $v0, $a0, 0x1d -/* CA12C 80133A2C 10400008 */ beqz $v0, .L80133A50 +/* CA12C 80133A2C 10400008 */ beqz $v0, L80133A50_CA150 /* CA130 80133A30 00041080 */ sll $v0, $a0, 2 /* CA134 80133A34 3C018015 */ lui $at, %hi(jtbl_80150DA0) /* CA138 80133A38 00220821 */ addu $at, $at, $v0 @@ -24,7 +24,6 @@ glabel remove_item_entity_by_index glabel L80133A48_CA148 /* CA148 80133A48 0C0448CA */ jal func_80112328 /* CA14C 80133A4C 84640020 */ lh $a0, 0x20($v1) -.L80133A50: glabel L80133A50_CA150 /* CA150 80133A50 3C118015 */ lui $s1, %hi(D_801565A0) /* CA154 80133A54 263165A0 */ addiu $s1, $s1, %lo(D_801565A0) diff --git a/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_reference.s b/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_reference.s index 520863c8cf..d7a59dc6df 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_reference.s +++ b/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_reference.s @@ -30,7 +30,7 @@ glabel remove_item_entity_by_reference .L8013398C: /* CA08C 8013398C 8223001B */ lb $v1, 0x1b($s1) /* CA090 80133990 2C62001D */ sltiu $v0, $v1, 0x1d -/* CA094 80133994 10400008 */ beqz $v0, .L801339B8 +/* CA094 80133994 10400008 */ beqz $v0, L801339B8_CA0B8 /* CA098 80133998 00031080 */ sll $v0, $v1, 2 /* CA09C 8013399C 3C018015 */ lui $at, %hi(jtbl_80150D28) /* CA0A0 801339A0 00220821 */ addu $at, $at, $v0 @@ -40,7 +40,6 @@ glabel remove_item_entity_by_reference glabel L801339B0_CA0B0 /* CA0B0 801339B0 0C0448CA */ jal func_80112328 /* CA0B4 801339B4 86240020 */ lh $a0, 0x20($s1) -.L801339B8: glabel L801339B8_CA0B8 /* CA0B8 801339B8 3C118015 */ lui $s1, %hi(D_801565A0) /* CA0BC 801339BC 263165A0 */ addiu $s1, $s1, %lo(D_801565A0) diff --git a/ver/us/asm/nonmatchings/code_C50A0/update_item_entities.s b/ver/us/asm/nonmatchings/code_C50A0/update_item_entities.s index 30149ca013..cfea51a9e1 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/update_item_entities.s +++ b/ver/us/asm/nonmatchings/code_C50A0/update_item_entities.s @@ -57,7 +57,7 @@ glabel update_item_entities /* C86B0 80131FB0 0220202D */ daddu $a0, $s1, $zero /* C86B4 80131FB4 8223001B */ lb $v1, 0x1b($s1) /* C86B8 80131FB8 2C62001D */ sltiu $v0, $v1, 0x1d -/* C86BC 80131FBC 10400014 */ beqz $v0, .L80132010 +/* C86BC 80131FBC 10400014 */ beqz $v0, L80132010_C8710 /* C86C0 80131FC0 00031080 */ sll $v0, $v1, 2 /* C86C4 80131FC4 3C018015 */ lui $at, %hi(jtbl_80150BD8) /* C86C8 80131FC8 00220821 */ addu $at, $at, $v0 @@ -67,22 +67,21 @@ glabel update_item_entities glabel L80131FD8_C86D8 /* C86D8 80131FD8 0C04D596 */ jal update_item_entity_static /* C86DC 80131FDC 0220202D */ daddu $a0, $s1, $zero -/* C86E0 80131FE0 0804C804 */ j .L80132010 +/* C86E0 80131FE0 0804C804 */ j L80132010_C8710 /* C86E4 80131FE4 00000000 */ nop glabel L80131FE8_C86E8 /* C86E8 80131FE8 0C04D5B3 */ jal func_801356CC /* C86EC 80131FEC 0220202D */ daddu $a0, $s1, $zero -/* C86F0 80131FF0 0804C804 */ j .L80132010 +/* C86F0 80131FF0 0804C804 */ j L80132010_C8710 /* C86F4 80131FF4 00000000 */ nop glabel L80131FF8_C86F8 /* C86F8 80131FF8 0C04D094 */ jal update_item_entity_collectable /* C86FC 80131FFC 0220202D */ daddu $a0, $s1, $zero -/* C8700 80132000 0804C804 */ j .L80132010 +/* C8700 80132000 0804C804 */ j L80132010_C8710 /* C8704 80132004 00000000 */ nop glabel L80132008_C8708 /* C8708 80132008 0C04D5B7 */ jal update_item_entity_temp /* C870C 8013200C 0220202D */ daddu $a0, $s1, $zero -.L80132010: glabel L80132010_C8710 /* C8710 80132010 3C028015 */ lui $v0, %hi(D_801565A0) /* C8714 80132014 8C4265A0 */ lw $v0, %lo(D_801565A0)($v0) @@ -92,7 +91,7 @@ glabel L80132010_C8710 /* C8724 80132024 26730001 */ addiu $s3, $s3, 1 /* C8728 80132028 8223001B */ lb $v1, 0x1b($s1) /* C872C 8013202C 2C62001D */ sltiu $v0, $v1, 0x1d -/* C8730 80132030 10400043 */ beqz $v0, .L80132140 +/* C8730 80132030 10400043 */ beqz $v0, L80132140_C8840 /* C8734 80132034 00031080 */ sll $v0, $v1, 2 /* C8738 80132038 3C018015 */ lui $at, %hi(jtbl_80150C50) /* C873C 8013203C 00220821 */ addu $at, $at, $v0 @@ -116,7 +115,7 @@ glabel L8013204C_C874C /* C8780 80132080 14A20004 */ bne $a1, $v0, .L80132094 /* C8784 80132084 00000000 */ nop /* C8788 80132088 86220038 */ lh $v0, 0x38($s1) -/* C878C 8013208C 1082002C */ beq $a0, $v0, .L80132140 +/* C878C 8013208C 1082002C */ beq $a0, $v0, L80132140_C8840 /* C8790 80132090 00000000 */ nop .L80132094: /* C8794 80132094 0C044181 */ jal get_shadow_by_index @@ -162,7 +161,6 @@ glabel L8013204C_C874C /* C8834 80132134 0200202D */ daddu $a0, $s0, $zero /* C8838 80132138 0C044A17 */ jal set_standard_shadow_scale /* C883C 8013213C E4800030 */ swc1 $f0, 0x30($a0) -.L80132140: glabel L80132140_C8840 /* C8840 80132140 C6200008 */ lwc1 $f0, 8($s1) /* C8844 80132144 C6220010 */ lwc1 $f2, 0x10($s1) diff --git a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s b/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s index c98cba3491..7d75cbbf32 100644 --- a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s +++ b/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s @@ -48,7 +48,7 @@ glabel update_item_entity_temp /* CBE80 80135780 00021600 */ sll $v0, $v0, 0x18 /* CBE84 80135784 00021E03 */ sra $v1, $v0, 0x18 /* CBE88 80135788 2C62000F */ sltiu $v0, $v1, 0xf -/* CBE8C 8013578C 104002FB */ beqz $v0, .L8013637C +/* CBE8C 8013578C 104002FB */ beqz $v0, L8013637C_CCA7C /* CBE90 80135790 00031080 */ sll $v0, $v1, 2 /* CBE94 80135794 3C018015 */ lui $at, %hi(jtbl_80150E20) /* CBE98 80135798 00220821 */ addu $at, $at, $v0 @@ -86,10 +86,10 @@ glabel L801357A8_CBEA8 /* CBF0C 8013580C 00000000 */ nop /* CBF10 80135810 10600006 */ beqz $v1, .L8013582C /* CBF14 80135814 2402001D */ addiu $v0, $zero, 0x1d -/* CBF18 80135818 146202D8 */ bne $v1, $v0, .L8013637C +/* CBF18 80135818 146202D8 */ bne $v1, $v0, L8013637C_CCA7C /* CBF1C 8013581C 24020001 */ addiu $v0, $zero, 1 /* CBF20 80135820 826300B6 */ lb $v1, 0xb6($s3) -/* CBF24 80135824 146202D5 */ bne $v1, $v0, .L8013637C +/* CBF24 80135824 146202D5 */ bne $v1, $v0, L8013637C_CCA7C /* CBF28 80135828 00000000 */ nop .L8013582C: /* CBF2C 8013582C 96220006 */ lhu $v0, 6($s1) @@ -302,7 +302,7 @@ glabel L801357A8_CBEA8 /* CC210 80135B10 00000000 */ nop /* CC214 80135B14 3C018015 */ lui $at, %hi(D_801568E4) /* CC218 80135B18 AC3268E4 */ sw $s2, %lo(D_801568E4)($at) -/* CC21C 80135B1C 0804D8DF */ j .L8013637C +/* CC21C 80135B1C 0804D8DF */ j L8013637C_CCA7C /* CC220 80135B20 00000000 */ nop glabel L80135B24_CC224 /* CC224 80135B24 3C038015 */ lui $v1, %hi(D_801568E4) @@ -468,7 +468,7 @@ glabel L80135B24_CC224 /* CC47C 80135D7C 8C620000 */ lw $v0, ($v1) /* CC480 80135D80 10400003 */ beqz $v0, .L80135D90 /* CC484 80135D84 2442FFFF */ addiu $v0, $v0, -1 -/* CC488 80135D88 0804D8DF */ j .L8013637C +/* CC488 80135D88 0804D8DF */ j L8013637C_CCA7C /* CC48C 80135D8C AC620000 */ sw $v0, ($v1) .L80135D90: /* CC490 80135D90 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -477,7 +477,7 @@ glabel L80135B24_CC224 /* CC49C 80135D9C 8C420010 */ lw $v0, 0x10($v0) /* CC4A0 80135DA0 3463C000 */ ori $v1, $v1, 0xc000 /* CC4A4 80135DA4 00431024 */ and $v0, $v0, $v1 -/* CC4A8 80135DA8 10400174 */ beqz $v0, .L8013637C +/* CC4A8 80135DA8 10400174 */ beqz $v0, L8013637C_CCA7C /* CC4AC 80135DAC 00000000 */ nop /* CC4B0 80135DB0 0C04C3DC */ jal func_80130F70 /* CC4B4 80135DB4 0220202D */ daddu $a0, $s1, $zero @@ -517,20 +517,20 @@ glabel L80135B24_CC224 /* CC534 80135E34 0C051F9F */ jal set_window_update /* CC538 80135E38 0200282D */ daddu $a1, $s0, $zero /* CC53C 80135E3C 24020003 */ addiu $v0, $zero, 3 -/* CC540 80135E40 0804D8DF */ j .L8013637C +/* CC540 80135E40 0804D8DF */ j L8013637C_CCA7C /* CC544 80135E44 A222001A */ sb $v0, 0x1a($s1) glabel L80135E48_CC548 /* CC548 80135E48 3C038016 */ lui $v1, %hi(gUIPanels) /* CC54C 80135E4C 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* CC550 80135E50 90620180 */ lbu $v0, 0x180($v1) /* CC554 80135E54 30420008 */ andi $v0, $v0, 8 -/* CC558 80135E58 14400148 */ bnez $v0, .L8013637C +/* CC558 80135E58 14400148 */ bnez $v0, L8013637C_CCA7C /* CC55C 80135E5C 00000000 */ nop /* CC560 80135E60 90620260 */ lbu $v0, 0x260($v1) /* CC564 80135E64 30420008 */ andi $v0, $v0, 8 -/* CC568 80135E68 14400144 */ bnez $v0, .L8013637C +/* CC568 80135E68 14400144 */ bnez $v0, L8013637C_CCA7C /* CC56C 80135E6C 24020004 */ addiu $v0, $zero, 4 -/* CC570 80135E70 0804D8DF */ j .L8013637C +/* CC570 80135E70 0804D8DF */ j L8013637C_CCA7C /* CC574 80135E74 A222001A */ sb $v0, 0x1a($s1) glabel L80135E78_CC578 /* CC578 80135E78 86220018 */ lh $v0, 0x18($s1) @@ -567,10 +567,10 @@ glabel L80135E78_CC578 /* CC5EC 80135EEC 0C0B2026 */ jal set_variable /* CC5F0 80135EF0 24060001 */ addiu $a2, $zero, 1 /* CC5F4 80135EF4 24020005 */ addiu $v0, $zero, 5 -/* CC5F8 80135EF8 0804D8DF */ j .L8013637C +/* CC5F8 80135EF8 0804D8DF */ j L8013637C_CCA7C /* CC5FC 80135EFC A222001A */ sb $v0, 0x1a($s1) .L80135F00: -/* CC600 80135F00 0804D8DF */ j .L8013637C +/* CC600 80135F00 0804D8DF */ j L8013637C_CCA7C /* CC604 80135F04 A222001A */ sb $v0, 0x1a($s1) glabel L80135F08_CC608 /* CC608 80135F08 86230018 */ lh $v1, 0x18($s1) @@ -601,13 +601,13 @@ glabel L80135F08_CC608 /* CC664 80135F64 0C0496AE */ jal clamp_printer_coords /* CC668 80135F68 00A0302D */ daddu $a2, $a1, $zero /* CC66C 80135F6C 24020006 */ addiu $v0, $zero, 6 -/* CC670 80135F70 0804D8DF */ j .L8013637C +/* CC670 80135F70 0804D8DF */ j L8013637C_CCA7C /* CC674 80135F74 A222001A */ sb $v0, 0x1a($s1) glabel L80135F78_CC678 /* CC678 80135F78 3C038015 */ lui $v1, %hi(D_801568F8) /* CC67C 80135F7C 8C6368F8 */ lw $v1, %lo(D_801568F8)($v1) /* CC680 80135F80 24020001 */ addiu $v0, $zero, 1 -/* CC684 80135F84 146200FD */ bne $v1, $v0, .L8013637C +/* CC684 80135F84 146200FD */ bne $v1, $v0, L8013637C_CCA7C /* CC688 80135F88 00000000 */ nop /* CC68C 80135F8C 3C018015 */ lui $at, %hi(D_801565A4) /* CC690 80135F90 A42065A4 */ sh $zero, %lo(D_801565A4)($at) @@ -639,7 +639,7 @@ glabel L80135FE8_CC6E8 /* CC6EC 80135FEC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* CC6F0 80135FF0 8C420010 */ lw $v0, 0x10($v0) /* CC6F4 80135FF4 30428000 */ andi $v0, $v0, 0x8000 -/* CC6F8 80135FF8 104000E0 */ beqz $v0, .L8013637C +/* CC6F8 80135FF8 104000E0 */ beqz $v0, L8013637C_CCA7C /* CC6FC 80135FFC 24070001 */ addiu $a3, $zero, 1 /* CC700 80136000 0000202D */ daddu $a0, $zero, $zero /* CC704 80136004 3C038008 */ lui $v1, %hi(gItemTable) @@ -708,24 +708,24 @@ glabel L80135FE8_CC6E8 /* CC7F8 801360F8 2402000B */ addiu $v0, $zero, 0xb /* CC7FC 801360FC 3C018015 */ lui $at, %hi(D_801568E4) /* CC800 80136100 AC2068E4 */ sw $zero, %lo(D_801568E4)($at) -/* CC804 80136104 0804D8DF */ j .L8013637C +/* CC804 80136104 0804D8DF */ j L8013637C_CCA7C /* CC808 80136108 A222001A */ sb $v0, 0x1a($s1) glabel L8013610C_CC80C /* CC80C 8013610C 3C038016 */ lui $v1, %hi(gUIPanels) /* CC810 80136110 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* CC814 80136114 90620180 */ lbu $v0, 0x180($v1) /* CC818 80136118 30420008 */ andi $v0, $v0, 8 -/* CC81C 8013611C 14400097 */ bnez $v0, .L8013637C +/* CC81C 8013611C 14400097 */ bnez $v0, L8013637C_CCA7C /* CC820 80136120 00000000 */ nop /* CC824 80136124 90620220 */ lbu $v0, 0x220($v1) /* CC828 80136128 30420008 */ andi $v0, $v0, 8 -/* CC82C 8013612C 14400093 */ bnez $v0, .L8013637C +/* CC82C 8013612C 14400093 */ bnez $v0, L8013637C_CCA7C /* CC830 80136130 00000000 */ nop /* CC834 80136134 90620260 */ lbu $v0, 0x260($v1) /* CC838 80136138 30420008 */ andi $v0, $v0, 8 -/* CC83C 8013613C 1440008F */ bnez $v0, .L8013637C +/* CC83C 8013613C 1440008F */ bnez $v0, L8013637C_CCA7C /* CC840 80136140 2402000C */ addiu $v0, $zero, 0xc -/* CC844 80136144 0804D8DF */ j .L8013637C +/* CC844 80136144 0804D8DF */ j L8013637C_CCA7C /* CC848 80136148 A222001A */ sb $v0, 0x1a($s1) glabel L8013614C_CC84C /* CC84C 8013614C 3C158015 */ lui $s5, %hi(D_801568E4) @@ -736,7 +736,7 @@ glabel L8013614C_CC84C /* CC860 80136160 8602032C */ lh $v0, 0x32c($s0) /* CC864 80136164 3C018015 */ lui $at, %hi(D_801568E8) /* CC868 80136168 AC2268E8 */ sw $v0, %lo(D_801568E8)($at) -/* CC86C 8013616C 10400083 */ beqz $v0, .L8013637C +/* CC86C 8013616C 10400083 */ beqz $v0, L8013637C_CCA7C /* CC870 80136170 00000000 */ nop /* CC874 80136174 0C03C4EC */ jal func_800F13B0 /* CC878 80136178 00000000 */ nop @@ -745,7 +745,7 @@ glabel L8013614C_CC84C .L80136184: /* CC884 80136184 AEA20000 */ sw $v0, ($s5) /* CC888 80136188 2842000F */ slti $v0, $v0, 0xf -/* CC88C 8013618C 1440007B */ bnez $v0, .L8013637C +/* CC88C 8013618C 1440007B */ bnez $v0, L8013637C_CCA7C /* CC890 80136190 00000000 */ nop /* CC894 80136194 0C03C54E */ jal func_800F1538 /* CC898 80136198 00000000 */ nop @@ -813,38 +813,38 @@ glabel L8013614C_CC84C /* CC988 80136288 24020032 */ addiu $v0, $zero, 0x32 /* CC98C 8013628C AEA20000 */ sw $v0, ($s5) /* CC990 80136290 2402000D */ addiu $v0, $zero, 0xd -/* CC994 80136294 0804D8DF */ j .L8013637C +/* CC994 80136294 0804D8DF */ j L8013637C_CCA7C /* CC998 80136298 A222001A */ sb $v0, 0x1a($s1) glabel L8013629C_CC99C /* CC99C 8013629C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* CC9A0 801362A0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* CC9A4 801362A4 8C420010 */ lw $v0, 0x10($v0) /* CC9A8 801362A8 30428000 */ andi $v0, $v0, 0x8000 -/* CC9AC 801362AC 10400033 */ beqz $v0, .L8013637C +/* CC9AC 801362AC 10400033 */ beqz $v0, L8013637C_CCA7C /* CC9B0 801362B0 00000000 */ nop /* CC9B4 801362B4 3C058014 */ lui $a1, %hi(basic_hidden_window_update) /* CC9B8 801362B8 24A57574 */ addiu $a1, $a1, %lo(basic_hidden_window_update) /* CC9BC 801362BC 0C051F9F */ jal set_window_update /* CC9C0 801362C0 2404000C */ addiu $a0, $zero, 0xc /* CC9C4 801362C4 2402000E */ addiu $v0, $zero, 0xe -/* CC9C8 801362C8 0804D8DF */ j .L8013637C +/* CC9C8 801362C8 0804D8DF */ j L8013637C_CCA7C /* CC9CC 801362CC A222001A */ sb $v0, 0x1a($s1) glabel L801362D0_CC9D0 /* CC9D0 801362D0 3C038016 */ lui $v1, %hi(gUIPanels) /* CC9D4 801362D4 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* CC9D8 801362D8 90620180 */ lbu $v0, 0x180($v1) /* CC9DC 801362DC 30420008 */ andi $v0, $v0, 8 -/* CC9E0 801362E0 14400026 */ bnez $v0, .L8013637C +/* CC9E0 801362E0 14400026 */ bnez $v0, L8013637C_CCA7C /* CC9E4 801362E4 00000000 */ nop /* CC9E8 801362E8 90620220 */ lbu $v0, 0x220($v1) /* CC9EC 801362EC 30420008 */ andi $v0, $v0, 8 -/* CC9F0 801362F0 14400022 */ bnez $v0, .L8013637C +/* CC9F0 801362F0 14400022 */ bnez $v0, L8013637C_CCA7C /* CC9F4 801362F4 00000000 */ nop /* CC9F8 801362F8 90620260 */ lbu $v0, 0x260($v1) /* CC9FC 801362FC 30420008 */ andi $v0, $v0, 8 -/* CCA00 80136300 1440001E */ bnez $v0, .L8013637C +/* CCA00 80136300 1440001E */ bnez $v0, L8013637C_CCA7C /* CCA04 80136304 2402000F */ addiu $v0, $zero, 0xf -/* CCA08 80136308 0804D8DF */ j .L8013637C +/* CCA08 80136308 0804D8DF */ j L8013637C_CCA7C /* CCA0C 8013630C A222001A */ sb $v0, 0x1a($s1) glabel L80136310_CCA10 /* CCA10 80136310 3C040001 */ lui $a0, 1 @@ -875,7 +875,6 @@ glabel L80136310_CCA10 /* CCA70 80136370 00000000 */ nop /* CCA74 80136374 3C018015 */ lui $at, %hi(D_801565A4) /* CCA78 80136378 A42065A4 */ sh $zero, %lo(D_801565A4)($at) -.L8013637C: glabel L8013637C_CCA7C /* CCA7C 8013637C 8FBF0038 */ lw $ra, 0x38($sp) /* CCA80 80136380 8FB50034 */ lw $s5, 0x34($sp) diff --git a/ver/us/asm/nonmatchings/code_E20110/func_802B7450_E20560.s b/ver/us/asm/nonmatchings/code_E20110/func_802B7450_E20560.s index eb3906217f..ee2fa17c6f 100644 --- a/ver/us/asm/nonmatchings/code_E20110/func_802B7450_E20560.s +++ b/ver/us/asm/nonmatchings/code_E20110/func_802B7450_E20560.s @@ -25,7 +25,7 @@ glabel func_802B7450_E20560 /* E205B0 802B74A0 0080802D */ daddu $s0, $a0, $zero /* E205B4 802B74A4 2443FFFD */ addiu $v1, $v0, -3 /* E205B8 802B74A8 2C620031 */ sltiu $v0, $v1, 0x31 -/* E205BC 802B74AC 10400038 */ beqz $v0, .L802B7590 +/* E205BC 802B74AC 10400038 */ beqz $v0, L802B7590_E206A0 /* E205C0 802B74B0 00031080 */ sll $v0, $v1, 2 /* E205C4 802B74B4 3C01802B */ lui $at, %hi(jtbl_802B7CC0_E20DD0) /* E205C8 802B74B8 00220821 */ addu $at, $at, $v0 @@ -33,7 +33,7 @@ glabel func_802B7450_E20560 /* E205D0 802B74C0 00400008 */ jr $v0 /* E205D4 802B74C4 00000000 */ nop glabel L802B74C8_E205D8 -/* E205D8 802B74C8 080ADD64 */ j .L802B7590 +/* E205D8 802B74C8 080ADD64 */ j L802B7590_E206A0 /* E205DC 802B74CC 2410FFFF */ addiu $s0, $zero, -1 .L802B74D0: /* E205E0 802B74D0 3C020200 */ lui $v0, 0x200 @@ -71,7 +71,7 @@ glabel L802B74C8_E205D8 .L802B7544: /* E20654 802B7544 14400007 */ bnez $v0, .L802B7564 /* E20658 802B7548 32022000 */ andi $v0, $s0, 0x2000 -/* E2065C 802B754C 14400010 */ bnez $v0, .L802B7590 +/* E2065C 802B754C 14400010 */ bnez $v0, L802B7590_E206A0 /* E20660 802B7550 00000000 */ nop /* E20664 802B7554 0C05173A */ jal should_collider_allow_interact /* E20668 802B7558 0200202D */ daddu $a0, $s0, $zero @@ -81,7 +81,7 @@ glabel L802B74C8_E205D8 /* E20674 802B7564 0C0394BE */ jal can_player_interact /* E20678 802B7568 00000000 */ nop .L802B756C: -/* E2067C 802B756C 14400008 */ bnez $v0, .L802B7590 +/* E2067C 802B756C 14400008 */ bnez $v0, L802B7590_E206A0 /* E20680 802B7570 3C04F7FF */ lui $a0, 0xf7ff /* E20684 802B7574 3484FFFF */ ori $a0, $a0, 0xffff /* E20688 802B7578 8E230000 */ lw $v1, ($s1) @@ -90,7 +90,6 @@ glabel L802B74C8_E205D8 /* E20694 802B7584 00641824 */ and $v1, $v1, $a0 /* E20698 802B7588 080ADD74 */ j .L802B75D0 /* E2069C 802B758C AE230000 */ sw $v1, ($s1) -.L802B7590: glabel L802B7590_E206A0 /* E206A0 802B7590 862200C6 */ lh $v0, 0xc6($s1) /* E206A4 802B7594 14500008 */ bne $v0, $s0, .L802B75B8 diff --git a/ver/us/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s b/ver/us/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s index fa97c6bd8d..3d05d75417 100644 --- a/ver/us/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s +++ b/ver/us/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s @@ -225,7 +225,7 @@ glabel func_802B62A4_E25174 /* E254B8 802B65E8 1440FFE5 */ bnez $v0, .L802B6580 /* E254BC 802B65EC 00000000 */ nop .L802B65F0: -/* E254C0 802B65F0 06200020 */ bltz $s1, .L802B6674 +/* E254C0 802B65F0 06200020 */ bltz $s1, L802B6674_E25544 /* E254C4 802B65F4 32224000 */ andi $v0, $s1, 0x4000 /* E254C8 802B65F8 1040001F */ beqz $v0, .L802B6678 /* E254CC 802B65FC 0220102D */ daddu $v0, $s1, $zero @@ -235,7 +235,7 @@ glabel func_802B62A4_E25174 /* E254DC 802B660C 0220202D */ daddu $a0, $s1, $zero /* E254E0 802B6610 2443FFF9 */ addiu $v1, $v0, -7 /* E254E4 802B6614 2C620020 */ sltiu $v0, $v1, 0x20 -/* E254E8 802B6618 10400016 */ beqz $v0, .L802B6674 +/* E254E8 802B6618 10400016 */ beqz $v0, L802B6674_E25544 /* E254EC 802B661C 00031080 */ sll $v0, $v1, 2 /* E254F0 802B6620 3C01802B */ lui $at, %hi(jtbl_802B6E08_E25CD8) /* E254F4 802B6624 00220821 */ addu $at, $at, $v0 @@ -243,28 +243,26 @@ glabel func_802B62A4_E25174 /* E254FC 802B662C 00400008 */ jr $v0 /* E25500 802B6630 00000000 */ nop glabel L802B6634_E25504 -/* E25504 802B6634 0603000F */ bgezl $s0, .L802B6674 +/* E25504 802B6634 0603000F */ bgezl $s0, L802B6674_E25544 /* E25508 802B6638 2411FFFF */ addiu $s1, $zero, -1 -/* E2550C 802B663C 080AD998 */ j .L802B6660 +/* E2550C 802B663C 080AD998 */ j L802B6660_E25530 /* E25510 802B6640 00000000 */ nop glabel L802B6644_E25514 -/* E25514 802B6644 5E00000B */ bgtzl $s0, .L802B6674 +/* E25514 802B6644 5E00000B */ bgtzl $s0, L802B6674_E25544 /* E25518 802B6648 2411FFFF */ addiu $s1, $zero, -1 -/* E2551C 802B664C 080AD998 */ j .L802B6660 +/* E2551C 802B664C 080AD998 */ j L802B6660_E25530 /* E25520 802B6650 00000000 */ nop glabel L802B6654_E25524 /* E25524 802B6654 2A020002 */ slti $v0, $s0, 2 -/* E25528 802B6658 50400006 */ beql $v0, $zero, .L802B6674 +/* E25528 802B6658 50400006 */ beql $v0, $zero, L802B6674_E25544 /* E2552C 802B665C 2411FFFF */ addiu $s1, $zero, -1 -.L802B6660: glabel L802B6660_E25530 /* E25530 802B6660 8E420004 */ lw $v0, 4($s2) /* E25534 802B6664 34420400 */ ori $v0, $v0, 0x400 -/* E25538 802B6668 080AD99D */ j .L802B6674 +/* E25538 802B6668 080AD99D */ j L802B6674_E25544 /* E2553C 802B666C AE420004 */ sw $v0, 4($s2) glabel L802B6670_E25540 /* E25540 802B6670 2411FFFF */ addiu $s1, $zero, -1 -.L802B6674: glabel L802B6674_E25544 /* E25544 802B6674 0220102D */ daddu $v0, $s1, $zero .L802B6678: diff --git a/ver/us/asm/nonmatchings/code_E26710/func_802B6000_E26710.s b/ver/us/asm/nonmatchings/code_E26710/func_802B6000_E26710.s index 71539696c0..98025cc0a4 100644 --- a/ver/us/asm/nonmatchings/code_E26710/func_802B6000_E26710.s +++ b/ver/us/asm/nonmatchings/code_E26710/func_802B6000_E26710.s @@ -146,7 +146,7 @@ glabel func_802B6000_E26710 .L802B6220: /* E26930 802B6220 820300B6 */ lb $v1, 0xb6($s0) /* E26934 802B6224 2C62000D */ sltiu $v0, $v1, 0xd -/* E26938 802B6228 104000DE */ beqz $v0, .L802B65A4 +/* E26938 802B6228 104000DE */ beqz $v0, L802B65A4_E26CB4 /* E2693C 802B622C 00031080 */ sll $v0, $v1, 2 /* E26940 802B6230 3C01802B */ lui $at, %hi(jtbl_802B6690_E26DA0) /* E26944 802B6234 00220821 */ addu $at, $at, $v0 @@ -180,7 +180,7 @@ glabel L802B6244_E26954 /* E269B0 802B62A0 0C03805E */ jal disable_player_input /* E269B4 802B62A4 A0430006 */ sb $v1, 6($v0) /* E269B8 802B62A8 2402000B */ addiu $v0, $zero, 0xb -/* E269BC 802B62AC 080AD969 */ j .L802B65A4 +/* E269BC 802B62AC 080AD969 */ j L802B65A4_E26CB4 /* E269C0 802B62B0 A20200B6 */ sb $v0, 0xb6($s0) .L802B62B4: /* E269C4 802B62B4 44800000 */ mtc1 $zero, $f0 @@ -204,7 +204,7 @@ glabel L802B6244_E26954 /* E26A0C 802B62FC A20300B6 */ sb $v1, 0xb6($s0) .L802B6300: /* E26A10 802B6300 8FA20010 */ lw $v0, 0x10($sp) -/* E26A14 802B6304 044000A7 */ bltz $v0, .L802B65A4 +/* E26A14 802B6304 044000A7 */ bltz $v0, L802B65A4_E26CB4 /* E26A18 802B6308 3C03FFFD */ lui $v1, 0xfffd /* E26A1C 802B630C 3463FFF7 */ ori $v1, $v1, 0xfff7 /* E26A20 802B6310 8E020000 */ lw $v0, ($s0) @@ -212,18 +212,18 @@ glabel L802B6244_E26954 /* E26A28 802B6318 00431024 */ and $v0, $v0, $v1 /* E26A2C 802B631C 0C039769 */ jal set_action_state /* E26A30 802B6320 AE020000 */ sw $v0, ($s0) -/* E26A34 802B6324 080AD969 */ j .L802B65A4 +/* E26A34 802B6324 080AD969 */ j L802B65A4_E26CB4 /* E26A38 802B6328 00000000 */ nop glabel L802B632C_E26A3C /* E26A3C 802B632C 96020008 */ lhu $v0, 8($s0) /* E26A40 802B6330 2442FFFF */ addiu $v0, $v0, -1 /* E26A44 802B6334 A6020008 */ sh $v0, 8($s0) /* E26A48 802B6338 00021400 */ sll $v0, $v0, 0x10 -/* E26A4C 802B633C 1C400099 */ bgtz $v0, .L802B65A4 +/* E26A4C 802B633C 1C400099 */ bgtz $v0, L802B65A4_E26CB4 /* E26A50 802B6340 00000000 */ nop /* E26A54 802B6344 920200B6 */ lbu $v0, 0xb6($s0) /* E26A58 802B6348 24420001 */ addiu $v0, $v0, 1 -/* E26A5C 802B634C 080AD969 */ j .L802B65A4 +/* E26A5C 802B634C 080AD969 */ j L802B65A4_E26CB4 /* E26A60 802B6350 A20200B6 */ sb $v0, 0xb6($s0) glabel L802B6354_E26A64 /* E26A64 802B6354 0C038D12 */ jal integrate_gravity @@ -245,7 +245,7 @@ glabel L802B6354_E26A64 /* E26AA4 802B6394 E6020070 */ swc1 $f2, 0x70($s0) .L802B6398: /* E26AA8 802B6398 8FA20010 */ lw $v0, 0x10($sp) -/* E26AAC 802B639C 04400081 */ bltz $v0, .L802B65A4 +/* E26AAC 802B639C 04400081 */ bltz $v0, L802B65A4_E26CB4 /* E26AB0 802B63A0 00000000 */ nop /* E26AB4 802B63A4 96240002 */ lhu $a0, 2($s1) /* E26AB8 802B63A8 30824000 */ andi $v0, $a0, 0x4000 @@ -354,14 +354,14 @@ glabel L802B6354_E26A64 /* E26C44 802B6534 A0820000 */ sb $v0, ($a0) /* E26C48 802B6538 34630400 */ ori $v1, $v1, 0x400 /* E26C4C 802B653C E4800008 */ swc1 $f0, 8($a0) -/* E26C50 802B6540 080AD969 */ j .L802B65A4 +/* E26C50 802B6540 080AD969 */ j L802B65A4_E26CB4 /* E26C54 802B6544 AE030000 */ sw $v1, ($s0) glabel L802B6548_E26C58 /* E26C58 802B6548 96020008 */ lhu $v0, 8($s0) /* E26C5C 802B654C 2442FFFF */ addiu $v0, $v0, -1 /* E26C60 802B6550 A6020008 */ sh $v0, 8($s0) /* E26C64 802B6554 00021400 */ sll $v0, $v0, 0x10 -/* E26C68 802B6558 14400012 */ bnez $v0, .L802B65A4 +/* E26C68 802B6558 14400012 */ bnez $v0, L802B65A4_E26CB4 /* E26C6C 802B655C 3C02FFFD */ lui $v0, 0xfffd /* E26C70 802B6560 3442FFF7 */ ori $v0, $v0, 0xfff7 /* E26C74 802B6564 2404000A */ addiu $a0, $zero, 0xa @@ -372,7 +372,7 @@ glabel L802B6548_E26C58 /* E26C88 802B6578 A20300B6 */ sb $v1, 0xb6($s0) /* E26C8C 802B657C 0C039769 */ jal set_action_state /* E26C90 802B6580 AE050000 */ sw $a1, ($s0) -/* E26C94 802B6584 080AD969 */ j .L802B65A4 +/* E26C94 802B6584 080AD969 */ j L802B65A4_E26CB4 /* E26C98 802B6588 00000000 */ nop glabel L802B658C_E26C9C /* E26C9C 802B658C 0C039769 */ jal set_action_state @@ -381,7 +381,6 @@ glabel L802B658C_E26C9C /* E26CA8 802B6598 24420001 */ addiu $v0, $v0, 1 /* E26CAC 802B659C 0C038069 */ jal enable_player_input /* E26CB0 802B65A0 A20200B6 */ sb $v0, 0xb6($s0) -.L802B65A4: glabel L802B65A4_E26CB4 /* E26CB4 802B65A4 C6020070 */ lwc1 $f2, 0x70($s0) /* E26CB8 802B65A8 44800000 */ mtc1 $zero, $f0 diff --git a/ver/us/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s b/ver/us/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s index ddc15b865a..59a5922396 100644 --- a/ver/us/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s +++ b/ver/us/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s @@ -47,7 +47,7 @@ glabel func_802B6000_E26DE0 .L802B60A8: /* E26E88 802B60A8 820300B6 */ lb $v1, 0xb6($s0) /* E26E8C 802B60AC 2C62000D */ sltiu $v0, $v1, 0xd -/* E26E90 802B60B0 10400146 */ beqz $v0, .L802B65CC +/* E26E90 802B60B0 10400146 */ beqz $v0, L802B65CC_E273AC /* E26E94 802B60B4 0000902D */ daddu $s2, $zero, $zero /* E26E98 802B60B8 00031080 */ sll $v0, $v1, 2 /* E26E9C 802B60BC 3C01802B */ lui $at, %hi(jtbl_802B66E0_E274C0) @@ -138,7 +138,7 @@ glabel L802B60D0_E26EB0 .L802B61FC: /* E26FDC 802B61FC 2402FFFF */ addiu $v0, $zero, -1 .L802B6200: -/* E26FE0 802B6200 080AD973 */ j .L802B65CC +/* E26FE0 802B6200 080AD973 */ j L802B65CC_E273AC /* E26FE4 802B6204 A6220008 */ sh $v0, 8($s1) glabel L802B6208_E26FE8 /* E26FE8 802B6208 C6020070 */ lwc1 $f2, 0x70($s0) @@ -164,11 +164,11 @@ glabel L802B6208_E26FE8 /* E27034 802B6254 2442FFFF */ addiu $v0, $v0, -1 /* E27038 802B6258 A6020008 */ sh $v0, 8($s0) /* E2703C 802B625C 00021400 */ sll $v0, $v0, 0x10 -/* E27040 802B6260 1C4000DA */ bgtz $v0, .L802B65CC +/* E27040 802B6260 1C4000DA */ bgtz $v0, L802B65CC_E273AC /* E27044 802B6264 00000000 */ nop /* E27048 802B6268 920200B6 */ lbu $v0, 0xb6($s0) /* E2704C 802B626C 24420001 */ addiu $v0, $v0, 1 -/* E27050 802B6270 080AD973 */ j .L802B65CC +/* E27050 802B6270 080AD973 */ j L802B65CC_E273AC /* E27054 802B6274 A20200B6 */ sb $v0, 0xb6($s0) glabel L802B6278_E27058 /* E27058 802B6278 4480A000 */ mtc1 $zero, $f20 @@ -187,7 +187,7 @@ glabel L802B6278_E27058 /* E2708C 802B62AC 46002021 */ cvt.d.s $f0, $f4 /* E27090 802B62B0 4620103E */ c.le.d $f2, $f0 /* E27094 802B62B4 00000000 */ nop -/* E27098 802B62B8 450000C4 */ bc1f .L802B65CC +/* E27098 802B62B8 450000C4 */ bc1f L802B65CC_E273AC /* E2709C 802B62BC E604008C */ swc1 $f4, 0x8c($s0) /* E270A0 802B62C0 3C040001 */ lui $a0, 1 /* E270A4 802B62C4 3C01C05E */ lui $at, 0xc05e @@ -210,7 +210,7 @@ glabel L802B6278_E27058 /* E270E8 802B6308 E6000078 */ swc1 $f0, 0x78($s0) /* E270EC 802B630C 0C037FBF */ jal func_800DFEFC /* E270F0 802B6310 E6040070 */ swc1 $f4, 0x70($s0) -/* E270F4 802B6314 080AD973 */ j .L802B65CC +/* E270F4 802B6314 080AD973 */ j L802B65CC_E273AC /* E270F8 802B6318 00000000 */ nop glabel L802B631C_E270FC /* E270FC 802B631C 0C038D36 */ jal func_800E34D8 @@ -232,7 +232,7 @@ glabel L802B631C_E270FC /* E2713C 802B635C E6020070 */ swc1 $f2, 0x70($s0) .L802B6360: /* E27140 802B6360 8FA20010 */ lw $v0, 0x10($sp) -/* E27144 802B6364 04400099 */ bltz $v0, .L802B65CC +/* E27144 802B6364 04400099 */ bltz $v0, L802B65CC_E273AC /* E27148 802B6368 00000000 */ nop /* E2714C 802B636C 96240002 */ lhu $a0, 2($s1) /* E27150 802B6370 30824000 */ andi $v0, $a0, 0x4000 @@ -254,7 +254,7 @@ glabel L802B631C_E270FC /* E27190 802B63B0 8E020000 */ lw $v0, ($s0) /* E27194 802B63B4 2403FFF7 */ addiu $v1, $zero, -9 /* E27198 802B63B8 00431024 */ and $v0, $v0, $v1 -/* E2719C 802B63BC 080AD973 */ j .L802B65CC +/* E2719C 802B63BC 080AD973 */ j L802B65CC_E273AC /* E271A0 802B63C0 AE020000 */ sw $v0, ($s0) .L802B63C4: /* E271A4 802B63C4 8FA40010 */ lw $a0, 0x10($sp) @@ -328,7 +328,7 @@ glabel L802B631C_E270FC /* E272A8 802B64C8 A0820000 */ sb $v0, ($a0) /* E272AC 802B64CC 34630400 */ ori $v1, $v1, 0x400 /* E272B0 802B64D0 E4800008 */ swc1 $f0, 8($a0) -/* E272B4 802B64D4 080AD973 */ j .L802B65CC +/* E272B4 802B64D4 080AD973 */ j L802B65CC_E273AC /* E272B8 802B64D8 AE030000 */ sw $v1, ($s0) glabel L802B64DC_E272BC /* E272BC 802B64DC 0C038D12 */ jal integrate_gravity @@ -337,7 +337,7 @@ glabel L802B64DC_E272BC /* E272C8 802B64E8 46000506 */ mov.s $f20, $f0 /* E272CC 802B64EC 4616A032 */ c.eq.s $f20, $f22 /* E272D0 802B64F0 00000000 */ nop -/* E272D4 802B64F4 45030035 */ bc1tl .L802B65CC +/* E272D4 802B64F4 45030035 */ bc1tl L802B65CC_E273AC /* E272D8 802B64F8 24120001 */ addiu $s2, $zero, 1 /* E272DC 802B64FC C6000070 */ lwc1 $f0, 0x70($s0) /* E272E0 802B6500 4600B03C */ c.lt.s $f22, $f0 @@ -366,7 +366,7 @@ glabel L802B64DC_E272BC /* E27334 802B6554 44806000 */ mtc1 $zero, $f12 /* E27338 802B6558 0C038D45 */ jal func_800E3514 /* E2733C 802B655C 27A50010 */ addiu $a1, $sp, 0x10 -/* E27340 802B6560 080AD973 */ j .L802B65CC +/* E27340 802B6560 080AD973 */ j L802B65CC_E273AC /* E27344 802B6564 E600002C */ swc1 $f0, 0x2c($s0) glabel L802B6568_E27348 /* E27348 802B6568 4480A000 */ mtc1 $zero, $f20 @@ -374,21 +374,20 @@ glabel L802B6568_E27348 /* E27350 802B6570 0C038D45 */ jal func_800E3514 /* E27354 802B6574 4600A306 */ mov.s $f12, $f20 /* E27358 802B6578 8FA20010 */ lw $v0, 0x10($sp) -/* E2735C 802B657C 04400005 */ bltz $v0, .L802B6594 +/* E2735C 802B657C 04400005 */ bltz $v0, L802B6594_E27374 /* E27360 802B6580 E600002C */ swc1 $f0, 0x2c($s0) /* E27364 802B6584 E6140070 */ swc1 $f20, 0x70($s0) /* E27368 802B6588 E6140074 */ swc1 $f20, 0x74($s0) /* E2736C 802B658C E6140078 */ swc1 $f20, 0x78($s0) /* E27370 802B6590 E614007C */ swc1 $f20, 0x7c($s0) -.L802B6594: glabel L802B6594_E27374 /* E27374 802B6594 92020280 */ lbu $v0, 0x280($s0) /* E27378 802B6598 2442FFFF */ addiu $v0, $v0, -1 /* E2737C 802B659C A2020280 */ sb $v0, 0x280($s0) /* E27380 802B65A0 00021600 */ sll $v0, $v0, 0x18 -/* E27384 802B65A4 1C400009 */ bgtz $v0, .L802B65CC +/* E27384 802B65A4 1C400009 */ bgtz $v0, L802B65CC_E273AC /* E27388 802B65A8 00000000 */ nop -/* E2738C 802B65AC 080AD973 */ j .L802B65CC +/* E2738C 802B65AC 080AD973 */ j L802B65CC_E273AC /* E27390 802B65B0 24120001 */ addiu $s2, $zero, 1 glabel L802B65B4_E27394 /* E27394 802B65B4 0C039769 */ jal set_action_state @@ -397,7 +396,6 @@ glabel L802B65B4_E27394 /* E273A0 802B65C0 24420001 */ addiu $v0, $v0, 1 /* E273A4 802B65C4 0C038069 */ jal enable_player_input /* E273A8 802B65C8 A20200B6 */ sb $v0, 0xb6($s0) -.L802B65CC: glabel L802B65CC_E273AC /* E273AC 802B65CC 12400007 */ beqz $s2, .L802B65EC /* E273B0 802B65D0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_E27510/func_802B6060_E27570.s b/ver/us/asm/nonmatchings/code_E27510/func_802B6060_E27570.s index d112f6805c..0110603c51 100644 --- a/ver/us/asm/nonmatchings/code_E27510/func_802B6060_E27570.s +++ b/ver/us/asm/nonmatchings/code_E27510/func_802B6060_E27570.s @@ -248,7 +248,7 @@ glabel L802B6394_E278A4 /* E2791C 802B640C 27A20044 */ addiu $v0, $sp, 0x44 /* E27920 802B6410 0C03791B */ jal func_800DE46C /* E27924 802B6414 AFA20020 */ sw $v0, 0x20($sp) -/* E27928 802B6418 04400023 */ bltz $v0, .L802B64A8 +/* E27928 802B6418 04400023 */ bltz $v0, L802B64A8_E279B8 /* E2792C 802B641C AFA20048 */ sw $v0, 0x48($sp) /* E27930 802B6420 C6020054 */ lwc1 $f2, 0x54($s0) /* E27934 802B6424 3C014040 */ lui $at, 0x4040 @@ -285,7 +285,6 @@ glabel L802B6394_E278A4 /* E279AC 802B649C E6140054 */ swc1 $f20, 0x54($s0) /* E279B0 802B64A0 080AD9C7 */ j .L802B671C /* E279B4 802B64A4 E600002C */ swc1 $f0, 0x2c($s0) -.L802B64A8: glabel L802B64A8_E279B8 /* E279B8 802B64A8 C6000054 */ lwc1 $f0, 0x54($s0) /* E279BC 802B64AC 3C01802B */ lui $at, %hi(D_802B678C) diff --git a/ver/us/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s b/ver/us/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s index 2e68cd473c..8cd69fa364 100644 --- a/ver/us/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s +++ b/ver/us/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s @@ -64,7 +64,7 @@ glabel func_802B6000_E27F40 .L802B60E8: /* E28028 802B60E8 820300B6 */ lb $v1, 0xb6($s0) /* E2802C 802B60EC 2C620016 */ sltiu $v0, $v1, 0x16 -/* E28030 802B60F0 104001C5 */ beqz $v0, .L802B6808 +/* E28030 802B60F0 104001C5 */ beqz $v0, L802B6808_E28748 /* E28034 802B60F4 00031080 */ sll $v0, $v1, 2 /* E28038 802B60F8 3C01802B */ lui $at, %hi(jtbl_802B6850_E28790) /* E2803C 802B60FC 00220821 */ addu $at, $at, $v0 @@ -78,9 +78,9 @@ glabel L802B610C_E2804C /* E28058 802B6118 A6020008 */ sh $v0, 8($s0) /* E2805C 802B611C 00021400 */ sll $v0, $v0, 0x10 /* E28060 802B6120 00021403 */ sra $v0, $v0, 0x10 -/* E28064 802B6124 504301B8 */ beql $v0, $v1, .L802B6808 +/* E28064 802B6124 504301B8 */ beql $v0, $v1, L802B6808_E28748 /* E28068 802B6128 A20000B6 */ sb $zero, 0xb6($s0) -/* E2806C 802B612C 080ADA02 */ j .L802B6808 +/* E2806C 802B612C 080ADA02 */ j L802B6808_E28748 /* E28070 802B6130 00000000 */ nop glabel L802B6134_E28074 /* E28074 802B6134 96020008 */ lhu $v0, 8($s0) @@ -97,7 +97,7 @@ glabel L802B6134_E28074 /* E2809C 802B615C 44811000 */ mtc1 $at, $f2 /* E280A0 802B6160 00000000 */ nop /* E280A4 802B6164 46020001 */ sub.s $f0, $f0, $f2 -/* E280A8 802B6168 080ADA02 */ j .L802B6808 +/* E280A8 802B6168 080ADA02 */ j L802B6808_E28748 /* E280AC 802B616C E600002C */ swc1 $f0, 0x2c($s0) glabel L802B6170_E280B0 /* E280B0 802B6170 820200BF */ lb $v0, 0xbf($s0) @@ -141,14 +141,14 @@ glabel L802B6170_E280B0 /* E28144 802B6204 E606003C */ swc1 $f6, 0x3c($s0) /* E28148 802B6208 E6080040 */ swc1 $f8, 0x40($s0) /* E2814C 802B620C E60A004C */ swc1 $f10, 0x4c($s0) -/* E28150 802B6210 080ADA02 */ j .L802B6808 +/* E28150 802B6210 080ADA02 */ j L802B6808_E28748 /* E28154 802B6214 AE030000 */ sw $v1, ($s0) glabel L802B6218_E28158 /* E28158 802B6218 96020008 */ lhu $v0, 8($s0) /* E2815C 802B621C 2442FFFF */ addiu $v0, $v0, -1 /* E28160 802B6220 A6020008 */ sh $v0, 8($s0) /* E28164 802B6224 00021400 */ sll $v0, $v0, 0x10 -/* E28168 802B6228 1C400177 */ bgtz $v0, .L802B6808 +/* E28168 802B6228 1C400177 */ bgtz $v0, L802B6808_E28748 /* E2816C 802B622C 00000000 */ nop /* E28170 802B6230 920200B6 */ lbu $v0, 0xb6($s0) /* E28174 802B6234 080AD9ED */ j .L802B67B4 @@ -228,7 +228,7 @@ glabel L802B623C_E2817C /* E28290 802B6350 E604002C */ swc1 $f4, 0x2c($s0) /* E28294 802B6354 4602003C */ c.lt.s $f0, $f2 /* E28298 802B6358 00000000 */ nop -/* E2829C 802B635C 4500012A */ bc1f .L802B6808 +/* E2829C 802B635C 4500012A */ bc1f L802B6808_E28748 /* E282A0 802B6360 E6420000 */ swc1 $f2, ($s2) /* E282A4 802B6364 920200B6 */ lbu $v0, 0xb6($s0) /* E282A8 802B6368 080AD9EC */ j .L802B67B0 @@ -299,7 +299,7 @@ glabel L802B637C_E282BC /* E28398 802B6458 A20300B6 */ sb $v1, 0xb6($s0) /* E2839C 802B645C 4600040D */ trunc.w.s $f16, $f0 /* E283A0 802B6460 44028000 */ mfc1 $v0, $f16 -/* E283A4 802B6464 080ADA02 */ j .L802B6808 +/* E283A4 802B6464 080ADA02 */ j L802B6808_E28748 /* E283A8 802B6468 A602001A */ sh $v0, 0x1a($s0) glabel L802B646C_E283AC /* E283AC 802B646C C60C0028 */ lwc1 $f12, 0x28($s0) @@ -333,7 +333,7 @@ glabel L802B646C_E283AC /* E2841C 802B64DC 46020003 */ div.s $f0, $f0, $f2 /* E28420 802B64E0 24420001 */ addiu $v0, $v0, 1 /* E28424 802B64E4 E6000054 */ swc1 $f0, 0x54($s0) -/* E28428 802B64E8 080ADA02 */ j .L802B6808 +/* E28428 802B64E8 080ADA02 */ j L802B6808_E28748 /* E2842C 802B64EC A20200B6 */ sb $v0, 0xb6($s0) glabel L802B64F0_E28430 /* E28430 802B64F0 C60C0028 */ lwc1 $f12, 0x28($s0) @@ -432,7 +432,7 @@ glabel L802B64F0_E28430 .L802B6650: /* E28590 802B6650 8FA3002C */ lw $v1, 0x2c($sp) /* E28594 802B6654 24020002 */ addiu $v0, $zero, 2 -/* E28598 802B6658 1462006B */ bne $v1, $v0, .L802B6808 +/* E28598 802B6658 1462006B */ bne $v1, $v0, L802B6808_E28748 /* E2859C 802B665C 00000000 */ nop /* E285A0 802B6660 920200B6 */ lbu $v0, 0xb6($s0) /* E285A4 802B6664 080AD9ED */ j .L802B67B4 @@ -463,7 +463,7 @@ glabel L802B666C_E285AC /* E28600 802B66C0 0C038D45 */ jal func_800E3514 /* E28604 802B66C4 27A5002C */ addiu $a1, $sp, 0x2c /* E28608 802B66C8 8FA2002C */ lw $v0, 0x2c($sp) -/* E2860C 802B66CC 0440004E */ bltz $v0, .L802B6808 +/* E2860C 802B66CC 0440004E */ bltz $v0, L802B6808_E28748 /* E28610 802B66D0 E600002C */ swc1 $f0, 0x2c($s0) /* E28614 802B66D4 0000202D */ daddu $a0, $zero, $zero /* E28618 802B66D8 24050002 */ addiu $a1, $zero, 2 @@ -502,7 +502,7 @@ glabel L802B666C_E285AC /* E2869C 802B675C E6020070 */ swc1 $f2, 0x70($s0) /* E286A0 802B6760 24420001 */ addiu $v0, $v0, 1 /* E286A4 802B6764 A20200B6 */ sb $v0, 0xb6($s0) -/* E286A8 802B6768 080ADA02 */ j .L802B6808 +/* E286A8 802B6768 080ADA02 */ j L802B6808_E28748 /* E286AC 802B676C E600002C */ swc1 $f0, 0x2c($s0) glabel L802B6770_E286B0 /* E286B0 802B6770 C60C0070 */ lwc1 $f12, 0x70($s0) @@ -516,7 +516,7 @@ glabel L802B6770_E286B0 /* E286D0 802B6790 0C038D45 */ jal func_800E3514 /* E286D4 802B6794 E60C0070 */ swc1 $f12, 0x70($s0) /* E286D8 802B6798 8FA2002C */ lw $v0, 0x2c($sp) -/* E286DC 802B679C 0440001A */ bltz $v0, .L802B6808 +/* E286DC 802B679C 0440001A */ bltz $v0, L802B6808_E28748 /* E286E0 802B67A0 E600002C */ swc1 $f0, 0x2c($s0) /* E286E4 802B67A4 920200B6 */ lbu $v0, 0xb6($s0) /* E286E8 802B67A8 2403000A */ addiu $v1, $zero, 0xa @@ -524,14 +524,14 @@ glabel L802B6770_E286B0 .L802B67B0: /* E286F0 802B67B0 24420001 */ addiu $v0, $v0, 1 .L802B67B4: -/* E286F4 802B67B4 080ADA02 */ j .L802B6808 +/* E286F4 802B67B4 080ADA02 */ j L802B6808_E28748 /* E286F8 802B67B8 A20200B6 */ sb $v0, 0xb6($s0) glabel L802B67BC_E286FC /* E286FC 802B67BC 96020008 */ lhu $v0, 8($s0) /* E28700 802B67C0 2442FFFF */ addiu $v0, $v0, -1 /* E28704 802B67C4 A6020008 */ sh $v0, 8($s0) /* E28708 802B67C8 00021400 */ sll $v0, $v0, 0x10 -/* E2870C 802B67CC 1C40000E */ bgtz $v0, .L802B6808 +/* E2870C 802B67CC 1C40000E */ bgtz $v0, L802B6808_E28748 /* E28710 802B67D0 00000000 */ nop /* E28714 802B67D4 0C039769 */ jal set_action_state /* E28718 802B67D8 2404000A */ addiu $a0, $zero, 0xa @@ -546,7 +546,6 @@ glabel L802B67BC_E286FC /* E2873C 802B67FC 2403FFBF */ addiu $v1, $zero, -0x41 /* E28740 802B6800 00431024 */ and $v0, $v0, $v1 /* E28744 802B6804 AC820000 */ sw $v0, ($a0) -.L802B6808: glabel L802B6808_E28748 /* E28748 802B6808 820200B6 */ lb $v0, 0xb6($s0) /* E2874C 802B680C 28420007 */ slti $v0, $v0, 7 diff --git a/ver/us/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s b/ver/us/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s index faabae81c8..0f01113304 100644 --- a/ver/us/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s +++ b/ver/us/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s @@ -27,7 +27,7 @@ glabel func_802B6000_E291A0 .L802B6058: /* E291F8 802B6058 822300B6 */ lb $v1, 0xb6($s1) /* E291FC 802B605C 2C620006 */ sltiu $v0, $v1, 6 -/* E29200 802B6060 1040008D */ beqz $v0, .L802B6298 +/* E29200 802B6060 1040008D */ beqz $v0, L802B6298_E29438 /* E29204 802B6064 00031080 */ sll $v0, $v1, 2 /* E29208 802B6068 3C01802B */ lui $at, %hi(jtbl_802B62B0_E29450) /* E2920C 802B606C 00220821 */ addu $at, $at, $v0 @@ -63,7 +63,7 @@ glabel L802B607C_E2921C /* E29280 802B60E0 A22200B6 */ sb $v0, 0xb6($s1) /* E29284 802B60E4 3C01802B */ lui $at, %hi(D_802B62DC) /* E29288 802B60E8 E42062DC */ swc1 $f0, %lo(D_802B62DC)($at) -/* E2928C 802B60EC 080AD8A6 */ j .L802B6298 +/* E2928C 802B60EC 080AD8A6 */ j L802B6298_E29438 /* E29290 802B60F0 00000000 */ nop glabel L802B60F4_E29294 /* E29294 802B60F4 26240028 */ addiu $a0, $s1, 0x28 @@ -93,7 +93,7 @@ glabel L802B60F4_E29294 /* E292F4 802B6154 4600403E */ c.le.s $f8, $f0 /* E292F8 802B6158 E4420060 */ swc1 $f2, 0x60($v0) /* E292FC 802B615C E4440064 */ swc1 $f4, 0x64($v0) -/* E29300 802B6160 4500004D */ bc1f .L802B6298 +/* E29300 802B6160 4500004D */ bc1f L802B6298_E29438 /* E29304 802B6164 E4460068 */ swc1 $f6, 0x68($v0) /* E29308 802B6168 922200B6 */ lbu $v0, 0xb6($s1) /* E2930C 802B616C 080AD888 */ j .L802B6220 @@ -128,7 +128,7 @@ glabel L802B6174_E29314 /* E2937C 802B61DC 0C038D45 */ jal func_800E3514 /* E29380 802B61E0 E4440068 */ swc1 $f4, 0x68($v0) /* E29384 802B61E4 8FA20010 */ lw $v0, 0x10($sp) -/* E29388 802B61E8 0440002B */ bltz $v0, .L802B6298 +/* E29388 802B61E8 0440002B */ bltz $v0, L802B6298_E29438 /* E2938C 802B61EC 46000506 */ mov.s $f20, $f0 /* E29390 802B61F0 24040162 */ addiu $a0, $zero, 0x162 /* E29394 802B61F4 0C052736 */ jal play_sound_at_player @@ -143,25 +143,25 @@ glabel L802B6174_E29314 /* E293B8 802B6218 AC2362E0 */ sw $v1, %lo(D_802B62E0)($at) /* E293BC 802B621C 24420001 */ addiu $v0, $v0, 1 .L802B6220: -/* E293C0 802B6220 080AD8A6 */ j .L802B6298 +/* E293C0 802B6220 080AD8A6 */ j L802B6298_E29438 /* E293C4 802B6224 A22200B6 */ sb $v0, 0xb6($s1) glabel L802B6228_E293C8 /* E293C8 802B6228 962200BC */ lhu $v0, 0xbc($s1) -/* E293CC 802B622C 1040001A */ beqz $v0, .L802B6298 +/* E293CC 802B622C 1040001A */ beqz $v0, L802B6298_E29438 /* E293D0 802B6230 3C040001 */ lui $a0, 1 /* E293D4 802B6234 0C037FDE */ jal func_800DFF78 /* E293D8 802B6238 34840030 */ ori $a0, $a0, 0x30 /* E293DC 802B623C 24020005 */ addiu $v0, $zero, 5 /* E293E0 802B6240 A22200B6 */ sb $v0, 0xb6($s1) /* E293E4 802B6244 2402000F */ addiu $v0, $zero, 0xf -/* E293E8 802B6248 080AD8A6 */ j .L802B6298 +/* E293E8 802B6248 080AD8A6 */ j L802B6298_E29438 /* E293EC 802B624C A6220008 */ sh $v0, 8($s1) glabel L802B6250_E293F0 /* E293F0 802B6250 86220008 */ lh $v0, 8($s1) /* E293F4 802B6254 96230008 */ lhu $v1, 8($s1) /* E293F8 802B6258 10400003 */ beqz $v0, .L802B6268 /* E293FC 802B625C 2462FFFF */ addiu $v0, $v1, -1 -/* E29400 802B6260 080AD8A6 */ j .L802B6298 +/* E29400 802B6260 080AD8A6 */ j L802B6298_E29438 /* E29404 802B6264 A6220008 */ sh $v0, 8($s1) .L802B6268: /* E29408 802B6268 0C038050 */ jal enable_player_static_collisions @@ -176,7 +176,6 @@ glabel L802B6250_E293F0 /* E2942C 802B628C 2404FFBF */ addiu $a0, $zero, -0x41 /* E29430 802B6290 00641824 */ and $v1, $v1, $a0 /* E29434 802B6294 AC430000 */ sw $v1, ($v0) -.L802B6298: glabel L802B6298_E29438 /* E29438 802B6298 8FBF0020 */ lw $ra, 0x20($sp) /* E2943C 802B629C 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s b/ver/us/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s index 97b0ae21ea..f875e41cc8 100644 --- a/ver/us/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s +++ b/ver/us/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s @@ -443,7 +443,7 @@ glabel func_802B60A4_E29514 /* E29BB4 802B6744 8E220000 */ lw $v0, ($s1) /* E29BB8 802B6748 2403FFBF */ addiu $v1, $zero, -0x41 /* E29BBC 802B674C 00431024 */ and $v0, $v0, $v1 -/* E29BC0 802B6750 080ADB96 */ j .L802B6E58 +/* E29BC0 802B6750 080ADB96 */ j L802B6E58_E2A2C8 /* E29BC4 802B6754 AE220000 */ sw $v0, ($s1) .L802B6758: /* E29BC8 802B6758 926200B6 */ lbu $v0, 0xb6($s3) @@ -451,7 +451,7 @@ glabel func_802B60A4_E29514 /* E29BD0 802B6760 00021600 */ sll $v0, $v0, 0x18 /* E29BD4 802B6764 00021E03 */ sra $v1, $v0, 0x18 /* E29BD8 802B6768 2C620009 */ sltiu $v0, $v1, 9 -/* E29BDC 802B676C 104001BA */ beqz $v0, .L802B6E58 +/* E29BDC 802B676C 104001BA */ beqz $v0, L802B6E58_E2A2C8 /* E29BE0 802B6770 00031080 */ sll $v0, $v1, 2 /* E29BE4 802B6774 3C01802B */ lui $at, %hi(jtbl_802B6EA8_E2A318) /* E29BE8 802B6778 00220821 */ addu $at, $at, $v0 @@ -601,7 +601,7 @@ glabel L802B6788_E29BF8 /* E29E18 802B69A8 C46C0000 */ lwc1 $f12, ($v1) /* E29E1C 802B69AC 0C00A6C9 */ jal clamp_angle /* E29E20 802B69B0 460C0300 */ add.s $f12, $f0, $f12 -/* E29E24 802B69B4 080ADB96 */ j .L802B6E58 +/* E29E24 802B69B4 080ADB96 */ j L802B6E58_E2A2C8 /* E29E28 802B69B8 E66000A8 */ swc1 $f0, 0xa8($s3) .L802B69BC: /* E29E2C 802B69BC 926200B6 */ lbu $v0, 0xb6($s3) @@ -610,7 +610,7 @@ glabel L802B6788_E29BF8 /* E29E38 802B69C8 24420001 */ addiu $v0, $v0, 1 /* E29E3C 802B69CC 0C03954C */ jal func_800E5530 /* E29E40 802B69D0 A26200B6 */ sb $v0, 0xb6($s3) -/* E29E44 802B69D4 080ADB96 */ j .L802B6E58 +/* E29E44 802B69D4 080ADB96 */ j L802B6E58_E2A2C8 /* E29E48 802B69D8 00000000 */ nop glabel L802B69DC_E29E4C /* E29E4C 802B69DC 3C02802B */ lui $v0, %hi(D_802B6EE4) @@ -701,7 +701,7 @@ glabel L802B69DC_E29E4C /* E29F98 802B6B28 46800020 */ cvt.s.w $f0, $f0 /* E29F9C 802B6B2C 4602003C */ c.lt.s $f0, $f2 /* E29FA0 802B6B30 00000000 */ nop -/* E29FA4 802B6B34 450000C8 */ bc1f .L802B6E58 +/* E29FA4 802B6B34 450000C8 */ bc1f L802B6E58_E2A2C8 /* E29FA8 802B6B38 00000000 */ nop /* E29FAC 802B6B3C C66C0028 */ lwc1 $f12, 0x28($s3) /* E29FB0 802B6B40 86020000 */ lh $v0, ($s0) @@ -753,7 +753,7 @@ glabel L802B69DC_E29E4C /* E2A068 802B6BF8 E4226ED4 */ swc1 $f2, %lo(D_802B6ED4)($at) /* E2A06C 802B6BFC 3C01802B */ lui $at, %hi(D_802B6ED8) /* E2A070 802B6C00 E4206ED8 */ swc1 $f0, %lo(D_802B6ED8)($at) -/* E2A074 802B6C04 080ADB96 */ j .L802B6E58 +/* E2A074 802B6C04 080ADB96 */ j L802B6E58_E2A2C8 /* E2A078 802B6C08 00000000 */ nop .L802B6C0C: /* E2A07C 802B6C0C 86620008 */ lh $v0, 8($s3) @@ -763,7 +763,7 @@ glabel L802B69DC_E29E4C /* E2A08C 802B6C1C 2402000A */ addiu $v0, $zero, 0xa /* E2A090 802B6C20 A26200B6 */ sb $v0, 0xb6($s3) /* E2A094 802B6C24 24020014 */ addiu $v0, $zero, 0x14 -/* E2A098 802B6C28 080ADB96 */ j .L802B6E58 +/* E2A098 802B6C28 080ADB96 */ j L802B6E58_E2A2C8 /* E2A09C 802B6C2C A6620008 */ sh $v0, 8($s3) glabel L802B6C30_E2A0A0 /* E2A0A0 802B6C30 C66000A8 */ lwc1 $f0, 0xa8($s3) @@ -828,7 +828,7 @@ glabel L802B6C30_E2A0A0 /* E2A180 802B6D10 24421D80 */ addiu $v0, $v0, %lo(gCameras) /* E2A184 802B6D14 E4400060 */ swc1 $f0, 0x60($v0) /* E2A188 802B6D18 E4420064 */ swc1 $f2, 0x64($v0) -/* E2A18C 802B6D1C 080ADB96 */ j .L802B6E58 +/* E2A18C 802B6D1C 080ADB96 */ j L802B6E58_E2A2C8 /* E2A190 802B6D20 E4440068 */ swc1 $f4, 0x68($v0) glabel L802B6D24_E2A194 /* E2A194 802B6D24 3C02802B */ lui $v0, %hi(D_802B6EE4) @@ -885,13 +885,12 @@ glabel L802B6D24_E2A194 /* E2A258 802B6DE8 86620008 */ lh $v0, 8($s3) /* E2A25C 802B6DEC 46060000 */ add.s $f0, $f0, $f6 /* E2A260 802B6DF0 96630008 */ lhu $v1, 8($s3) -/* E2A264 802B6DF4 10400004 */ beqz $v0, .L802B6E08 +/* E2A264 802B6DF4 10400004 */ beqz $v0, L802B6E08_E2A278 /* E2A268 802B6DF8 E660002C */ swc1 $f0, 0x2c($s3) /* E2A26C 802B6DFC 2462FFFF */ addiu $v0, $v1, -1 .L802B6E00: -/* E2A270 802B6E00 080ADB96 */ j .L802B6E58 +/* E2A270 802B6E00 080ADB96 */ j L802B6E58_E2A2C8 /* E2A274 802B6E04 A6620008 */ sh $v0, 8($s3) -.L802B6E08: glabel L802B6E08_E2A278 /* E2A278 802B6E08 0C038050 */ jal enable_player_static_collisions /* E2A27C 802B6E0C 00000000 */ nop @@ -913,7 +912,6 @@ glabel L802B6E08_E2A278 /* E2A2BC 802B6E4C 2403FFBF */ addiu $v1, $zero, -0x41 /* E2A2C0 802B6E50 00431024 */ and $v0, $v0, $v1 /* E2A2C4 802B6E54 AC820000 */ sw $v0, ($a0) -.L802B6E58: glabel L802B6E58_E2A2C8 /* E2A2C8 802B6E58 8FBF003C */ lw $ra, 0x3c($sp) /* E2A2CC 802B6E5C 8FB40038 */ lw $s4, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s b/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s index 3c72a2a3e7..d57a2417c3 100644 --- a/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s +++ b/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s @@ -100,7 +100,7 @@ glabel func_802B6120_E2A7D0 .L802B6294: /* E2A944 802B6294 822300B6 */ lb $v1, 0xb6($s1) /* E2A948 802B6298 2C620033 */ sltiu $v0, $v1, 0x33 -/* E2A94C 802B629C 104001D4 */ beqz $v0, .L802B69F0 +/* E2A94C 802B629C 104001D4 */ beqz $v0, L802B69F0_E2B0A0 /* E2A950 802B62A0 00031080 */ sll $v0, $v1, 2 /* E2A954 802B62A4 3C01802B */ lui $at, %hi(jtbl_802B6D90_E2B440) /* E2A958 802B62A8 00220821 */ addu $at, $at, $v0 @@ -113,7 +113,7 @@ glabel L802B62B8_E2A968 /* E2A970 802B62C0 00000000 */ nop /* E2A974 802B62C4 46001032 */ c.eq.s $f2, $f0 /* E2A978 802B62C8 00000000 */ nop -/* E2A97C 802B62CC 45000015 */ bc1f .L802B6324 +/* E2A97C 802B62CC 45000015 */ bc1f L802B6324_E2A9D4 /* E2A980 802B62D0 00000000 */ nop /* E2A984 802B62D4 0C0399B1 */ jal func_800E66C4 /* E2A988 802B62D8 00000000 */ nop @@ -126,7 +126,7 @@ glabel L802B62B8_E2A968 /* E2A9A4 802B62F4 0000282D */ daddu $a1, $zero, $zero /* E2A9A8 802B62F8 922200B6 */ lbu $v0, 0xb6($s1) /* E2A9AC 802B62FC 24420001 */ addiu $v0, $v0, 1 -/* E2A9B0 802B6300 080AD8C9 */ j .L802B6324 +/* E2A9B0 802B6300 080AD8C9 */ j L802B6324_E2A9D4 /* E2A9B4 802B6304 A22200B6 */ sb $v0, 0xb6($s1) .L802B6308: /* E2A9B8 802B6308 0C037FBF */ jal func_800DFEFC @@ -136,13 +136,12 @@ glabel L802B62B8_E2A968 /* E2A9C8 802B6318 2402000A */ addiu $v0, $zero, 0xa /* E2A9CC 802B631C A6220008 */ sh $v0, 8($s1) /* E2A9D0 802B6320 AE400008 */ sw $zero, 8($s2) -.L802B6324: glabel L802B6324_E2A9D4 /* E2A9D4 802B6324 96220008 */ lhu $v0, 8($s1) /* E2A9D8 802B6328 2442FFFF */ addiu $v0, $v0, -1 /* E2A9DC 802B632C A6220008 */ sh $v0, 8($s1) /* E2A9E0 802B6330 00021400 */ sll $v0, $v0, 0x10 -/* E2A9E4 802B6334 144001AE */ bnez $v0, .L802B69F0 +/* E2A9E4 802B6334 144001AE */ bnez $v0, L802B69F0_E2B0A0 /* E2A9E8 802B6338 3C04000C */ lui $a0, 0xc /* E2A9EC 802B633C 0C037FBF */ jal func_800DFEFC /* E2A9F0 802B6340 34840025 */ ori $a0, $a0, 0x25 @@ -151,16 +150,16 @@ glabel L802B6324_E2A9D4 /* E2A9FC 802B634C 14600004 */ bnez $v1, .L802B6360 /* E2AA00 802B6350 A22200B6 */ sb $v0, 0xb6($s1) /* E2AA04 802B6354 24020028 */ addiu $v0, $zero, 0x28 -/* E2AA08 802B6358 080ADA7C */ j .L802B69F0 +/* E2AA08 802B6358 080ADA7C */ j L802B69F0_E2B0A0 /* E2AA0C 802B635C A22200B6 */ sb $v0, 0xb6($s1) .L802B6360: /* E2AA10 802B6360 0C009C22 */ jal func_80027088 /* E2AA14 802B6364 24040002 */ addiu $a0, $zero, 2 -/* E2AA18 802B6368 080ADA7C */ j .L802B69F0 +/* E2AA18 802B6368 080ADA7C */ j L802B69F0_E2B0A0 /* E2AA1C 802B636C 00000000 */ nop glabel L802B6370_E2AA20 /* E2AA20 802B6370 962200BC */ lhu $v0, 0xbc($s1) -/* E2AA24 802B6374 1040019E */ beqz $v0, .L802B69F0 +/* E2AA24 802B6374 1040019E */ beqz $v0, L802B69F0_E2B0A0 /* E2AA28 802B6378 240400FD */ addiu $a0, $zero, 0xfd /* E2AA2C 802B637C 0000282D */ daddu $a1, $zero, $zero /* E2AA30 802B6380 2402000C */ addiu $v0, $zero, 0xc @@ -173,7 +172,7 @@ glabel L802B6370_E2AA20 /* E2AA4C 802B639C AE220000 */ sw $v0, ($s1) /* E2AA50 802B63A0 0C052736 */ jal play_sound_at_player /* E2AA54 802B63A4 A22300B6 */ sb $v1, 0xb6($s1) -/* E2AA58 802B63A8 080ADA7C */ j .L802B69F0 +/* E2AA58 802B63A8 080ADA7C */ j L802B69F0_E2B0A0 /* E2AA5C 802B63AC 00000000 */ nop glabel L802B63B0_E2AA60 /* E2AA60 802B63B0 96220008 */ lhu $v0, 8($s1) @@ -243,18 +242,18 @@ glabel L802B63DC_E2AA8C /* E2AB54 802B64A4 45030001 */ bc1tl .L802B64AC /* E2AB58 802B64A8 24020001 */ addiu $v0, $zero, 1 .L802B64AC: -/* E2AB5C 802B64AC 10400150 */ beqz $v0, .L802B69F0 +/* E2AB5C 802B64AC 10400150 */ beqz $v0, L802B69F0_E2B0A0 /* E2AB60 802B64B0 24020006 */ addiu $v0, $zero, 6 /* E2AB64 802B64B4 8224000D */ lb $a0, 0xd($s1) /* E2AB68 802B64B8 A22200B6 */ sb $v0, 0xb6($s1) /* E2AB6C 802B64BC 24020002 */ addiu $v0, $zero, 2 /* E2AB70 802B64C0 0C03995F */ jal make_disguise_npc /* E2AB74 802B64C4 A6220008 */ sh $v0, 8($s1) -/* E2AB78 802B64C8 10400149 */ beqz $v0, .L802B69F0 +/* E2AB78 802B64C8 10400149 */ beqz $v0, L802B69F0_E2B0A0 /* E2AB7C 802B64CC 24020005 */ addiu $v0, $zero, 5 /* E2AB80 802B64D0 0C039940 */ jal func_800E6500 /* E2AB84 802B64D4 A22200B6 */ sb $v0, 0xb6($s1) -/* E2AB88 802B64D8 080ADA7C */ j .L802B69F0 +/* E2AB88 802B64D8 080ADA7C */ j L802B69F0_E2B0A0 /* E2AB8C 802B64DC 00000000 */ nop glabel L802B64E0_E2AB90 /* E2AB90 802B64E0 8E220004 */ lw $v0, 4($s1) @@ -267,7 +266,7 @@ glabel L802B64E0_E2AB90 /* E2ABAC 802B64FC A062007E */ sb $v0, 0x7e($v1) /* E2ABB0 802B6500 922200B6 */ lbu $v0, 0xb6($s1) /* E2ABB4 802B6504 24420001 */ addiu $v0, $v0, 1 -/* E2ABB8 802B6508 080AD9FE */ j .L802B67F8 +/* E2ABB8 802B6508 080AD9FE */ j L802B67F8_E2AEA8 /* E2ABBC 802B650C A22200B6 */ sb $v0, 0xb6($s1) glabel L802B6510_E2ABC0 /* E2ABC0 802B6510 C640001C */ lwc1 $f0, 0x1c($s2) @@ -344,7 +343,7 @@ glabel L802B661C_E2ACCC /* E2ACD0 802B6620 2442FFFF */ addiu $v0, $v0, -1 /* E2ACD4 802B6624 A6220008 */ sh $v0, 8($s1) /* E2ACD8 802B6628 00021400 */ sll $v0, $v0, 0x10 -/* E2ACDC 802B662C 144000F0 */ bnez $v0, .L802B69F0 +/* E2ACDC 802B662C 144000F0 */ bnez $v0, L802B69F0_E2B0A0 /* E2ACE0 802B6630 00000000 */ nop /* E2ACE4 802B6634 0C009C22 */ jal func_80027088 /* E2ACE8 802B6638 0000202D */ daddu $a0, $zero, $zero @@ -438,7 +437,7 @@ glabel L802B66BC_E2AD6C /* E2AE34 802B6784 45030001 */ bc1tl .L802B678C /* E2AE38 802B6788 24020001 */ addiu $v0, $zero, 1 .L802B678C: -/* E2AE3C 802B678C 10400098 */ beqz $v0, .L802B69F0 +/* E2AE3C 802B678C 10400098 */ beqz $v0, L802B69F0_E2B0A0 /* E2AE40 802B6790 24030002 */ addiu $v1, $zero, 2 /* E2AE44 802B6794 922200B6 */ lbu $v0, 0xb6($s1) /* E2AE48 802B6798 A6230008 */ sh $v1, 8($s1) @@ -460,13 +459,12 @@ glabel L802B66BC_E2AD6C /* E2AE88 802B67D8 24020037 */ addiu $v0, $zero, 0x37 /* E2AE8C 802B67DC A62200B0 */ sh $v0, 0xb0($s1) /* E2AE90 802B67E0 24020026 */ addiu $v0, $zero, 0x26 -/* E2AE94 802B67E4 080ADA7C */ j .L802B69F0 +/* E2AE94 802B67E4 080ADA7C */ j L802B69F0_E2B0A0 /* E2AE98 802B67E8 A62200B2 */ sh $v0, 0xb2($s1) .L802B67EC: /* E2AE9C 802B67EC 2462FFFF */ addiu $v0, $v1, -1 -/* E2AEA0 802B67F0 080ADA7C */ j .L802B69F0 +/* E2AEA0 802B67F0 080ADA7C */ j L802B69F0_E2B0A0 /* E2AEA4 802B67F4 A6220008 */ sh $v0, 8($s1) -.L802B67F8: glabel L802B67F8_E2AEA8 /* E2AEA8 802B67F8 96220008 */ lhu $v0, 8($s1) /* E2AEAC 802B67FC 2442FFFF */ addiu $v0, $v0, -1 @@ -481,7 +479,7 @@ glabel L802B67F8_E2AEA8 .L802B681C: /* E2AECC 802B681C 0C0ADB3C */ jal func_802B6CF0_E2B3A0 /* E2AED0 802B6820 00000000 */ nop -/* E2AED4 802B6824 080ADA7C */ j .L802B69F0 +/* E2AED4 802B6824 080ADA7C */ j L802B69F0_E2B0A0 /* E2AED8 802B6828 00000000 */ nop glabel L802B682C_E2AEDC /* E2AEDC 802B682C C640001C */ lwc1 $f0, 0x1c($s2) @@ -565,14 +563,14 @@ glabel L802B682C_E2AEDC /* E2B004 802B6954 44810000 */ mtc1 $at, $f0 /* E2B008 802B6958 0C00A6C9 */ jal clamp_angle /* E2B00C 802B695C 46006301 */ sub.s $f12, $f12, $f0 -/* E2B010 802B6960 080ADA7C */ j .L802B69F0 +/* E2B010 802B6960 080ADA7C */ j L802B69F0_E2B0A0 /* E2B014 802B6964 E6200080 */ swc1 $f0, 0x80($s1) glabel L802B6968_E2B018 /* E2B018 802B6968 96220008 */ lhu $v0, 8($s1) /* E2B01C 802B696C 2442FFFF */ addiu $v0, $v0, -1 /* E2B020 802B6970 A6220008 */ sh $v0, 8($s1) /* E2B024 802B6974 00021400 */ sll $v0, $v0, 0x10 -/* E2B028 802B6978 1440001D */ bnez $v0, .L802B69F0 +/* E2B028 802B6978 1440001D */ bnez $v0, L802B69F0_E2B0A0 /* E2B02C 802B697C 00000000 */ nop /* E2B030 802B6980 0C009C22 */ jal func_80027088 /* E2B034 802B6984 0000202D */ daddu $a0, $zero, $zero @@ -590,7 +588,7 @@ glabel L802B69A4_E2B054 /* E2B060 802B69B0 00000000 */ nop glabel L802B69B4_E2B064 /* E2B064 802B69B4 962200BC */ lhu $v0, 0xbc($s1) -/* E2B068 802B69B8 1040000D */ beqz $v0, .L802B69F0 +/* E2B068 802B69B8 1040000D */ beqz $v0, L802B69F0_E2B0A0 /* E2B06C 802B69BC 0000202D */ daddu $a0, $zero, $zero /* E2B070 802B69C0 080ADA78 */ j .L802B69E0 /* E2B074 802B69C4 00000000 */ nop @@ -599,7 +597,7 @@ glabel L802B69C8_E2B078 /* E2B07C 802B69CC 2442FFFF */ addiu $v0, $v0, -1 /* E2B080 802B69D0 A6220008 */ sh $v0, 8($s1) /* E2B084 802B69D4 00021400 */ sll $v0, $v0, 0x10 -/* E2B088 802B69D8 14400005 */ bnez $v0, .L802B69F0 +/* E2B088 802B69D8 14400005 */ bnez $v0, L802B69F0_E2B0A0 /* E2B08C 802B69DC 0000202D */ daddu $a0, $zero, $zero .L802B69E0: /* E2B090 802B69E0 0C039769 */ jal set_action_state @@ -607,7 +605,6 @@ glabel L802B69C8_E2B078 .L802B69E8: /* E2B098 802B69E8 0C038050 */ jal enable_player_static_collisions /* E2B09C 802B69EC 00000000 */ nop -.L802B69F0: glabel L802B69F0_E2B0A0 /* E2B0A0 802B69F0 8E430008 */ lw $v1, 8($s2) /* E2B0A4 802B69F4 18600084 */ blez $v1, .L802B6C08 diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s b/ver/us/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s index 76079c32af..a113f98c09 100644 --- a/ver/us/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s +++ b/ver/us/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s @@ -109,7 +109,7 @@ glabel func_8024097C_EA127C .L80240B08: /* EA1408 80240B08 8E630070 */ lw $v1, 0x70($s3) /* EA140C 80240B0C 2C620064 */ sltiu $v0, $v1, 0x64 -/* EA1410 80240B10 10400048 */ beqz $v0, .L80240C34 +/* EA1410 80240B10 10400048 */ beqz $v0, L80240C34_EA1534 /* EA1414 80240B14 00031080 */ sll $v0, $v1, 2 /* EA1418 80240B18 3C018024 */ lui $at, %hi(jtbl_80246488_EA6D88) /* EA141C 80240B1C 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,7 @@ glabel L80240B3C_EA143C /* EA1440 80240B40 0280282D */ daddu $a1, $s4, $zero /* EA1444 80240B44 0C0136B6 */ jal func_8004DAD8 /* EA1448 80240B48 02A0302D */ daddu $a2, $s5, $zero -/* EA144C 80240B4C 0809030D */ j .L80240C34 +/* EA144C 80240B4C 0809030D */ j L80240C34_EA1534 /* EA1450 80240B50 00000000 */ nop glabel L80240B54_EA1454 /* EA1454 80240B54 0260202D */ daddu $a0, $s3, $zero @@ -138,7 +138,7 @@ glabel L80240B64_EA1464 /* EA1468 80240B68 0280282D */ daddu $a1, $s4, $zero /* EA146C 80240B6C 0C013809 */ jal func_8004E024 /* EA1470 80240B70 02A0302D */ daddu $a2, $s5, $zero -/* EA1474 80240B74 0809030D */ j .L80240C34 +/* EA1474 80240B74 0809030D */ j L80240C34_EA1534 /* EA1478 80240B78 00000000 */ nop glabel L80240B7C_EA147C /* EA147C 80240B7C 0260202D */ daddu $a0, $s3, $zero @@ -150,7 +150,7 @@ glabel L80240B8C_EA148C /* EA1490 80240B90 0280282D */ daddu $a1, $s4, $zero /* EA1494 80240B94 0C0138BB */ jal func_8004E2EC /* EA1498 80240B98 02A0302D */ daddu $a2, $s5, $zero -/* EA149C 80240B9C 0809030D */ j .L80240C34 +/* EA149C 80240B9C 0809030D */ j L80240C34_EA1534 /* EA14A0 80240BA0 00000000 */ nop glabel L80240BA4_EA14A4 /* EA14A4 80240BA4 0260202D */ daddu $a0, $s3, $zero @@ -162,14 +162,14 @@ glabel L80240BB4_EA14B4 /* EA14B8 80240BB8 0280282D */ daddu $a1, $s4, $zero /* EA14BC 80240BBC 0C013951 */ jal func_8004E544 /* EA14C0 80240BC0 02A0302D */ daddu $a2, $s5, $zero -/* EA14C4 80240BC4 0809030D */ j .L80240C34 +/* EA14C4 80240BC4 0809030D */ j L80240C34_EA1534 /* EA14C8 80240BC8 00000000 */ nop glabel L80240BCC_EA14CC /* EA14CC 80240BCC 0260202D */ daddu $a0, $s3, $zero /* EA14D0 80240BD0 0280282D */ daddu $a1, $s4, $zero /* EA14D4 80240BD4 0C013A02 */ jal func_8004E808 /* EA14D8 80240BD8 02A0302D */ daddu $a2, $s5, $zero -/* EA14DC 80240BDC 0809030D */ j .L80240C34 +/* EA14DC 80240BDC 0809030D */ j L80240C34_EA1534 /* EA14E0 80240BE0 00000000 */ nop glabel L80240BE4_EA14E4 /* EA14E4 80240BE4 0C0900C4 */ jal func_80240310_EA0C10 @@ -179,24 +179,23 @@ glabel L80240BEC_EA14EC /* EA14F0 80240BF0 0260202D */ daddu $a0, $s3, $zero /* EA14F4 80240BF4 8E630070 */ lw $v1, 0x70($s3) /* EA14F8 80240BF8 24020020 */ addiu $v0, $zero, 0x20 -/* EA14FC 80240BFC 1462000D */ bne $v1, $v0, .L80240C34 +/* EA14FC 80240BFC 1462000D */ bne $v1, $v0, L80240C34_EA1534 /* EA1500 80240C00 00000000 */ nop glabel L80240C04_EA1504 /* EA1504 80240C04 0C0900FB */ jal func_802403EC_EA0CEC /* EA1508 80240C08 0260202D */ daddu $a0, $s3, $zero /* EA150C 80240C0C 8E630070 */ lw $v1, 0x70($s3) /* EA1510 80240C10 24020021 */ addiu $v0, $zero, 0x21 -/* EA1514 80240C14 14620007 */ bne $v1, $v0, .L80240C34 +/* EA1514 80240C14 14620007 */ bne $v1, $v0, L80240C34_EA1534 /* EA1518 80240C18 00000000 */ nop glabel L80240C1C_EA151C /* EA151C 80240C1C 0C090131 */ jal func_802404C4_EA0DC4 /* EA1520 80240C20 0260202D */ daddu $a0, $s3, $zero -/* EA1524 80240C24 0809030D */ j .L80240C34 +/* EA1524 80240C24 0809030D */ j L80240C34_EA1534 /* EA1528 80240C28 00000000 */ nop glabel L80240C2C_EA152C /* EA152C 80240C2C 0C013AE3 */ jal func_8004EB8C /* EA1530 80240C30 0260202D */ daddu $a0, $s3, $zero -.L80240C34: glabel L80240C34_EA1534 /* EA1534 80240C34 8FBF0048 */ lw $ra, 0x48($sp) /* EA1538 80240C38 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s b/ver/us/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s index 4d2d3894f7..2f7bf71f59 100644 --- a/ver/us/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s +++ b/ver/us/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s @@ -145,7 +145,7 @@ glabel func_802420FC_EA29FC /* EA2C14 80242314 8E220090 */ lw $v0, 0x90($s1) /* EA2C18 80242318 1840000C */ blez $v0, .L8024234C /* EA2C1C 8024231C 2442FFFF */ addiu $v0, $v0, -1 -/* EA2C20 80242320 14400087 */ bnez $v0, .L80242540 +/* EA2C20 80242320 14400087 */ bnez $v0, L80242540_EA2E40 /* EA2C24 80242324 AE220090 */ sw $v0, 0x90($s1) /* EA2C28 80242328 3C03FFAA */ lui $v1, 0xffaa /* EA2C2C 8024232C 8E420028 */ lw $v0, 0x28($s2) @@ -232,7 +232,7 @@ glabel func_802420FC_EA29FC .L80242454: /* EA2D54 80242454 AE420028 */ sw $v0, 0x28($s2) /* EA2D58 80242458 24020007 */ addiu $v0, $zero, 7 -/* EA2D5C 8024245C 08090950 */ j .L80242540 +/* EA2D5C 8024245C 08090950 */ j L80242540_EA2E40 /* EA2D60 80242460 AE220090 */ sw $v0, 0x90($s1) .L80242464: /* EA2D64 80242464 0280282D */ daddu $a1, $s4, $zero @@ -282,13 +282,13 @@ glabel func_802420FC_EA29FC /* EA2DF8 802424F8 A22000B5 */ sb $zero, 0xb5($s1) .L802424FC: /* EA2DFC 802424FC 8E22008C */ lw $v0, 0x8c($s1) -/* EA2E00 80242500 1040000F */ beqz $v0, .L80242540 +/* EA2E00 80242500 1040000F */ beqz $v0, L80242540_EA2E40 /* EA2E04 80242504 3C03FFAA */ lui $v1, 0xffaa /* EA2E08 80242508 8E420028 */ lw $v0, 0x28($s2) /* EA2E0C 8024250C 3463FFFC */ ori $v1, $v1, 0xfffc /* EA2E10 80242510 00431821 */ addu $v1, $v0, $v1 /* EA2E14 80242514 2C620015 */ sltiu $v0, $v1, 0x15 -/* EA2E18 80242518 10400009 */ beqz $v0, .L80242540 +/* EA2E18 80242518 10400009 */ beqz $v0, L80242540_EA2E40 /* EA2E1C 8024251C 00031080 */ sll $v0, $v1, 2 /* EA2E20 80242520 3C018024 */ lui $at, %hi(jtbl_80246650_EA6F50) /* EA2E24 80242524 00220821 */ addu $at, $at, $v0 @@ -299,7 +299,6 @@ glabel L80242534_EA2E34 /* EA2E34 80242534 8E420028 */ lw $v0, 0x28($s2) /* EA2E38 80242538 24420001 */ addiu $v0, $v0, 1 /* EA2E3C 8024253C AE420028 */ sw $v0, 0x28($s2) -.L80242540: glabel L80242540_EA2E40 /* EA2E40 80242540 0000102D */ daddu $v0, $zero, $zero .L80242544: diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s b/ver/us/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s index 9a31bd640a..52360432c2 100644 --- a/ver/us/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s +++ b/ver/us/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s @@ -11,7 +11,7 @@ glabel func_802404B8_EA8F98 /* EA8FB0 802404D0 3C108011 */ lui $s0, %hi(D_80117578) /* EA8FB4 802404D4 26107578 */ addiu $s0, $s0, %lo(D_80117578) /* EA8FB8 802404D8 2C620005 */ sltiu $v0, $v1, 5 -/* EA8FBC 802404DC 1040008A */ beqz $v0, .L80240708 +/* EA8FBC 802404DC 1040008A */ beqz $v0, L80240708_EA91E8 /* EA8FC0 802404E0 00031080 */ sll $v0, $v1, 2 /* EA8FC4 802404E4 3C018025 */ lui $at, %hi(jtbl_80248340_EB0E20) /* EA8FC8 802404E8 00220821 */ addu $at, $at, $v0 @@ -62,10 +62,10 @@ glabel L802404F8_EA8FD8 /* EA9078 80240598 00021400 */ sll $v0, $v0, 0x10 /* EA907C 8024059C 00021403 */ sra $v0, $v0, 0x10 /* EA9080 802405A0 0043102A */ slt $v0, $v0, $v1 -/* EA9084 802405A4 14400058 */ bnez $v0, .L80240708 +/* EA9084 802405A4 14400058 */ bnez $v0, L80240708_EA91E8 /* EA9088 802405A8 24020001 */ addiu $v0, $zero, 1 /* EA908C 802405AC A6220044 */ sh $v0, 0x44($s1) -/* EA9090 802405B0 080901C2 */ j .L80240708 +/* EA9090 802405B0 080901C2 */ j L80240708_EA91E8 /* EA9094 802405B4 A6200046 */ sh $zero, 0x46($s1) glabel L802405B8_EA9098 /* EA9098 802405B8 96220046 */ lhu $v0, 0x46($s1) @@ -74,7 +74,7 @@ glabel L802405B8_EA9098 /* EA90A4 802405C4 00021400 */ sll $v0, $v0, 0x10 /* EA90A8 802405C8 00021403 */ sra $v0, $v0, 0x10 /* EA90AC 802405CC 2842003C */ slti $v0, $v0, 0x3c -/* EA90B0 802405D0 1440004D */ bnez $v0, .L80240708 +/* EA90B0 802405D0 1440004D */ bnez $v0, L80240708_EA91E8 /* EA90B4 802405D4 24020002 */ addiu $v0, $zero, 2 /* EA90B8 802405D8 8E230050 */ lw $v1, 0x50($s1) /* EA90BC 802405DC A6220044 */ sh $v0, 0x44($s1) @@ -84,7 +84,7 @@ glabel L802405B8_EA9098 /* EA90CC 802405EC AC620070 */ sw $v0, 0x70($v1) /* EA90D0 802405F0 8E220050 */ lw $v0, 0x50($s1) /* EA90D4 802405F4 8C42000C */ lw $v0, 0xc($v0) -/* EA90D8 802405F8 080901C2 */ j .L80240708 +/* EA90D8 802405F8 080901C2 */ j L80240708_EA91E8 /* EA90DC 802405FC AC400074 */ sw $zero, 0x74($v0) glabel L80240600_EA90E0 /* EA90E0 80240600 96220046 */ lhu $v0, 0x46($s1) @@ -93,7 +93,7 @@ glabel L80240600_EA90E0 /* EA90EC 8024060C 00021400 */ sll $v0, $v0, 0x10 /* EA90F0 80240610 00021403 */ sra $v0, $v0, 0x10 /* EA90F4 80240614 2842003C */ slti $v0, $v0, 0x3c -/* EA90F8 80240618 1440003B */ bnez $v0, .L80240708 +/* EA90F8 80240618 1440003B */ bnez $v0, L80240708_EA91E8 /* EA90FC 8024061C 00000000 */ nop /* EA9100 80240620 3C013F80 */ lui $at, 0x3f80 /* EA9104 80240624 44810000 */ mtc1 $at, $f0 @@ -125,7 +125,7 @@ glabel L80240600_EA90E0 /* EA916C 8024068C A6200046 */ sh $zero, 0x46($s1) /* EA9170 80240690 AE20002C */ sw $zero, 0x2c($s1) /* EA9174 80240694 A6220048 */ sh $v0, 0x48($s1) -/* EA9178 80240698 080901C2 */ j .L80240708 +/* EA9178 80240698 080901C2 */ j L80240708_EA91E8 /* EA917C 8024069C E6200030 */ swc1 $f0, 0x30($s1) glabel L802406A0_EA9180 /* EA9180 802406A0 0000202D */ daddu $a0, $zero, $zero @@ -142,7 +142,7 @@ glabel L802406A0_EA9180 /* EA91AC 802406CC 00021400 */ sll $v0, $v0, 0x10 /* EA91B0 802406D0 00021403 */ sra $v0, $v0, 0x10 /* EA91B4 802406D4 28420078 */ slti $v0, $v0, 0x78 -/* EA91B8 802406D8 1440000B */ bnez $v0, .L80240708 +/* EA91B8 802406D8 1440000B */ bnez $v0, L80240708_EA91E8 /* EA91BC 802406DC 24030001 */ addiu $v1, $zero, 1 /* EA91C0 802406E0 C620002C */ lwc1 $f0, 0x2c($s1) /* EA91C4 802406E4 24020002 */ addiu $v0, $zero, 2 @@ -154,7 +154,6 @@ glabel L802406A0_EA9180 /* EA91DC 802406FC A6220044 */ sh $v0, 0x44($s1) /* EA91E0 80240700 A6200046 */ sh $zero, 0x46($s1) /* EA91E4 80240704 E6200034 */ swc1 $f0, 0x34($s1) -.L80240708: glabel L80240708_EA91E8 /* EA91E8 80240708 8623004A */ lh $v1, 0x4a($s1) /* EA91EC 8024070C 24020001 */ addiu $v0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s b/ver/us/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s index 751376bf9d..f121c7fd83 100644 --- a/ver/us/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s +++ b/ver/us/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s @@ -133,7 +133,7 @@ glabel func_80240BD4_EB9A24 .L80240DC0: /* EB9C10 80240DC0 8EA30070 */ lw $v1, 0x70($s5) /* EB9C14 80240DC4 2C620064 */ sltiu $v0, $v1, 0x64 -/* EB9C18 80240DC8 10400042 */ beqz $v0, .L80240ED4 +/* EB9C18 80240DC8 10400042 */ beqz $v0, L80240ED4_EB9D24 /* EB9C1C 80240DCC 00031080 */ sll $v0, $v1, 2 /* EB9C20 80240DD0 3C018025 */ lui $at, %hi(jtbl_80249200_EC2050) /* EB9C24 80240DD4 00220821 */ addu $at, $at, $v0 @@ -150,7 +150,7 @@ glabel L80240DF4_EB9C44 /* EB9C48 80240DF8 0260282D */ daddu $a1, $s3, $zero /* EB9C4C 80240DFC 0C090066 */ jal func_80240198_EB8FE8 /* EB9C50 80240E00 0280302D */ daddu $a2, $s4, $zero -/* EB9C54 80240E04 080903B5 */ j .L80240ED4 +/* EB9C54 80240E04 080903B5 */ j L80240ED4_EB9D24 /* EB9C58 80240E08 00000000 */ nop glabel L80240E0C_EB9C5C /* EB9C5C 80240E0C 02A0202D */ daddu $a0, $s5, $zero @@ -162,14 +162,14 @@ glabel L80240E1C_EB9C6C /* EB9C70 80240E20 0260282D */ daddu $a1, $s3, $zero /* EB9C74 80240E24 0C090140 */ jal func_80240500_EB9350 /* EB9C78 80240E28 0280302D */ daddu $a2, $s4, $zero -/* EB9C7C 80240E2C 080903B5 */ j .L80240ED4 +/* EB9C7C 80240E2C 080903B5 */ j L80240ED4_EB9D24 /* EB9C80 80240E30 00000000 */ nop glabel L80240E34_EB9C84 /* EB9C84 80240E34 02A0202D */ daddu $a0, $s5, $zero /* EB9C88 80240E38 0260282D */ daddu $a1, $s3, $zero /* EB9C8C 80240E3C 0C0901AF */ jal func_802406BC_EB950C /* EB9C90 80240E40 0280302D */ daddu $a2, $s4, $zero -/* EB9C94 80240E44 080903B5 */ j .L80240ED4 +/* EB9C94 80240E44 080903B5 */ j L80240ED4_EB9D24 /* EB9C98 80240E48 00000000 */ nop glabel L80240E4C_EB9C9C /* EB9C9C 80240E4C 02A0202D */ daddu $a0, $s5, $zero @@ -181,7 +181,7 @@ glabel L80240E5C_EB9CAC /* EB9CB0 80240E60 0260282D */ daddu $a1, $s3, $zero /* EB9CB4 80240E64 0C0901F9 */ jal func_802407E4_EB9634 /* EB9CB8 80240E68 0280302D */ daddu $a2, $s4, $zero -/* EB9CBC 80240E6C 080903B5 */ j .L80240ED4 +/* EB9CBC 80240E6C 080903B5 */ j L80240ED4_EB9D24 /* EB9CC0 80240E70 00000000 */ nop glabel L80240E74_EB9CC4 /* EB9CC4 80240E74 02A0202D */ daddu $a0, $s5, $zero @@ -193,26 +193,25 @@ glabel L80240E84_EB9CD4 /* EB9CD8 80240E88 0260282D */ daddu $a1, $s3, $zero /* EB9CDC 80240E8C 0C090263 */ jal func_8024098C_EB97DC /* EB9CE0 80240E90 0280302D */ daddu $a2, $s4, $zero -/* EB9CE4 80240E94 080903B5 */ j .L80240ED4 +/* EB9CE4 80240E94 080903B5 */ j L80240ED4_EB9D24 /* EB9CE8 80240E98 00000000 */ nop glabel L80240E9C_EB9CEC /* EB9CEC 80240E9C 02A0202D */ daddu $a0, $s5, $zero /* EB9CF0 80240EA0 0260282D */ daddu $a1, $s3, $zero /* EB9CF4 80240EA4 0C0902AB */ jal func_80240AAC_EB98FC /* EB9CF8 80240EA8 0280302D */ daddu $a2, $s4, $zero -/* EB9CFC 80240EAC 080903B5 */ j .L80240ED4 +/* EB9CFC 80240EAC 080903B5 */ j L80240ED4_EB9D24 /* EB9D00 80240EB0 00000000 */ nop glabel L80240EB4_EB9D04 /* EB9D04 80240EB4 02A0202D */ daddu $a0, $s5, $zero /* EB9D08 80240EB8 0260282D */ daddu $a1, $s3, $zero /* EB9D0C 80240EBC 0C0902C5 */ jal func_80240B14_EB9964 /* EB9D10 80240EC0 0280302D */ daddu $a2, $s4, $zero -/* EB9D14 80240EC4 080903B5 */ j .L80240ED4 +/* EB9D14 80240EC4 080903B5 */ j L80240ED4_EB9D24 /* EB9D18 80240EC8 00000000 */ nop glabel L80240ECC_EB9D1C /* EB9D1C 80240ECC 0C013AE3 */ jal func_8004EB8C /* EB9D20 80240ED0 02A0202D */ daddu $a0, $s5, $zero -.L80240ED4: glabel L80240ED4_EB9D24 /* EB9D24 80240ED4 8FBF0060 */ lw $ra, 0x60($sp) /* EB9D28 80240ED8 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s b/ver/us/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s index e0c4ede2a3..f74309e852 100644 --- a/ver/us/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s +++ b/ver/us/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s @@ -94,7 +94,7 @@ glabel func_8024150C_ECB20C .L80241664: /* ECB364 80241664 8EA30070 */ lw $v1, 0x70($s5) /* ECB368 80241668 2C620064 */ sltiu $v0, $v1, 0x64 -/* ECB36C 8024166C 10400036 */ beqz $v0, .L80241748 +/* ECB36C 8024166C 10400036 */ beqz $v0, L80241748_ECB448 /* ECB370 80241670 00031080 */ sll $v0, $v1, 2 /* ECB374 80241674 3C018024 */ lui $at, %hi(jtbl_80246160_ECFE60) /* ECB378 80241678 00220821 */ addu $at, $at, $v0 @@ -111,7 +111,7 @@ glabel L80241698_ECB398 /* ECB39C 8024169C 0260282D */ daddu $a1, $s3, $zero /* ECB3A0 802416A0 0C0136B6 */ jal func_8004DAD8 /* ECB3A4 802416A4 0280302D */ daddu $a2, $s4, $zero -/* ECB3A8 802416A8 080905D2 */ j .L80241748 +/* ECB3A8 802416A8 080905D2 */ j L80241748_ECB448 /* ECB3AC 802416AC 00000000 */ nop glabel L802416B0_ECB3B0 /* ECB3B0 802416B0 02A0202D */ daddu $a0, $s5, $zero @@ -123,7 +123,7 @@ glabel L802416C0_ECB3C0 /* ECB3C4 802416C4 0260282D */ daddu $a1, $s3, $zero /* ECB3C8 802416C8 0C013809 */ jal func_8004E024 /* ECB3CC 802416CC 0280302D */ daddu $a2, $s4, $zero -/* ECB3D0 802416D0 080905D2 */ j .L80241748 +/* ECB3D0 802416D0 080905D2 */ j L80241748_ECB448 /* ECB3D4 802416D4 00000000 */ nop glabel L802416D8_ECB3D8 /* ECB3D8 802416D8 02A0202D */ daddu $a0, $s5, $zero @@ -135,7 +135,7 @@ glabel L802416E8_ECB3E8 /* ECB3EC 802416EC 0260282D */ daddu $a1, $s3, $zero /* ECB3F0 802416F0 0C0138BB */ jal func_8004E2EC /* ECB3F4 802416F4 0280302D */ daddu $a2, $s4, $zero -/* ECB3F8 802416F8 080905D2 */ j .L80241748 +/* ECB3F8 802416F8 080905D2 */ j L80241748_ECB448 /* ECB3FC 802416FC 00000000 */ nop glabel L80241700_ECB400 /* ECB400 80241700 02A0202D */ daddu $a0, $s5, $zero @@ -147,19 +147,18 @@ glabel L80241710_ECB410 /* ECB414 80241714 0260282D */ daddu $a1, $s3, $zero /* ECB418 80241718 0C0904D9 */ jal func_80241364_ECB064 /* ECB41C 8024171C 0280302D */ daddu $a2, $s4, $zero -/* ECB420 80241720 080905D2 */ j .L80241748 +/* ECB420 80241720 080905D2 */ j L80241748_ECB448 /* ECB424 80241724 00000000 */ nop glabel L80241728_ECB428 /* ECB428 80241728 02A0202D */ daddu $a0, $s5, $zero /* ECB42C 8024172C 0260282D */ daddu $a1, $s3, $zero /* ECB430 80241730 0C090532 */ jal func_802414C8_ECB1C8 /* ECB434 80241734 0280302D */ daddu $a2, $s4, $zero -/* ECB438 80241738 080905D2 */ j .L80241748 +/* ECB438 80241738 080905D2 */ j L80241748_ECB448 /* ECB43C 8024173C 00000000 */ nop glabel L80241740_ECB440 /* ECB440 80241740 0C013AE3 */ jal func_8004EB8C /* ECB444 80241744 02A0202D */ daddu $a0, $s5, $zero -.L80241748: glabel L80241748_ECB448 /* ECB448 80241748 8FBF0048 */ lw $ra, 0x48($sp) /* ECB44C 8024174C 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s b/ver/us/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s index 5bc0da0137..63b8c23e71 100644 --- a/ver/us/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s +++ b/ver/us/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s @@ -75,7 +75,7 @@ glabel func_8024162C_ED161C .L80241740: /* ED1730 80241740 8EA30070 */ lw $v1, 0x70($s5) /* ED1734 80241744 2C62000F */ sltiu $v0, $v1, 0xf -/* ED1738 80241748 10400034 */ beqz $v0, .L8024181C +/* ED1738 80241748 10400034 */ beqz $v0, L8024181C_ED180C /* ED173C 8024174C 00031080 */ sll $v0, $v1, 2 /* ED1740 80241750 3C018024 */ lui $at, %hi(jtbl_802441E8_ED41D8) /* ED1744 80241754 00220821 */ addu $at, $at, $v0 @@ -137,7 +137,6 @@ glabel L8024180C_ED17FC /* ED1800 80241810 0200282D */ daddu $a1, $s0, $zero /* ED1804 80241814 0C09045E */ jal func_80241178_ED1168 /* ED1808 80241818 0260302D */ daddu $a2, $s3, $zero -.L8024181C: glabel L8024181C_ED180C /* ED180C 8024181C 0000102D */ daddu $v0, $zero, $zero .L80241820: diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s b/ver/us/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s index 9a6c267635..f1fd3ee1ee 100644 --- a/ver/us/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s +++ b/ver/us/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s @@ -75,7 +75,7 @@ glabel func_802414D0_EDFE90 .L802415E4: /* EDFFA4 802415E4 8EA30070 */ lw $v1, 0x70($s5) /* EDFFA8 802415E8 2C62000F */ sltiu $v0, $v1, 0xf -/* EDFFAC 802415EC 10400034 */ beqz $v0, .L802416C0 +/* EDFFAC 802415EC 10400034 */ beqz $v0, L802416C0_EE0080 /* EDFFB0 802415F0 00031080 */ sll $v0, $v1, 2 /* EDFFB4 802415F4 3C018024 */ lui $at, %hi(jtbl_80247B08_EE64C8) /* EDFFB8 802415F8 00220821 */ addu $at, $at, $v0 @@ -137,7 +137,6 @@ glabel L802416B0_EE0070 /* EE0074 802416B4 0200282D */ daddu $a1, $s0, $zero /* EE0078 802416B8 0C090407 */ jal func_8024101C_EDF9DC /* EE007C 802416BC 0260302D */ daddu $a2, $s3, $zero -.L802416C0: glabel L802416C0_EE0080 /* EE0080 802416C0 0000102D */ daddu $v0, $zero, $zero .L802416C4: diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s b/ver/us/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s index 4eef19f26a..2935f1b9d7 100644 --- a/ver/us/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s +++ b/ver/us/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s @@ -145,7 +145,7 @@ glabel func_80242684_EE1044 /* EE125C 8024289C 8E220090 */ lw $v0, 0x90($s1) /* EE1260 802428A0 1840000C */ blez $v0, .L802428D4 /* EE1264 802428A4 2442FFFF */ addiu $v0, $v0, -1 -/* EE1268 802428A8 14400087 */ bnez $v0, .L80242AC8 +/* EE1268 802428A8 14400087 */ bnez $v0, L80242AC8_EE1488 /* EE126C 802428AC AE220090 */ sw $v0, 0x90($s1) /* EE1270 802428B0 3C03FFAA */ lui $v1, 0xffaa /* EE1274 802428B4 8E420028 */ lw $v0, 0x28($s2) @@ -232,7 +232,7 @@ glabel func_80242684_EE1044 .L802429DC: /* EE139C 802429DC AE420028 */ sw $v0, 0x28($s2) /* EE13A0 802429E0 24020007 */ addiu $v0, $zero, 7 -/* EE13A4 802429E4 08090AB2 */ j .L80242AC8 +/* EE13A4 802429E4 08090AB2 */ j L80242AC8_EE1488 /* EE13A8 802429E8 AE220090 */ sw $v0, 0x90($s1) .L802429EC: /* EE13AC 802429EC 0280282D */ daddu $a1, $s4, $zero @@ -282,13 +282,13 @@ glabel func_80242684_EE1044 /* EE1440 80242A80 A22000B5 */ sb $zero, 0xb5($s1) .L80242A84: /* EE1444 80242A84 8E22008C */ lw $v0, 0x8c($s1) -/* EE1448 80242A88 1040000F */ beqz $v0, .L80242AC8 +/* EE1448 80242A88 1040000F */ beqz $v0, L80242AC8_EE1488 /* EE144C 80242A8C 3C03FFAA */ lui $v1, 0xffaa /* EE1450 80242A90 8E420028 */ lw $v0, 0x28($s2) /* EE1454 80242A94 3463FFFC */ ori $v1, $v1, 0xfffc /* EE1458 80242A98 00431821 */ addu $v1, $v0, $v1 /* EE145C 80242A9C 2C620015 */ sltiu $v0, $v1, 0x15 -/* EE1460 80242AA0 10400009 */ beqz $v0, .L80242AC8 +/* EE1460 80242AA0 10400009 */ beqz $v0, L80242AC8_EE1488 /* EE1464 80242AA4 00031080 */ sll $v0, $v1, 2 /* EE1468 80242AA8 3C018024 */ lui $at, %hi(jtbl_80247B58_EE6518) /* EE146C 80242AAC 00220821 */ addu $at, $at, $v0 @@ -299,7 +299,6 @@ glabel L80242ABC_EE147C /* EE147C 80242ABC 8E420028 */ lw $v0, 0x28($s2) /* EE1480 80242AC0 24420001 */ addiu $v0, $v0, 1 /* EE1484 80242AC4 AE420028 */ sw $v0, 0x28($s2) -.L80242AC8: glabel L80242AC8_EE1488 /* EE1488 80242AC8 0000102D */ daddu $v0, $zero, $zero .L80242ACC: diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s b/ver/us/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s index 2f5d4cbfc0..9624049404 100644 --- a/ver/us/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s +++ b/ver/us/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s @@ -75,7 +75,7 @@ glabel func_80241E1C_EE83CC .L80241F30: /* EE84E0 80241F30 8EA30070 */ lw $v1, 0x70($s5) /* EE84E4 80241F34 2C62000F */ sltiu $v0, $v1, 0xf -/* EE84E8 80241F38 10400034 */ beqz $v0, .L8024200C +/* EE84E8 80241F38 10400034 */ beqz $v0, L8024200C_EE85BC /* EE84EC 80241F3C 00031080 */ sll $v0, $v1, 2 /* EE84F0 80241F40 3C018024 */ lui $at, %hi(jtbl_80245398_EEB948) /* EE84F4 80241F44 00220821 */ addu $at, $at, $v0 @@ -137,7 +137,6 @@ glabel L80241FFC_EE85AC /* EE85B0 80242000 0200282D */ daddu $a1, $s0, $zero /* EE85B4 80242004 0C09065A */ jal func_80241968_EE7F18 /* EE85B8 80242008 0260302D */ daddu $a2, $s3, $zero -.L8024200C: glabel L8024200C_EE85BC /* EE85BC 8024200C 0000102D */ daddu $v0, $zero, $zero .L80242010: diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s b/ver/us/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s index e324081b60..1bd360b5ff 100644 --- a/ver/us/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s +++ b/ver/us/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s @@ -75,7 +75,7 @@ glabel func_8024215C_EEF25C .L80242270: /* EEF370 80242270 8EA30070 */ lw $v1, 0x70($s5) /* EEF374 80242274 2C62000F */ sltiu $v0, $v1, 0xf -/* EEF378 80242278 10400034 */ beqz $v0, .L8024234C +/* EEF378 80242278 10400034 */ beqz $v0, L8024234C_EEF44C /* EEF37C 8024227C 00031080 */ sll $v0, $v1, 2 /* EEF380 80242280 3C018024 */ lui $at, %hi(jtbl_80245468_EF2568) /* EEF384 80242284 00220821 */ addu $at, $at, $v0 @@ -137,7 +137,6 @@ glabel L8024233C_EEF43C /* EEF440 80242340 0200282D */ daddu $a1, $s0, $zero /* EEF444 80242344 0C09072A */ jal func_80241CA8_EEEDA8 /* EEF448 80242348 0260302D */ daddu $a2, $s3, $zero -.L8024234C: glabel L8024234C_EEF44C /* EEF44C 8024234C 0000102D */ daddu $v0, $zero, $zero .L80242350: diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s b/ver/us/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s index 5f343539ff..959a393ffa 100644 --- a/ver/us/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s +++ b/ver/us/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s @@ -76,7 +76,7 @@ glabel func_80242780_EEF880 .L80242898: /* EEF998 80242898 8E830070 */ lw $v1, 0x70($s4) /* EEF99C 8024289C 2C620015 */ sltiu $v0, $v1, 0x15 -/* EEF9A0 802428A0 10400032 */ beqz $v0, .L8024296C +/* EEF9A0 802428A0 10400032 */ beqz $v0, L8024296C_EEFA6C /* EEF9A4 802428A4 00031080 */ sll $v0, $v1, 2 /* EEF9A8 802428A8 3C018024 */ lui $at, %hi(jtbl_802454B0_EF25B0) /* EEF9AC 802428AC 00220821 */ addu $at, $at, $v0 @@ -136,7 +136,6 @@ glabel L8024295C_EEFA5C /* EEFA60 80242960 0200282D */ daddu $a1, $s0, $zero /* EEFA64 80242964 0C0909C9 */ jal func_80242724_EEF824 /* EEFA68 80242968 0260302D */ daddu $a2, $s3, $zero -.L8024296C: glabel L8024296C_EEFA6C /* EEFA6C 8024296C 0000102D */ daddu $v0, $zero, $zero .L80242970: diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s b/ver/us/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s index 79889b7520..81a01e56f2 100644 --- a/ver/us/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s +++ b/ver/us/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s @@ -75,7 +75,7 @@ glabel func_8024137C_EF398C .L80241490: /* EF3AA0 80241490 8EA30070 */ lw $v1, 0x70($s5) /* EF3AA4 80241494 2C62000F */ sltiu $v0, $v1, 0xf -/* EF3AA8 80241498 10400034 */ beqz $v0, .L8024156C +/* EF3AA8 80241498 10400034 */ beqz $v0, L8024156C_EF3B7C /* EF3AAC 8024149C 00031080 */ sll $v0, $v1, 2 /* EF3AB0 802414A0 3C018024 */ lui $at, %hi(jtbl_802453C8_EF79D8) /* EF3AB4 802414A4 00220821 */ addu $at, $at, $v0 @@ -137,7 +137,6 @@ glabel L8024155C_EF3B6C /* EF3B70 80241560 0200282D */ daddu $a1, $s0, $zero /* EF3B74 80241564 0C0903B2 */ jal func_80240EC8_EF34D8 /* EF3B78 80241568 0260302D */ daddu $a2, $s3, $zero -.L8024156C: glabel L8024156C_EF3B7C /* EF3B7C 8024156C 0000102D */ daddu $v0, $zero, $zero .L80241570: diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s b/ver/us/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s index c4c4201dcc..e0688a9f59 100644 --- a/ver/us/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s +++ b/ver/us/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s @@ -145,7 +145,7 @@ glabel func_80242530_EF4B40 /* EF4D58 80242748 8E220090 */ lw $v0, 0x90($s1) /* EF4D5C 8024274C 1840000C */ blez $v0, .L80242780 /* EF4D60 80242750 2442FFFF */ addiu $v0, $v0, -1 -/* EF4D64 80242754 14400087 */ bnez $v0, .L80242974 +/* EF4D64 80242754 14400087 */ bnez $v0, L80242974_EF4F84 /* EF4D68 80242758 AE220090 */ sw $v0, 0x90($s1) /* EF4D6C 8024275C 3C03FFAA */ lui $v1, 0xffaa /* EF4D70 80242760 8E420028 */ lw $v0, 0x28($s2) @@ -232,7 +232,7 @@ glabel func_80242530_EF4B40 .L80242888: /* EF4E98 80242888 AE420028 */ sw $v0, 0x28($s2) /* EF4E9C 8024288C 24020007 */ addiu $v0, $zero, 7 -/* EF4EA0 80242890 08090A5D */ j .L80242974 +/* EF4EA0 80242890 08090A5D */ j L80242974_EF4F84 /* EF4EA4 80242894 AE220090 */ sw $v0, 0x90($s1) .L80242898: /* EF4EA8 80242898 0280282D */ daddu $a1, $s4, $zero @@ -282,13 +282,13 @@ glabel func_80242530_EF4B40 /* EF4F3C 8024292C A22000B5 */ sb $zero, 0xb5($s1) .L80242930: /* EF4F40 80242930 8E22008C */ lw $v0, 0x8c($s1) -/* EF4F44 80242934 1040000F */ beqz $v0, .L80242974 +/* EF4F44 80242934 1040000F */ beqz $v0, L80242974_EF4F84 /* EF4F48 80242938 3C03FFAA */ lui $v1, 0xffaa /* EF4F4C 8024293C 8E420028 */ lw $v0, 0x28($s2) /* EF4F50 80242940 3463FFFC */ ori $v1, $v1, 0xfffc /* EF4F54 80242944 00431821 */ addu $v1, $v0, $v1 /* EF4F58 80242948 2C620015 */ sltiu $v0, $v1, 0x15 -/* EF4F5C 8024294C 10400009 */ beqz $v0, .L80242974 +/* EF4F5C 8024294C 10400009 */ beqz $v0, L80242974_EF4F84 /* EF4F60 80242950 00031080 */ sll $v0, $v1, 2 /* EF4F64 80242954 3C018024 */ lui $at, %hi(jtbl_80245410_EF7A20) /* EF4F68 80242958 00220821 */ addu $at, $at, $v0 @@ -299,7 +299,6 @@ glabel L80242968_EF4F78 /* EF4F78 80242968 8E420028 */ lw $v0, 0x28($s2) /* EF4F7C 8024296C 24420001 */ addiu $v0, $v0, 1 /* EF4F80 80242970 AE420028 */ sw $v0, 0x28($s2) -.L80242974: glabel L80242974_EF4F84 /* EF4F84 80242974 0000102D */ daddu $v0, $zero, $zero .L80242978: diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D2520.s b/ver/us/asm/nonmatchings/code_F5750/func_802D2520.s index 31280a9abd..e627046720 100644 --- a/ver/us/asm/nonmatchings/code_F5750/func_802D2520.s +++ b/ver/us/asm/nonmatchings/code_F5750/func_802D2520.s @@ -29,7 +29,7 @@ glabel func_802D2520 /* F6F30 802D2580 3C128011 */ lui $s2, %hi(gPlayerStatus) /* F6F34 802D2584 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) /* F6F38 802D2588 2E22000E */ sltiu $v0, $s1, 0xe -/* F6F3C 802D258C 104000AB */ beqz $v0, .L802D283C +/* F6F3C 802D258C 104000AB */ beqz $v0, L802D283C_F71EC /* F6F40 802D2590 00111080 */ sll $v0, $s1, 2 /* F6F44 802D2594 3C01802E */ lui $at, %hi(jtbl_802DA208) /* F6F48 802D2598 00220821 */ addu $at, $at, $v0 @@ -214,7 +214,6 @@ glabel L802D27C0_F7170 .L802D2834: /* F71E4 802D2834 0C0B77FE */ jal func_802DDFF8 /* F71E8 802D2838 00000000 */ nop -.L802D283C: glabel L802D283C_F71EC /* F71EC 802D283C 8FBF0038 */ lw $ra, 0x38($sp) /* F71F0 802D2840 8FB50034 */ lw $s5, 0x34($sp) diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D4050.s b/ver/us/asm/nonmatchings/code_F5750/func_802D4050.s index 17898b4c36..95b0469d33 100644 --- a/ver/us/asm/nonmatchings/code_F5750/func_802D4050.s +++ b/ver/us/asm/nonmatchings/code_F5750/func_802D4050.s @@ -28,7 +28,7 @@ glabel func_802D4050 /* F8A5C 802D40AC 0040182D */ daddu $v1, $v0, $zero /* F8A60 802D40B0 26100001 */ addiu $s0, $s0, 1 /* F8A64 802D40B4 2E020006 */ sltiu $v0, $s0, 6 -/* F8A68 802D40B8 10400023 */ beqz $v0, .L802D4148 +/* F8A68 802D40B8 10400023 */ beqz $v0, L802D4148_F8AF8 /* F8A6C 802D40BC 00101080 */ sll $v0, $s0, 2 /* F8A70 802D40C0 3C01802E */ lui $at, %hi(jtbl_802DA240) /* F8A74 802D40C4 00220821 */ addu $at, $at, $v0 @@ -37,7 +37,7 @@ glabel func_802D4050 /* F8A80 802D40D0 00000000 */ nop glabel L802D40D4_F8A84 /* F8A84 802D40D4 24020001 */ addiu $v0, $zero, 1 -/* F8A88 802D40D8 080B5052 */ j .L802D4148 +/* F8A88 802D40D8 080B5052 */ j L802D4148_F8AF8 /* F8A8C 802D40DC A0620004 */ sb $v0, 4($v1) glabel L802D40E0_F8A90 /* F8A90 802D40E0 24020001 */ addiu $v0, $zero, 1 @@ -71,7 +71,6 @@ glabel L802D4104_F8AB4 /* F8AEC 802D413C 8E250000 */ lw $a1, ($s1) /* F8AF0 802D4140 0C0B1EAF */ jal get_variable /* F8AF4 802D4144 0240202D */ daddu $a0, $s2, $zero -.L802D4148: glabel L802D4148_F8AF8 /* F8AF8 802D4148 8FBF001C */ lw $ra, 0x1c($sp) /* F8AFC 802D414C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_FBE10/PlayEffect.s b/ver/us/asm/nonmatchings/code_FBE10/PlayEffect.s index 1e0df6a5c7..8248e487ce 100644 --- a/ver/us/asm/nonmatchings/code_FBE10/PlayEffect.s +++ b/ver/us/asm/nonmatchings/code_FBE10/PlayEffect.s @@ -172,7 +172,7 @@ glabel PlayEffect /* FCEE8 802D8538 8E530000 */ lw $s3, ($s2) /* FCEEC 802D853C 8E510004 */ lw $s1, 4($s2) /* FCEF0 802D8540 2C620087 */ sltiu $v0, $v1, 0x87 -/* FCEF4 802D8544 10400450 */ beqz $v0, .L802D9688 +/* FCEF4 802D8544 10400450 */ beqz $v0, L802D9688_FE038 /* FCEF8 802D8548 00031080 */ sll $v0, $v1, 2 /* FCEFC 802D854C 3C01802E */ lui $at, %hi(jtbl_802DA258) /* FCF00 802D8550 00220821 */ addu $at, $at, $v0 @@ -1406,9 +1406,8 @@ glabel L802D9668_FE018 /* FE02C 802D967C AFB40014 */ sw $s4, 0x14($sp) /* FE030 802D9680 080B65A4 */ j .L802D9690 /* FE034 802D9684 0040A82D */ daddu $s5, $v0, $zero -.L802D9688: glabel L802D9688_FE038 -/* FE038 802D9688 080B65A2 */ j .L802D9688 +/* FE038 802D9688 080B65A2 */ j L802D9688_FE038 /* FE03C 802D968C 00000000 */ nop .L802D9690: /* FE040 802D9690 12A00005 */ beqz $s5, .L802D96A8 diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s index 7f6124dff3..ee8791bb90 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s @@ -766,7 +766,7 @@ glabel L801138A8_A9FA8 /* AA2F0 80113BF0 2663FFFF */ addiu $v1, $s3, -1 .L80113BF4: /* AA2F4 80113BF4 2C62000B */ sltiu $v0, $v1, 0xb -/* AA2F8 80113BF8 104002A5 */ beqz $v0, .L80114690 +/* AA2F8 80113BF8 104002A5 */ beqz $v0, L80114690_AAD90 /* AA2FC 80113BFC 00031080 */ sll $v0, $v1, 2 /* AA300 80113C00 3C018015 */ lui $at, %hi(jtbl_8014F9B0) /* AA304 80113C04 00220821 */ addu $at, $at, $v0 @@ -778,7 +778,7 @@ glabel L80113C14_AA314 /* AA318 80113C18 00021600 */ sll $v0, $v0, 0x18 /* AA31C 80113C1C 00021E03 */ sra $v1, $v0, 0x18 /* AA320 80113C20 2C62002F */ sltiu $v0, $v1, 0x2f -/* AA324 80113C24 1040002A */ beqz $v0, .L80113CD0 +/* AA324 80113C24 1040002A */ beqz $v0, L80113CD0_AA3D0 /* AA328 80113C28 00031080 */ sll $v0, $v1, 2 /* AA32C 80113C2C 3C018015 */ lui $at, %hi(jtbl_8014F9E0) /* AA330 80113C30 00220821 */ addu $at, $at, $v0 @@ -839,7 +839,6 @@ glabel L80113CC0_AA3C0 glabel L80113CC8_AA3C8 /* AA3C8 80113CC8 08045199 */ j .L80114664 /* AA3CC 80113CCC 24050038 */ addiu $a1, $zero, 0x38 -.L80113CD0: glabel L80113CD0_AA3D0 /* AA3D0 80113CD0 08045199 */ j .L80114664 /* AA3D4 80113CD4 0000282D */ daddu $a1, $zero, $zero @@ -848,7 +847,7 @@ glabel L80113CD8_AA3D8 /* AA3DC 80113CDC 00021600 */ sll $v0, $v0, 0x18 /* AA3E0 80113CE0 00021E03 */ sra $v1, $v0, 0x18 /* AA3E4 80113CE4 2C62002F */ sltiu $v0, $v1, 0x2f -/* AA3E8 80113CE8 10400028 */ beqz $v0, .L80113D8C +/* AA3E8 80113CE8 10400028 */ beqz $v0, L80113D8C_AA48C /* AA3EC 80113CEC 00031080 */ sll $v0, $v1, 2 /* AA3F0 80113CF0 3C018015 */ lui $at, %hi(jtbl_8014FAA0) /* AA3F4 80113CF4 00220821 */ addu $at, $at, $v0 @@ -906,7 +905,6 @@ glabel L80113D7C_AA47C glabel L80113D84_AA484 /* AA484 80113D84 08045199 */ j .L80114664 /* AA488 80113D88 2405003A */ addiu $a1, $zero, 0x3a -.L80113D8C: glabel L80113D8C_AA48C /* AA48C 80113D8C 08045199 */ j .L80114664 /* AA490 80113D90 24050010 */ addiu $a1, $zero, 0x10 @@ -915,7 +913,7 @@ glabel L80113D94_AA494 /* AA498 80113D98 00021600 */ sll $v0, $v0, 0x18 /* AA49C 80113D9C 00021E03 */ sra $v1, $v0, 0x18 /* AA4A0 80113DA0 2C62002F */ sltiu $v0, $v1, 0x2f -/* AA4A4 80113DA4 10400028 */ beqz $v0, .L80113E48 +/* AA4A4 80113DA4 10400028 */ beqz $v0, L80113E48_AA548 /* AA4A8 80113DA8 00031080 */ sll $v0, $v1, 2 /* AA4AC 80113DAC 3C018015 */ lui $at, %hi(jtbl_8014FB60) /* AA4B0 80113DB0 00220821 */ addu $at, $at, $v0 @@ -973,7 +971,6 @@ glabel L80113E38_AA538 glabel L80113E40_AA540 /* AA540 80113E40 08044F93 */ j .L80113E4C /* AA544 80113E44 2405003C */ addiu $a1, $zero, 0x3c -.L80113E48: glabel L80113E48_AA548 /* AA548 80113E48 2405001F */ addiu $a1, $zero, 0x1f .L80113E4C: @@ -1049,7 +1046,7 @@ glabel L80113E48_AA548 /* AA650 80113F50 00063400 */ sll $a2, $a2, 0x10 /* AA654 80113F54 3042FFFF */ andi $v0, $v0, 0xffff /* AA658 80113F58 00C23025 */ or $a2, $a2, $v0 -/* AA65C 80113F5C 080451A4 */ j .L80114690 +/* AA65C 80113F5C 080451A4 */ j L80114690_AAD90 /* AA660 80113F60 ACA60004 */ sw $a2, 4($a1) glabel L80113F64_AA664 /* AA664 80113F64 3C038015 */ lui $v1, %hi(D_8014B74C) @@ -1069,7 +1066,7 @@ glabel L80113F64_AA664 /* AA69C 80113F9C 00021600 */ sll $v0, $v0, 0x18 /* AA6A0 80113FA0 00021E03 */ sra $v1, $v0, 0x18 /* AA6A4 80113FA4 2C62002F */ sltiu $v0, $v1, 0x2f -/* AA6A8 80113FA8 104000A2 */ beqz $v0, .L80114234 +/* AA6A8 80113FA8 104000A2 */ beqz $v0, L80114234_AA934 /* AA6AC 80113FAC 00031080 */ sll $v0, $v1, 2 /* AA6B0 80113FB0 3C018015 */ lui $at, %hi(jtbl_8014FC20) /* AA6B4 80113FB4 00220821 */ addu $at, $at, $v0 @@ -1252,7 +1249,6 @@ glabel L80114204_AA904 /* AA928 80114228 AC820000 */ sw $v0, ($a0) /* AA92C 8011422C AC660000 */ sw $a2, ($v1) /* AA930 80114230 AC650004 */ sw $a1, 4($v1) -.L80114234: glabel L80114234_AA934 /* AA934 80114234 3C0910AA */ lui $t1, 0x10aa /* AA938 80114238 8E020000 */ lw $v0, ($s0) @@ -1300,14 +1296,14 @@ glabel L80114234_AA934 /* AA9E0 801142E0 3C02DB08 */ lui $v0, 0xdb08 /* AA9E4 801142E4 AE050000 */ sw $a1, ($s0) /* AA9E8 801142E8 AC620000 */ sw $v0, ($v1) -/* AA9EC 801142EC 080451A4 */ j .L80114690 +/* AA9EC 801142EC 080451A4 */ j L80114690_AAD90 /* AA9F0 801142F0 AC690004 */ sw $t1, 4($v1) glabel L801142F4_AA9F4 /* AA9F4 801142F4 2682FFFF */ addiu $v0, $s4, -1 /* AA9F8 801142F8 00021600 */ sll $v0, $v0, 0x18 /* AA9FC 801142FC 00021E03 */ sra $v1, $v0, 0x18 /* AAA00 80114300 2C62002F */ sltiu $v0, $v1, 0x2f -/* AAA04 80114304 10400028 */ beqz $v0, .L801143A8 +/* AAA04 80114304 10400028 */ beqz $v0, L801143A8_AAAA8 /* AAA08 80114308 00031080 */ sll $v0, $v1, 2 /* AAA0C 8011430C 3C018015 */ lui $at, %hi(jtbl_8014FCE0) /* AAA10 80114310 00220821 */ addu $at, $at, $v0 @@ -1365,7 +1361,6 @@ glabel L80114398_AAA98 glabel L801143A0_AAAA0 /* AAAA0 801143A0 080450EB */ j .L801143AC /* AAAA4 801143A4 2405003C */ addiu $a1, $zero, 0x3c -.L801143A8: glabel L801143A8_AAAA8 /* AAAA8 801143A8 2405001F */ addiu $a1, $zero, 0x1f .L801143AC: @@ -1523,14 +1518,14 @@ glabel L801143A8_AAAA8 /* AACF8 801145F8 3C02DB08 */ lui $v0, 0xdb08 /* AACFC 801145FC AD640004 */ sw $a0, 4($t3) /* AAD00 80114600 ACE20000 */ sw $v0, ($a3) -/* AAD04 80114604 080451A4 */ j .L80114690 +/* AAD04 80114604 080451A4 */ j L80114690_AAD90 /* AAD08 80114608 ACE90004 */ sw $t1, 4($a3) glabel L8011460C_AAD0C /* AAD0C 8011460C 2682FFFF */ addiu $v0, $s4, -1 /* AAD10 80114610 00021600 */ sll $v0, $v0, 0x18 /* AAD14 80114614 00021E03 */ sra $v1, $v0, 0x18 /* AAD18 80114618 2C62002F */ sltiu $v0, $v1, 0x2f -/* AAD1C 8011461C 10400010 */ beqz $v0, .L80114660 +/* AAD1C 8011461C 10400010 */ beqz $v0, L80114660_AAD60 /* AAD20 80114620 00031080 */ sll $v0, $v1, 2 /* AAD24 80114624 3C018015 */ lui $at, %hi(jtbl_8014FDA0) /* AAD28 80114628 00220821 */ addu $at, $at, $v0 @@ -1552,7 +1547,6 @@ glabel L80114650_AAD50 glabel L80114658_AAD58 /* AAD58 80114658 08045199 */ j .L80114664 /* AAD5C 8011465C 2405003C */ addiu $a1, $zero, 0x3c -.L80114660: glabel L80114660_AAD60 /* AAD60 80114660 2405001F */ addiu $a1, $zero, 0x1f .L80114664: @@ -1567,7 +1561,6 @@ glabel L80114660_AAD60 /* AAD84 80114684 24630008 */ addiu $v1, $v1, 8 /* AAD88 80114688 AE030000 */ sw $v1, ($s0) /* AAD8C 8011468C AC820004 */ sw $v0, 4($a0) -.L80114690: glabel L80114690_AAD90 /* AAD90 80114690 33020008 */ andi $v0, $t8, 8 /* AAD94 80114694 14400016 */ bnez $v0, .L801146F0 diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s index c6fa01e5e5..cf3132f2e7 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s @@ -180,7 +180,7 @@ glabel create_entity /* A8258 80111B58 90420020 */ lbu $v0, 0x20($v0) /* A825C 80111B5C 2443FFF9 */ addiu $v1, $v0, -7 /* A8260 80111B60 2C62002B */ sltiu $v0, $v1, 0x2b -/* A8264 80111B64 10400009 */ beqz $v0, .L80111B8C +/* A8264 80111B64 10400009 */ beqz $v0, L80111B8C_A828C /* A8268 80111B68 00031080 */ sll $v0, $v1, 2 /* A826C 80111B6C 3C018015 */ lui $at, %hi(jtbl_8014F878) /* A8270 80111B70 00220821 */ addu $at, $at, $v0 @@ -191,7 +191,6 @@ glabel L80111B80_A8280 /* A8280 80111B80 8E020000 */ lw $v0, ($s0) /* A8284 80111B84 34424000 */ ori $v0, $v0, 0x4000 /* A8288 80111B88 AE020000 */ sw $v0, ($s0) -.L80111B8C: glabel L80111B8C_A828C /* A828C 80111B8C 8FA20040 */ lw $v0, 0x40($sp) /* A8290 80111B90 8C42000C */ lw $v0, 0xc($v0) diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s index a8685a9d26..256cca4758 100644 --- a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s +++ b/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s @@ -21,7 +21,7 @@ glabel func_801109DC /* A711C 80110A1C 0200102D */ daddu $v0, $s0, $zero /* A7120 80110A20 2623FFF9 */ addiu $v1, $s1, -7 /* A7124 80110A24 2C620020 */ sltiu $v0, $v1, 0x20 -/* A7128 80110A28 1040000F */ beqz $v0, .L80110A68 +/* A7128 80110A28 1040000F */ beqz $v0, L80110A68_A7168 /* A712C 80110A2C 00031080 */ sll $v0, $v1, 2 /* A7130 80110A30 3C018015 */ lui $at, %hi(jtbl_8014F768) /* A7134 80110A34 00220821 */ addu $at, $at, $v0 @@ -31,14 +31,13 @@ glabel func_801109DC .L80110A44: /* A7144 80110A44 2623FFF9 */ addiu $v1, $s1, -7 /* A7148 80110A48 2C62001C */ sltiu $v0, $v1, 0x1c -/* A714C 80110A4C 10400006 */ beqz $v0, .L80110A68 +/* A714C 80110A4C 10400006 */ beqz $v0, L80110A68_A7168 /* A7150 80110A50 00031080 */ sll $v0, $v1, 2 /* A7154 80110A54 3C018015 */ lui $at, %hi(jtbl_8014F7E8) /* A7158 80110A58 00220821 */ addu $at, $at, $v0 /* A715C 80110A5C 8C22F7E8 */ lw $v0, %lo(jtbl_8014F7E8)($at) /* A7160 80110A60 00400008 */ jr $v0 /* A7164 80110A64 00000000 */ nop -.L80110A68: glabel L80110A68_A7168 /* A7168 80110A68 080442A5 */ j .L80110A94 /* A716C 80110A6C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_entity_model.s b/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_entity_model.s index 3136d960ef..0406adf4bf 100644 --- a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_entity_model.s +++ b/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_entity_model.s @@ -120,7 +120,7 @@ glabel appendGfx_entity_model /* B7A44 80121344 00021600 */ sll $v0, $v0, 0x18 /* B7A48 80121348 00021E03 */ sra $v1, $v0, 0x18 /* B7A4C 8012134C 2C62002D */ sltiu $v0, $v1, 0x2d -/* B7A50 80121350 10400156 */ beqz $v0, .L801218AC +/* B7A50 80121350 10400156 */ beqz $v0, L801218AC_B7FAC /* B7A54 80121354 00031080 */ sll $v0, $v1, 2 /* B7A58 80121358 3C018015 */ lui $at, %hi(jtbl_801500D0) /* B7A5C 8012135C 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,7 @@ glabel L8012136C_B7A6C /* B7A88 80121388 AC820000 */ sw $v0, ($a0) /* B7A8C 8012138C 3C028015 */ lui $v0, %hi(D_8014B7F8) /* B7A90 80121390 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) -/* B7A94 80121394 0804862B */ j .L801218AC +/* B7A94 80121394 0804862B */ j L801218AC_B7FAC /* B7A98 80121398 AC820004 */ sw $v0, 4($a0) glabel L8012139C_B7A9C /* B7A9C 8012139C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -151,7 +151,7 @@ glabel L8012139C_B7A9C /* B7AB8 801213B8 AC820000 */ sw $v0, ($a0) /* B7ABC 801213BC 3C028015 */ lui $v0, %hi(D_8014B820) /* B7AC0 801213C0 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) -/* B7AC4 801213C4 0804862B */ j .L801218AC +/* B7AC4 801213C4 0804862B */ j L801218AC_B7FAC /* B7AC8 801213C8 AC820004 */ sw $v0, 4($a0) glabel L801213CC_B7ACC /* B7ACC 801213CC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -164,7 +164,7 @@ glabel L801213CC_B7ACC /* B7AE8 801213E8 AC820000 */ sw $v0, ($a0) /* B7AEC 801213EC 3C028015 */ lui $v0, %hi(D_8014B848) /* B7AF0 801213F0 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) -/* B7AF4 801213F4 0804862B */ j .L801218AC +/* B7AF4 801213F4 0804862B */ j L801218AC_B7FAC /* B7AF8 801213F8 AC820004 */ sw $v0, 4($a0) glabel L801213FC_B7AFC /* B7AFC 801213FC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -177,7 +177,7 @@ glabel L801213FC_B7AFC /* B7B18 80121418 AC820000 */ sw $v0, ($a0) /* B7B1C 8012141C 3C028015 */ lui $v0, %hi(D_8014B870) /* B7B20 80121420 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) -/* B7B24 80121424 0804862B */ j .L801218AC +/* B7B24 80121424 0804862B */ j L801218AC_B7FAC /* B7B28 80121428 AC820004 */ sw $v0, 4($a0) glabel L8012142C_B7B2C /* B7B2C 8012142C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -190,7 +190,7 @@ glabel L8012142C_B7B2C /* B7B48 80121448 AC820000 */ sw $v0, ($a0) /* B7B4C 8012144C 3C028015 */ lui $v0, %hi(D_8014B898) /* B7B50 80121450 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) -/* B7B54 80121454 0804862B */ j .L801218AC +/* B7B54 80121454 0804862B */ j L801218AC_B7FAC /* B7B58 80121458 AC820004 */ sw $v0, 4($a0) glabel L8012145C_B7B5C /* B7B5C 8012145C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -203,7 +203,7 @@ glabel L8012145C_B7B5C /* B7B78 80121478 AC820000 */ sw $v0, ($a0) /* B7B7C 8012147C 3C028015 */ lui $v0, %hi(D_8014B9B0) /* B7B80 80121480 2442B9B0 */ addiu $v0, $v0, %lo(D_8014B9B0) -/* B7B84 80121484 0804862B */ j .L801218AC +/* B7B84 80121484 0804862B */ j L801218AC_B7FAC /* B7B88 80121488 AC820004 */ sw $v0, 4($a0) glabel L8012148C_B7B8C /* B7B8C 8012148C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -216,7 +216,7 @@ glabel L8012148C_B7B8C /* B7BA8 801214A8 AC820000 */ sw $v0, ($a0) /* B7BAC 801214AC 3C028015 */ lui $v0, %hi(D_8014B8C0) /* B7BB0 801214B0 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) -/* B7BB4 801214B4 0804862B */ j .L801218AC +/* B7BB4 801214B4 0804862B */ j L801218AC_B7FAC /* B7BB8 801214B8 AC820004 */ sw $v0, 4($a0) glabel L801214BC_B7BBC /* B7BBC 801214BC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -229,7 +229,7 @@ glabel L801214BC_B7BBC /* B7BD8 801214D8 AC820000 */ sw $v0, ($a0) /* B7BDC 801214DC 3C028015 */ lui $v0, %hi(D_8014B9D8) /* B7BE0 801214E0 2442B9D8 */ addiu $v0, $v0, %lo(D_8014B9D8) -/* B7BE4 801214E4 0804862B */ j .L801218AC +/* B7BE4 801214E4 0804862B */ j L801218AC_B7FAC /* B7BE8 801214E8 AC820004 */ sw $v0, 4($a0) glabel L801214EC_B7BEC /* B7BEC 801214EC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -242,7 +242,7 @@ glabel L801214EC_B7BEC /* B7C08 80121508 AC820000 */ sw $v0, ($a0) /* B7C0C 8012150C 3C028015 */ lui $v0, %hi(D_8014B8E8) /* B7C10 80121510 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) -/* B7C14 80121514 0804862B */ j .L801218AC +/* B7C14 80121514 0804862B */ j L801218AC_B7FAC /* B7C18 80121518 AC820004 */ sw $v0, 4($a0) glabel L8012151C_B7C1C /* B7C1C 8012151C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -255,7 +255,7 @@ glabel L8012151C_B7C1C /* B7C38 80121538 AC820000 */ sw $v0, ($a0) /* B7C3C 8012153C 3C028015 */ lui $v0, %hi(D_8014BA00) /* B7C40 80121540 2442BA00 */ addiu $v0, $v0, %lo(D_8014BA00) -/* B7C44 80121544 0804862B */ j .L801218AC +/* B7C44 80121544 0804862B */ j L801218AC_B7FAC /* B7C48 80121548 AC820004 */ sw $v0, 4($a0) glabel L8012154C_B7C4C /* B7C4C 8012154C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -268,7 +268,7 @@ glabel L8012154C_B7C4C /* B7C68 80121568 AC820000 */ sw $v0, ($a0) /* B7C6C 8012156C 3C028015 */ lui $v0, %hi(D_8014B988) /* B7C70 80121570 2442B988 */ addiu $v0, $v0, %lo(D_8014B988) -/* B7C74 80121574 0804862B */ j .L801218AC +/* B7C74 80121574 0804862B */ j L801218AC_B7FAC /* B7C78 80121578 AC820004 */ sw $v0, 4($a0) glabel L8012157C_B7C7C /* B7C7C 8012157C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -281,7 +281,7 @@ glabel L8012157C_B7C7C /* B7C98 80121598 AC820000 */ sw $v0, ($a0) /* B7C9C 8012159C 3C028015 */ lui $v0, %hi(D_8014BA48) /* B7CA0 801215A0 2442BA48 */ addiu $v0, $v0, %lo(D_8014BA48) -/* B7CA4 801215A4 0804862B */ j .L801218AC +/* B7CA4 801215A4 0804862B */ j L801218AC_B7FAC /* B7CA8 801215A8 AC820004 */ sw $v0, 4($a0) glabel L801215AC_B7CAC /* B7CAC 801215AC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -294,7 +294,7 @@ glabel L801215AC_B7CAC /* B7CC8 801215C8 AC820000 */ sw $v0, ($a0) /* B7CCC 801215CC 3C028015 */ lui $v0, %hi(D_8014BA70) /* B7CD0 801215D0 2442BA70 */ addiu $v0, $v0, %lo(D_8014BA70) -/* B7CD4 801215D4 0804862B */ j .L801218AC +/* B7CD4 801215D4 0804862B */ j L801218AC_B7FAC /* B7CD8 801215D8 AC820004 */ sw $v0, 4($a0) glabel L801215DC_B7CDC /* B7CDC 801215DC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -307,7 +307,7 @@ glabel L801215DC_B7CDC /* B7CF8 801215F8 AC820000 */ sw $v0, ($a0) /* B7CFC 801215FC 3C028015 */ lui $v0, %hi(D_8014BA98) /* B7D00 80121600 2442BA98 */ addiu $v0, $v0, %lo(D_8014BA98) -/* B7D04 80121604 0804862B */ j .L801218AC +/* B7D04 80121604 0804862B */ j L801218AC_B7FAC /* B7D08 80121608 AC820004 */ sw $v0, 4($a0) glabel L8012160C_B7D0C /* B7D0C 8012160C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -320,7 +320,7 @@ glabel L8012160C_B7D0C /* B7D28 80121628 AC820000 */ sw $v0, ($a0) /* B7D2C 8012162C 3C028015 */ lui $v0, %hi(D_8014BAE8) /* B7D30 80121630 2442BAE8 */ addiu $v0, $v0, %lo(D_8014BAE8) -/* B7D34 80121634 0804862B */ j .L801218AC +/* B7D34 80121634 0804862B */ j L801218AC_B7FAC /* B7D38 80121638 AC820004 */ sw $v0, 4($a0) .L8012163C: /* B7D3C 8012163C 92420004 */ lbu $v0, 4($s2) @@ -328,7 +328,7 @@ glabel L8012160C_B7D0C /* B7D44 80121644 00021600 */ sll $v0, $v0, 0x18 /* B7D48 80121648 00021E03 */ sra $v1, $v0, 0x18 /* B7D4C 8012164C 2C620026 */ sltiu $v0, $v1, 0x26 -/* B7D50 80121650 10400059 */ beqz $v0, .L801217B8 +/* B7D50 80121650 10400059 */ beqz $v0, L801217B8_B7EB8 /* B7D54 80121654 00031080 */ sll $v0, $v1, 2 /* B7D58 80121658 3C018015 */ lui $at, %hi(jtbl_80150188) /* B7D5C 8012165C 00220821 */ addu $at, $at, $v0 @@ -346,7 +346,7 @@ glabel L8012166C_B7D6C /* B7D88 80121688 AC820000 */ sw $v0, ($a0) /* B7D8C 8012168C 3C028015 */ lui $v0, %hi(D_8014BE78) /* B7D90 80121690 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) -/* B7D94 80121694 080485EE */ j .L801217B8 +/* B7D94 80121694 080485EE */ j L801217B8_B7EB8 /* B7D98 80121698 AC820004 */ sw $v0, 4($a0) glabel L8012169C_B7D9C /* B7D9C 8012169C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -359,7 +359,7 @@ glabel L8012169C_B7D9C /* B7DB8 801216B8 AC820000 */ sw $v0, ($a0) /* B7DBC 801216BC 3C028015 */ lui $v0, %hi(D_8014BEA0) /* B7DC0 801216C0 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) -/* B7DC4 801216C4 080485EE */ j .L801217B8 +/* B7DC4 801216C4 080485EE */ j L801217B8_B7EB8 /* B7DC8 801216C8 AC820004 */ sw $v0, 4($a0) glabel L801216CC_B7DCC /* B7DCC 801216CC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -372,7 +372,7 @@ glabel L801216CC_B7DCC /* B7DE8 801216E8 AC820000 */ sw $v0, ($a0) /* B7DEC 801216EC 3C028015 */ lui $v0, %hi(D_8014BEC8) /* B7DF0 801216F0 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) -/* B7DF4 801216F4 080485EE */ j .L801217B8 +/* B7DF4 801216F4 080485EE */ j L801217B8_B7EB8 /* B7DF8 801216F8 AC820004 */ sw $v0, 4($a0) glabel L801216FC_B7DFC /* B7DFC 801216FC 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -385,7 +385,7 @@ glabel L801216FC_B7DFC /* B7E18 80121718 AC820000 */ sw $v0, ($a0) /* B7E1C 8012171C 3C028015 */ lui $v0, %hi(D_8014BEF0) /* B7E20 80121720 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) -/* B7E24 80121724 080485EE */ j .L801217B8 +/* B7E24 80121724 080485EE */ j L801217B8_B7EB8 /* B7E28 80121728 AC820004 */ sw $v0, 4($a0) glabel L8012172C_B7E2C /* B7E2C 8012172C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -398,7 +398,7 @@ glabel L8012172C_B7E2C /* B7E48 80121748 AC820000 */ sw $v0, ($a0) /* B7E4C 8012174C 3C028015 */ lui $v0, %hi(D_8014BF18) /* B7E50 80121750 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) -/* B7E54 80121754 080485EE */ j .L801217B8 +/* B7E54 80121754 080485EE */ j L801217B8_B7EB8 /* B7E58 80121758 AC820004 */ sw $v0, 4($a0) glabel L8012175C_B7E5C /* B7E5C 8012175C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -411,7 +411,7 @@ glabel L8012175C_B7E5C /* B7E78 80121778 AC820000 */ sw $v0, ($a0) /* B7E7C 8012177C 3C028015 */ lui $v0, %hi(D_8014BF40) /* B7E80 80121780 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) -/* B7E84 80121784 080485EE */ j .L801217B8 +/* B7E84 80121784 080485EE */ j L801217B8_B7EB8 /* B7E88 80121788 AC820004 */ sw $v0, 4($a0) glabel L8012178C_B7E8C /* B7E8C 8012178C 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -425,7 +425,6 @@ glabel L8012178C_B7E8C /* B7EAC 801217AC 3C028015 */ lui $v0, %hi(D_8014BF68) /* B7EB0 801217B0 2442BF68 */ addiu $v0, $v0, %lo(D_8014BF68) /* B7EB4 801217B4 AC820004 */ sw $v0, 4($a0) -.L801217B8: glabel L801217B8_B7EB8 /* B7EB8 801217B8 3C070001 */ lui $a3, 1 /* B7EBC 801217BC 3C028015 */ lui $v0, %hi(D_80154390) @@ -492,7 +491,6 @@ glabel L801217B8_B7EB8 /* B7FA0 801218A0 30A5FFFF */ andi $a1, $a1, 0xffff /* B7FA4 801218A4 00E53825 */ or $a3, $a3, $a1 /* B7FA8 801218A8 ACC70004 */ sw $a3, 4($a2) -.L801218AC: glabel L801218AC_B7FAC /* B7FAC 801218AC 3C02D9FD */ lui $v0, 0xd9fd .L801218B0: diff --git a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s b/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s index 113ce17435..a32e75c135 100644 --- a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s +++ b/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s @@ -109,7 +109,7 @@ glabel draw_entity_model_extra3 /* B8B18 80122418 00021600 */ sll $v0, $v0, 0x18 /* B8B1C 8012241C 00021E03 */ sra $v1, $v0, 0x18 /* B8B20 80122420 2C62002D */ sltiu $v0, $v1, 0x2d -/* B8B24 80122424 10400156 */ beqz $v0, .L80122980 +/* B8B24 80122424 10400156 */ beqz $v0, L80122980_B9080 /* B8B28 80122428 00031080 */ sll $v0, $v1, 2 /* B8B2C 8012242C 3C018015 */ lui $at, %hi(jtbl_80150220) /* B8B30 80122430 00220821 */ addu $at, $at, $v0 @@ -127,7 +127,7 @@ glabel L80122440_B8B40 /* B8B5C 8012245C AC820000 */ sw $v0, ($a0) /* B8B60 80122460 3C028015 */ lui $v0, %hi(D_8014B7F8) /* B8B64 80122464 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) -/* B8B68 80122468 08048A60 */ j .L80122980 +/* B8B68 80122468 08048A60 */ j L80122980_B9080 /* B8B6C 8012246C AC820004 */ sw $v0, 4($a0) glabel L80122470_B8B70 /* B8B70 80122470 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -140,7 +140,7 @@ glabel L80122470_B8B70 /* B8B8C 8012248C AC820000 */ sw $v0, ($a0) /* B8B90 80122490 3C028015 */ lui $v0, %hi(D_8014B820) /* B8B94 80122494 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) -/* B8B98 80122498 08048A60 */ j .L80122980 +/* B8B98 80122498 08048A60 */ j L80122980_B9080 /* B8B9C 8012249C AC820004 */ sw $v0, 4($a0) glabel L801224A0_B8BA0 /* B8BA0 801224A0 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -153,7 +153,7 @@ glabel L801224A0_B8BA0 /* B8BBC 801224BC AC820000 */ sw $v0, ($a0) /* B8BC0 801224C0 3C028015 */ lui $v0, %hi(D_8014B848) /* B8BC4 801224C4 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) -/* B8BC8 801224C8 08048A60 */ j .L80122980 +/* B8BC8 801224C8 08048A60 */ j L80122980_B9080 /* B8BCC 801224CC AC820004 */ sw $v0, 4($a0) glabel L801224D0_B8BD0 /* B8BD0 801224D0 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -166,7 +166,7 @@ glabel L801224D0_B8BD0 /* B8BEC 801224EC AC820000 */ sw $v0, ($a0) /* B8BF0 801224F0 3C028015 */ lui $v0, %hi(D_8014B870) /* B8BF4 801224F4 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) -/* B8BF8 801224F8 08048A60 */ j .L80122980 +/* B8BF8 801224F8 08048A60 */ j L80122980_B9080 /* B8BFC 801224FC AC820004 */ sw $v0, 4($a0) glabel L80122500_B8C00 /* B8C00 80122500 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -179,7 +179,7 @@ glabel L80122500_B8C00 /* B8C1C 8012251C AC820000 */ sw $v0, ($a0) /* B8C20 80122520 3C028015 */ lui $v0, %hi(D_8014B898) /* B8C24 80122524 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) -/* B8C28 80122528 08048A60 */ j .L80122980 +/* B8C28 80122528 08048A60 */ j L80122980_B9080 /* B8C2C 8012252C AC820004 */ sw $v0, 4($a0) glabel L80122530_B8C30 /* B8C30 80122530 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -192,7 +192,7 @@ glabel L80122530_B8C30 /* B8C4C 8012254C AC820000 */ sw $v0, ($a0) /* B8C50 80122550 3C028015 */ lui $v0, %hi(D_8014B9B0) /* B8C54 80122554 2442B9B0 */ addiu $v0, $v0, %lo(D_8014B9B0) -/* B8C58 80122558 08048A60 */ j .L80122980 +/* B8C58 80122558 08048A60 */ j L80122980_B9080 /* B8C5C 8012255C AC820004 */ sw $v0, 4($a0) glabel L80122560_B8C60 /* B8C60 80122560 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -205,7 +205,7 @@ glabel L80122560_B8C60 /* B8C7C 8012257C AC820000 */ sw $v0, ($a0) /* B8C80 80122580 3C028015 */ lui $v0, %hi(D_8014B8C0) /* B8C84 80122584 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) -/* B8C88 80122588 08048A60 */ j .L80122980 +/* B8C88 80122588 08048A60 */ j L80122980_B9080 /* B8C8C 8012258C AC820004 */ sw $v0, 4($a0) glabel L80122590_B8C90 /* B8C90 80122590 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -218,7 +218,7 @@ glabel L80122590_B8C90 /* B8CAC 801225AC AC820000 */ sw $v0, ($a0) /* B8CB0 801225B0 3C028015 */ lui $v0, %hi(D_8014B9D8) /* B8CB4 801225B4 2442B9D8 */ addiu $v0, $v0, %lo(D_8014B9D8) -/* B8CB8 801225B8 08048A60 */ j .L80122980 +/* B8CB8 801225B8 08048A60 */ j L80122980_B9080 /* B8CBC 801225BC AC820004 */ sw $v0, 4($a0) glabel L801225C0_B8CC0 /* B8CC0 801225C0 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -231,7 +231,7 @@ glabel L801225C0_B8CC0 /* B8CDC 801225DC AC820000 */ sw $v0, ($a0) /* B8CE0 801225E0 3C028015 */ lui $v0, %hi(D_8014B8E8) /* B8CE4 801225E4 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) -/* B8CE8 801225E8 08048A60 */ j .L80122980 +/* B8CE8 801225E8 08048A60 */ j L80122980_B9080 /* B8CEC 801225EC AC820004 */ sw $v0, 4($a0) glabel L801225F0_B8CF0 /* B8CF0 801225F0 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -244,7 +244,7 @@ glabel L801225F0_B8CF0 /* B8D0C 8012260C AC820000 */ sw $v0, ($a0) /* B8D10 80122610 3C028015 */ lui $v0, %hi(D_8014BA00) /* B8D14 80122614 2442BA00 */ addiu $v0, $v0, %lo(D_8014BA00) -/* B8D18 80122618 08048A60 */ j .L80122980 +/* B8D18 80122618 08048A60 */ j L80122980_B9080 /* B8D1C 8012261C AC820004 */ sw $v0, 4($a0) glabel L80122620_B8D20 /* B8D20 80122620 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -257,7 +257,7 @@ glabel L80122620_B8D20 /* B8D3C 8012263C AC820000 */ sw $v0, ($a0) /* B8D40 80122640 3C028015 */ lui $v0, %hi(D_8014B988) /* B8D44 80122644 2442B988 */ addiu $v0, $v0, %lo(D_8014B988) -/* B8D48 80122648 08048A60 */ j .L80122980 +/* B8D48 80122648 08048A60 */ j L80122980_B9080 /* B8D4C 8012264C AC820004 */ sw $v0, 4($a0) glabel L80122650_B8D50 /* B8D50 80122650 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -270,7 +270,7 @@ glabel L80122650_B8D50 /* B8D6C 8012266C AC820000 */ sw $v0, ($a0) /* B8D70 80122670 3C028015 */ lui $v0, %hi(D_8014BA48) /* B8D74 80122674 2442BA48 */ addiu $v0, $v0, %lo(D_8014BA48) -/* B8D78 80122678 08048A60 */ j .L80122980 +/* B8D78 80122678 08048A60 */ j L80122980_B9080 /* B8D7C 8012267C AC820004 */ sw $v0, 4($a0) glabel L80122680_B8D80 /* B8D80 80122680 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -283,7 +283,7 @@ glabel L80122680_B8D80 /* B8D9C 8012269C AC820000 */ sw $v0, ($a0) /* B8DA0 801226A0 3C028015 */ lui $v0, %hi(D_8014BA70) /* B8DA4 801226A4 2442BA70 */ addiu $v0, $v0, %lo(D_8014BA70) -/* B8DA8 801226A8 08048A60 */ j .L80122980 +/* B8DA8 801226A8 08048A60 */ j L80122980_B9080 /* B8DAC 801226AC AC820004 */ sw $v0, 4($a0) glabel L801226B0_B8DB0 /* B8DB0 801226B0 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -296,7 +296,7 @@ glabel L801226B0_B8DB0 /* B8DCC 801226CC AC820000 */ sw $v0, ($a0) /* B8DD0 801226D0 3C028015 */ lui $v0, %hi(D_8014BA98) /* B8DD4 801226D4 2442BA98 */ addiu $v0, $v0, %lo(D_8014BA98) -/* B8DD8 801226D8 08048A60 */ j .L80122980 +/* B8DD8 801226D8 08048A60 */ j L80122980_B9080 /* B8DDC 801226DC AC820004 */ sw $v0, 4($a0) glabel L801226E0_B8DE0 /* B8DE0 801226E0 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -309,7 +309,7 @@ glabel L801226E0_B8DE0 /* B8DFC 801226FC AC820000 */ sw $v0, ($a0) /* B8E00 80122700 3C028015 */ lui $v0, %hi(D_8014BAE8) /* B8E04 80122704 2442BAE8 */ addiu $v0, $v0, %lo(D_8014BAE8) -/* B8E08 80122708 08048A60 */ j .L80122980 +/* B8E08 80122708 08048A60 */ j L80122980_B9080 /* B8E0C 8012270C AC820004 */ sw $v0, 4($a0) .L80122710: /* B8E10 80122710 92420004 */ lbu $v0, 4($s2) @@ -317,7 +317,7 @@ glabel L801226E0_B8DE0 /* B8E18 80122718 00021600 */ sll $v0, $v0, 0x18 /* B8E1C 8012271C 00021E03 */ sra $v1, $v0, 0x18 /* B8E20 80122720 2C620026 */ sltiu $v0, $v1, 0x26 -/* B8E24 80122724 10400059 */ beqz $v0, .L8012288C +/* B8E24 80122724 10400059 */ beqz $v0, L8012288C_B8F8C /* B8E28 80122728 00031080 */ sll $v0, $v1, 2 /* B8E2C 8012272C 3C018015 */ lui $at, %hi(jtbl_801502D8) /* B8E30 80122730 00220821 */ addu $at, $at, $v0 @@ -335,7 +335,7 @@ glabel L80122740_B8E40 /* B8E5C 8012275C AC820000 */ sw $v0, ($a0) /* B8E60 80122760 3C028015 */ lui $v0, %hi(D_8014BE78) /* B8E64 80122764 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) -/* B8E68 80122768 08048A23 */ j .L8012288C +/* B8E68 80122768 08048A23 */ j L8012288C_B8F8C /* B8E6C 8012276C AC820004 */ sw $v0, 4($a0) glabel L80122770_B8E70 /* B8E70 80122770 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -348,7 +348,7 @@ glabel L80122770_B8E70 /* B8E8C 8012278C AC820000 */ sw $v0, ($a0) /* B8E90 80122790 3C028015 */ lui $v0, %hi(D_8014BEA0) /* B8E94 80122794 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) -/* B8E98 80122798 08048A23 */ j .L8012288C +/* B8E98 80122798 08048A23 */ j L8012288C_B8F8C /* B8E9C 8012279C AC820004 */ sw $v0, 4($a0) glabel L801227A0_B8EA0 /* B8EA0 801227A0 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -361,7 +361,7 @@ glabel L801227A0_B8EA0 /* B8EBC 801227BC AC820000 */ sw $v0, ($a0) /* B8EC0 801227C0 3C028015 */ lui $v0, %hi(D_8014BEC8) /* B8EC4 801227C4 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) -/* B8EC8 801227C8 08048A23 */ j .L8012288C +/* B8EC8 801227C8 08048A23 */ j L8012288C_B8F8C /* B8ECC 801227CC AC820004 */ sw $v0, 4($a0) glabel L801227D0_B8ED0 /* B8ED0 801227D0 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -374,7 +374,7 @@ glabel L801227D0_B8ED0 /* B8EEC 801227EC AC820000 */ sw $v0, ($a0) /* B8EF0 801227F0 3C028015 */ lui $v0, %hi(D_8014BEF0) /* B8EF4 801227F4 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) -/* B8EF8 801227F8 08048A23 */ j .L8012288C +/* B8EF8 801227F8 08048A23 */ j L8012288C_B8F8C /* B8EFC 801227FC AC820004 */ sw $v0, 4($a0) glabel L80122800_B8F00 /* B8F00 80122800 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -387,7 +387,7 @@ glabel L80122800_B8F00 /* B8F1C 8012281C AC820000 */ sw $v0, ($a0) /* B8F20 80122820 3C028015 */ lui $v0, %hi(D_8014BF18) /* B8F24 80122824 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) -/* B8F28 80122828 08048A23 */ j .L8012288C +/* B8F28 80122828 08048A23 */ j L8012288C_B8F8C /* B8F2C 8012282C AC820004 */ sw $v0, 4($a0) glabel L80122830_B8F30 /* B8F30 80122830 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -400,7 +400,7 @@ glabel L80122830_B8F30 /* B8F4C 8012284C AC820000 */ sw $v0, ($a0) /* B8F50 80122850 3C028015 */ lui $v0, %hi(D_8014BF40) /* B8F54 80122854 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) -/* B8F58 80122858 08048A23 */ j .L8012288C +/* B8F58 80122858 08048A23 */ j L8012288C_B8F8C /* B8F5C 8012285C AC820004 */ sw $v0, 4($a0) glabel L80122860_B8F60 /* B8F60 80122860 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -414,7 +414,6 @@ glabel L80122860_B8F60 /* B8F80 80122880 3C028015 */ lui $v0, %hi(D_8014BF68) /* B8F84 80122884 2442BF68 */ addiu $v0, $v0, %lo(D_8014BF68) /* B8F88 80122888 AC820004 */ sw $v0, 4($a0) -.L8012288C: glabel L8012288C_B8F8C /* B8F8C 8012288C 3C070001 */ lui $a3, 1 /* B8F90 80122890 3C028015 */ lui $v0, %hi(D_80154390) @@ -481,7 +480,6 @@ glabel L8012288C_B8F8C /* B9074 80122974 30A5FFFF */ andi $a1, $a1, 0xffff /* B9078 80122978 00E53825 */ or $a3, $a3, $a1 /* B907C 8012297C ACC70004 */ sw $a3, 4($a2) -.L80122980: glabel L80122980_B9080 /* B9080 80122980 3C02D9FD */ lui $v0, 0xd9fd .L80122984: diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s b/ver/us/asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s index 564e3ecc3f..b4a5716db8 100644 --- a/ver/us/asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s +++ b/ver/us/asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s @@ -354,7 +354,7 @@ glabel _render_transition_stencil /* CD6C0 80136FC0 93A20020 */ lbu $v0, 0x20($sp) /* CD6C4 80136FC4 2443FFFE */ addiu $v1, $v0, -2 /* CD6C8 80136FC8 2C62000E */ sltiu $v0, $v1, 0xe -/* CD6CC 80136FCC 1040034C */ beqz $v0, .L80137D00 +/* CD6CC 80136FCC 1040034C */ beqz $v0, L80137D00_CE400 /* CD6D0 80136FD0 00031080 */ sll $v0, $v1, 2 /* CD6D4 80136FD4 3C018015 */ lui $at, %hi(jtbl_80150EA0) /* CD6D8 80136FD8 00220821 */ addu $at, $at, $v0 @@ -717,7 +717,7 @@ glabel L8013722C_CD92C /* CDC48 80137548 AC930000 */ sw $s3, ($a0) /* CDC4C 8013754C AE420000 */ sw $v0, ($s2) /* CDC50 80137550 AC960008 */ sw $s6, 8($a0) -/* CDC54 80137554 0804DF40 */ j .L80137D00 +/* CDC54 80137554 0804DF40 */ j L80137D00_CE400 /* CDC58 80137558 AC90000C */ sw $s0, 0xc($a0) glabel L8013755C_CDC5C /* CDC5C 8013755C 44914000 */ mtc1 $s1, $f8 @@ -974,7 +974,7 @@ glabel L8013755C_CDC5C /* CE040 80137940 AC820000 */ sw $v0, ($a0) /* CE044 80137944 24020040 */ addiu $v0, $zero, 0x40 /* CE048 80137948 AC660000 */ sw $a2, ($v1) -/* CE04C 8013794C 0804DF40 */ j .L80137D00 +/* CE04C 8013794C 0804DF40 */ j L80137D00_CE400 /* CE050 80137950 AC620004 */ sw $v0, 4($v1) glabel L80137954_CE054 /* CE054 80137954 44914000 */ mtc1 $s1, $f8 @@ -1219,7 +1219,6 @@ glabel L80137CBC_CE3BC /* CE3F4 80137CF4 AD020004 */ sw $v0, 4($t0) /* CE3F8 80137CF8 0C04E395 */ jal func_80138E54 /* CE3FC 80137CFC E7B80010 */ swc1 $f24, 0x10($sp) -.L80137D00: glabel L80137D00_CE400 /* CE400 80137D00 3C06DA38 */ lui $a2, 0xda38 .L80137D04: diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s index cf4625b1c8..e989b7ec58 100644 --- a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s +++ b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s @@ -23,7 +23,7 @@ glabel func_8013AA9C /* D11E4 8013AAE4 2C82005A */ sltiu $v0, $a0, 0x5a /* D11E8 8013AAE8 10400107 */ beqz $v0, .L8013AF08 /* D11EC 8013AAEC 2CA20012 */ sltiu $v0, $a1, 0x12 -/* D11F0 8013AAF0 10400048 */ beqz $v0, .L8013AC14 +/* D11F0 8013AAF0 10400048 */ beqz $v0, L8013AC14_D1314 /* D11F4 8013AAF4 00051080 */ sll $v0, $a1, 2 /* D11F8 8013AAF8 3C018015 */ lui $at, %hi(jtbl_80150FB0) /* D11FC 8013AAFC 00220821 */ addu $at, $at, $v0 @@ -104,7 +104,6 @@ glabel L8013ABDC_D12DC /* D1308 8013AC08 00000000 */ nop /* D130C 8013AC0C 0804EB0F */ j .L8013AC3C /* D1310 8013AC10 00000000 */ nop -.L8013AC14: glabel L8013AC14_D1314 /* D1314 8013AC14 2403000D */ addiu $v1, $zero, 0xd /* D1318 8013AC18 50A30008 */ beql $a1, $v1, .L8013AC3C diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s index 54d749dcff..2505cac51d 100644 --- a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s +++ b/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s @@ -103,7 +103,7 @@ glabel func_8013B1B0 /* D1A28 8013B328 92430002 */ lbu $v1, 2($s2) /* D1A2C 8013B32C AE420038 */ sw $v0, 0x38($s2) /* D1A30 8013B330 2C62000C */ sltiu $v0, $v1, 0xc -/* D1A34 8013B334 1040000B */ beqz $v0, .L8013B364 +/* D1A34 8013B334 1040000B */ beqz $v0, L8013B364_D1A64 /* D1A38 8013B338 00031080 */ sll $v0, $v1, 2 /* D1A3C 8013B33C 3C018015 */ lui $at, %hi(jtbl_80151058) /* D1A40 8013B340 00220821 */ addu $at, $at, $v0 @@ -111,14 +111,13 @@ glabel func_8013B1B0 /* D1A48 8013B348 00400008 */ jr $v0 /* D1A4C 8013B34C 00000000 */ nop glabel L8013B350_D1A50 -/* D1A50 8013B350 0804ECD9 */ j .L8013B364 +/* D1A50 8013B350 0804ECD9 */ j L8013B364_D1A64 /* D1A54 8013B354 240A0002 */ addiu $t2, $zero, 2 glabel L8013B358_D1A58 -/* D1A58 8013B358 0804ECD9 */ j .L8013B364 +/* D1A58 8013B358 0804ECD9 */ j L8013B364_D1A64 /* D1A5C 8013B35C 240A0003 */ addiu $t2, $zero, 3 glabel L8013B360_D1A60 /* D1A60 8013B360 240A000A */ addiu $t2, $zero, 0xa -.L8013B364: glabel L8013B364_D1A64 /* D1A64 8013B364 3C070040 */ lui $a3, 0x40 /* D1A68 8013B368 C6400038 */ lwc1 $f0, 0x38($s2) @@ -368,7 +367,7 @@ glabel L8013B68C_D1D8C glabel L8013B6F8_D1DF8 /* D1DF8 8013B6F8 8E420014 */ lw $v0, 0x14($s2) /* D1DFC 8013B6FC 3042A000 */ andi $v0, $v0, 0xa000 -/* D1E00 8013B700 104000FA */ beqz $v0, .L8013BAEC +/* D1E00 8013B700 104000FA */ beqz $v0, L8013BAEC_D21EC /* D1E04 8013B704 3C02FC12 */ lui $v0, 0xfc12 /* D1E08 8013B708 34427E24 */ ori $v0, $v0, 0x7e24 /* D1E0C 8013B70C 3C06D9FF */ lui $a2, 0xd9ff @@ -627,7 +626,6 @@ glabel L8013BA84_D2184 /* D21E0 8013BAE0 00431025 */ or $v0, $v0, $v1 /* D21E4 8013BAE4 0804EEDA */ j .L8013BB68 /* D21E8 8013BAE8 ACA20004 */ sw $v0, 4($a1) -.L8013BAEC: glabel L8013BAEC_D21EC /* D21EC 8013BAEC 3C06FCFF */ lui $a2, 0xfcff /* D21F0 8013BAF0 34C6FFFF */ ori $a2, $a2, 0xffff diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s b/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s index c0bd7c2007..afcde45bae 100644 --- a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s +++ b/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s @@ -12,16 +12,15 @@ glabel func_8013F350 /* D5A6C 8013F36C AFB40020 */ sw $s4, 0x20($sp) /* D5A70 8013F370 AFB3001C */ sw $s3, 0x1c($sp) /* D5A74 8013F374 AFB20018 */ sw $s2, 0x18($sp) -/* D5A78 8013F378 120000D8 */ beqz $s0, .L8013F6DC +/* D5A78 8013F378 120000D8 */ beqz $s0, L8013F6DC_D5DDC /* D5A7C 8013F37C AFB10014 */ sw $s1, 0x14($sp) /* D5A80 8013F380 0000982D */ daddu $s3, $zero, $zero /* D5A84 8013F384 3C168015 */ lui $s6, %hi(D_8014EFCC) /* D5A88 8013F388 26D6EFCC */ addiu $s6, $s6, %lo(D_8014EFCC) -.L8013F38C: glabel L8013F38C_D5A8C /* D5A8C 8013F38C 8E030000 */ lw $v1, ($s0) /* D5A90 8013F390 2C62001C */ sltiu $v0, $v1, 0x1c -/* D5A94 8013F394 1040FFFD */ beqz $v0, .L8013F38C +/* D5A94 8013F394 1040FFFD */ beqz $v0, L8013F38C_D5A8C /* D5A98 8013F398 26100004 */ addiu $s0, $s0, 4 /* D5A9C 8013F39C 00031080 */ sll $v0, $v1, 2 /* D5AA0 8013F3A0 3C018015 */ lui $at, %hi(jtbl_80151140) @@ -30,7 +29,7 @@ glabel L8013F38C_D5A8C /* D5AAC 8013F3AC 00400008 */ jr $v0 /* D5AB0 8013F3B0 00000000 */ nop glabel L8013F3B4_D5AB4 -/* D5AB4 8013F3B4 0804FCE3 */ j .L8013F38C +/* D5AB4 8013F3B4 0804FCE3 */ j L8013F38C_D5A8C /* D5AB8 8013F3B8 2610000C */ addiu $s0, $s0, 0xc glabel L8013F3BC_D5ABC /* D5ABC 8013F3BC 8E130000 */ lw $s3, ($s0) @@ -41,7 +40,7 @@ glabel L8013F3C8_D5AC8 /* D5ACC 8013F3CC 26100008 */ addiu $s0, $s0, 8 .L8013F3D0: /* D5AD0 8013F3D0 A2B30046 */ sb $s3, 0x46($s5) -/* D5AD4 8013F3D4 0804FCE3 */ j .L8013F38C +/* D5AD4 8013F3D4 0804FCE3 */ j L8013F38C_D5A8C /* D5AD8 8013F3D8 A2B30045 */ sb $s3, 0x45($s5) glabel L8013F3DC_D5ADC /* D5ADC 8013F3DC 92020003 */ lbu $v0, 3($s0) @@ -55,13 +54,13 @@ glabel L8013F3DC_D5ADC /* D5AFC 8013F3FC 00431025 */ or $v0, $v0, $v1 /* D5B00 8013F400 AEA20000 */ sw $v0, ($s5) /* D5B04 8013F404 A2A4004F */ sb $a0, 0x4f($s5) -/* D5B08 8013F408 0804FCE3 */ j .L8013F38C +/* D5B08 8013F408 0804FCE3 */ j L8013F38C_D5A8C /* D5B0C 8013F40C A2A40051 */ sb $a0, 0x51($s5) glabel L8013F410_D5B10 -/* D5B10 8013F410 0804FCE3 */ j .L8013F38C +/* D5B10 8013F410 0804FCE3 */ j L8013F38C_D5A8C /* D5B14 8013F414 26100004 */ addiu $s0, $s0, 4 glabel L8013F418_D5B18 -/* D5B18 8013F418 0804FCE3 */ j .L8013F38C +/* D5B18 8013F418 0804FCE3 */ j L8013F38C_D5A8C /* D5B1C 8013F41C 26100008 */ addiu $s0, $s0, 8 .L8013F420: /* D5B20 8013F420 0804FD62 */ j .L8013F588 @@ -259,12 +258,11 @@ glabel L8013F430_D5B30 /* D5DC4 8013F6C4 26310001 */ addiu $s1, $s1, 1 .L8013F6C8: /* D5DC8 8013F6C8 2A2200C0 */ slti $v0, $s1, 0xc0 -/* D5DCC 8013F6CC 1440FF2F */ bnez $v0, .L8013F38C +/* D5DCC 8013F6CC 1440FF2F */ bnez $v0, L8013F38C_D5A8C /* D5DD0 8013F6D0 26100004 */ addiu $s0, $s0, 4 .L8013F6D4: /* D5DD4 8013F6D4 0804FDB5 */ j .L8013F6D4 /* D5DD8 8013F6D8 00000000 */ nop -.L8013F6DC: glabel L8013F6DC_D5DDC /* D5DDC 8013F6DC 8FBF002C */ lw $ra, 0x2c($sp) /* D5DE0 8013F6E0 8FB60028 */ lw $s6, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s b/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s index c9df01a998..d0ba495f7f 100644 --- a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s +++ b/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s @@ -13,7 +13,7 @@ glabel func_80141704 /* D7E24 80141724 8E64001C */ lw $a0, 0x1c($s3) /* D7E28 80141728 8E030000 */ lw $v1, ($s0) /* D7E2C 8014172C 2C62001C */ sltiu $v0, $v1, 0x1c -/* D7E30 80141730 104002AF */ beqz $v0, .L801421F0 +/* D7E30 80141730 104002AF */ beqz $v0, L801421F0_D88F0 /* D7E34 80141734 26100004 */ addiu $s0, $s0, 4 /* D7E38 80141738 00031080 */ sll $v0, $v1, 2 /* D7E3C 8014173C 3C018015 */ lui $at, %hi(jtbl_801511B0) @@ -26,7 +26,7 @@ glabel L80141750_D7E50 /* D7E54 80141754 2403003C */ addiu $v1, $zero, 0x3c /* D7E58 80141758 A2630047 */ sb $v1, 0x47($s3) /* D7E5C 8014175C 34420004 */ ori $v0, $v0, 4 -/* D7E60 80141760 0805087C */ j .L801421F0 +/* D7E60 80141760 0805087C */ j L801421F0_D88F0 /* D7E64 80141764 AE620000 */ sw $v0, ($s3) glabel L80141768_D7E68 /* D7E68 80141768 2402003C */ addiu $v0, $zero, 0x3c @@ -34,7 +34,7 @@ glabel L80141768_D7E68 /* D7E70 80141770 8E620000 */ lw $v0, ($s3) /* D7E74 80141774 3C030004 */ lui $v1, 4 /* D7E78 80141778 00431025 */ or $v0, $v0, $v1 -/* D7E7C 8014177C 0805087C */ j .L801421F0 +/* D7E7C 8014177C 0805087C */ j L801421F0_D88F0 /* D7E80 80141780 AE620000 */ sw $v0, ($s3) glabel L80141784_D7E84 /* D7E84 80141784 24020001 */ addiu $v0, $zero, 1 @@ -93,7 +93,7 @@ glabel L80141808_D7F08 .L80141844: /* D7F44 80141844 8E630000 */ lw $v1, ($s3) /* D7F48 80141848 30620100 */ andi $v0, $v1, 0x100 -/* D7F4C 8014184C 10400268 */ beqz $v0, .L801421F0 +/* D7F4C 8014184C 10400268 */ beqz $v0, L801421F0_D88F0 /* D7F50 80141850 3C020010 */ lui $v0, 0x10 /* D7F54 80141854 00621024 */ and $v0, $v1, $v0 /* D7F58 80141858 14400012 */ bnez $v0, .L801418A4 @@ -174,7 +174,7 @@ glabel L80141920_D8020 .L80141978: /* D8078 80141978 8E630000 */ lw $v1, ($s3) /* D807C 8014197C 30620100 */ andi $v0, $v1, 0x100 -/* D8080 80141980 1040021B */ beqz $v0, .L801421F0 +/* D8080 80141980 1040021B */ beqz $v0, L801421F0_D88F0 /* D8084 80141984 3C020010 */ lui $v0, 0x10 /* D8088 80141988 00621024 */ and $v0, $v1, $v0 /* D808C 8014198C 14400012 */ bnez $v0, .L801419D8 @@ -289,7 +289,7 @@ glabel L80141A54_D8154 /* D8214 80141B14 AE700004 */ sw $s0, 4($s3) /* D8218 80141B18 AE620014 */ sw $v0, 0x14($s3) /* D821C 80141B1C 30620100 */ andi $v0, $v1, 0x100 -/* D8220 80141B20 104001B3 */ beqz $v0, .L801421F0 +/* D8220 80141B20 104001B3 */ beqz $v0, L801421F0_D88F0 /* D8224 80141B24 3C020010 */ lui $v0, 0x10 /* D8228 80141B28 00621024 */ and $v0, $v1, $v0 /* D822C 80141B2C 14400012 */ bnez $v0, .L80141B78 @@ -374,7 +374,7 @@ glabel L80141A54_D8154 /* D8358 80141C58 00000000 */ nop /* D835C 80141C5C 468010A0 */ cvt.s.w $f2, $f2 /* D8360 80141C60 46020003 */ div.s $f0, $f0, $f2 -/* D8364 80141C64 0805087C */ j .L801421F0 +/* D8364 80141C64 0805087C */ j L801421F0_D88F0 /* D8368 80141C68 E6600024 */ swc1 $f0, 0x24($s3) glabel L80141C6C_D836C /* D836C 80141C6C 8E63000C */ lw $v1, 0xc($s3) @@ -684,7 +684,7 @@ glabel L801420BC_D87BC /* D87D0 801420D0 02512023 */ subu $a0, $s2, $s1 /* D87D4 801420D4 00511021 */ addu $v0, $v0, $s1 /* D87D8 801420D8 A2620047 */ sb $v0, 0x47($s3) -/* D87DC 801420DC 0805087C */ j .L801421F0 +/* D87DC 801420DC 0805087C */ j L801421F0_D88F0 /* D87E0 801420E0 AE700004 */ sw $s0, 4($s3) glabel L801420E4_D87E4 /* D87E4 801420E4 92030003 */ lbu $v1, 3($s0) @@ -758,7 +758,6 @@ glabel L801421C0_D88C0 /* D88E4 801421E4 A4850028 */ sh $a1, 0x28($a0) /* D88E8 801421E8 0805082D */ j .L801420B4 /* D88EC 801421EC A486002A */ sh $a2, 0x2a($a0) -.L801421F0: glabel L801421F0_D88F0 /* D88F0 801421F0 0000102D */ daddu $v0, $zero, $zero .L801421F4: diff --git a/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s b/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s index c7562b57e5..848c977652 100644 --- a/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s +++ b/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s @@ -61,7 +61,7 @@ glabel L8014A5AC_E0CAC /* E0D14 8014A614 0C0156EE */ jal func_80055BB8 /* E0D18 8014A618 240500FA */ addiu $a1, $zero, 0xfa .L8014A61C: -/* E0D1C 8014A61C 50400060 */ beql $v0, $zero, .L8014A7A0 +/* E0D1C 8014A61C 50400060 */ beql $v0, $zero, L8014A7A0_E0EA0 /* E0D20 8014A620 A6130000 */ sh $s3, ($s0) /* E0D24 8014A624 080529E9 */ j .L8014A7A4 /* E0D28 8014A628 26520001 */ addiu $s2, $s2, 1 @@ -73,15 +73,14 @@ glabel L8014A5AC_E0CAC /* E0D38 8014A638 96220000 */ lhu $v0, ($s1) /* E0D3C 8014A63C 00551024 */ and $v0, $v0, $s5 /* E0D40 8014A640 A6220000 */ sh $v0, ($s1) -.L8014A644: glabel L8014A644_E0D44 -/* E0D44 8014A644 080529E8 */ j .L8014A7A0 +/* E0D44 8014A644 080529E8 */ j L8014A7A0_E0EA0 /* E0D48 8014A648 A6140000 */ sh $s4, ($s0) glabel L8014A64C_E0D4C /* E0D4C 8014A64C 96230000 */ lhu $v1, ($s1) /* E0D50 8014A650 00751024 */ and $v0, $v1, $s5 /* E0D54 8014A654 30630001 */ andi $v1, $v1, 1 -/* E0D58 8014A658 1060FFFA */ beqz $v1, .L8014A644 +/* E0D58 8014A658 1060FFFA */ beqz $v1, L8014A644_E0D44 /* E0D5C 8014A65C A6220000 */ sh $v0, ($s1) /* E0D60 8014A660 8E040016 */ lw $a0, 0x16($s0) /* E0D64 8014A664 0C01567F */ jal func_800559FC @@ -92,11 +91,11 @@ glabel L8014A64C_E0D4C /* E0D78 8014A678 3042FFFE */ andi $v0, $v0, 0xfffe /* E0D7C 8014A67C A6220000 */ sh $v0, ($s1) /* E0D80 8014A680 24020003 */ addiu $v0, $zero, 3 -/* E0D84 8014A684 080529E8 */ j .L8014A7A0 +/* E0D84 8014A684 080529E8 */ j L8014A7A0_E0EA0 /* E0D88 8014A688 A6020000 */ sh $v0, ($s0) glabel L8014A68C_E0D8C /* E0D8C 8014A68C 24020004 */ addiu $v0, $zero, 4 -/* E0D90 8014A690 080529E8 */ j .L8014A7A0 +/* E0D90 8014A690 080529E8 */ j L8014A7A0_E0EA0 /* E0D94 8014A694 A6020000 */ sh $v0, ($s0) glabel L8014A698_E0D98 /* E0D98 8014A698 96230000 */ lhu $v1, ($s1) @@ -106,14 +105,14 @@ glabel L8014A698_E0D98 /* E0DA8 8014A6A8 8E04000E */ lw $a0, 0xe($s0) /* E0DAC 8014A6AC 04810003 */ bgez $a0, .L8014A6BC /* E0DB0 8014A6B0 00000000 */ nop -/* E0DB4 8014A6B4 080529E8 */ j .L8014A7A0 +/* E0DB4 8014A6B4 080529E8 */ j L8014A7A0_E0EA0 /* E0DB8 8014A6B8 A6000000 */ sh $zero, ($s0) .L8014A6BC: /* E0DBC 8014A6BC 0C015635 */ jal func_800558D4 /* E0DC0 8014A6C0 0240282D */ daddu $a1, $s2, $zero /* E0DC4 8014A6C4 3403FFFF */ ori $v1, $zero, 0xffff /* E0DC8 8014A6C8 0062182B */ sltu $v1, $v1, $v0 -/* E0DCC 8014A6CC 10600034 */ beqz $v1, .L8014A7A0 +/* E0DCC 8014A6CC 10600034 */ beqz $v1, L8014A7A0_E0EA0 /* E0DD0 8014A6D0 AE020016 */ sw $v0, 0x16($s0) /* E0DD4 8014A6D4 96220000 */ lhu $v0, ($s1) /* E0DD8 8014A6D8 30420020 */ andi $v0, $v0, 0x20 @@ -144,7 +143,7 @@ glabel L8014A698_E0D98 /* E0E34 8014A734 96220000 */ lhu $v0, ($s1) /* E0E38 8014A738 34420001 */ ori $v0, $v0, 1 /* E0E3C 8014A73C A6220000 */ sh $v0, ($s1) -/* E0E40 8014A740 080529E8 */ j .L8014A7A0 +/* E0E40 8014A740 080529E8 */ j L8014A7A0_E0EA0 /* E0E44 8014A744 A6000000 */ sh $zero, ($s0) .L8014A748: /* E0E48 8014A748 10400005 */ beqz $v0, .L8014A760 @@ -171,7 +170,6 @@ glabel L8014A698_E0D98 /* E0E98 8014A798 3042FFF7 */ andi $v0, $v0, 0xfff7 .L8014A79C: /* E0E9C 8014A79C A6220000 */ sh $v0, ($s1) -.L8014A7A0: glabel L8014A7A0_E0EA0 /* E0EA0 8014A7A0 26520001 */ addiu $s2, $s2, 1 .L8014A7A4: diff --git a/ver/us/asm/nonmatchings/code_f4c60_len_4300/_show_message.s b/ver/us/asm/nonmatchings/code_f4c60_len_4300/_show_message.s index b6f7e3b569..2b86e1dd2f 100644 --- a/ver/us/asm/nonmatchings/code_f4c60_len_4300/_show_message.s +++ b/ver/us/asm/nonmatchings/code_f4c60_len_4300/_show_message.s @@ -19,7 +19,7 @@ glabel _show_message /* F4D08 802D0358 AFB00030 */ sw $s0, 0x30($sp) /* F4D0C 802D035C F7B40058 */ sdc1 $f20, 0x58($sp) /* F4D10 802D0360 8E50000C */ lw $s0, 0xc($s2) -/* F4D14 802D0364 10A000CD */ beqz $a1, .L802D069C +/* F4D14 802D0364 10A000CD */ beqz $a1, L802D069C_F504C /* F4D18 802D0368 00C0B82D */ daddu $s7, $a2, $zero /* F4D1C 802D036C 3C16802E */ lui $s6, %hi(D_802DB264) /* F4D20 802D0370 26D6B264 */ addiu $s6, $s6, %lo(D_802DB264) @@ -190,7 +190,7 @@ glabel _show_message /* F4F8C 802D05DC 0C0496AE */ jal clamp_printer_coords /* F4F90 802D05E0 00463021 */ addu $a2, $v0, $a2 /* F4F94 802D05E4 2402FFFE */ addiu $v0, $zero, -2 -/* F4F98 802D05E8 1202002C */ beq $s0, $v0, .L802D069C +/* F4F98 802D05E8 1202002C */ beq $s0, $v0, L802D069C_F504C /* F4F9C 802D05EC AE5000B4 */ sw $s0, 0xb4($s2) /* F4FA0 802D05F0 24020003 */ addiu $v0, $zero, 3 /* F4FA4 802D05F4 16E20007 */ bne $s7, $v0, .L802D0614 @@ -217,7 +217,7 @@ glabel _show_message /* F4FF0 802D0640 8E420074 */ lw $v0, 0x74($s2) /* F4FF4 802D0644 3043000F */ andi $v1, $v0, 0xf /* F4FF8 802D0648 2C620006 */ sltiu $v0, $v1, 6 -/* F4FFC 802D064C 10400013 */ beqz $v0, .L802D069C +/* F4FFC 802D064C 10400013 */ beqz $v0, L802D069C_F504C /* F5000 802D0650 00031080 */ sll $v0, $v1, 2 /* F5004 802D0654 3C01802E */ lui $at, %hi(jtbl_802DA1F0) /* F5008 802D0658 00220821 */ addu $at, $at, $v0 @@ -226,23 +226,22 @@ glabel _show_message /* F5014 802D0664 00000000 */ nop glabel L802D0668_F5018 /* F5018 802D0668 E614000C */ swc1 $f20, 0xc($s0) -/* F501C 802D066C 080B41A7 */ j .L802D069C +/* F501C 802D066C 080B41A7 */ j L802D069C_F504C /* F5020 802D0670 E6200000 */ swc1 $f0, ($s1) glabel L802D0674_F5024 /* F5024 802D0674 E600000C */ swc1 $f0, 0xc($s0) -/* F5028 802D0678 080B41A7 */ j .L802D069C +/* F5028 802D0678 080B41A7 */ j L802D069C_F504C /* F502C 802D067C E6200000 */ swc1 $f0, ($s1) glabel L802D0680_F5030 /* F5030 802D0680 E614000C */ swc1 $f20, 0xc($s0) -/* F5034 802D0684 080B41A7 */ j .L802D069C +/* F5034 802D0684 080B41A7 */ j L802D069C_F504C /* F5038 802D0688 E6340000 */ swc1 $f20, ($s1) glabel L802D068C_F503C /* F503C 802D068C E600000C */ swc1 $f0, 0xc($s0) -/* F5040 802D0690 080B41A7 */ j .L802D069C +/* F5040 802D0690 080B41A7 */ j L802D069C_F504C /* F5044 802D0694 E6340000 */ swc1 $f20, ($s1) glabel L802D0698_F5048 /* F5048 802D0698 E614000C */ swc1 $f20, 0xc($s0) -.L802D069C: glabel L802D069C_F504C /* F504C 802D069C 8E5000B4 */ lw $s0, 0xb4($s2) /* F5050 802D06A0 2402FFFE */ addiu $v0, $zero, -2 diff --git a/ver/us/asm/nonmatchings/code_3CF80/osContGetInitData.s b/ver/us/asm/nonmatchings/os/code_3CF80/osContGetInitData.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CF80/osContGetInitData.s rename to ver/us/asm/nonmatchings/os/code_3CF80/osContGetInitData.s diff --git a/ver/us/asm/nonmatchings/code_3CF80/osContInit.s b/ver/us/asm/nonmatchings/os/code_3CF80/osContInit.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CF80/osContInit.s rename to ver/us/asm/nonmatchings/os/code_3CF80/osContInit.s diff --git a/ver/us/asm/nonmatchings/code_3CF80/osPackRequestData.s b/ver/us/asm/nonmatchings/os/code_3CF80/osPackRequestData.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CF80/osPackRequestData.s rename to ver/us/asm/nonmatchings/os/code_3CF80/osPackRequestData.s diff --git a/ver/us/asm/nonmatchings/code_3FEA0/_Printf.s b/ver/us/asm/nonmatchings/os/code_3FEA0/_Printf.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3FEA0/_Printf.s rename to ver/us/asm/nonmatchings/os/code_3FEA0/_Printf.s diff --git a/ver/us/asm/nonmatchings/code_3FEA0/_Putfld.s b/ver/us/asm/nonmatchings/os/code_3FEA0/_Putfld.s similarity index 99% rename from ver/us/asm/nonmatchings/code_3FEA0/_Putfld.s rename to ver/us/asm/nonmatchings/os/code_3FEA0/_Putfld.s index 8c778031a8..e9f088e9e9 100644 --- a/ver/us/asm/nonmatchings/code_3FEA0/_Putfld.s +++ b/ver/us/asm/nonmatchings/os/code_3FEA0/_Putfld.s @@ -18,7 +18,7 @@ glabel _Putfld /* 40454 80065054 AE000018 */ sw $zero, 0x18($s0) /* 40458 80065058 AE000014 */ sw $zero, 0x14($s0) /* 4045C 8006505C AE000010 */ sw $zero, 0x10($s0) -/* 40460 80065060 1040011A */ beqz $v0, .L800654CC +/* 40460 80065060 1040011A */ beqz $v0, L800654CC_408CC /* 40464 80065064 AE00000C */ sw $zero, 0xc($s0) /* 40468 80065068 00061080 */ sll $v0, $a2, 2 /* 4046C 8006506C 3C01800A */ lui $at, %hi(jtbl_80099C18) @@ -328,7 +328,6 @@ glabel L800654B0_408B0 /* 408C0 800654C0 24030025 */ addiu $v1, $zero, 0x25 /* 408C4 800654C4 08019538 */ j .L800654E0 /* 408C8 800654C8 A0430000 */ sb $v1, ($v0) -.L800654CC: glabel L800654CC_408CC /* 408CC 800654CC 8E02000C */ lw $v0, 0xc($s0) /* 408D0 800654D0 24430001 */ addiu $v1, $v0, 1 diff --git a/ver/us/asm/nonmatchings/code_3FEA0/proutSprintf.s b/ver/us/asm/nonmatchings/os/code_3FEA0/proutSprintf.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3FEA0/proutSprintf.s rename to ver/us/asm/nonmatchings/os/code_3FEA0/proutSprintf.s diff --git a/ver/us/asm/nonmatchings/code_3FEA0/sprintf.s b/ver/us/asm/nonmatchings/os/code_3FEA0/sprintf.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3FEA0/sprintf.s rename to ver/us/asm/nonmatchings/os/code_3FEA0/sprintf.s diff --git a/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s b/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s index d12cb1dc18..a34cda906d 100644 --- a/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s +++ b/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s @@ -157,7 +157,7 @@ glabel osDevMgrMain /* 3C6CC 800612CC 94420000 */ lhu $v0, ($v0) /* 3C6D0 800612D0 2443FFF6 */ addiu $v1, $v0, -0xa /* 3C6D4 800612D4 2C620007 */ sltiu $v0, $v1, 7 -/* 3C6D8 800612D8 10400042 */ beqz $v0, .L800613E4 +/* 3C6D8 800612D8 10400042 */ beqz $v0, L800613E4_3C7E4 /* 3C6DC 800612DC 00031080 */ sll $v0, $v1, 2 /* 3C6E0 800612E0 3C01800A */ lui $at, %hi(jtbl_80099B20) /* 3C6E4 800612E4 00220821 */ addu $at, $at, $v0 @@ -229,7 +229,6 @@ glabel L800613D4_3C7D4 /* 3C7D8 800613D8 8CA40004 */ lw $a0, 4($a1) /* 3C7DC 800613DC 0C019608 */ jal osSendMesg /* 3C7E0 800613E0 00003021 */ addu $a2, $zero, $zero -.L800613E4: glabel L800613E4_3C7E4 /* 3C7E4 800613E4 2402FFFF */ addiu $v0, $zero, -1 .L800613E8: diff --git a/ver/us/asm/nonmatchings/code_41880/osInsertTimer.s b/ver/us/asm/nonmatchings/os/code_41880/osInsertTimer.s similarity index 100% rename from ver/us/asm/nonmatchings/code_41880/osInsertTimer.s rename to ver/us/asm/nonmatchings/os/code_41880/osInsertTimer.s diff --git a/ver/us/asm/nonmatchings/code_41880/osSetTimerIntr.s b/ver/us/asm/nonmatchings/os/code_41880/osSetTimerIntr.s similarity index 100% rename from ver/us/asm/nonmatchings/code_41880/osSetTimerIntr.s rename to ver/us/asm/nonmatchings/os/code_41880/osSetTimerIntr.s diff --git a/ver/us/asm/nonmatchings/code_41880/osTimerInterrupt.s b/ver/us/asm/nonmatchings/os/code_41880/osTimerInterrupt.s similarity index 100% rename from ver/us/asm/nonmatchings/code_41880/osTimerInterrupt.s rename to ver/us/asm/nonmatchings/os/code_41880/osTimerInterrupt.s diff --git a/ver/us/asm/nonmatchings/code_41880/osTimerServicesInit.s b/ver/us/asm/nonmatchings/os/code_41880/osTimerServicesInit.s similarity index 100% rename from ver/us/asm/nonmatchings/code_41880/osTimerServicesInit.s rename to ver/us/asm/nonmatchings/os/code_41880/osTimerServicesInit.s diff --git a/ver/us/asm/nonmatchings/code_43590/osPfsAllocateFile.s b/ver/us/asm/nonmatchings/os/code_43590/osPfsAllocateFile.s similarity index 100% rename from ver/us/asm/nonmatchings/code_43590/osPfsAllocateFile.s rename to ver/us/asm/nonmatchings/os/code_43590/osPfsAllocateFile.s diff --git a/ver/us/asm/nonmatchings/code_43590/osPfsDeclearPage.s b/ver/us/asm/nonmatchings/os/code_43590/osPfsDeclearPage.s similarity index 100% rename from ver/us/asm/nonmatchings/code_43590/osPfsDeclearPage.s rename to ver/us/asm/nonmatchings/os/code_43590/osPfsDeclearPage.s diff --git a/ver/us/asm/nonmatchings/code_44490/osPfsCheckRamArea.s b/ver/us/asm/nonmatchings/os/code_44490/osPfsCheckRamArea.s similarity index 100% rename from ver/us/asm/nonmatchings/code_44490/osPfsCheckRamArea.s rename to ver/us/asm/nonmatchings/os/code_44490/osPfsCheckRamArea.s diff --git a/ver/us/asm/nonmatchings/code_44490/osPfsInitPak.s b/ver/us/asm/nonmatchings/os/code_44490/osPfsInitPak.s similarity index 100% rename from ver/us/asm/nonmatchings/code_44490/osPfsInitPak.s rename to ver/us/asm/nonmatchings/os/code_44490/osPfsInitPak.s diff --git a/ver/us/asm/nonmatchings/code_44490/osPfsNumFiles.s b/ver/us/asm/nonmatchings/os/code_44490/osPfsNumFiles.s similarity index 100% rename from ver/us/asm/nonmatchings/code_44490/osPfsNumFiles.s rename to ver/us/asm/nonmatchings/os/code_44490/osPfsNumFiles.s diff --git a/ver/us/asm/nonmatchings/si/si_execute_next_command.s b/ver/us/asm/nonmatchings/si/si_execute_next_command.s index 2e59d034ec..e9e38fb69c 100644 --- a/ver/us/asm/nonmatchings/si/si_execute_next_command.s +++ b/ver/us/asm/nonmatchings/si/si_execute_next_command.s @@ -32,477 +32,476 @@ glabel L802C743C_EBDEC /* EBE18 802C7468 00041080 */ sll $v0, $a0, 2 /* EBE1C 802C746C 00621821 */ addu $v1, $v1, $v0 /* EBE20 802C7470 A2040001 */ sb $a0, 1($s0) -/* EBE24 802C7474 080B1E95 */ j .L802C7A54 +/* EBE24 802C7474 080B1E95 */ j L802C7A54_EC404 /* EBE28 802C7478 AE030008 */ sw $v1, 8($s0) glabel L802C747C_EBE2C /* EBE2C 802C747C 0C0B1266 */ jal si_handle_return /* EBE30 802C7480 0200202D */ daddu $a0, $s0, $zero -/* EBE34 802C7484 080B1E95 */ j .L802C7A54 +/* EBE34 802C7484 080B1E95 */ j L802C7A54_EC404 /* EBE38 802C7488 0040282D */ daddu $a1, $v0, $zero glabel L802C748C_EBE3C /* EBE3C 802C748C 0C0B126E */ jal si_handle_label /* EBE40 802C7490 0200202D */ daddu $a0, $s0, $zero -/* EBE44 802C7494 080B1E95 */ j .L802C7A54 +/* EBE44 802C7494 080B1E95 */ j L802C7A54_EC404 /* EBE48 802C7498 0040282D */ daddu $a1, $v0, $zero glabel L802C749C_EBE4C /* EBE4C 802C749C 0C0B1270 */ jal si_handle_goto /* EBE50 802C74A0 0200202D */ daddu $a0, $s0, $zero -/* EBE54 802C74A4 080B1E95 */ j .L802C7A54 +/* EBE54 802C74A4 080B1E95 */ j L802C7A54_EC404 /* EBE58 802C74A8 0040282D */ daddu $a1, $v0, $zero glabel L802C74AC_EBE5C /* EBE5C 802C74AC 0C0B1280 */ jal si_handle_loop /* EBE60 802C74B0 0200202D */ daddu $a0, $s0, $zero -/* EBE64 802C74B4 080B1E95 */ j .L802C7A54 +/* EBE64 802C74B4 080B1E95 */ j L802C7A54_EC404 /* EBE68 802C74B8 0040282D */ daddu $a1, $v0, $zero glabel L802C74BC_EBE6C /* EBE6C 802C74BC 0C0B1292 */ jal si_handle_end_loop /* EBE70 802C74C0 0200202D */ daddu $a0, $s0, $zero -/* EBE74 802C74C4 080B1E95 */ j .L802C7A54 +/* EBE74 802C74C4 080B1E95 */ j L802C7A54_EC404 /* EBE78 802C74C8 0040282D */ daddu $a1, $v0, $zero glabel L802C74CC_EBE7C /* EBE7C 802C74CC 0C0B12C3 */ jal si_handle_break_loop /* EBE80 802C74D0 0200202D */ daddu $a0, $s0, $zero -/* EBE84 802C74D4 080B1E95 */ j .L802C7A54 +/* EBE84 802C74D4 080B1E95 */ j L802C7A54_EC404 /* EBE88 802C74D8 0040282D */ daddu $a1, $v0, $zero glabel L802C74DC_EBE8C /* EBE8C 802C74DC 0C0B12D7 */ jal si_handle_sleep_frames /* EBE90 802C74E0 0200202D */ daddu $a0, $s0, $zero -/* EBE94 802C74E4 080B1E95 */ j .L802C7A54 +/* EBE94 802C74E4 080B1E95 */ j L802C7A54_EC404 /* EBE98 802C74E8 0040282D */ daddu $a1, $v0, $zero glabel L802C74EC_EBE9C /* EBE9C 802C74EC 0C0B12EE */ jal si_handle_sleep_seconds /* EBEA0 802C74F0 0200202D */ daddu $a0, $s0, $zero -/* EBEA4 802C74F4 080B1E95 */ j .L802C7A54 +/* EBEA4 802C74F4 080B1E95 */ j L802C7A54_EC404 /* EBEA8 802C74F8 0040282D */ daddu $a1, $v0, $zero glabel L802C74FC_EBEAC /* EBEAC 802C74FC 0C0B1310 */ jal si_handle_if_equal /* EBEB0 802C7500 0200202D */ daddu $a0, $s0, $zero -/* EBEB4 802C7504 080B1E95 */ j .L802C7A54 +/* EBEB4 802C7504 080B1E95 */ j L802C7A54_EC404 /* EBEB8 802C7508 0040282D */ daddu $a1, $v0, $zero glabel L802C750C_EBEBC /* EBEBC 802C750C 0C0B1328 */ jal si_handle_if_not_equal /* EBEC0 802C7510 0200202D */ daddu $a0, $s0, $zero -/* EBEC4 802C7514 080B1E95 */ j .L802C7A54 +/* EBEC4 802C7514 080B1E95 */ j L802C7A54_EC404 /* EBEC8 802C7518 0040282D */ daddu $a1, $v0, $zero glabel L802C751C_EBECC /* EBECC 802C751C 0C0B1340 */ jal si_handle_if_less /* EBED0 802C7520 0200202D */ daddu $a0, $s0, $zero -/* EBED4 802C7524 080B1E95 */ j .L802C7A54 +/* EBED4 802C7524 080B1E95 */ j L802C7A54_EC404 /* EBED8 802C7528 0040282D */ daddu $a1, $v0, $zero glabel L802C752C_EBEDC /* EBEDC 802C752C 0C0B1359 */ jal si_handle_if_greater /* EBEE0 802C7530 0200202D */ daddu $a0, $s0, $zero -/* EBEE4 802C7534 080B1E95 */ j .L802C7A54 +/* EBEE4 802C7534 080B1E95 */ j L802C7A54_EC404 /* EBEE8 802C7538 0040282D */ daddu $a1, $v0, $zero glabel L802C753C_EBEEC /* EBEEC 802C753C 0C0B1372 */ jal si_handle_if_less_equal /* EBEF0 802C7540 0200202D */ daddu $a0, $s0, $zero -/* EBEF4 802C7544 080B1E95 */ j .L802C7A54 +/* EBEF4 802C7544 080B1E95 */ j L802C7A54_EC404 /* EBEF8 802C7548 0040282D */ daddu $a1, $v0, $zero glabel L802C754C_EBEFC /* EBEFC 802C754C 0C0B138B */ jal si_handle_if_greater_equal /* EBF00 802C7550 0200202D */ daddu $a0, $s0, $zero -/* EBF04 802C7554 080B1E95 */ j .L802C7A54 +/* EBF04 802C7554 080B1E95 */ j L802C7A54_EC404 /* EBF08 802C7558 0040282D */ daddu $a1, $v0, $zero glabel L802C755C_EBF0C /* EBF0C 802C755C 0C0B13A4 */ jal si_handle_if_flag /* EBF10 802C7560 0200202D */ daddu $a0, $s0, $zero -/* EBF14 802C7564 080B1E95 */ j .L802C7A54 +/* EBF14 802C7564 080B1E95 */ j L802C7A54_EC404 /* EBF18 802C7568 0040282D */ daddu $a1, $v0, $zero glabel L802C756C_EBF1C /* EBF1C 802C756C 0C0B13BA */ jal si_handle_if_not_flag /* EBF20 802C7570 0200202D */ daddu $a0, $s0, $zero -/* EBF24 802C7574 080B1E95 */ j .L802C7A54 +/* EBF24 802C7574 080B1E95 */ j L802C7A54_EC404 /* EBF28 802C7578 0040282D */ daddu $a1, $v0, $zero glabel L802C757C_EBF2C /* EBF2C 802C757C 0C0B13D0 */ jal si_handle_else /* EBF30 802C7580 0200202D */ daddu $a0, $s0, $zero -/* EBF34 802C7584 080B1E95 */ j .L802C7A54 +/* EBF34 802C7584 080B1E95 */ j L802C7A54_EC404 /* EBF38 802C7588 0040282D */ daddu $a1, $v0, $zero glabel L802C758C_EBF3C /* EBF3C 802C758C 0C0B13DB */ jal si_handle_end_if /* EBF40 802C7590 0200202D */ daddu $a0, $s0, $zero -/* EBF44 802C7594 080B1E95 */ j .L802C7A54 +/* EBF44 802C7594 080B1E95 */ j L802C7A54_EC404 /* EBF48 802C7598 0040282D */ daddu $a1, $v0, $zero glabel L802C759C_EBF4C /* EBF4C 802C759C 0C0B13DD */ jal si_handle_match /* EBF50 802C75A0 0200202D */ daddu $a0, $s0, $zero -/* EBF54 802C75A4 080B1E95 */ j .L802C7A54 +/* EBF54 802C75A4 080B1E95 */ j L802C7A54_EC404 /* EBF58 802C75A8 0040282D */ daddu $a1, $v0, $zero glabel L802C75AC_EBF5C /* EBF5C 802C75AC 0C0B13F9 */ jal si_handle_match_const /* EBF60 802C75B0 0200202D */ daddu $a0, $s0, $zero -/* EBF64 802C75B4 080B1E95 */ j .L802C7A54 +/* EBF64 802C75B4 080B1E95 */ j L802C7A54_EC404 /* EBF68 802C75B8 0040282D */ daddu $a1, $v0, $zero glabel L802C75BC_EBF6C /* EBF6C 802C75BC 0C0B140C */ jal si_handle_case_equal /* EBF70 802C75C0 0200202D */ daddu $a0, $s0, $zero -/* EBF74 802C75C4 080B1E95 */ j .L802C7A54 +/* EBF74 802C75C4 080B1E95 */ j L802C7A54_EC404 /* EBF78 802C75C8 0040282D */ daddu $a1, $v0, $zero glabel L802C75CC_EBF7C /* EBF7C 802C75CC 0C0B142F */ jal si_handle_case_not_equal /* EBF80 802C75D0 0200202D */ daddu $a0, $s0, $zero -/* EBF84 802C75D4 080B1E95 */ j .L802C7A54 +/* EBF84 802C75D4 080B1E95 */ j L802C7A54_EC404 /* EBF88 802C75D8 0040282D */ daddu $a1, $v0, $zero glabel L802C75DC_EBF8C /* EBF8C 802C75DC 0C0B1452 */ jal si_handle_case_less /* EBF90 802C75E0 0200202D */ daddu $a0, $s0, $zero -/* EBF94 802C75E4 080B1E95 */ j .L802C7A54 +/* EBF94 802C75E4 080B1E95 */ j L802C7A54_EC404 /* EBF98 802C75E8 0040282D */ daddu $a1, $v0, $zero glabel L802C75EC_EBF9C /* EBF9C 802C75EC 0C0B1476 */ jal si_handle_case_less_equal /* EBFA0 802C75F0 0200202D */ daddu $a0, $s0, $zero -/* EBFA4 802C75F4 080B1E95 */ j .L802C7A54 +/* EBFA4 802C75F4 080B1E95 */ j L802C7A54_EC404 /* EBFA8 802C75F8 0040282D */ daddu $a1, $v0, $zero glabel L802C75FC_EBFAC /* EBFAC 802C75FC 0C0B149A */ jal si_handle_case_greater /* EBFB0 802C7600 0200202D */ daddu $a0, $s0, $zero -/* EBFB4 802C7604 080B1E95 */ j .L802C7A54 +/* EBFB4 802C7604 080B1E95 */ j L802C7A54_EC404 /* EBFB8 802C7608 0040282D */ daddu $a1, $v0, $zero glabel L802C760C_EBFBC /* EBFBC 802C760C 0C0B14BE */ jal si_handle_case_greater_equal /* EBFC0 802C7610 0200202D */ daddu $a0, $s0, $zero -/* EBFC4 802C7614 080B1E95 */ j .L802C7A54 +/* EBFC4 802C7614 080B1E95 */ j L802C7A54_EC404 /* EBFC8 802C7618 0040282D */ daddu $a1, $v0, $zero glabel L802C761C_EBFCC /* EBFCC 802C761C 0C0B1511 */ jal si_handle_case_else /* EBFD0 802C7620 0200202D */ daddu $a0, $s0, $zero -/* EBFD4 802C7624 080B1E95 */ j .L802C7A54 +/* EBFD4 802C7624 080B1E95 */ j L802C7A54_EC404 /* EBFD8 802C7628 0040282D */ daddu $a1, $v0, $zero glabel L802C762C_EBFDC /* EBFDC 802C762C 0C0B15B5 */ jal si_handle_break_match /* EBFE0 802C7630 0200202D */ daddu $a0, $s0, $zero -/* EBFE4 802C7634 080B1E95 */ j .L802C7A54 +/* EBFE4 802C7634 080B1E95 */ j L802C7A54_EC404 /* EBFE8 802C7638 0040282D */ daddu $a1, $v0, $zero glabel L802C763C_EBFEC /* EBFEC 802C763C 0C0B1546 */ jal si_handle_case_multi_or_equal /* EBFF0 802C7640 0200202D */ daddu $a0, $s0, $zero -/* EBFF4 802C7644 080B1E95 */ j .L802C7A54 +/* EBFF4 802C7644 080B1E95 */ j L802C7A54_EC404 /* EBFF8 802C7648 0040282D */ daddu $a1, $v0, $zero glabel L802C764C_EBFFC /* EBFFC 802C764C 0C0B1597 */ jal si_handle_end_case_multi /* EC000 802C7650 0200202D */ daddu $a0, $s0, $zero -/* EC004 802C7654 080B1E95 */ j .L802C7A54 +/* EC004 802C7654 080B1E95 */ j L802C7A54_EC404 /* EC008 802C7658 0040282D */ daddu $a1, $v0, $zero glabel L802C765C_EC00C /* EC00C 802C765C 0C0B156E */ jal si_handle_case_multi_and_equal /* EC010 802C7660 0200202D */ daddu $a0, $s0, $zero -/* EC014 802C7664 080B1E95 */ j .L802C7A54 +/* EC014 802C7664 080B1E95 */ j L802C7A54_EC404 /* EC018 802C7668 0040282D */ daddu $a1, $v0, $zero glabel L802C766C_EC01C /* EC01C 802C766C 0C0B1527 */ jal si_handle_case_flag /* EC020 802C7670 0200202D */ daddu $a0, $s0, $zero -/* EC024 802C7674 080B1E95 */ j .L802C7A54 +/* EC024 802C7674 080B1E95 */ j L802C7A54_EC404 /* EC028 802C7678 0040282D */ daddu $a1, $v0, $zero glabel L802C767C_EC02C /* EC02C 802C767C 0C0B14E2 */ jal si_handle_case_range /* EC030 802C7680 0200202D */ daddu $a0, $s0, $zero -/* EC034 802C7684 080B1E95 */ j .L802C7A54 +/* EC034 802C7684 080B1E95 */ j L802C7A54_EC404 /* EC038 802C7688 0040282D */ daddu $a1, $v0, $zero glabel L802C768C_EC03C /* EC03C 802C768C 0C0B15C6 */ jal si_handle_end_match /* EC040 802C7690 0200202D */ daddu $a0, $s0, $zero -/* EC044 802C7694 080B1E95 */ j .L802C7A54 +/* EC044 802C7694 080B1E95 */ j L802C7A54_EC404 /* EC048 802C7698 0040282D */ daddu $a1, $v0, $zero glabel L802C769C_EC04C /* EC04C 802C769C 0C0B15D1 */ jal si_handle_set_var /* EC050 802C76A0 0200202D */ daddu $a0, $s0, $zero -/* EC054 802C76A4 080B1E95 */ j .L802C7A54 +/* EC054 802C76A4 080B1E95 */ j L802C7A54_EC404 /* EC058 802C76A8 0040282D */ daddu $a1, $v0, $zero glabel L802C76AC_EC05C /* EC05C 802C76AC 0C0B15E4 */ jal si_handle_set_const /* EC060 802C76B0 0200202D */ daddu $a0, $s0, $zero -/* EC064 802C76B4 080B1E95 */ j .L802C7A54 +/* EC064 802C76B4 080B1E95 */ j L802C7A54_EC404 /* EC068 802C76B8 0040282D */ daddu $a1, $v0, $zero glabel L802C76BC_EC06C /* EC06C 802C76BC 0C0B15EE */ jal si_handle_set_float /* EC070 802C76C0 0200202D */ daddu $a0, $s0, $zero -/* EC074 802C76C4 080B1E95 */ j .L802C7A54 +/* EC074 802C76C4 080B1E95 */ j L802C7A54_EC404 /* EC078 802C76C8 0040282D */ daddu $a1, $v0, $zero glabel L802C76CC_EC07C /* EC07C 802C76CC 0C0B1601 */ jal si_handle_add /* EC080 802C76D0 0200202D */ daddu $a0, $s0, $zero -/* EC084 802C76D4 080B1E95 */ j .L802C7A54 +/* EC084 802C76D4 080B1E95 */ j L802C7A54_EC404 /* EC088 802C76D8 0040282D */ daddu $a1, $v0, $zero glabel L802C76DC_EC08C /* EC08C 802C76DC 0C0B161A */ jal si_handle_subtract /* EC090 802C76E0 0200202D */ daddu $a0, $s0, $zero -/* EC094 802C76E4 080B1E95 */ j .L802C7A54 +/* EC094 802C76E4 080B1E95 */ j L802C7A54_EC404 /* EC098 802C76E8 0040282D */ daddu $a1, $v0, $zero glabel L802C76EC_EC09C /* EC09C 802C76EC 0C0B1633 */ jal si_handle_multiply /* EC0A0 802C76F0 0200202D */ daddu $a0, $s0, $zero -/* EC0A4 802C76F4 080B1E95 */ j .L802C7A54 +/* EC0A4 802C76F4 080B1E95 */ j L802C7A54_EC404 /* EC0A8 802C76F8 0040282D */ daddu $a1, $v0, $zero glabel L802C76FC_EC0AC /* EC0AC 802C76FC 0C0B164D */ jal si_handle_divide /* EC0B0 802C7700 0200202D */ daddu $a0, $s0, $zero -/* EC0B4 802C7704 080B1E95 */ j .L802C7A54 +/* EC0B4 802C7704 080B1E95 */ j L802C7A54_EC404 /* EC0B8 802C7708 0040282D */ daddu $a1, $v0, $zero glabel L802C770C_EC0BC /* EC0BC 802C770C 0C0B166F */ jal si_handle_mod /* EC0C0 802C7710 0200202D */ daddu $a0, $s0, $zero -/* EC0C4 802C7714 080B1E95 */ j .L802C7A54 +/* EC0C4 802C7714 080B1E95 */ j L802C7A54_EC404 /* EC0C8 802C7718 0040282D */ daddu $a1, $v0, $zero glabel L802C771C_EC0CC /* EC0CC 802C771C 0C0B16A1 */ jal si_handle_addF /* EC0D0 802C7720 0200202D */ daddu $a0, $s0, $zero -/* EC0D4 802C7724 080B1E95 */ j .L802C7A54 +/* EC0D4 802C7724 080B1E95 */ j L802C7A54_EC404 /* EC0D8 802C7728 0040282D */ daddu $a1, $v0, $zero glabel L802C772C_EC0DC /* EC0DC 802C772C 0C0B16BB */ jal si_handle_subtractF /* EC0E0 802C7730 0200202D */ daddu $a0, $s0, $zero -/* EC0E4 802C7734 080B1E95 */ j .L802C7A54 +/* EC0E4 802C7734 080B1E95 */ j L802C7A54_EC404 /* EC0E8 802C7738 0040282D */ daddu $a1, $v0, $zero glabel L802C773C_EC0EC /* EC0EC 802C773C 0C0B16D5 */ jal si_handle_multiplyF /* EC0F0 802C7740 0200202D */ daddu $a0, $s0, $zero -/* EC0F4 802C7744 080B1E95 */ j .L802C7A54 +/* EC0F4 802C7744 080B1E95 */ j L802C7A54_EC404 /* EC0F8 802C7748 0040282D */ daddu $a1, $v0, $zero glabel L802C774C_EC0FC /* EC0FC 802C774C 0C0B16F0 */ jal si_handle_divideF /* EC100 802C7750 0200202D */ daddu $a0, $s0, $zero -/* EC104 802C7754 080B1E95 */ j .L802C7A54 +/* EC104 802C7754 080B1E95 */ j L802C7A54_EC404 /* EC108 802C7758 0040282D */ daddu $a1, $v0, $zero glabel L802C775C_EC10C /* EC10C 802C775C 0C0B170A */ jal si_handle_set_int_buffer_ptr /* EC110 802C7760 0200202D */ daddu $a0, $s0, $zero -/* EC114 802C7764 080B1E95 */ j .L802C7A54 +/* EC114 802C7764 080B1E95 */ j L802C7A54_EC404 /* EC118 802C7768 0040282D */ daddu $a1, $v0, $zero glabel L802C776C_EC11C /* EC11C 802C776C 0C0B1724 */ jal si_handle_get_1_word /* EC120 802C7770 0200202D */ daddu $a0, $s0, $zero -/* EC124 802C7774 080B1E95 */ j .L802C7A54 +/* EC124 802C7774 080B1E95 */ j L802C7A54_EC404 /* EC128 802C7778 0040282D */ daddu $a1, $v0, $zero glabel L802C777C_EC12C /* EC12C 802C777C 0C0B1731 */ jal si_handle_get_2_word /* EC130 802C7780 0200202D */ daddu $a0, $s0, $zero -/* EC134 802C7784 080B1E95 */ j .L802C7A54 +/* EC134 802C7784 080B1E95 */ j L802C7A54_EC404 /* EC138 802C7788 0040282D */ daddu $a1, $v0, $zero glabel L802C778C_EC13C /* EC13C 802C778C 0C0B174B */ jal si_handle_get_3_word /* EC140 802C7790 0200202D */ daddu $a0, $s0, $zero -/* EC144 802C7794 080B1E95 */ j .L802C7A54 +/* EC144 802C7794 080B1E95 */ j L802C7A54_EC404 /* EC148 802C7798 0040282D */ daddu $a1, $v0, $zero glabel L802C779C_EC14C /* EC14C 802C779C 0C0B176D */ jal si_handle_get_4_word /* EC150 802C77A0 0200202D */ daddu $a0, $s0, $zero -/* EC154 802C77A4 080B1E95 */ j .L802C7A54 +/* EC154 802C77A4 080B1E95 */ j L802C7A54_EC404 /* EC158 802C77A8 0040282D */ daddu $a1, $v0, $zero glabel L802C77AC_EC15C /* EC15C 802C77AC 0C0B1797 */ jal si_handle_get_Nth_word /* EC160 802C77B0 0200202D */ daddu $a0, $s0, $zero -/* EC164 802C77B4 080B1E95 */ j .L802C7A54 +/* EC164 802C77B4 080B1E95 */ j L802C7A54_EC404 /* EC168 802C77B8 0040282D */ daddu $a1, $v0, $zero glabel L802C77BC_EC16C /* EC16C 802C77BC 0C0B1717 */ jal si_handle_set_float_buffer_ptr /* EC170 802C77C0 0200202D */ daddu $a0, $s0, $zero -/* EC174 802C77C4 080B1E95 */ j .L802C7A54 +/* EC174 802C77C4 080B1E95 */ j L802C7A54_EC404 /* EC178 802C77C8 0040282D */ daddu $a1, $v0, $zero glabel L802C77CC_EC17C /* EC17C 802C77CC 0C0B17AD */ jal si_handle_get_1_float /* EC180 802C77D0 0200202D */ daddu $a0, $s0, $zero -/* EC184 802C77D4 080B1E95 */ j .L802C7A54 +/* EC184 802C77D4 080B1E95 */ j L802C7A54_EC404 /* EC188 802C77D8 0040282D */ daddu $a1, $v0, $zero glabel L802C77DC_EC18C /* EC18C 802C77DC 0C0B17C3 */ jal si_handle_get_2_float /* EC190 802C77E0 0200202D */ daddu $a0, $s0, $zero -/* EC194 802C77E4 080B1E95 */ j .L802C7A54 +/* EC194 802C77E4 080B1E95 */ j L802C7A54_EC404 /* EC198 802C77E8 0040282D */ daddu $a1, $v0, $zero glabel L802C77EC_EC19C /* EC19C 802C77EC 0C0B17E7 */ jal si_handle_get_3_float /* EC1A0 802C77F0 0200202D */ daddu $a0, $s0, $zero -/* EC1A4 802C77F4 080B1E95 */ j .L802C7A54 +/* EC1A4 802C77F4 080B1E95 */ j L802C7A54_EC404 /* EC1A8 802C77F8 0040282D */ daddu $a1, $v0, $zero glabel L802C77FC_EC1AC /* EC1AC 802C77FC 0C0B1817 */ jal si_handle_get_4_float /* EC1B0 802C7800 0200202D */ daddu $a0, $s0, $zero -/* EC1B4 802C7804 080B1E95 */ j .L802C7A54 +/* EC1B4 802C7804 080B1E95 */ j L802C7A54_EC404 /* EC1B8 802C7808 0040282D */ daddu $a1, $v0, $zero glabel L802C780C_EC1BC /* EC1BC 802C780C 0C0B1853 */ jal si_handle_get_Nth_float /* EC1C0 802C7810 0200202D */ daddu $a0, $s0, $zero -/* EC1C4 802C7814 080B1E95 */ j .L802C7A54 +/* EC1C4 802C7814 080B1E95 */ j L802C7A54_EC404 /* EC1C8 802C7818 0040282D */ daddu $a1, $v0, $zero glabel L802C781C_EC1CC /* EC1CC 802C781C 0C0B186B */ jal si_handle_set_array /* EC1D0 802C7820 0200202D */ daddu $a0, $s0, $zero -/* EC1D4 802C7824 080B1E95 */ j .L802C7A54 +/* EC1D4 802C7824 080B1E95 */ j L802C7A54_EC404 /* EC1D8 802C7828 0040282D */ daddu $a1, $v0, $zero glabel L802C782C_EC1DC /* EC1DC 802C782C 0C0B1878 */ jal si_handle_set_flag_array /* EC1E0 802C7830 0200202D */ daddu $a0, $s0, $zero -/* EC1E4 802C7834 080B1E95 */ j .L802C7A54 +/* EC1E4 802C7834 080B1E95 */ j L802C7A54_EC404 /* EC1E8 802C7838 0040282D */ daddu $a1, $v0, $zero glabel L802C783C_EC1EC /* EC1EC 802C783C 0C0B1885 */ jal si_handle_allocate_array /* EC1F0 802C7840 0200202D */ daddu $a0, $s0, $zero -/* EC1F4 802C7844 080B1E95 */ j .L802C7A54 +/* EC1F4 802C7844 080B1E95 */ j L802C7A54_EC404 /* EC1F8 802C7848 0040282D */ daddu $a1, $v0, $zero glabel L802C784C_EC1FC /* EC1FC 802C784C 0C0B1A1C */ jal si_handle_kill_script /* EC200 802C7850 0200202D */ daddu $a0, $s0, $zero -/* EC204 802C7854 080B1E95 */ j .L802C7A54 +/* EC204 802C7854 080B1E95 */ j L802C7A54_EC404 /* EC208 802C7858 0040282D */ daddu $a1, $v0, $zero glabel L802C785C_EC20C /* EC20C 802C785C 0C0B189C */ jal si_handle_AND /* EC210 802C7860 0200202D */ daddu $a0, $s0, $zero -/* EC214 802C7864 080B1E95 */ j .L802C7A54 +/* EC214 802C7864 080B1E95 */ j L802C7A54_EC404 /* EC218 802C7868 0040282D */ daddu $a1, $v0, $zero glabel L802C786C_EC21C /* EC21C 802C786C 0C0B18B5 */ jal si_handle_AND_const /* EC220 802C7870 0200202D */ daddu $a0, $s0, $zero -/* EC224 802C7874 080B1E95 */ j .L802C7A54 +/* EC224 802C7874 080B1E95 */ j L802C7A54_EC404 /* EC228 802C7878 0040282D */ daddu $a1, $v0, $zero glabel L802C787C_EC22C /* EC22C 802C787C 0C0B18CB */ jal si_handle_OR /* EC230 802C7880 0200202D */ daddu $a0, $s0, $zero -/* EC234 802C7884 080B1E95 */ j .L802C7A54 +/* EC234 802C7884 080B1E95 */ j L802C7A54_EC404 /* EC238 802C7888 0040282D */ daddu $a1, $v0, $zero glabel L802C788C_EC23C /* EC23C 802C788C 0C0B18E4 */ jal si_handle_OR_const /* EC240 802C7890 0200202D */ daddu $a0, $s0, $zero -/* EC244 802C7894 080B1E95 */ j .L802C7A54 +/* EC244 802C7894 080B1E95 */ j L802C7A54_EC404 /* EC248 802C7898 0040282D */ daddu $a1, $v0, $zero glabel L802C789C_EC24C /* EC24C 802C789C 0C0B18FA */ jal si_handle_call /* EC250 802C78A0 0200202D */ daddu $a0, $s0, $zero -/* EC254 802C78A4 080B1E95 */ j .L802C7A54 +/* EC254 802C78A4 080B1E95 */ j L802C7A54_EC404 /* EC258 802C78A8 0040282D */ daddu $a1, $v0, $zero glabel L802C78AC_EC25C /* EC25C 802C78AC 0C0B191B */ jal si_handle_spawn_script /* EC260 802C78B0 0200202D */ daddu $a0, $s0, $zero -/* EC264 802C78B4 080B1E95 */ j .L802C7A54 +/* EC264 802C78B4 080B1E95 */ j L802C7A54_EC404 /* EC268 802C78B8 0040282D */ daddu $a1, $v0, $zero glabel L802C78BC_EC26C /* EC26C 802C78BC 0C0B1949 */ jal si_handle_spawn_script_get_id /* EC270 802C78C0 0200202D */ daddu $a0, $s0, $zero -/* EC274 802C78C4 080B1E95 */ j .L802C7A54 +/* EC274 802C78C4 080B1E95 */ j L802C7A54_EC404 /* EC278 802C78C8 0040282D */ daddu $a1, $v0, $zero glabel L802C78CC_EC27C /* EC27C 802C78CC 0C0B197F */ jal si_handle_await_script /* EC280 802C78D0 0200202D */ daddu $a0, $s0, $zero -/* EC284 802C78D4 080B1E95 */ j .L802C7A54 +/* EC284 802C78D4 080B1E95 */ j L802C7A54_EC404 /* EC288 802C78D8 0040282D */ daddu $a1, $v0, $zero glabel L802C78DC_EC28C /* EC28C 802C78DC 0C0B19C5 */ jal si_handle_bind_trigger /* EC290 802C78E0 0200202D */ daddu $a0, $s0, $zero -/* EC294 802C78E4 080B1E95 */ j .L802C7A54 +/* EC294 802C78E4 080B1E95 */ j L802C7A54_EC404 /* EC298 802C78E8 0040282D */ daddu $a1, $v0, $zero glabel L802C78EC_EC29C /* EC29C 802C78EC 0C0B1A14 */ jal si_handle_unbind /* EC2A0 802C78F0 0200202D */ daddu $a0, $s0, $zero -/* EC2A4 802C78F4 080B1E95 */ j .L802C7A54 +/* EC2A4 802C78F4 080B1E95 */ j L802C7A54_EC404 /* EC2A8 802C78F8 0040282D */ daddu $a1, $v0, $zero glabel L802C78FC_EC2AC /* EC2AC 802C78FC 0C0B1A27 */ jal si_handle_set_priority /* EC2B0 802C7900 0200202D */ daddu $a0, $s0, $zero -/* EC2B4 802C7904 080B1E95 */ j .L802C7A54 +/* EC2B4 802C7904 080B1E95 */ j L802C7A54_EC404 /* EC2B8 802C7908 0040282D */ daddu $a1, $v0, $zero glabel L802C790C_EC2BC /* EC2BC 802C790C 0C0B1A36 */ jal si_handle_set_timescale /* EC2C0 802C7910 0200202D */ daddu $a0, $s0, $zero -/* EC2C4 802C7914 080B1E95 */ j .L802C7A54 +/* EC2C4 802C7914 080B1E95 */ j L802C7A54_EC404 /* EC2C8 802C7918 0040282D */ daddu $a1, $v0, $zero glabel L802C791C_EC2CC /* EC2CC 802C791C 0C0B1A45 */ jal si_handle_set_group /* EC2D0 802C7920 0200202D */ daddu $a0, $s0, $zero -/* EC2D4 802C7924 080B1E95 */ j .L802C7A54 +/* EC2D4 802C7924 080B1E95 */ j L802C7A54_EC404 /* EC2D8 802C7928 0040282D */ daddu $a1, $v0, $zero glabel L802C792C_EC2DC /* EC2DC 802C792C 0C0B1990 */ jal si_handle_jump /* EC2E0 802C7930 0200202D */ daddu $a0, $s0, $zero -/* EC2E4 802C7934 080B1E95 */ j .L802C7A54 +/* EC2E4 802C7934 080B1E95 */ j L802C7A54_EC404 /* EC2E8 802C7938 0040282D */ daddu $a1, $v0, $zero glabel L802C793C_EC2EC /* EC2EC 802C793C 0C0B1AD5 */ jal si_handle_bind_lock /* EC2F0 802C7940 0200202D */ daddu $a0, $s0, $zero -/* EC2F4 802C7944 080B1E95 */ j .L802C7A54 +/* EC2F4 802C7944 080B1E95 */ j L802C7A54_EC404 /* EC2F8 802C7948 0040282D */ daddu $a1, $v0, $zero glabel L802C794C_EC2FC /* EC2FC 802C794C 0C0B1A54 */ jal si_handle_suspend_all /* EC300 802C7950 0200202D */ daddu $a0, $s0, $zero -/* EC304 802C7954 080B1E95 */ j .L802C7A54 +/* EC304 802C7954 080B1E95 */ j L802C7A54_EC404 /* EC308 802C7958 0040282D */ daddu $a1, $v0, $zero glabel L802C795C_EC30C /* EC30C 802C795C 0C0B1A5F */ jal si_handle_resume_all /* EC310 802C7960 0200202D */ daddu $a0, $s0, $zero -/* EC314 802C7964 080B1E95 */ j .L802C7A54 +/* EC314 802C7964 080B1E95 */ j L802C7A54_EC404 /* EC318 802C7968 0040282D */ daddu $a1, $v0, $zero glabel L802C796C_EC31C /* EC31C 802C796C 0C0B1A6A */ jal si_handle_suspend_others /* EC320 802C7970 0200202D */ daddu $a0, $s0, $zero -/* EC324 802C7974 080B1E95 */ j .L802C7A54 +/* EC324 802C7974 080B1E95 */ j L802C7A54_EC404 /* EC328 802C7978 0040282D */ daddu $a1, $v0, $zero glabel L802C797C_EC32C /* EC32C 802C797C 0C0B1A79 */ jal si_handle_resume_others /* EC330 802C7980 0200202D */ daddu $a0, $s0, $zero -/* EC334 802C7984 080B1E95 */ j .L802C7A54 +/* EC334 802C7984 080B1E95 */ j L802C7A54_EC404 /* EC338 802C7988 0040282D */ daddu $a1, $v0, $zero glabel L802C798C_EC33C /* EC33C 802C798C 0C0B1A88 */ jal si_handle_suspend_script /* EC340 802C7990 0200202D */ daddu $a0, $s0, $zero -/* EC344 802C7994 080B1E95 */ j .L802C7A54 +/* EC344 802C7994 080B1E95 */ j L802C7A54_EC404 /* EC348 802C7998 0040282D */ daddu $a1, $v0, $zero glabel L802C799C_EC34C /* EC34C 802C799C 0C0B1A93 */ jal si_handle_resume_script /* EC350 802C79A0 0200202D */ daddu $a0, $s0, $zero -/* EC354 802C79A4 080B1E95 */ j .L802C7A54 +/* EC354 802C79A4 080B1E95 */ j L802C7A54_EC404 /* EC358 802C79A8 0040282D */ daddu $a1, $v0, $zero glabel L802C79AC_EC35C /* EC35C 802C79AC 0C0B1A9E */ jal si_handle_does_script_exist /* EC360 802C79B0 0200202D */ daddu $a0, $s0, $zero -/* EC364 802C79B4 080B1E95 */ j .L802C7A54 +/* EC364 802C79B4 080B1E95 */ j L802C7A54_EC404 /* EC368 802C79B8 0040282D */ daddu $a1, $v0, $zero glabel L802C79BC_EC36C /* EC36C 802C79BC 0C0B1B1E */ jal si_handle_spawn_thread /* EC370 802C79C0 0200202D */ daddu $a0, $s0, $zero -/* EC374 802C79C4 080B1E95 */ j .L802C7A54 +/* EC374 802C79C4 080B1E95 */ j L802C7A54_EC404 /* EC378 802C79C8 0040282D */ daddu $a1, $v0, $zero glabel L802C79CC_EC37C /* EC37C 802C79CC 0C0B1B53 */ jal si_handle_end_spawn_thread /* EC380 802C79D0 0200202D */ daddu $a0, $s0, $zero -/* EC384 802C79D4 080B1E95 */ j .L802C7A54 +/* EC384 802C79D4 080B1E95 */ j L802C7A54_EC404 /* EC388 802C79D8 0040282D */ daddu $a1, $v0, $zero glabel L802C79DC_EC38C /* EC38C 802C79DC 0C0B1B5B */ jal si_handle_parallel_thread /* EC390 802C79E0 0200202D */ daddu $a0, $s0, $zero -/* EC394 802C79E4 080B1E95 */ j .L802C7A54 +/* EC394 802C79E4 080B1E95 */ j L802C7A54_EC404 /* EC398 802C79E8 0040282D */ daddu $a1, $v0, $zero glabel L802C79EC_EC39C /* EC39C 802C79EC 0C0B1B7D */ jal si_handle_end_parallel_thread /* EC3A0 802C79F0 0200202D */ daddu $a0, $s0, $zero -/* EC3A4 802C79F4 080B1E95 */ j .L802C7A54 +/* EC3A4 802C79F4 080B1E95 */ j L802C7A54_EC404 /* EC3A8 802C79F8 0040282D */ daddu $a1, $v0, $zero glabel L802C79FC_EC3AC /* EC3AC 802C79FC 0C0B1B85 */ jal func_802C6E14 /* EC3B0 802C7A00 0200202D */ daddu $a0, $s0, $zero -/* EC3B4 802C7A04 080B1E95 */ j .L802C7A54 +/* EC3B4 802C7A04 080B1E95 */ j L802C7A54_EC404 /* EC3B8 802C7A08 0040282D */ daddu $a1, $v0, $zero glabel L802C7A0C_EC3BC /* EC3BC 802C7A0C 0C0B1B87 */ jal si_handle_print_debug_var /* EC3C0 802C7A10 0200202D */ daddu $a0, $s0, $zero -/* EC3C4 802C7A14 080B1E95 */ j .L802C7A54 +/* EC3C4 802C7A14 080B1E95 */ j L802C7A54_EC404 /* EC3C8 802C7A18 0040282D */ daddu $a1, $v0, $zero glabel L802C7A1C_EC3CC /* EC3CC 802C7A1C 0C0B1CE7 */ jal func_802C739C /* EC3D0 802C7A20 0200202D */ daddu $a0, $s0, $zero -/* EC3D4 802C7A24 080B1E95 */ j .L802C7A54 +/* EC3D4 802C7A24 080B1E95 */ j L802C7A54_EC404 /* EC3D8 802C7A28 0040282D */ daddu $a1, $v0, $zero glabel L802C7A2C_EC3DC /* EC3DC 802C7A2C 0C0B1CEC */ jal func_802C73B0 /* EC3E0 802C7A30 0200202D */ daddu $a0, $s0, $zero -/* EC3E4 802C7A34 080B1E95 */ j .L802C7A54 +/* EC3E4 802C7A34 080B1E95 */ j L802C7A54_EC404 /* EC3E8 802C7A38 0040282D */ daddu $a1, $v0, $zero glabel L802C7A3C_EC3EC /* EC3EC 802C7A3C 0C0B1CEE */ jal func_802C73B8 /* EC3F0 802C7A40 0200202D */ daddu $a0, $s0, $zero -/* EC3F4 802C7A44 080B1E95 */ j .L802C7A54 +/* EC3F4 802C7A44 080B1E95 */ j L802C7A54_EC404 /* EC3F8 802C7A48 0040282D */ daddu $a1, $v0, $zero .L802C7A4C: /* EC3FC 802C7A4C 080B1E93 */ j .L802C7A4C /* EC400 802C7A50 00000000 */ nop -.L802C7A54: glabel L802C7A54_EC404 /* EC404 802C7A54 24020003 */ addiu $v0, $zero, 3 /* EC408 802C7A58 10A2FE6E */ beq $a1, $v0, .L802C7414 diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s b/ver/us/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s index 0efff08ae8..3f1b4cff5a 100644 --- a/ver/us/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s +++ b/ver/us/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s @@ -93,7 +93,7 @@ glabel func_80240C90_BDDE40 .L80240DE0: /* BDDF90 80240DE0 8E630070 */ lw $v1, 0x70($s3) /* BDDF94 80240DE4 2C620035 */ sltiu $v0, $v1, 0x35 -/* BDDF98 80240DE8 10400073 */ beqz $v0, .L80240FB8 +/* BDDF98 80240DE8 10400073 */ beqz $v0, L80240FB8_BDE168 /* BDDF9C 80240DEC 00031080 */ sll $v0, $v1, 2 /* BDDFA0 80240DF0 3C018024 */ lui $at, %hi(jtbl_80241B08_BDECB8) /* BDDFA4 80240DF4 00220821 */ addu $at, $at, $v0 @@ -170,7 +170,7 @@ glabel L80240EDC_BDE08C /* BDE09C 80240EEC 14400033 */ bnez $v0, .L80240FBC /* BDE0A0 80240EF0 0000102D */ daddu $v0, $zero, $zero /* BDE0A4 80240EF4 24020028 */ addiu $v0, $zero, 0x28 -/* BDE0A8 80240EF8 080903EE */ j .L80240FB8 +/* BDE0A8 80240EF8 080903EE */ j L80240FB8_BDE168 /* BDE0AC 80240EFC AE620070 */ sw $v0, 0x70($s3) glabel L80240F00_BDE0B0 /* BDE0B0 80240F00 0260202D */ daddu $a0, $s3, $zero @@ -226,7 +226,6 @@ glabel L80240FA8_BDE158 /* BDE15C 80240FAC 0280282D */ daddu $a1, $s4, $zero /* BDE160 80240FB0 0C090313 */ jal arn_02_UnkDurationCheck /* BDE164 80240FB4 0200302D */ daddu $a2, $s0, $zero -.L80240FB8: glabel L80240FB8_BDE168 /* BDE168 80240FB8 0000102D */ daddu $v0, $zero, $zero .L80240FBC: diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s b/ver/us/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s index 91717dfe04..c6b28b76d4 100644 --- a/ver/us/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s +++ b/ver/us/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s @@ -122,7 +122,7 @@ glabel func_80240B94_BDF924 .L80240D54: /* BDFAE4 80240D54 8E830070 */ lw $v1, 0x70($s4) /* BDFAE8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* BDFAEC 80240D5C 10400042 */ beqz $v0, .L80240E68 +/* BDFAEC 80240D5C 10400042 */ beqz $v0, L80240E68_BDFBF8 /* BDFAF0 80240D60 00031080 */ sll $v0, $v1, 2 /* BDFAF4 80240D64 3C018024 */ lui $at, %hi(jtbl_80244870_BE3600) /* BDFAF8 80240D68 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240D88_BDFB18 /* BDFB1C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* BDFB20 80240D90 0C090056 */ jal func_80240158_BDEEE8 /* BDFB24 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* BDFB28 80240D98 0809039A */ j .L80240E68 +/* BDFB28 80240D98 0809039A */ j L80240E68_BDFBF8 /* BDFB2C 80240D9C 00000000 */ nop glabel L80240DA0_BDFB30 /* BDFB30 80240DA0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80240DB0_BDFB40 /* BDFB44 80240DB4 0260282D */ daddu $a1, $s3, $zero /* BDFB48 80240DB8 0C090130 */ jal func_802404C0_BDF250 /* BDFB4C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* BDFB50 80240DC0 0809039A */ j .L80240E68 +/* BDFB50 80240DC0 0809039A */ j L80240E68_BDFBF8 /* BDFB54 80240DC4 00000000 */ nop glabel L80240DC8_BDFB58 /* BDFB58 80240DC8 0280202D */ daddu $a0, $s4, $zero /* BDFB5C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* BDFB60 80240DD0 0C09019F */ jal func_8024067C_BDF40C /* BDFB64 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* BDFB68 80240DD8 0809039A */ j .L80240E68 +/* BDFB68 80240DD8 0809039A */ j L80240E68_BDFBF8 /* BDFB6C 80240DDC 00000000 */ nop glabel L80240DE0_BDFB70 /* BDFB70 80240DE0 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80240DF0_BDFB80 /* BDFB84 80240DF4 0260282D */ daddu $a1, $s3, $zero /* BDFB88 80240DF8 0C0901E9 */ jal arn_03_NpcJumpFunc /* BDFB8C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* BDFB90 80240E00 0809039A */ j .L80240E68 +/* BDFB90 80240E00 0809039A */ j L80240E68_BDFBF8 /* BDFB94 80240E04 00000000 */ nop glabel L80240E08_BDFB98 /* BDFB98 80240E08 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80240E18_BDFBA8 /* BDFBAC 80240E1C 0260282D */ daddu $a1, $s3, $zero /* BDFBB0 80240E20 0C090253 */ jal func_8024094C_BDF6DC /* BDFBB4 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* BDFBB8 80240E28 0809039A */ j .L80240E68 +/* BDFBB8 80240E28 0809039A */ j L80240E68_BDFBF8 /* BDFBBC 80240E2C 00000000 */ nop glabel L80240E30_BDFBC0 /* BDFBC0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BDFBC4 80240E34 0260282D */ daddu $a1, $s3, $zero /* BDFBC8 80240E38 0C09029B */ jal arn_03_UnkNpcDurationFlagFunc /* BDFBCC 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* BDFBD0 80240E40 0809039A */ j .L80240E68 +/* BDFBD0 80240E40 0809039A */ j L80240E68_BDFBF8 /* BDFBD4 80240E44 00000000 */ nop glabel L80240E48_BDFBD8 /* BDFBD8 80240E48 0280202D */ daddu $a0, $s4, $zero /* BDFBDC 80240E4C 0260282D */ daddu $a1, $s3, $zero /* BDFBE0 80240E50 0C0902B5 */ jal func_80240AD4_BDF864 /* BDFBE4 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* BDFBE8 80240E58 0809039A */ j .L80240E68 +/* BDFBE8 80240E58 0809039A */ j L80240E68_BDFBF8 /* BDFBEC 80240E5C 00000000 */ nop glabel L80240E60_BDFBF0 /* BDFBF0 80240E60 0C0129CF */ jal func_8004A73C /* BDFBF4 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: glabel L80240E68_BDFBF8 /* BDFBF8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* BDFBFC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s index 8f3aefd8ce..e38d5117a3 100644 --- a/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s +++ b/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s @@ -122,7 +122,7 @@ glabel func_80240B94_BE4344 .L80240D54: /* BE4504 80240D54 8E830070 */ lw $v1, 0x70($s4) /* BE4508 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* BE450C 80240D5C 10400042 */ beqz $v0, .L80240E68 +/* BE450C 80240D5C 10400042 */ beqz $v0, L80240E68_BE4618 /* BE4510 80240D60 00031080 */ sll $v0, $v1, 2 /* BE4514 80240D64 3C018024 */ lui $at, %hi(jtbl_80244140_BE78F0) /* BE4518 80240D68 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240D88_BE4538 /* BE453C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* BE4540 80240D90 0C090056 */ jal func_80240158_BE3908 /* BE4544 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* BE4548 80240D98 0809039A */ j .L80240E68 +/* BE4548 80240D98 0809039A */ j L80240E68_BE4618 /* BE454C 80240D9C 00000000 */ nop glabel L80240DA0_BE4550 /* BE4550 80240DA0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80240DB0_BE4560 /* BE4564 80240DB4 0260282D */ daddu $a1, $s3, $zero /* BE4568 80240DB8 0C090130 */ jal func_802404C0_BE3C70 /* BE456C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* BE4570 80240DC0 0809039A */ j .L80240E68 +/* BE4570 80240DC0 0809039A */ j L80240E68_BE4618 /* BE4574 80240DC4 00000000 */ nop glabel L80240DC8_BE4578 /* BE4578 80240DC8 0280202D */ daddu $a0, $s4, $zero /* BE457C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* BE4580 80240DD0 0C09019F */ jal func_8024067C_BE3E2C /* BE4584 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* BE4588 80240DD8 0809039A */ j .L80240E68 +/* BE4588 80240DD8 0809039A */ j L80240E68_BE4618 /* BE458C 80240DDC 00000000 */ nop glabel L80240DE0_BE4590 /* BE4590 80240DE0 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80240DF0_BE45A0 /* BE45A4 80240DF4 0260282D */ daddu $a1, $s3, $zero /* BE45A8 80240DF8 0C0901E9 */ jal arn_04_NpcJumpFunc /* BE45AC 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* BE45B0 80240E00 0809039A */ j .L80240E68 +/* BE45B0 80240E00 0809039A */ j L80240E68_BE4618 /* BE45B4 80240E04 00000000 */ nop glabel L80240E08_BE45B8 /* BE45B8 80240E08 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80240E18_BE45C8 /* BE45CC 80240E1C 0260282D */ daddu $a1, $s3, $zero /* BE45D0 80240E20 0C090253 */ jal func_8024094C_BE40FC /* BE45D4 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* BE45D8 80240E28 0809039A */ j .L80240E68 +/* BE45D8 80240E28 0809039A */ j L80240E68_BE4618 /* BE45DC 80240E2C 00000000 */ nop glabel L80240E30_BE45E0 /* BE45E0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE45E4 80240E34 0260282D */ daddu $a1, $s3, $zero /* BE45E8 80240E38 0C09029B */ jal arn_04_UnkNpcDurationFlagFunc /* BE45EC 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* BE45F0 80240E40 0809039A */ j .L80240E68 +/* BE45F0 80240E40 0809039A */ j L80240E68_BE4618 /* BE45F4 80240E44 00000000 */ nop glabel L80240E48_BE45F8 /* BE45F8 80240E48 0280202D */ daddu $a0, $s4, $zero /* BE45FC 80240E4C 0260282D */ daddu $a1, $s3, $zero /* BE4600 80240E50 0C0902B5 */ jal func_80240AD4_BE4284 /* BE4604 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* BE4608 80240E58 0809039A */ j .L80240E68 +/* BE4608 80240E58 0809039A */ j L80240E68_BE4618 /* BE460C 80240E5C 00000000 */ nop glabel L80240E60_BE4610 /* BE4610 80240E60 0C0129CF */ jal func_8004A73C /* BE4614 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: glabel L80240E68_BE4618 /* BE4618 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* BE461C 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s b/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s index 72e2eafda8..b108c0944e 100644 --- a/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s +++ b/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s @@ -64,7 +64,7 @@ glabel func_8024219C_BE594C .L80242284: /* BE5A34 80242284 8E830070 */ lw $v1, 0x70($s4) /* BE5A38 80242288 2C62000F */ sltiu $v0, $v1, 0xf -/* BE5A3C 8024228C 10400034 */ beqz $v0, .L80242360 +/* BE5A3C 8024228C 10400034 */ beqz $v0, L80242360_BE5B10 /* BE5A40 80242290 00031080 */ sll $v0, $v1, 2 /* BE5A44 80242294 3C018024 */ lui $at, %hi(jtbl_802442E8_BE7A98) /* BE5A48 80242298 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80242350_BE5B00 /* BE5B04 80242354 0200282D */ daddu $a1, $s0, $zero /* BE5B08 80242358 0C09073A */ jal func_80241CE8_BE5498 /* BE5B0C 8024235C 0260302D */ daddu $a2, $s3, $zero -.L80242360: glabel L80242360_BE5B10 /* BE5B10 80242360 0000102D */ daddu $v0, $zero, $zero .L80242364: diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s b/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s index 566fa1c5d3..c0d29f52f7 100644 --- a/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s +++ b/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s @@ -93,7 +93,7 @@ glabel func_80243018_BE67C8 .L80243168: /* BE6918 80243168 8E630070 */ lw $v1, 0x70($s3) /* BE691C 8024316C 2C620035 */ sltiu $v0, $v1, 0x35 -/* BE6920 80243170 10400073 */ beqz $v0, .L80243340 +/* BE6920 80243170 10400073 */ beqz $v0, L80243340_BE6AF0 /* BE6924 80243174 00031080 */ sll $v0, $v1, 2 /* BE6928 80243178 3C018024 */ lui $at, %hi(jtbl_80244350_BE7B00) /* BE692C 8024317C 00220821 */ addu $at, $at, $v0 @@ -170,7 +170,7 @@ glabel L80243264_BE6A14 /* BE6A24 80243274 14400033 */ bnez $v0, .L80243344 /* BE6A28 80243278 0000102D */ daddu $v0, $zero, $zero /* BE6A2C 8024327C 24020028 */ addiu $v0, $zero, 0x28 -/* BE6A30 80243280 08090CD0 */ j .L80243340 +/* BE6A30 80243280 08090CD0 */ j L80243340_BE6AF0 /* BE6A34 80243284 AE620070 */ sw $v0, 0x70($s3) glabel L80243288_BE6A38 /* BE6A38 80243288 0260202D */ daddu $a0, $s3, $zero @@ -226,7 +226,6 @@ glabel L80243330_BE6AE0 /* BE6AE4 80243334 0280282D */ daddu $a1, $s4, $zero /* BE6AE8 80243338 0C090BF5 */ jal arn_04_UnkDurationCheck /* BE6AEC 8024333C 0200302D */ daddu $a2, $s0, $zero -.L80243340: glabel L80243340_BE6AF0 /* BE6AF0 80243340 0000102D */ daddu $v0, $zero, $zero .L80243344: diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/ver/us/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s index 87dd30e6c5..b78b39f2c0 100644 --- a/ver/us/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s +++ b/ver/us/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s @@ -122,7 +122,7 @@ glabel func_80240B94_BE8774 .L80240D54: /* BE8934 80240D54 8E830070 */ lw $v1, 0x70($s4) /* BE8938 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* BE893C 80240D5C 10400042 */ beqz $v0, .L80240E68 +/* BE893C 80240D5C 10400042 */ beqz $v0, L80240E68_BE8A48 /* BE8940 80240D60 00031080 */ sll $v0, $v1, 2 /* BE8944 80240D64 3C018024 */ lui $at, %hi(jtbl_80245060_BECC40) /* BE8948 80240D68 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240D88_BE8968 /* BE896C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* BE8970 80240D90 0C090056 */ jal func_80240158_BE7D38 /* BE8974 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* BE8978 80240D98 0809039A */ j .L80240E68 +/* BE8978 80240D98 0809039A */ j L80240E68_BE8A48 /* BE897C 80240D9C 00000000 */ nop glabel L80240DA0_BE8980 /* BE8980 80240DA0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80240DB0_BE8990 /* BE8994 80240DB4 0260282D */ daddu $a1, $s3, $zero /* BE8998 80240DB8 0C090130 */ jal func_802404C0_BE80A0 /* BE899C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* BE89A0 80240DC0 0809039A */ j .L80240E68 +/* BE89A0 80240DC0 0809039A */ j L80240E68_BE8A48 /* BE89A4 80240DC4 00000000 */ nop glabel L80240DC8_BE89A8 /* BE89A8 80240DC8 0280202D */ daddu $a0, $s4, $zero /* BE89AC 80240DCC 0260282D */ daddu $a1, $s3, $zero /* BE89B0 80240DD0 0C09019F */ jal func_8024067C_BE825C /* BE89B4 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* BE89B8 80240DD8 0809039A */ j .L80240E68 +/* BE89B8 80240DD8 0809039A */ j L80240E68_BE8A48 /* BE89BC 80240DDC 00000000 */ nop glabel L80240DE0_BE89C0 /* BE89C0 80240DE0 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80240DF0_BE89D0 /* BE89D4 80240DF4 0260282D */ daddu $a1, $s3, $zero /* BE89D8 80240DF8 0C0901E9 */ jal arn_05_NpcJumpFunc /* BE89DC 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* BE89E0 80240E00 0809039A */ j .L80240E68 +/* BE89E0 80240E00 0809039A */ j L80240E68_BE8A48 /* BE89E4 80240E04 00000000 */ nop glabel L80240E08_BE89E8 /* BE89E8 80240E08 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80240E18_BE89F8 /* BE89FC 80240E1C 0260282D */ daddu $a1, $s3, $zero /* BE8A00 80240E20 0C090253 */ jal func_8024094C_BE852C /* BE8A04 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* BE8A08 80240E28 0809039A */ j .L80240E68 +/* BE8A08 80240E28 0809039A */ j L80240E68_BE8A48 /* BE8A0C 80240E2C 00000000 */ nop glabel L80240E30_BE8A10 /* BE8A10 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE8A14 80240E34 0260282D */ daddu $a1, $s3, $zero /* BE8A18 80240E38 0C09029B */ jal arn_05_UnkNpcDurationFlagFunc /* BE8A1C 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* BE8A20 80240E40 0809039A */ j .L80240E68 +/* BE8A20 80240E40 0809039A */ j L80240E68_BE8A48 /* BE8A24 80240E44 00000000 */ nop glabel L80240E48_BE8A28 /* BE8A28 80240E48 0280202D */ daddu $a0, $s4, $zero /* BE8A2C 80240E4C 0260282D */ daddu $a1, $s3, $zero /* BE8A30 80240E50 0C0902B5 */ jal func_80240AD4_BE86B4 /* BE8A34 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* BE8A38 80240E58 0809039A */ j .L80240E68 +/* BE8A38 80240E58 0809039A */ j L80240E68_BE8A48 /* BE8A3C 80240E5C 00000000 */ nop glabel L80240E60_BE8A40 /* BE8A40 80240E60 0C0129CF */ jal func_8004A73C /* BE8A44 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: glabel L80240E68_BE8A48 /* BE8A48 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* BE8A4C 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_802401AC_BECF9C.s b/ver/us/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_802401AC_BECF9C.s index 5c6cfcc13a..861f1697f2 100644 --- a/ver/us/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_802401AC_BECF9C.s +++ b/ver/us/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_802401AC_BECF9C.s @@ -11,7 +11,7 @@ glabel func_802401AC_BECF9C /* BECFB4 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) /* BECFB8 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* BECFBC 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* BECFC0 802401D0 1040008A */ beqz $v0, .L802403FC +/* BECFC0 802401D0 1040008A */ beqz $v0, L802403FC_BED1EC /* BECFC4 802401D4 00031080 */ sll $v0, $v1, 2 /* BECFC8 802401D8 3C018024 */ lui $at, %hi(jtbl_80247900_BF46F0) /* BECFCC 802401DC 00220821 */ addu $at, $at, $v0 @@ -62,10 +62,10 @@ glabel L802401EC_BECFDC /* BED07C 8024028C 00021400 */ sll $v0, $v0, 0x10 /* BED080 80240290 00021403 */ sra $v0, $v0, 0x10 /* BED084 80240294 0043102A */ slt $v0, $v0, $v1 -/* BED088 80240298 14400058 */ bnez $v0, .L802403FC +/* BED088 80240298 14400058 */ bnez $v0, L802403FC_BED1EC /* BED08C 8024029C 24020001 */ addiu $v0, $zero, 1 /* BED090 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* BED094 802402A4 080900FF */ j .L802403FC +/* BED094 802402A4 080900FF */ j L802403FC_BED1EC /* BED098 802402A8 A6200046 */ sh $zero, 0x46($s1) glabel L802402AC_BED09C /* BED09C 802402AC 96220046 */ lhu $v0, 0x46($s1) @@ -74,7 +74,7 @@ glabel L802402AC_BED09C /* BED0A8 802402B8 00021400 */ sll $v0, $v0, 0x10 /* BED0AC 802402BC 00021403 */ sra $v0, $v0, 0x10 /* BED0B0 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* BED0B4 802402C4 1440004D */ bnez $v0, .L802403FC +/* BED0B4 802402C4 1440004D */ bnez $v0, L802403FC_BED1EC /* BED0B8 802402C8 24020002 */ addiu $v0, $zero, 2 /* BED0BC 802402CC 8E230050 */ lw $v1, 0x50($s1) /* BED0C0 802402D0 A6220044 */ sh $v0, 0x44($s1) @@ -84,7 +84,7 @@ glabel L802402AC_BED09C /* BED0D0 802402E0 AC620070 */ sw $v0, 0x70($v1) /* BED0D4 802402E4 8E220050 */ lw $v0, 0x50($s1) /* BED0D8 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* BED0DC 802402EC 080900FF */ j .L802403FC +/* BED0DC 802402EC 080900FF */ j L802403FC_BED1EC /* BED0E0 802402F0 AC400074 */ sw $zero, 0x74($v0) glabel L802402F4_BED0E4 /* BED0E4 802402F4 96220046 */ lhu $v0, 0x46($s1) @@ -93,7 +93,7 @@ glabel L802402F4_BED0E4 /* BED0F0 80240300 00021400 */ sll $v0, $v0, 0x10 /* BED0F4 80240304 00021403 */ sra $v0, $v0, 0x10 /* BED0F8 80240308 2842003C */ slti $v0, $v0, 0x3c -/* BED0FC 8024030C 1440003B */ bnez $v0, .L802403FC +/* BED0FC 8024030C 1440003B */ bnez $v0, L802403FC_BED1EC /* BED100 80240310 00000000 */ nop /* BED104 80240314 3C013F80 */ lui $at, 0x3f80 /* BED108 80240318 44810000 */ mtc1 $at, $f0 @@ -125,7 +125,7 @@ glabel L802402F4_BED0E4 /* BED170 80240380 A6200046 */ sh $zero, 0x46($s1) /* BED174 80240384 AE20002C */ sw $zero, 0x2c($s1) /* BED178 80240388 A6220048 */ sh $v0, 0x48($s1) -/* BED17C 8024038C 080900FF */ j .L802403FC +/* BED17C 8024038C 080900FF */ j L802403FC_BED1EC /* BED180 80240390 E6200030 */ swc1 $f0, 0x30($s1) glabel L80240394_BED184 /* BED184 80240394 0000202D */ daddu $a0, $zero, $zero @@ -142,7 +142,7 @@ glabel L80240394_BED184 /* BED1B0 802403C0 00021400 */ sll $v0, $v0, 0x10 /* BED1B4 802403C4 00021403 */ sra $v0, $v0, 0x10 /* BED1B8 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* BED1BC 802403CC 1440000B */ bnez $v0, .L802403FC +/* BED1BC 802403CC 1440000B */ bnez $v0, L802403FC_BED1EC /* BED1C0 802403D0 24030001 */ addiu $v1, $zero, 1 /* BED1C4 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) /* BED1C8 802403D8 24020002 */ addiu $v0, $zero, 2 @@ -154,7 +154,6 @@ glabel L80240394_BED184 /* BED1E0 802403F0 A6220044 */ sh $v0, 0x44($s1) /* BED1E4 802403F4 A6200046 */ sh $zero, 0x46($s1) /* BED1E8 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -.L802403FC: glabel L802403FC_BED1EC /* BED1EC 802403FC 8623004A */ lh $v1, 0x4a($s1) /* BED1F0 80240400 24020001 */ addiu $v0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s b/ver/us/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s index dcd91039ef..aa8e548e4e 100644 --- a/ver/us/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s +++ b/ver/us/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s @@ -64,7 +64,7 @@ glabel func_80241C5C_BEEA4C .L80241D44: /* BEEB34 80241D44 8E830070 */ lw $v1, 0x70($s4) /* BEEB38 80241D48 2C62000F */ sltiu $v0, $v1, 0xf -/* BEEB3C 80241D4C 10400034 */ beqz $v0, .L80241E20 +/* BEEB3C 80241D4C 10400034 */ beqz $v0, L80241E20_BEEC10 /* BEEB40 80241D50 00031080 */ sll $v0, $v1, 2 /* BEEB44 80241D54 3C018024 */ lui $at, %hi(jtbl_80247968_BF4758) /* BEEB48 80241D58 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241E10_BEEC00 /* BEEC04 80241E14 0200282D */ daddu $a1, $s0, $zero /* BEEC08 80241E18 0C0905EA */ jal func_802417A8_BEE598 /* BEEC0C 80241E1C 0260302D */ daddu $a2, $s3, $zero -.L80241E20: glabel L80241E20_BEEC10 /* BEEC10 80241E20 0000102D */ daddu $v0, $zero, $zero .L80241E24: diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s index 8c04c8422b..503ee5722b 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s @@ -64,7 +64,7 @@ glabel func_8024142C_BFECAC .L80241514: /* BFED94 80241514 8E830070 */ lw $v1, 0x70($s4) /* BFED98 80241518 2C62000F */ sltiu $v0, $v1, 0xf -/* BFED9C 8024151C 10400034 */ beqz $v0, .L802415F0 +/* BFED9C 8024151C 10400034 */ beqz $v0, L802415F0_BFEE70 /* BFEDA0 80241520 00031080 */ sll $v0, $v1, 2 /* BFEDA4 80241524 3C018026 */ lui $at, %hi(jtbl_80263438_C20CB8) /* BFEDA8 80241528 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L802415E0_BFEE60 /* BFEE64 802415E4 0200282D */ daddu $a1, $s0, $zero /* BFEE68 802415E8 0C0903DE */ jal func_80240F78_BFE7F8 /* BFEE6C 802415EC 0260302D */ daddu $a2, $s3, $zero -.L802415F0: glabel L802415F0_BFEE70 /* BFEE70 802415F0 0000102D */ daddu $v0, $zero, $zero .L802415F4: diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s index b66b81675a..1ad52aee97 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s @@ -52,7 +52,7 @@ glabel func_802422B0_BFFB30 .L8024236C: /* BFFBEC 8024236C 8E830070 */ lw $v1, 0x70($s4) /* BFFBF0 80242370 2C620020 */ sltiu $v0, $v1, 0x20 -/* BFFBF4 80242374 10400060 */ beqz $v0, .L802424F8 +/* BFFBF4 80242374 10400060 */ beqz $v0, L802424F8_BFFD78 /* BFFBF8 80242378 00031080 */ sll $v0, $v1, 2 /* BFFBFC 8024237C 3C018026 */ lui $at, %hi(jtbl_80263488_C20D08) /* BFFC00 80242380 00220821 */ addu $at, $at, $v0 @@ -92,9 +92,9 @@ glabel L802423E8_BFFC68 .L802423F8: /* BFFC78 802423F8 8E830070 */ lw $v1, 0x70($s4) /* BFFC7C 802423FC 2402000C */ addiu $v0, $zero, 0xc -/* BFFC80 80242400 1462003D */ bne $v1, $v0, .L802424F8 +/* BFFC80 80242400 1462003D */ bne $v1, $v0, L802424F8_BFFD78 /* BFFC84 80242404 24020006 */ addiu $v0, $zero, 6 -/* BFFC88 80242408 0809093E */ j .L802424F8 +/* BFFC88 80242408 0809093E */ j L802424F8_BFFD78 /* BFFC8C 8024240C A6A2008E */ sh $v0, 0x8e($s5) glabel L80242410_BFFC90 /* BFFC90 80242410 0280202D */ daddu $a0, $s4, $zero @@ -103,14 +103,14 @@ glabel L80242410_BFFC90 /* BFFC9C 8024241C 0260302D */ daddu $a2, $s3, $zero /* BFFCA0 80242420 8E830070 */ lw $v1, 0x70($s4) /* BFFCA4 80242424 2402000D */ addiu $v0, $zero, 0xd -/* BFFCA8 80242428 14620033 */ bne $v1, $v0, .L802424F8 +/* BFFCA8 80242428 14620033 */ bne $v1, $v0, L802424F8_BFFD78 /* BFFCAC 8024242C 00000000 */ nop glabel L80242430_BFFCB0 /* BFFCB0 80242430 0280202D */ daddu $a0, $s4, $zero /* BFFCB4 80242434 0220282D */ daddu $a1, $s1, $zero /* BFFCB8 80242438 0C0905DC */ jal func_80241770_BFEFF0 /* BFFCBC 8024243C 0260302D */ daddu $a2, $s3, $zero -/* BFFCC0 80242440 0809093E */ j .L802424F8 +/* BFFCC0 80242440 0809093E */ j L802424F8_BFFD78 /* BFFCC4 80242444 00000000 */ nop glabel L80242448_BFFCC8 /* BFFCC8 80242448 0280202D */ daddu $a0, $s4, $zero @@ -119,14 +119,14 @@ glabel L80242448_BFFCC8 /* BFFCD4 80242454 0260302D */ daddu $a2, $s3, $zero /* BFFCD8 80242458 8E830070 */ lw $v1, 0x70($s4) /* BFFCDC 8024245C 2402000F */ addiu $v0, $zero, 0xf -/* BFFCE0 80242460 14620025 */ bne $v1, $v0, .L802424F8 +/* BFFCE0 80242460 14620025 */ bne $v1, $v0, L802424F8_BFFD78 /* BFFCE4 80242464 00000000 */ nop glabel L80242468_BFFCE8 /* BFFCE8 80242468 0280202D */ daddu $a0, $s4, $zero /* BFFCEC 8024246C 0220282D */ daddu $a1, $s1, $zero /* BFFCF0 80242470 0C090655 */ jal func_80241954_BFF1D4 /* BFFCF4 80242474 0260302D */ daddu $a2, $s3, $zero -/* BFFCF8 80242478 0809093E */ j .L802424F8 +/* BFFCF8 80242478 0809093E */ j L802424F8_BFFD78 /* BFFCFC 8024247C 00000000 */ nop glabel L80242480_BFFD00 /* BFFD00 80242480 0280202D */ daddu $a0, $s4, $zero @@ -138,21 +138,21 @@ glabel L80242490_BFFD10 /* BFFD14 80242494 0220282D */ daddu $a1, $s1, $zero /* BFFD18 80242498 0C09072A */ jal func_80241CA8_BFF528 /* BFFD1C 8024249C 0260302D */ daddu $a2, $s3, $zero -/* BFFD20 802424A0 0809093E */ j .L802424F8 +/* BFFD20 802424A0 0809093E */ j L802424F8_BFFD78 /* BFFD24 802424A4 00000000 */ nop glabel L802424A8_BFFD28 /* BFFD28 802424A8 0280202D */ daddu $a0, $s4, $zero /* BFFD2C 802424AC 0220282D */ daddu $a1, $s1, $zero /* BFFD30 802424B0 0C09078A */ jal func_80241E28_BFF6A8 /* BFFD34 802424B4 0260302D */ daddu $a2, $s3, $zero -/* BFFD38 802424B8 0809093E */ j .L802424F8 +/* BFFD38 802424B8 0809093E */ j L802424F8_BFFD78 /* BFFD3C 802424BC 00000000 */ nop glabel L802424C0_BFFD40 /* BFFD40 802424C0 0280202D */ daddu $a0, $s4, $zero /* BFFD44 802424C4 0220282D */ daddu $a1, $s1, $zero /* BFFD48 802424C8 0C09079C */ jal func_80241E70_BFF6F0 /* BFFD4C 802424CC 0260302D */ daddu $a2, $s3, $zero -/* BFFD50 802424D0 0809093E */ j .L802424F8 +/* BFFD50 802424D0 0809093E */ j L802424F8_BFFD78 /* BFFD54 802424D4 00000000 */ nop glabel L802424D8_BFFD58 /* BFFD58 802424D8 0280202D */ daddu $a0, $s4, $zero @@ -164,7 +164,6 @@ glabel L802424E8_BFFD68 /* BFFD6C 802424EC 0220282D */ daddu $a1, $s1, $zero /* BFFD70 802424F0 0C0907E6 */ jal func_80241F98_BFF818 /* BFFD74 802424F4 0260302D */ daddu $a2, $s3, $zero -.L802424F8: glabel L802424F8_BFFD78 /* BFFD78 802424F8 8E820070 */ lw $v0, 0x70($s4) /* BFFD7C 802424FC 8FBF0058 */ lw $ra, 0x58($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s index a015b8ec23..8d6801b36c 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s @@ -122,7 +122,7 @@ glabel func_802430C0_C00940 .L80243280: /* C00B00 80243280 8E830070 */ lw $v1, 0x70($s4) /* C00B04 80243284 2C620064 */ sltiu $v0, $v1, 0x64 -/* C00B08 80243288 10400042 */ beqz $v0, .L80243394 +/* C00B08 80243288 10400042 */ beqz $v0, L80243394_C00C14 /* C00B0C 8024328C 00031080 */ sll $v0, $v1, 2 /* C00B10 80243290 3C018026 */ lui $at, %hi(jtbl_80263520_C20DA0) /* C00B14 80243294 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L802432B4_C00B34 /* C00B38 802432B8 0260282D */ daddu $a1, $s3, $zero /* C00B3C 802432BC 0C0909A1 */ jal func_80242684_BFFF04 /* C00B40 802432C0 02A0302D */ daddu $a2, $s5, $zero -/* C00B44 802432C4 08090CE5 */ j .L80243394 +/* C00B44 802432C4 08090CE5 */ j L80243394_C00C14 /* C00B48 802432C8 00000000 */ nop glabel L802432CC_C00B4C /* C00B4C 802432CC 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L802432DC_C00B5C /* C00B60 802432E0 0260282D */ daddu $a1, $s3, $zero /* C00B64 802432E4 0C090A7B */ jal func_802429EC_C0026C /* C00B68 802432E8 02A0302D */ daddu $a2, $s5, $zero -/* C00B6C 802432EC 08090CE5 */ j .L80243394 +/* C00B6C 802432EC 08090CE5 */ j L80243394_C00C14 /* C00B70 802432F0 00000000 */ nop glabel L802432F4_C00B74 /* C00B74 802432F4 0280202D */ daddu $a0, $s4, $zero /* C00B78 802432F8 0260282D */ daddu $a1, $s3, $zero /* C00B7C 802432FC 0C090AEA */ jal func_80242BA8_C00428 /* C00B80 80243300 02A0302D */ daddu $a2, $s5, $zero -/* C00B84 80243304 08090CE5 */ j .L80243394 +/* C00B84 80243304 08090CE5 */ j L80243394_C00C14 /* C00B88 80243308 00000000 */ nop glabel L8024330C_C00B8C /* C00B8C 8024330C 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L8024331C_C00B9C /* C00BA0 80243320 0260282D */ daddu $a1, $s3, $zero /* C00BA4 80243324 0C090B34 */ jal dgb_01_NpcJumpFunc /* C00BA8 80243328 02A0302D */ daddu $a2, $s5, $zero -/* C00BAC 8024332C 08090CE5 */ j .L80243394 +/* C00BAC 8024332C 08090CE5 */ j L80243394_C00C14 /* C00BB0 80243330 00000000 */ nop glabel L80243334_C00BB4 /* C00BB4 80243334 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80243344_C00BC4 /* C00BC8 80243348 0260282D */ daddu $a1, $s3, $zero /* C00BCC 8024334C 0C090B9E */ jal func_80242E78_C006F8 /* C00BD0 80243350 02A0302D */ daddu $a2, $s5, $zero -/* C00BD4 80243354 08090CE5 */ j .L80243394 +/* C00BD4 80243354 08090CE5 */ j L80243394_C00C14 /* C00BD8 80243358 00000000 */ nop glabel L8024335C_C00BDC /* C00BDC 8024335C 0280202D */ daddu $a0, $s4, $zero /* C00BE0 80243360 0260282D */ daddu $a1, $s3, $zero /* C00BE4 80243364 0C090BE6 */ jal dgb_01_UnkNpcDurationFlagFunc /* C00BE8 80243368 02A0302D */ daddu $a2, $s5, $zero -/* C00BEC 8024336C 08090CE5 */ j .L80243394 +/* C00BEC 8024336C 08090CE5 */ j L80243394_C00C14 /* C00BF0 80243370 00000000 */ nop glabel L80243374_C00BF4 /* C00BF4 80243374 0280202D */ daddu $a0, $s4, $zero /* C00BF8 80243378 0260282D */ daddu $a1, $s3, $zero /* C00BFC 8024337C 0C090C00 */ jal func_80243000_C00880 /* C00C00 80243380 02A0302D */ daddu $a2, $s5, $zero -/* C00C04 80243384 08090CE5 */ j .L80243394 +/* C00C04 80243384 08090CE5 */ j L80243394_C00C14 /* C00C08 80243388 00000000 */ nop glabel L8024338C_C00C0C /* C00C0C 8024338C 0C0129CF */ jal func_8004A73C /* C00C10 80243390 0280202D */ daddu $a0, $s4, $zero -.L80243394: glabel L80243394_C00C14 /* C00C14 80243394 8FBF0060 */ lw $ra, 0x60($sp) /* C00C18 80243398 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s index 5696e455ca..d0ce165fca 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s @@ -98,7 +98,7 @@ glabel func_8024061C_C2F1BC .L8024077C: /* C2F31C 8024077C 8E430070 */ lw $v1, 0x70($s2) /* C2F320 80240780 2C620064 */ sltiu $v0, $v1, 0x64 -/* C2F324 80240784 10400048 */ beqz $v0, .L802408A8 +/* C2F324 80240784 10400048 */ beqz $v0, L802408A8_C2F448 /* C2F328 80240788 00031080 */ sll $v0, $v1, 2 /* C2F32C 8024078C 3C018024 */ lui $at, %hi(jtbl_80242618_C311B8) /* C2F330 80240790 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L802407B0_C2F350 /* C2F354 802407B4 0260282D */ daddu $a1, $s3, $zero /* C2F358 802407B8 0C0125AE */ jal func_800496B8 /* C2F35C 802407BC 0280302D */ daddu $a2, $s4, $zero -/* C2F360 802407C0 0809022A */ j .L802408A8 +/* C2F360 802407C0 0809022A */ j L802408A8_C2F448 /* C2F364 802407C4 00000000 */ nop glabel L802407C8_C2F368 /* C2F368 802407C8 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L802407D8_C2F378 /* C2F37C 802407DC 0260282D */ daddu $a1, $s3, $zero /* C2F380 802407E0 0C012701 */ jal func_80049C04 /* C2F384 802407E4 0280302D */ daddu $a2, $s4, $zero -/* C2F388 802407E8 0809022A */ j .L802408A8 +/* C2F388 802407E8 0809022A */ j L802408A8_C2F448 /* C2F38C 802407EC 00000000 */ nop glabel L802407F0_C2F390 /* C2F390 802407F0 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240800_C2F3A0 /* C2F3A4 80240804 0260282D */ daddu $a1, $s3, $zero /* C2F3A8 80240808 0C0127B3 */ jal func_80049ECC /* C2F3AC 8024080C 0280302D */ daddu $a2, $s4, $zero -/* C2F3B0 80240810 0809022A */ j .L802408A8 +/* C2F3B0 80240810 0809022A */ j L802408A8_C2F448 /* C2F3B4 80240814 00000000 */ nop glabel L80240818_C2F3B8 /* C2F3B8 80240818 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240828_C2F3C8 /* C2F3CC 8024082C 0260282D */ daddu $a1, $s3, $zero /* C2F3D0 80240830 0C012849 */ jal func_8004A124 /* C2F3D4 80240834 0280302D */ daddu $a2, $s4, $zero -/* C2F3D8 80240838 0809022A */ j .L802408A8 +/* C2F3D8 80240838 0809022A */ j L802408A8_C2F448 /* C2F3DC 8024083C 00000000 */ nop glabel L80240840_C2F3E0 /* C2F3E0 80240840 0240202D */ daddu $a0, $s2, $zero /* C2F3E4 80240844 0260282D */ daddu $a1, $s3, $zero /* C2F3E8 80240848 0C0128FA */ jal func_8004A3E8 /* C2F3EC 8024084C 0280302D */ daddu $a2, $s4, $zero -/* C2F3F0 80240850 0809022A */ j .L802408A8 +/* C2F3F0 80240850 0809022A */ j L802408A8_C2F448 /* C2F3F4 80240854 00000000 */ nop glabel L80240858_C2F3F8 /* C2F3F8 80240858 0C090000 */ jal dgb_02_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240860_C2F400 /* C2F404 80240864 0240202D */ daddu $a0, $s2, $zero /* C2F408 80240868 8E430070 */ lw $v1, 0x70($s2) /* C2F40C 8024086C 24020020 */ addiu $v0, $zero, 0x20 -/* C2F410 80240870 1462000D */ bne $v1, $v0, .L802408A8 +/* C2F410 80240870 1462000D */ bne $v1, $v0, L802408A8_C2F448 /* C2F414 80240874 00000000 */ nop glabel L80240878_C2F418 /* C2F418 80240878 0C090037 */ jal dgb_02_UnkNpcAIFunc8 /* C2F41C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C2F420 80240880 8E430070 */ lw $v1, 0x70($s2) /* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 -/* C2F428 80240888 14620007 */ bne $v1, $v0, .L802408A8 +/* C2F428 80240888 14620007 */ bne $v1, $v0, L802408A8_C2F448 /* C2F42C 8024088C 00000000 */ nop glabel L80240890_C2F430 /* C2F430 80240890 0C09006D */ jal dgb_02_UnkNpcAIFunc5 /* C2F434 80240894 0240202D */ daddu $a0, $s2, $zero -/* C2F438 80240898 0809022A */ j .L802408A8 +/* C2F438 80240898 0809022A */ j L802408A8_C2F448 /* C2F43C 8024089C 00000000 */ nop glabel L802408A0_C2F440 /* C2F440 802408A0 0C0129CF */ jal func_8004A73C /* C2F444 802408A4 0240202D */ daddu $a0, $s2, $zero -.L802408A8: glabel L802408A8_C2F448 /* C2F448 802408A8 8FBF0048 */ lw $ra, 0x48($sp) /* C2F44C 802408AC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s index c144b55e22..76e0791319 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s @@ -106,7 +106,7 @@ glabel func_802410D4_C2FC74 .L80241254: /* C2FDF4 80241254 8E430070 */ lw $v1, 0x70($s2) /* C2FDF8 80241258 2C620064 */ sltiu $v0, $v1, 0x64 -/* C2FDFC 8024125C 10400067 */ beqz $v0, .L802413FC +/* C2FDFC 8024125C 10400067 */ beqz $v0, L802413FC_C2FF9C /* C2FE00 80241260 00031080 */ sll $v0, $v1, 2 /* C2FE04 80241264 3C018024 */ lui $at, %hi(jtbl_802427B0_C31350) /* C2FE08 80241268 00220821 */ addu $at, $at, $v0 @@ -118,35 +118,35 @@ glabel L80241278_C2FE18 /* C2FE1C 8024127C 0260282D */ daddu $a1, $s3, $zero /* C2FE20 80241280 0C090234 */ jal func_802408D0_C2F470 /* C2FE24 80241284 02A0302D */ daddu $a2, $s5, $zero -/* C2FE28 80241288 080904FF */ j .L802413FC +/* C2FE28 80241288 080904FF */ j L802413FC_C2FF9C /* C2FE2C 8024128C 00000000 */ nop glabel L80241290_C2FE30 /* C2FE30 80241290 0240202D */ daddu $a0, $s2, $zero /* C2FE34 80241294 0260282D */ daddu $a1, $s3, $zero /* C2FE38 80241298 0C090256 */ jal func_80240958_C2F4F8 /* C2FE3C 8024129C 02A0302D */ daddu $a2, $s5, $zero -/* C2FE40 802412A0 080904FF */ j .L802413FC +/* C2FE40 802412A0 080904FF */ j L802413FC_C2FF9C /* C2FE44 802412A4 00000000 */ nop glabel L802412A8_C2FE48 /* C2FE48 802412A8 0240202D */ daddu $a0, $s2, $zero /* C2FE4C 802412AC 0260282D */ daddu $a1, $s3, $zero /* C2FE50 802412B0 0C090304 */ jal func_80240C10_C2F7B0 /* C2FE54 802412B4 02A0302D */ daddu $a2, $s5, $zero -/* C2FE58 802412B8 080904FF */ j .L802413FC +/* C2FE58 802412B8 080904FF */ j L802413FC_C2FF9C /* C2FE5C 802412BC 00000000 */ nop glabel L802412C0_C2FE60 /* C2FE60 802412C0 0240202D */ daddu $a0, $s2, $zero /* C2FE64 802412C4 0260282D */ daddu $a1, $s3, $zero /* C2FE68 802412C8 0C09031D */ jal func_80240C74_C2F814 /* C2FE6C 802412CC 02A0302D */ daddu $a2, $s5, $zero -/* C2FE70 802412D0 080904FF */ j .L802413FC +/* C2FE70 802412D0 080904FF */ j L802413FC_C2FF9C /* C2FE74 802412D4 00000000 */ nop glabel L802412D8_C2FE78 /* C2FE78 802412D8 0240202D */ daddu $a0, $s2, $zero /* C2FE7C 802412DC 0260282D */ daddu $a1, $s3, $zero /* C2FE80 802412E0 0C090347 */ jal func_80240D1C_C2F8BC /* C2FE84 802412E4 02A0302D */ daddu $a2, $s5, $zero -/* C2FE88 802412E8 080904FF */ j .L802413FC +/* C2FE88 802412E8 080904FF */ j L802413FC_C2FF9C /* C2FE8C 802412EC 00000000 */ nop glabel L802412F0_C2FE90 /* C2FE90 802412F0 0240202D */ daddu $a0, $s2, $zero @@ -155,14 +155,14 @@ glabel L802412F0_C2FE90 /* C2FE9C 802412FC 02A0302D */ daddu $a2, $s5, $zero /* C2FEA0 80241300 8E430070 */ lw $v1, 0x70($s2) /* C2FEA4 80241304 2402000D */ addiu $v0, $zero, 0xd -/* C2FEA8 80241308 1462003C */ bne $v1, $v0, .L802413FC +/* C2FEA8 80241308 1462003C */ bne $v1, $v0, L802413FC_C2FF9C /* C2FEAC 8024130C 00000000 */ nop glabel L80241310_C2FEB0 /* C2FEB0 80241310 0240202D */ daddu $a0, $s2, $zero /* C2FEB4 80241314 0260282D */ daddu $a1, $s3, $zero /* C2FEB8 80241318 0C012849 */ jal func_8004A124 /* C2FEBC 8024131C 02A0302D */ daddu $a2, $s5, $zero -/* C2FEC0 80241320 080904FF */ j .L802413FC +/* C2FEC0 80241320 080904FF */ j L802413FC_C2FF9C /* C2FEC4 80241324 00000000 */ nop glabel L80241328_C2FEC8 /* C2FEC8 80241328 0240202D */ daddu $a0, $s2, $zero @@ -174,31 +174,31 @@ glabel L80241328_C2FEC8 /* C2FEE0 80241340 24020028 */ addiu $v0, $zero, 0x28 /* C2FEE4 80241344 AE220088 */ sw $v0, 0x88($s1) /* C2FEE8 80241348 24020003 */ addiu $v0, $zero, 3 -/* C2FEEC 8024134C 080904FF */ j .L802413FC +/* C2FEEC 8024134C 080904FF */ j L802413FC_C2FF9C /* C2FEF0 80241350 AE420070 */ sw $v0, 0x70($s2) glabel L80241354_C2FEF4 /* C2FEF4 80241354 0C090000 */ jal dgb_02_UnkNpcAIFunc6 /* C2FEF8 80241358 0240202D */ daddu $a0, $s2, $zero /* C2FEFC 8024135C 8E430070 */ lw $v1, 0x70($s2) /* C2FF00 80241360 2402001F */ addiu $v0, $zero, 0x1f -/* C2FF04 80241364 14620025 */ bne $v1, $v0, .L802413FC +/* C2FF04 80241364 14620025 */ bne $v1, $v0, L802413FC_C2FF9C /* C2FF08 80241368 00000000 */ nop glabel L8024136C_C2FF0C /* C2FF0C 8024136C 0C09001B */ jal dgb_02_UnkNpcAIFunc7 /* C2FF10 80241370 0240202D */ daddu $a0, $s2, $zero /* C2FF14 80241374 8E430070 */ lw $v1, 0x70($s2) /* C2FF18 80241378 24020020 */ addiu $v0, $zero, 0x20 -/* C2FF1C 8024137C 1462001F */ bne $v1, $v0, .L802413FC +/* C2FF1C 8024137C 1462001F */ bne $v1, $v0, L802413FC_C2FF9C /* C2FF20 80241380 00000000 */ nop glabel L80241384_C2FF24 /* C2FF24 80241384 0C090037 */ jal dgb_02_UnkNpcAIFunc8 /* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero -/* C2FF2C 8024138C 080904FF */ j .L802413FC +/* C2FF2C 8024138C 080904FF */ j L802413FC_C2FF9C /* C2FF30 80241390 00000000 */ nop glabel L80241394_C2FF34 /* C2FF34 80241394 0C09006D */ jal dgb_02_UnkNpcAIFunc5 /* C2FF38 80241398 0240202D */ daddu $a0, $s2, $zero -/* C2FF3C 8024139C 080904FF */ j .L802413FC +/* C2FF3C 8024139C 080904FF */ j L802413FC_C2FF9C /* C2FF40 802413A0 00000000 */ nop glabel L802413A4_C2FF44 /* C2FF44 802413A4 0240202D */ daddu $a0, $s2, $zero @@ -207,26 +207,25 @@ glabel L802413A4_C2FF44 /* C2FF50 802413B0 02A0302D */ daddu $a2, $s5, $zero /* C2FF54 802413B4 8E430070 */ lw $v1, 0x70($s2) /* C2FF58 802413B8 24020029 */ addiu $v0, $zero, 0x29 -/* C2FF5C 802413BC 1462000F */ bne $v1, $v0, .L802413FC +/* C2FF5C 802413BC 1462000F */ bne $v1, $v0, L802413FC_C2FF9C /* C2FF60 802413C0 00000000 */ nop glabel L802413C4_C2FF64 /* C2FF64 802413C4 0240202D */ daddu $a0, $s2, $zero /* C2FF68 802413C8 0260282D */ daddu $a1, $s3, $zero /* C2FF6C 802413CC 0C0903C0 */ jal func_80240F00_C2FAA0 /* C2FF70 802413D0 02A0302D */ daddu $a2, $s5, $zero -/* C2FF74 802413D4 080904FF */ j .L802413FC +/* C2FF74 802413D4 080904FF */ j L802413FC_C2FF9C /* C2FF78 802413D8 00000000 */ nop glabel L802413DC_C2FF7C /* C2FF7C 802413DC 0240202D */ daddu $a0, $s2, $zero /* C2FF80 802413E0 0260282D */ daddu $a1, $s3, $zero /* C2FF84 802413E4 0C09041E */ jal func_80241078_C2FC18 /* C2FF88 802413E8 02A0302D */ daddu $a2, $s5, $zero -/* C2FF8C 802413EC 080904FF */ j .L802413FC +/* C2FF8C 802413EC 080904FF */ j L802413FC_C2FF9C /* C2FF90 802413F0 00000000 */ nop glabel L802413F4_C2FF94 /* C2FF94 802413F4 0C0129CF */ jal func_8004A73C /* C2FF98 802413F8 0240202D */ daddu $a0, $s2, $zero -.L802413FC: glabel L802413FC_C2FF9C /* C2FF9C 802413FC 8FBF0048 */ lw $ra, 0x48($sp) /* C2FFA0 80241400 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s index 9a54d400ad..e33a36dd73 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s @@ -98,7 +98,7 @@ glabel func_8024086C_C31D4C .L802409CC: /* C31EAC 802409CC 8E430070 */ lw $v1, 0x70($s2) /* C31EB0 802409D0 2C620064 */ sltiu $v0, $v1, 0x64 -/* C31EB4 802409D4 10400048 */ beqz $v0, .L80240AF8 +/* C31EB4 802409D4 10400048 */ beqz $v0, L80240AF8_C31FD8 /* C31EB8 802409D8 00031080 */ sll $v0, $v1, 2 /* C31EBC 802409DC 3C018024 */ lui $at, %hi(jtbl_802449F8_C35ED8) /* C31EC0 802409E0 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80240A00_C31EE0 /* C31EE4 80240A04 0260282D */ daddu $a1, $s3, $zero /* C31EE8 80240A08 0C0125AE */ jal func_800496B8 /* C31EEC 80240A0C 0280302D */ daddu $a2, $s4, $zero -/* C31EF0 80240A10 080902BE */ j .L80240AF8 +/* C31EF0 80240A10 080902BE */ j L80240AF8_C31FD8 /* C31EF4 80240A14 00000000 */ nop glabel L80240A18_C31EF8 /* C31EF8 80240A18 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80240A28_C31F08 /* C31F0C 80240A2C 0260282D */ daddu $a1, $s3, $zero /* C31F10 80240A30 0C012701 */ jal func_80049C04 /* C31F14 80240A34 0280302D */ daddu $a2, $s4, $zero -/* C31F18 80240A38 080902BE */ j .L80240AF8 +/* C31F18 80240A38 080902BE */ j L80240AF8_C31FD8 /* C31F1C 80240A3C 00000000 */ nop glabel L80240A40_C31F20 /* C31F20 80240A40 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240A50_C31F30 /* C31F34 80240A54 0260282D */ daddu $a1, $s3, $zero /* C31F38 80240A58 0C0127B3 */ jal func_80049ECC /* C31F3C 80240A5C 0280302D */ daddu $a2, $s4, $zero -/* C31F40 80240A60 080902BE */ j .L80240AF8 +/* C31F40 80240A60 080902BE */ j L80240AF8_C31FD8 /* C31F44 80240A64 00000000 */ nop glabel L80240A68_C31F48 /* C31F48 80240A68 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240A78_C31F58 /* C31F5C 80240A7C 0260282D */ daddu $a1, $s3, $zero /* C31F60 80240A80 0C012849 */ jal func_8004A124 /* C31F64 80240A84 0280302D */ daddu $a2, $s4, $zero -/* C31F68 80240A88 080902BE */ j .L80240AF8 +/* C31F68 80240A88 080902BE */ j L80240AF8_C31FD8 /* C31F6C 80240A8C 00000000 */ nop glabel L80240A90_C31F70 /* C31F70 80240A90 0240202D */ daddu $a0, $s2, $zero /* C31F74 80240A94 0260282D */ daddu $a1, $s3, $zero /* C31F78 80240A98 0C0128FA */ jal func_8004A3E8 /* C31F7C 80240A9C 0280302D */ daddu $a2, $s4, $zero -/* C31F80 80240AA0 080902BE */ j .L80240AF8 +/* C31F80 80240AA0 080902BE */ j L80240AF8_C31FD8 /* C31F84 80240AA4 00000000 */ nop glabel L80240AA8_C31F88 /* C31F88 80240AA8 0C090094 */ jal dgb_03_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240AB0_C31F90 /* C31F94 80240AB4 0240202D */ daddu $a0, $s2, $zero /* C31F98 80240AB8 8E430070 */ lw $v1, 0x70($s2) /* C31F9C 80240ABC 24020020 */ addiu $v0, $zero, 0x20 -/* C31FA0 80240AC0 1462000D */ bne $v1, $v0, .L80240AF8 +/* C31FA0 80240AC0 1462000D */ bne $v1, $v0, L80240AF8_C31FD8 /* C31FA4 80240AC4 00000000 */ nop glabel L80240AC8_C31FA8 /* C31FA8 80240AC8 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 /* C31FAC 80240ACC 0240202D */ daddu $a0, $s2, $zero /* C31FB0 80240AD0 8E430070 */ lw $v1, 0x70($s2) /* C31FB4 80240AD4 24020021 */ addiu $v0, $zero, 0x21 -/* C31FB8 80240AD8 14620007 */ bne $v1, $v0, .L80240AF8 +/* C31FB8 80240AD8 14620007 */ bne $v1, $v0, L80240AF8_C31FD8 /* C31FBC 80240ADC 00000000 */ nop glabel L80240AE0_C31FC0 /* C31FC0 80240AE0 0C090101 */ jal dgb_03_UnkNpcAIFunc5 /* C31FC4 80240AE4 0240202D */ daddu $a0, $s2, $zero -/* C31FC8 80240AE8 080902BE */ j .L80240AF8 +/* C31FC8 80240AE8 080902BE */ j L80240AF8_C31FD8 /* C31FCC 80240AEC 00000000 */ nop glabel L80240AF0_C31FD0 /* C31FD0 80240AF0 0C0129CF */ jal func_8004A73C /* C31FD4 80240AF4 0240202D */ daddu $a0, $s2, $zero -.L80240AF8: glabel L80240AF8_C31FD8 /* C31FD8 80240AF8 8FBF0048 */ lw $ra, 0x48($sp) /* C31FDC 80240AFC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s index 28734785d4..9bdd9cebb3 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s @@ -122,7 +122,7 @@ glabel func_802416B4_C32B94 .L80241874: /* C32D54 80241874 8E830070 */ lw $v1, 0x70($s4) /* C32D58 80241878 2C620064 */ sltiu $v0, $v1, 0x64 -/* C32D5C 8024187C 10400042 */ beqz $v0, .L80241988 +/* C32D5C 8024187C 10400042 */ beqz $v0, L80241988_C32E68 /* C32D60 80241880 00031080 */ sll $v0, $v1, 2 /* C32D64 80241884 3C018024 */ lui $at, %hi(jtbl_80244B98_C36078) /* C32D68 80241888 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L802418A8_C32D88 /* C32D8C 802418AC 0260282D */ daddu $a1, $s3, $zero /* C32D90 802418B0 0C09031E */ jal func_80240C78_C32158 /* C32D94 802418B4 02A0302D */ daddu $a2, $s5, $zero -/* C32D98 802418B8 08090662 */ j .L80241988 +/* C32D98 802418B8 08090662 */ j L80241988_C32E68 /* C32D9C 802418BC 00000000 */ nop glabel L802418C0_C32DA0 /* C32DA0 802418C0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L802418D0_C32DB0 /* C32DB4 802418D4 0260282D */ daddu $a1, $s3, $zero /* C32DB8 802418D8 0C0903F8 */ jal func_80240FE0_C324C0 /* C32DBC 802418DC 02A0302D */ daddu $a2, $s5, $zero -/* C32DC0 802418E0 08090662 */ j .L80241988 +/* C32DC0 802418E0 08090662 */ j L80241988_C32E68 /* C32DC4 802418E4 00000000 */ nop glabel L802418E8_C32DC8 /* C32DC8 802418E8 0280202D */ daddu $a0, $s4, $zero /* C32DCC 802418EC 0260282D */ daddu $a1, $s3, $zero /* C32DD0 802418F0 0C090467 */ jal func_8024119C_C3267C /* C32DD4 802418F4 02A0302D */ daddu $a2, $s5, $zero -/* C32DD8 802418F8 08090662 */ j .L80241988 +/* C32DD8 802418F8 08090662 */ j L80241988_C32E68 /* C32DDC 802418FC 00000000 */ nop glabel L80241900_C32DE0 /* C32DE0 80241900 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80241910_C32DF0 /* C32DF4 80241914 0260282D */ daddu $a1, $s3, $zero /* C32DF8 80241918 0C0904B1 */ jal dgb_03_NpcJumpFunc /* C32DFC 8024191C 02A0302D */ daddu $a2, $s5, $zero -/* C32E00 80241920 08090662 */ j .L80241988 +/* C32E00 80241920 08090662 */ j L80241988_C32E68 /* C32E04 80241924 00000000 */ nop glabel L80241928_C32E08 /* C32E08 80241928 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80241938_C32E18 /* C32E1C 8024193C 0260282D */ daddu $a1, $s3, $zero /* C32E20 80241940 0C09051B */ jal func_8024146C_C3294C /* C32E24 80241944 02A0302D */ daddu $a2, $s5, $zero -/* C32E28 80241948 08090662 */ j .L80241988 +/* C32E28 80241948 08090662 */ j L80241988_C32E68 /* C32E2C 8024194C 00000000 */ nop glabel L80241950_C32E30 /* C32E30 80241950 0280202D */ daddu $a0, $s4, $zero /* C32E34 80241954 0260282D */ daddu $a1, $s3, $zero /* C32E38 80241958 0C090563 */ jal dgb_03_UnkNpcDurationFlagFunc /* C32E3C 8024195C 02A0302D */ daddu $a2, $s5, $zero -/* C32E40 80241960 08090662 */ j .L80241988 +/* C32E40 80241960 08090662 */ j L80241988_C32E68 /* C32E44 80241964 00000000 */ nop glabel L80241968_C32E48 /* C32E48 80241968 0280202D */ daddu $a0, $s4, $zero /* C32E4C 8024196C 0260282D */ daddu $a1, $s3, $zero /* C32E50 80241970 0C09057D */ jal func_802415F4_C32AD4 /* C32E54 80241974 02A0302D */ daddu $a2, $s5, $zero -/* C32E58 80241978 08090662 */ j .L80241988 +/* C32E58 80241978 08090662 */ j L80241988_C32E68 /* C32E5C 8024197C 00000000 */ nop glabel L80241980_C32E60 /* C32E60 80241980 0C0129CF */ jal func_8004A73C /* C32E64 80241984 0280202D */ daddu $a0, $s4, $zero -.L80241988: glabel L80241988_C32E68 /* C32E68 80241988 8FBF0060 */ lw $ra, 0x60($sp) /* C32E6C 8024198C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s index f8afaac6a2..921c6cf443 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s @@ -98,7 +98,7 @@ glabel func_802419B0_C32E90 .L80241B10: /* C32FF0 80241B10 8E430070 */ lw $v1, 0x70($s2) /* C32FF4 80241B14 2C620064 */ sltiu $v0, $v1, 0x64 -/* C32FF8 80241B18 1040004E */ beqz $v0, .L80241C54 +/* C32FF8 80241B18 1040004E */ beqz $v0, L80241C54_C33134 /* C32FFC 80241B1C 00031080 */ sll $v0, $v1, 2 /* C33000 80241B20 3C018024 */ lui $at, %hi(jtbl_80244D28_C36208) /* C33004 80241B24 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80241B44_C33024 /* C33028 80241B48 0260282D */ daddu $a1, $s3, $zero /* C3302C 80241B4C 0C09031E */ jal func_80240C78_C32158 /* C33030 80241B50 0280302D */ daddu $a2, $s4, $zero -/* C33034 80241B54 08090715 */ j .L80241C54 +/* C33034 80241B54 08090715 */ j L80241C54_C33134 /* C33038 80241B58 00000000 */ nop glabel L80241B5C_C3303C /* C3303C 80241B5C 0240202D */ daddu $a0, $s2, $zero @@ -127,14 +127,14 @@ glabel L80241B6C_C3304C /* C33050 80241B70 0260282D */ daddu $a1, $s3, $zero /* C33054 80241B74 0C0903F8 */ jal func_80240FE0_C324C0 /* C33058 80241B78 0280302D */ daddu $a2, $s4, $zero -/* C3305C 80241B7C 08090715 */ j .L80241C54 +/* C3305C 80241B7C 08090715 */ j L80241C54_C33134 /* C33060 80241B80 00000000 */ nop glabel L80241B84_C33064 /* C33064 80241B84 0240202D */ daddu $a0, $s2, $zero /* C33068 80241B88 0260282D */ daddu $a1, $s3, $zero /* C3306C 80241B8C 0C090467 */ jal func_8024119C_C3267C /* C33070 80241B90 0280302D */ daddu $a2, $s4, $zero -/* C33074 80241B94 08090715 */ j .L80241C54 +/* C33074 80241B94 08090715 */ j L80241C54_C33134 /* C33078 80241B98 00000000 */ nop glabel L80241B9C_C3307C /* C3307C 80241B9C 0240202D */ daddu $a0, $s2, $zero @@ -146,7 +146,7 @@ glabel L80241BAC_C3308C /* C33090 80241BB0 0260282D */ daddu $a1, $s3, $zero /* C33094 80241BB4 0C0904B1 */ jal dgb_03_NpcJumpFunc /* C33098 80241BB8 0280302D */ daddu $a2, $s4, $zero -/* C3309C 80241BBC 08090715 */ j .L80241C54 +/* C3309C 80241BBC 08090715 */ j L80241C54_C33134 /* C330A0 80241BC0 00000000 */ nop glabel L80241BC4_C330A4 /* C330A4 80241BC4 0240202D */ daddu $a0, $s2, $zero @@ -158,14 +158,14 @@ glabel L80241BD4_C330B4 /* C330B8 80241BD8 0260282D */ daddu $a1, $s3, $zero /* C330BC 80241BDC 0C09051B */ jal func_8024146C_C3294C /* C330C0 80241BE0 0280302D */ daddu $a2, $s4, $zero -/* C330C4 80241BE4 08090715 */ j .L80241C54 +/* C330C4 80241BE4 08090715 */ j L80241C54_C33134 /* C330C8 80241BE8 00000000 */ nop glabel L80241BEC_C330CC /* C330CC 80241BEC 0240202D */ daddu $a0, $s2, $zero /* C330D0 80241BF0 0260282D */ daddu $a1, $s3, $zero /* C330D4 80241BF4 0C090563 */ jal dgb_03_UnkNpcDurationFlagFunc /* C330D8 80241BF8 0280302D */ daddu $a2, $s4, $zero -/* C330DC 80241BFC 08090715 */ j .L80241C54 +/* C330DC 80241BFC 08090715 */ j L80241C54_C33134 /* C330E0 80241C00 00000000 */ nop glabel L80241C04_C330E4 /* C330E4 80241C04 0C090094 */ jal dgb_03_UnkNpcAIFunc6 @@ -175,24 +175,23 @@ glabel L80241C0C_C330EC /* C330F0 80241C10 0240202D */ daddu $a0, $s2, $zero /* C330F4 80241C14 8E430070 */ lw $v1, 0x70($s2) /* C330F8 80241C18 24020020 */ addiu $v0, $zero, 0x20 -/* C330FC 80241C1C 1462000D */ bne $v1, $v0, .L80241C54 +/* C330FC 80241C1C 1462000D */ bne $v1, $v0, L80241C54_C33134 /* C33100 80241C20 00000000 */ nop glabel L80241C24_C33104 /* C33104 80241C24 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 /* C33108 80241C28 0240202D */ daddu $a0, $s2, $zero /* C3310C 80241C2C 8E430070 */ lw $v1, 0x70($s2) /* C33110 80241C30 24020021 */ addiu $v0, $zero, 0x21 -/* C33114 80241C34 14620007 */ bne $v1, $v0, .L80241C54 +/* C33114 80241C34 14620007 */ bne $v1, $v0, L80241C54_C33134 /* C33118 80241C38 00000000 */ nop glabel L80241C3C_C3311C /* C3311C 80241C3C 0C090101 */ jal dgb_03_UnkNpcAIFunc5 /* C33120 80241C40 0240202D */ daddu $a0, $s2, $zero -/* C33124 80241C44 08090715 */ j .L80241C54 +/* C33124 80241C44 08090715 */ j L80241C54_C33134 /* C33128 80241C48 00000000 */ nop glabel L80241C4C_C3312C /* C3312C 80241C4C 0C0129CF */ jal func_8004A73C /* C33130 80241C50 0240202D */ daddu $a0, $s2, $zero -.L80241C54: glabel L80241C54_C33134 /* C33134 80241C54 8FBF0048 */ lw $ra, 0x48($sp) /* C33138 80241C58 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s index f7a8d617a0..bd1d07c121 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s @@ -106,7 +106,7 @@ glabel func_80242480_C33960 .L80242600: /* C33AE0 80242600 8E430070 */ lw $v1, 0x70($s2) /* C33AE4 80242604 2C620064 */ sltiu $v0, $v1, 0x64 -/* C33AE8 80242608 10400067 */ beqz $v0, .L802427A8 +/* C33AE8 80242608 10400067 */ beqz $v0, L802427A8_C33C88 /* C33AEC 8024260C 00031080 */ sll $v0, $v1, 2 /* C33AF0 80242610 3C018024 */ lui $at, %hi(jtbl_80244EC0_C363A0) /* C33AF4 80242614 00220821 */ addu $at, $at, $v0 @@ -118,35 +118,35 @@ glabel L80242624_C33B04 /* C33B08 80242628 0260282D */ daddu $a1, $s3, $zero /* C33B0C 8024262C 0C09071F */ jal func_80241C7C_C3315C /* C33B10 80242630 02A0302D */ daddu $a2, $s5, $zero -/* C33B14 80242634 080909EA */ j .L802427A8 +/* C33B14 80242634 080909EA */ j L802427A8_C33C88 /* C33B18 80242638 00000000 */ nop glabel L8024263C_C33B1C /* C33B1C 8024263C 0240202D */ daddu $a0, $s2, $zero /* C33B20 80242640 0260282D */ daddu $a1, $s3, $zero /* C33B24 80242644 0C090741 */ jal func_80241D04_C331E4 /* C33B28 80242648 02A0302D */ daddu $a2, $s5, $zero -/* C33B2C 8024264C 080909EA */ j .L802427A8 +/* C33B2C 8024264C 080909EA */ j L802427A8_C33C88 /* C33B30 80242650 00000000 */ nop glabel L80242654_C33B34 /* C33B34 80242654 0240202D */ daddu $a0, $s2, $zero /* C33B38 80242658 0260282D */ daddu $a1, $s3, $zero /* C33B3C 8024265C 0C0907EF */ jal func_80241FBC_C3349C /* C33B40 80242660 02A0302D */ daddu $a2, $s5, $zero -/* C33B44 80242664 080909EA */ j .L802427A8 +/* C33B44 80242664 080909EA */ j L802427A8_C33C88 /* C33B48 80242668 00000000 */ nop glabel L8024266C_C33B4C /* C33B4C 8024266C 0240202D */ daddu $a0, $s2, $zero /* C33B50 80242670 0260282D */ daddu $a1, $s3, $zero /* C33B54 80242674 0C090808 */ jal func_80242020_C33500 /* C33B58 80242678 02A0302D */ daddu $a2, $s5, $zero -/* C33B5C 8024267C 080909EA */ j .L802427A8 +/* C33B5C 8024267C 080909EA */ j L802427A8_C33C88 /* C33B60 80242680 00000000 */ nop glabel L80242684_C33B64 /* C33B64 80242684 0240202D */ daddu $a0, $s2, $zero /* C33B68 80242688 0260282D */ daddu $a1, $s3, $zero /* C33B6C 8024268C 0C090832 */ jal func_802420C8_C335A8 /* C33B70 80242690 02A0302D */ daddu $a2, $s5, $zero -/* C33B74 80242694 080909EA */ j .L802427A8 +/* C33B74 80242694 080909EA */ j L802427A8_C33C88 /* C33B78 80242698 00000000 */ nop glabel L8024269C_C33B7C /* C33B7C 8024269C 0240202D */ daddu $a0, $s2, $zero @@ -155,14 +155,14 @@ glabel L8024269C_C33B7C /* C33B88 802426A8 02A0302D */ daddu $a2, $s5, $zero /* C33B8C 802426AC 8E430070 */ lw $v1, 0x70($s2) /* C33B90 802426B0 2402000D */ addiu $v0, $zero, 0xd -/* C33B94 802426B4 1462003C */ bne $v1, $v0, .L802427A8 +/* C33B94 802426B4 1462003C */ bne $v1, $v0, L802427A8_C33C88 /* C33B98 802426B8 00000000 */ nop glabel L802426BC_C33B9C /* C33B9C 802426BC 0240202D */ daddu $a0, $s2, $zero /* C33BA0 802426C0 0260282D */ daddu $a1, $s3, $zero /* C33BA4 802426C4 0C012849 */ jal func_8004A124 /* C33BA8 802426C8 02A0302D */ daddu $a2, $s5, $zero -/* C33BAC 802426CC 080909EA */ j .L802427A8 +/* C33BAC 802426CC 080909EA */ j L802427A8_C33C88 /* C33BB0 802426D0 00000000 */ nop glabel L802426D4_C33BB4 /* C33BB4 802426D4 0240202D */ daddu $a0, $s2, $zero @@ -174,31 +174,31 @@ glabel L802426D4_C33BB4 /* C33BCC 802426EC 24020028 */ addiu $v0, $zero, 0x28 /* C33BD0 802426F0 AE220088 */ sw $v0, 0x88($s1) /* C33BD4 802426F4 24020003 */ addiu $v0, $zero, 3 -/* C33BD8 802426F8 080909EA */ j .L802427A8 +/* C33BD8 802426F8 080909EA */ j L802427A8_C33C88 /* C33BDC 802426FC AE420070 */ sw $v0, 0x70($s2) glabel L80242700_C33BE0 /* C33BE0 80242700 0C090094 */ jal dgb_03_UnkNpcAIFunc6 /* C33BE4 80242704 0240202D */ daddu $a0, $s2, $zero /* C33BE8 80242708 8E430070 */ lw $v1, 0x70($s2) /* C33BEC 8024270C 2402001F */ addiu $v0, $zero, 0x1f -/* C33BF0 80242710 14620025 */ bne $v1, $v0, .L802427A8 +/* C33BF0 80242710 14620025 */ bne $v1, $v0, L802427A8_C33C88 /* C33BF4 80242714 00000000 */ nop glabel L80242718_C33BF8 /* C33BF8 80242718 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 /* C33BFC 8024271C 0240202D */ daddu $a0, $s2, $zero /* C33C00 80242720 8E430070 */ lw $v1, 0x70($s2) /* C33C04 80242724 24020020 */ addiu $v0, $zero, 0x20 -/* C33C08 80242728 1462001F */ bne $v1, $v0, .L802427A8 +/* C33C08 80242728 1462001F */ bne $v1, $v0, L802427A8_C33C88 /* C33C0C 8024272C 00000000 */ nop glabel L80242730_C33C10 /* C33C10 80242730 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 /* C33C14 80242734 0240202D */ daddu $a0, $s2, $zero -/* C33C18 80242738 080909EA */ j .L802427A8 +/* C33C18 80242738 080909EA */ j L802427A8_C33C88 /* C33C1C 8024273C 00000000 */ nop glabel L80242740_C33C20 /* C33C20 80242740 0C090101 */ jal dgb_03_UnkNpcAIFunc5 /* C33C24 80242744 0240202D */ daddu $a0, $s2, $zero -/* C33C28 80242748 080909EA */ j .L802427A8 +/* C33C28 80242748 080909EA */ j L802427A8_C33C88 /* C33C2C 8024274C 00000000 */ nop glabel L80242750_C33C30 /* C33C30 80242750 0240202D */ daddu $a0, $s2, $zero @@ -207,26 +207,25 @@ glabel L80242750_C33C30 /* C33C3C 8024275C 02A0302D */ daddu $a2, $s5, $zero /* C33C40 80242760 8E430070 */ lw $v1, 0x70($s2) /* C33C44 80242764 24020029 */ addiu $v0, $zero, 0x29 -/* C33C48 80242768 1462000F */ bne $v1, $v0, .L802427A8 +/* C33C48 80242768 1462000F */ bne $v1, $v0, L802427A8_C33C88 /* C33C4C 8024276C 00000000 */ nop glabel L80242770_C33C50 /* C33C50 80242770 0240202D */ daddu $a0, $s2, $zero /* C33C54 80242774 0260282D */ daddu $a1, $s3, $zero /* C33C58 80242778 0C0908AB */ jal func_802422AC_C3378C /* C33C5C 8024277C 02A0302D */ daddu $a2, $s5, $zero -/* C33C60 80242780 080909EA */ j .L802427A8 +/* C33C60 80242780 080909EA */ j L802427A8_C33C88 /* C33C64 80242784 00000000 */ nop glabel L80242788_C33C68 /* C33C68 80242788 0240202D */ daddu $a0, $s2, $zero /* C33C6C 8024278C 0260282D */ daddu $a1, $s3, $zero /* C33C70 80242790 0C090909 */ jal func_80242424_C33904 /* C33C74 80242794 02A0302D */ daddu $a2, $s5, $zero -/* C33C78 80242798 080909EA */ j .L802427A8 +/* C33C78 80242798 080909EA */ j L802427A8_C33C88 /* C33C7C 8024279C 00000000 */ nop glabel L802427A0_C33C80 /* C33C80 802427A0 0C0129CF */ jal func_8004A73C /* C33C84 802427A4 0240202D */ daddu $a0, $s2, $zero -.L802427A8: glabel L802427A8_C33C88 /* C33C88 802427A8 8FBF0048 */ lw $ra, 0x48($sp) /* C33C8C 802427AC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s index dddd8d4813..09ba32bef8 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s @@ -64,7 +64,7 @@ glabel func_8024130C_C3783C .L802413F4: /* C37924 802413F4 8E830070 */ lw $v1, 0x70($s4) /* C37928 802413F8 2C62000F */ sltiu $v0, $v1, 0xf -/* C3792C 802413FC 10400034 */ beqz $v0, .L802414D0 +/* C3792C 802413FC 10400034 */ beqz $v0, L802414D0_C37A00 /* C37930 80241400 00031080 */ sll $v0, $v1, 2 /* C37934 80241404 3C018024 */ lui $at, %hi(jtbl_80244408_C3A938) /* C37938 80241408 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L802414C0_C379F0 /* C379F4 802414C4 0200282D */ daddu $a1, $s0, $zero /* C379F8 802414C8 0C090396 */ jal func_80240E58_C37388 /* C379FC 802414CC 0260302D */ daddu $a2, $s3, $zero -.L802414D0: glabel L802414D0_C37A00 /* C37A00 802414D0 0000102D */ daddu $v0, $zero, $zero .L802414D4: diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s index 4221207890..654668e5a0 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s @@ -52,7 +52,7 @@ glabel func_80242154_C38684 .L80242210: /* C38740 80242210 8E830070 */ lw $v1, 0x70($s4) /* C38744 80242214 2C620020 */ sltiu $v0, $v1, 0x20 -/* C38748 80242218 10400060 */ beqz $v0, .L8024239C +/* C38748 80242218 10400060 */ beqz $v0, L8024239C_C388CC /* C3874C 8024221C 00031080 */ sll $v0, $v1, 2 /* C38750 80242220 3C018024 */ lui $at, %hi(jtbl_80244458_C3A988) /* C38754 80242224 00220821 */ addu $at, $at, $v0 @@ -92,9 +92,9 @@ glabel L8024228C_C387BC .L8024229C: /* C387CC 8024229C 8E830070 */ lw $v1, 0x70($s4) /* C387D0 802422A0 2402000C */ addiu $v0, $zero, 0xc -/* C387D4 802422A4 1462003D */ bne $v1, $v0, .L8024239C +/* C387D4 802422A4 1462003D */ bne $v1, $v0, L8024239C_C388CC /* C387D8 802422A8 24020006 */ addiu $v0, $zero, 6 -/* C387DC 802422AC 080908E7 */ j .L8024239C +/* C387DC 802422AC 080908E7 */ j L8024239C_C388CC /* C387E0 802422B0 A6A2008E */ sh $v0, 0x8e($s5) glabel L802422B4_C387E4 /* C387E4 802422B4 0280202D */ daddu $a0, $s4, $zero @@ -103,14 +103,14 @@ glabel L802422B4_C387E4 /* C387F0 802422C0 0260302D */ daddu $a2, $s3, $zero /* C387F4 802422C4 8E830070 */ lw $v1, 0x70($s4) /* C387F8 802422C8 2402000D */ addiu $v0, $zero, 0xd -/* C387FC 802422CC 14620033 */ bne $v1, $v0, .L8024239C +/* C387FC 802422CC 14620033 */ bne $v1, $v0, L8024239C_C388CC /* C38800 802422D0 00000000 */ nop glabel L802422D4_C38804 /* C38804 802422D4 0280202D */ daddu $a0, $s4, $zero /* C38808 802422D8 0220282D */ daddu $a1, $s1, $zero /* C3880C 802422DC 0C090594 */ jal func_80241650_C37B80 /* C38810 802422E0 0260302D */ daddu $a2, $s3, $zero -/* C38814 802422E4 080908E7 */ j .L8024239C +/* C38814 802422E4 080908E7 */ j L8024239C_C388CC /* C38818 802422E8 00000000 */ nop glabel L802422EC_C3881C /* C3881C 802422EC 0280202D */ daddu $a0, $s4, $zero @@ -119,14 +119,14 @@ glabel L802422EC_C3881C /* C38828 802422F8 0260302D */ daddu $a2, $s3, $zero /* C3882C 802422FC 8E830070 */ lw $v1, 0x70($s4) /* C38830 80242300 2402000F */ addiu $v0, $zero, 0xf -/* C38834 80242304 14620025 */ bne $v1, $v0, .L8024239C +/* C38834 80242304 14620025 */ bne $v1, $v0, L8024239C_C388CC /* C38838 80242308 00000000 */ nop glabel L8024230C_C3883C /* C3883C 8024230C 0280202D */ daddu $a0, $s4, $zero /* C38840 80242310 0220282D */ daddu $a1, $s1, $zero /* C38844 80242314 0C0905FE */ jal func_802417F8_C37D28 /* C38848 80242318 0260302D */ daddu $a2, $s3, $zero -/* C3884C 8024231C 080908E7 */ j .L8024239C +/* C3884C 8024231C 080908E7 */ j L8024239C_C388CC /* C38850 80242320 00000000 */ nop glabel L80242324_C38854 /* C38854 80242324 0280202D */ daddu $a0, $s4, $zero @@ -138,21 +138,21 @@ glabel L80242334_C38864 /* C38868 80242338 0220282D */ daddu $a1, $s1, $zero /* C3886C 8024233C 0C0906D3 */ jal func_80241B4C_C3807C /* C38870 80242340 0260302D */ daddu $a2, $s3, $zero -/* C38874 80242344 080908E7 */ j .L8024239C +/* C38874 80242344 080908E7 */ j L8024239C_C388CC /* C38878 80242348 00000000 */ nop glabel L8024234C_C3887C /* C3887C 8024234C 0280202D */ daddu $a0, $s4, $zero /* C38880 80242350 0220282D */ daddu $a1, $s1, $zero /* C38884 80242354 0C090733 */ jal func_80241CCC_C381FC /* C38888 80242358 0260302D */ daddu $a2, $s3, $zero -/* C3888C 8024235C 080908E7 */ j .L8024239C +/* C3888C 8024235C 080908E7 */ j L8024239C_C388CC /* C38890 80242360 00000000 */ nop glabel L80242364_C38894 /* C38894 80242364 0280202D */ daddu $a0, $s4, $zero /* C38898 80242368 0220282D */ daddu $a1, $s1, $zero /* C3889C 8024236C 0C090745 */ jal func_80241D14_C38244 /* C388A0 80242370 0260302D */ daddu $a2, $s3, $zero -/* C388A4 80242374 080908E7 */ j .L8024239C +/* C388A4 80242374 080908E7 */ j L8024239C_C388CC /* C388A8 80242378 00000000 */ nop glabel L8024237C_C388AC /* C388AC 8024237C 0280202D */ daddu $a0, $s4, $zero @@ -164,7 +164,6 @@ glabel L8024238C_C388BC /* C388C0 80242390 0220282D */ daddu $a1, $s1, $zero /* C388C4 80242394 0C09078F */ jal func_80241E3C_C3836C /* C388C8 80242398 0260302D */ daddu $a2, $s3, $zero -.L8024239C: glabel L8024239C_C388CC /* C388CC 8024239C 8E820070 */ lw $v0, 0x70($s4) /* C388D0 802423A0 8FBF0058 */ lw $ra, 0x58($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s index 028c9e203d..7ccdf7bc02 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s @@ -106,7 +106,7 @@ glabel func_80240E80_C3B890 .L80241000: /* C3BA10 80241000 8E430070 */ lw $v1, 0x70($s2) /* C3BA14 80241004 2C620064 */ sltiu $v0, $v1, 0x64 -/* C3BA18 80241008 10400067 */ beqz $v0, .L802411A8 +/* C3BA18 80241008 10400067 */ beqz $v0, L802411A8_C3BBB8 /* C3BA1C 8024100C 00031080 */ sll $v0, $v1, 2 /* C3BA20 80241010 3C018024 */ lui $at, %hi(jtbl_80242350_C3CD60) /* C3BA24 80241014 00220821 */ addu $at, $at, $v0 @@ -118,35 +118,35 @@ glabel L80241024_C3BA34 /* C3BA38 80241028 0260282D */ daddu $a1, $s3, $zero /* C3BA3C 8024102C 0C09019F */ jal func_8024067C_C3B08C /* C3BA40 80241030 02A0302D */ daddu $a2, $s5, $zero -/* C3BA44 80241034 0809046A */ j .L802411A8 +/* C3BA44 80241034 0809046A */ j L802411A8_C3BBB8 /* C3BA48 80241038 00000000 */ nop glabel L8024103C_C3BA4C /* C3BA4C 8024103C 0240202D */ daddu $a0, $s2, $zero /* C3BA50 80241040 0260282D */ daddu $a1, $s3, $zero /* C3BA54 80241044 0C0901C1 */ jal func_80240704_C3B114 /* C3BA58 80241048 02A0302D */ daddu $a2, $s5, $zero -/* C3BA5C 8024104C 0809046A */ j .L802411A8 +/* C3BA5C 8024104C 0809046A */ j L802411A8_C3BBB8 /* C3BA60 80241050 00000000 */ nop glabel L80241054_C3BA64 /* C3BA64 80241054 0240202D */ daddu $a0, $s2, $zero /* C3BA68 80241058 0260282D */ daddu $a1, $s3, $zero /* C3BA6C 8024105C 0C09026F */ jal func_802409BC_C3B3CC /* C3BA70 80241060 02A0302D */ daddu $a2, $s5, $zero -/* C3BA74 80241064 0809046A */ j .L802411A8 +/* C3BA74 80241064 0809046A */ j L802411A8_C3BBB8 /* C3BA78 80241068 00000000 */ nop glabel L8024106C_C3BA7C /* C3BA7C 8024106C 0240202D */ daddu $a0, $s2, $zero /* C3BA80 80241070 0260282D */ daddu $a1, $s3, $zero /* C3BA84 80241074 0C090288 */ jal func_80240A20_C3B430 /* C3BA88 80241078 02A0302D */ daddu $a2, $s5, $zero -/* C3BA8C 8024107C 0809046A */ j .L802411A8 +/* C3BA8C 8024107C 0809046A */ j L802411A8_C3BBB8 /* C3BA90 80241080 00000000 */ nop glabel L80241084_C3BA94 /* C3BA94 80241084 0240202D */ daddu $a0, $s2, $zero /* C3BA98 80241088 0260282D */ daddu $a1, $s3, $zero /* C3BA9C 8024108C 0C0902B2 */ jal func_80240AC8_C3B4D8 /* C3BAA0 80241090 02A0302D */ daddu $a2, $s5, $zero -/* C3BAA4 80241094 0809046A */ j .L802411A8 +/* C3BAA4 80241094 0809046A */ j L802411A8_C3BBB8 /* C3BAA8 80241098 00000000 */ nop glabel L8024109C_C3BAAC /* C3BAAC 8024109C 0240202D */ daddu $a0, $s2, $zero @@ -155,14 +155,14 @@ glabel L8024109C_C3BAAC /* C3BAB8 802410A8 02A0302D */ daddu $a2, $s5, $zero /* C3BABC 802410AC 8E430070 */ lw $v1, 0x70($s2) /* C3BAC0 802410B0 2402000D */ addiu $v0, $zero, 0xd -/* C3BAC4 802410B4 1462003C */ bne $v1, $v0, .L802411A8 +/* C3BAC4 802410B4 1462003C */ bne $v1, $v0, L802411A8_C3BBB8 /* C3BAC8 802410B8 00000000 */ nop glabel L802410BC_C3BACC /* C3BACC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C3BAD0 802410C0 0260282D */ daddu $a1, $s3, $zero /* C3BAD4 802410C4 0C012849 */ jal func_8004A124 /* C3BAD8 802410C8 02A0302D */ daddu $a2, $s5, $zero -/* C3BADC 802410CC 0809046A */ j .L802411A8 +/* C3BADC 802410CC 0809046A */ j L802411A8_C3BBB8 /* C3BAE0 802410D0 00000000 */ nop glabel L802410D4_C3BAE4 /* C3BAE4 802410D4 0240202D */ daddu $a0, $s2, $zero @@ -174,31 +174,31 @@ glabel L802410D4_C3BAE4 /* C3BAFC 802410EC 24020028 */ addiu $v0, $zero, 0x28 /* C3BB00 802410F0 AE220088 */ sw $v0, 0x88($s1) /* C3BB04 802410F4 24020003 */ addiu $v0, $zero, 3 -/* C3BB08 802410F8 0809046A */ j .L802411A8 +/* C3BB08 802410F8 0809046A */ j L802411A8_C3BBB8 /* C3BB0C 802410FC AE420070 */ sw $v0, 0x70($s2) glabel L80241100_C3BB10 /* C3BB10 80241100 0C090018 */ jal dgb_05_UnkNpcAIFunc6 /* C3BB14 80241104 0240202D */ daddu $a0, $s2, $zero /* C3BB18 80241108 8E430070 */ lw $v1, 0x70($s2) /* C3BB1C 8024110C 2402001F */ addiu $v0, $zero, 0x1f -/* C3BB20 80241110 14620025 */ bne $v1, $v0, .L802411A8 +/* C3BB20 80241110 14620025 */ bne $v1, $v0, L802411A8_C3BBB8 /* C3BB24 80241114 00000000 */ nop glabel L80241118_C3BB28 /* C3BB28 80241118 0C090033 */ jal dgb_05_UnkNpcAIFunc7 /* C3BB2C 8024111C 0240202D */ daddu $a0, $s2, $zero /* C3BB30 80241120 8E430070 */ lw $v1, 0x70($s2) /* C3BB34 80241124 24020020 */ addiu $v0, $zero, 0x20 -/* C3BB38 80241128 1462001F */ bne $v1, $v0, .L802411A8 +/* C3BB38 80241128 1462001F */ bne $v1, $v0, L802411A8_C3BBB8 /* C3BB3C 8024112C 00000000 */ nop glabel L80241130_C3BB40 /* C3BB40 80241130 0C09004F */ jal dgb_05_UnkNpcAIFunc8 /* C3BB44 80241134 0240202D */ daddu $a0, $s2, $zero -/* C3BB48 80241138 0809046A */ j .L802411A8 +/* C3BB48 80241138 0809046A */ j L802411A8_C3BBB8 /* C3BB4C 8024113C 00000000 */ nop glabel L80241140_C3BB50 /* C3BB50 80241140 0C090085 */ jal dgb_05_UnkNpcAIFunc5 /* C3BB54 80241144 0240202D */ daddu $a0, $s2, $zero -/* C3BB58 80241148 0809046A */ j .L802411A8 +/* C3BB58 80241148 0809046A */ j L802411A8_C3BBB8 /* C3BB5C 8024114C 00000000 */ nop glabel L80241150_C3BB60 /* C3BB60 80241150 0240202D */ daddu $a0, $s2, $zero @@ -207,26 +207,25 @@ glabel L80241150_C3BB60 /* C3BB6C 8024115C 02A0302D */ daddu $a2, $s5, $zero /* C3BB70 80241160 8E430070 */ lw $v1, 0x70($s2) /* C3BB74 80241164 24020029 */ addiu $v0, $zero, 0x29 -/* C3BB78 80241168 1462000F */ bne $v1, $v0, .L802411A8 +/* C3BB78 80241168 1462000F */ bne $v1, $v0, L802411A8_C3BBB8 /* C3BB7C 8024116C 00000000 */ nop glabel L80241170_C3BB80 /* C3BB80 80241170 0240202D */ daddu $a0, $s2, $zero /* C3BB84 80241174 0260282D */ daddu $a1, $s3, $zero /* C3BB88 80241178 0C09032B */ jal func_80240CAC_C3B6BC /* C3BB8C 8024117C 02A0302D */ daddu $a2, $s5, $zero -/* C3BB90 80241180 0809046A */ j .L802411A8 +/* C3BB90 80241180 0809046A */ j L802411A8_C3BBB8 /* C3BB94 80241184 00000000 */ nop glabel L80241188_C3BB98 /* C3BB98 80241188 0240202D */ daddu $a0, $s2, $zero /* C3BB9C 8024118C 0260282D */ daddu $a1, $s3, $zero /* C3BBA0 80241190 0C090389 */ jal func_80240E24_C3B834 /* C3BBA4 80241194 02A0302D */ daddu $a2, $s5, $zero -/* C3BBA8 80241198 0809046A */ j .L802411A8 +/* C3BBA8 80241198 0809046A */ j L802411A8_C3BBB8 /* C3BBAC 8024119C 00000000 */ nop glabel L802411A0_C3BBB0 /* C3BBB0 802411A0 0C0129CF */ jal func_8004A73C /* C3BBB4 802411A4 0240202D */ daddu $a0, $s2, $zero -.L802411A8: glabel L802411A8_C3BBB8 /* C3BBB8 802411A8 8FBF0048 */ lw $ra, 0x48($sp) /* C3BBBC 802411AC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s index a437712286..c18422150c 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s @@ -98,7 +98,7 @@ glabel func_802411D0_C3BBE0 .L80241330: /* C3BD40 80241330 8E430070 */ lw $v1, 0x70($s2) /* C3BD44 80241334 2C620064 */ sltiu $v0, $v1, 0x64 -/* C3BD48 80241338 10400048 */ beqz $v0, .L8024145C +/* C3BD48 80241338 10400048 */ beqz $v0, L8024145C_C3BE6C /* C3BD4C 8024133C 00031080 */ sll $v0, $v1, 2 /* C3BD50 80241340 3C018024 */ lui $at, %hi(jtbl_802424E0_C3CEF0) /* C3BD54 80241344 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80241364_C3BD74 /* C3BD78 80241368 0260282D */ daddu $a1, $s3, $zero /* C3BD7C 8024136C 0C0125AE */ jal func_800496B8 /* C3BD80 80241370 0280302D */ daddu $a2, $s4, $zero -/* C3BD84 80241374 08090517 */ j .L8024145C +/* C3BD84 80241374 08090517 */ j L8024145C_C3BE6C /* C3BD88 80241378 00000000 */ nop glabel L8024137C_C3BD8C /* C3BD8C 8024137C 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L8024138C_C3BD9C /* C3BDA0 80241390 0260282D */ daddu $a1, $s3, $zero /* C3BDA4 80241394 0C012701 */ jal func_80049C04 /* C3BDA8 80241398 0280302D */ daddu $a2, $s4, $zero -/* C3BDAC 8024139C 08090517 */ j .L8024145C +/* C3BDAC 8024139C 08090517 */ j L8024145C_C3BE6C /* C3BDB0 802413A0 00000000 */ nop glabel L802413A4_C3BDB4 /* C3BDB4 802413A4 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L802413B4_C3BDC4 /* C3BDC8 802413B8 0260282D */ daddu $a1, $s3, $zero /* C3BDCC 802413BC 0C0127B3 */ jal func_80049ECC /* C3BDD0 802413C0 0280302D */ daddu $a2, $s4, $zero -/* C3BDD4 802413C4 08090517 */ j .L8024145C +/* C3BDD4 802413C4 08090517 */ j L8024145C_C3BE6C /* C3BDD8 802413C8 00000000 */ nop glabel L802413CC_C3BDDC /* C3BDDC 802413CC 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L802413DC_C3BDEC /* C3BDF0 802413E0 0260282D */ daddu $a1, $s3, $zero /* C3BDF4 802413E4 0C012849 */ jal func_8004A124 /* C3BDF8 802413E8 0280302D */ daddu $a2, $s4, $zero -/* C3BDFC 802413EC 08090517 */ j .L8024145C +/* C3BDFC 802413EC 08090517 */ j L8024145C_C3BE6C /* C3BE00 802413F0 00000000 */ nop glabel L802413F4_C3BE04 /* C3BE04 802413F4 0240202D */ daddu $a0, $s2, $zero /* C3BE08 802413F8 0260282D */ daddu $a1, $s3, $zero /* C3BE0C 802413FC 0C0128FA */ jal func_8004A3E8 /* C3BE10 80241400 0280302D */ daddu $a2, $s4, $zero -/* C3BE14 80241404 08090517 */ j .L8024145C +/* C3BE14 80241404 08090517 */ j L8024145C_C3BE6C /* C3BE18 80241408 00000000 */ nop glabel L8024140C_C3BE1C /* C3BE1C 8024140C 0C090018 */ jal dgb_05_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80241414_C3BE24 /* C3BE28 80241418 0240202D */ daddu $a0, $s2, $zero /* C3BE2C 8024141C 8E430070 */ lw $v1, 0x70($s2) /* C3BE30 80241420 24020020 */ addiu $v0, $zero, 0x20 -/* C3BE34 80241424 1462000D */ bne $v1, $v0, .L8024145C +/* C3BE34 80241424 1462000D */ bne $v1, $v0, L8024145C_C3BE6C /* C3BE38 80241428 00000000 */ nop glabel L8024142C_C3BE3C /* C3BE3C 8024142C 0C09004F */ jal dgb_05_UnkNpcAIFunc8 /* C3BE40 80241430 0240202D */ daddu $a0, $s2, $zero /* C3BE44 80241434 8E430070 */ lw $v1, 0x70($s2) /* C3BE48 80241438 24020021 */ addiu $v0, $zero, 0x21 -/* C3BE4C 8024143C 14620007 */ bne $v1, $v0, .L8024145C +/* C3BE4C 8024143C 14620007 */ bne $v1, $v0, L8024145C_C3BE6C /* C3BE50 80241440 00000000 */ nop glabel L80241444_C3BE54 /* C3BE54 80241444 0C090085 */ jal dgb_05_UnkNpcAIFunc5 /* C3BE58 80241448 0240202D */ daddu $a0, $s2, $zero -/* C3BE5C 8024144C 08090517 */ j .L8024145C +/* C3BE5C 8024144C 08090517 */ j L8024145C_C3BE6C /* C3BE60 80241450 00000000 */ nop glabel L80241454_C3BE64 /* C3BE64 80241454 0C0129CF */ jal func_8004A73C /* C3BE68 80241458 0240202D */ daddu $a0, $s2, $zero -.L8024145C: glabel L8024145C_C3BE6C /* C3BE6C 8024145C 8FBF0048 */ lw $ra, 0x48($sp) /* C3BE70 80241460 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s index 41ff520314..6082358e5c 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s @@ -106,7 +106,7 @@ glabel func_80240E20_C3EA10 .L80240FA0: /* C3EB90 80240FA0 8E430070 */ lw $v1, 0x70($s2) /* C3EB94 80240FA4 2C620064 */ sltiu $v0, $v1, 0x64 -/* C3EB98 80240FA8 10400067 */ beqz $v0, .L80241148 +/* C3EB98 80240FA8 10400067 */ beqz $v0, L80241148_C3ED38 /* C3EB9C 80240FAC 00031080 */ sll $v0, $v1, 2 /* C3EBA0 80240FB0 3C018024 */ lui $at, %hi(jtbl_80241EA0_C3FA90) /* C3EBA4 80240FB4 00220821 */ addu $at, $at, $v0 @@ -118,35 +118,35 @@ glabel L80240FC4_C3EBB4 /* C3EBB8 80240FC8 0260282D */ daddu $a1, $s3, $zero /* C3EBBC 80240FCC 0C090187 */ jal func_8024061C_C3E20C /* C3EBC0 80240FD0 02A0302D */ daddu $a2, $s5, $zero -/* C3EBC4 80240FD4 08090452 */ j .L80241148 +/* C3EBC4 80240FD4 08090452 */ j L80241148_C3ED38 /* C3EBC8 80240FD8 00000000 */ nop glabel L80240FDC_C3EBCC /* C3EBCC 80240FDC 0240202D */ daddu $a0, $s2, $zero /* C3EBD0 80240FE0 0260282D */ daddu $a1, $s3, $zero /* C3EBD4 80240FE4 0C0901A9 */ jal func_802406A4_C3E294 /* C3EBD8 80240FE8 02A0302D */ daddu $a2, $s5, $zero -/* C3EBDC 80240FEC 08090452 */ j .L80241148 +/* C3EBDC 80240FEC 08090452 */ j L80241148_C3ED38 /* C3EBE0 80240FF0 00000000 */ nop glabel L80240FF4_C3EBE4 /* C3EBE4 80240FF4 0240202D */ daddu $a0, $s2, $zero /* C3EBE8 80240FF8 0260282D */ daddu $a1, $s3, $zero /* C3EBEC 80240FFC 0C090257 */ jal func_8024095C_C3E54C /* C3EBF0 80241000 02A0302D */ daddu $a2, $s5, $zero -/* C3EBF4 80241004 08090452 */ j .L80241148 +/* C3EBF4 80241004 08090452 */ j L80241148_C3ED38 /* C3EBF8 80241008 00000000 */ nop glabel L8024100C_C3EBFC /* C3EBFC 8024100C 0240202D */ daddu $a0, $s2, $zero /* C3EC00 80241010 0260282D */ daddu $a1, $s3, $zero /* C3EC04 80241014 0C090270 */ jal func_802409C0_C3E5B0 /* C3EC08 80241018 02A0302D */ daddu $a2, $s5, $zero -/* C3EC0C 8024101C 08090452 */ j .L80241148 +/* C3EC0C 8024101C 08090452 */ j L80241148_C3ED38 /* C3EC10 80241020 00000000 */ nop glabel L80241024_C3EC14 /* C3EC14 80241024 0240202D */ daddu $a0, $s2, $zero /* C3EC18 80241028 0260282D */ daddu $a1, $s3, $zero /* C3EC1C 8024102C 0C09029A */ jal func_80240A68_C3E658 /* C3EC20 80241030 02A0302D */ daddu $a2, $s5, $zero -/* C3EC24 80241034 08090452 */ j .L80241148 +/* C3EC24 80241034 08090452 */ j L80241148_C3ED38 /* C3EC28 80241038 00000000 */ nop glabel L8024103C_C3EC2C /* C3EC2C 8024103C 0240202D */ daddu $a0, $s2, $zero @@ -155,14 +155,14 @@ glabel L8024103C_C3EC2C /* C3EC38 80241048 02A0302D */ daddu $a2, $s5, $zero /* C3EC3C 8024104C 8E430070 */ lw $v1, 0x70($s2) /* C3EC40 80241050 2402000D */ addiu $v0, $zero, 0xd -/* C3EC44 80241054 1462003C */ bne $v1, $v0, .L80241148 +/* C3EC44 80241054 1462003C */ bne $v1, $v0, L80241148_C3ED38 /* C3EC48 80241058 00000000 */ nop glabel L8024105C_C3EC4C /* C3EC4C 8024105C 0240202D */ daddu $a0, $s2, $zero /* C3EC50 80241060 0260282D */ daddu $a1, $s3, $zero /* C3EC54 80241064 0C012849 */ jal func_8004A124 /* C3EC58 80241068 02A0302D */ daddu $a2, $s5, $zero -/* C3EC5C 8024106C 08090452 */ j .L80241148 +/* C3EC5C 8024106C 08090452 */ j L80241148_C3ED38 /* C3EC60 80241070 00000000 */ nop glabel L80241074_C3EC64 /* C3EC64 80241074 0240202D */ daddu $a0, $s2, $zero @@ -174,31 +174,31 @@ glabel L80241074_C3EC64 /* C3EC7C 8024108C 24020028 */ addiu $v0, $zero, 0x28 /* C3EC80 80241090 AE220088 */ sw $v0, 0x88($s1) /* C3EC84 80241094 24020003 */ addiu $v0, $zero, 3 -/* C3EC88 80241098 08090452 */ j .L80241148 +/* C3EC88 80241098 08090452 */ j L80241148_C3ED38 /* C3EC8C 8024109C AE420070 */ sw $v0, 0x70($s2) glabel L802410A0_C3EC90 /* C3EC90 802410A0 0C090000 */ jal dgb_07_UnkNpcAIFunc6 /* C3EC94 802410A4 0240202D */ daddu $a0, $s2, $zero /* C3EC98 802410A8 8E430070 */ lw $v1, 0x70($s2) /* C3EC9C 802410AC 2402001F */ addiu $v0, $zero, 0x1f -/* C3ECA0 802410B0 14620025 */ bne $v1, $v0, .L80241148 +/* C3ECA0 802410B0 14620025 */ bne $v1, $v0, L80241148_C3ED38 /* C3ECA4 802410B4 00000000 */ nop glabel L802410B8_C3ECA8 /* C3ECA8 802410B8 0C09001B */ jal dgb_07_UnkNpcAIFunc7 /* C3ECAC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C3ECB0 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C3ECB4 802410C4 24020020 */ addiu $v0, $zero, 0x20 -/* C3ECB8 802410C8 1462001F */ bne $v1, $v0, .L80241148 +/* C3ECB8 802410C8 1462001F */ bne $v1, $v0, L80241148_C3ED38 /* C3ECBC 802410CC 00000000 */ nop glabel L802410D0_C3ECC0 /* C3ECC0 802410D0 0C090037 */ jal dgb_07_UnkNpcAIFunc8 /* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero -/* C3ECC8 802410D8 08090452 */ j .L80241148 +/* C3ECC8 802410D8 08090452 */ j L80241148_C3ED38 /* C3ECCC 802410DC 00000000 */ nop glabel L802410E0_C3ECD0 /* C3ECD0 802410E0 0C09006D */ jal dgb_07_UnkNpcAIFunc5 /* C3ECD4 802410E4 0240202D */ daddu $a0, $s2, $zero -/* C3ECD8 802410E8 08090452 */ j .L80241148 +/* C3ECD8 802410E8 08090452 */ j L80241148_C3ED38 /* C3ECDC 802410EC 00000000 */ nop glabel L802410F0_C3ECE0 /* C3ECE0 802410F0 0240202D */ daddu $a0, $s2, $zero @@ -207,26 +207,25 @@ glabel L802410F0_C3ECE0 /* C3ECEC 802410FC 02A0302D */ daddu $a2, $s5, $zero /* C3ECF0 80241100 8E430070 */ lw $v1, 0x70($s2) /* C3ECF4 80241104 24020029 */ addiu $v0, $zero, 0x29 -/* C3ECF8 80241108 1462000F */ bne $v1, $v0, .L80241148 +/* C3ECF8 80241108 1462000F */ bne $v1, $v0, L80241148_C3ED38 /* C3ECFC 8024110C 00000000 */ nop glabel L80241110_C3ED00 /* C3ED00 80241110 0240202D */ daddu $a0, $s2, $zero /* C3ED04 80241114 0260282D */ daddu $a1, $s3, $zero /* C3ED08 80241118 0C090313 */ jal func_80240C4C_C3E83C /* C3ED0C 8024111C 02A0302D */ daddu $a2, $s5, $zero -/* C3ED10 80241120 08090452 */ j .L80241148 +/* C3ED10 80241120 08090452 */ j L80241148_C3ED38 /* C3ED14 80241124 00000000 */ nop glabel L80241128_C3ED18 /* C3ED18 80241128 0240202D */ daddu $a0, $s2, $zero /* C3ED1C 8024112C 0260282D */ daddu $a1, $s3, $zero /* C3ED20 80241130 0C090371 */ jal func_80240DC4_C3E9B4 /* C3ED24 80241134 02A0302D */ daddu $a2, $s5, $zero -/* C3ED28 80241138 08090452 */ j .L80241148 +/* C3ED28 80241138 08090452 */ j L80241148_C3ED38 /* C3ED2C 8024113C 00000000 */ nop glabel L80241140_C3ED30 /* C3ED30 80241140 0C0129CF */ jal func_8004A73C /* C3ED34 80241144 0240202D */ daddu $a0, $s2, $zero -.L80241148: glabel L80241148_C3ED38 /* C3ED38 80241148 8FBF0048 */ lw $ra, 0x48($sp) /* C3ED3C 8024114C 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s index a673981fa5..518221d11f 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s @@ -98,7 +98,7 @@ glabel func_80241170_C3ED60 .L802412D0: /* C3EEC0 802412D0 8E430070 */ lw $v1, 0x70($s2) /* C3EEC4 802412D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* C3EEC8 802412D8 10400048 */ beqz $v0, .L802413FC +/* C3EEC8 802412D8 10400048 */ beqz $v0, L802413FC_C3EFEC /* C3EECC 802412DC 00031080 */ sll $v0, $v1, 2 /* C3EED0 802412E0 3C018024 */ lui $at, %hi(jtbl_80242030_C3FC20) /* C3EED4 802412E4 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80241304_C3EEF4 /* C3EEF8 80241308 0260282D */ daddu $a1, $s3, $zero /* C3EEFC 8024130C 0C0125AE */ jal func_800496B8 /* C3EF00 80241310 0280302D */ daddu $a2, $s4, $zero -/* C3EF04 80241314 080904FF */ j .L802413FC +/* C3EF04 80241314 080904FF */ j L802413FC_C3EFEC /* C3EF08 80241318 00000000 */ nop glabel L8024131C_C3EF0C /* C3EF0C 8024131C 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L8024132C_C3EF1C /* C3EF20 80241330 0260282D */ daddu $a1, $s3, $zero /* C3EF24 80241334 0C012701 */ jal func_80049C04 /* C3EF28 80241338 0280302D */ daddu $a2, $s4, $zero -/* C3EF2C 8024133C 080904FF */ j .L802413FC +/* C3EF2C 8024133C 080904FF */ j L802413FC_C3EFEC /* C3EF30 80241340 00000000 */ nop glabel L80241344_C3EF34 /* C3EF34 80241344 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80241354_C3EF44 /* C3EF48 80241358 0260282D */ daddu $a1, $s3, $zero /* C3EF4C 8024135C 0C0127B3 */ jal func_80049ECC /* C3EF50 80241360 0280302D */ daddu $a2, $s4, $zero -/* C3EF54 80241364 080904FF */ j .L802413FC +/* C3EF54 80241364 080904FF */ j L802413FC_C3EFEC /* C3EF58 80241368 00000000 */ nop glabel L8024136C_C3EF5C /* C3EF5C 8024136C 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L8024137C_C3EF6C /* C3EF70 80241380 0260282D */ daddu $a1, $s3, $zero /* C3EF74 80241384 0C012849 */ jal func_8004A124 /* C3EF78 80241388 0280302D */ daddu $a2, $s4, $zero -/* C3EF7C 8024138C 080904FF */ j .L802413FC +/* C3EF7C 8024138C 080904FF */ j L802413FC_C3EFEC /* C3EF80 80241390 00000000 */ nop glabel L80241394_C3EF84 /* C3EF84 80241394 0240202D */ daddu $a0, $s2, $zero /* C3EF88 80241398 0260282D */ daddu $a1, $s3, $zero /* C3EF8C 8024139C 0C0128FA */ jal func_8004A3E8 /* C3EF90 802413A0 0280302D */ daddu $a2, $s4, $zero -/* C3EF94 802413A4 080904FF */ j .L802413FC +/* C3EF94 802413A4 080904FF */ j L802413FC_C3EFEC /* C3EF98 802413A8 00000000 */ nop glabel L802413AC_C3EF9C /* C3EF9C 802413AC 0C090000 */ jal dgb_07_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L802413B4_C3EFA4 /* C3EFA8 802413B8 0240202D */ daddu $a0, $s2, $zero /* C3EFAC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C3EFB0 802413C0 24020020 */ addiu $v0, $zero, 0x20 -/* C3EFB4 802413C4 1462000D */ bne $v1, $v0, .L802413FC +/* C3EFB4 802413C4 1462000D */ bne $v1, $v0, L802413FC_C3EFEC /* C3EFB8 802413C8 00000000 */ nop glabel L802413CC_C3EFBC /* C3EFBC 802413CC 0C090037 */ jal dgb_07_UnkNpcAIFunc8 /* C3EFC0 802413D0 0240202D */ daddu $a0, $s2, $zero /* C3EFC4 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 -/* C3EFCC 802413DC 14620007 */ bne $v1, $v0, .L802413FC +/* C3EFCC 802413DC 14620007 */ bne $v1, $v0, L802413FC_C3EFEC /* C3EFD0 802413E0 00000000 */ nop glabel L802413E4_C3EFD4 /* C3EFD4 802413E4 0C09006D */ jal dgb_07_UnkNpcAIFunc5 /* C3EFD8 802413E8 0240202D */ daddu $a0, $s2, $zero -/* C3EFDC 802413EC 080904FF */ j .L802413FC +/* C3EFDC 802413EC 080904FF */ j L802413FC_C3EFEC /* C3EFE0 802413F0 00000000 */ nop glabel L802413F4_C3EFE4 /* C3EFE4 802413F4 0C0129CF */ jal func_8004A73C /* C3EFE8 802413F8 0240202D */ daddu $a0, $s2, $zero -.L802413FC: glabel L802413FC_C3EFEC /* C3EFEC 802413FC 8FBF0048 */ lw $ra, 0x48($sp) /* C3EFF0 80241400 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s index 43a4a1dd83..83129d0670 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s @@ -122,7 +122,7 @@ glabel func_80240B94_C40944 .L80240D54: /* C40B04 80240D54 8E830070 */ lw $v1, 0x70($s4) /* C40B08 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* C40B0C 80240D5C 10400042 */ beqz $v0, .L80240E68 +/* C40B0C 80240D5C 10400042 */ beqz $v0, L80240E68_C40C18 /* C40B10 80240D60 00031080 */ sll $v0, $v1, 2 /* C40B14 80240D64 3C018024 */ lui $at, %hi(jtbl_80246A10_C467C0) /* C40B18 80240D68 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240D88_C40B38 /* C40B3C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* C40B40 80240D90 0C090056 */ jal func_80240158_C3FF08 /* C40B44 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* C40B48 80240D98 0809039A */ j .L80240E68 +/* C40B48 80240D98 0809039A */ j L80240E68_C40C18 /* C40B4C 80240D9C 00000000 */ nop glabel L80240DA0_C40B50 /* C40B50 80240DA0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80240DB0_C40B60 /* C40B64 80240DB4 0260282D */ daddu $a1, $s3, $zero /* C40B68 80240DB8 0C090130 */ jal func_802404C0_C40270 /* C40B6C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* C40B70 80240DC0 0809039A */ j .L80240E68 +/* C40B70 80240DC0 0809039A */ j L80240E68_C40C18 /* C40B74 80240DC4 00000000 */ nop glabel L80240DC8_C40B78 /* C40B78 80240DC8 0280202D */ daddu $a0, $s4, $zero /* C40B7C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* C40B80 80240DD0 0C09019F */ jal func_8024067C_C4042C /* C40B84 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* C40B88 80240DD8 0809039A */ j .L80240E68 +/* C40B88 80240DD8 0809039A */ j L80240E68_C40C18 /* C40B8C 80240DDC 00000000 */ nop glabel L80240DE0_C40B90 /* C40B90 80240DE0 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80240DF0_C40BA0 /* C40BA4 80240DF4 0260282D */ daddu $a1, $s3, $zero /* C40BA8 80240DF8 0C0901E9 */ jal dgb_08_NpcJumpFunc /* C40BAC 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* C40BB0 80240E00 0809039A */ j .L80240E68 +/* C40BB0 80240E00 0809039A */ j L80240E68_C40C18 /* C40BB4 80240E04 00000000 */ nop glabel L80240E08_C40BB8 /* C40BB8 80240E08 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80240E18_C40BC8 /* C40BCC 80240E1C 0260282D */ daddu $a1, $s3, $zero /* C40BD0 80240E20 0C090253 */ jal func_8024094C_C406FC /* C40BD4 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* C40BD8 80240E28 0809039A */ j .L80240E68 +/* C40BD8 80240E28 0809039A */ j L80240E68_C40C18 /* C40BDC 80240E2C 00000000 */ nop glabel L80240E30_C40BE0 /* C40BE0 80240E30 0280202D */ daddu $a0, $s4, $zero /* C40BE4 80240E34 0260282D */ daddu $a1, $s3, $zero /* C40BE8 80240E38 0C09029B */ jal dgb_08_UnkNpcDurationFlagFunc /* C40BEC 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* C40BF0 80240E40 0809039A */ j .L80240E68 +/* C40BF0 80240E40 0809039A */ j L80240E68_C40C18 /* C40BF4 80240E44 00000000 */ nop glabel L80240E48_C40BF8 /* C40BF8 80240E48 0280202D */ daddu $a0, $s4, $zero /* C40BFC 80240E4C 0260282D */ daddu $a1, $s3, $zero /* C40C00 80240E50 0C0902B5 */ jal func_80240AD4_C40884 /* C40C04 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* C40C08 80240E58 0809039A */ j .L80240E68 +/* C40C08 80240E58 0809039A */ j L80240E68_C40C18 /* C40C0C 80240E5C 00000000 */ nop glabel L80240E60_C40C10 /* C40C10 80240E60 0C0129CF */ jal func_8004A73C /* C40C14 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: glabel L80240E68_C40C18 /* C40C18 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* C40C1C 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s index 3d0475e840..d002f9db89 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s @@ -98,7 +98,7 @@ glabel func_802414AC_C4125C .L8024160C: /* C413BC 8024160C 8E430070 */ lw $v1, 0x70($s2) /* C413C0 80241610 2C620064 */ sltiu $v0, $v1, 0x64 -/* C413C4 80241614 10400048 */ beqz $v0, .L80241738 +/* C413C4 80241614 10400048 */ beqz $v0, L80241738_C414E8 /* C413C8 80241618 00031080 */ sll $v0, $v1, 2 /* C413CC 8024161C 3C018024 */ lui $at, %hi(jtbl_80246BA8_C46958) /* C413D0 80241620 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80241640_C413F0 /* C413F4 80241644 0260282D */ daddu $a1, $s3, $zero /* C413F8 80241648 0C0125AE */ jal func_800496B8 /* C413FC 8024164C 0280302D */ daddu $a2, $s4, $zero -/* C41400 80241650 080905CE */ j .L80241738 +/* C41400 80241650 080905CE */ j L80241738_C414E8 /* C41404 80241654 00000000 */ nop glabel L80241658_C41408 /* C41408 80241658 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80241668_C41418 /* C4141C 8024166C 0260282D */ daddu $a1, $s3, $zero /* C41420 80241670 0C012701 */ jal func_80049C04 /* C41424 80241674 0280302D */ daddu $a2, $s4, $zero -/* C41428 80241678 080905CE */ j .L80241738 +/* C41428 80241678 080905CE */ j L80241738_C414E8 /* C4142C 8024167C 00000000 */ nop glabel L80241680_C41430 /* C41430 80241680 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80241690_C41440 /* C41444 80241694 0260282D */ daddu $a1, $s3, $zero /* C41448 80241698 0C0127B3 */ jal func_80049ECC /* C4144C 8024169C 0280302D */ daddu $a2, $s4, $zero -/* C41450 802416A0 080905CE */ j .L80241738 +/* C41450 802416A0 080905CE */ j L80241738_C414E8 /* C41454 802416A4 00000000 */ nop glabel L802416A8_C41458 /* C41458 802416A8 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L802416B8_C41468 /* C4146C 802416BC 0260282D */ daddu $a1, $s3, $zero /* C41470 802416C0 0C012849 */ jal func_8004A124 /* C41474 802416C4 0280302D */ daddu $a2, $s4, $zero -/* C41478 802416C8 080905CE */ j .L80241738 +/* C41478 802416C8 080905CE */ j L80241738_C414E8 /* C4147C 802416CC 00000000 */ nop glabel L802416D0_C41480 /* C41480 802416D0 0240202D */ daddu $a0, $s2, $zero /* C41484 802416D4 0260282D */ daddu $a1, $s3, $zero /* C41488 802416D8 0C0128FA */ jal func_8004A3E8 /* C4148C 802416DC 0280302D */ daddu $a2, $s4, $zero -/* C41490 802416E0 080905CE */ j .L80241738 +/* C41490 802416E0 080905CE */ j L80241738_C414E8 /* C41494 802416E4 00000000 */ nop glabel L802416E8_C41498 /* C41498 802416E8 0C0903A4 */ jal dgb_08_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L802416F0_C414A0 /* C414A4 802416F4 0240202D */ daddu $a0, $s2, $zero /* C414A8 802416F8 8E430070 */ lw $v1, 0x70($s2) /* C414AC 802416FC 24020020 */ addiu $v0, $zero, 0x20 -/* C414B0 80241700 1462000D */ bne $v1, $v0, .L80241738 +/* C414B0 80241700 1462000D */ bne $v1, $v0, L80241738_C414E8 /* C414B4 80241704 00000000 */ nop glabel L80241708_C414B8 /* C414B8 80241708 0C0903DB */ jal dgb_08_UnkNpcAIFunc8 /* C414BC 8024170C 0240202D */ daddu $a0, $s2, $zero /* C414C0 80241710 8E430070 */ lw $v1, 0x70($s2) /* C414C4 80241714 24020021 */ addiu $v0, $zero, 0x21 -/* C414C8 80241718 14620007 */ bne $v1, $v0, .L80241738 +/* C414C8 80241718 14620007 */ bne $v1, $v0, L80241738_C414E8 /* C414CC 8024171C 00000000 */ nop glabel L80241720_C414D0 /* C414D0 80241720 0C090411 */ jal dgb_08_UnkNpcAIFunc5 /* C414D4 80241724 0240202D */ daddu $a0, $s2, $zero -/* C414D8 80241728 080905CE */ j .L80241738 +/* C414D8 80241728 080905CE */ j L80241738_C414E8 /* C414DC 8024172C 00000000 */ nop glabel L80241730_C414E0 /* C414E0 80241730 0C0129CF */ jal func_8004A73C /* C414E4 80241734 0240202D */ daddu $a0, $s2, $zero -.L80241738: glabel L80241738_C414E8 /* C414E8 80241738 8FBF0048 */ lw $ra, 0x48($sp) /* C414EC 8024173C 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s index 61b5c8b49a..ee8ee2d687 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s @@ -64,7 +64,7 @@ glabel func_80242A6C_C4281C .L80242B54: /* C42904 80242B54 8E830070 */ lw $v1, 0x70($s4) /* C42908 80242B58 2C62000F */ sltiu $v0, $v1, 0xf -/* C4290C 80242B5C 10400034 */ beqz $v0, .L80242C30 +/* C4290C 80242B5C 10400034 */ beqz $v0, L80242C30_C429E0 /* C42910 80242B60 00031080 */ sll $v0, $v1, 2 /* C42914 80242B64 3C018024 */ lui $at, %hi(jtbl_80246D50_C46B00) /* C42918 80242B68 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80242C20_C429D0 /* C429D4 80242C24 0200282D */ daddu $a1, $s0, $zero /* C429D8 80242C28 0C09096E */ jal func_802425B8_C42368 /* C429DC 80242C2C 0260302D */ daddu $a2, $s3, $zero -.L80242C30: glabel L80242C30_C429E0 /* C429E0 80242C30 0000102D */ daddu $v0, $zero, $zero .L80242C34: diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s index c9d83a00ea..9c1c4aed28 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s @@ -52,7 +52,7 @@ glabel func_802438F0_C436A0 .L802439AC: /* C4375C 802439AC 8E830070 */ lw $v1, 0x70($s4) /* C43760 802439B0 2C620020 */ sltiu $v0, $v1, 0x20 -/* C43764 802439B4 10400060 */ beqz $v0, .L80243B38 +/* C43764 802439B4 10400060 */ beqz $v0, L80243B38_C438E8 /* C43768 802439B8 00031080 */ sll $v0, $v1, 2 /* C4376C 802439BC 3C018024 */ lui $at, %hi(jtbl_80246DA0_C46B50) /* C43770 802439C0 00220821 */ addu $at, $at, $v0 @@ -92,9 +92,9 @@ glabel L80243A28_C437D8 .L80243A38: /* C437E8 80243A38 8E830070 */ lw $v1, 0x70($s4) /* C437EC 80243A3C 2402000C */ addiu $v0, $zero, 0xc -/* C437F0 80243A40 1462003D */ bne $v1, $v0, .L80243B38 +/* C437F0 80243A40 1462003D */ bne $v1, $v0, L80243B38_C438E8 /* C437F4 80243A44 24020006 */ addiu $v0, $zero, 6 -/* C437F8 80243A48 08090ECE */ j .L80243B38 +/* C437F8 80243A48 08090ECE */ j L80243B38_C438E8 /* C437FC 80243A4C A6A2008E */ sh $v0, 0x8e($s5) glabel L80243A50_C43800 /* C43800 80243A50 0280202D */ daddu $a0, $s4, $zero @@ -103,14 +103,14 @@ glabel L80243A50_C43800 /* C4380C 80243A5C 0260302D */ daddu $a2, $s3, $zero /* C43810 80243A60 8E830070 */ lw $v1, 0x70($s4) /* C43814 80243A64 2402000D */ addiu $v0, $zero, 0xd -/* C43818 80243A68 14620033 */ bne $v1, $v0, .L80243B38 +/* C43818 80243A68 14620033 */ bne $v1, $v0, L80243B38_C438E8 /* C4381C 80243A6C 00000000 */ nop glabel L80243A70_C43820 /* C43820 80243A70 0280202D */ daddu $a0, $s4, $zero /* C43824 80243A74 0220282D */ daddu $a1, $s1, $zero /* C43828 80243A78 0C090B6C */ jal func_80242DB0_C42B60 /* C4382C 80243A7C 0260302D */ daddu $a2, $s3, $zero -/* C43830 80243A80 08090ECE */ j .L80243B38 +/* C43830 80243A80 08090ECE */ j L80243B38_C438E8 /* C43834 80243A84 00000000 */ nop glabel L80243A88_C43838 /* C43838 80243A88 0280202D */ daddu $a0, $s4, $zero @@ -119,14 +119,14 @@ glabel L80243A88_C43838 /* C43844 80243A94 0260302D */ daddu $a2, $s3, $zero /* C43848 80243A98 8E830070 */ lw $v1, 0x70($s4) /* C4384C 80243A9C 2402000F */ addiu $v0, $zero, 0xf -/* C43850 80243AA0 14620025 */ bne $v1, $v0, .L80243B38 +/* C43850 80243AA0 14620025 */ bne $v1, $v0, L80243B38_C438E8 /* C43854 80243AA4 00000000 */ nop glabel L80243AA8_C43858 /* C43858 80243AA8 0280202D */ daddu $a0, $s4, $zero /* C4385C 80243AAC 0220282D */ daddu $a1, $s1, $zero /* C43860 80243AB0 0C090BE5 */ jal func_80242F94_C42D44 /* C43864 80243AB4 0260302D */ daddu $a2, $s3, $zero -/* C43868 80243AB8 08090ECE */ j .L80243B38 +/* C43868 80243AB8 08090ECE */ j L80243B38_C438E8 /* C4386C 80243ABC 00000000 */ nop glabel L80243AC0_C43870 /* C43870 80243AC0 0280202D */ daddu $a0, $s4, $zero @@ -138,21 +138,21 @@ glabel L80243AD0_C43880 /* C43884 80243AD4 0220282D */ daddu $a1, $s1, $zero /* C43888 80243AD8 0C090CBA */ jal func_802432E8_C43098 /* C4388C 80243ADC 0260302D */ daddu $a2, $s3, $zero -/* C43890 80243AE0 08090ECE */ j .L80243B38 +/* C43890 80243AE0 08090ECE */ j L80243B38_C438E8 /* C43894 80243AE4 00000000 */ nop glabel L80243AE8_C43898 /* C43898 80243AE8 0280202D */ daddu $a0, $s4, $zero /* C4389C 80243AEC 0220282D */ daddu $a1, $s1, $zero /* C438A0 80243AF0 0C090D1A */ jal func_80243468_C43218 /* C438A4 80243AF4 0260302D */ daddu $a2, $s3, $zero -/* C438A8 80243AF8 08090ECE */ j .L80243B38 +/* C438A8 80243AF8 08090ECE */ j L80243B38_C438E8 /* C438AC 80243AFC 00000000 */ nop glabel L80243B00_C438B0 /* C438B0 80243B00 0280202D */ daddu $a0, $s4, $zero /* C438B4 80243B04 0220282D */ daddu $a1, $s1, $zero /* C438B8 80243B08 0C090D2C */ jal func_802434B0_C43260 /* C438BC 80243B0C 0260302D */ daddu $a2, $s3, $zero -/* C438C0 80243B10 08090ECE */ j .L80243B38 +/* C438C0 80243B10 08090ECE */ j L80243B38_C438E8 /* C438C4 80243B14 00000000 */ nop glabel L80243B18_C438C8 /* C438C8 80243B18 0280202D */ daddu $a0, $s4, $zero @@ -164,7 +164,6 @@ glabel L80243B28_C438D8 /* C438DC 80243B2C 0220282D */ daddu $a1, $s1, $zero /* C438E0 80243B30 0C090D76 */ jal func_802435D8_C43388 /* C438E4 80243B34 0260302D */ daddu $a2, $s3, $zero -.L80243B38: glabel L80243B38_C438E8 /* C438E8 80243B38 8E820070 */ lw $v0, 0x70($s4) /* C438EC 80243B3C 8FBF0058 */ lw $ra, 0x58($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s index e21792c0eb..5f6bbf8848 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s @@ -98,7 +98,7 @@ glabel func_8024061C_C471FC .L8024077C: /* C4735C 8024077C 8E430070 */ lw $v1, 0x70($s2) /* C47360 80240780 2C620064 */ sltiu $v0, $v1, 0x64 -/* C47364 80240784 10400048 */ beqz $v0, .L802408A8 +/* C47364 80240784 10400048 */ beqz $v0, L802408A8_C47488 /* C47368 80240788 00031080 */ sll $v0, $v1, 2 /* C4736C 8024078C 3C018024 */ lui $at, %hi(jtbl_80245398_C4BF78) /* C47370 80240790 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L802407B0_C47390 /* C47394 802407B4 0260282D */ daddu $a1, $s3, $zero /* C47398 802407B8 0C0125AE */ jal func_800496B8 /* C4739C 802407BC 0280302D */ daddu $a2, $s4, $zero -/* C473A0 802407C0 0809022A */ j .L802408A8 +/* C473A0 802407C0 0809022A */ j L802408A8_C47488 /* C473A4 802407C4 00000000 */ nop glabel L802407C8_C473A8 /* C473A8 802407C8 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L802407D8_C473B8 /* C473BC 802407DC 0260282D */ daddu $a1, $s3, $zero /* C473C0 802407E0 0C012701 */ jal func_80049C04 /* C473C4 802407E4 0280302D */ daddu $a2, $s4, $zero -/* C473C8 802407E8 0809022A */ j .L802408A8 +/* C473C8 802407E8 0809022A */ j L802408A8_C47488 /* C473CC 802407EC 00000000 */ nop glabel L802407F0_C473D0 /* C473D0 802407F0 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240800_C473E0 /* C473E4 80240804 0260282D */ daddu $a1, $s3, $zero /* C473E8 80240808 0C0127B3 */ jal func_80049ECC /* C473EC 8024080C 0280302D */ daddu $a2, $s4, $zero -/* C473F0 80240810 0809022A */ j .L802408A8 +/* C473F0 80240810 0809022A */ j L802408A8_C47488 /* C473F4 80240814 00000000 */ nop glabel L80240818_C473F8 /* C473F8 80240818 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240828_C47408 /* C4740C 8024082C 0260282D */ daddu $a1, $s3, $zero /* C47410 80240830 0C012849 */ jal func_8004A124 /* C47414 80240834 0280302D */ daddu $a2, $s4, $zero -/* C47418 80240838 0809022A */ j .L802408A8 +/* C47418 80240838 0809022A */ j L802408A8_C47488 /* C4741C 8024083C 00000000 */ nop glabel L80240840_C47420 /* C47420 80240840 0240202D */ daddu $a0, $s2, $zero /* C47424 80240844 0260282D */ daddu $a1, $s3, $zero /* C47428 80240848 0C0128FA */ jal func_8004A3E8 /* C4742C 8024084C 0280302D */ daddu $a2, $s4, $zero -/* C47430 80240850 0809022A */ j .L802408A8 +/* C47430 80240850 0809022A */ j L802408A8_C47488 /* C47434 80240854 00000000 */ nop glabel L80240858_C47438 /* C47438 80240858 0C090000 */ jal dgb_09_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240860_C47440 /* C47444 80240864 0240202D */ daddu $a0, $s2, $zero /* C47448 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4744C 8024086C 24020020 */ addiu $v0, $zero, 0x20 -/* C47450 80240870 1462000D */ bne $v1, $v0, .L802408A8 +/* C47450 80240870 1462000D */ bne $v1, $v0, L802408A8_C47488 /* C47454 80240874 00000000 */ nop glabel L80240878_C47458 /* C47458 80240878 0C090037 */ jal dgb_09_UnkNpcAIFunc8 /* C4745C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C47460 80240880 8E430070 */ lw $v1, 0x70($s2) /* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 -/* C47468 80240888 14620007 */ bne $v1, $v0, .L802408A8 +/* C47468 80240888 14620007 */ bne $v1, $v0, L802408A8_C47488 /* C4746C 8024088C 00000000 */ nop glabel L80240890_C47470 /* C47470 80240890 0C09006D */ jal dgb_09_UnkNpcAIFunc5 /* C47474 80240894 0240202D */ daddu $a0, $s2, $zero -/* C47478 80240898 0809022A */ j .L802408A8 +/* C47478 80240898 0809022A */ j L802408A8_C47488 /* C4747C 8024089C 00000000 */ nop glabel L802408A0_C47480 /* C47480 802408A0 0C0129CF */ jal func_8004A73C /* C47484 802408A4 0240202D */ daddu $a0, $s2, $zero -.L802408A8: glabel L802408A8_C47488 /* C47488 802408A8 8FBF0048 */ lw $ra, 0x48($sp) /* C4748C 802408AC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s index 8d223647d5..58b529a924 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s @@ -106,7 +106,7 @@ glabel func_802410D4_C47CB4 .L80241254: /* C47E34 80241254 8E430070 */ lw $v1, 0x70($s2) /* C47E38 80241258 2C620064 */ sltiu $v0, $v1, 0x64 -/* C47E3C 8024125C 10400067 */ beqz $v0, .L802413FC +/* C47E3C 8024125C 10400067 */ beqz $v0, L802413FC_C47FDC /* C47E40 80241260 00031080 */ sll $v0, $v1, 2 /* C47E44 80241264 3C018024 */ lui $at, %hi(jtbl_80245530_C4C110) /* C47E48 80241268 00220821 */ addu $at, $at, $v0 @@ -118,35 +118,35 @@ glabel L80241278_C47E58 /* C47E5C 8024127C 0260282D */ daddu $a1, $s3, $zero /* C47E60 80241280 0C090234 */ jal func_802408D0_C474B0 /* C47E64 80241284 02A0302D */ daddu $a2, $s5, $zero -/* C47E68 80241288 080904FF */ j .L802413FC +/* C47E68 80241288 080904FF */ j L802413FC_C47FDC /* C47E6C 8024128C 00000000 */ nop glabel L80241290_C47E70 /* C47E70 80241290 0240202D */ daddu $a0, $s2, $zero /* C47E74 80241294 0260282D */ daddu $a1, $s3, $zero /* C47E78 80241298 0C090256 */ jal func_80240958_C47538 /* C47E7C 8024129C 02A0302D */ daddu $a2, $s5, $zero -/* C47E80 802412A0 080904FF */ j .L802413FC +/* C47E80 802412A0 080904FF */ j L802413FC_C47FDC /* C47E84 802412A4 00000000 */ nop glabel L802412A8_C47E88 /* C47E88 802412A8 0240202D */ daddu $a0, $s2, $zero /* C47E8C 802412AC 0260282D */ daddu $a1, $s3, $zero /* C47E90 802412B0 0C090304 */ jal func_80240C10_C477F0 /* C47E94 802412B4 02A0302D */ daddu $a2, $s5, $zero -/* C47E98 802412B8 080904FF */ j .L802413FC +/* C47E98 802412B8 080904FF */ j L802413FC_C47FDC /* C47E9C 802412BC 00000000 */ nop glabel L802412C0_C47EA0 /* C47EA0 802412C0 0240202D */ daddu $a0, $s2, $zero /* C47EA4 802412C4 0260282D */ daddu $a1, $s3, $zero /* C47EA8 802412C8 0C09031D */ jal func_80240C74_C47854 /* C47EAC 802412CC 02A0302D */ daddu $a2, $s5, $zero -/* C47EB0 802412D0 080904FF */ j .L802413FC +/* C47EB0 802412D0 080904FF */ j L802413FC_C47FDC /* C47EB4 802412D4 00000000 */ nop glabel L802412D8_C47EB8 /* C47EB8 802412D8 0240202D */ daddu $a0, $s2, $zero /* C47EBC 802412DC 0260282D */ daddu $a1, $s3, $zero /* C47EC0 802412E0 0C090347 */ jal func_80240D1C_C478FC /* C47EC4 802412E4 02A0302D */ daddu $a2, $s5, $zero -/* C47EC8 802412E8 080904FF */ j .L802413FC +/* C47EC8 802412E8 080904FF */ j L802413FC_C47FDC /* C47ECC 802412EC 00000000 */ nop glabel L802412F0_C47ED0 /* C47ED0 802412F0 0240202D */ daddu $a0, $s2, $zero @@ -155,14 +155,14 @@ glabel L802412F0_C47ED0 /* C47EDC 802412FC 02A0302D */ daddu $a2, $s5, $zero /* C47EE0 80241300 8E430070 */ lw $v1, 0x70($s2) /* C47EE4 80241304 2402000D */ addiu $v0, $zero, 0xd -/* C47EE8 80241308 1462003C */ bne $v1, $v0, .L802413FC +/* C47EE8 80241308 1462003C */ bne $v1, $v0, L802413FC_C47FDC /* C47EEC 8024130C 00000000 */ nop glabel L80241310_C47EF0 /* C47EF0 80241310 0240202D */ daddu $a0, $s2, $zero /* C47EF4 80241314 0260282D */ daddu $a1, $s3, $zero /* C47EF8 80241318 0C012849 */ jal func_8004A124 /* C47EFC 8024131C 02A0302D */ daddu $a2, $s5, $zero -/* C47F00 80241320 080904FF */ j .L802413FC +/* C47F00 80241320 080904FF */ j L802413FC_C47FDC /* C47F04 80241324 00000000 */ nop glabel L80241328_C47F08 /* C47F08 80241328 0240202D */ daddu $a0, $s2, $zero @@ -174,31 +174,31 @@ glabel L80241328_C47F08 /* C47F20 80241340 24020028 */ addiu $v0, $zero, 0x28 /* C47F24 80241344 AE220088 */ sw $v0, 0x88($s1) /* C47F28 80241348 24020003 */ addiu $v0, $zero, 3 -/* C47F2C 8024134C 080904FF */ j .L802413FC +/* C47F2C 8024134C 080904FF */ j L802413FC_C47FDC /* C47F30 80241350 AE420070 */ sw $v0, 0x70($s2) glabel L80241354_C47F34 /* C47F34 80241354 0C090000 */ jal dgb_09_UnkNpcAIFunc6 /* C47F38 80241358 0240202D */ daddu $a0, $s2, $zero /* C47F3C 8024135C 8E430070 */ lw $v1, 0x70($s2) /* C47F40 80241360 2402001F */ addiu $v0, $zero, 0x1f -/* C47F44 80241364 14620025 */ bne $v1, $v0, .L802413FC +/* C47F44 80241364 14620025 */ bne $v1, $v0, L802413FC_C47FDC /* C47F48 80241368 00000000 */ nop glabel L8024136C_C47F4C /* C47F4C 8024136C 0C09001B */ jal dgb_09_UnkNpcAIFunc7 /* C47F50 80241370 0240202D */ daddu $a0, $s2, $zero /* C47F54 80241374 8E430070 */ lw $v1, 0x70($s2) /* C47F58 80241378 24020020 */ addiu $v0, $zero, 0x20 -/* C47F5C 8024137C 1462001F */ bne $v1, $v0, .L802413FC +/* C47F5C 8024137C 1462001F */ bne $v1, $v0, L802413FC_C47FDC /* C47F60 80241380 00000000 */ nop glabel L80241384_C47F64 /* C47F64 80241384 0C090037 */ jal dgb_09_UnkNpcAIFunc8 /* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero -/* C47F6C 8024138C 080904FF */ j .L802413FC +/* C47F6C 8024138C 080904FF */ j L802413FC_C47FDC /* C47F70 80241390 00000000 */ nop glabel L80241394_C47F74 /* C47F74 80241394 0C09006D */ jal dgb_09_UnkNpcAIFunc5 /* C47F78 80241398 0240202D */ daddu $a0, $s2, $zero -/* C47F7C 8024139C 080904FF */ j .L802413FC +/* C47F7C 8024139C 080904FF */ j L802413FC_C47FDC /* C47F80 802413A0 00000000 */ nop glabel L802413A4_C47F84 /* C47F84 802413A4 0240202D */ daddu $a0, $s2, $zero @@ -207,26 +207,25 @@ glabel L802413A4_C47F84 /* C47F90 802413B0 02A0302D */ daddu $a2, $s5, $zero /* C47F94 802413B4 8E430070 */ lw $v1, 0x70($s2) /* C47F98 802413B8 24020029 */ addiu $v0, $zero, 0x29 -/* C47F9C 802413BC 1462000F */ bne $v1, $v0, .L802413FC +/* C47F9C 802413BC 1462000F */ bne $v1, $v0, L802413FC_C47FDC /* C47FA0 802413C0 00000000 */ nop glabel L802413C4_C47FA4 /* C47FA4 802413C4 0240202D */ daddu $a0, $s2, $zero /* C47FA8 802413C8 0260282D */ daddu $a1, $s3, $zero /* C47FAC 802413CC 0C0903C0 */ jal func_80240F00_C47AE0 /* C47FB0 802413D0 02A0302D */ daddu $a2, $s5, $zero -/* C47FB4 802413D4 080904FF */ j .L802413FC +/* C47FB4 802413D4 080904FF */ j L802413FC_C47FDC /* C47FB8 802413D8 00000000 */ nop glabel L802413DC_C47FBC /* C47FBC 802413DC 0240202D */ daddu $a0, $s2, $zero /* C47FC0 802413E0 0260282D */ daddu $a1, $s3, $zero /* C47FC4 802413E4 0C09041E */ jal func_80241078_C47C58 /* C47FC8 802413E8 02A0302D */ daddu $a2, $s5, $zero -/* C47FCC 802413EC 080904FF */ j .L802413FC +/* C47FCC 802413EC 080904FF */ j L802413FC_C47FDC /* C47FD0 802413F0 00000000 */ nop glabel L802413F4_C47FD4 /* C47FD4 802413F4 0C0129CF */ jal func_8004A73C /* C47FD8 802413F8 0240202D */ daddu $a0, $s2, $zero -.L802413FC: glabel L802413FC_C47FDC /* C47FDC 802413FC 8FBF0048 */ lw $ra, 0x48($sp) /* C47FE0 80241400 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s index 544746ac99..f47ac7fe3c 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s @@ -64,7 +64,7 @@ glabel func_80242730_C49310 .L80242818: /* C493F8 80242818 8E830070 */ lw $v1, 0x70($s4) /* C493FC 8024281C 2C62000F */ sltiu $v0, $v1, 0xf -/* C49400 80242820 10400034 */ beqz $v0, .L802428F4 +/* C49400 80242820 10400034 */ beqz $v0, L802428F4_C494D4 /* C49404 80242824 00031080 */ sll $v0, $v1, 2 /* C49408 80242828 3C018024 */ lui $at, %hi(jtbl_802456D8_C4C2B8) /* C4940C 8024282C 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L802428E4_C494C4 /* C494C8 802428E8 0200282D */ daddu $a1, $s0, $zero /* C494CC 802428EC 0C09089F */ jal func_8024227C_C48E5C /* C494D0 802428F0 0260302D */ daddu $a2, $s3, $zero -.L802428F4: glabel L802428F4_C494D4 /* C494D4 802428F4 0000102D */ daddu $v0, $zero, $zero .L802428F8: diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s index 695e7c1271..10ebbd1056 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s @@ -52,7 +52,7 @@ glabel func_80243578_C4A158 .L80243634: /* C4A214 80243634 8E830070 */ lw $v1, 0x70($s4) /* C4A218 80243638 2C620020 */ sltiu $v0, $v1, 0x20 -/* C4A21C 8024363C 10400060 */ beqz $v0, .L802437C0 +/* C4A21C 8024363C 10400060 */ beqz $v0, L802437C0_C4A3A0 /* C4A220 80243640 00031080 */ sll $v0, $v1, 2 /* C4A224 80243644 3C018024 */ lui $at, %hi(jtbl_80245728_C4C308) /* C4A228 80243648 00220821 */ addu $at, $at, $v0 @@ -92,9 +92,9 @@ glabel L802436B0_C4A290 .L802436C0: /* C4A2A0 802436C0 8E830070 */ lw $v1, 0x70($s4) /* C4A2A4 802436C4 2402000C */ addiu $v0, $zero, 0xc -/* C4A2A8 802436C8 1462003D */ bne $v1, $v0, .L802437C0 +/* C4A2A8 802436C8 1462003D */ bne $v1, $v0, L802437C0_C4A3A0 /* C4A2AC 802436CC 24020006 */ addiu $v0, $zero, 6 -/* C4A2B0 802436D0 08090DF0 */ j .L802437C0 +/* C4A2B0 802436D0 08090DF0 */ j L802437C0_C4A3A0 /* C4A2B4 802436D4 A6A2008E */ sh $v0, 0x8e($s5) glabel L802436D8_C4A2B8 /* C4A2B8 802436D8 0280202D */ daddu $a0, $s4, $zero @@ -103,14 +103,14 @@ glabel L802436D8_C4A2B8 /* C4A2C4 802436E4 0260302D */ daddu $a2, $s3, $zero /* C4A2C8 802436E8 8E830070 */ lw $v1, 0x70($s4) /* C4A2CC 802436EC 2402000D */ addiu $v0, $zero, 0xd -/* C4A2D0 802436F0 14620033 */ bne $v1, $v0, .L802437C0 +/* C4A2D0 802436F0 14620033 */ bne $v1, $v0, L802437C0_C4A3A0 /* C4A2D4 802436F4 00000000 */ nop glabel L802436F8_C4A2D8 /* C4A2D8 802436F8 0280202D */ daddu $a0, $s4, $zero /* C4A2DC 802436FC 0220282D */ daddu $a1, $s1, $zero /* C4A2E0 80243700 0C090A9D */ jal func_80242A74_C49654 /* C4A2E4 80243704 0260302D */ daddu $a2, $s3, $zero -/* C4A2E8 80243708 08090DF0 */ j .L802437C0 +/* C4A2E8 80243708 08090DF0 */ j L802437C0_C4A3A0 /* C4A2EC 8024370C 00000000 */ nop glabel L80243710_C4A2F0 /* C4A2F0 80243710 0280202D */ daddu $a0, $s4, $zero @@ -119,14 +119,14 @@ glabel L80243710_C4A2F0 /* C4A2FC 8024371C 0260302D */ daddu $a2, $s3, $zero /* C4A300 80243720 8E830070 */ lw $v1, 0x70($s4) /* C4A304 80243724 2402000F */ addiu $v0, $zero, 0xf -/* C4A308 80243728 14620025 */ bne $v1, $v0, .L802437C0 +/* C4A308 80243728 14620025 */ bne $v1, $v0, L802437C0_C4A3A0 /* C4A30C 8024372C 00000000 */ nop glabel L80243730_C4A310 /* C4A310 80243730 0280202D */ daddu $a0, $s4, $zero /* C4A314 80243734 0220282D */ daddu $a1, $s1, $zero /* C4A318 80243738 0C090B07 */ jal func_80242C1C_C497FC /* C4A31C 8024373C 0260302D */ daddu $a2, $s3, $zero -/* C4A320 80243740 08090DF0 */ j .L802437C0 +/* C4A320 80243740 08090DF0 */ j L802437C0_C4A3A0 /* C4A324 80243744 00000000 */ nop glabel L80243748_C4A328 /* C4A328 80243748 0280202D */ daddu $a0, $s4, $zero @@ -138,21 +138,21 @@ glabel L80243758_C4A338 /* C4A33C 8024375C 0220282D */ daddu $a1, $s1, $zero /* C4A340 80243760 0C090BDC */ jal func_80242F70_C49B50 /* C4A344 80243764 0260302D */ daddu $a2, $s3, $zero -/* C4A348 80243768 08090DF0 */ j .L802437C0 +/* C4A348 80243768 08090DF0 */ j L802437C0_C4A3A0 /* C4A34C 8024376C 00000000 */ nop glabel L80243770_C4A350 /* C4A350 80243770 0280202D */ daddu $a0, $s4, $zero /* C4A354 80243774 0220282D */ daddu $a1, $s1, $zero /* C4A358 80243778 0C090C3C */ jal func_802430F0_C49CD0 /* C4A35C 8024377C 0260302D */ daddu $a2, $s3, $zero -/* C4A360 80243780 08090DF0 */ j .L802437C0 +/* C4A360 80243780 08090DF0 */ j L802437C0_C4A3A0 /* C4A364 80243784 00000000 */ nop glabel L80243788_C4A368 /* C4A368 80243788 0280202D */ daddu $a0, $s4, $zero /* C4A36C 8024378C 0220282D */ daddu $a1, $s1, $zero /* C4A370 80243790 0C090C4E */ jal func_80243138_C49D18 /* C4A374 80243794 0260302D */ daddu $a2, $s3, $zero -/* C4A378 80243798 08090DF0 */ j .L802437C0 +/* C4A378 80243798 08090DF0 */ j L802437C0_C4A3A0 /* C4A37C 8024379C 00000000 */ nop glabel L802437A0_C4A380 /* C4A380 802437A0 0280202D */ daddu $a0, $s4, $zero @@ -164,7 +164,6 @@ glabel L802437B0_C4A390 /* C4A394 802437B4 0220282D */ daddu $a1, $s1, $zero /* C4A398 802437B8 0C090C98 */ jal func_80243260_C49E40 /* C4A39C 802437BC 0260302D */ daddu $a2, $s3, $zero -.L802437C0: glabel L802437C0_C4A3A0 /* C4A3A0 802437C0 8E820070 */ lw $v0, 0x70($s4) /* C4A3A4 802437C4 8FBF0058 */ lw $ra, 0x58($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s index eaba705e42..fbd4668a65 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s @@ -98,7 +98,7 @@ glabel func_8024061C_C4FB2C .L8024077C: /* C4FC8C 8024077C 8E430070 */ lw $v1, 0x70($s2) /* C4FC90 80240780 2C620064 */ sltiu $v0, $v1, 0x64 -/* C4FC94 80240784 10400048 */ beqz $v0, .L802408A8 +/* C4FC94 80240784 10400048 */ beqz $v0, L802408A8_C4FDB8 /* C4FC98 80240788 00031080 */ sll $v0, $v1, 2 /* C4FC9C 8024078C 3C018024 */ lui $at, %hi(jtbl_80242CF8_C52208) /* C4FCA0 80240790 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L802407B0_C4FCC0 /* C4FCC4 802407B4 0260282D */ daddu $a1, $s3, $zero /* C4FCC8 802407B8 0C0125AE */ jal func_800496B8 /* C4FCCC 802407BC 0280302D */ daddu $a2, $s4, $zero -/* C4FCD0 802407C0 0809022A */ j .L802408A8 +/* C4FCD0 802407C0 0809022A */ j L802408A8_C4FDB8 /* C4FCD4 802407C4 00000000 */ nop glabel L802407C8_C4FCD8 /* C4FCD8 802407C8 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L802407D8_C4FCE8 /* C4FCEC 802407DC 0260282D */ daddu $a1, $s3, $zero /* C4FCF0 802407E0 0C012701 */ jal func_80049C04 /* C4FCF4 802407E4 0280302D */ daddu $a2, $s4, $zero -/* C4FCF8 802407E8 0809022A */ j .L802408A8 +/* C4FCF8 802407E8 0809022A */ j L802408A8_C4FDB8 /* C4FCFC 802407EC 00000000 */ nop glabel L802407F0_C4FD00 /* C4FD00 802407F0 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240800_C4FD10 /* C4FD14 80240804 0260282D */ daddu $a1, $s3, $zero /* C4FD18 80240808 0C0127B3 */ jal func_80049ECC /* C4FD1C 8024080C 0280302D */ daddu $a2, $s4, $zero -/* C4FD20 80240810 0809022A */ j .L802408A8 +/* C4FD20 80240810 0809022A */ j L802408A8_C4FDB8 /* C4FD24 80240814 00000000 */ nop glabel L80240818_C4FD28 /* C4FD28 80240818 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240828_C4FD38 /* C4FD3C 8024082C 0260282D */ daddu $a1, $s3, $zero /* C4FD40 80240830 0C012849 */ jal func_8004A124 /* C4FD44 80240834 0280302D */ daddu $a2, $s4, $zero -/* C4FD48 80240838 0809022A */ j .L802408A8 +/* C4FD48 80240838 0809022A */ j L802408A8_C4FDB8 /* C4FD4C 8024083C 00000000 */ nop glabel L80240840_C4FD50 /* C4FD50 80240840 0240202D */ daddu $a0, $s2, $zero /* C4FD54 80240844 0260282D */ daddu $a1, $s3, $zero /* C4FD58 80240848 0C0128FA */ jal func_8004A3E8 /* C4FD5C 8024084C 0280302D */ daddu $a2, $s4, $zero -/* C4FD60 80240850 0809022A */ j .L802408A8 +/* C4FD60 80240850 0809022A */ j L802408A8_C4FDB8 /* C4FD64 80240854 00000000 */ nop glabel L80240858_C4FD68 /* C4FD68 80240858 0C090000 */ jal dgb_15_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240860_C4FD70 /* C4FD74 80240864 0240202D */ daddu $a0, $s2, $zero /* C4FD78 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4FD7C 8024086C 24020020 */ addiu $v0, $zero, 0x20 -/* C4FD80 80240870 1462000D */ bne $v1, $v0, .L802408A8 +/* C4FD80 80240870 1462000D */ bne $v1, $v0, L802408A8_C4FDB8 /* C4FD84 80240874 00000000 */ nop glabel L80240878_C4FD88 /* C4FD88 80240878 0C090037 */ jal dgb_15_UnkNpcAIFunc8 /* C4FD8C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C4FD90 80240880 8E430070 */ lw $v1, 0x70($s2) /* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 -/* C4FD98 80240888 14620007 */ bne $v1, $v0, .L802408A8 +/* C4FD98 80240888 14620007 */ bne $v1, $v0, L802408A8_C4FDB8 /* C4FD9C 8024088C 00000000 */ nop glabel L80240890_C4FDA0 /* C4FDA0 80240890 0C09006D */ jal dgb_15_UnkNpcAIFunc5 /* C4FDA4 80240894 0240202D */ daddu $a0, $s2, $zero -/* C4FDA8 80240898 0809022A */ j .L802408A8 +/* C4FDA8 80240898 0809022A */ j L802408A8_C4FDB8 /* C4FDAC 8024089C 00000000 */ nop glabel L802408A0_C4FDB0 /* C4FDB0 802408A0 0C0129CF */ jal func_8004A73C /* C4FDB4 802408A4 0240202D */ daddu $a0, $s2, $zero -.L802408A8: glabel L802408A8_C4FDB8 /* C4FDB8 802408A8 8FBF0048 */ lw $ra, 0x48($sp) /* C4FDBC 802408AC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s index 48c40b2eb7..83e4531905 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s @@ -122,7 +122,7 @@ glabel func_80241464_C50974 .L80241624: /* C50B34 80241624 8E830070 */ lw $v1, 0x70($s4) /* C50B38 80241628 2C620064 */ sltiu $v0, $v1, 0x64 -/* C50B3C 8024162C 10400042 */ beqz $v0, .L80241738 +/* C50B3C 8024162C 10400042 */ beqz $v0, L80241738_C50C48 /* C50B40 80241630 00031080 */ sll $v0, $v1, 2 /* C50B44 80241634 3C018024 */ lui $at, %hi(jtbl_80242E98_C523A8) /* C50B48 80241638 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80241658_C50B68 /* C50B6C 8024165C 0260282D */ daddu $a1, $s3, $zero /* C50B70 80241660 0C09028A */ jal func_80240A28_C4FF38 /* C50B74 80241664 02A0302D */ daddu $a2, $s5, $zero -/* C50B78 80241668 080905CE */ j .L80241738 +/* C50B78 80241668 080905CE */ j L80241738_C50C48 /* C50B7C 8024166C 00000000 */ nop glabel L80241670_C50B80 /* C50B80 80241670 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80241680_C50B90 /* C50B94 80241684 0260282D */ daddu $a1, $s3, $zero /* C50B98 80241688 0C090364 */ jal func_80240D90_C502A0 /* C50B9C 8024168C 02A0302D */ daddu $a2, $s5, $zero -/* C50BA0 80241690 080905CE */ j .L80241738 +/* C50BA0 80241690 080905CE */ j L80241738_C50C48 /* C50BA4 80241694 00000000 */ nop glabel L80241698_C50BA8 /* C50BA8 80241698 0280202D */ daddu $a0, $s4, $zero /* C50BAC 8024169C 0260282D */ daddu $a1, $s3, $zero /* C50BB0 802416A0 0C0903D3 */ jal func_80240F4C_C5045C /* C50BB4 802416A4 02A0302D */ daddu $a2, $s5, $zero -/* C50BB8 802416A8 080905CE */ j .L80241738 +/* C50BB8 802416A8 080905CE */ j L80241738_C50C48 /* C50BBC 802416AC 00000000 */ nop glabel L802416B0_C50BC0 /* C50BC0 802416B0 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L802416C0_C50BD0 /* C50BD4 802416C4 0260282D */ daddu $a1, $s3, $zero /* C50BD8 802416C8 0C09041D */ jal dgb_15_NpcJumpFunc /* C50BDC 802416CC 02A0302D */ daddu $a2, $s5, $zero -/* C50BE0 802416D0 080905CE */ j .L80241738 +/* C50BE0 802416D0 080905CE */ j L80241738_C50C48 /* C50BE4 802416D4 00000000 */ nop glabel L802416D8_C50BE8 /* C50BE8 802416D8 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L802416E8_C50BF8 /* C50BFC 802416EC 0260282D */ daddu $a1, $s3, $zero /* C50C00 802416F0 0C090487 */ jal func_8024121C_C5072C /* C50C04 802416F4 02A0302D */ daddu $a2, $s5, $zero -/* C50C08 802416F8 080905CE */ j .L80241738 +/* C50C08 802416F8 080905CE */ j L80241738_C50C48 /* C50C0C 802416FC 00000000 */ nop glabel L80241700_C50C10 /* C50C10 80241700 0280202D */ daddu $a0, $s4, $zero /* C50C14 80241704 0260282D */ daddu $a1, $s3, $zero /* C50C18 80241708 0C0904CF */ jal dgb_15_UnkNpcDurationFlagFunc /* C50C1C 8024170C 02A0302D */ daddu $a2, $s5, $zero -/* C50C20 80241710 080905CE */ j .L80241738 +/* C50C20 80241710 080905CE */ j L80241738_C50C48 /* C50C24 80241714 00000000 */ nop glabel L80241718_C50C28 /* C50C28 80241718 0280202D */ daddu $a0, $s4, $zero /* C50C2C 8024171C 0260282D */ daddu $a1, $s3, $zero /* C50C30 80241720 0C0904E9 */ jal func_802413A4_C508B4 /* C50C34 80241724 02A0302D */ daddu $a2, $s5, $zero -/* C50C38 80241728 080905CE */ j .L80241738 +/* C50C38 80241728 080905CE */ j L80241738_C50C48 /* C50C3C 8024172C 00000000 */ nop glabel L80241730_C50C40 /* C50C40 80241730 0C0129CF */ jal func_8004A73C /* C50C44 80241734 0280202D */ daddu $a0, $s4, $zero -.L80241738: glabel L80241738_C50C48 /* C50C48 80241738 8FBF0060 */ lw $ra, 0x60($sp) /* C50C4C 8024173C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s index a77598ba59..5563bc24c7 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s @@ -106,7 +106,7 @@ glabel func_80240E20_C53360 .L80240FA0: /* C534E0 80240FA0 8E430070 */ lw $v1, 0x70($s2) /* C534E4 80240FA4 2C620064 */ sltiu $v0, $v1, 0x64 -/* C534E8 80240FA8 10400067 */ beqz $v0, .L80241148 +/* C534E8 80240FA8 10400067 */ beqz $v0, L80241148_C53688 /* C534EC 80240FAC 00031080 */ sll $v0, $v1, 2 /* C534F0 80240FB0 3C018024 */ lui $at, %hi(jtbl_80243200_C55740) /* C534F4 80240FB4 00220821 */ addu $at, $at, $v0 @@ -118,35 +118,35 @@ glabel L80240FC4_C53504 /* C53508 80240FC8 0260282D */ daddu $a1, $s3, $zero /* C5350C 80240FCC 0C090187 */ jal func_8024061C_C52B5C /* C53510 80240FD0 02A0302D */ daddu $a2, $s5, $zero -/* C53514 80240FD4 08090452 */ j .L80241148 +/* C53514 80240FD4 08090452 */ j L80241148_C53688 /* C53518 80240FD8 00000000 */ nop glabel L80240FDC_C5351C /* C5351C 80240FDC 0240202D */ daddu $a0, $s2, $zero /* C53520 80240FE0 0260282D */ daddu $a1, $s3, $zero /* C53524 80240FE4 0C0901A9 */ jal func_802406A4_C52BE4 /* C53528 80240FE8 02A0302D */ daddu $a2, $s5, $zero -/* C5352C 80240FEC 08090452 */ j .L80241148 +/* C5352C 80240FEC 08090452 */ j L80241148_C53688 /* C53530 80240FF0 00000000 */ nop glabel L80240FF4_C53534 /* C53534 80240FF4 0240202D */ daddu $a0, $s2, $zero /* C53538 80240FF8 0260282D */ daddu $a1, $s3, $zero /* C5353C 80240FFC 0C090257 */ jal func_8024095C_C52E9C /* C53540 80241000 02A0302D */ daddu $a2, $s5, $zero -/* C53544 80241004 08090452 */ j .L80241148 +/* C53544 80241004 08090452 */ j L80241148_C53688 /* C53548 80241008 00000000 */ nop glabel L8024100C_C5354C /* C5354C 8024100C 0240202D */ daddu $a0, $s2, $zero /* C53550 80241010 0260282D */ daddu $a1, $s3, $zero /* C53554 80241014 0C090270 */ jal func_802409C0_C52F00 /* C53558 80241018 02A0302D */ daddu $a2, $s5, $zero -/* C5355C 8024101C 08090452 */ j .L80241148 +/* C5355C 8024101C 08090452 */ j L80241148_C53688 /* C53560 80241020 00000000 */ nop glabel L80241024_C53564 /* C53564 80241024 0240202D */ daddu $a0, $s2, $zero /* C53568 80241028 0260282D */ daddu $a1, $s3, $zero /* C5356C 8024102C 0C09029A */ jal func_80240A68_C52FA8 /* C53570 80241030 02A0302D */ daddu $a2, $s5, $zero -/* C53574 80241034 08090452 */ j .L80241148 +/* C53574 80241034 08090452 */ j L80241148_C53688 /* C53578 80241038 00000000 */ nop glabel L8024103C_C5357C /* C5357C 8024103C 0240202D */ daddu $a0, $s2, $zero @@ -155,14 +155,14 @@ glabel L8024103C_C5357C /* C53588 80241048 02A0302D */ daddu $a2, $s5, $zero /* C5358C 8024104C 8E430070 */ lw $v1, 0x70($s2) /* C53590 80241050 2402000D */ addiu $v0, $zero, 0xd -/* C53594 80241054 1462003C */ bne $v1, $v0, .L80241148 +/* C53594 80241054 1462003C */ bne $v1, $v0, L80241148_C53688 /* C53598 80241058 00000000 */ nop glabel L8024105C_C5359C /* C5359C 8024105C 0240202D */ daddu $a0, $s2, $zero /* C535A0 80241060 0260282D */ daddu $a1, $s3, $zero /* C535A4 80241064 0C012849 */ jal func_8004A124 /* C535A8 80241068 02A0302D */ daddu $a2, $s5, $zero -/* C535AC 8024106C 08090452 */ j .L80241148 +/* C535AC 8024106C 08090452 */ j L80241148_C53688 /* C535B0 80241070 00000000 */ nop glabel L80241074_C535B4 /* C535B4 80241074 0240202D */ daddu $a0, $s2, $zero @@ -174,31 +174,31 @@ glabel L80241074_C535B4 /* C535CC 8024108C 24020028 */ addiu $v0, $zero, 0x28 /* C535D0 80241090 AE220088 */ sw $v0, 0x88($s1) /* C535D4 80241094 24020003 */ addiu $v0, $zero, 3 -/* C535D8 80241098 08090452 */ j .L80241148 +/* C535D8 80241098 08090452 */ j L80241148_C53688 /* C535DC 8024109C AE420070 */ sw $v0, 0x70($s2) glabel L802410A0_C535E0 /* C535E0 802410A0 0C090000 */ jal dgb_16_UnkNpcAIFunc6 /* C535E4 802410A4 0240202D */ daddu $a0, $s2, $zero /* C535E8 802410A8 8E430070 */ lw $v1, 0x70($s2) /* C535EC 802410AC 2402001F */ addiu $v0, $zero, 0x1f -/* C535F0 802410B0 14620025 */ bne $v1, $v0, .L80241148 +/* C535F0 802410B0 14620025 */ bne $v1, $v0, L80241148_C53688 /* C535F4 802410B4 00000000 */ nop glabel L802410B8_C535F8 /* C535F8 802410B8 0C09001B */ jal dgb_16_UnkNpcAIFunc7 /* C535FC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C53600 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C53604 802410C4 24020020 */ addiu $v0, $zero, 0x20 -/* C53608 802410C8 1462001F */ bne $v1, $v0, .L80241148 +/* C53608 802410C8 1462001F */ bne $v1, $v0, L80241148_C53688 /* C5360C 802410CC 00000000 */ nop glabel L802410D0_C53610 /* C53610 802410D0 0C090037 */ jal dgb_16_UnkNpcAIFunc8 /* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero -/* C53618 802410D8 08090452 */ j .L80241148 +/* C53618 802410D8 08090452 */ j L80241148_C53688 /* C5361C 802410DC 00000000 */ nop glabel L802410E0_C53620 /* C53620 802410E0 0C09006D */ jal dgb_16_UnkNpcAIFunc5 /* C53624 802410E4 0240202D */ daddu $a0, $s2, $zero -/* C53628 802410E8 08090452 */ j .L80241148 +/* C53628 802410E8 08090452 */ j L80241148_C53688 /* C5362C 802410EC 00000000 */ nop glabel L802410F0_C53630 /* C53630 802410F0 0240202D */ daddu $a0, $s2, $zero @@ -207,26 +207,25 @@ glabel L802410F0_C53630 /* C5363C 802410FC 02A0302D */ daddu $a2, $s5, $zero /* C53640 80241100 8E430070 */ lw $v1, 0x70($s2) /* C53644 80241104 24020029 */ addiu $v0, $zero, 0x29 -/* C53648 80241108 1462000F */ bne $v1, $v0, .L80241148 +/* C53648 80241108 1462000F */ bne $v1, $v0, L80241148_C53688 /* C5364C 8024110C 00000000 */ nop glabel L80241110_C53650 /* C53650 80241110 0240202D */ daddu $a0, $s2, $zero /* C53654 80241114 0260282D */ daddu $a1, $s3, $zero /* C53658 80241118 0C090313 */ jal func_80240C4C_C5318C /* C5365C 8024111C 02A0302D */ daddu $a2, $s5, $zero -/* C53660 80241120 08090452 */ j .L80241148 +/* C53660 80241120 08090452 */ j L80241148_C53688 /* C53664 80241124 00000000 */ nop glabel L80241128_C53668 /* C53668 80241128 0240202D */ daddu $a0, $s2, $zero /* C5366C 8024112C 0260282D */ daddu $a1, $s3, $zero /* C53670 80241130 0C090371 */ jal func_80240DC4_C53304 /* C53674 80241134 02A0302D */ daddu $a2, $s5, $zero -/* C53678 80241138 08090452 */ j .L80241148 +/* C53678 80241138 08090452 */ j L80241148_C53688 /* C5367C 8024113C 00000000 */ nop glabel L80241140_C53680 /* C53680 80241140 0C0129CF */ jal func_8004A73C /* C53684 80241144 0240202D */ daddu $a0, $s2, $zero -.L80241148: glabel L80241148_C53688 /* C53688 80241148 8FBF0048 */ lw $ra, 0x48($sp) /* C5368C 8024114C 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s index 74dc8a2d99..2427fe7409 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s @@ -98,7 +98,7 @@ glabel func_80241170_C536B0 .L802412D0: /* C53810 802412D0 8E430070 */ lw $v1, 0x70($s2) /* C53814 802412D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* C53818 802412D8 10400048 */ beqz $v0, .L802413FC +/* C53818 802412D8 10400048 */ beqz $v0, L802413FC_C5393C /* C5381C 802412DC 00031080 */ sll $v0, $v1, 2 /* C53820 802412E0 3C018024 */ lui $at, %hi(jtbl_80243390_C558D0) /* C53824 802412E4 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80241304_C53844 /* C53848 80241308 0260282D */ daddu $a1, $s3, $zero /* C5384C 8024130C 0C0125AE */ jal func_800496B8 /* C53850 80241310 0280302D */ daddu $a2, $s4, $zero -/* C53854 80241314 080904FF */ j .L802413FC +/* C53854 80241314 080904FF */ j L802413FC_C5393C /* C53858 80241318 00000000 */ nop glabel L8024131C_C5385C /* C5385C 8024131C 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L8024132C_C5386C /* C53870 80241330 0260282D */ daddu $a1, $s3, $zero /* C53874 80241334 0C012701 */ jal func_80049C04 /* C53878 80241338 0280302D */ daddu $a2, $s4, $zero -/* C5387C 8024133C 080904FF */ j .L802413FC +/* C5387C 8024133C 080904FF */ j L802413FC_C5393C /* C53880 80241340 00000000 */ nop glabel L80241344_C53884 /* C53884 80241344 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80241354_C53894 /* C53898 80241358 0260282D */ daddu $a1, $s3, $zero /* C5389C 8024135C 0C0127B3 */ jal func_80049ECC /* C538A0 80241360 0280302D */ daddu $a2, $s4, $zero -/* C538A4 80241364 080904FF */ j .L802413FC +/* C538A4 80241364 080904FF */ j L802413FC_C5393C /* C538A8 80241368 00000000 */ nop glabel L8024136C_C538AC /* C538AC 8024136C 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L8024137C_C538BC /* C538C0 80241380 0260282D */ daddu $a1, $s3, $zero /* C538C4 80241384 0C012849 */ jal func_8004A124 /* C538C8 80241388 0280302D */ daddu $a2, $s4, $zero -/* C538CC 8024138C 080904FF */ j .L802413FC +/* C538CC 8024138C 080904FF */ j L802413FC_C5393C /* C538D0 80241390 00000000 */ nop glabel L80241394_C538D4 /* C538D4 80241394 0240202D */ daddu $a0, $s2, $zero /* C538D8 80241398 0260282D */ daddu $a1, $s3, $zero /* C538DC 8024139C 0C0128FA */ jal func_8004A3E8 /* C538E0 802413A0 0280302D */ daddu $a2, $s4, $zero -/* C538E4 802413A4 080904FF */ j .L802413FC +/* C538E4 802413A4 080904FF */ j L802413FC_C5393C /* C538E8 802413A8 00000000 */ nop glabel L802413AC_C538EC /* C538EC 802413AC 0C090000 */ jal dgb_16_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L802413B4_C538F4 /* C538F8 802413B8 0240202D */ daddu $a0, $s2, $zero /* C538FC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C53900 802413C0 24020020 */ addiu $v0, $zero, 0x20 -/* C53904 802413C4 1462000D */ bne $v1, $v0, .L802413FC +/* C53904 802413C4 1462000D */ bne $v1, $v0, L802413FC_C5393C /* C53908 802413C8 00000000 */ nop glabel L802413CC_C5390C /* C5390C 802413CC 0C090037 */ jal dgb_16_UnkNpcAIFunc8 /* C53910 802413D0 0240202D */ daddu $a0, $s2, $zero /* C53914 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 -/* C5391C 802413DC 14620007 */ bne $v1, $v0, .L802413FC +/* C5391C 802413DC 14620007 */ bne $v1, $v0, L802413FC_C5393C /* C53920 802413E0 00000000 */ nop glabel L802413E4_C53924 /* C53924 802413E4 0C09006D */ jal dgb_16_UnkNpcAIFunc5 /* C53928 802413E8 0240202D */ daddu $a0, $s2, $zero -/* C5392C 802413EC 080904FF */ j .L802413FC +/* C5392C 802413EC 080904FF */ j L802413FC_C5393C /* C53930 802413F0 00000000 */ nop glabel L802413F4_C53934 /* C53934 802413F4 0C0129CF */ jal func_8004A73C /* C53938 802413F8 0240202D */ daddu $a0, $s2, $zero -.L802413FC: glabel L802413FC_C5393C /* C5393C 802413FC 8FBF0048 */ lw $ra, 0x48($sp) /* C53940 80241400 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s index 58264a3bb0..75a2b555bc 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s @@ -122,7 +122,7 @@ glabel func_80240B94_C56AD4 .L80240D54: /* C56C94 80240D54 8E830070 */ lw $v1, 0x70($s4) /* C56C98 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* C56C9C 80240D5C 10400042 */ beqz $v0, .L80240E68 +/* C56C9C 80240D5C 10400042 */ beqz $v0, L80240E68_C56DA8 /* C56CA0 80240D60 00031080 */ sll $v0, $v1, 2 /* C56CA4 80240D64 3C018024 */ lui $at, %hi(jtbl_802438F0_C59830) /* C56CA8 80240D68 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240D88_C56CC8 /* C56CCC 80240D8C 0260282D */ daddu $a1, $s3, $zero /* C56CD0 80240D90 0C090056 */ jal func_80240158_C56098 /* C56CD4 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* C56CD8 80240D98 0809039A */ j .L80240E68 +/* C56CD8 80240D98 0809039A */ j L80240E68_C56DA8 /* C56CDC 80240D9C 00000000 */ nop glabel L80240DA0_C56CE0 /* C56CE0 80240DA0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80240DB0_C56CF0 /* C56CF4 80240DB4 0260282D */ daddu $a1, $s3, $zero /* C56CF8 80240DB8 0C090130 */ jal func_802404C0_C56400 /* C56CFC 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* C56D00 80240DC0 0809039A */ j .L80240E68 +/* C56D00 80240DC0 0809039A */ j L80240E68_C56DA8 /* C56D04 80240DC4 00000000 */ nop glabel L80240DC8_C56D08 /* C56D08 80240DC8 0280202D */ daddu $a0, $s4, $zero /* C56D0C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* C56D10 80240DD0 0C09019F */ jal func_8024067C_C565BC /* C56D14 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* C56D18 80240DD8 0809039A */ j .L80240E68 +/* C56D18 80240DD8 0809039A */ j L80240E68_C56DA8 /* C56D1C 80240DDC 00000000 */ nop glabel L80240DE0_C56D20 /* C56D20 80240DE0 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80240DF0_C56D30 /* C56D34 80240DF4 0260282D */ daddu $a1, $s3, $zero /* C56D38 80240DF8 0C0901E9 */ jal dgb_18_NpcJumpFunc /* C56D3C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* C56D40 80240E00 0809039A */ j .L80240E68 +/* C56D40 80240E00 0809039A */ j L80240E68_C56DA8 /* C56D44 80240E04 00000000 */ nop glabel L80240E08_C56D48 /* C56D48 80240E08 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80240E18_C56D58 /* C56D5C 80240E1C 0260282D */ daddu $a1, $s3, $zero /* C56D60 80240E20 0C090253 */ jal func_8024094C_C5688C /* C56D64 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* C56D68 80240E28 0809039A */ j .L80240E68 +/* C56D68 80240E28 0809039A */ j L80240E68_C56DA8 /* C56D6C 80240E2C 00000000 */ nop glabel L80240E30_C56D70 /* C56D70 80240E30 0280202D */ daddu $a0, $s4, $zero /* C56D74 80240E34 0260282D */ daddu $a1, $s3, $zero /* C56D78 80240E38 0C09029B */ jal dgb_18_UnkNpcDurationFlagFunc /* C56D7C 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* C56D80 80240E40 0809039A */ j .L80240E68 +/* C56D80 80240E40 0809039A */ j L80240E68_C56DA8 /* C56D84 80240E44 00000000 */ nop glabel L80240E48_C56D88 /* C56D88 80240E48 0280202D */ daddu $a0, $s4, $zero /* C56D8C 80240E4C 0260282D */ daddu $a1, $s3, $zero /* C56D90 80240E50 0C0902B5 */ jal func_80240AD4_C56A14 /* C56D94 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* C56D98 80240E58 0809039A */ j .L80240E68 +/* C56D98 80240E58 0809039A */ j L80240E68_C56DA8 /* C56D9C 80240E5C 00000000 */ nop glabel L80240E60_C56DA0 /* C56DA0 80240E60 0C0129CF */ jal func_8004A73C /* C56DA4 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: glabel L80240E68_C56DA8 /* C56DA8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* C56DAC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s index b83e24def9..ae4fce1569 100644 --- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s +++ b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s @@ -122,7 +122,7 @@ glabel func_80241174_95C374 .L80241334: /* 95C534 80241334 8E830070 */ lw $v1, 0x70($s4) /* 95C538 80241338 2C620064 */ sltiu $v0, $v1, 0x64 -/* 95C53C 8024133C 10400042 */ beqz $v0, .L80241448 +/* 95C53C 8024133C 10400042 */ beqz $v0, L80241448_95C648 /* 95C540 80241340 00031080 */ sll $v0, $v1, 2 /* 95C544 80241344 3C018025 */ lui $at, %hi(jtbl_8024DDF0_968FF0) /* 95C548 80241348 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80241368_95C568 /* 95C56C 8024136C 0260282D */ daddu $a1, $s3, $zero /* 95C570 80241370 0C0901CE */ jal func_80240738_95B938 /* 95C574 80241374 02A0302D */ daddu $a2, $s5, $zero -/* 95C578 80241378 08090512 */ j .L80241448 +/* 95C578 80241378 08090512 */ j L80241448_95C648 /* 95C57C 8024137C 00000000 */ nop glabel L80241380_95C580 /* 95C580 80241380 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80241390_95C590 /* 95C594 80241394 0260282D */ daddu $a1, $s3, $zero /* 95C598 80241398 0C0902A8 */ jal func_80240AA0_95BCA0 /* 95C59C 8024139C 02A0302D */ daddu $a2, $s5, $zero -/* 95C5A0 802413A0 08090512 */ j .L80241448 +/* 95C5A0 802413A0 08090512 */ j L80241448_95C648 /* 95C5A4 802413A4 00000000 */ nop glabel L802413A8_95C5A8 /* 95C5A8 802413A8 0280202D */ daddu $a0, $s4, $zero /* 95C5AC 802413AC 0260282D */ daddu $a1, $s3, $zero /* 95C5B0 802413B0 0C090317 */ jal func_80240C5C_95BE5C /* 95C5B4 802413B4 02A0302D */ daddu $a2, $s5, $zero -/* 95C5B8 802413B8 08090512 */ j .L80241448 +/* 95C5B8 802413B8 08090512 */ j L80241448_95C648 /* 95C5BC 802413BC 00000000 */ nop glabel L802413C0_95C5C0 /* 95C5C0 802413C0 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L802413D0_95C5D0 /* 95C5D4 802413D4 0260282D */ daddu $a1, $s3, $zero /* 95C5D8 802413D8 0C090361 */ jal dro_01_NpcJumpFunc /* 95C5DC 802413DC 02A0302D */ daddu $a2, $s5, $zero -/* 95C5E0 802413E0 08090512 */ j .L80241448 +/* 95C5E0 802413E0 08090512 */ j L80241448_95C648 /* 95C5E4 802413E4 00000000 */ nop glabel L802413E8_95C5E8 /* 95C5E8 802413E8 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L802413F8_95C5F8 /* 95C5FC 802413FC 0260282D */ daddu $a1, $s3, $zero /* 95C600 80241400 0C0903CB */ jal func_80240F2C_95C12C /* 95C604 80241404 02A0302D */ daddu $a2, $s5, $zero -/* 95C608 80241408 08090512 */ j .L80241448 +/* 95C608 80241408 08090512 */ j L80241448_95C648 /* 95C60C 8024140C 00000000 */ nop glabel L80241410_95C610 /* 95C610 80241410 0280202D */ daddu $a0, $s4, $zero /* 95C614 80241414 0260282D */ daddu $a1, $s3, $zero /* 95C618 80241418 0C090413 */ jal dro_01_UnkNpcDurationFlagFunc /* 95C61C 8024141C 02A0302D */ daddu $a2, $s5, $zero -/* 95C620 80241420 08090512 */ j .L80241448 +/* 95C620 80241420 08090512 */ j L80241448_95C648 /* 95C624 80241424 00000000 */ nop glabel L80241428_95C628 /* 95C628 80241428 0280202D */ daddu $a0, $s4, $zero /* 95C62C 8024142C 0260282D */ daddu $a1, $s3, $zero /* 95C630 80241430 0C09042D */ jal func_802410B4_95C2B4 /* 95C634 80241434 02A0302D */ daddu $a2, $s5, $zero -/* 95C638 80241438 08090512 */ j .L80241448 +/* 95C638 80241438 08090512 */ j L80241448_95C648 /* 95C63C 8024143C 00000000 */ nop glabel L80241440_95C640 /* 95C640 80241440 0C0129CF */ jal func_8004A73C /* 95C644 80241444 0280202D */ daddu $a0, $s4, $zero -.L80241448: glabel L80241448_95C648 /* 95C648 80241448 8FBF0060 */ lw $ra, 0x60($sp) /* 95C64C 8024144C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s index 0a060032df..2c3d7d375c 100644 --- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s +++ b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s @@ -11,7 +11,7 @@ glabel func_802430C8_95E2C8 /* 95E2E0 802430E0 AFBF0018 */ sw $ra, 0x18($sp) /* 95E2E4 802430E4 F7B60028 */ sdc1 $f22, 0x28($sp) /* 95E2E8 802430E8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 95E2EC 802430EC 1040002A */ beqz $v0, .L80243198 +/* 95E2EC 802430EC 1040002A */ beqz $v0, L80243198_95E398 /* 95E2F0 802430F0 0080882D */ daddu $s1, $a0, $zero /* 95E2F4 802430F4 00051080 */ sll $v0, $a1, 2 /* 95E2F8 802430F8 3C018025 */ lui $at, %hi(jtbl_8024DF98_969198) @@ -22,7 +22,7 @@ glabel func_802430C8_95E2C8 glabel L8024310C_95E30C /* 95E30C 8024310C 8E22001C */ lw $v0, 0x1c($s1) /* 95E310 80243110 28420006 */ slti $v0, $v0, 6 -/* 95E314 80243114 14400020 */ bnez $v0, .L80243198 +/* 95E314 80243114 14400020 */ bnez $v0, L80243198_95E398 /* 95E318 80243118 00000000 */ nop /* 95E31C 8024311C 3C064318 */ lui $a2, 0x4318 /* 95E320 80243120 3C07C274 */ lui $a3, 0xc274 @@ -47,7 +47,7 @@ glabel L8024310C_95E30C /* 95E36C 8024316C 46000005 */ abs.s $f0, $f0 /* 95E370 80243170 4602003C */ c.lt.s $f0, $f2 /* 95E374 80243174 00000000 */ nop -/* 95E378 80243178 45000007 */ bc1f .L80243198 +/* 95E378 80243178 45000007 */ bc1f L80243198_95E398 /* 95E37C 8024317C 0000302D */ daddu $a2, $zero, $zero /* 95E380 80243180 3C048025 */ lui $a0, %hi(D_80248504_963704) /* 95E384 80243184 24848504 */ addiu $a0, $a0, %lo(D_80248504_963704) @@ -55,7 +55,6 @@ glabel L8024310C_95E30C /* 95E38C 8024318C 24050001 */ addiu $a1, $zero, 1 /* 95E390 80243190 24020004 */ addiu $v0, $zero, 4 /* 95E394 80243194 AE220020 */ sw $v0, 0x20($s1) -.L80243198: glabel L80243198_95E398 /* 95E398 80243198 8FBF0018 */ lw $ra, 0x18($sp) /* 95E39C 8024319C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s index e574c5a637..a419cbf37f 100644 --- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s +++ b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s @@ -14,7 +14,7 @@ glabel func_8024240C_96B5CC /* 96B5F0 80242430 34A5D489 */ ori $a1, $a1, 0xd489 /* 96B5F4 80242434 0040182D */ daddu $v1, $v0, $zero /* 96B5F8 80242438 2C62000E */ sltiu $v0, $v1, 0xe -/* 96B5FC 8024243C 10400295 */ beqz $v0, .L80242E94 +/* 96B5FC 8024243C 10400295 */ beqz $v0, L80242E94_96C054 /* 96B600 80242440 00031080 */ sll $v0, $v1, 2 /* 96B604 80242444 3C018025 */ lui $at, %hi(jtbl_8024EF20_9780E0) /* 96B608 80242448 00220821 */ addu $at, $at, $v0 @@ -73,7 +73,7 @@ glabel L80242458_96B618 /* 96B6D8 80242518 E4400028 */ swc1 $f0, 0x28($v0) /* 96B6DC 8024251C E4440030 */ swc1 $f4, 0x30($v0) /* 96B6E0 80242520 E4400050 */ swc1 $f0, 0x50($v0) -/* 96B6E4 80242524 08090BA5 */ j .L80242E94 +/* 96B6E4 80242524 08090BA5 */ j L80242E94_96C054 /* 96B6E8 80242528 E4460054 */ swc1 $f6, 0x54($v0) glabel L8024252C_96B6EC /* 96B6EC 8024252C 3C028025 */ lui $v0, %hi(D_8024F010) @@ -107,7 +107,7 @@ glabel L8024252C_96B6EC .L8024259C: /* 96B75C 8024259C 8E030000 */ lw $v1, ($s0) /* 96B760 802425A0 24020014 */ addiu $v0, $zero, 0x14 -/* 96B764 802425A4 1462023B */ bne $v1, $v0, .L80242E94 +/* 96B764 802425A4 1462023B */ bne $v1, $v0, L80242E94_96C054 /* 96B768 802425A8 00000000 */ nop /* 96B76C 802425AC 3C05F4AC */ lui $a1, 0xf4ac /* 96B770 802425B0 34A5D489 */ ori $a1, $a1, 0xd489 @@ -115,7 +115,7 @@ glabel L8024252C_96B6EC /* 96B778 802425B8 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) /* 96B77C 802425BC 0C0B2026 */ jal set_variable /* 96B780 802425C0 24060002 */ addiu $a2, $zero, 2 -/* 96B784 802425C4 08090BA5 */ j .L80242E94 +/* 96B784 802425C4 08090BA5 */ j L80242E94_96C054 /* 96B788 802425C8 AE000000 */ sw $zero, ($s0) glabel L802425CC_96B78C /* 96B78C 802425CC 3C028025 */ lui $v0, %hi(D_8024F010) @@ -126,7 +126,7 @@ glabel L802425CC_96B78C /* 96B7A0 802425E0 AC400048 */ sw $zero, 0x48($v0) /* 96B7A4 802425E4 AC400004 */ sw $zero, 4($v0) /* 96B7A8 802425E8 AC400008 */ sw $zero, 8($v0) -/* 96B7AC 802425EC 08090BA5 */ j .L80242E94 +/* 96B7AC 802425EC 08090BA5 */ j L80242E94_96C054 /* 96B7B0 802425F0 AC40000C */ sw $zero, 0xc($v0) glabel L802425F4_96B7B4 /* 96B7B4 802425F4 3C038025 */ lui $v1, %hi(D_8024F010) @@ -148,7 +148,7 @@ glabel L802425F4_96B7B4 /* 96B7F4 80242634 46040000 */ add.s $f0, $f0, $f4 /* 96B7F8 80242638 ACE40000 */ sw $a0, ($a3) /* 96B7FC 8024263C E4620004 */ swc1 $f2, 4($v1) -/* 96B800 80242640 14820214 */ bne $a0, $v0, .L80242E94 +/* 96B800 80242640 14820214 */ bne $a0, $v0, L80242E94_96C054 /* 96B804 80242644 E4600028 */ swc1 $f0, 0x28($v1) /* 96B808 80242648 3C05F4AC */ lui $a1, 0xf4ac /* 96B80C 8024264C 34A5D489 */ ori $a1, $a1, 0xd489 @@ -181,7 +181,7 @@ glabel L80242660_96B820 /* 96B874 802426B4 E4440030 */ swc1 $f4, 0x30($v0) /* 96B878 802426B8 E4460054 */ swc1 $f6, 0x54($v0) /* 96B87C 802426BC 24020014 */ addiu $v0, $zero, 0x14 -/* 96B880 802426C0 146201F4 */ bne $v1, $v0, .L80242E94 +/* 96B880 802426C0 146201F4 */ bne $v1, $v0, L80242E94_96C054 /* 96B884 802426C4 ACE30000 */ sw $v1, ($a3) /* 96B888 802426C8 3C05F4AC */ lui $a1, 0xf4ac /* 96B88C 802426CC 34A5D489 */ ori $a1, $a1, 0xd489 @@ -236,7 +236,7 @@ glabel L802426F4_96B8B4 .L8024278C: /* 96B94C 8024278C 8E030000 */ lw $v1, ($s0) /* 96B950 80242790 2402000A */ addiu $v0, $zero, 0xa -/* 96B954 80242794 146201BF */ bne $v1, $v0, .L80242E94 +/* 96B954 80242794 146201BF */ bne $v1, $v0, L80242E94_96C054 /* 96B958 80242798 24060006 */ addiu $a2, $zero, 6 /* 96B95C 8024279C 3C05F4AC */ lui $a1, 0xf4ac /* 96B960 802427A0 34A5D489 */ ori $a1, $a1, 0xd489 @@ -292,7 +292,7 @@ glabel L802427C4_96B984 .L80242864: /* 96BA24 80242864 8E030000 */ lw $v1, ($s0) /* 96BA28 80242868 2402000A */ addiu $v0, $zero, 0xa -/* 96BA2C 8024286C 14620189 */ bne $v1, $v0, .L80242E94 +/* 96BA2C 8024286C 14620189 */ bne $v1, $v0, L80242E94_96C054 /* 96BA30 80242870 24060007 */ addiu $a2, $zero, 7 /* 96BA34 80242874 3C05F4AC */ lui $a1, 0xf4ac /* 96BA38 80242878 34A5D489 */ ori $a1, $a1, 0xd489 @@ -306,7 +306,7 @@ glabel L802427C4_96B984 .L80242898: /* 96BA58 80242898 0C0526AE */ jal _play_sound /* 96BA5C 8024289C 00A0382D */ daddu $a3, $a1, $zero -/* 96BA60 802428A0 08090BA5 */ j .L80242E94 +/* 96BA60 802428A0 08090BA5 */ j L80242E94_96C054 /* 96BA64 802428A4 00000000 */ nop glabel L802428A8_96BA68 /* 96BA68 802428A8 3C028025 */ lui $v0, %hi(D_8024F010) @@ -352,7 +352,7 @@ glabel L802428A8_96BA68 .L80242948: /* 96BB08 80242948 8E030000 */ lw $v1, ($s0) /* 96BB0C 8024294C 2402000A */ addiu $v0, $zero, 0xa -/* 96BB10 80242950 14620150 */ bne $v1, $v0, .L80242E94 +/* 96BB10 80242950 14620150 */ bne $v1, $v0, L80242E94_96C054 /* 96BB14 80242954 24060008 */ addiu $a2, $zero, 8 /* 96BB18 80242958 3C05F4AC */ lui $a1, 0xf4ac /* 96BB1C 8024295C 34A5D489 */ ori $a1, $a1, 0xd489 @@ -360,7 +360,7 @@ glabel L802428A8_96BA68 /* 96BB24 80242964 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) /* 96BB28 80242968 0C0B2026 */ jal set_variable /* 96BB2C 8024296C AE000000 */ sw $zero, ($s0) -/* 96BB30 80242970 08090BA5 */ j .L80242E94 +/* 96BB30 80242970 08090BA5 */ j L80242E94_96C054 /* 96BB34 80242974 00000000 */ nop glabel L80242978_96BB38 /* 96BB38 80242978 3C028025 */ lui $v0, %hi(D_8024F010) @@ -378,7 +378,7 @@ glabel L80242978_96BB38 /* 96BB68 802429A8 ACE30000 */ sw $v1, ($a3) /* 96BB6C 802429AC E4400034 */ swc1 $f0, 0x34($v0) /* 96BB70 802429B0 2402000A */ addiu $v0, $zero, 0xa -/* 96BB74 802429B4 14620137 */ bne $v1, $v0, .L80242E94 +/* 96BB74 802429B4 14620137 */ bne $v1, $v0, L80242E94_96C054 /* 96BB78 802429B8 24060009 */ addiu $a2, $zero, 9 /* 96BB7C 802429BC 3C05F4AC */ lui $a1, 0xf4ac /* 96BB80 802429C0 3C048025 */ lui $a0, %hi(D_8024EFCC) @@ -409,7 +409,7 @@ glabel L802429D0_96BB90 /* 96BBE0 80242A20 E4420004 */ swc1 $f2, 4($v0) /* 96BBE4 80242A24 E4400028 */ swc1 $f0, 0x28($v0) /* 96BBE8 80242A28 2402000A */ addiu $v0, $zero, 0xa -/* 96BBEC 80242A2C 14620119 */ bne $v1, $v0, .L80242E94 +/* 96BBEC 80242A2C 14620119 */ bne $v1, $v0, L80242E94_96C054 /* 96BBF0 80242A30 0040302D */ daddu $a2, $v0, $zero /* 96BBF4 80242A34 3C05F4AC */ lui $a1, 0xf4ac /* 96BBF8 80242A38 34A5D489 */ ori $a1, $a1, 0xd489 @@ -418,7 +418,7 @@ glabel L802429D0_96BB90 .L80242A44: /* 96BC04 80242A44 0C0B2026 */ jal set_variable /* 96BC08 80242A48 ACE00000 */ sw $zero, ($a3) -/* 96BC0C 80242A4C 08090BA5 */ j .L80242E94 +/* 96BC0C 80242A4C 08090BA5 */ j L80242E94_96C054 /* 96BC10 80242A50 00000000 */ nop glabel L80242A54_96BC14 /* 96BC14 80242A54 3C038025 */ lui $v1, %hi(D_8024F010) @@ -430,7 +430,7 @@ glabel L80242A54_96BC14 /* 96BC2C 80242A6C 24020011 */ addiu $v0, $zero, 0x11 /* 96BC30 80242A70 AC600024 */ sw $zero, 0x24($v1) /* 96BC34 80242A74 AC600048 */ sw $zero, 0x48($v1) -/* 96BC38 80242A78 08090BA5 */ j .L80242E94 +/* 96BC38 80242A78 08090BA5 */ j L80242E94_96C054 /* 96BC3C 80242A7C AC62001C */ sw $v0, 0x1c($v1) glabel L80242A80_96BC40 /* 96BC40 80242A80 3C05F4AC */ lui $a1, 0xf4ac @@ -539,7 +539,7 @@ glabel L80242A80_96BC40 .L80242C14: /* 96BDD4 80242C14 26220010 */ addiu $v0, $s1, 0x10 /* 96BDD8 80242C18 0202102A */ slt $v0, $s0, $v0 -/* 96BDDC 80242C1C 1040009D */ beqz $v0, .L80242E94 +/* 96BDDC 80242C1C 1040009D */ beqz $v0, L80242E94_96C054 /* 96BDE0 80242C20 00000000 */ nop /* 96BDE4 80242C24 08090AD1 */ j .L80242B44 /* 96BDE8 80242C28 00000000 */ nop @@ -655,7 +655,7 @@ glabel L80242C2C_96BDEC /* 96BF8C 80242DCC 462010A0 */ cvt.s.d $f2, $f2 /* 96BF90 80242DD0 E4820000 */ swc1 $f2, ($a0) /* 96BF94 80242DD4 46200020 */ cvt.s.d $f0, $f0 -/* 96BF98 80242DD8 4500002E */ bc1f .L80242E94 +/* 96BF98 80242DD8 4500002E */ bc1f L80242E94_96C054 /* 96BF9C 80242DDC E4600000 */ swc1 $f0, ($v1) /* 96BFA0 80242DE0 3C05F4AC */ lui $a1, 0xf4ac /* 96BFA4 80242DE4 34A5D489 */ ori $a1, $a1, 0xd489 @@ -703,7 +703,6 @@ glabel L80242C2C_96BDEC /* 96C048 80242E88 28A20004 */ slti $v0, $a1, 4 /* 96C04C 80242E8C 1440FFF9 */ bnez $v0, .L80242E74 /* 96C050 80242E90 24840004 */ addiu $a0, $a0, 4 -.L80242E94: glabel L80242E94_96C054 /* 96C054 80242E94 8FBF0080 */ lw $ra, 0x80($sp) /* 96C058 80242E98 8FB1007C */ lw $s1, 0x7c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s b/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s index 1be9fd49f4..0a14b0667a 100644 --- a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s +++ b/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s @@ -177,7 +177,7 @@ glabel func_80241B34_DF8534 /* DF87B0 80241DB0 90560000 */ lbu $s6, ($v0) /* DF87B4 80241DB4 2684FF10 */ addiu $a0, $s4, -0xf0 /* DF87B8 80241DB8 2C830010 */ sltiu $v1, $a0, 0x10 -/* DF87BC 80241DBC 10600016 */ beqz $v1, .L80241E18 +/* DF87BC 80241DBC 10600016 */ beqz $v1, L80241E18_DF8818 /* DF87C0 80241DC0 00041080 */ sll $v0, $a0, 2 /* DF87C4 80241DC4 3C018025 */ lui $at, %hi(jtbl_8024E900_E05300) /* DF87C8 80241DC8 00220821 */ addu $at, $at, $v0 @@ -203,7 +203,6 @@ glabel L80241DF0_DF87F0 /* DF880C 80241E0C 26310001 */ addiu $s1, $s1, 1 /* DF8810 80241E10 0809083B */ j .L802420EC /* DF8814 80241E14 AE020004 */ sw $v0, 4($s0) -.L80241E18: glabel L80241E18_DF8818 /* DF8818 80241E18 328300FF */ andi $v1, $s4, 0xff /* DF881C 80241E1C 2C6200F0 */ sltiu $v0, $v1, 0xf0 diff --git a/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s b/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s index a764e6a074..359614764f 100644 --- a/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s +++ b/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s @@ -177,7 +177,7 @@ glabel func_80241B44_E06EA4 /* E07120 80241DC0 90560000 */ lbu $s6, ($v0) /* E07124 80241DC4 2684FF10 */ addiu $a0, $s4, -0xf0 /* E07128 80241DC8 2C830010 */ sltiu $v1, $a0, 0x10 -/* E0712C 80241DCC 10600016 */ beqz $v1, .L80241E28 +/* E0712C 80241DCC 10600016 */ beqz $v1, L80241E28_E07188 /* E07130 80241DD0 00041080 */ sll $v0, $a0, 2 /* E07134 80241DD4 3C018025 */ lui $at, %hi(jtbl_802493E0_E0E740) /* E07138 80241DD8 00220821 */ addu $at, $at, $v0 @@ -203,7 +203,6 @@ glabel L80241E00_E07160 /* E0717C 80241E1C 26310001 */ addiu $s1, $s1, 1 /* E07180 80241E20 0809083F */ j .L802420FC /* E07184 80241E24 AE020004 */ sw $v0, 4($s0) -.L80241E28: glabel L80241E28_E07188 /* E07188 80241E28 328300FF */ andi $v1, $s4, 0xff /* E0718C 80241E2C 2C6200F0 */ sltiu $v0, $v1, 0xf0 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s index 1f7ea8a493..766e68e15c 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s @@ -122,7 +122,7 @@ glabel func_80240BD4_C9EAF4 .L80240D94: /* C9ECB4 80240D94 8E830070 */ lw $v1, 0x70($s4) /* C9ECB8 80240D98 2C620064 */ sltiu $v0, $v1, 0x64 -/* C9ECBC 80240D9C 10400042 */ beqz $v0, .L80240EA8 +/* C9ECBC 80240D9C 10400042 */ beqz $v0, L80240EA8_C9EDC8 /* C9ECC0 80240DA0 00031080 */ sll $v0, $v1, 2 /* C9ECC4 80240DA4 3C018025 */ lui $at, %hi(jtbl_802491D0_CA70F0) /* C9ECC8 80240DA8 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240DC8_C9ECE8 /* C9ECEC 80240DCC 0260282D */ daddu $a1, $s3, $zero /* C9ECF0 80240DD0 0C090066 */ jal func_80240198_C9E0B8 /* C9ECF4 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* C9ECF8 80240DD8 080903AA */ j .L80240EA8 +/* C9ECF8 80240DD8 080903AA */ j L80240EA8_C9EDC8 /* C9ECFC 80240DDC 00000000 */ nop glabel L80240DE0_C9ED00 /* C9ED00 80240DE0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80240DF0_C9ED10 /* C9ED14 80240DF4 0260282D */ daddu $a1, $s3, $zero /* C9ED18 80240DF8 0C090140 */ jal func_80240500_C9E420 /* C9ED1C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* C9ED20 80240E00 080903AA */ j .L80240EA8 +/* C9ED20 80240E00 080903AA */ j L80240EA8_C9EDC8 /* C9ED24 80240E04 00000000 */ nop glabel L80240E08_C9ED28 /* C9ED28 80240E08 0280202D */ daddu $a0, $s4, $zero /* C9ED2C 80240E0C 0260282D */ daddu $a1, $s3, $zero /* C9ED30 80240E10 0C0901AF */ jal func_802406BC_C9E5DC /* C9ED34 80240E14 02A0302D */ daddu $a2, $s5, $zero -/* C9ED38 80240E18 080903AA */ j .L80240EA8 +/* C9ED38 80240E18 080903AA */ j L80240EA8_C9EDC8 /* C9ED3C 80240E1C 00000000 */ nop glabel L80240E20_C9ED40 /* C9ED40 80240E20 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80240E30_C9ED50 /* C9ED54 80240E34 0260282D */ daddu $a1, $s3, $zero /* C9ED58 80240E38 0C0901F9 */ jal flo_00_NpcJumpFunc /* C9ED5C 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* C9ED60 80240E40 080903AA */ j .L80240EA8 +/* C9ED60 80240E40 080903AA */ j L80240EA8_C9EDC8 /* C9ED64 80240E44 00000000 */ nop glabel L80240E48_C9ED68 /* C9ED68 80240E48 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80240E58_C9ED78 /* C9ED7C 80240E5C 0260282D */ daddu $a1, $s3, $zero /* C9ED80 80240E60 0C090263 */ jal func_8024098C_C9E8AC /* C9ED84 80240E64 02A0302D */ daddu $a2, $s5, $zero -/* C9ED88 80240E68 080903AA */ j .L80240EA8 +/* C9ED88 80240E68 080903AA */ j L80240EA8_C9EDC8 /* C9ED8C 80240E6C 00000000 */ nop glabel L80240E70_C9ED90 /* C9ED90 80240E70 0280202D */ daddu $a0, $s4, $zero /* C9ED94 80240E74 0260282D */ daddu $a1, $s3, $zero /* C9ED98 80240E78 0C0902AB */ jal flo_00_UnkNpcDurationFlagFunc /* C9ED9C 80240E7C 02A0302D */ daddu $a2, $s5, $zero -/* C9EDA0 80240E80 080903AA */ j .L80240EA8 +/* C9EDA0 80240E80 080903AA */ j L80240EA8_C9EDC8 /* C9EDA4 80240E84 00000000 */ nop glabel L80240E88_C9EDA8 /* C9EDA8 80240E88 0280202D */ daddu $a0, $s4, $zero /* C9EDAC 80240E8C 0260282D */ daddu $a1, $s3, $zero /* C9EDB0 80240E90 0C0902C5 */ jal func_80240B14_C9EA34 /* C9EDB4 80240E94 02A0302D */ daddu $a2, $s5, $zero -/* C9EDB8 80240E98 080903AA */ j .L80240EA8 +/* C9EDB8 80240E98 080903AA */ j L80240EA8_C9EDC8 /* C9EDBC 80240E9C 00000000 */ nop glabel L80240EA0_C9EDC0 /* C9EDC0 80240EA0 0C0129CF */ jal func_8004A73C /* C9EDC4 80240EA4 0280202D */ daddu $a0, $s4, $zero -.L80240EA8: glabel L80240EA8_C9EDC8 /* C9EDC8 80240EA8 8FBF0060 */ lw $ra, 0x60($sp) /* C9EDCC 80240EAC 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s index 8f7febb43e..ee1a8cf2cd 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s @@ -83,7 +83,7 @@ glabel func_8024150C_CB024C .L80241638: /* CB0378 80241638 8E830070 */ lw $v1, 0x70($s4) /* CB037C 8024163C 2C620064 */ sltiu $v0, $v1, 0x64 -/* CB0380 80241640 10400036 */ beqz $v0, .L8024171C +/* CB0380 80241640 10400036 */ beqz $v0, L8024171C_CB045C /* CB0384 80241644 00031080 */ sll $v0, $v1, 2 /* CB0388 80241648 3C018024 */ lui $at, %hi(jtbl_80246130_CB4E70) /* CB038C 8024164C 00220821 */ addu $at, $at, $v0 @@ -100,7 +100,7 @@ glabel L8024166C_CB03AC /* CB03B0 80241670 0240282D */ daddu $a1, $s2, $zero /* CB03B4 80241674 0C0125AE */ jal func_800496B8 /* CB03B8 80241678 0260302D */ daddu $a2, $s3, $zero -/* CB03BC 8024167C 080905C7 */ j .L8024171C +/* CB03BC 8024167C 080905C7 */ j L8024171C_CB045C /* CB03C0 80241680 00000000 */ nop glabel L80241684_CB03C4 /* CB03C4 80241684 0280202D */ daddu $a0, $s4, $zero @@ -112,7 +112,7 @@ glabel L80241694_CB03D4 /* CB03D8 80241698 0240282D */ daddu $a1, $s2, $zero /* CB03DC 8024169C 0C012701 */ jal func_80049C04 /* CB03E0 802416A0 0260302D */ daddu $a2, $s3, $zero -/* CB03E4 802416A4 080905C7 */ j .L8024171C +/* CB03E4 802416A4 080905C7 */ j L8024171C_CB045C /* CB03E8 802416A8 00000000 */ nop glabel L802416AC_CB03EC /* CB03EC 802416AC 0280202D */ daddu $a0, $s4, $zero @@ -124,7 +124,7 @@ glabel L802416BC_CB03FC /* CB0400 802416C0 0240282D */ daddu $a1, $s2, $zero /* CB0404 802416C4 0C0127B3 */ jal func_80049ECC /* CB0408 802416C8 0260302D */ daddu $a2, $s3, $zero -/* CB040C 802416CC 080905C7 */ j .L8024171C +/* CB040C 802416CC 080905C7 */ j L8024171C_CB045C /* CB0410 802416D0 00000000 */ nop glabel L802416D4_CB0414 /* CB0414 802416D4 0280202D */ daddu $a0, $s4, $zero @@ -136,19 +136,18 @@ glabel L802416E4_CB0424 /* CB0428 802416E8 0240282D */ daddu $a1, $s2, $zero /* CB042C 802416EC 0C0904D9 */ jal func_80241364_CB00A4 /* CB0430 802416F0 0260302D */ daddu $a2, $s3, $zero -/* CB0434 802416F4 080905C7 */ j .L8024171C +/* CB0434 802416F4 080905C7 */ j L8024171C_CB045C /* CB0438 802416F8 00000000 */ nop glabel L802416FC_CB043C /* CB043C 802416FC 0280202D */ daddu $a0, $s4, $zero /* CB0440 80241700 0240282D */ daddu $a1, $s2, $zero /* CB0444 80241704 0C090532 */ jal func_802414C8_CB0208 /* CB0448 80241708 0260302D */ daddu $a2, $s3, $zero -/* CB044C 8024170C 080905C7 */ j .L8024171C +/* CB044C 8024170C 080905C7 */ j L8024171C_CB045C /* CB0450 80241710 00000000 */ nop glabel L80241714_CB0454 /* CB0454 80241714 0C0129CF */ jal func_8004A73C /* CB0458 80241718 0280202D */ daddu $a0, $s4, $zero -.L8024171C: glabel L8024171C_CB045C /* CB045C 8024171C 8FBF0048 */ lw $ra, 0x48($sp) /* CB0460 80241720 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s index fb58a5bd7f..d4df7d8ad1 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s @@ -64,7 +64,7 @@ glabel func_8024162C_CB662C .L80241714: /* CB6714 80241714 8E830070 */ lw $v1, 0x70($s4) /* CB6718 80241718 2C62000F */ sltiu $v0, $v1, 0xf -/* CB671C 8024171C 10400034 */ beqz $v0, .L802417F0 +/* CB671C 8024171C 10400034 */ beqz $v0, L802417F0_CB67F0 /* CB6720 80241720 00031080 */ sll $v0, $v1, 2 /* CB6724 80241724 3C018024 */ lui $at, %hi(jtbl_802441B8_CB91B8) /* CB6728 80241728 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L802417E0_CB67E0 /* CB67E4 802417E4 0200282D */ daddu $a1, $s0, $zero /* CB67E8 802417E8 0C09045E */ jal func_80241178_CB6178 /* CB67EC 802417EC 0260302D */ daddu $a2, $s3, $zero -.L802417F0: glabel L802417F0_CB67F0 /* CB67F0 802417F0 0000102D */ daddu $v0, $zero, $zero .L802417F4: diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s index 24666d4af9..665bccb820 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s @@ -64,7 +64,7 @@ glabel func_802414D0_CC4CE0 .L802415B8: /* CC4DC8 802415B8 8E830070 */ lw $v1, 0x70($s4) /* CC4DCC 802415BC 2C62000F */ sltiu $v0, $v1, 0xf -/* CC4DD0 802415C0 10400034 */ beqz $v0, .L80241694 +/* CC4DD0 802415C0 10400034 */ beqz $v0, L80241694_CC4EA4 /* CC4DD4 802415C4 00031080 */ sll $v0, $v1, 2 /* CC4DD8 802415C8 3C018024 */ lui $at, %hi(jtbl_80247A48_CCB258) /* CC4DDC 802415CC 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241684_CC4E94 /* CC4E98 80241688 0200282D */ daddu $a1, $s0, $zero /* CC4E9C 8024168C 0C090407 */ jal func_8024101C_CC482C /* CC4EA0 80241690 0260302D */ daddu $a2, $s3, $zero -.L80241694: glabel L80241694_CC4EA4 /* CC4EA4 80241694 0000102D */ daddu $v0, $zero, $zero .L80241698: diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s index 071eb06a3c..2fbb94e699 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s @@ -134,7 +134,7 @@ glabel func_8024262C_CC5E3C /* CC6028 80242818 8E220090 */ lw $v0, 0x90($s1) /* CC602C 8024281C 1840000C */ blez $v0, .L80242850 /* CC6030 80242820 2442FFFF */ addiu $v0, $v0, -1 -/* CC6034 80242824 14400087 */ bnez $v0, .L80242A44 +/* CC6034 80242824 14400087 */ bnez $v0, L80242A44_CC6254 /* CC6038 80242828 AE220090 */ sw $v0, 0x90($s1) /* CC603C 8024282C 3C03FFAA */ lui $v1, 0xffaa /* CC6040 80242830 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_8024262C_CC5E3C .L80242958: /* CC6168 80242958 AE420028 */ sw $v0, 0x28($s2) /* CC616C 8024295C 24020007 */ addiu $v0, $zero, 7 -/* CC6170 80242960 08090A91 */ j .L80242A44 +/* CC6170 80242960 08090A91 */ j L80242A44_CC6254 /* CC6174 80242964 AE220090 */ sw $v0, 0x90($s1) .L80242968: /* CC6178 80242968 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_8024262C_CC5E3C /* CC620C 802429FC A22000B5 */ sb $zero, 0xb5($s1) .L80242A00: /* CC6210 80242A00 8E22008C */ lw $v0, 0x8c($s1) -/* CC6214 80242A04 1040000F */ beqz $v0, .L80242A44 +/* CC6214 80242A04 1040000F */ beqz $v0, L80242A44_CC6254 /* CC6218 80242A08 3C03FFAA */ lui $v1, 0xffaa /* CC621C 80242A0C 8E420028 */ lw $v0, 0x28($s2) /* CC6220 80242A10 3463FFFC */ ori $v1, $v1, 0xfffc /* CC6224 80242A14 00431821 */ addu $v1, $v0, $v1 /* CC6228 80242A18 2C620015 */ sltiu $v0, $v1, 0x15 -/* CC622C 80242A1C 10400009 */ beqz $v0, .L80242A44 +/* CC622C 80242A1C 10400009 */ beqz $v0, L80242A44_CC6254 /* CC6230 80242A20 00031080 */ sll $v0, $v1, 2 /* CC6234 80242A24 3C018024 */ lui $at, %hi(jtbl_80247A90_CCB2A0) /* CC6238 80242A28 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80242A38_CC6248 /* CC6248 80242A38 8E420028 */ lw $v0, 0x28($s2) /* CC624C 80242A3C 24420001 */ addiu $v0, $v0, 1 /* CC6250 80242A40 AE420028 */ sw $v0, 0x28($s2) -.L80242A44: glabel L80242A44_CC6254 /* CC6254 80242A44 0000102D */ daddu $v0, $zero, $zero .L80242A48: diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s index 51184c1bf0..5444630c4f 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s @@ -64,7 +64,7 @@ glabel func_80241E1C_CCD12C .L80241F04: /* CCD214 80241F04 8E830070 */ lw $v1, 0x70($s4) /* CCD218 80241F08 2C62000F */ sltiu $v0, $v1, 0xf -/* CCD21C 80241F0C 10400034 */ beqz $v0, .L80241FE0 +/* CCD21C 80241F0C 10400034 */ beqz $v0, L80241FE0_CCD2F0 /* CCD220 80241F10 00031080 */ sll $v0, $v1, 2 /* CCD224 80241F14 3C018024 */ lui $at, %hi(jtbl_80245368_CD0678) /* CCD228 80241F18 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241FD0_CCD2E0 /* CCD2E4 80241FD4 0200282D */ daddu $a1, $s0, $zero /* CCD2E8 80241FD8 0C09065A */ jal func_80241968_CCCC78 /* CCD2EC 80241FDC 0260302D */ daddu $a2, $s3, $zero -.L80241FE0: glabel L80241FE0_CCD2F0 /* CCD2F0 80241FE0 0000102D */ daddu $v0, $zero, $zero .L80241FE4: diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s index 4a54eb20b7..ccfca0d5db 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s @@ -64,7 +64,7 @@ glabel func_8024215C_CD3F8C .L80242244: /* CD4074 80242244 8E830070 */ lw $v1, 0x70($s4) /* CD4078 80242248 2C62000F */ sltiu $v0, $v1, 0xf -/* CD407C 8024224C 10400034 */ beqz $v0, .L80242320 +/* CD407C 8024224C 10400034 */ beqz $v0, L80242320_CD4150 /* CD4080 80242250 00031080 */ sll $v0, $v1, 2 /* CD4084 80242254 3C018024 */ lui $at, %hi(jtbl_80245408_CD7238) /* CD4088 80242258 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80242310_CD4140 /* CD4144 80242314 0200282D */ daddu $a1, $s0, $zero /* CD4148 80242318 0C09072A */ jal func_80241CA8_CD3AD8 /* CD414C 8024231C 0260302D */ daddu $a2, $s3, $zero -.L80242320: glabel L80242320_CD4150 /* CD4150 80242320 0000102D */ daddu $v0, $zero, $zero .L80242324: diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s index 04c2420147..d881934923 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s @@ -65,7 +65,7 @@ glabel func_80242754_CD4584 .L80242840: /* CD4670 80242840 8E830070 */ lw $v1, 0x70($s4) /* CD4674 80242844 2C620015 */ sltiu $v0, $v1, 0x15 -/* CD4678 80242848 10400032 */ beqz $v0, .L80242914 +/* CD4678 80242848 10400032 */ beqz $v0, L80242914_CD4744 /* CD467C 8024284C 00031080 */ sll $v0, $v1, 2 /* CD4680 80242850 3C018024 */ lui $at, %hi(jtbl_80245450_CD7280) /* CD4684 80242854 00220821 */ addu $at, $at, $v0 @@ -125,7 +125,6 @@ glabel L80242904_CD4734 /* CD4738 80242908 0200282D */ daddu $a1, $s0, $zero /* CD473C 8024290C 0C0909BE */ jal func_802426F8_CD4528 /* CD4740 80242910 0260302D */ daddu $a2, $s3, $zero -.L80242914: glabel L80242914_CD4744 /* CD4744 80242914 0000102D */ daddu $v0, $zero, $zero .L80242918: diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s index c6b8155c53..221d4a2849 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s @@ -64,7 +64,7 @@ glabel func_8024137C_CD865C .L80241464: /* CD8744 80241464 8E830070 */ lw $v1, 0x70($s4) /* CD8748 80241468 2C62000F */ sltiu $v0, $v1, 0xf -/* CD874C 8024146C 10400034 */ beqz $v0, .L80241540 +/* CD874C 8024146C 10400034 */ beqz $v0, L80241540_CD8820 /* CD8750 80241470 00031080 */ sll $v0, $v1, 2 /* CD8754 80241474 3C018024 */ lui $at, %hi(jtbl_80245318_CDC5F8) /* CD8758 80241478 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241530_CD8810 /* CD8814 80241534 0200282D */ daddu $a1, $s0, $zero /* CD8818 80241538 0C0903B2 */ jal func_80240EC8_CD81A8 /* CD881C 8024153C 0260302D */ daddu $a2, $s3, $zero -.L80241540: glabel L80241540_CD8820 /* CD8820 80241540 0000102D */ daddu $v0, $zero, $zero .L80241544: diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s index f0b4b635e1..b47ba4512b 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s @@ -134,7 +134,7 @@ glabel func_802424D8_CD97B8 /* CD99A4 802426C4 8E220090 */ lw $v0, 0x90($s1) /* CD99A8 802426C8 1840000C */ blez $v0, .L802426FC /* CD99AC 802426CC 2442FFFF */ addiu $v0, $v0, -1 -/* CD99B0 802426D0 14400087 */ bnez $v0, .L802428F0 +/* CD99B0 802426D0 14400087 */ bnez $v0, L802428F0_CD9BD0 /* CD99B4 802426D4 AE220090 */ sw $v0, 0x90($s1) /* CD99B8 802426D8 3C03FFAA */ lui $v1, 0xffaa /* CD99BC 802426DC 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_802424D8_CD97B8 .L80242804: /* CD9AE4 80242804 AE420028 */ sw $v0, 0x28($s2) /* CD9AE8 80242808 24020007 */ addiu $v0, $zero, 7 -/* CD9AEC 8024280C 08090A3C */ j .L802428F0 +/* CD9AEC 8024280C 08090A3C */ j L802428F0_CD9BD0 /* CD9AF0 80242810 AE220090 */ sw $v0, 0x90($s1) .L80242814: /* CD9AF4 80242814 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_802424D8_CD97B8 /* CD9B88 802428A8 A22000B5 */ sb $zero, 0xb5($s1) .L802428AC: /* CD9B8C 802428AC 8E22008C */ lw $v0, 0x8c($s1) -/* CD9B90 802428B0 1040000F */ beqz $v0, .L802428F0 +/* CD9B90 802428B0 1040000F */ beqz $v0, L802428F0_CD9BD0 /* CD9B94 802428B4 3C03FFAA */ lui $v1, 0xffaa /* CD9B98 802428B8 8E420028 */ lw $v0, 0x28($s2) /* CD9B9C 802428BC 3463FFFC */ ori $v1, $v1, 0xfffc /* CD9BA0 802428C0 00431821 */ addu $v1, $v0, $v1 /* CD9BA4 802428C4 2C620015 */ sltiu $v0, $v1, 0x15 -/* CD9BA8 802428C8 10400009 */ beqz $v0, .L802428F0 +/* CD9BA8 802428C8 10400009 */ beqz $v0, L802428F0_CD9BD0 /* CD9BAC 802428CC 00031080 */ sll $v0, $v1, 2 /* CD9BB0 802428D0 3C018024 */ lui $at, %hi(jtbl_80245360_CDC640) /* CD9BB4 802428D4 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L802428E4_CD9BC4 /* CD9BC4 802428E4 8E420028 */ lw $v0, 0x28($s2) /* CD9BC8 802428E8 24420001 */ addiu $v0, $v0, 1 /* CD9BCC 802428EC AE420028 */ sw $v0, 0x28($s2) -.L802428F0: glabel L802428F0_CD9BD0 /* CD9BD0 802428F0 0000102D */ daddu $v0, $zero, $zero .L802428F4: diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s index dfdc17b0bf..375e5094ce 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s @@ -11,7 +11,7 @@ glabel func_802401AC_CE68AC /* CE68C4 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) /* CE68C8 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* CE68CC 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* CE68D0 802401D0 1040008A */ beqz $v0, .L802403FC +/* CE68D0 802401D0 1040008A */ beqz $v0, L802403FC_CE6AFC /* CE68D4 802401D4 00031080 */ sll $v0, $v1, 2 /* CE68D8 802401D8 3C018024 */ lui $at, %hi(jtbl_80245B10_CEC210) /* CE68DC 802401DC 00220821 */ addu $at, $at, $v0 @@ -62,10 +62,10 @@ glabel L802401EC_CE68EC /* CE698C 8024028C 00021400 */ sll $v0, $v0, 0x10 /* CE6990 80240290 00021403 */ sra $v0, $v0, 0x10 /* CE6994 80240294 0043102A */ slt $v0, $v0, $v1 -/* CE6998 80240298 14400058 */ bnez $v0, .L802403FC +/* CE6998 80240298 14400058 */ bnez $v0, L802403FC_CE6AFC /* CE699C 8024029C 24020001 */ addiu $v0, $zero, 1 /* CE69A0 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* CE69A4 802402A4 080900FF */ j .L802403FC +/* CE69A4 802402A4 080900FF */ j L802403FC_CE6AFC /* CE69A8 802402A8 A6200046 */ sh $zero, 0x46($s1) glabel L802402AC_CE69AC /* CE69AC 802402AC 96220046 */ lhu $v0, 0x46($s1) @@ -74,7 +74,7 @@ glabel L802402AC_CE69AC /* CE69B8 802402B8 00021400 */ sll $v0, $v0, 0x10 /* CE69BC 802402BC 00021403 */ sra $v0, $v0, 0x10 /* CE69C0 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* CE69C4 802402C4 1440004D */ bnez $v0, .L802403FC +/* CE69C4 802402C4 1440004D */ bnez $v0, L802403FC_CE6AFC /* CE69C8 802402C8 24020002 */ addiu $v0, $zero, 2 /* CE69CC 802402CC 8E230050 */ lw $v1, 0x50($s1) /* CE69D0 802402D0 A6220044 */ sh $v0, 0x44($s1) @@ -84,7 +84,7 @@ glabel L802402AC_CE69AC /* CE69E0 802402E0 AC620070 */ sw $v0, 0x70($v1) /* CE69E4 802402E4 8E220050 */ lw $v0, 0x50($s1) /* CE69E8 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* CE69EC 802402EC 080900FF */ j .L802403FC +/* CE69EC 802402EC 080900FF */ j L802403FC_CE6AFC /* CE69F0 802402F0 AC400074 */ sw $zero, 0x74($v0) glabel L802402F4_CE69F4 /* CE69F4 802402F4 96220046 */ lhu $v0, 0x46($s1) @@ -93,7 +93,7 @@ glabel L802402F4_CE69F4 /* CE6A00 80240300 00021400 */ sll $v0, $v0, 0x10 /* CE6A04 80240304 00021403 */ sra $v0, $v0, 0x10 /* CE6A08 80240308 2842003C */ slti $v0, $v0, 0x3c -/* CE6A0C 8024030C 1440003B */ bnez $v0, .L802403FC +/* CE6A0C 8024030C 1440003B */ bnez $v0, L802403FC_CE6AFC /* CE6A10 80240310 00000000 */ nop /* CE6A14 80240314 3C013F80 */ lui $at, 0x3f80 /* CE6A18 80240318 44810000 */ mtc1 $at, $f0 @@ -125,7 +125,7 @@ glabel L802402F4_CE69F4 /* CE6A80 80240380 A6200046 */ sh $zero, 0x46($s1) /* CE6A84 80240384 AE20002C */ sw $zero, 0x2c($s1) /* CE6A88 80240388 A6220048 */ sh $v0, 0x48($s1) -/* CE6A8C 8024038C 080900FF */ j .L802403FC +/* CE6A8C 8024038C 080900FF */ j L802403FC_CE6AFC /* CE6A90 80240390 E6200030 */ swc1 $f0, 0x30($s1) glabel L80240394_CE6A94 /* CE6A94 80240394 0000202D */ daddu $a0, $zero, $zero @@ -142,7 +142,7 @@ glabel L80240394_CE6A94 /* CE6AC0 802403C0 00021400 */ sll $v0, $v0, 0x10 /* CE6AC4 802403C4 00021403 */ sra $v0, $v0, 0x10 /* CE6AC8 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* CE6ACC 802403CC 1440000B */ bnez $v0, .L802403FC +/* CE6ACC 802403CC 1440000B */ bnez $v0, L802403FC_CE6AFC /* CE6AD0 802403D0 24030001 */ addiu $v1, $zero, 1 /* CE6AD4 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) /* CE6AD8 802403D8 24020002 */ addiu $v0, $zero, 2 @@ -154,7 +154,6 @@ glabel L80240394_CE6A94 /* CE6AF0 802403F0 A6220044 */ sh $v0, 0x44($s1) /* CE6AF4 802403F4 A6200046 */ sh $zero, 0x46($s1) /* CE6AF8 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -.L802403FC: glabel L802403FC_CE6AFC /* CE6AFC 802403FC 8623004A */ lh $v1, 0x4a($s1) /* CE6B00 80240400 24020001 */ addiu $v0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s b/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s index fe6817349e..deff11a31a 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s @@ -134,7 +134,7 @@ glabel func_80240728_CEE988 /* CEEB74 80240914 8E220090 */ lw $v0, 0x90($s1) /* CEEB78 80240918 1840000C */ blez $v0, .L8024094C /* CEEB7C 8024091C 2442FFFF */ addiu $v0, $v0, -1 -/* CEEB80 80240920 14400087 */ bnez $v0, .L80240B40 +/* CEEB80 80240920 14400087 */ bnez $v0, L80240B40_CEEDA0 /* CEEB84 80240924 AE220090 */ sw $v0, 0x90($s1) /* CEEB88 80240928 3C03FFAA */ lui $v1, 0xffaa /* CEEB8C 8024092C 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240728_CEE988 .L80240A54: /* CEECB4 80240A54 AE420028 */ sw $v0, 0x28($s2) /* CEECB8 80240A58 24020007 */ addiu $v0, $zero, 7 -/* CEECBC 80240A5C 080902D0 */ j .L80240B40 +/* CEECBC 80240A5C 080902D0 */ j L80240B40_CEEDA0 /* CEECC0 80240A60 AE220090 */ sw $v0, 0x90($s1) .L80240A64: /* CEECC4 80240A64 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240728_CEE988 /* CEED58 80240AF8 A22000B5 */ sb $zero, 0xb5($s1) .L80240AFC: /* CEED5C 80240AFC 8E22008C */ lw $v0, 0x8c($s1) -/* CEED60 80240B00 1040000F */ beqz $v0, .L80240B40 +/* CEED60 80240B00 1040000F */ beqz $v0, L80240B40_CEEDA0 /* CEED64 80240B04 3C03FFAA */ lui $v1, 0xffaa /* CEED68 80240B08 8E420028 */ lw $v0, 0x28($s2) /* CEED6C 80240B0C 3463FFFC */ ori $v1, $v1, 0xfffc /* CEED70 80240B10 00431821 */ addu $v1, $v0, $v1 /* CEED74 80240B14 2C620015 */ sltiu $v0, $v1, 0x15 -/* CEED78 80240B18 10400009 */ beqz $v0, .L80240B40 +/* CEED78 80240B18 10400009 */ beqz $v0, L80240B40_CEEDA0 /* CEED7C 80240B1C 00031080 */ sll $v0, $v1, 2 /* CEED80 80240B20 3C018024 */ lui $at, %hi(jtbl_80242688_CF08E8) /* CEED84 80240B24 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240B34_CEED94 /* CEED94 80240B34 8E420028 */ lw $v0, 0x28($s2) /* CEED98 80240B38 24420001 */ addiu $v0, $v0, 1 /* CEED9C 80240B3C AE420028 */ sw $v0, 0x28($s2) -.L80240B40: glabel L80240B40_CEEDA0 /* CEEDA0 80240B40 0000102D */ daddu $v0, $zero, $zero .L80240B44: diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s index f43c10d8c1..3f0f73faa0 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s @@ -64,7 +64,7 @@ glabel func_8024134C_CF3F1C .L80241434: /* CF4004 80241434 8E830070 */ lw $v1, 0x70($s4) /* CF4008 80241438 2C62000F */ sltiu $v0, $v1, 0xf -/* CF400C 8024143C 10400034 */ beqz $v0, .L80241510 +/* CF400C 8024143C 10400034 */ beqz $v0, L80241510_CF40E0 /* CF4010 80241440 00031080 */ sll $v0, $v1, 2 /* CF4014 80241444 3C018024 */ lui $at, %hi(jtbl_80244EF8_CF7AC8) /* CF4018 80241448 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241500_CF40D0 /* CF40D4 80241504 0200282D */ daddu $a1, $s0, $zero /* CF40D8 80241508 0C0903A6 */ jal func_80240E98_CF3A68 /* CF40DC 8024150C 0260302D */ daddu $a2, $s3, $zero -.L80241510: glabel L80241510_CF40E0 /* CF40E0 80241510 0000102D */ daddu $v0, $zero, $zero .L80241514: diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s index 19ba02a3fa..33a5c9502d 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s @@ -65,7 +65,7 @@ glabel func_80241944_CF4514 .L80241A30: /* CF4600 80241A30 8E830070 */ lw $v1, 0x70($s4) /* CF4604 80241A34 2C620015 */ sltiu $v0, $v1, 0x15 -/* CF4608 80241A38 10400032 */ beqz $v0, .L80241B04 +/* CF4608 80241A38 10400032 */ beqz $v0, L80241B04_CF46D4 /* CF460C 80241A3C 00031080 */ sll $v0, $v1, 2 /* CF4610 80241A40 3C018024 */ lui $at, %hi(jtbl_80244F40_CF7B10) /* CF4614 80241A44 00220821 */ addu $at, $at, $v0 @@ -125,7 +125,6 @@ glabel L80241AF4_CF46C4 /* CF46C8 80241AF8 0200282D */ daddu $a1, $s0, $zero /* CF46CC 80241AFC 0C09063A */ jal func_802418E8_CF44B8 /* CF46D0 80241B00 0260302D */ daddu $a2, $s3, $zero -.L80241B04: glabel L80241B04_CF46D4 /* CF46D4 80241B04 0000102D */ daddu $v0, $zero, $zero .L80241B08: 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 5d49510ee7..c35b52cf3e 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 @@ -64,7 +64,7 @@ glabel func_802422FC_A1851C .L802423E4: /* A18604 802423E4 8E830070 */ lw $v1, 0x70($s4) /* A18608 802423E8 2C62000F */ sltiu $v0, $v1, 0xf -/* A1860C 802423EC 10400034 */ beqz $v0, .L802424C0 +/* A1860C 802423EC 10400034 */ beqz $v0, L802424C0_A186E0 /* A18610 802423F0 00031080 */ sll $v0, $v1, 2 /* A18614 802423F4 3C018024 */ lui $at, %hi(jtbl_80244E38_A1B058) /* A18618 802423F8 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L802424B0_A186D0 /* A186D4 802424B4 0200282D */ daddu $a1, $s0, $zero /* A186D8 802424B8 0C090792 */ jal func_80241E48_A18068 /* A186DC 802424BC 0260302D */ daddu $a2, $s3, $zero -.L802424C0: glabel L802424C0_A186E0 /* A186E0 802424C0 0000102D */ daddu $v0, $zero, $zero .L802424C4: 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 66d3bcb3be..f8081c163d 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 @@ -65,7 +65,7 @@ glabel func_802428F4_A18B14 .L802429E0: /* A18C00 802429E0 8E830070 */ lw $v1, 0x70($s4) /* A18C04 802429E4 2C620015 */ sltiu $v0, $v1, 0x15 -/* A18C08 802429E8 10400032 */ beqz $v0, .L80242AB4 +/* A18C08 802429E8 10400032 */ beqz $v0, L80242AB4_A18CD4 /* A18C0C 802429EC 00031080 */ sll $v0, $v1, 2 /* A18C10 802429F0 3C018024 */ lui $at, %hi(jtbl_80244E80_A1B0A0) /* A18C14 802429F4 00220821 */ addu $at, $at, $v0 @@ -125,7 +125,6 @@ glabel L80242AA4_A18CC4 /* A18CC8 80242AA8 0200282D */ daddu $a1, $s0, $zero /* A18CCC 80242AAC 0C090A26 */ jal func_80242898_A18AB8 /* A18CD0 80242AB0 0260302D */ daddu $a2, $s3, $zero -.L80242AB4: glabel L80242AB4_A18CD4 /* A18CD4 80242AB4 0000102D */ daddu $v0, $zero, $zero .L80242AB8: 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 5332b185e1..b84145f89b 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 @@ -64,7 +64,7 @@ glabel func_80241FBC_A1D0BC .L802420A4: /* A1D1A4 802420A4 8E830070 */ lw $v1, 0x70($s4) /* A1D1A8 802420A8 2C62000F */ sltiu $v0, $v1, 0xf -/* A1D1AC 802420AC 10400034 */ beqz $v0, .L80242180 +/* A1D1AC 802420AC 10400034 */ beqz $v0, L80242180_A1D280 /* A1D1B0 802420B0 00031080 */ sll $v0, $v1, 2 /* A1D1B4 802420B4 3C018025 */ lui $at, %hi(jtbl_8024BD88_A26E88) /* A1D1B8 802420B8 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80242170_A1D270 /* A1D274 80242174 0200282D */ daddu $a1, $s0, $zero /* A1D278 80242178 0C0906C2 */ jal func_80241B08_A1CC08 /* A1D27C 8024217C 0260302D */ daddu $a2, $s3, $zero -.L80242180: glabel L80242180_A1D280 /* A1D280 80242180 0000102D */ daddu $v0, $zero, $zero .L80242184: diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s index b6c9f699f5..93dc9c46d9 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s @@ -22,7 +22,7 @@ glabel func_80240BD0_A27AA0 /* A27AE0 80240C10 3C038024 */ lui $v1, %hi(D_80243250_A2A120) /* A27AE4 80240C14 8C633250 */ lw $v1, %lo(D_80243250_A2A120)($v1) /* A27AE8 80240C18 2C620005 */ sltiu $v0, $v1, 5 -/* A27AEC 80240C1C 10400050 */ beqz $v0, .L80240D60 +/* A27AEC 80240C1C 10400050 */ beqz $v0, L80240D60_A27C30 /* A27AF0 80240C20 00031080 */ sll $v0, $v1, 2 /* A27AF4 80240C24 3C018024 */ lui $at, %hi(jtbl_80243358_A2A228) /* A27AF8 80240C28 00220821 */ addu $at, $at, $v0 @@ -75,7 +75,7 @@ glabel L80240CCC_A27B9C /* A27BA0 80240CD0 24843254 */ addiu $a0, $a0, %lo(D_80243254_A2A124) /* A27BA4 80240CD4 8C820000 */ lw $v0, ($a0) /* A27BA8 80240CD8 2442FFF6 */ addiu $v0, $v0, -0xa -/* A27BAC 80240CDC 04410020 */ bgez $v0, .L80240D60 +/* A27BAC 80240CDC 04410020 */ bgez $v0, L80240D60_A27C30 /* A27BB0 80240CE0 AC820000 */ sw $v0, ($a0) /* A27BB4 80240CE4 3C028024 */ lui $v0, %hi(D_80243258_A2A128) /* A27BB8 80240CE8 24423258 */ addiu $v0, $v0, %lo(D_80243258_A2A128) @@ -94,7 +94,7 @@ glabel L80240D0C_A27BDC /* A27BE8 80240D18 10400003 */ beqz $v0, .L80240D28 /* A27BEC 80240D1C 2442FFFF */ addiu $v0, $v0, -1 .L80240D20: -/* A27BF0 80240D20 08090358 */ j .L80240D60 +/* A27BF0 80240D20 08090358 */ j L80240D60_A27C30 /* A27BF4 80240D24 AC620000 */ sw $v0, ($v1) .L80240D28: /* A27BF8 80240D28 3C028024 */ lui $v0, %hi(D_80243258_A2A128) @@ -113,7 +113,6 @@ glabel L80240D0C_A27BDC .L80240D58: /* A27C28 80240D58 3C018024 */ lui $at, %hi(D_80243250_A2A120) /* A27C2C 80240D5C AC203250 */ sw $zero, %lo(D_80243250_A2A120)($at) -.L80240D60: glabel L80240D60_A27C30 /* A27C30 80240D60 24040001 */ addiu $a0, $zero, 1 .L80240D64: diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s index a111a1e067..100775aac1 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s @@ -7,7 +7,7 @@ glabel func_802440D0_A2E310 /* A2E318 802440D8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A2E31C 802440DC AFBF0014 */ sw $ra, 0x14($sp) /* A2E320 802440E0 2C620007 */ sltiu $v0, $v1, 7 -/* A2E324 802440E4 104000D4 */ beqz $v0, .L80244438 +/* A2E324 802440E4 104000D4 */ beqz $v0, L80244438_A2E678 /* A2E328 802440E8 AFB00010 */ sw $s0, 0x10($sp) /* A2E32C 802440EC 00031080 */ sll $v0, $v1, 2 /* A2E330 802440F0 3C018025 */ lui $at, %hi(jtbl_8024F240_A39480) @@ -239,7 +239,6 @@ glabel L802443B0_A2E5F0 /* A2E66C 8024442C 24420001 */ addiu $v0, $v0, 1 /* A2E670 80244430 08091110 */ j .L80244440 /* A2E674 80244434 AC620000 */ sw $v0, ($v1) -.L80244438: glabel L80244438_A2E678 /* A2E678 80244438 08091111 */ j .L80244444 /* A2E67C 8024443C 24020001 */ addiu $v0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s index e912331970..523e88cd59 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s @@ -22,7 +22,7 @@ glabel func_802449F0_A2EC30 /* A2EC70 80244A30 3C038025 */ lui $v1, %hi(D_8024DA90_A37CD0) /* A2EC74 80244A34 8C63DA90 */ lw $v1, %lo(D_8024DA90_A37CD0)($v1) /* A2EC78 80244A38 2C620005 */ sltiu $v0, $v1, 5 -/* A2EC7C 80244A3C 10400050 */ beqz $v0, .L80244B80 +/* A2EC7C 80244A3C 10400050 */ beqz $v0, L80244B80_A2EDC0 /* A2EC80 80244A40 00031080 */ sll $v0, $v1, 2 /* A2EC84 80244A44 3C018025 */ lui $at, %hi(jtbl_8024F260_A394A0) /* A2EC88 80244A48 00220821 */ addu $at, $at, $v0 @@ -75,7 +75,7 @@ glabel L80244AEC_A2ED2C /* A2ED30 80244AF0 2484DA94 */ addiu $a0, $a0, %lo(D_8024DA94_A37CD4) /* A2ED34 80244AF4 8C820000 */ lw $v0, ($a0) /* A2ED38 80244AF8 2442FFF6 */ addiu $v0, $v0, -0xa -/* A2ED3C 80244AFC 04410020 */ bgez $v0, .L80244B80 +/* A2ED3C 80244AFC 04410020 */ bgez $v0, L80244B80_A2EDC0 /* A2ED40 80244B00 AC820000 */ sw $v0, ($a0) /* A2ED44 80244B04 3C028025 */ lui $v0, %hi(D_8024DA98_A37CD8) /* A2ED48 80244B08 2442DA98 */ addiu $v0, $v0, %lo(D_8024DA98_A37CD8) @@ -94,7 +94,7 @@ glabel L80244B2C_A2ED6C /* A2ED78 80244B38 10400003 */ beqz $v0, .L80244B48 /* A2ED7C 80244B3C 2442FFFF */ addiu $v0, $v0, -1 .L80244B40: -/* A2ED80 80244B40 080912E0 */ j .L80244B80 +/* A2ED80 80244B40 080912E0 */ j L80244B80_A2EDC0 /* A2ED84 80244B44 AC620000 */ sw $v0, ($v1) .L80244B48: /* A2ED88 80244B48 3C028025 */ lui $v0, %hi(D_8024DA98_A37CD8) @@ -113,7 +113,6 @@ glabel L80244B2C_A2ED6C .L80244B78: /* A2EDB8 80244B78 3C018025 */ lui $at, %hi(D_8024DA90_A37CD0) /* A2EDBC 80244B7C AC20DA90 */ sw $zero, %lo(D_8024DA90_A37CD0)($at) -.L80244B80: glabel L80244B80_A2EDC0 /* A2EDC0 80244B80 24040001 */ addiu $a0, $zero, 1 .L80244B84: diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s b/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s index afd2c1dbdb..0c9f69ed98 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s @@ -134,7 +134,7 @@ glabel func_802403D4_97BA04 /* 97BBF0 802405C0 8E220090 */ lw $v0, 0x90($s1) /* 97BBF4 802405C4 1840000C */ blez $v0, .L802405F8 /* 97BBF8 802405C8 2442FFFF */ addiu $v0, $v0, -1 -/* 97BBFC 802405CC 14400087 */ bnez $v0, .L802407EC +/* 97BBFC 802405CC 14400087 */ bnez $v0, L802407EC_97BE1C /* 97BC00 802405D0 AE220090 */ sw $v0, 0x90($s1) /* 97BC04 802405D4 3C03FFAA */ lui $v1, 0xffaa /* 97BC08 802405D8 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_802403D4_97BA04 .L80240700: /* 97BD30 80240700 AE420028 */ sw $v0, 0x28($s2) /* 97BD34 80240704 24020007 */ addiu $v0, $zero, 7 -/* 97BD38 80240708 080901FB */ j .L802407EC +/* 97BD38 80240708 080901FB */ j L802407EC_97BE1C /* 97BD3C 8024070C AE220090 */ sw $v0, 0x90($s1) .L80240710: /* 97BD40 80240710 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_802403D4_97BA04 /* 97BDD4 802407A4 A22000B5 */ sb $zero, 0xb5($s1) .L802407A8: /* 97BDD8 802407A8 8E22008C */ lw $v0, 0x8c($s1) -/* 97BDDC 802407AC 1040000F */ beqz $v0, .L802407EC +/* 97BDDC 802407AC 1040000F */ beqz $v0, L802407EC_97BE1C /* 97BDE0 802407B0 3C03FFAA */ lui $v1, 0xffaa /* 97BDE4 802407B4 8E420028 */ lw $v0, 0x28($s2) /* 97BDE8 802407B8 3463FFFC */ ori $v1, $v1, 0xfffc /* 97BDEC 802407BC 00431821 */ addu $v1, $v0, $v1 /* 97BDF0 802407C0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 97BDF4 802407C4 10400009 */ beqz $v0, .L802407EC +/* 97BDF4 802407C4 10400009 */ beqz $v0, L802407EC_97BE1C /* 97BDF8 802407C8 00031080 */ sll $v0, $v1, 2 /* 97BDFC 802407CC 3C018024 */ lui $at, %hi(jtbl_80242438_97DA68) /* 97BE00 802407D0 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L802407E0_97BE10 /* 97BE10 802407E0 8E420028 */ lw $v0, 0x28($s2) /* 97BE14 802407E4 24420001 */ addiu $v0, $v0, 1 /* 97BE18 802407E8 AE420028 */ sw $v0, 0x28($s2) -.L802407EC: glabel L802407EC_97BE1C /* 97BE1C 802407EC 0000102D */ daddu $v0, $zero, $zero .L802407F0: 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 c659bca666..557c97d5ca 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 @@ -86,7 +86,7 @@ glabel func_80240BF0_97E6C0 .L80240D30: /* 97E800 80240D30 8E630070 */ lw $v1, 0x70($s3) /* 97E804 80240D34 2C62000F */ sltiu $v0, $v1, 0xf -/* 97E808 80240D38 1040002C */ beqz $v0, .L80240DEC +/* 97E808 80240D38 1040002C */ beqz $v0, L80240DEC_97E8BC /* 97E80C 80240D3C 00031080 */ sll $v0, $v1, 2 /* 97E810 80240D40 3C018024 */ lui $at, %hi(jtbl_80242EB8_980988) /* 97E814 80240D44 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L80240DDC_97E8AC /* 97E8B0 80240DE0 0280282D */ daddu $a1, $s4, $zero /* 97E8B4 80240DE4 0C0902EB */ jal isk_05_UnkDurationCheck /* 97E8B8 80240DE8 0200302D */ daddu $a2, $s0, $zero -.L80240DEC: glabel L80240DEC_97E8BC /* 97E8BC 80240DEC 0000102D */ daddu $v0, $zero, $zero .L80240DF0: diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s index 4f672b4b0b..1ec75b86cc 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s @@ -67,7 +67,7 @@ glabel func_80240F3C_97EA0C .L80241034: /* 97EB04 80241034 8E830070 */ lw $v1, 0x70($s4) /* 97EB08 80241038 2C62000F */ sltiu $v0, $v1, 0xf -/* 97EB0C 8024103C 10400028 */ beqz $v0, .L802410E0 +/* 97EB0C 8024103C 10400028 */ beqz $v0, L802410E0_97EBB0 /* 97EB10 80241040 00031080 */ sll $v0, $v1, 2 /* 97EB14 80241044 3C018024 */ lui $at, %hi(jtbl_80242EF8_9809C8) /* 97EB18 80241048 00220821 */ addu $at, $at, $v0 @@ -84,7 +84,7 @@ glabel L80241068_97EB38 /* 97EB3C 8024106C 0200282D */ daddu $a1, $s0, $zero /* 97EB40 80241070 0C09008C */ jal func_80240230_97DD00 /* 97EB44 80241074 0260302D */ daddu $a2, $s3, $zero -/* 97EB48 80241078 08090438 */ j .L802410E0 +/* 97EB48 80241078 08090438 */ j L802410E0_97EBB0 /* 97EB4C 8024107C 00000000 */ nop glabel L80241080_97EB50 /* 97EB50 80241080 0280202D */ daddu $a0, $s4, $zero @@ -96,7 +96,7 @@ glabel L80241090_97EB60 /* 97EB64 80241094 0200282D */ daddu $a1, $s0, $zero /* 97EB68 80241098 0C09018A */ jal func_80240628_97E0F8 /* 97EB6C 8024109C 0260302D */ daddu $a2, $s3, $zero -/* 97EB70 802410A0 08090438 */ j .L802410E0 +/* 97EB70 802410A0 08090438 */ j L802410E0_97EBB0 /* 97EB74 802410A4 00000000 */ nop glabel L802410A8_97EB78 /* 97EB78 802410A8 0280202D */ daddu $a0, $s4, $zero @@ -108,14 +108,13 @@ glabel L802410B8_97EB88 /* 97EB8C 802410BC 0200282D */ daddu $a1, $s0, $zero /* 97EB90 802410C0 0C09022B */ jal func_802408AC_97E37C /* 97EB94 802410C4 0260302D */ daddu $a2, $s3, $zero -/* 97EB98 802410C8 08090438 */ j .L802410E0 +/* 97EB98 802410C8 08090438 */ j L802410E0_97EBB0 /* 97EB9C 802410CC 00000000 */ nop glabel L802410D0_97EBA0 /* 97EBA0 802410D0 0280202D */ daddu $a0, $s4, $zero /* 97EBA4 802410D4 0200282D */ daddu $a1, $s0, $zero /* 97EBA8 802410D8 0C0902EB */ jal isk_05_UnkDurationCheck /* 97EBAC 802410DC 0260302D */ daddu $a2, $s3, $zero -.L802410E0: glabel L802410E0_97EBB0 /* 97EBB0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) /* 97EBB4 802410E4 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s b/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s index 2cc9f5e009..f07d951c5a 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s @@ -134,7 +134,7 @@ glabel func_80240394_9851C4 /* 9853B0 80240580 8E220090 */ lw $v0, 0x90($s1) /* 9853B4 80240584 1840000C */ blez $v0, .L802405B8 /* 9853B8 80240588 2442FFFF */ addiu $v0, $v0, -1 -/* 9853BC 8024058C 14400087 */ bnez $v0, .L802407AC +/* 9853BC 8024058C 14400087 */ bnez $v0, L802407AC_9855DC /* 9853C0 80240590 AE220090 */ sw $v0, 0x90($s1) /* 9853C4 80240594 3C03FFAA */ lui $v1, 0xffaa /* 9853C8 80240598 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240394_9851C4 .L802406C0: /* 9854F0 802406C0 AE420028 */ sw $v0, 0x28($s2) /* 9854F4 802406C4 24020007 */ addiu $v0, $zero, 7 -/* 9854F8 802406C8 080901EB */ j .L802407AC +/* 9854F8 802406C8 080901EB */ j L802407AC_9855DC /* 9854FC 802406CC AE220090 */ sw $v0, 0x90($s1) .L802406D0: /* 985500 802406D0 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240394_9851C4 /* 985594 80240764 A22000B5 */ sb $zero, 0xb5($s1) .L80240768: /* 985598 80240768 8E22008C */ lw $v0, 0x8c($s1) -/* 98559C 8024076C 1040000F */ beqz $v0, .L802407AC +/* 98559C 8024076C 1040000F */ beqz $v0, L802407AC_9855DC /* 9855A0 80240770 3C03FFAA */ lui $v1, 0xffaa /* 9855A4 80240774 8E420028 */ lw $v0, 0x28($s2) /* 9855A8 80240778 3463FFFC */ ori $v1, $v1, 0xfffc /* 9855AC 8024077C 00431821 */ addu $v1, $v0, $v1 /* 9855B0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9855B4 80240784 10400009 */ beqz $v0, .L802407AC +/* 9855B4 80240784 10400009 */ beqz $v0, L802407AC_9855DC /* 9855B8 80240788 00031080 */ sll $v0, $v1, 2 /* 9855BC 8024078C 3C018024 */ lui $at, %hi(jtbl_80241658_986488) /* 9855C0 80240790 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L802407A0_9855D0 /* 9855D0 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 9855D4 802407A4 24420001 */ addiu $v0, $v0, 1 /* 9855D8 802407A8 AE420028 */ sw $v0, 0x28($s2) -.L802407AC: glabel L802407AC_9855DC /* 9855DC 802407AC 0000102D */ daddu $v0, $zero, $zero .L802407B0: 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 4d9c5a8e7e..19c37659dc 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 @@ -86,7 +86,7 @@ glabel func_80240BF0_9903D0 .L80240D30: /* 990510 80240D30 8E630070 */ lw $v1, 0x70($s3) /* 990514 80240D34 2C62000F */ sltiu $v0, $v1, 0xf -/* 990518 80240D38 1040002C */ beqz $v0, .L80240DEC +/* 990518 80240D38 1040002C */ beqz $v0, L80240DEC_9905CC /* 99051C 80240D3C 00031080 */ sll $v0, $v1, 2 /* 990520 80240D40 3C018024 */ lui $at, %hi(jtbl_80242EB8_992698) /* 990524 80240D44 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L80240DDC_9905BC /* 9905C0 80240DE0 0280282D */ daddu $a1, $s4, $zero /* 9905C4 80240DE4 0C0902EB */ jal isk_13_UnkDurationCheck /* 9905C8 80240DE8 0200302D */ daddu $a2, $s0, $zero -.L80240DEC: glabel L80240DEC_9905CC /* 9905CC 80240DEC 0000102D */ daddu $v0, $zero, $zero .L80240DF0: diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s index c60d7f4b89..4c82e581b1 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s @@ -67,7 +67,7 @@ glabel func_80240F3C_99071C .L80241034: /* 990814 80241034 8E830070 */ lw $v1, 0x70($s4) /* 990818 80241038 2C62000F */ sltiu $v0, $v1, 0xf -/* 99081C 8024103C 10400028 */ beqz $v0, .L802410E0 +/* 99081C 8024103C 10400028 */ beqz $v0, L802410E0_9908C0 /* 990820 80241040 00031080 */ sll $v0, $v1, 2 /* 990824 80241044 3C018024 */ lui $at, %hi(jtbl_80242EF8_9926D8) /* 990828 80241048 00220821 */ addu $at, $at, $v0 @@ -84,7 +84,7 @@ glabel L80241068_990848 /* 99084C 8024106C 0200282D */ daddu $a1, $s0, $zero /* 990850 80241070 0C09008C */ jal func_80240230_98FA10 /* 990854 80241074 0260302D */ daddu $a2, $s3, $zero -/* 990858 80241078 08090438 */ j .L802410E0 +/* 990858 80241078 08090438 */ j L802410E0_9908C0 /* 99085C 8024107C 00000000 */ nop glabel L80241080_990860 /* 990860 80241080 0280202D */ daddu $a0, $s4, $zero @@ -96,7 +96,7 @@ glabel L80241090_990870 /* 990874 80241094 0200282D */ daddu $a1, $s0, $zero /* 990878 80241098 0C09018A */ jal func_80240628_98FE08 /* 99087C 8024109C 0260302D */ daddu $a2, $s3, $zero -/* 990880 802410A0 08090438 */ j .L802410E0 +/* 990880 802410A0 08090438 */ j L802410E0_9908C0 /* 990884 802410A4 00000000 */ nop glabel L802410A8_990888 /* 990888 802410A8 0280202D */ daddu $a0, $s4, $zero @@ -108,14 +108,13 @@ glabel L802410B8_990898 /* 99089C 802410BC 0200282D */ daddu $a1, $s0, $zero /* 9908A0 802410C0 0C09022B */ jal func_802408AC_99008C /* 9908A4 802410C4 0260302D */ daddu $a2, $s3, $zero -/* 9908A8 802410C8 08090438 */ j .L802410E0 +/* 9908A8 802410C8 08090438 */ j L802410E0_9908C0 /* 9908AC 802410CC 00000000 */ nop glabel L802410D0_9908B0 /* 9908B0 802410D0 0280202D */ daddu $a0, $s4, $zero /* 9908B4 802410D4 0200282D */ daddu $a1, $s0, $zero /* 9908B8 802410D8 0C0902EB */ jal isk_13_UnkDurationCheck /* 9908BC 802410DC 0260302D */ daddu $a2, $s3, $zero -.L802410E0: glabel L802410E0_9908C0 /* 9908C0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) /* 9908C4 802410E4 8FB50044 */ lw $s5, 0x44($sp) 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 66fa113730..8087fa671b 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 @@ -86,7 +86,7 @@ glabel func_80240BF0_993320 .L80240D30: /* 993460 80240D30 8E630070 */ lw $v1, 0x70($s3) /* 993464 80240D34 2C62000F */ sltiu $v0, $v1, 0xf -/* 993468 80240D38 1040002C */ beqz $v0, .L80240DEC +/* 993468 80240D38 1040002C */ beqz $v0, L80240DEC_99351C /* 99346C 80240D3C 00031080 */ sll $v0, $v1, 2 /* 993470 80240D40 3C018024 */ lui $at, %hi(jtbl_80242A38_995168) /* 993474 80240D44 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L80240DDC_99350C /* 993510 80240DE0 0280282D */ daddu $a1, $s4, $zero /* 993514 80240DE4 0C0902EB */ jal isk_14_UnkDurationCheck /* 993518 80240DE8 0200302D */ daddu $a2, $s0, $zero -.L80240DEC: glabel L80240DEC_99351C /* 99351C 80240DEC 0000102D */ daddu $v0, $zero, $zero .L80240DF0: diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s index f22ad9a43e..994dcbb404 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s @@ -67,7 +67,7 @@ glabel func_80240F3C_99366C .L80241034: /* 993764 80241034 8E830070 */ lw $v1, 0x70($s4) /* 993768 80241038 2C62000F */ sltiu $v0, $v1, 0xf -/* 99376C 8024103C 10400028 */ beqz $v0, .L802410E0 +/* 99376C 8024103C 10400028 */ beqz $v0, L802410E0_993810 /* 993770 80241040 00031080 */ sll $v0, $v1, 2 /* 993774 80241044 3C018024 */ lui $at, %hi(jtbl_80242A78_9951A8) /* 993778 80241048 00220821 */ addu $at, $at, $v0 @@ -84,7 +84,7 @@ glabel L80241068_993798 /* 99379C 8024106C 0200282D */ daddu $a1, $s0, $zero /* 9937A0 80241070 0C09008C */ jal func_80240230_992960 /* 9937A4 80241074 0260302D */ daddu $a2, $s3, $zero -/* 9937A8 80241078 08090438 */ j .L802410E0 +/* 9937A8 80241078 08090438 */ j L802410E0_993810 /* 9937AC 8024107C 00000000 */ nop glabel L80241080_9937B0 /* 9937B0 80241080 0280202D */ daddu $a0, $s4, $zero @@ -96,7 +96,7 @@ glabel L80241090_9937C0 /* 9937C4 80241094 0200282D */ daddu $a1, $s0, $zero /* 9937C8 80241098 0C09018A */ jal func_80240628_992D58 /* 9937CC 8024109C 0260302D */ daddu $a2, $s3, $zero -/* 9937D0 802410A0 08090438 */ j .L802410E0 +/* 9937D0 802410A0 08090438 */ j L802410E0_993810 /* 9937D4 802410A4 00000000 */ nop glabel L802410A8_9937D8 /* 9937D8 802410A8 0280202D */ daddu $a0, $s4, $zero @@ -108,14 +108,13 @@ glabel L802410B8_9937E8 /* 9937EC 802410BC 0200282D */ daddu $a1, $s0, $zero /* 9937F0 802410C0 0C09022B */ jal func_802408AC_992FDC /* 9937F4 802410C4 0260302D */ daddu $a2, $s3, $zero -/* 9937F8 802410C8 08090438 */ j .L802410E0 +/* 9937F8 802410C8 08090438 */ j L802410E0_993810 /* 9937FC 802410CC 00000000 */ nop glabel L802410D0_993800 /* 993800 802410D0 0280202D */ daddu $a0, $s4, $zero /* 993804 802410D4 0200282D */ daddu $a1, $s0, $zero /* 993808 802410D8 0C0902EB */ jal isk_14_UnkDurationCheck /* 99380C 802410DC 0260302D */ daddu $a2, $s3, $zero -.L802410E0: glabel L802410E0_993810 /* 993810 802410E0 8FBF0048 */ lw $ra, 0x48($sp) /* 993814 802410E4 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s index 986db54a85..337e9640ff 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s @@ -11,7 +11,7 @@ glabel func_802401AC_99539C /* 9953B4 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) /* 9953B8 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* 9953BC 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* 9953C0 802401D0 1040008A */ beqz $v0, .L802403FC +/* 9953C0 802401D0 1040008A */ beqz $v0, L802403FC_9955EC /* 9953C4 802401D4 00031080 */ sll $v0, $v1, 2 /* 9953C8 802401D8 3C018024 */ lui $at, %hi(jtbl_80242D50_997F40) /* 9953CC 802401DC 00220821 */ addu $at, $at, $v0 @@ -62,10 +62,10 @@ glabel L802401EC_9953DC /* 99547C 8024028C 00021400 */ sll $v0, $v0, 0x10 /* 995480 80240290 00021403 */ sra $v0, $v0, 0x10 /* 995484 80240294 0043102A */ slt $v0, $v0, $v1 -/* 995488 80240298 14400058 */ bnez $v0, .L802403FC +/* 995488 80240298 14400058 */ bnez $v0, L802403FC_9955EC /* 99548C 8024029C 24020001 */ addiu $v0, $zero, 1 /* 995490 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* 995494 802402A4 080900FF */ j .L802403FC +/* 995494 802402A4 080900FF */ j L802403FC_9955EC /* 995498 802402A8 A6200046 */ sh $zero, 0x46($s1) glabel L802402AC_99549C /* 99549C 802402AC 96220046 */ lhu $v0, 0x46($s1) @@ -74,7 +74,7 @@ glabel L802402AC_99549C /* 9954A8 802402B8 00021400 */ sll $v0, $v0, 0x10 /* 9954AC 802402BC 00021403 */ sra $v0, $v0, 0x10 /* 9954B0 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* 9954B4 802402C4 1440004D */ bnez $v0, .L802403FC +/* 9954B4 802402C4 1440004D */ bnez $v0, L802403FC_9955EC /* 9954B8 802402C8 24020002 */ addiu $v0, $zero, 2 /* 9954BC 802402CC 8E230050 */ lw $v1, 0x50($s1) /* 9954C0 802402D0 A6220044 */ sh $v0, 0x44($s1) @@ -84,7 +84,7 @@ glabel L802402AC_99549C /* 9954D0 802402E0 AC620070 */ sw $v0, 0x70($v1) /* 9954D4 802402E4 8E220050 */ lw $v0, 0x50($s1) /* 9954D8 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* 9954DC 802402EC 080900FF */ j .L802403FC +/* 9954DC 802402EC 080900FF */ j L802403FC_9955EC /* 9954E0 802402F0 AC400074 */ sw $zero, 0x74($v0) glabel L802402F4_9954E4 /* 9954E4 802402F4 96220046 */ lhu $v0, 0x46($s1) @@ -93,7 +93,7 @@ glabel L802402F4_9954E4 /* 9954F0 80240300 00021400 */ sll $v0, $v0, 0x10 /* 9954F4 80240304 00021403 */ sra $v0, $v0, 0x10 /* 9954F8 80240308 2842003C */ slti $v0, $v0, 0x3c -/* 9954FC 8024030C 1440003B */ bnez $v0, .L802403FC +/* 9954FC 8024030C 1440003B */ bnez $v0, L802403FC_9955EC /* 995500 80240310 00000000 */ nop /* 995504 80240314 3C013F80 */ lui $at, 0x3f80 /* 995508 80240318 44810000 */ mtc1 $at, $f0 @@ -125,7 +125,7 @@ glabel L802402F4_9954E4 /* 995570 80240380 A6200046 */ sh $zero, 0x46($s1) /* 995574 80240384 AE20002C */ sw $zero, 0x2c($s1) /* 995578 80240388 A6220048 */ sh $v0, 0x48($s1) -/* 99557C 8024038C 080900FF */ j .L802403FC +/* 99557C 8024038C 080900FF */ j L802403FC_9955EC /* 995580 80240390 E6200030 */ swc1 $f0, 0x30($s1) glabel L80240394_995584 /* 995584 80240394 0000202D */ daddu $a0, $zero, $zero @@ -142,7 +142,7 @@ glabel L80240394_995584 /* 9955B0 802403C0 00021400 */ sll $v0, $v0, 0x10 /* 9955B4 802403C4 00021403 */ sra $v0, $v0, 0x10 /* 9955B8 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* 9955BC 802403CC 1440000B */ bnez $v0, .L802403FC +/* 9955BC 802403CC 1440000B */ bnez $v0, L802403FC_9955EC /* 9955C0 802403D0 24030001 */ addiu $v1, $zero, 1 /* 9955C4 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) /* 9955C8 802403D8 24020002 */ addiu $v0, $zero, 2 @@ -154,7 +154,6 @@ glabel L80240394_995584 /* 9955E0 802403F0 A6220044 */ sh $v0, 0x44($s1) /* 9955E4 802403F4 A6200046 */ sh $zero, 0x46($s1) /* 9955E8 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -.L802403FC: glabel L802403FC_9955EC /* 9955EC 802403FC 8623004A */ lh $v1, 0x4a($s1) /* 9955F0 80240400 24020001 */ addiu $v0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s b/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s index de7071144c..d356bb21cd 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s @@ -134,7 +134,7 @@ glabel func_80240394_998304 /* 9984F0 80240580 8E220090 */ lw $v0, 0x90($s1) /* 9984F4 80240584 1840000C */ blez $v0, .L802405B8 /* 9984F8 80240588 2442FFFF */ addiu $v0, $v0, -1 -/* 9984FC 8024058C 14400087 */ bnez $v0, .L802407AC +/* 9984FC 8024058C 14400087 */ bnez $v0, L802407AC_99871C /* 998500 80240590 AE220090 */ sw $v0, 0x90($s1) /* 998504 80240594 3C03FFAA */ lui $v1, 0xffaa /* 998508 80240598 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240394_998304 .L802406C0: /* 998630 802406C0 AE420028 */ sw $v0, 0x28($s2) /* 998634 802406C4 24020007 */ addiu $v0, $zero, 7 -/* 998638 802406C8 080901EB */ j .L802407AC +/* 998638 802406C8 080901EB */ j L802407AC_99871C /* 99863C 802406CC AE220090 */ sw $v0, 0x90($s1) .L802406D0: /* 998640 802406D0 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240394_998304 /* 9986D4 80240764 A22000B5 */ sb $zero, 0xb5($s1) .L80240768: /* 9986D8 80240768 8E22008C */ lw $v0, 0x8c($s1) -/* 9986DC 8024076C 1040000F */ beqz $v0, .L802407AC +/* 9986DC 8024076C 1040000F */ beqz $v0, L802407AC_99871C /* 9986E0 80240770 3C03FFAA */ lui $v1, 0xffaa /* 9986E4 80240774 8E420028 */ lw $v0, 0x28($s2) /* 9986E8 80240778 3463FFFC */ ori $v1, $v1, 0xfffc /* 9986EC 8024077C 00431821 */ addu $v1, $v0, $v1 /* 9986F0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9986F4 80240784 10400009 */ beqz $v0, .L802407AC +/* 9986F4 80240784 10400009 */ beqz $v0, L802407AC_99871C /* 9986F8 80240788 00031080 */ sll $v0, $v1, 2 /* 9986FC 8024078C 3C018024 */ lui $at, %hi(jtbl_80241778_9996E8) /* 998700 80240790 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L802407A0_998710 /* 998710 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 998714 802407A4 24420001 */ addiu $v0, $v0, 1 /* 998718 802407A8 AE420028 */ sw $v0, 0x28($s2) -.L802407AC: glabel L802407AC_99871C /* 99871C 802407AC 0000102D */ daddu $v0, $zero, $zero .L802407B0: diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s index 554e82a5c9..82017da6e5 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s @@ -66,7 +66,7 @@ glabel func_80241D70_911420 .L80241E60: /* 911510 80241E60 8E830070 */ lw $v1, 0x70($s4) /* 911514 80241E64 2C620016 */ sltiu $v0, $v1, 0x16 -/* 911518 80241E68 10400036 */ beqz $v0, .L80241F44 +/* 911518 80241E68 10400036 */ beqz $v0, L80241F44_9115F4 /* 91151C 80241E6C 00031080 */ sll $v0, $v1, 2 /* 911520 80241E70 3C018024 */ lui $at, %hi(jtbl_802463D8_915A88) /* 911524 80241E74 00220821 */ addu $at, $at, $v0 @@ -129,7 +129,6 @@ glabel L80241F34_9115E4 /* 9115E8 80241F38 0200282D */ daddu $a1, $s0, $zero /* 9115EC 80241F3C 0C09073C */ jal func_80241CF0_9113A0 /* 9115F0 80241F40 0260302D */ daddu $a2, $s3, $zero -.L80241F44: glabel L80241F44_9115F4 /* 9115F4 80241F44 0000102D */ daddu $v0, $zero, $zero .L80241F48: diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s index f444a552e3..e1693ed554 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s @@ -101,7 +101,7 @@ glabel func_80241F6C_91161C .L802420D8: /* 911788 802420D8 8E630070 */ lw $v1, 0x70($s3) /* 91178C 802420DC 2C620064 */ sltiu $v0, $v1, 0x64 -/* 911790 802420E0 10400060 */ beqz $v0, .L80242264 +/* 911790 802420E0 10400060 */ beqz $v0, L80242264_911914 /* 911794 802420E4 00031080 */ sll $v0, $v1, 2 /* 911798 802420E8 3C018024 */ lui $at, %hi(jtbl_80246430_915AE0) /* 91179C 802420EC 00220821 */ addu $at, $at, $v0 @@ -118,7 +118,7 @@ glabel L8024210C_9117BC /* 9117C0 80242110 0200282D */ daddu $a1, $s0, $zero /* 9117C4 80242114 0C0125AE */ jal func_800496B8 /* 9117C8 80242118 02A0302D */ daddu $a2, $s5, $zero -/* 9117CC 8024211C 08090899 */ j .L80242264 +/* 9117CC 8024211C 08090899 */ j L80242264_911914 /* 9117D0 80242120 00000000 */ nop glabel L80242124_9117D4 /* 9117D4 80242124 0260202D */ daddu $a0, $s3, $zero @@ -130,7 +130,7 @@ glabel L80242134_9117E4 /* 9117E8 80242138 0200282D */ daddu $a1, $s0, $zero /* 9117EC 8024213C 0C012701 */ jal func_80049C04 /* 9117F0 80242140 02A0302D */ daddu $a2, $s5, $zero -/* 9117F4 80242144 08090899 */ j .L80242264 +/* 9117F4 80242144 08090899 */ j L80242264_911914 /* 9117F8 80242148 00000000 */ nop glabel L8024214C_9117FC /* 9117FC 8024214C 0260202D */ daddu $a0, $s3, $zero @@ -142,7 +142,7 @@ glabel L8024215C_91180C /* 911810 80242160 0200282D */ daddu $a1, $s0, $zero /* 911814 80242164 0C0127B3 */ jal func_80049ECC /* 911818 80242168 02A0302D */ daddu $a2, $s5, $zero -/* 91181C 8024216C 08090899 */ j .L80242264 +/* 91181C 8024216C 08090899 */ j L80242264_911914 /* 911820 80242170 00000000 */ nop glabel L80242174_911824 /* 911824 80242174 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -170,7 +170,7 @@ glabel L80242174_911824 /* 911878 802421C8 02A0382D */ daddu $a3, $s5, $zero /* 91187C 802421CC 8E630070 */ lw $v1, 0x70($s3) /* 911880 802421D0 2402000C */ addiu $v0, $zero, 0xc -/* 911884 802421D4 14620023 */ bne $v1, $v0, .L80242264 +/* 911884 802421D4 14620023 */ bne $v1, $v0, L80242264_911914 /* 911888 802421D8 00000000 */ nop /* 91188C 802421DC 0260202D */ daddu $a0, $s3, $zero .L802421E0: @@ -182,39 +182,38 @@ glabel L802421EC_91189C /* 9118A0 802421F0 0200282D */ daddu $a1, $s0, $zero /* 9118A4 802421F4 0C012849 */ jal func_8004A124 /* 9118A8 802421F8 02A0302D */ daddu $a2, $s5, $zero -/* 9118AC 802421FC 08090899 */ j .L80242264 +/* 9118AC 802421FC 08090899 */ j L80242264_911914 /* 9118B0 80242200 00000000 */ nop glabel L80242204_9118B4 /* 9118B4 80242204 0260202D */ daddu $a0, $s3, $zero /* 9118B8 80242208 0200282D */ daddu $a1, $s0, $zero /* 9118BC 8024220C 0C0128FA */ jal func_8004A3E8 /* 9118C0 80242210 02A0302D */ daddu $a2, $s5, $zero -/* 9118C4 80242214 08090899 */ j .L80242264 +/* 9118C4 80242214 08090899 */ j L80242264_911914 /* 9118C8 80242218 00000000 */ nop glabel L8024221C_9118CC /* 9118CC 8024221C 0C090215 */ jal func_80240854_90FF04 /* 9118D0 80242220 0260202D */ daddu $a0, $s3, $zero -/* 9118D4 80242224 08090899 */ j .L80242264 +/* 9118D4 80242224 08090899 */ j L80242264_911914 /* 9118D8 80242228 00000000 */ nop glabel L8024222C_9118DC /* 9118DC 8024222C 0C090255 */ jal iwa_01_UnkSetDurationFunc /* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero -/* 9118E4 80242234 08090899 */ j .L80242264 +/* 9118E4 80242234 08090899 */ j L80242264_911914 /* 9118E8 80242238 00000000 */ nop glabel L8024223C_9118EC /* 9118EC 8024223C 0C090266 */ jal iwa_01_UnkNpcAIFunc9 /* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero -/* 9118F4 80242244 08090899 */ j .L80242264 +/* 9118F4 80242244 08090899 */ j L80242264_911914 /* 9118F8 80242248 00000000 */ nop glabel L8024224C_9118FC /* 9118FC 8024224C 0C09028E */ jal iwa_01_UnkDurationCheck /* 911900 80242250 0260202D */ daddu $a0, $s3, $zero -/* 911904 80242254 08090899 */ j .L80242264 +/* 911904 80242254 08090899 */ j L80242264_911914 /* 911908 80242258 00000000 */ nop glabel L8024225C_91190C /* 91190C 8024225C 0C0129CF */ jal func_8004A73C /* 911910 80242260 0260202D */ daddu $a0, $s3, $zero -.L80242264: glabel L80242264_911914 /* 911914 80242264 8FBF0048 */ lw $ra, 0x48($sp) /* 911918 80242268 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s index f921af6e99..253fd320c5 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s @@ -93,7 +93,7 @@ glabel func_80242F54_912604 .L802430A4: /* 912754 802430A4 8E630070 */ lw $v1, 0x70($s3) /* 912758 802430A8 2C620035 */ sltiu $v0, $v1, 0x35 -/* 91275C 802430AC 10400073 */ beqz $v0, .L8024327C +/* 91275C 802430AC 10400073 */ beqz $v0, L8024327C_91292C /* 912760 802430B0 00031080 */ sll $v0, $v1, 2 /* 912764 802430B4 3C018024 */ lui $at, %hi(jtbl_802465E8_915C98) /* 912768 802430B8 00220821 */ addu $at, $at, $v0 @@ -170,7 +170,7 @@ glabel L802431A0_912850 /* 912860 802431B0 14400033 */ bnez $v0, .L80243280 /* 912864 802431B4 0000102D */ daddu $v0, $zero, $zero /* 912868 802431B8 24020028 */ addiu $v0, $zero, 0x28 -/* 91286C 802431BC 08090C9F */ j .L8024327C +/* 91286C 802431BC 08090C9F */ j L8024327C_91292C /* 912870 802431C0 AE620070 */ sw $v0, 0x70($s3) glabel L802431C4_912874 /* 912874 802431C4 0260202D */ daddu $a0, $s3, $zero @@ -226,7 +226,6 @@ glabel L8024326C_91291C /* 912920 80243270 0280282D */ daddu $a1, $s4, $zero /* 912924 80243274 0C090BC4 */ jal dup_iwa_01_UnkDurationCheck /* 912928 80243278 0200302D */ daddu $a2, $s0, $zero -.L8024327C: glabel L8024327C_91292C /* 91292C 8024327C 0000102D */ daddu $v0, $zero, $zero .L80243280: diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s index 3dbf4d5f74..a2dc3cf23d 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s @@ -93,7 +93,7 @@ glabel func_80240C90_916A00 .L80240DE0: /* 916B50 80240DE0 8E630070 */ lw $v1, 0x70($s3) /* 916B54 80240DE4 2C620035 */ sltiu $v0, $v1, 0x35 -/* 916B58 80240DE8 10400073 */ beqz $v0, .L80240FB8 +/* 916B58 80240DE8 10400073 */ beqz $v0, L80240FB8_916D28 /* 916B5C 80240DEC 00031080 */ sll $v0, $v1, 2 /* 916B60 80240DF0 3C018024 */ lui $at, %hi(jtbl_80242D68_918AD8) /* 916B64 80240DF4 00220821 */ addu $at, $at, $v0 @@ -170,7 +170,7 @@ glabel L80240EDC_916C4C /* 916C5C 80240EEC 14400033 */ bnez $v0, .L80240FBC /* 916C60 80240EF0 0000102D */ daddu $v0, $zero, $zero /* 916C64 80240EF4 24020028 */ addiu $v0, $zero, 0x28 -/* 916C68 80240EF8 080903EE */ j .L80240FB8 +/* 916C68 80240EF8 080903EE */ j L80240FB8_916D28 /* 916C6C 80240EFC AE620070 */ sw $v0, 0x70($s3) glabel L80240F00_916C70 /* 916C70 80240F00 0260202D */ daddu $a0, $s3, $zero @@ -226,7 +226,6 @@ glabel L80240FA8_916D18 /* 916D1C 80240FAC 0280282D */ daddu $a1, $s4, $zero /* 916D20 80240FB0 0C090313 */ jal iwa_02_UnkDurationCheck /* 916D24 80240FB4 0200302D */ daddu $a2, $s0, $zero -.L80240FB8: glabel L80240FB8_916D28 /* 916D28 80240FB8 0000102D */ daddu $v0, $zero, $zero .L80240FBC: diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s index 0925f74da4..59f26cb92a 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s @@ -93,7 +93,7 @@ glabel func_80240FD0_919B80 .L80241120: /* 919CD0 80241120 8E630070 */ lw $v1, 0x70($s3) /* 919CD4 80241124 2C620035 */ sltiu $v0, $v1, 0x35 -/* 919CD8 80241128 10400073 */ beqz $v0, .L802412F8 +/* 919CD8 80241128 10400073 */ beqz $v0, L802412F8_919EA8 /* 919CDC 8024112C 00031080 */ sll $v0, $v1, 2 /* 919CE0 80241130 3C018024 */ lui $at, %hi(jtbl_80242C58_91B808) /* 919CE4 80241134 00220821 */ addu $at, $at, $v0 @@ -170,7 +170,7 @@ glabel L8024121C_919DCC /* 919DDC 8024122C 14400033 */ bnez $v0, .L802412FC /* 919DE0 80241230 0000102D */ daddu $v0, $zero, $zero /* 919DE4 80241234 24020028 */ addiu $v0, $zero, 0x28 -/* 919DE8 80241238 080904BE */ j .L802412F8 +/* 919DE8 80241238 080904BE */ j L802412F8_919EA8 /* 919DEC 8024123C AE620070 */ sw $v0, 0x70($s3) glabel L80241240_919DF0 /* 919DF0 80241240 0260202D */ daddu $a0, $s3, $zero @@ -226,7 +226,6 @@ glabel L802412E8_919E98 /* 919E9C 802412EC 0280282D */ daddu $a1, $s4, $zero /* 919EA0 802412F0 0C0903E3 */ jal iwa_03_UnkDurationCheck /* 919EA4 802412F4 0200302D */ daddu $a2, $s0, $zero -.L802412F8: glabel L802412F8_919EA8 /* 919EA8 802412F8 0000102D */ daddu $v0, $zero, $zero .L802412FC: diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s index f1a45728f6..c6045d12c3 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s @@ -93,7 +93,7 @@ glabel func_80240D10_91C5F0 .L80240E60: /* 91C740 80240E60 8E630070 */ lw $v1, 0x70($s3) /* 91C744 80240E64 2C620035 */ sltiu $v0, $v1, 0x35 -/* 91C748 80240E68 10400073 */ beqz $v0, .L80241038 +/* 91C748 80240E68 10400073 */ beqz $v0, L80241038_91C918 /* 91C74C 80240E6C 00031080 */ sll $v0, $v1, 2 /* 91C750 80240E70 3C018024 */ lui $at, %hi(jtbl_80242BB8_91E498) /* 91C754 80240E74 00220821 */ addu $at, $at, $v0 @@ -170,7 +170,7 @@ glabel L80240F5C_91C83C /* 91C84C 80240F6C 14400033 */ bnez $v0, .L8024103C /* 91C850 80240F70 0000102D */ daddu $v0, $zero, $zero /* 91C854 80240F74 24020028 */ addiu $v0, $zero, 0x28 -/* 91C858 80240F78 0809040E */ j .L80241038 +/* 91C858 80240F78 0809040E */ j L80241038_91C918 /* 91C85C 80240F7C AE620070 */ sw $v0, 0x70($s3) glabel L80240F80_91C860 /* 91C860 80240F80 0260202D */ daddu $a0, $s3, $zero @@ -226,7 +226,6 @@ glabel L80241028_91C908 /* 91C90C 8024102C 0280282D */ daddu $a1, $s4, $zero /* 91C910 80241030 0C090333 */ jal iwa_04_UnkDurationCheck /* 91C914 80241034 0200302D */ daddu $a2, $s0, $zero -.L80241038: glabel L80241038_91C918 /* 91C918 80241038 0000102D */ daddu $v0, $zero, $zero .L8024103C: diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s index df58dae312..4293a6cf87 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s @@ -29,7 +29,7 @@ glabel func_80241338_B21878 /* B218D8 80241398 3C03FF4A */ lui $v1, 0xff4a /* B218DC 8024139C 00431821 */ addu $v1, $v0, $v1 /* B218E0 802413A0 2C62000D */ sltiu $v0, $v1, 0xd -/* B218E4 802413A4 1040000B */ beqz $v0, .L802413D4 +/* B218E4 802413A4 1040000B */ beqz $v0, L802413D4_B21914 /* B218E8 802413A8 00031080 */ sll $v0, $v1, 2 /* B218EC 802413AC 3C018024 */ lui $at, %hi(jtbl_80247AB8_B27FF8) /* B218F0 802413B0 00220821 */ addu $at, $at, $v0 @@ -38,11 +38,10 @@ glabel func_80241338_B21878 /* B218FC 802413BC 00000000 */ nop glabel L802413C0_B21900 /* B21900 802413C0 8E020000 */ lw $v0, ($s0) -/* B21904 802413C4 04410003 */ bgez $v0, .L802413D4 +/* B21904 802413C4 04410003 */ bgez $v0, L802413D4_B21914 /* B21908 802413C8 00000000 */ nop /* B2190C 802413CC 0000B02D */ daddu $s6, $zero, $zero /* B21910 802413D0 AE000000 */ sw $zero, ($s0) -.L802413D4: glabel L802413D4_B21914 /* B21914 802413D4 1AE00065 */ blez $s7, .L8024156C /* B21918 802413D8 0000A02D */ daddu $s4, $zero, $zero 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 339f7a1475..e92e5690e2 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 @@ -86,7 +86,7 @@ glabel func_80240F30_B28F60 .L80241070: /* B290A0 80241070 8E630070 */ lw $v1, 0x70($s3) /* B290A4 80241074 2C62000F */ sltiu $v0, $v1, 0xf -/* B290A8 80241078 1040002C */ beqz $v0, .L8024112C +/* B290A8 80241078 1040002C */ beqz $v0, L8024112C_B2915C /* B290AC 8024107C 00031080 */ sll $v0, $v1, 2 /* B290B0 80241080 3C018024 */ lui $at, %hi(jtbl_802443F8_B2C428) /* B290B4 80241084 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L8024111C_B2914C /* B29150 80241120 0280282D */ daddu $a1, $s4, $zero /* B29154 80241124 0C0903BB */ jal jan_01_UnkDurationCheck /* B29158 80241128 0200302D */ daddu $a2, $s0, $zero -.L8024112C: glabel L8024112C_B2915C /* B2915C 8024112C 0000102D */ daddu $v0, $zero, $zero .L80241130: diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s index f0b8eec076..611983d58b 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s @@ -122,7 +122,7 @@ glabel func_80240FC4_B2D434 .L80241184: /* B2D5F4 80241184 8E830070 */ lw $v1, 0x70($s4) /* B2D5F8 80241188 2C620064 */ sltiu $v0, $v1, 0x64 -/* B2D5FC 8024118C 10400042 */ beqz $v0, .L80241298 +/* B2D5FC 8024118C 10400042 */ beqz $v0, L80241298_B2D708 /* B2D600 80241190 00031080 */ sll $v0, $v1, 2 /* B2D604 80241194 3C018025 */ lui $at, %hi(jtbl_802485D0_B34A40) /* B2D608 80241198 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L802411B8_B2D628 /* B2D62C 802411BC 0260282D */ daddu $a1, $s3, $zero /* B2D630 802411C0 0C090162 */ jal func_80240588_B2C9F8 /* B2D634 802411C4 02A0302D */ daddu $a2, $s5, $zero -/* B2D638 802411C8 080904A6 */ j .L80241298 +/* B2D638 802411C8 080904A6 */ j L80241298_B2D708 /* B2D63C 802411CC 00000000 */ nop glabel L802411D0_B2D640 /* B2D640 802411D0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L802411E0_B2D650 /* B2D654 802411E4 0260282D */ daddu $a1, $s3, $zero /* B2D658 802411E8 0C09023C */ jal func_802408F0_B2CD60 /* B2D65C 802411EC 02A0302D */ daddu $a2, $s5, $zero -/* B2D660 802411F0 080904A6 */ j .L80241298 +/* B2D660 802411F0 080904A6 */ j L80241298_B2D708 /* B2D664 802411F4 00000000 */ nop glabel L802411F8_B2D668 /* B2D668 802411F8 0280202D */ daddu $a0, $s4, $zero /* B2D66C 802411FC 0260282D */ daddu $a1, $s3, $zero /* B2D670 80241200 0C0902AB */ jal func_80240AAC_B2CF1C /* B2D674 80241204 02A0302D */ daddu $a2, $s5, $zero -/* B2D678 80241208 080904A6 */ j .L80241298 +/* B2D678 80241208 080904A6 */ j L80241298_B2D708 /* B2D67C 8024120C 00000000 */ nop glabel L80241210_B2D680 /* B2D680 80241210 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80241220_B2D690 /* B2D694 80241224 0260282D */ daddu $a1, $s3, $zero /* B2D698 80241228 0C0902F5 */ jal jan_02_NpcJumpFunc /* B2D69C 8024122C 02A0302D */ daddu $a2, $s5, $zero -/* B2D6A0 80241230 080904A6 */ j .L80241298 +/* B2D6A0 80241230 080904A6 */ j L80241298_B2D708 /* B2D6A4 80241234 00000000 */ nop glabel L80241238_B2D6A8 /* B2D6A8 80241238 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80241248_B2D6B8 /* B2D6BC 8024124C 0260282D */ daddu $a1, $s3, $zero /* B2D6C0 80241250 0C09035F */ jal func_80240D7C_B2D1EC /* B2D6C4 80241254 02A0302D */ daddu $a2, $s5, $zero -/* B2D6C8 80241258 080904A6 */ j .L80241298 +/* B2D6C8 80241258 080904A6 */ j L80241298_B2D708 /* B2D6CC 8024125C 00000000 */ nop glabel L80241260_B2D6D0 /* B2D6D0 80241260 0280202D */ daddu $a0, $s4, $zero /* B2D6D4 80241264 0260282D */ daddu $a1, $s3, $zero /* B2D6D8 80241268 0C0903A7 */ jal jan_02_UnkNpcDurationFlagFunc /* B2D6DC 8024126C 02A0302D */ daddu $a2, $s5, $zero -/* B2D6E0 80241270 080904A6 */ j .L80241298 +/* B2D6E0 80241270 080904A6 */ j L80241298_B2D708 /* B2D6E4 80241274 00000000 */ nop glabel L80241278_B2D6E8 /* B2D6E8 80241278 0280202D */ daddu $a0, $s4, $zero /* B2D6EC 8024127C 0260282D */ daddu $a1, $s3, $zero /* B2D6F0 80241280 0C0903C1 */ jal func_80240F04_B2D374 /* B2D6F4 80241284 02A0302D */ daddu $a2, $s5, $zero -/* B2D6F8 80241288 080904A6 */ j .L80241298 +/* B2D6F8 80241288 080904A6 */ j L80241298_B2D708 /* B2D6FC 8024128C 00000000 */ nop glabel L80241290_B2D700 /* B2D700 80241290 0C0129CF */ jal func_8004A73C /* B2D704 80241294 0280202D */ daddu $a0, $s4, $zero -.L80241298: glabel L80241298_B2D708 /* B2D708 80241298 8FBF0060 */ lw $ra, 0x60($sp) /* B2D70C 8024129C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index 749fad5ad3..db866bb254 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -122,7 +122,7 @@ glabel func_802411B4_B35D84 .L80241374: /* B35F44 80241374 8E830070 */ lw $v1, 0x70($s4) /* B35F48 80241378 2C620064 */ sltiu $v0, $v1, 0x64 -/* B35F4C 8024137C 10400042 */ beqz $v0, .L80241488 +/* B35F4C 8024137C 10400042 */ beqz $v0, L80241488_B36058 /* B35F50 80241380 00031080 */ sll $v0, $v1, 2 /* B35F54 80241384 3C018025 */ lui $at, %hi(jtbl_8024FA00_B445D0) /* B35F58 80241388 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L802413A8_B35F78 /* B35F7C 802413AC 0260282D */ daddu $a1, $s3, $zero /* B35F80 802413B0 0C0901DE */ jal func_80240778_B35348 /* B35F84 802413B4 02A0302D */ daddu $a2, $s5, $zero -/* B35F88 802413B8 08090522 */ j .L80241488 +/* B35F88 802413B8 08090522 */ j L80241488_B36058 /* B35F8C 802413BC 00000000 */ nop glabel L802413C0_B35F90 /* B35F90 802413C0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L802413D0_B35FA0 /* B35FA4 802413D4 0260282D */ daddu $a1, $s3, $zero /* B35FA8 802413D8 0C0902B8 */ jal func_80240AE0_B356B0 /* B35FAC 802413DC 02A0302D */ daddu $a2, $s5, $zero -/* B35FB0 802413E0 08090522 */ j .L80241488 +/* B35FB0 802413E0 08090522 */ j L80241488_B36058 /* B35FB4 802413E4 00000000 */ nop glabel L802413E8_B35FB8 /* B35FB8 802413E8 0280202D */ daddu $a0, $s4, $zero /* B35FBC 802413EC 0260282D */ daddu $a1, $s3, $zero /* B35FC0 802413F0 0C090327 */ jal func_80240C9C_B3586C /* B35FC4 802413F4 02A0302D */ daddu $a2, $s5, $zero -/* B35FC8 802413F8 08090522 */ j .L80241488 +/* B35FC8 802413F8 08090522 */ j L80241488_B36058 /* B35FCC 802413FC 00000000 */ nop glabel L80241400_B35FD0 /* B35FD0 80241400 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80241410_B35FE0 /* B35FE4 80241414 0260282D */ daddu $a1, $s3, $zero /* B35FE8 80241418 0C090371 */ jal jan_03_NpcJumpFunc /* B35FEC 8024141C 02A0302D */ daddu $a2, $s5, $zero -/* B35FF0 80241420 08090522 */ j .L80241488 +/* B35FF0 80241420 08090522 */ j L80241488_B36058 /* B35FF4 80241424 00000000 */ nop glabel L80241428_B35FF8 /* B35FF8 80241428 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80241438_B36008 /* B3600C 8024143C 0260282D */ daddu $a1, $s3, $zero /* B36010 80241440 0C0903DB */ jal func_80240F6C_B35B3C /* B36014 80241444 02A0302D */ daddu $a2, $s5, $zero -/* B36018 80241448 08090522 */ j .L80241488 +/* B36018 80241448 08090522 */ j L80241488_B36058 /* B3601C 8024144C 00000000 */ nop glabel L80241450_B36020 /* B36020 80241450 0280202D */ daddu $a0, $s4, $zero /* B36024 80241454 0260282D */ daddu $a1, $s3, $zero /* B36028 80241458 0C090423 */ jal jan_03_UnkNpcDurationFlagFunc /* B3602C 8024145C 02A0302D */ daddu $a2, $s5, $zero -/* B36030 80241460 08090522 */ j .L80241488 +/* B36030 80241460 08090522 */ j L80241488_B36058 /* B36034 80241464 00000000 */ nop glabel L80241468_B36038 /* B36038 80241468 0280202D */ daddu $a0, $s4, $zero /* B3603C 8024146C 0260282D */ daddu $a1, $s3, $zero /* B36040 80241470 0C09043D */ jal func_802410F4_B35CC4 /* B36044 80241474 02A0302D */ daddu $a2, $s5, $zero -/* B36048 80241478 08090522 */ j .L80241488 +/* B36048 80241478 08090522 */ j L80241488_B36058 /* B3604C 8024147C 00000000 */ nop glabel L80241480_B36050 /* B36050 80241480 0C0129CF */ jal func_8004A73C /* B36054 80241484 0280202D */ daddu $a0, $s4, $zero -.L80241488: glabel L80241488_B36058 /* B36058 80241488 8FBF0060 */ lw $ra, 0x60($sp) /* B3605C 8024148C 8FB5005C */ lw $s5, 0x5c($sp) 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 23bc096aa0..ee1579c2a1 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 @@ -86,7 +86,7 @@ glabel func_80241494_B4BF04 .L802415D4: /* B4C044 802415D4 8E630070 */ lw $v1, 0x70($s3) /* B4C048 802415D8 2C62000F */ sltiu $v0, $v1, 0xf -/* B4C04C 802415DC 1040002C */ beqz $v0, .L80241690 +/* B4C04C 802415DC 1040002C */ beqz $v0, L80241690_B4C100 /* B4C050 802415E0 00031080 */ sll $v0, $v1, 2 /* B4C054 802415E4 3C018024 */ lui $at, %hi(jtbl_80247A38_B524A8) /* B4C058 802415E8 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L80241680_B4C0F0 /* B4C0F4 80241684 0280282D */ daddu $a1, $s4, $zero /* B4C0F8 80241688 0C090514 */ jal jan_05_UnkDurationCheck /* B4C0FC 8024168C 0200302D */ daddu $a2, $s0, $zero -.L80241690: glabel L80241690_B4C100 /* B4C100 80241690 0000102D */ daddu $v0, $zero, $zero .L80241694: diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s index 4c651b333d..60503c8998 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s @@ -98,7 +98,7 @@ glabel func_80241EE8_B4C958 .L80242048: /* B4CAB8 80242048 8E430070 */ lw $v1, 0x70($s2) /* B4CABC 8024204C 2C620064 */ sltiu $v0, $v1, 0x64 -/* B4CAC0 80242050 10400048 */ beqz $v0, .L80242174 +/* B4CAC0 80242050 10400048 */ beqz $v0, L80242174_B4CBE4 /* B4CAC4 80242054 00031080 */ sll $v0, $v1, 2 /* B4CAC8 80242058 3C018024 */ lui $at, %hi(jtbl_80247A98_B52508) /* B4CACC 8024205C 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L8024207C_B4CAEC /* B4CAF0 80242080 0260282D */ daddu $a1, $s3, $zero /* B4CAF4 80242084 0C0125AE */ jal func_800496B8 /* B4CAF8 80242088 0280302D */ daddu $a2, $s4, $zero -/* B4CAFC 8024208C 0809085D */ j .L80242174 +/* B4CAFC 8024208C 0809085D */ j L80242174_B4CBE4 /* B4CB00 80242090 00000000 */ nop glabel L80242094_B4CB04 /* B4CB04 80242094 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L802420A4_B4CB14 /* B4CB18 802420A8 0260282D */ daddu $a1, $s3, $zero /* B4CB1C 802420AC 0C012701 */ jal func_80049C04 /* B4CB20 802420B0 0280302D */ daddu $a2, $s4, $zero -/* B4CB24 802420B4 0809085D */ j .L80242174 +/* B4CB24 802420B4 0809085D */ j L80242174_B4CBE4 /* B4CB28 802420B8 00000000 */ nop glabel L802420BC_B4CB2C /* B4CB2C 802420BC 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L802420CC_B4CB3C /* B4CB40 802420D0 0260282D */ daddu $a1, $s3, $zero /* B4CB44 802420D4 0C0127B3 */ jal func_80049ECC /* B4CB48 802420D8 0280302D */ daddu $a2, $s4, $zero -/* B4CB4C 802420DC 0809085D */ j .L80242174 +/* B4CB4C 802420DC 0809085D */ j L80242174_B4CBE4 /* B4CB50 802420E0 00000000 */ nop glabel L802420E4_B4CB54 /* B4CB54 802420E4 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L802420F4_B4CB64 /* B4CB68 802420F8 0260282D */ daddu $a1, $s3, $zero /* B4CB6C 802420FC 0C012849 */ jal func_8004A124 /* B4CB70 80242100 0280302D */ daddu $a2, $s4, $zero -/* B4CB74 80242104 0809085D */ j .L80242174 +/* B4CB74 80242104 0809085D */ j L80242174_B4CBE4 /* B4CB78 80242108 00000000 */ nop glabel L8024210C_B4CB7C /* B4CB7C 8024210C 0240202D */ daddu $a0, $s2, $zero /* B4CB80 80242110 0260282D */ daddu $a1, $s3, $zero /* B4CB84 80242114 0C0128FA */ jal func_8004A3E8 /* B4CB88 80242118 0280302D */ daddu $a2, $s4, $zero -/* B4CB8C 8024211C 0809085D */ j .L80242174 +/* B4CB8C 8024211C 0809085D */ j L80242174_B4CBE4 /* B4CB90 80242120 00000000 */ nop glabel L80242124_B4CB94 /* B4CB94 80242124 0C090633 */ jal jan_05_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L8024212C_B4CB9C /* B4CBA0 80242130 0240202D */ daddu $a0, $s2, $zero /* B4CBA4 80242134 8E430070 */ lw $v1, 0x70($s2) /* B4CBA8 80242138 24020020 */ addiu $v0, $zero, 0x20 -/* B4CBAC 8024213C 1462000D */ bne $v1, $v0, .L80242174 +/* B4CBAC 8024213C 1462000D */ bne $v1, $v0, L80242174_B4CBE4 /* B4CBB0 80242140 00000000 */ nop glabel L80242144_B4CBB4 /* B4CBB4 80242144 0C09066A */ jal jan_05_UnkNpcAIFunc8 /* B4CBB8 80242148 0240202D */ daddu $a0, $s2, $zero /* B4CBBC 8024214C 8E430070 */ lw $v1, 0x70($s2) /* B4CBC0 80242150 24020021 */ addiu $v0, $zero, 0x21 -/* B4CBC4 80242154 14620007 */ bne $v1, $v0, .L80242174 +/* B4CBC4 80242154 14620007 */ bne $v1, $v0, L80242174_B4CBE4 /* B4CBC8 80242158 00000000 */ nop glabel L8024215C_B4CBCC /* B4CBCC 8024215C 0C0906A0 */ jal jan_05_UnkNpcAIFunc5 /* B4CBD0 80242160 0240202D */ daddu $a0, $s2, $zero -/* B4CBD4 80242164 0809085D */ j .L80242174 +/* B4CBD4 80242164 0809085D */ j L80242174_B4CBE4 /* B4CBD8 80242168 00000000 */ nop glabel L8024216C_B4CBDC /* B4CBDC 8024216C 0C0129CF */ jal func_8004A73C /* B4CBE0 80242170 0240202D */ daddu $a0, $s2, $zero -.L80242174: glabel L80242174_B4CBE4 /* B4CBE4 80242174 8FBF0048 */ lw $ra, 0x48($sp) /* B4CBE8 80242178 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s index 7ec53f6f71..22e708b1d4 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s @@ -98,7 +98,7 @@ glabel func_8024219C_B4CC0C .L802422FC: /* B4CD6C 802422FC 8E430070 */ lw $v1, 0x70($s2) /* B4CD70 80242300 2C620064 */ sltiu $v0, $v1, 0x64 -/* B4CD74 80242304 10400048 */ beqz $v0, .L80242428 +/* B4CD74 80242304 10400048 */ beqz $v0, L80242428_B4CE98 /* B4CD78 80242308 00031080 */ sll $v0, $v1, 2 /* B4CD7C 8024230C 3C018024 */ lui $at, %hi(jtbl_80247C28_B52698) /* B4CD80 80242310 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80242330_B4CDA0 /* B4CDA4 80242334 0260282D */ daddu $a1, $s3, $zero /* B4CDA8 80242338 0C0125AE */ jal func_800496B8 /* B4CDAC 8024233C 0280302D */ daddu $a2, $s4, $zero -/* B4CDB0 80242340 0809090A */ j .L80242428 +/* B4CDB0 80242340 0809090A */ j L80242428_B4CE98 /* B4CDB4 80242344 00000000 */ nop glabel L80242348_B4CDB8 /* B4CDB8 80242348 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80242358_B4CDC8 /* B4CDCC 8024235C 0260282D */ daddu $a1, $s3, $zero /* B4CDD0 80242360 0C0905C2 */ jal func_80241708_B4C178 /* B4CDD4 80242364 0280302D */ daddu $a2, $s4, $zero -/* B4CDD8 80242368 0809090A */ j .L80242428 +/* B4CDD8 80242368 0809090A */ j L80242428_B4CE98 /* B4CDDC 8024236C 00000000 */ nop glabel L80242370_B4CDE0 /* B4CDE0 80242370 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80242380_B4CDF0 /* B4CDF4 80242384 0260282D */ daddu $a1, $s3, $zero /* B4CDF8 80242388 0C0127B3 */ jal func_80049ECC /* B4CDFC 8024238C 0280302D */ daddu $a2, $s4, $zero -/* B4CE00 80242390 0809090A */ j .L80242428 +/* B4CE00 80242390 0809090A */ j L80242428_B4CE98 /* B4CE04 80242394 00000000 */ nop glabel L80242398_B4CE08 /* B4CE08 80242398 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L802423A8_B4CE18 /* B4CE1C 802423AC 0260282D */ daddu $a1, $s3, $zero /* B4CE20 802423B0 0C012849 */ jal func_8004A124 /* B4CE24 802423B4 0280302D */ daddu $a2, $s4, $zero -/* B4CE28 802423B8 0809090A */ j .L80242428 +/* B4CE28 802423B8 0809090A */ j L80242428_B4CE98 /* B4CE2C 802423BC 00000000 */ nop glabel L802423C0_B4CE30 /* B4CE30 802423C0 0240202D */ daddu $a0, $s2, $zero /* B4CE34 802423C4 0260282D */ daddu $a1, $s3, $zero /* B4CE38 802423C8 0C0128FA */ jal func_8004A3E8 /* B4CE3C 802423CC 0280302D */ daddu $a2, $s4, $zero -/* B4CE40 802423D0 0809090A */ j .L80242428 +/* B4CE40 802423D0 0809090A */ j L80242428_B4CE98 /* B4CE44 802423D4 00000000 */ nop glabel L802423D8_B4CE48 /* B4CE48 802423D8 0C090633 */ jal jan_05_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L802423E0_B4CE50 /* B4CE54 802423E4 0240202D */ daddu $a0, $s2, $zero /* B4CE58 802423E8 8E430070 */ lw $v1, 0x70($s2) /* B4CE5C 802423EC 24020020 */ addiu $v0, $zero, 0x20 -/* B4CE60 802423F0 1462000D */ bne $v1, $v0, .L80242428 +/* B4CE60 802423F0 1462000D */ bne $v1, $v0, L80242428_B4CE98 /* B4CE64 802423F4 00000000 */ nop glabel L802423F8_B4CE68 /* B4CE68 802423F8 0C09066A */ jal jan_05_UnkNpcAIFunc8 /* B4CE6C 802423FC 0240202D */ daddu $a0, $s2, $zero /* B4CE70 80242400 8E430070 */ lw $v1, 0x70($s2) /* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21 -/* B4CE78 80242408 14620007 */ bne $v1, $v0, .L80242428 +/* B4CE78 80242408 14620007 */ bne $v1, $v0, L80242428_B4CE98 /* B4CE7C 8024240C 00000000 */ nop glabel L80242410_B4CE80 /* B4CE80 80242410 0C0906A0 */ jal jan_05_UnkNpcAIFunc5 /* B4CE84 80242414 0240202D */ daddu $a0, $s2, $zero -/* B4CE88 80242418 0809090A */ j .L80242428 +/* B4CE88 80242418 0809090A */ j L80242428_B4CE98 /* B4CE8C 8024241C 00000000 */ nop glabel L80242420_B4CE90 /* B4CE90 80242420 0C0129CF */ jal func_8004A73C /* B4CE94 80242424 0240202D */ daddu $a0, $s2, $zero -.L80242428: glabel L80242428_B4CE98 /* B4CE98 80242428 8FBF0048 */ lw $ra, 0x48($sp) /* B4CE9C 8024242C 8FB50044 */ lw $s5, 0x44($sp) 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 96f50410c6..3ff3e736ef 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 @@ -86,7 +86,7 @@ glabel func_80241330_B53B60 .L80241470: /* B53CA0 80241470 8E630070 */ lw $v1, 0x70($s3) /* B53CA4 80241474 2C62000F */ sltiu $v0, $v1, 0xf -/* B53CA8 80241478 1040002C */ beqz $v0, .L8024152C +/* B53CA8 80241478 1040002C */ beqz $v0, L8024152C_B53D5C /* B53CAC 8024147C 00031080 */ sll $v0, $v1, 2 /* B53CB0 80241480 3C018024 */ lui $at, %hi(jtbl_80246CB8_B594E8) /* B53CB4 80241484 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L8024151C_B53D4C /* B53D50 80241520 0280282D */ daddu $a1, $s4, $zero /* B53D54 80241524 0C0904BB */ jal jan_06_UnkDurationCheck /* B53D58 80241528 0200302D */ daddu $a2, $s0, $zero -.L8024152C: glabel L8024152C_B53D5C /* B53D5C 8024152C 0000102D */ daddu $v0, $zero, $zero .L80241530: diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s index 9e213777a1..9dd4b6c29f 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s @@ -98,7 +98,7 @@ glabel func_80241E38_B54668 .L80241F98: /* B547C8 80241F98 8E430070 */ lw $v1, 0x70($s2) /* B547CC 80241F9C 2C620064 */ sltiu $v0, $v1, 0x64 -/* B547D0 80241FA0 10400048 */ beqz $v0, .L802420C4 +/* B547D0 80241FA0 10400048 */ beqz $v0, L802420C4_B548F4 /* B547D4 80241FA4 00031080 */ sll $v0, $v1, 2 /* B547D8 80241FA8 3C018024 */ lui $at, %hi(jtbl_80246D18_B59548) /* B547DC 80241FAC 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80241FCC_B547FC /* B54800 80241FD0 0260282D */ daddu $a1, $s3, $zero /* B54804 80241FD4 0C0125AE */ jal func_800496B8 /* B54808 80241FD8 0280302D */ daddu $a2, $s4, $zero -/* B5480C 80241FDC 08090831 */ j .L802420C4 +/* B5480C 80241FDC 08090831 */ j L802420C4_B548F4 /* B54810 80241FE0 00000000 */ nop glabel L80241FE4_B54814 /* B54814 80241FE4 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80241FF4_B54824 /* B54828 80241FF8 0260282D */ daddu $a1, $s3, $zero /* B5482C 80241FFC 0C012701 */ jal func_80049C04 /* B54830 80242000 0280302D */ daddu $a2, $s4, $zero -/* B54834 80242004 08090831 */ j .L802420C4 +/* B54834 80242004 08090831 */ j L802420C4_B548F4 /* B54838 80242008 00000000 */ nop glabel L8024200C_B5483C /* B5483C 8024200C 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L8024201C_B5484C /* B54850 80242020 0260282D */ daddu $a1, $s3, $zero /* B54854 80242024 0C0127B3 */ jal func_80049ECC /* B54858 80242028 0280302D */ daddu $a2, $s4, $zero -/* B5485C 8024202C 08090831 */ j .L802420C4 +/* B5485C 8024202C 08090831 */ j L802420C4_B548F4 /* B54860 80242030 00000000 */ nop glabel L80242034_B54864 /* B54864 80242034 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80242044_B54874 /* B54878 80242048 0260282D */ daddu $a1, $s3, $zero /* B5487C 8024204C 0C012849 */ jal func_8004A124 /* B54880 80242050 0280302D */ daddu $a2, $s4, $zero -/* B54884 80242054 08090831 */ j .L802420C4 +/* B54884 80242054 08090831 */ j L802420C4_B548F4 /* B54888 80242058 00000000 */ nop glabel L8024205C_B5488C /* B5488C 8024205C 0240202D */ daddu $a0, $s2, $zero /* B54890 80242060 0260282D */ daddu $a1, $s3, $zero /* B54894 80242064 0C0128FA */ jal func_8004A3E8 /* B54898 80242068 0280302D */ daddu $a2, $s4, $zero -/* B5489C 8024206C 08090831 */ j .L802420C4 +/* B5489C 8024206C 08090831 */ j L802420C4_B548F4 /* B548A0 80242070 00000000 */ nop glabel L80242074_B548A4 /* B548A4 80242074 0C090607 */ jal jan_06_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L8024207C_B548AC /* B548B0 80242080 0240202D */ daddu $a0, $s2, $zero /* B548B4 80242084 8E430070 */ lw $v1, 0x70($s2) /* B548B8 80242088 24020020 */ addiu $v0, $zero, 0x20 -/* B548BC 8024208C 1462000D */ bne $v1, $v0, .L802420C4 +/* B548BC 8024208C 1462000D */ bne $v1, $v0, L802420C4_B548F4 /* B548C0 80242090 00000000 */ nop glabel L80242094_B548C4 /* B548C4 80242094 0C09063E */ jal jan_06_UnkNpcAIFunc8 /* B548C8 80242098 0240202D */ daddu $a0, $s2, $zero /* B548CC 8024209C 8E430070 */ lw $v1, 0x70($s2) /* B548D0 802420A0 24020021 */ addiu $v0, $zero, 0x21 -/* B548D4 802420A4 14620007 */ bne $v1, $v0, .L802420C4 +/* B548D4 802420A4 14620007 */ bne $v1, $v0, L802420C4_B548F4 /* B548D8 802420A8 00000000 */ nop glabel L802420AC_B548DC /* B548DC 802420AC 0C090674 */ jal jan_06_UnkNpcAIFunc5 /* B548E0 802420B0 0240202D */ daddu $a0, $s2, $zero -/* B548E4 802420B4 08090831 */ j .L802420C4 +/* B548E4 802420B4 08090831 */ j L802420C4_B548F4 /* B548E8 802420B8 00000000 */ nop glabel L802420BC_B548EC /* B548EC 802420BC 0C0129CF */ jal func_8004A73C /* B548F0 802420C0 0240202D */ daddu $a0, $s2, $zero -.L802420C4: glabel L802420C4_B548F4 /* B548F4 802420C4 8FBF0048 */ lw $ra, 0x48($sp) /* B548F8 802420C8 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s index dea3891fae..7b8c37a6d7 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s @@ -98,7 +98,7 @@ glabel func_802420EC_B5491C .L8024224C: /* B54A7C 8024224C 8E430070 */ lw $v1, 0x70($s2) /* B54A80 80242250 2C620064 */ sltiu $v0, $v1, 0x64 -/* B54A84 80242254 10400048 */ beqz $v0, .L80242378 +/* B54A84 80242254 10400048 */ beqz $v0, L80242378_B54BA8 /* B54A88 80242258 00031080 */ sll $v0, $v1, 2 /* B54A8C 8024225C 3C018024 */ lui $at, %hi(jtbl_80246EA8_B596D8) /* B54A90 80242260 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80242280_B54AB0 /* B54AB4 80242284 0260282D */ daddu $a1, $s3, $zero /* B54AB8 80242288 0C0125AE */ jal func_800496B8 /* B54ABC 8024228C 0280302D */ daddu $a2, $s4, $zero -/* B54AC0 80242290 080908DE */ j .L80242378 +/* B54AC0 80242290 080908DE */ j L80242378_B54BA8 /* B54AC4 80242294 00000000 */ nop glabel L80242298_B54AC8 /* B54AC8 80242298 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L802422A8_B54AD8 /* B54ADC 802422AC 0260282D */ daddu $a1, $s3, $zero /* B54AE0 802422B0 0C090596 */ jal func_80241658_B53E88 /* B54AE4 802422B4 0280302D */ daddu $a2, $s4, $zero -/* B54AE8 802422B8 080908DE */ j .L80242378 +/* B54AE8 802422B8 080908DE */ j L80242378_B54BA8 /* B54AEC 802422BC 00000000 */ nop glabel L802422C0_B54AF0 /* B54AF0 802422C0 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L802422D0_B54B00 /* B54B04 802422D4 0260282D */ daddu $a1, $s3, $zero /* B54B08 802422D8 0C0127B3 */ jal func_80049ECC /* B54B0C 802422DC 0280302D */ daddu $a2, $s4, $zero -/* B54B10 802422E0 080908DE */ j .L80242378 +/* B54B10 802422E0 080908DE */ j L80242378_B54BA8 /* B54B14 802422E4 00000000 */ nop glabel L802422E8_B54B18 /* B54B18 802422E8 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L802422F8_B54B28 /* B54B2C 802422FC 0260282D */ daddu $a1, $s3, $zero /* B54B30 80242300 0C012849 */ jal func_8004A124 /* B54B34 80242304 0280302D */ daddu $a2, $s4, $zero -/* B54B38 80242308 080908DE */ j .L80242378 +/* B54B38 80242308 080908DE */ j L80242378_B54BA8 /* B54B3C 8024230C 00000000 */ nop glabel L80242310_B54B40 /* B54B40 80242310 0240202D */ daddu $a0, $s2, $zero /* B54B44 80242314 0260282D */ daddu $a1, $s3, $zero /* B54B48 80242318 0C0128FA */ jal func_8004A3E8 /* B54B4C 8024231C 0280302D */ daddu $a2, $s4, $zero -/* B54B50 80242320 080908DE */ j .L80242378 +/* B54B50 80242320 080908DE */ j L80242378_B54BA8 /* B54B54 80242324 00000000 */ nop glabel L80242328_B54B58 /* B54B58 80242328 0C090607 */ jal jan_06_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80242330_B54B60 /* B54B64 80242334 0240202D */ daddu $a0, $s2, $zero /* B54B68 80242338 8E430070 */ lw $v1, 0x70($s2) /* B54B6C 8024233C 24020020 */ addiu $v0, $zero, 0x20 -/* B54B70 80242340 1462000D */ bne $v1, $v0, .L80242378 +/* B54B70 80242340 1462000D */ bne $v1, $v0, L80242378_B54BA8 /* B54B74 80242344 00000000 */ nop glabel L80242348_B54B78 /* B54B78 80242348 0C09063E */ jal jan_06_UnkNpcAIFunc8 /* B54B7C 8024234C 0240202D */ daddu $a0, $s2, $zero /* B54B80 80242350 8E430070 */ lw $v1, 0x70($s2) /* B54B84 80242354 24020021 */ addiu $v0, $zero, 0x21 -/* B54B88 80242358 14620007 */ bne $v1, $v0, .L80242378 +/* B54B88 80242358 14620007 */ bne $v1, $v0, L80242378_B54BA8 /* B54B8C 8024235C 00000000 */ nop glabel L80242360_B54B90 /* B54B90 80242360 0C090674 */ jal jan_06_UnkNpcAIFunc5 /* B54B94 80242364 0240202D */ daddu $a0, $s2, $zero -/* B54B98 80242368 080908DE */ j .L80242378 +/* B54B98 80242368 080908DE */ j L80242378_B54BA8 /* B54B9C 8024236C 00000000 */ nop glabel L80242370_B54BA0 /* B54BA0 80242370 0C0129CF */ jal func_8004A73C /* B54BA4 80242374 0240202D */ daddu $a0, $s2, $zero -.L80242378: glabel L80242378_B54BA8 /* B54BA8 80242378 8FBF0048 */ lw $ra, 0x48($sp) /* B54BAC 8024237C 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s index 4af8980344..b12422e5bb 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s @@ -98,7 +98,7 @@ glabel func_80240830_B5A0A0 .L80240990: /* B5A200 80240990 8E430070 */ lw $v1, 0x70($s2) /* B5A204 80240994 2C620064 */ sltiu $v0, $v1, 0x64 -/* B5A208 80240998 10400048 */ beqz $v0, .L80240ABC +/* B5A208 80240998 10400048 */ beqz $v0, L80240ABC_B5A32C /* B5A20C 8024099C 00031080 */ sll $v0, $v1, 2 /* B5A210 802409A0 3C018024 */ lui $at, %hi(jtbl_80244720_B5DF90) /* B5A214 802409A4 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L802409C4_B5A234 /* B5A238 802409C8 0260282D */ daddu $a1, $s3, $zero /* B5A23C 802409CC 0C0125AE */ jal func_800496B8 /* B5A240 802409D0 0280302D */ daddu $a2, $s4, $zero -/* B5A244 802409D4 080902AF */ j .L80240ABC +/* B5A244 802409D4 080902AF */ j L80240ABC_B5A32C /* B5A248 802409D8 00000000 */ nop glabel L802409DC_B5A24C /* B5A24C 802409DC 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L802409EC_B5A25C /* B5A260 802409F0 0260282D */ daddu $a1, $s3, $zero /* B5A264 802409F4 0C012701 */ jal func_80049C04 /* B5A268 802409F8 0280302D */ daddu $a2, $s4, $zero -/* B5A26C 802409FC 080902AF */ j .L80240ABC +/* B5A26C 802409FC 080902AF */ j L80240ABC_B5A32C /* B5A270 80240A00 00000000 */ nop glabel L80240A04_B5A274 /* B5A274 80240A04 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240A14_B5A284 /* B5A288 80240A18 0260282D */ daddu $a1, $s3, $zero /* B5A28C 80240A1C 0C0127B3 */ jal func_80049ECC /* B5A290 80240A20 0280302D */ daddu $a2, $s4, $zero -/* B5A294 80240A24 080902AF */ j .L80240ABC +/* B5A294 80240A24 080902AF */ j L80240ABC_B5A32C /* B5A298 80240A28 00000000 */ nop glabel L80240A2C_B5A29C /* B5A29C 80240A2C 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240A3C_B5A2AC /* B5A2B0 80240A40 0260282D */ daddu $a1, $s3, $zero /* B5A2B4 80240A44 0C012849 */ jal func_8004A124 /* B5A2B8 80240A48 0280302D */ daddu $a2, $s4, $zero -/* B5A2BC 80240A4C 080902AF */ j .L80240ABC +/* B5A2BC 80240A4C 080902AF */ j L80240ABC_B5A32C /* B5A2C0 80240A50 00000000 */ nop glabel L80240A54_B5A2C4 /* B5A2C4 80240A54 0240202D */ daddu $a0, $s2, $zero /* B5A2C8 80240A58 0260282D */ daddu $a1, $s3, $zero /* B5A2CC 80240A5C 0C0128FA */ jal func_8004A3E8 /* B5A2D0 80240A60 0280302D */ daddu $a2, $s4, $zero -/* B5A2D4 80240A64 080902AF */ j .L80240ABC +/* B5A2D4 80240A64 080902AF */ j L80240ABC_B5A32C /* B5A2D8 80240A68 00000000 */ nop glabel L80240A6C_B5A2DC /* B5A2DC 80240A6C 0C090085 */ jal jan_07_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240A74_B5A2E4 /* B5A2E8 80240A78 0240202D */ daddu $a0, $s2, $zero /* B5A2EC 80240A7C 8E430070 */ lw $v1, 0x70($s2) /* B5A2F0 80240A80 24020020 */ addiu $v0, $zero, 0x20 -/* B5A2F4 80240A84 1462000D */ bne $v1, $v0, .L80240ABC +/* B5A2F4 80240A84 1462000D */ bne $v1, $v0, L80240ABC_B5A32C /* B5A2F8 80240A88 00000000 */ nop glabel L80240A8C_B5A2FC /* B5A2FC 80240A8C 0C0900BC */ jal jan_07_UnkNpcAIFunc8 /* B5A300 80240A90 0240202D */ daddu $a0, $s2, $zero /* B5A304 80240A94 8E430070 */ lw $v1, 0x70($s2) /* B5A308 80240A98 24020021 */ addiu $v0, $zero, 0x21 -/* B5A30C 80240A9C 14620007 */ bne $v1, $v0, .L80240ABC +/* B5A30C 80240A9C 14620007 */ bne $v1, $v0, L80240ABC_B5A32C /* B5A310 80240AA0 00000000 */ nop glabel L80240AA4_B5A314 /* B5A314 80240AA4 0C0900F2 */ jal jan_07_UnkNpcAIFunc5 /* B5A318 80240AA8 0240202D */ daddu $a0, $s2, $zero -/* B5A31C 80240AAC 080902AF */ j .L80240ABC +/* B5A31C 80240AAC 080902AF */ j L80240ABC_B5A32C /* B5A320 80240AB0 00000000 */ nop glabel L80240AB4_B5A324 /* B5A324 80240AB4 0C0129CF */ jal func_8004A73C /* B5A328 80240AB8 0240202D */ daddu $a0, $s2, $zero -.L80240ABC: glabel L80240ABC_B5A32C /* B5A32C 80240ABC 8FBF0048 */ lw $ra, 0x48($sp) /* B5A330 80240AC0 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s b/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s index bbad8bd4b9..23643a174f 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s @@ -98,7 +98,7 @@ glabel func_80240AE4_B5A354 .L80240C44: /* B5A4B4 80240C44 8E430070 */ lw $v1, 0x70($s2) /* B5A4B8 80240C48 2C620064 */ sltiu $v0, $v1, 0x64 -/* B5A4BC 80240C4C 10400048 */ beqz $v0, .L80240D70 +/* B5A4BC 80240C4C 10400048 */ beqz $v0, L80240D70_B5A5E0 /* B5A4C0 80240C50 00031080 */ sll $v0, $v1, 2 /* B5A4C4 80240C54 3C018024 */ lui $at, %hi(jtbl_802448B0_B5E120) /* B5A4C8 80240C58 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80240C78_B5A4E8 /* B5A4EC 80240C7C 0260282D */ daddu $a1, $s3, $zero /* B5A4F0 80240C80 0C0125AE */ jal func_800496B8 /* B5A4F4 80240C84 0280302D */ daddu $a2, $s4, $zero -/* B5A4F8 80240C88 0809035C */ j .L80240D70 +/* B5A4F8 80240C88 0809035C */ j L80240D70_B5A5E0 /* B5A4FC 80240C8C 00000000 */ nop glabel L80240C90_B5A500 /* B5A500 80240C90 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80240CA0_B5A510 /* B5A514 80240CA4 0260282D */ daddu $a1, $s3, $zero /* B5A518 80240CA8 0C090014 */ jal func_80240050_B598C0 /* B5A51C 80240CAC 0280302D */ daddu $a2, $s4, $zero -/* B5A520 80240CB0 0809035C */ j .L80240D70 +/* B5A520 80240CB0 0809035C */ j L80240D70_B5A5E0 /* B5A524 80240CB4 00000000 */ nop glabel L80240CB8_B5A528 /* B5A528 80240CB8 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240CC8_B5A538 /* B5A53C 80240CCC 0260282D */ daddu $a1, $s3, $zero /* B5A540 80240CD0 0C0127B3 */ jal func_80049ECC /* B5A544 80240CD4 0280302D */ daddu $a2, $s4, $zero -/* B5A548 80240CD8 0809035C */ j .L80240D70 +/* B5A548 80240CD8 0809035C */ j L80240D70_B5A5E0 /* B5A54C 80240CDC 00000000 */ nop glabel L80240CE0_B5A550 /* B5A550 80240CE0 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240CF0_B5A560 /* B5A564 80240CF4 0260282D */ daddu $a1, $s3, $zero /* B5A568 80240CF8 0C012849 */ jal func_8004A124 /* B5A56C 80240CFC 0280302D */ daddu $a2, $s4, $zero -/* B5A570 80240D00 0809035C */ j .L80240D70 +/* B5A570 80240D00 0809035C */ j L80240D70_B5A5E0 /* B5A574 80240D04 00000000 */ nop glabel L80240D08_B5A578 /* B5A578 80240D08 0240202D */ daddu $a0, $s2, $zero /* B5A57C 80240D0C 0260282D */ daddu $a1, $s3, $zero /* B5A580 80240D10 0C0128FA */ jal func_8004A3E8 /* B5A584 80240D14 0280302D */ daddu $a2, $s4, $zero -/* B5A588 80240D18 0809035C */ j .L80240D70 +/* B5A588 80240D18 0809035C */ j L80240D70_B5A5E0 /* B5A58C 80240D1C 00000000 */ nop glabel L80240D20_B5A590 /* B5A590 80240D20 0C090085 */ jal jan_07_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240D28_B5A598 /* B5A59C 80240D2C 0240202D */ daddu $a0, $s2, $zero /* B5A5A0 80240D30 8E430070 */ lw $v1, 0x70($s2) /* B5A5A4 80240D34 24020020 */ addiu $v0, $zero, 0x20 -/* B5A5A8 80240D38 1462000D */ bne $v1, $v0, .L80240D70 +/* B5A5A8 80240D38 1462000D */ bne $v1, $v0, L80240D70_B5A5E0 /* B5A5AC 80240D3C 00000000 */ nop glabel L80240D40_B5A5B0 /* B5A5B0 80240D40 0C0900BC */ jal jan_07_UnkNpcAIFunc8 /* B5A5B4 80240D44 0240202D */ daddu $a0, $s2, $zero /* B5A5B8 80240D48 8E430070 */ lw $v1, 0x70($s2) /* B5A5BC 80240D4C 24020021 */ addiu $v0, $zero, 0x21 -/* B5A5C0 80240D50 14620007 */ bne $v1, $v0, .L80240D70 +/* B5A5C0 80240D50 14620007 */ bne $v1, $v0, L80240D70_B5A5E0 /* B5A5C4 80240D54 00000000 */ nop glabel L80240D58_B5A5C8 /* B5A5C8 80240D58 0C0900F2 */ jal jan_07_UnkNpcAIFunc5 /* B5A5CC 80240D5C 0240202D */ daddu $a0, $s2, $zero -/* B5A5D0 80240D60 0809035C */ j .L80240D70 +/* B5A5D0 80240D60 0809035C */ j L80240D70_B5A5E0 /* B5A5D4 80240D64 00000000 */ nop glabel L80240D68_B5A5D8 /* B5A5D8 80240D68 0C0129CF */ jal func_8004A73C /* B5A5DC 80240D6C 0240202D */ daddu $a0, $s2, $zero -.L80240D70: glabel L80240D70_B5A5E0 /* B5A5E0 80240D70 8FBF0048 */ lw $ra, 0x48($sp) /* B5A5E4 80240D74 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s index 79d2ae4584..a6ee06ea07 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s @@ -98,7 +98,7 @@ glabel func_80241C84_B5FF34 .L80241DE4: /* B60094 80241DE4 8E430070 */ lw $v1, 0x70($s2) /* B60098 80241DE8 2C620064 */ sltiu $v0, $v1, 0x64 -/* B6009C 80241DEC 10400048 */ beqz $v0, .L80241F10 +/* B6009C 80241DEC 10400048 */ beqz $v0, L80241F10_B601C0 /* B600A0 80241DF0 00031080 */ sll $v0, $v1, 2 /* B600A4 80241DF4 3C018024 */ lui $at, %hi(jtbl_802474E0_B65790) /* B600A8 80241DF8 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80241E18_B600C8 /* B600CC 80241E1C 0260282D */ daddu $a1, $s3, $zero /* B600D0 80241E20 0C0125AE */ jal func_800496B8 /* B600D4 80241E24 0280302D */ daddu $a2, $s4, $zero -/* B600D8 80241E28 080907C4 */ j .L80241F10 +/* B600D8 80241E28 080907C4 */ j L80241F10_B601C0 /* B600DC 80241E2C 00000000 */ nop glabel L80241E30_B600E0 /* B600E0 80241E30 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80241E40_B600F0 /* B600F4 80241E44 0260282D */ daddu $a1, $s3, $zero /* B600F8 80241E48 0C012701 */ jal func_80049C04 /* B600FC 80241E4C 0280302D */ daddu $a2, $s4, $zero -/* B60100 80241E50 080907C4 */ j .L80241F10 +/* B60100 80241E50 080907C4 */ j L80241F10_B601C0 /* B60104 80241E54 00000000 */ nop glabel L80241E58_B60108 /* B60108 80241E58 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80241E68_B60118 /* B6011C 80241E6C 0260282D */ daddu $a1, $s3, $zero /* B60120 80241E70 0C0127B3 */ jal func_80049ECC /* B60124 80241E74 0280302D */ daddu $a2, $s4, $zero -/* B60128 80241E78 080907C4 */ j .L80241F10 +/* B60128 80241E78 080907C4 */ j L80241F10_B601C0 /* B6012C 80241E7C 00000000 */ nop glabel L80241E80_B60130 /* B60130 80241E80 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80241E90_B60140 /* B60144 80241E94 0260282D */ daddu $a1, $s3, $zero /* B60148 80241E98 0C012849 */ jal func_8004A124 /* B6014C 80241E9C 0280302D */ daddu $a2, $s4, $zero -/* B60150 80241EA0 080907C4 */ j .L80241F10 +/* B60150 80241EA0 080907C4 */ j L80241F10_B601C0 /* B60154 80241EA4 00000000 */ nop glabel L80241EA8_B60158 /* B60158 80241EA8 0240202D */ daddu $a0, $s2, $zero /* B6015C 80241EAC 0260282D */ daddu $a1, $s3, $zero /* B60160 80241EB0 0C0128FA */ jal func_8004A3E8 /* B60164 80241EB4 0280302D */ daddu $a2, $s4, $zero -/* B60168 80241EB8 080907C4 */ j .L80241F10 +/* B60168 80241EB8 080907C4 */ j L80241F10_B601C0 /* B6016C 80241EBC 00000000 */ nop glabel L80241EC0_B60170 /* B60170 80241EC0 0C09059A */ jal jan_08_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80241EC8_B60178 /* B6017C 80241ECC 0240202D */ daddu $a0, $s2, $zero /* B60180 80241ED0 8E430070 */ lw $v1, 0x70($s2) /* B60184 80241ED4 24020020 */ addiu $v0, $zero, 0x20 -/* B60188 80241ED8 1462000D */ bne $v1, $v0, .L80241F10 +/* B60188 80241ED8 1462000D */ bne $v1, $v0, L80241F10_B601C0 /* B6018C 80241EDC 00000000 */ nop glabel L80241EE0_B60190 /* B60190 80241EE0 0C0905D1 */ jal jan_08_UnkNpcAIFunc8 /* B60194 80241EE4 0240202D */ daddu $a0, $s2, $zero /* B60198 80241EE8 8E430070 */ lw $v1, 0x70($s2) /* B6019C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 -/* B601A0 80241EF0 14620007 */ bne $v1, $v0, .L80241F10 +/* B601A0 80241EF0 14620007 */ bne $v1, $v0, L80241F10_B601C0 /* B601A4 80241EF4 00000000 */ nop glabel L80241EF8_B601A8 /* B601A8 80241EF8 0C090607 */ jal jan_08_UnkNpcAIFunc5 /* B601AC 80241EFC 0240202D */ daddu $a0, $s2, $zero -/* B601B0 80241F00 080907C4 */ j .L80241F10 +/* B601B0 80241F00 080907C4 */ j L80241F10_B601C0 /* B601B4 80241F04 00000000 */ nop glabel L80241F08_B601B8 /* B601B8 80241F08 0C0129CF */ jal func_8004A73C /* B601BC 80241F0C 0240202D */ daddu $a0, $s2, $zero -.L80241F10: glabel L80241F10_B601C0 /* B601C0 80241F10 8FBF0048 */ lw $ra, 0x48($sp) /* B601C4 80241F14 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s index ec9fa84378..f32ef732d2 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s @@ -98,7 +98,7 @@ glabel func_80241F38_B601E8 .L80242098: /* B60348 80242098 8E430070 */ lw $v1, 0x70($s2) /* B6034C 8024209C 2C620064 */ sltiu $v0, $v1, 0x64 -/* B60350 802420A0 10400048 */ beqz $v0, .L802421C4 +/* B60350 802420A0 10400048 */ beqz $v0, L802421C4_B60474 /* B60354 802420A4 00031080 */ sll $v0, $v1, 2 /* B60358 802420A8 3C018024 */ lui $at, %hi(jtbl_80247670_B65920) /* B6035C 802420AC 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L802420CC_B6037C /* B60380 802420D0 0260282D */ daddu $a1, $s3, $zero /* B60384 802420D4 0C0125AE */ jal func_800496B8 /* B60388 802420D8 0280302D */ daddu $a2, $s4, $zero -/* B6038C 802420DC 08090871 */ j .L802421C4 +/* B6038C 802420DC 08090871 */ j L802421C4_B60474 /* B60390 802420E0 00000000 */ nop glabel L802420E4_B60394 /* B60394 802420E4 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L802420F4_B603A4 /* B603A8 802420F8 0260282D */ daddu $a1, $s3, $zero /* B603AC 802420FC 0C090529 */ jal func_802414A4_B5F754 /* B603B0 80242100 0280302D */ daddu $a2, $s4, $zero -/* B603B4 80242104 08090871 */ j .L802421C4 +/* B603B4 80242104 08090871 */ j L802421C4_B60474 /* B603B8 80242108 00000000 */ nop glabel L8024210C_B603BC /* B603BC 8024210C 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L8024211C_B603CC /* B603D0 80242120 0260282D */ daddu $a1, $s3, $zero /* B603D4 80242124 0C0127B3 */ jal func_80049ECC /* B603D8 80242128 0280302D */ daddu $a2, $s4, $zero -/* B603DC 8024212C 08090871 */ j .L802421C4 +/* B603DC 8024212C 08090871 */ j L802421C4_B60474 /* B603E0 80242130 00000000 */ nop glabel L80242134_B603E4 /* B603E4 80242134 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80242144_B603F4 /* B603F8 80242148 0260282D */ daddu $a1, $s3, $zero /* B603FC 8024214C 0C012849 */ jal func_8004A124 /* B60400 80242150 0280302D */ daddu $a2, $s4, $zero -/* B60404 80242154 08090871 */ j .L802421C4 +/* B60404 80242154 08090871 */ j L802421C4_B60474 /* B60408 80242158 00000000 */ nop glabel L8024215C_B6040C /* B6040C 8024215C 0240202D */ daddu $a0, $s2, $zero /* B60410 80242160 0260282D */ daddu $a1, $s3, $zero /* B60414 80242164 0C0128FA */ jal func_8004A3E8 /* B60418 80242168 0280302D */ daddu $a2, $s4, $zero -/* B6041C 8024216C 08090871 */ j .L802421C4 +/* B6041C 8024216C 08090871 */ j L802421C4_B60474 /* B60420 80242170 00000000 */ nop glabel L80242174_B60424 /* B60424 80242174 0C09059A */ jal jan_08_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L8024217C_B6042C /* B60430 80242180 0240202D */ daddu $a0, $s2, $zero /* B60434 80242184 8E430070 */ lw $v1, 0x70($s2) /* B60438 80242188 24020020 */ addiu $v0, $zero, 0x20 -/* B6043C 8024218C 1462000D */ bne $v1, $v0, .L802421C4 +/* B6043C 8024218C 1462000D */ bne $v1, $v0, L802421C4_B60474 /* B60440 80242190 00000000 */ nop glabel L80242194_B60444 /* B60444 80242194 0C0905D1 */ jal jan_08_UnkNpcAIFunc8 /* B60448 80242198 0240202D */ daddu $a0, $s2, $zero /* B6044C 8024219C 8E430070 */ lw $v1, 0x70($s2) /* B60450 802421A0 24020021 */ addiu $v0, $zero, 0x21 -/* B60454 802421A4 14620007 */ bne $v1, $v0, .L802421C4 +/* B60454 802421A4 14620007 */ bne $v1, $v0, L802421C4_B60474 /* B60458 802421A8 00000000 */ nop glabel L802421AC_B6045C /* B6045C 802421AC 0C090607 */ jal jan_08_UnkNpcAIFunc5 /* B60460 802421B0 0240202D */ daddu $a0, $s2, $zero -/* B60464 802421B4 08090871 */ j .L802421C4 +/* B60464 802421B4 08090871 */ j L802421C4_B60474 /* B60468 802421B8 00000000 */ nop glabel L802421BC_B6046C /* B6046C 802421BC 0C0129CF */ jal func_8004A73C /* B60470 802421C0 0240202D */ daddu $a0, $s2, $zero -.L802421C4: glabel L802421C4_B60474 /* B60474 802421C4 8FBF0048 */ lw $ra, 0x48($sp) /* B60478 802421C8 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s b/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s index d263b2ed06..86f8668130 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s @@ -98,7 +98,7 @@ glabel func_80241170_B66C20 .L802412D0: /* B66D80 802412D0 8E430070 */ lw $v1, 0x70($s2) /* B66D84 802412D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* B66D88 802412D8 10400048 */ beqz $v0, .L802413FC +/* B66D88 802412D8 10400048 */ beqz $v0, L802413FC_B66EAC /* B66D8C 802412DC 00031080 */ sll $v0, $v1, 2 /* B66D90 802412E0 3C018024 */ lui $at, %hi(jtbl_802465C0_B6C070) /* B66D94 802412E4 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80241304_B66DB4 /* B66DB8 80241308 0260282D */ daddu $a1, $s3, $zero /* B66DBC 8024130C 0C0125AE */ jal func_800496B8 /* B66DC0 80241310 0280302D */ daddu $a2, $s4, $zero -/* B66DC4 80241314 080904FF */ j .L802413FC +/* B66DC4 80241314 080904FF */ j L802413FC_B66EAC /* B66DC8 80241318 00000000 */ nop glabel L8024131C_B66DCC /* B66DCC 8024131C 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L8024132C_B66DDC /* B66DE0 80241330 0260282D */ daddu $a1, $s3, $zero /* B66DE4 80241334 0C012701 */ jal func_80049C04 /* B66DE8 80241338 0280302D */ daddu $a2, $s4, $zero -/* B66DEC 8024133C 080904FF */ j .L802413FC +/* B66DEC 8024133C 080904FF */ j L802413FC_B66EAC /* B66DF0 80241340 00000000 */ nop glabel L80241344_B66DF4 /* B66DF4 80241344 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80241354_B66E04 /* B66E08 80241358 0260282D */ daddu $a1, $s3, $zero /* B66E0C 8024135C 0C0127B3 */ jal func_80049ECC /* B66E10 80241360 0280302D */ daddu $a2, $s4, $zero -/* B66E14 80241364 080904FF */ j .L802413FC +/* B66E14 80241364 080904FF */ j L802413FC_B66EAC /* B66E18 80241368 00000000 */ nop glabel L8024136C_B66E1C /* B66E1C 8024136C 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L8024137C_B66E2C /* B66E30 80241380 0260282D */ daddu $a1, $s3, $zero /* B66E34 80241384 0C012849 */ jal func_8004A124 /* B66E38 80241388 0280302D */ daddu $a2, $s4, $zero -/* B66E3C 8024138C 080904FF */ j .L802413FC +/* B66E3C 8024138C 080904FF */ j L802413FC_B66EAC /* B66E40 80241390 00000000 */ nop glabel L80241394_B66E44 /* B66E44 80241394 0240202D */ daddu $a0, $s2, $zero /* B66E48 80241398 0260282D */ daddu $a1, $s3, $zero /* B66E4C 8024139C 0C0128FA */ jal func_8004A3E8 /* B66E50 802413A0 0280302D */ daddu $a2, $s4, $zero -/* B66E54 802413A4 080904FF */ j .L802413FC +/* B66E54 802413A4 080904FF */ j L802413FC_B66EAC /* B66E58 802413A8 00000000 */ nop glabel L802413AC_B66E5C /* B66E5C 802413AC 0C0902D5 */ jal jan_09_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L802413B4_B66E64 /* B66E68 802413B8 0240202D */ daddu $a0, $s2, $zero /* B66E6C 802413BC 8E430070 */ lw $v1, 0x70($s2) /* B66E70 802413C0 24020020 */ addiu $v0, $zero, 0x20 -/* B66E74 802413C4 1462000D */ bne $v1, $v0, .L802413FC +/* B66E74 802413C4 1462000D */ bne $v1, $v0, L802413FC_B66EAC /* B66E78 802413C8 00000000 */ nop glabel L802413CC_B66E7C /* B66E7C 802413CC 0C09030C */ jal jan_09_UnkNpcAIFunc8 /* B66E80 802413D0 0240202D */ daddu $a0, $s2, $zero /* B66E84 802413D4 8E430070 */ lw $v1, 0x70($s2) /* B66E88 802413D8 24020021 */ addiu $v0, $zero, 0x21 -/* B66E8C 802413DC 14620007 */ bne $v1, $v0, .L802413FC +/* B66E8C 802413DC 14620007 */ bne $v1, $v0, L802413FC_B66EAC /* B66E90 802413E0 00000000 */ nop glabel L802413E4_B66E94 /* B66E94 802413E4 0C090342 */ jal jan_09_UnkNpcAIFunc5 /* B66E98 802413E8 0240202D */ daddu $a0, $s2, $zero -/* B66E9C 802413EC 080904FF */ j .L802413FC +/* B66E9C 802413EC 080904FF */ j L802413FC_B66EAC /* B66EA0 802413F0 00000000 */ nop glabel L802413F4_B66EA4 /* B66EA4 802413F4 0C0129CF */ jal func_8004A73C /* B66EA8 802413F8 0240202D */ daddu $a0, $s2, $zero -.L802413FC: glabel L802413FC_B66EAC /* B66EAC 802413FC 8FBF0048 */ lw $ra, 0x48($sp) /* B66EB0 80241400 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s b/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s index fed098872c..79e3b8db3c 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s @@ -98,7 +98,7 @@ glabel func_80241424_B66ED4 .L80241584: /* B67034 80241584 8E430070 */ lw $v1, 0x70($s2) /* B67038 80241588 2C620064 */ sltiu $v0, $v1, 0x64 -/* B6703C 8024158C 10400048 */ beqz $v0, .L802416B0 +/* B6703C 8024158C 10400048 */ beqz $v0, L802416B0_B67160 /* B67040 80241590 00031080 */ sll $v0, $v1, 2 /* B67044 80241594 3C018024 */ lui $at, %hi(jtbl_80246750_B6C200) /* B67048 80241598 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L802415B8_B67068 /* B6706C 802415BC 0260282D */ daddu $a1, $s3, $zero /* B67070 802415C0 0C0125AE */ jal func_800496B8 /* B67074 802415C4 0280302D */ daddu $a2, $s4, $zero -/* B67078 802415C8 080905AC */ j .L802416B0 +/* B67078 802415C8 080905AC */ j L802416B0_B67160 /* B6707C 802415CC 00000000 */ nop glabel L802415D0_B67080 /* B67080 802415D0 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L802415E0_B67090 /* B67094 802415E4 0260282D */ daddu $a1, $s3, $zero /* B67098 802415E8 0C090264 */ jal func_80240990_B66440 /* B6709C 802415EC 0280302D */ daddu $a2, $s4, $zero -/* B670A0 802415F0 080905AC */ j .L802416B0 +/* B670A0 802415F0 080905AC */ j L802416B0_B67160 /* B670A4 802415F4 00000000 */ nop glabel L802415F8_B670A8 /* B670A8 802415F8 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80241608_B670B8 /* B670BC 8024160C 0260282D */ daddu $a1, $s3, $zero /* B670C0 80241610 0C0127B3 */ jal func_80049ECC /* B670C4 80241614 0280302D */ daddu $a2, $s4, $zero -/* B670C8 80241618 080905AC */ j .L802416B0 +/* B670C8 80241618 080905AC */ j L802416B0_B67160 /* B670CC 8024161C 00000000 */ nop glabel L80241620_B670D0 /* B670D0 80241620 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80241630_B670E0 /* B670E4 80241634 0260282D */ daddu $a1, $s3, $zero /* B670E8 80241638 0C012849 */ jal func_8004A124 /* B670EC 8024163C 0280302D */ daddu $a2, $s4, $zero -/* B670F0 80241640 080905AC */ j .L802416B0 +/* B670F0 80241640 080905AC */ j L802416B0_B67160 /* B670F4 80241644 00000000 */ nop glabel L80241648_B670F8 /* B670F8 80241648 0240202D */ daddu $a0, $s2, $zero /* B670FC 8024164C 0260282D */ daddu $a1, $s3, $zero /* B67100 80241650 0C0128FA */ jal func_8004A3E8 /* B67104 80241654 0280302D */ daddu $a2, $s4, $zero -/* B67108 80241658 080905AC */ j .L802416B0 +/* B67108 80241658 080905AC */ j L802416B0_B67160 /* B6710C 8024165C 00000000 */ nop glabel L80241660_B67110 /* B67110 80241660 0C0902D5 */ jal jan_09_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80241668_B67118 /* B6711C 8024166C 0240202D */ daddu $a0, $s2, $zero /* B67120 80241670 8E430070 */ lw $v1, 0x70($s2) /* B67124 80241674 24020020 */ addiu $v0, $zero, 0x20 -/* B67128 80241678 1462000D */ bne $v1, $v0, .L802416B0 +/* B67128 80241678 1462000D */ bne $v1, $v0, L802416B0_B67160 /* B6712C 8024167C 00000000 */ nop glabel L80241680_B67130 /* B67130 80241680 0C09030C */ jal jan_09_UnkNpcAIFunc8 /* B67134 80241684 0240202D */ daddu $a0, $s2, $zero /* B67138 80241688 8E430070 */ lw $v1, 0x70($s2) /* B6713C 8024168C 24020021 */ addiu $v0, $zero, 0x21 -/* B67140 80241690 14620007 */ bne $v1, $v0, .L802416B0 +/* B67140 80241690 14620007 */ bne $v1, $v0, L802416B0_B67160 /* B67144 80241694 00000000 */ nop glabel L80241698_B67148 /* B67148 80241698 0C090342 */ jal jan_09_UnkNpcAIFunc5 /* B6714C 8024169C 0240202D */ daddu $a0, $s2, $zero -/* B67150 802416A0 080905AC */ j .L802416B0 +/* B67150 802416A0 080905AC */ j L802416B0_B67160 /* B67154 802416A4 00000000 */ nop glabel L802416A8_B67158 /* B67158 802416A8 0C0129CF */ jal func_8004A73C /* B6715C 802416AC 0240202D */ daddu $a0, $s2, $zero -.L802416B0: glabel L802416B0_B67160 /* B67160 802416B0 8FBF0048 */ lw $ra, 0x48($sp) /* B67164 802416B4 8FB50044 */ lw $s5, 0x44($sp) 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 b15437e058..38eedc304b 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 @@ -86,7 +86,7 @@ glabel func_80240F00_B6D290 .L80241040: /* B6D3D0 80241040 8E630070 */ lw $v1, 0x70($s3) /* B6D3D4 80241044 2C62000F */ sltiu $v0, $v1, 0xf -/* B6D3D8 80241048 1040002C */ beqz $v0, .L802410FC +/* B6D3D8 80241048 1040002C */ beqz $v0, L802410FC_B6D48C /* B6D3DC 8024104C 00031080 */ sll $v0, $v1, 2 /* B6D3E0 80241050 3C018024 */ lui $at, %hi(jtbl_80244488_B70818) /* B6D3E4 80241054 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L802410EC_B6D47C /* B6D480 802410F0 0280282D */ daddu $a1, $s4, $zero /* B6D484 802410F4 0C0903AF */ jal jan_10_UnkDurationCheck /* B6D488 802410F8 0200302D */ daddu $a2, $s0, $zero -.L802410FC: glabel L802410FC_B6D48C /* B6D48C 802410FC 0000102D */ daddu $v0, $zero, $zero .L80241100: diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s index 8f83cfbfef..7b7b15da28 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s @@ -98,7 +98,7 @@ glabel func_80240CF0_B73DA0 .L80240E50: /* B73F00 80240E50 8E430070 */ lw $v1, 0x70($s2) /* B73F04 80240E54 2C620064 */ sltiu $v0, $v1, 0x64 -/* B73F08 80240E58 10400048 */ beqz $v0, .L80240F7C +/* B73F08 80240E58 10400048 */ beqz $v0, L80240F7C_B7402C /* B73F0C 80240E5C 00031080 */ sll $v0, $v1, 2 /* B73F10 80240E60 3C018024 */ lui $at, %hi(jtbl_802433E0_B76490) /* B73F14 80240E64 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80240E84_B73F34 /* B73F38 80240E88 0260282D */ daddu $a1, $s3, $zero /* B73F3C 80240E8C 0C0125AE */ jal func_800496B8 /* B73F40 80240E90 0280302D */ daddu $a2, $s4, $zero -/* B73F44 80240E94 080903DF */ j .L80240F7C +/* B73F44 80240E94 080903DF */ j L80240F7C_B7402C /* B73F48 80240E98 00000000 */ nop glabel L80240E9C_B73F4C /* B73F4C 80240E9C 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80240EAC_B73F5C /* B73F60 80240EB0 0260282D */ daddu $a1, $s3, $zero /* B73F64 80240EB4 0C012701 */ jal func_80049C04 /* B73F68 80240EB8 0280302D */ daddu $a2, $s4, $zero -/* B73F6C 80240EBC 080903DF */ j .L80240F7C +/* B73F6C 80240EBC 080903DF */ j L80240F7C_B7402C /* B73F70 80240EC0 00000000 */ nop glabel L80240EC4_B73F74 /* B73F74 80240EC4 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240ED4_B73F84 /* B73F88 80240ED8 0260282D */ daddu $a1, $s3, $zero /* B73F8C 80240EDC 0C0127B3 */ jal func_80049ECC /* B73F90 80240EE0 0280302D */ daddu $a2, $s4, $zero -/* B73F94 80240EE4 080903DF */ j .L80240F7C +/* B73F94 80240EE4 080903DF */ j L80240F7C_B7402C /* B73F98 80240EE8 00000000 */ nop glabel L80240EEC_B73F9C /* B73F9C 80240EEC 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240EFC_B73FAC /* B73FB0 80240F00 0260282D */ daddu $a1, $s3, $zero /* B73FB4 80240F04 0C012849 */ jal func_8004A124 /* B73FB8 80240F08 0280302D */ daddu $a2, $s4, $zero -/* B73FBC 80240F0C 080903DF */ j .L80240F7C +/* B73FBC 80240F0C 080903DF */ j L80240F7C_B7402C /* B73FC0 80240F10 00000000 */ nop glabel L80240F14_B73FC4 /* B73FC4 80240F14 0240202D */ daddu $a0, $s2, $zero /* B73FC8 80240F18 0260282D */ daddu $a1, $s3, $zero /* B73FCC 80240F1C 0C0128FA */ jal func_8004A3E8 /* B73FD0 80240F20 0280302D */ daddu $a2, $s4, $zero -/* B73FD4 80240F24 080903DF */ j .L80240F7C +/* B73FD4 80240F24 080903DF */ j L80240F7C_B7402C /* B73FD8 80240F28 00000000 */ nop glabel L80240F2C_B73FDC /* B73FDC 80240F2C 0C0901B5 */ jal jan_12_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240F34_B73FE4 /* B73FE8 80240F38 0240202D */ daddu $a0, $s2, $zero /* B73FEC 80240F3C 8E430070 */ lw $v1, 0x70($s2) /* B73FF0 80240F40 24020020 */ addiu $v0, $zero, 0x20 -/* B73FF4 80240F44 1462000D */ bne $v1, $v0, .L80240F7C +/* B73FF4 80240F44 1462000D */ bne $v1, $v0, L80240F7C_B7402C /* B73FF8 80240F48 00000000 */ nop glabel L80240F4C_B73FFC /* B73FFC 80240F4C 0C0901EC */ jal jan_12_UnkNpcAIFunc8 /* B74000 80240F50 0240202D */ daddu $a0, $s2, $zero /* B74004 80240F54 8E430070 */ lw $v1, 0x70($s2) /* B74008 80240F58 24020021 */ addiu $v0, $zero, 0x21 -/* B7400C 80240F5C 14620007 */ bne $v1, $v0, .L80240F7C +/* B7400C 80240F5C 14620007 */ bne $v1, $v0, L80240F7C_B7402C /* B74010 80240F60 00000000 */ nop glabel L80240F64_B74014 /* B74014 80240F64 0C090222 */ jal jan_12_UnkNpcAIFunc5 /* B74018 80240F68 0240202D */ daddu $a0, $s2, $zero -/* B7401C 80240F6C 080903DF */ j .L80240F7C +/* B7401C 80240F6C 080903DF */ j L80240F7C_B7402C /* B74020 80240F70 00000000 */ nop glabel L80240F74_B74024 /* B74024 80240F74 0C0129CF */ jal func_8004A73C /* B74028 80240F78 0240202D */ daddu $a0, $s2, $zero -.L80240F7C: glabel L80240F7C_B7402C /* B7402C 80240F7C 8FBF0048 */ lw $ra, 0x48($sp) /* B74030 80240F80 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s index 708b08cef6..a993a70291 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s @@ -98,7 +98,7 @@ glabel func_80240FA4_B74054 .L80241104: /* B741B4 80241104 8E430070 */ lw $v1, 0x70($s2) /* B741B8 80241108 2C620064 */ sltiu $v0, $v1, 0x64 -/* B741BC 8024110C 10400048 */ beqz $v0, .L80241230 +/* B741BC 8024110C 10400048 */ beqz $v0, L80241230_B742E0 /* B741C0 80241110 00031080 */ sll $v0, $v1, 2 /* B741C4 80241114 3C018024 */ lui $at, %hi(jtbl_80243570_B76620) /* B741C8 80241118 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80241138_B741E8 /* B741EC 8024113C 0260282D */ daddu $a1, $s3, $zero /* B741F0 80241140 0C0125AE */ jal func_800496B8 /* B741F4 80241144 0280302D */ daddu $a2, $s4, $zero -/* B741F8 80241148 0809048C */ j .L80241230 +/* B741F8 80241148 0809048C */ j L80241230_B742E0 /* B741FC 8024114C 00000000 */ nop glabel L80241150_B74200 /* B74200 80241150 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80241160_B74210 /* B74214 80241164 0260282D */ daddu $a1, $s3, $zero /* B74218 80241168 0C090144 */ jal func_80240510_B735C0 /* B7421C 8024116C 0280302D */ daddu $a2, $s4, $zero -/* B74220 80241170 0809048C */ j .L80241230 +/* B74220 80241170 0809048C */ j L80241230_B742E0 /* B74224 80241174 00000000 */ nop glabel L80241178_B74228 /* B74228 80241178 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80241188_B74238 /* B7423C 8024118C 0260282D */ daddu $a1, $s3, $zero /* B74240 80241190 0C0127B3 */ jal func_80049ECC /* B74244 80241194 0280302D */ daddu $a2, $s4, $zero -/* B74248 80241198 0809048C */ j .L80241230 +/* B74248 80241198 0809048C */ j L80241230_B742E0 /* B7424C 8024119C 00000000 */ nop glabel L802411A0_B74250 /* B74250 802411A0 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L802411B0_B74260 /* B74264 802411B4 0260282D */ daddu $a1, $s3, $zero /* B74268 802411B8 0C012849 */ jal func_8004A124 /* B7426C 802411BC 0280302D */ daddu $a2, $s4, $zero -/* B74270 802411C0 0809048C */ j .L80241230 +/* B74270 802411C0 0809048C */ j L80241230_B742E0 /* B74274 802411C4 00000000 */ nop glabel L802411C8_B74278 /* B74278 802411C8 0240202D */ daddu $a0, $s2, $zero /* B7427C 802411CC 0260282D */ daddu $a1, $s3, $zero /* B74280 802411D0 0C0128FA */ jal func_8004A3E8 /* B74284 802411D4 0280302D */ daddu $a2, $s4, $zero -/* B74288 802411D8 0809048C */ j .L80241230 +/* B74288 802411D8 0809048C */ j L80241230_B742E0 /* B7428C 802411DC 00000000 */ nop glabel L802411E0_B74290 /* B74290 802411E0 0C0901B5 */ jal jan_12_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L802411E8_B74298 /* B7429C 802411EC 0240202D */ daddu $a0, $s2, $zero /* B742A0 802411F0 8E430070 */ lw $v1, 0x70($s2) /* B742A4 802411F4 24020020 */ addiu $v0, $zero, 0x20 -/* B742A8 802411F8 1462000D */ bne $v1, $v0, .L80241230 +/* B742A8 802411F8 1462000D */ bne $v1, $v0, L80241230_B742E0 /* B742AC 802411FC 00000000 */ nop glabel L80241200_B742B0 /* B742B0 80241200 0C0901EC */ jal jan_12_UnkNpcAIFunc8 /* B742B4 80241204 0240202D */ daddu $a0, $s2, $zero /* B742B8 80241208 8E430070 */ lw $v1, 0x70($s2) /* B742BC 8024120C 24020021 */ addiu $v0, $zero, 0x21 -/* B742C0 80241210 14620007 */ bne $v1, $v0, .L80241230 +/* B742C0 80241210 14620007 */ bne $v1, $v0, L80241230_B742E0 /* B742C4 80241214 00000000 */ nop glabel L80241218_B742C8 /* B742C8 80241218 0C090222 */ jal jan_12_UnkNpcAIFunc5 /* B742CC 8024121C 0240202D */ daddu $a0, $s2, $zero -/* B742D0 80241220 0809048C */ j .L80241230 +/* B742D0 80241220 0809048C */ j L80241230_B742E0 /* B742D4 80241224 00000000 */ nop glabel L80241228_B742D8 /* B742D8 80241228 0C0129CF */ jal func_8004A73C /* B742DC 8024122C 0240202D */ daddu $a0, $s2, $zero -.L80241230: glabel L80241230_B742E0 /* B742E0 80241230 8FBF0048 */ lw $ra, 0x48($sp) /* B742E4 80241234 8FB50044 */ lw $s5, 0x44($sp) 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 6d692d03e2..808af6ebc1 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 @@ -86,7 +86,7 @@ glabel func_802410B0_B7B100 .L802411F0: /* B7B240 802411F0 8E630070 */ lw $v1, 0x70($s3) /* B7B244 802411F4 2C62000F */ sltiu $v0, $v1, 0xf -/* B7B248 802411F8 1040002C */ beqz $v0, .L802412AC +/* B7B248 802411F8 1040002C */ beqz $v0, L802412AC_B7B2FC /* B7B24C 802411FC 00031080 */ sll $v0, $v1, 2 /* B7B250 80241200 3C018024 */ lui $at, %hi(jtbl_80243888_B7D8D8) /* B7B254 80241204 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L8024129C_B7B2EC /* B7B2F0 802412A0 0280282D */ daddu $a1, $s4, $zero /* B7B2F4 802412A4 0C09041B */ jal jan_14_UnkDurationCheck /* B7B2F8 802412A8 0200302D */ daddu $a2, $s0, $zero -.L802412AC: glabel L802412AC_B7B2FC /* B7B2FC 802412AC 0000102D */ daddu $v0, $zero, $zero .L802412B0: diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index e3bc3cb407..faaaeb6280 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -122,7 +122,7 @@ glabel func_80240B94_B84D14 .L80240D54: /* B84ED4 80240D54 8E830070 */ lw $v1, 0x70($s4) /* B84ED8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* B84EDC 80240D5C 10400042 */ beqz $v0, .L80240E68 +/* B84EDC 80240D5C 10400042 */ beqz $v0, L80240E68_B84FE8 /* B84EE0 80240D60 00031080 */ sll $v0, $v1, 2 /* B84EE4 80240D64 3C018025 */ lui $at, %hi(jtbl_8024B9B0_B8FB30) /* B84EE8 80240D68 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240D88_B84F08 /* B84F0C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* B84F10 80240D90 0C090056 */ jal func_80240158_B842D8 /* B84F14 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* B84F18 80240D98 0809039A */ j .L80240E68 +/* B84F18 80240D98 0809039A */ j L80240E68_B84FE8 /* B84F1C 80240D9C 00000000 */ nop glabel L80240DA0_B84F20 /* B84F20 80240DA0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80240DB0_B84F30 /* B84F34 80240DB4 0260282D */ daddu $a1, $s3, $zero /* B84F38 80240DB8 0C090130 */ jal func_802404C0_B84640 /* B84F3C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* B84F40 80240DC0 0809039A */ j .L80240E68 +/* B84F40 80240DC0 0809039A */ j L80240E68_B84FE8 /* B84F44 80240DC4 00000000 */ nop glabel L80240DC8_B84F48 /* B84F48 80240DC8 0280202D */ daddu $a0, $s4, $zero /* B84F4C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* B84F50 80240DD0 0C09019F */ jal func_8024067C_B847FC /* B84F54 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* B84F58 80240DD8 0809039A */ j .L80240E68 +/* B84F58 80240DD8 0809039A */ j L80240E68_B84FE8 /* B84F5C 80240DDC 00000000 */ nop glabel L80240DE0_B84F60 /* B84F60 80240DE0 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80240DF0_B84F70 /* B84F74 80240DF4 0260282D */ daddu $a1, $s3, $zero /* B84F78 80240DF8 0C0901E9 */ jal jan_22_NpcJumpFunc /* B84F7C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* B84F80 80240E00 0809039A */ j .L80240E68 +/* B84F80 80240E00 0809039A */ j L80240E68_B84FE8 /* B84F84 80240E04 00000000 */ nop glabel L80240E08_B84F88 /* B84F88 80240E08 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80240E18_B84F98 /* B84F9C 80240E1C 0260282D */ daddu $a1, $s3, $zero /* B84FA0 80240E20 0C090253 */ jal func_8024094C_B84ACC /* B84FA4 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* B84FA8 80240E28 0809039A */ j .L80240E68 +/* B84FA8 80240E28 0809039A */ j L80240E68_B84FE8 /* B84FAC 80240E2C 00000000 */ nop glabel L80240E30_B84FB0 /* B84FB0 80240E30 0280202D */ daddu $a0, $s4, $zero /* B84FB4 80240E34 0260282D */ daddu $a1, $s3, $zero /* B84FB8 80240E38 0C09029B */ jal jan_22_UnkNpcDurationFlagFunc /* B84FBC 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* B84FC0 80240E40 0809039A */ j .L80240E68 +/* B84FC0 80240E40 0809039A */ j L80240E68_B84FE8 /* B84FC4 80240E44 00000000 */ nop glabel L80240E48_B84FC8 /* B84FC8 80240E48 0280202D */ daddu $a0, $s4, $zero /* B84FCC 80240E4C 0260282D */ daddu $a1, $s3, $zero /* B84FD0 80240E50 0C0902B5 */ jal func_80240AD4_B84C54 /* B84FD4 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* B84FD8 80240E58 0809039A */ j .L80240E68 +/* B84FD8 80240E58 0809039A */ j L80240E68_B84FE8 /* B84FDC 80240E5C 00000000 */ nop glabel L80240E60_B84FE0 /* B84FE0 80240E60 0C0129CF */ jal func_8004A73C /* B84FE4 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: glabel L80240E68_B84FE8 /* B84FE8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* B84FEC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s index 7e073fe3f9..a518a1b2e5 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s @@ -122,7 +122,7 @@ glabel func_80240C44_ABBED4 .L80240E04: /* ABC094 80240E04 8E830070 */ lw $v1, 0x70($s4) /* ABC098 80240E08 2C620064 */ sltiu $v0, $v1, 0x64 -/* ABC09C 80240E0C 10400042 */ beqz $v0, .L80240F18 +/* ABC09C 80240E0C 10400042 */ beqz $v0, L80240F18_ABC1A8 /* ABC0A0 80240E10 00031080 */ sll $v0, $v1, 2 /* ABC0A4 80240E14 3C018025 */ lui $at, %hi(jtbl_80249D40_AC4FD0) /* ABC0A8 80240E18 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240E38_ABC0C8 /* ABC0CC 80240E3C 0260282D */ daddu $a1, $s3, $zero /* ABC0D0 80240E40 0C090082 */ jal func_80240208_ABB498 /* ABC0D4 80240E44 02A0302D */ daddu $a2, $s5, $zero -/* ABC0D8 80240E48 080903C6 */ j .L80240F18 +/* ABC0D8 80240E48 080903C6 */ j L80240F18_ABC1A8 /* ABC0DC 80240E4C 00000000 */ nop glabel L80240E50_ABC0E0 /* ABC0E0 80240E50 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80240E60_ABC0F0 /* ABC0F4 80240E64 0260282D */ daddu $a1, $s3, $zero /* ABC0F8 80240E68 0C09015C */ jal func_80240570_ABB800 /* ABC0FC 80240E6C 02A0302D */ daddu $a2, $s5, $zero -/* ABC100 80240E70 080903C6 */ j .L80240F18 +/* ABC100 80240E70 080903C6 */ j L80240F18_ABC1A8 /* ABC104 80240E74 00000000 */ nop glabel L80240E78_ABC108 /* ABC108 80240E78 0280202D */ daddu $a0, $s4, $zero /* ABC10C 80240E7C 0260282D */ daddu $a1, $s3, $zero /* ABC110 80240E80 0C0901CB */ jal func_8024072C_ABB9BC /* ABC114 80240E84 02A0302D */ daddu $a2, $s5, $zero -/* ABC118 80240E88 080903C6 */ j .L80240F18 +/* ABC118 80240E88 080903C6 */ j L80240F18_ABC1A8 /* ABC11C 80240E8C 00000000 */ nop glabel L80240E90_ABC120 /* ABC120 80240E90 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80240EA0_ABC130 /* ABC134 80240EA4 0260282D */ daddu $a1, $s3, $zero /* ABC138 80240EA8 0C090215 */ jal kkj_00_NpcJumpFunc /* ABC13C 80240EAC 02A0302D */ daddu $a2, $s5, $zero -/* ABC140 80240EB0 080903C6 */ j .L80240F18 +/* ABC140 80240EB0 080903C6 */ j L80240F18_ABC1A8 /* ABC144 80240EB4 00000000 */ nop glabel L80240EB8_ABC148 /* ABC148 80240EB8 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80240EC8_ABC158 /* ABC15C 80240ECC 0260282D */ daddu $a1, $s3, $zero /* ABC160 80240ED0 0C09027F */ jal func_802409FC_ABBC8C /* ABC164 80240ED4 02A0302D */ daddu $a2, $s5, $zero -/* ABC168 80240ED8 080903C6 */ j .L80240F18 +/* ABC168 80240ED8 080903C6 */ j L80240F18_ABC1A8 /* ABC16C 80240EDC 00000000 */ nop glabel L80240EE0_ABC170 /* ABC170 80240EE0 0280202D */ daddu $a0, $s4, $zero /* ABC174 80240EE4 0260282D */ daddu $a1, $s3, $zero /* ABC178 80240EE8 0C0902C7 */ jal kkj_00_UnkNpcDurationFlagFunc /* ABC17C 80240EEC 02A0302D */ daddu $a2, $s5, $zero -/* ABC180 80240EF0 080903C6 */ j .L80240F18 +/* ABC180 80240EF0 080903C6 */ j L80240F18_ABC1A8 /* ABC184 80240EF4 00000000 */ nop glabel L80240EF8_ABC188 /* ABC188 80240EF8 0280202D */ daddu $a0, $s4, $zero /* ABC18C 80240EFC 0260282D */ daddu $a1, $s3, $zero /* ABC190 80240F00 0C0902E1 */ jal func_80240B84_ABBE14 /* ABC194 80240F04 02A0302D */ daddu $a2, $s5, $zero -/* ABC198 80240F08 080903C6 */ j .L80240F18 +/* ABC198 80240F08 080903C6 */ j L80240F18_ABC1A8 /* ABC19C 80240F0C 00000000 */ nop glabel L80240F10_ABC1A0 /* ABC1A0 80240F10 0C0129CF */ jal func_8004A73C /* ABC1A4 80240F14 0280202D */ daddu $a0, $s4, $zero -.L80240F18: glabel L80240F18_ABC1A8 /* ABC1A8 80240F18 8FBF0060 */ lw $ra, 0x60($sp) /* ABC1AC 80240F1C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index 47ed2a9d60..ee72893a58 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -122,7 +122,7 @@ glabel func_80240B94_AC5D04 .L80240D54: /* AC5EC4 80240D54 8E830070 */ lw $v1, 0x70($s4) /* AC5EC8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* AC5ECC 80240D5C 10400042 */ beqz $v0, .L80240E68 +/* AC5ECC 80240D5C 10400042 */ beqz $v0, L80240E68_AC5FD8 /* AC5ED0 80240D60 00031080 */ sll $v0, $v1, 2 /* AC5ED4 80240D64 3C018024 */ lui $at, %hi(jtbl_80243A20_AC8B90) /* AC5ED8 80240D68 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240D88_AC5EF8 /* AC5EFC 80240D8C 0260282D */ daddu $a1, $s3, $zero /* AC5F00 80240D90 0C090056 */ jal func_80240158_AC52C8 /* AC5F04 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* AC5F08 80240D98 0809039A */ j .L80240E68 +/* AC5F08 80240D98 0809039A */ j L80240E68_AC5FD8 /* AC5F0C 80240D9C 00000000 */ nop glabel L80240DA0_AC5F10 /* AC5F10 80240DA0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80240DB0_AC5F20 /* AC5F24 80240DB4 0260282D */ daddu $a1, $s3, $zero /* AC5F28 80240DB8 0C090130 */ jal func_802404C0_AC5630 /* AC5F2C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* AC5F30 80240DC0 0809039A */ j .L80240E68 +/* AC5F30 80240DC0 0809039A */ j L80240E68_AC5FD8 /* AC5F34 80240DC4 00000000 */ nop glabel L80240DC8_AC5F38 /* AC5F38 80240DC8 0280202D */ daddu $a0, $s4, $zero /* AC5F3C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* AC5F40 80240DD0 0C09019F */ jal func_8024067C_AC57EC /* AC5F44 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* AC5F48 80240DD8 0809039A */ j .L80240E68 +/* AC5F48 80240DD8 0809039A */ j L80240E68_AC5FD8 /* AC5F4C 80240DDC 00000000 */ nop glabel L80240DE0_AC5F50 /* AC5F50 80240DE0 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80240DF0_AC5F60 /* AC5F64 80240DF4 0260282D */ daddu $a1, $s3, $zero /* AC5F68 80240DF8 0C0901E9 */ jal kkj_01_NpcJumpFunc /* AC5F6C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* AC5F70 80240E00 0809039A */ j .L80240E68 +/* AC5F70 80240E00 0809039A */ j L80240E68_AC5FD8 /* AC5F74 80240E04 00000000 */ nop glabel L80240E08_AC5F78 /* AC5F78 80240E08 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80240E18_AC5F88 /* AC5F8C 80240E1C 0260282D */ daddu $a1, $s3, $zero /* AC5F90 80240E20 0C090253 */ jal func_8024094C_AC5ABC /* AC5F94 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* AC5F98 80240E28 0809039A */ j .L80240E68 +/* AC5F98 80240E28 0809039A */ j L80240E68_AC5FD8 /* AC5F9C 80240E2C 00000000 */ nop glabel L80240E30_AC5FA0 /* AC5FA0 80240E30 0280202D */ daddu $a0, $s4, $zero /* AC5FA4 80240E34 0260282D */ daddu $a1, $s3, $zero /* AC5FA8 80240E38 0C09029B */ jal kkj_01_UnkNpcDurationFlagFunc /* AC5FAC 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* AC5FB0 80240E40 0809039A */ j .L80240E68 +/* AC5FB0 80240E40 0809039A */ j L80240E68_AC5FD8 /* AC5FB4 80240E44 00000000 */ nop glabel L80240E48_AC5FB8 /* AC5FB8 80240E48 0280202D */ daddu $a0, $s4, $zero /* AC5FBC 80240E4C 0260282D */ daddu $a1, $s3, $zero /* AC5FC0 80240E50 0C0902B5 */ jal func_80240AD4_AC5C44 /* AC5FC4 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* AC5FC8 80240E58 0809039A */ j .L80240E68 +/* AC5FC8 80240E58 0809039A */ j L80240E68_AC5FD8 /* AC5FCC 80240E5C 00000000 */ nop glabel L80240E60_AC5FD0 /* AC5FD0 80240E60 0C0129CF */ jal func_8004A73C /* AC5FD4 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: glabel L80240E68_AC5FD8 /* AC5FD8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* AC5FDC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s index 65a9932976..8483868a32 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s @@ -19,7 +19,7 @@ glabel func_802406C4_AF8014 /* AF8048 802406F8 3C038024 */ lui $v1, %hi(D_80246558_C60C98) /* AF804C 802406FC 8C636558 */ lw $v1, %lo(D_80246558_C60C98)($v1) /* AF8050 80240700 2C62000D */ sltiu $v0, $v1, 0xd -/* AF8054 80240704 104000F1 */ beqz $v0, .L80240ACC +/* AF8054 80240704 104000F1 */ beqz $v0, L80240ACC_AF841C /* AF8058 80240708 00031080 */ sll $v0, $v1, 2 /* AF805C 8024070C 3C018024 */ lui $at, %hi(jtbl_802461B0_AFDB00) /* AF8060 80240710 00220821 */ addu $at, $at, $v0 @@ -128,7 +128,7 @@ glabel L80240720_AF8070 /* AF81F4 802408A4 24020001 */ addiu $v0, $zero, 1 /* AF81F8 802408A8 3C018024 */ lui $at, %hi(D_80246558_C60C98) /* AF81FC 802408AC AC226558 */ sw $v0, %lo(D_80246558_C60C98)($at) -/* AF8200 802408B0 080902B3 */ j .L80240ACC +/* AF8200 802408B0 080902B3 */ j L80240ACC_AF841C /* AF8204 802408B4 AEB40070 */ sw $s4, 0x70($s5) glabel L802408B8_AF8208 /* AF8208 802408B8 3C128024 */ lui $s2, %hi(D_8024655C) @@ -157,13 +157,13 @@ glabel L802408B8_AF8208 /* AF8260 80240910 8EA20070 */ lw $v0, 0x70($s5) /* AF8264 80240914 10400003 */ beqz $v0, .L80240924 /* AF8268 80240918 2442FFFF */ addiu $v0, $v0, -1 -/* AF826C 8024091C 080902B3 */ j .L80240ACC +/* AF826C 8024091C 080902B3 */ j L80240ACC_AF841C /* AF8270 80240920 AEA20070 */ sw $v0, 0x70($s5) .L80240924: /* AF8274 80240924 2402000A */ addiu $v0, $zero, 0xa /* AF8278 80240928 3C018024 */ lui $at, %hi(D_80246558_C60C98) /* AF827C 8024092C AC226558 */ sw $v0, %lo(D_80246558_C60C98)($at) -/* AF8280 80240930 080902B3 */ j .L80240ACC +/* AF8280 80240930 080902B3 */ j L80240ACC_AF841C /* AF8284 80240934 00000000 */ nop glabel L80240938_AF8288 /* AF8288 80240938 3C048024 */ lui $a0, %hi(D_80246568_C8C018) @@ -245,14 +245,14 @@ glabel L8024096C_AF82BC /* AF8398 80240A48 24636534 */ addiu $v1, $v1, %lo(D_80246534) /* AF839C 80240A4C 8C620000 */ lw $v0, ($v1) /* AF83A0 80240A50 2442FFFF */ addiu $v0, $v0, -1 -/* AF83A4 80240A54 1440001D */ bnez $v0, .L80240ACC +/* AF83A4 80240A54 1440001D */ bnez $v0, L80240ACC_AF841C /* AF83A8 80240A58 AC620000 */ sw $v0, ($v1) /* AF83AC 80240A5C 24020005 */ addiu $v0, $zero, 5 /* AF83B0 80240A60 AC620000 */ sw $v0, ($v1) /* AF83B4 80240A64 2402000C */ addiu $v0, $zero, 0xc /* AF83B8 80240A68 3C018024 */ lui $at, %hi(D_80246558_C60C98) /* AF83BC 80240A6C AC226558 */ sw $v0, %lo(D_80246558_C60C98)($at) -/* AF83C0 80240A70 080902B3 */ j .L80240ACC +/* AF83C0 80240A70 080902B3 */ j L80240ACC_AF841C /* AF83C4 80240A74 00000000 */ nop glabel L80240A78_AF83C8 /* AF83C8 80240A78 3C038024 */ lui $v1, %hi(D_80246534) @@ -277,7 +277,6 @@ glabel L80240A78_AF83C8 /* AF8414 80240AC4 24020002 */ addiu $v0, $zero, 2 .L80240AC8: /* AF8418 80240AC8 AC620000 */ sw $v0, ($v1) -.L80240ACC: glabel L80240ACC_AF841C /* AF841C 80240ACC 3C058024 */ lui $a1, %hi(D_802465A0) /* AF8420 80240AD0 24A565A0 */ addiu $a1, $a1, %lo(D_802465A0) diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s index 88624de7fd..e094e16083 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s @@ -100,7 +100,7 @@ glabel func_80241C18_8B1C88 .L80241D84: /* 8B1DF4 80241D84 8E830070 */ lw $v1, 0x70($s4) /* 8B1DF8 80241D88 2C620064 */ sltiu $v0, $v1, 0x64 -/* 8B1DFC 80241D8C 10400036 */ beqz $v0, .L80241E68 +/* 8B1DFC 80241D8C 10400036 */ beqz $v0, L80241E68_8B1ED8 /* 8B1E00 80241D90 00031080 */ sll $v0, $v1, 2 /* 8B1E04 80241D94 3C018025 */ lui $at, %hi(jtbl_80257D58_8C7DC8) /* 8B1E08 80241D98 00220821 */ addu $at, $at, $v0 @@ -117,7 +117,7 @@ glabel L80241DB8_8B1E28 /* 8B1E2C 80241DBC 0260282D */ daddu $a1, $s3, $zero /* 8B1E30 80241DC0 0C090536 */ jal func_802414D8_8B1548 /* 8B1E34 80241DC4 02A0302D */ daddu $a2, $s5, $zero -/* 8B1E38 80241DC8 0809079A */ j .L80241E68 +/* 8B1E38 80241DC8 0809079A */ j L80241E68_8B1ED8 /* 8B1E3C 80241DCC 00000000 */ nop glabel L80241DD0_8B1E40 /* 8B1E40 80241DD0 0280202D */ daddu $a0, $s4, $zero @@ -129,7 +129,7 @@ glabel L80241DE0_8B1E50 /* 8B1E54 80241DE4 0260282D */ daddu $a1, $s3, $zero /* 8B1E58 80241DE8 0C090596 */ jal kmr_02_NpcJumpFunc /* 8B1E5C 80241DEC 02A0302D */ daddu $a2, $s5, $zero -/* 8B1E60 80241DF0 0809079A */ j .L80241E68 +/* 8B1E60 80241DF0 0809079A */ j L80241E68_8B1ED8 /* 8B1E64 80241DF4 00000000 */ nop glabel L80241DF8_8B1E68 /* 8B1E68 80241DF8 0280202D */ daddu $a0, $s4, $zero @@ -141,14 +141,14 @@ glabel L80241E08_8B1E78 /* 8B1E7C 80241E0C 0260282D */ daddu $a1, $s3, $zero /* 8B1E80 80241E10 0C090600 */ jal kmr_02_UnkNpcAIFunc11 /* 8B1E84 80241E14 02A0302D */ daddu $a2, $s5, $zero -/* 8B1E88 80241E18 0809079A */ j .L80241E68 +/* 8B1E88 80241E18 0809079A */ j L80241E68_8B1ED8 /* 8B1E8C 80241E1C 00000000 */ nop glabel L80241E20_8B1E90 /* 8B1E90 80241E20 0280202D */ daddu $a0, $s4, $zero /* 8B1E94 80241E24 0260282D */ daddu $a1, $s3, $zero /* 8B1E98 80241E28 0C090647 */ jal kmr_02_UnkNpcAIFunc10 /* 8B1E9C 80241E2C 02A0302D */ daddu $a2, $s5, $zero -/* 8B1EA0 80241E30 0809079A */ j .L80241E68 +/* 8B1EA0 80241E30 0809079A */ j L80241E68_8B1ED8 /* 8B1EA4 80241E34 00000000 */ nop glabel L80241E38_8B1EA8 /* 8B1EA8 80241E38 0280202D */ daddu $a0, $s4, $zero @@ -160,12 +160,11 @@ glabel L80241E48_8B1EB8 /* 8B1EBC 80241E4C 0260282D */ daddu $a1, $s3, $zero /* 8B1EC0 80241E50 0C090684 */ jal func_80241A10_8B1A80 /* 8B1EC4 80241E54 02A0302D */ daddu $a2, $s5, $zero -/* 8B1EC8 80241E58 0809079A */ j .L80241E68 +/* 8B1EC8 80241E58 0809079A */ j L80241E68_8B1ED8 /* 8B1ECC 80241E5C 00000000 */ nop glabel L80241E60_8B1ED0 /* 8B1ED0 80241E60 0C0129CF */ jal func_8004A73C /* 8B1ED4 80241E64 0280202D */ daddu $a0, $s4, $zero -.L80241E68: glabel L80241E68_8B1ED8 /* 8B1ED8 80241E68 8FBF0048 */ lw $ra, 0x48($sp) /* 8B1EDC 80241E6C 8FB50044 */ lw $s5, 0x44($sp) 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 ec3a0aa7f0..6905ccc518 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 @@ -64,7 +64,7 @@ glabel func_8024130C_8CF37C .L802413F4: /* 8CF464 802413F4 8E830070 */ lw $v1, 0x70($s4) /* 8CF468 802413F8 2C62000F */ sltiu $v0, $v1, 0xf -/* 8CF46C 802413FC 10400034 */ beqz $v0, .L802414D0 +/* 8CF46C 802413FC 10400034 */ beqz $v0, L802414D0_8CF540 /* 8CF470 80241400 00031080 */ sll $v0, $v1, 2 /* 8CF474 80241404 3C018024 */ lui $at, %hi(jtbl_80243458_8D14C8) /* 8CF478 80241408 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L802414C0_8CF530 /* 8CF534 802414C4 0200282D */ daddu $a1, $s0, $zero /* 8CF538 802414C8 0C090396 */ jal func_80240E58_8CEEC8 /* 8CF53C 802414CC 0260302D */ daddu $a2, $s3, $zero -.L802414D0: glabel L802414D0_8CF540 /* 8CF540 802414D0 0000102D */ daddu $v0, $zero, $zero .L802414D4: 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 9d816fcb1f..29f8f8ee9d 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 @@ -64,7 +64,7 @@ glabel func_8024130C_8D281C .L802413F4: /* 8D2904 802413F4 8E830070 */ lw $v1, 0x70($s4) /* 8D2908 802413F8 2C62000F */ sltiu $v0, $v1, 0xf -/* 8D290C 802413FC 10400034 */ beqz $v0, .L802414D0 +/* 8D290C 802413FC 10400034 */ beqz $v0, L802414D0_8D29E0 /* 8D2910 80241400 00031080 */ sll $v0, $v1, 2 /* 8D2914 80241404 3C018024 */ lui $at, %hi(jtbl_80242868_8D3D78) /* 8D2918 80241408 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L802414C0_8D29D0 /* 8D29D4 802414C4 0200282D */ daddu $a1, $s0, $zero /* 8D29D8 802414C8 0C090396 */ jal func_80240E58_8D2368 /* 8D29DC 802414CC 0260302D */ daddu $a2, $s3, $zero -.L802414D0: glabel L802414D0_8D29E0 /* 8D29E0 802414D0 0000102D */ daddu $v0, $zero, $zero .L802414D4: diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s index 2a0dc611bd..07f98b9812 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s @@ -100,7 +100,7 @@ glabel func_802407F4_8D45B4 .L80240960: /* 8D4720 80240960 8E830070 */ lw $v1, 0x70($s4) /* 8D4724 80240964 2C620064 */ sltiu $v0, $v1, 0x64 -/* 8D4728 80240968 10400036 */ beqz $v0, .L80240A44 +/* 8D4728 80240968 10400036 */ beqz $v0, L80240A44_8D4804 /* 8D472C 8024096C 00031080 */ sll $v0, $v1, 2 /* 8D4730 80240970 3C018024 */ lui $at, %hi(jtbl_80241EA8_8D5C68) /* 8D4734 80240974 00220821 */ addu $at, $at, $v0 @@ -117,7 +117,7 @@ glabel L80240994_8D4754 /* 8D4758 80240998 0260282D */ daddu $a1, $s3, $zero /* 8D475C 8024099C 0C09002D */ jal func_802400B4_8D3E74 /* 8D4760 802409A0 02A0302D */ daddu $a2, $s5, $zero -/* 8D4764 802409A4 08090291 */ j .L80240A44 +/* 8D4764 802409A4 08090291 */ j L80240A44_8D4804 /* 8D4768 802409A8 00000000 */ nop glabel L802409AC_8D476C /* 8D476C 802409AC 0280202D */ daddu $a0, $s4, $zero @@ -129,7 +129,7 @@ glabel L802409BC_8D477C /* 8D4780 802409C0 0260282D */ daddu $a1, $s3, $zero /* 8D4784 802409C4 0C09008D */ jal kmr_07_NpcJumpFunc /* 8D4788 802409C8 02A0302D */ daddu $a2, $s5, $zero -/* 8D478C 802409CC 08090291 */ j .L80240A44 +/* 8D478C 802409CC 08090291 */ j L80240A44_8D4804 /* 8D4790 802409D0 00000000 */ nop glabel L802409D4_8D4794 /* 8D4794 802409D4 0280202D */ daddu $a0, $s4, $zero @@ -141,14 +141,14 @@ glabel L802409E4_8D47A4 /* 8D47A8 802409E8 0260282D */ daddu $a1, $s3, $zero /* 8D47AC 802409EC 0C0900F7 */ jal kmr_07_UnkNpcAIFunc11 /* 8D47B0 802409F0 02A0302D */ daddu $a2, $s5, $zero -/* 8D47B4 802409F4 08090291 */ j .L80240A44 +/* 8D47B4 802409F4 08090291 */ j L80240A44_8D4804 /* 8D47B8 802409F8 00000000 */ nop glabel L802409FC_8D47BC /* 8D47BC 802409FC 0280202D */ daddu $a0, $s4, $zero /* 8D47C0 80240A00 0260282D */ daddu $a1, $s3, $zero /* 8D47C4 80240A04 0C09013E */ jal kmr_07_UnkNpcAIFunc10 /* 8D47C8 80240A08 02A0302D */ daddu $a2, $s5, $zero -/* 8D47CC 80240A0C 08090291 */ j .L80240A44 +/* 8D47CC 80240A0C 08090291 */ j L80240A44_8D4804 /* 8D47D0 80240A10 00000000 */ nop glabel L80240A14_8D47D4 /* 8D47D4 80240A14 0280202D */ daddu $a0, $s4, $zero @@ -160,12 +160,11 @@ glabel L80240A24_8D47E4 /* 8D47E8 80240A28 0260282D */ daddu $a1, $s3, $zero /* 8D47EC 80240A2C 0C09017B */ jal func_802405EC_8D43AC /* 8D47F0 80240A30 02A0302D */ daddu $a2, $s5, $zero -/* 8D47F4 80240A34 08090291 */ j .L80240A44 +/* 8D47F4 80240A34 08090291 */ j L80240A44_8D4804 /* 8D47F8 80240A38 00000000 */ nop glabel L80240A3C_8D47FC /* 8D47FC 80240A3C 0C0129CF */ jal func_8004A73C /* 8D4800 80240A40 0280202D */ daddu $a0, $s4, $zero -.L80240A44: glabel L80240A44_8D4804 /* 8D4804 80240A44 8FBF0048 */ lw $ra, 0x48($sp) /* 8D4808 80240A48 8FB50044 */ lw $s5, 0x44($sp) 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 bc2ac6fa20..c18bd02178 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 @@ -64,7 +64,7 @@ glabel func_8024130C_8D710C .L802413F4: /* 8D71F4 802413F4 8E830070 */ lw $v1, 0x70($s4) /* 8D71F8 802413F8 2C62000F */ sltiu $v0, $v1, 0xf -/* 8D71FC 802413FC 10400034 */ beqz $v0, .L802414D0 +/* 8D71FC 802413FC 10400034 */ beqz $v0, L802414D0_8D72D0 /* 8D7200 80241400 00031080 */ sll $v0, $v1, 2 /* 8D7204 80241404 3C018024 */ lui $at, %hi(jtbl_80242688_8D8488) /* 8D7208 80241408 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L802414C0_8D72C0 /* 8D72C4 802414C4 0200282D */ daddu $a1, $s0, $zero /* 8D72C8 802414C8 0C090396 */ jal func_80240E58_8D6C58 /* 8D72CC 802414CC 0260302D */ daddu $a2, $s3, $zero -.L802414D0: glabel L802414D0_8D72D0 /* 8D72D0 802414D0 0000102D */ daddu $v0, $zero, $zero .L802414D4: diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s index c652730735..6af464877f 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s @@ -100,7 +100,7 @@ glabel func_80240B64_8DAC64 .L80240CD0: /* 8DADD0 80240CD0 8E830070 */ lw $v1, 0x70($s4) /* 8DADD4 80240CD4 2C620064 */ sltiu $v0, $v1, 0x64 -/* 8DADD8 80240CD8 10400036 */ beqz $v0, .L80240DB4 +/* 8DADD8 80240CD8 10400036 */ beqz $v0, L80240DB4_8DAEB4 /* 8DADDC 80240CDC 00031080 */ sll $v0, $v1, 2 /* 8DADE0 80240CE0 3C018025 */ lui $at, %hi(jtbl_802510C8_8EB1C8) /* 8DADE4 80240CE4 00220821 */ addu $at, $at, $v0 @@ -117,7 +117,7 @@ glabel L80240D04_8DAE04 /* 8DAE08 80240D08 0260282D */ daddu $a1, $s3, $zero /* 8DAE0C 80240D0C 0C090109 */ jal func_80240424_8DA524 /* 8DAE10 80240D10 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE14 80240D14 0809036D */ j .L80240DB4 +/* 8DAE14 80240D14 0809036D */ j L80240DB4_8DAEB4 /* 8DAE18 80240D18 00000000 */ nop glabel L80240D1C_8DAE1C /* 8DAE1C 80240D1C 0280202D */ daddu $a0, $s4, $zero @@ -129,7 +129,7 @@ glabel L80240D2C_8DAE2C /* 8DAE30 80240D30 0260282D */ daddu $a1, $s3, $zero /* 8DAE34 80240D34 0C090169 */ jal kmr_11_NpcJumpFunc /* 8DAE38 80240D38 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE3C 80240D3C 0809036D */ j .L80240DB4 +/* 8DAE3C 80240D3C 0809036D */ j L80240DB4_8DAEB4 /* 8DAE40 80240D40 00000000 */ nop glabel L80240D44_8DAE44 /* 8DAE44 80240D44 0280202D */ daddu $a0, $s4, $zero @@ -141,14 +141,14 @@ glabel L80240D54_8DAE54 /* 8DAE58 80240D58 0260282D */ daddu $a1, $s3, $zero /* 8DAE5C 80240D5C 0C0901D3 */ jal kmr_11_UnkNpcAIFunc11 /* 8DAE60 80240D60 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE64 80240D64 0809036D */ j .L80240DB4 +/* 8DAE64 80240D64 0809036D */ j L80240DB4_8DAEB4 /* 8DAE68 80240D68 00000000 */ nop glabel L80240D6C_8DAE6C /* 8DAE6C 80240D6C 0280202D */ daddu $a0, $s4, $zero /* 8DAE70 80240D70 0260282D */ daddu $a1, $s3, $zero /* 8DAE74 80240D74 0C09021A */ jal kmr_11_UnkNpcAIFunc10 /* 8DAE78 80240D78 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE7C 80240D7C 0809036D */ j .L80240DB4 +/* 8DAE7C 80240D7C 0809036D */ j L80240DB4_8DAEB4 /* 8DAE80 80240D80 00000000 */ nop glabel L80240D84_8DAE84 /* 8DAE84 80240D84 0280202D */ daddu $a0, $s4, $zero @@ -160,12 +160,11 @@ glabel L80240D94_8DAE94 /* 8DAE98 80240D98 0260282D */ daddu $a1, $s3, $zero /* 8DAE9C 80240D9C 0C090257 */ jal func_8024095C_8DAA5C /* 8DAEA0 80240DA0 02A0302D */ daddu $a2, $s5, $zero -/* 8DAEA4 80240DA4 0809036D */ j .L80240DB4 +/* 8DAEA4 80240DA4 0809036D */ j L80240DB4_8DAEB4 /* 8DAEA8 80240DA8 00000000 */ nop glabel L80240DAC_8DAEAC /* 8DAEAC 80240DAC 0C0129CF */ jal func_8004A73C /* 8DAEB0 80240DB0 0280202D */ daddu $a0, $s4, $zero -.L80240DB4: glabel L80240DB4_8DAEB4 /* 8DAEB4 80240DB4 8FBF0048 */ lw $ra, 0x48($sp) /* 8DAEB8 80240DB8 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s index 7e413a042e..8febba87b3 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s @@ -15,7 +15,7 @@ glabel func_80240DA4_9087D4 /* 9087FC 80240DCC 8C6317C8 */ lw $v1, %lo(D_802417C8_9091F8)($v1) /* 908800 80240DD0 0040202D */ daddu $a0, $v0, $zero /* 908804 80240DD4 2C620005 */ sltiu $v0, $v1, 5 -/* 908808 80240DD8 1040003F */ beqz $v0, .L80240ED8 +/* 908808 80240DD8 1040003F */ beqz $v0, L80240ED8_908908 /* 90880C 80240DDC 24110046 */ addiu $s1, $zero, 0x46 /* 908810 80240DE0 00031080 */ sll $v0, $v1, 2 /* 908814 80240DE4 3C018024 */ lui $at, %hi(jtbl_802437F0_90B220) @@ -25,7 +25,7 @@ glabel func_80240DA4_9087D4 /* 908824 80240DF4 00000000 */ nop glabel L80240DF8_908828 /* 908828 80240DF8 8482001E */ lh $v0, 0x1e($a0) -/* 90882C 80240DFC 10400036 */ beqz $v0, .L80240ED8 +/* 90882C 80240DFC 10400036 */ beqz $v0, L80240ED8_908908 /* 908830 80240E00 24020001 */ addiu $v0, $zero, 1 /* 908834 80240E04 080903B4 */ j .L80240ED0 /* 908838 80240E08 00000000 */ nop @@ -49,16 +49,16 @@ glabel L80240E0C_90883C /* 908878 80240E48 ACB10000 */ sw $s1, ($a1) .L80240E4C: /* 90887C 80240E4C 8C820000 */ lw $v0, ($a0) -/* 908880 80240E50 14500021 */ bne $v0, $s0, .L80240ED8 +/* 908880 80240E50 14500021 */ bne $v0, $s0, L80240ED8_908908 /* 908884 80240E54 00000000 */ nop /* 908888 80240E58 8CA20000 */ lw $v0, ($a1) -/* 90888C 80240E5C 1451001E */ bne $v0, $s1, .L80240ED8 +/* 90888C 80240E5C 1451001E */ bne $v0, $s1, L80240ED8_908908 /* 908890 80240E60 24020002 */ addiu $v0, $zero, 2 /* 908894 80240E64 080903B4 */ j .L80240ED0 /* 908898 80240E68 00000000 */ nop glabel L80240E6C_90889C /* 90889C 80240E6C 8482001E */ lh $v0, 0x1e($a0) -/* 9088A0 80240E70 14400019 */ bnez $v0, .L80240ED8 +/* 9088A0 80240E70 14400019 */ bnez $v0, L80240ED8_908908 /* 9088A4 80240E74 24020003 */ addiu $v0, $zero, 3 /* 9088A8 80240E78 080903B4 */ j .L80240ED0 /* 9088AC 80240E7C 00000000 */ nop @@ -83,12 +83,11 @@ glabel L80240E80_9088B0 /* 9088EC 80240EBC 1440000A */ bnez $v0, .L80240EE8 /* 9088F0 80240EC0 00000000 */ nop /* 9088F4 80240EC4 8CA20000 */ lw $v0, ($a1) -/* 9088F8 80240EC8 14400003 */ bnez $v0, .L80240ED8 +/* 9088F8 80240EC8 14400003 */ bnez $v0, L80240ED8_908908 /* 9088FC 80240ECC 24020004 */ addiu $v0, $zero, 4 .L80240ED0: /* 908900 80240ED0 3C018024 */ lui $at, %hi(D_802417C8_9091F8) /* 908904 80240ED4 AC2217C8 */ sw $v0, %lo(D_802417C8_9091F8)($at) -.L80240ED8: glabel L80240ED8_908908 /* 908908 80240ED8 3C028024 */ lui $v0, %hi(D_802417CC_9091FC) /* 90890C 80240EDC 8C4217CC */ lw $v0, %lo(D_802417CC_9091FC)($v0) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s index 6bd3dbc17b..7d1227f40e 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s @@ -134,7 +134,7 @@ glabel func_802404F4_A47454 /* A47640 802406E0 8E220090 */ lw $v0, 0x90($s1) /* A47644 802406E4 1840000C */ blez $v0, .L80240718 /* A47648 802406E8 2442FFFF */ addiu $v0, $v0, -1 -/* A4764C 802406EC 14400087 */ bnez $v0, .L8024090C +/* A4764C 802406EC 14400087 */ bnez $v0, L8024090C_A4786C /* A47650 802406F0 AE220090 */ sw $v0, 0x90($s1) /* A47654 802406F4 3C03FFAA */ lui $v1, 0xffaa /* A47658 802406F8 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_802404F4_A47454 .L80240820: /* A47780 80240820 AE420028 */ sw $v0, 0x28($s2) /* A47784 80240824 24020007 */ addiu $v0, $zero, 7 -/* A47788 80240828 08090243 */ j .L8024090C +/* A47788 80240828 08090243 */ j L8024090C_A4786C /* A4778C 8024082C AE220090 */ sw $v0, 0x90($s1) .L80240830: /* A47790 80240830 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_802404F4_A47454 /* A47824 802408C4 A22000B5 */ sb $zero, 0xb5($s1) .L802408C8: /* A47828 802408C8 8E22008C */ lw $v0, 0x8c($s1) -/* A4782C 802408CC 1040000F */ beqz $v0, .L8024090C +/* A4782C 802408CC 1040000F */ beqz $v0, L8024090C_A4786C /* A47830 802408D0 3C03FFAA */ lui $v1, 0xffaa /* A47834 802408D4 8E420028 */ lw $v0, 0x28($s2) /* A47838 802408D8 3463FFFC */ ori $v1, $v1, 0xfffc /* A4783C 802408DC 00431821 */ addu $v1, $v0, $v1 /* A47840 802408E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* A47844 802408E4 10400009 */ beqz $v0, .L8024090C +/* A47844 802408E4 10400009 */ beqz $v0, L8024090C_A4786C /* A47848 802408E8 00031080 */ sll $v0, $v1, 2 /* A4784C 802408EC 3C018024 */ lui $at, %hi(jtbl_80241608_A48568) /* A47850 802408F0 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240900_A47860 /* A47860 80240900 8E420028 */ lw $v0, 0x28($s2) /* A47864 80240904 24420001 */ addiu $v0, $v0, 1 /* A47868 80240908 AE420028 */ sw $v0, 0x28($s2) -.L8024090C: glabel L8024090C_A4786C /* A4786C 8024090C 0000102D */ daddu $v0, $zero, $zero .L80240910: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s index 0eb5a1b399..30a4f20eea 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s @@ -134,7 +134,7 @@ glabel func_802404F4_A48AB4 /* A48CA0 802406E0 8E220090 */ lw $v0, 0x90($s1) /* A48CA4 802406E4 1840000C */ blez $v0, .L80240718 /* A48CA8 802406E8 2442FFFF */ addiu $v0, $v0, -1 -/* A48CAC 802406EC 14400087 */ bnez $v0, .L8024090C +/* A48CAC 802406EC 14400087 */ bnez $v0, L8024090C_A48ECC /* A48CB0 802406F0 AE220090 */ sw $v0, 0x90($s1) /* A48CB4 802406F4 3C03FFAA */ lui $v1, 0xffaa /* A48CB8 802406F8 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_802404F4_A48AB4 .L80240820: /* A48DE0 80240820 AE420028 */ sw $v0, 0x28($s2) /* A48DE4 80240824 24020007 */ addiu $v0, $zero, 7 -/* A48DE8 80240828 08090243 */ j .L8024090C +/* A48DE8 80240828 08090243 */ j L8024090C_A48ECC /* A48DEC 8024082C AE220090 */ sw $v0, 0x90($s1) .L80240830: /* A48DF0 80240830 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_802404F4_A48AB4 /* A48E84 802408C4 A22000B5 */ sb $zero, 0xb5($s1) .L802408C8: /* A48E88 802408C8 8E22008C */ lw $v0, 0x8c($s1) -/* A48E8C 802408CC 1040000F */ beqz $v0, .L8024090C +/* A48E8C 802408CC 1040000F */ beqz $v0, L8024090C_A48ECC /* A48E90 802408D0 3C03FFAA */ lui $v1, 0xffaa /* A48E94 802408D4 8E420028 */ lw $v0, 0x28($s2) /* A48E98 802408D8 3463FFFC */ ori $v1, $v1, 0xfffc /* A48E9C 802408DC 00431821 */ addu $v1, $v0, $v1 /* A48EA0 802408E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* A48EA4 802408E4 10400009 */ beqz $v0, .L8024090C +/* A48EA4 802408E4 10400009 */ beqz $v0, L8024090C_A48ECC /* A48EA8 802408E8 00031080 */ sll $v0, $v1, 2 /* A48EAC 802408EC 3C018024 */ lui $at, %hi(jtbl_80243888_A4BE48) /* A48EB0 802408F0 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240900_A48EC0 /* A48EC0 80240900 8E420028 */ lw $v0, 0x28($s2) /* A48EC4 80240904 24420001 */ addiu $v0, $v0, 1 /* A48EC8 80240908 AE420028 */ sw $v0, 0x28($s2) -.L8024090C: glabel L8024090C_A48ECC /* A48ECC 8024090C 0000102D */ daddu $v0, $zero, $zero .L80240910: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s index 3bc8e0d419..5254397ee5 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s @@ -227,7 +227,7 @@ glabel L80240F68_A49528 /* A49538 80240F78 58400001 */ blezl $v0, .L80240F80 /* A4953C 80240F7C 24150014 */ addiu $s5, $zero, 0x14 .L80240F80: -/* A49540 80240F80 16A0000A */ bnez $s5, .L80240FAC +/* A49540 80240F80 16A0000A */ bnez $s5, L80240FAC_A4956C /* A49544 80240F84 00000000 */ nop /* A49548 80240F88 8E250018 */ lw $a1, 0x18($s1) /* A4954C 80240F8C 8E26000C */ lw $a2, 0xc($s1) @@ -238,7 +238,6 @@ glabel L80240F68_A49528 /* A49560 80240FA0 46020000 */ add.s $f0, $f0, $f2 /* A49564 80240FA4 0809043E */ j .L802410F8 /* A49568 80240FA8 E620003C */ swc1 $f0, 0x3c($s1) -.L80240FAC: glabel L80240FAC_A4956C /* A4956C 80240FAC 862200A8 */ lh $v0, 0xa8($s1) /* A49570 80240FB0 3C013FE0 */ lui $at, 0x3fe0 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s index 3f5fca8695..ddbccf0414 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s @@ -81,7 +81,7 @@ glabel func_80241AB4_A4A074 .L80241BDC: /* A4A19C 80241BDC 8EA30070 */ lw $v1, 0x70($s5) /* A4A1A0 80241BE0 2C620019 */ sltiu $v0, $v1, 0x19 -/* A4A1A4 80241BE4 10400044 */ beqz $v0, .L80241CF8 +/* A4A1A4 80241BE4 10400044 */ beqz $v0, L80241CF8_A4A2B8 /* A4A1A8 80241BE8 00031080 */ sll $v0, $v1, 2 /* A4A1AC 80241BEC 3C018024 */ lui $at, %hi(jtbl_80243930_A4BEF0) /* A4A1B0 80241BF0 00220821 */ addu $at, $at, $v0 @@ -95,14 +95,14 @@ glabel L80241C00_A4A1C0 /* A4A1CC 80241C0C 0280302D */ daddu $a2, $s4, $zero /* A4A1D0 80241C10 8EA30070 */ lw $v1, 0x70($s5) /* A4A1D4 80241C14 24020001 */ addiu $v0, $zero, 1 -/* A4A1D8 80241C18 14620037 */ bne $v1, $v0, .L80241CF8 +/* A4A1D8 80241C18 14620037 */ bne $v1, $v0, L80241CF8_A4A2B8 /* A4A1DC 80241C1C 00000000 */ nop glabel L80241C20_A4A1E0 /* A4A1E0 80241C20 02A0202D */ daddu $a0, $s5, $zero /* A4A1E4 80241C24 0260282D */ daddu $a1, $s3, $zero /* A4A1E8 80241C28 0C090467 */ jal func_8024119C_A4975C /* A4A1EC 80241C2C 0280302D */ daddu $a2, $s4, $zero -/* A4A1F0 80241C30 0809073E */ j .L80241CF8 +/* A4A1F0 80241C30 0809073E */ j L80241CF8_A4A2B8 /* A4A1F4 80241C34 00000000 */ nop glabel L80241C38_A4A1F8 /* A4A1F8 80241C38 02A0202D */ daddu $a0, $s5, $zero @@ -114,7 +114,7 @@ glabel L80241C48_A4A208 /* A4A20C 80241C4C 0260282D */ daddu $a1, $s3, $zero /* A4A210 80241C50 0C0904DA */ jal func_80241368_A49928 /* A4A214 80241C54 0280302D */ daddu $a2, $s4, $zero -/* A4A218 80241C58 0809073E */ j .L80241CF8 +/* A4A218 80241C58 0809073E */ j L80241CF8_A4A2B8 /* A4A21C 80241C5C 00000000 */ nop glabel L80241C60_A4A220 /* A4A220 80241C60 02A0202D */ daddu $a0, $s5, $zero @@ -126,42 +126,41 @@ glabel L80241C70_A4A230 /* A4A234 80241C74 0260282D */ daddu $a1, $s3, $zero /* A4A238 80241C78 0C090543 */ jal func_8024150C_A49ACC /* A4A23C 80241C7C 0280302D */ daddu $a2, $s4, $zero -/* A4A240 80241C80 0809073E */ j .L80241CF8 +/* A4A240 80241C80 0809073E */ j L80241CF8_A4A2B8 /* A4A244 80241C84 00000000 */ nop glabel L80241C88_A4A248 /* A4A248 80241C88 02A0202D */ daddu $a0, $s5, $zero /* A4A24C 80241C8C 0260282D */ daddu $a1, $s3, $zero /* A4A250 80241C90 0C0905AC */ jal func_802416B0_A49C70 /* A4A254 80241C94 0280302D */ daddu $a2, $s4, $zero -/* A4A258 80241C98 0809073E */ j .L80241CF8 +/* A4A258 80241C98 0809073E */ j L80241CF8_A4A2B8 /* A4A25C 80241C9C 00000000 */ nop glabel L80241CA0_A4A260 /* A4A260 80241CA0 02A0202D */ daddu $a0, $s5, $zero /* A4A264 80241CA4 0260282D */ daddu $a1, $s3, $zero /* A4A268 80241CA8 0C0905BB */ jal func_802416EC_A49CAC /* A4A26C 80241CAC 0280302D */ daddu $a2, $s4, $zero -/* A4A270 80241CB0 0809073E */ j .L80241CF8 +/* A4A270 80241CB0 0809073E */ j L80241CF8_A4A2B8 /* A4A274 80241CB4 00000000 */ nop glabel L80241CB8_A4A278 /* A4A278 80241CB8 02A0202D */ daddu $a0, $s5, $zero /* A4A27C 80241CBC 0260282D */ daddu $a1, $s3, $zero /* A4A280 80241CC0 0C09062B */ jal func_802418AC_A49E6C /* A4A284 80241CC4 0280302D */ daddu $a2, $s4, $zero -/* A4A288 80241CC8 0809073E */ j .L80241CF8 +/* A4A288 80241CC8 0809073E */ j L80241CF8_A4A2B8 /* A4A28C 80241CCC 00000000 */ nop glabel L80241CD0_A4A290 /* A4A290 80241CD0 02A0202D */ daddu $a0, $s5, $zero /* A4A294 80241CD4 0260282D */ daddu $a1, $s3, $zero /* A4A298 80241CD8 0C090646 */ jal func_80241918_A49ED8 /* A4A29C 80241CDC 0280302D */ daddu $a2, $s4, $zero -/* A4A2A0 80241CE0 0809073E */ j .L80241CF8 +/* A4A2A0 80241CE0 0809073E */ j L80241CF8_A4A2B8 /* A4A2A4 80241CE4 00000000 */ nop glabel L80241CE8_A4A2A8 /* A4A2A8 80241CE8 02A0202D */ daddu $a0, $s5, $zero /* A4A2AC 80241CEC 0260282D */ daddu $a1, $s3, $zero /* A4A2B0 80241CF0 0C090693 */ jal func_80241A4C_A4A00C /* A4A2B4 80241CF4 0280302D */ daddu $a2, $s4, $zero -.L80241CF8: glabel L80241CF8_A4A2B8 /* A4A2B8 80241CF8 8FBF0048 */ lw $ra, 0x48($sp) /* A4A2BC 80241CFC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s index 81fe9a7896..d677adfd44 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s @@ -227,7 +227,7 @@ glabel L802405C0_A4CFE0 /* A4CFF0 802405D0 58400001 */ blezl $v0, .L802405D8 /* A4CFF4 802405D4 24150014 */ addiu $s5, $zero, 0x14 .L802405D8: -/* A4CFF8 802405D8 16A0000A */ bnez $s5, .L80240604 +/* A4CFF8 802405D8 16A0000A */ bnez $s5, L80240604_A4D024 /* A4CFFC 802405DC 00000000 */ nop /* A4D000 802405E0 8E250018 */ lw $a1, 0x18($s1) /* A4D004 802405E4 8E26000C */ lw $a2, 0xc($s1) @@ -238,7 +238,6 @@ glabel L802405C0_A4CFE0 /* A4D018 802405F8 46020000 */ add.s $f0, $f0, $f2 /* A4D01C 802405FC 080901D4 */ j .L80240750 /* A4D020 80240600 E620003C */ swc1 $f0, 0x3c($s1) -.L80240604: glabel L80240604_A4D024 /* A4D024 80240604 862200A8 */ lh $v0, 0xa8($s1) /* A4D028 80240608 3C013FE0 */ lui $at, 0x3fe0 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s index dda3566a9d..c98241baeb 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s @@ -81,7 +81,7 @@ glabel func_8024110C_A4DB2C .L80241234: /* A4DC54 80241234 8EA30070 */ lw $v1, 0x70($s5) /* A4DC58 80241238 2C620019 */ sltiu $v0, $v1, 0x19 -/* A4DC5C 8024123C 10400044 */ beqz $v0, .L80241350 +/* A4DC5C 8024123C 10400044 */ beqz $v0, L80241350_A4DD70 /* A4DC60 80241240 00031080 */ sll $v0, $v1, 2 /* A4DC64 80241244 3C018024 */ lui $at, %hi(jtbl_80242570_A4EF90) /* A4DC68 80241248 00220821 */ addu $at, $at, $v0 @@ -95,14 +95,14 @@ glabel L80241258_A4DC78 /* A4DC84 80241264 0280302D */ daddu $a2, $s4, $zero /* A4DC88 80241268 8EA30070 */ lw $v1, 0x70($s5) /* A4DC8C 8024126C 24020001 */ addiu $v0, $zero, 1 -/* A4DC90 80241270 14620037 */ bne $v1, $v0, .L80241350 +/* A4DC90 80241270 14620037 */ bne $v1, $v0, L80241350_A4DD70 /* A4DC94 80241274 00000000 */ nop glabel L80241278_A4DC98 /* A4DC98 80241278 02A0202D */ daddu $a0, $s5, $zero /* A4DC9C 8024127C 0260282D */ daddu $a1, $s3, $zero /* A4DCA0 80241280 0C0901FD */ jal func_802407F4_A4D214 /* A4DCA4 80241284 0280302D */ daddu $a2, $s4, $zero -/* A4DCA8 80241288 080904D4 */ j .L80241350 +/* A4DCA8 80241288 080904D4 */ j L80241350_A4DD70 /* A4DCAC 8024128C 00000000 */ nop glabel L80241290_A4DCB0 /* A4DCB0 80241290 02A0202D */ daddu $a0, $s5, $zero @@ -114,7 +114,7 @@ glabel L802412A0_A4DCC0 /* A4DCC4 802412A4 0260282D */ daddu $a1, $s3, $zero /* A4DCC8 802412A8 0C090270 */ jal func_802409C0_A4D3E0 /* A4DCCC 802412AC 0280302D */ daddu $a2, $s4, $zero -/* A4DCD0 802412B0 080904D4 */ j .L80241350 +/* A4DCD0 802412B0 080904D4 */ j L80241350_A4DD70 /* A4DCD4 802412B4 00000000 */ nop glabel L802412B8_A4DCD8 /* A4DCD8 802412B8 02A0202D */ daddu $a0, $s5, $zero @@ -126,42 +126,41 @@ glabel L802412C8_A4DCE8 /* A4DCEC 802412CC 0260282D */ daddu $a1, $s3, $zero /* A4DCF0 802412D0 0C0902D9 */ jal func_80240B64_A4D584 /* A4DCF4 802412D4 0280302D */ daddu $a2, $s4, $zero -/* A4DCF8 802412D8 080904D4 */ j .L80241350 +/* A4DCF8 802412D8 080904D4 */ j L80241350_A4DD70 /* A4DCFC 802412DC 00000000 */ nop glabel L802412E0_A4DD00 /* A4DD00 802412E0 02A0202D */ daddu $a0, $s5, $zero /* A4DD04 802412E4 0260282D */ daddu $a1, $s3, $zero /* A4DD08 802412E8 0C090342 */ jal func_80240D08_A4D728 /* A4DD0C 802412EC 0280302D */ daddu $a2, $s4, $zero -/* A4DD10 802412F0 080904D4 */ j .L80241350 +/* A4DD10 802412F0 080904D4 */ j L80241350_A4DD70 /* A4DD14 802412F4 00000000 */ nop glabel L802412F8_A4DD18 /* A4DD18 802412F8 02A0202D */ daddu $a0, $s5, $zero /* A4DD1C 802412FC 0260282D */ daddu $a1, $s3, $zero /* A4DD20 80241300 0C090351 */ jal func_80240D44_A4D764 /* A4DD24 80241304 0280302D */ daddu $a2, $s4, $zero -/* A4DD28 80241308 080904D4 */ j .L80241350 +/* A4DD28 80241308 080904D4 */ j L80241350_A4DD70 /* A4DD2C 8024130C 00000000 */ nop glabel L80241310_A4DD30 /* A4DD30 80241310 02A0202D */ daddu $a0, $s5, $zero /* A4DD34 80241314 0260282D */ daddu $a1, $s3, $zero /* A4DD38 80241318 0C0903C1 */ jal func_80240F04_A4D924 /* A4DD3C 8024131C 0280302D */ daddu $a2, $s4, $zero -/* A4DD40 80241320 080904D4 */ j .L80241350 +/* A4DD40 80241320 080904D4 */ j L80241350_A4DD70 /* A4DD44 80241324 00000000 */ nop glabel L80241328_A4DD48 /* A4DD48 80241328 02A0202D */ daddu $a0, $s5, $zero /* A4DD4C 8024132C 0260282D */ daddu $a1, $s3, $zero /* A4DD50 80241330 0C0903DC */ jal func_80240F70_A4D990 /* A4DD54 80241334 0280302D */ daddu $a2, $s4, $zero -/* A4DD58 80241338 080904D4 */ j .L80241350 +/* A4DD58 80241338 080904D4 */ j L80241350_A4DD70 /* A4DD5C 8024133C 00000000 */ nop glabel L80241340_A4DD60 /* A4DD60 80241340 02A0202D */ daddu $a0, $s5, $zero /* A4DD64 80241344 0260282D */ daddu $a1, $s3, $zero /* A4DD68 80241348 0C090429 */ jal func_802410A4_A4DAC4 /* A4DD6C 8024134C 0280302D */ daddu $a2, $s4, $zero -.L80241350: glabel L80241350_A4DD70 /* A4DD70 80241350 8FBF0048 */ lw $ra, 0x48($sp) /* A4DD74 80241354 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s index f4d144c381..1e1b1ad2ea 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s @@ -101,7 +101,7 @@ glabel func_80240F94_A4FF94 .L80241100: /* A50100 80241100 8E630070 */ lw $v1, 0x70($s3) /* A50104 80241104 2C620064 */ sltiu $v0, $v1, 0x64 -/* A50108 80241108 10400060 */ beqz $v0, .L8024128C +/* A50108 80241108 10400060 */ beqz $v0, L8024128C_A5028C /* A5010C 8024110C 00031080 */ sll $v0, $v1, 2 /* A50110 80241110 3C018024 */ lui $at, %hi(jtbl_802427E8_A517E8) /* A50114 80241114 00220821 */ addu $at, $at, $v0 @@ -118,7 +118,7 @@ glabel L80241134_A50134 /* A50138 80241138 0200282D */ daddu $a1, $s0, $zero /* A5013C 8024113C 0C0125AE */ jal func_800496B8 /* A50140 80241140 02A0302D */ daddu $a2, $s5, $zero -/* A50144 80241144 080904A3 */ j .L8024128C +/* A50144 80241144 080904A3 */ j L8024128C_A5028C /* A50148 80241148 00000000 */ nop glabel L8024114C_A5014C /* A5014C 8024114C 0260202D */ daddu $a0, $s3, $zero @@ -130,7 +130,7 @@ glabel L8024115C_A5015C /* A50160 80241160 0200282D */ daddu $a1, $s0, $zero /* A50164 80241164 0C012701 */ jal func_80049C04 /* A50168 80241168 02A0302D */ daddu $a2, $s5, $zero -/* A5016C 8024116C 080904A3 */ j .L8024128C +/* A5016C 8024116C 080904A3 */ j L8024128C_A5028C /* A50170 80241170 00000000 */ nop glabel L80241174_A50174 /* A50174 80241174 0260202D */ daddu $a0, $s3, $zero @@ -142,7 +142,7 @@ glabel L80241184_A50184 /* A50188 80241188 0200282D */ daddu $a1, $s0, $zero /* A5018C 8024118C 0C0127B3 */ jal func_80049ECC /* A50190 80241190 02A0302D */ daddu $a2, $s5, $zero -/* A50194 80241194 080904A3 */ j .L8024128C +/* A50194 80241194 080904A3 */ j L8024128C_A5028C /* A50198 80241198 00000000 */ nop glabel L8024119C_A5019C /* A5019C 8024119C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -170,7 +170,7 @@ glabel L8024119C_A5019C /* A501F0 802411F0 02A0382D */ daddu $a3, $s5, $zero /* A501F4 802411F4 8E630070 */ lw $v1, 0x70($s3) /* A501F8 802411F8 2402000C */ addiu $v0, $zero, 0xc -/* A501FC 802411FC 14620023 */ bne $v1, $v0, .L8024128C +/* A501FC 802411FC 14620023 */ bne $v1, $v0, L8024128C_A5028C /* A50200 80241200 00000000 */ nop /* A50204 80241204 0260202D */ daddu $a0, $s3, $zero .L80241208: @@ -182,39 +182,38 @@ glabel L80241214_A50214 /* A50218 80241218 0200282D */ daddu $a1, $s0, $zero /* A5021C 8024121C 0C012849 */ jal func_8004A124 /* A50220 80241220 02A0302D */ daddu $a2, $s5, $zero -/* A50224 80241224 080904A3 */ j .L8024128C +/* A50224 80241224 080904A3 */ j L8024128C_A5028C /* A50228 80241228 00000000 */ nop glabel L8024122C_A5022C /* A5022C 8024122C 0260202D */ daddu $a0, $s3, $zero /* A50230 80241230 0200282D */ daddu $a1, $s0, $zero /* A50234 80241234 0C0128FA */ jal func_8004A3E8 /* A50238 80241238 02A0302D */ daddu $a2, $s5, $zero -/* A5023C 8024123C 080904A3 */ j .L8024128C +/* A5023C 8024123C 080904A3 */ j L8024128C_A5028C /* A50240 80241240 00000000 */ nop glabel L80241244_A50244 /* A50244 80241244 0C0900F5 */ jal func_802403D4_A4F3D4 /* A50248 80241248 0260202D */ daddu $a0, $s3, $zero -/* A5024C 8024124C 080904A3 */ j .L8024128C +/* A5024C 8024124C 080904A3 */ j L8024128C_A5028C /* A50250 80241250 00000000 */ nop glabel L80241254_A50254 /* A50254 80241254 0C090135 */ jal kpa_09_UnkSetDurationFunc /* A50258 80241258 0260202D */ daddu $a0, $s3, $zero -/* A5025C 8024125C 080904A3 */ j .L8024128C +/* A5025C 8024125C 080904A3 */ j L8024128C_A5028C /* A50260 80241260 00000000 */ nop glabel L80241264_A50264 /* A50264 80241264 0C090146 */ jal kpa_09_UnkNpcAIFunc9 /* A50268 80241268 0260202D */ daddu $a0, $s3, $zero -/* A5026C 8024126C 080904A3 */ j .L8024128C +/* A5026C 8024126C 080904A3 */ j L8024128C_A5028C /* A50270 80241270 00000000 */ nop glabel L80241274_A50274 /* A50274 80241274 0C09016E */ jal kpa_09_UnkDurationCheck /* A50278 80241278 0260202D */ daddu $a0, $s3, $zero -/* A5027C 8024127C 080904A3 */ j .L8024128C +/* A5027C 8024127C 080904A3 */ j L8024128C_A5028C /* A50280 80241280 00000000 */ nop glabel L80241284_A50284 /* A50284 80241284 0C0129CF */ jal func_8004A73C /* A50288 80241288 0260202D */ daddu $a0, $s3, $zero -.L8024128C: glabel L8024128C_A5028C /* A5028C 8024128C 8FBF0048 */ lw $ra, 0x48($sp) /* A50290 80241290 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s index 8106971d6b..eeb1eb9182 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s @@ -101,7 +101,7 @@ glabel func_80241204_A94944 .L80241370: /* A94AB0 80241370 8E630070 */ lw $v1, 0x70($s3) /* A94AB4 80241374 2C620064 */ sltiu $v0, $v1, 0x64 -/* A94AB8 80241378 10400060 */ beqz $v0, .L802414FC +/* A94AB8 80241378 10400060 */ beqz $v0, L802414FC_A94C3C /* A94ABC 8024137C 00031080 */ sll $v0, $v1, 2 /* A94AC0 80241380 3C018024 */ lui $at, %hi(jtbl_80245B48_A99288) /* A94AC4 80241384 00220821 */ addu $at, $at, $v0 @@ -118,7 +118,7 @@ glabel L802413A4_A94AE4 /* A94AE8 802413A8 0200282D */ daddu $a1, $s0, $zero /* A94AEC 802413AC 0C0125AE */ jal func_800496B8 /* A94AF0 802413B0 02A0302D */ daddu $a2, $s5, $zero -/* A94AF4 802413B4 0809053F */ j .L802414FC +/* A94AF4 802413B4 0809053F */ j L802414FC_A94C3C /* A94AF8 802413B8 00000000 */ nop glabel L802413BC_A94AFC /* A94AFC 802413BC 0260202D */ daddu $a0, $s3, $zero @@ -130,7 +130,7 @@ glabel L802413CC_A94B0C /* A94B10 802413D0 0200282D */ daddu $a1, $s0, $zero /* A94B14 802413D4 0C012701 */ jal func_80049C04 /* A94B18 802413D8 02A0302D */ daddu $a2, $s5, $zero -/* A94B1C 802413DC 0809053F */ j .L802414FC +/* A94B1C 802413DC 0809053F */ j L802414FC_A94C3C /* A94B20 802413E0 00000000 */ nop glabel L802413E4_A94B24 /* A94B24 802413E4 0260202D */ daddu $a0, $s3, $zero @@ -142,7 +142,7 @@ glabel L802413F4_A94B34 /* A94B38 802413F8 0200282D */ daddu $a1, $s0, $zero /* A94B3C 802413FC 0C0127B3 */ jal func_80049ECC /* A94B40 80241400 02A0302D */ daddu $a2, $s5, $zero -/* A94B44 80241404 0809053F */ j .L802414FC +/* A94B44 80241404 0809053F */ j L802414FC_A94C3C /* A94B48 80241408 00000000 */ nop glabel L8024140C_A94B4C /* A94B4C 8024140C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -170,7 +170,7 @@ glabel L8024140C_A94B4C /* A94BA0 80241460 02A0382D */ daddu $a3, $s5, $zero /* A94BA4 80241464 8E630070 */ lw $v1, 0x70($s3) /* A94BA8 80241468 2402000C */ addiu $v0, $zero, 0xc -/* A94BAC 8024146C 14620023 */ bne $v1, $v0, .L802414FC +/* A94BAC 8024146C 14620023 */ bne $v1, $v0, L802414FC_A94C3C /* A94BB0 80241470 00000000 */ nop /* A94BB4 80241474 0260202D */ daddu $a0, $s3, $zero .L80241478: @@ -182,39 +182,38 @@ glabel L80241484_A94BC4 /* A94BC8 80241488 0200282D */ daddu $a1, $s0, $zero /* A94BCC 8024148C 0C012849 */ jal func_8004A124 /* A94BD0 80241490 02A0302D */ daddu $a2, $s5, $zero -/* A94BD4 80241494 0809053F */ j .L802414FC +/* A94BD4 80241494 0809053F */ j L802414FC_A94C3C /* A94BD8 80241498 00000000 */ nop glabel L8024149C_A94BDC /* A94BDC 8024149C 0260202D */ daddu $a0, $s3, $zero /* A94BE0 802414A0 0200282D */ daddu $a1, $s0, $zero /* A94BE4 802414A4 0C0128FA */ jal func_8004A3E8 /* A94BE8 802414A8 02A0302D */ daddu $a2, $s5, $zero -/* A94BEC 802414AC 0809053F */ j .L802414FC +/* A94BEC 802414AC 0809053F */ j L802414FC_A94C3C /* A94BF0 802414B0 00000000 */ nop glabel L802414B4_A94BF4 /* A94BF4 802414B4 0C090191 */ jal func_80240644_A93D84 /* A94BF8 802414B8 0260202D */ daddu $a0, $s3, $zero -/* A94BFC 802414BC 0809053F */ j .L802414FC +/* A94BFC 802414BC 0809053F */ j L802414FC_A94C3C /* A94C00 802414C0 00000000 */ nop glabel L802414C4_A94C04 /* A94C04 802414C4 0C0901D1 */ jal kpa_102_UnkSetDurationFunc /* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero -/* A94C0C 802414CC 0809053F */ j .L802414FC +/* A94C0C 802414CC 0809053F */ j L802414FC_A94C3C /* A94C10 802414D0 00000000 */ nop glabel L802414D4_A94C14 /* A94C14 802414D4 0C0901E2 */ jal kpa_102_UnkNpcAIFunc9 /* A94C18 802414D8 0260202D */ daddu $a0, $s3, $zero -/* A94C1C 802414DC 0809053F */ j .L802414FC +/* A94C1C 802414DC 0809053F */ j L802414FC_A94C3C /* A94C20 802414E0 00000000 */ nop glabel L802414E4_A94C24 /* A94C24 802414E4 0C09020A */ jal kpa_102_UnkDurationCheck /* A94C28 802414E8 0260202D */ daddu $a0, $s3, $zero -/* A94C2C 802414EC 0809053F */ j .L802414FC +/* A94C2C 802414EC 0809053F */ j L802414FC_A94C3C /* A94C30 802414F0 00000000 */ nop glabel L802414F4_A94C34 /* A94C34 802414F4 0C0129CF */ jal func_8004A73C /* A94C38 802414F8 0260202D */ daddu $a0, $s3, $zero -.L802414FC: glabel L802414FC_A94C3C /* A94C3C 802414FC 8FBF0048 */ lw $ra, 0x48($sp) /* A94C40 80241500 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s index 922fc74a0a..dbd1901532 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s @@ -134,7 +134,7 @@ glabel func_802418F0_A95030 /* A9521C 80241ADC 8E220090 */ lw $v0, 0x90($s1) /* A95220 80241AE0 1840000C */ blez $v0, .L80241B14 /* A95224 80241AE4 2442FFFF */ addiu $v0, $v0, -1 -/* A95228 80241AE8 14400087 */ bnez $v0, .L80241D08 +/* A95228 80241AE8 14400087 */ bnez $v0, L80241D08_A95448 /* A9522C 80241AEC AE220090 */ sw $v0, 0x90($s1) /* A95230 80241AF0 3C03FFAA */ lui $v1, 0xffaa /* A95234 80241AF4 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_802418F0_A95030 .L80241C1C: /* A9535C 80241C1C AE420028 */ sw $v0, 0x28($s2) /* A95360 80241C20 24020007 */ addiu $v0, $zero, 7 -/* A95364 80241C24 08090742 */ j .L80241D08 +/* A95364 80241C24 08090742 */ j L80241D08_A95448 /* A95368 80241C28 AE220090 */ sw $v0, 0x90($s1) .L80241C2C: /* A9536C 80241C2C 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_802418F0_A95030 /* A95400 80241CC0 A22000B5 */ sb $zero, 0xb5($s1) .L80241CC4: /* A95404 80241CC4 8E22008C */ lw $v0, 0x8c($s1) -/* A95408 80241CC8 1040000F */ beqz $v0, .L80241D08 +/* A95408 80241CC8 1040000F */ beqz $v0, L80241D08_A95448 /* A9540C 80241CCC 3C03FFAA */ lui $v1, 0xffaa /* A95410 80241CD0 8E420028 */ lw $v0, 0x28($s2) /* A95414 80241CD4 3463FFFC */ ori $v1, $v1, 0xfffc /* A95418 80241CD8 00431821 */ addu $v1, $v0, $v1 /* A9541C 80241CDC 2C620015 */ sltiu $v0, $v1, 0x15 -/* A95420 80241CE0 10400009 */ beqz $v0, .L80241D08 +/* A95420 80241CE0 10400009 */ beqz $v0, L80241D08_A95448 /* A95424 80241CE4 00031080 */ sll $v0, $v1, 2 /* A95428 80241CE8 3C018024 */ lui $at, %hi(jtbl_80245CE0_A99420) /* A9542C 80241CEC 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80241CFC_A9543C /* A9543C 80241CFC 8E420028 */ lw $v0, 0x28($s2) /* A95440 80241D00 24420001 */ addiu $v0, $v0, 1 /* A95444 80241D04 AE420028 */ sw $v0, 0x28($s2) -.L80241D08: glabel L80241D08_A95448 /* A95448 80241D08 0000102D */ daddu $v0, $zero, $zero .L80241D0C: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s index 77f9d15ad1..4978b157cf 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s @@ -227,7 +227,7 @@ glabel L80242250_A95990 /* A959A0 80242260 58400001 */ blezl $v0, .L80242268 /* A959A4 80242264 24150014 */ addiu $s5, $zero, 0x14 .L80242268: -/* A959A8 80242268 16A0000A */ bnez $s5, .L80242294 +/* A959A8 80242268 16A0000A */ bnez $s5, L80242294_A959D4 /* A959AC 8024226C 00000000 */ nop /* A959B0 80242270 8E250018 */ lw $a1, 0x18($s1) /* A959B4 80242274 8E26000C */ lw $a2, 0xc($s1) @@ -238,7 +238,6 @@ glabel L80242250_A95990 /* A959C8 80242288 46020000 */ add.s $f0, $f0, $f2 /* A959CC 8024228C 080908F8 */ j .L802423E0 /* A959D0 80242290 E620003C */ swc1 $f0, 0x3c($s1) -.L80242294: glabel L80242294_A959D4 /* A959D4 80242294 862200A8 */ lh $v0, 0xa8($s1) /* A959D8 80242298 3C013FE0 */ lui $at, 0x3fe0 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s index 5f4804c5bf..5319dcc334 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s @@ -84,7 +84,7 @@ glabel func_80243270_A969B0 /* A96AE4 802433A4 8E820070 */ lw $v0, 0x70($s4) /* A96AE8 802433A8 2443FFF6 */ addiu $v1, $v0, -0xa /* A96AEC 802433AC 2C620029 */ sltiu $v0, $v1, 0x29 -/* A96AF0 802433B0 1040004A */ beqz $v0, .L802434DC +/* A96AF0 802433B0 1040004A */ beqz $v0, L802434DC_A96C1C /* A96AF4 802433B4 00031080 */ sll $v0, $v1, 2 /* A96AF8 802433B8 3C018024 */ lui $at, %hi(jtbl_80245DA0_A994E0) /* A96AFC 802433BC 00220821 */ addu $at, $at, $v0 @@ -170,7 +170,6 @@ glabel L802434CC_A96C0C /* A96C10 802434D0 0200282D */ daddu $a1, $s0, $zero /* A96C14 802434D4 0C090C66 */ jal func_80243198_A968D8 /* A96C18 802434D8 0260302D */ daddu $a2, $s3, $zero -.L802434DC: glabel L802434DC_A96C1C /* A96C1C 802434DC 0000102D */ daddu $v0, $zero, $zero .L802434E0: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s index 5f72d00c0e..eab4d36d41 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s @@ -134,7 +134,7 @@ glabel func_802406A4_A52F64 /* A53150 80240890 8E220090 */ lw $v0, 0x90($s1) /* A53154 80240894 1840000C */ blez $v0, .L802408C8 /* A53158 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* A5315C 8024089C 14400087 */ bnez $v0, .L80240ABC +/* A5315C 8024089C 14400087 */ bnez $v0, L80240ABC_A5337C /* A53160 802408A0 AE220090 */ sw $v0, 0x90($s1) /* A53164 802408A4 3C03FFAA */ lui $v1, 0xffaa /* A53168 802408A8 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_802406A4_A52F64 .L802409D0: /* A53290 802409D0 AE420028 */ sw $v0, 0x28($s2) /* A53294 802409D4 24020007 */ addiu $v0, $zero, 7 -/* A53298 802409D8 080902AF */ j .L80240ABC +/* A53298 802409D8 080902AF */ j L80240ABC_A5337C /* A5329C 802409DC AE220090 */ sw $v0, 0x90($s1) .L802409E0: /* A532A0 802409E0 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_802406A4_A52F64 /* A53334 80240A74 A22000B5 */ sb $zero, 0xb5($s1) .L80240A78: /* A53338 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* A5333C 80240A7C 1040000F */ beqz $v0, .L80240ABC +/* A5333C 80240A7C 1040000F */ beqz $v0, L80240ABC_A5337C /* A53340 80240A80 3C03FFAA */ lui $v1, 0xffaa /* A53344 80240A84 8E420028 */ lw $v0, 0x28($s2) /* A53348 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc /* A5334C 80240A8C 00431821 */ addu $v1, $v0, $v1 /* A53350 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* A53354 80240A94 10400009 */ beqz $v0, .L80240ABC +/* A53354 80240A94 10400009 */ beqz $v0, L80240ABC_A5337C /* A53358 80240A98 00031080 */ sll $v0, $v1, 2 /* A5335C 80240A9C 3C018024 */ lui $at, %hi(jtbl_80242038_A548F8) /* A53360 80240AA0 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240AB0_A53370 /* A53370 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A53374 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A53378 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC: glabel L80240ABC_A5337C /* A5337C 80240ABC 0000102D */ daddu $v0, $zero, $zero .L80240AC0: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s index cd4127fefc..c40701db82 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s @@ -101,7 +101,7 @@ glabel func_80241064_A9A5F4 .L802411D0: /* A9A760 802411D0 8E630070 */ lw $v1, 0x70($s3) /* A9A764 802411D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* A9A768 802411D8 10400060 */ beqz $v0, .L8024135C +/* A9A768 802411D8 10400060 */ beqz $v0, L8024135C_A9A8EC /* A9A76C 802411DC 00031080 */ sll $v0, $v1, 2 /* A9A770 802411E0 3C018024 */ lui $at, %hi(jtbl_80243268_A9C7F8) /* A9A774 802411E4 00220821 */ addu $at, $at, $v0 @@ -118,7 +118,7 @@ glabel L80241204_A9A794 /* A9A798 80241208 0200282D */ daddu $a1, $s0, $zero /* A9A79C 8024120C 0C0125AE */ jal func_800496B8 /* A9A7A0 80241210 02A0302D */ daddu $a2, $s5, $zero -/* A9A7A4 80241214 080904D7 */ j .L8024135C +/* A9A7A4 80241214 080904D7 */ j L8024135C_A9A8EC /* A9A7A8 80241218 00000000 */ nop glabel L8024121C_A9A7AC /* A9A7AC 8024121C 0260202D */ daddu $a0, $s3, $zero @@ -130,7 +130,7 @@ glabel L8024122C_A9A7BC /* A9A7C0 80241230 0200282D */ daddu $a1, $s0, $zero /* A9A7C4 80241234 0C012701 */ jal func_80049C04 /* A9A7C8 80241238 02A0302D */ daddu $a2, $s5, $zero -/* A9A7CC 8024123C 080904D7 */ j .L8024135C +/* A9A7CC 8024123C 080904D7 */ j L8024135C_A9A8EC /* A9A7D0 80241240 00000000 */ nop glabel L80241244_A9A7D4 /* A9A7D4 80241244 0260202D */ daddu $a0, $s3, $zero @@ -142,7 +142,7 @@ glabel L80241254_A9A7E4 /* A9A7E8 80241258 0200282D */ daddu $a1, $s0, $zero /* A9A7EC 8024125C 0C0127B3 */ jal func_80049ECC /* A9A7F0 80241260 02A0302D */ daddu $a2, $s5, $zero -/* A9A7F4 80241264 080904D7 */ j .L8024135C +/* A9A7F4 80241264 080904D7 */ j L8024135C_A9A8EC /* A9A7F8 80241268 00000000 */ nop glabel L8024126C_A9A7FC /* A9A7FC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -170,7 +170,7 @@ glabel L8024126C_A9A7FC /* A9A850 802412C0 02A0382D */ daddu $a3, $s5, $zero /* A9A854 802412C4 8E630070 */ lw $v1, 0x70($s3) /* A9A858 802412C8 2402000C */ addiu $v0, $zero, 0xc -/* A9A85C 802412CC 14620023 */ bne $v1, $v0, .L8024135C +/* A9A85C 802412CC 14620023 */ bne $v1, $v0, L8024135C_A9A8EC /* A9A860 802412D0 00000000 */ nop /* A9A864 802412D4 0260202D */ daddu $a0, $s3, $zero .L802412D8: @@ -182,39 +182,38 @@ glabel L802412E4_A9A874 /* A9A878 802412E8 0200282D */ daddu $a1, $s0, $zero /* A9A87C 802412EC 0C012849 */ jal func_8004A124 /* A9A880 802412F0 02A0302D */ daddu $a2, $s5, $zero -/* A9A884 802412F4 080904D7 */ j .L8024135C +/* A9A884 802412F4 080904D7 */ j L8024135C_A9A8EC /* A9A888 802412F8 00000000 */ nop glabel L802412FC_A9A88C /* A9A88C 802412FC 0260202D */ daddu $a0, $s3, $zero /* A9A890 80241300 0200282D */ daddu $a1, $s0, $zero /* A9A894 80241304 0C0128FA */ jal func_8004A3E8 /* A9A898 80241308 02A0302D */ daddu $a2, $s5, $zero -/* A9A89C 8024130C 080904D7 */ j .L8024135C +/* A9A89C 8024130C 080904D7 */ j L8024135C_A9A8EC /* A9A8A0 80241310 00000000 */ nop glabel L80241314_A9A8A4 /* A9A8A4 80241314 0C090129 */ jal func_802404A4_A99A34 /* A9A8A8 80241318 0260202D */ daddu $a0, $s3, $zero -/* A9A8AC 8024131C 080904D7 */ j .L8024135C +/* A9A8AC 8024131C 080904D7 */ j L8024135C_A9A8EC /* A9A8B0 80241320 00000000 */ nop glabel L80241324_A9A8B4 /* A9A8B4 80241324 0C090169 */ jal kpa_111_UnkSetDurationFunc /* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero -/* A9A8BC 8024132C 080904D7 */ j .L8024135C +/* A9A8BC 8024132C 080904D7 */ j L8024135C_A9A8EC /* A9A8C0 80241330 00000000 */ nop glabel L80241334_A9A8C4 /* A9A8C4 80241334 0C09017A */ jal kpa_111_UnkNpcAIFunc9 /* A9A8C8 80241338 0260202D */ daddu $a0, $s3, $zero -/* A9A8CC 8024133C 080904D7 */ j .L8024135C +/* A9A8CC 8024133C 080904D7 */ j L8024135C_A9A8EC /* A9A8D0 80241340 00000000 */ nop glabel L80241344_A9A8D4 /* A9A8D4 80241344 0C0901A2 */ jal kpa_111_UnkDurationCheck /* A9A8D8 80241348 0260202D */ daddu $a0, $s3, $zero -/* A9A8DC 8024134C 080904D7 */ j .L8024135C +/* A9A8DC 8024134C 080904D7 */ j L8024135C_A9A8EC /* A9A8E0 80241350 00000000 */ nop glabel L80241354_A9A8E4 /* A9A8E4 80241354 0C0129CF */ jal func_8004A73C /* A9A8E8 80241358 0260202D */ daddu $a0, $s3, $zero -.L8024135C: glabel L8024135C_A9A8EC /* A9A8EC 8024135C 8FBF0048 */ lw $ra, 0x48($sp) /* A9A8F0 80241360 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s index 8e34e2b217..810ddc2054 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s @@ -134,7 +134,7 @@ glabel func_80240544_A9D174 /* A9D360 80240730 8E220090 */ lw $v0, 0x90($s1) /* A9D364 80240734 1840000C */ blez $v0, .L80240768 /* A9D368 80240738 2442FFFF */ addiu $v0, $v0, -1 -/* A9D36C 8024073C 14400087 */ bnez $v0, .L8024095C +/* A9D36C 8024073C 14400087 */ bnez $v0, L8024095C_A9D58C /* A9D370 80240740 AE220090 */ sw $v0, 0x90($s1) /* A9D374 80240744 3C03FFAA */ lui $v1, 0xffaa /* A9D378 80240748 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240544_A9D174 .L80240870: /* A9D4A0 80240870 AE420028 */ sw $v0, 0x28($s2) /* A9D4A4 80240874 24020007 */ addiu $v0, $zero, 7 -/* A9D4A8 80240878 08090257 */ j .L8024095C +/* A9D4A8 80240878 08090257 */ j L8024095C_A9D58C /* A9D4AC 8024087C AE220090 */ sw $v0, 0x90($s1) .L80240880: /* A9D4B0 80240880 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240544_A9D174 /* A9D544 80240914 A22000B5 */ sb $zero, 0xb5($s1) .L80240918: /* A9D548 80240918 8E22008C */ lw $v0, 0x8c($s1) -/* A9D54C 8024091C 1040000F */ beqz $v0, .L8024095C +/* A9D54C 8024091C 1040000F */ beqz $v0, L8024095C_A9D58C /* A9D550 80240920 3C03FFAA */ lui $v1, 0xffaa /* A9D554 80240924 8E420028 */ lw $v0, 0x28($s2) /* A9D558 80240928 3463FFFC */ ori $v1, $v1, 0xfffc /* A9D55C 8024092C 00431821 */ addu $v1, $v0, $v1 /* A9D560 80240930 2C620015 */ sltiu $v0, $v1, 0x15 -/* A9D564 80240934 10400009 */ beqz $v0, .L8024095C +/* A9D564 80240934 10400009 */ beqz $v0, L8024095C_A9D58C /* A9D568 80240938 00031080 */ sll $v0, $v1, 2 /* A9D56C 8024093C 3C018024 */ lui $at, %hi(jtbl_80241CF8_A9E928) /* A9D570 80240940 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240950_A9D580 /* A9D580 80240950 8E420028 */ lw $v0, 0x28($s2) /* A9D584 80240954 24420001 */ addiu $v0, $v0, 1 /* A9D588 80240958 AE420028 */ sw $v0, 0x28($s2) -.L8024095C: glabel L8024095C_A9D58C /* A9D58C 8024095C 0000102D */ daddu $v0, $zero, $zero .L80240960: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s index 8b987323f7..7202a6c5f7 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s @@ -101,7 +101,7 @@ glabel func_80241064_A9FDA4 .L802411D0: /* A9FF10 802411D0 8E630070 */ lw $v1, 0x70($s3) /* A9FF14 802411D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* A9FF18 802411D8 10400060 */ beqz $v0, .L8024135C +/* A9FF18 802411D8 10400060 */ beqz $v0, L8024135C_AA009C /* A9FF1C 802411DC 00031080 */ sll $v0, $v1, 2 /* A9FF20 802411E0 3C018024 */ lui $at, %hi(jtbl_80243008_AA1D48) /* A9FF24 802411E4 00220821 */ addu $at, $at, $v0 @@ -118,7 +118,7 @@ glabel L80241204_A9FF44 /* A9FF48 80241208 0200282D */ daddu $a1, $s0, $zero /* A9FF4C 8024120C 0C0125AE */ jal func_800496B8 /* A9FF50 80241210 02A0302D */ daddu $a2, $s5, $zero -/* A9FF54 80241214 080904D7 */ j .L8024135C +/* A9FF54 80241214 080904D7 */ j L8024135C_AA009C /* A9FF58 80241218 00000000 */ nop glabel L8024121C_A9FF5C /* A9FF5C 8024121C 0260202D */ daddu $a0, $s3, $zero @@ -130,7 +130,7 @@ glabel L8024122C_A9FF6C /* A9FF70 80241230 0200282D */ daddu $a1, $s0, $zero /* A9FF74 80241234 0C012701 */ jal func_80049C04 /* A9FF78 80241238 02A0302D */ daddu $a2, $s5, $zero -/* A9FF7C 8024123C 080904D7 */ j .L8024135C +/* A9FF7C 8024123C 080904D7 */ j L8024135C_AA009C /* A9FF80 80241240 00000000 */ nop glabel L80241244_A9FF84 /* A9FF84 80241244 0260202D */ daddu $a0, $s3, $zero @@ -142,7 +142,7 @@ glabel L80241254_A9FF94 /* A9FF98 80241258 0200282D */ daddu $a1, $s0, $zero /* A9FF9C 8024125C 0C0127B3 */ jal func_80049ECC /* A9FFA0 80241260 02A0302D */ daddu $a2, $s5, $zero -/* A9FFA4 80241264 080904D7 */ j .L8024135C +/* A9FFA4 80241264 080904D7 */ j L8024135C_AA009C /* A9FFA8 80241268 00000000 */ nop glabel L8024126C_A9FFAC /* A9FFAC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -170,7 +170,7 @@ glabel L8024126C_A9FFAC /* AA0000 802412C0 02A0382D */ daddu $a3, $s5, $zero /* AA0004 802412C4 8E630070 */ lw $v1, 0x70($s3) /* AA0008 802412C8 2402000C */ addiu $v0, $zero, 0xc -/* AA000C 802412CC 14620023 */ bne $v1, $v0, .L8024135C +/* AA000C 802412CC 14620023 */ bne $v1, $v0, L8024135C_AA009C /* AA0010 802412D0 00000000 */ nop /* AA0014 802412D4 0260202D */ daddu $a0, $s3, $zero .L802412D8: @@ -182,39 +182,38 @@ glabel L802412E4_AA0024 /* AA0028 802412E8 0200282D */ daddu $a1, $s0, $zero /* AA002C 802412EC 0C012849 */ jal func_8004A124 /* AA0030 802412F0 02A0302D */ daddu $a2, $s5, $zero -/* AA0034 802412F4 080904D7 */ j .L8024135C +/* AA0034 802412F4 080904D7 */ j L8024135C_AA009C /* AA0038 802412F8 00000000 */ nop glabel L802412FC_AA003C /* AA003C 802412FC 0260202D */ daddu $a0, $s3, $zero /* AA0040 80241300 0200282D */ daddu $a1, $s0, $zero /* AA0044 80241304 0C0128FA */ jal func_8004A3E8 /* AA0048 80241308 02A0302D */ daddu $a2, $s5, $zero -/* AA004C 8024130C 080904D7 */ j .L8024135C +/* AA004C 8024130C 080904D7 */ j L8024135C_AA009C /* AA0050 80241310 00000000 */ nop glabel L80241314_AA0054 /* AA0054 80241314 0C090129 */ jal func_802404A4_A9F1E4 /* AA0058 80241318 0260202D */ daddu $a0, $s3, $zero -/* AA005C 8024131C 080904D7 */ j .L8024135C +/* AA005C 8024131C 080904D7 */ j L8024135C_AA009C /* AA0060 80241320 00000000 */ nop glabel L80241324_AA0064 /* AA0064 80241324 0C090169 */ jal kpa_115_UnkSetDurationFunc /* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero -/* AA006C 8024132C 080904D7 */ j .L8024135C +/* AA006C 8024132C 080904D7 */ j L8024135C_AA009C /* AA0070 80241330 00000000 */ nop glabel L80241334_AA0074 /* AA0074 80241334 0C09017A */ jal kpa_115_UnkNpcAIFunc9 /* AA0078 80241338 0260202D */ daddu $a0, $s3, $zero -/* AA007C 8024133C 080904D7 */ j .L8024135C +/* AA007C 8024133C 080904D7 */ j L8024135C_AA009C /* AA0080 80241340 00000000 */ nop glabel L80241344_AA0084 /* AA0084 80241344 0C0901A2 */ jal kpa_115_UnkDurationCheck /* AA0088 80241348 0260202D */ daddu $a0, $s3, $zero -/* AA008C 8024134C 080904D7 */ j .L8024135C +/* AA008C 8024134C 080904D7 */ j L8024135C_AA009C /* AA0090 80241350 00000000 */ nop glabel L80241354_AA0094 /* AA0094 80241354 0C0129CF */ jal func_8004A73C /* AA0098 80241358 0260202D */ daddu $a0, $s3, $zero -.L8024135C: glabel L8024135C_AA009C /* AA009C 8024135C 8FBF0048 */ lw $ra, 0x48($sp) /* AA00A0 80241360 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s index 0871a736e2..6f8fee442a 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s @@ -101,7 +101,7 @@ glabel func_80240EF4_A618C4 .L80241060: /* A61A30 80241060 8E630070 */ lw $v1, 0x70($s3) /* A61A34 80241064 2C620064 */ sltiu $v0, $v1, 0x64 -/* A61A38 80241068 10400060 */ beqz $v0, .L802411EC +/* A61A38 80241068 10400060 */ beqz $v0, L802411EC_A61BBC /* A61A3C 8024106C 00031080 */ sll $v0, $v1, 2 /* A61A40 80241070 3C018024 */ lui $at, %hi(jtbl_802434C8_A63E98) /* A61A44 80241074 00220821 */ addu $at, $at, $v0 @@ -118,7 +118,7 @@ glabel L80241094_A61A64 /* A61A68 80241098 0200282D */ daddu $a1, $s0, $zero /* A61A6C 8024109C 0C0125AE */ jal func_800496B8 /* A61A70 802410A0 02A0302D */ daddu $a2, $s5, $zero -/* A61A74 802410A4 0809047B */ j .L802411EC +/* A61A74 802410A4 0809047B */ j L802411EC_A61BBC /* A61A78 802410A8 00000000 */ nop glabel L802410AC_A61A7C /* A61A7C 802410AC 0260202D */ daddu $a0, $s3, $zero @@ -130,7 +130,7 @@ glabel L802410BC_A61A8C /* A61A90 802410C0 0200282D */ daddu $a1, $s0, $zero /* A61A94 802410C4 0C012701 */ jal func_80049C04 /* A61A98 802410C8 02A0302D */ daddu $a2, $s5, $zero -/* A61A9C 802410CC 0809047B */ j .L802411EC +/* A61A9C 802410CC 0809047B */ j L802411EC_A61BBC /* A61AA0 802410D0 00000000 */ nop glabel L802410D4_A61AA4 /* A61AA4 802410D4 0260202D */ daddu $a0, $s3, $zero @@ -142,7 +142,7 @@ glabel L802410E4_A61AB4 /* A61AB8 802410E8 0200282D */ daddu $a1, $s0, $zero /* A61ABC 802410EC 0C0127B3 */ jal func_80049ECC /* A61AC0 802410F0 02A0302D */ daddu $a2, $s5, $zero -/* A61AC4 802410F4 0809047B */ j .L802411EC +/* A61AC4 802410F4 0809047B */ j L802411EC_A61BBC /* A61AC8 802410F8 00000000 */ nop glabel L802410FC_A61ACC /* A61ACC 802410FC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -170,7 +170,7 @@ glabel L802410FC_A61ACC /* A61B20 80241150 02A0382D */ daddu $a3, $s5, $zero /* A61B24 80241154 8E630070 */ lw $v1, 0x70($s3) /* A61B28 80241158 2402000C */ addiu $v0, $zero, 0xc -/* A61B2C 8024115C 14620023 */ bne $v1, $v0, .L802411EC +/* A61B2C 8024115C 14620023 */ bne $v1, $v0, L802411EC_A61BBC /* A61B30 80241160 00000000 */ nop /* A61B34 80241164 0260202D */ daddu $a0, $s3, $zero .L80241168: @@ -182,39 +182,38 @@ glabel L80241174_A61B44 /* A61B48 80241178 0200282D */ daddu $a1, $s0, $zero /* A61B4C 8024117C 0C012849 */ jal func_8004A124 /* A61B50 80241180 02A0302D */ daddu $a2, $s5, $zero -/* A61B54 80241184 0809047B */ j .L802411EC +/* A61B54 80241184 0809047B */ j L802411EC_A61BBC /* A61B58 80241188 00000000 */ nop glabel L8024118C_A61B5C /* A61B5C 8024118C 0260202D */ daddu $a0, $s3, $zero /* A61B60 80241190 0200282D */ daddu $a1, $s0, $zero /* A61B64 80241194 0C0128FA */ jal func_8004A3E8 /* A61B68 80241198 02A0302D */ daddu $a2, $s5, $zero -/* A61B6C 8024119C 0809047B */ j .L802411EC +/* A61B6C 8024119C 0809047B */ j L802411EC_A61BBC /* A61B70 802411A0 00000000 */ nop glabel L802411A4_A61B74 /* A61B74 802411A4 0C0900CD */ jal func_80240334_A60D04 /* A61B78 802411A8 0260202D */ daddu $a0, $s3, $zero -/* A61B7C 802411AC 0809047B */ j .L802411EC +/* A61B7C 802411AC 0809047B */ j L802411EC_A61BBC /* A61B80 802411B0 00000000 */ nop glabel L802411B4_A61B84 /* A61B84 802411B4 0C09010D */ jal kpa_50_UnkSetDurationFunc /* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero -/* A61B8C 802411BC 0809047B */ j .L802411EC +/* A61B8C 802411BC 0809047B */ j L802411EC_A61BBC /* A61B90 802411C0 00000000 */ nop glabel L802411C4_A61B94 /* A61B94 802411C4 0C09011E */ jal kpa_50_UnkNpcAIFunc9 /* A61B98 802411C8 0260202D */ daddu $a0, $s3, $zero -/* A61B9C 802411CC 0809047B */ j .L802411EC +/* A61B9C 802411CC 0809047B */ j L802411EC_A61BBC /* A61BA0 802411D0 00000000 */ nop glabel L802411D4_A61BA4 /* A61BA4 802411D4 0C090146 */ jal kpa_50_UnkDurationCheck /* A61BA8 802411D8 0260202D */ daddu $a0, $s3, $zero -/* A61BAC 802411DC 0809047B */ j .L802411EC +/* A61BAC 802411DC 0809047B */ j L802411EC_A61BBC /* A61BB0 802411E0 00000000 */ nop glabel L802411E4_A61BB4 /* A61BB4 802411E4 0C0129CF */ jal func_8004A73C /* A61BB8 802411E8 0260202D */ daddu $a0, $s3, $zero -.L802411EC: glabel L802411EC_A61BBC /* A61BBC 802411EC 8FBF0048 */ lw $ra, 0x48($sp) /* A61BC0 802411F0 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s index 3c7bafed26..f71693a2ab 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s @@ -134,7 +134,7 @@ glabel func_802415E0_A61FB0 /* A6219C 802417CC 8E220090 */ lw $v0, 0x90($s1) /* A621A0 802417D0 1840000C */ blez $v0, .L80241804 /* A621A4 802417D4 2442FFFF */ addiu $v0, $v0, -1 -/* A621A8 802417D8 14400087 */ bnez $v0, .L802419F8 +/* A621A8 802417D8 14400087 */ bnez $v0, L802419F8_A623C8 /* A621AC 802417DC AE220090 */ sw $v0, 0x90($s1) /* A621B0 802417E0 3C03FFAA */ lui $v1, 0xffaa /* A621B4 802417E4 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_802415E0_A61FB0 .L8024190C: /* A622DC 8024190C AE420028 */ sw $v0, 0x28($s2) /* A622E0 80241910 24020007 */ addiu $v0, $zero, 7 -/* A622E4 80241914 0809067E */ j .L802419F8 +/* A622E4 80241914 0809067E */ j L802419F8_A623C8 /* A622E8 80241918 AE220090 */ sw $v0, 0x90($s1) .L8024191C: /* A622EC 8024191C 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_802415E0_A61FB0 /* A62380 802419B0 A22000B5 */ sb $zero, 0xb5($s1) .L802419B4: /* A62384 802419B4 8E22008C */ lw $v0, 0x8c($s1) -/* A62388 802419B8 1040000F */ beqz $v0, .L802419F8 +/* A62388 802419B8 1040000F */ beqz $v0, L802419F8_A623C8 /* A6238C 802419BC 3C03FFAA */ lui $v1, 0xffaa /* A62390 802419C0 8E420028 */ lw $v0, 0x28($s2) /* A62394 802419C4 3463FFFC */ ori $v1, $v1, 0xfffc /* A62398 802419C8 00431821 */ addu $v1, $v0, $v1 /* A6239C 802419CC 2C620015 */ sltiu $v0, $v1, 0x15 -/* A623A0 802419D0 10400009 */ beqz $v0, .L802419F8 +/* A623A0 802419D0 10400009 */ beqz $v0, L802419F8_A623C8 /* A623A4 802419D4 00031080 */ sll $v0, $v1, 2 /* A623A8 802419D8 3C018024 */ lui $at, %hi(jtbl_80243660_A64030) /* A623AC 802419DC 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L802419EC_A623BC /* A623BC 802419EC 8E420028 */ lw $v0, 0x28($s2) /* A623C0 802419F0 24420001 */ addiu $v0, $v0, 1 /* A623C4 802419F4 AE420028 */ sw $v0, 0x28($s2) -.L802419F8: glabel L802419F8_A623C8 /* A623C8 802419F8 0000102D */ daddu $v0, $zero, $zero .L802419FC: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s index 9ff4775952..18b2df8f9c 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s @@ -227,7 +227,7 @@ glabel L80240570_A64600 /* A64610 80240580 58400001 */ blezl $v0, .L80240588 /* A64614 80240584 24150014 */ addiu $s5, $zero, 0x14 .L80240588: -/* A64618 80240588 16A0000A */ bnez $s5, .L802405B4 +/* A64618 80240588 16A0000A */ bnez $s5, L802405B4_A64644 /* A6461C 8024058C 00000000 */ nop /* A64620 80240590 8E250018 */ lw $a1, 0x18($s1) /* A64624 80240594 8E26000C */ lw $a2, 0xc($s1) @@ -238,7 +238,6 @@ glabel L80240570_A64600 /* A64638 802405A8 46020000 */ add.s $f0, $f0, $f2 /* A6463C 802405AC 080901C0 */ j .L80240700 /* A64640 802405B0 E620003C */ swc1 $f0, 0x3c($s1) -.L802405B4: glabel L802405B4_A64644 /* A64644 802405B4 862200A8 */ lh $v0, 0xa8($s1) /* A64648 802405B8 3C013FE0 */ lui $at, 0x3fe0 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s index ecc9f66b2a..0f0499f452 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s @@ -81,7 +81,7 @@ glabel func_802410BC_A6514C .L802411E4: /* A65274 802411E4 8EA30070 */ lw $v1, 0x70($s5) /* A65278 802411E8 2C620019 */ sltiu $v0, $v1, 0x19 -/* A6527C 802411EC 10400044 */ beqz $v0, .L80241300 +/* A6527C 802411EC 10400044 */ beqz $v0, L80241300_A65390 /* A65280 802411F0 00031080 */ sll $v0, $v1, 2 /* A65284 802411F4 3C018024 */ lui $at, %hi(jtbl_80242FA0_A67030) /* A65288 802411F8 00220821 */ addu $at, $at, $v0 @@ -95,14 +95,14 @@ glabel L80241208_A65298 /* A652A4 80241214 0280302D */ daddu $a2, $s4, $zero /* A652A8 80241218 8EA30070 */ lw $v1, 0x70($s5) /* A652AC 8024121C 24020001 */ addiu $v0, $zero, 1 -/* A652B0 80241220 14620037 */ bne $v1, $v0, .L80241300 +/* A652B0 80241220 14620037 */ bne $v1, $v0, L80241300_A65390 /* A652B4 80241224 00000000 */ nop glabel L80241228_A652B8 /* A652B8 80241228 02A0202D */ daddu $a0, $s5, $zero /* A652BC 8024122C 0260282D */ daddu $a1, $s3, $zero /* A652C0 80241230 0C0901E9 */ jal func_802407A4_A64834 /* A652C4 80241234 0280302D */ daddu $a2, $s4, $zero -/* A652C8 80241238 080904C0 */ j .L80241300 +/* A652C8 80241238 080904C0 */ j L80241300_A65390 /* A652CC 8024123C 00000000 */ nop glabel L80241240_A652D0 /* A652D0 80241240 02A0202D */ daddu $a0, $s5, $zero @@ -114,7 +114,7 @@ glabel L80241250_A652E0 /* A652E4 80241254 0260282D */ daddu $a1, $s3, $zero /* A652E8 80241258 0C09025C */ jal func_80240970_A64A00 /* A652EC 8024125C 0280302D */ daddu $a2, $s4, $zero -/* A652F0 80241260 080904C0 */ j .L80241300 +/* A652F0 80241260 080904C0 */ j L80241300_A65390 /* A652F4 80241264 00000000 */ nop glabel L80241268_A652F8 /* A652F8 80241268 02A0202D */ daddu $a0, $s5, $zero @@ -126,42 +126,41 @@ glabel L80241278_A65308 /* A6530C 8024127C 0260282D */ daddu $a1, $s3, $zero /* A65310 80241280 0C0902C5 */ jal func_80240B14_A64BA4 /* A65314 80241284 0280302D */ daddu $a2, $s4, $zero -/* A65318 80241288 080904C0 */ j .L80241300 +/* A65318 80241288 080904C0 */ j L80241300_A65390 /* A6531C 8024128C 00000000 */ nop glabel L80241290_A65320 /* A65320 80241290 02A0202D */ daddu $a0, $s5, $zero /* A65324 80241294 0260282D */ daddu $a1, $s3, $zero /* A65328 80241298 0C09032E */ jal func_80240CB8_A64D48 /* A6532C 8024129C 0280302D */ daddu $a2, $s4, $zero -/* A65330 802412A0 080904C0 */ j .L80241300 +/* A65330 802412A0 080904C0 */ j L80241300_A65390 /* A65334 802412A4 00000000 */ nop glabel L802412A8_A65338 /* A65338 802412A8 02A0202D */ daddu $a0, $s5, $zero /* A6533C 802412AC 0260282D */ daddu $a1, $s3, $zero /* A65340 802412B0 0C09033D */ jal func_80240CF4_A64D84 /* A65344 802412B4 0280302D */ daddu $a2, $s4, $zero -/* A65348 802412B8 080904C0 */ j .L80241300 +/* A65348 802412B8 080904C0 */ j L80241300_A65390 /* A6534C 802412BC 00000000 */ nop glabel L802412C0_A65350 /* A65350 802412C0 02A0202D */ daddu $a0, $s5, $zero /* A65354 802412C4 0260282D */ daddu $a1, $s3, $zero /* A65358 802412C8 0C0903AD */ jal func_80240EB4_A64F44 /* A6535C 802412CC 0280302D */ daddu $a2, $s4, $zero -/* A65360 802412D0 080904C0 */ j .L80241300 +/* A65360 802412D0 080904C0 */ j L80241300_A65390 /* A65364 802412D4 00000000 */ nop glabel L802412D8_A65368 /* A65368 802412D8 02A0202D */ daddu $a0, $s5, $zero /* A6536C 802412DC 0260282D */ daddu $a1, $s3, $zero /* A65370 802412E0 0C0903C8 */ jal func_80240F20_A64FB0 /* A65374 802412E4 0280302D */ daddu $a2, $s4, $zero -/* A65378 802412E8 080904C0 */ j .L80241300 +/* A65378 802412E8 080904C0 */ j L80241300_A65390 /* A6537C 802412EC 00000000 */ nop glabel L802412F0_A65380 /* A65380 802412F0 02A0202D */ daddu $a0, $s5, $zero /* A65384 802412F4 0260282D */ daddu $a1, $s3, $zero /* A65388 802412F8 0C090415 */ jal func_80241054_A650E4 /* A6538C 802412FC 0280302D */ daddu $a2, $s4, $zero -.L80241300: glabel L80241300_A65390 /* A65390 80241300 8FBF0048 */ lw $ra, 0x48($sp) /* A65394 80241304 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s index 4bf32270ec..37139a0261 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s @@ -134,7 +134,7 @@ glabel func_802417E0_A65870 /* A65A5C 802419CC 8E220090 */ lw $v0, 0x90($s1) /* A65A60 802419D0 1840000C */ blez $v0, .L80241A04 /* A65A64 802419D4 2442FFFF */ addiu $v0, $v0, -1 -/* A65A68 802419D8 14400087 */ bnez $v0, .L80241BF8 +/* A65A68 802419D8 14400087 */ bnez $v0, L80241BF8_A65C88 /* A65A6C 802419DC AE220090 */ sw $v0, 0x90($s1) /* A65A70 802419E0 3C03FFAA */ lui $v1, 0xffaa /* A65A74 802419E4 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_802417E0_A65870 .L80241B0C: /* A65B9C 80241B0C AE420028 */ sw $v0, 0x28($s2) /* A65BA0 80241B10 24020007 */ addiu $v0, $zero, 7 -/* A65BA4 80241B14 080906FE */ j .L80241BF8 +/* A65BA4 80241B14 080906FE */ j L80241BF8_A65C88 /* A65BA8 80241B18 AE220090 */ sw $v0, 0x90($s1) .L80241B1C: /* A65BAC 80241B1C 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_802417E0_A65870 /* A65C40 80241BB0 A22000B5 */ sb $zero, 0xb5($s1) .L80241BB4: /* A65C44 80241BB4 8E22008C */ lw $v0, 0x8c($s1) -/* A65C48 80241BB8 1040000F */ beqz $v0, .L80241BF8 +/* A65C48 80241BB8 1040000F */ beqz $v0, L80241BF8_A65C88 /* A65C4C 80241BBC 3C03FFAA */ lui $v1, 0xffaa /* A65C50 80241BC0 8E420028 */ lw $v0, 0x28($s2) /* A65C54 80241BC4 3463FFFC */ ori $v1, $v1, 0xfffc /* A65C58 80241BC8 00431821 */ addu $v1, $v0, $v1 /* A65C5C 80241BCC 2C620015 */ sltiu $v0, $v1, 0x15 -/* A65C60 80241BD0 10400009 */ beqz $v0, .L80241BF8 +/* A65C60 80241BD0 10400009 */ beqz $v0, L80241BF8_A65C88 /* A65C64 80241BD4 00031080 */ sll $v0, $v1, 2 /* A65C68 80241BD8 3C018024 */ lui $at, %hi(jtbl_80243010_A670A0) /* A65C6C 80241BDC 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80241BEC_A65C7C /* A65C7C 80241BEC 8E420028 */ lw $v0, 0x28($s2) /* A65C80 80241BF0 24420001 */ addiu $v0, $v0, 1 /* A65C84 80241BF4 AE420028 */ sw $v0, 0x28($s2) -.L80241BF8: glabel L80241BF8_A65C88 /* A65C88 80241BF8 0000102D */ daddu $v0, $zero, $zero .L80241BFC: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s index a04b4398ad..e6a086b872 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s @@ -101,7 +101,7 @@ glabel func_80240FD4_A680D4 .L80241140: /* A68240 80241140 8E630070 */ lw $v1, 0x70($s3) /* A68244 80241144 2C620064 */ sltiu $v0, $v1, 0x64 -/* A68248 80241148 10400060 */ beqz $v0, .L802412CC +/* A68248 80241148 10400060 */ beqz $v0, L802412CC_A683CC /* A6824C 8024114C 00031080 */ sll $v0, $v1, 2 /* A68250 80241150 3C018024 */ lui $at, %hi(jtbl_80243A08_A6AB08) /* A68254 80241154 00220821 */ addu $at, $at, $v0 @@ -118,7 +118,7 @@ glabel L80241174_A68274 /* A68278 80241178 0200282D */ daddu $a1, $s0, $zero /* A6827C 8024117C 0C0125AE */ jal func_800496B8 /* A68280 80241180 02A0302D */ daddu $a2, $s5, $zero -/* A68284 80241184 080904B3 */ j .L802412CC +/* A68284 80241184 080904B3 */ j L802412CC_A683CC /* A68288 80241188 00000000 */ nop glabel L8024118C_A6828C /* A6828C 8024118C 0260202D */ daddu $a0, $s3, $zero @@ -130,7 +130,7 @@ glabel L8024119C_A6829C /* A682A0 802411A0 0200282D */ daddu $a1, $s0, $zero /* A682A4 802411A4 0C012701 */ jal func_80049C04 /* A682A8 802411A8 02A0302D */ daddu $a2, $s5, $zero -/* A682AC 802411AC 080904B3 */ j .L802412CC +/* A682AC 802411AC 080904B3 */ j L802412CC_A683CC /* A682B0 802411B0 00000000 */ nop glabel L802411B4_A682B4 /* A682B4 802411B4 0260202D */ daddu $a0, $s3, $zero @@ -142,7 +142,7 @@ glabel L802411C4_A682C4 /* A682C8 802411C8 0200282D */ daddu $a1, $s0, $zero /* A682CC 802411CC 0C0127B3 */ jal func_80049ECC /* A682D0 802411D0 02A0302D */ daddu $a2, $s5, $zero -/* A682D4 802411D4 080904B3 */ j .L802412CC +/* A682D4 802411D4 080904B3 */ j L802412CC_A683CC /* A682D8 802411D8 00000000 */ nop glabel L802411DC_A682DC /* A682DC 802411DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -170,7 +170,7 @@ glabel L802411DC_A682DC /* A68330 80241230 02A0382D */ daddu $a3, $s5, $zero /* A68334 80241234 8E630070 */ lw $v1, 0x70($s3) /* A68338 80241238 2402000C */ addiu $v0, $zero, 0xc -/* A6833C 8024123C 14620023 */ bne $v1, $v0, .L802412CC +/* A6833C 8024123C 14620023 */ bne $v1, $v0, L802412CC_A683CC /* A68340 80241240 00000000 */ nop /* A68344 80241244 0260202D */ daddu $a0, $s3, $zero .L80241248: @@ -182,39 +182,38 @@ glabel L80241254_A68354 /* A68358 80241258 0200282D */ daddu $a1, $s0, $zero /* A6835C 8024125C 0C012849 */ jal func_8004A124 /* A68360 80241260 02A0302D */ daddu $a2, $s5, $zero -/* A68364 80241264 080904B3 */ j .L802412CC +/* A68364 80241264 080904B3 */ j L802412CC_A683CC /* A68368 80241268 00000000 */ nop glabel L8024126C_A6836C /* A6836C 8024126C 0260202D */ daddu $a0, $s3, $zero /* A68370 80241270 0200282D */ daddu $a1, $s0, $zero /* A68374 80241274 0C0128FA */ jal func_8004A3E8 /* A68378 80241278 02A0302D */ daddu $a2, $s5, $zero -/* A6837C 8024127C 080904B3 */ j .L802412CC +/* A6837C 8024127C 080904B3 */ j L802412CC_A683CC /* A68380 80241280 00000000 */ nop glabel L80241284_A68384 /* A68384 80241284 0C090105 */ jal func_80240414_A67514 /* A68388 80241288 0260202D */ daddu $a0, $s3, $zero -/* A6838C 8024128C 080904B3 */ j .L802412CC +/* A6838C 8024128C 080904B3 */ j L802412CC_A683CC /* A68390 80241290 00000000 */ nop glabel L80241294_A68394 /* A68394 80241294 0C090145 */ jal kpa_52_UnkSetDurationFunc /* A68398 80241298 0260202D */ daddu $a0, $s3, $zero -/* A6839C 8024129C 080904B3 */ j .L802412CC +/* A6839C 8024129C 080904B3 */ j L802412CC_A683CC /* A683A0 802412A0 00000000 */ nop glabel L802412A4_A683A4 /* A683A4 802412A4 0C090156 */ jal kpa_52_UnkNpcAIFunc9 /* A683A8 802412A8 0260202D */ daddu $a0, $s3, $zero -/* A683AC 802412AC 080904B3 */ j .L802412CC +/* A683AC 802412AC 080904B3 */ j L802412CC_A683CC /* A683B0 802412B0 00000000 */ nop glabel L802412B4_A683B4 /* A683B4 802412B4 0C09017E */ jal kpa_52_UnkDurationCheck /* A683B8 802412B8 0260202D */ daddu $a0, $s3, $zero -/* A683BC 802412BC 080904B3 */ j .L802412CC +/* A683BC 802412BC 080904B3 */ j L802412CC_A683CC /* A683C0 802412C0 00000000 */ nop glabel L802412C4_A683C4 /* A683C4 802412C4 0C0129CF */ jal func_8004A73C /* A683C8 802412C8 0260202D */ daddu $a0, $s3, $zero -.L802412CC: glabel L802412CC_A683CC /* A683CC 802412CC 8FBF0048 */ lw $ra, 0x48($sp) /* A683D0 802412D0 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s index 97c076ee83..aef50f4397 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s @@ -134,7 +134,7 @@ glabel func_802406A4_A6EA84 /* A6EC70 80240890 8E220090 */ lw $v0, 0x90($s1) /* A6EC74 80240894 1840000C */ blez $v0, .L802408C8 /* A6EC78 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* A6EC7C 8024089C 14400087 */ bnez $v0, .L80240ABC +/* A6EC7C 8024089C 14400087 */ bnez $v0, L80240ABC_A6EE9C /* A6EC80 802408A0 AE220090 */ sw $v0, 0x90($s1) /* A6EC84 802408A4 3C03FFAA */ lui $v1, 0xffaa /* A6EC88 802408A8 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_802406A4_A6EA84 .L802409D0: /* A6EDB0 802409D0 AE420028 */ sw $v0, 0x28($s2) /* A6EDB4 802409D4 24020007 */ addiu $v0, $zero, 7 -/* A6EDB8 802409D8 080902AF */ j .L80240ABC +/* A6EDB8 802409D8 080902AF */ j L80240ABC_A6EE9C /* A6EDBC 802409DC AE220090 */ sw $v0, 0x90($s1) .L802409E0: /* A6EDC0 802409E0 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_802406A4_A6EA84 /* A6EE54 80240A74 A22000B5 */ sb $zero, 0xb5($s1) .L80240A78: /* A6EE58 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* A6EE5C 80240A7C 1040000F */ beqz $v0, .L80240ABC +/* A6EE5C 80240A7C 1040000F */ beqz $v0, L80240ABC_A6EE9C /* A6EE60 80240A80 3C03FFAA */ lui $v1, 0xffaa /* A6EE64 80240A84 8E420028 */ lw $v0, 0x28($s2) /* A6EE68 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc /* A6EE6C 80240A8C 00431821 */ addu $v1, $v0, $v1 /* A6EE70 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* A6EE74 80240A94 10400009 */ beqz $v0, .L80240ABC +/* A6EE74 80240A94 10400009 */ beqz $v0, L80240ABC_A6EE9C /* A6EE78 80240A98 00031080 */ sll $v0, $v1, 2 /* A6EE7C 80240A9C 3C018024 */ lui $at, %hi(jtbl_80243CD8_A720B8) /* A6EE80 80240AA0 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240AB0_A6EE90 /* A6EE90 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A6EE94 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A6EE98 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC: glabel L80240ABC_A6EE9C /* A6EE9C 80240ABC 0000102D */ daddu $v0, $zero, $zero .L80240AC0: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s index 7999cddd1f..aec66d205e 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s @@ -227,7 +227,7 @@ glabel L80241004_A6F3E4 /* A6F3F4 80241014 58400001 */ blezl $v0, .L8024101C /* A6F3F8 80241018 24150014 */ addiu $s5, $zero, 0x14 .L8024101C: -/* A6F3FC 8024101C 16A0000A */ bnez $s5, .L80241048 +/* A6F3FC 8024101C 16A0000A */ bnez $s5, L80241048_A6F428 /* A6F400 80241020 00000000 */ nop /* A6F404 80241024 8E250018 */ lw $a1, 0x18($s1) /* A6F408 80241028 8E26000C */ lw $a2, 0xc($s1) @@ -238,7 +238,6 @@ glabel L80241004_A6F3E4 /* A6F41C 8024103C 46020000 */ add.s $f0, $f0, $f2 /* A6F420 80241040 08090465 */ j .L80241194 /* A6F424 80241044 E620003C */ swc1 $f0, 0x3c($s1) -.L80241048: glabel L80241048_A6F428 /* A6F428 80241048 862200A8 */ lh $v0, 0xa8($s1) /* A6F42C 8024104C 3C013FE0 */ lui $at, 0x3fe0 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s index 7e46fd12af..47ede4d6fc 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s @@ -84,7 +84,7 @@ glabel update_heroes_start_turn_A70404 /* A70538 80242158 8E820070 */ lw $v0, 0x70($s4) /* A7053C 8024215C 2443FFF6 */ addiu $v1, $v0, -0xa /* A70540 80242160 2C620029 */ sltiu $v0, $v1, 0x29 -/* A70544 80242164 1040004A */ beqz $v0, .L80242290 +/* A70544 80242164 1040004A */ beqz $v0, L80242290_A70670 /* A70548 80242168 00031080 */ sll $v0, $v1, 2 /* A7054C 8024216C 3C018024 */ lui $at, %hi(jtbl_80243D98_A72178) /* A70550 80242170 00220821 */ addu $at, $at, $v0 @@ -170,7 +170,6 @@ glabel L80242280_A70660 /* A70664 80242284 0200282D */ daddu $a1, $s0, $zero /* A70668 80242288 0C0907D3 */ jal func_80241F4C_A7032C /* A7066C 8024228C 0260302D */ daddu $a2, $s3, $zero -.L80242290: glabel L80242290_A70670 /* A70670 80242290 0000102D */ daddu $v0, $zero, $zero .L80242294: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s index 5c9cf765aa..77a8b91982 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s @@ -134,7 +134,7 @@ glabel func_802406A4_A74F14 /* A75100 80240890 8E220090 */ lw $v0, 0x90($s1) /* A75104 80240894 1840000C */ blez $v0, .L802408C8 /* A75108 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* A7510C 8024089C 14400087 */ bnez $v0, .L80240ABC +/* A7510C 8024089C 14400087 */ bnez $v0, L80240ABC_A7532C /* A75110 802408A0 AE220090 */ sw $v0, 0x90($s1) /* A75114 802408A4 3C03FFAA */ lui $v1, 0xffaa /* A75118 802408A8 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_802406A4_A74F14 .L802409D0: /* A75240 802409D0 AE420028 */ sw $v0, 0x28($s2) /* A75244 802409D4 24020007 */ addiu $v0, $zero, 7 -/* A75248 802409D8 080902AF */ j .L80240ABC +/* A75248 802409D8 080902AF */ j L80240ABC_A7532C /* A7524C 802409DC AE220090 */ sw $v0, 0x90($s1) .L802409E0: /* A75250 802409E0 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_802406A4_A74F14 /* A752E4 80240A74 A22000B5 */ sb $zero, 0xb5($s1) .L80240A78: /* A752E8 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* A752EC 80240A7C 1040000F */ beqz $v0, .L80240ABC +/* A752EC 80240A7C 1040000F */ beqz $v0, L80240ABC_A7532C /* A752F0 80240A80 3C03FFAA */ lui $v1, 0xffaa /* A752F4 80240A84 8E420028 */ lw $v0, 0x28($s2) /* A752F8 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc /* A752FC 80240A8C 00431821 */ addu $v1, $v0, $v1 /* A75300 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* A75304 80240A94 10400009 */ beqz $v0, .L80240ABC +/* A75304 80240A94 10400009 */ beqz $v0, L80240ABC_A7532C /* A75308 80240A98 00031080 */ sll $v0, $v1, 2 /* A7530C 80240A9C 3C018024 */ lui $at, %hi(jtbl_80243BF8_A78468) /* A75310 80240AA0 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240AB0_A75320 /* A75320 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A75324 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A75328 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC: glabel L80240ABC_A7532C /* A7532C 80240ABC 0000102D */ daddu $v0, $zero, $zero .L80240AC0: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s index d6ebd1fa4c..2ce0f07ca6 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s @@ -122,7 +122,7 @@ glabel func_80240B94_A875E4 .L80240D54: /* A877A4 80240D54 8E830070 */ lw $v1, 0x70($s4) /* A877A8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* A877AC 80240D5C 10400042 */ beqz $v0, .L80240E68 +/* A877AC 80240D5C 10400042 */ beqz $v0, L80240E68_A878B8 /* A877B0 80240D60 00031080 */ sll $v0, $v1, 2 /* A877B4 80240D64 3C018024 */ lui $at, %hi(jtbl_80245A40_A8C490) /* A877B8 80240D68 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240D88_A877D8 /* A877DC 80240D8C 0260282D */ daddu $a1, $s3, $zero /* A877E0 80240D90 0C090056 */ jal func_80240158_A86BA8 /* A877E4 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* A877E8 80240D98 0809039A */ j .L80240E68 +/* A877E8 80240D98 0809039A */ j L80240E68_A878B8 /* A877EC 80240D9C 00000000 */ nop glabel L80240DA0_A877F0 /* A877F0 80240DA0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80240DB0_A87800 /* A87804 80240DB4 0260282D */ daddu $a1, $s3, $zero /* A87808 80240DB8 0C090130 */ jal func_802404C0_A86F10 /* A8780C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* A87810 80240DC0 0809039A */ j .L80240E68 +/* A87810 80240DC0 0809039A */ j L80240E68_A878B8 /* A87814 80240DC4 00000000 */ nop glabel L80240DC8_A87818 /* A87818 80240DC8 0280202D */ daddu $a0, $s4, $zero /* A8781C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* A87820 80240DD0 0C09019F */ jal func_8024067C_A870CC /* A87824 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* A87828 80240DD8 0809039A */ j .L80240E68 +/* A87828 80240DD8 0809039A */ j L80240E68_A878B8 /* A8782C 80240DDC 00000000 */ nop glabel L80240DE0_A87830 /* A87830 80240DE0 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80240DF0_A87840 /* A87844 80240DF4 0260282D */ daddu $a1, $s3, $zero /* A87848 80240DF8 0C0901E9 */ jal kpa_91_NpcJumpFunc /* A8784C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* A87850 80240E00 0809039A */ j .L80240E68 +/* A87850 80240E00 0809039A */ j L80240E68_A878B8 /* A87854 80240E04 00000000 */ nop glabel L80240E08_A87858 /* A87858 80240E08 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80240E18_A87868 /* A8786C 80240E1C 0260282D */ daddu $a1, $s3, $zero /* A87870 80240E20 0C090253 */ jal func_8024094C_A8739C /* A87874 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* A87878 80240E28 0809039A */ j .L80240E68 +/* A87878 80240E28 0809039A */ j L80240E68_A878B8 /* A8787C 80240E2C 00000000 */ nop glabel L80240E30_A87880 /* A87880 80240E30 0280202D */ daddu $a0, $s4, $zero /* A87884 80240E34 0260282D */ daddu $a1, $s3, $zero /* A87888 80240E38 0C09029B */ jal kpa_91_UnkNpcDurationFlagFunc /* A8788C 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* A87890 80240E40 0809039A */ j .L80240E68 +/* A87890 80240E40 0809039A */ j L80240E68_A878B8 /* A87894 80240E44 00000000 */ nop glabel L80240E48_A87898 /* A87898 80240E48 0280202D */ daddu $a0, $s4, $zero /* A8789C 80240E4C 0260282D */ daddu $a1, $s3, $zero /* A878A0 80240E50 0C0902B5 */ jal func_80240AD4_A87524 /* A878A4 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* A878A8 80240E58 0809039A */ j .L80240E68 +/* A878A8 80240E58 0809039A */ j L80240E68_A878B8 /* A878AC 80240E5C 00000000 */ nop glabel L80240E60_A878B0 /* A878B0 80240E60 0C0129CF */ jal func_8004A73C /* A878B4 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: glabel L80240E68_A878B8 /* A878B8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* A878BC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s index 714e69f382..260777766e 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s @@ -132,7 +132,7 @@ glabel func_80241224_A87C74 .L8024140C: /* A87E5C 8024140C 8E630070 */ lw $v1, 0x70($s3) /* A87E60 80241410 2C620064 */ sltiu $v0, $v1, 0x64 -/* A87E64 80241414 1040003A */ beqz $v0, .L80241500 +/* A87E64 80241414 1040003A */ beqz $v0, L80241500_A87F50 /* A87E68 80241418 00031080 */ sll $v0, $v1, 2 /* A87E6C 8024141C 3C018024 */ lui $at, %hi(jtbl_80245BD8_A8C628) /* A87E70 80241420 00220821 */ addu $at, $at, $v0 @@ -151,7 +151,7 @@ glabel L80241448_A87E98 /* A87E9C 8024144C 0280282D */ daddu $a1, $s4, $zero /* A87EA0 80241450 0C090056 */ jal func_80240158_A86BA8 /* A87EA4 80241454 02A0302D */ daddu $a2, $s5, $zero -/* A87EA8 80241458 08090540 */ j .L80241500 +/* A87EA8 80241458 08090540 */ j L80241500_A87F50 /* A87EAC 8024145C 00000000 */ nop glabel L80241460_A87EB0 /* A87EB0 80241460 0260202D */ daddu $a0, $s3, $zero @@ -163,14 +163,14 @@ glabel L80241470_A87EC0 /* A87EC4 80241474 0280282D */ daddu $a1, $s4, $zero /* A87EC8 80241478 0C090130 */ jal func_802404C0_A86F10 /* A87ECC 8024147C 02A0302D */ daddu $a2, $s5, $zero -/* A87ED0 80241480 08090540 */ j .L80241500 +/* A87ED0 80241480 08090540 */ j L80241500_A87F50 /* A87ED4 80241484 00000000 */ nop glabel L80241488_A87ED8 /* A87ED8 80241488 0260202D */ daddu $a0, $s3, $zero /* A87EDC 8024148C 0280282D */ daddu $a1, $s4, $zero /* A87EE0 80241490 0C09019F */ jal func_8024067C_A870CC /* A87EE4 80241494 02A0302D */ daddu $a2, $s5, $zero -/* A87EE8 80241498 08090540 */ j .L80241500 +/* A87EE8 80241498 08090540 */ j L80241500_A87F50 /* A87EEC 8024149C 00000000 */ nop glabel L802414A0_A87EF0 /* A87EF0 802414A0 0260202D */ daddu $a0, $s3, $zero @@ -182,26 +182,25 @@ glabel L802414B0_A87F00 /* A87F04 802414B4 0280282D */ daddu $a1, $s4, $zero /* A87F08 802414B8 0C0903C3 */ jal func_80240F0C_A8795C /* A87F0C 802414BC 02A0302D */ daddu $a2, $s5, $zero -/* A87F10 802414C0 08090540 */ j .L80241500 +/* A87F10 802414C0 08090540 */ j L80241500_A87F50 /* A87F14 802414C4 00000000 */ nop glabel L802414C8_A87F18 /* A87F18 802414C8 0260202D */ daddu $a0, $s3, $zero /* A87F1C 802414CC 0280282D */ daddu $a1, $s4, $zero /* A87F20 802414D0 0C090410 */ jal kpa_91_UnkNpcAIFunc12 /* A87F24 802414D4 02A0302D */ daddu $a2, $s5, $zero -/* A87F28 802414D8 08090540 */ j .L80241500 +/* A87F28 802414D8 08090540 */ j L80241500_A87F50 /* A87F2C 802414DC 00000000 */ nop glabel L802414E0_A87F30 /* A87F30 802414E0 0260202D */ daddu $a0, $s3, $zero /* A87F34 802414E4 0280282D */ daddu $a1, $s4, $zero /* A87F38 802414E8 0C090469 */ jal kpa_91_set_script_owner_npc_col_height /* A87F3C 802414EC 02A0302D */ daddu $a2, $s5, $zero -/* A87F40 802414F0 08090540 */ j .L80241500 +/* A87F40 802414F0 08090540 */ j L80241500_A87F50 /* A87F44 802414F4 00000000 */ nop glabel L802414F8_A87F48 /* A87F48 802414F8 0C0129CF */ jal func_8004A73C /* A87F4C 802414FC 0260202D */ daddu $a0, $s3, $zero -.L80241500: glabel L80241500_A87F50 /* A87F50 80241500 8FBF0068 */ lw $ra, 0x68($sp) /* A87F54 80241504 8FB50064 */ lw $s5, 0x64($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s index fc4d0ab10b..5c41f17f73 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s @@ -122,7 +122,7 @@ glabel func_80240C74_A8D6F4 .L80240E34: /* A8D8B4 80240E34 8E830070 */ lw $v1, 0x70($s4) /* A8D8B8 80240E38 2C620064 */ sltiu $v0, $v1, 0x64 -/* A8D8BC 80240E3C 10400042 */ beqz $v0, .L80240F48 +/* A8D8BC 80240E3C 10400042 */ beqz $v0, L80240F48_A8D9C8 /* A8D8C0 80240E40 00031080 */ sll $v0, $v1, 2 /* A8D8C4 80240E44 3C018024 */ lui $at, %hi(jtbl_80245A10_A92490) /* A8D8C8 80240E48 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240E68_A8D8E8 /* A8D8EC 80240E6C 0260282D */ daddu $a1, $s3, $zero /* A8D8F0 80240E70 0C09008E */ jal func_80240238_A8CCB8 /* A8D8F4 80240E74 02A0302D */ daddu $a2, $s5, $zero -/* A8D8F8 80240E78 080903D2 */ j .L80240F48 +/* A8D8F8 80240E78 080903D2 */ j L80240F48_A8D9C8 /* A8D8FC 80240E7C 00000000 */ nop glabel L80240E80_A8D900 /* A8D900 80240E80 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80240E90_A8D910 /* A8D914 80240E94 0260282D */ daddu $a1, $s3, $zero /* A8D918 80240E98 0C090168 */ jal func_802405A0_A8D020 /* A8D91C 80240E9C 02A0302D */ daddu $a2, $s5, $zero -/* A8D920 80240EA0 080903D2 */ j .L80240F48 +/* A8D920 80240EA0 080903D2 */ j L80240F48_A8D9C8 /* A8D924 80240EA4 00000000 */ nop glabel L80240EA8_A8D928 /* A8D928 80240EA8 0280202D */ daddu $a0, $s4, $zero /* A8D92C 80240EAC 0260282D */ daddu $a1, $s3, $zero /* A8D930 80240EB0 0C0901D7 */ jal func_8024075C_A8D1DC /* A8D934 80240EB4 02A0302D */ daddu $a2, $s5, $zero -/* A8D938 80240EB8 080903D2 */ j .L80240F48 +/* A8D938 80240EB8 080903D2 */ j L80240F48_A8D9C8 /* A8D93C 80240EBC 00000000 */ nop glabel L80240EC0_A8D940 /* A8D940 80240EC0 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80240ED0_A8D950 /* A8D954 80240ED4 0260282D */ daddu $a1, $s3, $zero /* A8D958 80240ED8 0C090221 */ jal kpa_95_NpcJumpFunc /* A8D95C 80240EDC 02A0302D */ daddu $a2, $s5, $zero -/* A8D960 80240EE0 080903D2 */ j .L80240F48 +/* A8D960 80240EE0 080903D2 */ j L80240F48_A8D9C8 /* A8D964 80240EE4 00000000 */ nop glabel L80240EE8_A8D968 /* A8D968 80240EE8 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80240EF8_A8D978 /* A8D97C 80240EFC 0260282D */ daddu $a1, $s3, $zero /* A8D980 80240F00 0C09028B */ jal func_80240A2C_A8D4AC /* A8D984 80240F04 02A0302D */ daddu $a2, $s5, $zero -/* A8D988 80240F08 080903D2 */ j .L80240F48 +/* A8D988 80240F08 080903D2 */ j L80240F48_A8D9C8 /* A8D98C 80240F0C 00000000 */ nop glabel L80240F10_A8D990 /* A8D990 80240F10 0280202D */ daddu $a0, $s4, $zero /* A8D994 80240F14 0260282D */ daddu $a1, $s3, $zero /* A8D998 80240F18 0C0902D3 */ jal kpa_95_UnkNpcDurationFlagFunc /* A8D99C 80240F1C 02A0302D */ daddu $a2, $s5, $zero -/* A8D9A0 80240F20 080903D2 */ j .L80240F48 +/* A8D9A0 80240F20 080903D2 */ j L80240F48_A8D9C8 /* A8D9A4 80240F24 00000000 */ nop glabel L80240F28_A8D9A8 /* A8D9A8 80240F28 0280202D */ daddu $a0, $s4, $zero /* A8D9AC 80240F2C 0260282D */ daddu $a1, $s3, $zero /* A8D9B0 80240F30 0C0902ED */ jal func_80240BB4_A8D634 /* A8D9B4 80240F34 02A0302D */ daddu $a2, $s5, $zero -/* A8D9B8 80240F38 080903D2 */ j .L80240F48 +/* A8D9B8 80240F38 080903D2 */ j L80240F48_A8D9C8 /* A8D9BC 80240F3C 00000000 */ nop glabel L80240F40_A8D9C0 /* A8D9C0 80240F40 0C0129CF */ jal func_8004A73C /* A8D9C4 80240F44 0280202D */ daddu $a0, $s4, $zero -.L80240F48: glabel L80240F48_A8D9C8 /* A8D9C8 80240F48 8FBF0060 */ lw $ra, 0x60($sp) /* A8D9CC 80240F4C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s index 8718406051..b96f6b56a8 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s @@ -132,7 +132,7 @@ glabel func_80241304_A8DD84 .L802414EC: /* A8DF6C 802414EC 8E630070 */ lw $v1, 0x70($s3) /* A8DF70 802414F0 2C620064 */ sltiu $v0, $v1, 0x64 -/* A8DF74 802414F4 1040003A */ beqz $v0, .L802415E0 +/* A8DF74 802414F4 1040003A */ beqz $v0, L802415E0_A8E060 /* A8DF78 802414F8 00031080 */ sll $v0, $v1, 2 /* A8DF7C 802414FC 3C018024 */ lui $at, %hi(jtbl_80245BA8_A92628) /* A8DF80 80241500 00220821 */ addu $at, $at, $v0 @@ -151,7 +151,7 @@ glabel L80241528_A8DFA8 /* A8DFAC 8024152C 0280282D */ daddu $a1, $s4, $zero /* A8DFB0 80241530 0C09008E */ jal func_80240238_A8CCB8 /* A8DFB4 80241534 02A0302D */ daddu $a2, $s5, $zero -/* A8DFB8 80241538 08090578 */ j .L802415E0 +/* A8DFB8 80241538 08090578 */ j L802415E0_A8E060 /* A8DFBC 8024153C 00000000 */ nop glabel L80241540_A8DFC0 /* A8DFC0 80241540 0260202D */ daddu $a0, $s3, $zero @@ -163,14 +163,14 @@ glabel L80241550_A8DFD0 /* A8DFD4 80241554 0280282D */ daddu $a1, $s4, $zero /* A8DFD8 80241558 0C090168 */ jal func_802405A0_A8D020 /* A8DFDC 8024155C 02A0302D */ daddu $a2, $s5, $zero -/* A8DFE0 80241560 08090578 */ j .L802415E0 +/* A8DFE0 80241560 08090578 */ j L802415E0_A8E060 /* A8DFE4 80241564 00000000 */ nop glabel L80241568_A8DFE8 /* A8DFE8 80241568 0260202D */ daddu $a0, $s3, $zero /* A8DFEC 8024156C 0280282D */ daddu $a1, $s4, $zero /* A8DFF0 80241570 0C0901D7 */ jal func_8024075C_A8D1DC /* A8DFF4 80241574 02A0302D */ daddu $a2, $s5, $zero -/* A8DFF8 80241578 08090578 */ j .L802415E0 +/* A8DFF8 80241578 08090578 */ j L802415E0_A8E060 /* A8DFFC 8024157C 00000000 */ nop glabel L80241580_A8E000 /* A8E000 80241580 0260202D */ daddu $a0, $s3, $zero @@ -182,26 +182,25 @@ glabel L80241590_A8E010 /* A8E014 80241594 0280282D */ daddu $a1, $s4, $zero /* A8E018 80241598 0C0903FB */ jal func_80240FEC_A8DA6C /* A8E01C 8024159C 02A0302D */ daddu $a2, $s5, $zero -/* A8E020 802415A0 08090578 */ j .L802415E0 +/* A8E020 802415A0 08090578 */ j L802415E0_A8E060 /* A8E024 802415A4 00000000 */ nop glabel L802415A8_A8E028 /* A8E028 802415A8 0260202D */ daddu $a0, $s3, $zero /* A8E02C 802415AC 0280282D */ daddu $a1, $s4, $zero /* A8E030 802415B0 0C090448 */ jal kpa_95_UnkNpcAIFunc12 /* A8E034 802415B4 02A0302D */ daddu $a2, $s5, $zero -/* A8E038 802415B8 08090578 */ j .L802415E0 +/* A8E038 802415B8 08090578 */ j L802415E0_A8E060 /* A8E03C 802415BC 00000000 */ nop glabel L802415C0_A8E040 /* A8E040 802415C0 0260202D */ daddu $a0, $s3, $zero /* A8E044 802415C4 0280282D */ daddu $a1, $s4, $zero /* A8E048 802415C8 0C0904A1 */ jal kpa_95_set_script_owner_npc_col_height /* A8E04C 802415CC 02A0302D */ daddu $a2, $s5, $zero -/* A8E050 802415D0 08090578 */ j .L802415E0 +/* A8E050 802415D0 08090578 */ j L802415E0_A8E060 /* A8E054 802415D4 00000000 */ nop glabel L802415D8_A8E058 /* A8E058 802415D8 0C0129CF */ jal func_8004A73C /* A8E05C 802415DC 0260202D */ daddu $a0, $s3, $zero -.L802415E0: glabel L802415E0_A8E060 /* A8E060 802415E0 8FBF0068 */ lw $ra, 0x68($sp) /* A8E064 802415E4 8FB50064 */ lw $s5, 0x64($sp) 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 c7d0462410..92e55a0308 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 @@ -64,7 +64,7 @@ glabel func_802417EC_C5BF2C .L802418D4: /* C5C014 802418D4 8E830070 */ lw $v1, 0x70($s4) /* C5C018 802418D8 2C62000F */ sltiu $v0, $v1, 0xf -/* C5C01C 802418DC 10400034 */ beqz $v0, .L802419B0 +/* C5C01C 802418DC 10400034 */ beqz $v0, L802419B0_C5C0F0 /* C5C020 802418E0 00031080 */ sll $v0, $v1, 2 /* C5C024 802418E4 3C018024 */ lui $at, %hi(jtbl_80246518_C60C58) /* C5C028 802418E8 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L802419A0_C5C0E0 /* C5C0E4 802419A4 0200282D */ daddu $a1, $s0, $zero /* C5C0E8 802419A8 0C0904CE */ jal func_80241338_C5BA78 /* C5C0EC 802419AC 0260302D */ daddu $a2, $s3, $zero -.L802419B0: glabel L802419B0_C5C0F0 /* C5C0F0 802419B0 0000102D */ daddu $v0, $zero, $zero .L802419B4: 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 b177fb6317..466b857317 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 @@ -65,7 +65,7 @@ glabel func_80241DE4_C5C524 .L80241ED0: /* C5C610 80241ED0 8E830070 */ lw $v1, 0x70($s4) /* C5C614 80241ED4 2C620015 */ sltiu $v0, $v1, 0x15 -/* C5C618 80241ED8 10400032 */ beqz $v0, .L80241FA4 +/* C5C618 80241ED8 10400032 */ beqz $v0, L80241FA4_C5C6E4 /* C5C61C 80241EDC 00031080 */ sll $v0, $v1, 2 /* C5C620 80241EE0 3C018024 */ lui $at, %hi(jtbl_80246560_C60CA0) /* C5C624 80241EE4 00220821 */ addu $at, $at, $v0 @@ -125,7 +125,6 @@ glabel L80241F94_C5C6D4 /* C5C6D8 80241F98 0200282D */ daddu $a1, $s0, $zero /* C5C6DC 80241F9C 0C090762 */ jal func_80241D88_C5C4C8 /* C5C6E0 80241FA0 0260302D */ daddu $a2, $s3, $zero -.L80241FA4: glabel L80241FA4_C5C6E4 /* C5C6E4 80241FA4 0000102D */ daddu $v0, $zero, $zero .L80241FA8: diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s index 75b3ef706a..8e11e9c4f4 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s @@ -134,7 +134,7 @@ glabel func_802406A4_C613B4 /* C615A0 80240890 8E220090 */ lw $v0, 0x90($s1) /* C615A4 80240894 1840000C */ blez $v0, .L802408C8 /* C615A8 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* C615AC 8024089C 14400087 */ bnez $v0, .L80240ABC +/* C615AC 8024089C 14400087 */ bnez $v0, L80240ABC_C617CC /* C615B0 802408A0 AE220090 */ sw $v0, 0x90($s1) /* C615B4 802408A4 3C03FFAA */ lui $v1, 0xffaa /* C615B8 802408A8 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_802406A4_C613B4 .L802409D0: /* C616E0 802409D0 AE420028 */ sw $v0, 0x28($s2) /* C616E4 802409D4 24020007 */ addiu $v0, $zero, 7 -/* C616E8 802409D8 080902AF */ j .L80240ABC +/* C616E8 802409D8 080902AF */ j L80240ABC_C617CC /* C616EC 802409DC AE220090 */ sw $v0, 0x90($s1) .L802409E0: /* C616F0 802409E0 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_802406A4_C613B4 /* C61784 80240A74 A22000B5 */ sb $zero, 0xb5($s1) .L80240A78: /* C61788 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* C6178C 80240A7C 1040000F */ beqz $v0, .L80240ABC +/* C6178C 80240A7C 1040000F */ beqz $v0, L80240ABC_C617CC /* C61790 80240A80 3C03FFAA */ lui $v1, 0xffaa /* C61794 80240A84 8E420028 */ lw $v0, 0x28($s2) /* C61798 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc /* C6179C 80240A8C 00431821 */ addu $v1, $v0, $v1 /* C617A0 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* C617A4 80240A94 10400009 */ beqz $v0, .L80240ABC +/* C617A4 80240A94 10400009 */ beqz $v0, L80240ABC_C617CC /* C617A8 80240A98 00031080 */ sll $v0, $v1, 2 /* C617AC 80240A9C 3C018024 */ lui $at, %hi(jtbl_802471E8_C67EF8) /* C617B0 80240AA0 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240AB0_C617C0 /* C617C0 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* C617C4 80240AB4 24420001 */ addiu $v0, $v0, 1 /* C617C8 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC: glabel L80240ABC_C617CC /* C617CC 80240ABC 0000102D */ daddu $v0, $zero, $zero .L80240AC0: diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s index 9ea9ea80c9..53eacb51e1 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s @@ -98,7 +98,7 @@ glabel func_80241214_C61F24 .L80241374: /* C62084 80241374 8E430070 */ lw $v1, 0x70($s2) /* C62088 80241378 2C620064 */ sltiu $v0, $v1, 0x64 -/* C6208C 8024137C 10400048 */ beqz $v0, .L802414A0 +/* C6208C 8024137C 10400048 */ beqz $v0, L802414A0_C621B0 /* C62090 80241380 00031080 */ sll $v0, $v1, 2 /* C62094 80241384 3C018024 */ lui $at, %hi(jtbl_80247248_C67F58) /* C62098 80241388 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L802413A8_C620B8 /* C620BC 802413AC 0260282D */ daddu $a1, $s3, $zero /* C620C0 802413B0 0C0125AE */ jal func_800496B8 /* C620C4 802413B4 0280302D */ daddu $a2, $s4, $zero -/* C620C8 802413B8 08090528 */ j .L802414A0 +/* C620C8 802413B8 08090528 */ j L802414A0_C621B0 /* C620CC 802413BC 00000000 */ nop glabel L802413C0_C620D0 /* C620D0 802413C0 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L802413D0_C620E0 /* C620E4 802413D4 0260282D */ daddu $a1, $s3, $zero /* C620E8 802413D8 0C012701 */ jal func_80049C04 /* C620EC 802413DC 0280302D */ daddu $a2, $s4, $zero -/* C620F0 802413E0 08090528 */ j .L802414A0 +/* C620F0 802413E0 08090528 */ j L802414A0_C621B0 /* C620F4 802413E4 00000000 */ nop glabel L802413E8_C620F8 /* C620F8 802413E8 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L802413F8_C62108 /* C6210C 802413FC 0260282D */ daddu $a1, $s3, $zero /* C62110 80241400 0C0127B3 */ jal func_80049ECC /* C62114 80241404 0280302D */ daddu $a2, $s4, $zero -/* C62118 80241408 08090528 */ j .L802414A0 +/* C62118 80241408 08090528 */ j L802414A0_C621B0 /* C6211C 8024140C 00000000 */ nop glabel L80241410_C62120 /* C62120 80241410 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80241420_C62130 /* C62134 80241424 0260282D */ daddu $a1, $s3, $zero /* C62138 80241428 0C012849 */ jal func_8004A124 /* C6213C 8024142C 0280302D */ daddu $a2, $s4, $zero -/* C62140 80241430 08090528 */ j .L802414A0 +/* C62140 80241430 08090528 */ j L802414A0_C621B0 /* C62144 80241434 00000000 */ nop glabel L80241438_C62148 /* C62148 80241438 0240202D */ daddu $a0, $s2, $zero /* C6214C 8024143C 0260282D */ daddu $a1, $s3, $zero /* C62150 80241440 0C0128FA */ jal func_8004A3E8 /* C62154 80241444 0280302D */ daddu $a2, $s4, $zero -/* C62158 80241448 08090528 */ j .L802414A0 +/* C62158 80241448 08090528 */ j L802414A0_C621B0 /* C6215C 8024144C 00000000 */ nop glabel L80241450_C62160 /* C62160 80241450 0C0902FE */ jal kzn_03_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80241458_C62168 /* C6216C 8024145C 0240202D */ daddu $a0, $s2, $zero /* C62170 80241460 8E430070 */ lw $v1, 0x70($s2) /* C62174 80241464 24020020 */ addiu $v0, $zero, 0x20 -/* C62178 80241468 1462000D */ bne $v1, $v0, .L802414A0 +/* C62178 80241468 1462000D */ bne $v1, $v0, L802414A0_C621B0 /* C6217C 8024146C 00000000 */ nop glabel L80241470_C62180 /* C62180 80241470 0C090335 */ jal kzn_03_UnkNpcAIFunc8 /* C62184 80241474 0240202D */ daddu $a0, $s2, $zero /* C62188 80241478 8E430070 */ lw $v1, 0x70($s2) /* C6218C 8024147C 24020021 */ addiu $v0, $zero, 0x21 -/* C62190 80241480 14620007 */ bne $v1, $v0, .L802414A0 +/* C62190 80241480 14620007 */ bne $v1, $v0, L802414A0_C621B0 /* C62194 80241484 00000000 */ nop glabel L80241488_C62198 /* C62198 80241488 0C09036B */ jal kzn_03_UnkNpcAIFunc5 /* C6219C 8024148C 0240202D */ daddu $a0, $s2, $zero -/* C621A0 80241490 08090528 */ j .L802414A0 +/* C621A0 80241490 08090528 */ j L802414A0_C621B0 /* C621A4 80241494 00000000 */ nop glabel L80241498_C621A8 /* C621A8 80241498 0C0129CF */ jal func_8004A73C /* C621AC 8024149C 0240202D */ daddu $a0, $s2, $zero -.L802414A0: glabel L802414A0_C621B0 /* C621B0 802414A0 8FBF0048 */ lw $ra, 0x48($sp) /* C621B4 802414A4 8FB50044 */ lw $s5, 0x44($sp) 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 7bcfb65f3f..e62b53cd6e 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 @@ -64,7 +64,7 @@ glabel func_80241B2C_C6FE5C .L80241C14: /* C6FF44 80241C14 8E830070 */ lw $v1, 0x70($s4) /* C6FF48 80241C18 2C62000F */ sltiu $v0, $v1, 0xf -/* C6FF4C 80241C1C 10400034 */ beqz $v0, .L80241CF0 +/* C6FF4C 80241C1C 10400034 */ beqz $v0, L80241CF0_C70020 /* C6FF50 80241C20 00031080 */ sll $v0, $v1, 2 /* C6FF54 80241C24 3C018024 */ lui $at, %hi(jtbl_802430A8_C713D8) /* C6FF58 80241C28 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241CE0_C70010 /* C70014 80241CE4 0200282D */ daddu $a1, $s0, $zero /* C70018 80241CE8 0C09059E */ jal func_80241678_C6F9A8 /* C7001C 80241CEC 0260302D */ daddu $a2, $s3, $zero -.L80241CF0: glabel L80241CF0_C70020 /* C70020 80241CF0 0000102D */ daddu $v0, $zero, $zero .L80241CF4: 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 86bbdd2a9b..9ebe8b0fcc 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 @@ -65,7 +65,7 @@ glabel func_80242124_C70454 .L80242210: /* C70540 80242210 8E830070 */ lw $v1, 0x70($s4) /* C70544 80242214 2C620015 */ sltiu $v0, $v1, 0x15 -/* C70548 80242218 10400032 */ beqz $v0, .L802422E4 +/* C70548 80242218 10400032 */ beqz $v0, L802422E4_C70614 /* C7054C 8024221C 00031080 */ sll $v0, $v1, 2 /* C70550 80242220 3C018024 */ lui $at, %hi(jtbl_802430F0_C71420) /* C70554 80242224 00220821 */ addu $at, $at, $v0 @@ -125,7 +125,6 @@ glabel L802422D4_C70604 /* C70608 802422D8 0200282D */ daddu $a1, $s0, $zero /* C7060C 802422DC 0C090832 */ jal func_802420C8_C703F8 /* C70610 802422E0 0260302D */ daddu $a2, $s3, $zero -.L802422E4: glabel L802422E4_C70614 /* C70614 802422E4 0000102D */ daddu $v0, $zero, $zero .L802422E8: 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 f0450d63b2..3531ecd545 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 @@ -64,7 +64,7 @@ glabel func_80241D5C_C731DC .L80241E44: /* C732C4 80241E44 8E830070 */ lw $v1, 0x70($s4) /* C732C8 80241E48 2C62000F */ sltiu $v0, $v1, 0xf -/* C732CC 80241E4C 10400034 */ beqz $v0, .L80241F20 +/* C732CC 80241E4C 10400034 */ beqz $v0, L80241F20_C733A0 /* C732D0 80241E50 00031080 */ sll $v0, $v1, 2 /* C732D4 80241E54 3C018024 */ lui $at, %hi(jtbl_802455F8_C76A78) /* C732D8 80241E58 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241F10_C73390 /* C73394 80241F14 0200282D */ daddu $a1, $s0, $zero /* C73398 80241F18 0C09062A */ jal func_802418A8_C72D28 /* C7339C 80241F1C 0260302D */ daddu $a2, $s3, $zero -.L80241F20: glabel L80241F20_C733A0 /* C733A0 80241F20 0000102D */ daddu $v0, $zero, $zero .L80241F24: 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 3949cea13f..3cc640c052 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 @@ -65,7 +65,7 @@ glabel func_80242354_C737D4 .L80242440: /* C738C0 80242440 8E830070 */ lw $v1, 0x70($s4) /* C738C4 80242444 2C620015 */ sltiu $v0, $v1, 0x15 -/* C738C8 80242448 10400032 */ beqz $v0, .L80242514 +/* C738C8 80242448 10400032 */ beqz $v0, L80242514_C73994 /* C738CC 8024244C 00031080 */ sll $v0, $v1, 2 /* C738D0 80242450 3C018024 */ lui $at, %hi(jtbl_80245640_C76AC0) /* C738D4 80242454 00220821 */ addu $at, $at, $v0 @@ -125,7 +125,6 @@ glabel L80242504_C73984 /* C73988 80242508 0200282D */ daddu $a1, $s0, $zero /* C7398C 8024250C 0C0908BE */ jal func_802422F8_C73778 /* C73990 80242510 0260302D */ daddu $a2, $s3, $zero -.L80242514: glabel L80242514_C73994 /* C73994 80242514 0000102D */ daddu $v0, $zero, $zero .L80242518: diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s index 2c7909f5f4..623037ce0d 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s @@ -98,7 +98,7 @@ glabel func_80242B58_C73FD8 .L80242CB8: /* C74138 80242CB8 8E430070 */ lw $v1, 0x70($s2) /* C7413C 80242CBC 2C620064 */ sltiu $v0, $v1, 0x64 -/* C74140 80242CC0 10400048 */ beqz $v0, .L80242DE4 +/* C74140 80242CC0 10400048 */ beqz $v0, L80242DE4_C74264 /* C74144 80242CC4 00031080 */ sll $v0, $v1, 2 /* C74148 80242CC8 3C018024 */ lui $at, %hi(jtbl_802456A0_C76B20) /* C7414C 80242CCC 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80242CEC_C7416C /* C74170 80242CF0 0260282D */ daddu $a1, $s3, $zero /* C74174 80242CF4 0C0125AE */ jal func_800496B8 /* C74178 80242CF8 0280302D */ daddu $a2, $s4, $zero -/* C7417C 80242CFC 08090B79 */ j .L80242DE4 +/* C7417C 80242CFC 08090B79 */ j L80242DE4_C74264 /* C74180 80242D00 00000000 */ nop glabel L80242D04_C74184 /* C74184 80242D04 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80242D14_C74194 /* C74198 80242D18 0260282D */ daddu $a1, $s3, $zero /* C7419C 80242D1C 0C012701 */ jal func_80049C04 /* C741A0 80242D20 0280302D */ daddu $a2, $s4, $zero -/* C741A4 80242D24 08090B79 */ j .L80242DE4 +/* C741A4 80242D24 08090B79 */ j L80242DE4_C74264 /* C741A8 80242D28 00000000 */ nop glabel L80242D2C_C741AC /* C741AC 80242D2C 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80242D3C_C741BC /* C741C0 80242D40 0260282D */ daddu $a1, $s3, $zero /* C741C4 80242D44 0C0127B3 */ jal func_80049ECC /* C741C8 80242D48 0280302D */ daddu $a2, $s4, $zero -/* C741CC 80242D4C 08090B79 */ j .L80242DE4 +/* C741CC 80242D4C 08090B79 */ j L80242DE4_C74264 /* C741D0 80242D50 00000000 */ nop glabel L80242D54_C741D4 /* C741D4 80242D54 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80242D64_C741E4 /* C741E8 80242D68 0260282D */ daddu $a1, $s3, $zero /* C741EC 80242D6C 0C012849 */ jal func_8004A124 /* C741F0 80242D70 0280302D */ daddu $a2, $s4, $zero -/* C741F4 80242D74 08090B79 */ j .L80242DE4 +/* C741F4 80242D74 08090B79 */ j L80242DE4_C74264 /* C741F8 80242D78 00000000 */ nop glabel L80242D7C_C741FC /* C741FC 80242D7C 0240202D */ daddu $a0, $s2, $zero /* C74200 80242D80 0260282D */ daddu $a1, $s3, $zero /* C74204 80242D84 0C0128FA */ jal func_8004A3E8 /* C74208 80242D88 0280302D */ daddu $a2, $s4, $zero -/* C7420C 80242D8C 08090B79 */ j .L80242DE4 +/* C7420C 80242D8C 08090B79 */ j L80242DE4_C74264 /* C74210 80242D90 00000000 */ nop glabel L80242D94_C74214 /* C74214 80242D94 0C09094F */ jal kzn_08_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80242D9C_C7421C /* C74220 80242DA0 0240202D */ daddu $a0, $s2, $zero /* C74224 80242DA4 8E430070 */ lw $v1, 0x70($s2) /* C74228 80242DA8 24020020 */ addiu $v0, $zero, 0x20 -/* C7422C 80242DAC 1462000D */ bne $v1, $v0, .L80242DE4 +/* C7422C 80242DAC 1462000D */ bne $v1, $v0, L80242DE4_C74264 /* C74230 80242DB0 00000000 */ nop glabel L80242DB4_C74234 /* C74234 80242DB4 0C090986 */ jal kzn_08_UnkNpcAIFunc8 /* C74238 80242DB8 0240202D */ daddu $a0, $s2, $zero /* C7423C 80242DBC 8E430070 */ lw $v1, 0x70($s2) /* C74240 80242DC0 24020021 */ addiu $v0, $zero, 0x21 -/* C74244 80242DC4 14620007 */ bne $v1, $v0, .L80242DE4 +/* C74244 80242DC4 14620007 */ bne $v1, $v0, L80242DE4_C74264 /* C74248 80242DC8 00000000 */ nop glabel L80242DCC_C7424C /* C7424C 80242DCC 0C0909BC */ jal kzn_08_UnkNpcAIFunc5 /* C74250 80242DD0 0240202D */ daddu $a0, $s2, $zero -/* C74254 80242DD4 08090B79 */ j .L80242DE4 +/* C74254 80242DD4 08090B79 */ j L80242DE4_C74264 /* C74258 80242DD8 00000000 */ nop glabel L80242DDC_C7425C /* C7425C 80242DDC 0C0129CF */ jal func_8004A73C /* C74260 80242DE0 0240202D */ daddu $a0, $s2, $zero -.L80242DE4: glabel L80242DE4_C74264 /* C74264 80242DE4 8FBF0048 */ lw $ra, 0x48($sp) /* C74268 80242DE8 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s index 32c819c210..489b037c3f 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s @@ -98,7 +98,7 @@ glabel func_8024163C_C7831C .L8024179C: /* C7847C 8024179C 8E430070 */ lw $v1, 0x70($s2) /* C78480 802417A0 2C620064 */ sltiu $v0, $v1, 0x64 -/* C78484 802417A4 10400048 */ beqz $v0, .L802418C8 +/* C78484 802417A4 10400048 */ beqz $v0, L802418C8_C785A8 /* C78488 802417A8 00031080 */ sll $v0, $v1, 2 /* C7848C 802417AC 3C018024 */ lui $at, %hi(jtbl_80247278_C7DF58) /* C78490 802417B0 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L802417D0_C784B0 /* C784B4 802417D4 0260282D */ daddu $a1, $s3, $zero /* C784B8 802417D8 0C0125AE */ jal func_800496B8 /* C784BC 802417DC 0280302D */ daddu $a2, $s4, $zero -/* C784C0 802417E0 08090632 */ j .L802418C8 +/* C784C0 802417E0 08090632 */ j L802418C8_C785A8 /* C784C4 802417E4 00000000 */ nop glabel L802417E8_C784C8 /* C784C8 802417E8 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L802417F8_C784D8 /* C784DC 802417FC 0260282D */ daddu $a1, $s3, $zero /* C784E0 80241800 0C012701 */ jal func_80049C04 /* C784E4 80241804 0280302D */ daddu $a2, $s4, $zero -/* C784E8 80241808 08090632 */ j .L802418C8 +/* C784E8 80241808 08090632 */ j L802418C8_C785A8 /* C784EC 8024180C 00000000 */ nop glabel L80241810_C784F0 /* C784F0 80241810 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80241820_C78500 /* C78504 80241824 0260282D */ daddu $a1, $s3, $zero /* C78508 80241828 0C0127B3 */ jal func_80049ECC /* C7850C 8024182C 0280302D */ daddu $a2, $s4, $zero -/* C78510 80241830 08090632 */ j .L802418C8 +/* C78510 80241830 08090632 */ j L802418C8_C785A8 /* C78514 80241834 00000000 */ nop glabel L80241838_C78518 /* C78518 80241838 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80241848_C78528 /* C7852C 8024184C 0260282D */ daddu $a1, $s3, $zero /* C78530 80241850 0C012849 */ jal func_8004A124 /* C78534 80241854 0280302D */ daddu $a2, $s4, $zero -/* C78538 80241858 08090632 */ j .L802418C8 +/* C78538 80241858 08090632 */ j L802418C8_C785A8 /* C7853C 8024185C 00000000 */ nop glabel L80241860_C78540 /* C78540 80241860 0240202D */ daddu $a0, $s2, $zero /* C78544 80241864 0260282D */ daddu $a1, $s3, $zero /* C78548 80241868 0C0128FA */ jal func_8004A3E8 /* C7854C 8024186C 0280302D */ daddu $a2, $s4, $zero -/* C78550 80241870 08090632 */ j .L802418C8 +/* C78550 80241870 08090632 */ j L802418C8_C785A8 /* C78554 80241874 00000000 */ nop glabel L80241878_C78558 /* C78558 80241878 0C090408 */ jal kzn_09_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80241880_C78560 /* C78564 80241884 0240202D */ daddu $a0, $s2, $zero /* C78568 80241888 8E430070 */ lw $v1, 0x70($s2) /* C7856C 8024188C 24020020 */ addiu $v0, $zero, 0x20 -/* C78570 80241890 1462000D */ bne $v1, $v0, .L802418C8 +/* C78570 80241890 1462000D */ bne $v1, $v0, L802418C8_C785A8 /* C78574 80241894 00000000 */ nop glabel L80241898_C78578 /* C78578 80241898 0C09043F */ jal kzn_09_UnkNpcAIFunc8 /* C7857C 8024189C 0240202D */ daddu $a0, $s2, $zero /* C78580 802418A0 8E430070 */ lw $v1, 0x70($s2) /* C78584 802418A4 24020021 */ addiu $v0, $zero, 0x21 -/* C78588 802418A8 14620007 */ bne $v1, $v0, .L802418C8 +/* C78588 802418A8 14620007 */ bne $v1, $v0, L802418C8_C785A8 /* C7858C 802418AC 00000000 */ nop glabel L802418B0_C78590 /* C78590 802418B0 0C090475 */ jal kzn_09_UnkNpcAIFunc5 /* C78594 802418B4 0240202D */ daddu $a0, $s2, $zero -/* C78598 802418B8 08090632 */ j .L802418C8 +/* C78598 802418B8 08090632 */ j L802418C8_C785A8 /* C7859C 802418BC 00000000 */ nop glabel L802418C0_C785A0 /* C785A0 802418C0 0C0129CF */ jal func_8004A73C /* C785A4 802418C4 0240202D */ daddu $a0, $s2, $zero -.L802418C8: glabel L802418C8_C785A8 /* C785A8 802418C8 8FBF0048 */ lw $ra, 0x48($sp) /* C785AC 802418CC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s index 53022193b1..564510defa 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s @@ -134,7 +134,7 @@ glabel func_80242D58_C79A38 /* C79C24 80242F44 8E220090 */ lw $v0, 0x90($s1) /* C79C28 80242F48 1840000C */ blez $v0, .L80242F7C /* C79C2C 80242F4C 2442FFFF */ addiu $v0, $v0, -1 -/* C79C30 80242F50 14400087 */ bnez $v0, .L80243170 +/* C79C30 80242F50 14400087 */ bnez $v0, L80243170_C79E50 /* C79C34 80242F54 AE220090 */ sw $v0, 0x90($s1) /* C79C38 80242F58 3C03FFAA */ lui $v1, 0xffaa /* C79C3C 80242F5C 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80242D58_C79A38 .L80243084: /* C79D64 80243084 AE420028 */ sw $v0, 0x28($s2) /* C79D68 80243088 24020007 */ addiu $v0, $zero, 7 -/* C79D6C 8024308C 08090C5C */ j .L80243170 +/* C79D6C 8024308C 08090C5C */ j L80243170_C79E50 /* C79D70 80243090 AE220090 */ sw $v0, 0x90($s1) .L80243094: /* C79D74 80243094 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80242D58_C79A38 /* C79E08 80243128 A22000B5 */ sb $zero, 0xb5($s1) .L8024312C: /* C79E0C 8024312C 8E22008C */ lw $v0, 0x8c($s1) -/* C79E10 80243130 1040000F */ beqz $v0, .L80243170 +/* C79E10 80243130 1040000F */ beqz $v0, L80243170_C79E50 /* C79E14 80243134 3C03FFAA */ lui $v1, 0xffaa /* C79E18 80243138 8E420028 */ lw $v0, 0x28($s2) /* C79E1C 8024313C 3463FFFC */ ori $v1, $v1, 0xfffc /* C79E20 80243140 00431821 */ addu $v1, $v0, $v1 /* C79E24 80243144 2C620015 */ sltiu $v0, $v1, 0x15 -/* C79E28 80243148 10400009 */ beqz $v0, .L80243170 +/* C79E28 80243148 10400009 */ beqz $v0, L80243170_C79E50 /* C79E2C 8024314C 00031080 */ sll $v0, $v1, 2 /* C79E30 80243150 3C018024 */ lui $at, %hi(jtbl_80247440_C7E120) /* C79E34 80243154 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80243164_C79E44 /* C79E44 80243164 8E420028 */ lw $v0, 0x28($s2) /* C79E48 80243168 24420001 */ addiu $v0, $v0, 1 /* C79E4C 8024316C AE420028 */ sw $v0, 0x28($s2) -.L80243170: glabel L80243170_C79E50 /* C79E50 80243170 0000102D */ daddu $v0, $zero, $zero .L80243174: 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 6618f0e685..7761812956 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 @@ -64,7 +64,7 @@ glabel func_8024176C_C8190C .L80241854: /* C819F4 80241854 8E830070 */ lw $v1, 0x70($s4) /* C819F8 80241858 2C62000F */ sltiu $v0, $v1, 0xf -/* C819FC 8024185C 10400034 */ beqz $v0, .L80241930 +/* C819FC 8024185C 10400034 */ beqz $v0, L80241930_C81AD0 /* C81A00 80241860 00031080 */ sll $v0, $v1, 2 /* C81A04 80241864 3C018024 */ lui $at, %hi(jtbl_80245868_C85A08) /* C81A08 80241868 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241920_C81AC0 /* C81AC4 80241924 0200282D */ daddu $a1, $s0, $zero /* C81AC8 80241928 0C0904AE */ jal func_802412B8_C81458 /* C81ACC 8024192C 0260302D */ daddu $a2, $s3, $zero -.L80241930: glabel L80241930_C81AD0 /* C81AD0 80241930 0000102D */ daddu $v0, $zero, $zero .L80241934: 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 6d32d7a3f3..52ab44681c 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 @@ -65,7 +65,7 @@ glabel func_80241D64_C81F04 .L80241E50: /* C81FF0 80241E50 8E830070 */ lw $v1, 0x70($s4) /* C81FF4 80241E54 2C620015 */ sltiu $v0, $v1, 0x15 -/* C81FF8 80241E58 10400032 */ beqz $v0, .L80241F24 +/* C81FF8 80241E58 10400032 */ beqz $v0, L80241F24_C820C4 /* C81FFC 80241E5C 00031080 */ sll $v0, $v1, 2 /* C82000 80241E60 3C018024 */ lui $at, %hi(jtbl_802458B0_C85A50) /* C82004 80241E64 00220821 */ addu $at, $at, $v0 @@ -125,7 +125,6 @@ glabel L80241F14_C820B4 /* C820B8 80241F18 0200282D */ daddu $a1, $s0, $zero /* C820BC 80241F1C 0C090742 */ jal func_80241D08_C81EA8 /* C820C0 80241F20 0260302D */ daddu $a2, $s3, $zero -.L80241F24: glabel L80241F24_C820C4 /* C820C4 80241F24 0000102D */ daddu $v0, $zero, $zero .L80241F28: diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s index b56e0f62cb..5ec7a5895b 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s @@ -98,7 +98,7 @@ glabel func_8024092C_C863DC .L80240A8C: /* C8653C 80240A8C 8E430070 */ lw $v1, 0x70($s2) /* C86540 80240A90 2C620064 */ sltiu $v0, $v1, 0x64 -/* C86544 80240A94 10400048 */ beqz $v0, .L80240BB8 +/* C86544 80240A94 10400048 */ beqz $v0, L80240BB8_C86668 /* C86548 80240A98 00031080 */ sll $v0, $v1, 2 /* C8654C 80240A9C 3C018024 */ lui $at, %hi(jtbl_802463A8_C8BE58) /* C86550 80240AA0 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80240AC0_C86570 /* C86574 80240AC4 0260282D */ daddu $a1, $s3, $zero /* C86578 80240AC8 0C0125AE */ jal func_800496B8 /* C8657C 80240ACC 0280302D */ daddu $a2, $s4, $zero -/* C86580 80240AD0 080902EE */ j .L80240BB8 +/* C86580 80240AD0 080902EE */ j L80240BB8_C86668 /* C86584 80240AD4 00000000 */ nop glabel L80240AD8_C86588 /* C86588 80240AD8 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80240AE8_C86598 /* C8659C 80240AEC 0260282D */ daddu $a1, $s3, $zero /* C865A0 80240AF0 0C012701 */ jal func_80049C04 /* C865A4 80240AF4 0280302D */ daddu $a2, $s4, $zero -/* C865A8 80240AF8 080902EE */ j .L80240BB8 +/* C865A8 80240AF8 080902EE */ j L80240BB8_C86668 /* C865AC 80240AFC 00000000 */ nop glabel L80240B00_C865B0 /* C865B0 80240B00 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240B10_C865C0 /* C865C4 80240B14 0260282D */ daddu $a1, $s3, $zero /* C865C8 80240B18 0C0127B3 */ jal func_80049ECC /* C865CC 80240B1C 0280302D */ daddu $a2, $s4, $zero -/* C865D0 80240B20 080902EE */ j .L80240BB8 +/* C865D0 80240B20 080902EE */ j L80240BB8_C86668 /* C865D4 80240B24 00000000 */ nop glabel L80240B28_C865D8 /* C865D8 80240B28 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240B38_C865E8 /* C865EC 80240B3C 0260282D */ daddu $a1, $s3, $zero /* C865F0 80240B40 0C012849 */ jal func_8004A124 /* C865F4 80240B44 0280302D */ daddu $a2, $s4, $zero -/* C865F8 80240B48 080902EE */ j .L80240BB8 +/* C865F8 80240B48 080902EE */ j L80240BB8_C86668 /* C865FC 80240B4C 00000000 */ nop glabel L80240B50_C86600 /* C86600 80240B50 0240202D */ daddu $a0, $s2, $zero /* C86604 80240B54 0260282D */ daddu $a1, $s3, $zero /* C86608 80240B58 0C0128FA */ jal func_8004A3E8 /* C8660C 80240B5C 0280302D */ daddu $a2, $s4, $zero -/* C86610 80240B60 080902EE */ j .L80240BB8 +/* C86610 80240B60 080902EE */ j L80240BB8_C86668 /* C86614 80240B64 00000000 */ nop glabel L80240B68_C86618 /* C86618 80240B68 0C0900C4 */ jal kzn_17_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240B70_C86620 /* C86624 80240B74 0240202D */ daddu $a0, $s2, $zero /* C86628 80240B78 8E430070 */ lw $v1, 0x70($s2) /* C8662C 80240B7C 24020020 */ addiu $v0, $zero, 0x20 -/* C86630 80240B80 1462000D */ bne $v1, $v0, .L80240BB8 +/* C86630 80240B80 1462000D */ bne $v1, $v0, L80240BB8_C86668 /* C86634 80240B84 00000000 */ nop glabel L80240B88_C86638 /* C86638 80240B88 0C0900FB */ jal kzn_17_UnkNpcAIFunc8 /* C8663C 80240B8C 0240202D */ daddu $a0, $s2, $zero /* C86640 80240B90 8E430070 */ lw $v1, 0x70($s2) /* C86644 80240B94 24020021 */ addiu $v0, $zero, 0x21 -/* C86648 80240B98 14620007 */ bne $v1, $v0, .L80240BB8 +/* C86648 80240B98 14620007 */ bne $v1, $v0, L80240BB8_C86668 /* C8664C 80240B9C 00000000 */ nop glabel L80240BA0_C86650 /* C86650 80240BA0 0C090131 */ jal kzn_17_UnkNpcAIFunc5 /* C86654 80240BA4 0240202D */ daddu $a0, $s2, $zero -/* C86658 80240BA8 080902EE */ j .L80240BB8 +/* C86658 80240BA8 080902EE */ j L80240BB8_C86668 /* C8665C 80240BAC 00000000 */ nop glabel L80240BB0_C86660 /* C86660 80240BB0 0C0129CF */ jal func_8004A73C /* C86664 80240BB4 0240202D */ daddu $a0, $s2, $zero -.L80240BB8: glabel L80240BB8_C86668 /* C86668 80240BB8 8FBF0048 */ lw $ra, 0x48($sp) /* C8666C 80240BBC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s index 43ec95190f..97fa56113c 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s @@ -134,7 +134,7 @@ glabel func_80242048_C87AF8 /* C87CE4 80242234 8E220090 */ lw $v0, 0x90($s1) /* C87CE8 80242238 1840000C */ blez $v0, .L8024226C /* C87CEC 8024223C 2442FFFF */ addiu $v0, $v0, -1 -/* C87CF0 80242240 14400087 */ bnez $v0, .L80242460 +/* C87CF0 80242240 14400087 */ bnez $v0, L80242460_C87F10 /* C87CF4 80242244 AE220090 */ sw $v0, 0x90($s1) /* C87CF8 80242248 3C03FFAA */ lui $v1, 0xffaa /* C87CFC 8024224C 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80242048_C87AF8 .L80242374: /* C87E24 80242374 AE420028 */ sw $v0, 0x28($s2) /* C87E28 80242378 24020007 */ addiu $v0, $zero, 7 -/* C87E2C 8024237C 08090918 */ j .L80242460 +/* C87E2C 8024237C 08090918 */ j L80242460_C87F10 /* C87E30 80242380 AE220090 */ sw $v0, 0x90($s1) .L80242384: /* C87E34 80242384 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80242048_C87AF8 /* C87EC8 80242418 A22000B5 */ sb $zero, 0xb5($s1) .L8024241C: /* C87ECC 8024241C 8E22008C */ lw $v0, 0x8c($s1) -/* C87ED0 80242420 1040000F */ beqz $v0, .L80242460 +/* C87ED0 80242420 1040000F */ beqz $v0, L80242460_C87F10 /* C87ED4 80242424 3C03FFAA */ lui $v1, 0xffaa /* C87ED8 80242428 8E420028 */ lw $v0, 0x28($s2) /* C87EDC 8024242C 3463FFFC */ ori $v1, $v1, 0xfffc /* C87EE0 80242430 00431821 */ addu $v1, $v0, $v1 /* C87EE4 80242434 2C620015 */ sltiu $v0, $v1, 0x15 -/* C87EE8 80242438 10400009 */ beqz $v0, .L80242460 +/* C87EE8 80242438 10400009 */ beqz $v0, L80242460_C87F10 /* C87EEC 8024243C 00031080 */ sll $v0, $v1, 2 /* C87EF0 80242440 3C018024 */ lui $at, %hi(jtbl_80246570_C8C020) /* C87EF4 80242444 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80242454_C87F04 /* C87F04 80242454 8E420028 */ lw $v0, 0x28($s2) /* C87F08 80242458 24420001 */ addiu $v0, $v0, 1 /* C87F0C 8024245C AE420028 */ sw $v0, 0x28($s2) -.L80242460: glabel L80242460_C87F10 /* C87F10 80242460 0000102D */ daddu $v0, $zero, $zero .L80242464: diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s index e3ecab1226..98b72e3847 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s @@ -11,7 +11,7 @@ glabel func_802404B8_C8E068 /* C8E080 802404D0 3C108011 */ lui $s0, %hi(gPlayerStatus) /* C8E084 802404D4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* C8E088 802404D8 2C620005 */ sltiu $v0, $v1, 5 -/* C8E08C 802404DC 1040008A */ beqz $v0, .L80240708 +/* C8E08C 802404DC 1040008A */ beqz $v0, L80240708_C8E2B8 /* C8E090 802404E0 00031080 */ sll $v0, $v1, 2 /* C8E094 802404E4 3C018025 */ lui $at, %hi(jtbl_80248340_C95EF0) /* C8E098 802404E8 00220821 */ addu $at, $at, $v0 @@ -62,10 +62,10 @@ glabel L802404F8_C8E0A8 /* C8E148 80240598 00021400 */ sll $v0, $v0, 0x10 /* C8E14C 8024059C 00021403 */ sra $v0, $v0, 0x10 /* C8E150 802405A0 0043102A */ slt $v0, $v0, $v1 -/* C8E154 802405A4 14400058 */ bnez $v0, .L80240708 +/* C8E154 802405A4 14400058 */ bnez $v0, L80240708_C8E2B8 /* C8E158 802405A8 24020001 */ addiu $v0, $zero, 1 /* C8E15C 802405AC A6220044 */ sh $v0, 0x44($s1) -/* C8E160 802405B0 080901C2 */ j .L80240708 +/* C8E160 802405B0 080901C2 */ j L80240708_C8E2B8 /* C8E164 802405B4 A6200046 */ sh $zero, 0x46($s1) glabel L802405B8_C8E168 /* C8E168 802405B8 96220046 */ lhu $v0, 0x46($s1) @@ -74,7 +74,7 @@ glabel L802405B8_C8E168 /* C8E174 802405C4 00021400 */ sll $v0, $v0, 0x10 /* C8E178 802405C8 00021403 */ sra $v0, $v0, 0x10 /* C8E17C 802405CC 2842003C */ slti $v0, $v0, 0x3c -/* C8E180 802405D0 1440004D */ bnez $v0, .L80240708 +/* C8E180 802405D0 1440004D */ bnez $v0, L80240708_C8E2B8 /* C8E184 802405D4 24020002 */ addiu $v0, $zero, 2 /* C8E188 802405D8 8E230050 */ lw $v1, 0x50($s1) /* C8E18C 802405DC A6220044 */ sh $v0, 0x44($s1) @@ -84,7 +84,7 @@ glabel L802405B8_C8E168 /* C8E19C 802405EC AC620070 */ sw $v0, 0x70($v1) /* C8E1A0 802405F0 8E220050 */ lw $v0, 0x50($s1) /* C8E1A4 802405F4 8C42000C */ lw $v0, 0xc($v0) -/* C8E1A8 802405F8 080901C2 */ j .L80240708 +/* C8E1A8 802405F8 080901C2 */ j L80240708_C8E2B8 /* C8E1AC 802405FC AC400074 */ sw $zero, 0x74($v0) glabel L80240600_C8E1B0 /* C8E1B0 80240600 96220046 */ lhu $v0, 0x46($s1) @@ -93,7 +93,7 @@ glabel L80240600_C8E1B0 /* C8E1BC 8024060C 00021400 */ sll $v0, $v0, 0x10 /* C8E1C0 80240610 00021403 */ sra $v0, $v0, 0x10 /* C8E1C4 80240614 2842003C */ slti $v0, $v0, 0x3c -/* C8E1C8 80240618 1440003B */ bnez $v0, .L80240708 +/* C8E1C8 80240618 1440003B */ bnez $v0, L80240708_C8E2B8 /* C8E1CC 8024061C 00000000 */ nop /* C8E1D0 80240620 3C013F80 */ lui $at, 0x3f80 /* C8E1D4 80240624 44810000 */ mtc1 $at, $f0 @@ -125,7 +125,7 @@ glabel L80240600_C8E1B0 /* C8E23C 8024068C A6200046 */ sh $zero, 0x46($s1) /* C8E240 80240690 AE20002C */ sw $zero, 0x2c($s1) /* C8E244 80240694 A6220048 */ sh $v0, 0x48($s1) -/* C8E248 80240698 080901C2 */ j .L80240708 +/* C8E248 80240698 080901C2 */ j L80240708_C8E2B8 /* C8E24C 8024069C E6200030 */ swc1 $f0, 0x30($s1) glabel L802406A0_C8E250 /* C8E250 802406A0 0000202D */ daddu $a0, $zero, $zero @@ -142,7 +142,7 @@ glabel L802406A0_C8E250 /* C8E27C 802406CC 00021400 */ sll $v0, $v0, 0x10 /* C8E280 802406D0 00021403 */ sra $v0, $v0, 0x10 /* C8E284 802406D4 28420078 */ slti $v0, $v0, 0x78 -/* C8E288 802406D8 1440000B */ bnez $v0, .L80240708 +/* C8E288 802406D8 1440000B */ bnez $v0, L80240708_C8E2B8 /* C8E28C 802406DC 24030001 */ addiu $v1, $zero, 1 /* C8E290 802406E0 C620002C */ lwc1 $f0, 0x2c($s1) /* C8E294 802406E4 24020002 */ addiu $v0, $zero, 2 @@ -154,7 +154,6 @@ glabel L802406A0_C8E250 /* C8E2AC 802406FC A6220044 */ sh $v0, 0x44($s1) /* C8E2B0 80240700 A6200046 */ sh $zero, 0x46($s1) /* C8E2B4 80240704 E6200034 */ swc1 $f0, 0x34($s1) -.L80240708: glabel L80240708_C8E2B8 /* C8E2B8 80240708 8623004A */ lh $v1, 0x4a($s1) /* C8E2BC 8024070C 24020001 */ addiu $v0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s index 5db78e0405..58f226c603 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s @@ -122,7 +122,7 @@ glabel func_80243104_7EDE14 .L802432C4: /* 7EDFD4 802432C4 8E830070 */ lw $v1, 0x70($s4) /* 7EDFD8 802432C8 2C620064 */ sltiu $v0, $v1, 0x64 -/* 7EDFDC 802432CC 10400042 */ beqz $v0, .L802433D8 +/* 7EDFDC 802432CC 10400042 */ beqz $v0, L802433D8_7EE0E8 /* 7EDFE0 802432D0 00031080 */ sll $v0, $v1, 2 /* 7EDFE4 802432D4 3C018025 */ lui $at, %hi(jtbl_802559D0_8006E0) /* 7EDFE8 802432D8 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L802432F8_7EE008 /* 7EE00C 802432FC 0260282D */ daddu $a1, $s3, $zero /* 7EE010 80243300 0C0909B2 */ jal func_802426C8_7ED3D8 /* 7EE014 80243304 02A0302D */ daddu $a2, $s5, $zero -/* 7EE018 80243308 08090CF6 */ j .L802433D8 +/* 7EE018 80243308 08090CF6 */ j L802433D8_7EE0E8 /* 7EE01C 8024330C 00000000 */ nop glabel L80243310_7EE020 /* 7EE020 80243310 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80243320_7EE030 /* 7EE034 80243324 0260282D */ daddu $a1, $s3, $zero /* 7EE038 80243328 0C090A8C */ jal func_80242A30_7ED740 /* 7EE03C 8024332C 02A0302D */ daddu $a2, $s5, $zero -/* 7EE040 80243330 08090CF6 */ j .L802433D8 +/* 7EE040 80243330 08090CF6 */ j L802433D8_7EE0E8 /* 7EE044 80243334 00000000 */ nop glabel L80243338_7EE048 /* 7EE048 80243338 0280202D */ daddu $a0, $s4, $zero /* 7EE04C 8024333C 0260282D */ daddu $a1, $s3, $zero /* 7EE050 80243340 0C090AFB */ jal func_80242BEC_7ED8FC /* 7EE054 80243344 02A0302D */ daddu $a2, $s5, $zero -/* 7EE058 80243348 08090CF6 */ j .L802433D8 +/* 7EE058 80243348 08090CF6 */ j L802433D8_7EE0E8 /* 7EE05C 8024334C 00000000 */ nop glabel L80243350_7EE060 /* 7EE060 80243350 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80243360_7EE070 /* 7EE074 80243364 0260282D */ daddu $a1, $s3, $zero /* 7EE078 80243368 0C090B45 */ jal mac_00_NpcJumpFunc /* 7EE07C 8024336C 02A0302D */ daddu $a2, $s5, $zero -/* 7EE080 80243370 08090CF6 */ j .L802433D8 +/* 7EE080 80243370 08090CF6 */ j L802433D8_7EE0E8 /* 7EE084 80243374 00000000 */ nop glabel L80243378_7EE088 /* 7EE088 80243378 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80243388_7EE098 /* 7EE09C 8024338C 0260282D */ daddu $a1, $s3, $zero /* 7EE0A0 80243390 0C090BAF */ jal func_80242EBC_7EDBCC /* 7EE0A4 80243394 02A0302D */ daddu $a2, $s5, $zero -/* 7EE0A8 80243398 08090CF6 */ j .L802433D8 +/* 7EE0A8 80243398 08090CF6 */ j L802433D8_7EE0E8 /* 7EE0AC 8024339C 00000000 */ nop glabel L802433A0_7EE0B0 /* 7EE0B0 802433A0 0280202D */ daddu $a0, $s4, $zero /* 7EE0B4 802433A4 0260282D */ daddu $a1, $s3, $zero /* 7EE0B8 802433A8 0C090BF7 */ jal mac_00_UnkNpcDurationFlagFunc /* 7EE0BC 802433AC 02A0302D */ daddu $a2, $s5, $zero -/* 7EE0C0 802433B0 08090CF6 */ j .L802433D8 +/* 7EE0C0 802433B0 08090CF6 */ j L802433D8_7EE0E8 /* 7EE0C4 802433B4 00000000 */ nop glabel L802433B8_7EE0C8 /* 7EE0C8 802433B8 0280202D */ daddu $a0, $s4, $zero /* 7EE0CC 802433BC 0260282D */ daddu $a1, $s3, $zero /* 7EE0D0 802433C0 0C090C11 */ jal func_80243044_7EDD54 /* 7EE0D4 802433C4 02A0302D */ daddu $a2, $s5, $zero -/* 7EE0D8 802433C8 08090CF6 */ j .L802433D8 +/* 7EE0D8 802433C8 08090CF6 */ j L802433D8_7EE0E8 /* 7EE0DC 802433CC 00000000 */ nop glabel L802433D0_7EE0E0 /* 7EE0E0 802433D0 0C0129CF */ jal func_8004A73C /* 7EE0E4 802433D4 0280202D */ daddu $a0, $s4, $zero -.L802433D8: glabel L802433D8_7EE0E8 /* 7EE0E8 802433D8 8FBF0060 */ lw $ra, 0x60($sp) /* 7EE0EC 802433DC 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s index 538c850d3a..ba77eee5b9 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s @@ -122,7 +122,7 @@ glabel func_80241C14_802494 .L80241DD4: /* 802654 80241DD4 8E830070 */ lw $v1, 0x70($s4) /* 802658 80241DD8 2C620064 */ sltiu $v0, $v1, 0x64 -/* 80265C 80241DDC 10400042 */ beqz $v0, .L80241EE8 +/* 80265C 80241DDC 10400042 */ beqz $v0, L80241EE8_802768 /* 802660 80241DE0 00031080 */ sll $v0, $v1, 2 /* 802664 80241DE4 3C018026 */ lui $at, %hi(jtbl_802626F0_822F70) /* 802668 80241DE8 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80241E08_802688 /* 80268C 80241E0C 0260282D */ daddu $a1, $s3, $zero /* 802690 80241E10 0C090476 */ jal func_802411D8_801A58 /* 802694 80241E14 02A0302D */ daddu $a2, $s5, $zero -/* 802698 80241E18 080907BA */ j .L80241EE8 +/* 802698 80241E18 080907BA */ j L80241EE8_802768 /* 80269C 80241E1C 00000000 */ nop glabel L80241E20_8026A0 /* 8026A0 80241E20 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80241E30_8026B0 /* 8026B4 80241E34 0260282D */ daddu $a1, $s3, $zero /* 8026B8 80241E38 0C090550 */ jal func_80241540_801DC0 /* 8026BC 80241E3C 02A0302D */ daddu $a2, $s5, $zero -/* 8026C0 80241E40 080907BA */ j .L80241EE8 +/* 8026C0 80241E40 080907BA */ j L80241EE8_802768 /* 8026C4 80241E44 00000000 */ nop glabel L80241E48_8026C8 /* 8026C8 80241E48 0280202D */ daddu $a0, $s4, $zero /* 8026CC 80241E4C 0260282D */ daddu $a1, $s3, $zero /* 8026D0 80241E50 0C0905BF */ jal func_802416FC_801F7C /* 8026D4 80241E54 02A0302D */ daddu $a2, $s5, $zero -/* 8026D8 80241E58 080907BA */ j .L80241EE8 +/* 8026D8 80241E58 080907BA */ j L80241EE8_802768 /* 8026DC 80241E5C 00000000 */ nop glabel L80241E60_8026E0 /* 8026E0 80241E60 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80241E70_8026F0 /* 8026F4 80241E74 0260282D */ daddu $a1, $s3, $zero /* 8026F8 80241E78 0C090609 */ jal dup_mac_01_NpcJumpFunc /* 8026FC 80241E7C 02A0302D */ daddu $a2, $s5, $zero -/* 802700 80241E80 080907BA */ j .L80241EE8 +/* 802700 80241E80 080907BA */ j L80241EE8_802768 /* 802704 80241E84 00000000 */ nop glabel L80241E88_802708 /* 802708 80241E88 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80241E98_802718 /* 80271C 80241E9C 0260282D */ daddu $a1, $s3, $zero /* 802720 80241EA0 0C090673 */ jal func_802419CC_80224C /* 802724 80241EA4 02A0302D */ daddu $a2, $s5, $zero -/* 802728 80241EA8 080907BA */ j .L80241EE8 +/* 802728 80241EA8 080907BA */ j L80241EE8_802768 /* 80272C 80241EAC 00000000 */ nop glabel L80241EB0_802730 /* 802730 80241EB0 0280202D */ daddu $a0, $s4, $zero /* 802734 80241EB4 0260282D */ daddu $a1, $s3, $zero /* 802738 80241EB8 0C0906BB */ jal dup_mac_01_UnkNpcDurationFlagFunc /* 80273C 80241EBC 02A0302D */ daddu $a2, $s5, $zero -/* 802740 80241EC0 080907BA */ j .L80241EE8 +/* 802740 80241EC0 080907BA */ j L80241EE8_802768 /* 802744 80241EC4 00000000 */ nop glabel L80241EC8_802748 /* 802748 80241EC8 0280202D */ daddu $a0, $s4, $zero /* 80274C 80241ECC 0260282D */ daddu $a1, $s3, $zero /* 802750 80241ED0 0C0906D5 */ jal func_80241B54_8023D4 /* 802754 80241ED4 02A0302D */ daddu $a2, $s5, $zero -/* 802758 80241ED8 080907BA */ j .L80241EE8 +/* 802758 80241ED8 080907BA */ j L80241EE8_802768 /* 80275C 80241EDC 00000000 */ nop glabel L80241EE0_802760 /* 802760 80241EE0 0C0129CF */ jal func_8004A73C /* 802764 80241EE4 0280202D */ daddu $a0, $s4, $zero -.L80241EE8: glabel L80241EE8_802768 /* 802768 80241EE8 8FBF0060 */ lw $ra, 0x60($sp) /* 80276C 80241EEC 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s index bff6905f9e..3b2033ad8f 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s @@ -122,7 +122,7 @@ glabel func_802460E4_806964 .L802462A4: /* 806B24 802462A4 8E830070 */ lw $v1, 0x70($s4) /* 806B28 802462A8 2C620064 */ sltiu $v0, $v1, 0x64 -/* 806B2C 802462AC 10400042 */ beqz $v0, .L802463B8 +/* 806B2C 802462AC 10400042 */ beqz $v0, L802463B8_806C38 /* 806B30 802462B0 00031080 */ sll $v0, $v1, 2 /* 806B34 802462B4 3C018026 */ lui $at, %hi(jtbl_802628A0_823120) /* 806B38 802462B8 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L802462D8_806B58 /* 806B5C 802462DC 0260282D */ daddu $a1, $s3, $zero /* 806B60 802462E0 0C0915AA */ jal func_802456A8_805F28 /* 806B64 802462E4 02A0302D */ daddu $a2, $s5, $zero -/* 806B68 802462E8 080918EE */ j .L802463B8 +/* 806B68 802462E8 080918EE */ j L802463B8_806C38 /* 806B6C 802462EC 00000000 */ nop glabel L802462F0_806B70 /* 806B70 802462F0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80246300_806B80 /* 806B84 80246304 0260282D */ daddu $a1, $s3, $zero /* 806B88 80246308 0C091684 */ jal func_80245A10_806290 /* 806B8C 8024630C 02A0302D */ daddu $a2, $s5, $zero -/* 806B90 80246310 080918EE */ j .L802463B8 +/* 806B90 80246310 080918EE */ j L802463B8_806C38 /* 806B94 80246314 00000000 */ nop glabel L80246318_806B98 /* 806B98 80246318 0280202D */ daddu $a0, $s4, $zero /* 806B9C 8024631C 0260282D */ daddu $a1, $s3, $zero /* 806BA0 80246320 0C0916F3 */ jal func_80245BCC_80644C /* 806BA4 80246324 02A0302D */ daddu $a2, $s5, $zero -/* 806BA8 80246328 080918EE */ j .L802463B8 +/* 806BA8 80246328 080918EE */ j L802463B8_806C38 /* 806BAC 8024632C 00000000 */ nop glabel L80246330_806BB0 /* 806BB0 80246330 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80246340_806BC0 /* 806BC4 80246344 0260282D */ daddu $a1, $s3, $zero /* 806BC8 80246348 0C09173D */ jal mac_01_NpcJumpFunc /* 806BCC 8024634C 02A0302D */ daddu $a2, $s5, $zero -/* 806BD0 80246350 080918EE */ j .L802463B8 +/* 806BD0 80246350 080918EE */ j L802463B8_806C38 /* 806BD4 80246354 00000000 */ nop glabel L80246358_806BD8 /* 806BD8 80246358 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80246368_806BE8 /* 806BEC 8024636C 0260282D */ daddu $a1, $s3, $zero /* 806BF0 80246370 0C0917A7 */ jal func_80245E9C_80671C /* 806BF4 80246374 02A0302D */ daddu $a2, $s5, $zero -/* 806BF8 80246378 080918EE */ j .L802463B8 +/* 806BF8 80246378 080918EE */ j L802463B8_806C38 /* 806BFC 8024637C 00000000 */ nop glabel L80246380_806C00 /* 806C00 80246380 0280202D */ daddu $a0, $s4, $zero /* 806C04 80246384 0260282D */ daddu $a1, $s3, $zero /* 806C08 80246388 0C0917EF */ jal mac_01_UnkNpcDurationFlagFunc /* 806C0C 8024638C 02A0302D */ daddu $a2, $s5, $zero -/* 806C10 80246390 080918EE */ j .L802463B8 +/* 806C10 80246390 080918EE */ j L802463B8_806C38 /* 806C14 80246394 00000000 */ nop glabel L80246398_806C18 /* 806C18 80246398 0280202D */ daddu $a0, $s4, $zero /* 806C1C 8024639C 0260282D */ daddu $a1, $s3, $zero /* 806C20 802463A0 0C091809 */ jal func_80246024_8068A4 /* 806C24 802463A4 02A0302D */ daddu $a2, $s5, $zero -/* 806C28 802463A8 080918EE */ j .L802463B8 +/* 806C28 802463A8 080918EE */ j L802463B8_806C38 /* 806C2C 802463AC 00000000 */ nop glabel L802463B0_806C30 /* 806C30 802463B0 0C0129CF */ jal func_8004A73C /* 806C34 802463B4 0280202D */ daddu $a0, $s4, $zero -.L802463B8: glabel L802463B8_806C38 /* 806C38 802463B8 8FBF0060 */ lw $ra, 0x60($sp) /* 806C3C 802463BC 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s index dc6d111559..4175b7e76a 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s @@ -122,7 +122,7 @@ glabel func_802414C4_824784 .L80241684: /* 824944 80241684 8E830070 */ lw $v1, 0x70($s4) /* 824948 80241688 2C620064 */ sltiu $v0, $v1, 0x64 -/* 82494C 8024168C 10400042 */ beqz $v0, .L80241798 +/* 82494C 8024168C 10400042 */ beqz $v0, L80241798_824A58 /* 824950 80241690 00031080 */ sll $v0, $v1, 2 /* 824954 80241694 3C018025 */ lui $at, %hi(jtbl_8024E210_8314D0) /* 824958 80241698 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L802416B8_824978 /* 82497C 802416BC 0260282D */ daddu $a1, $s3, $zero /* 824980 802416C0 0C0902A2 */ jal func_80240A88_823D48 /* 824984 802416C4 02A0302D */ daddu $a2, $s5, $zero -/* 824988 802416C8 080905E6 */ j .L80241798 +/* 824988 802416C8 080905E6 */ j L80241798_824A58 /* 82498C 802416CC 00000000 */ nop glabel L802416D0_824990 /* 824990 802416D0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L802416E0_8249A0 /* 8249A4 802416E4 0260282D */ daddu $a1, $s3, $zero /* 8249A8 802416E8 0C09037C */ jal func_80240DF0_8240B0 /* 8249AC 802416EC 02A0302D */ daddu $a2, $s5, $zero -/* 8249B0 802416F0 080905E6 */ j .L80241798 +/* 8249B0 802416F0 080905E6 */ j L80241798_824A58 /* 8249B4 802416F4 00000000 */ nop glabel L802416F8_8249B8 /* 8249B8 802416F8 0280202D */ daddu $a0, $s4, $zero /* 8249BC 802416FC 0260282D */ daddu $a1, $s3, $zero /* 8249C0 80241700 0C0903EB */ jal func_80240FAC_82426C /* 8249C4 80241704 02A0302D */ daddu $a2, $s5, $zero -/* 8249C8 80241708 080905E6 */ j .L80241798 +/* 8249C8 80241708 080905E6 */ j L80241798_824A58 /* 8249CC 8024170C 00000000 */ nop glabel L80241710_8249D0 /* 8249D0 80241710 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80241720_8249E0 /* 8249E4 80241724 0260282D */ daddu $a1, $s3, $zero /* 8249E8 80241728 0C090435 */ jal mac_02_NpcJumpFunc /* 8249EC 8024172C 02A0302D */ daddu $a2, $s5, $zero -/* 8249F0 80241730 080905E6 */ j .L80241798 +/* 8249F0 80241730 080905E6 */ j L80241798_824A58 /* 8249F4 80241734 00000000 */ nop glabel L80241738_8249F8 /* 8249F8 80241738 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80241748_824A08 /* 824A0C 8024174C 0260282D */ daddu $a1, $s3, $zero /* 824A10 80241750 0C09049F */ jal func_8024127C_82453C /* 824A14 80241754 02A0302D */ daddu $a2, $s5, $zero -/* 824A18 80241758 080905E6 */ j .L80241798 +/* 824A18 80241758 080905E6 */ j L80241798_824A58 /* 824A1C 8024175C 00000000 */ nop glabel L80241760_824A20 /* 824A20 80241760 0280202D */ daddu $a0, $s4, $zero /* 824A24 80241764 0260282D */ daddu $a1, $s3, $zero /* 824A28 80241768 0C0904E7 */ jal mac_02_UnkNpcDurationFlagFunc /* 824A2C 8024176C 02A0302D */ daddu $a2, $s5, $zero -/* 824A30 80241770 080905E6 */ j .L80241798 +/* 824A30 80241770 080905E6 */ j L80241798_824A58 /* 824A34 80241774 00000000 */ nop glabel L80241778_824A38 /* 824A38 80241778 0280202D */ daddu $a0, $s4, $zero /* 824A3C 8024177C 0260282D */ daddu $a1, $s3, $zero /* 824A40 80241780 0C090501 */ jal func_80241404_8246C4 /* 824A44 80241784 02A0302D */ daddu $a2, $s5, $zero -/* 824A48 80241788 080905E6 */ j .L80241798 +/* 824A48 80241788 080905E6 */ j L80241798_824A58 /* 824A4C 8024178C 00000000 */ nop glabel L80241790_824A50 /* 824A50 80241790 0C0129CF */ jal func_8004A73C /* 824A54 80241794 0280202D */ daddu $a0, $s4, $zero -.L80241798: glabel L80241798_824A58 /* 824A58 80241798 8FBF0060 */ lw $ra, 0x60($sp) /* 824A5C 8024179C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s index 1d9d39fd08..f9ac44e618 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s @@ -122,7 +122,7 @@ glabel func_80241024_853194 .L802411E4: /* 853354 802411E4 8E830070 */ lw $v1, 0x70($s4) /* 853358 802411E8 2C620064 */ sltiu $v0, $v1, 0x64 -/* 85335C 802411EC 10400042 */ beqz $v0, .L802412F8 +/* 85335C 802411EC 10400042 */ beqz $v0, L802412F8_853468 /* 853360 802411F0 00031080 */ sll $v0, $v1, 2 /* 853364 802411F4 3C018025 */ lui $at, %hi(jtbl_802527C0_864930) /* 853368 802411F8 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80241218_853388 /* 85338C 8024121C 0260282D */ daddu $a1, $s3, $zero /* 853390 80241220 0C09017A */ jal func_802405E8_852758 /* 853394 80241224 02A0302D */ daddu $a2, $s5, $zero -/* 853398 80241228 080904BE */ j .L802412F8 +/* 853398 80241228 080904BE */ j L802412F8_853468 /* 85339C 8024122C 00000000 */ nop glabel L80241230_8533A0 /* 8533A0 80241230 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80241240_8533B0 /* 8533B4 80241244 0260282D */ daddu $a1, $s3, $zero /* 8533B8 80241248 0C090254 */ jal func_80240950_852AC0 /* 8533BC 8024124C 02A0302D */ daddu $a2, $s5, $zero -/* 8533C0 80241250 080904BE */ j .L802412F8 +/* 8533C0 80241250 080904BE */ j L802412F8_853468 /* 8533C4 80241254 00000000 */ nop glabel L80241258_8533C8 /* 8533C8 80241258 0280202D */ daddu $a0, $s4, $zero /* 8533CC 8024125C 0260282D */ daddu $a1, $s3, $zero /* 8533D0 80241260 0C0902C3 */ jal func_80240B0C_852C7C /* 8533D4 80241264 02A0302D */ daddu $a2, $s5, $zero -/* 8533D8 80241268 080904BE */ j .L802412F8 +/* 8533D8 80241268 080904BE */ j L802412F8_853468 /* 8533DC 8024126C 00000000 */ nop glabel L80241270_8533E0 /* 8533E0 80241270 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80241280_8533F0 /* 8533F4 80241284 0260282D */ daddu $a1, $s3, $zero /* 8533F8 80241288 0C09030D */ jal mac_05_NpcJumpFunc /* 8533FC 8024128C 02A0302D */ daddu $a2, $s5, $zero -/* 853400 80241290 080904BE */ j .L802412F8 +/* 853400 80241290 080904BE */ j L802412F8_853468 /* 853404 80241294 00000000 */ nop glabel L80241298_853408 /* 853408 80241298 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L802412A8_853418 /* 85341C 802412AC 0260282D */ daddu $a1, $s3, $zero /* 853420 802412B0 0C090377 */ jal func_80240DDC_852F4C /* 853424 802412B4 02A0302D */ daddu $a2, $s5, $zero -/* 853428 802412B8 080904BE */ j .L802412F8 +/* 853428 802412B8 080904BE */ j L802412F8_853468 /* 85342C 802412BC 00000000 */ nop glabel L802412C0_853430 /* 853430 802412C0 0280202D */ daddu $a0, $s4, $zero /* 853434 802412C4 0260282D */ daddu $a1, $s3, $zero /* 853438 802412C8 0C0903BF */ jal mac_05_UnkNpcDurationFlagFunc /* 85343C 802412CC 02A0302D */ daddu $a2, $s5, $zero -/* 853440 802412D0 080904BE */ j .L802412F8 +/* 853440 802412D0 080904BE */ j L802412F8_853468 /* 853444 802412D4 00000000 */ nop glabel L802412D8_853448 /* 853448 802412D8 0280202D */ daddu $a0, $s4, $zero /* 85344C 802412DC 0260282D */ daddu $a1, $s3, $zero /* 853450 802412E0 0C0903D9 */ jal func_80240F64_8530D4 /* 853454 802412E4 02A0302D */ daddu $a2, $s5, $zero -/* 853458 802412E8 080904BE */ j .L802412F8 +/* 853458 802412E8 080904BE */ j L802412F8_853468 /* 85345C 802412EC 00000000 */ nop glabel L802412F0_853460 /* 853460 802412F0 0C0129CF */ jal func_8004A73C /* 853464 802412F4 0280202D */ daddu $a0, $s4, $zero -.L802412F8: glabel L802412F8_853468 /* 853468 802412F8 8FBF0060 */ lw $ra, 0x60($sp) /* 85346C 802412FC 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s index 4086da62be..54f106252f 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s @@ -29,7 +29,7 @@ glabel func_80243588_8556F8 /* 855758 802435E8 3C03FF4A */ lui $v1, 0xff4a /* 85575C 802435EC 00431821 */ addu $v1, $v0, $v1 /* 855760 802435F0 2C62000D */ sltiu $v0, $v1, 0xd -/* 855764 802435F4 1040000B */ beqz $v0, .L80243624 +/* 855764 802435F4 1040000B */ beqz $v0, L80243624_855794 /* 855768 802435F8 00031080 */ sll $v0, $v1, 2 /* 85576C 802435FC 3C018025 */ lui $at, %hi(jtbl_80252970_864AE0) /* 855770 80243600 00220821 */ addu $at, $at, $v0 @@ -38,11 +38,10 @@ glabel func_80243588_8556F8 /* 85577C 8024360C 00000000 */ nop glabel L80243610_855780 /* 855780 80243610 8E020000 */ lw $v0, ($s0) -/* 855784 80243614 04410003 */ bgez $v0, .L80243624 +/* 855784 80243614 04410003 */ bgez $v0, L80243624_855794 /* 855788 80243618 00000000 */ nop /* 85578C 8024361C 0000B02D */ daddu $s6, $zero, $zero /* 855790 80243620 AE000000 */ sw $zero, ($s0) -.L80243624: glabel L80243624_855794 /* 855794 80243624 1AE00065 */ blez $s7, .L802437BC /* 855798 80243628 0000A02D */ daddu $s4, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s index 25a43d7827..f91ea38797 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s @@ -29,7 +29,7 @@ glabel func_80240658_865198 /* 8651F8 802406B8 3C03FF4A */ lui $v1, 0xff4a /* 8651FC 802406BC 00431821 */ addu $v1, $v0, $v1 /* 865200 802406C0 2C62000D */ sltiu $v0, $v1, 0xd -/* 865204 802406C4 1040000B */ beqz $v0, .L802406F4 +/* 865204 802406C4 1040000B */ beqz $v0, L802406F4_865234 /* 865208 802406C8 00031080 */ sll $v0, $v1, 2 /* 86520C 802406CC 3C018024 */ lui $at, %hi(jtbl_80244910_869450) /* 865210 802406D0 00220821 */ addu $at, $at, $v0 @@ -38,11 +38,10 @@ glabel func_80240658_865198 /* 86521C 802406DC 00000000 */ nop glabel L802406E0_865220 /* 865220 802406E0 8E020000 */ lw $v0, ($s0) -/* 865224 802406E4 04410003 */ bgez $v0, .L802406F4 +/* 865224 802406E4 04410003 */ bgez $v0, L802406F4_865234 /* 865228 802406E8 00000000 */ nop /* 86522C 802406EC 0000B02D */ daddu $s6, $zero, $zero /* 865230 802406F0 AE000000 */ sw $zero, ($s0) -.L802406F4: glabel L802406F4_865234 /* 865234 802406F4 1AE00065 */ blez $s7, .L8024088C /* 865238 802406F8 0000A02D */ daddu $s4, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s index 16efd1e428..0bf9d0c998 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s @@ -122,7 +122,7 @@ glabel func_80240E74_E0F614 .L80241034: /* E0F7D4 80241034 8E830070 */ lw $v1, 0x70($s4) /* E0F7D8 80241038 2C620064 */ sltiu $v0, $v1, 0x64 -/* E0F7DC 8024103C 10400042 */ beqz $v0, .L80241148 +/* E0F7DC 8024103C 10400042 */ beqz $v0, L80241148_E0F8E8 /* E0F7E0 80241040 00031080 */ sll $v0, $v1, 2 /* E0F7E4 80241044 3C018024 */ lui $at, %hi(jtbl_80243E00_E125A0) /* E0F7E8 80241048 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80241068_E0F808 /* E0F80C 8024106C 0260282D */ daddu $a1, $s3, $zero /* E0F810 80241070 0C09010E */ jal func_80240438_E0EBD8 /* E0F814 80241074 02A0302D */ daddu $a2, $s5, $zero -/* E0F818 80241078 08090452 */ j .L80241148 +/* E0F818 80241078 08090452 */ j L80241148_E0F8E8 /* E0F81C 8024107C 00000000 */ nop glabel L80241080_E0F820 /* E0F820 80241080 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80241090_E0F830 /* E0F834 80241094 0260282D */ daddu $a1, $s3, $zero /* E0F838 80241098 0C0901E8 */ jal func_802407A0_E0EF40 /* E0F83C 8024109C 02A0302D */ daddu $a2, $s5, $zero -/* E0F840 802410A0 08090452 */ j .L80241148 +/* E0F840 802410A0 08090452 */ j L80241148_E0F8E8 /* E0F844 802410A4 00000000 */ nop glabel L802410A8_E0F848 /* E0F848 802410A8 0280202D */ daddu $a0, $s4, $zero /* E0F84C 802410AC 0260282D */ daddu $a1, $s3, $zero /* E0F850 802410B0 0C090257 */ jal func_8024095C_E0F0FC /* E0F854 802410B4 02A0302D */ daddu $a2, $s5, $zero -/* E0F858 802410B8 08090452 */ j .L80241148 +/* E0F858 802410B8 08090452 */ j L80241148_E0F8E8 /* E0F85C 802410BC 00000000 */ nop glabel L802410C0_E0F860 /* E0F860 802410C0 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L802410D0_E0F870 /* E0F874 802410D4 0260282D */ daddu $a1, $s3, $zero /* E0F878 802410D8 0C0902A1 */ jal mgm_00_NpcJumpFunc /* E0F87C 802410DC 02A0302D */ daddu $a2, $s5, $zero -/* E0F880 802410E0 08090452 */ j .L80241148 +/* E0F880 802410E0 08090452 */ j L80241148_E0F8E8 /* E0F884 802410E4 00000000 */ nop glabel L802410E8_E0F888 /* E0F888 802410E8 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L802410F8_E0F898 /* E0F89C 802410FC 0260282D */ daddu $a1, $s3, $zero /* E0F8A0 80241100 0C09030B */ jal func_80240C2C_E0F3CC /* E0F8A4 80241104 02A0302D */ daddu $a2, $s5, $zero -/* E0F8A8 80241108 08090452 */ j .L80241148 +/* E0F8A8 80241108 08090452 */ j L80241148_E0F8E8 /* E0F8AC 8024110C 00000000 */ nop glabel L80241110_E0F8B0 /* E0F8B0 80241110 0280202D */ daddu $a0, $s4, $zero /* E0F8B4 80241114 0260282D */ daddu $a1, $s3, $zero /* E0F8B8 80241118 0C090353 */ jal mgm_00_UnkNpcDurationFlagFunc /* E0F8BC 8024111C 02A0302D */ daddu $a2, $s5, $zero -/* E0F8C0 80241120 08090452 */ j .L80241148 +/* E0F8C0 80241120 08090452 */ j L80241148_E0F8E8 /* E0F8C4 80241124 00000000 */ nop glabel L80241128_E0F8C8 /* E0F8C8 80241128 0280202D */ daddu $a0, $s4, $zero /* E0F8CC 8024112C 0260282D */ daddu $a1, $s3, $zero /* E0F8D0 80241130 0C09036D */ jal func_80240DB4_E0F554 /* E0F8D4 80241134 02A0302D */ daddu $a2, $s5, $zero -/* E0F8D8 80241138 08090452 */ j .L80241148 +/* E0F8D8 80241138 08090452 */ j L80241148_E0F8E8 /* E0F8DC 8024113C 00000000 */ nop glabel L80241140_E0F8E0 /* E0F8E0 80241140 0C0129CF */ jal func_8004A73C /* E0F8E4 80241144 0280202D */ daddu $a0, $s4, $zero -.L80241148: glabel L80241148_E0F8E8 /* E0F8E8 80241148 8FBF0060 */ lw $ra, 0x60($sp) /* E0F8EC 8024114C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s index 23ad0ecdbb..1f69078f29 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s @@ -55,7 +55,7 @@ glabel func_80240BB0_E16930 /* E169F4 80240C74 0040982D */ daddu $s3, $v0, $zero /* E169F8 80240C78 2463FFF6 */ addiu $v1, $v1, -0xa /* E169FC 80240C7C 2C620042 */ sltiu $v0, $v1, 0x42 -/* E16A00 80240C80 104003AD */ beqz $v0, .L80241B38 +/* E16A00 80240C80 104003AD */ beqz $v0, L80241B38_E178B8 /* E16A04 80240C84 00031080 */ sll $v0, $v1, 2 /* E16A08 80240C88 3C018025 */ lui $at, %hi(jtbl_802484E8_E1E268) /* E16A0C 80240C8C 00220821 */ addu $at, $at, $v0 @@ -78,7 +78,7 @@ glabel L80240C9C_E16A1C glabel L80240CCC_E16A4C /* E16A4C 80240CCC 8E820030 */ lw $v0, 0x30($s4) /* E16A50 80240CD0 2442FFFF */ addiu $v0, $v0, -1 -/* E16A54 80240CD4 1C400398 */ bgtz $v0, .L80241B38 +/* E16A54 80240CD4 1C400398 */ bgtz $v0, L80241B38_E178B8 /* E16A58 80240CD8 AE820030 */ sw $v0, 0x30($s4) /* E16A5C 80240CDC 3C02002B */ lui $v0, 0x2b /* E16A60 80240CE0 34420002 */ ori $v0, $v0, 2 @@ -163,7 +163,7 @@ glabel L80240D88_E16B08 /* E16B90 80240E10 C6600064 */ lwc1 $f0, 0x64($s3) /* E16B94 80240E14 4600103E */ c.le.s $f2, $f0 /* E16B98 80240E18 00000000 */ nop -/* E16B9C 80240E1C 45000346 */ bc1f .L80241B38 +/* E16B9C 80240E1C 45000346 */ bc1f L80241B38_E178B8 /* E16BA0 80240E20 2404014A */ addiu $a0, $zero, 0x14a /* E16BA4 80240E24 2402000B */ addiu $v0, $zero, 0xb /* E16BA8 80240E28 0C00A67F */ jal rand_int @@ -406,7 +406,7 @@ glabel L80241048_E16DC8 /* E16F54 802411D4 0C0513AC */ jal icon_set_opacity /* E16F58 802411D8 240500FF */ addiu $a1, $zero, 0xff /* E16F5C 802411DC 2402000F */ addiu $v0, $zero, 0xf -/* E16F60 802411E0 080906CE */ j .L80241B38 +/* E16F60 802411E0 080906CE */ j L80241B38_E178B8 /* E16F64 802411E4 AE82002C */ sw $v0, 0x2c($s4) glabel L802411E8_E16F68 /* E16F68 802411E8 3C040001 */ lui $a0, 1 @@ -519,7 +519,7 @@ glabel L80241354_E170D4 glabel L80241384_E17104 /* E17104 80241384 8E820030 */ lw $v0, 0x30($s4) /* E17108 80241388 2442FFFF */ addiu $v0, $v0, -1 -/* E1710C 8024138C 1C4001EA */ bgtz $v0, .L80241B38 +/* E1710C 8024138C 1C4001EA */ bgtz $v0, L80241B38_E178B8 /* E17110 80241390 AE820030 */ sw $v0, 0x30($s4) /* E17114 80241394 24020020 */ addiu $v0, $zero, 0x20 /* E17118 80241398 AE82002C */ sw $v0, 0x2c($s4) @@ -601,7 +601,7 @@ glabel L80241434_E171B4 /* E1723C 802414BC C6600064 */ lwc1 $f0, 0x64($s3) /* E17240 802414C0 4600103E */ c.le.s $f2, $f0 /* E17244 802414C4 00000000 */ nop -/* E17248 802414C8 4500019B */ bc1f .L80241B38 +/* E17248 802414C8 4500019B */ bc1f L80241B38_E178B8 /* E1724C 802414CC 2404014A */ addiu $a0, $zero, 0x14a /* E17250 802414D0 2402001F */ addiu $v0, $zero, 0x1f /* E17254 802414D4 0C00A67F */ jal rand_int @@ -767,7 +767,7 @@ glabel L802416C4_E17444 /* E174B4 80241734 AE82002C */ sw $v0, 0x2c($s4) /* E174B8 80241738 8E620000 */ lw $v0, ($s3) /* E174BC 8024173C 34420002 */ ori $v0, $v0, 2 -/* E174C0 80241740 080906CE */ j .L80241B38 +/* E174C0 80241740 080906CE */ j L80241B38_E178B8 /* E174C4 80241744 AE620000 */ sw $v0, ($s3) glabel L80241748_E174C8 /* E174C8 80241748 27A50068 */ addiu $a1, $sp, 0x68 @@ -798,7 +798,7 @@ glabel L80241748_E174C8 glabel L802417AC_E1752C /* E1752C 802417AC 8E820030 */ lw $v0, 0x30($s4) /* E17530 802417B0 2442FFFF */ addiu $v0, $v0, -1 -/* E17534 802417B4 1C4000E0 */ bgtz $v0, .L80241B38 +/* E17534 802417B4 1C4000E0 */ bgtz $v0, L80241B38_E178B8 /* E17538 802417B8 AE820030 */ sw $v0, 0x30($s4) /* E1753C 802417BC 27B20068 */ addiu $s2, $sp, 0x68 /* E17540 802417C0 0240282D */ daddu $a1, $s2, $zero @@ -853,7 +853,7 @@ glabel L802417AC_E1752C /* E17604 80241884 26040058 */ addiu $a0, $s0, 0x58 /* E17608 80241888 96020000 */ lhu $v0, ($s0) /* E1760C 8024188C 34421400 */ ori $v0, $v0, 0x1400 -/* E17610 80241890 080906CE */ j .L80241B38 +/* E17610 80241890 080906CE */ j L80241B38_E178B8 /* E17614 80241894 A6020000 */ sh $v0, ($s0) .L80241898: /* E17618 80241898 8E650038 */ lw $a1, 0x38($s3) @@ -938,7 +938,7 @@ glabel L802418C4_E17644 /* E17740 802419C0 C6600064 */ lwc1 $f0, 0x64($s3) /* E17744 802419C4 4600103E */ c.le.s $f2, $f0 /* E17748 802419C8 00000000 */ nop -/* E1774C 802419CC 4500005A */ bc1f .L80241B38 +/* E1774C 802419CC 4500005A */ bc1f L80241B38_E178B8 /* E17750 802419D0 2404014A */ addiu $a0, $zero, 0x14a /* E17754 802419D4 24020047 */ addiu $v0, $zero, 0x47 /* E17758 802419D8 0C00A67F */ jal rand_int @@ -1036,7 +1036,6 @@ glabel L80241A30_E177B0 /* E178B0 80241B30 AE82002C */ sw $v0, 0x2c($s4) .L80241B34: /* E178B4 80241B34 AE800030 */ sw $zero, 0x30($s4) -.L80241B38: glabel L80241B38_E178B8 /* E178B8 80241B38 2694001C */ addiu $s4, $s4, 0x1c .L80241B3C: diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s index 337d674c7e..f2ff95a056 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s @@ -98,7 +98,7 @@ glabel func_80240B1C_B93F5C .L80240C7C: /* B940BC 80240C7C 8E430070 */ lw $v1, 0x70($s2) /* B940C0 80240C80 2C620064 */ sltiu $v0, $v1, 0x64 -/* B940C4 80240C84 10400048 */ beqz $v0, .L80240DA8 +/* B940C4 80240C84 10400048 */ beqz $v0, L80240DA8_B941E8 /* B940C8 80240C88 00031080 */ sll $v0, $v1, 2 /* B940CC 80240C8C 3C018024 */ lui $at, %hi(jtbl_802445F8_B97A38) /* B940D0 80240C90 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80240CB0_B940F0 /* B940F4 80240CB4 0260282D */ daddu $a1, $s3, $zero /* B940F8 80240CB8 0C0125AE */ jal func_800496B8 /* B940FC 80240CBC 0280302D */ daddu $a2, $s4, $zero -/* B94100 80240CC0 0809036A */ j .L80240DA8 +/* B94100 80240CC0 0809036A */ j L80240DA8_B941E8 /* B94104 80240CC4 00000000 */ nop glabel L80240CC8_B94108 /* B94108 80240CC8 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80240CD8_B94118 /* B9411C 80240CDC 0260282D */ daddu $a1, $s3, $zero /* B94120 80240CE0 0C012701 */ jal func_80049C04 /* B94124 80240CE4 0280302D */ daddu $a2, $s4, $zero -/* B94128 80240CE8 0809036A */ j .L80240DA8 +/* B94128 80240CE8 0809036A */ j L80240DA8_B941E8 /* B9412C 80240CEC 00000000 */ nop glabel L80240CF0_B94130 /* B94130 80240CF0 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240D00_B94140 /* B94144 80240D04 0260282D */ daddu $a1, $s3, $zero /* B94148 80240D08 0C0127B3 */ jal func_80049ECC /* B9414C 80240D0C 0280302D */ daddu $a2, $s4, $zero -/* B94150 80240D10 0809036A */ j .L80240DA8 +/* B94150 80240D10 0809036A */ j L80240DA8_B941E8 /* B94154 80240D14 00000000 */ nop glabel L80240D18_B94158 /* B94158 80240D18 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240D28_B94168 /* B9416C 80240D2C 0260282D */ daddu $a1, $s3, $zero /* B94170 80240D30 0C012849 */ jal func_8004A124 /* B94174 80240D34 0280302D */ daddu $a2, $s4, $zero -/* B94178 80240D38 0809036A */ j .L80240DA8 +/* B94178 80240D38 0809036A */ j L80240DA8_B941E8 /* B9417C 80240D3C 00000000 */ nop glabel L80240D40_B94180 /* B94180 80240D40 0240202D */ daddu $a0, $s2, $zero /* B94184 80240D44 0260282D */ daddu $a1, $s3, $zero /* B94188 80240D48 0C0128FA */ jal func_8004A3E8 /* B9418C 80240D4C 0280302D */ daddu $a2, $s4, $zero -/* B94190 80240D50 0809036A */ j .L80240DA8 +/* B94190 80240D50 0809036A */ j L80240DA8_B941E8 /* B94194 80240D54 00000000 */ nop glabel L80240D58_B94198 /* B94198 80240D58 0C090140 */ jal mim_01_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240D60_B941A0 /* B941A4 80240D64 0240202D */ daddu $a0, $s2, $zero /* B941A8 80240D68 8E430070 */ lw $v1, 0x70($s2) /* B941AC 80240D6C 24020020 */ addiu $v0, $zero, 0x20 -/* B941B0 80240D70 1462000D */ bne $v1, $v0, .L80240DA8 +/* B941B0 80240D70 1462000D */ bne $v1, $v0, L80240DA8_B941E8 /* B941B4 80240D74 00000000 */ nop glabel L80240D78_B941B8 /* B941B8 80240D78 0C090177 */ jal mim_01_UnkNpcAIFunc8 /* B941BC 80240D7C 0240202D */ daddu $a0, $s2, $zero /* B941C0 80240D80 8E430070 */ lw $v1, 0x70($s2) /* B941C4 80240D84 24020021 */ addiu $v0, $zero, 0x21 -/* B941C8 80240D88 14620007 */ bne $v1, $v0, .L80240DA8 +/* B941C8 80240D88 14620007 */ bne $v1, $v0, L80240DA8_B941E8 /* B941CC 80240D8C 00000000 */ nop glabel L80240D90_B941D0 /* B941D0 80240D90 0C0901AD */ jal mim_01_UnkNpcAIFunc5 /* B941D4 80240D94 0240202D */ daddu $a0, $s2, $zero -/* B941D8 80240D98 0809036A */ j .L80240DA8 +/* B941D8 80240D98 0809036A */ j L80240DA8_B941E8 /* B941DC 80240D9C 00000000 */ nop glabel L80240DA0_B941E0 /* B941E0 80240DA0 0C0129CF */ jal func_8004A73C /* B941E4 80240DA4 0240202D */ daddu $a0, $s2, $zero -.L80240DA8: glabel L80240DA8_B941E8 /* B941E8 80240DA8 8FBF0048 */ lw $ra, 0x48($sp) /* B941EC 80240DAC 8FB50044 */ lw $s5, 0x44($sp) 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 5bc243d7b2..57c596430a 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 @@ -86,7 +86,7 @@ glabel func_80240C60_B98860 .L80240DA0: /* B989A0 80240DA0 8E630070 */ lw $v1, 0x70($s3) /* B989A4 80240DA4 2C62000F */ sltiu $v0, $v1, 0xf -/* B989A8 80240DA8 1040002C */ beqz $v0, .L80240E5C +/* B989A8 80240DA8 1040002C */ beqz $v0, L80240E5C_B98A5C /* B989AC 80240DAC 00031080 */ sll $v0, $v1, 2 /* B989B0 80240DB0 3C018024 */ lui $at, %hi(jtbl_80243838_B9B438) /* B989B4 80240DB4 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L80240E4C_B98A4C /* B98A50 80240E50 0280282D */ daddu $a1, $s4, $zero /* B98A54 80240E54 0C090307 */ jal mim_02_UnkDurationCheck /* B98A58 80240E58 0200302D */ daddu $a2, $s0, $zero -.L80240E5C: glabel L80240E5C_B98A5C /* B98A5C 80240E5C 0000102D */ daddu $v0, $zero, $zero .L80240E60: 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 39cc89544e..a73fce8247 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 @@ -86,7 +86,7 @@ glabel func_80240DF0_B9E750 .L80240F30: /* B9E890 80240F30 8E630070 */ lw $v1, 0x70($s3) /* B9E894 80240F34 2C62000F */ sltiu $v0, $v1, 0xf -/* B9E898 80240F38 1040002C */ beqz $v0, .L80240FEC +/* B9E898 80240F38 1040002C */ beqz $v0, L80240FEC_B9E94C /* B9E89C 80240F3C 00031080 */ sll $v0, $v1, 2 /* B9E8A0 80240F40 3C018024 */ lui $at, %hi(jtbl_80242D88_BA06E8) /* B9E8A4 80240F44 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L80240FDC_B9E93C /* B9E940 80240FE0 0280282D */ daddu $a1, $s4, $zero /* B9E944 80240FE4 0C09036B */ jal mim_04_UnkDurationCheck /* B9E948 80240FE8 0200302D */ daddu $a2, $s0, $zero -.L80240FEC: glabel L80240FEC_B9E94C /* B9E94C 80240FEC 0000102D */ daddu $v0, $zero, $zero .L80240FF0: diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s index be24124b5e..31be4b51b5 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s @@ -98,7 +98,7 @@ glabel func_8024068C_BA0DBC .L802407EC: /* BA0F1C 802407EC 8E430070 */ lw $v1, 0x70($s2) /* BA0F20 802407F0 2C620064 */ sltiu $v0, $v1, 0x64 -/* BA0F24 802407F4 10400048 */ beqz $v0, .L80240918 +/* BA0F24 802407F4 10400048 */ beqz $v0, L80240918_BA1048 /* BA0F28 802407F8 00031080 */ sll $v0, $v1, 2 /* BA0F2C 802407FC 3C018024 */ lui $at, %hi(jtbl_80243E88_BA45B8) /* BA0F30 80240800 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80240820_BA0F50 /* BA0F54 80240824 0260282D */ daddu $a1, $s3, $zero /* BA0F58 80240828 0C0125AE */ jal func_800496B8 /* BA0F5C 8024082C 0280302D */ daddu $a2, $s4, $zero -/* BA0F60 80240830 08090246 */ j .L80240918 +/* BA0F60 80240830 08090246 */ j L80240918_BA1048 /* BA0F64 80240834 00000000 */ nop glabel L80240838_BA0F68 /* BA0F68 80240838 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80240848_BA0F78 /* BA0F7C 8024084C 0260282D */ daddu $a1, $s3, $zero /* BA0F80 80240850 0C012701 */ jal func_80049C04 /* BA0F84 80240854 0280302D */ daddu $a2, $s4, $zero -/* BA0F88 80240858 08090246 */ j .L80240918 +/* BA0F88 80240858 08090246 */ j L80240918_BA1048 /* BA0F8C 8024085C 00000000 */ nop glabel L80240860_BA0F90 /* BA0F90 80240860 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240870_BA0FA0 /* BA0FA4 80240874 0260282D */ daddu $a1, $s3, $zero /* BA0FA8 80240878 0C0127B3 */ jal func_80049ECC /* BA0FAC 8024087C 0280302D */ daddu $a2, $s4, $zero -/* BA0FB0 80240880 08090246 */ j .L80240918 +/* BA0FB0 80240880 08090246 */ j L80240918_BA1048 /* BA0FB4 80240884 00000000 */ nop glabel L80240888_BA0FB8 /* BA0FB8 80240888 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240898_BA0FC8 /* BA0FCC 8024089C 0260282D */ daddu $a1, $s3, $zero /* BA0FD0 802408A0 0C012849 */ jal func_8004A124 /* BA0FD4 802408A4 0280302D */ daddu $a2, $s4, $zero -/* BA0FD8 802408A8 08090246 */ j .L80240918 +/* BA0FD8 802408A8 08090246 */ j L80240918_BA1048 /* BA0FDC 802408AC 00000000 */ nop glabel L802408B0_BA0FE0 /* BA0FE0 802408B0 0240202D */ daddu $a0, $s2, $zero /* BA0FE4 802408B4 0260282D */ daddu $a1, $s3, $zero /* BA0FE8 802408B8 0C0128FA */ jal func_8004A3E8 /* BA0FEC 802408BC 0280302D */ daddu $a2, $s4, $zero -/* BA0FF0 802408C0 08090246 */ j .L80240918 +/* BA0FF0 802408C0 08090246 */ j L80240918_BA1048 /* BA0FF4 802408C4 00000000 */ nop glabel L802408C8_BA0FF8 /* BA0FF8 802408C8 0C09001C */ jal mim_05_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L802408D0_BA1000 /* BA1004 802408D4 0240202D */ daddu $a0, $s2, $zero /* BA1008 802408D8 8E430070 */ lw $v1, 0x70($s2) /* BA100C 802408DC 24020020 */ addiu $v0, $zero, 0x20 -/* BA1010 802408E0 1462000D */ bne $v1, $v0, .L80240918 +/* BA1010 802408E0 1462000D */ bne $v1, $v0, L80240918_BA1048 /* BA1014 802408E4 00000000 */ nop glabel L802408E8_BA1018 /* BA1018 802408E8 0C090053 */ jal mim_05_UnkNpcAIFunc8 /* BA101C 802408EC 0240202D */ daddu $a0, $s2, $zero /* BA1020 802408F0 8E430070 */ lw $v1, 0x70($s2) /* BA1024 802408F4 24020021 */ addiu $v0, $zero, 0x21 -/* BA1028 802408F8 14620007 */ bne $v1, $v0, .L80240918 +/* BA1028 802408F8 14620007 */ bne $v1, $v0, L80240918_BA1048 /* BA102C 802408FC 00000000 */ nop glabel L80240900_BA1030 /* BA1030 80240900 0C090089 */ jal mim_05_UnkNpcAIFunc5 /* BA1034 80240904 0240202D */ daddu $a0, $s2, $zero -/* BA1038 80240908 08090246 */ j .L80240918 +/* BA1038 80240908 08090246 */ j L80240918_BA1048 /* BA103C 8024090C 00000000 */ nop glabel L80240910_BA1040 /* BA1040 80240910 0C0129CF */ jal func_8004A73C /* BA1044 80240914 0240202D */ daddu $a0, $s2, $zero -.L80240918: glabel L80240918_BA1048 /* BA1048 80240918 8FBF0048 */ lw $ra, 0x48($sp) /* BA104C 8024091C 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s index 5ef55597cf..3e7878104f 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s @@ -98,7 +98,7 @@ glabel func_80240B8C_BA530C .L80240CEC: /* BA546C 80240CEC 8E430070 */ lw $v1, 0x70($s2) /* BA5470 80240CF0 2C620064 */ sltiu $v0, $v1, 0x64 -/* BA5474 80240CF4 10400048 */ beqz $v0, .L80240E18 +/* BA5474 80240CF4 10400048 */ beqz $v0, L80240E18_BA5598 /* BA5478 80240CF8 00031080 */ sll $v0, $v1, 2 /* BA547C 80240CFC 3C018024 */ lui $at, %hi(jtbl_802457B8_BA9F38) /* BA5480 80240D00 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80240D20_BA54A0 /* BA54A4 80240D24 0260282D */ daddu $a1, $s3, $zero /* BA54A8 80240D28 0C0125AE */ jal func_800496B8 /* BA54AC 80240D2C 0280302D */ daddu $a2, $s4, $zero -/* BA54B0 80240D30 08090386 */ j .L80240E18 +/* BA54B0 80240D30 08090386 */ j L80240E18_BA5598 /* BA54B4 80240D34 00000000 */ nop glabel L80240D38_BA54B8 /* BA54B8 80240D38 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80240D48_BA54C8 /* BA54CC 80240D4C 0260282D */ daddu $a1, $s3, $zero /* BA54D0 80240D50 0C012701 */ jal func_80049C04 /* BA54D4 80240D54 0280302D */ daddu $a2, $s4, $zero -/* BA54D8 80240D58 08090386 */ j .L80240E18 +/* BA54D8 80240D58 08090386 */ j L80240E18_BA5598 /* BA54DC 80240D5C 00000000 */ nop glabel L80240D60_BA54E0 /* BA54E0 80240D60 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240D70_BA54F0 /* BA54F4 80240D74 0260282D */ daddu $a1, $s3, $zero /* BA54F8 80240D78 0C0127B3 */ jal func_80049ECC /* BA54FC 80240D7C 0280302D */ daddu $a2, $s4, $zero -/* BA5500 80240D80 08090386 */ j .L80240E18 +/* BA5500 80240D80 08090386 */ j L80240E18_BA5598 /* BA5504 80240D84 00000000 */ nop glabel L80240D88_BA5508 /* BA5508 80240D88 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240D98_BA5518 /* BA551C 80240D9C 0260282D */ daddu $a1, $s3, $zero /* BA5520 80240DA0 0C012849 */ jal func_8004A124 /* BA5524 80240DA4 0280302D */ daddu $a2, $s4, $zero -/* BA5528 80240DA8 08090386 */ j .L80240E18 +/* BA5528 80240DA8 08090386 */ j L80240E18_BA5598 /* BA552C 80240DAC 00000000 */ nop glabel L80240DB0_BA5530 /* BA5530 80240DB0 0240202D */ daddu $a0, $s2, $zero /* BA5534 80240DB4 0260282D */ daddu $a1, $s3, $zero /* BA5538 80240DB8 0C0128FA */ jal func_8004A3E8 /* BA553C 80240DBC 0280302D */ daddu $a2, $s4, $zero -/* BA5540 80240DC0 08090386 */ j .L80240E18 +/* BA5540 80240DC0 08090386 */ j L80240E18_BA5598 /* BA5544 80240DC4 00000000 */ nop glabel L80240DC8_BA5548 /* BA5548 80240DC8 0C09015C */ jal mim_06_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240DD0_BA5550 /* BA5554 80240DD4 0240202D */ daddu $a0, $s2, $zero /* BA5558 80240DD8 8E430070 */ lw $v1, 0x70($s2) /* BA555C 80240DDC 24020020 */ addiu $v0, $zero, 0x20 -/* BA5560 80240DE0 1462000D */ bne $v1, $v0, .L80240E18 +/* BA5560 80240DE0 1462000D */ bne $v1, $v0, L80240E18_BA5598 /* BA5564 80240DE4 00000000 */ nop glabel L80240DE8_BA5568 /* BA5568 80240DE8 0C090193 */ jal mim_06_UnkNpcAIFunc8 /* BA556C 80240DEC 0240202D */ daddu $a0, $s2, $zero /* BA5570 80240DF0 8E430070 */ lw $v1, 0x70($s2) /* BA5574 80240DF4 24020021 */ addiu $v0, $zero, 0x21 -/* BA5578 80240DF8 14620007 */ bne $v1, $v0, .L80240E18 +/* BA5578 80240DF8 14620007 */ bne $v1, $v0, L80240E18_BA5598 /* BA557C 80240DFC 00000000 */ nop glabel L80240E00_BA5580 /* BA5580 80240E00 0C0901C9 */ jal mim_06_UnkNpcAIFunc5 /* BA5584 80240E04 0240202D */ daddu $a0, $s2, $zero -/* BA5588 80240E08 08090386 */ j .L80240E18 +/* BA5588 80240E08 08090386 */ j L80240E18_BA5598 /* BA558C 80240E0C 00000000 */ nop glabel L80240E10_BA5590 /* BA5590 80240E10 0C0129CF */ jal func_8004A73C /* BA5594 80240E14 0240202D */ daddu $a0, $s2, $zero -.L80240E18: glabel L80240E18_BA5598 /* BA5598 80240E18 8FBF0048 */ lw $ra, 0x48($sp) /* BA559C 80240E1C 8FB50044 */ lw $s5, 0x44($sp) 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 6cdc764bee..96dcb88766 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 @@ -86,7 +86,7 @@ glabel func_80242B04_BA7284 .L80242C44: /* BA73C4 80242C44 8E630070 */ lw $v1, 0x70($s3) /* BA73C8 80242C48 2C62000F */ sltiu $v0, $v1, 0xf -/* BA73CC 80242C4C 1040002C */ beqz $v0, .L80242D00 +/* BA73CC 80242C4C 1040002C */ beqz $v0, L80242D00_BA7480 /* BA73D0 80242C50 00031080 */ sll $v0, $v1, 2 /* BA73D4 80242C54 3C018024 */ lui $at, %hi(jtbl_80245980_BAA100) /* BA73D8 80242C58 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L80242CF0_BA7470 /* BA7474 80242CF4 0280282D */ daddu $a1, $s4, $zero /* BA7478 80242CF8 0C090AB0 */ jal mim_06_UnkDurationCheck /* BA747C 80242CFC 0200302D */ daddu $a2, $s0, $zero -.L80242D00: glabel L80242D00_BA7480 /* BA7480 80242D00 0000102D */ daddu $v0, $zero, $zero .L80242D04: 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 cfc7c9a11f..d84b91b442 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 @@ -86,7 +86,7 @@ glabel func_80240E60_BAAFA0 .L80240FA0: /* BAB0E0 80240FA0 8E630070 */ lw $v1, 0x70($s3) /* BAB0E4 80240FA4 2C62000F */ sltiu $v0, $v1, 0xf -/* BAB0E8 80240FA8 1040002C */ beqz $v0, .L8024105C +/* BAB0E8 80240FA8 1040002C */ beqz $v0, L8024105C_BAB19C /* BAB0EC 80240FAC 00031080 */ sll $v0, $v1, 2 /* BAB0F0 80240FB0 3C018024 */ lui $at, %hi(jtbl_802437B8_BAD8F8) /* BAB0F4 80240FB4 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L8024104C_BAB18C /* BAB190 80241050 0280282D */ daddu $a1, $s4, $zero /* BAB194 80241054 0C090387 */ jal mim_07_UnkDurationCheck /* BAB198 80241058 0200302D */ daddu $a2, $s0, $zero -.L8024105C: glabel L8024105C_BAB19C /* BAB19C 8024105C 0000102D */ daddu $v0, $zero, $zero .L80241060: 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 642750432e..916aef242c 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 @@ -64,7 +64,7 @@ glabel func_802413AC_BAECEC .L80241494: /* BAEDD4 80241494 8E830070 */ lw $v1, 0x70($s4) /* BAEDD8 80241498 2C62000F */ sltiu $v0, $v1, 0xf -/* BAEDDC 8024149C 10400034 */ beqz $v0, .L80241570 +/* BAEDDC 8024149C 10400034 */ beqz $v0, L80241570_BAEEB0 /* BAEDE0 802414A0 00031080 */ sll $v0, $v1, 2 /* BAEDE4 802414A4 3C018024 */ lui $at, %hi(jtbl_802452B8_BB2BF8) /* BAEDE8 802414A8 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241560_BAEEA0 /* BAEEA4 80241564 0200282D */ daddu $a1, $s0, $zero /* BAEEA8 80241568 0C0903BE */ jal func_80240EF8_BAE838 /* BAEEAC 8024156C 0260302D */ daddu $a2, $s3, $zero -.L80241570: glabel L80241570_BAEEB0 /* BAEEB0 80241570 0000102D */ daddu $v0, $zero, $zero .L80241574: diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s index 891e3e7a2a..8c36e03733 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s @@ -98,7 +98,7 @@ glabel func_80241BB4_BAF4F4 .L80241D14: /* BAF654 80241D14 8E430070 */ lw $v1, 0x70($s2) /* BAF658 80241D18 2C620064 */ sltiu $v0, $v1, 0x64 -/* BAF65C 80241D1C 10400048 */ beqz $v0, .L80241E40 +/* BAF65C 80241D1C 10400048 */ beqz $v0, L80241E40_BAF780 /* BAF660 80241D20 00031080 */ sll $v0, $v1, 2 /* BAF664 80241D24 3C018024 */ lui $at, %hi(jtbl_80245300_BB2C40) /* BAF668 80241D28 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80241D48_BAF688 /* BAF68C 80241D4C 0260282D */ daddu $a1, $s3, $zero /* BAF690 80241D50 0C0125AE */ jal func_800496B8 /* BAF694 80241D54 0280302D */ daddu $a2, $s4, $zero -/* BAF698 80241D58 08090790 */ j .L80241E40 +/* BAF698 80241D58 08090790 */ j L80241E40_BAF780 /* BAF69C 80241D5C 00000000 */ nop glabel L80241D60_BAF6A0 /* BAF6A0 80241D60 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80241D70_BAF6B0 /* BAF6B4 80241D74 0260282D */ daddu $a1, $s3, $zero /* BAF6B8 80241D78 0C012701 */ jal func_80049C04 /* BAF6BC 80241D7C 0280302D */ daddu $a2, $s4, $zero -/* BAF6C0 80241D80 08090790 */ j .L80241E40 +/* BAF6C0 80241D80 08090790 */ j L80241E40_BAF780 /* BAF6C4 80241D84 00000000 */ nop glabel L80241D88_BAF6C8 /* BAF6C8 80241D88 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80241D98_BAF6D8 /* BAF6DC 80241D9C 0260282D */ daddu $a1, $s3, $zero /* BAF6E0 80241DA0 0C0127B3 */ jal func_80049ECC /* BAF6E4 80241DA4 0280302D */ daddu $a2, $s4, $zero -/* BAF6E8 80241DA8 08090790 */ j .L80241E40 +/* BAF6E8 80241DA8 08090790 */ j L80241E40_BAF780 /* BAF6EC 80241DAC 00000000 */ nop glabel L80241DB0_BAF6F0 /* BAF6F0 80241DB0 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80241DC0_BAF700 /* BAF704 80241DC4 0260282D */ daddu $a1, $s3, $zero /* BAF708 80241DC8 0C012849 */ jal func_8004A124 /* BAF70C 80241DCC 0280302D */ daddu $a2, $s4, $zero -/* BAF710 80241DD0 08090790 */ j .L80241E40 +/* BAF710 80241DD0 08090790 */ j L80241E40_BAF780 /* BAF714 80241DD4 00000000 */ nop glabel L80241DD8_BAF718 /* BAF718 80241DD8 0240202D */ daddu $a0, $s2, $zero /* BAF71C 80241DDC 0260282D */ daddu $a1, $s3, $zero /* BAF720 80241DE0 0C0128FA */ jal func_8004A3E8 /* BAF724 80241DE4 0280302D */ daddu $a2, $s4, $zero -/* BAF728 80241DE8 08090790 */ j .L80241E40 +/* BAF728 80241DE8 08090790 */ j L80241E40_BAF780 /* BAF72C 80241DEC 00000000 */ nop glabel L80241DF0_BAF730 /* BAF730 80241DF0 0C090566 */ jal mim_08_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80241DF8_BAF738 /* BAF73C 80241DFC 0240202D */ daddu $a0, $s2, $zero /* BAF740 80241E00 8E430070 */ lw $v1, 0x70($s2) /* BAF744 80241E04 24020020 */ addiu $v0, $zero, 0x20 -/* BAF748 80241E08 1462000D */ bne $v1, $v0, .L80241E40 +/* BAF748 80241E08 1462000D */ bne $v1, $v0, L80241E40_BAF780 /* BAF74C 80241E0C 00000000 */ nop glabel L80241E10_BAF750 /* BAF750 80241E10 0C09059D */ jal mim_08_UnkNpcAIFunc8 /* BAF754 80241E14 0240202D */ daddu $a0, $s2, $zero /* BAF758 80241E18 8E430070 */ lw $v1, 0x70($s2) /* BAF75C 80241E1C 24020021 */ addiu $v0, $zero, 0x21 -/* BAF760 80241E20 14620007 */ bne $v1, $v0, .L80241E40 +/* BAF760 80241E20 14620007 */ bne $v1, $v0, L80241E40_BAF780 /* BAF764 80241E24 00000000 */ nop glabel L80241E28_BAF768 /* BAF768 80241E28 0C0905D3 */ jal mim_08_UnkNpcAIFunc5 /* BAF76C 80241E2C 0240202D */ daddu $a0, $s2, $zero -/* BAF770 80241E30 08090790 */ j .L80241E40 +/* BAF770 80241E30 08090790 */ j L80241E40_BAF780 /* BAF774 80241E34 00000000 */ nop glabel L80241E38_BAF778 /* BAF778 80241E38 0C0129CF */ jal func_8004A73C /* BAF77C 80241E3C 0240202D */ daddu $a0, $s2, $zero -.L80241E40: glabel L80241E40_BAF780 /* BAF780 80241E40 8FBF0048 */ lw $ra, 0x48($sp) /* BAF784 80241E44 8FB50044 */ lw $s5, 0x44($sp) 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 b22511efa4..5f6b907ab5 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 @@ -86,7 +86,7 @@ glabel func_80240C90_BB3A90 .L80240DD0: /* BB3BD0 80240DD0 8E630070 */ lw $v1, 0x70($s3) /* BB3BD4 80240DD4 2C62000F */ sltiu $v0, $v1, 0xf -/* BB3BD8 80240DD8 1040002C */ beqz $v0, .L80240E8C +/* BB3BD8 80240DD8 1040002C */ beqz $v0, L80240E8C_BB3C8C /* BB3BDC 80240DDC 00031080 */ sll $v0, $v1, 2 /* BB3BE0 80240DE0 3C018024 */ lui $at, %hi(jtbl_80242B98_BB5998) /* BB3BE4 80240DE4 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L80240E7C_BB3C7C /* BB3C80 80240E80 0280282D */ daddu $a1, $s4, $zero /* BB3C84 80240E84 0C090313 */ jal mim_09_UnkDurationCheck /* BB3C88 80240E88 0200302D */ daddu $a2, $s0, $zero -.L80240E8C: glabel L80240E8C_BB3C8C /* BB3C8C 80240E8C 0000102D */ daddu $v0, $zero, $zero .L80240E90: diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s index c2ce9db2c0..4197d0772c 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s @@ -100,7 +100,7 @@ glabel func_802407F4_9C5BD4 .L80240960: /* 9C5D40 80240960 8E830070 */ lw $v1, 0x70($s4) /* 9C5D44 80240964 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9C5D48 80240968 10400036 */ beqz $v0, .L80240A44 +/* 9C5D48 80240968 10400036 */ beqz $v0, L80240A44_9C5E24 /* 9C5D4C 8024096C 00031080 */ sll $v0, $v1, 2 /* 9C5D50 80240970 3C018025 */ lui $at, %hi(jtbl_80251AA8_9D6E88) /* 9C5D54 80240974 00220821 */ addu $at, $at, $v0 @@ -117,7 +117,7 @@ glabel L80240994_9C5D74 /* 9C5D78 80240998 0260282D */ daddu $a1, $s3, $zero /* 9C5D7C 8024099C 0C09002D */ jal func_802400B4_9C5494 /* 9C5D80 802409A0 02A0302D */ daddu $a2, $s5, $zero -/* 9C5D84 802409A4 08090291 */ j .L80240A44 +/* 9C5D84 802409A4 08090291 */ j L80240A44_9C5E24 /* 9C5D88 802409A8 00000000 */ nop glabel L802409AC_9C5D8C /* 9C5D8C 802409AC 0280202D */ daddu $a0, $s4, $zero @@ -129,7 +129,7 @@ glabel L802409BC_9C5D9C /* 9C5DA0 802409C0 0260282D */ daddu $a1, $s3, $zero /* 9C5DA4 802409C4 0C09008D */ jal nok_01_NpcJumpFunc /* 9C5DA8 802409C8 02A0302D */ daddu $a2, $s5, $zero -/* 9C5DAC 802409CC 08090291 */ j .L80240A44 +/* 9C5DAC 802409CC 08090291 */ j L80240A44_9C5E24 /* 9C5DB0 802409D0 00000000 */ nop glabel L802409D4_9C5DB4 /* 9C5DB4 802409D4 0280202D */ daddu $a0, $s4, $zero @@ -141,14 +141,14 @@ glabel L802409E4_9C5DC4 /* 9C5DC8 802409E8 0260282D */ daddu $a1, $s3, $zero /* 9C5DCC 802409EC 0C0900F7 */ jal nok_01_UnkNpcAIFunc11 /* 9C5DD0 802409F0 02A0302D */ daddu $a2, $s5, $zero -/* 9C5DD4 802409F4 08090291 */ j .L80240A44 +/* 9C5DD4 802409F4 08090291 */ j L80240A44_9C5E24 /* 9C5DD8 802409F8 00000000 */ nop glabel L802409FC_9C5DDC /* 9C5DDC 802409FC 0280202D */ daddu $a0, $s4, $zero /* 9C5DE0 80240A00 0260282D */ daddu $a1, $s3, $zero /* 9C5DE4 80240A04 0C09013E */ jal nok_01_UnkNpcAIFunc10 /* 9C5DE8 80240A08 02A0302D */ daddu $a2, $s5, $zero -/* 9C5DEC 80240A0C 08090291 */ j .L80240A44 +/* 9C5DEC 80240A0C 08090291 */ j L80240A44_9C5E24 /* 9C5DF0 80240A10 00000000 */ nop glabel L80240A14_9C5DF4 /* 9C5DF4 80240A14 0280202D */ daddu $a0, $s4, $zero @@ -160,12 +160,11 @@ glabel L80240A24_9C5E04 /* 9C5E08 80240A28 0260282D */ daddu $a1, $s3, $zero /* 9C5E0C 80240A2C 0C09017B */ jal func_802405EC_9C59CC /* 9C5E10 80240A30 02A0302D */ daddu $a2, $s5, $zero -/* 9C5E14 80240A34 08090291 */ j .L80240A44 +/* 9C5E14 80240A34 08090291 */ j L80240A44_9C5E24 /* 9C5E18 80240A38 00000000 */ nop glabel L80240A3C_9C5E1C /* 9C5E1C 80240A3C 0C0129CF */ jal func_8004A73C /* 9C5E20 80240A40 0280202D */ daddu $a0, $s4, $zero -.L80240A44: glabel L80240A44_9C5E24 /* 9C5E24 80240A44 8FBF0048 */ lw $ra, 0x48($sp) /* 9C5E28 80240A48 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s index c35dd9eacd..96168c9312 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s @@ -122,7 +122,7 @@ glabel func_80241614_9D8634 .L802417D4: /* 9D87F4 802417D4 8E830070 */ lw $v1, 0x70($s4) /* 9D87F8 802417D8 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9D87FC 802417DC 10400042 */ beqz $v0, .L802418E8 +/* 9D87FC 802417DC 10400042 */ beqz $v0, L802418E8_9D8908 /* 9D8800 802417E0 00031080 */ sll $v0, $v1, 2 /* 9D8804 802417E4 3C018025 */ lui $at, %hi(jtbl_80254630_9EB650) /* 9D8808 802417E8 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80241808_9D8828 /* 9D882C 8024180C 0260282D */ daddu $a1, $s3, $zero /* 9D8830 80241810 0C0902F6 */ jal func_80240BD8_9D7BF8 /* 9D8834 80241814 02A0302D */ daddu $a2, $s5, $zero -/* 9D8838 80241818 0809063A */ j .L802418E8 +/* 9D8838 80241818 0809063A */ j L802418E8_9D8908 /* 9D883C 8024181C 00000000 */ nop glabel L80241820_9D8840 /* 9D8840 80241820 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80241830_9D8850 /* 9D8854 80241834 0260282D */ daddu $a1, $s3, $zero /* 9D8858 80241838 0C0903D0 */ jal func_80240F40_9D7F60 /* 9D885C 8024183C 02A0302D */ daddu $a2, $s5, $zero -/* 9D8860 80241840 0809063A */ j .L802418E8 +/* 9D8860 80241840 0809063A */ j L802418E8_9D8908 /* 9D8864 80241844 00000000 */ nop glabel L80241848_9D8868 /* 9D8868 80241848 0280202D */ daddu $a0, $s4, $zero /* 9D886C 8024184C 0260282D */ daddu $a1, $s3, $zero /* 9D8870 80241850 0C09043F */ jal func_802410FC_9D811C /* 9D8874 80241854 02A0302D */ daddu $a2, $s5, $zero -/* 9D8878 80241858 0809063A */ j .L802418E8 +/* 9D8878 80241858 0809063A */ j L802418E8_9D8908 /* 9D887C 8024185C 00000000 */ nop glabel L80241860_9D8880 /* 9D8880 80241860 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80241870_9D8890 /* 9D8894 80241874 0260282D */ daddu $a1, $s3, $zero /* 9D8898 80241878 0C090489 */ jal nok_02_NpcJumpFunc /* 9D889C 8024187C 02A0302D */ daddu $a2, $s5, $zero -/* 9D88A0 80241880 0809063A */ j .L802418E8 +/* 9D88A0 80241880 0809063A */ j L802418E8_9D8908 /* 9D88A4 80241884 00000000 */ nop glabel L80241888_9D88A8 /* 9D88A8 80241888 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80241898_9D88B8 /* 9D88BC 8024189C 0260282D */ daddu $a1, $s3, $zero /* 9D88C0 802418A0 0C0904F3 */ jal func_802413CC_9D83EC /* 9D88C4 802418A4 02A0302D */ daddu $a2, $s5, $zero -/* 9D88C8 802418A8 0809063A */ j .L802418E8 +/* 9D88C8 802418A8 0809063A */ j L802418E8_9D8908 /* 9D88CC 802418AC 00000000 */ nop glabel L802418B0_9D88D0 /* 9D88D0 802418B0 0280202D */ daddu $a0, $s4, $zero /* 9D88D4 802418B4 0260282D */ daddu $a1, $s3, $zero /* 9D88D8 802418B8 0C09053B */ jal nok_02_UnkNpcDurationFlagFunc /* 9D88DC 802418BC 02A0302D */ daddu $a2, $s5, $zero -/* 9D88E0 802418C0 0809063A */ j .L802418E8 +/* 9D88E0 802418C0 0809063A */ j L802418E8_9D8908 /* 9D88E4 802418C4 00000000 */ nop glabel L802418C8_9D88E8 /* 9D88E8 802418C8 0280202D */ daddu $a0, $s4, $zero /* 9D88EC 802418CC 0260282D */ daddu $a1, $s3, $zero /* 9D88F0 802418D0 0C090555 */ jal func_80241554_9D8574 /* 9D88F4 802418D4 02A0302D */ daddu $a2, $s5, $zero -/* 9D88F8 802418D8 0809063A */ j .L802418E8 +/* 9D88F8 802418D8 0809063A */ j L802418E8_9D8908 /* 9D88FC 802418DC 00000000 */ nop glabel L802418E0_9D8900 /* 9D8900 802418E0 0C0129CF */ jal func_8004A73C /* 9D8904 802418E4 0280202D */ daddu $a0, $s4, $zero -.L802418E8: glabel L802418E8_9D8908 /* 9D8908 802418E8 8FBF0060 */ lw $ra, 0x60($sp) /* 9D890C 802418EC 8FB5005C */ lw $s5, 0x5c($sp) 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 1cd09d4a17..9b4874614a 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 @@ -86,7 +86,7 @@ glabel func_80240BF0_9EC3E0 .L80240D30: /* 9EC520 80240D30 8E630070 */ lw $v1, 0x70($s3) /* 9EC524 80240D34 2C62000F */ sltiu $v0, $v1, 0xf -/* 9EC528 80240D38 1040002C */ beqz $v0, .L80240DEC +/* 9EC528 80240D38 1040002C */ beqz $v0, L80240DEC_9EC5DC /* 9EC52C 80240D3C 00031080 */ sll $v0, $v1, 2 /* 9EC530 80240D40 3C018024 */ lui $at, %hi(jtbl_802423B8_9EDBA8) /* 9EC534 80240D44 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L80240DDC_9EC5CC /* 9EC5D0 80240DE0 0280282D */ daddu $a1, $s4, $zero /* 9EC5D4 80240DE4 0C0902EB */ jal nok_03_UnkDurationCheck /* 9EC5D8 80240DE8 0200302D */ daddu $a2, $s0, $zero -.L80240DEC: glabel L80240DEC_9EC5DC /* 9EC5DC 80240DEC 0000102D */ daddu $v0, $zero, $zero .L80240DF0: diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s index 3a2718cdb4..07fec4e099 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s @@ -134,7 +134,7 @@ glabel func_80240394_9F4DD4 /* 9F4FC0 80240580 8E220090 */ lw $v0, 0x90($s1) /* 9F4FC4 80240584 1840000C */ blez $v0, .L802405B8 /* 9F4FC8 80240588 2442FFFF */ addiu $v0, $v0, -1 -/* 9F4FCC 8024058C 14400087 */ bnez $v0, .L802407AC +/* 9F4FCC 8024058C 14400087 */ bnez $v0, L802407AC_9F51EC /* 9F4FD0 80240590 AE220090 */ sw $v0, 0x90($s1) /* 9F4FD4 80240594 3C03FFAA */ lui $v1, 0xffaa /* 9F4FD8 80240598 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240394_9F4DD4 .L802406C0: /* 9F5100 802406C0 AE420028 */ sw $v0, 0x28($s2) /* 9F5104 802406C4 24020007 */ addiu $v0, $zero, 7 -/* 9F5108 802406C8 080901EB */ j .L802407AC +/* 9F5108 802406C8 080901EB */ j L802407AC_9F51EC /* 9F510C 802406CC AE220090 */ sw $v0, 0x90($s1) .L802406D0: /* 9F5110 802406D0 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240394_9F4DD4 /* 9F51A4 80240764 A22000B5 */ sb $zero, 0xb5($s1) .L80240768: /* 9F51A8 80240768 8E22008C */ lw $v0, 0x8c($s1) -/* 9F51AC 8024076C 1040000F */ beqz $v0, .L802407AC +/* 9F51AC 8024076C 1040000F */ beqz $v0, L802407AC_9F51EC /* 9F51B0 80240770 3C03FFAA */ lui $v1, 0xffaa /* 9F51B4 80240774 8E420028 */ lw $v0, 0x28($s2) /* 9F51B8 80240778 3463FFFC */ ori $v1, $v1, 0xfffc /* 9F51BC 8024077C 00431821 */ addu $v1, $v0, $v1 /* 9F51C0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9F51C4 80240784 10400009 */ beqz $v0, .L802407AC +/* 9F51C4 80240784 10400009 */ beqz $v0, L802407AC_9F51EC /* 9F51C8 80240788 00031080 */ sll $v0, $v1, 2 /* 9F51CC 8024078C 3C018024 */ lui $at, %hi(jtbl_80245CF8_9FA738) /* 9F51D0 80240790 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L802407A0_9F51E0 /* 9F51E0 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 9F51E4 802407A4 24420001 */ addiu $v0, $v0, 1 /* 9F51E8 802407A8 AE420028 */ sw $v0, 0x28($s2) -.L802407AC: glabel L802407AC_9F51EC /* 9F51EC 802407AC 0000102D */ daddu $v0, $zero, $zero .L802407B0: 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 8f76feadb6..e770e81f89 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 @@ -64,7 +64,7 @@ glabel func_80241AE0_9F6520 .L80241BC8: /* 9F6608 80241BC8 8E830070 */ lw $v1, 0x70($s4) /* 9F660C 80241BCC 2C62000F */ sltiu $v0, $v1, 0xf -/* 9F6610 80241BD0 10400034 */ beqz $v0, .L80241CA4 +/* 9F6610 80241BD0 10400034 */ beqz $v0, L80241CA4_9F66E4 /* 9F6614 80241BD4 00031080 */ sll $v0, $v1, 2 /* 9F6618 80241BD8 3C018024 */ lui $at, %hi(jtbl_80245D68_9FA7A8) /* 9F661C 80241BDC 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241C94_9F66D4 /* 9F66D8 80241C98 0200282D */ daddu $a1, $s0, $zero /* 9F66DC 80241C9C 0C09058B */ jal func_8024162C_9F606C /* 9F66E0 80241CA0 0260302D */ daddu $a2, $s3, $zero -.L80241CA4: glabel L80241CA4_9F66E4 /* 9F66E4 80241CA4 0000102D */ daddu $v0, $zero, $zero .L80241CA8: diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s index 5a66219b4a..8a766ce406 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s @@ -134,7 +134,7 @@ glabel func_80240904_9FB0F4 /* 9FB2E0 80240AF0 8E220090 */ lw $v0, 0x90($s1) /* 9FB2E4 80240AF4 1840000C */ blez $v0, .L80240B28 /* 9FB2E8 80240AF8 2442FFFF */ addiu $v0, $v0, -1 -/* 9FB2EC 80240AFC 14400087 */ bnez $v0, .L80240D1C +/* 9FB2EC 80240AFC 14400087 */ bnez $v0, L80240D1C_9FB50C /* 9FB2F0 80240B00 AE220090 */ sw $v0, 0x90($s1) /* 9FB2F4 80240B04 3C03FFAA */ lui $v1, 0xffaa /* 9FB2F8 80240B08 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240904_9FB0F4 .L80240C30: /* 9FB420 80240C30 AE420028 */ sw $v0, 0x28($s2) /* 9FB424 80240C34 24020007 */ addiu $v0, $zero, 7 -/* 9FB428 80240C38 08090347 */ j .L80240D1C +/* 9FB428 80240C38 08090347 */ j L80240D1C_9FB50C /* 9FB42C 80240C3C AE220090 */ sw $v0, 0x90($s1) .L80240C40: /* 9FB430 80240C40 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240904_9FB0F4 /* 9FB4C4 80240CD4 A22000B5 */ sb $zero, 0xb5($s1) .L80240CD8: /* 9FB4C8 80240CD8 8E22008C */ lw $v0, 0x8c($s1) -/* 9FB4CC 80240CDC 1040000F */ beqz $v0, .L80240D1C +/* 9FB4CC 80240CDC 1040000F */ beqz $v0, L80240D1C_9FB50C /* 9FB4D0 80240CE0 3C03FFAA */ lui $v1, 0xffaa /* 9FB4D4 80240CE4 8E420028 */ lw $v0, 0x28($s2) /* 9FB4D8 80240CE8 3463FFFC */ ori $v1, $v1, 0xfffc /* 9FB4DC 80240CEC 00431821 */ addu $v1, $v0, $v1 /* 9FB4E0 80240CF0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9FB4E4 80240CF4 10400009 */ beqz $v0, .L80240D1C +/* 9FB4E4 80240CF4 10400009 */ beqz $v0, L80240D1C_9FB50C /* 9FB4E8 80240CF8 00031080 */ sll $v0, $v1, 2 /* 9FB4EC 80240CFC 3C018024 */ lui $at, %hi(jtbl_80245A78_A00268) /* 9FB4F0 80240D00 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240D10_9FB500 /* 9FB500 80240D10 8E420028 */ lw $v0, 0x28($s2) /* 9FB504 80240D14 24420001 */ addiu $v0, $v0, 1 /* 9FB508 80240D18 AE420028 */ sw $v0, 0x28($s2) -.L80240D1C: glabel L80240D1C_9FB50C /* 9FB50C 80240D1C 0000102D */ daddu $v0, $zero, $zero .L80240D20: diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s index bb7d6a084f..14d4684f71 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s @@ -122,7 +122,7 @@ glabel func_802418D8_9FC0C8 .L80241A98: /* 9FC288 80241A98 8E830070 */ lw $v1, 0x70($s4) /* 9FC28C 80241A9C 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9FC290 80241AA0 10400042 */ beqz $v0, .L80241BAC +/* 9FC290 80241AA0 10400042 */ beqz $v0, L80241BAC_9FC39C /* 9FC294 80241AA4 00031080 */ sll $v0, $v1, 2 /* 9FC298 80241AA8 3C018024 */ lui $at, %hi(jtbl_80245AE0_A002D0) /* 9FC29C 80241AAC 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80241ACC_9FC2BC /* 9FC2C0 80241AD0 0260282D */ daddu $a1, $s3, $zero /* 9FC2C4 80241AD4 0C0903A7 */ jal func_80240E9C_9FB68C /* 9FC2C8 80241AD8 02A0302D */ daddu $a2, $s5, $zero -/* 9FC2CC 80241ADC 080906EB */ j .L80241BAC +/* 9FC2CC 80241ADC 080906EB */ j L80241BAC_9FC39C /* 9FC2D0 80241AE0 00000000 */ nop glabel L80241AE4_9FC2D4 /* 9FC2D4 80241AE4 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80241AF4_9FC2E4 /* 9FC2E8 80241AF8 0260282D */ daddu $a1, $s3, $zero /* 9FC2EC 80241AFC 0C090481 */ jal func_80241204_9FB9F4 /* 9FC2F0 80241B00 02A0302D */ daddu $a2, $s5, $zero -/* 9FC2F4 80241B04 080906EB */ j .L80241BAC +/* 9FC2F4 80241B04 080906EB */ j L80241BAC_9FC39C /* 9FC2F8 80241B08 00000000 */ nop glabel L80241B0C_9FC2FC /* 9FC2FC 80241B0C 0280202D */ daddu $a0, $s4, $zero /* 9FC300 80241B10 0260282D */ daddu $a1, $s3, $zero /* 9FC304 80241B14 0C0904F0 */ jal func_802413C0_9FBBB0 /* 9FC308 80241B18 02A0302D */ daddu $a2, $s5, $zero -/* 9FC30C 80241B1C 080906EB */ j .L80241BAC +/* 9FC30C 80241B1C 080906EB */ j L80241BAC_9FC39C /* 9FC310 80241B20 00000000 */ nop glabel L80241B24_9FC314 /* 9FC314 80241B24 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80241B34_9FC324 /* 9FC328 80241B38 0260282D */ daddu $a1, $s3, $zero /* 9FC32C 80241B3C 0C09053A */ jal nok_12_NpcJumpFunc /* 9FC330 80241B40 02A0302D */ daddu $a2, $s5, $zero -/* 9FC334 80241B44 080906EB */ j .L80241BAC +/* 9FC334 80241B44 080906EB */ j L80241BAC_9FC39C /* 9FC338 80241B48 00000000 */ nop glabel L80241B4C_9FC33C /* 9FC33C 80241B4C 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80241B5C_9FC34C /* 9FC350 80241B60 0260282D */ daddu $a1, $s3, $zero /* 9FC354 80241B64 0C0905A4 */ jal func_80241690_9FBE80 /* 9FC358 80241B68 02A0302D */ daddu $a2, $s5, $zero -/* 9FC35C 80241B6C 080906EB */ j .L80241BAC +/* 9FC35C 80241B6C 080906EB */ j L80241BAC_9FC39C /* 9FC360 80241B70 00000000 */ nop glabel L80241B74_9FC364 /* 9FC364 80241B74 0280202D */ daddu $a0, $s4, $zero /* 9FC368 80241B78 0260282D */ daddu $a1, $s3, $zero /* 9FC36C 80241B7C 0C0905EC */ jal nok_12_UnkNpcDurationFlagFunc /* 9FC370 80241B80 02A0302D */ daddu $a2, $s5, $zero -/* 9FC374 80241B84 080906EB */ j .L80241BAC +/* 9FC374 80241B84 080906EB */ j L80241BAC_9FC39C /* 9FC378 80241B88 00000000 */ nop glabel L80241B8C_9FC37C /* 9FC37C 80241B8C 0280202D */ daddu $a0, $s4, $zero /* 9FC380 80241B90 0260282D */ daddu $a1, $s3, $zero /* 9FC384 80241B94 0C090606 */ jal func_80241818_9FC008 /* 9FC388 80241B98 02A0302D */ daddu $a2, $s5, $zero -/* 9FC38C 80241B9C 080906EB */ j .L80241BAC +/* 9FC38C 80241B9C 080906EB */ j L80241BAC_9FC39C /* 9FC390 80241BA0 00000000 */ nop glabel L80241BA4_9FC394 /* 9FC394 80241BA4 0C0129CF */ jal func_8004A73C /* 9FC398 80241BA8 0280202D */ daddu $a0, $s4, $zero -.L80241BAC: glabel L80241BAC_9FC39C /* 9FC39C 80241BAC 8FBF0060 */ lw $ra, 0x60($sp) /* 9FC3A0 80241BB0 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s index 35a1590b2e..dced198119 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s @@ -132,7 +132,7 @@ glabel func_80241BD4_9FC3C4 .L80241DBC: /* 9FC5AC 80241DBC 8E630070 */ lw $v1, 0x70($s3) /* 9FC5B0 80241DC0 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9FC5B4 80241DC4 1040003A */ beqz $v0, .L80241EB0 +/* 9FC5B4 80241DC4 1040003A */ beqz $v0, L80241EB0_9FC6A0 /* 9FC5B8 80241DC8 00031080 */ sll $v0, $v1, 2 /* 9FC5BC 80241DCC 3C018024 */ lui $at, %hi(jtbl_80245C70_A00460) /* 9FC5C0 80241DD0 00220821 */ addu $at, $at, $v0 @@ -151,7 +151,7 @@ glabel L80241DF8_9FC5E8 /* 9FC5EC 80241DFC 0280282D */ daddu $a1, $s4, $zero /* 9FC5F0 80241E00 0C0903A7 */ jal func_80240E9C_9FB68C /* 9FC5F4 80241E04 02A0302D */ daddu $a2, $s5, $zero -/* 9FC5F8 80241E08 080907AC */ j .L80241EB0 +/* 9FC5F8 80241E08 080907AC */ j L80241EB0_9FC6A0 /* 9FC5FC 80241E0C 00000000 */ nop glabel L80241E10_9FC600 /* 9FC600 80241E10 0260202D */ daddu $a0, $s3, $zero @@ -163,14 +163,14 @@ glabel L80241E20_9FC610 /* 9FC614 80241E24 0280282D */ daddu $a1, $s4, $zero /* 9FC618 80241E28 0C090481 */ jal func_80241204_9FB9F4 /* 9FC61C 80241E2C 02A0302D */ daddu $a2, $s5, $zero -/* 9FC620 80241E30 080907AC */ j .L80241EB0 +/* 9FC620 80241E30 080907AC */ j L80241EB0_9FC6A0 /* 9FC624 80241E34 00000000 */ nop glabel L80241E38_9FC628 /* 9FC628 80241E38 0260202D */ daddu $a0, $s3, $zero /* 9FC62C 80241E3C 0280282D */ daddu $a1, $s4, $zero /* 9FC630 80241E40 0C0904F0 */ jal func_802413C0_9FBBB0 /* 9FC634 80241E44 02A0302D */ daddu $a2, $s5, $zero -/* 9FC638 80241E48 080907AC */ j .L80241EB0 +/* 9FC638 80241E48 080907AC */ j L80241EB0_9FC6A0 /* 9FC63C 80241E4C 00000000 */ nop glabel L80241E50_9FC640 /* 9FC640 80241E50 0260202D */ daddu $a0, $s3, $zero @@ -182,26 +182,25 @@ glabel L80241E60_9FC650 /* 9FC654 80241E64 0280282D */ daddu $a1, $s4, $zero /* 9FC658 80241E68 0C09017B */ jal func_802405EC_9FADDC /* 9FC65C 80241E6C 02A0302D */ daddu $a2, $s5, $zero -/* 9FC660 80241E70 080907AC */ j .L80241EB0 +/* 9FC660 80241E70 080907AC */ j L80241EB0_9FC6A0 /* 9FC664 80241E74 00000000 */ nop glabel L80241E78_9FC668 /* 9FC668 80241E78 0260202D */ daddu $a0, $s3, $zero /* 9FC66C 80241E7C 0280282D */ daddu $a1, $s4, $zero /* 9FC670 80241E80 0C0901C8 */ jal nok_12_UnkNpcAIFunc12 /* 9FC674 80241E84 02A0302D */ daddu $a2, $s5, $zero -/* 9FC678 80241E88 080907AC */ j .L80241EB0 +/* 9FC678 80241E88 080907AC */ j L80241EB0_9FC6A0 /* 9FC67C 80241E8C 00000000 */ nop glabel L80241E90_9FC680 /* 9FC680 80241E90 0260202D */ daddu $a0, $s3, $zero /* 9FC684 80241E94 0280282D */ daddu $a1, $s4, $zero /* 9FC688 80241E98 0C090221 */ jal nok_12_set_script_owner_npc_col_height /* 9FC68C 80241E9C 02A0302D */ daddu $a2, $s5, $zero -/* 9FC690 80241EA0 080907AC */ j .L80241EB0 +/* 9FC690 80241EA0 080907AC */ j L80241EB0_9FC6A0 /* 9FC694 80241EA4 00000000 */ nop glabel L80241EA8_9FC698 /* 9FC698 80241EA8 0C0129CF */ jal func_8004A73C /* 9FC69C 80241EAC 0260202D */ daddu $a0, $s3, $zero -.L80241EB0: glabel L80241EB0_9FC6A0 /* 9FC6A0 80241EB0 8FBF0068 */ lw $ra, 0x68($sp) /* 9FC6A4 80241EB4 8FB50064 */ lw $s5, 0x64($sp) 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 512229db06..93d4d1ba18 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 @@ -86,7 +86,7 @@ glabel func_80240BF0_A011F0 .L80240D30: /* A01330 80240D30 8E630070 */ lw $v1, 0x70($s3) /* A01334 80240D34 2C62000F */ sltiu $v0, $v1, 0xf -/* A01338 80240D38 1040002C */ beqz $v0, .L80240DEC +/* A01338 80240D38 1040002C */ beqz $v0, L80240DEC_A013EC /* A0133C 80240D3C 00031080 */ sll $v0, $v1, 2 /* A01340 80240D40 3C018024 */ lui $at, %hi(jtbl_802421D8_A027D8) /* A01344 80240D44 00220821 */ addu $at, $at, $v0 @@ -138,7 +138,6 @@ glabel L80240DDC_A013DC /* A013E0 80240DE0 0280282D */ daddu $a1, $s4, $zero /* A013E4 80240DE4 0C0902EB */ jal nok_13_UnkDurationCheck /* A013E8 80240DE8 0200302D */ daddu $a2, $s0, $zero -.L80240DEC: glabel L80240DEC_A013EC /* A013EC 80240DEC 0000102D */ daddu $v0, $zero, $zero .L80240DF0: diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s index a20554c9e2..16291d1495 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s @@ -134,7 +134,7 @@ glabel func_80240554_A02D94 /* A02F80 80240740 8E220090 */ lw $v0, 0x90($s1) /* A02F84 80240744 1840000C */ blez $v0, .L80240778 /* A02F88 80240748 2442FFFF */ addiu $v0, $v0, -1 -/* A02F8C 8024074C 14400087 */ bnez $v0, .L8024096C +/* A02F8C 8024074C 14400087 */ bnez $v0, L8024096C_A031AC /* A02F90 80240750 AE220090 */ sw $v0, 0x90($s1) /* A02F94 80240754 3C03FFAA */ lui $v1, 0xffaa /* A02F98 80240758 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240554_A02D94 .L80240880: /* A030C0 80240880 AE420028 */ sw $v0, 0x28($s2) /* A030C4 80240884 24020007 */ addiu $v0, $zero, 7 -/* A030C8 80240888 0809025B */ j .L8024096C +/* A030C8 80240888 0809025B */ j L8024096C_A031AC /* A030CC 8024088C AE220090 */ sw $v0, 0x90($s1) .L80240890: /* A030D0 80240890 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240554_A02D94 /* A03164 80240924 A22000B5 */ sb $zero, 0xb5($s1) .L80240928: /* A03168 80240928 8E22008C */ lw $v0, 0x8c($s1) -/* A0316C 8024092C 1040000F */ beqz $v0, .L8024096C +/* A0316C 8024092C 1040000F */ beqz $v0, L8024096C_A031AC /* A03170 80240930 3C03FFAA */ lui $v1, 0xffaa /* A03174 80240934 8E420028 */ lw $v0, 0x28($s2) /* A03178 80240938 3463FFFC */ ori $v1, $v1, 0xfffc /* A0317C 8024093C 00431821 */ addu $v1, $v0, $v1 /* A03180 80240940 2C620015 */ sltiu $v0, $v1, 0x15 -/* A03184 80240944 10400009 */ beqz $v0, .L8024096C +/* A03184 80240944 10400009 */ beqz $v0, L8024096C_A031AC /* A03188 80240948 00031080 */ sll $v0, $v1, 2 /* A0318C 8024094C 3C018024 */ lui $at, %hi(jtbl_802445C8_A06E08) /* A03190 80240950 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240960_A031A0 /* A031A0 80240960 8E420028 */ lw $v0, 0x28($s2) /* A031A4 80240964 24420001 */ addiu $v0, $v0, 1 /* A031A8 80240968 AE420028 */ sw $v0, 0x28($s2) -.L8024096C: glabel L8024096C_A031AC /* A031AC 8024096C 0000102D */ daddu $v0, $zero, $zero .L80240970: 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 62e572daeb..f33874f7c0 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 @@ -64,7 +64,7 @@ glabel func_80241CA0_A044E0 .L80241D88: /* A045C8 80241D88 8E830070 */ lw $v1, 0x70($s4) /* A045CC 80241D8C 2C62000F */ sltiu $v0, $v1, 0xf -/* A045D0 80241D90 10400034 */ beqz $v0, .L80241E64 +/* A045D0 80241D90 10400034 */ beqz $v0, L80241E64_A046A4 /* A045D4 80241D94 00031080 */ sll $v0, $v1, 2 /* A045D8 80241D98 3C018024 */ lui $at, %hi(jtbl_80244638_A06E78) /* A045DC 80241D9C 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241E54_A04694 /* A04698 80241E58 0200282D */ daddu $a1, $s0, $zero /* A0469C 80241E5C 0C0905FB */ jal func_802417EC_A0402C /* A046A0 80241E60 0260302D */ daddu $a2, $s3, $zero -.L80241E64: glabel L80241E64_A046A4 /* A046A4 80241E64 0000102D */ daddu $v0, $zero, $zero .L80241E68: 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 2f4d487e60..a1d8a3fced 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 @@ -67,7 +67,7 @@ glabel func_802421CC_A04A0C .L802422C0: /* A04B00 802422C0 8E630070 */ lw $v1, 0x70($s3) /* A04B04 802422C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* A04B08 802422C8 1040004A */ beqz $v0, .L802423F4 +/* A04B08 802422C8 1040004A */ beqz $v0, L802423F4_A04C34 /* A04B0C 802422CC 00031080 */ sll $v0, $v1, 2 /* A04B10 802422D0 3C018024 */ lui $at, %hi(jtbl_80244678_A06EB8) /* A04B14 802422D4 00220821 */ addu $at, $at, $v0 @@ -152,7 +152,6 @@ glabel L802423E4_A04C24 /* A04C28 802423E8 0200282D */ daddu $a1, $s0, $zero /* A04C2C 802423EC 0C090862 */ jal nok_14_UnkDurationCheck /* A04C30 802423F0 0280302D */ daddu $a2, $s4, $zero -.L802423F4: glabel L802423F4_A04C34 /* A04C34 802423F4 0000102D */ daddu $v0, $zero, $zero .L802423F8: diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s index 929d74f4d3..ef2e6e84ef 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s @@ -134,7 +134,7 @@ glabel func_80240674_A07574 /* A07760 80240860 8E220090 */ lw $v0, 0x90($s1) /* A07764 80240864 1840000C */ blez $v0, .L80240898 /* A07768 80240868 2442FFFF */ addiu $v0, $v0, -1 -/* A0776C 8024086C 14400087 */ bnez $v0, .L80240A8C +/* A0776C 8024086C 14400087 */ bnez $v0, L80240A8C_A0798C /* A07770 80240870 AE220090 */ sw $v0, 0x90($s1) /* A07774 80240874 3C03FFAA */ lui $v1, 0xffaa /* A07778 80240878 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240674_A07574 .L802409A0: /* A078A0 802409A0 AE420028 */ sw $v0, 0x28($s2) /* A078A4 802409A4 24020007 */ addiu $v0, $zero, 7 -/* A078A8 802409A8 080902A3 */ j .L80240A8C +/* A078A8 802409A8 080902A3 */ j L80240A8C_A0798C /* A078AC 802409AC AE220090 */ sw $v0, 0x90($s1) .L802409B0: /* A078B0 802409B0 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240674_A07574 /* A07944 80240A44 A22000B5 */ sb $zero, 0xb5($s1) .L80240A48: /* A07948 80240A48 8E22008C */ lw $v0, 0x8c($s1) -/* A0794C 80240A4C 1040000F */ beqz $v0, .L80240A8C +/* A0794C 80240A4C 1040000F */ beqz $v0, L80240A8C_A0798C /* A07950 80240A50 3C03FFAA */ lui $v1, 0xffaa /* A07954 80240A54 8E420028 */ lw $v0, 0x28($s2) /* A07958 80240A58 3463FFFC */ ori $v1, $v1, 0xfffc /* A0795C 80240A5C 00431821 */ addu $v1, $v0, $v1 /* A07960 80240A60 2C620015 */ sltiu $v0, $v1, 0x15 -/* A07964 80240A64 10400009 */ beqz $v0, .L80240A8C +/* A07964 80240A64 10400009 */ beqz $v0, L80240A8C_A0798C /* A07968 80240A68 00031080 */ sll $v0, $v1, 2 /* A0796C 80240A6C 3C018024 */ lui $at, %hi(jtbl_80244CF8_A0BBF8) /* A07970 80240A70 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240A80_A07980 /* A07980 80240A80 8E420028 */ lw $v0, 0x28($s2) /* A07984 80240A84 24420001 */ addiu $v0, $v0, 1 /* A07988 80240A88 AE420028 */ sw $v0, 0x28($s2) -.L80240A8C: glabel L80240A8C_A0798C /* A0798C 80240A8C 0000102D */ daddu $v0, $zero, $zero .L80240A90: 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 54b937eb6f..b26843fe11 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 @@ -64,7 +64,7 @@ glabel func_80241DC0_A08CC0 .L80241EA8: /* A08DA8 80241EA8 8E830070 */ lw $v1, 0x70($s4) /* A08DAC 80241EAC 2C62000F */ sltiu $v0, $v1, 0xf -/* A08DB0 80241EB0 10400034 */ beqz $v0, .L80241F84 +/* A08DB0 80241EB0 10400034 */ beqz $v0, L80241F84_A08E84 /* A08DB4 80241EB4 00031080 */ sll $v0, $v1, 2 /* A08DB8 80241EB8 3C018024 */ lui $at, %hi(jtbl_80244D68_A0BC68) /* A08DBC 80241EBC 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241F74_A08E74 /* A08E78 80241F78 0200282D */ daddu $a1, $s0, $zero /* A08E7C 80241F7C 0C090643 */ jal func_8024190C_A0880C /* A08E80 80241F80 0260302D */ daddu $a2, $s3, $zero -.L80241F84: glabel L80241F84_A08E84 /* A08E84 80241F84 0000102D */ daddu $v0, $zero, $zero .L80241F88: 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 f42562398f..b8f557ae80 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 @@ -67,7 +67,7 @@ glabel func_802422EC_A091EC .L802423E0: /* A092E0 802423E0 8E630070 */ lw $v1, 0x70($s3) /* A092E4 802423E4 2C620010 */ sltiu $v0, $v1, 0x10 -/* A092E8 802423E8 1040004A */ beqz $v0, .L80242514 +/* A092E8 802423E8 1040004A */ beqz $v0, L80242514_A09414 /* A092EC 802423EC 00031080 */ sll $v0, $v1, 2 /* A092F0 802423F0 3C018024 */ lui $at, %hi(jtbl_80244DA8_A0BCA8) /* A092F4 802423F4 00220821 */ addu $at, $at, $v0 @@ -152,7 +152,6 @@ glabel L80242504_A09404 /* A09408 80242508 0200282D */ daddu $a1, $s0, $zero /* A0940C 8024250C 0C0908AA */ jal nok_15_UnkDurationCheck /* A09410 80242510 0280302D */ daddu $a2, $s4, $zero -.L80242514: glabel L80242514_A09414 /* A09414 80242514 0000102D */ daddu $v0, $zero, $zero .L80242518: diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s index 808e1f2d48..d492cfcd97 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s @@ -75,7 +75,7 @@ glabel func_80240098_BBD238 .L802401A8: /* BBD348 802401A8 8E830070 */ lw $v1, 0x70($s4) /* BBD34C 802401AC 2C62000C */ sltiu $v0, $v1, 0xc -/* BBD350 802401B0 10400076 */ beqz $v0, .L8024038C +/* BBD350 802401B0 10400076 */ beqz $v0, L8024038C_BBD52C /* BBD354 802401B4 00031080 */ sll $v0, $v1, 2 /* BBD358 802401B8 3C018024 */ lui $at, %hi(jtbl_802458C0_BC2A60) /* BBD35C 802401BC 00220821 */ addu $at, $at, $v0 @@ -85,7 +85,7 @@ glabel func_80240098_BBD238 glabel L802401CC_BBD36C /* BBD36C 802401CC 8E220008 */ lw $v0, 8($s1) /* BBD370 802401D0 8C420004 */ lw $v0, 4($v0) -/* BBD374 802401D4 1040006D */ beqz $v0, .L8024038C +/* BBD374 802401D4 1040006D */ beqz $v0, L8024038C_BBD52C /* BBD378 802401D8 24020023 */ addiu $v0, $zero, 0x23 /* BBD37C 802401DC AE220004 */ sw $v0, 4($s1) /* BBD380 802401E0 24020001 */ addiu $v0, $zero, 1 @@ -101,16 +101,16 @@ glabel L802401CC_BBD36C /* BBD3A8 80240208 E6200018 */ swc1 $f0, 0x18($s1) /* BBD3AC 8024020C E622000C */ swc1 $f2, 0xc($s1) /* BBD3B0 80240210 AE230000 */ sw $v1, ($s1) -/* BBD3B4 80240214 080900E3 */ j .L8024038C +/* BBD3B4 80240214 080900E3 */ j L8024038C_BBD52C /* BBD3B8 80240218 AE820070 */ sw $v0, 0x70($s4) glabel L8024021C_BBD3BC /* BBD3BC 8024021C 8E220004 */ lw $v0, 4($s1) /* BBD3C0 80240220 2403FFFF */ addiu $v1, $zero, -1 /* BBD3C4 80240224 2442FFFF */ addiu $v0, $v0, -1 -/* BBD3C8 80240228 14430058 */ bne $v0, $v1, .L8024038C +/* BBD3C8 80240228 14430058 */ bne $v0, $v1, L8024038C_BBD52C /* BBD3CC 8024022C AE220004 */ sw $v0, 4($s1) /* BBD3D0 80240230 24020002 */ addiu $v0, $zero, 2 -/* BBD3D4 80240234 080900E3 */ j .L8024038C +/* BBD3D4 80240234 080900E3 */ j L8024038C_BBD52C /* BBD3D8 80240238 AE820070 */ sw $v0, 0x70($s4) glabel L8024023C_BBD3DC /* BBD3DC 8024023C C6200010 */ lwc1 $f0, 0x10($s1) @@ -124,11 +124,11 @@ glabel L8024023C_BBD3DC /* BBD3FC 8024025C 00000000 */ nop /* BBD400 80240260 4602003C */ c.lt.s $f0, $f2 /* BBD404 80240264 00000000 */ nop -/* BBD408 80240268 45000048 */ bc1f .L8024038C +/* BBD408 80240268 45000048 */ bc1f L8024038C_BBD52C /* BBD40C 8024026C E6200010 */ swc1 $f0, 0x10($s1) /* BBD410 80240270 24020003 */ addiu $v0, $zero, 3 /* BBD414 80240274 E6220010 */ swc1 $f2, 0x10($s1) -/* BBD418 80240278 080900E3 */ j .L8024038C +/* BBD418 80240278 080900E3 */ j L8024038C_BBD52C /* BBD41C 8024027C AE820070 */ sw $v0, 0x70($s4) glabel L80240280_BBD420 /* BBD420 80240280 C6200018 */ lwc1 $f0, 0x18($s1) @@ -141,7 +141,7 @@ glabel L80240280_BBD420 /* BBD43C 8024029C 00000000 */ nop /* BBD440 802402A0 4602003C */ c.lt.s $f0, $f2 /* BBD444 802402A4 00000000 */ nop -/* BBD448 802402A8 45000038 */ bc1f .L8024038C +/* BBD448 802402A8 45000038 */ bc1f L8024038C_BBD52C /* BBD44C 802402AC E6200018 */ swc1 $f0, 0x18($s1) /* BBD450 802402B0 24020004 */ addiu $v0, $zero, 4 /* BBD454 802402B4 E6220018 */ swc1 $f2, 0x18($s1) @@ -150,16 +150,16 @@ glabel L80240280_BBD420 /* BBD460 802402C0 2403FFFE */ addiu $v1, $zero, -2 /* BBD464 802402C4 00431024 */ and $v0, $v0, $v1 /* BBD468 802402C8 34420004 */ ori $v0, $v0, 4 -/* BBD46C 802402CC 080900E3 */ j .L8024038C +/* BBD46C 802402CC 080900E3 */ j L8024038C_BBD52C /* BBD470 802402D0 AE220000 */ sw $v0, ($s1) glabel L802402D4_BBD474 /* BBD474 802402D4 8E220004 */ lw $v0, 4($s1) /* BBD478 802402D8 2403FFFF */ addiu $v1, $zero, -1 /* BBD47C 802402DC 2442FFFF */ addiu $v0, $v0, -1 -/* BBD480 802402E0 1443002A */ bne $v0, $v1, .L8024038C +/* BBD480 802402E0 1443002A */ bne $v0, $v1, L8024038C_BBD52C /* BBD484 802402E4 AE220004 */ sw $v0, 4($s1) /* BBD488 802402E8 2402000B */ addiu $v0, $zero, 0xb -/* BBD48C 802402EC 080900E3 */ j .L8024038C +/* BBD48C 802402EC 080900E3 */ j L8024038C_BBD52C /* BBD490 802402F0 AE820070 */ sw $v0, 0x70($s4) glabel L802402F4_BBD494 /* BBD494 802402F4 0000202D */ daddu $a0, $zero, $zero @@ -197,12 +197,11 @@ glabel L802402F4_BBD494 /* BBD510 80240370 AE220000 */ sw $v0, ($s1) .L80240374: /* BBD514 80240374 24020002 */ addiu $v0, $zero, 2 -/* BBD518 80240378 14820004 */ bne $a0, $v0, .L8024038C +/* BBD518 80240378 14820004 */ bne $a0, $v0, L8024038C_BBD52C /* BBD51C 8024037C 00000000 */ nop /* BBD520 80240380 8E220008 */ lw $v0, 8($s1) /* BBD524 80240384 AC400004 */ sw $zero, 4($v0) /* BBD528 80240388 AE800070 */ sw $zero, 0x70($s4) -.L8024038C: glabel L8024038C_BBD52C /* BBD52C 8024038C 8E220000 */ lw $v0, ($s1) /* BBD530 80240390 30420001 */ andi $v0, $v0, 1 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s index c08ad7f518..56fd29b371 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s @@ -14,7 +14,7 @@ glabel func_80240AF0_BD4360 /* BD4384 80240B14 8E230074 */ lw $v1, 0x74($s1) /* BD4388 80240B18 8E120020 */ lw $s2, 0x20($s0) /* BD438C 80240B1C 2C62000E */ sltiu $v0, $v1, 0xe -/* BD4390 80240B20 10400058 */ beqz $v0, .L80240C84 +/* BD4390 80240B20 10400058 */ beqz $v0, L80240C84_BD44F4 /* BD4394 80240B24 00031080 */ sll $v0, $v1, 2 /* BD4398 80240B28 3C018024 */ lui $at, %hi(jtbl_80246EC8_BDA738) /* BD439C 80240B2C 00220821 */ addu $at, $at, $v0 @@ -28,7 +28,7 @@ glabel L80240B3C_BD43AC /* BD43B8 80240B48 34A58888 */ ori $a1, $a1, 0x8888 /* BD43BC 80240B4C 0040182D */ daddu $v1, $v0, $zero /* BD43C0 80240B50 24020001 */ addiu $v0, $zero, 1 -/* BD43C4 80240B54 1462004B */ bne $v1, $v0, .L80240C84 +/* BD43C4 80240B54 1462004B */ bne $v1, $v0, L80240C84_BD44F4 /* BD43C8 80240B58 2402000A */ addiu $v0, $zero, 0xa /* BD43CC 80240B5C 08090320 */ j .L80240C80 /* BD43D0 80240B60 AE430000 */ sw $v1, ($s2) @@ -43,9 +43,9 @@ glabel L80240B64_BD43D4 /* BD43F0 80240B80 2442FFFF */ addiu $v0, $v0, -1 /* BD43F4 80240B84 A602008E */ sh $v0, 0x8e($s0) /* BD43F8 80240B88 00021400 */ sll $v0, $v0, 0x10 -/* BD43FC 80240B8C 1440003D */ bnez $v0, .L80240C84 +/* BD43FC 80240B8C 1440003D */ bnez $v0, L80240C84_BD44F4 /* BD4400 80240B90 2402000B */ addiu $v0, $zero, 0xb -/* BD4404 80240B94 08090321 */ j .L80240C84 +/* BD4404 80240B94 08090321 */ j L80240C84_BD44F4 /* BD4408 80240B98 AE220074 */ sw $v0, 0x74($s1) glabel L80240B9C_BD440C /* BD440C 80240B9C C602003C */ lwc1 $f2, 0x3c($s0) @@ -74,7 +74,7 @@ glabel L80240B9C_BD440C /* BD4464 80240BF4 E600000C */ swc1 $f0, 0xc($s0) /* BD4468 80240BF8 4602203E */ c.le.s $f4, $f2 /* BD446C 80240BFC 00000000 */ nop -/* BD4470 80240C00 45000020 */ bc1f .L80240C84 +/* BD4470 80240C00 45000020 */ bc1f L80240C84_BD44F4 /* BD4474 80240C04 E604003C */ swc1 $f4, 0x3c($s0) /* BD4478 80240C08 0220202D */ daddu $a0, $s1, $zero /* BD447C 80240C0C 3C05FD05 */ lui $a1, 0xfd05 @@ -100,18 +100,17 @@ glabel L80240C2C_BD449C /* BD44C4 80240C54 44816000 */ mtc1 $at, $f12 /* BD44C8 80240C58 0C00A6C9 */ jal clamp_angle /* BD44CC 80240C5C 460C0300 */ add.s $f12, $f0, $f12 -/* BD44D0 80240C60 08090321 */ j .L80240C84 +/* BD44D0 80240C60 08090321 */ j L80240C84_BD44F4 /* BD44D4 80240C64 E600000C */ swc1 $f0, 0xc($s0) glabel L80240C68_BD44D8 /* BD44D8 80240C68 0220202D */ daddu $a0, $s1, $zero /* BD44DC 80240C6C 3C05FD05 */ lui $a1, 0xfd05 /* BD44E0 80240C70 0C0B1EAF */ jal get_variable /* BD44E4 80240C74 34A50F82 */ ori $a1, $a1, 0xf82 -/* BD44E8 80240C78 14400002 */ bnez $v0, .L80240C84 +/* BD44E8 80240C78 14400002 */ bnez $v0, L80240C84_BD44F4 /* BD44EC 80240C7C 2402000C */ addiu $v0, $zero, 0xc .L80240C80: /* BD44F0 80240C80 AE220074 */ sw $v0, 0x74($s1) -.L80240C84: glabel L80240C84_BD44F4 /* BD44F4 80240C84 8FBF001C */ lw $ra, 0x1c($sp) /* BD44F8 80240C88 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s index b7c78e5fc5..9471db1246 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s @@ -17,7 +17,7 @@ glabel func_80240D10_BD4580 /* BD45B0 80240D40 8E110020 */ lw $s1, 0x20($s0) /* BD45B4 80240D44 2C62000E */ sltiu $v0, $v1, 0xe /* BD45B8 80240D48 8E330020 */ lw $s3, 0x20($s1) -/* BD45BC 80240D4C 10400099 */ beqz $v0, .L80240FB4 +/* BD45BC 80240D4C 10400099 */ beqz $v0, L80240FB4_BD4824 /* BD45C0 80240D50 00031080 */ sll $v0, $v1, 2 /* BD45C4 80240D54 3C018024 */ lui $at, %hi(jtbl_80246F00_BDA770) /* BD45C8 80240D58 00220821 */ addu $at, $at, $v0 @@ -33,12 +33,12 @@ glabel L80240D68_BD45D8 /* BD45EC 80240D7C E600000C */ swc1 $f0, 0xc($s0) /* BD45F0 80240D80 8E630000 */ lw $v1, ($s3) /* BD45F4 80240D84 24020001 */ addiu $v0, $zero, 1 -/* BD45F8 80240D88 1462008A */ bne $v1, $v0, .L80240FB4 +/* BD45F8 80240D88 1462008A */ bne $v1, $v0, L80240FB4_BD4824 /* BD45FC 80240D8C 24040014 */ addiu $a0, $zero, 0x14 /* BD4600 80240D90 0C00A67F */ jal rand_int /* BD4604 80240D94 AE430074 */ sw $v1, 0x74($s2) /* BD4608 80240D98 2442000A */ addiu $v0, $v0, 0xa -/* BD460C 80240D9C 080903ED */ j .L80240FB4 +/* BD460C 80240D9C 080903ED */ j L80240FB4_BD4824 /* BD4610 80240DA0 A602008E */ sh $v0, 0x8e($s0) glabel L80240DA4_BD4614 /* BD4614 80240DA4 C620000C */ lwc1 $f0, 0xc($s1) @@ -51,7 +51,7 @@ glabel L80240DA4_BD4614 /* BD4630 80240DC0 2442FFFF */ addiu $v0, $v0, -1 /* BD4634 80240DC4 A602008E */ sh $v0, 0x8e($s0) /* BD4638 80240DC8 00021400 */ sll $v0, $v0, 0x10 -/* BD463C 80240DCC 14400079 */ bnez $v0, .L80240FB4 +/* BD463C 80240DCC 14400079 */ bnez $v0, L80240FB4_BD4824 /* BD4640 80240DD0 3C04B000 */ lui $a0, 0xb000 /* BD4644 80240DD4 C6000040 */ lwc1 $f0, 0x40($s0) /* BD4648 80240DD8 3484000F */ ori $a0, $a0, 0xf @@ -68,7 +68,7 @@ glabel L80240DA4_BD4614 /* BD4674 80240E04 A600008E */ sh $zero, 0x8e($s0) /* BD4678 80240E08 E6000060 */ swc1 $f0, 0x60($s0) /* BD467C 80240E0C E6020064 */ swc1 $f2, 0x64($s0) -/* BD4680 80240E10 080903ED */ j .L80240FB4 +/* BD4680 80240E10 080903ED */ j L80240FB4_BD4824 /* BD4684 80240E14 E6040068 */ swc1 $f4, 0x68($s0) glabel L80240E18_BD4688 /* BD4688 80240E18 C620000C */ lwc1 $f0, 0xc($s1) @@ -133,7 +133,7 @@ glabel L80240E18_BD4688 /* BD4774 80240F04 46040000 */ add.s $f0, $f0, $f4 /* BD4778 80240F08 E60C0038 */ swc1 $f12, 0x38($s0) /* BD477C 80240F0C E60A0040 */ swc1 $f10, 0x40($s0) -/* BD4780 80240F10 14430028 */ bne $v0, $v1, .L80240FB4 +/* BD4780 80240F10 14430028 */ bne $v0, $v1, L80240FB4_BD4824 /* BD4784 80240F14 E600003C */ swc1 $f0, 0x3c($s0) /* BD4788 80240F18 080903EC */ j .L80240FB0 /* BD478C 80240F1C 2402000A */ addiu $v0, $zero, 0xa @@ -167,18 +167,17 @@ glabel L80240F20_BD4790 /* BD47F4 80240F84 44811000 */ mtc1 $at, $f2 /* BD47F8 80240F88 00000000 */ nop /* BD47FC 80240F8C 46020000 */ add.s $f0, $f0, $f2 -/* BD4800 80240F90 080903ED */ j .L80240FB4 +/* BD4800 80240F90 080903ED */ j L80240FB4_BD4824 /* BD4804 80240F94 E600003C */ swc1 $f0, 0x3c($s0) glabel L80240F98_BD4808 /* BD4808 80240F98 0240202D */ daddu $a0, $s2, $zero /* BD480C 80240F9C 3C05FD05 */ lui $a1, 0xfd05 /* BD4810 80240FA0 0C0B1EAF */ jal get_variable /* BD4814 80240FA4 34A50F82 */ ori $a1, $a1, 0xf82 -/* BD4818 80240FA8 14400002 */ bnez $v0, .L80240FB4 +/* BD4818 80240FA8 14400002 */ bnez $v0, L80240FB4_BD4824 /* BD481C 80240FAC 2402000A */ addiu $v0, $zero, 0xa .L80240FB0: /* BD4820 80240FB0 AE420074 */ sw $v0, 0x74($s2) -.L80240FB4: glabel L80240FB4_BD4824 /* BD4824 80240FB4 8FBF0028 */ lw $ra, 0x28($sp) /* BD4828 80240FB8 8FB30024 */ lw $s3, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s index ceee8bd0af..db5eb961af 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s @@ -83,7 +83,7 @@ glabel func_802409EC_D9B8DC .L80240B18: /* D9BA08 80240B18 8E830070 */ lw $v1, 0x70($s4) /* D9BA0C 80240B1C 2C620064 */ sltiu $v0, $v1, 0x64 -/* D9BA10 80240B20 10400036 */ beqz $v0, .L80240BFC +/* D9BA10 80240B20 10400036 */ beqz $v0, L80240BFC_D9BAEC /* D9BA14 80240B24 00031080 */ sll $v0, $v1, 2 /* D9BA18 80240B28 3C018024 */ lui $at, %hi(jtbl_80242448_D9D338) /* D9BA1C 80240B2C 00220821 */ addu $at, $at, $v0 @@ -100,7 +100,7 @@ glabel L80240B4C_D9BA3C /* D9BA40 80240B50 0240282D */ daddu $a1, $s2, $zero /* D9BA44 80240B54 0C0125AE */ jal func_800496B8 /* D9BA48 80240B58 0260302D */ daddu $a2, $s3, $zero -/* D9BA4C 80240B5C 080902FF */ j .L80240BFC +/* D9BA4C 80240B5C 080902FF */ j L80240BFC_D9BAEC /* D9BA50 80240B60 00000000 */ nop glabel L80240B64_D9BA54 /* D9BA54 80240B64 0280202D */ daddu $a0, $s4, $zero @@ -112,7 +112,7 @@ glabel L80240B74_D9BA64 /* D9BA68 80240B78 0240282D */ daddu $a1, $s2, $zero /* D9BA6C 80240B7C 0C012701 */ jal func_80049C04 /* D9BA70 80240B80 0260302D */ daddu $a2, $s3, $zero -/* D9BA74 80240B84 080902FF */ j .L80240BFC +/* D9BA74 80240B84 080902FF */ j L80240BFC_D9BAEC /* D9BA78 80240B88 00000000 */ nop glabel L80240B8C_D9BA7C /* D9BA7C 80240B8C 0280202D */ daddu $a0, $s4, $zero @@ -124,7 +124,7 @@ glabel L80240B9C_D9BA8C /* D9BA90 80240BA0 0240282D */ daddu $a1, $s2, $zero /* D9BA94 80240BA4 0C0127B3 */ jal func_80049ECC /* D9BA98 80240BA8 0260302D */ daddu $a2, $s3, $zero -/* D9BA9C 80240BAC 080902FF */ j .L80240BFC +/* D9BA9C 80240BAC 080902FF */ j L80240BFC_D9BAEC /* D9BAA0 80240BB0 00000000 */ nop glabel L80240BB4_D9BAA4 /* D9BAA4 80240BB4 0280202D */ daddu $a0, $s4, $zero @@ -136,19 +136,18 @@ glabel L80240BC4_D9BAB4 /* D9BAB8 80240BC8 0240282D */ daddu $a1, $s2, $zero /* D9BABC 80240BCC 0C090211 */ jal func_80240844_D9B734 /* D9BAC0 80240BD0 0260302D */ daddu $a2, $s3, $zero -/* D9BAC4 80240BD4 080902FF */ j .L80240BFC +/* D9BAC4 80240BD4 080902FF */ j L80240BFC_D9BAEC /* D9BAC8 80240BD8 00000000 */ nop glabel L80240BDC_D9BACC /* D9BACC 80240BDC 0280202D */ daddu $a0, $s4, $zero /* D9BAD0 80240BE0 0240282D */ daddu $a1, $s2, $zero /* D9BAD4 80240BE4 0C09026A */ jal func_802409A8_D9B898 /* D9BAD8 80240BE8 0260302D */ daddu $a2, $s3, $zero -/* D9BADC 80240BEC 080902FF */ j .L80240BFC +/* D9BADC 80240BEC 080902FF */ j L80240BFC_D9BAEC /* D9BAE0 80240BF0 00000000 */ nop glabel L80240BF4_D9BAE4 /* D9BAE4 80240BF4 0C0129CF */ jal func_8004A73C /* D9BAE8 80240BF8 0280202D */ daddu $a0, $s4, $zero -.L80240BFC: glabel L80240BFC_D9BAEC /* D9BAEC 80240BFC 8FBF0048 */ lw $ra, 0x48($sp) /* D9BAF0 80240C00 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s index 0e9d9cd0b9..02384c189e 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s @@ -122,7 +122,7 @@ glabel func_80240BA8_D9E078 .L80240D68: /* D9E238 80240D68 8E630070 */ lw $v1, 0x70($s3) /* D9E23C 80240D6C 2C620064 */ sltiu $v0, $v1, 0x64 -/* D9E240 80240D70 10400050 */ beqz $v0, .L80240EB4 +/* D9E240 80240D70 10400050 */ beqz $v0, L80240EB4_D9E384 /* D9E244 80240D74 00031080 */ sll $v0, $v1, 2 /* D9E248 80240D78 3C018024 */ lui $at, %hi(jtbl_80247880_DA4D50) /* D9E24C 80240D7C 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240D9C_D9E26C /* D9E270 80240DA0 0280282D */ daddu $a1, $s4, $zero /* D9E274 80240DA4 0C0125AE */ jal func_800496B8 /* D9E278 80240DA8 02A0302D */ daddu $a2, $s5, $zero -/* D9E27C 80240DAC 080903AD */ j .L80240EB4 +/* D9E27C 80240DAC 080903AD */ j L80240EB4_D9E384 /* D9E280 80240DB0 00000000 */ nop glabel L80240DB4_D9E284 /* D9E284 80240DB4 0260202D */ daddu $a0, $s3, $zero @@ -151,7 +151,7 @@ glabel L80240DC4_D9E294 /* D9E298 80240DC8 0280282D */ daddu $a1, $s4, $zero /* D9E29C 80240DCC 0C012701 */ jal func_80049C04 /* D9E2A0 80240DD0 02A0302D */ daddu $a2, $s5, $zero -/* D9E2A4 80240DD4 080903AD */ j .L80240EB4 +/* D9E2A4 80240DD4 080903AD */ j L80240EB4_D9E384 /* D9E2A8 80240DD8 00000000 */ nop glabel L80240DDC_D9E2AC /* D9E2AC 80240DDC 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L80240DEC_D9E2BC /* D9E2C0 80240DF0 0280282D */ daddu $a1, $s4, $zero /* D9E2C4 80240DF4 0C0127B3 */ jal func_80049ECC /* D9E2C8 80240DF8 02A0302D */ daddu $a2, $s5, $zero -/* D9E2CC 80240DFC 080903AD */ j .L80240EB4 +/* D9E2CC 80240DFC 080903AD */ j L80240EB4_D9E384 /* D9E2D0 80240E00 00000000 */ nop glabel L80240E04_D9E2D4 /* D9E2D4 80240E04 0260202D */ daddu $a0, $s3, $zero @@ -177,7 +177,7 @@ glabel L80240E14_D9E2E4 /* D9E2F0 80240E20 02A0302D */ daddu $a2, $s5, $zero /* D9E2F4 80240E24 8E630070 */ lw $v1, 0x70($s3) /* D9E2F8 80240E28 2402000E */ addiu $v0, $zero, 0xe -/* D9E2FC 80240E2C 14620021 */ bne $v1, $v0, .L80240EB4 +/* D9E2FC 80240E2C 14620021 */ bne $v1, $v0, L80240EB4_D9E384 /* D9E300 80240E30 00000000 */ nop glabel L80240E34_D9E304 /* D9E304 80240E34 0260202D */ daddu $a0, $s3, $zero @@ -186,7 +186,7 @@ glabel L80240E34_D9E304 /* D9E310 80240E40 02A0302D */ daddu $a2, $s5, $zero /* D9E314 80240E44 8E630070 */ lw $v1, 0x70($s3) /* D9E318 80240E48 2402000F */ addiu $v0, $zero, 0xf -/* D9E31C 80240E4C 14620019 */ bne $v1, $v0, .L80240EB4 +/* D9E31C 80240E4C 14620019 */ bne $v1, $v0, L80240EB4_D9E384 /* D9E320 80240E50 00000000 */ nop glabel L80240E54_D9E324 /* D9E324 80240E54 0260202D */ daddu $a0, $s3, $zero @@ -195,7 +195,7 @@ glabel L80240E54_D9E324 /* D9E330 80240E60 02A0302D */ daddu $a2, $s5, $zero /* D9E334 80240E64 8E630070 */ lw $v1, 0x70($s3) /* D9E338 80240E68 24020010 */ addiu $v0, $zero, 0x10 -/* D9E33C 80240E6C 14620011 */ bne $v1, $v0, .L80240EB4 +/* D9E33C 80240E6C 14620011 */ bne $v1, $v0, L80240EB4_D9E384 /* D9E340 80240E70 00000000 */ nop glabel L80240E74_D9E344 /* D9E344 80240E74 0260202D */ daddu $a0, $s3, $zero @@ -204,19 +204,18 @@ glabel L80240E74_D9E344 /* D9E350 80240E80 02A0302D */ daddu $a2, $s5, $zero /* D9E354 80240E84 8E630070 */ lw $v1, 0x70($s3) /* D9E358 80240E88 24020011 */ addiu $v0, $zero, 0x11 -/* D9E35C 80240E8C 14620009 */ bne $v1, $v0, .L80240EB4 +/* D9E35C 80240E8C 14620009 */ bne $v1, $v0, L80240EB4_D9E384 /* D9E360 80240E90 00000000 */ nop glabel L80240E94_D9E364 /* D9E364 80240E94 0260202D */ daddu $a0, $s3, $zero /* D9E368 80240E98 0280282D */ daddu $a1, $s4, $zero /* D9E36C 80240E9C 0C0902D2 */ jal func_80240B48_D9E018 /* D9E370 80240EA0 02A0302D */ daddu $a2, $s5, $zero -/* D9E374 80240EA4 080903AD */ j .L80240EB4 +/* D9E374 80240EA4 080903AD */ j L80240EB4_D9E384 /* D9E378 80240EA8 00000000 */ nop glabel L80240EAC_D9E37C /* D9E37C 80240EAC 0C0129CF */ jal func_8004A73C /* D9E380 80240EB0 0260202D */ daddu $a0, $s3, $zero -.L80240EB4: glabel L80240EB4_D9E384 /* D9E384 80240EB4 8FBF0060 */ lw $ra, 0x60($sp) /* D9E388 80240EB8 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s index 9371343990..68ca6efae9 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s @@ -100,7 +100,7 @@ glabel func_802416D0_D9EBA0 .L8024183C: /* D9ED0C 8024183C 8E830070 */ lw $v1, 0x70($s4) /* D9ED10 80241840 2C620064 */ sltiu $v0, $v1, 0x64 -/* D9ED14 80241844 10400036 */ beqz $v0, .L80241920 +/* D9ED14 80241844 10400036 */ beqz $v0, L80241920_D9EDF0 /* D9ED18 80241848 00031080 */ sll $v0, $v1, 2 /* D9ED1C 8024184C 3C018024 */ lui $at, %hi(jtbl_80247A28_DA4EF8) /* D9ED20 80241850 00220821 */ addu $at, $at, $v0 @@ -117,7 +117,7 @@ glabel L80241870_D9ED40 /* D9ED44 80241874 0260282D */ daddu $a1, $s3, $zero /* D9ED48 80241878 0C0903E4 */ jal func_80240F90_D9E460 /* D9ED4C 8024187C 02A0302D */ daddu $a2, $s5, $zero -/* D9ED50 80241880 08090648 */ j .L80241920 +/* D9ED50 80241880 08090648 */ j L80241920_D9EDF0 /* D9ED54 80241884 00000000 */ nop glabel L80241888_D9ED58 /* D9ED58 80241888 0280202D */ daddu $a0, $s4, $zero @@ -129,7 +129,7 @@ glabel L80241898_D9ED68 /* D9ED6C 8024189C 0260282D */ daddu $a1, $s3, $zero /* D9ED70 802418A0 0C090444 */ jal omo_02_NpcJumpFunc /* D9ED74 802418A4 02A0302D */ daddu $a2, $s5, $zero -/* D9ED78 802418A8 08090648 */ j .L80241920 +/* D9ED78 802418A8 08090648 */ j L80241920_D9EDF0 /* D9ED7C 802418AC 00000000 */ nop glabel L802418B0_D9ED80 /* D9ED80 802418B0 0280202D */ daddu $a0, $s4, $zero @@ -141,14 +141,14 @@ glabel L802418C0_D9ED90 /* D9ED94 802418C4 0260282D */ daddu $a1, $s3, $zero /* D9ED98 802418C8 0C0904AE */ jal omo_02_UnkNpcAIFunc11 /* D9ED9C 802418CC 02A0302D */ daddu $a2, $s5, $zero -/* D9EDA0 802418D0 08090648 */ j .L80241920 +/* D9EDA0 802418D0 08090648 */ j L80241920_D9EDF0 /* D9EDA4 802418D4 00000000 */ nop glabel L802418D8_D9EDA8 /* D9EDA8 802418D8 0280202D */ daddu $a0, $s4, $zero /* D9EDAC 802418DC 0260282D */ daddu $a1, $s3, $zero /* D9EDB0 802418E0 0C0904F5 */ jal omo_02_UnkNpcAIFunc10 /* D9EDB4 802418E4 02A0302D */ daddu $a2, $s5, $zero -/* D9EDB8 802418E8 08090648 */ j .L80241920 +/* D9EDB8 802418E8 08090648 */ j L80241920_D9EDF0 /* D9EDBC 802418EC 00000000 */ nop glabel L802418F0_D9EDC0 /* D9EDC0 802418F0 0280202D */ daddu $a0, $s4, $zero @@ -160,12 +160,11 @@ glabel L80241900_D9EDD0 /* D9EDD4 80241904 0260282D */ daddu $a1, $s3, $zero /* D9EDD8 80241908 0C090532 */ jal func_802414C8_D9E998 /* D9EDDC 8024190C 02A0302D */ daddu $a2, $s5, $zero -/* D9EDE0 80241910 08090648 */ j .L80241920 +/* D9EDE0 80241910 08090648 */ j L80241920_D9EDF0 /* D9EDE4 80241914 00000000 */ nop glabel L80241918_D9EDE8 /* D9EDE8 80241918 0C0129CF */ jal func_8004A73C /* D9EDEC 8024191C 0280202D */ daddu $a0, $s4, $zero -.L80241920: glabel L80241920_D9EDF0 /* D9EDF0 80241920 8FBF0048 */ lw $ra, 0x48($sp) /* D9EDF4 80241924 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s index c30aab6c18..7a9d1501f4 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s @@ -101,7 +101,7 @@ glabel func_8024283C_D9FD0C .L802429A8: /* D9FE78 802429A8 8E630070 */ lw $v1, 0x70($s3) /* D9FE7C 802429AC 2C620064 */ sltiu $v0, $v1, 0x64 -/* D9FE80 802429B0 10400060 */ beqz $v0, .L80242B34 +/* D9FE80 802429B0 10400060 */ beqz $v0, L80242B34_DA0004 /* D9FE84 802429B4 00031080 */ sll $v0, $v1, 2 /* D9FE88 802429B8 3C018024 */ lui $at, %hi(jtbl_80247BE0_DA50B0) /* D9FE8C 802429BC 00220821 */ addu $at, $at, $v0 @@ -118,7 +118,7 @@ glabel L802429DC_D9FEAC /* D9FEB0 802429E0 0200282D */ daddu $a1, $s0, $zero /* D9FEB4 802429E4 0C0125AE */ jal func_800496B8 /* D9FEB8 802429E8 02A0302D */ daddu $a2, $s5, $zero -/* D9FEBC 802429EC 08090ACD */ j .L80242B34 +/* D9FEBC 802429EC 08090ACD */ j L80242B34_DA0004 /* D9FEC0 802429F0 00000000 */ nop glabel L802429F4_D9FEC4 /* D9FEC4 802429F4 0260202D */ daddu $a0, $s3, $zero @@ -130,7 +130,7 @@ glabel L80242A04_D9FED4 /* D9FED8 80242A08 0200282D */ daddu $a1, $s0, $zero /* D9FEDC 80242A0C 0C012701 */ jal func_80049C04 /* D9FEE0 80242A10 02A0302D */ daddu $a2, $s5, $zero -/* D9FEE4 80242A14 08090ACD */ j .L80242B34 +/* D9FEE4 80242A14 08090ACD */ j L80242B34_DA0004 /* D9FEE8 80242A18 00000000 */ nop glabel L80242A1C_D9FEEC /* D9FEEC 80242A1C 0260202D */ daddu $a0, $s3, $zero @@ -142,7 +142,7 @@ glabel L80242A2C_D9FEFC /* D9FF00 80242A30 0200282D */ daddu $a1, $s0, $zero /* D9FF04 80242A34 0C0127B3 */ jal func_80049ECC /* D9FF08 80242A38 02A0302D */ daddu $a2, $s5, $zero -/* D9FF0C 80242A3C 08090ACD */ j .L80242B34 +/* D9FF0C 80242A3C 08090ACD */ j L80242B34_DA0004 /* D9FF10 80242A40 00000000 */ nop glabel L80242A44_D9FF14 /* D9FF14 80242A44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -170,7 +170,7 @@ glabel L80242A44_D9FF14 /* D9FF68 80242A98 02A0382D */ daddu $a3, $s5, $zero /* D9FF6C 80242A9C 8E630070 */ lw $v1, 0x70($s3) /* D9FF70 80242AA0 2402000C */ addiu $v0, $zero, 0xc -/* D9FF74 80242AA4 14620023 */ bne $v1, $v0, .L80242B34 +/* D9FF74 80242AA4 14620023 */ bne $v1, $v0, L80242B34_DA0004 /* D9FF78 80242AA8 00000000 */ nop /* D9FF7C 80242AAC 0260202D */ daddu $a0, $s3, $zero .L80242AB0: @@ -182,39 +182,38 @@ glabel L80242ABC_D9FF8C /* D9FF90 80242AC0 0200282D */ daddu $a1, $s0, $zero /* D9FF94 80242AC4 0C012849 */ jal func_8004A124 /* D9FF98 80242AC8 02A0302D */ daddu $a2, $s5, $zero -/* D9FF9C 80242ACC 08090ACD */ j .L80242B34 +/* D9FF9C 80242ACC 08090ACD */ j L80242B34_DA0004 /* D9FFA0 80242AD0 00000000 */ nop glabel L80242AD4_D9FFA4 /* D9FFA4 80242AD4 0260202D */ daddu $a0, $s3, $zero /* D9FFA8 80242AD8 0200282D */ daddu $a1, $s0, $zero /* D9FFAC 80242ADC 0C0128FA */ jal func_8004A3E8 /* D9FFB0 80242AE0 02A0302D */ daddu $a2, $s5, $zero -/* D9FFB4 80242AE4 08090ACD */ j .L80242B34 +/* D9FFB4 80242AE4 08090ACD */ j L80242B34_DA0004 /* D9FFB8 80242AE8 00000000 */ nop glabel L80242AEC_D9FFBC /* D9FFBC 80242AEC 0C09071F */ jal func_80241C7C_D9F14C /* D9FFC0 80242AF0 0260202D */ daddu $a0, $s3, $zero -/* D9FFC4 80242AF4 08090ACD */ j .L80242B34 +/* D9FFC4 80242AF4 08090ACD */ j L80242B34_DA0004 /* D9FFC8 80242AF8 00000000 */ nop glabel L80242AFC_D9FFCC /* D9FFCC 80242AFC 0C09075F */ jal omo_02_UnkSetDurationFunc /* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero -/* D9FFD4 80242B04 08090ACD */ j .L80242B34 +/* D9FFD4 80242B04 08090ACD */ j L80242B34_DA0004 /* D9FFD8 80242B08 00000000 */ nop glabel L80242B0C_D9FFDC /* D9FFDC 80242B0C 0C090770 */ jal omo_02_UnkNpcAIFunc9 /* D9FFE0 80242B10 0260202D */ daddu $a0, $s3, $zero -/* D9FFE4 80242B14 08090ACD */ j .L80242B34 +/* D9FFE4 80242B14 08090ACD */ j L80242B34_DA0004 /* D9FFE8 80242B18 00000000 */ nop glabel L80242B1C_D9FFEC /* D9FFEC 80242B1C 0C090798 */ jal omo_02_UnkDurationCheck /* D9FFF0 80242B20 0260202D */ daddu $a0, $s3, $zero -/* D9FFF4 80242B24 08090ACD */ j .L80242B34 +/* D9FFF4 80242B24 08090ACD */ j L80242B34_DA0004 /* D9FFF8 80242B28 00000000 */ nop glabel L80242B2C_D9FFFC /* D9FFFC 80242B2C 0C0129CF */ jal func_8004A73C /* DA0000 80242B30 0260202D */ daddu $a0, $s3, $zero -.L80242B34: glabel L80242B34_DA0004 /* DA0004 80242B34 8FBF0048 */ lw $ra, 0x48($sp) /* DA0008 80242B38 8FB50044 */ lw $s5, 0x44($sp) 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 db1d003bd3..3539bae3ae 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 @@ -64,7 +64,7 @@ glabel func_802416AC_DAEAAC .L80241794: /* DAEB94 80241794 8E830070 */ lw $v1, 0x70($s4) /* DAEB98 80241798 2C62000F */ sltiu $v0, $v1, 0xf -/* DAEB9C 8024179C 10400034 */ beqz $v0, .L80241870 +/* DAEB9C 8024179C 10400034 */ beqz $v0, L80241870_DAEC70 /* DAEBA0 802417A0 00031080 */ sll $v0, $v1, 2 /* DAEBA4 802417A4 3C018024 */ lui $at, %hi(jtbl_80244CC8_DB20C8) /* DAEBA8 802417A8 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241860_DAEC60 /* DAEC64 80241864 0200282D */ daddu $a1, $s0, $zero /* DAEC68 80241868 0C09047E */ jal func_802411F8_DAE5F8 /* DAEC6C 8024186C 0260302D */ daddu $a2, $s3, $zero -.L80241870: glabel L80241870_DAEC70 /* DAEC70 80241870 0000102D */ daddu $v0, $zero, $zero .L80241874: diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s index b9d435c458..9b9a0cd8be 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s @@ -122,7 +122,7 @@ glabel func_80241AD0_DAEED0 .L80241C90: /* DAF090 80241C90 8E630070 */ lw $v1, 0x70($s3) /* DAF094 80241C94 2C620064 */ sltiu $v0, $v1, 0x64 -/* DAF098 80241C98 10400050 */ beqz $v0, .L80241DDC +/* DAF098 80241C98 10400050 */ beqz $v0, L80241DDC_DAF1DC /* DAF09C 80241C9C 00031080 */ sll $v0, $v1, 2 /* DAF0A0 80241CA0 3C018024 */ lui $at, %hi(jtbl_80244D18_DB2118) /* DAF0A4 80241CA4 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80241CC4_DAF0C4 /* DAF0C8 80241CC8 0280282D */ daddu $a1, $s4, $zero /* DAF0CC 80241CCC 0C0125AE */ jal func_800496B8 /* DAF0D0 80241CD0 02A0302D */ daddu $a2, $s5, $zero -/* DAF0D4 80241CD4 08090777 */ j .L80241DDC +/* DAF0D4 80241CD4 08090777 */ j L80241DDC_DAF1DC /* DAF0D8 80241CD8 00000000 */ nop glabel L80241CDC_DAF0DC /* DAF0DC 80241CDC 0260202D */ daddu $a0, $s3, $zero @@ -151,7 +151,7 @@ glabel L80241CEC_DAF0EC /* DAF0F0 80241CF0 0280282D */ daddu $a1, $s4, $zero /* DAF0F4 80241CF4 0C012701 */ jal func_80049C04 /* DAF0F8 80241CF8 02A0302D */ daddu $a2, $s5, $zero -/* DAF0FC 80241CFC 08090777 */ j .L80241DDC +/* DAF0FC 80241CFC 08090777 */ j L80241DDC_DAF1DC /* DAF100 80241D00 00000000 */ nop glabel L80241D04_DAF104 /* DAF104 80241D04 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L80241D14_DAF114 /* DAF118 80241D18 0280282D */ daddu $a1, $s4, $zero /* DAF11C 80241D1C 0C0127B3 */ jal func_80049ECC /* DAF120 80241D20 02A0302D */ daddu $a2, $s5, $zero -/* DAF124 80241D24 08090777 */ j .L80241DDC +/* DAF124 80241D24 08090777 */ j L80241DDC_DAF1DC /* DAF128 80241D28 00000000 */ nop glabel L80241D2C_DAF12C /* DAF12C 80241D2C 0260202D */ daddu $a0, $s3, $zero @@ -177,7 +177,7 @@ glabel L80241D3C_DAF13C /* DAF148 80241D48 02A0302D */ daddu $a2, $s5, $zero /* DAF14C 80241D4C 8E630070 */ lw $v1, 0x70($s3) /* DAF150 80241D50 2402000E */ addiu $v0, $zero, 0xe -/* DAF154 80241D54 14620021 */ bne $v1, $v0, .L80241DDC +/* DAF154 80241D54 14620021 */ bne $v1, $v0, L80241DDC_DAF1DC /* DAF158 80241D58 00000000 */ nop glabel L80241D5C_DAF15C /* DAF15C 80241D5C 0260202D */ daddu $a0, $s3, $zero @@ -186,7 +186,7 @@ glabel L80241D5C_DAF15C /* DAF168 80241D68 02A0302D */ daddu $a2, $s5, $zero /* DAF16C 80241D6C 8E630070 */ lw $v1, 0x70($s3) /* DAF170 80241D70 2402000F */ addiu $v0, $zero, 0xf -/* DAF174 80241D74 14620019 */ bne $v1, $v0, .L80241DDC +/* DAF174 80241D74 14620019 */ bne $v1, $v0, L80241DDC_DAF1DC /* DAF178 80241D78 00000000 */ nop glabel L80241D7C_DAF17C /* DAF17C 80241D7C 0260202D */ daddu $a0, $s3, $zero @@ -195,7 +195,7 @@ glabel L80241D7C_DAF17C /* DAF188 80241D88 02A0302D */ daddu $a2, $s5, $zero /* DAF18C 80241D8C 8E630070 */ lw $v1, 0x70($s3) /* DAF190 80241D90 24020010 */ addiu $v0, $zero, 0x10 -/* DAF194 80241D94 14620011 */ bne $v1, $v0, .L80241DDC +/* DAF194 80241D94 14620011 */ bne $v1, $v0, L80241DDC_DAF1DC /* DAF198 80241D98 00000000 */ nop glabel L80241D9C_DAF19C /* DAF19C 80241D9C 0260202D */ daddu $a0, $s3, $zero @@ -204,19 +204,18 @@ glabel L80241D9C_DAF19C /* DAF1A8 80241DA8 02A0302D */ daddu $a2, $s5, $zero /* DAF1AC 80241DAC 8E630070 */ lw $v1, 0x70($s3) /* DAF1B0 80241DB0 24020011 */ addiu $v0, $zero, 0x11 -/* DAF1B4 80241DB4 14620009 */ bne $v1, $v0, .L80241DDC +/* DAF1B4 80241DB4 14620009 */ bne $v1, $v0, L80241DDC_DAF1DC /* DAF1B8 80241DB8 00000000 */ nop glabel L80241DBC_DAF1BC /* DAF1BC 80241DBC 0260202D */ daddu $a0, $s3, $zero /* DAF1C0 80241DC0 0280282D */ daddu $a1, $s4, $zero /* DAF1C4 80241DC4 0C09069C */ jal func_80241A70_DAEE70 /* DAF1C8 80241DC8 02A0302D */ daddu $a2, $s5, $zero -/* DAF1CC 80241DCC 08090777 */ j .L80241DDC +/* DAF1CC 80241DCC 08090777 */ j L80241DDC_DAF1DC /* DAF1D0 80241DD0 00000000 */ nop glabel L80241DD4_DAF1D4 /* DAF1D4 80241DD4 0C0129CF */ jal func_8004A73C /* DAF1D8 80241DD8 0260202D */ daddu $a0, $s3, $zero -.L80241DDC: glabel L80241DDC_DAF1DC /* DAF1DC 80241DDC 8FBF0060 */ lw $ra, 0x60($sp) /* DAF1E0 80241DE0 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s index 0ed1f5cf6b..a6841d24df 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s @@ -122,7 +122,7 @@ glabel func_80240238_DB24F8 .L802403F8: /* DB26B8 802403F8 8E630070 */ lw $v1, 0x70($s3) /* DB26BC 802403FC 2C620064 */ sltiu $v0, $v1, 0x64 -/* DB26C0 80240400 10400050 */ beqz $v0, .L80240544 +/* DB26C0 80240400 10400050 */ beqz $v0, L80240544_DB2804 /* DB26C4 80240404 00031080 */ sll $v0, $v1, 2 /* DB26C8 80240408 3C018024 */ lui $at, %hi(jtbl_802452C0_DB7580) /* DB26CC 8024040C 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L8024042C_DB26EC /* DB26F0 80240430 0280282D */ daddu $a1, $s4, $zero /* DB26F4 80240434 0C0125AE */ jal func_800496B8 /* DB26F8 80240438 02A0302D */ daddu $a2, $s5, $zero -/* DB26FC 8024043C 08090151 */ j .L80240544 +/* DB26FC 8024043C 08090151 */ j L80240544_DB2804 /* DB2700 80240440 00000000 */ nop glabel L80240444_DB2704 /* DB2704 80240444 0260202D */ daddu $a0, $s3, $zero @@ -151,7 +151,7 @@ glabel L80240454_DB2714 /* DB2718 80240458 0280282D */ daddu $a1, $s4, $zero /* DB271C 8024045C 0C012701 */ jal func_80049C04 /* DB2720 80240460 02A0302D */ daddu $a2, $s5, $zero -/* DB2724 80240464 08090151 */ j .L80240544 +/* DB2724 80240464 08090151 */ j L80240544_DB2804 /* DB2728 80240468 00000000 */ nop glabel L8024046C_DB272C /* DB272C 8024046C 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L8024047C_DB273C /* DB2740 80240480 0280282D */ daddu $a1, $s4, $zero /* DB2744 80240484 0C0127B3 */ jal func_80049ECC /* DB2748 80240488 02A0302D */ daddu $a2, $s5, $zero -/* DB274C 8024048C 08090151 */ j .L80240544 +/* DB274C 8024048C 08090151 */ j L80240544_DB2804 /* DB2750 80240490 00000000 */ nop glabel L80240494_DB2754 /* DB2754 80240494 0260202D */ daddu $a0, $s3, $zero @@ -177,7 +177,7 @@ glabel L802404A4_DB2764 /* DB2770 802404B0 02A0302D */ daddu $a2, $s5, $zero /* DB2774 802404B4 8E630070 */ lw $v1, 0x70($s3) /* DB2778 802404B8 2402000E */ addiu $v0, $zero, 0xe -/* DB277C 802404BC 14620021 */ bne $v1, $v0, .L80240544 +/* DB277C 802404BC 14620021 */ bne $v1, $v0, L80240544_DB2804 /* DB2780 802404C0 00000000 */ nop glabel L802404C4_DB2784 /* DB2784 802404C4 0260202D */ daddu $a0, $s3, $zero @@ -186,7 +186,7 @@ glabel L802404C4_DB2784 /* DB2790 802404D0 02A0302D */ daddu $a2, $s5, $zero /* DB2794 802404D4 8E630070 */ lw $v1, 0x70($s3) /* DB2798 802404D8 2402000F */ addiu $v0, $zero, 0xf -/* DB279C 802404DC 14620019 */ bne $v1, $v0, .L80240544 +/* DB279C 802404DC 14620019 */ bne $v1, $v0, L80240544_DB2804 /* DB27A0 802404E0 00000000 */ nop glabel L802404E4_DB27A4 /* DB27A4 802404E4 0260202D */ daddu $a0, $s3, $zero @@ -195,7 +195,7 @@ glabel L802404E4_DB27A4 /* DB27B0 802404F0 02A0302D */ daddu $a2, $s5, $zero /* DB27B4 802404F4 8E630070 */ lw $v1, 0x70($s3) /* DB27B8 802404F8 24020010 */ addiu $v0, $zero, 0x10 -/* DB27BC 802404FC 14620011 */ bne $v1, $v0, .L80240544 +/* DB27BC 802404FC 14620011 */ bne $v1, $v0, L80240544_DB2804 /* DB27C0 80240500 00000000 */ nop glabel L80240504_DB27C4 /* DB27C4 80240504 0260202D */ daddu $a0, $s3, $zero @@ -204,19 +204,18 @@ glabel L80240504_DB27C4 /* DB27D0 80240510 02A0302D */ daddu $a2, $s5, $zero /* DB27D4 80240514 8E630070 */ lw $v1, 0x70($s3) /* DB27D8 80240518 24020011 */ addiu $v0, $zero, 0x11 -/* DB27DC 8024051C 14620009 */ bne $v1, $v0, .L80240544 +/* DB27DC 8024051C 14620009 */ bne $v1, $v0, L80240544_DB2804 /* DB27E0 80240520 00000000 */ nop glabel L80240524_DB27E4 /* DB27E4 80240524 0260202D */ daddu $a0, $s3, $zero /* DB27E8 80240528 0280282D */ daddu $a1, $s4, $zero /* DB27EC 8024052C 0C090076 */ jal func_802401D8_DB2498 /* DB27F0 80240530 02A0302D */ daddu $a2, $s5, $zero -/* DB27F4 80240534 08090151 */ j .L80240544 +/* DB27F4 80240534 08090151 */ j L80240544_DB2804 /* DB27F8 80240538 00000000 */ nop glabel L8024053C_DB27FC /* DB27FC 8024053C 0C0129CF */ jal func_8004A73C /* DB2800 80240540 0260202D */ daddu $a0, $s3, $zero -.L80240544: glabel L80240544_DB2804 /* DB2804 80240544 8FBF0060 */ lw $ra, 0x60($sp) /* DB2808 80240548 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s index 868c0f4511..e2cd09a565 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s @@ -122,7 +122,7 @@ glabel func_80240780_DB2A40 .L80240940: /* DB2C00 80240940 8E630070 */ lw $v1, 0x70($s3) /* DB2C04 80240944 2C620064 */ sltiu $v0, $v1, 0x64 -/* DB2C08 80240948 10400038 */ beqz $v0, .L80240A2C +/* DB2C08 80240948 10400038 */ beqz $v0, L80240A2C_DB2CEC /* DB2C0C 8024094C 00031080 */ sll $v0, $v1, 2 /* DB2C10 80240950 3C018024 */ lui $at, %hi(jtbl_80245460_DB7720) /* DB2C14 80240954 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240974_DB2C34 /* DB2C38 80240978 0280282D */ daddu $a1, $s4, $zero /* DB2C3C 8024097C 0C0125AE */ jal func_800496B8 /* DB2C40 80240980 02A0302D */ daddu $a2, $s5, $zero -/* DB2C44 80240984 0809028B */ j .L80240A2C +/* DB2C44 80240984 0809028B */ j L80240A2C_DB2CEC /* DB2C48 80240988 00000000 */ nop glabel L8024098C_DB2C4C /* DB2C4C 8024098C 0260202D */ daddu $a0, $s3, $zero @@ -151,7 +151,7 @@ glabel L8024099C_DB2C5C /* DB2C60 802409A0 0280282D */ daddu $a1, $s4, $zero /* DB2C64 802409A4 0C09016F */ jal func_802405BC_DB287C /* DB2C68 802409A8 02A0302D */ daddu $a2, $s5, $zero -/* DB2C6C 802409AC 0809028B */ j .L80240A2C +/* DB2C6C 802409AC 0809028B */ j L80240A2C_DB2CEC /* DB2C70 802409B0 00000000 */ nop glabel L802409B4_DB2C74 /* DB2C74 802409B4 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L802409C4_DB2C84 /* DB2C88 802409C8 0280282D */ daddu $a1, $s4, $zero /* DB2C8C 802409CC 0C0127B3 */ jal func_80049ECC /* DB2C90 802409D0 02A0302D */ daddu $a2, $s5, $zero -/* DB2C94 802409D4 0809028B */ j .L80240A2C +/* DB2C94 802409D4 0809028B */ j L80240A2C_DB2CEC /* DB2C98 802409D8 00000000 */ nop glabel L802409DC_DB2C9C /* DB2C9C 802409DC 0260202D */ daddu $a0, $s3, $zero @@ -177,19 +177,18 @@ glabel L802409EC_DB2CAC /* DB2CB8 802409F8 02A0302D */ daddu $a2, $s5, $zero /* DB2CBC 802409FC 8E630070 */ lw $v1, 0x70($s3) /* DB2CC0 80240A00 2402000E */ addiu $v0, $zero, 0xe -/* DB2CC4 80240A04 14620009 */ bne $v1, $v0, .L80240A2C +/* DB2CC4 80240A04 14620009 */ bne $v1, $v0, L80240A2C_DB2CEC /* DB2CC8 80240A08 00000000 */ nop glabel L80240A0C_DB2CCC /* DB2CCC 80240A0C 0260202D */ daddu $a0, $s3, $zero /* DB2CD0 80240A10 0280282D */ daddu $a1, $s4, $zero /* DB2CD4 80240A14 0C0128FA */ jal func_8004A3E8 /* DB2CD8 80240A18 02A0302D */ daddu $a2, $s5, $zero -/* DB2CDC 80240A1C 0809028B */ j .L80240A2C +/* DB2CDC 80240A1C 0809028B */ j L80240A2C_DB2CEC /* DB2CE0 80240A20 00000000 */ nop glabel L80240A24_DB2CE4 /* DB2CE4 80240A24 0C0129CF */ jal func_8004A73C /* DB2CE8 80240A28 0260202D */ daddu $a0, $s3, $zero -.L80240A2C: glabel L80240A2C_DB2CEC /* DB2CEC 80240A2C 8FBF0060 */ lw $ra, 0x60($sp) /* DB2CF0 80240A30 8FB5005C */ lw $s5, 0x5c($sp) 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 e6a74666ae..24c1ebc770 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 @@ -64,7 +64,7 @@ glabel func_80241D60_DB4020 .L80241E48: /* DB4108 80241E48 8E830070 */ lw $v1, 0x70($s4) /* DB410C 80241E4C 2C62000F */ sltiu $v0, $v1, 0xf -/* DB4110 80241E50 10400034 */ beqz $v0, .L80241F24 +/* DB4110 80241E50 10400034 */ beqz $v0, L80241F24_DB41E4 /* DB4114 80241E54 00031080 */ sll $v0, $v1, 2 /* DB4118 80241E58 3C018024 */ lui $at, %hi(jtbl_80245608_DB78C8) /* DB411C 80241E5C 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241F14_DB41D4 /* DB41D8 80241F18 0200282D */ daddu $a1, $s0, $zero /* DB41DC 80241F1C 0C09062B */ jal func_802418AC_DB3B6C /* DB41E0 80241F20 0260302D */ daddu $a2, $s3, $zero -.L80241F24: glabel L80241F24_DB41E4 /* DB41E4 80241F24 0000102D */ daddu $v0, $zero, $zero .L80241F28: diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s index 09a4365539..9362fd61d1 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s @@ -122,7 +122,7 @@ glabel func_80240238_DBD4E8 .L802403F8: /* DBD6A8 802403F8 8E630070 */ lw $v1, 0x70($s3) /* DBD6AC 802403FC 2C620064 */ sltiu $v0, $v1, 0x64 -/* DBD6B0 80240400 10400050 */ beqz $v0, .L80240544 +/* DBD6B0 80240400 10400050 */ beqz $v0, L80240544_DBD7F4 /* DBD6B4 80240404 00031080 */ sll $v0, $v1, 2 /* DBD6B8 80240408 3C018024 */ lui $at, %hi(jtbl_80246BE0_DC3E90) /* DBD6BC 8024040C 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L8024042C_DBD6DC /* DBD6E0 80240430 0280282D */ daddu $a1, $s4, $zero /* DBD6E4 80240434 0C0125AE */ jal func_800496B8 /* DBD6E8 80240438 02A0302D */ daddu $a2, $s5, $zero -/* DBD6EC 8024043C 08090151 */ j .L80240544 +/* DBD6EC 8024043C 08090151 */ j L80240544_DBD7F4 /* DBD6F0 80240440 00000000 */ nop glabel L80240444_DBD6F4 /* DBD6F4 80240444 0260202D */ daddu $a0, $s3, $zero @@ -151,7 +151,7 @@ glabel L80240454_DBD704 /* DBD708 80240458 0280282D */ daddu $a1, $s4, $zero /* DBD70C 8024045C 0C012701 */ jal func_80049C04 /* DBD710 80240460 02A0302D */ daddu $a2, $s5, $zero -/* DBD714 80240464 08090151 */ j .L80240544 +/* DBD714 80240464 08090151 */ j L80240544_DBD7F4 /* DBD718 80240468 00000000 */ nop glabel L8024046C_DBD71C /* DBD71C 8024046C 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L8024047C_DBD72C /* DBD730 80240480 0280282D */ daddu $a1, $s4, $zero /* DBD734 80240484 0C0127B3 */ jal func_80049ECC /* DBD738 80240488 02A0302D */ daddu $a2, $s5, $zero -/* DBD73C 8024048C 08090151 */ j .L80240544 +/* DBD73C 8024048C 08090151 */ j L80240544_DBD7F4 /* DBD740 80240490 00000000 */ nop glabel L80240494_DBD744 /* DBD744 80240494 0260202D */ daddu $a0, $s3, $zero @@ -177,7 +177,7 @@ glabel L802404A4_DBD754 /* DBD760 802404B0 02A0302D */ daddu $a2, $s5, $zero /* DBD764 802404B4 8E630070 */ lw $v1, 0x70($s3) /* DBD768 802404B8 2402000E */ addiu $v0, $zero, 0xe -/* DBD76C 802404BC 14620021 */ bne $v1, $v0, .L80240544 +/* DBD76C 802404BC 14620021 */ bne $v1, $v0, L80240544_DBD7F4 /* DBD770 802404C0 00000000 */ nop glabel L802404C4_DBD774 /* DBD774 802404C4 0260202D */ daddu $a0, $s3, $zero @@ -186,7 +186,7 @@ glabel L802404C4_DBD774 /* DBD780 802404D0 02A0302D */ daddu $a2, $s5, $zero /* DBD784 802404D4 8E630070 */ lw $v1, 0x70($s3) /* DBD788 802404D8 2402000F */ addiu $v0, $zero, 0xf -/* DBD78C 802404DC 14620019 */ bne $v1, $v0, .L80240544 +/* DBD78C 802404DC 14620019 */ bne $v1, $v0, L80240544_DBD7F4 /* DBD790 802404E0 00000000 */ nop glabel L802404E4_DBD794 /* DBD794 802404E4 0260202D */ daddu $a0, $s3, $zero @@ -195,7 +195,7 @@ glabel L802404E4_DBD794 /* DBD7A0 802404F0 02A0302D */ daddu $a2, $s5, $zero /* DBD7A4 802404F4 8E630070 */ lw $v1, 0x70($s3) /* DBD7A8 802404F8 24020010 */ addiu $v0, $zero, 0x10 -/* DBD7AC 802404FC 14620011 */ bne $v1, $v0, .L80240544 +/* DBD7AC 802404FC 14620011 */ bne $v1, $v0, L80240544_DBD7F4 /* DBD7B0 80240500 00000000 */ nop glabel L80240504_DBD7B4 /* DBD7B4 80240504 0260202D */ daddu $a0, $s3, $zero @@ -204,19 +204,18 @@ glabel L80240504_DBD7B4 /* DBD7C0 80240510 02A0302D */ daddu $a2, $s5, $zero /* DBD7C4 80240514 8E630070 */ lw $v1, 0x70($s3) /* DBD7C8 80240518 24020011 */ addiu $v0, $zero, 0x11 -/* DBD7CC 8024051C 14620009 */ bne $v1, $v0, .L80240544 +/* DBD7CC 8024051C 14620009 */ bne $v1, $v0, L80240544_DBD7F4 /* DBD7D0 80240520 00000000 */ nop glabel L80240524_DBD7D4 /* DBD7D4 80240524 0260202D */ daddu $a0, $s3, $zero /* DBD7D8 80240528 0280282D */ daddu $a1, $s4, $zero /* DBD7DC 8024052C 0C090076 */ jal func_802401D8_DBD488 /* DBD7E0 80240530 02A0302D */ daddu $a2, $s5, $zero -/* DBD7E4 80240534 08090151 */ j .L80240544 +/* DBD7E4 80240534 08090151 */ j L80240544_DBD7F4 /* DBD7E8 80240538 00000000 */ nop glabel L8024053C_DBD7EC /* DBD7EC 8024053C 0C0129CF */ jal func_8004A73C /* DBD7F0 80240540 0260202D */ daddu $a0, $s3, $zero -.L80240544: glabel L80240544_DBD7F4 /* DBD7F4 80240544 8FBF0060 */ lw $ra, 0x60($sp) /* DBD7F8 80240548 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s index 2e12716787..d5a3318971 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s @@ -122,7 +122,7 @@ glabel func_80241100_DBE3B0 .L802412C0: /* DBE570 802412C0 8E830070 */ lw $v1, 0x70($s4) /* DBE574 802412C4 2C620064 */ sltiu $v0, $v1, 0x64 -/* DBE578 802412C8 10400042 */ beqz $v0, .L802413D4 +/* DBE578 802412C8 10400042 */ beqz $v0, L802413D4_DBE684 /* DBE57C 802412CC 00031080 */ sll $v0, $v1, 2 /* DBE580 802412D0 3C018024 */ lui $at, %hi(jtbl_80246D80_DC4030) /* DBE584 802412D4 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L802412F4_DBE5A4 /* DBE5A8 802412F8 0260282D */ daddu $a1, $s3, $zero /* DBE5AC 802412FC 0C0901B1 */ jal func_802406C4_DBD974 /* DBE5B0 80241300 02A0302D */ daddu $a2, $s5, $zero -/* DBE5B4 80241304 080904F5 */ j .L802413D4 +/* DBE5B4 80241304 080904F5 */ j L802413D4_DBE684 /* DBE5B8 80241308 00000000 */ nop glabel L8024130C_DBE5BC /* DBE5BC 8024130C 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L8024131C_DBE5CC /* DBE5D0 80241320 0260282D */ daddu $a1, $s3, $zero /* DBE5D4 80241324 0C09028B */ jal func_80240A2C_DBDCDC /* DBE5D8 80241328 02A0302D */ daddu $a2, $s5, $zero -/* DBE5DC 8024132C 080904F5 */ j .L802413D4 +/* DBE5DC 8024132C 080904F5 */ j L802413D4_DBE684 /* DBE5E0 80241330 00000000 */ nop glabel L80241334_DBE5E4 /* DBE5E4 80241334 0280202D */ daddu $a0, $s4, $zero /* DBE5E8 80241338 0260282D */ daddu $a1, $s3, $zero /* DBE5EC 8024133C 0C0902FA */ jal func_80240BE8_DBDE98 /* DBE5F0 80241340 02A0302D */ daddu $a2, $s5, $zero -/* DBE5F4 80241344 080904F5 */ j .L802413D4 +/* DBE5F4 80241344 080904F5 */ j L802413D4_DBE684 /* DBE5F8 80241348 00000000 */ nop glabel L8024134C_DBE5FC /* DBE5FC 8024134C 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L8024135C_DBE60C /* DBE610 80241360 0260282D */ daddu $a1, $s3, $zero /* DBE614 80241364 0C090344 */ jal omo_07_NpcJumpFunc /* DBE618 80241368 02A0302D */ daddu $a2, $s5, $zero -/* DBE61C 8024136C 080904F5 */ j .L802413D4 +/* DBE61C 8024136C 080904F5 */ j L802413D4_DBE684 /* DBE620 80241370 00000000 */ nop glabel L80241374_DBE624 /* DBE624 80241374 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80241384_DBE634 /* DBE638 80241388 0260282D */ daddu $a1, $s3, $zero /* DBE63C 8024138C 0C0903AE */ jal func_80240EB8_DBE168 /* DBE640 80241390 02A0302D */ daddu $a2, $s5, $zero -/* DBE644 80241394 080904F5 */ j .L802413D4 +/* DBE644 80241394 080904F5 */ j L802413D4_DBE684 /* DBE648 80241398 00000000 */ nop glabel L8024139C_DBE64C /* DBE64C 8024139C 0280202D */ daddu $a0, $s4, $zero /* DBE650 802413A0 0260282D */ daddu $a1, $s3, $zero /* DBE654 802413A4 0C0903F6 */ jal omo_07_UnkNpcDurationFlagFunc /* DBE658 802413A8 02A0302D */ daddu $a2, $s5, $zero -/* DBE65C 802413AC 080904F5 */ j .L802413D4 +/* DBE65C 802413AC 080904F5 */ j L802413D4_DBE684 /* DBE660 802413B0 00000000 */ nop glabel L802413B4_DBE664 /* DBE664 802413B4 0280202D */ daddu $a0, $s4, $zero /* DBE668 802413B8 0260282D */ daddu $a1, $s3, $zero /* DBE66C 802413BC 0C090410 */ jal func_80241040_DBE2F0 /* DBE670 802413C0 02A0302D */ daddu $a2, $s5, $zero -/* DBE674 802413C4 080904F5 */ j .L802413D4 +/* DBE674 802413C4 080904F5 */ j L802413D4_DBE684 /* DBE678 802413C8 00000000 */ nop glabel L802413CC_DBE67C /* DBE67C 802413CC 0C0129CF */ jal func_8004A73C /* DBE680 802413D0 0280202D */ daddu $a0, $s4, $zero -.L802413D4: glabel L802413D4_DBE684 /* DBE684 802413D4 8FBF0060 */ lw $ra, 0x60($sp) /* DBE688 802413D8 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s index 123896872b..1766a1e7f8 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s @@ -122,7 +122,7 @@ glabel func_80241634_DBE8E4 .L802417F4: /* DBEAA4 802417F4 8E630070 */ lw $v1, 0x70($s3) /* DBEAA8 802417F8 2C620064 */ sltiu $v0, $v1, 0x64 -/* DBEAAC 802417FC 10400054 */ beqz $v0, .L80241950 +/* DBEAAC 802417FC 10400054 */ beqz $v0, L80241950_DBEC00 /* DBEAB0 80241800 00031080 */ sll $v0, $v1, 2 /* DBEAB4 80241804 3C018024 */ lui $at, %hi(jtbl_80246F20_DC41D0) /* DBEAB8 80241808 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80241828_DBEAD8 /* DBEADC 8024182C 0280282D */ daddu $a1, $s4, $zero /* DBEAE0 80241830 0C0901B1 */ jal func_802406C4_DBD974 /* DBEAE4 80241834 02A0302D */ daddu $a2, $s5, $zero -/* DBEAE8 80241838 08090654 */ j .L80241950 +/* DBEAE8 80241838 08090654 */ j L80241950_DBEC00 /* DBEAEC 8024183C 00000000 */ nop glabel L80241840_DBEAF0 /* DBEAF0 80241840 0260202D */ daddu $a0, $s3, $zero @@ -151,14 +151,14 @@ glabel L80241850_DBEB00 /* DBEB04 80241854 0280282D */ daddu $a1, $s4, $zero /* DBEB08 80241858 0C09028B */ jal func_80240A2C_DBDCDC /* DBEB0C 8024185C 02A0302D */ daddu $a2, $s5, $zero -/* DBEB10 80241860 08090654 */ j .L80241950 +/* DBEB10 80241860 08090654 */ j L80241950_DBEC00 /* DBEB14 80241864 00000000 */ nop glabel L80241868_DBEB18 /* DBEB18 80241868 0260202D */ daddu $a0, $s3, $zero /* DBEB1C 8024186C 0280282D */ daddu $a1, $s4, $zero /* DBEB20 80241870 0C0902FA */ jal func_80240BE8_DBDE98 /* DBEB24 80241874 02A0302D */ daddu $a2, $s5, $zero -/* DBEB28 80241878 08090654 */ j .L80241950 +/* DBEB28 80241878 08090654 */ j L80241950_DBEC00 /* DBEB2C 8024187C 00000000 */ nop glabel L80241880_DBEB30 /* DBEB30 80241880 0260202D */ daddu $a0, $s3, $zero @@ -170,7 +170,7 @@ glabel L80241890_DBEB40 /* DBEB44 80241894 0280282D */ daddu $a1, $s4, $zero /* DBEB48 80241898 0C090344 */ jal omo_07_NpcJumpFunc /* DBEB4C 8024189C 02A0302D */ daddu $a2, $s5, $zero -/* DBEB50 802418A0 08090654 */ j .L80241950 +/* DBEB50 802418A0 08090654 */ j L80241950_DBEC00 /* DBEB54 802418A4 00000000 */ nop glabel L802418A8_DBEB58 /* DBEB58 802418A8 0260202D */ daddu $a0, $s3, $zero @@ -182,7 +182,7 @@ glabel L802418B8_DBEB68 /* DBEB6C 802418BC 0280282D */ daddu $a1, $s4, $zero /* DBEB70 802418C0 0C0903AE */ jal func_80240EB8_DBE168 /* DBEB74 802418C4 02A0302D */ daddu $a2, $s5, $zero -/* DBEB78 802418C8 08090654 */ j .L80241950 +/* DBEB78 802418C8 08090654 */ j L80241950_DBEC00 /* DBEB7C 802418CC 00000000 */ nop glabel L802418D0_DBEB80 /* DBEB80 802418D0 0260202D */ daddu $a0, $s3, $zero @@ -191,7 +191,7 @@ glabel L802418D0_DBEB80 /* DBEB8C 802418DC 02A0302D */ daddu $a2, $s5, $zero /* DBEB90 802418E0 8E630070 */ lw $v1, 0x70($s3) /* DBEB94 802418E4 2402000F */ addiu $v0, $zero, 0xf -/* DBEB98 802418E8 14620019 */ bne $v1, $v0, .L80241950 +/* DBEB98 802418E8 14620019 */ bne $v1, $v0, L80241950_DBEC00 /* DBEB9C 802418EC 00000000 */ nop glabel L802418F0_DBEBA0 /* DBEBA0 802418F0 0260202D */ daddu $a0, $s3, $zero @@ -200,7 +200,7 @@ glabel L802418F0_DBEBA0 /* DBEBAC 802418FC 02A0302D */ daddu $a2, $s5, $zero /* DBEBB0 80241900 8E630070 */ lw $v1, 0x70($s3) /* DBEBB4 80241904 24020010 */ addiu $v0, $zero, 0x10 -/* DBEBB8 80241908 14620011 */ bne $v1, $v0, .L80241950 +/* DBEBB8 80241908 14620011 */ bne $v1, $v0, L80241950_DBEC00 /* DBEBBC 8024190C 00000000 */ nop glabel L80241910_DBEBC0 /* DBEBC0 80241910 0260202D */ daddu $a0, $s3, $zero @@ -209,19 +209,18 @@ glabel L80241910_DBEBC0 /* DBEBCC 8024191C 02A0302D */ daddu $a2, $s5, $zero /* DBEBD0 80241920 8E630070 */ lw $v1, 0x70($s3) /* DBEBD4 80241924 24020011 */ addiu $v0, $zero, 0x11 -/* DBEBD8 80241928 14620009 */ bne $v1, $v0, .L80241950 +/* DBEBD8 80241928 14620009 */ bne $v1, $v0, L80241950_DBEC00 /* DBEBDC 8024192C 00000000 */ nop glabel L80241930_DBEBE0 /* DBEBE0 80241930 0260202D */ daddu $a0, $s3, $zero /* DBEBE4 80241934 0280282D */ daddu $a1, $s4, $zero /* DBEBE8 80241938 0C090575 */ jal func_802415D4_DBE884 /* DBEBEC 8024193C 02A0302D */ daddu $a2, $s5, $zero -/* DBEBF0 80241940 08090654 */ j .L80241950 +/* DBEBF0 80241940 08090654 */ j L80241950_DBEC00 /* DBEBF4 80241944 00000000 */ nop glabel L80241948_DBEBF8 /* DBEBF8 80241948 0C0129CF */ jal func_8004A73C /* DBEBFC 8024194C 0260202D */ daddu $a0, $s3, $zero -.L80241950: glabel L80241950_DBEC00 /* DBEC00 80241950 8FBF0060 */ lw $ra, 0x60($sp) /* DBEC04 80241954 8FB5005C */ lw $s5, 0x5c($sp) 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 9d0746e2af..4fef74fa92 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 @@ -64,7 +64,7 @@ glabel func_80242C84_DBFF34 .L80242D6C: /* DC001C 80242D6C 8E830070 */ lw $v1, 0x70($s4) /* DC0020 80242D70 2C62000F */ sltiu $v0, $v1, 0xf -/* DC0024 80242D74 10400034 */ beqz $v0, .L80242E48 +/* DC0024 80242D74 10400034 */ beqz $v0, L80242E48_DC00F8 /* DC0028 80242D78 00031080 */ sll $v0, $v1, 2 /* DC002C 80242D7C 3C018024 */ lui $at, %hi(jtbl_802470C8_DC4378) /* DC0030 80242D80 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80242E38_DC00E8 /* DC00EC 80242E3C 0200282D */ daddu $a1, $s0, $zero /* DC00F0 80242E40 0C0909F4 */ jal func_802427D0_DBFA80 /* DC00F4 80242E44 0260302D */ daddu $a2, $s3, $zero -.L80242E48: glabel L80242E48_DC00F8 /* DC00F8 80242E48 0000102D */ daddu $v0, $zero, $zero .L80242E4C: diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s index 837a157ce7..6fe879e1a8 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s @@ -122,7 +122,7 @@ glabel func_80240AA8_DC4E78 .L80240C68: /* DC5038 80240C68 8E630070 */ lw $v1, 0x70($s3) /* DC503C 80240C6C 2C620064 */ sltiu $v0, $v1, 0x64 -/* DC5040 80240C70 10400050 */ beqz $v0, .L80240DB4 +/* DC5040 80240C70 10400050 */ beqz $v0, L80240DB4_DC5184 /* DC5044 80240C74 00031080 */ sll $v0, $v1, 2 /* DC5048 80240C78 3C018025 */ lui $at, %hi(jtbl_80248770_DCCB40) /* DC504C 80240C7C 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240C9C_DC506C /* DC5070 80240CA0 0280282D */ daddu $a1, $s4, $zero /* DC5074 80240CA4 0C0125AE */ jal func_800496B8 /* DC5078 80240CA8 02A0302D */ daddu $a2, $s5, $zero -/* DC507C 80240CAC 0809036D */ j .L80240DB4 +/* DC507C 80240CAC 0809036D */ j L80240DB4_DC5184 /* DC5080 80240CB0 00000000 */ nop glabel L80240CB4_DC5084 /* DC5084 80240CB4 0260202D */ daddu $a0, $s3, $zero @@ -151,7 +151,7 @@ glabel L80240CC4_DC5094 /* DC5098 80240CC8 0280282D */ daddu $a1, $s4, $zero /* DC509C 80240CCC 0C012701 */ jal func_80049C04 /* DC50A0 80240CD0 02A0302D */ daddu $a2, $s5, $zero -/* DC50A4 80240CD4 0809036D */ j .L80240DB4 +/* DC50A4 80240CD4 0809036D */ j L80240DB4_DC5184 /* DC50A8 80240CD8 00000000 */ nop glabel L80240CDC_DC50AC /* DC50AC 80240CDC 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L80240CEC_DC50BC /* DC50C0 80240CF0 0280282D */ daddu $a1, $s4, $zero /* DC50C4 80240CF4 0C0127B3 */ jal func_80049ECC /* DC50C8 80240CF8 02A0302D */ daddu $a2, $s5, $zero -/* DC50CC 80240CFC 0809036D */ j .L80240DB4 +/* DC50CC 80240CFC 0809036D */ j L80240DB4_DC5184 /* DC50D0 80240D00 00000000 */ nop glabel L80240D04_DC50D4 /* DC50D4 80240D04 0260202D */ daddu $a0, $s3, $zero @@ -177,7 +177,7 @@ glabel L80240D14_DC50E4 /* DC50F0 80240D20 02A0302D */ daddu $a2, $s5, $zero /* DC50F4 80240D24 8E630070 */ lw $v1, 0x70($s3) /* DC50F8 80240D28 2402000E */ addiu $v0, $zero, 0xe -/* DC50FC 80240D2C 14620021 */ bne $v1, $v0, .L80240DB4 +/* DC50FC 80240D2C 14620021 */ bne $v1, $v0, L80240DB4_DC5184 /* DC5100 80240D30 00000000 */ nop glabel L80240D34_DC5104 /* DC5104 80240D34 0260202D */ daddu $a0, $s3, $zero @@ -186,7 +186,7 @@ glabel L80240D34_DC5104 /* DC5110 80240D40 02A0302D */ daddu $a2, $s5, $zero /* DC5114 80240D44 8E630070 */ lw $v1, 0x70($s3) /* DC5118 80240D48 2402000F */ addiu $v0, $zero, 0xf -/* DC511C 80240D4C 14620019 */ bne $v1, $v0, .L80240DB4 +/* DC511C 80240D4C 14620019 */ bne $v1, $v0, L80240DB4_DC5184 /* DC5120 80240D50 00000000 */ nop glabel L80240D54_DC5124 /* DC5124 80240D54 0260202D */ daddu $a0, $s3, $zero @@ -195,7 +195,7 @@ glabel L80240D54_DC5124 /* DC5130 80240D60 02A0302D */ daddu $a2, $s5, $zero /* DC5134 80240D64 8E630070 */ lw $v1, 0x70($s3) /* DC5138 80240D68 24020010 */ addiu $v0, $zero, 0x10 -/* DC513C 80240D6C 14620011 */ bne $v1, $v0, .L80240DB4 +/* DC513C 80240D6C 14620011 */ bne $v1, $v0, L80240DB4_DC5184 /* DC5140 80240D70 00000000 */ nop glabel L80240D74_DC5144 /* DC5144 80240D74 0260202D */ daddu $a0, $s3, $zero @@ -204,19 +204,18 @@ glabel L80240D74_DC5144 /* DC5150 80240D80 02A0302D */ daddu $a2, $s5, $zero /* DC5154 80240D84 8E630070 */ lw $v1, 0x70($s3) /* DC5158 80240D88 24020011 */ addiu $v0, $zero, 0x11 -/* DC515C 80240D8C 14620009 */ bne $v1, $v0, .L80240DB4 +/* DC515C 80240D8C 14620009 */ bne $v1, $v0, L80240DB4_DC5184 /* DC5160 80240D90 00000000 */ nop glabel L80240D94_DC5164 /* DC5164 80240D94 0260202D */ daddu $a0, $s3, $zero /* DC5168 80240D98 0280282D */ daddu $a1, $s4, $zero /* DC516C 80240D9C 0C090292 */ jal func_80240A48_DC4E18 /* DC5170 80240DA0 02A0302D */ daddu $a2, $s5, $zero -/* DC5174 80240DA4 0809036D */ j .L80240DB4 +/* DC5174 80240DA4 0809036D */ j L80240DB4_DC5184 /* DC5178 80240DA8 00000000 */ nop glabel L80240DAC_DC517C /* DC517C 80240DAC 0C0129CF */ jal func_8004A73C /* DC5180 80240DB0 0260202D */ daddu $a0, $s3, $zero -.L80240DB4: glabel L80240DB4_DC5184 /* DC5184 80240DB4 8FBF0060 */ lw $ra, 0x60($sp) /* DC5188 80240DB8 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s index aa8713e7fd..af8d1dd832 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s @@ -122,7 +122,7 @@ glabel func_80240C18_DCD8E8 .L80240DD8: /* DCDAA8 80240DD8 8E630070 */ lw $v1, 0x70($s3) /* DCDAAC 80240DDC 2C620064 */ sltiu $v0, $v1, 0x64 -/* DCDAB0 80240DE0 10400050 */ beqz $v0, .L80240F24 +/* DCDAB0 80240DE0 10400050 */ beqz $v0, L80240F24_DCDBF4 /* DCDAB4 80240DE4 00031080 */ sll $v0, $v1, 2 /* DCDAB8 80240DE8 3C018025 */ lui $at, %hi(jtbl_8024A640_DD7310) /* DCDABC 80240DEC 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240E0C_DCDADC /* DCDAE0 80240E10 0280282D */ daddu $a1, $s4, $zero /* DCDAE4 80240E14 0C0125AE */ jal func_800496B8 /* DCDAE8 80240E18 02A0302D */ daddu $a2, $s5, $zero -/* DCDAEC 80240E1C 080903C9 */ j .L80240F24 +/* DCDAEC 80240E1C 080903C9 */ j L80240F24_DCDBF4 /* DCDAF0 80240E20 00000000 */ nop glabel L80240E24_DCDAF4 /* DCDAF4 80240E24 0260202D */ daddu $a0, $s3, $zero @@ -151,7 +151,7 @@ glabel L80240E34_DCDB04 /* DCDB08 80240E38 0280282D */ daddu $a1, $s4, $zero /* DCDB0C 80240E3C 0C012701 */ jal func_80049C04 /* DCDB10 80240E40 02A0302D */ daddu $a2, $s5, $zero -/* DCDB14 80240E44 080903C9 */ j .L80240F24 +/* DCDB14 80240E44 080903C9 */ j L80240F24_DCDBF4 /* DCDB18 80240E48 00000000 */ nop glabel L80240E4C_DCDB1C /* DCDB1C 80240E4C 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L80240E5C_DCDB2C /* DCDB30 80240E60 0280282D */ daddu $a1, $s4, $zero /* DCDB34 80240E64 0C0127B3 */ jal func_80049ECC /* DCDB38 80240E68 02A0302D */ daddu $a2, $s5, $zero -/* DCDB3C 80240E6C 080903C9 */ j .L80240F24 +/* DCDB3C 80240E6C 080903C9 */ j L80240F24_DCDBF4 /* DCDB40 80240E70 00000000 */ nop glabel L80240E74_DCDB44 /* DCDB44 80240E74 0260202D */ daddu $a0, $s3, $zero @@ -177,7 +177,7 @@ glabel L80240E84_DCDB54 /* DCDB60 80240E90 02A0302D */ daddu $a2, $s5, $zero /* DCDB64 80240E94 8E630070 */ lw $v1, 0x70($s3) /* DCDB68 80240E98 2402000E */ addiu $v0, $zero, 0xe -/* DCDB6C 80240E9C 14620021 */ bne $v1, $v0, .L80240F24 +/* DCDB6C 80240E9C 14620021 */ bne $v1, $v0, L80240F24_DCDBF4 /* DCDB70 80240EA0 00000000 */ nop glabel L80240EA4_DCDB74 /* DCDB74 80240EA4 0260202D */ daddu $a0, $s3, $zero @@ -186,7 +186,7 @@ glabel L80240EA4_DCDB74 /* DCDB80 80240EB0 02A0302D */ daddu $a2, $s5, $zero /* DCDB84 80240EB4 8E630070 */ lw $v1, 0x70($s3) /* DCDB88 80240EB8 2402000F */ addiu $v0, $zero, 0xf -/* DCDB8C 80240EBC 14620019 */ bne $v1, $v0, .L80240F24 +/* DCDB8C 80240EBC 14620019 */ bne $v1, $v0, L80240F24_DCDBF4 /* DCDB90 80240EC0 00000000 */ nop glabel L80240EC4_DCDB94 /* DCDB94 80240EC4 0260202D */ daddu $a0, $s3, $zero @@ -195,7 +195,7 @@ glabel L80240EC4_DCDB94 /* DCDBA0 80240ED0 02A0302D */ daddu $a2, $s5, $zero /* DCDBA4 80240ED4 8E630070 */ lw $v1, 0x70($s3) /* DCDBA8 80240ED8 24020010 */ addiu $v0, $zero, 0x10 -/* DCDBAC 80240EDC 14620011 */ bne $v1, $v0, .L80240F24 +/* DCDBAC 80240EDC 14620011 */ bne $v1, $v0, L80240F24_DCDBF4 /* DCDBB0 80240EE0 00000000 */ nop glabel L80240EE4_DCDBB4 /* DCDBB4 80240EE4 0260202D */ daddu $a0, $s3, $zero @@ -204,19 +204,18 @@ glabel L80240EE4_DCDBB4 /* DCDBC0 80240EF0 02A0302D */ daddu $a2, $s5, $zero /* DCDBC4 80240EF4 8E630070 */ lw $v1, 0x70($s3) /* DCDBC8 80240EF8 24020011 */ addiu $v0, $zero, 0x11 -/* DCDBCC 80240EFC 14620009 */ bne $v1, $v0, .L80240F24 +/* DCDBCC 80240EFC 14620009 */ bne $v1, $v0, L80240F24_DCDBF4 /* DCDBD0 80240F00 00000000 */ nop glabel L80240F04_DCDBD4 /* DCDBD4 80240F04 0260202D */ daddu $a0, $s3, $zero /* DCDBD8 80240F08 0280282D */ daddu $a1, $s4, $zero /* DCDBDC 80240F0C 0C0902EE */ jal func_80240BB8_DCD888 /* DCDBE0 80240F10 02A0302D */ daddu $a2, $s5, $zero -/* DCDBE4 80240F14 080903C9 */ j .L80240F24 +/* DCDBE4 80240F14 080903C9 */ j L80240F24_DCDBF4 /* DCDBE8 80240F18 00000000 */ nop glabel L80240F1C_DCDBEC /* DCDBEC 80240F1C 0C0129CF */ jal func_8004A73C /* DCDBF0 80240F20 0260202D */ daddu $a0, $s3, $zero -.L80240F24: glabel L80240F24_DCDBF4 /* DCDBF4 80240F24 8FBF0060 */ lw $ra, 0x60($sp) /* DCDBF8 80240F28 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s index 1fcbe5f781..37c7032f23 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s @@ -122,7 +122,7 @@ glabel func_80241AE0_DCE7B0 .L80241CA0: /* DCE970 80241CA0 8E830070 */ lw $v1, 0x70($s4) /* DCE974 80241CA4 2C620064 */ sltiu $v0, $v1, 0x64 -/* DCE978 80241CA8 10400042 */ beqz $v0, .L80241DB4 +/* DCE978 80241CA8 10400042 */ beqz $v0, L80241DB4_DCEA84 /* DCE97C 80241CAC 00031080 */ sll $v0, $v1, 2 /* DCE980 80241CB0 3C018025 */ lui $at, %hi(jtbl_8024A7E0_DD74B0) /* DCE984 80241CB4 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80241CD4_DCE9A4 /* DCE9A8 80241CD8 0260282D */ daddu $a1, $s3, $zero /* DCE9AC 80241CDC 0C090429 */ jal func_802410A4_DCDD74 /* DCE9B0 80241CE0 02A0302D */ daddu $a2, $s5, $zero -/* DCE9B4 80241CE4 0809076D */ j .L80241DB4 +/* DCE9B4 80241CE4 0809076D */ j L80241DB4_DCEA84 /* DCE9B8 80241CE8 00000000 */ nop glabel L80241CEC_DCE9BC /* DCE9BC 80241CEC 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80241CFC_DCE9CC /* DCE9D0 80241D00 0260282D */ daddu $a1, $s3, $zero /* DCE9D4 80241D04 0C090503 */ jal func_8024140C_DCE0DC /* DCE9D8 80241D08 02A0302D */ daddu $a2, $s5, $zero -/* DCE9DC 80241D0C 0809076D */ j .L80241DB4 +/* DCE9DC 80241D0C 0809076D */ j L80241DB4_DCEA84 /* DCE9E0 80241D10 00000000 */ nop glabel L80241D14_DCE9E4 /* DCE9E4 80241D14 0280202D */ daddu $a0, $s4, $zero /* DCE9E8 80241D18 0260282D */ daddu $a1, $s3, $zero /* DCE9EC 80241D1C 0C090572 */ jal func_802415C8_DCE298 /* DCE9F0 80241D20 02A0302D */ daddu $a2, $s5, $zero -/* DCE9F4 80241D24 0809076D */ j .L80241DB4 +/* DCE9F4 80241D24 0809076D */ j L80241DB4_DCEA84 /* DCE9F8 80241D28 00000000 */ nop glabel L80241D2C_DCE9FC /* DCE9FC 80241D2C 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80241D3C_DCEA0C /* DCEA10 80241D40 0260282D */ daddu $a1, $s3, $zero /* DCEA14 80241D44 0C0905BC */ jal omo_09_NpcJumpFunc /* DCEA18 80241D48 02A0302D */ daddu $a2, $s5, $zero -/* DCEA1C 80241D4C 0809076D */ j .L80241DB4 +/* DCEA1C 80241D4C 0809076D */ j L80241DB4_DCEA84 /* DCEA20 80241D50 00000000 */ nop glabel L80241D54_DCEA24 /* DCEA24 80241D54 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80241D64_DCEA34 /* DCEA38 80241D68 0260282D */ daddu $a1, $s3, $zero /* DCEA3C 80241D6C 0C090626 */ jal func_80241898_DCE568 /* DCEA40 80241D70 02A0302D */ daddu $a2, $s5, $zero -/* DCEA44 80241D74 0809076D */ j .L80241DB4 +/* DCEA44 80241D74 0809076D */ j L80241DB4_DCEA84 /* DCEA48 80241D78 00000000 */ nop glabel L80241D7C_DCEA4C /* DCEA4C 80241D7C 0280202D */ daddu $a0, $s4, $zero /* DCEA50 80241D80 0260282D */ daddu $a1, $s3, $zero /* DCEA54 80241D84 0C09066E */ jal omo_09_UnkNpcDurationFlagFunc /* DCEA58 80241D88 02A0302D */ daddu $a2, $s5, $zero -/* DCEA5C 80241D8C 0809076D */ j .L80241DB4 +/* DCEA5C 80241D8C 0809076D */ j L80241DB4_DCEA84 /* DCEA60 80241D90 00000000 */ nop glabel L80241D94_DCEA64 /* DCEA64 80241D94 0280202D */ daddu $a0, $s4, $zero /* DCEA68 80241D98 0260282D */ daddu $a1, $s3, $zero /* DCEA6C 80241D9C 0C090688 */ jal func_80241A20_DCE6F0 /* DCEA70 80241DA0 02A0302D */ daddu $a2, $s5, $zero -/* DCEA74 80241DA4 0809076D */ j .L80241DB4 +/* DCEA74 80241DA4 0809076D */ j L80241DB4_DCEA84 /* DCEA78 80241DA8 00000000 */ nop glabel L80241DAC_DCEA7C /* DCEA7C 80241DAC 0C0129CF */ jal func_8004A73C /* DCEA80 80241DB0 0280202D */ daddu $a0, $s4, $zero -.L80241DB4: glabel L80241DB4_DCEA84 /* DCEA84 80241DB4 8FBF0060 */ lw $ra, 0x60($sp) /* DCEA88 80241DB8 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s index 5f56bdb8f7..5c1a5b4697 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s @@ -122,7 +122,7 @@ glabel func_80242014_DCECE4 .L802421D4: /* DCEEA4 802421D4 8E630070 */ lw $v1, 0x70($s3) /* DCEEA8 802421D8 2C620064 */ sltiu $v0, $v1, 0x64 -/* DCEEAC 802421DC 10400054 */ beqz $v0, .L80242330 +/* DCEEAC 802421DC 10400054 */ beqz $v0, L80242330_DCF000 /* DCEEB0 802421E0 00031080 */ sll $v0, $v1, 2 /* DCEEB4 802421E4 3C018025 */ lui $at, %hi(jtbl_8024A980_DD7650) /* DCEEB8 802421E8 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80242208_DCEED8 /* DCEEDC 8024220C 0280282D */ daddu $a1, $s4, $zero /* DCEEE0 80242210 0C090429 */ jal func_802410A4_DCDD74 /* DCEEE4 80242214 02A0302D */ daddu $a2, $s5, $zero -/* DCEEE8 80242218 080908CC */ j .L80242330 +/* DCEEE8 80242218 080908CC */ j L80242330_DCF000 /* DCEEEC 8024221C 00000000 */ nop glabel L80242220_DCEEF0 /* DCEEF0 80242220 0260202D */ daddu $a0, $s3, $zero @@ -151,14 +151,14 @@ glabel L80242230_DCEF00 /* DCEF04 80242234 0280282D */ daddu $a1, $s4, $zero /* DCEF08 80242238 0C090503 */ jal func_8024140C_DCE0DC /* DCEF0C 8024223C 02A0302D */ daddu $a2, $s5, $zero -/* DCEF10 80242240 080908CC */ j .L80242330 +/* DCEF10 80242240 080908CC */ j L80242330_DCF000 /* DCEF14 80242244 00000000 */ nop glabel L80242248_DCEF18 /* DCEF18 80242248 0260202D */ daddu $a0, $s3, $zero /* DCEF1C 8024224C 0280282D */ daddu $a1, $s4, $zero /* DCEF20 80242250 0C090572 */ jal func_802415C8_DCE298 /* DCEF24 80242254 02A0302D */ daddu $a2, $s5, $zero -/* DCEF28 80242258 080908CC */ j .L80242330 +/* DCEF28 80242258 080908CC */ j L80242330_DCF000 /* DCEF2C 8024225C 00000000 */ nop glabel L80242260_DCEF30 /* DCEF30 80242260 0260202D */ daddu $a0, $s3, $zero @@ -170,7 +170,7 @@ glabel L80242270_DCEF40 /* DCEF44 80242274 0280282D */ daddu $a1, $s4, $zero /* DCEF48 80242278 0C0905BC */ jal omo_09_NpcJumpFunc /* DCEF4C 8024227C 02A0302D */ daddu $a2, $s5, $zero -/* DCEF50 80242280 080908CC */ j .L80242330 +/* DCEF50 80242280 080908CC */ j L80242330_DCF000 /* DCEF54 80242284 00000000 */ nop glabel L80242288_DCEF58 /* DCEF58 80242288 0260202D */ daddu $a0, $s3, $zero @@ -182,7 +182,7 @@ glabel L80242298_DCEF68 /* DCEF6C 8024229C 0280282D */ daddu $a1, $s4, $zero /* DCEF70 802422A0 0C090626 */ jal func_80241898_DCE568 /* DCEF74 802422A4 02A0302D */ daddu $a2, $s5, $zero -/* DCEF78 802422A8 080908CC */ j .L80242330 +/* DCEF78 802422A8 080908CC */ j L80242330_DCF000 /* DCEF7C 802422AC 00000000 */ nop glabel L802422B0_DCEF80 /* DCEF80 802422B0 0260202D */ daddu $a0, $s3, $zero @@ -191,7 +191,7 @@ glabel L802422B0_DCEF80 /* DCEF8C 802422BC 02A0302D */ daddu $a2, $s5, $zero /* DCEF90 802422C0 8E630070 */ lw $v1, 0x70($s3) /* DCEF94 802422C4 2402000F */ addiu $v0, $zero, 0xf -/* DCEF98 802422C8 14620019 */ bne $v1, $v0, .L80242330 +/* DCEF98 802422C8 14620019 */ bne $v1, $v0, L80242330_DCF000 /* DCEF9C 802422CC 00000000 */ nop glabel L802422D0_DCEFA0 /* DCEFA0 802422D0 0260202D */ daddu $a0, $s3, $zero @@ -200,7 +200,7 @@ glabel L802422D0_DCEFA0 /* DCEFAC 802422DC 02A0302D */ daddu $a2, $s5, $zero /* DCEFB0 802422E0 8E630070 */ lw $v1, 0x70($s3) /* DCEFB4 802422E4 24020010 */ addiu $v0, $zero, 0x10 -/* DCEFB8 802422E8 14620011 */ bne $v1, $v0, .L80242330 +/* DCEFB8 802422E8 14620011 */ bne $v1, $v0, L80242330_DCF000 /* DCEFBC 802422EC 00000000 */ nop glabel L802422F0_DCEFC0 /* DCEFC0 802422F0 0260202D */ daddu $a0, $s3, $zero @@ -209,19 +209,18 @@ glabel L802422F0_DCEFC0 /* DCEFCC 802422FC 02A0302D */ daddu $a2, $s5, $zero /* DCEFD0 80242300 8E630070 */ lw $v1, 0x70($s3) /* DCEFD4 80242304 24020011 */ addiu $v0, $zero, 0x11 -/* DCEFD8 80242308 14620009 */ bne $v1, $v0, .L80242330 +/* DCEFD8 80242308 14620009 */ bne $v1, $v0, L80242330_DCF000 /* DCEFDC 8024230C 00000000 */ nop glabel L80242310_DCEFE0 /* DCEFE0 80242310 0260202D */ daddu $a0, $s3, $zero /* DCEFE4 80242314 0280282D */ daddu $a1, $s4, $zero /* DCEFE8 80242318 0C0907ED */ jal func_80241FB4_DCEC84 /* DCEFEC 8024231C 02A0302D */ daddu $a2, $s5, $zero -/* DCEFF0 80242320 080908CC */ j .L80242330 +/* DCEFF0 80242320 080908CC */ j L80242330_DCF000 /* DCEFF4 80242324 00000000 */ nop glabel L80242328_DCEFF8 /* DCEFF8 80242328 0C0129CF */ jal func_8004A73C /* DCEFFC 8024232C 0260202D */ daddu $a0, $s3, $zero -.L80242330: glabel L80242330_DCF000 /* DCF000 80242330 8FBF0060 */ lw $ra, 0x60($sp) /* DCF004 80242334 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s index ebfef1c040..26ed82e271 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s @@ -101,7 +101,7 @@ glabel func_8024324C_DCFF1C .L802433B8: /* DD0088 802433B8 8E630070 */ lw $v1, 0x70($s3) /* DD008C 802433BC 2C620064 */ sltiu $v0, $v1, 0x64 -/* DD0090 802433C0 10400060 */ beqz $v0, .L80243544 +/* DD0090 802433C0 10400060 */ beqz $v0, L80243544_DD0214 /* DD0094 802433C4 00031080 */ sll $v0, $v1, 2 /* DD0098 802433C8 3C018025 */ lui $at, %hi(jtbl_8024AB38_DD7808) /* DD009C 802433CC 00220821 */ addu $at, $at, $v0 @@ -118,7 +118,7 @@ glabel L802433EC_DD00BC /* DD00C0 802433F0 0200282D */ daddu $a1, $s0, $zero /* DD00C4 802433F4 0C0125AE */ jal func_800496B8 /* DD00C8 802433F8 02A0302D */ daddu $a2, $s5, $zero -/* DD00CC 802433FC 08090D51 */ j .L80243544 +/* DD00CC 802433FC 08090D51 */ j L80243544_DD0214 /* DD00D0 80243400 00000000 */ nop glabel L80243404_DD00D4 /* DD00D4 80243404 0260202D */ daddu $a0, $s3, $zero @@ -130,7 +130,7 @@ glabel L80243414_DD00E4 /* DD00E8 80243418 0200282D */ daddu $a1, $s0, $zero /* DD00EC 8024341C 0C012701 */ jal func_80049C04 /* DD00F0 80243420 02A0302D */ daddu $a2, $s5, $zero -/* DD00F4 80243424 08090D51 */ j .L80243544 +/* DD00F4 80243424 08090D51 */ j L80243544_DD0214 /* DD00F8 80243428 00000000 */ nop glabel L8024342C_DD00FC /* DD00FC 8024342C 0260202D */ daddu $a0, $s3, $zero @@ -142,7 +142,7 @@ glabel L8024343C_DD010C /* DD0110 80243440 0200282D */ daddu $a1, $s0, $zero /* DD0114 80243444 0C0127B3 */ jal func_80049ECC /* DD0118 80243448 02A0302D */ daddu $a2, $s5, $zero -/* DD011C 8024344C 08090D51 */ j .L80243544 +/* DD011C 8024344C 08090D51 */ j L80243544_DD0214 /* DD0120 80243450 00000000 */ nop glabel L80243454_DD0124 /* DD0124 80243454 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -170,7 +170,7 @@ glabel L80243454_DD0124 /* DD0178 802434A8 02A0382D */ daddu $a3, $s5, $zero /* DD017C 802434AC 8E630070 */ lw $v1, 0x70($s3) /* DD0180 802434B0 2402000C */ addiu $v0, $zero, 0xc -/* DD0184 802434B4 14620023 */ bne $v1, $v0, .L80243544 +/* DD0184 802434B4 14620023 */ bne $v1, $v0, L80243544_DD0214 /* DD0188 802434B8 00000000 */ nop /* DD018C 802434BC 0260202D */ daddu $a0, $s3, $zero .L802434C0: @@ -182,39 +182,38 @@ glabel L802434CC_DD019C /* DD01A0 802434D0 0200282D */ daddu $a1, $s0, $zero /* DD01A4 802434D4 0C012849 */ jal func_8004A124 /* DD01A8 802434D8 02A0302D */ daddu $a2, $s5, $zero -/* DD01AC 802434DC 08090D51 */ j .L80243544 +/* DD01AC 802434DC 08090D51 */ j L80243544_DD0214 /* DD01B0 802434E0 00000000 */ nop glabel L802434E4_DD01B4 /* DD01B4 802434E4 0260202D */ daddu $a0, $s3, $zero /* DD01B8 802434E8 0200282D */ daddu $a1, $s0, $zero /* DD01BC 802434EC 0C0128FA */ jal func_8004A3E8 /* DD01C0 802434F0 02A0302D */ daddu $a2, $s5, $zero -/* DD01C4 802434F4 08090D51 */ j .L80243544 +/* DD01C4 802434F4 08090D51 */ j L80243544_DD0214 /* DD01C8 802434F8 00000000 */ nop glabel L802434FC_DD01CC /* DD01CC 802434FC 0C0909A3 */ jal func_8024268C_DCF35C /* DD01D0 80243500 0260202D */ daddu $a0, $s3, $zero -/* DD01D4 80243504 08090D51 */ j .L80243544 +/* DD01D4 80243504 08090D51 */ j L80243544_DD0214 /* DD01D8 80243508 00000000 */ nop glabel L8024350C_DD01DC /* DD01DC 8024350C 0C0909E3 */ jal omo_09_UnkSetDurationFunc /* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero -/* DD01E4 80243514 08090D51 */ j .L80243544 +/* DD01E4 80243514 08090D51 */ j L80243544_DD0214 /* DD01E8 80243518 00000000 */ nop glabel L8024351C_DD01EC /* DD01EC 8024351C 0C0909F4 */ jal omo_09_UnkNpcAIFunc9 /* DD01F0 80243520 0260202D */ daddu $a0, $s3, $zero -/* DD01F4 80243524 08090D51 */ j .L80243544 +/* DD01F4 80243524 08090D51 */ j L80243544_DD0214 /* DD01F8 80243528 00000000 */ nop glabel L8024352C_DD01FC /* DD01FC 8024352C 0C090A1C */ jal omo_09_UnkDurationCheck /* DD0200 80243530 0260202D */ daddu $a0, $s3, $zero -/* DD0204 80243534 08090D51 */ j .L80243544 +/* DD0204 80243534 08090D51 */ j L80243544_DD0214 /* DD0208 80243538 00000000 */ nop glabel L8024353C_DD020C /* DD020C 8024353C 0C0129CF */ jal func_8004A73C /* DD0210 80243540 0260202D */ daddu $a0, $s3, $zero -.L80243544: glabel L80243544_DD0214 /* DD0214 80243544 8FBF0048 */ lw $ra, 0x48($sp) /* DD0218 80243548 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s index 33f2efcc4d..41305bb689 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s @@ -122,7 +122,7 @@ glabel func_802404B8_DE2948 .L80240678: /* DE2B08 80240678 8E630070 */ lw $v1, 0x70($s3) /* DE2B0C 8024067C 2C620064 */ sltiu $v0, $v1, 0x64 -/* DE2B10 80240680 10400050 */ beqz $v0, .L802407C4 +/* DE2B10 80240680 10400050 */ beqz $v0, L802407C4_DE2C54 /* DE2B14 80240684 00031080 */ sll $v0, $v1, 2 /* DE2B18 80240688 3C018024 */ lui $at, %hi(jtbl_80242EF0_DE5380) /* DE2B1C 8024068C 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L802406AC_DE2B3C /* DE2B40 802406B0 0280282D */ daddu $a1, $s4, $zero /* DE2B44 802406B4 0C0125AE */ jal func_800496B8 /* DE2B48 802406B8 02A0302D */ daddu $a2, $s5, $zero -/* DE2B4C 802406BC 080901F1 */ j .L802407C4 +/* DE2B4C 802406BC 080901F1 */ j L802407C4_DE2C54 /* DE2B50 802406C0 00000000 */ nop glabel L802406C4_DE2B54 /* DE2B54 802406C4 0260202D */ daddu $a0, $s3, $zero @@ -151,7 +151,7 @@ glabel L802406D4_DE2B64 /* DE2B68 802406D8 0280282D */ daddu $a1, $s4, $zero /* DE2B6C 802406DC 0C012701 */ jal func_80049C04 /* DE2B70 802406E0 02A0302D */ daddu $a2, $s5, $zero -/* DE2B74 802406E4 080901F1 */ j .L802407C4 +/* DE2B74 802406E4 080901F1 */ j L802407C4_DE2C54 /* DE2B78 802406E8 00000000 */ nop glabel L802406EC_DE2B7C /* DE2B7C 802406EC 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L802406FC_DE2B8C /* DE2B90 80240700 0280282D */ daddu $a1, $s4, $zero /* DE2B94 80240704 0C0127B3 */ jal func_80049ECC /* DE2B98 80240708 02A0302D */ daddu $a2, $s5, $zero -/* DE2B9C 8024070C 080901F1 */ j .L802407C4 +/* DE2B9C 8024070C 080901F1 */ j L802407C4_DE2C54 /* DE2BA0 80240710 00000000 */ nop glabel L80240714_DE2BA4 /* DE2BA4 80240714 0260202D */ daddu $a0, $s3, $zero @@ -177,7 +177,7 @@ glabel L80240724_DE2BB4 /* DE2BC0 80240730 02A0302D */ daddu $a2, $s5, $zero /* DE2BC4 80240734 8E630070 */ lw $v1, 0x70($s3) /* DE2BC8 80240738 2402000E */ addiu $v0, $zero, 0xe -/* DE2BCC 8024073C 14620021 */ bne $v1, $v0, .L802407C4 +/* DE2BCC 8024073C 14620021 */ bne $v1, $v0, L802407C4_DE2C54 /* DE2BD0 80240740 00000000 */ nop glabel L80240744_DE2BD4 /* DE2BD4 80240744 0260202D */ daddu $a0, $s3, $zero @@ -186,7 +186,7 @@ glabel L80240744_DE2BD4 /* DE2BE0 80240750 02A0302D */ daddu $a2, $s5, $zero /* DE2BE4 80240754 8E630070 */ lw $v1, 0x70($s3) /* DE2BE8 80240758 2402000F */ addiu $v0, $zero, 0xf -/* DE2BEC 8024075C 14620019 */ bne $v1, $v0, .L802407C4 +/* DE2BEC 8024075C 14620019 */ bne $v1, $v0, L802407C4_DE2C54 /* DE2BF0 80240760 00000000 */ nop glabel L80240764_DE2BF4 /* DE2BF4 80240764 0260202D */ daddu $a0, $s3, $zero @@ -195,7 +195,7 @@ glabel L80240764_DE2BF4 /* DE2C00 80240770 02A0302D */ daddu $a2, $s5, $zero /* DE2C04 80240774 8E630070 */ lw $v1, 0x70($s3) /* DE2C08 80240778 24020010 */ addiu $v0, $zero, 0x10 -/* DE2C0C 8024077C 14620011 */ bne $v1, $v0, .L802407C4 +/* DE2C0C 8024077C 14620011 */ bne $v1, $v0, L802407C4_DE2C54 /* DE2C10 80240780 00000000 */ nop glabel L80240784_DE2C14 /* DE2C14 80240784 0260202D */ daddu $a0, $s3, $zero @@ -204,19 +204,18 @@ glabel L80240784_DE2C14 /* DE2C20 80240790 02A0302D */ daddu $a2, $s5, $zero /* DE2C24 80240794 8E630070 */ lw $v1, 0x70($s3) /* DE2C28 80240798 24020011 */ addiu $v0, $zero, 0x11 -/* DE2C2C 8024079C 14620009 */ bne $v1, $v0, .L802407C4 +/* DE2C2C 8024079C 14620009 */ bne $v1, $v0, L802407C4_DE2C54 /* DE2C30 802407A0 00000000 */ nop glabel L802407A4_DE2C34 /* DE2C34 802407A4 0260202D */ daddu $a0, $s3, $zero /* DE2C38 802407A8 0280282D */ daddu $a1, $s4, $zero /* DE2C3C 802407AC 0C090116 */ jal func_80240458_DE28E8 /* DE2C40 802407B0 02A0302D */ daddu $a2, $s5, $zero -/* DE2C44 802407B4 080901F1 */ j .L802407C4 +/* DE2C44 802407B4 080901F1 */ j L802407C4_DE2C54 /* DE2C48 802407B8 00000000 */ nop glabel L802407BC_DE2C4C /* DE2C4C 802407BC 0C0129CF */ jal func_8004A73C /* DE2C50 802407C0 0260202D */ daddu $a0, $s3, $zero -.L802407C4: glabel L802407C4_DE2C54 /* DE2C54 802407C4 8FBF0060 */ lw $ra, 0x60($sp) /* DE2C58 802407C8 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s index 659bdd43ea..8e033d0504 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s @@ -122,7 +122,7 @@ glabel func_80240A00_DE2E90 .L80240BC0: /* DE3050 80240BC0 8E630070 */ lw $v1, 0x70($s3) /* DE3054 80240BC4 2C620064 */ sltiu $v0, $v1, 0x64 -/* DE3058 80240BC8 10400038 */ beqz $v0, .L80240CAC +/* DE3058 80240BC8 10400038 */ beqz $v0, L80240CAC_DE313C /* DE305C 80240BCC 00031080 */ sll $v0, $v1, 2 /* DE3060 80240BD0 3C018024 */ lui $at, %hi(jtbl_80243090_DE5520) /* DE3064 80240BD4 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240BF4_DE3084 /* DE3088 80240BF8 0280282D */ daddu $a1, $s4, $zero /* DE308C 80240BFC 0C0125AE */ jal func_800496B8 /* DE3090 80240C00 02A0302D */ daddu $a2, $s5, $zero -/* DE3094 80240C04 0809032B */ j .L80240CAC +/* DE3094 80240C04 0809032B */ j L80240CAC_DE313C /* DE3098 80240C08 00000000 */ nop glabel L80240C0C_DE309C /* DE309C 80240C0C 0260202D */ daddu $a0, $s3, $zero @@ -151,7 +151,7 @@ glabel L80240C1C_DE30AC /* DE30B0 80240C20 0280282D */ daddu $a1, $s4, $zero /* DE30B4 80240C24 0C09020F */ jal func_8024083C_DE2CCC /* DE30B8 80240C28 02A0302D */ daddu $a2, $s5, $zero -/* DE30BC 80240C2C 0809032B */ j .L80240CAC +/* DE30BC 80240C2C 0809032B */ j L80240CAC_DE313C /* DE30C0 80240C30 00000000 */ nop glabel L80240C34_DE30C4 /* DE30C4 80240C34 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L80240C44_DE30D4 /* DE30D8 80240C48 0280282D */ daddu $a1, $s4, $zero /* DE30DC 80240C4C 0C0127B3 */ jal func_80049ECC /* DE30E0 80240C50 02A0302D */ daddu $a2, $s5, $zero -/* DE30E4 80240C54 0809032B */ j .L80240CAC +/* DE30E4 80240C54 0809032B */ j L80240CAC_DE313C /* DE30E8 80240C58 00000000 */ nop glabel L80240C5C_DE30EC /* DE30EC 80240C5C 0260202D */ daddu $a0, $s3, $zero @@ -177,19 +177,18 @@ glabel L80240C6C_DE30FC /* DE3108 80240C78 02A0302D */ daddu $a2, $s5, $zero /* DE310C 80240C7C 8E630070 */ lw $v1, 0x70($s3) /* DE3110 80240C80 2402000E */ addiu $v0, $zero, 0xe -/* DE3114 80240C84 14620009 */ bne $v1, $v0, .L80240CAC +/* DE3114 80240C84 14620009 */ bne $v1, $v0, L80240CAC_DE313C /* DE3118 80240C88 00000000 */ nop glabel L80240C8C_DE311C /* DE311C 80240C8C 0260202D */ daddu $a0, $s3, $zero /* DE3120 80240C90 0280282D */ daddu $a1, $s4, $zero /* DE3124 80240C94 0C0128FA */ jal func_8004A3E8 /* DE3128 80240C98 02A0302D */ daddu $a2, $s5, $zero -/* DE312C 80240C9C 0809032B */ j .L80240CAC +/* DE312C 80240C9C 0809032B */ j L80240CAC_DE313C /* DE3130 80240CA0 00000000 */ nop glabel L80240CA4_DE3134 /* DE3134 80240CA4 0C0129CF */ jal func_8004A73C /* DE3138 80240CA8 0260202D */ daddu $a0, $s3, $zero -.L80240CAC: glabel L80240CAC_DE313C /* DE313C 80240CAC 8FBF0060 */ lw $ra, 0x60($sp) /* DE3140 80240CB0 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s index 7709af18f1..a5bd8b458b 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s @@ -11,7 +11,7 @@ glabel func_802401AC_DE891C /* DE8934 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) /* DE8938 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* DE893C 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* DE8940 802401D0 1040008A */ beqz $v0, .L802403FC +/* DE8940 802401D0 1040008A */ beqz $v0, L802403FC_DE8B6C /* DE8944 802401D4 00031080 */ sll $v0, $v1, 2 /* DE8948 802401D8 3C018024 */ lui $at, %hi(jtbl_80243730_DEBEA0) /* DE894C 802401DC 00220821 */ addu $at, $at, $v0 @@ -62,10 +62,10 @@ glabel L802401EC_DE895C /* DE89FC 8024028C 00021400 */ sll $v0, $v0, 0x10 /* DE8A00 80240290 00021403 */ sra $v0, $v0, 0x10 /* DE8A04 80240294 0043102A */ slt $v0, $v0, $v1 -/* DE8A08 80240298 14400058 */ bnez $v0, .L802403FC +/* DE8A08 80240298 14400058 */ bnez $v0, L802403FC_DE8B6C /* DE8A0C 8024029C 24020001 */ addiu $v0, $zero, 1 /* DE8A10 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* DE8A14 802402A4 080900FF */ j .L802403FC +/* DE8A14 802402A4 080900FF */ j L802403FC_DE8B6C /* DE8A18 802402A8 A6200046 */ sh $zero, 0x46($s1) glabel L802402AC_DE8A1C /* DE8A1C 802402AC 96220046 */ lhu $v0, 0x46($s1) @@ -74,7 +74,7 @@ glabel L802402AC_DE8A1C /* DE8A28 802402B8 00021400 */ sll $v0, $v0, 0x10 /* DE8A2C 802402BC 00021403 */ sra $v0, $v0, 0x10 /* DE8A30 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* DE8A34 802402C4 1440004D */ bnez $v0, .L802403FC +/* DE8A34 802402C4 1440004D */ bnez $v0, L802403FC_DE8B6C /* DE8A38 802402C8 24020002 */ addiu $v0, $zero, 2 /* DE8A3C 802402CC 8E230050 */ lw $v1, 0x50($s1) /* DE8A40 802402D0 A6220044 */ sh $v0, 0x44($s1) @@ -84,7 +84,7 @@ glabel L802402AC_DE8A1C /* DE8A50 802402E0 AC620070 */ sw $v0, 0x70($v1) /* DE8A54 802402E4 8E220050 */ lw $v0, 0x50($s1) /* DE8A58 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* DE8A5C 802402EC 080900FF */ j .L802403FC +/* DE8A5C 802402EC 080900FF */ j L802403FC_DE8B6C /* DE8A60 802402F0 AC400074 */ sw $zero, 0x74($v0) glabel L802402F4_DE8A64 /* DE8A64 802402F4 96220046 */ lhu $v0, 0x46($s1) @@ -93,7 +93,7 @@ glabel L802402F4_DE8A64 /* DE8A70 80240300 00021400 */ sll $v0, $v0, 0x10 /* DE8A74 80240304 00021403 */ sra $v0, $v0, 0x10 /* DE8A78 80240308 2842003C */ slti $v0, $v0, 0x3c -/* DE8A7C 8024030C 1440003B */ bnez $v0, .L802403FC +/* DE8A7C 8024030C 1440003B */ bnez $v0, L802403FC_DE8B6C /* DE8A80 80240310 00000000 */ nop /* DE8A84 80240314 3C013F80 */ lui $at, 0x3f80 /* DE8A88 80240318 44810000 */ mtc1 $at, $f0 @@ -125,7 +125,7 @@ glabel L802402F4_DE8A64 /* DE8AF0 80240380 A6200046 */ sh $zero, 0x46($s1) /* DE8AF4 80240384 AE20002C */ sw $zero, 0x2c($s1) /* DE8AF8 80240388 A6220048 */ sh $v0, 0x48($s1) -/* DE8AFC 8024038C 080900FF */ j .L802403FC +/* DE8AFC 8024038C 080900FF */ j L802403FC_DE8B6C /* DE8B00 80240390 E6200030 */ swc1 $f0, 0x30($s1) glabel L80240394_DE8B04 /* DE8B04 80240394 0000202D */ daddu $a0, $zero, $zero @@ -142,7 +142,7 @@ glabel L80240394_DE8B04 /* DE8B30 802403C0 00021400 */ sll $v0, $v0, 0x10 /* DE8B34 802403C4 00021403 */ sra $v0, $v0, 0x10 /* DE8B38 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* DE8B3C 802403CC 1440000B */ bnez $v0, .L802403FC +/* DE8B3C 802403CC 1440000B */ bnez $v0, L802403FC_DE8B6C /* DE8B40 802403D0 24030001 */ addiu $v1, $zero, 1 /* DE8B44 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) /* DE8B48 802403D8 24020002 */ addiu $v0, $zero, 2 @@ -154,7 +154,6 @@ glabel L80240394_DE8B04 /* DE8B60 802403F0 A6220044 */ sh $v0, 0x44($s1) /* DE8B64 802403F4 A6200046 */ sh $zero, 0x46($s1) /* DE8B68 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -.L802403FC: glabel L802403FC_DE8B6C /* DE8B6C 802403FC 8623004A */ lh $v1, 0x4a($s1) /* DE8B70 80240400 24020001 */ addiu $v0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s index 8cd21443b9..45292bcfc8 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s @@ -122,7 +122,7 @@ glabel func_80240798_DEF638 .L80240958: /* DEF7F8 80240958 8E630070 */ lw $v1, 0x70($s3) /* DEF7FC 8024095C 2C620064 */ sltiu $v0, $v1, 0x64 -/* DEF800 80240960 10400050 */ beqz $v0, .L80240AA4 +/* DEF800 80240960 10400050 */ beqz $v0, L80240AA4_DEF944 /* DEF804 80240964 00031080 */ sll $v0, $v1, 2 /* DEF808 80240968 3C018024 */ lui $at, %hi(jtbl_80247620_DF64C0) /* DEF80C 8024096C 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L8024098C_DEF82C /* DEF830 80240990 0280282D */ daddu $a1, $s4, $zero /* DEF834 80240994 0C0125AE */ jal func_800496B8 /* DEF838 80240998 02A0302D */ daddu $a2, $s5, $zero -/* DEF83C 8024099C 080902A9 */ j .L80240AA4 +/* DEF83C 8024099C 080902A9 */ j L80240AA4_DEF944 /* DEF840 802409A0 00000000 */ nop glabel L802409A4_DEF844 /* DEF844 802409A4 0260202D */ daddu $a0, $s3, $zero @@ -151,7 +151,7 @@ glabel L802409B4_DEF854 /* DEF858 802409B8 0280282D */ daddu $a1, $s4, $zero /* DEF85C 802409BC 0C012701 */ jal func_80049C04 /* DEF860 802409C0 02A0302D */ daddu $a2, $s5, $zero -/* DEF864 802409C4 080902A9 */ j .L80240AA4 +/* DEF864 802409C4 080902A9 */ j L80240AA4_DEF944 /* DEF868 802409C8 00000000 */ nop glabel L802409CC_DEF86C /* DEF86C 802409CC 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L802409DC_DEF87C /* DEF880 802409E0 0280282D */ daddu $a1, $s4, $zero /* DEF884 802409E4 0C0127B3 */ jal func_80049ECC /* DEF888 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* DEF88C 802409EC 080902A9 */ j .L80240AA4 +/* DEF88C 802409EC 080902A9 */ j L80240AA4_DEF944 /* DEF890 802409F0 00000000 */ nop glabel L802409F4_DEF894 /* DEF894 802409F4 0260202D */ daddu $a0, $s3, $zero @@ -177,7 +177,7 @@ glabel L80240A04_DEF8A4 /* DEF8B0 80240A10 02A0302D */ daddu $a2, $s5, $zero /* DEF8B4 80240A14 8E630070 */ lw $v1, 0x70($s3) /* DEF8B8 80240A18 2402000E */ addiu $v0, $zero, 0xe -/* DEF8BC 80240A1C 14620021 */ bne $v1, $v0, .L80240AA4 +/* DEF8BC 80240A1C 14620021 */ bne $v1, $v0, L80240AA4_DEF944 /* DEF8C0 80240A20 00000000 */ nop glabel L80240A24_DEF8C4 /* DEF8C4 80240A24 0260202D */ daddu $a0, $s3, $zero @@ -186,7 +186,7 @@ glabel L80240A24_DEF8C4 /* DEF8D0 80240A30 02A0302D */ daddu $a2, $s5, $zero /* DEF8D4 80240A34 8E630070 */ lw $v1, 0x70($s3) /* DEF8D8 80240A38 2402000F */ addiu $v0, $zero, 0xf -/* DEF8DC 80240A3C 14620019 */ bne $v1, $v0, .L80240AA4 +/* DEF8DC 80240A3C 14620019 */ bne $v1, $v0, L80240AA4_DEF944 /* DEF8E0 80240A40 00000000 */ nop glabel L80240A44_DEF8E4 /* DEF8E4 80240A44 0260202D */ daddu $a0, $s3, $zero @@ -195,7 +195,7 @@ glabel L80240A44_DEF8E4 /* DEF8F0 80240A50 02A0302D */ daddu $a2, $s5, $zero /* DEF8F4 80240A54 8E630070 */ lw $v1, 0x70($s3) /* DEF8F8 80240A58 24020010 */ addiu $v0, $zero, 0x10 -/* DEF8FC 80240A5C 14620011 */ bne $v1, $v0, .L80240AA4 +/* DEF8FC 80240A5C 14620011 */ bne $v1, $v0, L80240AA4_DEF944 /* DEF900 80240A60 00000000 */ nop glabel L80240A64_DEF904 /* DEF904 80240A64 0260202D */ daddu $a0, $s3, $zero @@ -204,19 +204,18 @@ glabel L80240A64_DEF904 /* DEF910 80240A70 02A0302D */ daddu $a2, $s5, $zero /* DEF914 80240A74 8E630070 */ lw $v1, 0x70($s3) /* DEF918 80240A78 24020011 */ addiu $v0, $zero, 0x11 -/* DEF91C 80240A7C 14620009 */ bne $v1, $v0, .L80240AA4 +/* DEF91C 80240A7C 14620009 */ bne $v1, $v0, L80240AA4_DEF944 /* DEF920 80240A80 00000000 */ nop glabel L80240A84_DEF924 /* DEF924 80240A84 0260202D */ daddu $a0, $s3, $zero /* DEF928 80240A88 0280282D */ daddu $a1, $s4, $zero /* DEF92C 80240A8C 0C0901CE */ jal func_80240738_DEF5D8 /* DEF930 80240A90 02A0302D */ daddu $a2, $s5, $zero -/* DEF934 80240A94 080902A9 */ j .L80240AA4 +/* DEF934 80240A94 080902A9 */ j L80240AA4_DEF944 /* DEF938 80240A98 00000000 */ nop glabel L80240A9C_DEF93C /* DEF93C 80240A9C 0C0129CF */ jal func_8004A73C /* DEF940 80240AA0 0260202D */ daddu $a0, $s3, $zero -.L80240AA4: glabel L80240AA4_DEF944 /* DEF944 80240AA4 8FBF0060 */ lw $ra, 0x60($sp) /* DEF948 80240AA8 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s index 91e81b70a8..9a9faa9a3d 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s @@ -122,7 +122,7 @@ glabel func_80240CE0_DEFB80 .L80240EA0: /* DEFD40 80240EA0 8E630070 */ lw $v1, 0x70($s3) /* DEFD44 80240EA4 2C620064 */ sltiu $v0, $v1, 0x64 -/* DEFD48 80240EA8 10400038 */ beqz $v0, .L80240F8C +/* DEFD48 80240EA8 10400038 */ beqz $v0, L80240F8C_DEFE2C /* DEFD4C 80240EAC 00031080 */ sll $v0, $v1, 2 /* DEFD50 80240EB0 3C018024 */ lui $at, %hi(jtbl_802477C0_DF6660) /* DEFD54 80240EB4 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80240ED4_DEFD74 /* DEFD78 80240ED8 0280282D */ daddu $a1, $s4, $zero /* DEFD7C 80240EDC 0C0125AE */ jal func_800496B8 /* DEFD80 80240EE0 02A0302D */ daddu $a2, $s5, $zero -/* DEFD84 80240EE4 080903E3 */ j .L80240F8C +/* DEFD84 80240EE4 080903E3 */ j L80240F8C_DEFE2C /* DEFD88 80240EE8 00000000 */ nop glabel L80240EEC_DEFD8C /* DEFD8C 80240EEC 0260202D */ daddu $a0, $s3, $zero @@ -151,7 +151,7 @@ glabel L80240EFC_DEFD9C /* DEFDA0 80240F00 0280282D */ daddu $a1, $s4, $zero /* DEFDA4 80240F04 0C0902C7 */ jal func_80240B1C_DEF9BC /* DEFDA8 80240F08 02A0302D */ daddu $a2, $s5, $zero -/* DEFDAC 80240F0C 080903E3 */ j .L80240F8C +/* DEFDAC 80240F0C 080903E3 */ j L80240F8C_DEFE2C /* DEFDB0 80240F10 00000000 */ nop glabel L80240F14_DEFDB4 /* DEFDB4 80240F14 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L80240F24_DEFDC4 /* DEFDC8 80240F28 0280282D */ daddu $a1, $s4, $zero /* DEFDCC 80240F2C 0C0127B3 */ jal func_80049ECC /* DEFDD0 80240F30 02A0302D */ daddu $a2, $s5, $zero -/* DEFDD4 80240F34 080903E3 */ j .L80240F8C +/* DEFDD4 80240F34 080903E3 */ j L80240F8C_DEFE2C /* DEFDD8 80240F38 00000000 */ nop glabel L80240F3C_DEFDDC /* DEFDDC 80240F3C 0260202D */ daddu $a0, $s3, $zero @@ -177,19 +177,18 @@ glabel L80240F4C_DEFDEC /* DEFDF8 80240F58 02A0302D */ daddu $a2, $s5, $zero /* DEFDFC 80240F5C 8E630070 */ lw $v1, 0x70($s3) /* DEFE00 80240F60 2402000E */ addiu $v0, $zero, 0xe -/* DEFE04 80240F64 14620009 */ bne $v1, $v0, .L80240F8C +/* DEFE04 80240F64 14620009 */ bne $v1, $v0, L80240F8C_DEFE2C /* DEFE08 80240F68 00000000 */ nop glabel L80240F6C_DEFE0C /* DEFE0C 80240F6C 0260202D */ daddu $a0, $s3, $zero /* DEFE10 80240F70 0280282D */ daddu $a1, $s4, $zero /* DEFE14 80240F74 0C0128FA */ jal func_8004A3E8 /* DEFE18 80240F78 02A0302D */ daddu $a2, $s5, $zero -/* DEFE1C 80240F7C 080903E3 */ j .L80240F8C +/* DEFE1C 80240F7C 080903E3 */ j L80240F8C_DEFE2C /* DEFE20 80240F80 00000000 */ nop glabel L80240F84_DEFE24 /* DEFE24 80240F84 0C0129CF */ jal func_8004A73C /* DEFE28 80240F88 0260202D */ daddu $a0, $s3, $zero -.L80240F8C: glabel L80240F8C_DEFE2C /* DEFE2C 80240F8C 8FBF0060 */ lw $ra, 0x60($sp) /* DEFE30 80240F90 8FB5005C */ lw $s5, 0x5c($sp) 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 62651cfd31..690c18bc5f 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 @@ -64,7 +64,7 @@ glabel func_802422C0_DF1160 .L802423A8: /* DF1248 802423A8 8E830070 */ lw $v1, 0x70($s4) /* DF124C 802423AC 2C62000F */ sltiu $v0, $v1, 0xf -/* DF1250 802423B0 10400034 */ beqz $v0, .L80242484 +/* DF1250 802423B0 10400034 */ beqz $v0, L80242484_DF1324 /* DF1254 802423B4 00031080 */ sll $v0, $v1, 2 /* DF1258 802423B8 3C018024 */ lui $at, %hi(jtbl_80247968_DF6808) /* DF125C 802423BC 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80242474_DF1314 /* DF1318 80242478 0200282D */ daddu $a1, $s0, $zero /* DF131C 8024247C 0C090783 */ jal func_80241E0C_DF0CAC /* DF1320 80242480 0260302D */ daddu $a2, $s3, $zero -.L80242484: glabel L80242484_DF1324 /* DF1324 80242484 0000102D */ daddu $v0, $zero, $zero .L80242488: diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s index 46b2ea6bf9..b1c266d9e4 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s @@ -101,7 +101,7 @@ glabel func_802433A0_DF2240 .L8024350C: /* DF23AC 8024350C 8E630070 */ lw $v1, 0x70($s3) /* DF23B0 80243510 2C620064 */ sltiu $v0, $v1, 0x64 -/* DF23B4 80243514 10400060 */ beqz $v0, .L80243698 +/* DF23B4 80243514 10400060 */ beqz $v0, L80243698_DF2538 /* DF23B8 80243518 00031080 */ sll $v0, $v1, 2 /* DF23BC 8024351C 3C018024 */ lui $at, %hi(jtbl_802479D0_DF6870) /* DF23C0 80243520 00220821 */ addu $at, $at, $v0 @@ -118,7 +118,7 @@ glabel L80243540_DF23E0 /* DF23E4 80243544 0200282D */ daddu $a1, $s0, $zero /* DF23E8 80243548 0C0125AE */ jal func_800496B8 /* DF23EC 8024354C 02A0302D */ daddu $a2, $s5, $zero -/* DF23F0 80243550 08090DA6 */ j .L80243698 +/* DF23F0 80243550 08090DA6 */ j L80243698_DF2538 /* DF23F4 80243554 00000000 */ nop glabel L80243558_DF23F8 /* DF23F8 80243558 0260202D */ daddu $a0, $s3, $zero @@ -130,7 +130,7 @@ glabel L80243568_DF2408 /* DF240C 8024356C 0200282D */ daddu $a1, $s0, $zero /* DF2410 80243570 0C012701 */ jal func_80049C04 /* DF2414 80243574 02A0302D */ daddu $a2, $s5, $zero -/* DF2418 80243578 08090DA6 */ j .L80243698 +/* DF2418 80243578 08090DA6 */ j L80243698_DF2538 /* DF241C 8024357C 00000000 */ nop glabel L80243580_DF2420 /* DF2420 80243580 0260202D */ daddu $a0, $s3, $zero @@ -142,7 +142,7 @@ glabel L80243590_DF2430 /* DF2434 80243594 0200282D */ daddu $a1, $s0, $zero /* DF2438 80243598 0C0127B3 */ jal func_80049ECC /* DF243C 8024359C 02A0302D */ daddu $a2, $s5, $zero -/* DF2440 802435A0 08090DA6 */ j .L80243698 +/* DF2440 802435A0 08090DA6 */ j L80243698_DF2538 /* DF2444 802435A4 00000000 */ nop glabel L802435A8_DF2448 /* DF2448 802435A8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -170,7 +170,7 @@ glabel L802435A8_DF2448 /* DF249C 802435FC 02A0382D */ daddu $a3, $s5, $zero /* DF24A0 80243600 8E630070 */ lw $v1, 0x70($s3) /* DF24A4 80243604 2402000C */ addiu $v0, $zero, 0xc -/* DF24A8 80243608 14620023 */ bne $v1, $v0, .L80243698 +/* DF24A8 80243608 14620023 */ bne $v1, $v0, L80243698_DF2538 /* DF24AC 8024360C 00000000 */ nop /* DF24B0 80243610 0260202D */ daddu $a0, $s3, $zero .L80243614: @@ -182,39 +182,38 @@ glabel L80243620_DF24C0 /* DF24C4 80243624 0200282D */ daddu $a1, $s0, $zero /* DF24C8 80243628 0C012849 */ jal func_8004A124 /* DF24CC 8024362C 02A0302D */ daddu $a2, $s5, $zero -/* DF24D0 80243630 08090DA6 */ j .L80243698 +/* DF24D0 80243630 08090DA6 */ j L80243698_DF2538 /* DF24D4 80243634 00000000 */ nop glabel L80243638_DF24D8 /* DF24D8 80243638 0260202D */ daddu $a0, $s3, $zero /* DF24DC 8024363C 0200282D */ daddu $a1, $s0, $zero /* DF24E0 80243640 0C0128FA */ jal func_8004A3E8 /* DF24E4 80243644 02A0302D */ daddu $a2, $s5, $zero -/* DF24E8 80243648 08090DA6 */ j .L80243698 +/* DF24E8 80243648 08090DA6 */ j L80243698_DF2538 /* DF24EC 8024364C 00000000 */ nop glabel L80243650_DF24F0 /* DF24F0 80243650 0C0909F8 */ jal func_802427E0_DF1680 /* DF24F4 80243654 0260202D */ daddu $a0, $s3, $zero -/* DF24F8 80243658 08090DA6 */ j .L80243698 +/* DF24F8 80243658 08090DA6 */ j L80243698_DF2538 /* DF24FC 8024365C 00000000 */ nop glabel L80243660_DF2500 /* DF2500 80243660 0C090A38 */ jal omo_17_UnkSetDurationFunc /* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero -/* DF2508 80243668 08090DA6 */ j .L80243698 +/* DF2508 80243668 08090DA6 */ j L80243698_DF2538 /* DF250C 8024366C 00000000 */ nop glabel L80243670_DF2510 /* DF2510 80243670 0C090A49 */ jal omo_17_UnkNpcAIFunc9 /* DF2514 80243674 0260202D */ daddu $a0, $s3, $zero -/* DF2518 80243678 08090DA6 */ j .L80243698 +/* DF2518 80243678 08090DA6 */ j L80243698_DF2538 /* DF251C 8024367C 00000000 */ nop glabel L80243680_DF2520 /* DF2520 80243680 0C090A71 */ jal omo_17_UnkDurationCheck /* DF2524 80243684 0260202D */ daddu $a0, $s3, $zero -/* DF2528 80243688 08090DA6 */ j .L80243698 +/* DF2528 80243688 08090DA6 */ j L80243698_DF2538 /* DF252C 8024368C 00000000 */ nop glabel L80243690_DF2530 /* DF2530 80243690 0C0129CF */ jal func_8004A73C /* DF2534 80243694 0260202D */ daddu $a0, $s3, $zero -.L80243698: glabel L80243698_DF2538 /* DF2538 80243698 8FBF0048 */ lw $ra, 0x48($sp) /* DF253C 8024369C 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s b/ver/us/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s index 24ba826172..960b3cb99e 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s @@ -85,7 +85,7 @@ glabel func_802401B0_D54840 .L802402EC: /* D5497C 802402EC 8E630070 */ lw $v1, 0x70($s3) /* D54980 802402F0 2C620010 */ sltiu $v0, $v1, 0x10 -/* D54984 802402F4 10400185 */ beqz $v0, .L8024090C +/* D54984 802402F4 10400185 */ beqz $v0, L8024090C_D54F9C /* D54988 802402F8 00031080 */ sll $v0, $v1, 2 /* D5498C 802402FC 3C018024 */ lui $at, %hi(jtbl_802414D0_D55B60) /* D54990 80240300 00220821 */ addu $at, $at, $v0 @@ -259,7 +259,7 @@ glabel L802404AC_D54B3C /* D54C04 80240574 E620001C */ swc1 $f0, 0x1c($s1) /* D54C08 80240578 4604103C */ c.lt.s $f2, $f4 /* D54C0C 8024057C 00000000 */ nop -/* D54C10 80240580 450000E2 */ bc1f .L8024090C +/* D54C10 80240580 450000E2 */ bc1f L8024090C_D54F9C /* D54C14 80240584 E622003C */ swc1 $f2, 0x3c($s1) /* D54C18 80240588 2402000C */ addiu $v0, $zero, 0xc /* D54C1C 8024058C E624003C */ swc1 $f4, 0x3c($s1) @@ -475,7 +475,7 @@ glabel L802406A0_D54D30 /* D54F38 802408A8 C6220068 */ lwc1 $f2, 0x68($s1) /* D54F3C 802408AC 4600103C */ c.lt.s $f2, $f0 /* D54F40 802408B0 00000000 */ nop -/* D54F44 802408B4 45000015 */ bc1f .L8024090C +/* D54F44 802408B4 45000015 */ bc1f L8024090C_D54F9C /* D54F48 802408B8 2402000E */ addiu $v0, $zero, 0xe /* D54F4C 802408BC E622003C */ swc1 $f2, 0x3c($s1) /* D54F50 802408C0 AE620070 */ sw $v0, 0x70($s3) @@ -497,9 +497,8 @@ glabel L802408F4_D54F84 /* D54F88 802408F8 2442FFFF */ addiu $v0, $v0, -1 /* D54F8C 802408FC A622008E */ sh $v0, 0x8e($s1) /* D54F90 80240900 00021400 */ sll $v0, $v0, 0x10 -/* D54F94 80240904 58400001 */ blezl $v0, .L8024090C +/* D54F94 80240904 58400001 */ blezl $v0, L8024090C_D54F9C /* D54F98 80240908 AE600070 */ sw $zero, 0x70($s3) -.L8024090C: glabel L8024090C_D54F9C /* D54F9C 8024090C 0000102D */ daddu $v0, $zero, $zero .L80240910: diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s index 15e9108f60..5930348ad2 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s @@ -85,7 +85,7 @@ glabel func_80240F20_D601D0 .L8024105C: /* D6030C 8024105C 8E630070 */ lw $v1, 0x70($s3) /* D60310 80241060 2C620010 */ sltiu $v0, $v1, 0x10 -/* D60314 80241064 10400185 */ beqz $v0, .L8024167C +/* D60314 80241064 10400185 */ beqz $v0, L8024167C_D6092C /* D60318 80241068 00031080 */ sll $v0, $v1, 2 /* D6031C 8024106C 3C018024 */ lui $at, %hi(jtbl_80242200_D614B0) /* D60320 80241070 00220821 */ addu $at, $at, $v0 @@ -259,7 +259,7 @@ glabel L8024121C_D604CC /* D60594 802412E4 E620001C */ swc1 $f0, 0x1c($s1) /* D60598 802412E8 4604103C */ c.lt.s $f2, $f4 /* D6059C 802412EC 00000000 */ nop -/* D605A0 802412F0 450000E2 */ bc1f .L8024167C +/* D605A0 802412F0 450000E2 */ bc1f L8024167C_D6092C /* D605A4 802412F4 E622003C */ swc1 $f2, 0x3c($s1) /* D605A8 802412F8 2402000C */ addiu $v0, $zero, 0xc /* D605AC 802412FC E624003C */ swc1 $f4, 0x3c($s1) @@ -475,7 +475,7 @@ glabel L80241410_D606C0 /* D608C8 80241618 C6220068 */ lwc1 $f2, 0x68($s1) /* D608CC 8024161C 4600103C */ c.lt.s $f2, $f0 /* D608D0 80241620 00000000 */ nop -/* D608D4 80241624 45000015 */ bc1f .L8024167C +/* D608D4 80241624 45000015 */ bc1f L8024167C_D6092C /* D608D8 80241628 2402000E */ addiu $v0, $zero, 0xe /* D608DC 8024162C E622003C */ swc1 $f2, 0x3c($s1) /* D608E0 80241630 AE620070 */ sw $v0, 0x70($s3) @@ -497,9 +497,8 @@ glabel L80241664_D60914 /* D60918 80241668 2442FFFF */ addiu $v0, $v0, -1 /* D6091C 8024166C A622008E */ sh $v0, 0x8e($s1) /* D60920 80241670 00021400 */ sll $v0, $v0, 0x10 -/* D60924 80241674 58400001 */ blezl $v0, .L8024167C +/* D60924 80241674 58400001 */ blezl $v0, L8024167C_D6092C /* D60928 80241678 AE600070 */ sw $zero, 0x70($s3) -.L8024167C: glabel L8024167C_D6092C /* D6092C 8024167C 0000102D */ daddu $v0, $zero, $zero .L80241680: diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s index 88a1655716..52cb9d7ebb 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s @@ -11,7 +11,7 @@ glabel func_802401CC_D86BCC /* D86BE4 802401E4 3C108011 */ lui $s0, %hi(gPlayerStatus) /* D86BE8 802401E8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* D86BEC 802401EC 2C620005 */ sltiu $v0, $v1, 5 -/* D86BF0 802401F0 1040008A */ beqz $v0, .L8024041C +/* D86BF0 802401F0 1040008A */ beqz $v0, L8024041C_D86E1C /* D86BF4 802401F4 00031080 */ sll $v0, $v1, 2 /* D86BF8 802401F8 3C018024 */ lui $at, %hi(jtbl_80242CB0_D896B0) /* D86BFC 802401FC 00220821 */ addu $at, $at, $v0 @@ -62,10 +62,10 @@ glabel L8024020C_D86C0C /* D86CAC 802402AC 00021400 */ sll $v0, $v0, 0x10 /* D86CB0 802402B0 00021403 */ sra $v0, $v0, 0x10 /* D86CB4 802402B4 0043102A */ slt $v0, $v0, $v1 -/* D86CB8 802402B8 14400058 */ bnez $v0, .L8024041C +/* D86CB8 802402B8 14400058 */ bnez $v0, L8024041C_D86E1C /* D86CBC 802402BC 24020001 */ addiu $v0, $zero, 1 /* D86CC0 802402C0 A6220044 */ sh $v0, 0x44($s1) -/* D86CC4 802402C4 08090107 */ j .L8024041C +/* D86CC4 802402C4 08090107 */ j L8024041C_D86E1C /* D86CC8 802402C8 A6200046 */ sh $zero, 0x46($s1) glabel L802402CC_D86CCC /* D86CCC 802402CC 96220046 */ lhu $v0, 0x46($s1) @@ -74,7 +74,7 @@ glabel L802402CC_D86CCC /* D86CD8 802402D8 00021400 */ sll $v0, $v0, 0x10 /* D86CDC 802402DC 00021403 */ sra $v0, $v0, 0x10 /* D86CE0 802402E0 2842003C */ slti $v0, $v0, 0x3c -/* D86CE4 802402E4 1440004D */ bnez $v0, .L8024041C +/* D86CE4 802402E4 1440004D */ bnez $v0, L8024041C_D86E1C /* D86CE8 802402E8 24020002 */ addiu $v0, $zero, 2 /* D86CEC 802402EC 8E230050 */ lw $v1, 0x50($s1) /* D86CF0 802402F0 A6220044 */ sh $v0, 0x44($s1) @@ -84,7 +84,7 @@ glabel L802402CC_D86CCC /* D86D00 80240300 AC620070 */ sw $v0, 0x70($v1) /* D86D04 80240304 8E220050 */ lw $v0, 0x50($s1) /* D86D08 80240308 8C42000C */ lw $v0, 0xc($v0) -/* D86D0C 8024030C 08090107 */ j .L8024041C +/* D86D0C 8024030C 08090107 */ j L8024041C_D86E1C /* D86D10 80240310 AC400074 */ sw $zero, 0x74($v0) glabel L80240314_D86D14 /* D86D14 80240314 96220046 */ lhu $v0, 0x46($s1) @@ -93,7 +93,7 @@ glabel L80240314_D86D14 /* D86D20 80240320 00021400 */ sll $v0, $v0, 0x10 /* D86D24 80240324 00021403 */ sra $v0, $v0, 0x10 /* D86D28 80240328 2842003C */ slti $v0, $v0, 0x3c -/* D86D2C 8024032C 1440003B */ bnez $v0, .L8024041C +/* D86D2C 8024032C 1440003B */ bnez $v0, L8024041C_D86E1C /* D86D30 80240330 00000000 */ nop /* D86D34 80240334 3C013F80 */ lui $at, 0x3f80 /* D86D38 80240338 44810000 */ mtc1 $at, $f0 @@ -125,7 +125,7 @@ glabel L80240314_D86D14 /* D86DA0 802403A0 A6200046 */ sh $zero, 0x46($s1) /* D86DA4 802403A4 AE20002C */ sw $zero, 0x2c($s1) /* D86DA8 802403A8 A6220048 */ sh $v0, 0x48($s1) -/* D86DAC 802403AC 08090107 */ j .L8024041C +/* D86DAC 802403AC 08090107 */ j L8024041C_D86E1C /* D86DB0 802403B0 E6200030 */ swc1 $f0, 0x30($s1) glabel L802403B4_D86DB4 /* D86DB4 802403B4 0000202D */ daddu $a0, $zero, $zero @@ -142,7 +142,7 @@ glabel L802403B4_D86DB4 /* D86DE0 802403E0 00021400 */ sll $v0, $v0, 0x10 /* D86DE4 802403E4 00021403 */ sra $v0, $v0, 0x10 /* D86DE8 802403E8 28420078 */ slti $v0, $v0, 0x78 -/* D86DEC 802403EC 1440000B */ bnez $v0, .L8024041C +/* D86DEC 802403EC 1440000B */ bnez $v0, L8024041C_D86E1C /* D86DF0 802403F0 24030001 */ addiu $v1, $zero, 1 /* D86DF4 802403F4 C620002C */ lwc1 $f0, 0x2c($s1) /* D86DF8 802403F8 24020002 */ addiu $v0, $zero, 2 @@ -154,7 +154,6 @@ glabel L802403B4_D86DB4 /* D86E10 80240410 A6220044 */ sh $v0, 0x44($s1) /* D86E14 80240414 A6200046 */ sh $zero, 0x46($s1) /* D86E18 80240418 E6200034 */ swc1 $f0, 0x34($s1) -.L8024041C: glabel L8024041C_D86E1C /* D86E1C 8024041C 8623004A */ lh $v1, 0x4a($s1) /* D86E20 80240420 24020001 */ addiu $v0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index 4c8a5ae09f..dd82092336 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -122,7 +122,7 @@ glabel func_80241AB4_D8ED04 .L80241C74: /* D8EEC4 80241C74 8E830070 */ lw $v1, 0x70($s4) /* D8EEC8 80241C78 2C620064 */ sltiu $v0, $v1, 0x64 -/* D8EECC 80241C7C 10400042 */ beqz $v0, .L80241D88 +/* D8EECC 80241C7C 10400042 */ beqz $v0, L80241D88_D8EFD8 /* D8EED0 80241C80 00031080 */ sll $v0, $v1, 2 /* D8EED4 80241C84 3C018024 */ lui $at, %hi(jtbl_80243FF0_D91240) /* D8EED8 80241C88 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80241CA8_D8EEF8 /* D8EEFC 80241CAC 0260282D */ daddu $a1, $s3, $zero /* D8EF00 80241CB0 0C09041E */ jal func_80241078_D8E2C8 /* D8EF04 80241CB4 02A0302D */ daddu $a2, $s5, $zero -/* D8EF08 80241CB8 08090762 */ j .L80241D88 +/* D8EF08 80241CB8 08090762 */ j L80241D88_D8EFD8 /* D8EF0C 80241CBC 00000000 */ nop glabel L80241CC0_D8EF10 /* D8EF10 80241CC0 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80241CD0_D8EF20 /* D8EF24 80241CD4 0260282D */ daddu $a1, $s3, $zero /* D8EF28 80241CD8 0C0904F8 */ jal func_802413E0_D8E630 /* D8EF2C 80241CDC 02A0302D */ daddu $a2, $s5, $zero -/* D8EF30 80241CE0 08090762 */ j .L80241D88 +/* D8EF30 80241CE0 08090762 */ j L80241D88_D8EFD8 /* D8EF34 80241CE4 00000000 */ nop glabel L80241CE8_D8EF38 /* D8EF38 80241CE8 0280202D */ daddu $a0, $s4, $zero /* D8EF3C 80241CEC 0260282D */ daddu $a1, $s3, $zero /* D8EF40 80241CF0 0C090567 */ jal func_8024159C_D8E7EC /* D8EF44 80241CF4 02A0302D */ daddu $a2, $s5, $zero -/* D8EF48 80241CF8 08090762 */ j .L80241D88 +/* D8EF48 80241CF8 08090762 */ j L80241D88_D8EFD8 /* D8EF4C 80241CFC 00000000 */ nop glabel L80241D00_D8EF50 /* D8EF50 80241D00 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80241D10_D8EF60 /* D8EF64 80241D14 0260282D */ daddu $a1, $s3, $zero /* D8EF68 80241D18 0C0905B1 */ jal pra_35_NpcJumpFunc /* D8EF6C 80241D1C 02A0302D */ daddu $a2, $s5, $zero -/* D8EF70 80241D20 08090762 */ j .L80241D88 +/* D8EF70 80241D20 08090762 */ j L80241D88_D8EFD8 /* D8EF74 80241D24 00000000 */ nop glabel L80241D28_D8EF78 /* D8EF78 80241D28 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80241D38_D8EF88 /* D8EF8C 80241D3C 0260282D */ daddu $a1, $s3, $zero /* D8EF90 80241D40 0C09061B */ jal func_8024186C_D8EABC /* D8EF94 80241D44 02A0302D */ daddu $a2, $s5, $zero -/* D8EF98 80241D48 08090762 */ j .L80241D88 +/* D8EF98 80241D48 08090762 */ j L80241D88_D8EFD8 /* D8EF9C 80241D4C 00000000 */ nop glabel L80241D50_D8EFA0 /* D8EFA0 80241D50 0280202D */ daddu $a0, $s4, $zero /* D8EFA4 80241D54 0260282D */ daddu $a1, $s3, $zero /* D8EFA8 80241D58 0C090663 */ jal pra_35_UnkNpcDurationFlagFunc /* D8EFAC 80241D5C 02A0302D */ daddu $a2, $s5, $zero -/* D8EFB0 80241D60 08090762 */ j .L80241D88 +/* D8EFB0 80241D60 08090762 */ j L80241D88_D8EFD8 /* D8EFB4 80241D64 00000000 */ nop glabel L80241D68_D8EFB8 /* D8EFB8 80241D68 0280202D */ daddu $a0, $s4, $zero /* D8EFBC 80241D6C 0260282D */ daddu $a1, $s3, $zero /* D8EFC0 80241D70 0C09067D */ jal func_802419F4_D8EC44 /* D8EFC4 80241D74 02A0302D */ daddu $a2, $s5, $zero -/* D8EFC8 80241D78 08090762 */ j .L80241D88 +/* D8EFC8 80241D78 08090762 */ j L80241D88_D8EFD8 /* D8EFCC 80241D7C 00000000 */ nop glabel L80241D80_D8EFD0 /* D8EFD0 80241D80 0C0129CF */ jal func_8004A73C /* D8EFD4 80241D84 0280202D */ daddu $a0, $s4, $zero -.L80241D88: glabel L80241D88_D8EFD8 /* D8EFD8 80241D88 8FBF0060 */ lw $ra, 0x60($sp) /* D8EFDC 80241D8C 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index 67e50e1087..38eac10123 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s @@ -98,7 +98,7 @@ glabel func_802423CC_D8F61C .L8024252C: /* D8F77C 8024252C 8E430070 */ lw $v1, 0x70($s2) /* D8F780 80242530 2C620064 */ sltiu $v0, $v1, 0x64 -/* D8F784 80242534 1040004E */ beqz $v0, .L80242670 +/* D8F784 80242534 1040004E */ beqz $v0, L80242670_D8F8C0 /* D8F788 80242538 00031080 */ sll $v0, $v1, 2 /* D8F78C 8024253C 3C018024 */ lui $at, %hi(jtbl_80244188_D913D8) /* D8F790 80242540 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80242560_D8F7B0 /* D8F7B4 80242564 0260282D */ daddu $a1, $s3, $zero /* D8F7B8 80242568 0C09041E */ jal func_80241078_D8E2C8 /* D8F7BC 8024256C 0280302D */ daddu $a2, $s4, $zero -/* D8F7C0 80242570 0809099C */ j .L80242670 +/* D8F7C0 80242570 0809099C */ j L80242670_D8F8C0 /* D8F7C4 80242574 00000000 */ nop glabel L80242578_D8F7C8 /* D8F7C8 80242578 0240202D */ daddu $a0, $s2, $zero @@ -127,14 +127,14 @@ glabel L80242588_D8F7D8 /* D8F7DC 8024258C 0260282D */ daddu $a1, $s3, $zero /* D8F7E0 80242590 0C0904F8 */ jal func_802413E0_D8E630 /* D8F7E4 80242594 0280302D */ daddu $a2, $s4, $zero -/* D8F7E8 80242598 0809099C */ j .L80242670 +/* D8F7E8 80242598 0809099C */ j L80242670_D8F8C0 /* D8F7EC 8024259C 00000000 */ nop glabel L802425A0_D8F7F0 /* D8F7F0 802425A0 0240202D */ daddu $a0, $s2, $zero /* D8F7F4 802425A4 0260282D */ daddu $a1, $s3, $zero /* D8F7F8 802425A8 0C090567 */ jal func_8024159C_D8E7EC /* D8F7FC 802425AC 0280302D */ daddu $a2, $s4, $zero -/* D8F800 802425B0 0809099C */ j .L80242670 +/* D8F800 802425B0 0809099C */ j L80242670_D8F8C0 /* D8F804 802425B4 00000000 */ nop glabel L802425B8_D8F808 /* D8F808 802425B8 0240202D */ daddu $a0, $s2, $zero @@ -146,7 +146,7 @@ glabel L802425C8_D8F818 /* D8F81C 802425CC 0260282D */ daddu $a1, $s3, $zero /* D8F820 802425D0 0C0905B1 */ jal pra_35_NpcJumpFunc /* D8F824 802425D4 0280302D */ daddu $a2, $s4, $zero -/* D8F828 802425D8 0809099C */ j .L80242670 +/* D8F828 802425D8 0809099C */ j L80242670_D8F8C0 /* D8F82C 802425DC 00000000 */ nop glabel L802425E0_D8F830 /* D8F830 802425E0 0240202D */ daddu $a0, $s2, $zero @@ -158,14 +158,14 @@ glabel L802425F0_D8F840 /* D8F844 802425F4 0260282D */ daddu $a1, $s3, $zero /* D8F848 802425F8 0C09061B */ jal func_8024186C_D8EABC /* D8F84C 802425FC 0280302D */ daddu $a2, $s4, $zero -/* D8F850 80242600 0809099C */ j .L80242670 +/* D8F850 80242600 0809099C */ j L80242670_D8F8C0 /* D8F854 80242604 00000000 */ nop glabel L80242608_D8F858 /* D8F858 80242608 0240202D */ daddu $a0, $s2, $zero /* D8F85C 8024260C 0260282D */ daddu $a1, $s3, $zero /* D8F860 80242610 0C090663 */ jal pra_35_UnkNpcDurationFlagFunc /* D8F864 80242614 0280302D */ daddu $a2, $s4, $zero -/* D8F868 80242618 0809099C */ j .L80242670 +/* D8F868 80242618 0809099C */ j L80242670_D8F8C0 /* D8F86C 8024261C 00000000 */ nop glabel L80242620_D8F870 /* D8F870 80242620 0C09076C */ jal pra_35_UnkNpcAIFunc6 @@ -175,24 +175,23 @@ glabel L80242628_D8F878 /* D8F87C 8024262C 0240202D */ daddu $a0, $s2, $zero /* D8F880 80242630 8E430070 */ lw $v1, 0x70($s2) /* D8F884 80242634 24020020 */ addiu $v0, $zero, 0x20 -/* D8F888 80242638 1462000D */ bne $v1, $v0, .L80242670 +/* D8F888 80242638 1462000D */ bne $v1, $v0, L80242670_D8F8C0 /* D8F88C 8024263C 00000000 */ nop glabel L80242640_D8F890 /* D8F890 80242640 0C0907A3 */ jal pra_35_UnkNpcAIFunc8 /* D8F894 80242644 0240202D */ daddu $a0, $s2, $zero /* D8F898 80242648 8E430070 */ lw $v1, 0x70($s2) /* D8F89C 8024264C 24020021 */ addiu $v0, $zero, 0x21 -/* D8F8A0 80242650 14620007 */ bne $v1, $v0, .L80242670 +/* D8F8A0 80242650 14620007 */ bne $v1, $v0, L80242670_D8F8C0 /* D8F8A4 80242654 00000000 */ nop glabel L80242658_D8F8A8 /* D8F8A8 80242658 0C0907D9 */ jal pra_35_UnkNpcAIFunc5 /* D8F8AC 8024265C 0240202D */ daddu $a0, $s2, $zero -/* D8F8B0 80242660 0809099C */ j .L80242670 +/* D8F8B0 80242660 0809099C */ j L80242670_D8F8C0 /* D8F8B4 80242664 00000000 */ nop glabel L80242668_D8F8B8 /* D8F8B8 80242668 0C0129CF */ jal func_8004A73C /* D8F8BC 8024266C 0240202D */ daddu $a0, $s2, $zero -.L80242670: glabel L80242670_D8F8C0 /* D8F8C0 80242670 8FBF0048 */ lw $ra, 0x48($sp) /* D8F8C4 80242674 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s index c963ab7f53..953d90c828 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s @@ -98,7 +98,7 @@ glabel func_80242698_D8F8E8 .L802427F8: /* D8FA48 802427F8 8E430070 */ lw $v1, 0x70($s2) /* D8FA4C 802427FC 2C620064 */ sltiu $v0, $v1, 0x64 -/* D8FA50 80242800 10400048 */ beqz $v0, .L80242924 +/* D8FA50 80242800 10400048 */ beqz $v0, L80242924_D8FB74 /* D8FA54 80242804 00031080 */ sll $v0, $v1, 2 /* D8FA58 80242808 3C018024 */ lui $at, %hi(jtbl_80244318_D91568) /* D8FA5C 8024280C 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L8024282C_D8FA7C /* D8FA80 80242830 0260282D */ daddu $a1, $s3, $zero /* D8FA84 80242834 0C0125AE */ jal func_800496B8 /* D8FA88 80242838 0280302D */ daddu $a2, $s4, $zero -/* D8FA8C 8024283C 08090A49 */ j .L80242924 +/* D8FA8C 8024283C 08090A49 */ j L80242924_D8FB74 /* D8FA90 80242840 00000000 */ nop glabel L80242844_D8FA94 /* D8FA94 80242844 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80242854_D8FAA4 /* D8FAA8 80242858 0260282D */ daddu $a1, $s3, $zero /* D8FAAC 8024285C 0C012701 */ jal func_80049C04 /* D8FAB0 80242860 0280302D */ daddu $a2, $s4, $zero -/* D8FAB4 80242864 08090A49 */ j .L80242924 +/* D8FAB4 80242864 08090A49 */ j L80242924_D8FB74 /* D8FAB8 80242868 00000000 */ nop glabel L8024286C_D8FABC /* D8FABC 8024286C 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L8024287C_D8FACC /* D8FAD0 80242880 0260282D */ daddu $a1, $s3, $zero /* D8FAD4 80242884 0C0127B3 */ jal func_80049ECC /* D8FAD8 80242888 0280302D */ daddu $a2, $s4, $zero -/* D8FADC 8024288C 08090A49 */ j .L80242924 +/* D8FADC 8024288C 08090A49 */ j L80242924_D8FB74 /* D8FAE0 80242890 00000000 */ nop glabel L80242894_D8FAE4 /* D8FAE4 80242894 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L802428A4_D8FAF4 /* D8FAF8 802428A8 0260282D */ daddu $a1, $s3, $zero /* D8FAFC 802428AC 0C012849 */ jal func_8004A124 /* D8FB00 802428B0 0280302D */ daddu $a2, $s4, $zero -/* D8FB04 802428B4 08090A49 */ j .L80242924 +/* D8FB04 802428B4 08090A49 */ j L80242924_D8FB74 /* D8FB08 802428B8 00000000 */ nop glabel L802428BC_D8FB0C /* D8FB0C 802428BC 0240202D */ daddu $a0, $s2, $zero /* D8FB10 802428C0 0260282D */ daddu $a1, $s3, $zero /* D8FB14 802428C4 0C0128FA */ jal func_8004A3E8 /* D8FB18 802428C8 0280302D */ daddu $a2, $s4, $zero -/* D8FB1C 802428CC 08090A49 */ j .L80242924 +/* D8FB1C 802428CC 08090A49 */ j L80242924_D8FB74 /* D8FB20 802428D0 00000000 */ nop glabel L802428D4_D8FB24 /* D8FB24 802428D4 0C09076C */ jal pra_35_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L802428DC_D8FB2C /* D8FB30 802428E0 0240202D */ daddu $a0, $s2, $zero /* D8FB34 802428E4 8E430070 */ lw $v1, 0x70($s2) /* D8FB38 802428E8 24020020 */ addiu $v0, $zero, 0x20 -/* D8FB3C 802428EC 1462000D */ bne $v1, $v0, .L80242924 +/* D8FB3C 802428EC 1462000D */ bne $v1, $v0, L80242924_D8FB74 /* D8FB40 802428F0 00000000 */ nop glabel L802428F4_D8FB44 /* D8FB44 802428F4 0C0907A3 */ jal pra_35_UnkNpcAIFunc8 /* D8FB48 802428F8 0240202D */ daddu $a0, $s2, $zero /* D8FB4C 802428FC 8E430070 */ lw $v1, 0x70($s2) /* D8FB50 80242900 24020021 */ addiu $v0, $zero, 0x21 -/* D8FB54 80242904 14620007 */ bne $v1, $v0, .L80242924 +/* D8FB54 80242904 14620007 */ bne $v1, $v0, L80242924_D8FB74 /* D8FB58 80242908 00000000 */ nop glabel L8024290C_D8FB5C /* D8FB5C 8024290C 0C0907D9 */ jal pra_35_UnkNpcAIFunc5 /* D8FB60 80242910 0240202D */ daddu $a0, $s2, $zero -/* D8FB64 80242914 08090A49 */ j .L80242924 +/* D8FB64 80242914 08090A49 */ j L80242924_D8FB74 /* D8FB68 80242918 00000000 */ nop glabel L8024291C_D8FB6C /* D8FB6C 8024291C 0C0129CF */ jal func_8004A73C /* D8FB70 80242920 0240202D */ daddu $a0, $s2, $zero -.L80242924: glabel L80242924_D8FB74 /* D8FB74 80242924 8FBF0048 */ lw $ra, 0x48($sp) /* D8FB78 80242928 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s index 9d3ab2e0df..4336badb69 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s @@ -98,7 +98,7 @@ glabel func_8024156C_D944AC .L802416CC: /* D9460C 802416CC 8E430070 */ lw $v1, 0x70($s2) /* D94610 802416D0 2C620064 */ sltiu $v0, $v1, 0x64 -/* D94614 802416D4 10400048 */ beqz $v0, .L802417F8 +/* D94614 802416D4 10400048 */ beqz $v0, L802417F8_D94738 /* D94618 802416D8 00031080 */ sll $v0, $v1, 2 /* D9461C 802416DC 3C018024 */ lui $at, %hi(jtbl_80242518_D95458) /* D94620 802416E0 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80241700_D94640 /* D94644 80241704 0260282D */ daddu $a1, $s3, $zero /* D94648 80241708 0C0125AE */ jal func_800496B8 /* D9464C 8024170C 0280302D */ daddu $a2, $s4, $zero -/* D94650 80241710 080905FE */ j .L802417F8 +/* D94650 80241710 080905FE */ j L802417F8_D94738 /* D94654 80241714 00000000 */ nop glabel L80241718_D94658 /* D94658 80241718 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80241728_D94668 /* D9466C 8024172C 0260282D */ daddu $a1, $s3, $zero /* D94670 80241730 0C012701 */ jal func_80049C04 /* D94674 80241734 0280302D */ daddu $a2, $s4, $zero -/* D94678 80241738 080905FE */ j .L802417F8 +/* D94678 80241738 080905FE */ j L802417F8_D94738 /* D9467C 8024173C 00000000 */ nop glabel L80241740_D94680 /* D94680 80241740 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80241750_D94690 /* D94694 80241754 0260282D */ daddu $a1, $s3, $zero /* D94698 80241758 0C0127B3 */ jal func_80049ECC /* D9469C 8024175C 0280302D */ daddu $a2, $s4, $zero -/* D946A0 80241760 080905FE */ j .L802417F8 +/* D946A0 80241760 080905FE */ j L802417F8_D94738 /* D946A4 80241764 00000000 */ nop glabel L80241768_D946A8 /* D946A8 80241768 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80241778_D946B8 /* D946BC 8024177C 0260282D */ daddu $a1, $s3, $zero /* D946C0 80241780 0C012849 */ jal func_8004A124 /* D946C4 80241784 0280302D */ daddu $a2, $s4, $zero -/* D946C8 80241788 080905FE */ j .L802417F8 +/* D946C8 80241788 080905FE */ j L802417F8_D94738 /* D946CC 8024178C 00000000 */ nop glabel L80241790_D946D0 /* D946D0 80241790 0240202D */ daddu $a0, $s2, $zero /* D946D4 80241794 0260282D */ daddu $a1, $s3, $zero /* D946D8 80241798 0C0128FA */ jal func_8004A3E8 /* D946DC 8024179C 0280302D */ daddu $a2, $s4, $zero -/* D946E0 802417A0 080905FE */ j .L802417F8 +/* D946E0 802417A0 080905FE */ j L802417F8_D94738 /* D946E4 802417A4 00000000 */ nop glabel L802417A8_D946E8 /* D946E8 802417A8 0C0903D4 */ jal pra_37_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L802417B0_D946F0 /* D946F4 802417B4 0240202D */ daddu $a0, $s2, $zero /* D946F8 802417B8 8E430070 */ lw $v1, 0x70($s2) /* D946FC 802417BC 24020020 */ addiu $v0, $zero, 0x20 -/* D94700 802417C0 1462000D */ bne $v1, $v0, .L802417F8 +/* D94700 802417C0 1462000D */ bne $v1, $v0, L802417F8_D94738 /* D94704 802417C4 00000000 */ nop glabel L802417C8_D94708 /* D94708 802417C8 0C09040B */ jal pra_37_UnkNpcAIFunc8 /* D9470C 802417CC 0240202D */ daddu $a0, $s2, $zero /* D94710 802417D0 8E430070 */ lw $v1, 0x70($s2) /* D94714 802417D4 24020021 */ addiu $v0, $zero, 0x21 -/* D94718 802417D8 14620007 */ bne $v1, $v0, .L802417F8 +/* D94718 802417D8 14620007 */ bne $v1, $v0, L802417F8_D94738 /* D9471C 802417DC 00000000 */ nop glabel L802417E0_D94720 /* D94720 802417E0 0C090441 */ jal pra_37_UnkNpcAIFunc5 /* D94724 802417E4 0240202D */ daddu $a0, $s2, $zero -/* D94728 802417E8 080905FE */ j .L802417F8 +/* D94728 802417E8 080905FE */ j L802417F8_D94738 /* D9472C 802417EC 00000000 */ nop glabel L802417F0_D94730 /* D94730 802417F0 0C0129CF */ jal func_8004A73C /* D94734 802417F4 0240202D */ daddu $a0, $s2, $zero -.L802417F8: glabel L802417F8_D94738 /* D94738 802417F8 8FBF0048 */ lw $ra, 0x48($sp) /* D9473C 802417FC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s b/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s index d6c768c837..05f255a1e4 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s @@ -85,7 +85,7 @@ glabel func_80240F50_D96540 .L8024108C: /* D9667C 8024108C 8E630070 */ lw $v1, 0x70($s3) /* D96680 80241090 2C620010 */ sltiu $v0, $v1, 0x10 -/* D96684 80241094 10400185 */ beqz $v0, .L802416AC +/* D96684 80241094 10400185 */ beqz $v0, L802416AC_D96C9C /* D96688 80241098 00031080 */ sll $v0, $v1, 2 /* D9668C 8024109C 3C018024 */ lui $at, %hi(jtbl_80242250_D97840) /* D96690 802410A0 00220821 */ addu $at, $at, $v0 @@ -259,7 +259,7 @@ glabel L8024124C_D9683C /* D96904 80241314 E620001C */ swc1 $f0, 0x1c($s1) /* D96908 80241318 4604103C */ c.lt.s $f2, $f4 /* D9690C 8024131C 00000000 */ nop -/* D96910 80241320 450000E2 */ bc1f .L802416AC +/* D96910 80241320 450000E2 */ bc1f L802416AC_D96C9C /* D96914 80241324 E622003C */ swc1 $f2, 0x3c($s1) /* D96918 80241328 2402000C */ addiu $v0, $zero, 0xc /* D9691C 8024132C E624003C */ swc1 $f4, 0x3c($s1) @@ -475,7 +475,7 @@ glabel L80241440_D96A30 /* D96C38 80241648 C6220068 */ lwc1 $f2, 0x68($s1) /* D96C3C 8024164C 4600103C */ c.lt.s $f2, $f0 /* D96C40 80241650 00000000 */ nop -/* D96C44 80241654 45000015 */ bc1f .L802416AC +/* D96C44 80241654 45000015 */ bc1f L802416AC_D96C9C /* D96C48 80241658 2402000E */ addiu $v0, $zero, 0xe /* D96C4C 8024165C E622003C */ swc1 $f2, 0x3c($s1) /* D96C50 80241660 AE620070 */ sw $v0, 0x70($s3) @@ -497,9 +497,8 @@ glabel L80241694_D96C84 /* D96C88 80241698 2442FFFF */ addiu $v0, $v0, -1 /* D96C8C 8024169C A622008E */ sh $v0, 0x8e($s1) /* D96C90 802416A0 00021400 */ sll $v0, $v0, 0x10 -/* D96C94 802416A4 58400001 */ blezl $v0, .L802416AC +/* D96C94 802416A4 58400001 */ blezl $v0, L802416AC_D96C9C /* D96C98 802416A8 AE600070 */ sw $zero, 0x70($s3) -.L802416AC: glabel L802416AC_D96C9C /* D96C9C 802416AC 0000102D */ daddu $v0, $zero, $zero .L802416B0: diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s index 3d99f997de..b3526146bd 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s @@ -85,7 +85,7 @@ glabel func_80240F50_D987E0 .L8024108C: /* D9891C 8024108C 8E630070 */ lw $v1, 0x70($s3) /* D98920 80241090 2C620010 */ sltiu $v0, $v1, 0x10 -/* D98924 80241094 10400185 */ beqz $v0, .L802416AC +/* D98924 80241094 10400185 */ beqz $v0, L802416AC_D98F3C /* D98928 80241098 00031080 */ sll $v0, $v1, 2 /* D9892C 8024109C 3C018024 */ lui $at, %hi(jtbl_802420D0_D99960) /* D98930 802410A0 00220821 */ addu $at, $at, $v0 @@ -259,7 +259,7 @@ glabel L8024124C_D98ADC /* D98BA4 80241314 E620001C */ swc1 $f0, 0x1c($s1) /* D98BA8 80241318 4604103C */ c.lt.s $f2, $f4 /* D98BAC 8024131C 00000000 */ nop -/* D98BB0 80241320 450000E2 */ bc1f .L802416AC +/* D98BB0 80241320 450000E2 */ bc1f L802416AC_D98F3C /* D98BB4 80241324 E622003C */ swc1 $f2, 0x3c($s1) /* D98BB8 80241328 2402000C */ addiu $v0, $zero, 0xc /* D98BBC 8024132C E624003C */ swc1 $f4, 0x3c($s1) @@ -475,7 +475,7 @@ glabel L80241440_D98CD0 /* D98ED8 80241648 C6220068 */ lwc1 $f2, 0x68($s1) /* D98EDC 8024164C 4600103C */ c.lt.s $f2, $f0 /* D98EE0 80241650 00000000 */ nop -/* D98EE4 80241654 45000015 */ bc1f .L802416AC +/* D98EE4 80241654 45000015 */ bc1f L802416AC_D98F3C /* D98EE8 80241658 2402000E */ addiu $v0, $zero, 0xe /* D98EEC 8024165C E622003C */ swc1 $f2, 0x3c($s1) /* D98EF0 80241660 AE620070 */ sw $v0, 0x70($s3) @@ -497,9 +497,8 @@ glabel L80241694_D98F24 /* D98F28 80241698 2442FFFF */ addiu $v0, $v0, -1 /* D98F2C 8024169C A622008E */ sh $v0, 0x8e($s1) /* D98F30 802416A0 00021400 */ sll $v0, $v0, 0x10 -/* D98F34 802416A4 58400001 */ blezl $v0, .L802416AC +/* D98F34 802416A4 58400001 */ blezl $v0, L802416AC_D98F3C /* D98F38 802416A8 AE600070 */ sw $zero, 0x70($s3) -.L802416AC: glabel L802416AC_D98F3C /* D98F3C 802416AC 0000102D */ daddu $v0, $zero, $zero .L802416B0: diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s index e99e5010e0..33718a4fd4 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s @@ -98,7 +98,7 @@ glabel func_8024066C_D1172C .L802407CC: /* D1188C 802407CC 8E430070 */ lw $v1, 0x70($s2) /* D11890 802407D0 2C620064 */ sltiu $v0, $v1, 0x64 -/* D11894 802407D4 10400048 */ beqz $v0, .L802408F8 +/* D11894 802407D4 10400048 */ beqz $v0, L802408F8_D119B8 /* D11898 802407D8 00031080 */ sll $v0, $v1, 2 /* D1189C 802407DC 3C018024 */ lui $at, %hi(jtbl_80242378_D13438) /* D118A0 802407E0 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80240800_D118C0 /* D118C4 80240804 0260282D */ daddu $a1, $s3, $zero /* D118C8 80240808 0C0125AE */ jal func_800496B8 /* D118CC 8024080C 0280302D */ daddu $a2, $s4, $zero -/* D118D0 80240810 0809023E */ j .L802408F8 +/* D118D0 80240810 0809023E */ j L802408F8_D119B8 /* D118D4 80240814 00000000 */ nop glabel L80240818_D118D8 /* D118D8 80240818 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80240828_D118E8 /* D118EC 8024082C 0260282D */ daddu $a1, $s3, $zero /* D118F0 80240830 0C012701 */ jal func_80049C04 /* D118F4 80240834 0280302D */ daddu $a2, $s4, $zero -/* D118F8 80240838 0809023E */ j .L802408F8 +/* D118F8 80240838 0809023E */ j L802408F8_D119B8 /* D118FC 8024083C 00000000 */ nop glabel L80240840_D11900 /* D11900 80240840 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240850_D11910 /* D11914 80240854 0260282D */ daddu $a1, $s3, $zero /* D11918 80240858 0C0127B3 */ jal func_80049ECC /* D1191C 8024085C 0280302D */ daddu $a2, $s4, $zero -/* D11920 80240860 0809023E */ j .L802408F8 +/* D11920 80240860 0809023E */ j L802408F8_D119B8 /* D11924 80240864 00000000 */ nop glabel L80240868_D11928 /* D11928 80240868 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240878_D11938 /* D1193C 8024087C 0260282D */ daddu $a1, $s3, $zero /* D11940 80240880 0C012849 */ jal func_8004A124 /* D11944 80240884 0280302D */ daddu $a2, $s4, $zero -/* D11948 80240888 0809023E */ j .L802408F8 +/* D11948 80240888 0809023E */ j L802408F8_D119B8 /* D1194C 8024088C 00000000 */ nop glabel L80240890_D11950 /* D11950 80240890 0240202D */ daddu $a0, $s2, $zero /* D11954 80240894 0260282D */ daddu $a1, $s3, $zero /* D11958 80240898 0C0128FA */ jal func_8004A3E8 /* D1195C 8024089C 0280302D */ daddu $a2, $s4, $zero -/* D11960 802408A0 0809023E */ j .L802408F8 +/* D11960 802408A0 0809023E */ j L802408F8_D119B8 /* D11964 802408A4 00000000 */ nop glabel L802408A8_D11968 /* D11968 802408A8 0C090014 */ jal sam_03_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L802408B0_D11970 /* D11974 802408B4 0240202D */ daddu $a0, $s2, $zero /* D11978 802408B8 8E430070 */ lw $v1, 0x70($s2) /* D1197C 802408BC 24020020 */ addiu $v0, $zero, 0x20 -/* D11980 802408C0 1462000D */ bne $v1, $v0, .L802408F8 +/* D11980 802408C0 1462000D */ bne $v1, $v0, L802408F8_D119B8 /* D11984 802408C4 00000000 */ nop glabel L802408C8_D11988 /* D11988 802408C8 0C09004B */ jal sam_03_UnkNpcAIFunc8 /* D1198C 802408CC 0240202D */ daddu $a0, $s2, $zero /* D11990 802408D0 8E430070 */ lw $v1, 0x70($s2) /* D11994 802408D4 24020021 */ addiu $v0, $zero, 0x21 -/* D11998 802408D8 14620007 */ bne $v1, $v0, .L802408F8 +/* D11998 802408D8 14620007 */ bne $v1, $v0, L802408F8_D119B8 /* D1199C 802408DC 00000000 */ nop glabel L802408E0_D119A0 /* D119A0 802408E0 0C090081 */ jal sam_03_UnkNpcAIFunc5 /* D119A4 802408E4 0240202D */ daddu $a0, $s2, $zero -/* D119A8 802408E8 0809023E */ j .L802408F8 +/* D119A8 802408E8 0809023E */ j L802408F8_D119B8 /* D119AC 802408EC 00000000 */ nop glabel L802408F0_D119B0 /* D119B0 802408F0 0C0129CF */ jal func_8004A73C /* D119B4 802408F4 0240202D */ daddu $a0, $s2, $zero -.L802408F8: glabel L802408F8_D119B8 /* D119B8 802408F8 8FBF0048 */ lw $ra, 0x48($sp) /* D119BC 802408FC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s index 2830d91f1e..ac0e7ab3bf 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s @@ -98,7 +98,7 @@ glabel func_8024061C_D18DFC .L8024077C: /* D18F5C 8024077C 8E430070 */ lw $v1, 0x70($s2) /* D18F60 80240780 2C620064 */ sltiu $v0, $v1, 0x64 -/* D18F64 80240784 10400048 */ beqz $v0, .L802408A8 +/* D18F64 80240784 10400048 */ beqz $v0, L802408A8_D19088 /* D18F68 80240788 00031080 */ sll $v0, $v1, 2 /* D18F6C 8024078C 3C018024 */ lui $at, %hi(jtbl_802474E8_D1FCC8) /* D18F70 80240790 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L802407B0_D18F90 /* D18F94 802407B4 0260282D */ daddu $a1, $s3, $zero /* D18F98 802407B8 0C0125AE */ jal func_800496B8 /* D18F9C 802407BC 0280302D */ daddu $a2, $s4, $zero -/* D18FA0 802407C0 0809022A */ j .L802408A8 +/* D18FA0 802407C0 0809022A */ j L802408A8_D19088 /* D18FA4 802407C4 00000000 */ nop glabel L802407C8_D18FA8 /* D18FA8 802407C8 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L802407D8_D18FB8 /* D18FBC 802407DC 0260282D */ daddu $a1, $s3, $zero /* D18FC0 802407E0 0C012701 */ jal func_80049C04 /* D18FC4 802407E4 0280302D */ daddu $a2, $s4, $zero -/* D18FC8 802407E8 0809022A */ j .L802408A8 +/* D18FC8 802407E8 0809022A */ j L802408A8_D19088 /* D18FCC 802407EC 00000000 */ nop glabel L802407F0_D18FD0 /* D18FD0 802407F0 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240800_D18FE0 /* D18FE4 80240804 0260282D */ daddu $a1, $s3, $zero /* D18FE8 80240808 0C0127B3 */ jal func_80049ECC /* D18FEC 8024080C 0280302D */ daddu $a2, $s4, $zero -/* D18FF0 80240810 0809022A */ j .L802408A8 +/* D18FF0 80240810 0809022A */ j L802408A8_D19088 /* D18FF4 80240814 00000000 */ nop glabel L80240818_D18FF8 /* D18FF8 80240818 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240828_D19008 /* D1900C 8024082C 0260282D */ daddu $a1, $s3, $zero /* D19010 80240830 0C012849 */ jal func_8004A124 /* D19014 80240834 0280302D */ daddu $a2, $s4, $zero -/* D19018 80240838 0809022A */ j .L802408A8 +/* D19018 80240838 0809022A */ j L802408A8_D19088 /* D1901C 8024083C 00000000 */ nop glabel L80240840_D19020 /* D19020 80240840 0240202D */ daddu $a0, $s2, $zero /* D19024 80240844 0260282D */ daddu $a1, $s3, $zero /* D19028 80240848 0C0128FA */ jal func_8004A3E8 /* D1902C 8024084C 0280302D */ daddu $a2, $s4, $zero -/* D19030 80240850 0809022A */ j .L802408A8 +/* D19030 80240850 0809022A */ j L802408A8_D19088 /* D19034 80240854 00000000 */ nop glabel L80240858_D19038 /* D19038 80240858 0C090000 */ jal sam_05_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240860_D19040 /* D19044 80240864 0240202D */ daddu $a0, $s2, $zero /* D19048 80240868 8E430070 */ lw $v1, 0x70($s2) /* D1904C 8024086C 24020020 */ addiu $v0, $zero, 0x20 -/* D19050 80240870 1462000D */ bne $v1, $v0, .L802408A8 +/* D19050 80240870 1462000D */ bne $v1, $v0, L802408A8_D19088 /* D19054 80240874 00000000 */ nop glabel L80240878_D19058 /* D19058 80240878 0C090037 */ jal sam_05_UnkNpcAIFunc8 /* D1905C 8024087C 0240202D */ daddu $a0, $s2, $zero /* D19060 80240880 8E430070 */ lw $v1, 0x70($s2) /* D19064 80240884 24020021 */ addiu $v0, $zero, 0x21 -/* D19068 80240888 14620007 */ bne $v1, $v0, .L802408A8 +/* D19068 80240888 14620007 */ bne $v1, $v0, L802408A8_D19088 /* D1906C 8024088C 00000000 */ nop glabel L80240890_D19070 /* D19070 80240890 0C09006D */ jal sam_05_UnkNpcAIFunc5 /* D19074 80240894 0240202D */ daddu $a0, $s2, $zero -/* D19078 80240898 0809022A */ j .L802408A8 +/* D19078 80240898 0809022A */ j L802408A8_D19088 /* D1907C 8024089C 00000000 */ nop glabel L802408A0_D19080 /* D19080 802408A0 0C0129CF */ jal func_8004A73C /* D19084 802408A4 0240202D */ daddu $a0, $s2, $zero -.L802408A8: glabel L802408A8_D19088 /* D19088 802408A8 8FBF0048 */ lw $ra, 0x48($sp) /* D1908C 802408AC 8FB50044 */ lw $s5, 0x44($sp) 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 b30eb5004d..d8ea21d0c4 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 @@ -64,7 +64,7 @@ glabel func_8024185C_D216EC .L80241944: /* D217D4 80241944 8E830070 */ lw $v1, 0x70($s4) /* D217D8 80241948 2C62000F */ sltiu $v0, $v1, 0xf -/* D217DC 8024194C 10400034 */ beqz $v0, .L80241A20 +/* D217DC 8024194C 10400034 */ beqz $v0, L80241A20_D218B0 /* D217E0 80241950 00031080 */ sll $v0, $v1, 2 /* D217E4 80241954 3C018025 */ lui $at, %hi(jtbl_8024BE58_D2BCE8) /* D217E8 80241958 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241A10_D218A0 /* D218A4 80241A14 0200282D */ daddu $a1, $s0, $zero /* D218A8 80241A18 0C0904EA */ jal func_802413A8_D21238 /* D218AC 80241A1C 0260302D */ daddu $a2, $s3, $zero -.L80241A20: glabel L80241A20_D218B0 /* D218B0 80241A20 0000102D */ daddu $v0, $zero, $zero .L80241A24: diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s index 7541079b41..b2af036498 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s @@ -98,7 +98,7 @@ glabel func_80240C6C_D2C99C .L80240DCC: /* D2CAFC 80240DCC 8E430070 */ lw $v1, 0x70($s2) /* D2CB00 80240DD0 2C620064 */ sltiu $v0, $v1, 0x64 -/* D2CB04 80240DD4 10400048 */ beqz $v0, .L80240EF8 +/* D2CB04 80240DD4 10400048 */ beqz $v0, L80240EF8_D2CC28 /* D2CB08 80240DD8 00031080 */ sll $v0, $v1, 2 /* D2CB0C 80240DDC 3C018024 */ lui $at, %hi(jtbl_80243D88_D2FAB8) /* D2CB10 80240DE0 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80240E00_D2CB30 /* D2CB34 80240E04 0260282D */ daddu $a1, $s3, $zero /* D2CB38 80240E08 0C0125AE */ jal func_800496B8 /* D2CB3C 80240E0C 0280302D */ daddu $a2, $s4, $zero -/* D2CB40 80240E10 080903BE */ j .L80240EF8 +/* D2CB40 80240E10 080903BE */ j L80240EF8_D2CC28 /* D2CB44 80240E14 00000000 */ nop glabel L80240E18_D2CB48 /* D2CB48 80240E18 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80240E28_D2CB58 /* D2CB5C 80240E2C 0260282D */ daddu $a1, $s3, $zero /* D2CB60 80240E30 0C012701 */ jal func_80049C04 /* D2CB64 80240E34 0280302D */ daddu $a2, $s4, $zero -/* D2CB68 80240E38 080903BE */ j .L80240EF8 +/* D2CB68 80240E38 080903BE */ j L80240EF8_D2CC28 /* D2CB6C 80240E3C 00000000 */ nop glabel L80240E40_D2CB70 /* D2CB70 80240E40 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240E50_D2CB80 /* D2CB84 80240E54 0260282D */ daddu $a1, $s3, $zero /* D2CB88 80240E58 0C0127B3 */ jal func_80049ECC /* D2CB8C 80240E5C 0280302D */ daddu $a2, $s4, $zero -/* D2CB90 80240E60 080903BE */ j .L80240EF8 +/* D2CB90 80240E60 080903BE */ j L80240EF8_D2CC28 /* D2CB94 80240E64 00000000 */ nop glabel L80240E68_D2CB98 /* D2CB98 80240E68 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240E78_D2CBA8 /* D2CBAC 80240E7C 0260282D */ daddu $a1, $s3, $zero /* D2CBB0 80240E80 0C012849 */ jal func_8004A124 /* D2CBB4 80240E84 0280302D */ daddu $a2, $s4, $zero -/* D2CBB8 80240E88 080903BE */ j .L80240EF8 +/* D2CBB8 80240E88 080903BE */ j L80240EF8_D2CC28 /* D2CBBC 80240E8C 00000000 */ nop glabel L80240E90_D2CBC0 /* D2CBC0 80240E90 0240202D */ daddu $a0, $s2, $zero /* D2CBC4 80240E94 0260282D */ daddu $a1, $s3, $zero /* D2CBC8 80240E98 0C0128FA */ jal func_8004A3E8 /* D2CBCC 80240E9C 0280302D */ daddu $a2, $s4, $zero -/* D2CBD0 80240EA0 080903BE */ j .L80240EF8 +/* D2CBD0 80240EA0 080903BE */ j L80240EF8_D2CC28 /* D2CBD4 80240EA4 00000000 */ nop glabel L80240EA8_D2CBD8 /* D2CBD8 80240EA8 0C090194 */ jal sam_07_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240EB0_D2CBE0 /* D2CBE4 80240EB4 0240202D */ daddu $a0, $s2, $zero /* D2CBE8 80240EB8 8E430070 */ lw $v1, 0x70($s2) /* D2CBEC 80240EBC 24020020 */ addiu $v0, $zero, 0x20 -/* D2CBF0 80240EC0 1462000D */ bne $v1, $v0, .L80240EF8 +/* D2CBF0 80240EC0 1462000D */ bne $v1, $v0, L80240EF8_D2CC28 /* D2CBF4 80240EC4 00000000 */ nop glabel L80240EC8_D2CBF8 /* D2CBF8 80240EC8 0C0901CB */ jal sam_07_UnkNpcAIFunc8 /* D2CBFC 80240ECC 0240202D */ daddu $a0, $s2, $zero /* D2CC00 80240ED0 8E430070 */ lw $v1, 0x70($s2) /* D2CC04 80240ED4 24020021 */ addiu $v0, $zero, 0x21 -/* D2CC08 80240ED8 14620007 */ bne $v1, $v0, .L80240EF8 +/* D2CC08 80240ED8 14620007 */ bne $v1, $v0, L80240EF8_D2CC28 /* D2CC0C 80240EDC 00000000 */ nop glabel L80240EE0_D2CC10 /* D2CC10 80240EE0 0C090201 */ jal sam_07_UnkNpcAIFunc5 /* D2CC14 80240EE4 0240202D */ daddu $a0, $s2, $zero -/* D2CC18 80240EE8 080903BE */ j .L80240EF8 +/* D2CC18 80240EE8 080903BE */ j L80240EF8_D2CC28 /* D2CC1C 80240EEC 00000000 */ nop glabel L80240EF0_D2CC20 /* D2CC20 80240EF0 0C0129CF */ jal func_8004A73C /* D2CC24 80240EF4 0240202D */ daddu $a0, $s2, $zero -.L80240EF8: glabel L80240EF8_D2CC28 /* D2CC28 80240EF8 8FBF0048 */ lw $ra, 0x48($sp) /* D2CC2C 80240EFC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s index 85fba8d7b2..18f2b6983c 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s @@ -98,7 +98,7 @@ glabel func_8024135C_D30FDC .L802414BC: /* D3113C 802414BC 8E430070 */ lw $v1, 0x70($s2) /* D31140 802414C0 2C620064 */ sltiu $v0, $v1, 0x64 -/* D31144 802414C4 10400048 */ beqz $v0, .L802415E8 +/* D31144 802414C4 10400048 */ beqz $v0, L802415E8_D31268 /* D31148 802414C8 00031080 */ sll $v0, $v1, 2 /* D3114C 802414CC 3C018024 */ lui $at, %hi(jtbl_802464D8_D36158) /* D31150 802414D0 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L802414F0_D31170 /* D31174 802414F4 0260282D */ daddu $a1, $s3, $zero /* D31178 802414F8 0C0125AE */ jal func_800496B8 /* D3117C 802414FC 0280302D */ daddu $a2, $s4, $zero -/* D31180 80241500 0809057A */ j .L802415E8 +/* D31180 80241500 0809057A */ j L802415E8_D31268 /* D31184 80241504 00000000 */ nop glabel L80241508_D31188 /* D31188 80241508 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80241518_D31198 /* D3119C 8024151C 0260282D */ daddu $a1, $s3, $zero /* D311A0 80241520 0C012701 */ jal func_80049C04 /* D311A4 80241524 0280302D */ daddu $a2, $s4, $zero -/* D311A8 80241528 0809057A */ j .L802415E8 +/* D311A8 80241528 0809057A */ j L802415E8_D31268 /* D311AC 8024152C 00000000 */ nop glabel L80241530_D311B0 /* D311B0 80241530 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80241540_D311C0 /* D311C4 80241544 0260282D */ daddu $a1, $s3, $zero /* D311C8 80241548 0C0127B3 */ jal func_80049ECC /* D311CC 8024154C 0280302D */ daddu $a2, $s4, $zero -/* D311D0 80241550 0809057A */ j .L802415E8 +/* D311D0 80241550 0809057A */ j L802415E8_D31268 /* D311D4 80241554 00000000 */ nop glabel L80241558_D311D8 /* D311D8 80241558 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80241568_D311E8 /* D311EC 8024156C 0260282D */ daddu $a1, $s3, $zero /* D311F0 80241570 0C012849 */ jal func_8004A124 /* D311F4 80241574 0280302D */ daddu $a2, $s4, $zero -/* D311F8 80241578 0809057A */ j .L802415E8 +/* D311F8 80241578 0809057A */ j L802415E8_D31268 /* D311FC 8024157C 00000000 */ nop glabel L80241580_D31200 /* D31200 80241580 0240202D */ daddu $a0, $s2, $zero /* D31204 80241584 0260282D */ daddu $a1, $s3, $zero /* D31208 80241588 0C0128FA */ jal func_8004A3E8 /* D3120C 8024158C 0280302D */ daddu $a2, $s4, $zero -/* D31210 80241590 0809057A */ j .L802415E8 +/* D31210 80241590 0809057A */ j L802415E8_D31268 /* D31214 80241594 00000000 */ nop glabel L80241598_D31218 /* D31218 80241598 0C090350 */ jal sam_08_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L802415A0_D31220 /* D31224 802415A4 0240202D */ daddu $a0, $s2, $zero /* D31228 802415A8 8E430070 */ lw $v1, 0x70($s2) /* D3122C 802415AC 24020020 */ addiu $v0, $zero, 0x20 -/* D31230 802415B0 1462000D */ bne $v1, $v0, .L802415E8 +/* D31230 802415B0 1462000D */ bne $v1, $v0, L802415E8_D31268 /* D31234 802415B4 00000000 */ nop glabel L802415B8_D31238 /* D31238 802415B8 0C090387 */ jal sam_08_UnkNpcAIFunc8 /* D3123C 802415BC 0240202D */ daddu $a0, $s2, $zero /* D31240 802415C0 8E430070 */ lw $v1, 0x70($s2) /* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 -/* D31248 802415C8 14620007 */ bne $v1, $v0, .L802415E8 +/* D31248 802415C8 14620007 */ bne $v1, $v0, L802415E8_D31268 /* D3124C 802415CC 00000000 */ nop glabel L802415D0_D31250 /* D31250 802415D0 0C0903BD */ jal sam_08_UnkNpcAIFunc5 /* D31254 802415D4 0240202D */ daddu $a0, $s2, $zero -/* D31258 802415D8 0809057A */ j .L802415E8 +/* D31258 802415D8 0809057A */ j L802415E8_D31268 /* D3125C 802415DC 00000000 */ nop glabel L802415E0_D31260 /* D31260 802415E0 0C0129CF */ jal func_8004A73C /* D31264 802415E4 0240202D */ daddu $a0, $s2, $zero -.L802415E8: glabel L802415E8_D31268 /* D31268 802415E8 8FBF0048 */ lw $ra, 0x48($sp) /* D3126C 802415EC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s index e1258af101..810f084ec2 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s @@ -98,7 +98,7 @@ glabel func_802409EC_D381EC .L80240B4C: /* D3834C 80240B4C 8E430070 */ lw $v1, 0x70($s2) /* D38350 80240B50 2C620064 */ sltiu $v0, $v1, 0x64 -/* D38354 80240B54 10400048 */ beqz $v0, .L80240C78 +/* D38354 80240B54 10400048 */ beqz $v0, L80240C78_D38478 /* D38358 80240B58 00031080 */ sll $v0, $v1, 2 /* D3835C 80240B5C 3C018024 */ lui $at, %hi(jtbl_80242C38_D3A438) /* D38360 80240B60 00220821 */ addu $at, $at, $v0 @@ -115,7 +115,7 @@ glabel L80240B80_D38380 /* D38384 80240B84 0260282D */ daddu $a1, $s3, $zero /* D38388 80240B88 0C0125AE */ jal func_800496B8 /* D3838C 80240B8C 0280302D */ daddu $a2, $s4, $zero -/* D38390 80240B90 0809031E */ j .L80240C78 +/* D38390 80240B90 0809031E */ j L80240C78_D38478 /* D38394 80240B94 00000000 */ nop glabel L80240B98_D38398 /* D38398 80240B98 0240202D */ daddu $a0, $s2, $zero @@ -127,7 +127,7 @@ glabel L80240BA8_D383A8 /* D383AC 80240BAC 0260282D */ daddu $a1, $s3, $zero /* D383B0 80240BB0 0C012701 */ jal func_80049C04 /* D383B4 80240BB4 0280302D */ daddu $a2, $s4, $zero -/* D383B8 80240BB8 0809031E */ j .L80240C78 +/* D383B8 80240BB8 0809031E */ j L80240C78_D38478 /* D383BC 80240BBC 00000000 */ nop glabel L80240BC0_D383C0 /* D383C0 80240BC0 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80240BD0_D383D0 /* D383D4 80240BD4 0260282D */ daddu $a1, $s3, $zero /* D383D8 80240BD8 0C0127B3 */ jal func_80049ECC /* D383DC 80240BDC 0280302D */ daddu $a2, $s4, $zero -/* D383E0 80240BE0 0809031E */ j .L80240C78 +/* D383E0 80240BE0 0809031E */ j L80240C78_D38478 /* D383E4 80240BE4 00000000 */ nop glabel L80240BE8_D383E8 /* D383E8 80240BE8 0240202D */ daddu $a0, $s2, $zero @@ -151,14 +151,14 @@ glabel L80240BF8_D383F8 /* D383FC 80240BFC 0260282D */ daddu $a1, $s3, $zero /* D38400 80240C00 0C012849 */ jal func_8004A124 /* D38404 80240C04 0280302D */ daddu $a2, $s4, $zero -/* D38408 80240C08 0809031E */ j .L80240C78 +/* D38408 80240C08 0809031E */ j L80240C78_D38478 /* D3840C 80240C0C 00000000 */ nop glabel L80240C10_D38410 /* D38410 80240C10 0240202D */ daddu $a0, $s2, $zero /* D38414 80240C14 0260282D */ daddu $a1, $s3, $zero /* D38418 80240C18 0C0128FA */ jal func_8004A3E8 /* D3841C 80240C1C 0280302D */ daddu $a2, $s4, $zero -/* D38420 80240C20 0809031E */ j .L80240C78 +/* D38420 80240C20 0809031E */ j L80240C78_D38478 /* D38424 80240C24 00000000 */ nop glabel L80240C28_D38428 /* D38428 80240C28 0C0900F4 */ jal sam_10_UnkNpcAIFunc6 @@ -168,24 +168,23 @@ glabel L80240C30_D38430 /* D38434 80240C34 0240202D */ daddu $a0, $s2, $zero /* D38438 80240C38 8E430070 */ lw $v1, 0x70($s2) /* D3843C 80240C3C 24020020 */ addiu $v0, $zero, 0x20 -/* D38440 80240C40 1462000D */ bne $v1, $v0, .L80240C78 +/* D38440 80240C40 1462000D */ bne $v1, $v0, L80240C78_D38478 /* D38444 80240C44 00000000 */ nop glabel L80240C48_D38448 /* D38448 80240C48 0C09012B */ jal sam_10_UnkNpcAIFunc8 /* D3844C 80240C4C 0240202D */ daddu $a0, $s2, $zero /* D38450 80240C50 8E430070 */ lw $v1, 0x70($s2) /* D38454 80240C54 24020021 */ addiu $v0, $zero, 0x21 -/* D38458 80240C58 14620007 */ bne $v1, $v0, .L80240C78 +/* D38458 80240C58 14620007 */ bne $v1, $v0, L80240C78_D38478 /* D3845C 80240C5C 00000000 */ nop glabel L80240C60_D38460 /* D38460 80240C60 0C090161 */ jal sam_10_UnkNpcAIFunc5 /* D38464 80240C64 0240202D */ daddu $a0, $s2, $zero -/* D38468 80240C68 0809031E */ j .L80240C78 +/* D38468 80240C68 0809031E */ j L80240C78_D38478 /* D3846C 80240C6C 00000000 */ nop glabel L80240C70_D38470 /* D38470 80240C70 0C0129CF */ jal func_8004A73C /* D38474 80240C74 0240202D */ daddu $a0, $s2, $zero -.L80240C78: glabel L80240C78_D38478 /* D38478 80240C78 8FBF0048 */ lw $ra, 0x48($sp) /* D3847C 80240C7C 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s index c0c655ada1..7f84d65482 100644 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s +++ b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s @@ -100,7 +100,7 @@ glabel func_80240B64_940114 .L80240CD0: /* 940280 80240CD0 8E830070 */ lw $v1, 0x70($s4) /* 940284 80240CD4 2C620064 */ sltiu $v0, $v1, 0x64 -/* 940288 80240CD8 10400036 */ beqz $v0, .L80240DB4 +/* 940288 80240CD8 10400036 */ beqz $v0, L80240DB4_940364 /* 94028C 80240CDC 00031080 */ sll $v0, $v1, 2 /* 940290 80240CE0 3C018024 */ lui $at, %hi(jtbl_802448B8_943E68) /* 940294 80240CE4 00220821 */ addu $at, $at, $v0 @@ -117,7 +117,7 @@ glabel L80240D04_9402B4 /* 9402B8 80240D08 0260282D */ daddu $a1, $s3, $zero /* 9402BC 80240D0C 0C090109 */ jal func_80240424_93F9D4 /* 9402C0 80240D10 02A0302D */ daddu $a2, $s5, $zero -/* 9402C4 80240D14 0809036D */ j .L80240DB4 +/* 9402C4 80240D14 0809036D */ j L80240DB4_940364 /* 9402C8 80240D18 00000000 */ nop glabel L80240D1C_9402CC /* 9402CC 80240D1C 0280202D */ daddu $a0, $s4, $zero @@ -129,7 +129,7 @@ glabel L80240D2C_9402DC /* 9402E0 80240D30 0260282D */ daddu $a1, $s3, $zero /* 9402E4 80240D34 0C090169 */ jal sbk_30_NpcJumpFunc /* 9402E8 80240D38 02A0302D */ daddu $a2, $s5, $zero -/* 9402EC 80240D3C 0809036D */ j .L80240DB4 +/* 9402EC 80240D3C 0809036D */ j L80240DB4_940364 /* 9402F0 80240D40 00000000 */ nop glabel L80240D44_9402F4 /* 9402F4 80240D44 0280202D */ daddu $a0, $s4, $zero @@ -141,14 +141,14 @@ glabel L80240D54_940304 /* 940308 80240D58 0260282D */ daddu $a1, $s3, $zero /* 94030C 80240D5C 0C0901D3 */ jal sbk_30_UnkNpcAIFunc11 /* 940310 80240D60 02A0302D */ daddu $a2, $s5, $zero -/* 940314 80240D64 0809036D */ j .L80240DB4 +/* 940314 80240D64 0809036D */ j L80240DB4_940364 /* 940318 80240D68 00000000 */ nop glabel L80240D6C_94031C /* 94031C 80240D6C 0280202D */ daddu $a0, $s4, $zero /* 940320 80240D70 0260282D */ daddu $a1, $s3, $zero /* 940324 80240D74 0C09021A */ jal sbk_30_UnkNpcAIFunc10 /* 940328 80240D78 02A0302D */ daddu $a2, $s5, $zero -/* 94032C 80240D7C 0809036D */ j .L80240DB4 +/* 94032C 80240D7C 0809036D */ j L80240DB4_940364 /* 940330 80240D80 00000000 */ nop glabel L80240D84_940334 /* 940334 80240D84 0280202D */ daddu $a0, $s4, $zero @@ -160,12 +160,11 @@ glabel L80240D94_940344 /* 940348 80240D98 0260282D */ daddu $a1, $s3, $zero /* 94034C 80240D9C 0C090257 */ jal func_8024095C_93FF0C /* 940350 80240DA0 02A0302D */ daddu $a2, $s5, $zero -/* 940354 80240DA4 0809036D */ j .L80240DB4 +/* 940354 80240DA4 0809036D */ j L80240DB4_940364 /* 940358 80240DA8 00000000 */ nop glabel L80240DAC_94035C /* 94035C 80240DAC 0C0129CF */ jal func_8004A73C /* 940360 80240DB0 0280202D */ daddu $a0, $s4, $zero -.L80240DB4: glabel L80240DB4_940364 /* 940364 80240DB4 8FBF0048 */ lw $ra, 0x48($sp) /* 940368 80240DB8 8FB50044 */ lw $s5, 0x44($sp) 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 e919c64688..70cdd8d5bc 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 @@ -64,7 +64,7 @@ glabel func_802426FC_87C2DC .L802427E4: /* 87C3C4 802427E4 8E830070 */ lw $v1, 0x70($s4) /* 87C3C8 802427E8 2C62000F */ sltiu $v0, $v1, 0xf -/* 87C3CC 802427EC 10400034 */ beqz $v0, .L802428C0 +/* 87C3CC 802427EC 10400034 */ beqz $v0, L802428C0_87C4A0 /* 87C3D0 802427F0 00031080 */ sll $v0, $v1, 2 /* 87C3D4 802427F4 3C018024 */ lui $at, %hi(jtbl_802451C8_87EDA8) /* 87C3D8 802427F8 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L802428B0_87C490 /* 87C494 802428B4 0200282D */ daddu $a1, $s0, $zero /* 87C498 802428B8 0C090892 */ jal func_80242248_87BE28 /* 87C49C 802428BC 0260302D */ daddu $a2, $s3, $zero -.L802428C0: glabel L802428C0_87C4A0 /* 87C4A0 802428C0 0000102D */ daddu $v0, $zero, $zero .L802428C4: diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s b/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s index 43a85d1964..f8cf1a5130 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s @@ -134,7 +134,7 @@ glabel func_80240DC4_882F84 /* 883170 80240FB0 8E220090 */ lw $v0, 0x90($s1) /* 883174 80240FB4 1840000C */ blez $v0, .L80240FE8 /* 883178 80240FB8 2442FFFF */ addiu $v0, $v0, -1 -/* 88317C 80240FBC 14400087 */ bnez $v0, .L802411DC +/* 88317C 80240FBC 14400087 */ bnez $v0, L802411DC_88339C /* 883180 80240FC0 AE220090 */ sw $v0, 0x90($s1) /* 883184 80240FC4 3C03FFAA */ lui $v1, 0xffaa /* 883188 80240FC8 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240DC4_882F84 .L802410F0: /* 8832B0 802410F0 AE420028 */ sw $v0, 0x28($s2) /* 8832B4 802410F4 24020007 */ addiu $v0, $zero, 7 -/* 8832B8 802410F8 08090477 */ j .L802411DC +/* 8832B8 802410F8 08090477 */ j L802411DC_88339C /* 8832BC 802410FC AE220090 */ sw $v0, 0x90($s1) .L80241100: /* 8832C0 80241100 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240DC4_882F84 /* 883354 80241194 A22000B5 */ sb $zero, 0xb5($s1) .L80241198: /* 883358 80241198 8E22008C */ lw $v0, 0x8c($s1) -/* 88335C 8024119C 1040000F */ beqz $v0, .L802411DC +/* 88335C 8024119C 1040000F */ beqz $v0, L802411DC_88339C /* 883360 802411A0 3C03FFAA */ lui $v1, 0xffaa /* 883364 802411A4 8E420028 */ lw $v0, 0x28($s2) /* 883368 802411A8 3463FFFC */ ori $v1, $v1, 0xfffc /* 88336C 802411AC 00431821 */ addu $v1, $v0, $v1 /* 883370 802411B0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 883374 802411B4 10400009 */ beqz $v0, .L802411DC +/* 883374 802411B4 10400009 */ beqz $v0, L802411DC_88339C /* 883378 802411B8 00031080 */ sll $v0, $v1, 2 /* 88337C 802411BC 3C018024 */ lui $at, %hi(jtbl_802441A8_886368) /* 883380 802411C0 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L802411D0_883390 /* 883390 802411D0 8E420028 */ lw $v0, 0x28($s2) /* 883394 802411D4 24420001 */ addiu $v0, $v0, 1 /* 883398 802411D8 AE420028 */ sw $v0, 0x28($s2) -.L802411DC: glabel L802411DC_88339C /* 88339C 802411DC 0000102D */ daddu $v0, $zero, $zero .L802411E0: diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s index 1484953e4a..b840301152 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s @@ -134,7 +134,7 @@ glabel func_80241CF4_88A8C4 /* 88AAB0 80241EE0 8E220090 */ lw $v0, 0x90($s1) /* 88AAB4 80241EE4 1840000C */ blez $v0, .L80241F18 /* 88AAB8 80241EE8 2442FFFF */ addiu $v0, $v0, -1 -/* 88AABC 80241EEC 14400087 */ bnez $v0, .L8024210C +/* 88AABC 80241EEC 14400087 */ bnez $v0, L8024210C_88ACDC /* 88AAC0 80241EF0 AE220090 */ sw $v0, 0x90($s1) /* 88AAC4 80241EF4 3C03FFAA */ lui $v1, 0xffaa /* 88AAC8 80241EF8 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80241CF4_88A8C4 .L80242020: /* 88ABF0 80242020 AE420028 */ sw $v0, 0x28($s2) /* 88ABF4 80242024 24020007 */ addiu $v0, $zero, 7 -/* 88ABF8 80242028 08090843 */ j .L8024210C +/* 88ABF8 80242028 08090843 */ j L8024210C_88ACDC /* 88ABFC 8024202C AE220090 */ sw $v0, 0x90($s1) .L80242030: /* 88AC00 80242030 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80241CF4_88A8C4 /* 88AC94 802420C4 A22000B5 */ sb $zero, 0xb5($s1) .L802420C8: /* 88AC98 802420C8 8E22008C */ lw $v0, 0x8c($s1) -/* 88AC9C 802420CC 1040000F */ beqz $v0, .L8024210C +/* 88AC9C 802420CC 1040000F */ beqz $v0, L8024210C_88ACDC /* 88ACA0 802420D0 3C03FFAA */ lui $v1, 0xffaa /* 88ACA4 802420D4 8E420028 */ lw $v0, 0x28($s2) /* 88ACA8 802420D8 3463FFFC */ ori $v1, $v1, 0xfffc /* 88ACAC 802420DC 00431821 */ addu $v1, $v0, $v1 /* 88ACB0 802420E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 88ACB4 802420E4 10400009 */ beqz $v0, .L8024210C +/* 88ACB4 802420E4 10400009 */ beqz $v0, L8024210C_88ACDC /* 88ACB8 802420E8 00031080 */ sll $v0, $v1, 2 /* 88ACBC 802420EC 3C018024 */ lui $at, %hi(jtbl_802449D8_88D5A8) /* 88ACC0 802420F0 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80242100_88ACD0 /* 88ACD0 80242100 8E420028 */ lw $v0, 0x28($s2) /* 88ACD4 80242104 24420001 */ addiu $v0, $v0, 1 /* 88ACD8 80242108 AE420028 */ sw $v0, 0x28($s2) -.L8024210C: glabel L8024210C_88ACDC /* 88ACDC 8024210C 0000102D */ daddu $v0, $zero, $zero .L80242110: diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s b/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s index 87177f3229..a09a386050 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s @@ -134,7 +134,7 @@ glabel func_80240CF4_89B044 /* 89B230 80240EE0 8E220090 */ lw $v0, 0x90($s1) /* 89B234 80240EE4 1840000C */ blez $v0, .L80240F18 /* 89B238 80240EE8 2442FFFF */ addiu $v0, $v0, -1 -/* 89B23C 80240EEC 14400087 */ bnez $v0, .L8024110C +/* 89B23C 80240EEC 14400087 */ bnez $v0, L8024110C_89B45C /* 89B240 80240EF0 AE220090 */ sw $v0, 0x90($s1) /* 89B244 80240EF4 3C03FFAA */ lui $v1, 0xffaa /* 89B248 80240EF8 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240CF4_89B044 .L80241020: /* 89B370 80241020 AE420028 */ sw $v0, 0x28($s2) /* 89B374 80241024 24020007 */ addiu $v0, $zero, 7 -/* 89B378 80241028 08090443 */ j .L8024110C +/* 89B378 80241028 08090443 */ j L8024110C_89B45C /* 89B37C 8024102C AE220090 */ sw $v0, 0x90($s1) .L80241030: /* 89B380 80241030 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240CF4_89B044 /* 89B414 802410C4 A22000B5 */ sb $zero, 0xb5($s1) .L802410C8: /* 89B418 802410C8 8E22008C */ lw $v0, 0x8c($s1) -/* 89B41C 802410CC 1040000F */ beqz $v0, .L8024110C +/* 89B41C 802410CC 1040000F */ beqz $v0, L8024110C_89B45C /* 89B420 802410D0 3C03FFAA */ lui $v1, 0xffaa /* 89B424 802410D4 8E420028 */ lw $v0, 0x28($s2) /* 89B428 802410D8 3463FFFC */ ori $v1, $v1, 0xfffc /* 89B42C 802410DC 00431821 */ addu $v1, $v0, $v1 /* 89B430 802410E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 89B434 802410E4 10400009 */ beqz $v0, .L8024110C +/* 89B434 802410E4 10400009 */ beqz $v0, L8024110C_89B45C /* 89B438 802410E8 00031080 */ sll $v0, $v1, 2 /* 89B43C 802410EC 3C018024 */ lui $at, %hi(jtbl_802433F8_89D748) /* 89B440 802410F0 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80241100_89B450 /* 89B450 80241100 8E420028 */ lw $v0, 0x28($s2) /* 89B454 80241104 24420001 */ addiu $v0, $v0, 1 /* 89B458 80241108 AE420028 */ sw $v0, 0x28($s2) -.L8024110C: glabel L8024110C_89B45C /* 89B45C 8024110C 0000102D */ daddu $v0, $zero, $zero .L80241110: diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s index dff66ab8a9..b6a8bf4907 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s @@ -134,7 +134,7 @@ glabel func_80240CF4_8A30C4 /* 8A32B0 80240EE0 8E220090 */ lw $v0, 0x90($s1) /* 8A32B4 80240EE4 1840000C */ blez $v0, .L80240F18 /* 8A32B8 80240EE8 2442FFFF */ addiu $v0, $v0, -1 -/* 8A32BC 80240EEC 14400087 */ bnez $v0, .L8024110C +/* 8A32BC 80240EEC 14400087 */ bnez $v0, L8024110C_8A34DC /* 8A32C0 80240EF0 AE220090 */ sw $v0, 0x90($s1) /* 8A32C4 80240EF4 3C03FFAA */ lui $v1, 0xffaa /* 8A32C8 80240EF8 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240CF4_8A30C4 .L80241020: /* 8A33F0 80241020 AE420028 */ sw $v0, 0x28($s2) /* 8A33F4 80241024 24020007 */ addiu $v0, $zero, 7 -/* 8A33F8 80241028 08090443 */ j .L8024110C +/* 8A33F8 80241028 08090443 */ j L8024110C_8A34DC /* 8A33FC 8024102C AE220090 */ sw $v0, 0x90($s1) .L80241030: /* 8A3400 80241030 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240CF4_8A30C4 /* 8A3494 802410C4 A22000B5 */ sb $zero, 0xb5($s1) .L802410C8: /* 8A3498 802410C8 8E22008C */ lw $v0, 0x8c($s1) -/* 8A349C 802410CC 1040000F */ beqz $v0, .L8024110C +/* 8A349C 802410CC 1040000F */ beqz $v0, L8024110C_8A34DC /* 8A34A0 802410D0 3C03FFAA */ lui $v1, 0xffaa /* 8A34A4 802410D4 8E420028 */ lw $v0, 0x28($s2) /* 8A34A8 802410D8 3463FFFC */ ori $v1, $v1, 0xfffc /* 8A34AC 802410DC 00431821 */ addu $v1, $v0, $v1 /* 8A34B0 802410E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 8A34B4 802410E4 10400009 */ beqz $v0, .L8024110C +/* 8A34B4 802410E4 10400009 */ beqz $v0, L8024110C_8A34DC /* 8A34B8 802410E8 00031080 */ sll $v0, $v1, 2 /* 8A34BC 802410EC 3C018024 */ lui $at, %hi(jtbl_80243658_8A5A28) /* 8A34C0 802410F0 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80241100_8A34D0 /* 8A34D0 80241100 8E420028 */ lw $v0, 0x28($s2) /* 8A34D4 80241104 24420001 */ addiu $v0, $v0, 1 /* 8A34D8 80241108 AE420028 */ sw $v0, 0x28($s2) -.L8024110C: glabel L8024110C_8A34DC /* 8A34DC 8024110C 0000102D */ daddu $v0, $zero, $zero .L80241110: diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s index 7d9d48087b..bdbb234469 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s @@ -134,7 +134,7 @@ glabel func_80240A64_8A64E4 /* 8A66D0 80240C50 8E220090 */ lw $v0, 0x90($s1) /* 8A66D4 80240C54 1840000C */ blez $v0, .L80240C88 /* 8A66D8 80240C58 2442FFFF */ addiu $v0, $v0, -1 -/* 8A66DC 80240C5C 14400087 */ bnez $v0, .L80240E7C +/* 8A66DC 80240C5C 14400087 */ bnez $v0, L80240E7C_8A68FC /* 8A66E0 80240C60 AE220090 */ sw $v0, 0x90($s1) /* 8A66E4 80240C64 3C03FFAA */ lui $v1, 0xffaa /* 8A66E8 80240C68 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240A64_8A64E4 .L80240D90: /* 8A6810 80240D90 AE420028 */ sw $v0, 0x28($s2) /* 8A6814 80240D94 24020007 */ addiu $v0, $zero, 7 -/* 8A6818 80240D98 0809039F */ j .L80240E7C +/* 8A6818 80240D98 0809039F */ j L80240E7C_8A68FC /* 8A681C 80240D9C AE220090 */ sw $v0, 0x90($s1) .L80240DA0: /* 8A6820 80240DA0 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240A64_8A64E4 /* 8A68B4 80240E34 A22000B5 */ sb $zero, 0xb5($s1) .L80240E38: /* 8A68B8 80240E38 8E22008C */ lw $v0, 0x8c($s1) -/* 8A68BC 80240E3C 1040000F */ beqz $v0, .L80240E7C +/* 8A68BC 80240E3C 1040000F */ beqz $v0, L80240E7C_8A68FC /* 8A68C0 80240E40 3C03FFAA */ lui $v1, 0xffaa /* 8A68C4 80240E44 8E420028 */ lw $v0, 0x28($s2) /* 8A68C8 80240E48 3463FFFC */ ori $v1, $v1, 0xfffc /* 8A68CC 80240E4C 00431821 */ addu $v1, $v0, $v1 /* 8A68D0 80240E50 2C620015 */ sltiu $v0, $v1, 0x15 -/* 8A68D4 80240E54 10400009 */ beqz $v0, .L80240E7C +/* 8A68D4 80240E54 10400009 */ beqz $v0, L80240E7C_8A68FC /* 8A68D8 80240E58 00031080 */ sll $v0, $v1, 2 /* 8A68DC 80240E5C 3C018024 */ lui $at, %hi(jtbl_802424A8_8A7F28) /* 8A68E0 80240E60 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240E70_8A68F0 /* 8A68F0 80240E70 8E420028 */ lw $v0, 0x28($s2) /* 8A68F4 80240E74 24420001 */ addiu $v0, $v0, 1 /* 8A68F8 80240E78 AE420028 */ sw $v0, 0x28($s2) -.L80240E7C: glabel L80240E7C_8A68FC /* 8A68FC 80240E7C 0000102D */ daddu $v0, $zero, $zero .L80240E80: diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s index cb9d88d830..419a56b4a6 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s @@ -134,7 +134,7 @@ glabel func_80240784_99D114 /* 99D300 80240970 8E220090 */ lw $v0, 0x90($s1) /* 99D304 80240974 1840000C */ blez $v0, .L802409A8 /* 99D308 80240978 2442FFFF */ addiu $v0, $v0, -1 -/* 99D30C 8024097C 14400087 */ bnez $v0, .L80240B9C +/* 99D30C 8024097C 14400087 */ bnez $v0, L80240B9C_99D52C /* 99D310 80240980 AE220090 */ sw $v0, 0x90($s1) /* 99D314 80240984 3C03FFAA */ lui $v1, 0xffaa /* 99D318 80240988 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240784_99D114 .L80240AB0: /* 99D440 80240AB0 AE420028 */ sw $v0, 0x28($s2) /* 99D444 80240AB4 24020007 */ addiu $v0, $zero, 7 -/* 99D448 80240AB8 080902E7 */ j .L80240B9C +/* 99D448 80240AB8 080902E7 */ j L80240B9C_99D52C /* 99D44C 80240ABC AE220090 */ sw $v0, 0x90($s1) .L80240AC0: /* 99D450 80240AC0 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240784_99D114 /* 99D4E4 80240B54 A22000B5 */ sb $zero, 0xb5($s1) .L80240B58: /* 99D4E8 80240B58 8E22008C */ lw $v0, 0x8c($s1) -/* 99D4EC 80240B5C 1040000F */ beqz $v0, .L80240B9C +/* 99D4EC 80240B5C 1040000F */ beqz $v0, L80240B9C_99D52C /* 99D4F0 80240B60 3C03FFAA */ lui $v1, 0xffaa /* 99D4F4 80240B64 8E420028 */ lw $v0, 0x28($s2) /* 99D4F8 80240B68 3463FFFC */ ori $v1, $v1, 0xfffc /* 99D4FC 80240B6C 00431821 */ addu $v1, $v0, $v1 /* 99D500 80240B70 2C620015 */ sltiu $v0, $v1, 0x15 -/* 99D504 80240B74 10400009 */ beqz $v0, .L80240B9C +/* 99D504 80240B74 10400009 */ beqz $v0, L80240B9C_99D52C /* 99D508 80240B78 00031080 */ sll $v0, $v1, 2 /* 99D50C 80240B7C 3C018024 */ lui $at, %hi(jtbl_80244448_9A0DD8) /* 99D510 80240B80 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240B90_99D520 /* 99D520 80240B90 8E420028 */ lw $v0, 0x28($s2) /* 99D524 80240B94 24420001 */ addiu $v0, $v0, 1 /* 99D528 80240B98 AE420028 */ sw $v0, 0x28($s2) -.L80240B9C: glabel L80240B9C_99D52C /* 99D52C 80240B9C 0000102D */ daddu $v0, $zero, $zero .L80240BA0: diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s index d2bbe86517..4fe0398348 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s @@ -100,7 +100,7 @@ glabel func_802413B8_99DD48 .L80241524: /* 99DEB4 80241524 8E830070 */ lw $v1, 0x70($s4) /* 99DEB8 80241528 2C620064 */ sltiu $v0, $v1, 0x64 -/* 99DEBC 8024152C 10400036 */ beqz $v0, .L80241608 +/* 99DEBC 8024152C 10400036 */ beqz $v0, L80241608_99DF98 /* 99DEC0 80241530 00031080 */ sll $v0, $v1, 2 /* 99DEC4 80241534 3C018024 */ lui $at, %hi(jtbl_802444B8_9A0E48) /* 99DEC8 80241538 00220821 */ addu $at, $at, $v0 @@ -117,7 +117,7 @@ glabel L80241558_99DEE8 /* 99DEEC 8024155C 0260282D */ daddu $a1, $s3, $zero /* 99DEF0 80241560 0C09031E */ jal func_80240C78_99D608 /* 99DEF4 80241564 02A0302D */ daddu $a2, $s5, $zero -/* 99DEF8 80241568 08090582 */ j .L80241608 +/* 99DEF8 80241568 08090582 */ j L80241608_99DF98 /* 99DEFC 8024156C 00000000 */ nop glabel L80241570_99DF00 /* 99DF00 80241570 0280202D */ daddu $a0, $s4, $zero @@ -129,7 +129,7 @@ glabel L80241580_99DF10 /* 99DF14 80241584 0260282D */ daddu $a1, $s3, $zero /* 99DF18 80241588 0C09037E */ jal trd_01_NpcJumpFunc /* 99DF1C 8024158C 02A0302D */ daddu $a2, $s5, $zero -/* 99DF20 80241590 08090582 */ j .L80241608 +/* 99DF20 80241590 08090582 */ j L80241608_99DF98 /* 99DF24 80241594 00000000 */ nop glabel L80241598_99DF28 /* 99DF28 80241598 0280202D */ daddu $a0, $s4, $zero @@ -141,14 +141,14 @@ glabel L802415A8_99DF38 /* 99DF3C 802415AC 0260282D */ daddu $a1, $s3, $zero /* 99DF40 802415B0 0C0903E8 */ jal trd_01_UnkNpcAIFunc11 /* 99DF44 802415B4 02A0302D */ daddu $a2, $s5, $zero -/* 99DF48 802415B8 08090582 */ j .L80241608 +/* 99DF48 802415B8 08090582 */ j L80241608_99DF98 /* 99DF4C 802415BC 00000000 */ nop glabel L802415C0_99DF50 /* 99DF50 802415C0 0280202D */ daddu $a0, $s4, $zero /* 99DF54 802415C4 0260282D */ daddu $a1, $s3, $zero /* 99DF58 802415C8 0C09042F */ jal trd_01_UnkNpcAIFunc10 /* 99DF5C 802415CC 02A0302D */ daddu $a2, $s5, $zero -/* 99DF60 802415D0 08090582 */ j .L80241608 +/* 99DF60 802415D0 08090582 */ j L80241608_99DF98 /* 99DF64 802415D4 00000000 */ nop glabel L802415D8_99DF68 /* 99DF68 802415D8 0280202D */ daddu $a0, $s4, $zero @@ -160,12 +160,11 @@ glabel L802415E8_99DF78 /* 99DF7C 802415EC 0260282D */ daddu $a1, $s3, $zero /* 99DF80 802415F0 0C09046C */ jal func_802411B0_99DB40 /* 99DF84 802415F4 02A0302D */ daddu $a2, $s5, $zero -/* 99DF88 802415F8 08090582 */ j .L80241608 +/* 99DF88 802415F8 08090582 */ j L80241608_99DF98 /* 99DF8C 802415FC 00000000 */ nop glabel L80241600_99DF90 /* 99DF90 80241600 0C0129CF */ jal func_8004A73C /* 99DF94 80241604 0280202D */ daddu $a0, $s4, $zero -.L80241608: glabel L80241608_99DF98 /* 99DF98 80241608 8FBF0048 */ lw $ra, 0x48($sp) /* 99DF9C 8024160C 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s index 55ab968459..dbf379991f 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s @@ -134,7 +134,7 @@ glabel func_80240474_9A1454 /* 9A1640 80240660 8E220090 */ lw $v0, 0x90($s1) /* 9A1644 80240664 1840000C */ blez $v0, .L80240698 /* 9A1648 80240668 2442FFFF */ addiu $v0, $v0, -1 -/* 9A164C 8024066C 14400087 */ bnez $v0, .L8024088C +/* 9A164C 8024066C 14400087 */ bnez $v0, L8024088C_9A186C /* 9A1650 80240670 AE220090 */ sw $v0, 0x90($s1) /* 9A1654 80240674 3C03FFAA */ lui $v1, 0xffaa /* 9A1658 80240678 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240474_9A1454 .L802407A0: /* 9A1780 802407A0 AE420028 */ sw $v0, 0x28($s2) /* 9A1784 802407A4 24020007 */ addiu $v0, $zero, 7 -/* 9A1788 802407A8 08090223 */ j .L8024088C +/* 9A1788 802407A8 08090223 */ j L8024088C_9A186C /* 9A178C 802407AC AE220090 */ sw $v0, 0x90($s1) .L802407B0: /* 9A1790 802407B0 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240474_9A1454 /* 9A1824 80240844 A22000B5 */ sb $zero, 0xb5($s1) .L80240848: /* 9A1828 80240848 8E22008C */ lw $v0, 0x8c($s1) -/* 9A182C 8024084C 1040000F */ beqz $v0, .L8024088C +/* 9A182C 8024084C 1040000F */ beqz $v0, L8024088C_9A186C /* 9A1830 80240850 3C03FFAA */ lui $v1, 0xffaa /* 9A1834 80240854 8E420028 */ lw $v0, 0x28($s2) /* 9A1838 80240858 3463FFFC */ ori $v1, $v1, 0xfffc /* 9A183C 8024085C 00431821 */ addu $v1, $v0, $v1 /* 9A1840 80240860 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9A1844 80240864 10400009 */ beqz $v0, .L8024088C +/* 9A1844 80240864 10400009 */ beqz $v0, L8024088C_9A186C /* 9A1848 80240868 00031080 */ sll $v0, $v1, 2 /* 9A184C 8024086C 3C018024 */ lui $at, %hi(jtbl_802432E8_9A42C8) /* 9A1850 80240870 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240880_9A1860 /* 9A1860 80240880 8E420028 */ lw $v0, 0x28($s2) /* 9A1864 80240884 24420001 */ addiu $v0, $v0, 1 /* 9A1868 80240888 AE420028 */ sw $v0, 0x28($s2) -.L8024088C: glabel L8024088C_9A186C /* 9A186C 8024088C 0000102D */ daddu $v0, $zero, $zero .L80240890: diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s index fd58fa972a..94448d264c 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s @@ -122,7 +122,7 @@ glabel func_80241448_9A2428 .L80241608: /* 9A25E8 80241608 8E830070 */ lw $v1, 0x70($s4) /* 9A25EC 8024160C 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9A25F0 80241610 10400042 */ beqz $v0, .L8024171C +/* 9A25F0 80241610 10400042 */ beqz $v0, L8024171C_9A26FC /* 9A25F4 80241614 00031080 */ sll $v0, $v1, 2 /* 9A25F8 80241618 3C018024 */ lui $at, %hi(jtbl_80243350_9A4330) /* 9A25FC 8024161C 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L8024163C_9A261C /* 9A2620 80241640 0260282D */ daddu $a1, $s3, $zero /* 9A2624 80241644 0C090283 */ jal func_80240A0C_9A19EC /* 9A2628 80241648 02A0302D */ daddu $a2, $s5, $zero -/* 9A262C 8024164C 080905C7 */ j .L8024171C +/* 9A262C 8024164C 080905C7 */ j L8024171C_9A26FC /* 9A2630 80241650 00000000 */ nop glabel L80241654_9A2634 /* 9A2634 80241654 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80241664_9A2644 /* 9A2648 80241668 0260282D */ daddu $a1, $s3, $zero /* 9A264C 8024166C 0C09035D */ jal func_80240D74_9A1D54 /* 9A2650 80241670 02A0302D */ daddu $a2, $s5, $zero -/* 9A2654 80241674 080905C7 */ j .L8024171C +/* 9A2654 80241674 080905C7 */ j L8024171C_9A26FC /* 9A2658 80241678 00000000 */ nop glabel L8024167C_9A265C /* 9A265C 8024167C 0280202D */ daddu $a0, $s4, $zero /* 9A2660 80241680 0260282D */ daddu $a1, $s3, $zero /* 9A2664 80241684 0C0903CC */ jal func_80240F30_9A1F10 /* 9A2668 80241688 02A0302D */ daddu $a2, $s5, $zero -/* 9A266C 8024168C 080905C7 */ j .L8024171C +/* 9A266C 8024168C 080905C7 */ j L8024171C_9A26FC /* 9A2670 80241690 00000000 */ nop glabel L80241694_9A2674 /* 9A2674 80241694 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L802416A4_9A2684 /* 9A2688 802416A8 0260282D */ daddu $a1, $s3, $zero /* 9A268C 802416AC 0C090416 */ jal trd_02_NpcJumpFunc /* 9A2690 802416B0 02A0302D */ daddu $a2, $s5, $zero -/* 9A2694 802416B4 080905C7 */ j .L8024171C +/* 9A2694 802416B4 080905C7 */ j L8024171C_9A26FC /* 9A2698 802416B8 00000000 */ nop glabel L802416BC_9A269C /* 9A269C 802416BC 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L802416CC_9A26AC /* 9A26B0 802416D0 0260282D */ daddu $a1, $s3, $zero /* 9A26B4 802416D4 0C090480 */ jal func_80241200_9A21E0 /* 9A26B8 802416D8 02A0302D */ daddu $a2, $s5, $zero -/* 9A26BC 802416DC 080905C7 */ j .L8024171C +/* 9A26BC 802416DC 080905C7 */ j L8024171C_9A26FC /* 9A26C0 802416E0 00000000 */ nop glabel L802416E4_9A26C4 /* 9A26C4 802416E4 0280202D */ daddu $a0, $s4, $zero /* 9A26C8 802416E8 0260282D */ daddu $a1, $s3, $zero /* 9A26CC 802416EC 0C0904C8 */ jal trd_02_UnkNpcDurationFlagFunc /* 9A26D0 802416F0 02A0302D */ daddu $a2, $s5, $zero -/* 9A26D4 802416F4 080905C7 */ j .L8024171C +/* 9A26D4 802416F4 080905C7 */ j L8024171C_9A26FC /* 9A26D8 802416F8 00000000 */ nop glabel L802416FC_9A26DC /* 9A26DC 802416FC 0280202D */ daddu $a0, $s4, $zero /* 9A26E0 80241700 0260282D */ daddu $a1, $s3, $zero /* 9A26E4 80241704 0C0904E2 */ jal func_80241388_9A2368 /* 9A26E8 80241708 02A0302D */ daddu $a2, $s5, $zero -/* 9A26EC 8024170C 080905C7 */ j .L8024171C +/* 9A26EC 8024170C 080905C7 */ j L8024171C_9A26FC /* 9A26F0 80241710 00000000 */ nop glabel L80241714_9A26F4 /* 9A26F4 80241714 0C0129CF */ jal func_8004A73C /* 9A26F8 80241718 0280202D */ daddu $a0, $s4, $zero -.L8024171C: glabel L8024171C_9A26FC /* 9A26FC 8024171C 8FBF0060 */ lw $ra, 0x60($sp) /* 9A2700 80241720 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s index 496d540179..a9884bee73 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s @@ -132,7 +132,7 @@ glabel func_80241744_9A2724 .L8024192C: /* 9A290C 8024192C 8E630070 */ lw $v1, 0x70($s3) /* 9A2910 80241930 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9A2914 80241934 1040003A */ beqz $v0, .L80241A20 +/* 9A2914 80241934 1040003A */ beqz $v0, L80241A20_9A2A00 /* 9A2918 80241938 00031080 */ sll $v0, $v1, 2 /* 9A291C 8024193C 3C018024 */ lui $at, %hi(jtbl_802434E0_9A44C0) /* 9A2920 80241940 00220821 */ addu $at, $at, $v0 @@ -151,7 +151,7 @@ glabel L80241968_9A2948 /* 9A294C 8024196C 0280282D */ daddu $a1, $s4, $zero /* 9A2950 80241970 0C090283 */ jal func_80240A0C_9A19EC /* 9A2954 80241974 02A0302D */ daddu $a2, $s5, $zero -/* 9A2958 80241978 08090688 */ j .L80241A20 +/* 9A2958 80241978 08090688 */ j L80241A20_9A2A00 /* 9A295C 8024197C 00000000 */ nop glabel L80241980_9A2960 /* 9A2960 80241980 0260202D */ daddu $a0, $s3, $zero @@ -163,14 +163,14 @@ glabel L80241990_9A2970 /* 9A2974 80241994 0280282D */ daddu $a1, $s4, $zero /* 9A2978 80241998 0C09035D */ jal func_80240D74_9A1D54 /* 9A297C 8024199C 02A0302D */ daddu $a2, $s5, $zero -/* 9A2980 802419A0 08090688 */ j .L80241A20 +/* 9A2980 802419A0 08090688 */ j L80241A20_9A2A00 /* 9A2984 802419A4 00000000 */ nop glabel L802419A8_9A2988 /* 9A2988 802419A8 0260202D */ daddu $a0, $s3, $zero /* 9A298C 802419AC 0280282D */ daddu $a1, $s4, $zero /* 9A2990 802419B0 0C0903CC */ jal func_80240F30_9A1F10 /* 9A2994 802419B4 02A0302D */ daddu $a2, $s5, $zero -/* 9A2998 802419B8 08090688 */ j .L80241A20 +/* 9A2998 802419B8 08090688 */ j L80241A20_9A2A00 /* 9A299C 802419BC 00000000 */ nop glabel L802419C0_9A29A0 /* 9A29A0 802419C0 0260202D */ daddu $a0, $s3, $zero @@ -182,26 +182,25 @@ glabel L802419D0_9A29B0 /* 9A29B4 802419D4 0280282D */ daddu $a1, $s4, $zero /* 9A29B8 802419D8 0C090057 */ jal func_8024015C_9A113C /* 9A29BC 802419DC 02A0302D */ daddu $a2, $s5, $zero -/* 9A29C0 802419E0 08090688 */ j .L80241A20 +/* 9A29C0 802419E0 08090688 */ j L80241A20_9A2A00 /* 9A29C4 802419E4 00000000 */ nop glabel L802419E8_9A29C8 /* 9A29C8 802419E8 0260202D */ daddu $a0, $s3, $zero /* 9A29CC 802419EC 0280282D */ daddu $a1, $s4, $zero /* 9A29D0 802419F0 0C0900A4 */ jal trd_02_UnkNpcAIFunc12 /* 9A29D4 802419F4 02A0302D */ daddu $a2, $s5, $zero -/* 9A29D8 802419F8 08090688 */ j .L80241A20 +/* 9A29D8 802419F8 08090688 */ j L80241A20_9A2A00 /* 9A29DC 802419FC 00000000 */ nop glabel L80241A00_9A29E0 /* 9A29E0 80241A00 0260202D */ daddu $a0, $s3, $zero /* 9A29E4 80241A04 0280282D */ daddu $a1, $s4, $zero /* 9A29E8 80241A08 0C0900FD */ jal trd_02_set_script_owner_npc_col_height /* 9A29EC 80241A0C 02A0302D */ daddu $a2, $s5, $zero -/* 9A29F0 80241A10 08090688 */ j .L80241A20 +/* 9A29F0 80241A10 08090688 */ j L80241A20_9A2A00 /* 9A29F4 80241A14 00000000 */ nop glabel L80241A18_9A29F8 /* 9A29F8 80241A18 0C0129CF */ jal func_8004A73C /* 9A29FC 80241A1C 0260202D */ daddu $a0, $s3, $zero -.L80241A20: glabel L80241A20_9A2A00 /* 9A2A00 80241A20 8FBF0068 */ lw $ra, 0x68($sp) /* 9A2A04 80241A24 8FB50064 */ lw $s5, 0x64($sp) diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s b/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s index ea325b9cdd..4cae68bee1 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s @@ -134,7 +134,7 @@ glabel func_80240434_9A4A84 /* 9A4C70 80240620 8E220090 */ lw $v0, 0x90($s1) /* 9A4C74 80240624 1840000C */ blez $v0, .L80240658 /* 9A4C78 80240628 2442FFFF */ addiu $v0, $v0, -1 -/* 9A4C7C 8024062C 14400087 */ bnez $v0, .L8024084C +/* 9A4C7C 8024062C 14400087 */ bnez $v0, L8024084C_9A4E9C /* 9A4C80 80240630 AE220090 */ sw $v0, 0x90($s1) /* 9A4C84 80240634 3C03FFAA */ lui $v1, 0xffaa /* 9A4C88 80240638 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240434_9A4A84 .L80240760: /* 9A4DB0 80240760 AE420028 */ sw $v0, 0x28($s2) /* 9A4DB4 80240764 24020007 */ addiu $v0, $zero, 7 -/* 9A4DB8 80240768 08090213 */ j .L8024084C +/* 9A4DB8 80240768 08090213 */ j L8024084C_9A4E9C /* 9A4DBC 8024076C AE220090 */ sw $v0, 0x90($s1) .L80240770: /* 9A4DC0 80240770 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240434_9A4A84 /* 9A4E54 80240804 A22000B5 */ sb $zero, 0xb5($s1) .L80240808: /* 9A4E58 80240808 8E22008C */ lw $v0, 0x8c($s1) -/* 9A4E5C 8024080C 1040000F */ beqz $v0, .L8024084C +/* 9A4E5C 8024080C 1040000F */ beqz $v0, L8024084C_9A4E9C /* 9A4E60 80240810 3C03FFAA */ lui $v1, 0xffaa /* 9A4E64 80240814 8E420028 */ lw $v0, 0x28($s2) /* 9A4E68 80240818 3463FFFC */ ori $v1, $v1, 0xfffc /* 9A4E6C 8024081C 00431821 */ addu $v1, $v0, $v1 /* 9A4E70 80240820 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9A4E74 80240824 10400009 */ beqz $v0, .L8024084C +/* 9A4E74 80240824 10400009 */ beqz $v0, L8024084C_9A4E9C /* 9A4E78 80240828 00031080 */ sll $v0, $v1, 2 /* 9A4E7C 8024082C 3C018024 */ lui $at, %hi(jtbl_80243D48_9A8398) /* 9A4E80 80240830 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240840_9A4E90 /* 9A4E90 80240840 8E420028 */ lw $v0, 0x28($s2) /* 9A4E94 80240844 24420001 */ addiu $v0, $v0, 1 /* 9A4E98 80240848 AE420028 */ sw $v0, 0x28($s2) -.L8024084C: glabel L8024084C_9A4E9C /* 9A4E9C 8024084C 0000102D */ daddu $v0, $zero, $zero .L80240850: diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s index 842648e8fd..097b2f883d 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s @@ -134,7 +134,7 @@ glabel func_80240844_9A8C34 /* 9A8E20 80240A30 8E220090 */ lw $v0, 0x90($s1) /* 9A8E24 80240A34 1840000C */ blez $v0, .L80240A68 /* 9A8E28 80240A38 2442FFFF */ addiu $v0, $v0, -1 -/* 9A8E2C 80240A3C 14400087 */ bnez $v0, .L80240C5C +/* 9A8E2C 80240A3C 14400087 */ bnez $v0, L80240C5C_9A904C /* 9A8E30 80240A40 AE220090 */ sw $v0, 0x90($s1) /* 9A8E34 80240A44 3C03FFAA */ lui $v1, 0xffaa /* 9A8E38 80240A48 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_80240844_9A8C34 .L80240B70: /* 9A8F60 80240B70 AE420028 */ sw $v0, 0x28($s2) /* 9A8F64 80240B74 24020007 */ addiu $v0, $zero, 7 -/* 9A8F68 80240B78 08090317 */ j .L80240C5C +/* 9A8F68 80240B78 08090317 */ j L80240C5C_9A904C /* 9A8F6C 80240B7C AE220090 */ sw $v0, 0x90($s1) .L80240B80: /* 9A8F70 80240B80 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_80240844_9A8C34 /* 9A9004 80240C14 A22000B5 */ sb $zero, 0xb5($s1) .L80240C18: /* 9A9008 80240C18 8E22008C */ lw $v0, 0x8c($s1) -/* 9A900C 80240C1C 1040000F */ beqz $v0, .L80240C5C +/* 9A900C 80240C1C 1040000F */ beqz $v0, L80240C5C_9A904C /* 9A9010 80240C20 3C03FFAA */ lui $v1, 0xffaa /* 9A9014 80240C24 8E420028 */ lw $v0, 0x28($s2) /* 9A9018 80240C28 3463FFFC */ ori $v1, $v1, 0xfffc /* 9A901C 80240C2C 00431821 */ addu $v1, $v0, $v1 /* 9A9020 80240C30 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9A9024 80240C34 10400009 */ beqz $v0, .L80240C5C +/* 9A9024 80240C34 10400009 */ beqz $v0, L80240C5C_9A904C /* 9A9028 80240C38 00031080 */ sll $v0, $v1, 2 /* 9A902C 80240C3C 3C018024 */ lui $at, %hi(jtbl_80245EE8_9AE2D8) /* 9A9030 80240C40 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240C50_9A9040 /* 9A9040 80240C50 8E420028 */ lw $v0, 0x28($s2) /* 9A9044 80240C54 24420001 */ addiu $v0, $v0, 1 /* 9A9048 80240C58 AE420028 */ sw $v0, 0x28($s2) -.L80240C5C: glabel L80240C5C_9A904C /* 9A904C 80240C5C 0000102D */ daddu $v0, $zero, $zero .L80240C60: diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s index ed3c0c1882..cb0e59d570 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -122,7 +122,7 @@ glabel func_80241818_9A9C08 .L802419D8: /* 9A9DC8 802419D8 8E830070 */ lw $v1, 0x70($s4) /* 9A9DCC 802419DC 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9A9DD0 802419E0 10400042 */ beqz $v0, .L80241AEC +/* 9A9DD0 802419E0 10400042 */ beqz $v0, L80241AEC_9A9EDC /* 9A9DD4 802419E4 00031080 */ sll $v0, $v1, 2 /* 9A9DD8 802419E8 3C018024 */ lui $at, %hi(jtbl_80245F50_9AE340) /* 9A9DDC 802419EC 00220821 */ addu $at, $at, $v0 @@ -139,7 +139,7 @@ glabel L80241A0C_9A9DFC /* 9A9E00 80241A10 0260282D */ daddu $a1, $s3, $zero /* 9A9E04 80241A14 0C090377 */ jal func_80240DDC_9A91CC /* 9A9E08 80241A18 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E0C 80241A1C 080906BB */ j .L80241AEC +/* 9A9E0C 80241A1C 080906BB */ j L80241AEC_9A9EDC /* 9A9E10 80241A20 00000000 */ nop glabel L80241A24_9A9E14 /* 9A9E14 80241A24 0280202D */ daddu $a0, $s4, $zero @@ -151,14 +151,14 @@ glabel L80241A34_9A9E24 /* 9A9E28 80241A38 0260282D */ daddu $a1, $s3, $zero /* 9A9E2C 80241A3C 0C090451 */ jal func_80241144_9A9534 /* 9A9E30 80241A40 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E34 80241A44 080906BB */ j .L80241AEC +/* 9A9E34 80241A44 080906BB */ j L80241AEC_9A9EDC /* 9A9E38 80241A48 00000000 */ nop glabel L80241A4C_9A9E3C /* 9A9E3C 80241A4C 0280202D */ daddu $a0, $s4, $zero /* 9A9E40 80241A50 0260282D */ daddu $a1, $s3, $zero /* 9A9E44 80241A54 0C0904C0 */ jal func_80241300_9A96F0 /* 9A9E48 80241A58 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E4C 80241A5C 080906BB */ j .L80241AEC +/* 9A9E4C 80241A5C 080906BB */ j L80241AEC_9A9EDC /* 9A9E50 80241A60 00000000 */ nop glabel L80241A64_9A9E54 /* 9A9E54 80241A64 0280202D */ daddu $a0, $s4, $zero @@ -170,7 +170,7 @@ glabel L80241A74_9A9E64 /* 9A9E68 80241A78 0260282D */ daddu $a1, $s3, $zero /* 9A9E6C 80241A7C 0C09050A */ jal trd_04_NpcJumpFunc /* 9A9E70 80241A80 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E74 80241A84 080906BB */ j .L80241AEC +/* 9A9E74 80241A84 080906BB */ j L80241AEC_9A9EDC /* 9A9E78 80241A88 00000000 */ nop glabel L80241A8C_9A9E7C /* 9A9E7C 80241A8C 0280202D */ daddu $a0, $s4, $zero @@ -182,26 +182,25 @@ glabel L80241A9C_9A9E8C /* 9A9E90 80241AA0 0260282D */ daddu $a1, $s3, $zero /* 9A9E94 80241AA4 0C090574 */ jal func_802415D0_9A99C0 /* 9A9E98 80241AA8 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E9C 80241AAC 080906BB */ j .L80241AEC +/* 9A9E9C 80241AAC 080906BB */ j L80241AEC_9A9EDC /* 9A9EA0 80241AB0 00000000 */ nop glabel L80241AB4_9A9EA4 /* 9A9EA4 80241AB4 0280202D */ daddu $a0, $s4, $zero /* 9A9EA8 80241AB8 0260282D */ daddu $a1, $s3, $zero /* 9A9EAC 80241ABC 0C0905BC */ jal trd_04_UnkNpcDurationFlagFunc /* 9A9EB0 80241AC0 02A0302D */ daddu $a2, $s5, $zero -/* 9A9EB4 80241AC4 080906BB */ j .L80241AEC +/* 9A9EB4 80241AC4 080906BB */ j L80241AEC_9A9EDC /* 9A9EB8 80241AC8 00000000 */ nop glabel L80241ACC_9A9EBC /* 9A9EBC 80241ACC 0280202D */ daddu $a0, $s4, $zero /* 9A9EC0 80241AD0 0260282D */ daddu $a1, $s3, $zero /* 9A9EC4 80241AD4 0C0905D6 */ jal func_80241758_9A9B48 /* 9A9EC8 80241AD8 02A0302D */ daddu $a2, $s5, $zero -/* 9A9ECC 80241ADC 080906BB */ j .L80241AEC +/* 9A9ECC 80241ADC 080906BB */ j L80241AEC_9A9EDC /* 9A9ED0 80241AE0 00000000 */ nop glabel L80241AE4_9A9ED4 /* 9A9ED4 80241AE4 0C0129CF */ jal func_8004A73C /* 9A9ED8 80241AE8 0280202D */ daddu $a0, $s4, $zero -.L80241AEC: glabel L80241AEC_9A9EDC /* 9A9EDC 80241AEC 8FBF0060 */ lw $ra, 0x60($sp) /* 9A9EE0 80241AF0 8FB5005C */ lw $s5, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s index 8f77a7bb49..5209aef809 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s @@ -132,7 +132,7 @@ glabel func_80241B14_9A9F04 .L80241CFC: /* 9AA0EC 80241CFC 8E630070 */ lw $v1, 0x70($s3) /* 9AA0F0 80241D00 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9AA0F4 80241D04 1040003A */ beqz $v0, .L80241DF0 +/* 9AA0F4 80241D04 1040003A */ beqz $v0, L80241DF0_9AA1E0 /* 9AA0F8 80241D08 00031080 */ sll $v0, $v1, 2 /* 9AA0FC 80241D0C 3C018024 */ lui $at, %hi(jtbl_802460E0_9AE4D0) /* 9AA100 80241D10 00220821 */ addu $at, $at, $v0 @@ -151,7 +151,7 @@ glabel L80241D38_9AA128 /* 9AA12C 80241D3C 0280282D */ daddu $a1, $s4, $zero /* 9AA130 80241D40 0C090377 */ jal func_80240DDC_9A91CC /* 9AA134 80241D44 02A0302D */ daddu $a2, $s5, $zero -/* 9AA138 80241D48 0809077C */ j .L80241DF0 +/* 9AA138 80241D48 0809077C */ j L80241DF0_9AA1E0 /* 9AA13C 80241D4C 00000000 */ nop glabel L80241D50_9AA140 /* 9AA140 80241D50 0260202D */ daddu $a0, $s3, $zero @@ -163,14 +163,14 @@ glabel L80241D60_9AA150 /* 9AA154 80241D64 0280282D */ daddu $a1, $s4, $zero /* 9AA158 80241D68 0C090451 */ jal func_80241144_9A9534 /* 9AA15C 80241D6C 02A0302D */ daddu $a2, $s5, $zero -/* 9AA160 80241D70 0809077C */ j .L80241DF0 +/* 9AA160 80241D70 0809077C */ j L80241DF0_9AA1E0 /* 9AA164 80241D74 00000000 */ nop glabel L80241D78_9AA168 /* 9AA168 80241D78 0260202D */ daddu $a0, $s3, $zero /* 9AA16C 80241D7C 0280282D */ daddu $a1, $s4, $zero /* 9AA170 80241D80 0C0904C0 */ jal func_80241300_9A96F0 /* 9AA174 80241D84 02A0302D */ daddu $a2, $s5, $zero -/* 9AA178 80241D88 0809077C */ j .L80241DF0 +/* 9AA178 80241D88 0809077C */ j L80241DF0_9AA1E0 /* 9AA17C 80241D8C 00000000 */ nop glabel L80241D90_9AA180 /* 9AA180 80241D90 0260202D */ daddu $a0, $s3, $zero @@ -182,26 +182,25 @@ glabel L80241DA0_9AA190 /* 9AA194 80241DA4 0280282D */ daddu $a1, $s4, $zero /* 9AA198 80241DA8 0C09014B */ jal func_8024052C_9A891C /* 9AA19C 80241DAC 02A0302D */ daddu $a2, $s5, $zero -/* 9AA1A0 80241DB0 0809077C */ j .L80241DF0 +/* 9AA1A0 80241DB0 0809077C */ j L80241DF0_9AA1E0 /* 9AA1A4 80241DB4 00000000 */ nop glabel L80241DB8_9AA1A8 /* 9AA1A8 80241DB8 0260202D */ daddu $a0, $s3, $zero /* 9AA1AC 80241DBC 0280282D */ daddu $a1, $s4, $zero /* 9AA1B0 80241DC0 0C090198 */ jal trd_04_UnkNpcAIFunc12 /* 9AA1B4 80241DC4 02A0302D */ daddu $a2, $s5, $zero -/* 9AA1B8 80241DC8 0809077C */ j .L80241DF0 +/* 9AA1B8 80241DC8 0809077C */ j L80241DF0_9AA1E0 /* 9AA1BC 80241DCC 00000000 */ nop glabel L80241DD0_9AA1C0 /* 9AA1C0 80241DD0 0260202D */ daddu $a0, $s3, $zero /* 9AA1C4 80241DD4 0280282D */ daddu $a1, $s4, $zero /* 9AA1C8 80241DD8 0C0901F1 */ jal trd_04_set_script_owner_npc_col_height /* 9AA1CC 80241DDC 02A0302D */ daddu $a2, $s5, $zero -/* 9AA1D0 80241DE0 0809077C */ j .L80241DF0 +/* 9AA1D0 80241DE0 0809077C */ j L80241DF0_9AA1E0 /* 9AA1D4 80241DE4 00000000 */ nop glabel L80241DE8_9AA1D8 /* 9AA1D8 80241DE8 0C0129CF */ jal func_8004A73C /* 9AA1DC 80241DEC 0260202D */ daddu $a0, $s3, $zero -.L80241DF0: glabel L80241DF0_9AA1E0 /* 9AA1E0 80241DF0 8FBF0068 */ lw $ra, 0x68($sp) /* 9AA1E4 80241DF4 8FB50064 */ lw $s5, 0x64($sp) 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 1d718d9aac..277beb3e1e 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 @@ -64,7 +64,7 @@ glabel func_80243124_9AB514 .L8024320C: /* 9AB5FC 8024320C 8E830070 */ lw $v1, 0x70($s4) /* 9AB600 80243210 2C62000F */ sltiu $v0, $v1, 0xf -/* 9AB604 80243214 10400034 */ beqz $v0, .L802432E8 +/* 9AB604 80243214 10400034 */ beqz $v0, L802432E8_9AB6D8 /* 9AB608 80243218 00031080 */ sll $v0, $v1, 2 /* 9AB60C 8024321C 3C018024 */ lui $at, %hi(jtbl_80246288_9AE678) /* 9AB610 80243220 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L802432D8_9AB6C8 /* 9AB6CC 802432DC 0200282D */ daddu $a1, $s0, $zero /* 9AB6D0 802432E0 0C090B1C */ jal func_80242C70_9AB060 /* 9AB6D4 802432E4 0260302D */ daddu $a2, $s3, $zero -.L802432E8: glabel L802432E8_9AB6D8 /* 9AB6D8 802432E8 0000102D */ daddu $v0, $zero, $zero .L802432EC: 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 a81e1a9b56..aa55ca876b 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 @@ -67,7 +67,7 @@ glabel func_80243650_9ABA40 .L80243744: /* 9ABB34 80243744 8E630070 */ lw $v1, 0x70($s3) /* 9ABB38 80243748 2C620010 */ sltiu $v0, $v1, 0x10 -/* 9ABB3C 8024374C 1040004A */ beqz $v0, .L80243878 +/* 9ABB3C 8024374C 1040004A */ beqz $v0, L80243878_9ABC68 /* 9ABB40 80243750 00031080 */ sll $v0, $v1, 2 /* 9ABB44 80243754 3C018024 */ lui $at, %hi(jtbl_802462C8_9AE6B8) /* 9ABB48 80243758 00220821 */ addu $at, $at, $v0 @@ -152,7 +152,6 @@ glabel L80243868_9ABC58 /* 9ABC5C 8024386C 0200282D */ daddu $a1, $s0, $zero /* 9ABC60 80243870 0C090D83 */ jal trd_04_UnkDurationCheck /* 9ABC64 80243874 0280302D */ daddu $a2, $s4, $zero -.L80243878: glabel L80243878_9ABC68 /* 9ABC68 80243878 0000102D */ daddu $v0, $zero, $zero .L8024387C: diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s index cf58ba93e4..cc3d0d5677 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s @@ -134,7 +134,7 @@ glabel func_802406A4_9B7024 /* 9B7210 80240890 8E220090 */ lw $v0, 0x90($s1) /* 9B7214 80240894 1840000C */ blez $v0, .L802408C8 /* 9B7218 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* 9B721C 8024089C 14400087 */ bnez $v0, .L80240ABC +/* 9B721C 8024089C 14400087 */ bnez $v0, L80240ABC_9B743C /* 9B7220 802408A0 AE220090 */ sw $v0, 0x90($s1) /* 9B7224 802408A4 3C03FFAA */ lui $v1, 0xffaa /* 9B7228 802408A8 8E420028 */ lw $v0, 0x28($s2) @@ -221,7 +221,7 @@ glabel func_802406A4_9B7024 .L802409D0: /* 9B7350 802409D0 AE420028 */ sw $v0, 0x28($s2) /* 9B7354 802409D4 24020007 */ addiu $v0, $zero, 7 -/* 9B7358 802409D8 080902AF */ j .L80240ABC +/* 9B7358 802409D8 080902AF */ j L80240ABC_9B743C /* 9B735C 802409DC AE220090 */ sw $v0, 0x90($s1) .L802409E0: /* 9B7360 802409E0 0280282D */ daddu $a1, $s4, $zero @@ -271,13 +271,13 @@ glabel func_802406A4_9B7024 /* 9B73F4 80240A74 A22000B5 */ sb $zero, 0xb5($s1) .L80240A78: /* 9B73F8 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* 9B73FC 80240A7C 1040000F */ beqz $v0, .L80240ABC +/* 9B73FC 80240A7C 1040000F */ beqz $v0, L80240ABC_9B743C /* 9B7400 80240A80 3C03FFAA */ lui $v1, 0xffaa /* 9B7404 80240A84 8E420028 */ lw $v0, 0x28($s2) /* 9B7408 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc /* 9B740C 80240A8C 00431821 */ addu $v1, $v0, $v1 /* 9B7410 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9B7414 80240A94 10400009 */ beqz $v0, .L80240ABC +/* 9B7414 80240A94 10400009 */ beqz $v0, L80240ABC_9B743C /* 9B7418 80240A98 00031080 */ sll $v0, $v1, 2 /* 9B741C 80240A9C 3C018024 */ lui $at, %hi(jtbl_80244828_9BB1A8) /* 9B7420 80240AA0 00220821 */ addu $at, $at, $v0 @@ -288,7 +288,6 @@ glabel L80240AB0_9B7430 /* 9B7430 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* 9B7434 80240AB4 24420001 */ addiu $v0, $v0, 1 /* 9B7438 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC: glabel L80240ABC_9B743C /* 9B743C 80240ABC 0000102D */ daddu $v0, $zero, $zero .L80240AC0: 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 4663d0eb4c..e2e7daaafb 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 @@ -64,7 +64,7 @@ glabel func_80241DF0_9B8770 .L80241ED8: /* 9B8858 80241ED8 8E830070 */ lw $v1, 0x70($s4) /* 9B885C 80241EDC 2C62000F */ sltiu $v0, $v1, 0xf -/* 9B8860 80241EE0 10400034 */ beqz $v0, .L80241FB4 +/* 9B8860 80241EE0 10400034 */ beqz $v0, L80241FB4_9B8934 /* 9B8864 80241EE4 00031080 */ sll $v0, $v1, 2 /* 9B8868 80241EE8 3C018024 */ lui $at, %hi(jtbl_80244898_9BB218) /* 9B886C 80241EEC 00220821 */ addu $at, $at, $v0 @@ -126,7 +126,6 @@ glabel L80241FA4_9B8924 /* 9B8928 80241FA8 0200282D */ daddu $a1, $s0, $zero /* 9B892C 80241FAC 0C09064F */ jal func_8024193C_9B82BC /* 9B8930 80241FB0 0260302D */ daddu $a2, $s3, $zero -.L80241FB4: glabel L80241FB4_9B8934 /* 9B8934 80241FB4 0000102D */ daddu $v0, $zero, $zero .L80241FB8: 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 e58d7e3ae0..e6199e8102 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 @@ -67,7 +67,7 @@ glabel func_8024231C_9B8C9C .L80242410: /* 9B8D90 80242410 8E630070 */ lw $v1, 0x70($s3) /* 9B8D94 80242414 2C620010 */ sltiu $v0, $v1, 0x10 -/* 9B8D98 80242418 1040004A */ beqz $v0, .L80242544 +/* 9B8D98 80242418 1040004A */ beqz $v0, L80242544_9B8EC4 /* 9B8D9C 8024241C 00031080 */ sll $v0, $v1, 2 /* 9B8DA0 80242420 3C018024 */ lui $at, %hi(jtbl_802448D8_9BB258) /* 9B8DA4 80242424 00220821 */ addu $at, $at, $v0 @@ -152,7 +152,6 @@ glabel L80242534_9B8EB4 /* 9B8EB8 80242538 0200282D */ daddu $a1, $s0, $zero /* 9B8EBC 8024253C 0C0908B6 */ jal trd_07_UnkDurationCheck /* 9B8EC0 80242540 0280302D */ daddu $a2, $s4, $zero -.L80242544: glabel L80242544_9B8EC4 /* 9B8EC4 80242544 0000102D */ daddu $v0, $zero, $zero .L80242548: diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s index f031cc4842..857b58af7b 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s @@ -11,7 +11,7 @@ glabel func_802401AC_9C2ABC /* 9C2AD4 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) /* 9C2AD8 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* 9C2ADC 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* 9C2AE0 802401D0 1040008A */ beqz $v0, .L802403FC +/* 9C2AE0 802401D0 1040008A */ beqz $v0, L802403FC_9C2D0C /* 9C2AE4 802401D4 00031080 */ sll $v0, $v1, 2 /* 9C2AE8 802401D8 3C018024 */ lui $at, %hi(jtbl_80242AA0_9C53B0) /* 9C2AEC 802401DC 00220821 */ addu $at, $at, $v0 @@ -62,10 +62,10 @@ glabel L802401EC_9C2AFC /* 9C2B9C 8024028C 00021400 */ sll $v0, $v0, 0x10 /* 9C2BA0 80240290 00021403 */ sra $v0, $v0, 0x10 /* 9C2BA4 80240294 0043102A */ slt $v0, $v0, $v1 -/* 9C2BA8 80240298 14400058 */ bnez $v0, .L802403FC +/* 9C2BA8 80240298 14400058 */ bnez $v0, L802403FC_9C2D0C /* 9C2BAC 8024029C 24020001 */ addiu $v0, $zero, 1 /* 9C2BB0 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* 9C2BB4 802402A4 080900FF */ j .L802403FC +/* 9C2BB4 802402A4 080900FF */ j L802403FC_9C2D0C /* 9C2BB8 802402A8 A6200046 */ sh $zero, 0x46($s1) glabel L802402AC_9C2BBC /* 9C2BBC 802402AC 96220046 */ lhu $v0, 0x46($s1) @@ -74,7 +74,7 @@ glabel L802402AC_9C2BBC /* 9C2BC8 802402B8 00021400 */ sll $v0, $v0, 0x10 /* 9C2BCC 802402BC 00021403 */ sra $v0, $v0, 0x10 /* 9C2BD0 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* 9C2BD4 802402C4 1440004D */ bnez $v0, .L802403FC +/* 9C2BD4 802402C4 1440004D */ bnez $v0, L802403FC_9C2D0C /* 9C2BD8 802402C8 24020002 */ addiu $v0, $zero, 2 /* 9C2BDC 802402CC 8E230050 */ lw $v1, 0x50($s1) /* 9C2BE0 802402D0 A6220044 */ sh $v0, 0x44($s1) @@ -84,7 +84,7 @@ glabel L802402AC_9C2BBC /* 9C2BF0 802402E0 AC620070 */ sw $v0, 0x70($v1) /* 9C2BF4 802402E4 8E220050 */ lw $v0, 0x50($s1) /* 9C2BF8 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* 9C2BFC 802402EC 080900FF */ j .L802403FC +/* 9C2BFC 802402EC 080900FF */ j L802403FC_9C2D0C /* 9C2C00 802402F0 AC400074 */ sw $zero, 0x74($v0) glabel L802402F4_9C2C04 /* 9C2C04 802402F4 96220046 */ lhu $v0, 0x46($s1) @@ -93,7 +93,7 @@ glabel L802402F4_9C2C04 /* 9C2C10 80240300 00021400 */ sll $v0, $v0, 0x10 /* 9C2C14 80240304 00021403 */ sra $v0, $v0, 0x10 /* 9C2C18 80240308 2842003C */ slti $v0, $v0, 0x3c -/* 9C2C1C 8024030C 1440003B */ bnez $v0, .L802403FC +/* 9C2C1C 8024030C 1440003B */ bnez $v0, L802403FC_9C2D0C /* 9C2C20 80240310 00000000 */ nop /* 9C2C24 80240314 3C013F80 */ lui $at, 0x3f80 /* 9C2C28 80240318 44810000 */ mtc1 $at, $f0 @@ -125,7 +125,7 @@ glabel L802402F4_9C2C04 /* 9C2C90 80240380 A6200046 */ sh $zero, 0x46($s1) /* 9C2C94 80240384 AE20002C */ sw $zero, 0x2c($s1) /* 9C2C98 80240388 A6220048 */ sh $v0, 0x48($s1) -/* 9C2C9C 8024038C 080900FF */ j .L802403FC +/* 9C2C9C 8024038C 080900FF */ j L802403FC_9C2D0C /* 9C2CA0 80240390 E6200030 */ swc1 $f0, 0x30($s1) glabel L80240394_9C2CA4 /* 9C2CA4 80240394 0000202D */ daddu $a0, $zero, $zero @@ -142,7 +142,7 @@ glabel L80240394_9C2CA4 /* 9C2CD0 802403C0 00021400 */ sll $v0, $v0, 0x10 /* 9C2CD4 802403C4 00021403 */ sra $v0, $v0, 0x10 /* 9C2CD8 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* 9C2CDC 802403CC 1440000B */ bnez $v0, .L802403FC +/* 9C2CDC 802403CC 1440000B */ bnez $v0, L802403FC_9C2D0C /* 9C2CE0 802403D0 24030001 */ addiu $v1, $zero, 1 /* 9C2CE4 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) /* 9C2CE8 802403D8 24020002 */ addiu $v0, $zero, 2 @@ -154,7 +154,6 @@ glabel L80240394_9C2CA4 /* 9C2D00 802403F0 A6220044 */ sh $v0, 0x44($s1) /* 9C2D04 802403F4 A6200046 */ sh $zero, 0x46($s1) /* 9C2D08 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -.L802403FC: glabel L802403FC_9C2D0C /* 9C2D0C 802403FC 8623004A */ lh $v1, 0x4a($s1) /* 9C2D10 80240400 24020001 */ addiu $v0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s b/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s index 6003d42f5d..ae0b42b31b 100644 --- a/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s +++ b/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s @@ -135,7 +135,7 @@ glabel func_802BD694_323FE4 /* 3241BC 802BD86C 8E820070 */ lw $v0, 0x70($s4) /* 3241C0 802BD870 2443FFFF */ addiu $v1, $v0, -1 /* 3241C4 802BD874 2C620015 */ sltiu $v0, $v1, 0x15 -/* 3241C8 802BD878 10400152 */ beqz $v0, .L802BDDC4 +/* 3241C8 802BD878 10400152 */ beqz $v0, L802BDDC4_324714 /* 3241CC 802BD87C 00031080 */ sll $v0, $v1, 2 /* 3241D0 802BD880 3C01802C */ lui $at, %hi(jtbl_802BE068_3249B8) /* 3241D4 802BD884 00220821 */ addu $at, $at, $v0 @@ -242,7 +242,7 @@ glabel L802BD894_3241E4 /* 32435C 802BDA0C 34840002 */ ori $a0, $a0, 2 /* 324360 802BDA10 8E820070 */ lw $v0, 0x70($s4) /* 324364 802BDA14 24420001 */ addiu $v0, $v0, 1 -/* 324368 802BDA18 080AF771 */ j .L802BDDC4 +/* 324368 802BDA18 080AF771 */ j L802BDDC4_324714 /* 32436C 802BDA1C AE820070 */ sw $v0, 0x70($s4) glabel L802BDA20_324370 /* 324370 802BDA20 86220002 */ lh $v0, 2($s1) @@ -333,7 +333,7 @@ glabel L802BDA20_324370 /* 3244C4 802BDB74 0C052742 */ jal play_sound_at_npc /* 3244C8 802BDB78 2406FFFC */ addiu $a2, $zero, -4 /* 3244CC 802BDB7C 24020001 */ addiu $v0, $zero, 1 -/* 3244D0 802BDB80 080AF771 */ j .L802BDDC4 +/* 3244D0 802BDB80 080AF771 */ j L802BDDC4_324714 /* 3244D4 802BDB84 AE820070 */ sw $v0, 0x70($s4) glabel L802BDB88_3244D8 /* 3244D8 802BDB88 86220002 */ lh $v0, 2($s1) @@ -390,7 +390,7 @@ glabel L802BDB88_3244D8 /* 3245A0 802BDC50 C422E0EC */ lwc1 $f2, %lo(D_802BE0EC)($at) /* 3245A4 802BDC54 468010A0 */ cvt.s.w $f2, $f2 /* 3245A8 802BDC58 46020001 */ sub.s $f0, $f0, $f2 -/* 3245AC 802BDC5C 080AF771 */ j .L802BDDC4 +/* 3245AC 802BDC5C 080AF771 */ j L802BDDC4_324714 /* 3245B0 802BDC60 E6400040 */ swc1 $f0, 0x40($s2) glabel L802BDC64_3245B4 /* 3245B4 802BDC64 86220002 */ lh $v0, 2($s1) @@ -462,7 +462,7 @@ glabel L802BDC64_3245B4 /* 3246B0 802BDD60 24420001 */ addiu $v0, $v0, 1 /* 3246B4 802BDD64 AE820070 */ sw $v0, 0x70($s4) /* 3246B8 802BDD68 82620015 */ lb $v0, 0x15($s3) -/* 3246BC 802BDD6C 080AF771 */ j .L802BDDC4 +/* 3246BC 802BDD6C 080AF771 */ j L802BDDC4_324714 /* 3246C0 802BDD70 AE820078 */ sw $v0, 0x78($s4) glabel L802BDD74_3246C4 /* 3246C4 802BDD74 8E820074 */ lw $v0, 0x74($s4) @@ -473,10 +473,10 @@ glabel L802BDD74_3246C4 /* 3246D8 802BDD88 0043102A */ slt $v0, $v0, $v1 /* 3246DC 802BDD8C 10400005 */ beqz $v0, .L802BDDA4 /* 3246E0 802BDD90 24020002 */ addiu $v0, $zero, 2 -/* 3246E4 802BDD94 080AF771 */ j .L802BDDC4 +/* 3246E4 802BDD94 080AF771 */ j L802BDDC4_324714 /* 3246E8 802BDD98 AE820070 */ sw $v0, 0x70($s4) .L802BDD9C: -/* 3246EC 802BDD9C 080AF771 */ j .L802BDDC4 +/* 3246EC 802BDD9C 080AF771 */ j L802BDDC4_324714 /* 3246F0 802BDDA0 AE820074 */ sw $v0, 0x74($s4) .L802BDDA4: /* 3246F4 802BDDA4 2404200F */ addiu $a0, $zero, 0x200f @@ -487,7 +487,6 @@ glabel L802BDD74_3246C4 /* 324708 802BDDB8 0240202D */ daddu $a0, $s2, $zero /* 32470C 802BDDBC 080AF772 */ j .L802BDDC8 /* 324710 802BDDC0 24020001 */ addiu $v0, $zero, 1 -.L802BDDC4: glabel L802BDDC4_324714 /* 324714 802BDDC4 0000102D */ daddu $v0, $zero, $zero .L802BDDC8: diff --git a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s index 57b9397a3a..5be00ca1d4 100644 --- a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s +++ b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s @@ -64,7 +64,7 @@ glabel func_802BD638_31B658 /* 31B734 802BD714 8EA20070 */ lw $v0, 0x70($s5) /* 31B738 802BD718 2443FFFE */ addiu $v1, $v0, -2 /* 31B73C 802BD71C 2C620014 */ sltiu $v0, $v1, 0x14 -/* 31B740 802BD720 1040031F */ beqz $v0, .L802BE3A0 +/* 31B740 802BD720 1040031F */ beqz $v0, L802BE3A0_31C3C0 /* 31B744 802BD724 00031080 */ sll $v0, $v1, 2 /* 31B748 802BD728 3C01802C */ lui $at, %hi(jtbl_802BEBC8_31CBE8) /* 31B74C 802BD72C 00220821 */ addu $at, $at, $v0 @@ -225,7 +225,7 @@ glabel L802BD7F0_31B810 /* 31B9A0 802BD980 46023180 */ add.s $f6, $f6, $f2 /* 31B9A4 802BD984 E60A0038 */ swc1 $f10, 0x38($s0) /* 31B9A8 802BD988 E608003C */ swc1 $f8, 0x3c($s0) -/* 31B9AC 802BD98C 14400284 */ bnez $v0, .L802BE3A0 +/* 31B9AC 802BD98C 14400284 */ bnez $v0, L802BE3A0_31C3C0 /* 31B9B0 802BD990 E6060040 */ swc1 $f6, 0x40($s0) /* 31B9B4 802BD994 0C00EB6B */ jal disable_npc_blur /* 31B9B8 802BD998 0200202D */ daddu $a0, $s0, $zero @@ -245,7 +245,7 @@ glabel L802BD7F0_31B810 .L802BD9CC: /* 31B9EC 802BD9CC 0C037FBF */ jal func_800DFEFC /* 31B9F0 802BD9D0 00000000 */ nop -/* 31B9F4 802BD9D4 080AF8E8 */ j .L802BE3A0 +/* 31B9F4 802BD9D4 080AF8E8 */ j L802BE3A0_31C3C0 /* 31B9F8 802BD9D8 AEA00070 */ sw $zero, 0x70($s5) .L802BD9DC: /* 31B9FC 802BD9DC 3C020002 */ lui $v0, 2 @@ -303,7 +303,7 @@ glabel L802BDAA8_31BAC8 /* 31BAC8 802BDAA8 928200B4 */ lbu $v0, 0xb4($s4) /* 31BACC 802BDAAC 2442FFEB */ addiu $v0, $v0, -0x15 /* 31BAD0 802BDAB0 2C420003 */ sltiu $v0, $v0, 3 -/* 31BAD4 802BDAB4 5440023A */ bnel $v0, $zero, .L802BE3A0 +/* 31BAD4 802BDAB4 5440023A */ bnel $v0, $zero, L802BE3A0_31C3C0 /* 31BAD8 802BDAB8 AEA00070 */ sw $zero, 0x70($s5) /* 31BADC 802BDABC C602001C */ lwc1 $f2, 0x1c($s0) /* 31BAE0 802BDAC0 C6000014 */ lwc1 $f0, 0x14($s0) @@ -393,13 +393,13 @@ glabel L802BDAA8_31BAC8 /* 31BC24 802BDC04 00000000 */ nop /* 31BC28 802BDC08 4600203C */ c.lt.s $f4, $f0 /* 31BC2C 802BDC0C 00000000 */ nop -/* 31BC30 802BDC10 450101E3 */ bc1t .L802BE3A0 +/* 31BC30 802BDC10 450101E3 */ bc1t L802BE3A0_31C3C0 /* 31BC34 802BDC14 00000000 */ nop /* 31BC38 802BDC18 C682002C */ lwc1 $f2, 0x2c($s4) /* 31BC3C 802BDC1C C6000068 */ lwc1 $f0, 0x68($s0) /* 31BC40 802BDC20 4600103C */ c.lt.s $f2, $f0 /* 31BC44 802BDC24 00000000 */ nop -/* 31BC48 802BDC28 450001DD */ bc1f .L802BE3A0 +/* 31BC48 802BDC28 450001DD */ bc1f L802BE3A0_31C3C0 /* 31BC4C 802BDC2C 3C040002 */ lui $a0, 2 /* 31BC50 802BDC30 34840009 */ ori $a0, $a0, 9 /* 31BC54 802BDC34 8E020000 */ lw $v0, ($s0) @@ -471,13 +471,13 @@ glabel L802BDAA8_31BAC8 /* 31BD58 802BDD38 0000282D */ daddu $a1, $zero, $zero /* 31BD5C 802BDD3C 0C052742 */ jal play_sound_at_npc /* 31BD60 802BDD40 2406FFFC */ addiu $a2, $zero, -4 -/* 31BD64 802BDD44 080AF8E8 */ j .L802BE3A0 +/* 31BD64 802BDD44 080AF8E8 */ j L802BE3A0_31C3C0 /* 31BD68 802BDD48 00000000 */ nop glabel L802BDD4C_31BD6C /* 31BD6C 802BDD4C 928200B4 */ lbu $v0, 0xb4($s4) /* 31BD70 802BDD50 2442FFEB */ addiu $v0, $v0, -0x15 /* 31BD74 802BDD54 2C420002 */ sltiu $v0, $v0, 2 -/* 31BD78 802BDD58 54400191 */ bnel $v0, $zero, .L802BE3A0 +/* 31BD78 802BDD58 54400191 */ bnel $v0, $zero, L802BE3A0_31C3C0 /* 31BD7C 802BDD5C AEA00070 */ sw $zero, 0x70($s5) /* 31BD80 802BDD60 34048000 */ ori $a0, $zero, 0x8000 /* 31BD84 802BDD64 C6000038 */ lwc1 $f0, 0x38($s0) @@ -743,7 +743,7 @@ glabel L802BDD4C_31BD6C /* 31C17C 802BE15C 2402001E */ addiu $v0, $zero, 0x1e /* 31C180 802BE160 3C01802C */ lui $at, %hi(D_802BEC50) /* 31C184 802BE164 AC22EC50 */ sw $v0, %lo(D_802BEC50)($at) -/* 31C188 802BE168 080AF8E8 */ j .L802BE3A0 +/* 31C188 802BE168 080AF8E8 */ j L802BE3A0_31C3C0 /* 31C18C 802BE16C AE000018 */ sw $zero, 0x18($s0) .L802BE170: /* 31C190 802BE170 C6020010 */ lwc1 $f2, 0x10($s0) @@ -761,7 +761,7 @@ glabel L802BDD4C_31BD6C /* 31C1BC 802BE19C AEA20070 */ sw $v0, 0x70($s5) /* 31C1C0 802BE1A0 0C052742 */ jal play_sound_at_npc /* 31C1C4 802BE1A4 AE000018 */ sw $zero, 0x18($s0) -/* 31C1C8 802BE1A8 080AF8E8 */ j .L802BE3A0 +/* 31C1C8 802BE1A8 080AF8E8 */ j L802BE3A0_31C3C0 /* 31C1CC 802BE1AC 00000000 */ nop .L802BE1B0: /* 31C1D0 802BE1B0 3C0142D2 */ lui $at, 0x42d2 @@ -769,7 +769,7 @@ glabel L802BDD4C_31BD6C /* 31C1D8 802BE1B8 00000000 */ nop /* 31C1DC 802BE1BC 4602003C */ c.lt.s $f0, $f2 /* 31C1E0 802BE1C0 00000000 */ nop -/* 31C1E4 802BE1C4 45000076 */ bc1f .L802BE3A0 +/* 31C1E4 802BE1C4 45000076 */ bc1f L802BE3A0_31C3C0 /* 31C1E8 802BE1C8 00000000 */ nop /* 31C1EC 802BE1CC C6000018 */ lwc1 $f0, 0x18($s0) /* 31C1F0 802BE1D0 3C014010 */ lui $at, 0x4010 @@ -784,7 +784,7 @@ glabel L802BDD4C_31BD6C /* 31C210 802BE1F0 460000A1 */ cvt.d.s $f2, $f0 /* 31C214 802BE1F4 4624103C */ c.lt.d $f2, $f4 /* 31C218 802BE1F8 00000000 */ nop -/* 31C21C 802BE1FC 45000068 */ bc1f .L802BE3A0 +/* 31C21C 802BE1FC 45000068 */ bc1f L802BE3A0_31C3C0 /* 31C220 802BE200 E6000018 */ swc1 $f0, 0x18($s0) /* 31C224 802BE204 C6000010 */ lwc1 $f0, 0x10($s0) /* 31C228 802BE208 3C013FF0 */ lui $at, 0x3ff0 @@ -798,7 +798,7 @@ glabel L802BDD4C_31BD6C /* 31C248 802BE228 00000000 */ nop /* 31C24C 802BE22C E6020018 */ swc1 $f2, 0x18($s0) /* 31C250 802BE230 46200020 */ cvt.s.d $f0, $f0 -/* 31C254 802BE234 080AF8E8 */ j .L802BE3A0 +/* 31C254 802BE234 080AF8E8 */ j L802BE3A0_31C3C0 /* 31C258 802BE238 E6000010 */ swc1 $f0, 0x10($s0) glabel L802BE23C_31C25C /* 31C25C 802BE23C C6000038 */ lwc1 $f0, 0x38($s0) @@ -889,13 +889,12 @@ glabel L802BE37C_31C39C /* 31C3A8 802BE388 10400003 */ beqz $v0, .L802BE398 /* 31C3AC 802BE38C 2442FFFF */ addiu $v0, $v0, -1 .L802BE390: -/* 31C3B0 802BE390 080AF8E8 */ j .L802BE3A0 +/* 31C3B0 802BE390 080AF8E8 */ j L802BE3A0_31C3C0 /* 31C3B4 802BE394 AC620000 */ sw $v0, ($v1) .L802BE398: /* 31C3B8 802BE398 24020007 */ addiu $v0, $zero, 7 .L802BE39C: /* 31C3BC 802BE39C AEA20070 */ sw $v0, 0x70($s5) -.L802BE3A0: glabel L802BE3A0_31C3C0 /* 31C3C0 802BE3A0 8EA30070 */ lw $v1, 0x70($s5) /* 31C3C4 802BE3A4 24020007 */ addiu $v0, $zero, 7 diff --git a/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s b/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s index ccfc7a3368..4bacf1baf7 100644 --- a/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s +++ b/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s @@ -126,7 +126,7 @@ glabel func_802BD660_319BD0 /* 319D90 802BD820 8C42EBC0 */ lw $v0, %lo(D_802BEBC0)($v0) /* 319D94 802BD824 2443FFFF */ addiu $v1, $v0, -1 /* 319D98 802BD828 2C62001F */ sltiu $v0, $v1, 0x1f -/* 319D9C 802BD82C 104003D7 */ beqz $v0, .L802BE78C +/* 319D9C 802BD82C 104003D7 */ beqz $v0, L802BE78C_31ACFC /* 319DA0 802BD830 00031080 */ sll $v0, $v1, 2 /* 319DA4 802BD834 3C01802C */ lui $at, %hi(jtbl_802BEB18_31B088) /* 319DA8 802BD838 00220821 */ addu $at, $at, $v0 @@ -179,7 +179,7 @@ glabel L802BD848_319DB8 /* 319E60 802BD8F0 24030004 */ addiu $v1, $zero, 4 /* 319E64 802BD8F4 A603008E */ sh $v1, 0x8e($s0) /* 319E68 802BD8F8 24420001 */ addiu $v0, $v0, 1 -/* 319E6C 802BD8FC 080AF9E3 */ j .L802BE78C +/* 319E6C 802BD8FC 080AF9E3 */ j L802BE78C_31ACFC /* 319E70 802BD900 AC820000 */ sw $v0, ($a0) glabel L802BD904_319E74 /* 319E74 802BD904 822300B4 */ lb $v1, 0xb4($s1) @@ -274,7 +274,7 @@ glabel L802BD904_319E74 /* 319FCC 802BDA5C 82230015 */ lb $v1, 0x15($s1) /* 319FD0 802BDA60 8E420078 */ lw $v0, 0x78($s2) /* 319FD4 802BDA64 0043102A */ slt $v0, $v0, $v1 -/* 319FD8 802BDA68 10400348 */ beqz $v0, .L802BE78C +/* 319FD8 802BDA68 10400348 */ beqz $v0, L802BE78C_31ACFC /* 319FDC 802BDA6C 00000000 */ nop /* 319FE0 802BDA70 0C00EB6B */ jal disable_npc_blur /* 319FE4 802BDA74 0200202D */ daddu $a0, $s0, $zero @@ -333,7 +333,7 @@ glabel L802BDAF8_31A068 /* 31A0AC 802BDB3C 3C040001 */ lui $a0, 1 /* 31A0B0 802BDB40 0C037FBF */ jal func_800DFEFC /* 31A0B4 802BDB44 34840002 */ ori $a0, $a0, 2 -/* 31A0B8 802BDB48 080AF9E3 */ j .L802BE78C +/* 31A0B8 802BDB48 080AF9E3 */ j L802BE78C_31ACFC /* 31A0BC 802BDB4C 00000000 */ nop .L802BDB50: /* 31A0C0 802BDB50 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -749,7 +749,7 @@ glabel L802BDAF8_31A068 /* 31A700 802BE190 10600004 */ beqz $v1, .L802BE1A4 /* 31A704 802BE194 E4440068 */ swc1 $f4, 0x68($v0) /* 31A708 802BE198 2462FFFF */ addiu $v0, $v1, -1 -/* 31A70C 802BE19C 080AF9E3 */ j .L802BE78C +/* 31A70C 802BE19C 080AF9E3 */ j L802BE78C_31ACFC /* 31A710 802BE1A0 AC820000 */ sw $v0, ($a0) .L802BE1A4: /* 31A714 802BE1A4 3C040004 */ lui $a0, 4 @@ -777,7 +777,7 @@ glabel L802BDAF8_31A068 /* 31A76C 802BE1FC E6020064 */ swc1 $f2, 0x64($s0) /* 31A770 802BE200 3C018016 */ lui $at, %hi(gCollisionStatus+0x2) /* 31A774 802BE204 A422A552 */ sh $v0, %lo(gCollisionStatus+0x2)($at) -/* 31A778 802BE208 080AF9E3 */ j .L802BE78C +/* 31A778 802BE208 080AF9E3 */ j L802BE78C_31ACFC /* 31A77C 802BE20C 00000000 */ nop glabel L802BE210_31A780 /* 31A780 802BE210 0C0AF556 */ jal func_802BD558_319AC8 @@ -807,7 +807,7 @@ glabel L802BE210_31A780 .L802BE270: /* 31A7E0 802BE270 3C01802C */ lui $at, %hi(D_802BEBC0) /* 31A7E4 802BE274 AC24EBC0 */ sw $a0, %lo(D_802BEBC0)($at) -/* 31A7E8 802BE278 080AF9E3 */ j .L802BE78C +/* 31A7E8 802BE278 080AF9E3 */ j L802BE78C_31ACFC /* 31A7EC 802BE27C 00000000 */ nop .L802BE280: /* 31A7F0 802BE280 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -956,7 +956,7 @@ glabel L802BE210_31A780 /* 31AA18 802BE4A8 34840002 */ ori $a0, $a0, 2 /* 31AA1C 802BE4AC 3C01802C */ lui $at, %hi(D_802BEBC0) /* 31AA20 802BE4B0 AC35EBC0 */ sw $s5, %lo(D_802BEBC0)($at) -/* 31AA24 802BE4B4 080AF9E3 */ j .L802BE78C +/* 31AA24 802BE4B4 080AF9E3 */ j L802BE78C_31ACFC /* 31AA28 802BE4B8 00000000 */ nop .L802BE4BC: /* 31AA2C 802BE4BC C6000038 */ lwc1 $f0, 0x38($s0) @@ -1125,7 +1125,7 @@ glabel L802BE210_31A780 /* 31ACAC 802BE73C 24420001 */ addiu $v0, $v0, 1 /* 31ACB0 802BE740 4600103C */ c.lt.s $f2, $f0 /* 31ACB4 802BE744 00000000 */ nop -/* 31ACB8 802BE748 45010010 */ bc1t .L802BE78C +/* 31ACB8 802BE748 45010010 */ bc1t L802BE78C_31ACFC /* 31ACBC 802BE74C A602008E */ sh $v0, 0x8e($s0) /* 31ACC0 802BE750 24020005 */ addiu $v0, $zero, 5 /* 31ACC4 802BE754 3C01802C */ lui $at, %hi(D_802BEBC4) @@ -1138,14 +1138,13 @@ glabel L802BE764_31ACD4 /* 31ACDC 802BE76C 8C620000 */ lw $v0, ($v1) /* 31ACE0 802BE770 10400003 */ beqz $v0, .L802BE780 /* 31ACE4 802BE774 2442FFFF */ addiu $v0, $v0, -1 -/* 31ACE8 802BE778 080AF9E3 */ j .L802BE78C +/* 31ACE8 802BE778 080AF9E3 */ j L802BE78C_31ACFC /* 31ACEC 802BE77C AC620000 */ sw $v0, ($v1) .L802BE780: /* 31ACF0 802BE780 24020015 */ addiu $v0, $zero, 0x15 .L802BE784: /* 31ACF4 802BE784 3C01802C */ lui $at, %hi(D_802BEBC0) /* 31ACF8 802BE788 AC22EBC0 */ sw $v0, %lo(D_802BEBC0)($at) -.L802BE78C: glabel L802BE78C_31ACFC /* 31ACFC 802BE78C 3C12802C */ lui $s2, %hi(D_802BEBC0) /* 31AD00 802BE790 2652EBC0 */ addiu $s2, $s2, %lo(D_802BEBC0) diff --git a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s index 70308670df..a6d4636d76 100644 --- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s +++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s @@ -48,7 +48,7 @@ glabel func_802BE3A4_31F114 /* 31F1BC 802BE44C AE430004 */ sw $v1, 4($s2) /* 31F1C0 802BE450 8EA30070 */ lw $v1, 0x70($s5) /* 31F1C4 802BE454 2C62001A */ sltiu $v0, $v1, 0x1a -/* 31F1C8 802BE458 10400425 */ beqz $v0, .L802BF4F0 +/* 31F1C8 802BE458 10400425 */ beqz $v0, L802BF4F0_320260 /* 31F1CC 802BE45C 00031080 */ sll $v0, $v1, 2 /* 31F1D0 802BE460 3C01802C */ lui $at, %hi(jtbl_802BFE68_320BD8) /* 31F1D4 802BE464 00220821 */ addu $at, $at, $v0 @@ -79,7 +79,7 @@ glabel L802BE474_31F1E4 /* 31F230 802BE4C0 24020001 */ addiu $v0, $zero, 1 .L802BE4C4: /* 31F234 802BE4C4 24020014 */ addiu $v0, $zero, 0x14 -/* 31F238 802BE4C8 080AFD3C */ j .L802BF4F0 +/* 31F238 802BE4C8 080AFD3C */ j L802BF4F0_320260 /* 31F23C 802BE4CC AEA20070 */ sw $v0, 0x70($s5) .L802BE4D0: /* 31F240 802BE4D0 C622003C */ lwc1 $f2, 0x3c($s1) @@ -127,7 +127,7 @@ glabel L802BE474_31F1E4 /* 31F2E8 802BE578 3C01802C */ lui $at, %hi(D_802BFEE8) /* 31F2EC 802BE57C AC20FEE8 */ sw $zero, %lo(D_802BFEE8)($at) /* 31F2F0 802BE580 AEA00078 */ sw $zero, 0x78($s5) -/* 31F2F4 802BE584 080AFD3C */ j .L802BF4F0 +/* 31F2F4 802BE584 080AFD3C */ j L802BF4F0_320260 /* 31F2F8 802BE588 AEB00070 */ sw $s0, 0x70($s5) glabel L802BE58C_31F2FC /* 31F2FC 802BE58C 86C40012 */ lh $a0, 0x12($s6) @@ -253,7 +253,7 @@ glabel L802BE58C_31F2FC /* 31F4D8 802BE768 E6220064 */ swc1 $f2, 0x64($s1) /* 31F4DC 802BE76C 8EA20070 */ lw $v0, 0x70($s5) /* 31F4E0 802BE770 24420001 */ addiu $v0, $v0, 1 -/* 31F4E4 802BE774 080AFD3C */ j .L802BF4F0 +/* 31F4E4 802BE774 080AFD3C */ j L802BF4F0_320260 /* 31F4E8 802BE778 AEA20070 */ sw $v0, 0x70($s5) glabel L802BE77C_31F4EC /* 31F4EC 802BE77C C6200060 */ lwc1 $f0, 0x60($s1) @@ -490,7 +490,7 @@ glabel L802BE9E4_31F754 /* 31F874 802BEB04 3C01802C */ lui $at, %hi(D_802BFEE8) /* 31F878 802BEB08 AC20FEE8 */ sw $zero, %lo(D_802BFEE8)($at) /* 31F87C 802BEB0C AEA00078 */ sw $zero, 0x78($s5) -/* 31F880 802BEB10 080AFD3C */ j .L802BF4F0 +/* 31F880 802BEB10 080AFD3C */ j L802BF4F0_320260 /* 31F884 802BEB14 AEA20070 */ sw $v0, 0x70($s5) glabel L802BEB18_31F888 /* 31F888 802BEB18 0220202D */ daddu $a0, $s1, $zero @@ -820,7 +820,7 @@ glabel L802BEB18_31F888 /* 31FD58 802BEFE8 8E240080 */ lw $a0, 0x80($s1) /* 31FD5C 802BEFEC 0C0371DE */ jal func_800DC778 /* 31FD60 802BEFF0 0280382D */ daddu $a3, $s4, $zero -/* 31FD64 802BEFF4 1040013E */ beqz $v0, .L802BF4F0 +/* 31FD64 802BEFF4 1040013E */ beqz $v0, L802BF4F0_320260 /* 31FD68 802BEFF8 AFA20040 */ sw $v0, 0x40($sp) /* 31FD6C 802BEFFC 0200282D */ daddu $a1, $s0, $zero /* 31FD70 802BF000 0260302D */ daddu $a2, $s3, $zero @@ -950,7 +950,7 @@ glabel L802BEB18_31F888 /* 31FF60 802BF1F0 00431025 */ or $v0, $v0, $v1 /* 31FF64 802BF1F4 AE420000 */ sw $v0, ($s2) /* 31FF68 802BF1F8 24020003 */ addiu $v0, $zero, 3 -/* 31FF6C 802BF1FC 080AFD3C */ j .L802BF4F0 +/* 31FF6C 802BF1FC 080AFD3C */ j L802BF4F0_320260 /* 31FF70 802BF200 AEA20070 */ sw $v0, 0x70($s5) glabel L802BF204_31FF74 /* 31FF74 802BF204 3C040001 */ lui $a0, 1 @@ -965,14 +965,13 @@ glabel L802BF21C_31FF8C /* 31FF94 802BF224 00000000 */ nop /* 31FF98 802BF228 4600103E */ c.le.s $f2, $f0 /* 31FF9C 802BF22C 00000000 */ nop -/* 31FFA0 802BF230 45000006 */ bc1f .L802BF24C +/* 31FFA0 802BF230 45000006 */ bc1f L802BF24C_31FFBC /* 31FFA4 802BF234 3C040001 */ lui $a0, 1 /* 31FFA8 802BF238 0C037FBF */ jal func_800DFEFC /* 31FFAC 802BF23C 34840008 */ ori $a0, $a0, 8 /* 31FFB0 802BF240 8EA20070 */ lw $v0, 0x70($s5) /* 31FFB4 802BF244 24420001 */ addiu $v0, $v0, 1 /* 31FFB8 802BF248 AEA20070 */ sw $v0, 0x70($s5) -.L802BF24C: glabel L802BF24C_31FFBC /* 31FFBC 802BF24C C62C001C */ lwc1 $f12, 0x1c($s1) /* 31FFC0 802BF250 44800000 */ mtc1 $zero, $f0 @@ -1021,7 +1020,7 @@ glabel L802BF24C_31FFBC /* 320064 802BF2F4 2442FFFF */ addiu $v0, $v0, -1 .L802BF2F8: /* 320068 802BF2F8 8FA20040 */ lw $v0, 0x40($sp) -/* 32006C 802BF2FC 0440007C */ bltz $v0, .L802BF4F0 +/* 32006C 802BF2FC 0440007C */ bltz $v0, L802BF4F0_320260 /* 320070 802BF300 3C03FFBF */ lui $v1, 0xffbf /* 320074 802BF304 3463FFFF */ ori $v1, $v1, 0xffff /* 320078 802BF308 3C040001 */ lui $a0, 1 @@ -1084,7 +1083,7 @@ glabel L802BF24C_31FFBC /* 32015C 802BF3EC 46080003 */ div.s $f0, $f0, $f8 /* 320160 802BF3F0 E6200018 */ swc1 $f0, 0x18($s1) /* 320164 802BF3F4 E622001C */ swc1 $f2, 0x1c($s1) -/* 320168 802BF3F8 080AFD3C */ j .L802BF4F0 +/* 320168 802BF3F8 080AFD3C */ j L802BF4F0_320260 /* 32016C 802BF3FC AEA20070 */ sw $v0, 0x70($s5) glabel L802BF400_320170 /* 320170 802BF400 26240038 */ addiu $a0, $s1, 0x38 @@ -1148,7 +1147,6 @@ glabel L802BF400_320170 /* 320258 802BF4E8 24020001 */ addiu $v0, $zero, 1 .L802BF4EC: /* 32025C 802BF4EC A622008E */ sh $v0, 0x8e($s1) -.L802BF4F0: glabel L802BF4F0_320260 /* 320260 802BF4F0 0000102D */ daddu $v0, $zero, $zero .L802BF4F4: diff --git a/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s b/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s index f3713cef24..df42ccc08f 100644 --- a/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s +++ b/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s @@ -92,7 +92,7 @@ glabel _use_partner_ability /* 83CC8 800EA818 8C63CD30 */ lw $v1, %lo(D_8010CD30)($v1) /* 83CCC 800EA81C 2C62000B */ sltiu $v0, $v1, 0xb .L800EA820: -/* 83CD0 800EA820 1040024A */ beqz $v0, .L800EB14C +/* 83CD0 800EA820 1040024A */ beqz $v0, L800EB14C_845FC /* 83CD4 800EA824 00031080 */ sll $v0, $v1, 2 /* 83CD8 800EA828 3C018011 */ lui $at, %hi(jtbl_8010C118) /* 83CDC 800EA82C 00220821 */ addu $at, $at, $v0 @@ -113,14 +113,14 @@ glabel L800EA83C_83CEC /* 83D14 800EA864 24020002 */ addiu $v0, $zero, 2 /* 83D18 800EA868 10600009 */ beqz $v1, .L800EA890 /* 83D1C 800EA86C 00000000 */ nop -/* 83D20 800EA870 0803AC53 */ j .L800EB14C +/* 83D20 800EA870 0803AC53 */ j L800EB14C_845FC /* 83D24 800EA874 00000000 */ nop .L800EA878: /* 83D28 800EA878 1062003F */ beq $v1, $v0, .L800EA978 /* 83D2C 800EA87C 00000000 */ nop /* 83D30 800EA880 10640056 */ beq $v1, $a0, .L800EA9DC /* 83D34 800EA884 00000000 */ nop -/* 83D38 800EA888 0803AC53 */ j .L800EB14C +/* 83D38 800EA888 0803AC53 */ j L800EB14C_845FC /* 83D3C 800EA88C 00000000 */ nop .L800EA890: /* 83D40 800EA890 0C03805E */ jal disable_player_input @@ -151,14 +151,14 @@ glabel L800EA83C_83CEC /* 83DA4 800EA8F4 AC45014C */ sw $a1, 0x14c($v0) /* 83DA8 800EA8F8 0C009C22 */ jal func_80027088 /* 83DAC 800EA8FC AE230000 */ sw $v1, ($s1) -/* 83DB0 800EA900 0803AC53 */ j .L800EB14C +/* 83DB0 800EA900 0803AC53 */ j L800EB14C_845FC /* 83DB4 800EA904 00000000 */ nop .L800EA908: /* 83DB8 800EA908 3C048011 */ lui $a0, %hi(D_8010CFDC) /* 83DBC 800EA90C 8C84CFDC */ lw $a0, %lo(D_8010CFDC)($a0) /* 83DC0 800EA910 0C0B1059 */ jal does_script_exist /* 83DC4 800EA914 00000000 */ nop -/* 83DC8 800EA918 1440020C */ bnez $v0, .L800EB14C +/* 83DC8 800EA918 1440020C */ bnez $v0, L800EB14C_845FC /* 83DCC 800EA91C 00000000 */ nop /* 83DD0 800EA920 0C009C22 */ jal func_80027088 /* 83DD4 800EA924 0000202D */ daddu $a0, $zero, $zero @@ -206,14 +206,14 @@ glabel L800EA83C_83CEC /* 83E78 800EA9C8 00641821 */ addu $v1, $v1, $a0 /* 83E7C 800EA9CC 0C009C22 */ jal func_80027088 /* 83E80 800EA9D0 ACA30000 */ sw $v1, ($a1) -/* 83E84 800EA9D4 0803AC53 */ j .L800EB14C +/* 83E84 800EA9D4 0803AC53 */ j L800EB14C_845FC /* 83E88 800EA9D8 00000000 */ nop .L800EA9DC: /* 83E8C 800EA9DC 3C108011 */ lui $s0, %hi(D_8010CFDC) /* 83E90 800EA9E0 2610CFDC */ addiu $s0, $s0, %lo(D_8010CFDC) /* 83E94 800EA9E4 0C0B1059 */ jal does_script_exist /* 83E98 800EA9E8 8E040000 */ lw $a0, ($s0) -/* 83E9C 800EA9EC 144001D7 */ bnez $v0, .L800EB14C +/* 83E9C 800EA9EC 144001D7 */ bnez $v0, L800EB14C_845FC /* 83EA0 800EA9F0 24050014 */ addiu $a1, $zero, 0x14 /* 83EA4 800EA9F4 3C028011 */ lui $v0, %hi(D_8010CFEC) /* 83EA8 800EA9F8 8C42CFEC */ lw $v0, %lo(D_8010CFEC)($v0) @@ -234,7 +234,7 @@ glabel L800EA83C_83CEC /* 83EE4 800EAA34 AC32CD30 */ sw $s2, %lo(D_8010CD30)($at) /* 83EE8 800EAA38 0C009C22 */ jal func_80027088 /* 83EEC 800EAA3C 0000202D */ daddu $a0, $zero, $zero -/* 83EF0 800EAA40 0803AC53 */ j .L800EB14C +/* 83EF0 800EAA40 0803AC53 */ j L800EB14C_845FC /* 83EF4 800EAA44 00000000 */ nop glabel L800EAA48_83EF8 /* 83EF8 800EAA48 24040003 */ addiu $a0, $zero, 3 @@ -250,14 +250,14 @@ glabel L800EAA48_83EF8 /* 83F20 800EAA70 24020002 */ addiu $v0, $zero, 2 /* 83F24 800EAA74 10600009 */ beqz $v1, .L800EAA9C /* 83F28 800EAA78 00000000 */ nop -/* 83F2C 800EAA7C 0803AC53 */ j .L800EB14C +/* 83F2C 800EAA7C 0803AC53 */ j L800EB14C_845FC /* 83F30 800EAA80 00000000 */ nop .L800EAA84: /* 83F34 800EAA84 10620170 */ beq $v1, $v0, .L800EB048 /* 83F38 800EAA88 00000000 */ nop /* 83F3C 800EAA8C 1064002E */ beq $v1, $a0, .L800EAB48 /* 83F40 800EAA90 24050014 */ addiu $a1, $zero, 0x14 -/* 83F44 800EAA94 0803AC53 */ j .L800EB14C +/* 83F44 800EAA94 0803AC53 */ j L800EB14C_845FC /* 83F48 800EAA98 00000000 */ nop .L800EAA9C: /* 83F4C 800EAA9C 3C048011 */ lui $a0, %hi(D_8010CFDC) @@ -321,7 +321,7 @@ glabel L800EAA48_83EF8 /* 8402C 800EAB7C AC24CFDC */ sw $a0, %lo(D_8010CFDC)($at) /* 84030 800EAB80 A0430004 */ sb $v1, 4($v0) /* 84034 800EAB84 3C018011 */ lui $at, %hi(D_8010CD30) -/* 84038 800EAB88 0803AC53 */ j .L800EB14C +/* 84038 800EAB88 0803AC53 */ j L800EB14C_845FC /* 8403C 800EAB8C AC31CD30 */ sw $s1, %lo(D_8010CD30)($at) glabel L800EAB90_84040 /* 84040 800EAB90 3C118011 */ lui $s1, %hi(D_8010CD34) @@ -331,7 +331,7 @@ glabel L800EAB90_84040 /* 84050 800EABA0 24020001 */ addiu $v0, $zero, 1 /* 84054 800EABA4 12020010 */ beq $s0, $v0, .L800EABE8 /* 84058 800EABA8 00000000 */ nop -/* 8405C 800EABAC 0803AC53 */ j .L800EB14C +/* 8405C 800EABAC 0803AC53 */ j L800EB14C_845FC /* 84060 800EABB0 00000000 */ nop .L800EABB4: /* 84064 800EABB4 0C03805E */ jal disable_player_input @@ -352,7 +352,7 @@ glabel L800EAB90_84040 /* 8409C 800EABEC 8C84CFDC */ lw $a0, %lo(D_8010CFDC)($a0) /* 840A0 800EABF0 0C0B1059 */ jal does_script_exist /* 840A4 800EABF4 00000000 */ nop -/* 840A8 800EABF8 14400154 */ bnez $v0, .L800EB14C +/* 840A8 800EABF8 14400154 */ bnez $v0, L800EB14C_845FC /* 840AC 800EABFC 00000000 */ nop /* 840B0 800EAC00 0C03A9AA */ jal func_800EA6A8 /* 840B4 800EAC04 00000000 */ nop @@ -364,12 +364,12 @@ glabel L800EAB90_84040 /* 840CC 800EAC1C AC22CFD8 */ sw $v0, %lo(D_8010CFD8)($at) /* 840D0 800EAC20 0C038069 */ jal enable_player_input /* 840D4 800EAC24 A2620012 */ sb $v0, 0x12($s3) -/* 840D8 800EAC28 0803AC53 */ j .L800EB14C +/* 840D8 800EAC28 0803AC53 */ j L800EB14C_845FC /* 840DC 800EAC2C 00000000 */ nop glabel L800EAC30_840E0 /* 840E0 800EAC30 3C028011 */ lui $v0, %hi(D_8010CD34) /* 840E4 800EAC34 8C42CD34 */ lw $v0, %lo(D_8010CD34)($v0) -/* 840E8 800EAC38 14400144 */ bnez $v0, .L800EB14C +/* 840E8 800EAC38 14400144 */ bnez $v0, L800EB14C_845FC /* 840EC 800EAC3C 00000000 */ nop /* 840F0 800EAC40 3C048011 */ lui $a0, %hi(D_8010CFDC) /* 840F4 800EAC44 8C84CFDC */ lw $a0, %lo(D_8010CFDC)($a0) @@ -384,7 +384,7 @@ glabel L800EAC30_840E0 /* 84118 800EAC68 AC22CD30 */ sw $v0, %lo(D_8010CD30)($at) /* 8411C 800EAC6C 3C018011 */ lui $at, %hi(D_8010CFD8) /* 84120 800EAC70 AC23CFD8 */ sw $v1, %lo(D_8010CFD8)($at) -/* 84124 800EAC74 0803AC53 */ j .L800EB14C +/* 84124 800EAC74 0803AC53 */ j L800EB14C_845FC /* 84128 800EAC78 A2630012 */ sb $v1, 0x12($s3) glabel L800EAC7C_8412C /* 8412C 800EAC7C 3C108011 */ lui $s0, %hi(D_8010CD34) @@ -397,12 +397,12 @@ glabel L800EAC7C_8412C /* 84148 800EAC98 24020002 */ addiu $v0, $zero, 2 /* 8414C 800EAC9C 10600007 */ beqz $v1, .L800EACBC /* 84150 800EACA0 00000000 */ nop -/* 84154 800EACA4 0803AC53 */ j .L800EB14C +/* 84154 800EACA4 0803AC53 */ j L800EB14C_845FC /* 84158 800EACA8 00000000 */ nop .L800EACAC: /* 8415C 800EACAC 1062002B */ beq $v1, $v0, .L800EAD5C /* 84160 800EACB0 00000000 */ nop -/* 84164 800EACB4 0803AC53 */ j .L800EB14C +/* 84164 800EACB4 0803AC53 */ j L800EB14C_845FC /* 84168 800EACB8 00000000 */ nop .L800EACBC: /* 8416C 800EACBC 0C03805E */ jal disable_player_input @@ -444,14 +444,14 @@ glabel L800EAC7C_8412C /* 841F8 800EAD48 8C830000 */ lw $v1, ($a0) /* 841FC 800EAD4C AC45014C */ sw $a1, 0x14c($v0) /* 84200 800EAD50 24630001 */ addiu $v1, $v1, 1 -/* 84204 800EAD54 0803AC53 */ j .L800EB14C +/* 84204 800EAD54 0803AC53 */ j L800EB14C_845FC /* 84208 800EAD58 AC830000 */ sw $v1, ($a0) .L800EAD5C: /* 8420C 800EAD5C 3C108011 */ lui $s0, %hi(D_8010CFDC) /* 84210 800EAD60 2610CFDC */ addiu $s0, $s0, %lo(D_8010CFDC) /* 84214 800EAD64 0C0B1059 */ jal does_script_exist /* 84218 800EAD68 8E040000 */ lw $a0, ($s0) -/* 8421C 800EAD6C 144000F7 */ bnez $v0, .L800EB14C +/* 8421C 800EAD6C 144000F7 */ bnez $v0, L800EB14C_845FC /* 84220 800EAD70 24050014 */ addiu $a1, $zero, 0x14 /* 84224 800EAD74 3C028011 */ lui $v0, %hi(D_8010CFEC) /* 84228 800EAD78 8C42CFEC */ lw $v0, %lo(D_8010CFEC)($v0) @@ -470,7 +470,7 @@ glabel L800EAC7C_8412C /* 8425C 800EADAC 3C018011 */ lui $at, %hi(D_8010CD30) /* 84260 800EADB0 0C038069 */ jal enable_player_input /* 84264 800EADB4 AC31CD30 */ sw $s1, %lo(D_8010CD30)($at) -/* 84268 800EADB8 0803AC53 */ j .L800EB14C +/* 84268 800EADB8 0803AC53 */ j L800EB14C_845FC /* 8426C 800EADBC 00000000 */ nop glabel L800EADC0_84270 /* 84270 800EADC0 3C118011 */ lui $s1, %hi(D_8010CD34) @@ -483,7 +483,7 @@ glabel L800EADC0_84270 /* 8428C 800EADDC 24020001 */ addiu $v0, $zero, 1 /* 84290 800EADE0 12020025 */ beq $s0, $v0, .L800EAE78 /* 84294 800EADE4 24050014 */ addiu $a1, $zero, 0x14 -/* 84298 800EADE8 0803AC53 */ j .L800EB14C +/* 84298 800EADE8 0803AC53 */ j L800EB14C_845FC /* 8429C 800EADEC 00000000 */ nop .L800EADF0: /* 842A0 800EADF0 0C03805E */ jal disable_player_input @@ -518,7 +518,7 @@ glabel L800EADC0_84270 /* 84314 800EAE64 00000000 */ nop /* 84318 800EAE68 8E220000 */ lw $v0, ($s1) /* 8431C 800EAE6C 24420001 */ addiu $v0, $v0, 1 -/* 84320 800EAE70 0803AC53 */ j .L800EB14C +/* 84320 800EAE70 0803AC53 */ j L800EB14C_845FC /* 84324 800EAE74 AE220000 */ sw $v0, ($s1) .L800EAE78: /* 84328 800EAE78 3C028011 */ lui $v0, %hi(D_8010CFEC) @@ -550,7 +550,7 @@ glabel L800EADC0_84270 /* 84390 800EAEE0 AC30CD30 */ sw $s0, %lo(D_8010CD30)($at) /* 84394 800EAEE4 0C038069 */ jal enable_player_input /* 84398 800EAEE8 AC620028 */ sw $v0, 0x28($v1) -/* 8439C 800EAEEC 0803AC53 */ j .L800EB14C +/* 8439C 800EAEEC 0803AC53 */ j L800EB14C_845FC /* 843A0 800EAEF0 00000000 */ nop glabel L800EAEF4_843A4 /* 843A4 800EAEF4 3C118011 */ lui $s1, %hi(D_8010CD34) @@ -560,7 +560,7 @@ glabel L800EAEF4_843A4 /* 843B4 800EAF04 24020001 */ addiu $v0, $zero, 1 /* 843B8 800EAF08 1202001A */ beq $s0, $v0, .L800EAF74 /* 843BC 800EAF0C 00000000 */ nop -/* 843C0 800EAF10 0803AC53 */ j .L800EB14C +/* 843C0 800EAF10 0803AC53 */ j L800EB14C_845FC /* 843C4 800EAF14 00000000 */ nop .L800EAF18: /* 843C8 800EAF18 3C108011 */ lui $s0, %hi(D_8010CFDC) @@ -585,14 +585,14 @@ glabel L800EAEF4_843A4 /* 84410 800EAF60 8E230000 */ lw $v1, ($s1) /* 84414 800EAF64 24630001 */ addiu $v1, $v1, 1 /* 84418 800EAF68 AC44014C */ sw $a0, 0x14c($v0) -/* 8441C 800EAF6C 0803AC53 */ j .L800EB14C +/* 8441C 800EAF6C 0803AC53 */ j L800EB14C_845FC /* 84420 800EAF70 AE230000 */ sw $v1, ($s1) .L800EAF74: /* 84424 800EAF74 3C118011 */ lui $s1, %hi(D_8010CFDC) /* 84428 800EAF78 2631CFDC */ addiu $s1, $s1, %lo(D_8010CFDC) /* 8442C 800EAF7C 0C0B1059 */ jal does_script_exist /* 84430 800EAF80 8E240000 */ lw $a0, ($s1) -/* 84434 800EAF84 14400071 */ bnez $v0, .L800EB14C +/* 84434 800EAF84 14400071 */ bnez $v0, L800EB14C_845FC /* 84438 800EAF88 24050014 */ addiu $a1, $zero, 0x14 /* 8443C 800EAF8C 3C028011 */ lui $v0, %hi(D_8010CFEC) /* 84440 800EAF90 8C42CFEC */ lw $v0, %lo(D_8010CFEC)($v0) @@ -609,7 +609,7 @@ glabel L800EAEF4_843A4 /* 8446C 800EAFBC AE240000 */ sw $a0, ($s1) /* 84470 800EAFC0 A0430004 */ sb $v1, 4($v0) /* 84474 800EAFC4 3C018011 */ lui $at, %hi(D_8010CD30) -/* 84478 800EAFC8 0803AC53 */ j .L800EB14C +/* 84478 800EAFC8 0803AC53 */ j L800EB14C_845FC /* 8447C 800EAFCC AC30CD30 */ sw $s0, %lo(D_8010CD30)($at) glabel L800EAFD0_84480 /* 84480 800EAFD0 3C108011 */ lui $s0, %hi(D_8010CD34) @@ -624,12 +624,12 @@ glabel L800EAFD0_84480 /* 844A4 800EAFF4 24020002 */ addiu $v0, $zero, 2 /* 844A8 800EAFF8 10600007 */ beqz $v1, .L800EB018 /* 844AC 800EAFFC 00000000 */ nop -/* 844B0 800EB000 0803AC53 */ j .L800EB14C +/* 844B0 800EB000 0803AC53 */ j L800EB14C_845FC /* 844B4 800EB004 00000000 */ nop .L800EB008: /* 844B8 800EB008 10620015 */ beq $v1, $v0, .L800EB060 /* 844BC 800EB00C 00000000 */ nop -/* 844C0 800EB010 0803AC53 */ j .L800EB14C +/* 844C0 800EB010 0803AC53 */ j L800EB14C_845FC /* 844C4 800EB014 00000000 */ nop .L800EB018: /* 844C8 800EB018 0C03805E */ jal disable_player_input @@ -650,7 +650,7 @@ glabel L800EAFD0_84480 .L800EB050: /* 84500 800EB050 8C620000 */ lw $v0, ($v1) /* 84504 800EB054 24420001 */ addiu $v0, $v0, 1 -/* 84508 800EB058 0803AC53 */ j .L800EB14C +/* 84508 800EB058 0803AC53 */ j L800EB14C_845FC /* 8450C 800EB05C AC620000 */ sw $v0, ($v1) .L800EB060: /* 84510 800EB060 80A20000 */ lb $v0, ($a1) @@ -684,13 +684,13 @@ glabel L800EAFD0_84480 /* 8457C 800EB0CC 0C038069 */ jal enable_player_input /* 84580 800EB0D0 00000000 */ nop /* 84584 800EB0D4 3C018011 */ lui $at, %hi(D_8010CD30) -/* 84588 800EB0D8 0803AC53 */ j .L800EB14C +/* 84588 800EB0D8 0803AC53 */ j L800EB14C_845FC /* 8458C 800EB0DC AC31CD30 */ sw $s1, %lo(D_8010CD30)($at) glabel L800EB0E0_84590 /* 84590 800EB0E0 3C108011 */ lui $s0, %hi(D_8010CD34) /* 84594 800EB0E4 2610CD34 */ addiu $s0, $s0, %lo(D_8010CD34) /* 84598 800EB0E8 8E020000 */ lw $v0, ($s0) -/* 8459C 800EB0EC 14400017 */ bnez $v0, .L800EB14C +/* 8459C 800EB0EC 14400017 */ bnez $v0, L800EB14C_845FC /* 845A0 800EB0F0 00000000 */ nop /* 845A4 800EB0F4 3C118011 */ lui $s1, %hi(D_8010CFDC) /* 845A8 800EB0F8 2631CFDC */ addiu $s1, $s1, %lo(D_8010CFDC) @@ -703,7 +703,7 @@ glabel L800EB0E0_84590 .L800EB114: /* 845C4 800EB114 8E020000 */ lw $v0, ($s0) /* 845C8 800EB118 24420001 */ addiu $v0, $v0, 1 -/* 845CC 800EB11C 0803AC53 */ j .L800EB14C +/* 845CC 800EB11C 0803AC53 */ j L800EB14C_845FC /* 845D0 800EB120 AE020000 */ sw $v0, ($s0) glabel L800EB124_845D4 /* 845D4 800EB124 3C048011 */ lui $a0, %hi(D_8010CFC4) @@ -714,9 +714,8 @@ glabel L800EB124_845D4 /* 845E8 800EB138 AC20CFE0 */ sw $zero, %lo(D_8010CFE0)($at) /* 845EC 800EB13C 8C830000 */ lw $v1, ($a0) /* 845F0 800EB140 24020003 */ addiu $v0, $zero, 3 -/* 845F4 800EB144 54620001 */ bnel $v1, $v0, .L800EB14C +/* 845F4 800EB144 54620001 */ bnel $v1, $v0, L800EB14C_845FC /* 845F8 800EB148 AC800000 */ sw $zero, ($a0) -.L800EB14C: glabel L800EB14C_845FC /* 845FC 800EB14C 8FBF0020 */ lw $ra, 0x20($sp) /* 84600 800EB150 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/partners/func_800EBC74.s b/ver/us/asm/nonmatchings/world/partners/func_800EBC74.s index 91c42f9d7f..d08c15c658 100644 --- a/ver/us/asm/nonmatchings/world/partners/func_800EBC74.s +++ b/ver/us/asm/nonmatchings/world/partners/func_800EBC74.s @@ -19,7 +19,7 @@ glabel func_800EBC74 /* 8515C 800EBCAC F7B60060 */ sdc1 $f22, 0x60($sp) /* 85160 800EBCB0 F7B40058 */ sdc1 $f20, 0x58($sp) /* 85164 800EBCB4 2C620033 */ sltiu $v0, $v1, 0x33 -/* 85168 800EBCB8 1040058A */ beqz $v0, .L800ED2E4 +/* 85168 800EBCB8 1040058A */ beqz $v0, L800ED2E4_86794 /* 8516C 800EBCBC 0080882D */ daddu $s1, $a0, $zero /* 85170 800EBCC0 00031080 */ sll $v0, $v1, 2 /* 85174 800EBCC4 3C018011 */ lui $at, %hi(jtbl_8010C148) @@ -285,7 +285,7 @@ glabel L800EBD18_851C8 /* 8554C 800EC09C 24035000 */ addiu $v1, $zero, 0x5000 /* 85550 800EC0A0 8E220000 */ lw $v0, ($s1) /* 85554 800EC0A4 30425000 */ andi $v0, $v0, 0x5000 -/* 85558 800EC0A8 1443048E */ bne $v0, $v1, .L800ED2E4 +/* 85558 800EC0A8 1443048E */ bne $v0, $v1, L800ED2E4_86794 /* 8555C 800EC0AC 00000000 */ nop .L800EC0B0: /* 85560 800EC0B0 0C03A92C */ jal func_800EA4B0 @@ -323,7 +323,7 @@ glabel L800EBD18_851C8 /* 855DC 800EC12C 46000005 */ abs.s $f0, $f0 /* 855E0 800EC130 4600103C */ c.lt.s $f2, $f0 /* 855E4 800EC134 00000000 */ nop -/* 855E8 800EC138 4500046A */ bc1f .L800ED2E4 +/* 855E8 800EC138 4500046A */ bc1f L800ED2E4_86794 /* 855EC 800EC13C 24020005 */ addiu $v0, $zero, 5 /* 855F0 800EC140 0803B4B7 */ j .L800ED2DC /* 855F4 800EC144 00000000 */ nop @@ -339,7 +339,7 @@ glabel L800EC148_855F8 /* 85618 800EC168 0040902D */ daddu $s2, $v0, $zero /* 8561C 800EC16C 2642FFFE */ addiu $v0, $s2, -2 /* 85620 800EC170 2C420002 */ sltiu $v0, $v0, 2 -/* 85624 800EC174 1040045B */ beqz $v0, .L800ED2E4 +/* 85624 800EC174 1040045B */ beqz $v0, L800ED2E4_86794 /* 85628 800EC178 00000000 */ nop /* 8562C 800EC17C C674002C */ lwc1 $f20, 0x2c($s3) /* 85630 800EC180 C62C0038 */ lwc1 $f12, 0x38($s1) @@ -439,7 +439,7 @@ glabel L800EC148_855F8 .L800EC2E8: /* 85798 800EC2E8 3C018011 */ lui $at, %hi(D_8010CFC8) /* 8579C 800EC2EC A420CFC8 */ sh $zero, %lo(D_8010CFC8)($at) -/* 857A0 800EC2F0 0803B4B9 */ j .L800ED2E4 +/* 857A0 800EC2F0 0803B4B9 */ j L800ED2E4_86794 /* 857A4 800EC2F4 00000000 */ nop .L800EC2F8: /* 857A8 800EC2F8 C6220018 */ lwc1 $f2, 0x18($s1) @@ -677,7 +677,7 @@ glabel L800EC45C_8590C /* 85B28 800EC678 46000021 */ cvt.d.s $f0, $f0 /* 85B2C 800EC67C 4622003C */ c.lt.d $f0, $f2 /* 85B30 800EC680 00000000 */ nop -/* 85B34 800EC684 45000317 */ bc1f .L800ED2E4 +/* 85B34 800EC684 45000317 */ bc1f L800ED2E4_86794 /* 85B38 800EC688 00000000 */ nop /* 85B3C 800EC68C C6600028 */ lwc1 $f0, 0x28($s3) /* 85B40 800EC690 E6200038 */ swc1 $f0, 0x38($s1) @@ -699,14 +699,14 @@ glabel L800EC45C_8590C /* 85B80 800EC6D0 0C00A7E7 */ jal add_vec2D_polar /* 85B84 800EC6D4 0280282D */ daddu $a1, $s4, $zero /* 85B88 800EC6D8 24020005 */ addiu $v0, $zero, 5 -/* 85B8C 800EC6DC 0803B4B9 */ j .L800ED2E4 +/* 85B8C 800EC6DC 0803B4B9 */ j L800ED2E4_86794 /* 85B90 800EC6E0 A6020000 */ sh $v0, ($s0) .L800EC6E4: /* 85B94 800EC6E4 8E250018 */ lw $a1, 0x18($s1) /* 85B98 800EC6E8 8E26000C */ lw $a2, 0xc($s1) /* 85B9C 800EC6EC 0C00EA95 */ jal npc_move_heading /* 85BA0 800EC6F0 0220202D */ daddu $a0, $s1, $zero -/* 85BA4 800EC6F4 0803B4B9 */ j .L800ED2E4 +/* 85BA4 800EC6F4 0803B4B9 */ j L800ED2E4_86794 /* 85BA8 800EC6F8 00000000 */ nop glabel L800EC6FC_85BAC /* 85BAC 800EC6FC 3C038011 */ lui $v1, %hi(D_8010CD38) @@ -927,7 +927,7 @@ glabel L800EC6FC_85BAC /* 85EE4 800ECA34 8E240080 */ lw $a0, 0x80($s1) /* 85EE8 800ECA38 0C0371DE */ jal func_800DC778 /* 85EEC 800ECA3C 27A70030 */ addiu $a3, $sp, 0x30 -/* 85EF0 800ECA40 10400228 */ beqz $v0, .L800ED2E4 +/* 85EF0 800ECA40 10400228 */ beqz $v0, L800ED2E4_86794 /* 85EF4 800ECA44 00000000 */ nop /* 85EF8 800ECA48 3C108011 */ lui $s0, %hi(D_8010C978) /* 85EFC 800ECA4C 2610C978 */ addiu $s0, $s0, %lo(D_8010C978) @@ -964,9 +964,9 @@ glabel L800EC6FC_85BAC /* 85F78 800ECAC8 10620177 */ beq $v1, $v0, .L800ED0A8 /* 85F7C 800ECACC 2402000C */ addiu $v0, $zero, 0xc /* 85F80 800ECAD0 826300B4 */ lb $v1, 0xb4($s3) -/* 85F84 800ECAD4 14620203 */ bne $v1, $v0, .L800ED2E4 +/* 85F84 800ECAD4 14620203 */ bne $v1, $v0, L800ED2E4_86794 /* 85F88 800ECAD8 00000000 */ nop -/* 85F8C 800ECADC 0803B4B9 */ j .L800ED2E4 +/* 85F8C 800ECADC 0803B4B9 */ j L800ED2E4_86794 /* 85F90 800ECAE0 A4800000 */ sh $zero, ($a0) .L800ECAE4: /* 85F94 800ECAE4 8E040000 */ lw $a0, ($s0) @@ -989,11 +989,11 @@ glabel L800EC6FC_85BAC .L800ECB24: /* 85FD4 800ECB24 0C03A92C */ jal func_800EA4B0 /* 85FD8 800ECB28 00000000 */ nop -/* 85FDC 800ECB2C 144001ED */ bnez $v0, .L800ED2E4 +/* 85FDC 800ECB2C 144001ED */ bnez $v0, L800ED2E4_86794 /* 85FE0 800ECB30 24020002 */ addiu $v0, $zero, 2 /* 85FE4 800ECB34 3C018011 */ lui $at, %hi(D_8010CFCA) /* 85FE8 800ECB38 A422CFCA */ sh $v0, %lo(D_8010CFCA)($at) -/* 85FEC 800ECB3C 0803B4B9 */ j .L800ED2E4 +/* 85FEC 800ECB3C 0803B4B9 */ j L800ED2E4_86794 /* 85FF0 800ECB40 00000000 */ nop .L800ECB44: /* 85FF4 800ECB44 3C0142B4 */ lui $at, 0x42b4 @@ -1109,12 +1109,12 @@ glabel L800ECCC0_86170 /* 8618C 800ECCDC 24020002 */ addiu $v0, $zero, 2 /* 86190 800ECCE0 10600007 */ beqz $v1, .L800ECD00 /* 86194 800ECCE4 00000000 */ nop -/* 86198 800ECCE8 0803B4B9 */ j .L800ED2E4 +/* 86198 800ECCE8 0803B4B9 */ j L800ED2E4_86794 /* 8619C 800ECCEC 00000000 */ nop .L800ECCF0: /* 861A0 800ECCF0 106200E2 */ beq $v1, $v0, .L800ED07C /* 861A4 800ECCF4 00000000 */ nop -/* 861A8 800ECCF8 0803B4B9 */ j .L800ED2E4 +/* 861A8 800ECCF8 0803B4B9 */ j L800ED2E4_86794 /* 861AC 800ECCFC 00000000 */ nop .L800ECD00: /* 861B0 800ECD00 0C0394D2 */ jal func_800E5348 @@ -1317,7 +1317,7 @@ glabel L800ECCC0_86170 .L800ECFF8: /* 864A8 800ECFF8 0C00F598 */ jal func_8003D660 /* 864AC 800ECFFC 0220202D */ daddu $a0, $s1, $zero -/* 864B0 800ED000 0803B4B9 */ j .L800ED2E4 +/* 864B0 800ED000 0803B4B9 */ j L800ED2E4_86794 /* 864B4 800ED004 00000000 */ nop .L800ED008: /* 864B8 800ED008 0C03BD17 */ jal clear_partner_move_history @@ -1347,7 +1347,7 @@ glabel L800ECCC0_86170 /* 86518 800ED068 2403001E */ addiu $v1, $zero, 0x1e /* 8651C 800ED06C AE030000 */ sw $v1, ($s0) /* 86520 800ED070 24420001 */ addiu $v0, $v0, 1 -/* 86524 800ED074 0803B4B9 */ j .L800ED2E4 +/* 86524 800ED074 0803B4B9 */ j L800ED2E4_86794 /* 86528 800ED078 A4820000 */ sh $v0, ($a0) .L800ED07C: /* 8652C 800ED07C 3C038010 */ lui $v1, %hi(D_800F802C) @@ -1355,7 +1355,7 @@ glabel L800ECCC0_86170 /* 86534 800ED084 8C620000 */ lw $v0, ($v1) /* 86538 800ED088 10400003 */ beqz $v0, .L800ED098 /* 8653C 800ED08C 2442FFFF */ addiu $v0, $v0, -1 -/* 86540 800ED090 0803B4B9 */ j .L800ED2E4 +/* 86540 800ED090 0803B4B9 */ j L800ED2E4_86794 /* 86544 800ED094 AC620000 */ sw $v0, ($v1) .L800ED098: /* 86548 800ED098 3C018011 */ lui $at, %hi(D_8010CFC8) @@ -1363,13 +1363,13 @@ glabel L800ECCC0_86170 /* 86550 800ED0A0 3C018011 */ lui $at, %hi(D_8010CFCA) /* 86554 800ED0A4 A420CFCA */ sh $zero, %lo(D_8010CFCA)($at) .L800ED0A8: -/* 86558 800ED0A8 0803B4B9 */ j .L800ED2E4 +/* 86558 800ED0A8 0803B4B9 */ j L800ED2E4_86794 /* 8655C 800ED0AC A4800000 */ sh $zero, ($a0) glabel L800ED0B0_86560 /* 86560 800ED0B0 0220202D */ daddu $a0, $s1, $zero /* 86564 800ED0B4 0C03BE0B */ jal func_800EF82C /* 86568 800ED0B8 0000282D */ daddu $a1, $zero, $zero -/* 8656C 800ED0BC 0803B4B9 */ j .L800ED2E4 +/* 8656C 800ED0BC 0803B4B9 */ j L800ED2E4_86794 /* 86570 800ED0C0 00000000 */ nop glabel L800ED0C4_86574 /* 86574 800ED0C4 8E220000 */ lw $v0, ($s1) @@ -1391,7 +1391,7 @@ glabel L800ED0C4_86574 /* 865B4 800ED104 24020032 */ addiu $v0, $zero, 0x32 /* 865B8 800ED108 3C018011 */ lui $at, %hi(D_8010CFC8) /* 865BC 800ED10C A422CFC8 */ sh $v0, %lo(D_8010CFC8)($at) -/* 865C0 800ED110 0803B4B9 */ j .L800ED2E4 +/* 865C0 800ED110 0803B4B9 */ j L800ED2E4_86794 /* 865C4 800ED114 AE230028 */ sw $v1, 0x28($s1) .L800ED118: /* 865C8 800ED118 3C014040 */ lui $at, 0x4040 @@ -1452,7 +1452,7 @@ glabel L800ED0C4_86574 .L800ED1F0: /* 866A0 800ED1F0 3C018011 */ lui $at, %hi(D_8010CFC8) /* 866A4 800ED1F4 A422CFC8 */ sh $v0, %lo(D_8010CFC8)($at) -/* 866A8 800ED1F8 0803B4B9 */ j .L800ED2E4 +/* 866A8 800ED1F8 0803B4B9 */ j L800ED2E4_86794 /* 866AC 800ED1FC E6200040 */ swc1 $f0, 0x40($s1) .L800ED200: /* 866B0 800ED200 C6200038 */ lwc1 $f0, 0x38($s1) @@ -1482,7 +1482,7 @@ glabel L800ED0C4_86574 /* 86710 800ED260 8E240080 */ lw $a0, 0x80($s1) /* 86714 800ED264 0C0371DE */ jal func_800DC778 /* 86718 800ED268 27A70030 */ addiu $a3, $sp, 0x30 -/* 8671C 800ED26C 1040001D */ beqz $v0, .L800ED2E4 +/* 8671C 800ED26C 1040001D */ beqz $v0, L800ED2E4_86794 /* 86720 800ED270 00000000 */ nop /* 86724 800ED274 C7AC0028 */ lwc1 $f12, 0x28($sp) /* 86728 800ED278 3C038011 */ lui $v1, %hi(D_8010CFD8) @@ -1513,7 +1513,6 @@ glabel L800ED0C4_86574 .L800ED2DC: /* 8678C 800ED2DC 3C018011 */ lui $at, %hi(D_8010CFC8) /* 86790 800ED2E0 A422CFC8 */ sh $v0, %lo(D_8010CFC8)($at) -.L800ED2E4: glabel L800ED2E4_86794 /* 86794 800ED2E4 8FBF0050 */ lw $ra, 0x50($sp) /* 86798 800ED2E8 8FB5004C */ lw $s5, 0x4c($sp) diff --git a/ver/us/asm/nonmatchings/world/partners/func_800ED9F8.s b/ver/us/asm/nonmatchings/world/partners/func_800ED9F8.s index a995bb639a..81d5c0e952 100644 --- a/ver/us/asm/nonmatchings/world/partners/func_800ED9F8.s +++ b/ver/us/asm/nonmatchings/world/partners/func_800ED9F8.s @@ -19,7 +19,7 @@ glabel func_800ED9F8 /* 86EE0 800EDA30 F7B60050 */ sdc1 $f22, 0x50($sp) /* 86EE4 800EDA34 F7B40048 */ sdc1 $f20, 0x48($sp) /* 86EE8 800EDA38 2C620033 */ sltiu $v0, $v1, 0x33 -/* 86EEC 800EDA3C 104003CA */ beqz $v0, .L800EE968 +/* 86EEC 800EDA3C 104003CA */ beqz $v0, L800EE968_87E18 /* 86EF0 800EDA40 0080882D */ daddu $s1, $a0, $zero /* 86EF4 800EDA44 00031080 */ sll $v0, $v1, 2 /* 86EF8 800EDA48 3C018011 */ lui $at, %hi(jtbl_8010C218) @@ -263,11 +263,11 @@ glabel L800EDA5C_86F0C /* 87278 800EDDC8 AE26000C */ sw $a2, 0xc($s1) /* 8727C 800EDDCC 8E220000 */ lw $v0, ($s1) /* 87280 800EDDD0 30424000 */ andi $v0, $v0, 0x4000 -/* 87284 800EDDD4 104002E4 */ beqz $v0, .L800EE968 +/* 87284 800EDDD4 104002E4 */ beqz $v0, L800EE968_87E18 /* 87288 800EDDD8 24020001 */ addiu $v0, $zero, 1 /* 8728C 800EDDDC 3C018011 */ lui $at, %hi(D_8010CFC8) /* 87290 800EDDE0 A422CFC8 */ sh $v0, %lo(D_8010CFC8)($at) -/* 87294 800EDDE4 0803BA5A */ j .L800EE968 +/* 87294 800EDDE4 0803BA5A */ j L800EE968_87E18 /* 87298 800EDDE8 00000000 */ nop glabel L800EDDEC_8729C /* 8729C 800EDDEC 3C048011 */ lui $a0, %hi(D_8010CFBC) @@ -275,7 +275,7 @@ glabel L800EDDEC_8729C /* 872A4 800EDDF4 8C830000 */ lw $v1, ($a0) /* 872A8 800EDDF8 3C028011 */ lui $v0, %hi(D_8010CFB8) /* 872AC 800EDDFC 8C42CFB8 */ lw $v0, %lo(D_8010CFB8)($v0) -/* 872B0 800EDE00 106202D9 */ beq $v1, $v0, .L800EE968 +/* 872B0 800EDE00 106202D9 */ beq $v1, $v0, L800EE968_87E18 /* 872B4 800EDE04 24620001 */ addiu $v0, $v1, 1 /* 872B8 800EDE08 AC820000 */ sw $v0, ($a0) /* 872BC 800EDE0C 28420028 */ slti $v0, $v0, 0x28 @@ -365,7 +365,7 @@ glabel L800EDDEC_8729C /* 873FC 800EDF4C 8E670030 */ lw $a3, 0x30($s3) /* 87400 800EDF50 24020005 */ addiu $v0, $zero, 5 /* 87404 800EDF54 E620000C */ swc1 $f0, 0xc($s1) -/* 87408 800EDF58 0803BA5A */ j .L800EE968 +/* 87408 800EDF58 0803BA5A */ j L800EE968_87E18 /* 8740C 800EDF5C A6020000 */ sh $v0, ($s0) .L800EDF60: /* 87410 800EDF60 C6200018 */ lwc1 $f0, 0x18($s1) @@ -440,7 +440,7 @@ glabel L800EDDEC_8729C /* 87514 800EE064 E6200060 */ swc1 $f0, 0x60($s1) /* 87518 800EE068 E6220064 */ swc1 $f2, 0x64($s1) /* 8751C 800EE06C E6240068 */ swc1 $f4, 0x68($s1) -/* 87520 800EE070 0803BA5A */ j .L800EE968 +/* 87520 800EE070 0803BA5A */ j L800EE968_87E18 /* 87524 800EE074 AE230028 */ sw $v1, 0x28($s1) glabel L800EE078_87528 /* 87528 800EE078 C620001C */ lwc1 $f0, 0x1c($s1) @@ -471,13 +471,13 @@ glabel L800EE078_87528 /* 87588 800EE0D8 C620001C */ lwc1 $f0, 0x1c($s1) /* 8758C 800EE0DC 4614003E */ c.le.s $f0, $f20 /* 87590 800EE0E0 00000000 */ nop -/* 87594 800EE0E4 45000220 */ bc1f .L800EE968 +/* 87594 800EE0E4 45000220 */ bc1f L800EE968_87E18 /* 87598 800EE0E8 00000000 */ nop /* 8759C 800EE0EC C622003C */ lwc1 $f2, 0x3c($s1) /* 875A0 800EE0F0 C6200064 */ lwc1 $f0, 0x64($s1) /* 875A4 800EE0F4 4600103C */ c.lt.s $f2, $f0 /* 875A8 800EE0F8 00000000 */ nop -/* 875AC 800EE0FC 4500021A */ bc1f .L800EE968 +/* 875AC 800EE0FC 4500021A */ bc1f L800EE968_87E18 /* 875B0 800EE100 00000000 */ nop /* 875B4 800EE104 C62C0038 */ lwc1 $f12, 0x38($s1) /* 875B8 800EE108 3C038011 */ lui $v1, %hi(D_8010CFD8) @@ -508,10 +508,10 @@ glabel L800EE078_87528 /* 8761C 800EE16C C422CFC0 */ lwc1 $f2, %lo(D_8010CFC0)($at) /* 87620 800EE170 4602003C */ c.lt.s $f0, $f2 /* 87624 800EE174 00000000 */ nop -/* 87628 800EE178 450001FB */ bc1f .L800EE968 +/* 87628 800EE178 450001FB */ bc1f L800EE968_87E18 /* 8762C 800EE17C E7A0002C */ swc1 $f0, 0x2c($sp) /* 87630 800EE180 2402000F */ addiu $v0, $zero, 0xf -/* 87634 800EE184 0803BA5A */ j .L800EE968 +/* 87634 800EE184 0803BA5A */ j L800EE968_87E18 /* 87638 800EE188 A6020000 */ sh $v0, ($s0) glabel L800EE18C_8763C /* 8763C 800EE18C 3C038011 */ lui $v1, %hi(D_8010CD38) @@ -708,7 +708,7 @@ glabel L800EE18C_8763C /* 8791C 800EE46C 0220202D */ daddu $a0, $s1, $zero /* 87920 800EE470 0C00EA95 */ jal npc_move_heading /* 87924 800EE474 AC86000C */ sw $a2, 0xc($a0) -/* 87928 800EE478 0803BA5A */ j .L800EE968 +/* 87928 800EE478 0803BA5A */ j L800EE968_87E18 /* 8792C 800EE47C 00000000 */ nop .L800EE480: /* 87930 800EE480 C62C0038 */ lwc1 $f12, 0x38($s1) @@ -720,7 +720,7 @@ glabel L800EE18C_8763C /* 87948 800EE498 C422CFC0 */ lwc1 $f2, %lo(D_8010CFC0)($at) /* 8794C 800EE49C 4602003E */ c.le.s $f0, $f2 /* 87950 800EE4A0 00000000 */ nop -/* 87954 800EE4A4 45010130 */ bc1t .L800EE968 +/* 87954 800EE4A4 45010130 */ bc1t L800EE968_87E18 /* 87958 800EE4A8 E7A0002C */ swc1 $f0, 0x2c($sp) /* 8795C 800EE4AC 3C0142B4 */ lui $at, 0x42b4 /* 87960 800EE4B0 4481C000 */ mtc1 $at, $f24 @@ -771,13 +771,13 @@ glabel L800EE18C_8763C .L800EE55C: /* 87A0C 800EE55C 3C018011 */ lui $at, %hi(D_8010CFC8) /* 87A10 800EE560 A420CFC8 */ sh $zero, %lo(D_8010CFC8)($at) -/* 87A14 800EE564 0803BA5A */ j .L800EE968 +/* 87A14 800EE564 0803BA5A */ j L800EE968_87E18 /* 87A18 800EE568 00000000 */ nop glabel L800EE56C_87A1C /* 87A1C 800EE56C 8E620004 */ lw $v0, 4($s3) /* 87A20 800EE570 3C030010 */ lui $v1, 0x10 /* 87A24 800EE574 00431024 */ and $v0, $v0, $v1 -/* 87A28 800EE578 144000FB */ bnez $v0, .L800EE968 +/* 87A28 800EE578 144000FB */ bnez $v0, L800EE968_87E18 /* 87A2C 800EE57C 00000000 */ nop /* 87A30 800EE580 3C038011 */ lui $v1, %hi(D_8010CFCE) /* 87A34 800EE584 8463CFCE */ lh $v1, %lo(D_8010CFCE)($v1) @@ -786,7 +786,7 @@ glabel L800EE56C_87A1C /* 87A40 800EE590 24020001 */ addiu $v0, $zero, 1 /* 87A44 800EE594 10620048 */ beq $v1, $v0, .L800EE6B8 /* 87A48 800EE598 00000000 */ nop -/* 87A4C 800EE59C 0803BA5A */ j .L800EE968 +/* 87A4C 800EE59C 0803BA5A */ j L800EE968_87E18 /* 87A50 800EE5A0 00000000 */ nop .L800EE5A4: /* 87A54 800EE5A4 0C0394D2 */ jal func_800E5348 @@ -985,14 +985,14 @@ glabel L800EE56C_87A1C /* 87D44 800EE894 46081083 */ div.s $f2, $f2, $f8 /* 87D48 800EE898 46022100 */ add.s $f4, $f4, $f2 /* 87D4C 800EE89C E6260038 */ swc1 $f6, 0x38($s1) -/* 87D50 800EE8A0 0803BA5A */ j .L800EE968 +/* 87D50 800EE8A0 0803BA5A */ j L800EE968_87E18 /* 87D54 800EE8A4 E6240040 */ swc1 $f4, 0x40($s1) .L800EE8A8: /* 87D58 800EE8A8 8E250018 */ lw $a1, 0x18($s1) /* 87D5C 800EE8AC 8E26000C */ lw $a2, 0xc($s1) /* 87D60 800EE8B0 0C00EA95 */ jal npc_move_heading /* 87D64 800EE8B4 0220202D */ daddu $a0, $s1, $zero -/* 87D68 800EE8B8 0803BA5A */ j .L800EE968 +/* 87D68 800EE8B8 0803BA5A */ j L800EE968_87E18 /* 87D6C 800EE8BC 00000000 */ nop .L800EE8C0: /* 87D70 800EE8C0 0C03BD17 */ jal clear_partner_move_history @@ -1021,13 +1021,13 @@ glabel L800EE56C_87A1C /* 87DCC 800EE91C A420CFCE */ sh $zero, %lo(D_8010CFCE)($at) /* 87DD0 800EE920 0C00A6C9 */ jal clamp_angle /* 87DD4 800EE924 46006301 */ sub.s $f12, $f12, $f0 -/* 87DD8 800EE928 0803BA5A */ j .L800EE968 +/* 87DD8 800EE928 0803BA5A */ j L800EE968_87E18 /* 87DDC 800EE92C E620000C */ swc1 $f0, 0xc($s1) glabel L800EE930_87DE0 /* 87DE0 800EE930 0220202D */ daddu $a0, $s1, $zero /* 87DE4 800EE934 0C03BE0B */ jal func_800EF82C /* 87DE8 800EE938 24050001 */ addiu $a1, $zero, 1 -/* 87DEC 800EE93C 0803BA5A */ j .L800EE968 +/* 87DEC 800EE93C 0803BA5A */ j L800EE968_87E18 /* 87DF0 800EE940 00000000 */ nop glabel L800EE944_87DF4 /* 87DF4 800EE944 3C028011 */ lui $v0, %hi(D_8010CFD8) @@ -1039,7 +1039,6 @@ glabel L800EE944_87DF4 /* 87E0C 800EE95C 00431021 */ addu $v0, $v0, $v1 /* 87E10 800EE960 8C42835C */ lw $v0, %lo(gPartnerAnimations+0x14)($v0) /* 87E14 800EE964 AE220028 */ sw $v0, 0x28($s1) -.L800EE968: glabel L800EE968_87E18 /* 87E18 800EE968 8FBF0044 */ lw $ra, 0x44($sp) /* 87E1C 800EE96C 8FB40040 */ lw $s4, 0x40($sp) diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 569450d47c..213db52aac 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -16,10 +16,7 @@ options: segments: - name: header type: header - start: 0x00 - vram: 0 - subsections: - - [0x0000, header, header] + start: 0x0 - name: boot type: code start: 0x0040 @@ -38,6 +35,7 @@ segments: - [0x1b40, c, code_1b40_len_20b0] - [0x3bf0, c, code_3bf0_len_6f0] - [0x42e0, c, code_42e0_len_1f60] + - [0x43F0, c] - [0x6000, c, code_6000] - [0x6240, c, code_6240_len_c00] - [0x6e40, c, code_6e40_len_500] @@ -120,7 +118,7 @@ segments: - [0x3cc50, c, os/code_3cc50_len_80] - [0x3ccd0, c, os/code_3ccd0_len_30] - [0x3cd00, c, os/code_3cd00_len_5f0] - - [0x3CF80, c] + - [0x3CF80, c, os/code_3CF80] - [0x3D290, c, os/osVirtualToPhysical] - [0x3d2f0, c, os/code_3d2f0_len_10] - [0x3d300, c, os/code_3d300_len_30] @@ -134,13 +132,13 @@ segments: - [0x3f6d0, c, os/code_3f6d0_len_320] - [0x3f9f0, c, os/code_3f9f0_len_60] - [0x3fa50, c, os/code_3fa50_len_f60] - - [0x3FEA0, c] + - [0x3FEA0, c, os/code_3FEA0] - [0x40980, c, os/osCreateMesgQueue] - [0x409b0, c, os/code_409b0_len_140] - [0x40af0, c, os/code_40af0_len_130] - [0x40c20, c, os/code_40c20_len_1f0] - [0x40E00, hasm, os/osGetCount] - - [0x40E10, c] + - [0x40E10, c, os/code_40E10] - [0x41050, c, os/osSpTaskYield] - [0x41070, c, os/osSpTaskYielded] - [0x410C0, c, os/osSiRawStartDma] @@ -156,7 +154,7 @@ segments: - [0x416a0, c, os/code_416a0_len_90] - [0x41730, c, os/code_41730_len_20] - [0x41750, c, os/code_41750_len_450] - - [0x41880, c] + - [0x41880, c, os/code_41880] - [0x41ba0, c, os/code_41ba0_len_c0] - [0x41c60, c, os/code_41c60_len_c0] - [0x41d20, c, os/code_41d20_len_40] @@ -187,12 +185,12 @@ segments: - [0x42e70, c, os/code_42e70_len_390] - [0x42F20, c, os/guRotate] - [0x43200, c, os/code_43200_len_7c0] - - [0x43590, c] + - [0x43590, c, os/code_43590] - [0x439c0, c, os/code_439c0_len_220] - [0x43be0, c, os/code_43be0_len_5e0] - [0x441c0, c, os/code_441c0_len_1c0] - [0x44380, c, os/code_44380_len_4e0] - - [0x44490, c] + - [0x44490, c, os/code_44490] - [0x44860, c, os/code_44860_len_60] - [0x448c0, c, os/code_448c0_len_210] - [0x44ad0, c, os/code_44ad0_len_70] @@ -237,6 +235,7 @@ segments: - [0x4F410, .data, code_1370_len_7d0] - [0x4F420, .data, code_1b40_len_20b0] - [0x4F660, .data, code_42e0_len_1f60] + - [0x4F670, .data, code_43F0] - [0x4F9D0, data, code_6240_len_c00] - [0x53570, .data, code_25f00_len_940] - [0x53590, data, code_26840_len_20d0] @@ -251,7 +250,7 @@ segments: - [0x71430, data] - [0x73130, rodata, code_1060_len_310] - [0x73148, .rodata, code_1b40_len_20b0] - - [0x73160, .rodata, code_42e0_len_1f60] + - [0x73160, .rodata, code_43F0] - [0x73200, rodata] - [0x73AB0, .rodata, code_20ec0_len_5040] - [0x73B10, .rodata, code_23680]