diff --git a/src/B4580.c b/src/B4580.c index 797add193f..bb41fff723 100644 --- a/src/B4580.c +++ b/src/B4580.c @@ -1031,7 +1031,7 @@ void play_model_animation_starting_from(s32 index, s32 animPos, s32 framesToSkip } animator->animReadPos = (s16*) animPos; - animator->savedReadPos =(s16*) animPos; + animator->savedReadPos = (s16*) animPos; animator->treeIndexPos = 0; animator->nextUpdateTime = 1.0f; diff --git a/src/d0a70_len_4fe0.c b/src/d0a70_len_4fe0.c index 344122ef64..9fc77d3516 100644 --- a/src/d0a70_len_4fe0.c +++ b/src/d0a70_len_4fe0.c @@ -23,7 +23,7 @@ typedef struct { /* 0x5C */ u8* buf; /* 0x60 */ u16 bufSize; /* 0x62 */ char unk_62[0x2]; - /* 0x64 */ s32* unk_64; + /* 0x64 */ u8* unk_64; /* 0x68 */ Vtx* vtxBufs[2]; /* 0x70 */ Gfx* gfxBufs[2]; /* 0x78 */ s32 unk_78; @@ -1059,16 +1059,16 @@ void func_8013C048(FoldState* state) { } FoldGfxDescriptor* fold_load_gfx(FoldState* state) { - Gfx* romStart = fold_groupOffsets[state->unk_1C[0][0]] + _24B7F0_ROM_START; + u8* romStart = fold_groupOffsets[state->unk_1C[0][0]] + _24B7F0_ROM_START; FoldGfxDescriptor* descriptor = &fold_groupDescriptors[state->arrayIdx]; if (state->unk_64 != romStart) { - Gfx* romEnd; + u8* romEnd; s32 i; state->unk_64 = romStart; - dma_copy(state->unk_64, (s32)state->unk_64 + 0x10, descriptor); + dma_copy(state->unk_64, state->unk_64 + 0x10, descriptor); if (state->vtxBufs[0] != NULL) { fold_add_to_gfx_cache(state->vtxBufs[0], 1); @@ -1085,7 +1085,7 @@ FoldGfxDescriptor* fold_load_gfx(FoldState* state) { if (state->gfxBufs[1] != NULL) { // fold_add_to_gfx_cache(state->gfxBufs[1], 1); romEnd = state->gfxBufs[1]; // required to match - fold_add_to_gfx_cache(romEnd, 1); + fold_add_to_gfx_cache(state->gfxBufs[1], 1); state->gfxBufs[1] = NULL; } state->vtxBufs[0] = heap_malloc(descriptor->vtxCount * 0x10); @@ -1094,7 +1094,7 @@ FoldGfxDescriptor* fold_load_gfx(FoldState* state) { state->gfxBufs[1] = heap_malloc(descriptor->gfxCount * 8); romStart = (s32)descriptor->gfx + _24B7F0_ROM_START; - romEnd = &romStart[descriptor->gfxCount]; + romEnd = &romStart[descriptor->gfxCount * sizeof(*descriptor->gfx)]; dma_copy(romStart, romEnd, state->gfxBufs[0]); dma_copy(romStart, romEnd, state->gfxBufs[1]); diff --git a/src/world/area_dgb/dgb_00/BFA0A0.c b/src/world/area_dgb/dgb_00/BFA0A0.c index ab68b2b098..97a7e4b8a1 100644 --- a/src/world/area_dgb/dgb_00/BFA0A0.c +++ b/src/world/area_dgb/dgb_00/BFA0A0.c @@ -2,9 +2,9 @@ #include "message_ids.h" ApiStatus N(func_80240000_BFA0A0)(Evt* script, s32 isInitialCall) { - sprintf(&wMapShapeName, "arn_20_shape"); - sprintf(&wMapHitName, "arn_20_hit"); - sprintf(&wMapTexName, "arn_tex"); + sprintf(wMapShapeName, "arn_20_shape"); + sprintf(wMapHitName, "arn_20_hit"); + sprintf(wMapTexName, "arn_tex"); return ApiStatus_BLOCK; } diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index 0f18ad71c2..b580bb08d9 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -91,7 +91,7 @@ EvtScript N(main) = { #include "world/common/atomic/Chest.old.inc.c" EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, &Entity_Chest, -300, 50, -200, 0, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), -300, 50, -200, 0, 0, MAKE_ENTITY_END) EVT_CALL(AssignChestFlag, GameFlag(CHEST_FLAG)) EVT_CALL(AssignScript, EVT_PTR(N(EVS_Chest_Interact))) EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), -125, 60, 175, 0, MAKE_ENTITY_END) diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 16dd78ef43..9be6743c8b 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -86,8 +86,8 @@ EvtScript N(main) = { EvtScript N(makeEntities) = { EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, -220, 75, -210, 17, GF_DGB07_Item_StarPiece) - EVT_CALL(MakeEntity, &Entity_WoodenCrate, -370, 0, -200, 0, -1, MAKE_ENTITY_END) - EVT_CALL(MakeEntity, &Entity_WoodenCrate, -410, 0, -200, 0, -1, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_WoodenCrate), -370, 0, -200, 0, -1, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_WoodenCrate), -410, 0, -200, 0, -1, MAKE_ENTITY_END) EVT_RETURN EVT_END }; diff --git a/src/world/area_dgb/dgb_07/dgb_07.h b/src/world/area_dgb/dgb_07/dgb_07.h index 95da869a92..50135932c3 100644 --- a/src/world/area_dgb/dgb_07/dgb_07.h +++ b/src/world/area_dgb/dgb_07/dgb_07.h @@ -11,6 +11,6 @@ ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(MeleeHitbox_Main)(Evt *script, s32 isInitialCall); -NpcGroupList N(npcGroupList_80241E5C); +extern NpcGroupList N(npcGroupList_80241E5C); extern EvtScript N(main); extern EvtScript N(makeEntities); diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index 9109131d5b..bfb0e6df81 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -136,7 +136,7 @@ static s32 N(pad_868)[] = { #include "world/common/atomic/Chest.old.inc.c" EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, &Entity_Chest, -225, 0, -245, 0, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), -225, 0, -245, 0, 0, MAKE_ENTITY_END) EVT_CALL(AssignChestFlag, GF_DGB12_Chest_CastleKey1) EVT_CALL(AssignScript, EVT_PTR(N(EVS_Chest_Interact))) EVT_RETURN diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 1412a8e668..789561e38c 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -191,7 +191,7 @@ EvtScript N(80241FBC) = { }; s32 N(unk_missing_8024202C)[] = { - 0x00000000, 0x00240022, 0x00000000, 0x00000000, N(80241FBC), 0x80077F70, 0x00000000, 0x8007809C, + 0x00000000, 0x00240022, 0x00000000, 0x00000000, (s32) N(80241FBC), 0x80077F70, 0x00000000, 0x8007809C, 0x00000000, 0x00000000, 0x000D0000, }; @@ -209,7 +209,7 @@ EvtScript N(80242058) = { }; s32 N(unk_missing_80242100)[] = { - 0x00000000, 0x000E0012, 0x00000000, 0x00000000, N(80242058), 0x00000000, 0x00000000, N(80241EA0), + 0x00000000, 0x000E0012, 0x00000000, 0x00000000, (s32) N(80242058), 0x00000000, 0x00000000, (s32) N(80241EA0), 0x00000000, 0x00000000, 0x000D0008, }; diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index f4cc59e37c..3e696758e8 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -698,7 +698,7 @@ EvtScript N(8024382C) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, &Entity_Chest, 845, 0, 145, -35, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 845, 0, 145, -35, 0, MAKE_ENTITY_END) EVT_CALL(AssignChestFlag, GF_DGB18_Chest_MysticalKey) EVT_CALL(AssignScript, EVT_PTR(N(8024382C))) EVT_RETURN diff --git a/src/world/area_end/end_00/end_00_A_crystal_king.c b/src/world/area_end/end_00/end_00_A_crystal_king.c index 9ed8bbd109..5d7b37460c 100644 --- a/src/world/area_end/end_00/end_00_A_crystal_king.c +++ b/src/world/area_end/end_00/end_00_A_crystal_king.c @@ -1,8 +1,6 @@ #include "end_00.h" #include "effects.h" -extern EvtScript N(EVS_OffsetNpcScroll); - Vec3f N(CrystalsFlyInPath)[] = { { 2050.0, 100.0, 0.0 }, { 1900.0, 80.0, 0.0 }, diff --git a/src/world/area_kkj/kkj_00/ABB290.c b/src/world/area_kkj/kkj_00/ABB290.c index a91e408c1a..1414e7cd3f 100644 --- a/src/world/area_kkj/kkj_00/ABB290.c +++ b/src/world/area_kkj/kkj_00/ABB290.c @@ -3,8 +3,8 @@ static char* N(exit_str_0) = "kkj_01"; static char* N(exit_str_1) = "kkj_19"; -extern f32 D_8024160C_ABC89C; -extern f32 D_8024162C_ABC8BC; +extern SlideParams D_8024160C_ABC89C; +extern SlideParams D_8024162C_ABC8BC; ApiStatus func_80240000_ABB290(Evt* script, s32 isInitialCall) { if (evt_get_variable(NULL, GB_StoryProgress) >= 96) { diff --git a/src/world/area_pra/pra_29/D7CB70.c b/src/world/area_pra/pra_29/D7CB70.c index 29e38a7041..9fe651b205 100644 --- a/src/world/area_pra/pra_29/D7CB70.c +++ b/src/world/area_pra/pra_29/D7CB70.c @@ -2,8 +2,27 @@ #include "world/common/atomic/Reflection.inc.c" -void func_80240F20_D7DA70(Vtx* arg0, Vtx* arg1, Vtx* arg2, s32 arg3, s32 arg4); -INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240F20_D7DA70); +void func_80240F20_D7DA70(Vtx* arg0, Vtx* arg1, Vtx* arg2, s32 numVerticies, s32 arg4) { + s32 temp_t3; + s32 var_t2; + s32 temp_t5; + s32 i; + + temp_t3 = 255 - arg4; + var_t2 = arg4; + if (var_t2 > 255) { + var_t2 = 255; + } + temp_t5 = 255 - var_t2; + + for (i = 0; i < numVerticies; i++) { + arg2[i].v.ob[0] = ((arg0[i].v.ob[0] * temp_t3) + (arg1[i].v.ob[0] * arg4)) / 255; + arg2[i].v.ob[1] = ((arg0[i].v.ob[1] * temp_t3) + (arg1[i].v.ob[1] * arg4)) / 255; + arg2[i].v.ob[2] = ((arg0[i].v.ob[2] * temp_t3) + (arg1[i].v.ob[2] * arg4)) / 255; + arg2[i].v.tc[0] = ((arg0[i].v.tc[0] * temp_t5) + (arg1[i].v.tc[0] * var_t2)) / 255; + arg2[i].v.tc[1] = ((arg0[i].v.tc[1] * temp_t5) + (arg1[i].v.tc[1] * var_t2)) / 255; + } +} void func_802410B0_D7DC00(s32 index) { Vtx* first1; diff --git a/src/world/area_pra/pra_31/D7F270.c b/src/world/area_pra/pra_31/D7F270.c index 8732b2f65d..5169436dc9 100644 --- a/src/world/area_pra/pra_31/D7F270.c +++ b/src/world/area_pra/pra_31/D7F270.c @@ -1,22 +1,165 @@ #include "pra_31.h" +typedef struct UnkPra31 { + /* 0x00 */ s16 unk_00; + /* 0x02 */ s16 unk_02; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ char unk_0C[0x8]; + /* 0x14 */ f32 unk_14; +} UnkPra31; // size = 0x18 + INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240510_D7F270); -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240818_D7F578); +ApiStatus func_80240818_D7F578(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 idx = evt_get_variable(script, *args++); + f32 temp_f20 = evt_get_float_variable(script, *args++); + UnkPra31* structs = (UnkPra31*) evt_get_variable(script, MapVar(0)); + UnkPra31* structPtr = &structs[idx]; -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240894_D7F5F4); + structPtr->unk_14 = temp_f20; + return ApiStatus_DONE2; +} + +ApiStatus func_80240894_D7F5F4(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 idx = evt_get_variable(script, *args++); + UnkPra31* structs = (UnkPra31*) evt_get_variable(script, MapVar(0)); + UnkPra31* structPtr = &structs[idx]; + s32 var_s0; + s32 var_s1; + s32 temp_f2; + s32 i; + + script->varTable[0] = 0; + temp_f2 = structPtr->unk_14; + + switch (temp_f2) { + case 0: + var_s0 = structPtr->unk_00; + var_s1 = structPtr->unk_02 - 1; + break; + case 90: + var_s1 = structPtr->unk_02; + var_s0 = structPtr->unk_00 + 1; + break; + case 180: + var_s0 = structPtr->unk_00; + var_s1 = structPtr->unk_02 + 1; + break; + case 270: + var_s1 = structPtr->unk_02; + var_s0 = structPtr->unk_00 - 1; + break; + } + + for (i = 0; i < 3; i++) { + if (i != idx && var_s0 == structs[i].unk_00 && var_s1 == structs[i].unk_02) { + script->varTable[0] = 1; + } + } + + if (var_s0 < 0) { + script->varTable[0] = 1; + } + if (var_s0 >= 9) { + script->varTable[0] = 1; + } + if (var_s1 < 0) { + script->varTable[0] = 1; + } + if (var_s1 >= 3) { + script->varTable[0] = 1; + } + if (script->varTable[0] == 1 && gPlayerStatusPtr->actionState == ACTION_STATE_PUSHING_BLOCK) { + set_action_state(ACTION_STATE_IDLE); + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240A3C_D7F79C); -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240BBC_D7F91C); +ApiStatus func_80240BBC_D7F91C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 idx = evt_get_variable(script, *args++); + UnkPra31* structs = (UnkPra31*) evt_get_variable(script, MapVar(0)); + UnkPra31* structPtr = &structs[idx]; + s32 temp_f2 = structPtr->unk_14; -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240C70_D7F9D0); + switch (temp_f2) { + case 0: + script->varTable[0] = 180; + break; + case 0xB4: + script->varTable[0] = 0; + break; + case 90: + case 270: + script->varTable[0] = temp_f2; + break; + } + return ApiStatus_DONE2; +} + +ApiStatus func_80240C70_D7F9D0(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + Bytecode* args = script->ptrReadPos; + s32 idx = evt_get_variable(script, *args++); + UnkPra31* structs = (UnkPra31*) evt_get_variable(script, MapVar(0)); + UnkPra31* structPtr = &structs[idx]; + s32 temp_f4 = structPtr->unk_14; + + switch (temp_f4) { + case 0: + script->varTable[3] = playerStatus->position.z; + script->varTable[4] = playerStatus->position.z + 50.0f; + script->varTable[5] = 1; + break; + case 90: + script->varTable[3] = playerStatus->position.x; + script->varTable[4] = playerStatus->position.x + 50.0f; + script->varTable[5] = 0; + break; + case 180: + script->varTable[3] = playerStatus->position.z; + script->varTable[4] = playerStatus->position.z - 50.0f; + script->varTable[5] = 1; + break; + case 270: + script->varTable[3] = playerStatus->position.x; + script->varTable[4] = playerStatus->position.x - 50.0f; + script->varTable[5] = 0; + break; + } + return ApiStatus_DONE2; +} #include "world/common/todo/UnkFunc12.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240E70_D7FBD0); +ApiStatus func_80240E70_D7FBD0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 idx = evt_get_variable(script, *args++); + UnkPra31* structs = (UnkPra31*) evt_get_variable(script, MapVar(0)); + UnkPra31* structPtr = &structs[idx]; -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240F2C_D7FC8C); + evt_set_float_variable(script, LocalVar(0), structPtr->unk_04); + evt_set_float_variable(script, LocalVar(1), -structPtr->unk_08); + evt_set_float_variable(script, LocalVar(2), clamp_angle(structPtr->unk_14 + 90.0)); + return ApiStatus_DONE2; +} + +ApiStatus func_80240F2C_D7FC8C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 idx = evt_get_variable(script, *args++); + UnkPra31* structs = (UnkPra31*) evt_get_variable(script, MapVar(0)); + UnkPra31* structPtr = &structs[idx]; + + evt_set_float_variable(script, LocalVar(0), structPtr->unk_04); + evt_set_float_variable(script, LocalVar(1), structPtr->unk_08); + evt_set_float_variable(script, LocalVar(2), clamp_angle(structPtr->unk_14)); + return ApiStatus_DONE2; +} ApiStatus func_80240FD0_D7FD30(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index b4d926b1c4..33d42126ce 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -1,11 +1,58 @@ #include "sam_05.h" +#include "sprite.h" static char* N(exit_str_0) = "sam_04"; static char* N(exit_str_1) = "sam_06"; #include "world/common/enemy/ai/PiranhaPlantAI.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802419A4_D1A184); +extern s32 D_80242F90_D1B770; + +ApiStatus func_802419A4_D1A184(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + u8 sp20[20]; + u8 sp38[20]; + u8 sp50[20]; + u8 sp68[20]; + s32 i; + + if (isInitialCall) { + npc->duration = 0; + script->functionTemp[0] = 0; + } + + if (enemy->varTable[3] == 0) { + func_802DE780(npc->spriteInstanceID, 1, 7, 255, 255, 255, 0, 0); + return ApiStatus_BLOCK; + } + + func_802DE780(npc->spriteInstanceID, 0, 0x11, 0x14, 0, 0, 255, 0); + script->functionTemp[0] += 10; + if (script->functionTemp[0] >= 360) { + script->functionTemp[0] %= 360; + } + + for (i = 0; i < 20; i++) { + sp20[i] = (cosine(script->functionTemp[0] + (i * 25)) + 1.0) * 56.0; + sp38[i] = (cosine(script->functionTemp[0] + (i * 25) + 45) + 1.0) * 56.0; + sp50[i] = (cosine(script->functionTemp[0] + (i * 25) + 90) + 1.0) * 56.0; + sp68[i] = enemy->varTable[3]; + + func_802DE780(npc->spriteInstanceID, 0, 0xC, i, (sp20[i] << 24) | (sp38[i] << 16) | (sp50[i] << 8) | sp68[i], 0, 255, 0); + } + + if (enemy->varTable[3] == 255) { + s32 vt3 = enemy->varTable[3]; // todo required to match + + npc->renderMode = RENDER_MODE_ALPHATEST; + func_802DE780(npc->spriteInstanceID, 1, 0xF, (s32) &D_80242F90_D1B770, vt3, 0, vt3, 0); + } else { + npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; + func_802DE780(npc->spriteInstanceID, 1, 0xF, (s32) &D_80242F90_D1B770, enemy->varTable[3], 0, enemy->varTable[3], 0); + } + return ApiStatus_BLOCK; +} ApiStatus func_80241D20_D1A500(Evt* script, s32 isInitialCall) { if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { diff --git a/src/world/area_sam/sam_09/D362F0.c b/src/world/area_sam/sam_09/D362F0.c index 5af9f80b8e..82d806b2f9 100644 --- a/src/world/area_sam/sam_09/D362F0.c +++ b/src/world/area_sam/sam_09/D362F0.c @@ -15,16 +15,70 @@ ApiStatus func_80240118_D36408(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_sam/sam_09/D362F0", func_80240158_D36448); +ApiStatus func_80240158_D36448(Evt* script, s32 isInitialCall) { + s32 mapVar0; + s32 mapVar2; + s32 mapVar3; -INCLUDE_ASM(s32, "world/area_sam/sam_09/D362F0", func_80240264_D36554); + mapVar0 = evt_get_variable(script, MapVar(0)); + if (mapVar0 == -1) { + mapVar0 = 0xFF; + } + evt_set_variable(script, GameByte(264), mapVar0 & 0xFF); + evt_set_variable(script, GameByte(265), (mapVar0 >> 8) & 0xFF); + + mapVar2 = evt_get_variable(script, MapVar(1)); + if (mapVar2 == -1) { + mapVar2 = 0xFF; + } + evt_set_variable(script, GameByte(266), mapVar2 & 0xFF); + evt_set_variable(script, GameByte(267), (mapVar2 >> 8) & 0xFF); + + mapVar3 = evt_get_variable(script, MapVar(2)); + if (mapVar3 == -1) { + mapVar3 = 0xFF; + } + evt_set_variable(script, GameByte(268), mapVar3 & 0xFF); + evt_set_variable(script, GameByte(269), (mapVar3 >> 8) & 0xFF); + return ApiStatus_DONE2; +} + +ApiStatus func_80240264_D36554(Evt* script, s32 isInitialCall) { + s32 temp_a2; + s32 temp_s0; + + temp_s0 = evt_get_variable(script, GameByte(264)) & 0xFF; + temp_a2 = evt_get_variable(script, GameByte(265)) & 0xFF; + if (temp_s0 != 0xFF) { + evt_set_variable(script, MapVar(0), (temp_a2 << 8) | temp_s0); + } else { + evt_set_variable(script, MapVar(0), -1); + } + + temp_s0 = evt_get_variable(script, GameByte(266)) & 0xFF; + temp_a2 = evt_get_variable(script, GameByte(267)) & 0xFF; + if (temp_s0 != 0xFF) { + evt_set_variable(script, MapVar(1), (temp_a2 << 8) | temp_s0); + } else { + evt_set_variable(script, MapVar(1), -1); + } + + temp_s0 = evt_get_variable(script, GameByte(268)) & 0xFF; + temp_a2 = evt_get_variable(script, GameByte(269)) & 0xFF; + if (temp_s0 != 0xFF) { + evt_set_variable(script, MapVar(2), (temp_a2 << 8) | temp_s0); + } else { + evt_set_variable(script, MapVar(2), -1); + } + return ApiStatus_DONE2; +} ApiStatus func_802403A0_D36690(Evt* script, s32 isInitialCall) { s32* array; s32 len = 92; s32 i; - script->varTable[0] = array = heap_malloc(92 * sizeof(*array)); + script->varTable[0] = (s32) array = heap_malloc(92 * sizeof(*array)); for (i = 0; i < 91; i++) { array[i] = 128 + i; } diff --git a/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c index c2f0333c1f..ac2dec423a 100644 --- a/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c +++ b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c @@ -104,7 +104,7 @@ ApiStatus N(FlyingNoAttackAI_Main)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyDetectVolume territory; EnemyDetectVolume* territoryPtr = &territory; - MobileAISettings* aiSettings =(MobileAISettings*) evt_get_variable(script, *args); + MobileAISettings* aiSettings = (MobileAISettings*) evt_get_variable(script, *args); territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/common/enemy/ai/SentinelAI.inc.c b/src/world/common/enemy/ai/SentinelAI.inc.c index 51aef251ec..22d43d2d9f 100644 --- a/src/world/common/enemy/ai/SentinelAI.inc.c +++ b/src/world/common/enemy/ai/SentinelAI.inc.c @@ -279,7 +279,7 @@ ApiStatus N(SentinelAI_Main)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyDetectVolume territory; EnemyDetectVolume* territoryPtr = &territory; - MobileAISettings* aiSettings =(MobileAISettings*) evt_get_variable(script, *args); + MobileAISettings* aiSettings = (MobileAISettings*) evt_get_variable(script, *args); territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/dead/dead_03/EB1170.c b/src/world/dead/dead_03/EB1170.c index c5c453abad..2c10b5cc24 100644 --- a/src/world/dead/dead_03/EB1170.c +++ b/src/world/dead/dead_03/EB1170.c @@ -4,7 +4,6 @@ extern s32 func_80059AC8(s32, s32); extern s32 dead_03_ItemChoice_HasSelectedItem; extern s32 dead_03_ItemChoice_SelectedItemID; extern s32 dead_03_D_802442D0[]; -extern s32 dead_03_LetterDelivery_SavedNpcAnim; extern s32 D_800B8DEC; #include "world/common/todo/StashVars.inc.c" diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index 661ad766ed..de24f6f853 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -463,7 +463,7 @@ void func_802BDDD8_321928(Npc* npc) { npc->collisionRadius) != 0) { npc->pos.x += (x - npc->pos.x) / 5.0f; - npc->pos.z +=(z - npc->pos.z) / 5.0f; + npc->pos.z += (z - npc->pos.z) / 5.0f; } } diff --git a/ver/us/asm/data/world/area_kkj/kkj_00/ABC3D0.data.s b/ver/us/asm/data/world/area_kkj/kkj_00/ABC3D0.data.s index ab838caca0..76e3e546b8 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_00/ABC3D0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_00/ABC3D0.data.s @@ -24,7 +24,10 @@ dlabel D_8024160C_ABC89C .word 0x43B34000, 0x3F000000, 0x41A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_8024162C_ABC8BC -.word 0x3FC00000, 0x3F000000, 0x41A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_80240040_ABB2D0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240040_ABB2D0, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000019, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_802439C4_ABEC54, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80248DC4, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802413C4_ABC654, 0x00000044, 0x00000001, D_80241460_ABC6F0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x3FC00000, 0x3F000000, 0x41A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +dlabel D_8024164C_ABC8DC +.word 0x00000043, 0x00000002, func_80240040_ABB2D0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240040_ABB2D0, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000019, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_802439C4_ABEC54, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80248DC4, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802413C4_ABC654, 0x00000044, 0x00000001, D_80241460_ABC6F0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241820_ABCAB0 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240F20_D7DA70.s b/ver/us/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240F20_D7DA70.s deleted file mode 100644 index 7188ff32ec..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240F20_D7DA70.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D7DA70 -/* D7DA70 80240F20 8FAC0010 */ lw $t4, 0x10($sp) -/* D7DA74 80240F24 240300FF */ addiu $v1, $zero, 0xff -/* D7DA78 80240F28 0180502D */ daddu $t2, $t4, $zero -/* D7DA7C 80240F2C 29420100 */ slti $v0, $t2, 0x100 -/* D7DA80 80240F30 14400002 */ bnez $v0, .L80240F3C -/* D7DA84 80240F34 006C5823 */ subu $t3, $v1, $t4 -/* D7DA88 80240F38 0060502D */ daddu $t2, $v1, $zero -.L80240F3C: -/* D7DA8C 80240F3C 0000482D */ daddu $t1, $zero, $zero -/* D7DA90 80240F40 18E00059 */ blez $a3, .L802410A8 -/* D7DA94 80240F44 006A6823 */ subu $t5, $v1, $t2 -/* D7DA98 80240F48 3C088080 */ lui $t0, 0x8080 -/* D7DA9C 80240F4C 35088081 */ ori $t0, $t0, 0x8081 -.L80240F50: -/* D7DAA0 80240F50 84820000 */ lh $v0, ($a0) -/* D7DAA4 80240F54 004B0018 */ mult $v0, $t3 -/* D7DAA8 80240F58 00001812 */ mflo $v1 -/* D7DAAC 80240F5C 84A20000 */ lh $v0, ($a1) -/* D7DAB0 80240F60 00000000 */ nop -/* D7DAB4 80240F64 004C0018 */ mult $v0, $t4 -/* D7DAB8 80240F68 00001012 */ mflo $v0 -/* D7DABC 80240F6C 00621821 */ addu $v1, $v1, $v0 -/* D7DAC0 80240F70 00000000 */ nop -/* D7DAC4 80240F74 00680018 */ mult $v1, $t0 -/* D7DAC8 80240F78 00001010 */ mfhi $v0 -/* D7DACC 80240F7C 00431021 */ addu $v0, $v0, $v1 -/* D7DAD0 80240F80 000211C3 */ sra $v0, $v0, 7 -/* D7DAD4 80240F84 00031FC3 */ sra $v1, $v1, 0x1f -/* D7DAD8 80240F88 00431023 */ subu $v0, $v0, $v1 -/* D7DADC 80240F8C A4C20000 */ sh $v0, ($a2) -/* D7DAE0 80240F90 84820002 */ lh $v0, 2($a0) -/* D7DAE4 80240F94 004B0018 */ mult $v0, $t3 -/* D7DAE8 80240F98 00001812 */ mflo $v1 -/* D7DAEC 80240F9C 84A20002 */ lh $v0, 2($a1) -/* D7DAF0 80240FA0 00000000 */ nop -/* D7DAF4 80240FA4 004C0018 */ mult $v0, $t4 -/* D7DAF8 80240FA8 00001012 */ mflo $v0 -/* D7DAFC 80240FAC 00621821 */ addu $v1, $v1, $v0 -/* D7DB00 80240FB0 00000000 */ nop -/* D7DB04 80240FB4 00680018 */ mult $v1, $t0 -/* D7DB08 80240FB8 00001010 */ mfhi $v0 -/* D7DB0C 80240FBC 00431021 */ addu $v0, $v0, $v1 -/* D7DB10 80240FC0 000211C3 */ sra $v0, $v0, 7 -/* D7DB14 80240FC4 00031FC3 */ sra $v1, $v1, 0x1f -/* D7DB18 80240FC8 00431023 */ subu $v0, $v0, $v1 -/* D7DB1C 80240FCC A4C20002 */ sh $v0, 2($a2) -/* D7DB20 80240FD0 84820004 */ lh $v0, 4($a0) -/* D7DB24 80240FD4 004B0018 */ mult $v0, $t3 -/* D7DB28 80240FD8 00001812 */ mflo $v1 -/* D7DB2C 80240FDC 84A20004 */ lh $v0, 4($a1) -/* D7DB30 80240FE0 00000000 */ nop -/* D7DB34 80240FE4 004C0018 */ mult $v0, $t4 -/* D7DB38 80240FE8 00001012 */ mflo $v0 -/* D7DB3C 80240FEC 00621821 */ addu $v1, $v1, $v0 -/* D7DB40 80240FF0 00000000 */ nop -/* D7DB44 80240FF4 00680018 */ mult $v1, $t0 -/* D7DB48 80240FF8 00001010 */ mfhi $v0 -/* D7DB4C 80240FFC 00431021 */ addu $v0, $v0, $v1 -/* D7DB50 80241000 000211C3 */ sra $v0, $v0, 7 -/* D7DB54 80241004 00031FC3 */ sra $v1, $v1, 0x1f -/* D7DB58 80241008 00431023 */ subu $v0, $v0, $v1 -/* D7DB5C 8024100C A4C20004 */ sh $v0, 4($a2) -/* D7DB60 80241010 84820008 */ lh $v0, 8($a0) -/* D7DB64 80241014 004D0018 */ mult $v0, $t5 -/* D7DB68 80241018 00001812 */ mflo $v1 -/* D7DB6C 8024101C 84A20008 */ lh $v0, 8($a1) -/* D7DB70 80241020 00000000 */ nop -/* D7DB74 80241024 004A0018 */ mult $v0, $t2 -/* D7DB78 80241028 00001012 */ mflo $v0 -/* D7DB7C 8024102C 00621821 */ addu $v1, $v1, $v0 -/* D7DB80 80241030 00000000 */ nop -/* D7DB84 80241034 00680018 */ mult $v1, $t0 -/* D7DB88 80241038 00001010 */ mfhi $v0 -/* D7DB8C 8024103C 00431021 */ addu $v0, $v0, $v1 -/* D7DB90 80241040 000211C3 */ sra $v0, $v0, 7 -/* D7DB94 80241044 00031FC3 */ sra $v1, $v1, 0x1f -/* D7DB98 80241048 00431023 */ subu $v0, $v0, $v1 -/* D7DB9C 8024104C A4C20008 */ sh $v0, 8($a2) -/* D7DBA0 80241050 8482000A */ lh $v0, 0xa($a0) -/* D7DBA4 80241054 004D0018 */ mult $v0, $t5 -/* D7DBA8 80241058 00001812 */ mflo $v1 -/* D7DBAC 8024105C 84A2000A */ lh $v0, 0xa($a1) -/* D7DBB0 80241060 00000000 */ nop -/* D7DBB4 80241064 004A0018 */ mult $v0, $t2 -/* D7DBB8 80241068 00001012 */ mflo $v0 -/* D7DBBC 8024106C 00621821 */ addu $v1, $v1, $v0 -/* D7DBC0 80241070 00000000 */ nop -/* D7DBC4 80241074 00680018 */ mult $v1, $t0 -/* D7DBC8 80241078 25290001 */ addiu $t1, $t1, 1 -/* D7DBCC 8024107C 24840010 */ addiu $a0, $a0, 0x10 -/* D7DBD0 80241080 24A50010 */ addiu $a1, $a1, 0x10 -/* D7DBD4 80241084 00001010 */ mfhi $v0 -/* D7DBD8 80241088 00431021 */ addu $v0, $v0, $v1 -/* D7DBDC 8024108C 000211C3 */ sra $v0, $v0, 7 -/* D7DBE0 80241090 00031FC3 */ sra $v1, $v1, 0x1f -/* D7DBE4 80241094 00431023 */ subu $v0, $v0, $v1 -/* D7DBE8 80241098 A4C2000A */ sh $v0, 0xa($a2) -/* D7DBEC 8024109C 0127102A */ slt $v0, $t1, $a3 -/* D7DBF0 802410A0 1440FFAB */ bnez $v0, .L80240F50 -/* D7DBF4 802410A4 24C60010 */ addiu $a2, $a2, 0x10 -.L802410A8: -/* D7DBF8 802410A8 03E00008 */ jr $ra -/* D7DBFC 802410AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240818_D7F578.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240818_D7F578.s deleted file mode 100644 index 62ba788d13..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240818_D7F578.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240818_D7F578 -/* D7F578 80240818 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D7F57C 8024081C AFB10014 */ sw $s1, 0x14($sp) -/* D7F580 80240820 0080882D */ daddu $s1, $a0, $zero -/* D7F584 80240824 AFBF0018 */ sw $ra, 0x18($sp) -/* D7F588 80240828 AFB00010 */ sw $s0, 0x10($sp) -/* D7F58C 8024082C F7B40020 */ sdc1 $f20, 0x20($sp) -/* D7F590 80240830 8E30000C */ lw $s0, 0xc($s1) -/* D7F594 80240834 8E050000 */ lw $a1, ($s0) -/* D7F598 80240838 0C0B1EAF */ jal evt_get_variable -/* D7F59C 8024083C 26100004 */ addiu $s0, $s0, 4 -/* D7F5A0 80240840 0220202D */ daddu $a0, $s1, $zero -/* D7F5A4 80240844 8E050000 */ lw $a1, ($s0) -/* D7F5A8 80240848 0C0B210B */ jal evt_get_float_variable -/* D7F5AC 8024084C 0040802D */ daddu $s0, $v0, $zero -/* D7F5B0 80240850 0220202D */ daddu $a0, $s1, $zero -/* D7F5B4 80240854 3C05FD05 */ lui $a1, 0xfd05 -/* D7F5B8 80240858 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7F5BC 8024085C 0C0B1EAF */ jal evt_get_variable -/* D7F5C0 80240860 46000506 */ mov.s $f20, $f0 -/* D7F5C4 80240864 00101840 */ sll $v1, $s0, 1 -/* D7F5C8 80240868 00701821 */ addu $v1, $v1, $s0 -/* D7F5CC 8024086C 000318C0 */ sll $v1, $v1, 3 -/* D7F5D0 80240870 00431821 */ addu $v1, $v0, $v1 -/* D7F5D4 80240874 E4740014 */ swc1 $f20, 0x14($v1) -/* D7F5D8 80240878 8FBF0018 */ lw $ra, 0x18($sp) -/* D7F5DC 8024087C 8FB10014 */ lw $s1, 0x14($sp) -/* D7F5E0 80240880 8FB00010 */ lw $s0, 0x10($sp) -/* D7F5E4 80240884 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D7F5E8 80240888 24020002 */ addiu $v0, $zero, 2 -/* D7F5EC 8024088C 03E00008 */ jr $ra -/* D7F5F0 80240890 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240894_D7F5F4.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240894_D7F5F4.s deleted file mode 100644 index 7f62348a5e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240894_D7F5F4.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240894_D7F5F4 -/* D7F5F4 80240894 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D7F5F8 80240898 AFB20018 */ sw $s2, 0x18($sp) -/* D7F5FC 8024089C 0080902D */ daddu $s2, $a0, $zero -/* D7F600 802408A0 AFBF0020 */ sw $ra, 0x20($sp) -/* D7F604 802408A4 AFB3001C */ sw $s3, 0x1c($sp) -/* D7F608 802408A8 AFB10014 */ sw $s1, 0x14($sp) -/* D7F60C 802408AC AFB00010 */ sw $s0, 0x10($sp) -/* D7F610 802408B0 8E42000C */ lw $v0, 0xc($s2) -/* D7F614 802408B4 0C0B1EAF */ jal evt_get_variable -/* D7F618 802408B8 8C450000 */ lw $a1, ($v0) -/* D7F61C 802408BC 0240202D */ daddu $a0, $s2, $zero -/* D7F620 802408C0 3C05FD05 */ lui $a1, 0xfd05 -/* D7F624 802408C4 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7F628 802408C8 0C0B1EAF */ jal evt_get_variable -/* D7F62C 802408CC 0040982D */ daddu $s3, $v0, $zero -/* D7F630 802408D0 0040302D */ daddu $a2, $v0, $zero -/* D7F634 802408D4 00131040 */ sll $v0, $s3, 1 -/* D7F638 802408D8 00531021 */ addu $v0, $v0, $s3 -/* D7F63C 802408DC 000210C0 */ sll $v0, $v0, 3 -/* D7F640 802408E0 00C21821 */ addu $v1, $a2, $v0 -/* D7F644 802408E4 AE400084 */ sw $zero, 0x84($s2) -/* D7F648 802408E8 C4600014 */ lwc1 $f0, 0x14($v1) -/* D7F64C 802408EC 2402005A */ addiu $v0, $zero, 0x5a -/* D7F650 802408F0 4600008D */ trunc.w.s $f2, $f0 -/* D7F654 802408F4 44041000 */ mfc1 $a0, $f2 -/* D7F658 802408F8 00000000 */ nop -/* D7F65C 802408FC 10820011 */ beq $a0, $v0, .L80240944 -/* D7F660 80240900 2882005B */ slti $v0, $a0, 0x5b -/* D7F664 80240904 50400005 */ beql $v0, $zero, .L8024091C -/* D7F668 80240908 240200B4 */ addiu $v0, $zero, 0xb4 -/* D7F66C 8024090C 10800009 */ beqz $a0, .L80240934 -/* D7F670 80240910 0000202D */ daddu $a0, $zero, $zero -/* D7F674 80240914 0809025E */ j .L80240978 -/* D7F678 80240918 24050001 */ addiu $a1, $zero, 1 -.L8024091C: -/* D7F67C 8024091C 1082000D */ beq $a0, $v0, .L80240954 -/* D7F680 80240920 2402010E */ addiu $v0, $zero, 0x10e -/* D7F684 80240924 1082000F */ beq $a0, $v0, .L80240964 -/* D7F688 80240928 0000202D */ daddu $a0, $zero, $zero -/* D7F68C 8024092C 0809025E */ j .L80240978 -/* D7F690 80240930 24050001 */ addiu $a1, $zero, 1 -.L80240934: -/* D7F694 80240934 84620002 */ lh $v0, 2($v1) -/* D7F698 80240938 84700000 */ lh $s0, ($v1) -/* D7F69C 8024093C 0809025C */ j .L80240970 -/* D7F6A0 80240940 2451FFFF */ addiu $s1, $v0, -1 -.L80240944: -/* D7F6A4 80240944 84620000 */ lh $v0, ($v1) -/* D7F6A8 80240948 84710002 */ lh $s1, 2($v1) -/* D7F6AC 8024094C 0809025C */ j .L80240970 -/* D7F6B0 80240950 24500001 */ addiu $s0, $v0, 1 -.L80240954: -/* D7F6B4 80240954 84620002 */ lh $v0, 2($v1) -/* D7F6B8 80240958 84700000 */ lh $s0, ($v1) -/* D7F6BC 8024095C 0809025C */ j .L80240970 -/* D7F6C0 80240960 24510001 */ addiu $s1, $v0, 1 -.L80240964: -/* D7F6C4 80240964 84620000 */ lh $v0, ($v1) -/* D7F6C8 80240968 84710002 */ lh $s1, 2($v1) -/* D7F6CC 8024096C 2450FFFF */ addiu $s0, $v0, -1 -.L80240970: -/* D7F6D0 80240970 0000202D */ daddu $a0, $zero, $zero -/* D7F6D4 80240974 24050001 */ addiu $a1, $zero, 1 -.L80240978: -/* D7F6D8 80240978 00C0182D */ daddu $v1, $a2, $zero -.L8024097C: -/* D7F6DC 8024097C 50930008 */ beql $a0, $s3, .L802409A0 -/* D7F6E0 80240980 24840001 */ addiu $a0, $a0, 1 -/* D7F6E4 80240984 84620000 */ lh $v0, ($v1) -/* D7F6E8 80240988 56020005 */ bnel $s0, $v0, .L802409A0 -/* D7F6EC 8024098C 24840001 */ addiu $a0, $a0, 1 -/* D7F6F0 80240990 84620002 */ lh $v0, 2($v1) -/* D7F6F4 80240994 52220001 */ beql $s1, $v0, .L8024099C -/* D7F6F8 80240998 AE450084 */ sw $a1, 0x84($s2) -.L8024099C: -/* D7F6FC 8024099C 24840001 */ addiu $a0, $a0, 1 -.L802409A0: -/* D7F700 802409A0 28820003 */ slti $v0, $a0, 3 -/* D7F704 802409A4 1440FFF5 */ bnez $v0, .L8024097C -/* D7F708 802409A8 24630018 */ addiu $v1, $v1, 0x18 -/* D7F70C 802409AC 06010004 */ bgez $s0, .L802409C0 -/* D7F710 802409B0 2A020009 */ slti $v0, $s0, 9 -/* D7F714 802409B4 24020001 */ addiu $v0, $zero, 1 -/* D7F718 802409B8 AE420084 */ sw $v0, 0x84($s2) -/* D7F71C 802409BC 2A020009 */ slti $v0, $s0, 9 -.L802409C0: -/* D7F720 802409C0 14400002 */ bnez $v0, .L802409CC -/* D7F724 802409C4 24020001 */ addiu $v0, $zero, 1 -/* D7F728 802409C8 AE420084 */ sw $v0, 0x84($s2) -.L802409CC: -/* D7F72C 802409CC 06210004 */ bgez $s1, .L802409E0 -/* D7F730 802409D0 2A220003 */ slti $v0, $s1, 3 -/* D7F734 802409D4 24020001 */ addiu $v0, $zero, 1 -/* D7F738 802409D8 AE420084 */ sw $v0, 0x84($s2) -/* D7F73C 802409DC 2A220003 */ slti $v0, $s1, 3 -.L802409E0: -/* D7F740 802409E0 14400002 */ bnez $v0, .L802409EC -/* D7F744 802409E4 24020001 */ addiu $v0, $zero, 1 -/* D7F748 802409E8 AE420084 */ sw $v0, 0x84($s2) -.L802409EC: -/* D7F74C 802409EC 8E430084 */ lw $v1, 0x84($s2) -/* D7F750 802409F0 24020001 */ addiu $v0, $zero, 1 -/* D7F754 802409F4 14620009 */ bne $v1, $v0, .L80240A1C -/* D7F758 802409F8 00000000 */ nop -/* D7F75C 802409FC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D7F760 80240A00 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D7F764 80240A04 804300B4 */ lb $v1, 0xb4($v0) -/* D7F768 80240A08 24020014 */ addiu $v0, $zero, 0x14 -/* D7F76C 80240A0C 14620003 */ bne $v1, $v0, .L80240A1C -/* D7F770 80240A10 00000000 */ nop -/* D7F774 80240A14 0C039769 */ jal set_action_state -/* D7F778 80240A18 0000202D */ daddu $a0, $zero, $zero -.L80240A1C: -/* D7F77C 80240A1C 8FBF0020 */ lw $ra, 0x20($sp) -/* D7F780 80240A20 8FB3001C */ lw $s3, 0x1c($sp) -/* D7F784 80240A24 8FB20018 */ lw $s2, 0x18($sp) -/* D7F788 80240A28 8FB10014 */ lw $s1, 0x14($sp) -/* D7F78C 80240A2C 8FB00010 */ lw $s0, 0x10($sp) -/* D7F790 80240A30 24020002 */ addiu $v0, $zero, 2 -/* D7F794 80240A34 03E00008 */ jr $ra -/* D7F798 80240A38 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240BBC_D7F91C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240BBC_D7F91C.s deleted file mode 100644 index 4f2afae858..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240BBC_D7F91C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BBC_D7F91C -/* D7F91C 80240BBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7F920 80240BC0 AFB10014 */ sw $s1, 0x14($sp) -/* D7F924 80240BC4 0080882D */ daddu $s1, $a0, $zero -/* D7F928 80240BC8 AFBF0018 */ sw $ra, 0x18($sp) -/* D7F92C 80240BCC AFB00010 */ sw $s0, 0x10($sp) -/* D7F930 80240BD0 8E22000C */ lw $v0, 0xc($s1) -/* D7F934 80240BD4 0C0B1EAF */ jal evt_get_variable -/* D7F938 80240BD8 8C450000 */ lw $a1, ($v0) -/* D7F93C 80240BDC 0220202D */ daddu $a0, $s1, $zero -/* D7F940 80240BE0 3C05FD05 */ lui $a1, 0xfd05 -/* D7F944 80240BE4 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7F948 80240BE8 0C0B1EAF */ jal evt_get_variable -/* D7F94C 80240BEC 0040802D */ daddu $s0, $v0, $zero -/* D7F950 80240BF0 00101840 */ sll $v1, $s0, 1 -/* D7F954 80240BF4 00701821 */ addu $v1, $v1, $s0 -/* D7F958 80240BF8 000318C0 */ sll $v1, $v1, 3 -/* D7F95C 80240BFC 00431021 */ addu $v0, $v0, $v1 -/* D7F960 80240C00 C4400014 */ lwc1 $f0, 0x14($v0) -/* D7F964 80240C04 2402005A */ addiu $v0, $zero, 0x5a -/* D7F968 80240C08 4600008D */ trunc.w.s $f2, $f0 -/* D7F96C 80240C0C 44031000 */ mfc1 $v1, $f2 -/* D7F970 80240C10 00000000 */ nop -/* D7F974 80240C14 1062000F */ beq $v1, $v0, .L80240C54 -/* D7F978 80240C18 2862005B */ slti $v0, $v1, 0x5b -/* D7F97C 80240C1C 10400005 */ beqz $v0, .L80240C34 -/* D7F980 80240C20 240200B4 */ addiu $v0, $zero, 0xb4 -/* D7F984 80240C24 5060000C */ beql $v1, $zero, .L80240C58 -/* D7F988 80240C28 AE220084 */ sw $v0, 0x84($s1) -/* D7F98C 80240C2C 08090316 */ j .L80240C58 -/* D7F990 80240C30 00000000 */ nop -.L80240C34: -/* D7F994 80240C34 10620005 */ beq $v1, $v0, .L80240C4C -/* D7F998 80240C38 2402010E */ addiu $v0, $zero, 0x10e -/* D7F99C 80240C3C 50620006 */ beql $v1, $v0, .L80240C58 -/* D7F9A0 80240C40 AE230084 */ sw $v1, 0x84($s1) -/* D7F9A4 80240C44 08090316 */ j .L80240C58 -/* D7F9A8 80240C48 00000000 */ nop -.L80240C4C: -/* D7F9AC 80240C4C 08090316 */ j .L80240C58 -/* D7F9B0 80240C50 AE200084 */ sw $zero, 0x84($s1) -.L80240C54: -/* D7F9B4 80240C54 AE230084 */ sw $v1, 0x84($s1) -.L80240C58: -/* D7F9B8 80240C58 8FBF0018 */ lw $ra, 0x18($sp) -/* D7F9BC 80240C5C 8FB10014 */ lw $s1, 0x14($sp) -/* D7F9C0 80240C60 8FB00010 */ lw $s0, 0x10($sp) -/* D7F9C4 80240C64 24020002 */ addiu $v0, $zero, 2 -/* D7F9C8 80240C68 03E00008 */ jr $ra -/* D7F9CC 80240C6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70_D7F9D0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70_D7F9D0.s deleted file mode 100644 index 400514499c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70_D7F9D0.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C70_D7F9D0 -/* D7F9D0 80240C70 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7F9D4 80240C74 AFB10014 */ sw $s1, 0x14($sp) -/* D7F9D8 80240C78 0080882D */ daddu $s1, $a0, $zero -/* D7F9DC 80240C7C AFBF0018 */ sw $ra, 0x18($sp) -/* D7F9E0 80240C80 AFB00010 */ sw $s0, 0x10($sp) -/* D7F9E4 80240C84 8E22000C */ lw $v0, 0xc($s1) -/* D7F9E8 80240C88 0C0B1EAF */ jal evt_get_variable -/* D7F9EC 80240C8C 8C450000 */ lw $a1, ($v0) -/* D7F9F0 80240C90 0220202D */ daddu $a0, $s1, $zero -/* D7F9F4 80240C94 3C05FD05 */ lui $a1, 0xfd05 -/* D7F9F8 80240C98 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7F9FC 80240C9C 0C0B1EAF */ jal evt_get_variable -/* D7FA00 80240CA0 0040802D */ daddu $s0, $v0, $zero -/* D7FA04 80240CA4 00101840 */ sll $v1, $s0, 1 -/* D7FA08 80240CA8 00701821 */ addu $v1, $v1, $s0 -/* D7FA0C 80240CAC 000318C0 */ sll $v1, $v1, 3 -/* D7FA10 80240CB0 00431021 */ addu $v0, $v0, $v1 -/* D7FA14 80240CB4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D7FA18 80240CB8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D7FA1C 80240CBC C4400014 */ lwc1 $f0, 0x14($v0) -/* D7FA20 80240CC0 2402005A */ addiu $v0, $zero, 0x5a -/* D7FA24 80240CC4 4600010D */ trunc.w.s $f4, $f0 -/* D7FA28 80240CC8 44032000 */ mfc1 $v1, $f4 -/* D7FA2C 80240CCC 00000000 */ nop -/* D7FA30 80240CD0 10620015 */ beq $v1, $v0, .L80240D28 -/* D7FA34 80240CD4 2862005B */ slti $v0, $v1, 0x5b -/* D7FA38 80240CD8 10400005 */ beqz $v0, .L80240CF0 -/* D7FA3C 80240CDC 240200B4 */ addiu $v0, $zero, 0xb4 -/* D7FA40 80240CE0 10600009 */ beqz $v1, .L80240D08 -/* D7FA44 80240CE4 00000000 */ nop -/* D7FA48 80240CE8 08090369 */ j .L80240DA4 -/* D7FA4C 80240CEC 00000000 */ nop -.L80240CF0: -/* D7FA50 80240CF0 10620015 */ beq $v1, $v0, .L80240D48 -/* D7FA54 80240CF4 2402010E */ addiu $v0, $zero, 0x10e -/* D7FA58 80240CF8 10620020 */ beq $v1, $v0, .L80240D7C -/* D7FA5C 80240CFC 00000000 */ nop -/* D7FA60 80240D00 08090369 */ j .L80240DA4 -/* D7FA64 80240D04 00000000 */ nop -.L80240D08: -/* D7FA68 80240D08 C6000030 */ lwc1 $f0, 0x30($s0) -/* D7FA6C 80240D0C 4600010D */ trunc.w.s $f4, $f0 -/* D7FA70 80240D10 E6240090 */ swc1 $f4, 0x90($s1) -/* D7FA74 80240D14 C6020030 */ lwc1 $f2, 0x30($s0) -/* D7FA78 80240D18 3C014248 */ lui $at, 0x4248 -/* D7FA7C 80240D1C 44810000 */ mtc1 $at, $f0 -/* D7FA80 80240D20 0809035A */ j .L80240D68 -/* D7FA84 80240D24 46001080 */ add.s $f2, $f2, $f0 -.L80240D28: -/* D7FA88 80240D28 C6000028 */ lwc1 $f0, 0x28($s0) -/* D7FA8C 80240D2C 3C014248 */ lui $at, 0x4248 -/* D7FA90 80240D30 44811000 */ mtc1 $at, $f2 -/* D7FA94 80240D34 4600010D */ trunc.w.s $f4, $f0 -/* D7FA98 80240D38 E6240090 */ swc1 $f4, 0x90($s1) -/* D7FA9C 80240D3C C6000028 */ lwc1 $f0, 0x28($s0) -/* D7FAA0 80240D40 08090366 */ j .L80240D98 -/* D7FAA4 80240D44 46020000 */ add.s $f0, $f0, $f2 -.L80240D48: -/* D7FAA8 80240D48 C6000030 */ lwc1 $f0, 0x30($s0) -/* D7FAAC 80240D4C 4600010D */ trunc.w.s $f4, $f0 -/* D7FAB0 80240D50 E6240090 */ swc1 $f4, 0x90($s1) -/* D7FAB4 80240D54 C6020030 */ lwc1 $f2, 0x30($s0) -/* D7FAB8 80240D58 3C014248 */ lui $at, 0x4248 -/* D7FABC 80240D5C 44810000 */ mtc1 $at, $f0 -/* D7FAC0 80240D60 00000000 */ nop -/* D7FAC4 80240D64 46001081 */ sub.s $f2, $f2, $f0 -.L80240D68: -/* D7FAC8 80240D68 24020001 */ addiu $v0, $zero, 1 -/* D7FACC 80240D6C AE220098 */ sw $v0, 0x98($s1) -/* D7FAD0 80240D70 4600110D */ trunc.w.s $f4, $f2 -/* D7FAD4 80240D74 08090369 */ j .L80240DA4 -/* D7FAD8 80240D78 E6240094 */ swc1 $f4, 0x94($s1) -.L80240D7C: -/* D7FADC 80240D7C C6000028 */ lwc1 $f0, 0x28($s0) -/* D7FAE0 80240D80 3C014248 */ lui $at, 0x4248 -/* D7FAE4 80240D84 44811000 */ mtc1 $at, $f2 -/* D7FAE8 80240D88 4600010D */ trunc.w.s $f4, $f0 -/* D7FAEC 80240D8C E6240090 */ swc1 $f4, 0x90($s1) -/* D7FAF0 80240D90 C6000028 */ lwc1 $f0, 0x28($s0) -/* D7FAF4 80240D94 46020001 */ sub.s $f0, $f0, $f2 -.L80240D98: -/* D7FAF8 80240D98 AE200098 */ sw $zero, 0x98($s1) -/* D7FAFC 80240D9C 4600010D */ trunc.w.s $f4, $f0 -/* D7FB00 80240DA0 E6240094 */ swc1 $f4, 0x94($s1) -.L80240DA4: -/* D7FB04 80240DA4 8FBF0018 */ lw $ra, 0x18($sp) -/* D7FB08 80240DA8 8FB10014 */ lw $s1, 0x14($sp) -/* D7FB0C 80240DAC 8FB00010 */ lw $s0, 0x10($sp) -/* D7FB10 80240DB0 24020002 */ addiu $v0, $zero, 2 -/* D7FB14 80240DB4 03E00008 */ jr $ra -/* D7FB18 80240DB8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240E70_D7FBD0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240E70_D7FBD0.s deleted file mode 100644 index c26070ac9a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240E70_D7FBD0.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247C90_D869F0 -.double 90.0, 0.0 - -.section .text - -glabel func_80240E70_D7FBD0 -/* D7FBD0 80240E70 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7FBD4 80240E74 AFB10014 */ sw $s1, 0x14($sp) -/* D7FBD8 80240E78 0080882D */ daddu $s1, $a0, $zero -/* D7FBDC 80240E7C AFBF0018 */ sw $ra, 0x18($sp) -/* D7FBE0 80240E80 AFB00010 */ sw $s0, 0x10($sp) -/* D7FBE4 80240E84 8E22000C */ lw $v0, 0xc($s1) -/* D7FBE8 80240E88 0C0B1EAF */ jal evt_get_variable -/* D7FBEC 80240E8C 8C450000 */ lw $a1, ($v0) -/* D7FBF0 80240E90 0220202D */ daddu $a0, $s1, $zero -/* D7FBF4 80240E94 3C05FD05 */ lui $a1, 0xfd05 -/* D7FBF8 80240E98 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7FBFC 80240E9C 0C0B1EAF */ jal evt_get_variable -/* D7FC00 80240EA0 0040802D */ daddu $s0, $v0, $zero -/* D7FC04 80240EA4 0220202D */ daddu $a0, $s1, $zero -/* D7FC08 80240EA8 3C05FE36 */ lui $a1, 0xfe36 -/* D7FC0C 80240EAC 00101840 */ sll $v1, $s0, 1 -/* D7FC10 80240EB0 00701821 */ addu $v1, $v1, $s0 -/* D7FC14 80240EB4 000318C0 */ sll $v1, $v1, 3 -/* D7FC18 80240EB8 00438021 */ addu $s0, $v0, $v1 -/* D7FC1C 80240EBC 8E060004 */ lw $a2, 4($s0) -/* D7FC20 80240EC0 0C0B2190 */ jal evt_set_float_variable -/* D7FC24 80240EC4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D7FC28 80240EC8 0220202D */ daddu $a0, $s1, $zero -/* D7FC2C 80240ECC C6000008 */ lwc1 $f0, 8($s0) -/* D7FC30 80240ED0 3C05FE36 */ lui $a1, 0xfe36 -/* D7FC34 80240ED4 46000007 */ neg.s $f0, $f0 -/* D7FC38 80240ED8 44060000 */ mfc1 $a2, $f0 -/* D7FC3C 80240EDC 0C0B2190 */ jal evt_set_float_variable -/* D7FC40 80240EE0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D7FC44 80240EE4 C60C0014 */ lwc1 $f12, 0x14($s0) -/* D7FC48 80240EE8 3C018024 */ lui $at, %hi(D_80247C90_D869F0) -/* D7FC4C 80240EEC D4207C90 */ ldc1 $f0, %lo(D_80247C90_D869F0)($at) -/* D7FC50 80240EF0 46006321 */ cvt.d.s $f12, $f12 -/* D7FC54 80240EF4 46206300 */ add.d $f12, $f12, $f0 -/* D7FC58 80240EF8 0C00A6C9 */ jal clamp_angle -/* D7FC5C 80240EFC 46206320 */ cvt.s.d $f12, $f12 -/* D7FC60 80240F00 0220202D */ daddu $a0, $s1, $zero -/* D7FC64 80240F04 3C05FE36 */ lui $a1, 0xfe36 -/* D7FC68 80240F08 44060000 */ mfc1 $a2, $f0 -/* D7FC6C 80240F0C 0C0B2190 */ jal evt_set_float_variable -/* D7FC70 80240F10 34A53C82 */ ori $a1, $a1, 0x3c82 -/* D7FC74 80240F14 8FBF0018 */ lw $ra, 0x18($sp) -/* D7FC78 80240F18 8FB10014 */ lw $s1, 0x14($sp) -/* D7FC7C 80240F1C 8FB00010 */ lw $s0, 0x10($sp) -/* D7FC80 80240F20 24020002 */ addiu $v0, $zero, 2 -/* D7FC84 80240F24 03E00008 */ jr $ra -/* D7FC88 80240F28 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240F2C_D7FC8C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240F2C_D7FC8C.s deleted file mode 100644 index 8535eec60e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240F2C_D7FC8C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F2C_D7FC8C -/* D7FC8C 80240F2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7FC90 80240F30 AFB10014 */ sw $s1, 0x14($sp) -/* D7FC94 80240F34 0080882D */ daddu $s1, $a0, $zero -/* D7FC98 80240F38 AFBF0018 */ sw $ra, 0x18($sp) -/* D7FC9C 80240F3C AFB00010 */ sw $s0, 0x10($sp) -/* D7FCA0 80240F40 8E22000C */ lw $v0, 0xc($s1) -/* D7FCA4 80240F44 0C0B1EAF */ jal evt_get_variable -/* D7FCA8 80240F48 8C450000 */ lw $a1, ($v0) -/* D7FCAC 80240F4C 0220202D */ daddu $a0, $s1, $zero -/* D7FCB0 80240F50 3C05FD05 */ lui $a1, 0xfd05 -/* D7FCB4 80240F54 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7FCB8 80240F58 0C0B1EAF */ jal evt_get_variable -/* D7FCBC 80240F5C 0040802D */ daddu $s0, $v0, $zero -/* D7FCC0 80240F60 0220202D */ daddu $a0, $s1, $zero -/* D7FCC4 80240F64 3C05FE36 */ lui $a1, 0xfe36 -/* D7FCC8 80240F68 00101840 */ sll $v1, $s0, 1 -/* D7FCCC 80240F6C 00701821 */ addu $v1, $v1, $s0 -/* D7FCD0 80240F70 000318C0 */ sll $v1, $v1, 3 -/* D7FCD4 80240F74 00438021 */ addu $s0, $v0, $v1 -/* D7FCD8 80240F78 8E060004 */ lw $a2, 4($s0) -/* D7FCDC 80240F7C 0C0B2190 */ jal evt_set_float_variable -/* D7FCE0 80240F80 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D7FCE4 80240F84 0220202D */ daddu $a0, $s1, $zero -/* D7FCE8 80240F88 3C05FE36 */ lui $a1, 0xfe36 -/* D7FCEC 80240F8C 8E060008 */ lw $a2, 8($s0) -/* D7FCF0 80240F90 0C0B2190 */ jal evt_set_float_variable -/* D7FCF4 80240F94 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D7FCF8 80240F98 C60C0014 */ lwc1 $f12, 0x14($s0) -/* D7FCFC 80240F9C 0C00A6C9 */ jal clamp_angle -/* D7FD00 80240FA0 00000000 */ nop -/* D7FD04 80240FA4 0220202D */ daddu $a0, $s1, $zero -/* D7FD08 80240FA8 3C05FE36 */ lui $a1, 0xfe36 -/* D7FD0C 80240FAC 44060000 */ mfc1 $a2, $f0 -/* D7FD10 80240FB0 0C0B2190 */ jal evt_set_float_variable -/* D7FD14 80240FB4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* D7FD18 80240FB8 8FBF0018 */ lw $ra, 0x18($sp) -/* D7FD1C 80240FBC 8FB10014 */ lw $s1, 0x14($sp) -/* D7FD20 80240FC0 8FB00010 */ lw $s0, 0x10($sp) -/* D7FD24 80240FC4 24020002 */ addiu $v0, $zero, 2 -/* D7FD28 80240FC8 03E00008 */ jr $ra -/* D7FD2C 80240FCC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s deleted file mode 100644 index 8c00b47b4f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s +++ /dev/null @@ -1,240 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419A4_D1A184 -/* D1A184 802419A4 27BDFF40 */ addiu $sp, $sp, -0xc0 -/* D1A188 802419A8 AFBE00A0 */ sw $fp, 0xa0($sp) -/* D1A18C 802419AC 0080F02D */ daddu $fp, $a0, $zero -/* D1A190 802419B0 AFBF00A4 */ sw $ra, 0xa4($sp) -/* D1A194 802419B4 AFB7009C */ sw $s7, 0x9c($sp) -/* D1A198 802419B8 AFB60098 */ sw $s6, 0x98($sp) -/* D1A19C 802419BC AFB50094 */ sw $s5, 0x94($sp) -/* D1A1A0 802419C0 AFB40090 */ sw $s4, 0x90($sp) -/* D1A1A4 802419C4 AFB3008C */ sw $s3, 0x8c($sp) -/* D1A1A8 802419C8 AFB20088 */ sw $s2, 0x88($sp) -/* D1A1AC 802419CC AFB10084 */ sw $s1, 0x84($sp) -/* D1A1B0 802419D0 AFB00080 */ sw $s0, 0x80($sp) -/* D1A1B4 802419D4 F7B800B8 */ sdc1 $f24, 0xb8($sp) -/* D1A1B8 802419D8 F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* D1A1BC 802419DC F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* D1A1C0 802419E0 8FD70148 */ lw $s7, 0x148($fp) -/* D1A1C4 802419E4 86E40008 */ lh $a0, 8($s7) -/* D1A1C8 802419E8 0C00EABB */ jal get_npc_unsafe -/* D1A1CC 802419EC 00A0802D */ daddu $s0, $a1, $zero -/* D1A1D0 802419F0 12000003 */ beqz $s0, .L80241A00 -/* D1A1D4 802419F4 0040B02D */ daddu $s6, $v0, $zero -/* D1A1D8 802419F8 A6C0008E */ sh $zero, 0x8e($s6) -/* D1A1DC 802419FC AFC00070 */ sw $zero, 0x70($fp) -.L80241A00: -/* D1A1E0 80241A00 8EE20078 */ lw $v0, 0x78($s7) -/* D1A1E4 80241A04 1440000B */ bnez $v0, .L80241A34 -/* D1A1E8 80241A08 0000282D */ daddu $a1, $zero, $zero -/* D1A1EC 80241A0C 24050001 */ addiu $a1, $zero, 1 -/* D1A1F0 80241A10 24060007 */ addiu $a2, $zero, 7 -/* D1A1F4 80241A14 240200FF */ addiu $v0, $zero, 0xff -/* D1A1F8 80241A18 AFA20010 */ sw $v0, 0x10($sp) -/* D1A1FC 80241A1C AFA20014 */ sw $v0, 0x14($sp) -/* D1A200 80241A20 AFA00018 */ sw $zero, 0x18($sp) -/* D1A204 80241A24 AFA0001C */ sw $zero, 0x1c($sp) -/* D1A208 80241A28 8EC40024 */ lw $a0, 0x24($s6) -/* D1A20C 80241A2C 08090736 */ j .L80241CD8 -/* D1A210 80241A30 0040382D */ daddu $a3, $v0, $zero -.L80241A34: -/* D1A214 80241A34 24060011 */ addiu $a2, $zero, 0x11 -/* D1A218 80241A38 240200FF */ addiu $v0, $zero, 0xff -/* D1A21C 80241A3C AFA00010 */ sw $zero, 0x10($sp) -/* D1A220 80241A40 AFA00014 */ sw $zero, 0x14($sp) -/* D1A224 80241A44 AFA20018 */ sw $v0, 0x18($sp) -/* D1A228 80241A48 AFA0001C */ sw $zero, 0x1c($sp) -/* D1A22C 80241A4C 8EC40024 */ lw $a0, 0x24($s6) -/* D1A230 80241A50 0C0B79E0 */ jal func_802DE780 -/* D1A234 80241A54 24070014 */ addiu $a3, $zero, 0x14 -/* D1A238 80241A58 8FC20070 */ lw $v0, 0x70($fp) -/* D1A23C 80241A5C 2444000A */ addiu $a0, $v0, 0xa -/* D1A240 80241A60 28820168 */ slti $v0, $a0, 0x168 -/* D1A244 80241A64 14400010 */ bnez $v0, .L80241AA8 -/* D1A248 80241A68 AFC40070 */ sw $a0, 0x70($fp) -/* D1A24C 80241A6C 3C02B60B */ lui $v0, 0xb60b -/* D1A250 80241A70 344260B7 */ ori $v0, $v0, 0x60b7 -/* D1A254 80241A74 00820018 */ mult $a0, $v0 -/* D1A258 80241A78 00041FC3 */ sra $v1, $a0, 0x1f -/* D1A25C 80241A7C 00004810 */ mfhi $t1 -/* D1A260 80241A80 01241021 */ addu $v0, $t1, $a0 -/* D1A264 80241A84 00021203 */ sra $v0, $v0, 8 -/* D1A268 80241A88 00431023 */ subu $v0, $v0, $v1 -/* D1A26C 80241A8C 00021840 */ sll $v1, $v0, 1 -/* D1A270 80241A90 00621821 */ addu $v1, $v1, $v0 -/* D1A274 80241A94 00031100 */ sll $v0, $v1, 4 -/* D1A278 80241A98 00431023 */ subu $v0, $v0, $v1 -/* D1A27C 80241A9C 000210C0 */ sll $v0, $v0, 3 -/* D1A280 80241AA0 00821023 */ subu $v0, $a0, $v0 -/* D1A284 80241AA4 AFC20070 */ sw $v0, 0x70($fp) -.L80241AA8: -/* D1A288 80241AA8 0000882D */ daddu $s1, $zero, $zero -/* D1A28C 80241AAC 27B50050 */ addiu $s5, $sp, 0x50 -/* D1A290 80241AB0 27B40038 */ addiu $s4, $sp, 0x38 -/* D1A294 80241AB4 27B20020 */ addiu $s2, $sp, 0x20 -/* D1A298 80241AB8 0220802D */ daddu $s0, $s1, $zero -/* D1A29C 80241ABC 3C013FF0 */ lui $at, 0x3ff0 -/* D1A2A0 80241AC0 4481C800 */ mtc1 $at, $f25 -/* D1A2A4 80241AC4 4480C000 */ mtc1 $zero, $f24 -/* D1A2A8 80241AC8 3C01404C */ lui $at, 0x404c -/* D1A2AC 80241ACC 4481B800 */ mtc1 $at, $f23 -/* D1A2B0 80241AD0 4480B000 */ mtc1 $zero, $f22 -/* D1A2B4 80241AD4 3C0141E0 */ lui $at, 0x41e0 -/* D1A2B8 80241AD8 4481A800 */ mtc1 $at, $f21 -/* D1A2BC 80241ADC 4480A000 */ mtc1 $zero, $f20 -.L80241AE0: -/* D1A2C0 80241AE0 97C40072 */ lhu $a0, 0x72($fp) -/* D1A2C4 80241AE4 00902021 */ addu $a0, $a0, $s0 -/* D1A2C8 80241AE8 00042400 */ sll $a0, $a0, 0x10 -/* D1A2CC 80241AEC 0C00A4F5 */ jal cosine -/* D1A2D0 80241AF0 00042403 */ sra $a0, $a0, 0x10 -/* D1A2D4 80241AF4 46000021 */ cvt.d.s $f0, $f0 -/* D1A2D8 80241AF8 46380000 */ add.d $f0, $f0, $f24 -/* D1A2DC 80241AFC 46360002 */ mul.d $f0, $f0, $f22 -/* D1A2E0 80241B00 00000000 */ nop -/* D1A2E4 80241B04 4620A03E */ c.le.d $f20, $f0 -/* D1A2E8 80241B08 00000000 */ nop -/* D1A2EC 80241B0C 45030005 */ bc1tl .L80241B24 -/* D1A2F0 80241B10 46340001 */ sub.d $f0, $f0, $f20 -/* D1A2F4 80241B14 4620008D */ trunc.w.d $f2, $f0 -/* D1A2F8 80241B18 44021000 */ mfc1 $v0, $f2 -/* D1A2FC 80241B1C 080906CE */ j .L80241B38 -/* D1A300 80241B20 A2420000 */ sb $v0, ($s2) -.L80241B24: -/* D1A304 80241B24 4620008D */ trunc.w.d $f2, $f0 -/* D1A308 80241B28 44021000 */ mfc1 $v0, $f2 -/* D1A30C 80241B2C 3C098000 */ lui $t1, 0x8000 -/* D1A310 80241B30 00491025 */ or $v0, $v0, $t1 -/* D1A314 80241B34 A2420000 */ sb $v0, ($s2) -.L80241B38: -/* D1A318 80241B38 97C40072 */ lhu $a0, 0x72($fp) -/* D1A31C 80241B3C 00902021 */ addu $a0, $a0, $s0 -/* D1A320 80241B40 2484002D */ addiu $a0, $a0, 0x2d -/* D1A324 80241B44 00042400 */ sll $a0, $a0, 0x10 -/* D1A328 80241B48 0C00A4F5 */ jal cosine -/* D1A32C 80241B4C 00042403 */ sra $a0, $a0, 0x10 -/* D1A330 80241B50 46000021 */ cvt.d.s $f0, $f0 -/* D1A334 80241B54 46380000 */ add.d $f0, $f0, $f24 -/* D1A338 80241B58 46360002 */ mul.d $f0, $f0, $f22 -/* D1A33C 80241B5C 00000000 */ nop -/* D1A340 80241B60 4620A03E */ c.le.d $f20, $f0 -/* D1A344 80241B64 00000000 */ nop -/* D1A348 80241B68 45010005 */ bc1t .L80241B80 -/* D1A34C 80241B6C 0280182D */ daddu $v1, $s4, $zero -/* D1A350 80241B70 4620008D */ trunc.w.d $f2, $f0 -/* D1A354 80241B74 44021000 */ mfc1 $v0, $f2 -/* D1A358 80241B78 080906E6 */ j .L80241B98 -/* D1A35C 80241B7C A0620000 */ sb $v0, ($v1) -.L80241B80: -/* D1A360 80241B80 46340001 */ sub.d $f0, $f0, $f20 -/* D1A364 80241B84 4620008D */ trunc.w.d $f2, $f0 -/* D1A368 80241B88 44021000 */ mfc1 $v0, $f2 -/* D1A36C 80241B8C 3C098000 */ lui $t1, 0x8000 -/* D1A370 80241B90 00491025 */ or $v0, $v0, $t1 -/* D1A374 80241B94 A0620000 */ sb $v0, ($v1) -.L80241B98: -/* D1A378 80241B98 97C40072 */ lhu $a0, 0x72($fp) -/* D1A37C 80241B9C 00902021 */ addu $a0, $a0, $s0 -/* D1A380 80241BA0 2484005A */ addiu $a0, $a0, 0x5a -/* D1A384 80241BA4 00042400 */ sll $a0, $a0, 0x10 -/* D1A388 80241BA8 0C00A4F5 */ jal cosine -/* D1A38C 80241BAC 00042403 */ sra $a0, $a0, 0x10 -/* D1A390 80241BB0 46000021 */ cvt.d.s $f0, $f0 -/* D1A394 80241BB4 46380000 */ add.d $f0, $f0, $f24 -/* D1A398 80241BB8 46360002 */ mul.d $f0, $f0, $f22 -/* D1A39C 80241BBC 00000000 */ nop -/* D1A3A0 80241BC0 4620A03E */ c.le.d $f20, $f0 -/* D1A3A4 80241BC4 00000000 */ nop -/* D1A3A8 80241BC8 45010005 */ bc1t .L80241BE0 -/* D1A3AC 80241BCC 02A0182D */ daddu $v1, $s5, $zero -/* D1A3B0 80241BD0 4620008D */ trunc.w.d $f2, $f0 -/* D1A3B4 80241BD4 44021000 */ mfc1 $v0, $f2 -/* D1A3B8 80241BD8 080906FE */ j .L80241BF8 -/* D1A3BC 80241BDC 0000282D */ daddu $a1, $zero, $zero -.L80241BE0: -/* D1A3C0 80241BE0 46340001 */ sub.d $f0, $f0, $f20 -/* D1A3C4 80241BE4 4620008D */ trunc.w.d $f2, $f0 -/* D1A3C8 80241BE8 44021000 */ mfc1 $v0, $f2 -/* D1A3CC 80241BEC 3C098000 */ lui $t1, 0x8000 -/* D1A3D0 80241BF0 00491025 */ or $v0, $v0, $t1 -/* D1A3D4 80241BF4 0000282D */ daddu $a1, $zero, $zero -.L80241BF8: -/* D1A3D8 80241BF8 2406000C */ addiu $a2, $zero, 0xc -/* D1A3DC 80241BFC 0220382D */ daddu $a3, $s1, $zero -/* D1A3E0 80241C00 26100019 */ addiu $s0, $s0, 0x19 -/* D1A3E4 80241C04 A0620000 */ sb $v0, ($v1) -/* D1A3E8 80241C08 27A30068 */ addiu $v1, $sp, 0x68 -/* D1A3EC 80241C0C 00711821 */ addu $v1, $v1, $s1 -/* D1A3F0 80241C10 26310001 */ addiu $s1, $s1, 1 -/* D1A3F4 80241C14 92E2007B */ lbu $v0, 0x7b($s7) -/* D1A3F8 80241C18 241300FF */ addiu $s3, $zero, 0xff -/* D1A3FC 80241C1C A0620000 */ sb $v0, ($v1) -/* D1A400 80241C20 92A80000 */ lbu $t0, ($s5) -/* D1A404 80241C24 26B50001 */ addiu $s5, $s5, 1 -/* D1A408 80241C28 92420000 */ lbu $v0, ($s2) -/* D1A40C 80241C2C 92840000 */ lbu $a0, ($s4) -/* D1A410 80241C30 90630000 */ lbu $v1, ($v1) -/* D1A414 80241C34 26940001 */ addiu $s4, $s4, 1 -/* D1A418 80241C38 AFA00014 */ sw $zero, 0x14($sp) -/* D1A41C 80241C3C AFB30018 */ sw $s3, 0x18($sp) -/* D1A420 80241C40 AFA0001C */ sw $zero, 0x1c($sp) -/* D1A424 80241C44 00021600 */ sll $v0, $v0, 0x18 -/* D1A428 80241C48 00042400 */ sll $a0, $a0, 0x10 -/* D1A42C 80241C4C 00441025 */ or $v0, $v0, $a0 -/* D1A430 80241C50 00084200 */ sll $t0, $t0, 8 -/* D1A434 80241C54 00481025 */ or $v0, $v0, $t0 -/* D1A438 80241C58 00431025 */ or $v0, $v0, $v1 -/* D1A43C 80241C5C AFA20010 */ sw $v0, 0x10($sp) -/* D1A440 80241C60 8EC40024 */ lw $a0, 0x24($s6) -/* D1A444 80241C64 0C0B79E0 */ jal func_802DE780 -/* D1A448 80241C68 26520001 */ addiu $s2, $s2, 1 -/* D1A44C 80241C6C 2A220014 */ slti $v0, $s1, 0x14 -/* D1A450 80241C70 1440FF9B */ bnez $v0, .L80241AE0 -/* D1A454 80241C74 00000000 */ nop -/* D1A458 80241C78 8EE30078 */ lw $v1, 0x78($s7) -/* D1A45C 80241C7C 1473000A */ bne $v1, $s3, .L80241CA8 -/* D1A460 80241C80 24020016 */ addiu $v0, $zero, 0x16 -/* D1A464 80241C84 24050001 */ addiu $a1, $zero, 1 -/* D1A468 80241C88 2406000F */ addiu $a2, $zero, 0xf -/* D1A46C 80241C8C 2402000D */ addiu $v0, $zero, 0xd -/* D1A470 80241C90 A2C200AA */ sb $v0, 0xaa($s6) -/* D1A474 80241C94 AFA30010 */ sw $v1, 0x10($sp) -/* D1A478 80241C98 AFA00014 */ sw $zero, 0x14($sp) -/* D1A47C 80241C9C AFA30018 */ sw $v1, 0x18($sp) -/* D1A480 80241CA0 08090733 */ j .L80241CCC -/* D1A484 80241CA4 AFA0001C */ sw $zero, 0x1c($sp) -.L80241CA8: -/* D1A488 80241CA8 A2C200AA */ sb $v0, 0xaa($s6) -/* D1A48C 80241CAC 8EE20078 */ lw $v0, 0x78($s7) -/* D1A490 80241CB0 24050001 */ addiu $a1, $zero, 1 -/* D1A494 80241CB4 AFA00014 */ sw $zero, 0x14($sp) -/* D1A498 80241CB8 AFA20010 */ sw $v0, 0x10($sp) -/* D1A49C 80241CBC 8EE20078 */ lw $v0, 0x78($s7) -/* D1A4A0 80241CC0 2406000F */ addiu $a2, $zero, 0xf -/* D1A4A4 80241CC4 AFA0001C */ sw $zero, 0x1c($sp) -/* D1A4A8 80241CC8 AFA20018 */ sw $v0, 0x18($sp) -.L80241CCC: -/* D1A4AC 80241CCC 8EC40024 */ lw $a0, 0x24($s6) -/* D1A4B0 80241CD0 3C078024 */ lui $a3, %hi(D_80242F90_D1B770) -/* D1A4B4 80241CD4 24E72F90 */ addiu $a3, $a3, %lo(D_80242F90_D1B770) -.L80241CD8: -/* D1A4B8 80241CD8 0C0B79E0 */ jal func_802DE780 -/* D1A4BC 80241CDC 00000000 */ nop -/* D1A4C0 80241CE0 0000102D */ daddu $v0, $zero, $zero -/* D1A4C4 80241CE4 8FBF00A4 */ lw $ra, 0xa4($sp) -/* D1A4C8 80241CE8 8FBE00A0 */ lw $fp, 0xa0($sp) -/* D1A4CC 80241CEC 8FB7009C */ lw $s7, 0x9c($sp) -/* D1A4D0 80241CF0 8FB60098 */ lw $s6, 0x98($sp) -/* D1A4D4 80241CF4 8FB50094 */ lw $s5, 0x94($sp) -/* D1A4D8 80241CF8 8FB40090 */ lw $s4, 0x90($sp) -/* D1A4DC 80241CFC 8FB3008C */ lw $s3, 0x8c($sp) -/* D1A4E0 80241D00 8FB20088 */ lw $s2, 0x88($sp) -/* D1A4E4 80241D04 8FB10084 */ lw $s1, 0x84($sp) -/* D1A4E8 80241D08 8FB00080 */ lw $s0, 0x80($sp) -/* D1A4EC 80241D0C D7B800B8 */ ldc1 $f24, 0xb8($sp) -/* D1A4F0 80241D10 D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* D1A4F4 80241D14 D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* D1A4F8 80241D18 03E00008 */ jr $ra -/* D1A4FC 80241D1C 27BD00C0 */ addiu $sp, $sp, 0xc0 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240158_D36448.s b/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240158_D36448.s deleted file mode 100644 index d2a744fed6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240158_D36448.s +++ /dev/null @@ -1,74 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_D36448 -/* D36448 80240158 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3644C 8024015C AFB10014 */ sw $s1, 0x14($sp) -/* D36450 80240160 0080882D */ daddu $s1, $a0, $zero -/* D36454 80240164 3C05FD05 */ lui $a1, 0xfd05 -/* D36458 80240168 34A50F80 */ ori $a1, $a1, 0xf80 -/* D3645C 8024016C AFBF001C */ sw $ra, 0x1c($sp) -/* D36460 80240170 AFB20018 */ sw $s2, 0x18($sp) -/* D36464 80240174 0C0B1EAF */ jal evt_get_variable -/* D36468 80240178 AFB00010 */ sw $s0, 0x10($sp) -/* D3646C 8024017C 0040802D */ daddu $s0, $v0, $zero -/* D36470 80240180 2412FFFF */ addiu $s2, $zero, -1 -/* D36474 80240184 52120001 */ beql $s0, $s2, .L8024018C -/* D36478 80240188 241000FF */ addiu $s0, $zero, 0xff -.L8024018C: -/* D3647C 8024018C 0220202D */ daddu $a0, $s1, $zero -/* D36480 80240190 3C05F5DE */ lui $a1, 0xf5de -/* D36484 80240194 34A50288 */ ori $a1, $a1, 0x288 -/* D36488 80240198 0C0B2026 */ jal evt_set_variable -/* D3648C 8024019C 320600FF */ andi $a2, $s0, 0xff -/* D36490 802401A0 0220202D */ daddu $a0, $s1, $zero -/* D36494 802401A4 3C05F5DE */ lui $a1, 0xf5de -/* D36498 802401A8 34A50289 */ ori $a1, $a1, 0x289 -/* D3649C 802401AC 00103203 */ sra $a2, $s0, 8 -/* D364A0 802401B0 0C0B2026 */ jal evt_set_variable -/* D364A4 802401B4 30C600FF */ andi $a2, $a2, 0xff -/* D364A8 802401B8 0220202D */ daddu $a0, $s1, $zero -/* D364AC 802401BC 3C05FD05 */ lui $a1, 0xfd05 -/* D364B0 802401C0 0C0B1EAF */ jal evt_get_variable -/* D364B4 802401C4 34A50F81 */ ori $a1, $a1, 0xf81 -/* D364B8 802401C8 0040802D */ daddu $s0, $v0, $zero -/* D364BC 802401CC 52120001 */ beql $s0, $s2, .L802401D4 -/* D364C0 802401D0 241000FF */ addiu $s0, $zero, 0xff -.L802401D4: -/* D364C4 802401D4 0220202D */ daddu $a0, $s1, $zero -/* D364C8 802401D8 3C05F5DE */ lui $a1, 0xf5de -/* D364CC 802401DC 34A5028A */ ori $a1, $a1, 0x28a -/* D364D0 802401E0 0C0B2026 */ jal evt_set_variable -/* D364D4 802401E4 320600FF */ andi $a2, $s0, 0xff -/* D364D8 802401E8 0220202D */ daddu $a0, $s1, $zero -/* D364DC 802401EC 3C05F5DE */ lui $a1, 0xf5de -/* D364E0 802401F0 34A5028B */ ori $a1, $a1, 0x28b -/* D364E4 802401F4 00103203 */ sra $a2, $s0, 8 -/* D364E8 802401F8 0C0B2026 */ jal evt_set_variable -/* D364EC 802401FC 30C600FF */ andi $a2, $a2, 0xff -/* D364F0 80240200 0220202D */ daddu $a0, $s1, $zero -/* D364F4 80240204 3C05FD05 */ lui $a1, 0xfd05 -/* D364F8 80240208 0C0B1EAF */ jal evt_get_variable -/* D364FC 8024020C 34A50F82 */ ori $a1, $a1, 0xf82 -/* D36500 80240210 0040802D */ daddu $s0, $v0, $zero -/* D36504 80240214 52120001 */ beql $s0, $s2, .L8024021C -/* D36508 80240218 241000FF */ addiu $s0, $zero, 0xff -.L8024021C: -/* D3650C 8024021C 0220202D */ daddu $a0, $s1, $zero -/* D36510 80240220 3C05F5DE */ lui $a1, 0xf5de -/* D36514 80240224 34A5028C */ ori $a1, $a1, 0x28c -/* D36518 80240228 0C0B2026 */ jal evt_set_variable -/* D3651C 8024022C 320600FF */ andi $a2, $s0, 0xff -/* D36520 80240230 0220202D */ daddu $a0, $s1, $zero -/* D36524 80240234 3C05F5DE */ lui $a1, 0xf5de -/* D36528 80240238 34A5028D */ ori $a1, $a1, 0x28d -/* D3652C 8024023C 00103203 */ sra $a2, $s0, 8 -/* D36530 80240240 0C0B2026 */ jal evt_set_variable -/* D36534 80240244 30C600FF */ andi $a2, $a2, 0xff -/* D36538 80240248 8FBF001C */ lw $ra, 0x1c($sp) -/* D3653C 8024024C 8FB20018 */ lw $s2, 0x18($sp) -/* D36540 80240250 8FB10014 */ lw $s1, 0x14($sp) -/* D36544 80240254 8FB00010 */ lw $s0, 0x10($sp) -/* D36548 80240258 24020002 */ addiu $v0, $zero, 2 -/* D3654C 8024025C 03E00008 */ jr $ra -/* D36550 80240260 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240264_D36554.s b/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240264_D36554.s deleted file mode 100644 index b90e8f8c7e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240264_D36554.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240264_D36554 -/* D36554 80240264 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D36558 80240268 AFB10014 */ sw $s1, 0x14($sp) -/* D3655C 8024026C 0080882D */ daddu $s1, $a0, $zero -/* D36560 80240270 3C05F5DE */ lui $a1, 0xf5de -/* D36564 80240274 34A50288 */ ori $a1, $a1, 0x288 -/* D36568 80240278 AFBF0018 */ sw $ra, 0x18($sp) -/* D3656C 8024027C 0C0B1EAF */ jal evt_get_variable -/* D36570 80240280 AFB00010 */ sw $s0, 0x10($sp) -/* D36574 80240284 305000FF */ andi $s0, $v0, 0xff -/* D36578 80240288 0220202D */ daddu $a0, $s1, $zero -/* D3657C 8024028C 3C05F5DE */ lui $a1, 0xf5de -/* D36580 80240290 0C0B1EAF */ jal evt_get_variable -/* D36584 80240294 34A50289 */ ori $a1, $a1, 0x289 -/* D36588 80240298 304600FF */ andi $a2, $v0, 0xff -/* D3658C 8024029C 240200FF */ addiu $v0, $zero, 0xff -/* D36590 802402A0 12020006 */ beq $s0, $v0, .L802402BC -/* D36594 802402A4 0220202D */ daddu $a0, $s1, $zero -/* D36598 802402A8 3C05FD05 */ lui $a1, 0xfd05 -/* D3659C 802402AC 34A50F80 */ ori $a1, $a1, 0xf80 -/* D365A0 802402B0 00063200 */ sll $a2, $a2, 8 -/* D365A4 802402B4 080900B2 */ j .L802402C8 -/* D365A8 802402B8 00D03025 */ or $a2, $a2, $s0 -.L802402BC: -/* D365AC 802402BC 3C05FD05 */ lui $a1, 0xfd05 -/* D365B0 802402C0 34A50F80 */ ori $a1, $a1, 0xf80 -/* D365B4 802402C4 2406FFFF */ addiu $a2, $zero, -1 -.L802402C8: -/* D365B8 802402C8 0C0B2026 */ jal evt_set_variable -/* D365BC 802402CC 00000000 */ nop -/* D365C0 802402D0 0220202D */ daddu $a0, $s1, $zero -/* D365C4 802402D4 3C05F5DE */ lui $a1, 0xf5de -/* D365C8 802402D8 0C0B1EAF */ jal evt_get_variable -/* D365CC 802402DC 34A5028A */ ori $a1, $a1, 0x28a -/* D365D0 802402E0 305000FF */ andi $s0, $v0, 0xff -/* D365D4 802402E4 0220202D */ daddu $a0, $s1, $zero -/* D365D8 802402E8 3C05F5DE */ lui $a1, 0xf5de -/* D365DC 802402EC 0C0B1EAF */ jal evt_get_variable -/* D365E0 802402F0 34A5028B */ ori $a1, $a1, 0x28b -/* D365E4 802402F4 304600FF */ andi $a2, $v0, 0xff -/* D365E8 802402F8 240200FF */ addiu $v0, $zero, 0xff -/* D365EC 802402FC 12020006 */ beq $s0, $v0, .L80240318 -/* D365F0 80240300 0220202D */ daddu $a0, $s1, $zero -/* D365F4 80240304 3C05FD05 */ lui $a1, 0xfd05 -/* D365F8 80240308 34A50F81 */ ori $a1, $a1, 0xf81 -/* D365FC 8024030C 00063200 */ sll $a2, $a2, 8 -/* D36600 80240310 080900C9 */ j .L80240324 -/* D36604 80240314 00D03025 */ or $a2, $a2, $s0 -.L80240318: -/* D36608 80240318 3C05FD05 */ lui $a1, 0xfd05 -/* D3660C 8024031C 34A50F81 */ ori $a1, $a1, 0xf81 -/* D36610 80240320 2406FFFF */ addiu $a2, $zero, -1 -.L80240324: -/* D36614 80240324 0C0B2026 */ jal evt_set_variable -/* D36618 80240328 00000000 */ nop -/* D3661C 8024032C 0220202D */ daddu $a0, $s1, $zero -/* D36620 80240330 3C05F5DE */ lui $a1, 0xf5de -/* D36624 80240334 0C0B1EAF */ jal evt_get_variable -/* D36628 80240338 34A5028C */ ori $a1, $a1, 0x28c -/* D3662C 8024033C 305000FF */ andi $s0, $v0, 0xff -/* D36630 80240340 0220202D */ daddu $a0, $s1, $zero -/* D36634 80240344 3C05F5DE */ lui $a1, 0xf5de -/* D36638 80240348 0C0B1EAF */ jal evt_get_variable -/* D3663C 8024034C 34A5028D */ ori $a1, $a1, 0x28d -/* D36640 80240350 304600FF */ andi $a2, $v0, 0xff -/* D36644 80240354 240200FF */ addiu $v0, $zero, 0xff -/* D36648 80240358 12020006 */ beq $s0, $v0, .L80240374 -/* D3664C 8024035C 0220202D */ daddu $a0, $s1, $zero -/* D36650 80240360 3C05FD05 */ lui $a1, 0xfd05 -/* D36654 80240364 34A50F82 */ ori $a1, $a1, 0xf82 -/* D36658 80240368 00063200 */ sll $a2, $a2, 8 -/* D3665C 8024036C 080900E0 */ j .L80240380 -/* D36660 80240370 00D03025 */ or $a2, $a2, $s0 -.L80240374: -/* D36664 80240374 3C05FD05 */ lui $a1, 0xfd05 -/* D36668 80240378 34A50F82 */ ori $a1, $a1, 0xf82 -/* D3666C 8024037C 2406FFFF */ addiu $a2, $zero, -1 -.L80240380: -/* D36670 80240380 0C0B2026 */ jal evt_set_variable -/* D36674 80240384 00000000 */ nop -/* D36678 80240388 8FBF0018 */ lw $ra, 0x18($sp) -/* D3667C 8024038C 8FB10014 */ lw $s1, 0x14($sp) -/* D36680 80240390 8FB00010 */ lw $s0, 0x10($sp) -/* D36684 80240394 24020002 */ addiu $v0, $zero, 2 -/* D36688 80240398 03E00008 */ jr $ra -/* D3668C 8024039C 27BD0020 */ addiu $sp, $sp, 0x20