diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c index f367f684c0..1bd95cb7d3 100644 --- a/src/world/area_kkj/kkj_19/AF7C00.c +++ b/src/world/area_kkj/kkj_19/AF7C00.c @@ -1,32 +1,281 @@ #include "kkj_19.h" +#include "hud_element.h" + +extern s32 D_80241B10_AF9460; +extern s32 D_80241B14_AF9464; +extern s32 D_802461F0[]; +extern s32 D_802463B8_kkj_19[]; +extern s32 D_8024652C; +extern s32 D_80246530; +extern s32 D_80246534; +extern s32 D_80246538_kkj_19[]; +extern s32 D_80246550_kkj_19; +extern s32 D_80246554; +extern u32 D_80246558_kkj_19; +extern s32 D_8024655C; +extern s32 D_80246560_kkj_19; +extern s32 D_80246568_C8C018[]; +extern s32 D_80246578[]; +extern s32 D_802465A0; +extern HudScript HES_AButton; +extern HudScript HES_BlueMeter; +extern HudScript HES_MashAButton; +extern s32 dgb_08_npcGroup_80246528; #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/AddPlayerHandsOffset.inc.c" +// Needs data migration, matching otherwise +#ifdef NON_MATCHING +ApiStatus func_802404DC_AF7E2C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + D_80241B10_AF9460 = 0; + } + + if (D_80241B10_AF9460 != 0) { + D_80241B10_AF9460 = 0; + evt_set_variable(script, *args++, D_80241B14_AF9464); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} +#else INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802404DC_AF7E2C); +#endif -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240530_AF7E80); +ApiStatus func_80240530_AF7E80(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240568_AF7EB8); + D_80241B14_AF9464 = evt_get_variable(script, *args++); + D_80241B10_AF9460 = 1; -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240604_AF7F54); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802406A0_AF7FF0); +ApiStatus func_80240568_AF7EB8(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*)evt_get_variable(script, *args++); + s32 i; -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802406C4_AF8014); + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_802461F0[i] = ptr[i]; + } + D_802461F0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_802461F0[i] = i + 16; + D_802461F0[112] = 0; + } + } + + return ApiStatus_DONE2; +} + +ApiStatus func_80240604_AF7F54(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*)evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_802463B8_kkj_19[i] = ptr[i]; + } + D_802463B8_kkj_19[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_802463B8_kkj_19[i] = i + 128; + D_802463B8_kkj_19[91] = 0; + } + } + + return ApiStatus_DONE2; +} + +void func_802406A0_AF7FF0(void) { + hud_element_draw_clipped(D_80246568_C8C018[0]); +} + +ApiStatus func_802406C4_AF8014(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 hudElemID; + s32 temp; + s32 i; + + if (isInitialCall) { + D_80246558_kkj_19 = 0; + } + + switch (D_80246558_kkj_19) { + case 0: + D_80246534 = evt_get_variable(script, *args++); + D_80246554 = create_generic_entity_frontUI(NULL, func_802406A0_AF7FF0); + dgb_08_npcGroup_80246528 = 0; + D_80246530 = 0; + for (i = 0; i < 10; i++) { + D_80246578[i] = 0; + } + D_80246538_kkj_19[1] = 12; + D_80246538_kkj_19[2] = 24; + D_80246538_kkj_19[3] = 36; + D_80246538_kkj_19[4] = 48; + D_80246538_kkj_19[5] = 60; + D_80246550_kkj_19 = 5; + D_802465A0 = 0; + D_80246538_kkj_19[0] = 0; + D_8024655C = -48; + D_80246560_kkj_19 = 64; + + hudElemID = hud_element_create(&HES_AButton); + D_80246568_C8C018[0] = hudElemID; + hud_element_set_render_pos(hudElemID, D_8024655C, D_80246560_kkj_19); + hud_element_set_render_depth(hudElemID, 0); + hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + + hudElemID = hud_element_create(&HES_BlueMeter); + D_80246568_C8C018[1] = hudElemID; + hud_element_set_render_pos(hudElemID, D_8024655C, D_80246560_kkj_19 + 28); + hud_element_set_render_depth(hudElemID, 0); + hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + + hudElemID = D_80246568_C8C018[0]; + hud_element_set_alpha(hudElemID, 255); + hud_element_clear_flags(hudElemID, HUD_ELEMENT_FLAGS_DISABLED); + + hudElemID = D_80246568_C8C018[1]; + hud_element_set_alpha(hudElemID, 255); + hud_element_clear_flags(hudElemID, HUD_ELEMENT_FLAGS_DISABLED); + + D_80246558_kkj_19 = 1; + script->functionTemp[0] = 10; + break; + case 1: + D_8024655C += 20; + if (D_8024655C > 50) { + D_8024655C = 50; + } + hud_element_set_render_pos(D_80246568_C8C018[0], D_8024655C, D_80246560_kkj_19); + hud_element_set_render_pos(D_80246568_C8C018[1], D_8024655C, D_80246560_kkj_19 + 28); + if (script->functionTemp[0] != 0) { + script->functionTemp[0]--; + } else { + D_80246558_kkj_19 = 10; + } + break; + case 10: + hud_element_set_script(D_80246568_C8C018[0], &HES_MashAButton); + dgb_08_npcGroup_80246528 = 0; + D_8024652C = 0; + D_80246558_kkj_19 = 11; + // fallthrough + case 11: + temp = D_80246538_kkj_19[D_80246550_kkj_19]; + if (gGameStatusPtr->pressedButtons[0] & A_BUTTON) { + dgb_08_npcGroup_80246528++; + } + if (dgb_08_npcGroup_80246528 > temp) { + dgb_08_npcGroup_80246528 = temp; + } + if (D_8024652C == 2) { + D_8024652C = 3; + } + for (i = 0; i < 10; i++) { + if (D_80246578[i] != 0) { + break; + } + } + if (i >= 10) { + D_8024652C = 2; + } else if (D_8024652C != 3) { + D_8024652C = 2; + } + D_80246534--; + if (D_80246534 == 0) { + D_80246534 = 5; + D_80246558_kkj_19 = 12; + } + break; + case 12: + if (D_80246534 != 0) { + D_80246534--; + break; + } + script->varTable[0] = dgb_08_npcGroup_80246528; + hud_element_free(D_80246568_C8C018[0]); + hud_element_free(D_80246568_C8C018[1]); + free_generic_entity(D_80246554); + return ApiStatus_DONE2; + } + + D_80246578[D_802465A0++] = gGameStatusPtr->pressedButtons[0] & A_BUTTON; + + if (D_802465A0 >= 10) { + D_802465A0 = 0; + } + + evt_set_variable(script, LSW(3), D_8024652C); + return ApiStatus_BLOCK; +} static char* N(exit_str_0) = "kkj_18"; -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240B4C_AF849C); +ApiStatus func_80240B4C_AF849C(Evt* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[1] = 0; + } -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240B8C_AF84DC); + if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { + script->varTable[0] = script->functionTemp[1]; + return ApiStatus_DONE2; + } + + script->functionTemp[1]++; + return ApiStatus_BLOCK; +} + +ApiStatus func_80240B8C_AF84DC(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Bytecode var = *args++; + s32 itemID = evt_get_variable(script, var); + + evt_set_variable(script, var, gItemTable[itemID].nameMsg); + return ApiStatus_DONE2; +} #include "world/common/GetFloorCollider.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240C10_AF8560); +ApiStatus func_80240C10_AF8560(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240C4C_AF859C); + gPlayerStatus.unk_C4 = evt_get_variable(script, *args++); + gGameStatusPtr->peachCookingIngredient = gPlayerStatus.unk_C4; + + return ApiStatus_DONE2; +} + +ApiStatus func_80240C4C_AF859C(Evt* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[1] = 0; + } + + script->functionTemp[1] += 16; + + if (script->functionTemp[1] > 255) { + script->functionTemp[1] = 255; + } + + set_screen_overlay_params_front(0, script->functionTemp[1]); + + if (script->functionTemp[1] == 255) { + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} ApiStatus func_80240CB4_AF8604(Evt* script, s32 isInitialCall) { if (isInitialCall) { diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c index 20ce43297b..0ad4e90faa 100644 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ b/src/world/area_kmr/kmr_20/8ED5A0.c @@ -8,9 +8,23 @@ #include "common/foliage.inc.c" #define NAMESPACE kmr_20 -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241C9C_8EDABC); +ApiStatus func_80241C9C_8EDABC(Evt* script, s32 isInitialCall) { + func_8011B950(269, -1, 1, 1); + set_background_color_blend(0, 0, 0, 255); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241CF0_8EDB10); + gCameras[CAM_DEFAULT].bgColor[0] = 0; + gCameras[CAM_DEFAULT].bgColor[1] = 0; + gCameras[CAM_DEFAULT].bgColor[2] = 0; + + return ApiStatus_DONE2; +} + +ApiStatus func_80241CF0_8EDB10(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + gCameras[CAM_DEFAULT].moveSpeed = evt_get_float_variable(script, *args++); + return ApiStatus_DONE2; +} ApiStatus func_80241D1C_8EDB3C(Evt* script, s32 isInitialCall) { au_ambience_set_volume(0, 1000, 0x3F); diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c index 4086e348ab..5dbd799d95 100644 --- a/src/world/area_kmr/kmr_20/8EDB70.c +++ b/src/world/area_kmr/kmr_20/8EDB70.c @@ -4,9 +4,36 @@ #include "world/common/atomic/Pipe.inc.c" #define NAMESPACE kmr_20 -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80242030_8EDE50); +ApiStatus func_80242030_8EDE50(Evt* script, s32 isInitialCall) { + func_8011B950(269, -1, 0, 1); + set_background_color_blend(0, 0, 0, 0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80242084_8EDEA4); + gCameras[CAM_DEFAULT].bgColor[0] = 0; + gCameras[CAM_DEFAULT].bgColor[1] = 0; + gCameras[CAM_DEFAULT].bgColor[2] = 0; + + return ApiStatus_DONE2; +} + +ApiStatus func_80242084_8EDEA4(Evt* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[1] = 0; + } + + script->functionTemp[1] += 16; + + if (script->functionTemp[1] > 255) { + script->functionTemp[1] = 255; + } + + set_screen_overlay_params_front(0, script->functionTemp[1]); + + if (script->functionTemp[1] == 255) { + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} ApiStatus func_802420EC_8EDF0C(Evt* script, s32 isInitialCall) { if (isInitialCall) { diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240530_AF7E80.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240530_AF7E80.s deleted file mode 100644 index 203fcb5969..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240530_AF7E80.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_AF7E80 -/* AF7E80 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF7E84 80240534 AFBF0010 */ sw $ra, 0x10($sp) -/* AF7E88 80240538 8C82000C */ lw $v0, 0xc($a0) -/* AF7E8C 8024053C 0C0B1EAF */ jal evt_get_variable -/* AF7E90 80240540 8C450000 */ lw $a1, ($v0) -/* AF7E94 80240544 3C018024 */ lui $at, %hi(D_80241B14_AF9464) -/* AF7E98 80240548 AC221B14 */ sw $v0, %lo(D_80241B14_AF9464)($at) -/* AF7E9C 8024054C 24020002 */ addiu $v0, $zero, 2 -/* AF7EA0 80240550 8FBF0010 */ lw $ra, 0x10($sp) -/* AF7EA4 80240554 24030001 */ addiu $v1, $zero, 1 -/* AF7EA8 80240558 3C018024 */ lui $at, %hi(D_80241B10_AF9460) -/* AF7EAC 8024055C AC231B10 */ sw $v1, %lo(D_80241B10_AF9460)($at) -/* AF7EB0 80240560 03E00008 */ jr $ra -/* AF7EB4 80240564 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240568_AF7EB8.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240568_AF7EB8.s deleted file mode 100644 index 01ba46bb9b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240568_AF7EB8.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_AF7EB8 -/* AF7EB8 80240568 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF7EBC 8024056C AFBF0010 */ sw $ra, 0x10($sp) -/* AF7EC0 80240570 8C82000C */ lw $v0, 0xc($a0) -/* AF7EC4 80240574 0C0B1EAF */ jal evt_get_variable -/* AF7EC8 80240578 8C450000 */ lw $a1, ($v0) -/* AF7ECC 8024057C 0040182D */ daddu $v1, $v0, $zero -/* AF7ED0 80240580 10600012 */ beqz $v1, .L802405CC -/* AF7ED4 80240584 0000202D */ daddu $a0, $zero, $zero -/* AF7ED8 80240588 8C620000 */ lw $v0, ($v1) -/* AF7EDC 8024058C 5040000A */ beql $v0, $zero, .L802405B8 -/* AF7EE0 80240590 00041080 */ sll $v0, $a0, 2 -/* AF7EE4 80240594 3C058024 */ lui $a1, %hi(D_802461F0) -/* AF7EE8 80240598 24A561F0 */ addiu $a1, $a1, %lo(D_802461F0) -.L8024059C: -/* AF7EEC 8024059C 24630004 */ addiu $v1, $v1, 4 -/* AF7EF0 802405A0 24840001 */ addiu $a0, $a0, 1 -/* AF7EF4 802405A4 ACA20000 */ sw $v0, ($a1) -/* AF7EF8 802405A8 8C620000 */ lw $v0, ($v1) -/* AF7EFC 802405AC 1440FFFB */ bnez $v0, .L8024059C -/* AF7F00 802405B0 24A50004 */ addiu $a1, $a1, 4 -/* AF7F04 802405B4 00041080 */ sll $v0, $a0, 2 -.L802405B8: -/* AF7F08 802405B8 3C018024 */ lui $at, %hi(D_802461F0) -/* AF7F0C 802405BC 00220821 */ addu $at, $at, $v0 -/* AF7F10 802405C0 AC2061F0 */ sw $zero, %lo(D_802461F0)($at) -/* AF7F14 802405C4 0809017D */ j .L802405F4 -/* AF7F18 802405C8 00000000 */ nop -.L802405CC: -/* AF7F1C 802405CC 3C038024 */ lui $v1, %hi(D_802461F0) -/* AF7F20 802405D0 246361F0 */ addiu $v1, $v1, %lo(D_802461F0) -/* AF7F24 802405D4 0060282D */ daddu $a1, $v1, $zero -.L802405D8: -/* AF7F28 802405D8 24820010 */ addiu $v0, $a0, 0x10 -/* AF7F2C 802405DC AC620000 */ sw $v0, ($v1) -/* AF7F30 802405E0 24630004 */ addiu $v1, $v1, 4 -/* AF7F34 802405E4 24840001 */ addiu $a0, $a0, 1 -/* AF7F38 802405E8 28820070 */ slti $v0, $a0, 0x70 -/* AF7F3C 802405EC 1440FFFA */ bnez $v0, .L802405D8 -/* AF7F40 802405F0 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802405F4: -/* AF7F44 802405F4 8FBF0010 */ lw $ra, 0x10($sp) -/* AF7F48 802405F8 24020002 */ addiu $v0, $zero, 2 -/* AF7F4C 802405FC 03E00008 */ jr $ra -/* AF7F50 80240600 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s deleted file mode 100644 index 89948040a2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240604_AF7F54 -/* AF7F54 80240604 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF7F58 80240608 AFBF0010 */ sw $ra, 0x10($sp) -/* AF7F5C 8024060C 8C82000C */ lw $v0, 0xc($a0) -/* AF7F60 80240610 0C0B1EAF */ jal evt_get_variable -/* AF7F64 80240614 8C450000 */ lw $a1, ($v0) -/* AF7F68 80240618 0040182D */ daddu $v1, $v0, $zero -/* AF7F6C 8024061C 10600012 */ beqz $v1, .L80240668 -/* AF7F70 80240620 0000202D */ daddu $a0, $zero, $zero -/* AF7F74 80240624 8C620000 */ lw $v0, ($v1) -/* AF7F78 80240628 5040000A */ beql $v0, $zero, .L80240654 -/* AF7F7C 8024062C 00041080 */ sll $v0, $a0, 2 -/* AF7F80 80240630 3C058024 */ lui $a1, %hi(D_802463B8_kkj_19) -/* AF7F84 80240634 24A563B8 */ addiu $a1, $a1, %lo(D_802463B8_kkj_19) -.L80240638: -/* AF7F88 80240638 24630004 */ addiu $v1, $v1, 4 -/* AF7F8C 8024063C 24840001 */ addiu $a0, $a0, 1 -/* AF7F90 80240640 ACA20000 */ sw $v0, ($a1) -/* AF7F94 80240644 8C620000 */ lw $v0, ($v1) -/* AF7F98 80240648 1440FFFB */ bnez $v0, .L80240638 -/* AF7F9C 8024064C 24A50004 */ addiu $a1, $a1, 4 -/* AF7FA0 80240650 00041080 */ sll $v0, $a0, 2 -.L80240654: -/* AF7FA4 80240654 3C018024 */ lui $at, %hi(D_802463B8_kkj_19) -/* AF7FA8 80240658 00220821 */ addu $at, $at, $v0 -/* AF7FAC 8024065C AC2063B8 */ sw $zero, %lo(D_802463B8_kkj_19)($at) -/* AF7FB0 80240660 080901A4 */ j .L80240690 -/* AF7FB4 80240664 00000000 */ nop -.L80240668: -/* AF7FB8 80240668 3C038024 */ lui $v1, %hi(D_802463B8_kkj_19) -/* AF7FBC 8024066C 246363B8 */ addiu $v1, $v1, %lo(D_802463B8_kkj_19) -/* AF7FC0 80240670 0060282D */ daddu $a1, $v1, $zero -.L80240674: -/* AF7FC4 80240674 24820080 */ addiu $v0, $a0, 0x80 -/* AF7FC8 80240678 AC620000 */ sw $v0, ($v1) -/* AF7FCC 8024067C 24630004 */ addiu $v1, $v1, 4 -/* AF7FD0 80240680 24840001 */ addiu $a0, $a0, 1 -/* AF7FD4 80240684 2882005B */ slti $v0, $a0, 0x5b -/* AF7FD8 80240688 1440FFFA */ bnez $v0, .L80240674 -/* AF7FDC 8024068C ACA0016C */ sw $zero, 0x16c($a1) -.L80240690: -/* AF7FE0 80240690 8FBF0010 */ lw $ra, 0x10($sp) -/* AF7FE4 80240694 24020002 */ addiu $v0, $zero, 2 -/* AF7FE8 80240698 03E00008 */ jr $ra -/* AF7FEC 8024069C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s deleted file mode 100644 index 3b328672ab..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A0_AF7FF0 -/* AF7FF0 802406A0 3C048024 */ lui $a0, %hi(D_80246568_C8C018) -/* AF7FF4 802406A4 8C846568 */ lw $a0, %lo(D_80246568_C8C018)($a0) -/* AF7FF8 802406A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF7FFC 802406AC AFBF0010 */ sw $ra, 0x10($sp) -/* AF8000 802406B0 0C0511EA */ jal hud_element_draw_clipped -/* AF8004 802406B4 00000000 */ nop -/* AF8008 802406B8 8FBF0010 */ lw $ra, 0x10($sp) -/* AF800C 802406BC 03E00008 */ jr $ra -/* AF8010 802406C0 27BD0018 */ addiu $sp, $sp, 0x18 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 deleted file mode 100644 index a661af75eb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s +++ /dev/null @@ -1,321 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802461B0_AFDB00 -.word .L80240720_AF8070, .L802408B8_AF8208, .L80240ACC_AF841C, .L80240ACC_AF841C, .L80240ACC_AF841C, .L80240ACC_AF841C, .L80240ACC_AF841C, .L80240ACC_AF841C, .L80240ACC_AF841C, .L80240ACC_AF841C, .L80240938_AF8288, .L8024096C_AF82BC, .L80240A78_AF83C8 - -.section .text - -glabel func_802406C4_AF8014 -/* AF8014 802406C4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AF8018 802406C8 AFB50024 */ sw $s5, 0x24($sp) -/* AF801C 802406CC 0080A82D */ daddu $s5, $a0, $zero -/* AF8020 802406D0 AFBF0028 */ sw $ra, 0x28($sp) -/* AF8024 802406D4 AFB40020 */ sw $s4, 0x20($sp) -/* AF8028 802406D8 AFB3001C */ sw $s3, 0x1c($sp) -/* AF802C 802406DC AFB20018 */ sw $s2, 0x18($sp) -/* AF8030 802406E0 AFB10014 */ sw $s1, 0x14($sp) -/* AF8034 802406E4 AFB00010 */ sw $s0, 0x10($sp) -/* AF8038 802406E8 10A00003 */ beqz $a1, .L802406F8 -/* AF803C 802406EC 8EA6000C */ lw $a2, 0xc($s5) -/* AF8040 802406F0 3C018024 */ lui $at, %hi(D_80246558_kkj_19) -/* AF8044 802406F4 AC206558 */ sw $zero, %lo(D_80246558_kkj_19)($at) -.L802406F8: -/* AF8048 802406F8 3C038024 */ lui $v1, %hi(D_80246558_kkj_19) -/* AF804C 802406FC 8C636558 */ lw $v1, %lo(D_80246558_kkj_19)($v1) -/* AF8050 80240700 2C62000D */ sltiu $v0, $v1, 0xd -/* 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 -/* AF8064 80240714 8C2261B0 */ lw $v0, %lo(jtbl_802461B0_AFDB00)($at) -/* AF8068 80240718 00400008 */ jr $v0 -/* AF806C 8024071C 00000000 */ nop -.L80240720_AF8070: -/* AF8070 80240720 02A0202D */ daddu $a0, $s5, $zero -/* AF8074 80240724 8CC50000 */ lw $a1, ($a2) -/* AF8078 80240728 0C0B1EAF */ jal evt_get_variable -/* AF807C 8024072C 24140009 */ addiu $s4, $zero, 9 -/* AF8080 80240730 3C058024 */ lui $a1, %hi(func_802406A0_AF7FF0) -/* AF8084 80240734 24A506A0 */ addiu $a1, $a1, %lo(func_802406A0_AF7FF0) -/* AF8088 80240738 3C018024 */ lui $at, %hi(D_80246534) -/* AF808C 8024073C AC226534 */ sw $v0, %lo(D_80246534)($at) -/* AF8090 80240740 0C048C8F */ jal create_generic_entity_frontUI -/* AF8094 80240744 0000202D */ daddu $a0, $zero, $zero -/* AF8098 80240748 3C038024 */ lui $v1, %hi(D_8024659C) -/* AF809C 8024074C 2463659C */ addiu $v1, $v1, %lo(D_8024659C) -/* AF80A0 80240750 3C018024 */ lui $at, %hi(D_80246554) -/* AF80A4 80240754 AC226554 */ sw $v0, %lo(D_80246554)($at) -/* AF80A8 80240758 3C018024 */ lui $at, %hi(dgb_08_npcGroup_80246528) -/* AF80AC 8024075C AC206528 */ sw $zero, %lo(dgb_08_npcGroup_80246528)($at) -/* AF80B0 80240760 3C018024 */ lui $at, %hi(D_80246530) -/* AF80B4 80240764 AC206530 */ sw $zero, %lo(D_80246530)($at) -.L80240768: -/* AF80B8 80240768 AC600000 */ sw $zero, ($v1) -/* AF80BC 8024076C 2694FFFF */ addiu $s4, $s4, -1 -/* AF80C0 80240770 0681FFFD */ bgez $s4, .L80240768 -/* AF80C4 80240774 2463FFFC */ addiu $v1, $v1, -4 -/* AF80C8 80240778 2414000A */ addiu $s4, $zero, 0xa -/* AF80CC 8024077C 3C048011 */ lui $a0, %hi(HES_AButton) -/* AF80D0 80240780 24848B28 */ addiu $a0, $a0, %lo(HES_AButton) -/* AF80D4 80240784 3C038024 */ lui $v1, %hi(D_80246538_kkj_19) -/* AF80D8 80240788 24636538 */ addiu $v1, $v1, %lo(D_80246538_kkj_19) -/* AF80DC 8024078C 2402000C */ addiu $v0, $zero, 0xc -/* AF80E0 80240790 AC620004 */ sw $v0, 4($v1) -/* AF80E4 80240794 24020018 */ addiu $v0, $zero, 0x18 -/* AF80E8 80240798 AC620008 */ sw $v0, 8($v1) -/* AF80EC 8024079C 24020024 */ addiu $v0, $zero, 0x24 -/* AF80F0 802407A0 AC62000C */ sw $v0, 0xc($v1) -/* AF80F4 802407A4 24020030 */ addiu $v0, $zero, 0x30 -/* AF80F8 802407A8 AC620010 */ sw $v0, 0x10($v1) -/* AF80FC 802407AC 2402003C */ addiu $v0, $zero, 0x3c -/* AF8100 802407B0 AC620014 */ sw $v0, 0x14($v1) -/* AF8104 802407B4 24020005 */ addiu $v0, $zero, 5 -/* AF8108 802407B8 3C118024 */ lui $s1, %hi(D_8024655C) -/* AF810C 802407BC 2631655C */ addiu $s1, $s1, %lo(D_8024655C) -/* AF8110 802407C0 3C018024 */ lui $at, %hi(D_80246550_kkj_19) -/* AF8114 802407C4 AC226550 */ sw $v0, %lo(D_80246550_kkj_19)($at) -/* AF8118 802407C8 2402FFD0 */ addiu $v0, $zero, -0x30 -/* AF811C 802407CC 3C108024 */ lui $s0, %hi(D_80246560_kkj_19) -/* AF8120 802407D0 26106560 */ addiu $s0, $s0, %lo(D_80246560_kkj_19) -/* AF8124 802407D4 3C018024 */ lui $at, %hi(D_802465A0) -/* AF8128 802407D8 AC2065A0 */ sw $zero, %lo(D_802465A0)($at) -/* AF812C 802407DC AC600000 */ sw $zero, ($v1) -/* AF8130 802407E0 AE220000 */ sw $v0, ($s1) -/* AF8134 802407E4 24020040 */ addiu $v0, $zero, 0x40 -/* AF8138 802407E8 0C050529 */ jal hud_element_create -/* AF813C 802407EC AE020000 */ sw $v0, ($s0) -/* AF8140 802407F0 0040982D */ daddu $s3, $v0, $zero -/* AF8144 802407F4 0260202D */ daddu $a0, $s3, $zero -/* AF8148 802407F8 8E250000 */ lw $a1, ($s1) -/* AF814C 802407FC 8E060000 */ lw $a2, ($s0) -/* AF8150 80240800 3C128024 */ lui $s2, %hi(D_80246568_C8C018) -/* AF8154 80240804 26526568 */ addiu $s2, $s2, %lo(D_80246568_C8C018) -/* AF8158 80240808 0C051261 */ jal hud_element_set_render_pos -/* AF815C 8024080C AE530000 */ sw $s3, ($s2) -/* AF8160 80240810 0260202D */ daddu $a0, $s3, $zero -/* AF8164 80240814 0C051277 */ jal hud_element_set_render_depth -/* AF8168 80240818 0000282D */ daddu $a1, $zero, $zero -/* AF816C 8024081C 0260202D */ daddu $a0, $s3, $zero -/* AF8170 80240820 0C051280 */ jal hud_element_set_flags -/* AF8174 80240824 24050082 */ addiu $a1, $zero, 0x82 -/* AF8178 80240828 3C048011 */ lui $a0, %hi(HES_BlueMeter) -/* AF817C 8024082C 24848AFC */ addiu $a0, $a0, %lo(HES_BlueMeter) -/* AF8180 80240830 0C050529 */ jal hud_element_create -/* AF8184 80240834 00000000 */ nop -/* AF8188 80240838 0040982D */ daddu $s3, $v0, $zero -/* AF818C 8024083C 8E250000 */ lw $a1, ($s1) -/* AF8190 80240840 8E060000 */ lw $a2, ($s0) -/* AF8194 80240844 0260202D */ daddu $a0, $s3, $zero -/* AF8198 80240848 AE530004 */ sw $s3, 4($s2) -/* AF819C 8024084C 0C051261 */ jal hud_element_set_render_pos -/* AF81A0 80240850 24C6001C */ addiu $a2, $a2, 0x1c -/* AF81A4 80240854 0260202D */ daddu $a0, $s3, $zero -/* AF81A8 80240858 0C051277 */ jal hud_element_set_render_depth -/* AF81AC 8024085C 0000282D */ daddu $a1, $zero, $zero -/* AF81B0 80240860 0260202D */ daddu $a0, $s3, $zero -/* AF81B4 80240864 0C051280 */ jal hud_element_set_flags -/* AF81B8 80240868 24050082 */ addiu $a1, $zero, 0x82 -/* AF81BC 8024086C 8E530000 */ lw $s3, ($s2) -/* AF81C0 80240870 240500FF */ addiu $a1, $zero, 0xff -/* AF81C4 80240874 0C0513AC */ jal hud_element_set_alpha -/* AF81C8 80240878 0260202D */ daddu $a0, $s3, $zero -/* AF81CC 8024087C 0260202D */ daddu $a0, $s3, $zero -/* AF81D0 80240880 0C05128B */ jal hud_element_clear_flags -/* AF81D4 80240884 24050002 */ addiu $a1, $zero, 2 -/* AF81D8 80240888 8E530004 */ lw $s3, 4($s2) -/* AF81DC 8024088C 240500FF */ addiu $a1, $zero, 0xff -/* AF81E0 80240890 0C0513AC */ jal hud_element_set_alpha -/* AF81E4 80240894 0260202D */ daddu $a0, $s3, $zero -/* AF81E8 80240898 0260202D */ daddu $a0, $s3, $zero -/* AF81EC 8024089C 0C05128B */ jal hud_element_clear_flags -/* AF81F0 802408A0 24050002 */ addiu $a1, $zero, 2 -/* AF81F4 802408A4 24020001 */ addiu $v0, $zero, 1 -/* AF81F8 802408A8 3C018024 */ lui $at, %hi(D_80246558_kkj_19) -/* AF81FC 802408AC AC226558 */ sw $v0, %lo(D_80246558_kkj_19)($at) -/* AF8200 802408B0 080902B3 */ j .L80240ACC_AF841C -/* AF8204 802408B4 AEB40070 */ sw $s4, 0x70($s5) -.L802408B8_AF8208: -/* AF8208 802408B8 3C128024 */ lui $s2, %hi(D_8024655C) -/* AF820C 802408BC 2652655C */ addiu $s2, $s2, %lo(D_8024655C) -/* AF8210 802408C0 8E420000 */ lw $v0, ($s2) -/* AF8214 802408C4 24420014 */ addiu $v0, $v0, 0x14 -/* AF8218 802408C8 AE420000 */ sw $v0, ($s2) -/* AF821C 802408CC 28420033 */ slti $v0, $v0, 0x33 -/* AF8220 802408D0 14400002 */ bnez $v0, .L802408DC -/* AF8224 802408D4 24020032 */ addiu $v0, $zero, 0x32 -/* AF8228 802408D8 AE420000 */ sw $v0, ($s2) -.L802408DC: -/* AF822C 802408DC 3C118024 */ lui $s1, %hi(D_80246568_C8C018) -/* AF8230 802408E0 26316568 */ addiu $s1, $s1, %lo(D_80246568_C8C018) -/* AF8234 802408E4 3C108024 */ lui $s0, %hi(D_80246560_kkj_19) -/* AF8238 802408E8 26106560 */ addiu $s0, $s0, %lo(D_80246560_kkj_19) -/* AF823C 802408EC 8E240000 */ lw $a0, ($s1) -/* AF8240 802408F0 8E450000 */ lw $a1, ($s2) -/* AF8244 802408F4 0C051261 */ jal hud_element_set_render_pos -/* AF8248 802408F8 8E060000 */ lw $a2, ($s0) -/* AF824C 802408FC 8E240004 */ lw $a0, 4($s1) -/* AF8250 80240900 8E060000 */ lw $a2, ($s0) -/* AF8254 80240904 8E450000 */ lw $a1, ($s2) -/* AF8258 80240908 0C051261 */ jal hud_element_set_render_pos -/* AF825C 8024090C 24C6001C */ addiu $a2, $a2, 0x1c -/* 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_AF841C -/* AF8270 80240920 AEA20070 */ sw $v0, 0x70($s5) -.L80240924: -/* AF8274 80240924 2402000A */ addiu $v0, $zero, 0xa -/* AF8278 80240928 3C018024 */ lui $at, %hi(D_80246558_kkj_19) -/* AF827C 8024092C AC226558 */ sw $v0, %lo(D_80246558_kkj_19)($at) -/* AF8280 80240930 080902B3 */ j .L80240ACC_AF841C -/* AF8284 80240934 00000000 */ nop -.L80240938_AF8288: -/* AF8288 80240938 3C048024 */ lui $a0, %hi(D_80246568_C8C018) -/* AF828C 8024093C 8C846568 */ lw $a0, %lo(D_80246568_C8C018)($a0) -/* AF8290 80240940 3C058011 */ lui $a1, %hi(HES_MashAButton) -/* AF8294 80240944 24A58B80 */ addiu $a1, $a1, %lo(HES_MashAButton) -/* AF8298 80240948 0C0511FF */ jal hud_element_set_script -/* AF829C 8024094C 00000000 */ nop -/* AF82A0 80240950 2402000B */ addiu $v0, $zero, 0xb -/* AF82A4 80240954 3C018024 */ lui $at, %hi(dgb_08_npcGroup_80246528) -/* AF82A8 80240958 AC206528 */ sw $zero, %lo(dgb_08_npcGroup_80246528)($at) -/* AF82AC 8024095C 3C018024 */ lui $at, %hi(D_8024652C) -/* AF82B0 80240960 AC20652C */ sw $zero, %lo(D_8024652C)($at) -/* AF82B4 80240964 3C018024 */ lui $at, %hi(D_80246558_kkj_19) -/* AF82B8 80240968 AC226558 */ sw $v0, %lo(D_80246558_kkj_19)($at) -.L8024096C_AF82BC: -/* AF82BC 8024096C 3C038024 */ lui $v1, %hi(D_80246550_kkj_19) -/* AF82C0 80240970 8C636550 */ lw $v1, %lo(D_80246550_kkj_19)($v1) -/* AF82C4 80240974 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* AF82C8 80240978 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* AF82CC 8024097C 00031880 */ sll $v1, $v1, 2 -/* AF82D0 80240980 8C420010 */ lw $v0, 0x10($v0) -/* AF82D4 80240984 3C048024 */ lui $a0, %hi(D_80246538_kkj_19) -/* AF82D8 80240988 00832021 */ addu $a0, $a0, $v1 -/* AF82DC 8024098C 8C846538 */ lw $a0, %lo(D_80246538_kkj_19)($a0) -/* AF82E0 80240990 30428000 */ andi $v0, $v0, 0x8000 -/* AF82E4 80240994 10400006 */ beqz $v0, .L802409B0 -/* AF82E8 80240998 00000000 */ nop -/* AF82EC 8024099C 3C038024 */ lui $v1, %hi(dgb_08_npcGroup_80246528) -/* AF82F0 802409A0 24636528 */ addiu $v1, $v1, %lo(dgb_08_npcGroup_80246528) -/* AF82F4 802409A4 8C620000 */ lw $v0, ($v1) -/* AF82F8 802409A8 24420001 */ addiu $v0, $v0, 1 -/* AF82FC 802409AC AC620000 */ sw $v0, ($v1) -.L802409B0: -/* AF8300 802409B0 3C038024 */ lui $v1, %hi(dgb_08_npcGroup_80246528) -/* AF8304 802409B4 24636528 */ addiu $v1, $v1, %lo(dgb_08_npcGroup_80246528) -/* AF8308 802409B8 8C620000 */ lw $v0, ($v1) -/* AF830C 802409BC 0082102A */ slt $v0, $a0, $v0 -/* AF8310 802409C0 54400001 */ bnel $v0, $zero, .L802409C8 -/* AF8314 802409C4 AC640000 */ sw $a0, ($v1) -.L802409C8: -/* AF8318 802409C8 3C048024 */ lui $a0, %hi(D_8024652C) -/* AF831C 802409CC 2484652C */ addiu $a0, $a0, %lo(D_8024652C) -/* AF8320 802409D0 8C830000 */ lw $v1, ($a0) -/* AF8324 802409D4 24020002 */ addiu $v0, $zero, 2 -/* AF8328 802409D8 14620003 */ bne $v1, $v0, .L802409E8 -/* AF832C 802409DC 0000A02D */ daddu $s4, $zero, $zero -/* AF8330 802409E0 24020003 */ addiu $v0, $zero, 3 -/* AF8334 802409E4 AC820000 */ sw $v0, ($a0) -.L802409E8: -/* AF8338 802409E8 3C038024 */ lui $v1, %hi(D_80246578) -/* AF833C 802409EC 24636578 */ addiu $v1, $v1, %lo(D_80246578) -.L802409F0: -/* AF8340 802409F0 8C620000 */ lw $v0, ($v1) -/* AF8344 802409F4 14400006 */ bnez $v0, .L80240A10 -/* AF8348 802409F8 2A82000A */ slti $v0, $s4, 0xa -/* AF834C 802409FC 26940001 */ addiu $s4, $s4, 1 -/* AF8350 80240A00 2A82000A */ slti $v0, $s4, 0xa -/* AF8354 80240A04 1440FFFA */ bnez $v0, .L802409F0 -/* AF8358 80240A08 24630004 */ addiu $v1, $v1, 4 -/* AF835C 80240A0C 2A82000A */ slti $v0, $s4, 0xa -.L80240A10: -/* AF8360 80240A10 14400006 */ bnez $v0, .L80240A2C -/* AF8364 80240A14 24020003 */ addiu $v0, $zero, 3 -/* AF8368 80240A18 24020002 */ addiu $v0, $zero, 2 -/* AF836C 80240A1C 3C018024 */ lui $at, %hi(D_8024652C) -/* AF8370 80240A20 AC22652C */ sw $v0, %lo(D_8024652C)($at) -/* AF8374 80240A24 08090291 */ j .L80240A44 -/* AF8378 80240A28 00000000 */ nop -.L80240A2C: -/* AF837C 80240A2C 3C048024 */ lui $a0, %hi(D_8024652C) -/* AF8380 80240A30 2484652C */ addiu $a0, $a0, %lo(D_8024652C) -/* AF8384 80240A34 8C830000 */ lw $v1, ($a0) -/* AF8388 80240A38 10620002 */ beq $v1, $v0, .L80240A44 -/* AF838C 80240A3C 24020002 */ addiu $v0, $zero, 2 -/* AF8390 80240A40 AC820000 */ sw $v0, ($a0) -.L80240A44: -/* AF8394 80240A44 3C038024 */ lui $v1, %hi(D_80246534) -/* 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_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_kkj_19) -/* AF83BC 80240A6C AC226558 */ sw $v0, %lo(D_80246558_kkj_19)($at) -/* AF83C0 80240A70 080902B3 */ j .L80240ACC_AF841C -/* AF83C4 80240A74 00000000 */ nop -.L80240A78_AF83C8: -/* AF83C8 80240A78 3C038024 */ lui $v1, %hi(D_80246534) -/* AF83CC 80240A7C 24636534 */ addiu $v1, $v1, %lo(D_80246534) -/* AF83D0 80240A80 8C620000 */ lw $v0, ($v1) -/* AF83D4 80240A84 54400010 */ bnel $v0, $zero, .L80240AC8 -/* AF83D8 80240A88 2442FFFF */ addiu $v0, $v0, -1 -/* AF83DC 80240A8C 3C028024 */ lui $v0, %hi(dgb_08_npcGroup_80246528) -/* AF83E0 80240A90 8C426528 */ lw $v0, %lo(dgb_08_npcGroup_80246528)($v0) -/* AF83E4 80240A94 3C108024 */ lui $s0, %hi(D_80246568_C8C018) -/* AF83E8 80240A98 26106568 */ addiu $s0, $s0, %lo(D_80246568_C8C018) -/* AF83EC 80240A9C AEA20084 */ sw $v0, 0x84($s5) -/* AF83F0 80240AA0 0C05123D */ jal hud_element_free -/* AF83F4 80240AA4 8E040000 */ lw $a0, ($s0) -/* AF83F8 80240AA8 0C05123D */ jal hud_element_free -/* AF83FC 80240AAC 8E040004 */ lw $a0, 4($s0) -/* AF8400 80240AB0 3C048024 */ lui $a0, %hi(D_80246554) -/* AF8404 80240AB4 8C846554 */ lw $a0, %lo(D_80246554)($a0) -/* AF8408 80240AB8 0C048D70 */ jal free_generic_entity -/* AF840C 80240ABC 00000000 */ nop -/* AF8410 80240AC0 080902CA */ j .L80240B28 -/* AF8414 80240AC4 24020002 */ addiu $v0, $zero, 2 -.L80240AC8: -/* AF8418 80240AC8 AC620000 */ sw $v0, ($v1) -.L80240ACC_AF841C: -/* AF841C 80240ACC 3C058024 */ lui $a1, %hi(D_802465A0) -/* AF8420 80240AD0 24A565A0 */ addiu $a1, $a1, %lo(D_802465A0) -/* AF8424 80240AD4 8CA20000 */ lw $v0, ($a1) -/* AF8428 80240AD8 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* AF842C 80240ADC 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* AF8430 80240AE0 00022080 */ sll $a0, $v0, 2 -/* AF8434 80240AE4 8C630010 */ lw $v1, 0x10($v1) -/* AF8438 80240AE8 24420001 */ addiu $v0, $v0, 1 -/* AF843C 80240AEC ACA20000 */ sw $v0, ($a1) -/* AF8440 80240AF0 2842000A */ slti $v0, $v0, 0xa -/* AF8444 80240AF4 30638000 */ andi $v1, $v1, 0x8000 -/* AF8448 80240AF8 3C018024 */ lui $at, %hi(D_80246578) -/* AF844C 80240AFC 00240821 */ addu $at, $at, $a0 -/* AF8450 80240B00 AC236578 */ sw $v1, %lo(D_80246578)($at) -/* AF8454 80240B04 50400001 */ beql $v0, $zero, .L80240B0C -/* AF8458 80240B08 ACA00000 */ sw $zero, ($a1) -.L80240B0C: -/* AF845C 80240B0C 02A0202D */ daddu $a0, $s5, $zero -/* AF8460 80240B10 3C05F70F */ lui $a1, 0xf70f -/* AF8464 80240B14 3C068024 */ lui $a2, %hi(D_8024652C) -/* AF8468 80240B18 8CC6652C */ lw $a2, %lo(D_8024652C)($a2) -/* AF846C 80240B1C 0C0B2026 */ jal evt_set_variable -/* AF8470 80240B20 34A52E83 */ ori $a1, $a1, 0x2e83 -/* AF8474 80240B24 0000102D */ daddu $v0, $zero, $zero -.L80240B28: -/* AF8478 80240B28 8FBF0028 */ lw $ra, 0x28($sp) -/* AF847C 80240B2C 8FB50024 */ lw $s5, 0x24($sp) -/* AF8480 80240B30 8FB40020 */ lw $s4, 0x20($sp) -/* AF8484 80240B34 8FB3001C */ lw $s3, 0x1c($sp) -/* AF8488 80240B38 8FB20018 */ lw $s2, 0x18($sp) -/* AF848C 80240B3C 8FB10014 */ lw $s1, 0x14($sp) -/* AF8490 80240B40 8FB00010 */ lw $s0, 0x10($sp) -/* AF8494 80240B44 03E00008 */ jr $ra -/* AF8498 80240B48 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B4C_AF849C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B4C_AF849C.s deleted file mode 100644 index b9b760451a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B4C_AF849C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B4C_AF849C -/* AF849C 80240B4C 54A00001 */ bnel $a1, $zero, .L80240B54 -/* AF84A0 80240B50 AC800074 */ sw $zero, 0x74($a0) -.L80240B54: -/* AF84A4 80240B54 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* AF84A8 80240B58 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* AF84AC 80240B5C 8C420010 */ lw $v0, 0x10($v0) -/* AF84B0 80240B60 30428000 */ andi $v0, $v0, 0x8000 -/* AF84B4 80240B64 14400006 */ bnez $v0, .L80240B80 -/* AF84B8 80240B68 24020002 */ addiu $v0, $zero, 2 -/* AF84BC 80240B6C 8C830074 */ lw $v1, 0x74($a0) -/* AF84C0 80240B70 0000102D */ daddu $v0, $zero, $zero -/* AF84C4 80240B74 24630001 */ addiu $v1, $v1, 1 -/* AF84C8 80240B78 03E00008 */ jr $ra -/* AF84CC 80240B7C AC830074 */ sw $v1, 0x74($a0) -.L80240B80: -/* AF84D0 80240B80 8C830074 */ lw $v1, 0x74($a0) -/* AF84D4 80240B84 03E00008 */ jr $ra -/* AF84D8 80240B88 AC830084 */ sw $v1, 0x84($a0) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C_AF84DC.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C_AF84DC.s deleted file mode 100644 index f3a296f796..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C_AF84DC.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B8C_AF84DC -/* AF84DC 80240B8C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF84E0 80240B90 AFB00010 */ sw $s0, 0x10($sp) -/* AF84E4 80240B94 0080802D */ daddu $s0, $a0, $zero -/* AF84E8 80240B98 AFBF0018 */ sw $ra, 0x18($sp) -/* AF84EC 80240B9C AFB10014 */ sw $s1, 0x14($sp) -/* AF84F0 80240BA0 8E02000C */ lw $v0, 0xc($s0) -/* AF84F4 80240BA4 8C510000 */ lw $s1, ($v0) -/* AF84F8 80240BA8 0C0B1EAF */ jal evt_get_variable -/* AF84FC 80240BAC 0220282D */ daddu $a1, $s1, $zero -/* AF8500 80240BB0 0200202D */ daddu $a0, $s0, $zero -/* AF8504 80240BB4 00021140 */ sll $v0, $v0, 5 -/* AF8508 80240BB8 3C068008 */ lui $a2, %hi(gItemTable) -/* AF850C 80240BBC 00C23021 */ addu $a2, $a2, $v0 -/* AF8510 80240BC0 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* AF8514 80240BC4 0C0B2026 */ jal evt_set_variable -/* AF8518 80240BC8 0220282D */ daddu $a1, $s1, $zero -/* AF851C 80240BCC 8FBF0018 */ lw $ra, 0x18($sp) -/* AF8520 80240BD0 8FB10014 */ lw $s1, 0x14($sp) -/* AF8524 80240BD4 8FB00010 */ lw $s0, 0x10($sp) -/* AF8528 80240BD8 24020002 */ addiu $v0, $zero, 2 -/* AF852C 80240BDC 03E00008 */ jr $ra -/* AF8530 80240BE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s deleted file mode 100644 index f6652adc35..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C10_AF8560 -/* AF8560 80240C10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF8564 80240C14 AFBF0010 */ sw $ra, 0x10($sp) -/* AF8568 80240C18 8C82000C */ lw $v0, 0xc($a0) -/* AF856C 80240C1C 0C0B1EAF */ jal evt_get_variable -/* AF8570 80240C20 8C450000 */ lw $a1, ($v0) -/* AF8574 80240C24 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* AF8578 80240C28 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* AF857C 80240C2C 0040182D */ daddu $v1, $v0, $zero -/* AF8580 80240C30 3C018011 */ lui $at, %hi(gPlayerStatus+0xC4) -/* AF8584 80240C34 A023F08C */ sb $v1, %lo(gPlayerStatus+0xC4)($at) -/* AF8588 80240C38 A0830080 */ sb $v1, 0x80($a0) -/* AF858C 80240C3C 8FBF0010 */ lw $ra, 0x10($sp) -/* AF8590 80240C40 24020002 */ addiu $v0, $zero, 2 -/* AF8594 80240C44 03E00008 */ jr $ra -/* AF8598 80240C48 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C4C_AF859C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C4C_AF859C.s deleted file mode 100644 index ad5e05fc01..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C4C_AF859C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_AF859C -/* AF859C 80240C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF85A0 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* AF85A4 80240C54 0080802D */ daddu $s0, $a0, $zero -/* AF85A8 80240C58 10A00002 */ beqz $a1, .L80240C64 -/* AF85AC 80240C5C AFBF0014 */ sw $ra, 0x14($sp) -/* AF85B0 80240C60 AE000074 */ sw $zero, 0x74($s0) -.L80240C64: -/* AF85B4 80240C64 8E020074 */ lw $v0, 0x74($s0) -/* AF85B8 80240C68 24420010 */ addiu $v0, $v0, 0x10 -/* AF85BC 80240C6C AE020074 */ sw $v0, 0x74($s0) -/* AF85C0 80240C70 28420100 */ slti $v0, $v0, 0x100 -/* AF85C4 80240C74 14400002 */ bnez $v0, .L80240C80 -/* AF85C8 80240C78 240200FF */ addiu $v0, $zero, 0xff -/* AF85CC 80240C7C AE020074 */ sw $v0, 0x74($s0) -.L80240C80: -/* AF85D0 80240C80 C6000074 */ lwc1 $f0, 0x74($s0) -/* AF85D4 80240C84 46800020 */ cvt.s.w $f0, $f0 -/* AF85D8 80240C88 44050000 */ mfc1 $a1, $f0 -/* AF85DC 80240C8C 0C04DF62 */ jal set_screen_overlay_params_front -/* AF85E0 80240C90 0000202D */ daddu $a0, $zero, $zero -/* AF85E4 80240C94 8E020074 */ lw $v0, 0x74($s0) -/* AF85E8 80240C98 8FBF0014 */ lw $ra, 0x14($sp) -/* AF85EC 80240C9C 8FB00010 */ lw $s0, 0x10($sp) -/* AF85F0 80240CA0 384200FF */ xori $v0, $v0, 0xff -/* AF85F4 80240CA4 2C420001 */ sltiu $v0, $v0, 1 -/* AF85F8 80240CA8 00021040 */ sll $v0, $v0, 1 -/* AF85FC 80240CAC 03E00008 */ jr $ra -/* AF8600 80240CB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241C9C_8EDABC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241C9C_8EDABC.s deleted file mode 100644 index 20f4d90a41..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241C9C_8EDABC.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C9C_8EDABC -/* 8EDABC 80241C9C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDAC0 80241CA0 2404010D */ addiu $a0, $zero, 0x10d -/* 8EDAC4 80241CA4 2405FFFF */ addiu $a1, $zero, -1 -/* 8EDAC8 80241CA8 24060001 */ addiu $a2, $zero, 1 -/* 8EDACC 80241CAC AFBF0010 */ sw $ra, 0x10($sp) -/* 8EDAD0 80241CB0 0C046E54 */ jal func_8011B950 -/* 8EDAD4 80241CB4 00C0382D */ daddu $a3, $a2, $zero -/* 8EDAD8 80241CB8 0000202D */ daddu $a0, $zero, $zero -/* 8EDADC 80241CBC 0080282D */ daddu $a1, $a0, $zero -/* 8EDAE0 80241CC0 0080302D */ daddu $a2, $a0, $zero -/* 8EDAE4 80241CC4 0C046F97 */ jal set_background_color_blend -/* 8EDAE8 80241CC8 240700FF */ addiu $a3, $zero, 0xff -/* 8EDAEC 80241CCC 3C02800B */ lui $v0, %hi(gCameras) -/* 8EDAF0 80241CD0 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* 8EDAF4 80241CD4 A440002C */ sh $zero, 0x2c($v0) -/* 8EDAF8 80241CD8 A440002E */ sh $zero, 0x2e($v0) -/* 8EDAFC 80241CDC A4400030 */ sh $zero, 0x30($v0) -/* 8EDB00 80241CE0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EDB04 80241CE4 24020002 */ addiu $v0, $zero, 2 -/* 8EDB08 80241CE8 03E00008 */ jr $ra -/* 8EDB0C 80241CEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s deleted file mode 100644 index 6518a59c76..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CF0_8EDB10 -/* 8EDB10 80241CF0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDB14 80241CF4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8EDB18 80241CF8 8C82000C */ lw $v0, 0xc($a0) -/* 8EDB1C 80241CFC 0C0B210B */ jal evt_get_float_variable -/* 8EDB20 80241D00 8C450000 */ lw $a1, ($v0) -/* 8EDB24 80241D04 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EDB28 80241D08 24020002 */ addiu $v0, $zero, 2 -/* 8EDB2C 80241D0C 3C01800B */ lui $at, %hi(gCameras+0x490) -/* 8EDB30 80241D10 E4202210 */ swc1 $f0, %lo(gCameras+0x490)($at) -/* 8EDB34 80241D14 03E00008 */ jr $ra -/* 8EDB38 80241D18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242030_8EDE50.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242030_8EDE50.s deleted file mode 100644 index 0c9b2749a7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242030_8EDE50.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242030_8EDE50 -/* 8EDE50 80242030 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDE54 80242034 2404010D */ addiu $a0, $zero, 0x10d -/* 8EDE58 80242038 2405FFFF */ addiu $a1, $zero, -1 -/* 8EDE5C 8024203C 0000302D */ daddu $a2, $zero, $zero -/* 8EDE60 80242040 AFBF0010 */ sw $ra, 0x10($sp) -/* 8EDE64 80242044 0C046E54 */ jal func_8011B950 -/* 8EDE68 80242048 24070001 */ addiu $a3, $zero, 1 -/* 8EDE6C 8024204C 0000202D */ daddu $a0, $zero, $zero -/* 8EDE70 80242050 0080282D */ daddu $a1, $a0, $zero -/* 8EDE74 80242054 0080302D */ daddu $a2, $a0, $zero -/* 8EDE78 80242058 0C046F97 */ jal set_background_color_blend -/* 8EDE7C 8024205C 0080382D */ daddu $a3, $a0, $zero -/* 8EDE80 80242060 3C02800B */ lui $v0, %hi(gCameras) -/* 8EDE84 80242064 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* 8EDE88 80242068 A440002C */ sh $zero, 0x2c($v0) -/* 8EDE8C 8024206C A440002E */ sh $zero, 0x2e($v0) -/* 8EDE90 80242070 A4400030 */ sh $zero, 0x30($v0) -/* 8EDE94 80242074 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EDE98 80242078 24020002 */ addiu $v0, $zero, 2 -/* 8EDE9C 8024207C 03E00008 */ jr $ra -/* 8EDEA0 80242080 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084_8EDEA4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084_8EDEA4.s deleted file mode 100644 index 51819f8f2f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084_8EDEA4.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242084_8EDEA4 -/* 8EDEA4 80242084 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDEA8 80242088 AFB00010 */ sw $s0, 0x10($sp) -/* 8EDEAC 8024208C 0080802D */ daddu $s0, $a0, $zero -/* 8EDEB0 80242090 10A00002 */ beqz $a1, .L8024209C -/* 8EDEB4 80242094 AFBF0014 */ sw $ra, 0x14($sp) -/* 8EDEB8 80242098 AE000074 */ sw $zero, 0x74($s0) -.L8024209C: -/* 8EDEBC 8024209C 8E020074 */ lw $v0, 0x74($s0) -/* 8EDEC0 802420A0 24420010 */ addiu $v0, $v0, 0x10 -/* 8EDEC4 802420A4 AE020074 */ sw $v0, 0x74($s0) -/* 8EDEC8 802420A8 28420100 */ slti $v0, $v0, 0x100 -/* 8EDECC 802420AC 14400002 */ bnez $v0, .L802420B8 -/* 8EDED0 802420B0 240200FF */ addiu $v0, $zero, 0xff -/* 8EDED4 802420B4 AE020074 */ sw $v0, 0x74($s0) -.L802420B8: -/* 8EDED8 802420B8 C6000074 */ lwc1 $f0, 0x74($s0) -/* 8EDEDC 802420BC 46800020 */ cvt.s.w $f0, $f0 -/* 8EDEE0 802420C0 44050000 */ mfc1 $a1, $f0 -/* 8EDEE4 802420C4 0C04DF62 */ jal set_screen_overlay_params_front -/* 8EDEE8 802420C8 0000202D */ daddu $a0, $zero, $zero -/* 8EDEEC 802420CC 8E020074 */ lw $v0, 0x74($s0) -/* 8EDEF0 802420D0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8EDEF4 802420D4 8FB00010 */ lw $s0, 0x10($sp) -/* 8EDEF8 802420D8 384200FF */ xori $v0, $v0, 0xff -/* 8EDEFC 802420DC 2C420001 */ sltiu $v0, $v0, 1 -/* 8EDF00 802420E0 00021040 */ sll $v0, $v0, 1 -/* 8EDF04 802420E4 03E00008 */ jr $ra -/* 8EDF08 802420E8 27BD0018 */ addiu $sp, $sp, 0x18