diff --git a/.gitignore b/.gitignore index a2ddf0505f..4fdcf98fa3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ venv/ ctx.c expected/ .vscode/launch.json +/tools/star-rod # Build artifacts build.ninja @@ -27,7 +28,7 @@ build.ninja /tools/permuter_settings.toml # Assets -/assets +/*assets *.bin *.o @@ -35,6 +36,9 @@ build.ninja /sprite/SpriteTable.xml /mod.cfg /tools/star-rod +/editor +/logs +/out /tools/Yay0compress /tools/n64crc diff --git a/asm/data/code_6240_len_c00.data.s b/asm/data/code_6240_len_c00.data.s index a1209bf67d..d4d651429f 100644 --- a/asm/data/code_6240_len_c00.data.s +++ b/asm/data/code_6240_len_c00.data.s @@ -45,7 +45,7 @@ glabel D_80077400 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000 glabel gCurrentCameraID -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000E4, 0x000000E1, 0x000000EB, 0x000000EF, 0x000000F6, 0x0000010A, 0x0000010C, 0x00000121, 0x00000122, 0x00000123, 0x00000118, 0x0000010E, 0x00000131, 0x0000012E, 0x0000012F, 0x000000E0, 0x000000EE, 0x000000F0, 0x00000109, 0x0000010B, 0x00000107, 0x000000E8, 0x00000117, 0x00000108, 0x00000124, 0x00000125, 0x00000126, 0x0000010F, 0x0000012B, 0x0000012C, 0x000000E9, 0x00000106, 0x00000143, 0x000000ED, 0x00000129, 0x0000012A, 0x000000E7, 0x000000F8, 0x000000FF, 0x00000140, 0x00000105, 0x00000110, 0x00000119, 0x000000E3, 0x00000116, 0x00000113, 0x000000F4, 0x000000E2, 0x000000F5, 0x00000115, 0x00000101, 0x00000102, 0x0000012D, 0x00000111, 0x0000010D, 0x00000112, 0x000000F9, 0x00000130, 0x000000FB, 0x000000FA, 0x000000EC, 0x000000E5, 0x00000150, 0x000000F2, 0x00000100, 0x000000F1, 0x00000114, 0x000000F7, 0x000000F3, 0x00000145, 0x00000146, 0x00000147, 0x00000148, 0x00000149, 0x00000104, 0x000000FC, 0x00000103, 0x0000011A, 0x0000011B, 0x000000FD, 0x00000144, 0x0000011E, 0x000000FE, 0x0000011F, 0x0000011D, 0x0000011C, 0x000000E6, 0x00000120, 0x00000080, 0x00000081, 0x00000082, 0x00000084, 0x00000083, 0x00000086, 0x00000085, 0x00000088, 0x0000008B, 0x0000008A, 0x0000008C, 0x0000008E, 0x00000095, 0x0000008D, 0x00000089, 0x0000009B, 0x0000009E, 0x0000009F, 0x000000A0, 0x000000A1, 0x0000009D, 0x0000009C, 0x000000A4, 0x000000A3, 0x000000A2, 0x00000093, 0x00000094, 0x000000A5, 0x000000A6, 0x000000A7, 0x000000A8, 0x000000A9, 0x000000AA, 0x000000AB, 0x000000AC, 0x000000AD, 0x000000AE, 0x000000AF, 0x0000008F, 0x00000090, 0x00000091, 0x00000092, 0x0000009A, 0x00000098, 0x00000096, 0x00000097, 0x00000087, 0x000000B0, 0x000000B1, 0x000000B2, 0x000000B3, 0x000000B4, 0x000000B5, 0x000000B6, 0x000000B9, 0x000000B8, 0x000000B7, 0x000000BA, 0x000000BD, 0x000000BB, 0x000000BE, 0x000000BF, 0x000000BC, 0x000000C0, 0x000000C1, 0x000000C2, 0x000000C3, 0x000000C4, 0x000000C5, 0x000000C6, 0x000000C7, 0x000000C8, 0x000000C9, 0x000000CA, 0x000000CB, 0x000000CC, 0x000000CD, 0x000000CE, 0x000000CF, 0x000000D0, 0x000000D1, 0x000000D2, 0x000000D3, 0x000000D4, 0x000000D5, 0x000000D6, 0x000000D7, 0x000000D8, 0x000000D9, 0x000000DA, 0x00000000, begin_state_init, step_init_state, 0x00000000, func_80033788, 0x00000000, begin_state_logos, step_logos, 0x00000000, func_80034388, 0x00000000, begin_state_title_screen, step_title_screen, 0x00000000, func_800375A4, 0x00000000, func_80035E00, func_80035EEC, 0x00000000, func_800360FC, 0x00000000, func_80036130, func_8003617C, 0x00000000, func_800363FC, 0x00000000, func_80036430, func_8003646C, 0x00000000, func_80036640, 0x00000000, func_80035E24, func_80035EEC, 0x00000000, func_800360FC, 0x00000000, begin_state_world, step_world, 0x00000000, func_80035DA0, 0x00000000, begin_state_battle, step_battle, 0x00000000, func_80033B54, 0x00000000, func_80033B88, func_80033BC0, 0x00000000, func_80033E64, 0x00000000, begin_state_pause_menu, step_pause_menu, 0x00000000, func_80034BF4, 0x00000000, func_80034BFC, func_80034C3C, 0x00000000, func_80034FF0, 0x00000000, func_80035000, func_800351C8, 0x00000000, func_800355C4, 0x00000000, func_800355D4, func_80035704, 0x00000000, func_80035D18, 0x00000000, func_80035058, func_800354EC, 0x00000000, func_800355CC, 0x00000000, func_80035660, func_80035B40, 0x00000000, func_80035D20, 0x00000000, begin_state_intro, step_intro, 0x00000000, func_80036DE0, 0x00000000, init_demo_data, next_demo_scene, 0x00000000, func_8003845C +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000E4, 0x000000E1, 0x000000EB, 0x000000EF, 0x000000F6, 0x0000010A, 0x0000010C, 0x00000121, 0x00000122, 0x00000123, 0x00000118, 0x0000010E, 0x00000131, 0x0000012E, 0x0000012F, 0x000000E0, 0x000000EE, 0x000000F0, 0x00000109, 0x0000010B, 0x00000107, 0x000000E8, 0x00000117, 0x00000108, 0x00000124, 0x00000125, 0x00000126, 0x0000010F, 0x0000012B, 0x0000012C, 0x000000E9, 0x00000106, 0x00000143, 0x000000ED, 0x00000129, 0x0000012A, 0x000000E7, 0x000000F8, 0x000000FF, 0x00000140, 0x00000105, 0x00000110, 0x00000119, 0x000000E3, 0x00000116, 0x00000113, 0x000000F4, 0x000000E2, 0x000000F5, 0x00000115, 0x00000101, 0x00000102, 0x0000012D, 0x00000111, 0x0000010D, 0x00000112, 0x000000F9, 0x00000130, 0x000000FB, 0x000000FA, 0x000000EC, 0x000000E5, 0x00000150, 0x000000F2, 0x00000100, 0x000000F1, 0x00000114, 0x000000F7, 0x000000F3, 0x00000145, 0x00000146, 0x00000147, 0x00000148, 0x00000149, 0x00000104, 0x000000FC, 0x00000103, 0x0000011A, 0x0000011B, 0x000000FD, 0x00000144, 0x0000011E, 0x000000FE, 0x0000011F, 0x0000011D, 0x0000011C, 0x000000E6, 0x00000120, 0x00000080, 0x00000081, 0x00000082, 0x00000084, 0x00000083, 0x00000086, 0x00000085, 0x00000088, 0x0000008B, 0x0000008A, 0x0000008C, 0x0000008E, 0x00000095, 0x0000008D, 0x00000089, 0x0000009B, 0x0000009E, 0x0000009F, 0x000000A0, 0x000000A1, 0x0000009D, 0x0000009C, 0x000000A4, 0x000000A3, 0x000000A2, 0x00000093, 0x00000094, 0x000000A5, 0x000000A6, 0x000000A7, 0x000000A8, 0x000000A9, 0x000000AA, 0x000000AB, 0x000000AC, 0x000000AD, 0x000000AE, 0x000000AF, 0x0000008F, 0x00000090, 0x00000091, 0x00000092, 0x0000009A, 0x00000098, 0x00000096, 0x00000097, 0x00000087, 0x000000B0, 0x000000B1, 0x000000B2, 0x000000B3, 0x000000B4, 0x000000B5, 0x000000B6, 0x000000B9, 0x000000B8, 0x000000B7, 0x000000BA, 0x000000BD, 0x000000BB, 0x000000BE, 0x000000BF, 0x000000BC, 0x000000C0, 0x000000C1, 0x000000C2, 0x000000C3, 0x000000C4, 0x000000C5, 0x000000C6, 0x000000C7, 0x000000C8, 0x000000C9, 0x000000CA, 0x000000CB, 0x000000CC, 0x000000CD, 0x000000CE, 0x000000CF, 0x000000D0, 0x000000D1, 0x000000D2, 0x000000D3, 0x000000D4, 0x000000D5, 0x000000D6, 0x000000D7, 0x000000D8, 0x000000D9, 0x000000DA, 0x00000000, begin_state_init, step_init_state, 0x00000000, state_drawUI_startup, 0x00000000, begin_state_logos, step_logos, 0x00000000, func_80034388, 0x00000000, begin_state_title_screen, step_title_screen, 0x00000000, func_800375A4, 0x00000000, func_80035E00, func_80035EEC, 0x00000000, func_800360FC, 0x00000000, func_80036130, func_8003617C, 0x00000000, func_800363FC, 0x00000000, func_80036430, func_8003646C, 0x00000000, func_80036640, 0x00000000, func_80035E24, func_80035EEC, 0x00000000, func_800360FC, 0x00000000, begin_state_world, step_world, 0x00000000, func_80035DA0, 0x00000000, begin_state_battle, step_battle, 0x00000000, func_80033B54, 0x00000000, func_80033B88, func_80033BC0, 0x00000000, func_80033E64, 0x00000000, begin_state_pause_menu, step_pause_menu, 0x00000000, func_80034BF4, 0x00000000, func_80034BFC, func_80034C3C, 0x00000000, func_80034FF0, 0x00000000, state_init_language_select, state_step_language_select, 0x00000000, state_drawUI_language_select, 0x00000000, func_800355D4, func_80035704, 0x00000000, func_80035D18, 0x00000000, state_init_file_select, func_800354EC, 0x00000000, state_drawUI_file_select, 0x00000000, func_80035660, func_80035B40, 0x00000000, func_80035D20, 0x00000000, begin_state_intro, step_intro, 0x00000000, func_80036DE0, 0x00000000, init_demo_data, next_demo_scene, 0x00000000, func_8003845C glabel D_80077850 .word 0x800776E8, 0x800776FC, 0x80077710, 0x80077724, 0x80077774, 0x80077738, 0x8007774C, 0x80077760, 0x80077788, 0x8007779C, 0x800777B0, 0x800777C4, 0x800777D8, 0x800777EC, 0x80077800, 0x80077814, 0x80077828, 0x8007783C, 0x00000000, 0x00000000 @@ -165,7 +165,7 @@ glabel D_80077C40 .word 0x00000000 glabel D_80077C44 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CreateNpc, 0xFFFFFFF6, 0x00BB0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFF6, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000001, GetCamLookAtObjVector, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFF6, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_8003F0C4, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_8003F018, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFF6, 0x00BB0000, 0x00000043, 0x00000001, func_8003F384, 0x00000043, 0x00000001, UnfadeBackgroundFromBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_8003F084, 0x00000043, 0x00000002, DeleteNpc, 0xFFFFFFF6, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002075, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_8003F414, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_8003F4CC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_8003EE98, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, HasMerleeCasts, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8003EECC, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CreateNpc, 0xFFFFFFF6, 0x00BB0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFF6, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000001, GetCamLookAtObjVector, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFF6, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000001, MerleeUpdateFX, 0x00000057, 0x00000000, 0x00000043, 0x00000001, FadeInMerlee, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFF6, 0x00BB0000, 0x00000043, 0x00000001, MerleeStopFX, 0x00000043, 0x00000001, UnfadeBackgroundFromBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000001, FadeOutMerlee, 0x00000043, 0x00000002, DeleteNpc, 0xFFFFFFF6, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002075, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlayMerleeGatherFX, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlayMerleeOrbFX, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, ShowMerleeCoinMessage, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, HasMerleeCasts, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowMerleeRanOutMessage, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel SCRIPT_NpcDefeat .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, OnDefeatEnemy, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/asm/nonmatchings/battle/area_kkj/6DBDA0/func_8021833C_6DC0DC.s b/asm/nonmatchings/battle/area_kkj/6DBDA0/func_8021833C_6DC0DC.s index 089f5e08ce..52e685fc0d 100644 --- a/asm/nonmatchings/battle/area_kkj/6DBDA0/func_8021833C_6DC0DC.s +++ b/asm/nonmatchings/battle/area_kkj/6DBDA0/func_8021833C_6DC0DC.s @@ -12,15 +12,15 @@ glabel func_8021833C_6DC0DC /* 6DC0F8 80218358 00A0302D */ daddu $a2, $a1, $zero /* 6DC0FC 8021835C 00A0382D */ daddu $a3, $a1, $zero /* 6DC100 80218360 24020014 */ addiu $v0, $zero, 0x14 -/* 6DC104 80218364 0C04DF93 */ jal func_80137E4C +/* 6DC104 80218364 0C04DF93 */ jal set_transition_stencil_center /* 6DC108 80218368 AE020070 */ sw $v0, 0x70($s0) /* 6DC10C 8021836C 24040001 */ addiu $a0, $zero, 1 /* 6DC110 80218370 0080282D */ daddu $a1, $a0, $zero /* 6DC114 80218374 24060140 */ addiu $a2, $zero, 0x140 -/* 6DC118 80218378 0C04DF93 */ jal func_80137E4C +/* 6DC118 80218378 0C04DF93 */ jal set_transition_stencil_center /* 6DC11C 8021837C 240700F0 */ addiu $a3, $zero, 0xf0 /* 6DC120 80218380 3C054316 */ lui $a1, 0x4316 -/* 6DC124 80218384 0C04DF69 */ jal func_80137DA4 +/* 6DC124 80218384 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 6DC128 80218388 2404000C */ addiu $a0, $zero, 0xc .L8021838C: /* 6DC12C 8021838C 8E020070 */ lw $v0, 0x70($s0) @@ -29,15 +29,15 @@ glabel func_8021833C_6DC0DC /* 6DC138 80218398 24040001 */ addiu $a0, $zero, 1 /* 6DC13C 8021839C 0000282D */ daddu $a1, $zero, $zero /* 6DC140 802183A0 00A0302D */ daddu $a2, $a1, $zero -/* 6DC144 802183A4 0C04DF93 */ jal func_80137E4C +/* 6DC144 802183A4 0C04DF93 */ jal set_transition_stencil_center /* 6DC148 802183A8 00A0382D */ daddu $a3, $a1, $zero /* 6DC14C 802183AC 24040001 */ addiu $a0, $zero, 1 /* 6DC150 802183B0 0080282D */ daddu $a1, $a0, $zero /* 6DC154 802183B4 24060140 */ addiu $a2, $zero, 0x140 -/* 6DC158 802183B8 0C04DF93 */ jal func_80137E4C +/* 6DC158 802183B8 0C04DF93 */ jal set_transition_stencil_center /* 6DC15C 802183BC 240700F0 */ addiu $a3, $zero, 0xf0 /* 6DC160 802183C0 3C05BF80 */ lui $a1, 0xbf80 -/* 6DC164 802183C4 0C04DF69 */ jal func_80137DA4 +/* 6DC164 802183C4 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 6DC168 802183C8 240400FF */ addiu $a0, $zero, 0xff /* 6DC16C 802183CC 080860F7 */ j .L802183DC /* 6DC170 802183D0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/area_kkj/6DBDA0/func_802183EC_6DC18C.s b/asm/nonmatchings/battle/area_kkj/6DBDA0/func_802183EC_6DC18C.s index 965ff62e57..bbd87aa90f 100644 --- a/asm/nonmatchings/battle/area_kkj/6DBDA0/func_802183EC_6DC18C.s +++ b/asm/nonmatchings/battle/area_kkj/6DBDA0/func_802183EC_6DC18C.s @@ -12,15 +12,15 @@ glabel func_802183EC_6DC18C /* 6DC1A8 80218408 00A0302D */ daddu $a2, $a1, $zero /* 6DC1AC 8021840C 00A0382D */ daddu $a3, $a1, $zero /* 6DC1B0 80218410 2402001E */ addiu $v0, $zero, 0x1e -/* 6DC1B4 80218414 0C04DF93 */ jal func_80137E4C +/* 6DC1B4 80218414 0C04DF93 */ jal set_transition_stencil_center /* 6DC1B8 80218418 AE020070 */ sw $v0, 0x70($s0) /* 6DC1BC 8021841C 24040001 */ addiu $a0, $zero, 1 /* 6DC1C0 80218420 0080282D */ daddu $a1, $a0, $zero /* 6DC1C4 80218424 24060140 */ addiu $a2, $zero, 0x140 -/* 6DC1C8 80218428 0C04DF93 */ jal func_80137E4C +/* 6DC1C8 80218428 0C04DF93 */ jal set_transition_stencil_center /* 6DC1CC 8021842C 240700F0 */ addiu $a3, $zero, 0xf0 /* 6DC1D0 80218430 3C054316 */ lui $a1, 0x4316 -/* 6DC1D4 80218434 0C04DF69 */ jal func_80137DA4 +/* 6DC1D4 80218434 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 6DC1D8 80218438 2404000C */ addiu $a0, $zero, 0xc .L8021843C: /* 6DC1DC 8021843C 8E020070 */ lw $v0, 0x70($s0) @@ -29,15 +29,15 @@ glabel func_802183EC_6DC18C /* 6DC1E8 80218448 24040001 */ addiu $a0, $zero, 1 /* 6DC1EC 8021844C 0000282D */ daddu $a1, $zero, $zero /* 6DC1F0 80218450 00A0302D */ daddu $a2, $a1, $zero -/* 6DC1F4 80218454 0C04DF93 */ jal func_80137E4C +/* 6DC1F4 80218454 0C04DF93 */ jal set_transition_stencil_center /* 6DC1F8 80218458 00A0382D */ daddu $a3, $a1, $zero /* 6DC1FC 8021845C 24040001 */ addiu $a0, $zero, 1 /* 6DC200 80218460 0080282D */ daddu $a1, $a0, $zero /* 6DC204 80218464 24060140 */ addiu $a2, $zero, 0x140 -/* 6DC208 80218468 0C04DF93 */ jal func_80137E4C +/* 6DC208 80218468 0C04DF93 */ jal set_transition_stencil_center /* 6DC20C 8021846C 240700F0 */ addiu $a3, $zero, 0xf0 /* 6DC210 80218470 3C05BF80 */ lui $a1, 0xbf80 -/* 6DC214 80218474 0C04DF69 */ jal func_80137DA4 +/* 6DC214 80218474 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 6DC218 80218478 240400FF */ addiu $a0, $zero, 0xff /* 6DC21C 8021847C 08086123 */ j .L8021848C /* 6DC220 80218480 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/area_omo2/52B7C0/func_802181F4_52B894.s b/asm/nonmatchings/battle/area_omo2/52B7C0/func_802181F4_52B894.s index 546fbf621c..6154102ecc 100644 --- a/asm/nonmatchings/battle/area_omo2/52B7C0/func_802181F4_52B894.s +++ b/asm/nonmatchings/battle/area_omo2/52B7C0/func_802181F4_52B894.s @@ -17,7 +17,7 @@ glabel func_802181F4_52B894 /* 52B8C4 80218224 00000000 */ nop /* 52B8C8 80218228 46800020 */ cvt.s.w $f0, $f0 /* 52B8CC 8021822C 44050000 */ mfc1 $a1, $f0 -/* 52B8D0 80218230 0C04DF69 */ jal func_80137DA4 +/* 52B8D0 80218230 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 52B8D4 80218234 2404000D */ addiu $a0, $zero, 0xd /* 52B8D8 80218238 8FBF0018 */ lw $ra, 0x18($sp) /* 52B8DC 8021823C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_omo3/5573E0/func_80218000_5573E0.s b/asm/nonmatchings/battle/area_omo3/5573E0/func_80218000_5573E0.s index 68134fe5fb..ca2fd47079 100644 --- a/asm/nonmatchings/battle/area_omo3/5573E0/func_80218000_5573E0.s +++ b/asm/nonmatchings/battle/area_omo3/5573E0/func_80218000_5573E0.s @@ -7,10 +7,10 @@ glabel func_80218000_5573E0 /* 5573E8 80218008 0C09A75B */ jal get_actor /* 5573EC 8021800C 8C840148 */ lw $a0, 0x148($a0) /* 5573F0 80218010 3C05435C */ lui $a1, 0x435c -/* 5573F4 80218014 0C04DF69 */ jal func_80137DA4 +/* 5573F4 80218014 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 5573F8 80218018 2404000D */ addiu $a0, $zero, 0xd /* 5573FC 8021801C 3C054348 */ lui $a1, 0x4348 -/* 557400 80218020 0C04E035 */ jal func_801380D4 +/* 557400 80218020 0C04E035 */ jal set_transition_stencil_alpha /* 557404 80218024 24040001 */ addiu $a0, $zero, 1 /* 557408 80218028 8FBF0010 */ lw $ra, 0x10($sp) /* 55740C 8021802C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/area_omo3/5573E0/func_80218070_557450.s b/asm/nonmatchings/battle/area_omo3/5573E0/func_80218070_557450.s index c77ce5894a..ad489488a2 100644 --- a/asm/nonmatchings/battle/area_omo3/5573E0/func_80218070_557450.s +++ b/asm/nonmatchings/battle/area_omo3/5573E0/func_80218070_557450.s @@ -25,7 +25,7 @@ glabel func_80218070_557450 /* 5574A0 802180C0 0040902D */ daddu $s2, $v0, $zero /* 5574A4 802180C4 16400005 */ bnez $s2, .L802180DC /* 5574A8 802180C8 24040001 */ addiu $a0, $zero, 1 -/* 5574AC 802180CC 0C04E035 */ jal func_801380D4 +/* 5574AC 802180CC 0C04E035 */ jal set_transition_stencil_alpha /* 5574B0 802180D0 0000282D */ daddu $a1, $zero, $zero /* 5574B4 802180D4 08086116 */ j .L80218458 /* 5574B8 802180D8 0000102D */ daddu $v0, $zero, $zero @@ -207,7 +207,7 @@ glabel L8021831C_5576FC /* 557730 80218350 00000000 */ nop /* 557734 80218354 468031A0 */ cvt.s.w $f6, $f6 /* 557738 80218358 44053000 */ mfc1 $a1, $f6 -/* 55773C 8021835C 0C04E035 */ jal func_801380D4 +/* 55773C 8021835C 0C04E035 */ jal set_transition_stencil_alpha /* 557740 80218360 24040001 */ addiu $a0, $zero, 1 /* 557744 80218364 C7A40018 */ lwc1 $f4, 0x18($sp) /* 557748 80218368 46802120 */ cvt.s.w $f4, $f4 @@ -227,7 +227,7 @@ glabel L8021831C_5576FC /* 557780 802183A0 44063000 */ mfc1 $a2, $f6 /* 557784 802183A4 4600018D */ trunc.w.s $f6, $f0 /* 557788 802183A8 44073000 */ mfc1 $a3, $f6 -/* 55778C 802183AC 0C04DFB0 */ jal func_80137EC0 +/* 55778C 802183AC 0C04DFB0 */ jal set_transition_stencil_center_worldpos /* 557790 802183B0 0000282D */ daddu $a1, $zero, $zero /* 557794 802183B4 C7A40018 */ lwc1 $f4, 0x18($sp) /* 557798 802183B8 46802120 */ cvt.s.w $f4, $f4 diff --git a/asm/nonmatchings/battle/move/mega_quake_756780/func_802A10A4_756824.s b/asm/nonmatchings/battle/move/mega_quake_756780/func_802A10A4_756824.s index a9dfed2299..ead9642a6d 100644 --- a/asm/nonmatchings/battle/move/mega_quake_756780/func_802A10A4_756824.s +++ b/asm/nonmatchings/battle/move/mega_quake_756780/func_802A10A4_756824.s @@ -25,15 +25,15 @@ glabel func_802A10A4_756824 /* 756868 802A10E8 24040001 */ addiu $a0, $zero, 1 /* 75686C 802A10EC 0000282D */ daddu $a1, $zero, $zero /* 756870 802A10F0 00A0302D */ daddu $a2, $a1, $zero -/* 756874 802A10F4 0C04DF93 */ jal func_80137E4C +/* 756874 802A10F4 0C04DF93 */ jal set_transition_stencil_center /* 756878 802A10F8 00A0382D */ daddu $a3, $a1, $zero /* 75687C 802A10FC 24040001 */ addiu $a0, $zero, 1 /* 756880 802A1100 0080282D */ daddu $a1, $a0, $zero /* 756884 802A1104 24060140 */ addiu $a2, $zero, 0x140 -/* 756888 802A1108 0C04DF93 */ jal func_80137E4C +/* 756888 802A1108 0C04DF93 */ jal set_transition_stencil_center /* 75688C 802A110C 240700F0 */ addiu $a3, $zero, 0xf0 /* 756890 802A1110 3C054320 */ lui $a1, 0x4320 -/* 756894 802A1114 0C04DF69 */ jal func_80137DA4 +/* 756894 802A1114 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 756898 802A1118 2404000C */ addiu $a0, $zero, 0xc /* 75689C 802A111C 8E020074 */ lw $v0, 0x74($s0) /* 7568A0 802A1120 14400010 */ bnez $v0, .L802A1164 @@ -41,15 +41,15 @@ glabel func_802A10A4_756824 /* 7568A8 802A1128 24040001 */ addiu $a0, $zero, 1 /* 7568AC 802A112C 0000282D */ daddu $a1, $zero, $zero /* 7568B0 802A1130 00A0302D */ daddu $a2, $a1, $zero -/* 7568B4 802A1134 0C04DF93 */ jal func_80137E4C +/* 7568B4 802A1134 0C04DF93 */ jal set_transition_stencil_center /* 7568B8 802A1138 00A0382D */ daddu $a3, $a1, $zero /* 7568BC 802A113C 24040001 */ addiu $a0, $zero, 1 /* 7568C0 802A1140 0080282D */ daddu $a1, $a0, $zero /* 7568C4 802A1144 24060140 */ addiu $a2, $zero, 0x140 -/* 7568C8 802A1148 0C04DF93 */ jal func_80137E4C +/* 7568C8 802A1148 0C04DF93 */ jal set_transition_stencil_center /* 7568CC 802A114C 240700F0 */ addiu $a3, $zero, 0xf0 /* 7568D0 802A1150 2404000C */ addiu $a0, $zero, 0xc -/* 7568D4 802A1154 0C04DF69 */ jal func_80137DA4 +/* 7568D4 802A1154 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 7568D8 802A1158 0000282D */ daddu $a1, $zero, $zero /* 7568DC 802A115C 080A845B */ j .L802A116C /* 7568E0 802A1160 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_10400_len_d30/func_800354EC.s b/asm/nonmatchings/code_10400_len_d30/func_800354EC.s index 2bee8969a0..b72d178e62 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_800354EC.s +++ b/asm/nonmatchings/code_10400_len_d30/func_800354EC.s @@ -24,7 +24,7 @@ glabel func_800354EC /* 10934 80035534 0800D56C */ j .L800355B0 /* 10938 80035538 00000000 */ nop .L8003553C: -/* 1093C 8003553C 0C051FB1 */ jal func_80147EC4 +/* 1093C 8003553C 0C051FB1 */ jal set_windows_visible /* 10940 80035540 24040003 */ addiu $a0, $zero, 3 /* 10944 80035544 24020002 */ addiu $v0, $zero, 2 /* 10948 80035548 3C01800A */ lui $at, %hi(D_800A0930) diff --git a/asm/nonmatchings/code_10400_len_d30/func_800355D4.s b/asm/nonmatchings/code_10400_len_d30/func_800355D4.s index b52b7dfbf9..4183337fd6 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_800355D4.s +++ b/asm/nonmatchings/code_10400_len_d30/func_800355D4.s @@ -25,7 +25,7 @@ glabel func_800355D4 /* 10A20 80035620 3C01800A */ lui $at, %hi(D_800A0931) /* 10A24 80035624 A0220931 */ sb $v0, %lo(D_800A0931)($at) .L80035628: -/* 10A28 80035628 0C04DF62 */ jal func_80137D88 +/* 10A28 80035628 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 10A2C 8003562C 00000000 */ nop /* 10A30 80035630 24020001 */ addiu $v0, $zero, 1 /* 10A34 80035634 3C04800A */ lui $a0, %hi(D_8009A650) diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035704.s b/asm/nonmatchings/code_10400_len_d30/func_80035704.s index 53f752ea1d..84ceb7eb36 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035704.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035704.s @@ -34,7 +34,7 @@ glabel L80035740_10B40 /* 10B70 80035770 00000000 */ nop /* 10B74 80035774 46800020 */ cvt.s.w $f0, $f0 /* 10B78 80035778 44050000 */ mfc1 $a1, $f0 -/* 10B7C 8003577C 0C04DF62 */ jal func_80137D88 +/* 10B7C 8003577C 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 10B80 80035780 0000202D */ daddu $a0, $zero, $zero /* 10B84 80035784 86020000 */ lh $v0, ($s0) /* 10B88 80035788 144000E7 */ bnez $v0, .L80035B28 @@ -65,7 +65,7 @@ glabel L800357A4_10BA4 /* 10BE0 800357E0 00000000 */ nop /* 10BE4 800357E4 46800020 */ cvt.s.w $f0, $f0 /* 10BE8 800357E8 44050000 */ mfc1 $a1, $f0 -/* 10BEC 800357EC 0C04DF62 */ jal func_80137D88 +/* 10BEC 800357EC 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 10BF0 800357F0 0000202D */ daddu $a0, $zero, $zero /* 10BF4 800357F4 86020000 */ lh $v0, ($s0) /* 10BF8 800357F8 145100CB */ bne $v0, $s1, .L80035B28 @@ -203,7 +203,7 @@ glabel L80035814_10C14 /* 10DF0 800359F0 0C009C22 */ jal func_80027088 /* 10DF4 800359F4 24040001 */ addiu $a0, $zero, 1 .L800359F8: -/* 10DF8 800359F8 0C051FB1 */ jal func_80147EC4 +/* 10DF8 800359F8 0C051FB1 */ jal set_windows_visible /* 10DFC 800359FC 0000202D */ daddu $a0, $zero, $zero /* 10E00 80035A00 24020003 */ addiu $v0, $zero, 3 /* 10E04 80035A04 3C01800A */ lui $at, %hi(D_800A0931) @@ -212,9 +212,9 @@ glabel L80035814_10C14 /* 10E10 80035A10 00000000 */ nop /* 10E14 80035A14 0C00E64C */ jal update_npcs /* 10E18 80035A18 00000000 */ nop -/* 10E1C 80035A1C 0C00F949 */ jal func_8003E524 +/* 10E1C 80035A1C 0C00F949 */ jal update_counters /* 10E20 80035A20 00000000 */ nop -/* 10E24 80035A24 0C016754 */ jal func_80059D50 +/* 10E24 80035A24 0C016754 */ jal update_effects /* 10E28 80035A28 00000000 */ nop /* 10E2C 80035A2C 3C03800A */ lui $v1, %hi(D_800A0932) /* 10E30 80035A30 24630932 */ addiu $v1, $v1, %lo(D_800A0932) @@ -237,9 +237,9 @@ glabel L80035A68_10E68 /* 10E6C 80035A6C 00000000 */ nop /* 10E70 80035A70 0C00E64C */ jal update_npcs /* 10E74 80035A74 00000000 */ nop -/* 10E78 80035A78 0C00F949 */ jal func_8003E524 +/* 10E78 80035A78 0C00F949 */ jal update_counters /* 10E7C 80035A7C 00000000 */ nop -/* 10E80 80035A80 0C016754 */ jal func_80059D50 +/* 10E80 80035A80 0C016754 */ jal update_effects /* 10E84 80035A84 00000000 */ nop /* 10E88 80035A88 3C04800A */ lui $a0, %hi(D_800A0932) /* 10E8C 80035A8C 24840932 */ addiu $a0, $a0, %lo(D_800A0932) @@ -272,9 +272,9 @@ glabel L80035AE0_10EE0 /* 10EEC 80035AEC 00000000 */ nop /* 10EF0 80035AF0 0C00E64C */ jal update_npcs /* 10EF4 80035AF4 00000000 */ nop -/* 10EF8 80035AF8 0C00F949 */ jal func_8003E524 +/* 10EF8 80035AF8 0C00F949 */ jal update_counters /* 10EFC 80035AFC 00000000 */ nop -/* 10F00 80035B00 0C016754 */ jal func_80059D50 +/* 10F00 80035B00 0C016754 */ jal update_effects /* 10F04 80035B04 00000000 */ nop /* 10F08 80035B08 0C038069 */ jal enable_player_input /* 10F0C 80035B0C 00000000 */ nop @@ -283,7 +283,7 @@ glabel L80035AE0_10EE0 /* 10F18 80035B18 3C05BF80 */ lui $a1, 0xbf80 /* 10F1C 80035B1C 240400FF */ addiu $a0, $zero, 0xff .L80035B20: -/* 10F20 80035B20 0C04DF62 */ jal func_80137D88 +/* 10F20 80035B20 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 10F24 80035B24 00000000 */ nop .L80035B28: /* 10F28 80035B28 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035B40.s b/asm/nonmatchings/code_10400_len_d30/func_80035B40.s index a33c881b4c..33d79e49be 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035B40.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035B40.s @@ -63,7 +63,7 @@ glabel L80035BDC_10FDC glabel L80035C10_11010 /* 11010 80035C10 0C0912C0 */ jal func_80244B00 /* 11014 80035C14 00000000 */ nop -/* 11018 80035C18 0C051FB1 */ jal func_80147EC4 +/* 11018 80035C18 0C051FB1 */ jal set_windows_visible /* 1101C 80035C1C 0000202D */ daddu $a0, $zero, $zero /* 11020 80035C20 24020003 */ addiu $v0, $zero, 3 /* 11024 80035C24 3C01800A */ lui $at, %hi(D_800A0931) diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035058.s b/asm/nonmatchings/code_10400_len_d30/state_init_file_select.s similarity index 99% rename from asm/nonmatchings/code_10400_len_d30/func_80035058.s rename to asm/nonmatchings/code_10400_len_d30/state_init_file_select.s index cfdae22457..0e3fcec2eb 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035058.s +++ b/asm/nonmatchings/code_10400_len_d30/state_init_file_select.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80035058 +glabel state_init_file_select /* 10458 80035058 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 1045C 8003505C AFBF001C */ sw $ra, 0x1c($sp) /* 10460 80035060 AFB00018 */ sw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035000.s b/asm/nonmatchings/code_10400_len_d30/state_init_language_select.s similarity index 92% rename from asm/nonmatchings/code_10400_len_d30/func_80035000.s rename to asm/nonmatchings/code_10400_len_d30/state_init_language_select.s index 6a9cdc897a..78b93e3759 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035000.s +++ b/asm/nonmatchings/code_10400_len_d30/state_init_language_select.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80035000 +glabel state_init_language_select /* 10400 80035000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 10404 80035004 AFB00010 */ sw $s0, 0x10($sp) /* 10408 80035008 3C10800A */ lui $s0, %hi(D_800A0932) @@ -18,7 +18,7 @@ glabel func_80035000 /* 10434 80035034 00000000 */ nop /* 10438 80035038 46800020 */ cvt.s.w $f0, $f0 /* 1043C 8003503C 44050000 */ mfc1 $a1, $f0 -/* 10440 80035040 0C04DF62 */ jal func_80137D88 +/* 10440 80035040 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 10444 80035044 0000202D */ daddu $a0, $zero, $zero /* 10448 80035048 8FBF0014 */ lw $ra, 0x14($sp) /* 1044C 8003504C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_10400_len_d30/func_800351C8.s b/asm/nonmatchings/code_10400_len_d30/state_step_language_select.s similarity index 95% rename from asm/nonmatchings/code_10400_len_d30/func_800351C8.s rename to asm/nonmatchings/code_10400_len_d30/state_step_language_select.s index d2046fe81c..356d352787 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_800351C8.s +++ b/asm/nonmatchings/code_10400_len_d30/state_step_language_select.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800351C8 +glabel state_step_language_select /* 105C8 800351C8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 105CC 800351CC AFB10014 */ sw $s1, 0x14($sp) /* 105D0 800351D0 3C11800A */ lui $s1, %hi(D_800A0931) @@ -32,9 +32,9 @@ glabel func_800351C8 /* 1062C 8003522C 00000000 */ nop /* 10630 80035230 0C00E64C */ jal update_npcs /* 10634 80035234 00000000 */ nop -/* 10638 80035238 0C00F949 */ jal func_8003E524 +/* 10638 80035238 0C00F949 */ jal update_counters /* 1063C 8003523C 00000000 */ nop -/* 10640 80035240 0C016754 */ jal func_80059D50 +/* 10640 80035240 0C016754 */ jal update_effects /* 10644 80035244 00000000 */ nop /* 10648 80035248 3C10800A */ lui $s0, %hi(D_800A0932) /* 1064C 8003524C 26100932 */ addiu $s0, $s0, %lo(D_800A0932) @@ -56,7 +56,7 @@ glabel func_800351C8 /* 10688 80035288 00000000 */ nop /* 1068C 8003528C 46800020 */ cvt.s.w $f0, $f0 /* 10690 80035290 44050000 */ mfc1 $a1, $f0 -/* 10694 80035294 0C04DF62 */ jal func_80137D88 +/* 10694 80035294 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 10698 80035298 0000202D */ daddu $a0, $zero, $zero /* 1069C 8003529C 86030000 */ lh $v1, ($s0) /* 106A0 800352A0 240200FF */ addiu $v0, $zero, 0xff @@ -109,7 +109,7 @@ glabel func_800351C8 /* 1074C 8003534C 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) /* 10750 80035350 8C430000 */ lw $v1, ($v0) /* 10754 80035354 34630008 */ ori $v1, $v1, 8 -/* 10758 80035358 0C051FB1 */ jal func_80147EC4 +/* 10758 80035358 0C051FB1 */ jal set_windows_visible /* 1075C 8003535C AC430000 */ sw $v1, ($v0) /* 10760 80035360 24020003 */ addiu $v0, $zero, 3 /* 10764 80035364 A2120000 */ sb $s2, ($s0) @@ -144,7 +144,7 @@ glabel func_800351C8 /* 107D4 800353D4 00000000 */ nop /* 107D8 800353D8 0C052010 */ jal func_80148040 /* 107DC 800353DC 00000000 */ nop -/* 107E0 800353E0 0C05177E */ jal func_80145DF8 +/* 107E0 800353E0 0C05177E */ jal use_default_background_settings /* 107E4 800353E4 00000000 */ nop /* 107E8 800353E8 0C0482EC */ jal clear_entity_models /* 107EC 800353EC 00000000 */ nop @@ -182,7 +182,7 @@ glabel func_800351C8 /* 1086C 8003546C 8CC20000 */ lw $v0, ($a2) /* 10870 80035470 3C05437F */ lui $a1, 0x437f /* 10874 80035474 00431024 */ and $v0, $v0, $v1 -/* 10878 80035478 0C04DF62 */ jal func_80137D88 +/* 10878 80035478 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 1087C 8003547C ACC20000 */ sw $v0, ($a2) .L80035480: /* 10880 80035480 82020000 */ lb $v0, ($s0) @@ -205,7 +205,7 @@ glabel func_800351C8 /* 108BC 800354BC 00000000 */ nop /* 108C0 800354C0 46800020 */ cvt.s.w $f0, $f0 /* 108C4 800354C4 44050000 */ mfc1 $a1, $f0 -/* 108C8 800354C8 0C04DF62 */ jal func_80137D88 +/* 108C8 800354C8 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 108CC 800354CC 0000202D */ daddu $a0, $zero, $zero .L800354D0: /* 108D0 800354D0 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s b/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s index 75fb22f553..889b742f1a 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s +++ b/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s @@ -77,7 +77,7 @@ glabel func_80035EEC /* 113F8 80035FF8 0800D83B */ j .L800360EC /* 113FC 80035FFC A4430000 */ sh $v1, ($v0) .L80036000: -/* 11400 80036000 0C00F949 */ jal func_8003E524 +/* 11400 80036000 0C00F949 */ jal update_counters /* 11404 80036004 00000000 */ nop /* 11408 80036008 0C00E64C */ jal update_npcs /* 1140C 8003600C 00000000 */ nop @@ -116,7 +116,7 @@ glabel func_80035EEC /* 11484 80036084 00000000 */ nop /* 11488 80036088 0C037DD0 */ jal update_player /* 1148C 8003608C 00000000 */ nop -/* 11490 80036090 0C016754 */ jal func_80059D50 +/* 11490 80036090 0C016754 */ jal update_effects /* 11494 80036094 00000000 */ nop /* 11498 80036098 0C00B500 */ jal update_cameras /* 1149C 8003609C 00000000 */ nop @@ -136,7 +136,7 @@ glabel func_80035EEC /* 114D4 800360D4 00000000 */ nop .L800360D8: /* 114D8 800360D8 3C05BF80 */ lui $a1, 0xbf80 -/* 114DC 800360DC 0C04DF62 */ jal func_80137D88 +/* 114DC 800360DC 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 114E0 800360E0 240400FF */ addiu $a0, $zero, 0xff /* 114E4 800360E4 0C00CD3C */ jal set_game_mode /* 114E8 800360E8 24040004 */ addiu $a0, $zero, 4 diff --git a/asm/nonmatchings/code_111f0_len_860/func_8003617C.s b/asm/nonmatchings/code_111f0_len_860/func_8003617C.s index f17a69aa00..ce51dff2ef 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_8003617C.s +++ b/asm/nonmatchings/code_111f0_len_860/func_8003617C.s @@ -21,7 +21,7 @@ glabel L800361B4_115B4 /* 115B8 800361B8 00000000 */ nop /* 115BC 800361BC 0C037DD0 */ jal update_player /* 115C0 800361C0 00000000 */ nop -/* 115C4 800361C4 0C016754 */ jal func_80059D50 +/* 115C4 800361C4 0C016754 */ jal update_effects /* 115C8 800361C8 00000000 */ nop /* 115CC 800361CC 0C00B500 */ jal update_cameras /* 115D0 800361D0 00000000 */ nop @@ -104,7 +104,7 @@ glabel L80036244_11644 /* 116F0 800362F0 0800D8FA */ j .L800363E8 /* 116F4 800362F4 A4430000 */ sh $v1, ($v0) glabel L800362F8_116F8 -/* 116F8 800362F8 0C00F949 */ jal func_8003E524 +/* 116F8 800362F8 0C00F949 */ jal update_counters /* 116FC 800362FC 00000000 */ nop /* 11700 80036300 0C00E64C */ jal update_npcs /* 11704 80036304 00000000 */ nop @@ -143,7 +143,7 @@ glabel L8003637C_1177C /* 11780 80036380 00000000 */ nop /* 11784 80036384 0C037DD0 */ jal update_player /* 11788 80036388 00000000 */ nop -/* 1178C 8003638C 0C016754 */ jal func_80059D50 +/* 1178C 8003638C 0C016754 */ jal update_effects /* 11790 80036390 00000000 */ nop /* 11794 80036394 0C00B500 */ jal update_cameras /* 11798 80036398 00000000 */ nop @@ -163,7 +163,7 @@ glabel L8003637C_1177C /* 117D0 800363D0 00000000 */ nop .L800363D4: /* 117D4 800363D4 3C05BF80 */ lui $a1, 0xbf80 -/* 117D8 800363D8 0C04DF62 */ jal func_80137D88 +/* 117D8 800363D8 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 117DC 800363DC 240400FF */ addiu $a0, $zero, 0xff /* 117E0 800363E0 0C00CD3C */ jal set_game_mode /* 117E4 800363E4 24040004 */ addiu $a0, $zero, 4 diff --git a/asm/nonmatchings/code_111f0_len_860/func_8003646C.s b/asm/nonmatchings/code_111f0_len_860/func_8003646C.s index 378c84d231..e67cf700b2 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_8003646C.s +++ b/asm/nonmatchings/code_111f0_len_860/func_8003646C.s @@ -68,7 +68,7 @@ glabel func_8003646C /* 11954 80036554 0800D984 */ j .L80036610 /* 11958 80036558 A6020000 */ sh $v0, ($s0) .L8003655C: -/* 1195C 8003655C 0C00F949 */ jal func_8003E524 +/* 1195C 8003655C 0C00F949 */ jal update_counters /* 11960 80036560 00000000 */ nop /* 11964 80036564 0C00E64C */ jal update_npcs /* 11968 80036568 00000000 */ nop @@ -102,7 +102,7 @@ glabel func_8003646C /* 119D4 800365D4 3C05BF80 */ lui $a1, 0xbf80 /* 119D8 800365D8 24E20001 */ addiu $v0, $a3, 1 /* 119DC 800365DC A4C00000 */ sh $zero, ($a2) -/* 119E0 800365E0 0C04DF62 */ jal func_80137D88 +/* 119E0 800365E0 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 119E4 800365E4 A6020000 */ sh $v0, ($s0) /* 119E8 800365E8 0C00CD3C */ jal set_game_mode /* 119EC 800365EC 24040004 */ addiu $a0, $zero, 4 @@ -111,7 +111,7 @@ glabel func_8003646C /* 119F4 800365F4 00000000 */ nop /* 119F8 800365F8 0C037DD0 */ jal update_player /* 119FC 800365FC 00000000 */ nop -/* 11A00 80036600 0C016754 */ jal func_80059D50 +/* 11A00 80036600 0C016754 */ jal update_effects /* 11A04 80036604 00000000 */ nop /* 11A08 80036608 0C00B500 */ jal update_cameras /* 11A0C 8003660C 00000000 */ nop @@ -122,7 +122,7 @@ glabel func_8003646C /* 11A1C 8003661C 00000000 */ nop /* 11A20 80036620 46800020 */ cvt.s.w $f0, $f0 /* 11A24 80036624 44050000 */ mfc1 $a1, $f0 -/* 11A28 80036628 0C04DF62 */ jal func_80137D88 +/* 11A28 80036628 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 11A2C 8003662C 0000202D */ daddu $a0, $zero, $zero .L80036630: /* 11A30 80036630 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_11a50_len_7a0/begin_state_intro.s b/asm/nonmatchings/code_11a50_len_7a0/begin_state_intro.s index 588899fae4..dd98dbe62c 100644 --- a/asm/nonmatchings/code_11a50_len_7a0/begin_state_intro.s +++ b/asm/nonmatchings/code_11a50_len_7a0/begin_state_intro.s @@ -119,7 +119,7 @@ glabel begin_state_intro /* 11C04 80036804 00000000 */ nop /* 11C08 80036808 46800020 */ cvt.s.w $f0, $f0 /* 11C0C 8003680C 44050000 */ mfc1 $a1, $f0 -/* 11C10 80036810 0C04DF69 */ jal func_80137DA4 +/* 11C10 80036810 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 11C14 80036814 00000000 */ nop /* 11C18 80036818 3C05800A */ lui $a1, %hi(D_800A095B) /* 11C1C 8003681C 90A5095B */ lbu $a1, %lo(D_800A095B)($a1) @@ -127,7 +127,7 @@ glabel begin_state_intro /* 11C24 80036824 90C6095D */ lbu $a2, %lo(D_800A095D)($a2) /* 11C28 80036828 3C07800A */ lui $a3, 0x800a /* 11C2C 8003682C 90E7095F */ lbu $a3, 0x95f($a3) -/* 11C30 80036830 0C04DF84 */ jal func_80137E10 +/* 11C30 80036830 0C04DF84 */ jal set_transition_stencil_color /* 11C34 80036834 24040001 */ addiu $a0, $zero, 1 /* 11C38 80036838 0C00CE1D */ jal intro_logos_update_fade /* 11C3C 8003683C 00000000 */ nop diff --git a/asm/nonmatchings/code_11a50_len_7a0/step_intro.s b/asm/nonmatchings/code_11a50_len_7a0/step_intro.s index bf3426f9a2..48edb017d2 100644 --- a/asm/nonmatchings/code_11a50_len_7a0/step_intro.s +++ b/asm/nonmatchings/code_11a50_len_7a0/step_intro.s @@ -79,7 +79,7 @@ glabel step_intro /* 11D64 80036964 00400008 */ jr $v0 /* 11D68 80036968 00000000 */ nop glabel L8003696C_11D6C -/* 11D6C 8003696C 0C016754 */ jal func_80059D50 +/* 11D6C 8003696C 0C016754 */ jal update_effects /* 11D70 80036970 00000000 */ nop /* 11D74 80036974 0C00B500 */ jal update_cameras /* 11D78 80036978 00000000 */ nop @@ -198,7 +198,7 @@ glabel L80036AA0_11EA0 /* 11F28 80036B28 00000000 */ nop /* 11F2C 80036B2C 0C052010 */ jal func_80148040 /* 11F30 80036B30 00000000 */ nop -/* 11F34 80036B34 0C05177E */ jal func_80145DF8 +/* 11F34 80036B34 0C05177E */ jal use_default_background_settings /* 11F38 80036B38 00000000 */ nop /* 11F3C 80036B3C 0C050440 */ jal func_80141100 /* 11F40 80036B40 00000000 */ nop @@ -208,7 +208,7 @@ glabel L80036AA0_11EA0 /* 11F50 80036B50 00000000 */ nop /* 11F54 80036B54 0C04432E */ jal clear_entity_data /* 11F58 80036B58 0000202D */ daddu $a0, $zero, $zero -/* 11F5C 80036B5C 0C04E042 */ jal func_80138108 +/* 11F5C 80036B5C 0C04E042 */ jal clear_transition_stencil /* 11F60 80036B60 00000000 */ nop /* 11F64 80036B64 0C037F14 */ jal clear_player_status /* 11F68 80036B68 00000000 */ nop @@ -220,7 +220,7 @@ glabel L80036AA0_11EA0 /* 11F80 80036B80 00000000 */ nop /* 11F84 80036B84 0C00F8CE */ jal func_8003E338 /* 11F88 80036B88 00000000 */ nop -/* 11F8C 80036B8C 0C016727 */ jal func_80059C9C +/* 11F8C 80036B8C 0C016727 */ jal clear_effect_data /* 11F90 80036B90 00000000 */ nop /* 11F94 80036B94 0C04C3FC */ jal clear_item_entity_data /* 11F98 80036B98 00000000 */ nop @@ -298,11 +298,11 @@ glabel L80036C40_12040 /* 120A8 80036CA8 00621824 */ and $v1, $v1, $v0 /* 120AC 80036CAC 0C037DD0 */ jal update_player /* 120B0 80036CB0 AC830000 */ sw $v1, ($a0) -/* 120B4 80036CB4 0C00F949 */ jal func_8003E524 +/* 120B4 80036CB4 0C00F949 */ jal update_counters /* 120B8 80036CB8 00000000 */ nop /* 120BC 80036CBC 0C00E64C */ jal update_npcs /* 120C0 80036CC0 00000000 */ nop -/* 120C4 80036CC4 0C016754 */ jal func_80059D50 +/* 120C4 80036CC4 0C016754 */ jal update_effects /* 120C8 80036CC8 00000000 */ nop /* 120CC 80036CCC 0C00B500 */ jal update_cameras /* 120D0 80036CD0 00000000 */ nop @@ -319,7 +319,7 @@ glabel L80036C40_12040 /* 120FC 80036CFC 0800DB5E */ j .L80036D78 /* 12100 80036D00 A4440088 */ sh $a0, 0x88($v0) glabel L80036D04_12104 -/* 12104 80036D04 0C016754 */ jal func_80059D50 +/* 12104 80036D04 0C016754 */ jal update_effects /* 12108 80036D08 00000000 */ nop /* 1210C 80036D0C 0C00B500 */ jal update_cameras /* 12110 80036D10 00000000 */ nop @@ -334,10 +334,10 @@ glabel L80036D04_12104 /* 12134 80036D34 4481A000 */ mtc1 $at, $f20 /* 12138 80036D38 00000000 */ nop /* 1213C 80036D3C 4405A000 */ mfc1 $a1, $f20 -/* 12140 80036D40 0C04DF62 */ jal func_80137D88 +/* 12140 80036D40 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 12144 80036D44 240400FF */ addiu $a0, $zero, 0xff /* 12148 80036D48 4405A000 */ mfc1 $a1, $f20 -/* 1214C 80036D4C 0C04DF69 */ jal func_80137DA4 +/* 1214C 80036D4C 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 12150 80036D50 240400FF */ addiu $a0, $zero, 0xff /* 12154 80036D54 0800DB5E */ j .L80036D78 /* 12158 80036D58 00000000 */ nop @@ -359,7 +359,7 @@ glabel L80036D78_12178 /* 1218C 80036D8C 00000000 */ nop /* 12190 80036D90 46800020 */ cvt.s.w $f0, $f0 /* 12194 80036D94 44050000 */ mfc1 $a1, $f0 -/* 12198 80036D98 0C04DF69 */ jal func_80137DA4 +/* 12198 80036D98 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 1219C 80036D9C 00000000 */ nop /* 121A0 80036DA0 3C05800A */ lui $a1, %hi(D_800A095B) /* 121A4 80036DA4 90A5095B */ lbu $a1, %lo(D_800A095B)($a1) @@ -367,7 +367,7 @@ glabel L80036D78_12178 /* 121AC 80036DAC 90C6095D */ lbu $a2, %lo(D_800A095D)($a2) /* 121B0 80036DB0 3C07800A */ lui $a3, %hi(D_800A095F) /* 121B4 80036DB4 90E7095F */ lbu $a3, %lo(D_800A095F)($a3) -/* 121B8 80036DB8 0C04DF84 */ jal func_80137E10 +/* 121B8 80036DB8 0C04DF84 */ jal set_transition_stencil_color /* 121BC 80036DBC 24040001 */ addiu $a0, $zero, 1 /* 121C0 80036DC0 0C00CE1D */ jal intro_logos_update_fade /* 121C4 80036DC4 00000000 */ nop diff --git a/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s b/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s index 4ee5553eb2..1354f7f46d 100644 --- a/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s +++ b/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s @@ -137,19 +137,19 @@ glabel begin_state_title_screen /* 12400 80037000 00000000 */ nop /* 12404 80037004 0C050440 */ jal func_80141100 /* 12408 80037008 00000000 */ nop -/* 1240C 8003700C 0C05177E */ jal func_80145DF8 +/* 1240C 8003700C 0C05177E */ jal use_default_background_settings /* 12410 80037010 00000000 */ nop /* 12414 80037014 0C04432E */ jal clear_entity_data /* 12418 80037018 24040001 */ addiu $a0, $zero, 1 -/* 1241C 8003701C 0C016727 */ jal func_80059C9C +/* 1241C 8003701C 0C016727 */ jal clear_effect_data /* 12420 80037020 00000000 */ nop /* 12424 80037024 8E420000 */ lw $v0, ($s2) /* 12428 80037028 34420002 */ ori $v0, $v0, 2 /* 1242C 8003702C 0C039CE8 */ jal clear_player_data /* 12430 80037030 AE420000 */ sw $v0, ($s2) /* 12434 80037034 0000202D */ daddu $a0, $zero, $zero -/* 12438 80037038 3C058003 */ lui $a1, %hi(func_80037638) -/* 1243C 8003703C 24A57638 */ addiu $a1, $a1, %lo(func_80037638) +/* 12438 80037038 3C058003 */ lui $a1, %hi(title_append_gfx) +/* 1243C 8003703C 24A57638 */ addiu $a1, $a1, %lo(title_append_gfx) /* 12440 80037040 8E420000 */ lw $v0, ($s2) /* 12444 80037044 2403FFF7 */ addiu $v1, $zero, -9 /* 12448 80037048 00431024 */ and $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s b/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s index b5afc217d6..4a3da46a83 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s @@ -32,7 +32,7 @@ glabel L800375F4_129F4 /* 12A08 80037608 30420001 */ andi $v0, $v0, 1 /* 12A0C 8003760C 10400007 */ beqz $v0, .L8003762C /* 12A10 80037610 00000000 */ nop -/* 12A14 80037614 0C00DEF2 */ jal func_80037BC8 +/* 12A14 80037614 0C00DEF2 */ jal title_draw_press_start /* 12A18 80037618 00000000 */ nop /* 12A1C 8003761C 0800DD8B */ j .L8003762C /* 12A20 80037620 00000000 */ nop diff --git a/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s b/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s index 7cef8bbe01..04ff0c2319 100644 --- a/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s +++ b/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s @@ -281,7 +281,7 @@ glabel L80037450_12850 /* 128B0 800374B0 0000202D */ daddu $a0, $zero, $zero /* 128B4 800374B4 0C04432E */ jal clear_entity_data /* 128B8 800374B8 24040001 */ addiu $a0, $zero, 1 -/* 128BC 800374BC 0C051CFC */ jal func_801473F0 +/* 128BC 800374BC 0C051CFC */ jal clear_windows /* 128C0 800374C0 00000000 */ nop /* 128C4 800374C4 3C04800A */ lui $a0, %hi(D_8009A650) /* 128C8 800374C8 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037638.s b/asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s similarity index 99% rename from asm/nonmatchings/code_121f0_len_1290/func_80037638.s rename to asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s index d7229b3fe7..36fcd0627e 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037638.s +++ b/asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80037638 +glabel title_append_gfx /* 12A38 80037638 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 12A3C 8003763C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 12A40 80037640 27BDFFC8 */ addiu $sp, $sp, -0x38 @@ -62,7 +62,7 @@ glabel L800376D4_12AD4 /* 12B08 80037708 460C6302 */ mul.s $f12, $f12, $f12 /* 12B0C 8003770C 00000000 */ nop .L80037710: -/* 12B10 80037710 0C00DE5A */ jal func_80037968 +/* 12B10 80037710 0C00DE5A */ jal title_draw_images /* 12B14 80037714 46006386 */ mov.s $f14, $f12 .L80037718: glabel L80037718_12B18 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s b/asm/nonmatchings/code_121f0_len_1290/title_draw_copyright.s similarity index 99% rename from asm/nonmatchings/code_121f0_len_1290/func_80037E14.s rename to asm/nonmatchings/code_121f0_len_1290/title_draw_copyright.s index e17aa96af1..a4eb42b30f 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s +++ b/asm/nonmatchings/code_121f0_len_1290/title_draw_copyright.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80037E14 +glabel title_draw_copyright /* 13214 80037E14 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 13218 80037E18 3C07800A */ lui $a3, %hi(gMasterGfxPos) /* 1321C 80037E1C 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037968.s b/asm/nonmatchings/code_121f0_len_1290/title_draw_images.s similarity index 80% rename from asm/nonmatchings/code_121f0_len_1290/func_80037968.s rename to asm/nonmatchings/code_121f0_len_1290/title_draw_images.s index b1971e5098..0d919f9e13 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037968.s +++ b/asm/nonmatchings/code_121f0_len_1290/title_draw_images.s @@ -1,13 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80037968 +glabel title_draw_images /* 12D68 80037968 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 12D6C 8003796C F7B40018 */ sdc1 $f20, 0x18($sp) /* 12D70 80037970 AFBF0010 */ sw $ra, 0x10($sp) -/* 12D74 80037974 0C00DE65 */ jal func_80037994 +/* 12D74 80037974 0C00DE65 */ jal title_draw_logo /* 12D78 80037978 46007506 */ mov.s $f20, $f14 -/* 12D7C 8003797C 0C00DF85 */ jal func_80037E14 +/* 12D7C 8003797C 0C00DF85 */ jal title_draw_copyright /* 12D80 80037980 4600A306 */ mov.s $f12, $f20 /* 12D84 80037984 8FBF0010 */ lw $ra, 0x10($sp) /* 12D88 80037988 D7B40018 */ ldc1 $f20, 0x18($sp) diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037994.s b/asm/nonmatchings/code_121f0_len_1290/title_draw_logo.s similarity index 99% rename from asm/nonmatchings/code_121f0_len_1290/func_80037994.s rename to asm/nonmatchings/code_121f0_len_1290/title_draw_logo.s index ba7fe6188b..bad99f138b 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037994.s +++ b/asm/nonmatchings/code_121f0_len_1290/title_draw_logo.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80037994 +glabel title_draw_logo /* 12D94 80037994 27BDFFF8 */ addiu $sp, $sp, -8 /* 12D98 80037998 0000602D */ daddu $t4, $zero, $zero /* 12D9C 8003799C 3C02800A */ lui $v0, %hi(gMasterGfxPos) diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s b/asm/nonmatchings/code_121f0_len_1290/title_draw_press_start.s similarity index 99% rename from asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s rename to asm/nonmatchings/code_121f0_len_1290/title_draw_press_start.s index c1ec6f0999..d2d616ae9c 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s +++ b/asm/nonmatchings/code_121f0_len_1290/title_draw_press_start.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80037BC8 +glabel title_draw_press_start /* 12FC8 80037BC8 3C048007 */ lui $a0, %hi(D_80077A2C) /* 12FCC 80037BCC 24847A2C */ addiu $a0, $a0, %lo(D_80077A2C) /* 12FD0 80037BD0 8C830000 */ lw $v1, ($a0) diff --git a/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s b/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s index c1c0432675..6bcfafe651 100644 --- a/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s +++ b/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s @@ -112,7 +112,7 @@ glabel L800381C8_135C8 /* 1368C 8003828C 00000000 */ nop /* 13690 80038290 0C052010 */ jal func_80148040 /* 13694 80038294 00000000 */ nop -/* 13698 80038298 0C05177E */ jal func_80145DF8 +/* 13698 80038298 0C05177E */ jal use_default_background_settings /* 1369C 8003829C 00000000 */ nop /* 136A0 800382A0 0C050440 */ jal func_80141100 /* 136A4 800382A4 00000000 */ nop @@ -122,7 +122,7 @@ glabel L800381C8_135C8 /* 136B4 800382B4 00000000 */ nop /* 136B8 800382B8 0C04432E */ jal clear_entity_data /* 136BC 800382BC 0000202D */ daddu $a0, $zero, $zero -/* 136C0 800382C0 0C04E042 */ jal func_80138108 +/* 136C0 800382C0 0C04E042 */ jal clear_transition_stencil /* 136C4 800382C4 00000000 */ nop /* 136C8 800382C8 0C037F14 */ jal clear_player_status /* 136CC 800382CC 00000000 */ nop @@ -134,7 +134,7 @@ glabel L800381C8_135C8 /* 136E4 800382E4 00000000 */ nop /* 136E8 800382E8 0C00F8CE */ jal func_8003E338 /* 136EC 800382EC 00000000 */ nop -/* 136F0 800382F0 0C016727 */ jal func_80059C9C +/* 136F0 800382F0 0C016727 */ jal clear_effect_data /* 136F4 800382F4 00000000 */ nop /* 136F8 800382F8 0C04C3FC */ jal clear_item_entity_data /* 136FC 800382FC 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/func_80242FF4.s b/asm/nonmatchings/code_135EE0/func_80242FF4.s index f56b050171..a96a6ceaa6 100644 --- a/asm/nonmatchings/code_135EE0/func_80242FF4.s +++ b/asm/nonmatchings/code_135EE0/func_80242FF4.s @@ -23,7 +23,7 @@ glabel func_80242FF4 /* 136378 80243038 16220005 */ bne $s1, $v0, .L80243050 /* 13637C 8024303C 2A22000A */ slti $v0, $s1, 0xa /* 136380 80243040 92050002 */ lbu $a1, 2($s0) -/* 136384 80243044 0C051F5C */ jal func_80147D70 +/* 136384 80243044 0C051F5C */ jal update_window_hierarchy /* 136388 80243048 00000000 */ nop /* 13638C 8024304C 2A22000A */ slti $v0, $s1, 0xa .L80243050: diff --git a/asm/nonmatchings/code_135EE0/func_80243090.s b/asm/nonmatchings/code_135EE0/func_80243090.s index 8b58e922bd..68e28558b5 100644 --- a/asm/nonmatchings/code_135EE0/func_80243090.s +++ b/asm/nonmatchings/code_135EE0/func_80243090.s @@ -12,7 +12,7 @@ glabel func_80243090 /* 1363EC 802430AC 9202001C */ lbu $v0, 0x1c($s0) /* 1363F0 802430B0 14400008 */ bnez $v0, .L802430D4 /* 1363F4 802430B4 00000000 */ nop -/* 1363F8 802430B8 0C051F5C */ jal func_80147D70 +/* 1363F8 802430B8 0C051F5C */ jal update_window_hierarchy /* 1363FC 802430BC 92050002 */ lbu $a1, 2($s0) /* 136400 802430C0 8FA20040 */ lw $v0, 0x40($sp) /* 136404 802430C4 AC400000 */ sw $zero, ($v0) diff --git a/asm/nonmatchings/code_135EE0/pause_cleanup.s b/asm/nonmatchings/code_135EE0/pause_cleanup.s index 55bd55bd0a..936bc52222 100644 --- a/asm/nonmatchings/code_135EE0/pause_cleanup.s +++ b/asm/nonmatchings/code_135EE0/pause_cleanup.s @@ -53,14 +53,14 @@ glabel pause_cleanup /* 137AF4 802447B4 24100016 */ addiu $s0, $zero, 0x16 /* 137AF8 802447B8 0200202D */ daddu $a0, $s0, $zero .L802447BC: -/* 137AFC 802447BC 0C051F9F */ jal func_80147E7C +/* 137AFC 802447BC 0C051F9F */ jal set_window_update /* 137B00 802447C0 24050002 */ addiu $a1, $zero, 2 /* 137B04 802447C4 26100001 */ addiu $s0, $s0, 1 /* 137B08 802447C8 2A02002C */ slti $v0, $s0, 0x2c /* 137B0C 802447CC 1440FFFB */ bnez $v0, .L802447BC /* 137B10 802447D0 0200202D */ daddu $a0, $s0, $zero /* 137B14 802447D4 2404002C */ addiu $a0, $zero, 0x2c -/* 137B18 802447D8 0C051F9F */ jal func_80147E7C +/* 137B18 802447D8 0C051F9F */ jal set_window_update /* 137B1C 802447DC 24050002 */ addiu $a1, $zero, 2 /* 137B20 802447E0 8FBF0018 */ lw $ra, 0x18($sp) /* 137B24 802447E4 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_135EE0/pause_init.s b/asm/nonmatchings/code_135EE0/pause_init.s index 514d3eb907..7273d8fc0b 100644 --- a/asm/nonmatchings/code_135EE0/pause_init.s +++ b/asm/nonmatchings/code_135EE0/pause_init.s @@ -50,7 +50,7 @@ glabel pause_init /* 13744C 8024410C 8C4200E8 */ lw $v0, %lo(gPauseMenuCommonIconIDs)($v0) /* 137450 80244110 3C018027 */ lui $at, %hi(D_802700D0) /* 137454 80244114 AC2200D0 */ sw $v0, %lo(D_802700D0)($at) -/* 137458 80244118 0C051FCC */ jal func_80147F30 +/* 137458 80244118 0C051FCC */ jal setup_pause_menu_tab /* 13745C 8024411C 0000882D */ daddu $s1, $zero, $zero /* 137460 80244120 3C018027 */ lui $at, %hi(D_80270108) /* 137464 80244124 AC200108 */ sw $zero, %lo(D_80270108)($at) @@ -93,7 +93,7 @@ glabel pause_init /* 1374EC 802441AC 14400006 */ bnez $v0, .L802441C8 /* 1374F0 802441B0 02751821 */ addu $v1, $s3, $s5 /* 1374F4 802441B4 0240202D */ daddu $a0, $s2, $zero -/* 1374F8 802441B8 0C051F9F */ jal func_80147E7C +/* 1374F8 802441B8 0C051F9F */ jal set_window_update /* 1374FC 802441BC 24050002 */ addiu $a1, $zero, 2 /* 137500 802441C0 08091076 */ j .L802441D8 /* 137504 802441C4 2673FFE0 */ addiu $s3, $s3, -0x20 @@ -138,13 +138,13 @@ glabel pause_init /* 137594 80244254 1440FFF8 */ bnez $v0, .L80244238 /* 137598 80244258 26520004 */ addiu $s2, $s2, 4 /* 13759C 8024425C 24040018 */ addiu $a0, $zero, 0x18 -/* 1375A0 80244260 0C051F9F */ jal func_80147E7C +/* 1375A0 80244260 0C051F9F */ jal set_window_update /* 1375A4 80244264 24050001 */ addiu $a1, $zero, 1 /* 1375A8 80244268 0C05272D */ jal play_sound /* 1375AC 8024426C 24040009 */ addiu $a0, $zero, 9 .L80244270: /* 1375B0 80244270 2404002C */ addiu $a0, $zero, 0x2c -/* 1375B4 80244274 0C051F5C */ jal func_80147D70 +/* 1375B4 80244274 0C051F5C */ jal update_window_hierarchy /* 1375B8 80244278 24050040 */ addiu $a1, $zero, 0x40 /* 1375BC 8024427C 8FBF0028 */ lw $ra, 0x28($sp) /* 1375C0 80244280 8FB50024 */ lw $s5, 0x24($sp) diff --git a/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s index 3480a14fba..74edeb965c 100644 --- a/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s @@ -121,7 +121,7 @@ glabel pause_textbox_draw_contents /* 136A78 80243738 AD020004 */ sw $v0, 4($t0) /* 136A7C 8024373C 2402000A */ addiu $v0, $zero, 0xa /* 136A80 80243740 AFA20010 */ sw $v0, 0x10($sp) -/* 136A84 80243744 0C04993B */ jal draw_string +/* 136A84 80243744 0C04993B */ jal draw_msg /* 136A88 80243748 AFA00014 */ sw $zero, 0x14($sp) /* 136A8C 8024374C 3C128027 */ lui $s2, %hi(D_80270118) /* 136A90 80243750 26520118 */ addiu $s2, $s2, %lo(D_80270118) diff --git a/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s index 5cb39cd61b..0ac26b8814 100644 --- a/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s @@ -322,7 +322,7 @@ glabel pause_tutorial_draw_contents /* 137014 80243CD4 240700FF */ addiu $a3, $zero, 0xff /* 137018 80243CD8 AFA00010 */ sw $zero, 0x10($sp) /* 13701C 80243CDC AFB40014 */ sw $s4, 0x14($sp) -/* 137020 80243CE0 0C04993B */ jal draw_string +/* 137020 80243CE0 0C04993B */ jal draw_msg /* 137024 80243CE4 01F02821 */ addu $a1, $t7, $s0 /* 137028 80243CE8 3C158025 */ lui $s5, %hi(D_8024F018) /* 13702C 80243CEC 26B5F018 */ addiu $s5, $s5, %lo(D_8024F018) @@ -444,7 +444,7 @@ glabel pause_tutorial_draw_contents /* 1371FC 80243EBC 8FAF0128 */ lw $t7, 0x128($sp) /* 137200 80243EC0 01D02821 */ addu $a1, $t6, $s0 /* 137204 80243EC4 01E63021 */ addu $a2, $t7, $a2 -/* 137208 80243EC8 0C04993B */ jal draw_string +/* 137208 80243EC8 0C04993B */ jal draw_msg /* 13720C 80243ECC 00C23023 */ subu $a2, $a2, $v0 /* 137210 80243ED0 8EA30000 */ lw $v1, ($s5) /* 137214 80243ED4 8FAE012C */ lw $t6, 0x12c($sp) @@ -529,7 +529,7 @@ glabel pause_tutorial_draw_contents /* 13734C 8024400C 240700FF */ addiu $a3, $zero, 0xff /* 137350 80244010 AFB60010 */ sw $s6, 0x10($sp) /* 137354 80244014 AFA00014 */ sw $zero, 0x14($sp) -/* 137358 80244018 0C04993B */ jal draw_string +/* 137358 80244018 0C04993B */ jal draw_msg /* 13735C 8024401C 25C6002C */ addiu $a2, $t6, 0x2c .L80244020: /* 137360 80244020 8FBF00FC */ lw $ra, 0xfc($sp) diff --git a/asm/nonmatchings/code_1370_len_7d0/func_80026164.s b/asm/nonmatchings/code_1370_len_7d0/gfx_task_main.s similarity index 99% rename from asm/nonmatchings/code_1370_len_7d0/func_80026164.s rename to asm/nonmatchings/code_1370_len_7d0/gfx_task_main.s index e9aea249e8..ff18c7e92a 100644 --- a/asm/nonmatchings/code_1370_len_7d0/func_80026164.s +++ b/asm/nonmatchings/code_1370_len_7d0/gfx_task_main.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80026164 +glabel gfx_task_main /* 1564 80026164 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 1568 80026168 3C048007 */ lui $a0, %hi(gCurrentDisplayContextIndex) /* 156C 8002616C 8C8441F4 */ lw $a0, %lo(gCurrentDisplayContextIndex)($a0) @@ -37,7 +37,7 @@ glabel func_80026164 /* 15E4 800261E4 AE420000 */ sw $v0, ($s2) /* 15E8 800261E8 3C118007 */ lui $s1, %hi(D_80073E04) /* 15EC 800261EC 8E313E04 */ lw $s1, %lo(D_80073E04)($s1) -/* 15F0 800261F0 0C009C68 */ jal func_800271A0 +/* 15F0 800261F0 0C009C68 */ jal gfx_init_state /* 15F4 800261F4 3C13070F */ lui $s3, 0x70f /* 15F8 800261F8 3C06FF10 */ lui $a2, 0xff10 /* 15FC 800261FC 34C6013F */ ori $a2, $a2, 0x13f diff --git a/asm/nonmatchings/code_137ED0/pause_tabs_handle_input.s b/asm/nonmatchings/code_137ED0/pause_tabs_handle_input.s index 654df650ad..4f3dd4577b 100644 --- a/asm/nonmatchings/code_137ED0/pause_tabs_handle_input.s +++ b/asm/nonmatchings/code_137ED0/pause_tabs_handle_input.s @@ -93,7 +93,7 @@ glabel pause_tabs_handle_input /* 1387DC 8024549C 9084F1D8 */ lbu $a0, %lo(D_8024F1D8)($a0) /* 1387E0 802454A0 3C068024 */ lui $a2, %hi(func_80243090) /* 1387E4 802454A4 24C63090 */ addiu $a2, $a2, %lo(func_80243090) -/* 1387E8 802454A8 0C051F92 */ jal func_80147E48 +/* 1387E8 802454A8 0C051F92 */ jal replace_window_update /* 1387EC 802454AC 24050040 */ addiu $a1, $zero, 0x40 /* 1387F0 802454B0 8E220000 */ lw $v0, ($s1) /* 1387F4 802454B4 3C048025 */ lui $a0, %hi(D_8024F1D8) @@ -101,7 +101,7 @@ glabel pause_tabs_handle_input /* 1387FC 802454BC 9084F1D8 */ lbu $a0, %lo(D_8024F1D8)($a0) /* 138800 802454C0 3C068024 */ lui $a2, %hi(func_80242FF4) /* 138804 802454C4 24C62FF4 */ addiu $a2, $a2, %lo(func_80242FF4) -/* 138808 802454C8 0C051F92 */ jal func_80147E48 +/* 138808 802454C8 0C051F92 */ jal replace_window_update /* 13880C 802454CC 24050040 */ addiu $a1, $zero, 0x40 /* 138810 802454D0 3C048016 */ lui $a0, %hi(D_8015A070) /* 138814 802454D4 2484A070 */ addiu $a0, $a0, %lo(D_8015A070) diff --git a/asm/nonmatchings/code_137ED0/pause_tabs_init.s b/asm/nonmatchings/code_137ED0/pause_tabs_init.s index e6917009c6..fc95fa6cd0 100644 --- a/asm/nonmatchings/code_137ED0/pause_tabs_init.s +++ b/asm/nonmatchings/code_137ED0/pause_tabs_init.s @@ -36,7 +36,7 @@ glabel pause_tabs_init /* 13863C 802452FC 2442FFDC */ addiu $v0, $v0, -0x24 /* 138640 80245300 3C048025 */ lui $a0, %hi(D_8024F1E8) /* 138644 80245304 2484F1E8 */ addiu $a0, $a0, %lo(D_8024F1E8) -/* 138648 80245308 0C051FCC */ jal func_80147F30 +/* 138648 80245308 0C051FCC */ jal setup_pause_menu_tab /* 13864C 8024530C 24050007 */ addiu $a1, $zero, 7 /* 138650 80245310 24020019 */ addiu $v0, $zero, 0x19 /* 138654 80245314 3C018016 */ lui $at, %hi(D_8015A2BE) diff --git a/asm/nonmatchings/code_137ED0/pause_tabs_update.s b/asm/nonmatchings/code_137ED0/pause_tabs_update.s index 9031b825cf..a9bc164e45 100644 --- a/asm/nonmatchings/code_137ED0/pause_tabs_update.s +++ b/asm/nonmatchings/code_137ED0/pause_tabs_update.s @@ -183,7 +183,7 @@ glabel pause_tabs_update /* 138B94 80245854 26100001 */ addiu $s0, $s0, 1 .L80245858: /* 138B98 80245858 92240000 */ lbu $a0, ($s1) -/* 138B9C 8024585C 0C051F9F */ jal func_80147E7C +/* 138B9C 8024585C 0C051F9F */ jal set_window_update /* 138BA0 80245860 0240282D */ daddu $a1, $s2, $zero /* 138BA4 80245864 24040001 */ addiu $a0, $zero, 1 /* 138BA8 80245868 26100001 */ addiu $s0, $s0, 1 @@ -225,7 +225,7 @@ glabel pause_tabs_update /* 138C2C 802458EC 3C048025 */ lui $a0, %hi(D_8024F1E0) /* 138C30 802458F0 00822021 */ addu $a0, $a0, $v0 /* 138C34 802458F4 9084F1E0 */ lbu $a0, %lo(D_8024F1E0)($a0) -/* 138C38 802458F8 0C051F9F */ jal func_80147E7C +/* 138C38 802458F8 0C051F9F */ jal set_window_update /* 138C3C 802458FC 0280282D */ daddu $a1, $s4, $zero .L80245900: /* 138C40 80245900 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s b/asm/nonmatchings/code_13870_len_6980/draw_encounter_ui.s similarity index 79% rename from asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s rename to asm/nonmatchings/code_13870_len_6980/draw_encounter_ui.s index 7fef003fa5..17260f3292 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s +++ b/asm/nonmatchings/code_13870_len_6980/draw_encounter_ui.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8003E5B0 +glabel draw_encounter_ui /* 199B0 8003E5B0 3C03800A */ lui $v1, %hi(gGameState) /* 199B4 8003E5B4 8C63A600 */ lw $v1, %lo(gGameState)($v1) /* 199B8 8003E5B8 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -15,31 +15,31 @@ glabel func_8003E5B0 /* 199D8 8003E5D8 00400008 */ jr $v0 /* 199DC 8003E5DC 00000000 */ nop glabel L8003E5E0_199E0 -/* 199E0 8003E5E0 0C011050 */ jal func_80044140 +/* 199E0 8003E5E0 0C011050 */ jal init_encounters_ui /* 199E4 8003E5E4 00000000 */ nop /* 199E8 8003E5E8 0800F98A */ j .L8003E628 /* 199EC 8003E5EC 00000000 */ nop glabel L8003E5F0_199F0 -/* 199F0 8003E5F0 0C0104D7 */ jal func_8004135C +/* 199F0 8003E5F0 0C0104D7 */ jal draw_encounters_neutral /* 199F4 8003E5F4 00000000 */ nop /* 199F8 8003E5F8 0800F98A */ j .L8003E628 /* 199FC 8003E5FC 00000000 */ nop glabel L8003E600_19A00 -/* 19A00 8003E600 0C010659 */ jal func_80041964 +/* 19A00 8003E600 0C010659 */ jal draw_encounters_pre_battle /* 19A04 8003E604 00000000 */ nop /* 19A08 8003E608 0800F98A */ j .L8003E628 /* 19A0C 8003E60C 00000000 */ nop glabel L8003E610_19A10 -/* 19A10 8003E610 0C010C75 */ jal func_800431D4 +/* 19A10 8003E610 0C010C75 */ jal draw_encounters_conversation /* 19A14 8003E614 00000000 */ nop /* 19A18 8003E618 0800F98A */ j .L8003E628 /* 19A1C 8003E61C 00000000 */ nop glabel L8003E620_19A20 -/* 19A20 8003E620 0C010C13 */ jal func_8004304C +/* 19A20 8003E620 0C010C13 */ jal draw_encounters_post_battle /* 19A24 8003E624 00000000 */ nop .L8003E628: glabel L8003E628_19A28 -/* 19A28 8003E628 0C01170A */ jal func_80045C28 +/* 19A28 8003E628 0C01170A */ jal draw_merlee_messages /* 19A2C 8003E62C 00000000 */ nop /* 19A30 8003E630 8FBF0010 */ lw $ra, 0x10($sp) /* 19A34 8003E634 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E63C.s b/asm/nonmatchings/code_13870_len_6980/draw_first_strike_ui.s similarity index 96% rename from asm/nonmatchings/code_13870_len_6980/func_8003E63C.s rename to asm/nonmatchings/code_13870_len_6980/draw_first_strike_ui.s index 208a8ef977..32d9623400 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E63C.s +++ b/asm/nonmatchings/code_13870_len_6980/draw_first_strike_ui.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8003E63C +glabel draw_first_strike_ui /* 19A3C 8003E63C 3C03800A */ lui $v1, %hi(gGameState) /* 19A40 8003E640 8C63A600 */ lw $v1, %lo(gGameState)($v1) /* 19A44 8003E644 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003AC5C.s b/asm/nonmatchings/code_13870_len_6980/set_npc_sprite.s similarity index 99% rename from asm/nonmatchings/code_13870_len_6980/func_8003AC5C.s rename to asm/nonmatchings/code_13870_len_6980/set_npc_sprite.s index 4da1f11f75..098875c054 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003AC5C.s +++ b/asm/nonmatchings/code_13870_len_6980/set_npc_sprite.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8003AC5C +glabel set_npc_sprite /* 1605C 8003AC5C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 16060 8003AC60 AFB00010 */ sw $s0, 0x10($sp) /* 16064 8003AC64 0080802D */ daddu $s0, $a0, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E524.s b/asm/nonmatchings/code_13870_len_6980/update_counters.s similarity index 79% rename from asm/nonmatchings/code_13870_len_6980/func_8003E524.s rename to asm/nonmatchings/code_13870_len_6980/update_counters.s index 2929fd7803..9f38c3f5d6 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E524.s +++ b/asm/nonmatchings/code_13870_len_6980/update_counters.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8003E524 +glabel update_counters /* 19924 8003E524 3C03800A */ lui $v1, %hi(gGameState) /* 19928 8003E528 8C63A600 */ lw $v1, %lo(gGameState)($v1) /* 1992C 8003E52C 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -15,31 +15,31 @@ glabel func_8003E524 /* 1994C 8003E54C 00400008 */ jr $v0 /* 19950 8003E550 00000000 */ nop glabel L8003E554_19954 -/* 19954 8003E554 0C010DAC */ jal create_npcs +/* 19954 8003E554 0C010DAC */ jal create_encounters /* 19958 8003E558 00000000 */ nop /* 1995C 8003E55C 0800F967 */ j .L8003E59C /* 19960 8003E560 00000000 */ nop glabel L8003E564_19964 -/* 19964 8003E564 0C00FDF3 */ jal func_8003F7CC +/* 19964 8003E564 0C00FDF3 */ jal update_encounters_neutral /* 19968 8003E568 00000000 */ nop /* 1996C 8003E56C 0800F967 */ j .L8003E59C /* 19970 8003E570 00000000 */ nop glabel L8003E574_19974 -/* 19974 8003E574 0C0104D9 */ jal func_80041364 +/* 19974 8003E574 0C0104D9 */ jal update_encounters_pre_battle /* 19978 8003E578 00000000 */ nop /* 1997C 8003E57C 0800F967 */ j .L8003E59C /* 19980 8003E580 00000000 */ nop glabel L8003E584_19984 -/* 19984 8003E584 0C010C27 */ jal func_8004309C +/* 19984 8003E584 0C010C27 */ jal update_encounters_conversation /* 19988 8003E588 00000000 */ nop /* 1998C 8003E58C 0800F967 */ j .L8003E59C /* 19990 8003E590 00000000 */ nop glabel L8003E594_19994 -/* 19994 8003E594 0C0107C4 */ jal func_80041F10 +/* 19994 8003E594 0C0107C4 */ jal update_encounters_post_battle /* 19998 8003E598 00000000 */ nop .L8003E59C: glabel L8003E59C_1999C -/* 1999C 8003E59C 0C0116DA */ jal func_80045B68 +/* 1999C 8003E59C 0C0116DA */ jal update_merlee_messages /* 199A0 8003E5A0 00000000 */ nop /* 199A4 8003E5A4 8FBF0010 */ lw $ra, 0x10($sp) /* 199A8 8003E5A8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s index 5f70be8b8c..f193b44ad1 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s @@ -413,7 +413,7 @@ glabel pause_badges_draw_contents /* 13AE5C 80247B1C 8FAA0064 */ lw $t2, 0x64($sp) /* 13AE60 80247B20 00543021 */ addu $a2, $v0, $s4 /* 13AE64 80247B24 AFAB0010 */ sw $t3, 0x10($sp) -/* 13AE68 80247B28 0C04993B */ jal draw_string +/* 13AE68 80247B28 0C04993B */ jal draw_msg /* 13AE6C 80247B2C AFAA0014 */ sw $t2, 0x14($sp) /* 13AE70 80247B30 08091F09 */ j .L80247C24 /* 13AE74 80247B34 00000000 */ nop @@ -443,7 +443,7 @@ glabel pause_badges_draw_contents /* 13AED0 80247B90 AFAA0010 */ sw $t2, 0x10($sp) /* 13AED4 80247B94 AFAB0014 */ sw $t3, 0x14($sp) /* 13AED8 80247B98 8E240000 */ lw $a0, ($s1) -/* 13AEDC 80247B9C 0C04993B */ jal draw_string +/* 13AEDC 80247B9C 0C04993B */ jal draw_msg /* 13AEE0 80247BA0 00543021 */ addu $a2, $v0, $s4 .L80247BA4: /* 13AEE4 80247BA4 0C091CAA */ jal pause_badges_scroll_offset_x @@ -1006,7 +1006,7 @@ glabel pause_badges_draw_contents /* 13B71C 802483DC AFA20014 */ sw $v0, 0x14($sp) /* 13B720 802483E0 25650010 */ addiu $a1, $t3, 0x10 /* 13B724 802483E4 2550004A */ addiu $s0, $t2, 0x4a -/* 13B728 802483E8 0C04993B */ jal draw_string +/* 13B728 802483E8 0C04993B */ jal draw_msg /* 13B72C 802483EC 0200302D */ daddu $a2, $s0, $zero /* 13B730 802483F0 0200302D */ daddu $a2, $s0, $zero /* 13B734 802483F4 24070001 */ addiu $a3, $zero, 1 @@ -1381,7 +1381,7 @@ glabel pause_badges_draw_contents .L80248984: /* 13BCC4 80248984 0040202D */ daddu $a0, $v0, $zero /* 13BCC8 80248988 AFA00010 */ sw $zero, 0x10($sp) -/* 13BCCC 8024898C 0C04993B */ jal draw_string +/* 13BCCC 8024898C 0C04993B */ jal draw_msg /* 13BCD0 80248990 AFB00014 */ sw $s0, 0x14($sp) /* 13BCD4 80248994 8E230000 */ lw $v1, ($s1) /* 13BCD8 80248998 8FA600C4 */ lw $a2, 0xc4($sp) @@ -1440,7 +1440,7 @@ glabel pause_badges_draw_contents .L80248A5C: /* 13BD9C 80248A5C 0040202D */ daddu $a0, $v0, $zero /* 13BDA0 80248A60 AFA00010 */ sw $zero, 0x10($sp) -/* 13BDA4 80248A64 0C04993B */ jal draw_string +/* 13BDA4 80248A64 0C04993B */ jal draw_msg /* 13BDA8 80248A68 AFB00014 */ sw $s0, 0x14($sp) /* 13BDAC 80248A6C 0C093BA0 */ jal pause_get_menu_string /* 13BDB0 80248A70 24040049 */ addiu $a0, $zero, 0x49 @@ -1458,7 +1458,7 @@ glabel pause_badges_draw_contents .L80248A9C: /* 13BDDC 80248A9C 0040202D */ daddu $a0, $v0, $zero /* 13BDE0 80248AA0 AFA00010 */ sw $zero, 0x10($sp) -/* 13BDE4 80248AA4 0C04993B */ jal draw_string +/* 13BDE4 80248AA4 0C04993B */ jal draw_msg /* 13BDE8 80248AA8 AFB00014 */ sw $s0, 0x14($sp) /* 13BDEC 80248AAC 3C038027 */ lui $v1, %hi(gPauseMenuCurrentTab) /* 13BDF0 80248AB0 806300D4 */ lb $v1, %lo(gPauseMenuCurrentTab)($v1) @@ -1638,7 +1638,7 @@ glabel pause_badges_draw_contents /* 13C08C 80248D4C AFB00014 */ sw $s0, 0x14($sp) /* 13C090 80248D50 2565005A */ addiu $a1, $t3, 0x5a .L80248D54: -/* 13C094 80248D54 0C04993B */ jal draw_string +/* 13C094 80248D54 0C04993B */ jal draw_msg /* 13C098 80248D58 25460042 */ addiu $a2, $t2, 0x42 .L80248D5C: /* 13C09C 80248D5C 8FBF00BC */ lw $ra, 0xbc($sp) diff --git a/asm/nonmatchings/code_138CC0/pause_badges_init.s b/asm/nonmatchings/code_138CC0/pause_badges_init.s index e8ece300f1..943775d0f8 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_init.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_init.s @@ -52,7 +52,7 @@ glabel pause_badges_init /* 13C3B0 80249070 24420024 */ addiu $v0, $v0, 0x24 /* 13C3B4 80249074 3C048025 */ lui $a0, %hi(D_8024F528) /* 13C3B8 80249078 2484F528 */ addiu $a0, $a0, %lo(D_8024F528) -/* 13C3BC 8024907C 0C051FCC */ jal func_80147F30 +/* 13C3BC 8024907C 0C051FCC */ jal setup_pause_menu_tab /* 13C3C0 80249080 24050001 */ addiu $a1, $zero, 1 /* 13C3C4 80249084 24020001 */ addiu $v0, $zero, 1 /* 13C3C8 80249088 A2620000 */ sb $v0, ($s3) diff --git a/asm/nonmatchings/code_138CC0/pause_stats_draw_contents.s b/asm/nonmatchings/code_138CC0/pause_stats_draw_contents.s index 1c9012e8d1..a6d0436209 100644 --- a/asm/nonmatchings/code_138CC0/pause_stats_draw_contents.s +++ b/asm/nonmatchings/code_138CC0/pause_stats_draw_contents.s @@ -39,7 +39,7 @@ glabel pause_stats_draw_contents /* 138D48 80245A08 2408000A */ addiu $t0, $zero, 0xa /* 138D4C 80245A0C AFA80010 */ sw $t0, 0x10($sp) /* 138D50 80245A10 24080001 */ addiu $t0, $zero, 1 -/* 138D54 80245A14 0C04993B */ jal draw_string +/* 138D54 80245A14 0C04993B */ jal draw_msg /* 138D58 80245A18 AFA80014 */ sw $t0, 0x14($sp) /* 138D5C 80245A1C 0200302D */ daddu $a2, $s0, $zero /* 138D60 80245A20 24070001 */ addiu $a3, $zero, 1 @@ -80,7 +80,7 @@ glabel pause_stats_draw_contents /* 138DEC 80245AAC 2408000A */ addiu $t0, $zero, 0xa /* 138DF0 80245AB0 AFA80010 */ sw $t0, 0x10($sp) /* 138DF4 80245AB4 24080001 */ addiu $t0, $zero, 1 -/* 138DF8 80245AB8 0C04993B */ jal draw_string +/* 138DF8 80245AB8 0C04993B */ jal draw_msg /* 138DFC 80245ABC AFA80014 */ sw $t0, 0x14($sp) /* 138E00 80245AC0 0280282D */ daddu $a1, $s4, $zero /* 138E04 80245AC4 0200302D */ daddu $a2, $s0, $zero @@ -116,7 +116,7 @@ glabel pause_stats_draw_contents /* 138E7C 80245B3C 2408000A */ addiu $t0, $zero, 0xa /* 138E80 80245B40 AFA80010 */ sw $t0, 0x10($sp) /* 138E84 80245B44 24080001 */ addiu $t0, $zero, 1 -/* 138E88 80245B48 0C04993B */ jal draw_string +/* 138E88 80245B48 0C04993B */ jal draw_msg /* 138E8C 80245B4C AFA80014 */ sw $t0, 0x14($sp) /* 138E90 80245B50 0280282D */ daddu $a1, $s4, $zero /* 138E94 80245B54 0200302D */ daddu $a2, $s0, $zero @@ -161,7 +161,7 @@ glabel pause_stats_draw_contents /* 138F30 80245BF0 25140019 */ addiu $s4, $t0, 0x19 /* 138F34 80245BF4 0280282D */ daddu $a1, $s4, $zero /* 138F38 80245BF8 24080001 */ addiu $t0, $zero, 1 -/* 138F3C 80245BFC 0C04993B */ jal draw_string +/* 138F3C 80245BFC 0C04993B */ jal draw_msg /* 138F40 80245C00 AFA80014 */ sw $t0, 0x14($sp) /* 138F44 80245C04 0200302D */ daddu $a2, $s0, $zero /* 138F48 80245C08 8FA80084 */ lw $t0, 0x84($sp) @@ -183,7 +183,7 @@ glabel pause_stats_draw_contents /* 138F88 80245C48 240700FF */ addiu $a3, $zero, 0xff /* 138F8C 80245C4C 24080001 */ addiu $t0, $zero, 1 /* 138F90 80245C50 AFA00010 */ sw $zero, 0x10($sp) -/* 138F94 80245C54 0C04993B */ jal draw_string +/* 138F94 80245C54 0C04993B */ jal draw_msg /* 138F98 80245C58 AFA80014 */ sw $t0, 0x14($sp) /* 138F9C 80245C5C 0200302D */ daddu $a2, $s0, $zero /* 138FA0 80245C60 8FA80084 */ lw $t0, 0x84($sp) @@ -216,7 +216,7 @@ glabel pause_stats_draw_contents /* 13900C 80245CCC 240700FF */ addiu $a3, $zero, 0xff /* 139010 80245CD0 24080001 */ addiu $t0, $zero, 1 /* 139014 80245CD4 AFA00010 */ sw $zero, 0x10($sp) -/* 139018 80245CD8 0C04993B */ jal draw_string +/* 139018 80245CD8 0C04993B */ jal draw_msg /* 13901C 80245CDC AFA80014 */ sw $t0, 0x14($sp) /* 139020 80245CE0 0260282D */ daddu $a1, $s3, $zero /* 139024 80245CE4 0200302D */ daddu $a2, $s0, $zero @@ -236,7 +236,7 @@ glabel pause_stats_draw_contents /* 13905C 80245D1C 240700FF */ addiu $a3, $zero, 0xff /* 139060 80245D20 24080001 */ addiu $t0, $zero, 1 /* 139064 80245D24 AFA00010 */ sw $zero, 0x10($sp) -/* 139068 80245D28 0C04993B */ jal draw_string +/* 139068 80245D28 0C04993B */ jal draw_msg /* 13906C 80245D2C AFA80014 */ sw $t0, 0x14($sp) /* 139070 80245D30 02E0282D */ daddu $a1, $s7, $zero /* 139074 80245D34 0200302D */ daddu $a2, $s0, $zero @@ -267,7 +267,7 @@ glabel pause_stats_draw_contents /* 1390D8 80245D98 240700FF */ addiu $a3, $zero, 0xff /* 1390DC 80245D9C 24080001 */ addiu $t0, $zero, 1 /* 1390E0 80245DA0 AFA00010 */ sw $zero, 0x10($sp) -/* 1390E4 80245DA4 0C04993B */ jal draw_string +/* 1390E4 80245DA4 0C04993B */ jal draw_msg /* 1390E8 80245DA8 AFA80014 */ sw $t0, 0x14($sp) /* 1390EC 80245DAC 0260282D */ daddu $a1, $s3, $zero /* 1390F0 80245DB0 0200302D */ daddu $a2, $s0, $zero @@ -295,7 +295,7 @@ glabel pause_stats_draw_contents /* 139148 80245E08 2408000A */ addiu $t0, $zero, 0xa /* 13914C 80245E0C AFA80010 */ sw $t0, 0x10($sp) /* 139150 80245E10 24080001 */ addiu $t0, $zero, 1 -/* 139154 80245E14 0C04993B */ jal draw_string +/* 139154 80245E14 0C04993B */ jal draw_msg /* 139158 80245E18 AFA80014 */ sw $t0, 0x14($sp) /* 13915C 80245E1C 3C020149 */ lui $v0, 0x149 /* 139160 80245E20 3C148011 */ lui $s4, %hi(gPlayerData+0x2BC) @@ -367,7 +367,7 @@ glabel pause_stats_draw_contents /* 139264 80245F24 2408000A */ addiu $t0, $zero, 0xa /* 139268 80245F28 AFA80010 */ sw $t0, 0x10($sp) /* 13926C 80245F2C 24080001 */ addiu $t0, $zero, 1 -/* 139270 80245F30 0C04993B */ jal draw_string +/* 139270 80245F30 0C04993B */ jal draw_msg /* 139274 80245F34 AFA80014 */ sw $t0, 0x14($sp) /* 139278 80245F38 0C093BA0 */ jal pause_get_menu_string /* 13927C 80245F3C 2404003A */ addiu $a0, $zero, 0x3a @@ -378,7 +378,7 @@ glabel pause_stats_draw_contents /* 139290 80245F50 2408000A */ addiu $t0, $zero, 0xa /* 139294 80245F54 AFA80010 */ sw $t0, 0x10($sp) /* 139298 80245F58 24080001 */ addiu $t0, $zero, 1 -/* 13929C 80245F5C 0C04993B */ jal draw_string +/* 13929C 80245F5C 0C04993B */ jal draw_msg /* 1392A0 80245F60 AFA80014 */ sw $t0, 0x14($sp) /* 1392A4 80245F64 3C027482 */ lui $v0, 0x7482 /* 1392A8 80245F68 3442296B */ ori $v0, $v0, 0x296b @@ -487,7 +487,7 @@ glabel pause_stats_draw_contents /* 13943C 802460FC 24170001 */ addiu $s7, $zero, 1 /* 139440 80246100 AFA00010 */ sw $zero, 0x10($sp) /* 139444 80246104 AFB70014 */ sw $s7, 0x14($sp) -/* 139448 80246108 0C04993B */ jal draw_string +/* 139448 80246108 0C04993B */ jal draw_msg /* 13944C 8024610C 25050010 */ addiu $a1, $t0, 0x10 /* 139450 80246110 0C093BA0 */ jal pause_get_menu_string /* 139454 80246114 24040044 */ addiu $a0, $zero, 0x44 @@ -497,7 +497,7 @@ glabel pause_stats_draw_contents /* 139464 80246124 0220382D */ daddu $a3, $s1, $zero /* 139468 80246128 AFA00010 */ sw $zero, 0x10($sp) /* 13946C 8024612C AFB70014 */ sw $s7, 0x14($sp) -/* 139470 80246130 0C04993B */ jal draw_string +/* 139470 80246130 0C04993B */ jal draw_msg /* 139474 80246134 25050043 */ addiu $a1, $t0, 0x43 /* 139478 80246138 00142400 */ sll $a0, $s4, 0x10 /* 13947C 8024613C 00042403 */ sra $a0, $a0, 0x10 @@ -573,7 +573,7 @@ glabel pause_stats_draw_contents /* 139584 80246244 AFA00010 */ sw $zero, 0x10($sp) /* 139588 80246248 AFB70014 */ sw $s7, 0x14($sp) /* 13958C 8024624C 251200B0 */ addiu $s2, $t0, 0xb0 -/* 139590 80246250 0C04993B */ jal draw_string +/* 139590 80246250 0C04993B */ jal draw_msg /* 139594 80246254 0240282D */ daddu $a1, $s2, $zero /* 139598 80246258 00108383 */ sra $s0, $s0, 0xe /* 13959C 8024625C 8EC40008 */ lw $a0, 8($s6) @@ -598,7 +598,7 @@ glabel pause_stats_draw_contents /* 1395E8 802462A8 27C60030 */ addiu $a2, $fp, 0x30 /* 1395EC 802462AC 240700FF */ addiu $a3, $zero, 0xff /* 1395F0 802462B0 AFA00010 */ sw $zero, 0x10($sp) -/* 1395F4 802462B4 0C04993B */ jal draw_string +/* 1395F4 802462B4 0C04993B */ jal draw_msg /* 1395F8 802462B8 AFB70014 */ sw $s7, 0x14($sp) /* 1395FC 802462BC 24040006 */ addiu $a0, $zero, 6 /* 139600 802462C0 8FA80084 */ lw $t0, 0x84($sp) diff --git a/asm/nonmatchings/code_138CC0/pause_stats_init.s b/asm/nonmatchings/code_138CC0/pause_stats_init.s index 7dc2956449..b363e88544 100644 --- a/asm/nonmatchings/code_138CC0/pause_stats_init.s +++ b/asm/nonmatchings/code_138CC0/pause_stats_init.s @@ -36,7 +36,7 @@ glabel pause_stats_init /* 139E7C 80246B3C 24420024 */ addiu $v0, $v0, 0x24 /* 139E80 80246B40 3C048025 */ lui $a0, %hi(D_8024F488) /* 139E84 80246B44 2484F488 */ addiu $a0, $a0, %lo(D_8024F488) -/* 139E88 80246B48 0C051FCC */ jal func_80147F30 +/* 139E88 80246B48 0C051FCC */ jal setup_pause_menu_tab /* 139E8C 80246B4C 24050001 */ addiu $a1, $zero, 1 /* 139E90 80246B50 24020001 */ addiu $v0, $zero, 1 /* 139E94 80246B54 A2620000 */ sb $v0, ($s3) diff --git a/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s b/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s index bf12d4f582..62404d20b8 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s @@ -311,7 +311,7 @@ glabel pause_items_draw_contents /* 13D144 80249E04 8E240000 */ lw $a0, ($s1) /* 13D148 80249E08 00553021 */ addu $a2, $v0, $s5 .L80249E0C: -/* 13D14C 80249E0C 0C04993B */ jal draw_string +/* 13D14C 80249E0C 0C04993B */ jal draw_msg /* 13D150 80249E10 00000000 */ nop .L80249E14: /* 13D154 80249E14 8FAA0050 */ lw $t2, 0x50($sp) @@ -617,7 +617,7 @@ glabel pause_items_draw_contents .L8024A27C: /* 13D5BC 8024A27C 0040202D */ daddu $a0, $v0, $zero /* 13D5C0 8024A280 AFA00010 */ sw $zero, 0x10($sp) -/* 13D5C4 8024A284 0C04993B */ jal draw_string +/* 13D5C4 8024A284 0C04993B */ jal draw_msg /* 13D5C8 8024A288 AFB00014 */ sw $s0, 0x14($sp) /* 13D5CC 8024A28C 8E230000 */ lw $v1, ($s1) /* 13D5D0 8024A290 8FA600AC */ lw $a2, 0xac($sp) @@ -676,7 +676,7 @@ glabel pause_items_draw_contents .L8024A354: /* 13D694 8024A354 0040202D */ daddu $a0, $v0, $zero /* 13D698 8024A358 AFA00010 */ sw $zero, 0x10($sp) -/* 13D69C 8024A35C 0C04993B */ jal draw_string +/* 13D69C 8024A35C 0C04993B */ jal draw_msg /* 13D6A0 8024A360 AFA80014 */ sw $t0, 0x14($sp) /* 13D6A4 8024A364 3C038027 */ lui $v1, %hi(gPauseMenuCurrentTab) /* 13D6A8 8024A368 806300D4 */ lb $v1, %lo(gPauseMenuCurrentTab)($v1) diff --git a/asm/nonmatchings/code_13CAF0/pause_items_init.s b/asm/nonmatchings/code_13CAF0/pause_items_init.s index 75c8262a44..fde3c918b7 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_init.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_init.s @@ -42,7 +42,7 @@ glabel pause_items_init /* 13DAE0 8024A7A0 24420024 */ addiu $v0, $v0, 0x24 /* 13DAE4 8024A7A4 3C048025 */ lui $a0, %hi(D_8024F5C0) /* 13DAE8 8024A7A8 2484F5C0 */ addiu $a0, $a0, %lo(D_8024F5C0) -/* 13DAEC 8024A7AC 0C051FCC */ jal func_80147F30 +/* 13DAEC 8024A7AC 0C051FCC */ jal setup_pause_menu_tab /* 13DAF0 8024A7B0 24050001 */ addiu $a1, $zero, 1 /* 13DAF4 8024A7B4 24020001 */ addiu $v0, $zero, 1 /* 13DAF8 8024A7B8 A2620000 */ sb $v0, ($s3) diff --git a/asm/nonmatchings/code_13E120/pause_partners_draw_movelist.s b/asm/nonmatchings/code_13E120/pause_partners_draw_movelist.s index 219566ee24..064960b49f 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_draw_movelist.s +++ b/asm/nonmatchings/code_13E120/pause_partners_draw_movelist.s @@ -125,7 +125,7 @@ glabel pause_partners_draw_movelist /* 13F238 8024BEF8 2408000A */ addiu $t0, $zero, 0xa /* 13F23C 8024BEFC AFA80010 */ sw $t0, 0x10($sp) /* 13F240 8024BF00 24080001 */ addiu $t0, $zero, 1 -/* 13F244 8024BF04 0C04993B */ jal draw_string +/* 13F244 8024BF04 0C04993B */ jal draw_msg /* 13F248 8024BF08 AFA80014 */ sw $t0, 0x14($sp) /* 13F24C 8024BF0C 26500004 */ addiu $s0, $s2, 4 /* 13F250 8024BF10 00108080 */ sll $s0, $s0, 2 diff --git a/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_title.s b/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_title.s index 78a76e1ca0..706aadc7fa 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_title.s +++ b/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_title.s @@ -17,7 +17,7 @@ glabel pause_partners_draw_movelist_title /* 13F3B8 8024C078 2605000C */ addiu $a1, $s0, 0xc /* 13F3BC 8024C07C 02223021 */ addu $a2, $s1, $v0 /* 13F3C0 8024C080 240700FF */ addiu $a3, $zero, 0xff -/* 13F3C4 8024C084 0C04993B */ jal draw_string +/* 13F3C4 8024C084 0C04993B */ jal draw_msg /* 13F3C8 8024C088 AFA20014 */ sw $v0, 0x14($sp) /* 13F3CC 8024C08C 8FBF0020 */ lw $ra, 0x20($sp) /* 13F3D0 8024C090 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/asm/nonmatchings/code_13E120/pause_partners_draw_title.s b/asm/nonmatchings/code_13E120/pause_partners_draw_title.s index f682b8d61b..4a8ee749ea 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_draw_title.s +++ b/asm/nonmatchings/code_13E120/pause_partners_draw_title.s @@ -63,7 +63,7 @@ glabel pause_partners_draw_title /* 13EFCC 8024BC8C 26660001 */ addiu $a2, $s3, 1 /* 13EFD0 8024BC90 240700FF */ addiu $a3, $zero, 0xff /* 13EFD4 8024BC94 AFA00010 */ sw $zero, 0x10($sp) -/* 13EFD8 8024BC98 0C04993B */ jal draw_string +/* 13EFD8 8024BC98 0C04993B */ jal draw_msg /* 13EFDC 8024BC9C AFA00014 */ sw $zero, 0x14($sp) /* 13EFE0 8024BCA0 24020001 */ addiu $v0, $zero, 1 /* 13EFE4 8024BCA4 1602000A */ bne $s0, $v0, .L8024BCD0 diff --git a/asm/nonmatchings/code_13E120/pause_partners_handle_input.s b/asm/nonmatchings/code_13E120/pause_partners_handle_input.s index b7b433619c..10847ccc7e 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_handle_input.s +++ b/asm/nonmatchings/code_13E120/pause_partners_handle_input.s @@ -219,7 +219,7 @@ glabel pause_partners_handle_input /* 13F984 8024C644 0C05272D */ jal play_sound /* 13F988 8024C648 240400C9 */ addiu $a0, $zero, 0xc9 /* 13F98C 8024C64C 24040024 */ addiu $a0, $zero, 0x24 -/* 13F990 8024C650 0C051F9F */ jal func_80147E7C +/* 13F990 8024C650 0C051F9F */ jal set_window_update /* 13F994 8024C654 24050001 */ addiu $a1, $zero, 1 /* 13F998 8024C658 080931E4 */ j .L8024C790 /* 13F99C 8024C65C 00000000 */ nop @@ -244,7 +244,7 @@ glabel pause_partners_handle_input /* 13F9E0 8024C6A0 0C05272D */ jal play_sound /* 13F9E4 8024C6A4 240400CA */ addiu $a0, $zero, 0xca /* 13F9E8 8024C6A8 24040024 */ addiu $a0, $zero, 0x24 -/* 13F9EC 8024C6AC 0C051F9F */ jal func_80147E7C +/* 13F9EC 8024C6AC 0C051F9F */ jal set_window_update /* 13F9F0 8024C6B0 24050002 */ addiu $a1, $zero, 2 /* 13F9F4 8024C6B4 080931E4 */ j .L8024C790 /* 13F9F8 8024C6B8 00000000 */ nop diff --git a/asm/nonmatchings/code_13E120/pause_partners_init.s b/asm/nonmatchings/code_13E120/pause_partners_init.s index 11f449f28f..8978e740cb 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_init.s +++ b/asm/nonmatchings/code_13E120/pause_partners_init.s @@ -44,7 +44,7 @@ glabel pause_partners_init /* 13F4B4 8024C174 1440000A */ bnez $v0, .L8024C1A0 /* 13F4B8 8024C178 0000802D */ daddu $s0, $zero, $zero /* 13F4BC 8024C17C 24040022 */ addiu $a0, $zero, 0x22 -/* 13F4C0 8024C180 0C051F9F */ jal func_80147E7C +/* 13F4C0 8024C180 0C051F9F */ jal set_window_update /* 13F4C4 8024C184 24050002 */ addiu $a1, $zero, 2 /* 13F4C8 8024C188 080930C6 */ j .L8024C318 /* 13F4CC 8024C18C A2800000 */ sb $zero, ($s4) @@ -95,7 +95,7 @@ glabel pause_partners_init /* 13F56C 8024C22C 2442FFDC */ addiu $v0, $v0, -0x24 /* 13F570 8024C230 3C048025 */ lui $a0, %hi(D_8024F7C8) /* 13F574 8024C234 2484F7C8 */ addiu $a0, $a0, %lo(D_8024F7C8) -/* 13F578 8024C238 0C051FCC */ jal func_80147F30 +/* 13F578 8024C238 0C051FCC */ jal setup_pause_menu_tab /* 13F57C 8024C23C 24050005 */ addiu $a1, $zero, 5 /* 13F580 8024C240 3C028027 */ lui $v0, %hi(D_802706B0) /* 13F584 8024C244 8C4206B0 */ lw $v0, %lo(D_802706B0)($v0) diff --git a/asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s b/asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s index 7d5cdbcc32..bfeecf46e1 100644 --- a/asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s +++ b/asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s @@ -46,7 +46,7 @@ glabel pause_spirits_draw_title /* 140670 8024D330 26660001 */ addiu $a2, $s3, 1 /* 140674 8024D334 240700FF */ addiu $a3, $zero, 0xff /* 140678 8024D338 AFA00010 */ sw $zero, 0x10($sp) -/* 14067C 8024D33C 0C04993B */ jal draw_string +/* 14067C 8024D33C 0C04993B */ jal draw_msg /* 140680 8024D340 AFA00014 */ sw $zero, 0x14($sp) .L8024D344: /* 140684 8024D344 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/code_13FD40/pause_spirits_init.s b/asm/nonmatchings/code_13FD40/pause_spirits_init.s index e7f2b07fad..2746ea742c 100644 --- a/asm/nonmatchings/code_13FD40/pause_spirits_init.s +++ b/asm/nonmatchings/code_13FD40/pause_spirits_init.s @@ -53,7 +53,7 @@ glabel pause_spirits_init /* 140754 8024D414 2442FFDC */ addiu $v0, $v0, -0x24 /* 140758 8024D418 3C048025 */ lui $a0, %hi(D_8024F9C8) /* 14075C 8024D41C 2484F9C8 */ addiu $a0, $a0, %lo(D_8024F9C8) -/* 140760 8024D420 0C051FCC */ jal func_80147F30 +/* 140760 8024D420 0C051FCC */ jal setup_pause_menu_tab /* 140764 8024D424 24050002 */ addiu $a1, $zero, 2 /* 140768 8024D428 24020001 */ addiu $v0, $zero, 1 /* 14076C 8024D42C A2620000 */ sb $v0, ($s3) diff --git a/asm/nonmatchings/code_140C70/pause_map_draw_title.s b/asm/nonmatchings/code_140C70/pause_map_draw_title.s index 77f394d9dd..0e9c51010b 100644 --- a/asm/nonmatchings/code_140C70/pause_map_draw_title.s +++ b/asm/nonmatchings/code_140C70/pause_map_draw_title.s @@ -38,7 +38,7 @@ glabel pause_map_draw_title /* 141910 8024E5D0 AFA00014 */ sw $zero, 0x14($sp) /* 141914 8024E5D4 00032040 */ sll $a0, $v1, 1 /* 141918 8024E5D8 00832021 */ addu $a0, $a0, $v1 -/* 14191C 8024E5DC 0C04993B */ jal draw_string +/* 14191C 8024E5DC 0C04993B */ jal draw_msg /* 141920 8024E5E0 00902021 */ addu $a0, $a0, $s0 .L8024E5E4: /* 141924 8024E5E4 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/nonmatchings/code_140C70/pause_map_init.s b/asm/nonmatchings/code_140C70/pause_map_init.s index a12c74f6e6..06989e8b0f 100644 --- a/asm/nonmatchings/code_140C70/pause_map_init.s +++ b/asm/nonmatchings/code_140C70/pause_map_init.s @@ -35,7 +35,7 @@ glabel pause_map_init /* 1419B4 8024E674 2442FFDC */ addiu $v0, $v0, -0x24 /* 1419B8 8024E678 3C048025 */ lui $a0, %hi(D_80250590) /* 1419BC 8024E67C 24840590 */ addiu $a0, $a0, %lo(D_80250590) -/* 1419C0 8024E680 0C051FCC */ jal func_80147F30 +/* 1419C0 8024E680 0C051FCC */ jal setup_pause_menu_tab /* 1419C4 8024E684 24050007 */ addiu $a1, $zero, 7 /* 1419C8 8024E688 0000202D */ daddu $a0, $zero, $zero /* 1419CC 8024E68C 3C05F5DE */ lui $a1, 0xf5de diff --git a/asm/nonmatchings/code_163400/func_802448E0.s b/asm/nonmatchings/code_163400/func_802448E0.s index 25a752f9dd..41ce6ea3ea 100644 --- a/asm/nonmatchings/code_163400/func_802448E0.s +++ b/asm/nonmatchings/code_163400/func_802448E0.s @@ -47,7 +47,7 @@ glabel func_802448E0 .L80244984: /* 1651E4 80244984 3C048025 */ lui $a0, %hi(D_80249DAC) /* 1651E8 80244988 24849DAC */ addiu $a0, $a0, %lo(D_80249DAC) -/* 1651EC 8024498C 0C051FCC */ jal func_80147F30 +/* 1651EC 8024498C 0C051FCC */ jal setup_pause_menu_tab /* 1651F0 80244990 24050003 */ addiu $a1, $zero, 3 /* 1651F4 80244994 3C138025 */ lui $s3, %hi(D_80249B84) /* 1651F8 80244998 8E739B84 */ lw $s3, %lo(D_80249B84)($s3) @@ -138,7 +138,7 @@ glabel func_802448E0 /* 165328 80244AC8 1440FFF8 */ bnez $v0, .L80244AAC /* 16532C 80244ACC 26310004 */ addiu $s1, $s1, 4 /* 165330 80244AD0 24040017 */ addiu $a0, $zero, 0x17 -/* 165334 80244AD4 0C051F5C */ jal func_80147D70 +/* 165334 80244AD4 0C051F5C */ jal update_window_hierarchy /* 165338 80244AD8 24050040 */ addiu $a1, $zero, 0x40 /* 16533C 80244ADC 8FBF0028 */ lw $ra, 0x28($sp) /* 165340 80244AE0 8FB50024 */ lw $s5, 0x24($sp) diff --git a/asm/nonmatchings/code_163400/func_80244B00.s b/asm/nonmatchings/code_163400/func_80244B00.s index 7ba40cf21f..c341d86f6a 100644 --- a/asm/nonmatchings/code_163400/func_80244B00.s +++ b/asm/nonmatchings/code_163400/func_80244B00.s @@ -36,17 +36,17 @@ glabel func_80244B00 /* 1653D0 80244B70 2410002C */ addiu $s0, $zero, 0x2c /* 1653D4 80244B74 0200202D */ daddu $a0, $s0, $zero .L80244B78: -/* 1653D8 80244B78 0C051F9F */ jal func_80147E7C +/* 1653D8 80244B78 0C051F9F */ jal set_window_update /* 1653DC 80244B7C 24050002 */ addiu $a1, $zero, 2 /* 1653E0 80244B80 26100001 */ addiu $s0, $s0, 1 /* 1653E4 80244B84 2A020040 */ slti $v0, $s0, 0x40 /* 1653E8 80244B88 1440FFFB */ bnez $v0, .L80244B78 /* 1653EC 80244B8C 0200202D */ daddu $a0, $s0, $zero /* 1653F0 80244B90 24040018 */ addiu $a0, $zero, 0x18 -/* 1653F4 80244B94 0C051F9F */ jal func_80147E7C +/* 1653F4 80244B94 0C051F9F */ jal set_window_update /* 1653F8 80244B98 24050002 */ addiu $a1, $zero, 2 /* 1653FC 80244B9C 24040017 */ addiu $a0, $zero, 0x17 -/* 165400 80244BA0 0C051F9F */ jal func_80147E7C +/* 165400 80244BA0 0C051F9F */ jal set_window_update /* 165404 80244BA4 24050002 */ addiu $a1, $zero, 2 /* 165408 80244BA8 0C0912F1 */ jal func_80244BC4 /* 16540C 80244BAC 00000000 */ nop diff --git a/asm/nonmatchings/code_165490/func_80245808.s b/asm/nonmatchings/code_165490/func_80245808.s index 210dd72212..9d1c17ebca 100644 --- a/asm/nonmatchings/code_165490/func_80245808.s +++ b/asm/nonmatchings/code_165490/func_80245808.s @@ -36,7 +36,7 @@ glabel func_80245808 /* 1660DC 8024587C 2442FFDC */ addiu $v0, $v0, -0x24 /* 1660E0 80245880 3C048025 */ lui $a0, %hi(D_80249EA0) /* 1660E4 80245884 24849EA0 */ addiu $a0, $a0, %lo(D_80249EA0) -/* 1660E8 80245888 0C051FCC */ jal func_80147F30 +/* 1660E8 80245888 0C051FCC */ jal setup_pause_menu_tab /* 1660EC 8024588C 2405000E */ addiu $a1, $zero, 0xe /* 1660F0 80245890 82620004 */ lb $v0, 4($s3) /* 1660F4 80245894 82630005 */ lb $v1, 5($s3) @@ -132,16 +132,16 @@ glabel func_80245808 /* 166244 802459E4 82620004 */ lb $v0, 4($s3) /* 166248 802459E8 1040000C */ beqz $v0, .L80245A1C /* 16624C 802459EC 24040035 */ addiu $a0, $zero, 0x35 -/* 166250 802459F0 0C051F9F */ jal func_80147E7C +/* 166250 802459F0 0C051F9F */ jal set_window_update /* 166254 802459F4 24050002 */ addiu $a1, $zero, 2 /* 166258 802459F8 24040037 */ addiu $a0, $zero, 0x37 -/* 16625C 802459FC 0C051F9F */ jal func_80147E7C +/* 16625C 802459FC 0C051F9F */ jal set_window_update /* 166260 80245A00 24050002 */ addiu $a1, $zero, 2 /* 166264 80245A04 24040033 */ addiu $a0, $zero, 0x33 -/* 166268 80245A08 0C051F9F */ jal func_80147E7C +/* 166268 80245A08 0C051F9F */ jal set_window_update /* 16626C 80245A0C 24050002 */ addiu $a1, $zero, 2 /* 166270 80245A10 24040034 */ addiu $a0, $zero, 0x34 -/* 166274 80245A14 0C051F9F */ jal func_80147E7C +/* 166274 80245A14 0C051F9F */ jal set_window_update /* 166278 80245A18 24050002 */ addiu $a1, $zero, 2 .L80245A1C: /* 16627C 80245A1C 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_165490/func_80245A40.s b/asm/nonmatchings/code_165490/func_80245A40.s index 6bcdb4d4e7..c419b86e39 100644 --- a/asm/nonmatchings/code_165490/func_80245A40.s +++ b/asm/nonmatchings/code_165490/func_80245A40.s @@ -274,45 +274,45 @@ glabel L80245DD0_166630 /* 166684 80245E24 26103380 */ addiu $s0, $s0, %lo(func_80243380) /* 166688 80245E28 3C018025 */ lui $at, %hi(D_8024C090) /* 16668C 80245E2C A020C090 */ sb $zero, %lo(D_8024C090)($at) -/* 166690 80245E30 0C051F9F */ jal func_80147E7C +/* 166690 80245E30 0C051F9F */ jal set_window_update /* 166694 80245E34 0200282D */ daddu $a1, $s0, $zero /* 166698 80245E38 24040031 */ addiu $a0, $zero, 0x31 -/* 16669C 80245E3C 0C051F9F */ jal func_80147E7C +/* 16669C 80245E3C 0C051F9F */ jal set_window_update /* 1666A0 80245E40 0200282D */ daddu $a1, $s0, $zero /* 1666A4 80245E44 2404002D */ addiu $a0, $zero, 0x2d /* 1666A8 80245E48 3C108024 */ lui $s0, %hi(func_80243898) /* 1666AC 80245E4C 26103898 */ addiu $s0, $s0, %lo(func_80243898) -/* 1666B0 80245E50 0C051F9F */ jal func_80147E7C +/* 1666B0 80245E50 0C051F9F */ jal set_window_update /* 1666B4 80245E54 0200282D */ daddu $a1, $s0, $zero /* 1666B8 80245E58 24040033 */ addiu $a0, $zero, 0x33 -/* 1666BC 80245E5C 0C051F9F */ jal func_80147E7C +/* 1666BC 80245E5C 0C051F9F */ jal set_window_update /* 1666C0 80245E60 0200282D */ daddu $a1, $s0, $zero /* 1666C4 80245E64 24040034 */ addiu $a0, $zero, 0x34 -/* 1666C8 80245E68 0C051F9F */ jal func_80147E7C +/* 1666C8 80245E68 0C051F9F */ jal set_window_update /* 1666CC 80245E6C 0200282D */ daddu $a1, $s0, $zero /* 1666D0 80245E70 24040035 */ addiu $a0, $zero, 0x35 -/* 1666D4 80245E74 0C051F9F */ jal func_80147E7C +/* 1666D4 80245E74 0C051F9F */ jal set_window_update /* 1666D8 80245E78 0200282D */ daddu $a1, $s0, $zero /* 1666DC 80245E7C 24040036 */ addiu $a0, $zero, 0x36 -/* 1666E0 80245E80 0C051F9F */ jal func_80147E7C +/* 1666E0 80245E80 0C051F9F */ jal set_window_update /* 1666E4 80245E84 0200282D */ daddu $a1, $s0, $zero /* 1666E8 80245E88 24040037 */ addiu $a0, $zero, 0x37 -/* 1666EC 80245E8C 0C051F9F */ jal func_80147E7C +/* 1666EC 80245E8C 0C051F9F */ jal set_window_update /* 1666F0 80245E90 0200282D */ daddu $a1, $s0, $zero /* 1666F4 80245E94 24040035 */ addiu $a0, $zero, 0x35 -/* 1666F8 80245E98 0C051F9F */ jal func_80147E7C +/* 1666F8 80245E98 0C051F9F */ jal set_window_update /* 1666FC 80245E9C 0200282D */ daddu $a1, $s0, $zero /* 166700 80245EA0 24040038 */ addiu $a0, $zero, 0x38 -/* 166704 80245EA4 0C051F9F */ jal func_80147E7C +/* 166704 80245EA4 0C051F9F */ jal set_window_update /* 166708 80245EA8 0200282D */ daddu $a1, $s0, $zero /* 16670C 80245EAC 24040039 */ addiu $a0, $zero, 0x39 -/* 166710 80245EB0 0C051F9F */ jal func_80147E7C +/* 166710 80245EB0 0C051F9F */ jal set_window_update /* 166714 80245EB4 0200282D */ daddu $a1, $s0, $zero /* 166718 80245EB8 2404003A */ addiu $a0, $zero, 0x3a -/* 16671C 80245EBC 0C051F9F */ jal func_80147E7C +/* 16671C 80245EBC 0C051F9F */ jal set_window_update /* 166720 80245EC0 0200282D */ daddu $a1, $s0, $zero /* 166724 80245EC4 2404003B */ addiu $a0, $zero, 0x3b -/* 166728 80245EC8 0C051F9F */ jal func_80147E7C +/* 166728 80245EC8 0C051F9F */ jal set_window_update /* 16672C 80245ECC 0200282D */ daddu $a1, $s0, $zero /* 166730 80245ED0 0C05272D */ jal play_sound /* 166734 80245ED4 240400C9 */ addiu $a0, $zero, 0xc9 @@ -333,39 +333,39 @@ glabel L80245DD0_166630 /* 16676C 80245F0C 24040033 */ addiu $a0, $zero, 0x33 /* 166770 80245F10 3C128024 */ lui $s2, %hi(func_8024368C) /* 166774 80245F14 2652368C */ addiu $s2, $s2, %lo(func_8024368C) -/* 166778 80245F18 0C051F9F */ jal func_80147E7C +/* 166778 80245F18 0C051F9F */ jal set_window_update /* 16677C 80245F1C 0240282D */ daddu $a1, $s2, $zero /* 166780 80245F20 24040034 */ addiu $a0, $zero, 0x34 /* 166784 80245F24 3C118024 */ lui $s1, %hi(func_802436F0) /* 166788 80245F28 263136F0 */ addiu $s1, $s1, %lo(func_802436F0) -/* 16678C 80245F2C 0C051F9F */ jal func_80147E7C +/* 16678C 80245F2C 0C051F9F */ jal set_window_update /* 166790 80245F30 0220282D */ daddu $a1, $s1, $zero /* 166794 80245F34 24040035 */ addiu $a0, $zero, 0x35 /* 166798 80245F38 3C108024 */ lui $s0, %hi(func_802437B8) /* 16679C 80245F3C 261037B8 */ addiu $s0, $s0, %lo(func_802437B8) -/* 1667A0 80245F40 0C051F9F */ jal func_80147E7C +/* 1667A0 80245F40 0C051F9F */ jal set_window_update /* 1667A4 80245F44 0200282D */ daddu $a1, $s0, $zero /* 1667A8 80245F48 24040036 */ addiu $a0, $zero, 0x36 -/* 1667AC 80245F4C 0C051F9F */ jal func_80147E7C +/* 1667AC 80245F4C 0C051F9F */ jal set_window_update /* 1667B0 80245F50 0200282D */ daddu $a1, $s0, $zero /* 1667B4 80245F54 24040037 */ addiu $a0, $zero, 0x37 -/* 1667B8 80245F58 0C051F9F */ jal func_80147E7C +/* 1667B8 80245F58 0C051F9F */ jal set_window_update /* 1667BC 80245F5C 0200282D */ daddu $a1, $s0, $zero /* 1667C0 80245F60 24040038 */ addiu $a0, $zero, 0x38 -/* 1667C4 80245F64 0C051F9F */ jal func_80147E7C +/* 1667C4 80245F64 0C051F9F */ jal set_window_update /* 1667C8 80245F68 0240282D */ daddu $a1, $s2, $zero /* 1667CC 80245F6C 24040039 */ addiu $a0, $zero, 0x39 -/* 1667D0 80245F70 0C051F9F */ jal func_80147E7C +/* 1667D0 80245F70 0C051F9F */ jal set_window_update /* 1667D4 80245F74 0220282D */ daddu $a1, $s1, $zero /* 1667D8 80245F78 2404003A */ addiu $a0, $zero, 0x3a -/* 1667DC 80245F7C 0C051F9F */ jal func_80147E7C +/* 1667DC 80245F7C 0C051F9F */ jal set_window_update /* 1667E0 80245F80 0240282D */ daddu $a1, $s2, $zero /* 1667E4 80245F84 2404003B */ addiu $a0, $zero, 0x3b -/* 1667E8 80245F88 0C051F9F */ jal func_80147E7C +/* 1667E8 80245F88 0C051F9F */ jal set_window_update /* 1667EC 80245F8C 0220282D */ daddu $a1, $s1, $zero /* 1667F0 80245F90 3C058024 */ lui $a1, %hi(func_80243754) /* 1667F4 80245F94 24A53754 */ addiu $a1, $a1, %lo(func_80243754) -/* 1667F8 80245F98 0C051F9F */ jal func_80147E7C +/* 1667F8 80245F98 0C051F9F */ jal set_window_update /* 1667FC 80245F9C 2404002D */ addiu $a0, $zero, 0x2d /* 166800 80245FA0 0C05272D */ jal play_sound /* 166804 80245FA4 240400D6 */ addiu $a0, $zero, 0xd6 @@ -394,19 +394,19 @@ glabel L80245DD0_166630 /* 166854 80245FF4 24060002 */ addiu $a2, $zero, 2 /* 166858 80245FF8 3C058024 */ lui $a1, %hi(func_8024368C) /* 16685C 80245FFC 24A5368C */ addiu $a1, $a1, %lo(func_8024368C) -/* 166860 80246000 0C051F9F */ jal func_80147E7C +/* 166860 80246000 0C051F9F */ jal set_window_update /* 166864 80246004 24040033 */ addiu $a0, $zero, 0x33 /* 166868 80246008 3C058024 */ lui $a1, %hi(func_802436F0) /* 16686C 8024600C 24A536F0 */ addiu $a1, $a1, %lo(func_802436F0) -/* 166870 80246010 0C051F9F */ jal func_80147E7C +/* 166870 80246010 0C051F9F */ jal set_window_update /* 166874 80246014 24040034 */ addiu $a0, $zero, 0x34 /* 166878 80246018 24040035 */ addiu $a0, $zero, 0x35 /* 16687C 8024601C 3C108024 */ lui $s0, %hi(func_802437B8) /* 166880 80246020 261037B8 */ addiu $s0, $s0, %lo(func_802437B8) -/* 166884 80246024 0C051F9F */ jal func_80147E7C +/* 166884 80246024 0C051F9F */ jal set_window_update /* 166888 80246028 0200282D */ daddu $a1, $s0, $zero /* 16688C 8024602C 24040037 */ addiu $a0, $zero, 0x37 -/* 166890 80246030 0C051F9F */ jal func_80147E7C +/* 166890 80246030 0C051F9F */ jal set_window_update /* 166894 80246034 0200282D */ daddu $a1, $s0, $zero /* 166898 80246038 08091A3A */ j .L802468E8 /* 16689C 8024603C 00000000 */ nop @@ -418,47 +418,47 @@ glabel L80245DD0_166630 /* 1668B0 80246050 2404002D */ addiu $a0, $zero, 0x2d /* 1668B4 80246054 3C108024 */ lui $s0, %hi(func_80243898) /* 1668B8 80246058 26103898 */ addiu $s0, $s0, %lo(func_80243898) -/* 1668BC 8024605C 0C051F9F */ jal func_80147E7C +/* 1668BC 8024605C 0C051F9F */ jal set_window_update /* 1668C0 80246060 0200282D */ daddu $a1, $s0, $zero /* 1668C4 80246064 24040033 */ addiu $a0, $zero, 0x33 -/* 1668C8 80246068 0C051F9F */ jal func_80147E7C +/* 1668C8 80246068 0C051F9F */ jal set_window_update /* 1668CC 8024606C 0200282D */ daddu $a1, $s0, $zero /* 1668D0 80246070 24040034 */ addiu $a0, $zero, 0x34 -/* 1668D4 80246074 0C051F9F */ jal func_80147E7C +/* 1668D4 80246074 0C051F9F */ jal set_window_update /* 1668D8 80246078 0200282D */ daddu $a1, $s0, $zero /* 1668DC 8024607C 24040035 */ addiu $a0, $zero, 0x35 -/* 1668E0 80246080 0C051F9F */ jal func_80147E7C +/* 1668E0 80246080 0C051F9F */ jal set_window_update /* 1668E4 80246084 0200282D */ daddu $a1, $s0, $zero /* 1668E8 80246088 24040036 */ addiu $a0, $zero, 0x36 -/* 1668EC 8024608C 0C051F9F */ jal func_80147E7C +/* 1668EC 8024608C 0C051F9F */ jal set_window_update /* 1668F0 80246090 0200282D */ daddu $a1, $s0, $zero /* 1668F4 80246094 24040037 */ addiu $a0, $zero, 0x37 -/* 1668F8 80246098 0C051F9F */ jal func_80147E7C +/* 1668F8 80246098 0C051F9F */ jal set_window_update /* 1668FC 8024609C 0200282D */ daddu $a1, $s0, $zero /* 166900 802460A0 24040035 */ addiu $a0, $zero, 0x35 -/* 166904 802460A4 0C051F9F */ jal func_80147E7C +/* 166904 802460A4 0C051F9F */ jal set_window_update /* 166908 802460A8 0200282D */ daddu $a1, $s0, $zero /* 16690C 802460AC 24040038 */ addiu $a0, $zero, 0x38 -/* 166910 802460B0 0C051F9F */ jal func_80147E7C +/* 166910 802460B0 0C051F9F */ jal set_window_update /* 166914 802460B4 0200282D */ daddu $a1, $s0, $zero /* 166918 802460B8 24040039 */ addiu $a0, $zero, 0x39 -/* 16691C 802460BC 0C051F9F */ jal func_80147E7C +/* 16691C 802460BC 0C051F9F */ jal set_window_update /* 166920 802460C0 0200282D */ daddu $a1, $s0, $zero /* 166924 802460C4 2404003A */ addiu $a0, $zero, 0x3a -/* 166928 802460C8 0C051F9F */ jal func_80147E7C +/* 166928 802460C8 0C051F9F */ jal set_window_update /* 16692C 802460CC 0200282D */ daddu $a1, $s0, $zero /* 166930 802460D0 2404003B */ addiu $a0, $zero, 0x3b -/* 166934 802460D4 0C051F9F */ jal func_80147E7C +/* 166934 802460D4 0C051F9F */ jal set_window_update /* 166938 802460D8 0200282D */ daddu $a1, $s0, $zero /* 16693C 802460DC 92640003 */ lbu $a0, 3($s3) /* 166940 802460E0 3C058024 */ lui $a1, %hi(func_80243908) /* 166944 802460E4 24A53908 */ addiu $a1, $a1, %lo(func_80243908) -/* 166948 802460E8 0C051F9F */ jal func_80147E7C +/* 166948 802460E8 0C051F9F */ jal set_window_update /* 16694C 802460EC 24840038 */ addiu $a0, $a0, 0x38 /* 166950 802460F0 0C05272D */ jal play_sound /* 166954 802460F4 240400C9 */ addiu $a0, $zero, 0xc9 /* 166958 802460F8 24040032 */ addiu $a0, $zero, 0x32 -/* 16695C 802460FC 0C051F9F */ jal func_80147E7C +/* 16695C 802460FC 0C051F9F */ jal set_window_update /* 166960 80246100 24050001 */ addiu $a1, $zero, 1 /* 166964 80246104 3C048016 */ lui $a0, %hi(gUIPanels) /* 166968 80246108 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) @@ -531,19 +531,19 @@ glabel L802461E8_166A48 /* 166A60 80246200 A2600004 */ sb $zero, 4($s3) /* 166A64 80246204 3C058024 */ lui $a1, %hi(func_802433F4) /* 166A68 80246208 24A533F4 */ addiu $a1, $a1, %lo(func_802433F4) -/* 166A6C 8024620C 0C051F9F */ jal func_80147E7C +/* 166A6C 8024620C 0C051F9F */ jal set_window_update /* 166A70 80246210 24040033 */ addiu $a0, $zero, 0x33 /* 166A74 80246214 3C058024 */ lui $a1, %hi(func_80243468) /* 166A78 80246218 24A53468 */ addiu $a1, $a1, %lo(func_80243468) -/* 166A7C 8024621C 0C051F9F */ jal func_80147E7C +/* 166A7C 8024621C 0C051F9F */ jal set_window_update /* 166A80 80246220 24040034 */ addiu $a0, $zero, 0x34 /* 166A84 80246224 24040035 */ addiu $a0, $zero, 0x35 /* 166A88 80246228 3C108024 */ lui $s0, %hi(func_802434DC) /* 166A8C 8024622C 261034DC */ addiu $s0, $s0, %lo(func_802434DC) -/* 166A90 80246230 0C051F9F */ jal func_80147E7C +/* 166A90 80246230 0C051F9F */ jal set_window_update /* 166A94 80246234 0200282D */ daddu $a1, $s0, $zero /* 166A98 80246238 24040037 */ addiu $a0, $zero, 0x37 -/* 166A9C 8024623C 0C051F9F */ jal func_80147E7C +/* 166A9C 8024623C 0C051F9F */ jal set_window_update /* 166AA0 80246240 0200282D */ daddu $a1, $s0, $zero /* 166AA4 80246244 0260202D */ daddu $a0, $s3, $zero /* 166AA8 80246248 0000282D */ daddu $a1, $zero, $zero @@ -562,7 +562,7 @@ glabel L802461E8_166A48 /* 166AD8 80246278 240400C9 */ addiu $a0, $zero, 0xc9 /* 166ADC 8024627C 3C058024 */ lui $a1, %hi(func_80243CCC) /* 166AE0 80246280 24A53CCC */ addiu $a1, $a1, %lo(func_80243CCC) -/* 166AE4 80246284 0C051F9F */ jal func_80147E7C +/* 166AE4 80246284 0C051F9F */ jal set_window_update /* 166AE8 80246288 24040032 */ addiu $a0, $zero, 0x32 /* 166AEC 8024628C 3C048016 */ lui $a0, %hi(gUIPanels) /* 166AF0 80246290 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) @@ -635,19 +635,19 @@ glabel L80246370_166BD0 /* 166BE8 80246388 A2600004 */ sb $zero, 4($s3) /* 166BEC 8024638C 3C058024 */ lui $a1, %hi(func_802433F4) /* 166BF0 80246390 24A533F4 */ addiu $a1, $a1, %lo(func_802433F4) -/* 166BF4 80246394 0C051F9F */ jal func_80147E7C +/* 166BF4 80246394 0C051F9F */ jal set_window_update /* 166BF8 80246398 24040033 */ addiu $a0, $zero, 0x33 /* 166BFC 8024639C 3C058024 */ lui $a1, %hi(func_80243468) /* 166C00 802463A0 24A53468 */ addiu $a1, $a1, %lo(func_80243468) -/* 166C04 802463A4 0C051F9F */ jal func_80147E7C +/* 166C04 802463A4 0C051F9F */ jal set_window_update /* 166C08 802463A8 24040034 */ addiu $a0, $zero, 0x34 /* 166C0C 802463AC 24040035 */ addiu $a0, $zero, 0x35 /* 166C10 802463B0 3C108024 */ lui $s0, %hi(func_802434DC) /* 166C14 802463B4 261034DC */ addiu $s0, $s0, %lo(func_802434DC) -/* 166C18 802463B8 0C051F9F */ jal func_80147E7C +/* 166C18 802463B8 0C051F9F */ jal set_window_update /* 166C1C 802463BC 0200282D */ daddu $a1, $s0, $zero /* 166C20 802463C0 24040037 */ addiu $a0, $zero, 0x37 -/* 166C24 802463C4 0C051F9F */ jal func_80147E7C +/* 166C24 802463C4 0C051F9F */ jal set_window_update /* 166C28 802463C8 0200282D */ daddu $a1, $s0, $zero /* 166C2C 802463CC 0260202D */ daddu $a0, $s3, $zero /* 166C30 802463D0 0000282D */ daddu $a1, $zero, $zero @@ -767,10 +767,10 @@ glabel L80246420_166C80 .L80246578: /* 166DD8 80246578 2404002F */ addiu $a0, $zero, 0x2f /* 166DDC 8024657C 24050001 */ addiu $a1, $zero, 1 -/* 166DE0 80246580 0C051F9F */ jal func_80147E7C +/* 166DE0 80246580 0C051F9F */ jal set_window_update /* 166DE4 80246584 A4C20000 */ sh $v0, ($a2) /* 166DE8 80246588 24040032 */ addiu $a0, $zero, 0x32 -/* 166DEC 8024658C 0C051F9F */ jal func_80147E7C +/* 166DEC 8024658C 0C051F9F */ jal set_window_update /* 166DF0 80246590 24050002 */ addiu $a1, $zero, 2 /* 166DF4 80246594 3C118025 */ lui $s1, %hi(D_8024C094) /* 166DF8 80246598 2631C094 */ addiu $s1, $s1, %lo(D_8024C094) @@ -816,7 +816,7 @@ glabel L80246420_166C80 /* 166E94 80246634 240400C9 */ addiu $a0, $zero, 0xc9 /* 166E98 80246638 3C058024 */ lui $a1, %hi(func_80243CCC) /* 166E9C 8024663C 24A53CCC */ addiu $a1, $a1, %lo(func_80243CCC) -/* 166EA0 80246640 0C051F9F */ jal func_80147E7C +/* 166EA0 80246640 0C051F9F */ jal set_window_update /* 166EA4 80246644 24040032 */ addiu $a0, $zero, 0x32 /* 166EA8 80246648 3C048016 */ lui $a0, %hi(gUIPanels) /* 166EAC 8024664C 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) @@ -904,21 +904,21 @@ glabel L8024672C_166F8C /* 166FDC 8024677C 0C05272D */ jal play_sound /* 166FE0 80246780 240400C9 */ addiu $a0, $zero, 0xc9 /* 166FE4 80246784 2404002C */ addiu $a0, $zero, 0x2c -/* 166FE8 80246788 3C058014 */ lui $a1, %hi(func_80147650) -/* 166FEC 8024678C 24A57650 */ addiu $a1, $a1, %lo(func_80147650) +/* 166FE8 80246788 3C058014 */ lui $a1, %hi(main_menu_window_update) +/* 166FEC 8024678C 24A57650 */ addiu $a1, $a1, %lo(main_menu_window_update) /* 166FF0 80246790 24020002 */ addiu $v0, $zero, 2 /* 166FF4 80246794 3C018025 */ lui $at, %hi(D_8024C098) /* 166FF8 80246798 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 166FFC 8024679C 3C028025 */ lui $v0, %hi(D_80249B8C) /* 167000 802467A0 8C429B8C */ lw $v0, %lo(D_80249B8C)($v0) /* 167004 802467A4 24100001 */ addiu $s0, $zero, 1 -/* 167008 802467A8 0C051F9F */ jal func_80147E7C +/* 167008 802467A8 0C051F9F */ jal set_window_update /* 16700C 802467AC A0500004 */ sb $s0, 4($v0) /* 167010 802467B0 2404002F */ addiu $a0, $zero, 0x2f -/* 167014 802467B4 0C051F9F */ jal func_80147E7C +/* 167014 802467B4 0C051F9F */ jal set_window_update /* 167018 802467B8 24050001 */ addiu $a1, $zero, 1 /* 16701C 802467BC 24040032 */ addiu $a0, $zero, 0x32 -/* 167020 802467C0 0C051F9F */ jal func_80147E7C +/* 167020 802467C0 0C051F9F */ jal set_window_update /* 167024 802467C4 24050002 */ addiu $a1, $zero, 2 /* 167028 802467C8 92640003 */ lbu $a0, 3($s3) /* 16702C 802467CC 0C00ACDD */ jal fio_save_game @@ -932,7 +932,7 @@ glabel L8024672C_166F8C /* 167048 802467E8 240400C9 */ addiu $a0, $zero, 0xc9 /* 16704C 802467EC 3C058024 */ lui $a1, %hi(func_80243CCC) /* 167050 802467F0 24A53CCC */ addiu $a1, $a1, %lo(func_80243CCC) -/* 167054 802467F4 0C051F9F */ jal func_80147E7C +/* 167054 802467F4 0C051F9F */ jal set_window_update /* 167058 802467F8 24040032 */ addiu $a0, $zero, 0x32 /* 16705C 802467FC 3C048016 */ lui $a0, %hi(gUIPanels) /* 167060 80246800 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) @@ -1038,39 +1038,39 @@ glabel L80246960_1671C0 /* 1671C0 80246960 24040033 */ addiu $a0, $zero, 0x33 /* 1671C4 80246964 3C128024 */ lui $s2, %hi(func_8024368C) /* 1671C8 80246968 2652368C */ addiu $s2, $s2, %lo(func_8024368C) -/* 1671CC 8024696C 0C051F9F */ jal func_80147E7C +/* 1671CC 8024696C 0C051F9F */ jal set_window_update /* 1671D0 80246970 0240282D */ daddu $a1, $s2, $zero /* 1671D4 80246974 24040034 */ addiu $a0, $zero, 0x34 /* 1671D8 80246978 3C118024 */ lui $s1, %hi(func_802436F0) /* 1671DC 8024697C 263136F0 */ addiu $s1, $s1, %lo(func_802436F0) -/* 1671E0 80246980 0C051F9F */ jal func_80147E7C +/* 1671E0 80246980 0C051F9F */ jal set_window_update /* 1671E4 80246984 0220282D */ daddu $a1, $s1, $zero /* 1671E8 80246988 24040035 */ addiu $a0, $zero, 0x35 /* 1671EC 8024698C 3C108024 */ lui $s0, %hi(func_802437B8) /* 1671F0 80246990 261037B8 */ addiu $s0, $s0, %lo(func_802437B8) -/* 1671F4 80246994 0C051F9F */ jal func_80147E7C +/* 1671F4 80246994 0C051F9F */ jal set_window_update /* 1671F8 80246998 0200282D */ daddu $a1, $s0, $zero /* 1671FC 8024699C 24040036 */ addiu $a0, $zero, 0x36 -/* 167200 802469A0 0C051F9F */ jal func_80147E7C +/* 167200 802469A0 0C051F9F */ jal set_window_update /* 167204 802469A4 0200282D */ daddu $a1, $s0, $zero /* 167208 802469A8 24040037 */ addiu $a0, $zero, 0x37 -/* 16720C 802469AC 0C051F9F */ jal func_80147E7C +/* 16720C 802469AC 0C051F9F */ jal set_window_update /* 167210 802469B0 0200282D */ daddu $a1, $s0, $zero /* 167214 802469B4 24040038 */ addiu $a0, $zero, 0x38 -/* 167218 802469B8 0C051F9F */ jal func_80147E7C +/* 167218 802469B8 0C051F9F */ jal set_window_update /* 16721C 802469BC 0240282D */ daddu $a1, $s2, $zero /* 167220 802469C0 24040039 */ addiu $a0, $zero, 0x39 -/* 167224 802469C4 0C051F9F */ jal func_80147E7C +/* 167224 802469C4 0C051F9F */ jal set_window_update /* 167228 802469C8 0220282D */ daddu $a1, $s1, $zero /* 16722C 802469CC 2404003A */ addiu $a0, $zero, 0x3a -/* 167230 802469D0 0C051F9F */ jal func_80147E7C +/* 167230 802469D0 0C051F9F */ jal set_window_update /* 167234 802469D4 0240282D */ daddu $a1, $s2, $zero /* 167238 802469D8 2404003B */ addiu $a0, $zero, 0x3b -/* 16723C 802469DC 0C051F9F */ jal func_80147E7C +/* 16723C 802469DC 0C051F9F */ jal set_window_update /* 167240 802469E0 0220282D */ daddu $a1, $s1, $zero /* 167244 802469E4 3C058024 */ lui $a1, %hi(func_80243754) /* 167248 802469E8 24A53754 */ addiu $a1, $a1, %lo(func_80243754) -/* 16724C 802469EC 0C051F9F */ jal func_80147E7C +/* 16724C 802469EC 0C051F9F */ jal set_window_update /* 167250 802469F0 2404002D */ addiu $a0, $zero, 0x2d /* 167254 802469F4 0C05272D */ jal play_sound /* 167258 802469F8 240400D6 */ addiu $a0, $zero, 0xd6 @@ -1084,19 +1084,19 @@ glabel L80246A04_167264 /* 167274 80246A14 24060002 */ addiu $a2, $zero, 2 /* 167278 80246A18 3C058024 */ lui $a1, %hi(func_802433F4) /* 16727C 80246A1C 24A533F4 */ addiu $a1, $a1, %lo(func_802433F4) -/* 167280 80246A20 0C051F9F */ jal func_80147E7C +/* 167280 80246A20 0C051F9F */ jal set_window_update /* 167284 80246A24 24040033 */ addiu $a0, $zero, 0x33 /* 167288 80246A28 3C058024 */ lui $a1, %hi(func_80243468) /* 16728C 80246A2C 24A53468 */ addiu $a1, $a1, %lo(func_80243468) -/* 167290 80246A30 0C051F9F */ jal func_80147E7C +/* 167290 80246A30 0C051F9F */ jal set_window_update /* 167294 80246A34 24040034 */ addiu $a0, $zero, 0x34 /* 167298 80246A38 24040035 */ addiu $a0, $zero, 0x35 /* 16729C 80246A3C 3C108024 */ lui $s0, %hi(func_802434DC) /* 1672A0 80246A40 261034DC */ addiu $s0, $s0, %lo(func_802434DC) -/* 1672A4 80246A44 0C051F9F */ jal func_80147E7C +/* 1672A4 80246A44 0C051F9F */ jal set_window_update /* 1672A8 80246A48 0200282D */ daddu $a1, $s0, $zero /* 1672AC 80246A4C 24040037 */ addiu $a0, $zero, 0x37 -/* 1672B0 80246A50 0C051F9F */ jal func_80147E7C +/* 1672B0 80246A50 0C051F9F */ jal set_window_update /* 1672B4 80246A54 0200282D */ daddu $a1, $s0, $zero /* 1672B8 80246A58 08091ABB */ j .L80246AEC /* 1672BC 80246A5C 00000000 */ nop @@ -1108,19 +1108,19 @@ glabel L80246A60_1672C0 /* 1672D0 80246A70 24060002 */ addiu $a2, $zero, 2 /* 1672D4 80246A74 3C058024 */ lui $a1, %hi(func_802433F4) /* 1672D8 80246A78 24A533F4 */ addiu $a1, $a1, %lo(func_802433F4) -/* 1672DC 80246A7C 0C051F9F */ jal func_80147E7C +/* 1672DC 80246A7C 0C051F9F */ jal set_window_update /* 1672E0 80246A80 24040033 */ addiu $a0, $zero, 0x33 /* 1672E4 80246A84 3C058024 */ lui $a1, %hi(func_80243468) /* 1672E8 80246A88 24A53468 */ addiu $a1, $a1, %lo(func_80243468) -/* 1672EC 80246A8C 0C051F9F */ jal func_80147E7C +/* 1672EC 80246A8C 0C051F9F */ jal set_window_update /* 1672F0 80246A90 24040034 */ addiu $a0, $zero, 0x34 /* 1672F4 80246A94 24040035 */ addiu $a0, $zero, 0x35 /* 1672F8 80246A98 3C108024 */ lui $s0, %hi(func_802434DC) /* 1672FC 80246A9C 261034DC */ addiu $s0, $s0, %lo(func_802434DC) -/* 167300 80246AA0 0C051F9F */ jal func_80147E7C +/* 167300 80246AA0 0C051F9F */ jal set_window_update /* 167304 80246AA4 0200282D */ daddu $a1, $s0, $zero /* 167308 80246AA8 24040037 */ addiu $a0, $zero, 0x37 -/* 16730C 80246AAC 0C051F9F */ jal func_80147E7C +/* 16730C 80246AAC 0C051F9F */ jal set_window_update /* 167310 80246AB0 0200282D */ daddu $a1, $s0, $zero /* 167314 80246AB4 08091ABB */ j .L80246AEC /* 167318 80246AB8 00000000 */ nop diff --git a/asm/nonmatchings/code_167570/func_80247198.s b/asm/nonmatchings/code_167570/func_80247198.s index 0ea1d4193a..12828a1bfe 100644 --- a/asm/nonmatchings/code_167570/func_80247198.s +++ b/asm/nonmatchings/code_167570/func_80247198.s @@ -16,7 +16,7 @@ glabel func_80247198 /* 167A20 802471C0 2442FFDC */ addiu $v0, $v0, -0x24 /* 167A24 802471C4 3C048025 */ lui $a0, %hi(D_8024A0CC) /* 167A28 802471C8 2484A0CC */ addiu $a0, $a0, %lo(D_8024A0CC) -/* 167A2C 802471CC 0C051FCC */ jal func_80147F30 +/* 167A2C 802471CC 0C051FCC */ jal setup_pause_menu_tab /* 167A30 802471D0 24050002 */ addiu $a1, $zero, 2 /* 167A34 802471D4 24020001 */ addiu $v0, $zero, 1 /* 167A38 802471D8 A2020000 */ sb $v0, ($s0) diff --git a/asm/nonmatchings/code_167570/func_802471EC.s b/asm/nonmatchings/code_167570/func_802471EC.s index b02a14b295..ff96816f5a 100644 --- a/asm/nonmatchings/code_167570/func_802471EC.s +++ b/asm/nonmatchings/code_167570/func_802471EC.s @@ -163,11 +163,11 @@ glabel L80247370_167BD0 .L80247440: /* 167CA0 80247440 2404002F */ addiu $a0, $zero, 0x2f /* 167CA4 80247444 24050001 */ addiu $a1, $zero, 1 -/* 167CA8 80247448 0C051F9F */ jal func_80147E7C +/* 167CA8 80247448 0C051F9F */ jal set_window_update /* 167CAC 8024744C A4C20000 */ sh $v0, ($a2) /* 167CB0 80247450 3C058024 */ lui $a1, %hi(func_80243EEC) /* 167CB4 80247454 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) -/* 167CB8 80247458 0C051F9F */ jal func_80147E7C +/* 167CB8 80247458 0C051F9F */ jal set_window_update /* 167CBC 8024745C 24040032 */ addiu $a0, $zero, 0x32 /* 167CC0 80247460 0000202D */ daddu $a0, $zero, $zero /* 167CC4 80247464 3C028025 */ lui $v0, %hi(D_80249B84) @@ -263,11 +263,11 @@ glabel L802474E4_167D44 .L802475B8: /* 167E18 802475B8 2404002F */ addiu $a0, $zero, 0x2f /* 167E1C 802475BC 24050001 */ addiu $a1, $zero, 1 -/* 167E20 802475C0 0C051F9F */ jal func_80147E7C +/* 167E20 802475C0 0C051F9F */ jal set_window_update /* 167E24 802475C4 A4C20000 */ sh $v0, ($a2) /* 167E28 802475C8 3C058024 */ lui $a1, %hi(func_80243EEC) /* 167E2C 802475CC 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) -/* 167E30 802475D0 0C051F9F */ jal func_80147E7C +/* 167E30 802475D0 0C051F9F */ jal set_window_update /* 167E34 802475D4 24040032 */ addiu $a0, $zero, 0x32 /* 167E38 802475D8 3C118025 */ lui $s1, %hi(D_8024C094) /* 167E3C 802475DC 2631C094 */ addiu $s1, $s1, %lo(D_8024C094) @@ -364,11 +364,11 @@ glabel L80247664_167EC4 .L80247738: /* 167F98 80247738 2404002F */ addiu $a0, $zero, 0x2f /* 167F9C 8024773C 24050001 */ addiu $a1, $zero, 1 -/* 167FA0 80247740 0C051F9F */ jal func_80147E7C +/* 167FA0 80247740 0C051F9F */ jal set_window_update /* 167FA4 80247744 A4C20000 */ sh $v0, ($a2) /* 167FA8 80247748 3C058024 */ lui $a1, %hi(func_80243EEC) /* 167FAC 8024774C 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) -/* 167FB0 80247750 0C051F9F */ jal func_80147E7C +/* 167FB0 80247750 0C051F9F */ jal set_window_update /* 167FB4 80247754 24040032 */ addiu $a0, $zero, 0x32 /* 167FB8 80247758 3C108025 */ lui $s0, %hi(D_80249B84) /* 167FBC 8024775C 26109B84 */ addiu $s0, $s0, %lo(D_80249B84) @@ -457,49 +457,49 @@ glabel L802477F8_168058 /* 1680FC 8024789C 3C018007 */ lui $at, %hi(D_80077A24) /* 168100 802478A0 00310821 */ addu $at, $at, $s1 /* 168104 802478A4 A0227A24 */ sb $v0, %lo(D_80077A24)($at) -/* 168108 802478A8 0C051F9F */ jal func_80147E7C +/* 168108 802478A8 0C051F9F */ jal set_window_update /* 16810C 802478AC 0200282D */ daddu $a1, $s0, $zero /* 168110 802478B0 24040031 */ addiu $a0, $zero, 0x31 -/* 168114 802478B4 0C051F9F */ jal func_80147E7C +/* 168114 802478B4 0C051F9F */ jal set_window_update /* 168118 802478B8 0200282D */ daddu $a1, $s0, $zero /* 16811C 802478BC 2404002D */ addiu $a0, $zero, 0x2d /* 168120 802478C0 3C108024 */ lui $s0, %hi(func_8024381C) /* 168124 802478C4 2610381C */ addiu $s0, $s0, %lo(func_8024381C) -/* 168128 802478C8 0C051F9F */ jal func_80147E7C +/* 168128 802478C8 0C051F9F */ jal set_window_update /* 16812C 802478CC 0200282D */ daddu $a1, $s0, $zero /* 168130 802478D0 24040033 */ addiu $a0, $zero, 0x33 -/* 168134 802478D4 0C051F9F */ jal func_80147E7C +/* 168134 802478D4 0C051F9F */ jal set_window_update /* 168138 802478D8 0200282D */ daddu $a1, $s0, $zero /* 16813C 802478DC 24040034 */ addiu $a0, $zero, 0x34 -/* 168140 802478E0 0C051F9F */ jal func_80147E7C +/* 168140 802478E0 0C051F9F */ jal set_window_update /* 168144 802478E4 0200282D */ daddu $a1, $s0, $zero /* 168148 802478E8 24040035 */ addiu $a0, $zero, 0x35 -/* 16814C 802478EC 0C051F9F */ jal func_80147E7C +/* 16814C 802478EC 0C051F9F */ jal set_window_update /* 168150 802478F0 0200282D */ daddu $a1, $s0, $zero /* 168154 802478F4 24040036 */ addiu $a0, $zero, 0x36 -/* 168158 802478F8 0C051F9F */ jal func_80147E7C +/* 168158 802478F8 0C051F9F */ jal set_window_update /* 16815C 802478FC 0200282D */ daddu $a1, $s0, $zero /* 168160 80247900 24040037 */ addiu $a0, $zero, 0x37 -/* 168164 80247904 0C051F9F */ jal func_80147E7C +/* 168164 80247904 0C051F9F */ jal set_window_update /* 168168 80247908 0200282D */ daddu $a1, $s0, $zero /* 16816C 8024790C 24040035 */ addiu $a0, $zero, 0x35 -/* 168170 80247910 0C051F9F */ jal func_80147E7C +/* 168170 80247910 0C051F9F */ jal set_window_update /* 168174 80247914 0200282D */ daddu $a1, $s0, $zero /* 168178 80247918 24040038 */ addiu $a0, $zero, 0x38 -/* 16817C 8024791C 0C051F9F */ jal func_80147E7C +/* 16817C 8024791C 0C051F9F */ jal set_window_update /* 168180 80247920 0200282D */ daddu $a1, $s0, $zero /* 168184 80247924 24040039 */ addiu $a0, $zero, 0x39 -/* 168188 80247928 0C051F9F */ jal func_80147E7C +/* 168188 80247928 0C051F9F */ jal set_window_update /* 16818C 8024792C 0200282D */ daddu $a1, $s0, $zero /* 168190 80247930 2404003A */ addiu $a0, $zero, 0x3a -/* 168194 80247934 0C051F9F */ jal func_80147E7C +/* 168194 80247934 0C051F9F */ jal set_window_update /* 168198 80247938 0200282D */ daddu $a1, $s0, $zero /* 16819C 8024793C 2404003B */ addiu $a0, $zero, 0x3b -/* 1681A0 80247940 0C051F9F */ jal func_80147E7C +/* 1681A0 80247940 0C051F9F */ jal set_window_update /* 1681A4 80247944 0200282D */ daddu $a1, $s0, $zero /* 1681A8 80247948 3C058024 */ lui $a1, %hi(func_80243EEC) /* 1681AC 8024794C 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) -/* 1681B0 80247950 0C051F9F */ jal func_80147E7C +/* 1681B0 80247950 0C051F9F */ jal set_window_update /* 1681B4 80247954 24040032 */ addiu $a0, $zero, 0x32 /* 1681B8 80247958 24020002 */ addiu $v0, $zero, 2 /* 1681BC 8024795C 3C018025 */ lui $at, %hi(D_8024C098) @@ -624,46 +624,46 @@ glabel L80247AF8_168358 /* 16836C 80247B0C 3C018025 */ lui $at, %hi(D_8024C098) /* 168370 80247B10 A020C098 */ sb $zero, %lo(D_8024C098)($at) /* 168374 80247B14 90510003 */ lbu $s1, 3($v0) -/* 168378 80247B18 0C051F9F */ jal func_80147E7C +/* 168378 80247B18 0C051F9F */ jal set_window_update /* 16837C 80247B1C 0200282D */ daddu $a1, $s0, $zero /* 168380 80247B20 24040033 */ addiu $a0, $zero, 0x33 -/* 168384 80247B24 0C051F9F */ jal func_80147E7C +/* 168384 80247B24 0C051F9F */ jal set_window_update /* 168388 80247B28 0200282D */ daddu $a1, $s0, $zero /* 16838C 80247B2C 24040034 */ addiu $a0, $zero, 0x34 -/* 168390 80247B30 0C051F9F */ jal func_80147E7C +/* 168390 80247B30 0C051F9F */ jal set_window_update /* 168394 80247B34 0200282D */ daddu $a1, $s0, $zero /* 168398 80247B38 24040035 */ addiu $a0, $zero, 0x35 -/* 16839C 80247B3C 0C051F9F */ jal func_80147E7C +/* 16839C 80247B3C 0C051F9F */ jal set_window_update /* 1683A0 80247B40 0200282D */ daddu $a1, $s0, $zero /* 1683A4 80247B44 24040036 */ addiu $a0, $zero, 0x36 -/* 1683A8 80247B48 0C051F9F */ jal func_80147E7C +/* 1683A8 80247B48 0C051F9F */ jal set_window_update /* 1683AC 80247B4C 0200282D */ daddu $a1, $s0, $zero /* 1683B0 80247B50 24040037 */ addiu $a0, $zero, 0x37 -/* 1683B4 80247B54 0C051F9F */ jal func_80147E7C +/* 1683B4 80247B54 0C051F9F */ jal set_window_update /* 1683B8 80247B58 0200282D */ daddu $a1, $s0, $zero /* 1683BC 80247B5C 24040035 */ addiu $a0, $zero, 0x35 -/* 1683C0 80247B60 0C051F9F */ jal func_80147E7C +/* 1683C0 80247B60 0C051F9F */ jal set_window_update /* 1683C4 80247B64 0200282D */ daddu $a1, $s0, $zero /* 1683C8 80247B68 24040038 */ addiu $a0, $zero, 0x38 -/* 1683CC 80247B6C 0C051F9F */ jal func_80147E7C +/* 1683CC 80247B6C 0C051F9F */ jal set_window_update /* 1683D0 80247B70 0200282D */ daddu $a1, $s0, $zero /* 1683D4 80247B74 24040039 */ addiu $a0, $zero, 0x39 -/* 1683D8 80247B78 0C051F9F */ jal func_80147E7C +/* 1683D8 80247B78 0C051F9F */ jal set_window_update /* 1683DC 80247B7C 0200282D */ daddu $a1, $s0, $zero /* 1683E0 80247B80 2404003A */ addiu $a0, $zero, 0x3a -/* 1683E4 80247B84 0C051F9F */ jal func_80147E7C +/* 1683E4 80247B84 0C051F9F */ jal set_window_update /* 1683E8 80247B88 0200282D */ daddu $a1, $s0, $zero /* 1683EC 80247B8C 2404003B */ addiu $a0, $zero, 0x3b -/* 1683F0 80247B90 0C051F9F */ jal func_80147E7C +/* 1683F0 80247B90 0C051F9F */ jal set_window_update /* 1683F4 80247B94 0200282D */ daddu $a1, $s0, $zero /* 1683F8 80247B98 3C058024 */ lui $a1, %hi(func_80243B10) /* 1683FC 80247B9C 24A53B10 */ addiu $a1, $a1, %lo(func_80243B10) -/* 168400 80247BA0 0C051F9F */ jal func_80147E7C +/* 168400 80247BA0 0C051F9F */ jal set_window_update /* 168404 80247BA4 26240038 */ addiu $a0, $s1, 0x38 /* 168408 80247BA8 24040032 */ addiu $a0, $zero, 0x32 /* 16840C 80247BAC 24050002 */ addiu $a1, $zero, 2 .L80247BB0: -/* 168410 80247BB0 0C051F9F */ jal func_80147E7C +/* 168410 80247BB0 0C051F9F */ jal set_window_update /* 168414 80247BB4 00000000 */ nop .L80247BB8: /* 168418 80247BB8 3C028025 */ lui $v0, %hi(D_8024C084) @@ -710,46 +710,46 @@ glabel L80247C3C_16849C /* 1684B0 80247C50 3C018025 */ lui $at, %hi(D_8024C098) /* 1684B4 80247C54 A020C098 */ sb $zero, %lo(D_8024C098)($at) /* 1684B8 80247C58 90510003 */ lbu $s1, 3($v0) -/* 1684BC 80247C5C 0C051F9F */ jal func_80147E7C +/* 1684BC 80247C5C 0C051F9F */ jal set_window_update /* 1684C0 80247C60 0200282D */ daddu $a1, $s0, $zero /* 1684C4 80247C64 24040033 */ addiu $a0, $zero, 0x33 -/* 1684C8 80247C68 0C051F9F */ jal func_80147E7C +/* 1684C8 80247C68 0C051F9F */ jal set_window_update /* 1684CC 80247C6C 0200282D */ daddu $a1, $s0, $zero /* 1684D0 80247C70 24040034 */ addiu $a0, $zero, 0x34 -/* 1684D4 80247C74 0C051F9F */ jal func_80147E7C +/* 1684D4 80247C74 0C051F9F */ jal set_window_update /* 1684D8 80247C78 0200282D */ daddu $a1, $s0, $zero /* 1684DC 80247C7C 24040035 */ addiu $a0, $zero, 0x35 -/* 1684E0 80247C80 0C051F9F */ jal func_80147E7C +/* 1684E0 80247C80 0C051F9F */ jal set_window_update /* 1684E4 80247C84 0200282D */ daddu $a1, $s0, $zero /* 1684E8 80247C88 24040036 */ addiu $a0, $zero, 0x36 -/* 1684EC 80247C8C 0C051F9F */ jal func_80147E7C +/* 1684EC 80247C8C 0C051F9F */ jal set_window_update /* 1684F0 80247C90 0200282D */ daddu $a1, $s0, $zero /* 1684F4 80247C94 24040037 */ addiu $a0, $zero, 0x37 -/* 1684F8 80247C98 0C051F9F */ jal func_80147E7C +/* 1684F8 80247C98 0C051F9F */ jal set_window_update /* 1684FC 80247C9C 0200282D */ daddu $a1, $s0, $zero /* 168500 80247CA0 24040035 */ addiu $a0, $zero, 0x35 -/* 168504 80247CA4 0C051F9F */ jal func_80147E7C +/* 168504 80247CA4 0C051F9F */ jal set_window_update /* 168508 80247CA8 0200282D */ daddu $a1, $s0, $zero /* 16850C 80247CAC 24040038 */ addiu $a0, $zero, 0x38 -/* 168510 80247CB0 0C051F9F */ jal func_80147E7C +/* 168510 80247CB0 0C051F9F */ jal set_window_update /* 168514 80247CB4 0200282D */ daddu $a1, $s0, $zero /* 168518 80247CB8 24040039 */ addiu $a0, $zero, 0x39 -/* 16851C 80247CBC 0C051F9F */ jal func_80147E7C +/* 16851C 80247CBC 0C051F9F */ jal set_window_update /* 168520 80247CC0 0200282D */ daddu $a1, $s0, $zero /* 168524 80247CC4 2404003A */ addiu $a0, $zero, 0x3a -/* 168528 80247CC8 0C051F9F */ jal func_80147E7C +/* 168528 80247CC8 0C051F9F */ jal set_window_update /* 16852C 80247CCC 0200282D */ daddu $a1, $s0, $zero /* 168530 80247CD0 2404003B */ addiu $a0, $zero, 0x3b -/* 168534 80247CD4 0C051F9F */ jal func_80147E7C +/* 168534 80247CD4 0C051F9F */ jal set_window_update /* 168538 80247CD8 0200282D */ daddu $a1, $s0, $zero /* 16853C 80247CDC 3C058024 */ lui $a1, %hi(func_80243B10) /* 168540 80247CE0 24A53B10 */ addiu $a1, $a1, %lo(func_80243B10) -/* 168544 80247CE4 0C051F9F */ jal func_80147E7C +/* 168544 80247CE4 0C051F9F */ jal set_window_update /* 168548 80247CE8 26240038 */ addiu $a0, $s1, 0x38 /* 16854C 80247CEC 24040032 */ addiu $a0, $zero, 0x32 /* 168550 80247CF0 24050002 */ addiu $a1, $zero, 2 .L80247CF4: -/* 168554 80247CF4 0C051F9F */ jal func_80147E7C +/* 168554 80247CF4 0C051F9F */ jal set_window_update /* 168558 80247CF8 00000000 */ nop .L80247CFC: /* 16855C 80247CFC 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/code_168590/func_80247FD0.s b/asm/nonmatchings/code_168590/func_80247FD0.s index 6166654df7..0e6a42dfa8 100644 --- a/asm/nonmatchings/code_168590/func_80247FD0.s +++ b/asm/nonmatchings/code_168590/func_80247FD0.s @@ -16,7 +16,7 @@ glabel func_80247FD0 /* 168858 80247FF8 24420024 */ addiu $v0, $v0, 0x24 /* 16885C 80247FFC 3C048025 */ lui $a0, %hi(D_8024A134) /* 168860 80248000 2484A134 */ addiu $a0, $a0, %lo(D_8024A134) -/* 168864 80248004 0C051FCC */ jal func_80147F30 +/* 168864 80248004 0C051FCC */ jal setup_pause_menu_tab /* 168868 80248008 24050001 */ addiu $a1, $zero, 1 /* 16886C 8024800C 24020001 */ addiu $v0, $zero, 1 /* 168870 80248010 A2020000 */ sb $v0, ($s0) diff --git a/asm/nonmatchings/code_168590/func_80248024.s b/asm/nonmatchings/code_168590/func_80248024.s index bde25a920a..e593309eb0 100644 --- a/asm/nonmatchings/code_168590/func_80248024.s +++ b/asm/nonmatchings/code_168590/func_80248024.s @@ -34,19 +34,19 @@ glabel func_80248024 /* 1688F0 80248090 A2200004 */ sb $zero, 4($s1) /* 1688F4 80248094 3C058024 */ lui $a1, %hi(func_802433F4) /* 1688F8 80248098 24A533F4 */ addiu $a1, $a1, %lo(func_802433F4) -/* 1688FC 8024809C 0C051F9F */ jal func_80147E7C +/* 1688FC 8024809C 0C051F9F */ jal set_window_update /* 168900 802480A0 24040033 */ addiu $a0, $zero, 0x33 /* 168904 802480A4 3C058024 */ lui $a1, %hi(func_80243468) /* 168908 802480A8 24A53468 */ addiu $a1, $a1, %lo(func_80243468) -/* 16890C 802480AC 0C051F9F */ jal func_80147E7C +/* 16890C 802480AC 0C051F9F */ jal set_window_update /* 168910 802480B0 24040034 */ addiu $a0, $zero, 0x34 /* 168914 802480B4 24040035 */ addiu $a0, $zero, 0x35 /* 168918 802480B8 3C108024 */ lui $s0, %hi(func_802434DC) /* 16891C 802480BC 261034DC */ addiu $s0, $s0, %lo(func_802434DC) -/* 168920 802480C0 0C051F9F */ jal func_80147E7C +/* 168920 802480C0 0C051F9F */ jal set_window_update /* 168924 802480C4 0200282D */ daddu $a1, $s0, $zero /* 168928 802480C8 24040037 */ addiu $a0, $zero, 0x37 -/* 16892C 802480CC 0C051F9F */ jal func_80147E7C +/* 16892C 802480CC 0C051F9F */ jal set_window_update /* 168930 802480D0 0200282D */ daddu $a1, $s0, $zero /* 168934 802480D4 0220202D */ daddu $a0, $s1, $zero /* 168938 802480D8 0809204E */ j .L80248138 @@ -55,19 +55,19 @@ glabel func_80248024 /* 168940 802480E0 A2200004 */ sb $zero, 4($s1) /* 168944 802480E4 3C058024 */ lui $a1, %hi(func_802433F4) /* 168948 802480E8 24A533F4 */ addiu $a1, $a1, %lo(func_802433F4) -/* 16894C 802480EC 0C051F9F */ jal func_80147E7C +/* 16894C 802480EC 0C051F9F */ jal set_window_update /* 168950 802480F0 24040033 */ addiu $a0, $zero, 0x33 /* 168954 802480F4 3C058024 */ lui $a1, %hi(func_80243468) /* 168958 802480F8 24A53468 */ addiu $a1, $a1, %lo(func_80243468) -/* 16895C 802480FC 0C051F9F */ jal func_80147E7C +/* 16895C 802480FC 0C051F9F */ jal set_window_update /* 168960 80248100 24040034 */ addiu $a0, $zero, 0x34 /* 168964 80248104 24040035 */ addiu $a0, $zero, 0x35 /* 168968 80248108 3C108024 */ lui $s0, %hi(func_802434DC) /* 16896C 8024810C 261034DC */ addiu $s0, $s0, %lo(func_802434DC) -/* 168970 80248110 0C051F9F */ jal func_80147E7C +/* 168970 80248110 0C051F9F */ jal set_window_update /* 168974 80248114 0200282D */ daddu $a1, $s0, $zero /* 168978 80248118 24040037 */ addiu $a0, $zero, 0x37 -/* 16897C 8024811C 0C051F9F */ jal func_80147E7C +/* 16897C 8024811C 0C051F9F */ jal set_window_update /* 168980 80248120 0200282D */ daddu $a1, $s0, $zero /* 168984 80248124 0809204D */ j .L80248134 /* 168988 80248128 0220202D */ daddu $a0, $s1, $zero @@ -81,7 +81,7 @@ glabel func_80248024 /* 16899C 8024813C 24060002 */ addiu $a2, $zero, 2 /* 1689A0 80248140 2404002F */ addiu $a0, $zero, 0x2f .L80248144: -/* 1689A4 80248144 0C051F9F */ jal func_80147E7C +/* 1689A4 80248144 0C051F9F */ jal set_window_update /* 1689A8 80248148 24050002 */ addiu $a1, $zero, 2 .L8024814C: /* 1689AC 8024814C 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_168590/func_80248170.s b/asm/nonmatchings/code_168590/func_80248170.s index 70982f0fbe..a3e54428d3 100644 --- a/asm/nonmatchings/code_168590/func_80248170.s +++ b/asm/nonmatchings/code_168590/func_80248170.s @@ -15,7 +15,7 @@ glabel func_80248170 /* 1689F8 80248198 90A20000 */ lbu $v0, ($a1) /* 1689FC 8024819C 304200F7 */ andi $v0, $v0, 0xf7 /* 168A00 802481A0 A0A20000 */ sb $v0, ($a1) -/* 168A04 802481A4 0C051F9F */ jal func_80147E7C +/* 168A04 802481A4 0C051F9F */ jal set_window_update /* 168A08 802481A8 24050001 */ addiu $a1, $zero, 1 .L802481AC: /* 168A0C 802481AC 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_168590/func_80248A80.s b/asm/nonmatchings/code_168590/func_80248A80.s index 7461bae232..0dfabd631f 100644 --- a/asm/nonmatchings/code_168590/func_80248A80.s +++ b/asm/nonmatchings/code_168590/func_80248A80.s @@ -36,7 +36,7 @@ glabel func_80248A80 /* 169354 80248AF4 2442FFDC */ addiu $v0, $v0, -0x24 /* 169358 80248AF8 3C048025 */ lui $a0, %hi(D_8024A190) /* 16935C 80248AFC 2484A190 */ addiu $a0, $a0, %lo(D_8024A190) -/* 169360 80248B00 0C051FCC */ jal func_80147F30 +/* 169360 80248B00 0C051FCC */ jal setup_pause_menu_tab /* 169364 80248B04 24050002 */ addiu $a1, $zero, 2 /* 169368 80248B08 3C048016 */ lui $a0, %hi(gUIPanels) /* 16936C 80248B0C 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) diff --git a/asm/nonmatchings/code_168590/func_80248BF4.s b/asm/nonmatchings/code_168590/func_80248BF4.s index d1f3000ddc..20aedb2d36 100644 --- a/asm/nonmatchings/code_168590/func_80248BF4.s +++ b/asm/nonmatchings/code_168590/func_80248BF4.s @@ -198,7 +198,7 @@ glabel L80248E90_1696F0 /* 169718 80248EB8 00000000 */ nop /* 16971C 80248EBC 3C058025 */ lui $a1, %hi(func_80248170) /* 169720 80248EC0 24A58170 */ addiu $a1, $a1, %lo(func_80248170) -/* 169724 80248EC4 0C051F9F */ jal func_80147E7C +/* 169724 80248EC4 0C051F9F */ jal set_window_update /* 169728 80248EC8 24040031 */ addiu $a0, $zero, 0x31 /* 16972C 80248ECC 0809240D */ j .L80249034 /* 169730 80248ED0 00000000 */ nop @@ -229,7 +229,7 @@ glabel L80248ED4_169734 /* 169784 80248F24 240400C9 */ addiu $a0, $zero, 0xc9 /* 169788 80248F28 3C058024 */ lui $a1, %hi(func_80243CCC) /* 16978C 80248F2C 24A53CCC */ addiu $a1, $a1, %lo(func_80243CCC) -/* 169790 80248F30 0C051F9F */ jal func_80147E7C +/* 169790 80248F30 0C051F9F */ jal set_window_update /* 169794 80248F34 24040032 */ addiu $a0, $zero, 0x32 /* 169798 80248F38 3C048016 */ lui $a0, %hi(gUIPanels) /* 16979C 80248F3C 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) @@ -343,45 +343,45 @@ glabel L80249034_169894 /* 169928 802490C8 3C108024 */ lui $s0, %hi(func_80243628) /* 16992C 802490CC 26103628 */ addiu $s0, $s0, %lo(func_80243628) /* 169930 802490D0 0200282D */ daddu $a1, $s0, $zero -/* 169934 802490D4 0C051F9F */ jal func_80147E7C +/* 169934 802490D4 0C051F9F */ jal set_window_update /* 169938 802490D8 A0600000 */ sb $zero, ($v1) /* 16993C 802490DC 24040031 */ addiu $a0, $zero, 0x31 -/* 169940 802490E0 0C051F9F */ jal func_80147E7C +/* 169940 802490E0 0C051F9F */ jal set_window_update /* 169944 802490E4 0200282D */ daddu $a1, $s0, $zero /* 169948 802490E8 2404002D */ addiu $a0, $zero, 0x2d /* 16994C 802490EC 3C108024 */ lui $s0, %hi(func_8024381C) /* 169950 802490F0 2610381C */ addiu $s0, $s0, %lo(func_8024381C) -/* 169954 802490F4 0C051F9F */ jal func_80147E7C +/* 169954 802490F4 0C051F9F */ jal set_window_update /* 169958 802490F8 0200282D */ daddu $a1, $s0, $zero /* 16995C 802490FC 24040033 */ addiu $a0, $zero, 0x33 -/* 169960 80249100 0C051F9F */ jal func_80147E7C +/* 169960 80249100 0C051F9F */ jal set_window_update /* 169964 80249104 0200282D */ daddu $a1, $s0, $zero /* 169968 80249108 24040034 */ addiu $a0, $zero, 0x34 -/* 16996C 8024910C 0C051F9F */ jal func_80147E7C +/* 16996C 8024910C 0C051F9F */ jal set_window_update /* 169970 80249110 0200282D */ daddu $a1, $s0, $zero /* 169974 80249114 24040035 */ addiu $a0, $zero, 0x35 -/* 169978 80249118 0C051F9F */ jal func_80147E7C +/* 169978 80249118 0C051F9F */ jal set_window_update /* 16997C 8024911C 0200282D */ daddu $a1, $s0, $zero /* 169980 80249120 24040036 */ addiu $a0, $zero, 0x36 -/* 169984 80249124 0C051F9F */ jal func_80147E7C +/* 169984 80249124 0C051F9F */ jal set_window_update /* 169988 80249128 0200282D */ daddu $a1, $s0, $zero /* 16998C 8024912C 24040037 */ addiu $a0, $zero, 0x37 -/* 169990 80249130 0C051F9F */ jal func_80147E7C +/* 169990 80249130 0C051F9F */ jal set_window_update /* 169994 80249134 0200282D */ daddu $a1, $s0, $zero /* 169998 80249138 24040035 */ addiu $a0, $zero, 0x35 -/* 16999C 8024913C 0C051F9F */ jal func_80147E7C +/* 16999C 8024913C 0C051F9F */ jal set_window_update /* 1699A0 80249140 0200282D */ daddu $a1, $s0, $zero /* 1699A4 80249144 24040038 */ addiu $a0, $zero, 0x38 -/* 1699A8 80249148 0C051F9F */ jal func_80147E7C +/* 1699A8 80249148 0C051F9F */ jal set_window_update /* 1699AC 8024914C 0200282D */ daddu $a1, $s0, $zero /* 1699B0 80249150 24040039 */ addiu $a0, $zero, 0x39 -/* 1699B4 80249154 0C051F9F */ jal func_80147E7C +/* 1699B4 80249154 0C051F9F */ jal set_window_update /* 1699B8 80249158 0200282D */ daddu $a1, $s0, $zero /* 1699BC 8024915C 2404003A */ addiu $a0, $zero, 0x3a -/* 1699C0 80249160 0C051F9F */ jal func_80147E7C +/* 1699C0 80249160 0C051F9F */ jal set_window_update /* 1699C4 80249164 0200282D */ daddu $a1, $s0, $zero /* 1699C8 80249168 2404003B */ addiu $a0, $zero, 0x3b -/* 1699CC 8024916C 0C051F9F */ jal func_80147E7C +/* 1699CC 8024916C 0C051F9F */ jal set_window_update /* 1699D0 80249170 0200282D */ daddu $a1, $s0, $zero /* 1699D4 80249174 3C018025 */ lui $at, %hi(D_8024C098) /* 1699D8 80249178 A020C098 */ sb $zero, %lo(D_8024C098)($at) @@ -432,7 +432,7 @@ glabel L80249034_169894 /* 169A74 80249214 240400C9 */ addiu $a0, $zero, 0xc9 /* 169A78 80249218 3C058024 */ lui $a1, %hi(func_80243CCC) /* 169A7C 8024921C 24A53CCC */ addiu $a1, $a1, %lo(func_80243CCC) -/* 169A80 80249220 0C051F9F */ jal func_80147E7C +/* 169A80 80249220 0C051F9F */ jal set_window_update /* 169A84 80249224 24040032 */ addiu $a0, $zero, 0x32 /* 169A88 80249228 3C048016 */ lui $a0, %hi(gUIPanels) /* 169A8C 8024922C 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) diff --git a/asm/nonmatchings/code_16F740/begin_battle.s b/asm/nonmatchings/code_16F740/begin_battle.s index 3f40911054..50497c0378 100644 --- a/asm/nonmatchings/code_16F740/begin_battle.s +++ b/asm/nonmatchings/code_16F740/begin_battle.s @@ -49,7 +49,7 @@ glabel L802412B4_16FB94 /* 16FB98 802412B8 8EC20004 */ lw $v0, 4($s6) /* 16FB9C 802412BC 3C01802A */ lui $at, %hi(D_8029F240) /* 16FBA0 802412C0 AC22F240 */ sw $v0, %lo(D_8029F240)($at) -/* 16FBA4 802412C4 0C04DF69 */ jal func_80137DA4 +/* 16FBA4 802412C4 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 16FBA8 802412C8 240400FF */ addiu $a0, $zero, 0xff /* 16FBAC 802412CC 8EA40004 */ lw $a0, 4($s5) /* 16FBB0 802412D0 0C016B3A */ jal load_asset_by_name @@ -452,10 +452,10 @@ glabel L802417DC_1700BC /* 17016C 8024188C 24040001 */ addiu $a0, $zero, 1 /* 170170 80241890 0000282D */ daddu $a1, $zero, $zero /* 170174 80241894 00A0302D */ daddu $a2, $a1, $zero -/* 170178 80241898 0C04DF84 */ jal func_80137E10 +/* 170178 80241898 0C04DF84 */ jal set_transition_stencil_color /* 17017C 8024189C 00A0382D */ daddu $a3, $a1, $zero /* 170180 802418A0 3C054357 */ lui $a1, 0x4357 -/* 170184 802418A4 0C04DF69 */ jal func_80137DA4 +/* 170184 802418A4 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 170188 802418A8 0000202D */ daddu $a0, $zero, $zero .L802418AC: /* 17018C 802418AC 0C03A752 */ jal is_ability_active @@ -585,7 +585,7 @@ glabel L80241A64_170344 /* 170348 80241A68 14400007 */ bnez $v0, .L80241A88 /* 17034C 80241A6C 00000000 */ nop /* 170350 80241A70 3C05BF80 */ lui $a1, 0xbf80 -/* 170354 80241A74 0C04DF62 */ jal func_80137D88 +/* 170354 80241A74 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 170358 80241A78 240400FF */ addiu $a0, $zero, 0xff /* 17035C 80241A7C 24040005 */ addiu $a0, $zero, 5 .L80241A80: diff --git a/asm/nonmatchings/code_16F740/end_battle.s b/asm/nonmatchings/code_16F740/end_battle.s index 1923445a44..3790427794 100644 --- a/asm/nonmatchings/code_16F740/end_battle.s +++ b/asm/nonmatchings/code_16F740/end_battle.s @@ -52,12 +52,12 @@ glabel L80244AA8_173388 /* 1733E4 80244B04 0000202D */ daddu $a0, $zero, $zero /* 1733E8 80244B08 0080282D */ daddu $a1, $a0, $zero /* 1733EC 80244B0C 0080302D */ daddu $a2, $a0, $zero -/* 1733F0 80244B10 0C04DF84 */ jal func_80137E10 +/* 1733F0 80244B10 0C04DF84 */ jal set_transition_stencil_color /* 1733F4 80244B14 0080382D */ daddu $a3, $a0, $zero /* 1733F8 80244B18 0000202D */ daddu $a0, $zero, $zero /* 1733FC 80244B1C 0080282D */ daddu $a1, $a0, $zero /* 173400 80244B20 240600A0 */ addiu $a2, $zero, 0xa0 -/* 173404 80244B24 0C04DF93 */ jal func_80137E4C +/* 173404 80244B24 0C04DF93 */ jal set_transition_stencil_center /* 173408 80244B28 24070078 */ addiu $a3, $zero, 0x78 /* 17340C 80244B2C 24020001 */ addiu $v0, $zero, 1 .L80244B30: @@ -172,7 +172,7 @@ glabel L80244C28_173508 .L80244CB0: /* 173590 80244CB0 0C016938 */ jal remove_all_effects /* 173594 80244CB4 00000000 */ nop -/* 173598 80244CB8 0C051FB1 */ jal func_80147EC4 +/* 173598 80244CB8 0C051FB1 */ jal set_windows_visible /* 17359C 80244CBC 0000202D */ daddu $a0, $zero, $zero /* 1735A0 80244CC0 8E020004 */ lw $v0, 4($s0) /* 1735A4 80244CC4 30420040 */ andi $v0, $v0, 0x40 diff --git a/asm/nonmatchings/code_16F740/func_80241AB8.s b/asm/nonmatchings/code_16F740/func_80241AB8.s index 3f9cbb7d67..693e66ffbc 100644 --- a/asm/nonmatchings/code_16F740/func_80241AB8.s +++ b/asm/nonmatchings/code_16F740/func_80241AB8.s @@ -7,7 +7,7 @@ glabel func_80241AB8 /* 1703A0 80241AC0 0080282D */ daddu $a1, $a0, $zero /* 1703A4 80241AC4 0080302D */ daddu $a2, $a0, $zero /* 1703A8 80241AC8 AFBF0010 */ sw $ra, 0x10($sp) -/* 1703AC 80241ACC 0C04DF84 */ jal func_80137E10 +/* 1703AC 80241ACC 0C04DF84 */ jal set_transition_stencil_color /* 1703B0 80241AD0 0080382D */ daddu $a3, $a0, $zero /* 1703B4 80241AD4 3C058028 */ lui $a1, %hi(D_80280A30) /* 1703B8 80241AD8 8CA50A30 */ lw $a1, %lo(D_80280A30)($a1) @@ -22,7 +22,7 @@ glabel func_80241AB8 /* 1703D8 80241AF8 46800020 */ cvt.s.w $f0, $f0 /* 1703DC 80241AFC 44050000 */ mfc1 $a1, $f0 .L80241B00: -/* 1703E0 80241B00 0C04DF62 */ jal func_80137D88 +/* 1703E0 80241B00 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 1703E4 80241B04 0000202D */ daddu $a0, $zero, $zero /* 1703E8 80241B08 8FBF0010 */ lw $ra, 0x10($sp) /* 1703EC 80241B0C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16F740/func_80244D90.s b/asm/nonmatchings/code_16F740/func_80244D90.s index 98c76c1ac0..31197ee8e1 100644 --- a/asm/nonmatchings/code_16F740/func_80244D90.s +++ b/asm/nonmatchings/code_16F740/func_80244D90.s @@ -41,7 +41,7 @@ glabel func_80244D90 /* 1736FC 80244E1C 44050000 */ mfc1 $a1, $f0 /* 173700 80244E20 0000202D */ daddu $a0, $zero, $zero .L80244E24: -/* 173704 80244E24 0C04DF62 */ jal func_80137D88 +/* 173704 80244E24 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 173708 80244E28 00000000 */ nop /* 17370C 80244E2C 8FBF0010 */ lw $ra, 0x10($sp) /* 173710 80244E30 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16F740/func_802480F0.s b/asm/nonmatchings/code_16F740/func_802480F0.s index 94a0dcf745..426a09cc7f 100644 --- a/asm/nonmatchings/code_16F740/func_802480F0.s +++ b/asm/nonmatchings/code_16F740/func_802480F0.s @@ -41,7 +41,7 @@ glabel func_802480F0 /* 176A54 80248174 44050000 */ mfc1 $a1, $f0 /* 176A58 80248178 0000202D */ daddu $a0, $zero, $zero .L8024817C: -/* 176A5C 8024817C 0C04DF62 */ jal func_80137D88 +/* 176A5C 8024817C 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 176A60 80248180 00000000 */ nop .L80248184: /* 176A64 80248184 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_16F740/func_802485FC.s b/asm/nonmatchings/code_16F740/func_802485FC.s index ff7ff16b78..ad45cded2c 100644 --- a/asm/nonmatchings/code_16F740/func_802485FC.s +++ b/asm/nonmatchings/code_16F740/func_802485FC.s @@ -25,7 +25,7 @@ glabel func_802485FC /* 176F24 80248644 44050000 */ mfc1 $a1, $f0 /* 176F28 80248648 0000202D */ daddu $a0, $zero, $zero .L8024864C: -/* 176F2C 8024864C 0C04DF62 */ jal func_80137D88 +/* 176F2C 8024864C 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 176F30 80248650 00000000 */ nop .L80248654: /* 176F34 80248654 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_16F740/func_80248AA4.s b/asm/nonmatchings/code_16F740/func_80248AA4.s index b90fbbe263..a745c98aac 100644 --- a/asm/nonmatchings/code_16F740/func_80248AA4.s +++ b/asm/nonmatchings/code_16F740/func_80248AA4.s @@ -25,7 +25,7 @@ glabel func_80248AA4 /* 1773CC 80248AEC 44050000 */ mfc1 $a1, $f0 /* 1773D0 80248AF0 0000202D */ daddu $a0, $zero, $zero .L80248AF4: -/* 1773D4 80248AF4 0C04DF62 */ jal func_80137D88 +/* 1773D4 80248AF4 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 1773D8 80248AF8 00000000 */ nop .L80248AFC: /* 1773DC 80248AFC 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_16F740/func_80248B08.s b/asm/nonmatchings/code_16F740/func_80248B08.s index 8d93fb89cc..c769c8b699 100644 --- a/asm/nonmatchings/code_16F740/func_80248B08.s +++ b/asm/nonmatchings/code_16F740/func_80248B08.s @@ -143,7 +143,7 @@ glabel L80248CAC_17758C /* 1775D0 80248CF0 8E4400D8 */ lw $a0, 0xd8($s2) /* 1775D4 80248CF4 0C016938 */ jal remove_all_effects /* 1775D8 80248CF8 00000000 */ nop -/* 1775DC 80248CFC 0C051FB1 */ jal func_80147EC4 +/* 1775DC 80248CFC 0C051FB1 */ jal set_windows_visible /* 1775E0 80248D00 0000202D */ daddu $a0, $zero, $zero /* 1775E4 80248D04 3C02800E */ lui $v0, %hi(gBattleStatus+0x4) /* 1775E8 80248D08 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) diff --git a/asm/nonmatchings/code_16F740/func_80248D78.s b/asm/nonmatchings/code_16F740/func_80248D78.s index bd31ea8dd0..c17f733af3 100644 --- a/asm/nonmatchings/code_16F740/func_80248D78.s +++ b/asm/nonmatchings/code_16F740/func_80248D78.s @@ -11,13 +11,13 @@ glabel func_80248D78 /* 177670 80248D90 0000202D */ daddu $a0, $zero, $zero /* 177674 80248D94 0080282D */ daddu $a1, $a0, $zero /* 177678 80248D98 0080302D */ daddu $a2, $a0, $zero -/* 17767C 80248D9C 0C04DF84 */ jal func_80137E10 +/* 17767C 80248D9C 0C04DF84 */ jal set_transition_stencil_color /* 177680 80248DA0 0080382D */ daddu $a3, $a0, $zero /* 177684 80248DA4 3C018028 */ lui $at, %hi(D_80280A30) /* 177688 80248DA8 C4200A30 */ lwc1 $f0, %lo(D_80280A30)($at) /* 17768C 80248DAC 46800020 */ cvt.s.w $f0, $f0 /* 177690 80248DB0 44050000 */ mfc1 $a1, $f0 -/* 177694 80248DB4 0C04DF62 */ jal func_80137D88 +/* 177694 80248DB4 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 177698 80248DB8 0000202D */ daddu $a0, $zero, $zero .L80248DBC: /* 17769C 80248DBC 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_16c8e0/initialize_battle.s b/asm/nonmatchings/code_16c8e0/initialize_battle.s index 9c728eea25..c23bef53ca 100644 --- a/asm/nonmatchings/code_16c8e0/initialize_battle.s +++ b/asm/nonmatchings/code_16c8e0/initialize_battle.s @@ -95,7 +95,7 @@ glabel initialize_battle /* 16CB60 8023E280 0000882D */ daddu $s1, $zero, $zero /* 16CB64 8023E284 0C09A3A2 */ jal func_80268E88 /* 16CB68 8023E288 00000000 */ nop -/* 16CB6C 8023E28C 0C051FB1 */ jal func_80147EC4 +/* 16CB6C 8023E28C 0C051FB1 */ jal set_windows_visible /* 16CB70 8023E290 24040001 */ addiu $a0, $zero, 1 /* 16CB74 8023E294 3C048029 */ lui $a0, %hi(D_80291F80) /* 16CB78 8023E298 24841F80 */ addiu $a0, $a0, %lo(D_80291F80) diff --git a/asm/nonmatchings/code_16c8e0/update_battle_state.s b/asm/nonmatchings/code_16c8e0/update_battle_state.s index 54fcf744ba..08ceafcea7 100644 --- a/asm/nonmatchings/code_16c8e0/update_battle_state.s +++ b/asm/nonmatchings/code_16c8e0/update_battle_state.s @@ -311,7 +311,7 @@ glabel L8023E7E4_16D0C4 /* 16D138 8023E858 24040001 */ addiu $a0, $zero, 1 /* 16D13C 8023E85C 0000282D */ daddu $a1, $zero, $zero /* 16D140 8023E860 00A0302D */ daddu $a2, $a1, $zero -/* 16D144 8023E864 0C04DF84 */ jal func_80137E10 +/* 16D144 8023E864 0C04DF84 */ jal set_transition_stencil_color /* 16D148 8023E868 00A0382D */ daddu $a3, $a1, $zero /* 16D14C 8023E86C 16400003 */ bnez $s2, .L8023E87C /* 16D150 8023E870 00000000 */ nop @@ -372,14 +372,14 @@ glabel L8023E7E4_16D0C4 /* 16D218 8023E938 E7A2001C */ swc1 $f2, 0x1c($sp) /* 16D21C 8023E93C 3C05BF80 */ lui $a1, 0xbf80 /* 16D220 8023E940 240400FF */ addiu $a0, $zero, 0xff -/* 16D224 8023E944 0C04DF69 */ jal func_80137DA4 +/* 16D224 8023E944 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 16D228 8023E948 E7A0001C */ swc1 $f0, 0x1c($sp) /* 16D22C 8023E94C 0808FA58 */ j .L8023E960 /* 16D230 8023E950 A2000432 */ sb $zero, 0x432($s0) .L8023E954: /* 16D234 8023E954 44051000 */ mfc1 $a1, $f2 .L8023E958: -/* 16D238 8023E958 0C04DF69 */ jal func_80137DA4 +/* 16D238 8023E958 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 16D23C 8023E95C 0000202D */ daddu $a0, $zero, $zero .L8023E960: /* 16D240 8023E960 16200005 */ bnez $s1, .L8023E978 @@ -411,7 +411,7 @@ glabel L8023E7E4_16D0C4 /* 16D2A4 8023E9C4 00000000 */ nop /* 16D2A8 8023E9C8 A6000000 */ sh $zero, ($s0) /* 16D2AC 8023E9CC 0000202D */ daddu $a0, $zero, $zero -/* 16D2B0 8023E9D0 0C04DF62 */ jal func_80137D88 +/* 16D2B0 8023E9D0 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 16D2B4 8023E9D4 0000282D */ daddu $a1, $zero, $zero /* 16D2B8 8023E9D8 0808FA99 */ j .L8023EA64 /* 16D2BC 8023E9DC 00000000 */ nop @@ -440,12 +440,12 @@ glabel L8023E7E4_16D0C4 /* 16D30C 8023EA2C 00000000 */ nop /* 16D310 8023EA30 46802120 */ cvt.s.w $f4, $f4 /* 16D314 8023EA34 44052000 */ mfc1 $a1, $f4 -/* 16D318 8023EA38 0C04DF62 */ jal func_80137D88 +/* 16D318 8023EA38 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 16D31C 8023EA3C 0000202D */ daddu $a0, $zero, $zero /* 16D320 8023EA40 0000202D */ daddu $a0, $zero, $zero /* 16D324 8023EA44 240500D0 */ addiu $a1, $zero, 0xd0 /* 16D328 8023EA48 00A0302D */ daddu $a2, $a1, $zero -/* 16D32C 8023EA4C 0C04DF84 */ jal func_80137E10 +/* 16D32C 8023EA4C 0C04DF84 */ jal set_transition_stencil_color /* 16D330 8023EA50 00A0382D */ daddu $a3, $a1, $zero /* 16D334 8023EA54 0C00CDF4 */ jal intro_logos_set_fade_alpha /* 16D338 8023EA58 240400FF */ addiu $a0, $zero, 0xff diff --git a/asm/nonmatchings/code_17D6A0/func_8024F5AC.s b/asm/nonmatchings/code_17D6A0/func_8024F5AC.s index 86583518b8..256880da75 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024F5AC.s +++ b/asm/nonmatchings/code_17D6A0/func_8024F5AC.s @@ -92,7 +92,7 @@ glabel func_8024F5AC /* 17DFE4 8024F704 0C019D40 */ jal guMtxF2L /* 17DFE8 8024F708 02A0282D */ daddu $a1, $s5, $zero /* 17DFEC 8024F70C 0200202D */ daddu $a0, $s0, $zero -/* 17DFF0 8024F710 0C04873A */ jal func_80121CE8 +/* 17DFF0 8024F710 0C04873A */ jal draw_entity_model_shadow /* 17DFF4 8024F714 02A0282D */ daddu $a1, $s5, $zero .L8024F718: /* 17DFF8 8024F718 8FA30258 */ lw $v1, 0x258($sp) diff --git a/asm/nonmatchings/code_17D6A0/func_8024FB3C.s b/asm/nonmatchings/code_17D6A0/func_8024FB3C.s index 3f4f5b0635..b82b7f3805 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024FB3C.s +++ b/asm/nonmatchings/code_17D6A0/func_8024FB3C.s @@ -443,7 +443,7 @@ glabel L80250178_17EA58 /* 17EA94 802501B4 24040009 */ addiu $a0, $zero, 9 /* 17EA98 802501B8 2402BFFF */ addiu $v0, $zero, -0x4001 /* 17EA9C 802501BC 00621024 */ and $v0, $v1, $v0 -/* 17EAA0 802501C0 0C051F9F */ jal func_80147E7C +/* 17EAA0 802501C0 0C051F9F */ jal set_window_update /* 17EAA4 802501C4 ACC20000 */ sw $v0, ($a2) /* 17EAA8 802501C8 24020002 */ addiu $v0, $zero, 2 /* 17EAAC 802501CC A6200014 */ sh $zero, 0x14($s1) @@ -455,7 +455,7 @@ glabel L80250178_17EA58 /* 17EAC0 802501E0 24020002 */ addiu $v0, $zero, 2 /* 17EAC4 802501E4 1082017D */ beq $a0, $v0, .L802507DC /* 17EAC8 802501E8 24040009 */ addiu $a0, $zero, 9 -/* 17EACC 802501EC 0C051F9F */ jal func_80147E7C +/* 17EACC 802501EC 0C051F9F */ jal set_window_update /* 17EAD0 802501F0 24050007 */ addiu $a1, $zero, 7 /* 17EAD4 802501F4 96220012 */ lhu $v0, 0x12($s1) /* 17EAD8 802501F8 2442FFD2 */ addiu $v0, $v0, -0x2e @@ -894,7 +894,7 @@ glabel L802507A8_17F088 /* 17F0BC 802507DC 12400008 */ beqz $s2, .L80250800 /* 17F0C0 802507E0 00000000 */ nop /* 17F0C4 802507E4 24040009 */ addiu $a0, $zero, 9 -/* 17F0C8 802507E8 0C051F9F */ jal func_80147E7C +/* 17F0C8 802507E8 0C051F9F */ jal set_window_update /* 17F0CC 802507EC 24050002 */ addiu $a1, $zero, 2 /* 17F0D0 802507F0 3C018028 */ lui $at, %hi(D_802838F8) /* 17F0D4 802507F4 AC2038F8 */ sw $zero, %lo(D_802838F8)($at) diff --git a/asm/nonmatchings/code_17D6A0/func_80250818.s b/asm/nonmatchings/code_17D6A0/func_80250818.s index d79e821246..07f9435bcb 100644 --- a/asm/nonmatchings/code_17D6A0/func_80250818.s +++ b/asm/nonmatchings/code_17D6A0/func_80250818.s @@ -28,7 +28,7 @@ glabel L80250868_17F148 /* 17F150 80250870 3C108028 */ lui $s0, %hi(D_80283770) /* 17F154 80250874 02028021 */ addu $s0, $s0, $v0 /* 17F158 80250878 8E103770 */ lw $s0, %lo(D_80283770)($s0) -/* 17F15C 8025087C 0C04992C */ jal func_801264B0 +/* 17F15C 8025087C 0C04992C */ jal get_msg_lines /* 17F160 80250880 0200202D */ daddu $a0, $s0, $zero /* 17F164 80250884 2443FFFF */ addiu $v1, $v0, -1 /* 17F168 80250888 0200202D */ daddu $a0, $s0, $zero @@ -41,7 +41,7 @@ glabel L80250868_17F148 /* 17F184 802508A4 2402000F */ addiu $v0, $zero, 0xf /* 17F188 802508A8 AFA20010 */ sw $v0, 0x10($sp) /* 17F18C 802508AC AFA00014 */ sw $zero, 0x14($sp) -/* 17F190 802508B0 0C04993B */ jal draw_string +/* 17F190 802508B0 0C04993B */ jal draw_msg /* 17F194 802508B4 02263021 */ addu $a2, $s1, $a2 /* 17F198 802508B8 080943A0 */ j .L80250E80 /* 17F19C 802508BC 00000000 */ nop @@ -51,7 +51,7 @@ glabel L802508C0_17F1A0 /* 17F1A8 802508C8 3C108028 */ lui $s0, %hi(D_80283770) /* 17F1AC 802508CC 02028021 */ addu $s0, $s0, $v0 /* 17F1B0 802508D0 8E103770 */ lw $s0, %lo(D_80283770)($s0) -/* 17F1B4 802508D4 0C04992C */ jal func_801264B0 +/* 17F1B4 802508D4 0C04992C */ jal get_msg_lines /* 17F1B8 802508D8 0200202D */ daddu $a0, $s0, $zero /* 17F1BC 802508DC 2443FFFF */ addiu $v1, $v0, -1 /* 17F1C0 802508E0 0000282D */ daddu $a1, $zero, $zero @@ -71,7 +71,7 @@ glabel L8025090C_17F1EC /* 17F1F4 80250914 3C108028 */ lui $s0, %hi(D_80283770) /* 17F1F8 80250918 02028021 */ addu $s0, $s0, $v0 /* 17F1FC 8025091C 8E103770 */ lw $s0, %lo(D_80283770)($s0) -/* 17F200 80250920 0C04992C */ jal func_801264B0 +/* 17F200 80250920 0C04992C */ jal get_msg_lines /* 17F204 80250924 0200202D */ daddu $a0, $s0, $zero /* 17F208 80250928 2443FFFF */ addiu $v1, $v0, -1 /* 17F20C 8025092C 0000282D */ daddu $a1, $zero, $zero @@ -94,7 +94,7 @@ glabel L8025090C_17F1EC /* 17F24C 8025096C 240700FF */ addiu $a3, $zero, 0xff /* 17F250 80250970 2402000F */ addiu $v0, $zero, 0xf /* 17F254 80250974 AFA20010 */ sw $v0, 0x10($sp) -/* 17F258 80250978 0C04993B */ jal draw_string +/* 17F258 80250978 0C04993B */ jal draw_msg /* 17F25C 8025097C AFA00014 */ sw $zero, 0x14($sp) /* 17F260 80250980 080943A0 */ j .L80250E80 /* 17F264 80250984 00000000 */ nop @@ -110,7 +110,7 @@ glabel L80250988_17F268 /* 17F288 802509A8 2402000F */ addiu $v0, $zero, 0xf /* 17F28C 802509AC AFA20010 */ sw $v0, 0x10($sp) /* 17F290 802509B0 AFA00014 */ sw $zero, 0x14($sp) -/* 17F294 802509B4 0C04993B */ jal draw_string +/* 17F294 802509B4 0C04993B */ jal draw_msg /* 17F298 802509B8 0200202D */ daddu $a0, $s0, $zero /* 17F29C 802509BC 2645000D */ addiu $a1, $s2, 0xd /* 17F2A0 802509C0 3C10802A */ lui $s0, %hi(D_8029F642) @@ -138,7 +138,7 @@ glabel L802509DC_17F2BC /* 17F2EC 80250A0C 02028021 */ addu $s0, $s0, $v0 /* 17F2F0 80250A10 8E103770 */ lw $s0, %lo(D_80283770)($s0) /* 17F2F4 80250A14 2631FFFA */ addiu $s1, $s1, -6 -/* 17F2F8 80250A18 0C04992C */ jal func_801264B0 +/* 17F2F8 80250A18 0C04992C */ jal get_msg_lines /* 17F2FC 80250A1C 0200202D */ daddu $a0, $s0, $zero /* 17F300 80250A20 2443FFFF */ addiu $v1, $v0, -1 /* 17F304 80250A24 0200202D */ daddu $a0, $s0, $zero @@ -152,7 +152,7 @@ glabel L802509DC_17F2BC /* 17F324 80250A44 AFA20010 */ sw $v0, 0x10($sp) /* 17F328 80250A48 AFA00014 */ sw $zero, 0x14($sp) /* 17F32C 80250A4C 02238821 */ addu $s1, $s1, $v1 -/* 17F330 80250A50 0C04993B */ jal draw_string +/* 17F330 80250A50 0C04993B */ jal draw_msg /* 17F334 80250A54 26260006 */ addiu $a2, $s1, 6 /* 17F338 80250A58 96620012 */ lhu $v0, 0x12($s3) /* 17F33C 80250A5C 2442FFD2 */ addiu $v0, $v0, -0x2e diff --git a/asm/nonmatchings/code_17D6A0/show_message_popup.s b/asm/nonmatchings/code_17D6A0/show_message_popup.s index 562e3a5249..593f098026 100644 --- a/asm/nonmatchings/code_17D6A0/show_message_popup.s +++ b/asm/nonmatchings/code_17D6A0/show_message_popup.s @@ -39,7 +39,7 @@ glabel L80250EEC_17F7CC /* 17F808 80250F28 240300A0 */ addiu $v1, $zero, 0xa0 /* 17F80C 80250F2C 00628823 */ subu $s1, $v1, $v0 /* 17F810 80250F30 00E0902D */ daddu $s2, $a3, $zero -/* 17F814 80250F34 0C04992C */ jal func_801264B0 +/* 17F814 80250F34 0C04992C */ jal get_msg_lines /* 17F818 80250F38 0200202D */ daddu $a0, $s0, $zero /* 17F81C 80250F3C 2442FFFF */ addiu $v0, $v0, -1 /* 17F820 80250F40 24040009 */ addiu $a0, $zero, 9 @@ -57,7 +57,7 @@ glabel L80250EEC_17F7CC /* 17F850 80250F70 AFA00014 */ sw $zero, 0x14($sp) /* 17F854 80250F74 AFB3001C */ sw $s3, 0x1c($sp) /* 17F858 80250F78 AFA20020 */ sw $v0, 0x20($sp) -/* 17F85C 80250F7C 0C051F32 */ jal set_ui_panel_properties +/* 17F85C 80250F7C 0C051F32 */ jal set_window_properties /* 17F860 80250F80 AFA80010 */ sw $t0, 0x10($sp) /* 17F864 80250F84 24040009 */ addiu $a0, $zero, 9 /* 17F868 80250F88 080944A3 */ j .L8025128C @@ -90,7 +90,7 @@ glabel L80250F90_17F870 /* 17F8D0 80250FF0 AFA80010 */ sw $t0, 0x10($sp) /* 17F8D4 80250FF4 AFA00014 */ sw $zero, 0x14($sp) /* 17F8D8 80250FF8 AFB3001C */ sw $s3, 0x1c($sp) -/* 17F8DC 80250FFC 0C051F32 */ jal set_ui_panel_properties +/* 17F8DC 80250FFC 0C051F32 */ jal set_window_properties /* 17F8E0 80251000 AFA20020 */ sw $v0, 0x20($sp) /* 17F8E4 80251004 24040009 */ addiu $a0, $zero, 9 /* 17F8E8 80251008 080944A3 */ j .L8025128C @@ -119,7 +119,7 @@ glabel L80251010_17F8F0 /* 17F940 80251060 240300A0 */ addiu $v1, $zero, 0xa0 /* 17F944 80251064 00628823 */ subu $s1, $v1, $v0 /* 17F948 80251068 00E0902D */ daddu $s2, $a3, $zero -/* 17F94C 8025106C 0C04992C */ jal func_801264B0 +/* 17F94C 8025106C 0C04992C */ jal get_msg_lines /* 17F950 80251070 0200202D */ daddu $a0, $s0, $zero /* 17F954 80251074 2442FFFF */ addiu $v0, $v0, -1 /* 17F958 80251078 24040009 */ addiu $a0, $zero, 9 @@ -137,7 +137,7 @@ glabel L80251010_17F8F0 /* 17F988 802510A8 AFA00014 */ sw $zero, 0x14($sp) /* 17F98C 802510AC AFB3001C */ sw $s3, 0x1c($sp) /* 17F990 802510B0 AFA20020 */ sw $v0, 0x20($sp) -/* 17F994 802510B4 0C051F32 */ jal set_ui_panel_properties +/* 17F994 802510B4 0C051F32 */ jal set_window_properties /* 17F998 802510B8 AFA80010 */ sw $t0, 0x10($sp) /* 17F99C 802510BC 24040009 */ addiu $a0, $zero, 9 /* 17F9A0 802510C0 080944A3 */ j .L8025128C @@ -170,7 +170,7 @@ glabel L802510C8_17F9A8 /* 17FA08 80251128 240300A0 */ addiu $v1, $zero, 0xa0 /* 17FA0C 8025112C 00628823 */ subu $s1, $v1, $v0 /* 17FA10 80251130 00E0902D */ daddu $s2, $a3, $zero -/* 17FA14 80251134 0C04992C */ jal func_801264B0 +/* 17FA14 80251134 0C04992C */ jal get_msg_lines /* 17FA18 80251138 0200202D */ daddu $a0, $s0, $zero /* 17FA1C 8025113C 2442FFFF */ addiu $v0, $v0, -1 /* 17FA20 80251140 24040009 */ addiu $a0, $zero, 9 @@ -188,7 +188,7 @@ glabel L802510C8_17F9A8 /* 17FA50 80251170 AFA00014 */ sw $zero, 0x14($sp) /* 17FA54 80251174 AFB3001C */ sw $s3, 0x1c($sp) /* 17FA58 80251178 AFA20020 */ sw $v0, 0x20($sp) -/* 17FA5C 8025117C 0C051F32 */ jal set_ui_panel_properties +/* 17FA5C 8025117C 0C051F32 */ jal set_window_properties /* 17FA60 80251180 AFA80010 */ sw $t0, 0x10($sp) /* 17FA64 80251184 24040009 */ addiu $a0, $zero, 9 /* 17FA68 80251188 080944A3 */ j .L8025128C @@ -213,7 +213,7 @@ glabel L80251190_17FA70 /* 17FAB0 802511D0 240300A0 */ addiu $v1, $zero, 0xa0 /* 17FAB4 802511D4 00628823 */ subu $s1, $v1, $v0 /* 17FAB8 802511D8 00E0902D */ daddu $s2, $a3, $zero -/* 17FABC 802511DC 0C04992C */ jal func_801264B0 +/* 17FABC 802511DC 0C04992C */ jal get_msg_lines /* 17FAC0 802511E0 0200202D */ daddu $a0, $s0, $zero /* 17FAC4 802511E4 2442FFFF */ addiu $v0, $v0, -1 /* 17FAC8 802511E8 00021840 */ sll $v1, $v0, 1 @@ -250,7 +250,7 @@ glabel L80251190_17FA70 /* 17FB40 80251260 00063403 */ sra $a2, $a2, 0x10 /* 17FB44 80251264 3C01802A */ lui $at, %hi(D_8029F650) /* 17FB48 80251268 A423F650 */ sh $v1, %lo(D_8029F650)($at) -/* 17FB4C 8025126C 0C051F32 */ jal set_ui_panel_properties +/* 17FB4C 8025126C 0C051F32 */ jal set_window_properties /* 17FB50 80251270 00463021 */ addu $a2, $v0, $a2 /* 17FB54 80251274 86620012 */ lh $v0, 0x12($s3) /* 17FB58 80251278 14500003 */ bne $v0, $s0, .L80251288 @@ -260,7 +260,7 @@ glabel L80251190_17FA70 .L80251288: /* 17FB68 80251288 24050008 */ addiu $a1, $zero, 8 .L8025128C: -/* 17FB6C 8025128C 0C051F9F */ jal func_80147E7C +/* 17FB6C 8025128C 0C051F9F */ jal set_window_update /* 17FB70 80251290 00000000 */ nop .L80251294: /* 17FB74 80251294 8FBF003C */ lw $ra, 0x3c($sp) diff --git a/asm/nonmatchings/code_18C790/func_8025E190.s b/asm/nonmatchings/code_18C790/func_8025E190.s index 596d238fe7..f27ae0a118 100644 --- a/asm/nonmatchings/code_18C790/func_8025E190.s +++ b/asm/nonmatchings/code_18C790/func_8025E190.s @@ -1484,10 +1484,10 @@ glabel L8025F5F4_18DED4 /* 18E0DC 8025F7FC 2402FFFF */ addiu $v0, $zero, -1 /* 18E0E0 8025F800 AFA30014 */ sw $v1, 0x14($sp) /* 18E0E4 8025F804 AFA0001C */ sw $zero, 0x1c($sp) -/* 18E0E8 8025F808 0C051F32 */ jal set_ui_panel_properties +/* 18E0E8 8025F808 0C051F32 */ jal set_window_properties /* 18E0EC 8025F80C AFA20020 */ sw $v0, 0x20($sp) /* 18E0F0 8025F810 24040008 */ addiu $a0, $zero, 8 -/* 18E0F4 8025F814 0C051F9F */ jal func_80147E7C +/* 18E0F4 8025F814 0C051F9F */ jal set_window_update /* 18E0F8 8025F818 24050001 */ addiu $a1, $zero, 1 /* 18E0FC 8025F81C 08097FD0 */ j .L8025FF40 /* 18E100 8025F820 24020008 */ addiu $v0, $zero, 8 @@ -1569,7 +1569,7 @@ glabel L8025F924_18E204 /* 18E20C 8025F92C 0C05123D */ jal free_icon /* 18E210 8025F930 00000000 */ nop /* 18E214 8025F934 24040008 */ addiu $a0, $zero, 8 -/* 18E218 8025F938 0C051F9F */ jal func_80147E7C +/* 18E218 8025F938 0C051F9F */ jal set_window_update /* 18E21C 8025F93C 24050002 */ addiu $a1, $zero, 2 /* 18E220 8025F940 83C30048 */ lb $v1, 0x48($fp) /* 18E224 8025F944 24020001 */ addiu $v0, $zero, 1 @@ -1841,10 +1841,10 @@ glabel L8025FCA4_18E584 /* 18E5D8 8025FCF8 AFA20018 */ sw $v0, 0x18($sp) /* 18E5DC 8025FCFC 2402FFFF */ addiu $v0, $zero, -1 /* 18E5E0 8025FD00 AFA0001C */ sw $zero, 0x1c($sp) -/* 18E5E4 8025FD04 0C051F32 */ jal set_ui_panel_properties +/* 18E5E4 8025FD04 0C051F32 */ jal set_window_properties /* 18E5E8 8025FD08 AFA20020 */ sw $v0, 0x20($sp) /* 18E5EC 8025FD0C 24040009 */ addiu $a0, $zero, 9 -/* 18E5F0 8025FD10 0C051F9F */ jal func_80147E7C +/* 18E5F0 8025FD10 0C051F9F */ jal set_window_update /* 18E5F4 8025FD14 24050001 */ addiu $a1, $zero, 1 /* 18E5F8 8025FD18 2402003C */ addiu $v0, $zero, 0x3c /* 18E5FC 8025FD1C 3C01802A */ lui $at, %hi(D_8029FB4C) @@ -1871,7 +1871,7 @@ glabel L8025FD2C_18E60C /* 18E644 8025FD64 AC620000 */ sw $v0, ($v1) .L8025FD68: /* 18E648 8025FD68 24040009 */ addiu $a0, $zero, 9 -/* 18E64C 8025FD6C 0C051F9F */ jal func_80147E7C +/* 18E64C 8025FD6C 0C051F9F */ jal set_window_update /* 18E650 8025FD70 24050002 */ addiu $a1, $zero, 2 /* 18E654 8025FD74 08097FD0 */ j .L8025FF40 /* 18E658 8025FD78 24020008 */ addiu $v0, $zero, 8 diff --git a/asm/nonmatchings/code_18C790/func_802601BC.s b/asm/nonmatchings/code_18C790/func_802601BC.s index 07e1d74acd..4282c986f8 100644 --- a/asm/nonmatchings/code_18C790/func_802601BC.s +++ b/asm/nonmatchings/code_18C790/func_802601BC.s @@ -443,7 +443,7 @@ glabel L80260810_18F0F0 /* 18F108 80260828 468010A0 */ cvt.s.w $f2, $f2 .L8026082C: /* 18F10C 8026082C 44051000 */ mfc1 $a1, $f2 -/* 18F110 80260830 0C04DF62 */ jal func_80137D88 +/* 18F110 80260830 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 18F114 80260834 0000202D */ daddu $a0, $zero, $zero .L80260838: glabel L80260838_18F118 diff --git a/asm/nonmatchings/code_18C790/func_80260948.s b/asm/nonmatchings/code_18C790/func_80260948.s index 68c4dd9253..d6f26bb41a 100644 --- a/asm/nonmatchings/code_18C790/func_80260948.s +++ b/asm/nonmatchings/code_18C790/func_80260948.s @@ -56,7 +56,7 @@ glabel func_80260948 /* 18F2E0 80260A00 24A50011 */ addiu $a1, $a1, 0x11 /* 18F2E4 80260A04 240700FF */ addiu $a3, $zero, 0xff /* 18F2E8 80260A08 AFA20010 */ sw $v0, 0x10($sp) -/* 18F2EC 80260A0C 0C04993B */ jal draw_string +/* 18F2EC 80260A0C 0C04993B */ jal draw_msg /* 18F2F0 80260A10 AFA00014 */ sw $zero, 0x14($sp) .L80260A14: /* 18F2F4 80260A14 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_18C790/func_80260A20.s b/asm/nonmatchings/code_18C790/func_80260A20.s index dbaf171c2b..577dc2e17a 100644 --- a/asm/nonmatchings/code_18C790/func_80260A20.s +++ b/asm/nonmatchings/code_18C790/func_80260A20.s @@ -11,7 +11,7 @@ glabel func_80260A20 /* 18F318 80260A38 240700FF */ addiu $a3, $zero, 0xff /* 18F31C 80260A3C AFBF0018 */ sw $ra, 0x18($sp) /* 18F320 80260A40 AFA20010 */ sw $v0, 0x10($sp) -/* 18F324 80260A44 0C04993B */ jal draw_string +/* 18F324 80260A44 0C04993B */ jal draw_msg /* 18F328 80260A48 AFA00014 */ sw $zero, 0x14($sp) /* 18F32C 80260A4C 8FBF0018 */ lw $ra, 0x18($sp) /* 18F330 80260A50 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F0C4.s b/asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s similarity index 99% rename from asm/nonmatchings/code_1a1f0_len_5390/func_8003F0C4.s rename to asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s index e28d9c6a2b..c3c3ab46db 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F0C4.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8003F0C4 +glabel MerleeUpdateFX /* 1A4C4 8003F0C4 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 1A4C8 8003F0C8 AFB20020 */ sw $s2, 0x20($sp) /* 1A4CC 8003F0CC 0080902D */ daddu $s2, $a0, $zero diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s b/asm/nonmatchings/code_1a1f0_len_5390/check_conversation_trigger.s similarity index 99% rename from asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s rename to asm/nonmatchings/code_1a1f0_len_5390/check_conversation_trigger.s index 09952d9717..c51b2264a1 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/check_conversation_trigger.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800431DC +glabel check_conversation_trigger /* 1E5DC 800431DC 27BDFF58 */ addiu $sp, $sp, -0xa8 /* 1E5E0 800431E0 3C03FDFF */ lui $v1, 0xfdff /* 1E5E4 800431E4 AFB40060 */ sw $s4, 0x60($sp) @@ -273,7 +273,7 @@ glabel func_800431DC /* 1E9E4 800435E4 0000102D */ daddu $v0, $zero, $zero /* 1E9E8 800435E8 13C0001F */ beqz $fp, .L80043668 /* 1E9EC 800435EC 00000000 */ nop -/* 1E9F0 800435F0 0C04D07A */ jal func_801341E8 +/* 1E9F0 800435F0 0C04D07A */ jal is_picking_up_item /* 1E9F4 800435F4 00000000 */ nop /* 1E9F8 800435F8 1440001B */ bnez $v0, .L80043668 /* 1E9FC 800435FC 0000102D */ daddu $v0, $zero, $zero @@ -285,7 +285,7 @@ glabel func_800431DC /* 1EA14 80043614 30848000 */ andi $a0, $a0, 0x8000 /* 1EA18 80043618 10800012 */ beqz $a0, .L80043664 /* 1EA1C 8004361C AE830000 */ sw $v1, ($s4) -/* 1EA20 80043620 0C03A5EE */ jal func_800E97B8 +/* 1EA20 80043620 0C03A5EE */ jal close_status_menu /* 1EA24 80043624 00000000 */ nop /* 1EA28 80043628 24020001 */ addiu $v0, $zero, 1 /* 1EA2C 8004362C 24030005 */ addiu $v1, $zero, 5 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s b/asm/nonmatchings/code_1a1f0_len_5390/create_encounters.s similarity index 99% rename from asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s rename to asm/nonmatchings/code_1a1f0_len_5390/create_encounters.s index 04a344646a..5e5e5012eb 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/create_encounters.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel create_npcs +glabel create_encounters /* 1EAB0 800436B0 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 1EAB4 800436B4 AFBE0058 */ sw $fp, 0x58($sp) /* 1EAB8 800436B8 27BE0010 */ addiu $fp, $sp, 0x10 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_80041964.s b/asm/nonmatchings/code_1a1f0_len_5390/draw_encounters_pre_battle.s similarity index 95% rename from asm/nonmatchings/code_1a1f0_len_5390/func_80041964.s rename to asm/nonmatchings/code_1a1f0_len_5390/draw_encounters_pre_battle.s index 5eed953e47..615c0157fb 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_80041964.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/draw_encounters_pre_battle.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80041964 +glabel draw_encounters_pre_battle /* 1CD64 80041964 27BDFF88 */ addiu $sp, $sp, -0x78 /* 1CD68 80041968 AFB00038 */ sw $s0, 0x38($sp) /* 1CD6C 8004196C 3C10800B */ lui $s0, %hi(gCurrentEncounter) @@ -68,15 +68,15 @@ glabel func_80041964 /* 1CE54 80041A54 C6020090 */ lwc1 $f2, 0x90($s0) /* 1CE58 80041A58 468010A0 */ cvt.s.w $f2, $f2 /* 1CE5C 80041A5C 44051000 */ mfc1 $a1, $f2 -/* 1CE60 80041A60 0C04DF69 */ jal func_80137DA4 +/* 1CE60 80041A60 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 1CE64 80041A64 2404000A */ addiu $a0, $zero, 0xa /* 1CE68 80041A68 3C05437F */ lui $a1, 0x437f -/* 1CE6C 80041A6C 0C04E035 */ jal func_801380D4 +/* 1CE6C 80041A6C 0C04E035 */ jal set_transition_stencil_alpha /* 1CE70 80041A70 24040001 */ addiu $a0, $zero, 1 /* 1CE74 80041A74 24040001 */ addiu $a0, $zero, 1 /* 1CE78 80041A78 0000282D */ daddu $a1, $zero, $zero /* 1CE7C 80041A7C 00A0302D */ daddu $a2, $a1, $zero -/* 1CE80 80041A80 0C04DF84 */ jal func_80137E10 +/* 1CE80 80041A80 0C04DF84 */ jal set_transition_stencil_color /* 1CE84 80041A84 00A0382D */ daddu $a3, $a1, $zero /* 1CE88 80041A88 3C108007 */ lui $s0, %hi(gCurrentCameraID) /* 1CE8C 80041A8C 26107410 */ addiu $s0, $s0, %lo(gCurrentCameraID) @@ -128,15 +128,15 @@ glabel func_80041964 /* 1CF40 80041B40 C6220090 */ lwc1 $f2, 0x90($s1) /* 1CF44 80041B44 468010A0 */ cvt.s.w $f2, $f2 /* 1CF48 80041B48 44051000 */ mfc1 $a1, $f2 -/* 1CF4C 80041B4C 0C04DF62 */ jal func_80137D88 +/* 1CF4C 80041B4C 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 1CF50 80041B50 2404000A */ addiu $a0, $zero, 0xa /* 1CF54 80041B54 3C05437F */ lui $a1, 0x437f -/* 1CF58 80041B58 0C04E035 */ jal func_801380D4 +/* 1CF58 80041B58 0C04E035 */ jal set_transition_stencil_alpha /* 1CF5C 80041B5C 0000202D */ daddu $a0, $zero, $zero /* 1CF60 80041B60 0000202D */ daddu $a0, $zero, $zero /* 1CF64 80041B64 0080282D */ daddu $a1, $a0, $zero /* 1CF68 80041B68 0080302D */ daddu $a2, $a0, $zero -/* 1CF6C 80041B6C 0C04DF84 */ jal func_80137E10 +/* 1CF6C 80041B6C 0C04DF84 */ jal set_transition_stencil_color /* 1CF70 80041B70 0080382D */ daddu $a3, $a0, $zero /* 1CF74 80041B74 3C108007 */ lui $s0, %hi(gCurrentCameraID) /* 1CF78 80041B78 26107410 */ addiu $s0, $s0, %lo(gCurrentCameraID) @@ -184,7 +184,7 @@ glabel func_80041964 /* 1D020 80041C20 00E23821 */ addu $a3, $a3, $v0 /* 1D024 80041C24 00073843 */ sra $a3, $a3, 1 .L80041C28: -/* 1D028 80041C28 0C04DF93 */ jal func_80137E4C +/* 1D028 80041C28 0C04DF93 */ jal set_transition_stencil_center /* 1D02C 80041C2C 00E33821 */ addu $a3, $a3, $v1 .L80041C30: /* 1D030 80041C30 8FBF0040 */ lw $ra, 0x40($sp) diff --git a/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s b/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s index d4e5ce7227..637ba0781f 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s @@ -178,7 +178,7 @@ glabel show_first_strike_message /* 1D2EC 80041EEC 240700FF */ addiu $a3, $zero, 0xff /* 1D2F0 80041EF0 2402000A */ addiu $v0, $zero, 0xa /* 1D2F4 80041EF4 AFA20010 */ sw $v0, 0x10($sp) -/* 1D2F8 80041EF8 0C04993B */ jal draw_string +/* 1D2F8 80041EF8 0C04993B */ jal draw_msg /* 1D2FC 80041EFC AFA00014 */ sw $zero, 0x14($sp) .L80041F00: /* 1D300 80041F00 8FBF0054 */ lw $ra, 0x54($sp) diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s b/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s similarity index 99% rename from asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s rename to asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s index 643a664e67..668fa96101 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8003F7CC +glabel update_encounters_neutral /* 1ABCC 8003F7CC 27BDFF40 */ addiu $sp, $sp, -0xc0 /* 1ABD0 8003F7D0 AFB30074 */ sw $s3, 0x74($sp) /* 1ABD4 8003F7D4 3C13800B */ lui $s3, %hi(gCurrentEncounter) @@ -430,7 +430,7 @@ glabel func_8003F7CC /* 1B210 8003FE10 30820F00 */ andi $v0, $a0, 0xf00 /* 1B214 8003FE14 144002AC */ bnez $v0, .L800408C8 /* 1B218 8003FE18 00000000 */ nop -/* 1B21C 8003FE1C 0C04D07A */ jal func_801341E8 +/* 1B21C 8003FE1C 0C04D07A */ jal is_picking_up_item /* 1B220 8003FE20 00000000 */ nop /* 1B224 8003FE24 144002A8 */ bnez $v0, .L800408C8 /* 1B228 8003FE28 3C021000 */ lui $v0, 0x1000 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s b/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s similarity index 99% rename from asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s rename to asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s index 462e10b504..26ac5ec01b 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80041F10 +glabel update_encounters_post_battle /* 1D310 80041F10 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 1D314 80041F14 AFB60028 */ sw $s6, 0x28($sp) /* 1D318 80041F18 3C16800B */ lui $s6, %hi(gCurrentEncounter) @@ -726,7 +726,7 @@ glabel L800421E8_1D5E8 /* 1DD34 80042934 0C03BD80 */ jal func_800EF600 /* 1DD38 80042938 00000000 */ nop /* 1DD3C 8004293C 3C05BF80 */ lui $a1, 0xbf80 -/* 1DD40 80042940 0C04DF62 */ jal func_80137D88 +/* 1DD40 80042940 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 1DD44 80042944 240400FF */ addiu $a0, $zero, 0xff /* 1DD48 80042948 3C02800A */ lui $v0, %hi(D_8009A63C) /* 1DD4C 8004294C 8042A63C */ lb $v0, %lo(D_8009A63C)($v0) @@ -900,7 +900,7 @@ glabel L800421E8_1D5E8 /* 1DFA0 80042BA0 0C03BD80 */ jal func_800EF600 /* 1DFA4 80042BA4 00000000 */ nop /* 1DFA8 80042BA8 3C05BF80 */ lui $a1, 0xbf80 -/* 1DFAC 80042BAC 0C04DF62 */ jal func_80137D88 +/* 1DFAC 80042BAC 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 1DFB0 80042BB0 240400FF */ addiu $a0, $zero, 0xff /* 1DFB4 80042BB4 2402000F */ addiu $v0, $zero, 0xf /* 1DFB8 80042BB8 AEC20094 */ sw $v0, 0x94($s6) @@ -1150,7 +1150,7 @@ glabel L800421E8_1D5E8 /* 1E314 80042F14 00000000 */ nop .L80042F18: /* 1E318 80042F18 3C05BF80 */ lui $a1, 0xbf80 -/* 1E31C 80042F1C 0C04DF62 */ jal func_80137D88 +/* 1E31C 80042F1C 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 1E320 80042F20 240400FF */ addiu $a0, $zero, 0xff .L80042F24: /* 1E324 80042F24 0C0B1192 */ jal resume_all_group diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_80041364.s b/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_pre_battle.s similarity index 99% rename from asm/nonmatchings/code_1a1f0_len_5390/func_80041364.s rename to asm/nonmatchings/code_1a1f0_len_5390/update_encounters_pre_battle.s index 822b240e7f..2a50b09c0b 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_80041364.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_pre_battle.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80041364 +glabel update_encounters_pre_battle /* 1C764 80041364 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 1C768 80041368 AFB50024 */ sw $s5, 0x24($sp) /* 1C76C 8004136C 3C15800B */ lui $s5, %hi(gCurrentEncounter) @@ -318,7 +318,7 @@ glabel func_80041364 /* 1CBE0 800417E0 0C01CB37 */ jal func_80072CDC /* 1CBE4 800417E4 0000202D */ daddu $a0, $zero, $zero /* 1CBE8 800417E8 86840046 */ lh $a0, 0x46($s4) -/* 1CBEC 800417EC 0C01CB33 */ jal func_80072CCC +/* 1CBEC 800417EC 0C01CB33 */ jal set_battle_stage /* 1CBF0 800417F0 00000000 */ nop /* 1CBF4 800417F4 0C01CB24 */ jal load_battle /* 1CBF8 800417F8 86840044 */ lh $a0, 0x44($s4) @@ -332,7 +332,7 @@ glabel func_80041364 /* 1CC18 80041818 A2A0000C */ sb $zero, 0xc($s5) /* 1CC1C 8004181C A6A0000E */ sh $zero, 0xe($s5) /* 1CC20 80041820 AEA00098 */ sw $zero, 0x98($s5) -/* 1CC24 80041824 0C04DF62 */ jal func_80137D88 +/* 1CC24 80041824 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 1CC28 80041828 AEA20090 */ sw $v0, 0x90($s5) /* 1CC2C 8004182C 24020005 */ addiu $v0, $zero, 5 /* 1CC30 80041830 3C01800A */ lui $at, %hi(gGameState) diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s b/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_background.s similarity index 99% rename from asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s rename to asm/nonmatchings/code_1b40_len_20b0/gfx_draw_background.s index 25f79c3a57..eb6166e3cb 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s +++ b/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_background.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80027E10 +glabel gfx_draw_background /* 3210 80027E10 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 3214 80027E14 3C040050 */ lui $a0, 0x50 /* 3218 80027E18 3C0C800A */ lui $t4, %hi(gMasterGfxPos) @@ -520,7 +520,7 @@ glabel func_80027E10 /* 39CC 800285CC 0800A177 */ j .L800285DC /* 39D0 800285D0 ACA30004 */ sw $v1, 4($a1) .L800285D4: -/* 39D4 800285D4 0C0517B0 */ jal func_80145EC0 +/* 39D4 800285D4 0C0517B0 */ jal enable_background_wave /* 39D8 800285D8 00000000 */ nop .L800285DC: /* 39DC 800285DC 3C04E300 */ lui $a0, 0xe300 diff --git a/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s b/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s index f6aedcc8eb..f39e8d8a02 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s +++ b/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s @@ -46,7 +46,7 @@ glabel gfx_draw_frame /* 1FA4 80026BA4 00000000 */ nop /* 1FA8 80026BA8 0C0B0FB9 */ jal func_802C3EE4 /* 1FAC 80026BAC 00000000 */ nop -/* 1FB0 80026BB0 0C04E088 */ jal func_80138220 +/* 1FB0 80026BB0 0C04E088 */ jal render_transition_stencil_lower /* 1FB4 80026BB4 00000000 */ nop /* 1FB8 80026BB8 0C048D54 */ jal func_80123550 /* 1FBC 80026BBC 00000000 */ nop @@ -61,7 +61,7 @@ glabel gfx_draw_frame /* 1FE0 80026BE0 00431024 */ and $v0, $v0, $v1 /* 1FE4 80026BE4 14400003 */ bnez $v0, .L80026BF4 /* 1FE8 80026BE8 00000000 */ nop -/* 1FEC 80026BEC 0C051EB1 */ jal func_80147AC4 +/* 1FEC 80026BEC 0C051EB1 */ jal render_window_root /* 1FF0 80026BF0 00000000 */ nop .L80026BF4: /* 1FF4 80026BF4 8E020000 */ lw $v0, ($s0) @@ -91,7 +91,7 @@ glabel gfx_draw_frame /* 204C 80026C4C 00000000 */ nop /* 2050 80026C50 0C0509C7 */ jal func_8014271C /* 2054 80026C54 00000000 */ nop -/* 2058 80026C58 0C04E068 */ jal func_801381A0 +/* 2058 80026C58 0C04E068 */ jal render_transition_stencil_upper /* 205C 80026C5C 00000000 */ nop /* 2060 80026C60 8E220000 */ lw $v0, ($s1) /* 2064 80026C64 24030010 */ addiu $v1, $zero, 0x10 @@ -116,7 +116,7 @@ glabel gfx_draw_frame /* 20A8 80026CA8 00431024 */ and $v0, $v0, $v1 /* 20AC 80026CAC 10400003 */ beqz $v0, .L80026CBC /* 20B0 80026CB0 00000000 */ nop -/* 20B4 80026CB4 0C051EB1 */ jal func_80147AC4 +/* 20B4 80026CB4 0C051EB1 */ jal render_window_root /* 20B8 80026CB8 00000000 */ nop .L80026CBC: /* 20BC 80026CBC 0C044BF1 */ jal func_80112FC4 @@ -138,7 +138,7 @@ glabel gfx_draw_frame /* 20FC 80026CFC 00000000 */ nop /* 2100 80026D00 46800020 */ cvt.s.w $f0, $f0 /* 2104 80026D04 44050000 */ mfc1 $a1, $f0 -/* 2108 80026D08 0C04DAA0 */ jal func_80136A80 +/* 2108 80026D08 0C04DAA0 */ jal _render_transition_stencil /* 210C 80026D0C 0000302D */ daddu $a2, $zero, $zero .L80026D10: /* 2110 80026D10 3C02800A */ lui $v0, %hi(gMasterGfxPos) diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_800271A0.s b/asm/nonmatchings/code_1b40_len_20b0/gfx_init_state.s similarity index 98% rename from asm/nonmatchings/code_1b40_len_20b0/func_800271A0.s rename to asm/nonmatchings/code_1b40_len_20b0/gfx_init_state.s index 6a1d3447c9..c509381f18 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_800271A0.s +++ b/asm/nonmatchings/code_1b40_len_20b0/gfx_init_state.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800271A0 +glabel gfx_init_state /* 25A0 800271A0 3C04800A */ lui $a0, %hi(gMasterGfxPos) /* 25A4 800271A4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 25A8 800271A8 8C830000 */ lw $v1, ($a0) diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s b/asm/nonmatchings/code_1b40_len_20b0/gfx_task_background.s similarity index 96% rename from asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s rename to asm/nonmatchings/code_1b40_len_20b0/gfx_task_background.s index ef6c89865e..6f61f5a95a 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s +++ b/asm/nonmatchings/code_1b40_len_20b0/gfx_task_background.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800269EC +glabel gfx_task_background /* 1DEC 800269EC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 1DF0 800269F0 AFB20018 */ sw $s2, 0x18($sp) /* 1DF4 800269F4 3C120001 */ lui $s2, 1 @@ -29,9 +29,9 @@ glabel func_800269EC /* 1E4C 80026A4C 00451021 */ addu $v0, $v0, $a1 /* 1E50 80026A50 AE220000 */ sw $v0, ($s1) /* 1E54 80026A54 00521021 */ addu $v0, $v0, $s2 -/* 1E58 80026A58 0C009C68 */ jal func_800271A0 +/* 1E58 80026A58 0C009C68 */ jal gfx_init_state /* 1E5C 80026A5C AE020000 */ sw $v0, ($s0) -/* 1E60 80026A60 0C009F84 */ jal func_80027E10 +/* 1E60 80026A60 0C009F84 */ jal gfx_draw_background /* 1E64 80026A64 00000000 */ nop /* 1E68 80026A68 8E030000 */ lw $v1, ($s0) /* 1E6C 80026A6C 3C02E900 */ lui $v0, 0xe900 diff --git a/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s b/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s index 297157235b..4648f873cd 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s +++ b/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s @@ -112,7 +112,7 @@ glabel load_engine_data /* 2388 80026F88 00000000 */ nop /* 238C 80026F8C 0C052010 */ jal func_80148040 /* 2390 80026F90 00000000 */ nop -/* 2394 80026F94 0C05177E */ jal func_80145DF8 +/* 2394 80026F94 0C05177E */ jal use_default_background_settings /* 2398 80026F98 00000000 */ nop /* 239C 80026F9C 0C048D98 */ jal clear_character_set /* 23A0 80026FA0 00000000 */ nop @@ -132,9 +132,9 @@ glabel load_engine_data /* 23D8 80026FD8 00000000 */ nop /* 23DC 80026FDC 0C00F8CE */ jal func_8003E338 /* 23E0 80026FE0 00000000 */ nop -/* 23E4 80026FE4 0C04E042 */ jal func_80138108 +/* 23E4 80026FE4 0C04E042 */ jal clear_transition_stencil /* 23E8 80026FE8 00000000 */ nop -/* 23EC 80026FEC 0C016727 */ jal func_80059C9C +/* 23EC 80026FEC 0C016727 */ jal clear_effect_data /* 23F0 80026FF0 00000000 */ nop /* 23F4 80026FF4 0C0514C8 */ jal clear_saved_variables /* 23F8 80026FF8 00000000 */ nop @@ -142,11 +142,11 @@ glabel load_engine_data /* 2400 80027000 00000000 */ nop /* 2404 80027004 0C052926 */ jal func_8014A498 /* 2408 80027008 00000000 */ nop -/* 240C 8002700C 0C051C8C */ jal func_80147230 +/* 240C 8002700C 0C051C8C */ jal reset_ambient_sounds /* 2410 80027010 00000000 */ nop /* 2414 80027014 0C052586 */ jal func_80149618 /* 2418 80027018 00000000 */ nop -/* 241C 8002701C 0C051CFC */ jal func_801473F0 +/* 241C 8002701C 0C051CFC */ jal clear_windows /* 2420 80027020 00000000 */ nop /* 2424 80027024 0C00AE90 */ jal initialize_curtains /* 2428 80027028 00000000 */ nop diff --git a/asm/nonmatchings/code_1b40_len_20b0/step_game_loop.s b/asm/nonmatchings/code_1b40_len_20b0/step_game_loop.s index c81fd9f694..565dd869d4 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/step_game_loop.s +++ b/asm/nonmatchings/code_1b40_len_20b0/step_game_loop.s @@ -23,7 +23,7 @@ glabel step_game_loop /* 1B88 80026788 54400001 */ bnel $v0, $zero, .L80026790 /* 1B8C 8002678C AE0402BC */ sw $a0, 0x2bc($s0) .L80026790: -/* 1B90 80026790 0C00A3E3 */ jal func_80028F8C +/* 1B90 80026790 0C00A3E3 */ jal update_max_rumble_duration /* 1B94 80026794 00000000 */ nop /* 1B98 80026798 3C048007 */ lui $a0, %hi(D_80074021) /* 1B9C 8002679C 24844021 */ addiu $a0, $a0, %lo(D_80074021) @@ -61,11 +61,11 @@ glabel step_game_loop /* 1C18 80026818 00000000 */ nop /* 1C1C 8002681C 0C052952 */ jal func_8014A548 /* 1C20 80026820 00000000 */ nop -/* 1C24 80026824 0C051C99 */ jal func_80147264 +/* 1C24 80026824 0C051C99 */ jal update_ambient_sounds /* 1C28 80026828 00000000 */ nop /* 1C2C 8002682C 0C0525CD */ jal func_80149734 /* 1C30 80026830 00000000 */ nop -/* 1C34 80026834 0C051D05 */ jal func_80147414 +/* 1C34 80026834 0C051D05 */ jal update_windows /* 1C38 80026838 00000000 */ nop /* 1C3C 8002683C 0C00AE9E */ jal update_curtains /* 1C40 80026840 00000000 */ nop diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s b/asm/nonmatchings/code_20ec0_len_5040/draw_merlee_message.s similarity index 88% rename from asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s rename to asm/nonmatchings/code_20ec0_len_5040/draw_merlee_message.s index b50dd286b4..4e95ed136c 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/draw_merlee_message.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80045ED0 +glabel draw_merlee_message /* 212D0 80045ED0 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 212D4 80045ED4 AFB20030 */ sw $s2, 0x30($sp) /* 212D8 80045ED8 0080902D */ daddu $s2, $a0, $zero @@ -26,7 +26,7 @@ glabel func_80045ED0 /* 21324 80045F24 02221021 */ addu $v0, $s1, $v0 /* 21328 80045F28 00021043 */ sra $v0, $v0, 1 /* 2132C 80045F2C 241000A0 */ addiu $s0, $zero, 0xa0 -/* 21330 80045F30 0C04992C */ jal func_801264B0 +/* 21330 80045F30 0C04992C */ jal get_msg_lines /* 21334 80045F34 02028023 */ subu $s0, $s0, $v0 /* 21338 80045F38 24040009 */ addiu $a0, $zero, 9 /* 2133C 80045F3C 2442FFFF */ addiu $v0, $v0, -1 @@ -35,8 +35,8 @@ glabel func_80045ED0 /* 21348 80045F48 3C038008 */ lui $v1, %hi(D_80078160) /* 2134C 80045F4C 00621821 */ addu $v1, $v1, $v0 /* 21350 80045F50 84638160 */ lh $v1, %lo(D_80078160)($v1) -/* 21354 80045F54 3C028004 */ lui $v0, %hi(func_80045E4C) -/* 21358 80045F58 24425E4C */ addiu $v0, $v0, %lo(func_80045E4C) +/* 21354 80045F54 3C028004 */ lui $v0, %hi(draw_merlee_message_string) +/* 21358 80045F58 24425E4C */ addiu $v0, $v0, %lo(draw_merlee_message_string) /* 2135C 80045F5C AFA20018 */ sw $v0, 0x18($sp) /* 21360 80045F60 2402FFFF */ addiu $v0, $zero, -1 /* 21364 80045F64 24060050 */ addiu $a2, $zero, 0x50 @@ -44,10 +44,10 @@ glabel func_80045ED0 /* 2136C 80045F6C AFA00014 */ sw $zero, 0x14($sp) /* 21370 80045F70 AFB2001C */ sw $s2, 0x1c($sp) /* 21374 80045F74 AFA20020 */ sw $v0, 0x20($sp) -/* 21378 80045F78 0C051F32 */ jal set_ui_panel_properties +/* 21378 80045F78 0C051F32 */ jal set_window_properties /* 2137C 80045F7C AFA30010 */ sw $v1, 0x10($sp) /* 21380 80045F80 24040009 */ addiu $a0, $zero, 9 -/* 21384 80045F84 0C051F9F */ jal func_80147E7C +/* 21384 80045F84 0C051F9F */ jal set_window_update /* 21388 80045F88 24050001 */ addiu $a1, $zero, 1 .L80045F8C: /* 2138C 80045F8C 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045E4C.s b/asm/nonmatchings/code_20ec0_len_5040/draw_merlee_message_string.s similarity index 92% rename from asm/nonmatchings/code_20ec0_len_5040/func_80045E4C.s rename to asm/nonmatchings/code_20ec0_len_5040/draw_merlee_message_string.s index 1ddc36a7b1..4bbcc7e822 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045E4C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/draw_merlee_message_string.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80045E4C +glabel draw_merlee_message_string /* 2124C 80045E4C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 21250 80045E50 AFBF0024 */ sw $ra, 0x24($sp) /* 21254 80045E54 AFB20020 */ sw $s2, 0x20($sp) @@ -14,7 +14,7 @@ glabel func_80045E4C /* 21270 80045E70 02429021 */ addu $s2, $s2, $v0 /* 21274 80045E74 8E528168 */ lw $s2, %lo(D_80078168)($s2) /* 21278 80045E78 24B1000F */ addiu $s1, $a1, 0xf -/* 2127C 80045E7C 0C04992C */ jal func_801264B0 +/* 2127C 80045E7C 0C04992C */ jal get_msg_lines /* 21280 80045E80 0240202D */ daddu $a0, $s2, $zero /* 21284 80045E84 0240202D */ daddu $a0, $s2, $zero /* 21288 80045E88 2442FFFF */ addiu $v0, $v0, -1 @@ -27,7 +27,7 @@ glabel func_80045E4C /* 212A4 80045EA4 240700FF */ addiu $a3, $zero, 0xff /* 212A8 80045EA8 AFA20010 */ sw $v0, 0x10($sp) /* 212AC 80045EAC AFA00014 */ sw $zero, 0x14($sp) -/* 212B0 80045EB0 0C04993B */ jal draw_string +/* 212B0 80045EB0 0C04993B */ jal draw_msg /* 212B4 80045EB4 02063021 */ addu $a2, $s0, $a2 /* 212B8 80045EB8 8FBF0024 */ lw $ra, 0x24($sp) /* 212BC 80045EBC 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045C28.s b/asm/nonmatchings/code_20ec0_len_5040/draw_merlee_messages.s similarity index 98% rename from asm/nonmatchings/code_20ec0_len_5040/func_80045C28.s rename to asm/nonmatchings/code_20ec0_len_5040/draw_merlee_messages.s index 60285ee2ee..b4073bae59 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045C28.s +++ b/asm/nonmatchings/code_20ec0_len_5040/draw_merlee_messages.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80045C28 +glabel draw_merlee_messages /* 21028 80045C28 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 2102C 80045C2C AFB10014 */ sw $s1, 0x14($sp) /* 21030 80045C30 0000882D */ daddu $s1, $zero, $zero diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s index d5a90dcf6c..a07ece1bd2 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s @@ -15,8 +15,8 @@ glabel func_80045D00 /* 21128 80045D28 3C028004 */ lui $v0, %hi(func_80045D7C) /* 2112C 80045D2C 24425D7C */ addiu $v0, $v0, %lo(func_80045D7C) /* 21130 80045D30 AC620004 */ sw $v0, 4($v1) -/* 21134 80045D34 3C028004 */ lui $v0, %hi(func_80045ED0) -/* 21138 80045D38 24425ED0 */ addiu $v0, $v0, %lo(func_80045ED0) +/* 21134 80045D34 3C028004 */ lui $v0, %hi(draw_merlee_message) +/* 21138 80045D38 24425ED0 */ addiu $v0, $v0, %lo(draw_merlee_message) /* 2113C 80045D3C AC62000C */ sw $v0, 0xc($v1) /* 21140 80045D40 24020001 */ addiu $v0, $zero, 1 /* 21144 80045D44 A0620017 */ sb $v0, 0x17($v1) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045D7C.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045D7C.s index 0568e8db8b..36a809434f 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045D7C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045D7C.s @@ -52,7 +52,7 @@ glabel L80045E14_21214 /* 21218 80045E18 10800008 */ beqz $a0, .L80045E3C /* 2121C 80045E1C 00000000 */ nop /* 21220 80045E20 24040009 */ addiu $a0, $zero, 9 -/* 21224 80045E24 0C051F9F */ jal func_80147E7C +/* 21224 80045E24 0C051F9F */ jal set_window_update /* 21228 80045E28 24050002 */ addiu $a1, $zero, 2 /* 2122C 80045E2C 3C01800A */ lui $at, %hi(D_800A0F40) /* 21230 80045E30 AC200F40 */ sw $zero, %lo(D_800A0F40)($at) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045FA4.s b/asm/nonmatchings/code_20ec0_len_5040/is_merlee_message_done.s similarity index 90% rename from asm/nonmatchings/code_20ec0_len_5040/func_80045FA4.s rename to asm/nonmatchings/code_20ec0_len_5040/is_merlee_message_done.s index af9e5888fe..3238e36ff2 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045FA4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/is_merlee_message_done.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80045FA4 +glabel is_merlee_message_done /* 213A4 80045FA4 3C02800A */ lui $v0, %hi(D_800A0F40) /* 213A8 80045FA8 8C420F40 */ lw $v0, %lo(D_800A0F40)($v0) /* 213AC 80045FAC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045B68.s b/asm/nonmatchings/code_20ec0_len_5040/update_merlee_messages.s similarity index 97% rename from asm/nonmatchings/code_20ec0_len_5040/func_80045B68.s rename to asm/nonmatchings/code_20ec0_len_5040/update_merlee_messages.s index 594895fd3e..c8d898cf39 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045B68.s +++ b/asm/nonmatchings/code_20ec0_len_5040/update_merlee_messages.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80045B68 +glabel update_merlee_messages /* 20F68 80045B68 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 20F6C 80045B6C AFB10014 */ sw $s1, 0x14($sp) /* 20F70 80045B70 0000882D */ daddu $s1, $zero, $zero diff --git a/asm/nonmatchings/code_341d0/func_80059C9C.s b/asm/nonmatchings/code_341d0/clear_effect_data.s similarity index 99% rename from asm/nonmatchings/code_341d0/func_80059C9C.s rename to asm/nonmatchings/code_341d0/clear_effect_data.s index 547edff6b0..b977bf576c 100644 --- a/asm/nonmatchings/code_341d0/func_80059C9C.s +++ b/asm/nonmatchings/code_341d0/clear_effect_data.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80059C9C +glabel clear_effect_data /* 3509C 80059C9C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 350A0 80059CA0 2402000E */ addiu $v0, $zero, 0xe /* 350A4 80059CA4 3C03800A */ lui $v1, %hi(D_800A41C0) diff --git a/asm/nonmatchings/code_341d0/func_80059F94.s b/asm/nonmatchings/code_341d0/func_80059F94.s index ad1f1877ad..e82122a6aa 100644 --- a/asm/nonmatchings/code_341d0/func_80059F94.s +++ b/asm/nonmatchings/code_341d0/func_80059F94.s @@ -50,8 +50,8 @@ glabel func_80059F94 .L8005A040: /* 35440 8005A040 8DC20010 */ lw $v0, 0x10($t6) /* 35444 8005A044 8C4F0018 */ lw $t7, 0x18($v0) -/* 35448 8005A048 3C028006 */ lui $v0, %hi(func_80059C80) -/* 3544C 8005A04C 24429C80 */ addiu $v0, $v0, %lo(func_80059C80) +/* 35448 8005A048 3C028006 */ lui $v0, %hi(stub_effect_delegate) +/* 3544C 8005A04C 24429C80 */ addiu $v0, $v0, %lo(stub_effect_delegate) /* 35450 8005A050 51E2008D */ beql $t7, $v0, .L8005A288 /* 35454 8005A054 26520001 */ addiu $s2, $s2, 1 /* 35458 8005A058 12200088 */ beqz $s1, .L8005A27C diff --git a/asm/nonmatchings/code_341d0/func_80059C88.s b/asm/nonmatchings/code_341d0/set_effect_pos_offset.s similarity index 92% rename from asm/nonmatchings/code_341d0/func_80059C88.s rename to asm/nonmatchings/code_341d0/set_effect_pos_offset.s index 77d0e7ff62..74e23b3c0c 100644 --- a/asm/nonmatchings/code_341d0/func_80059C88.s +++ b/asm/nonmatchings/code_341d0/set_effect_pos_offset.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80059C88 +glabel set_effect_pos_offset /* 35088 80059C88 8C82000C */ lw $v0, 0xc($a0) /* 3508C 80059C8C AC450004 */ sw $a1, 4($v0) /* 35090 80059C90 AC460008 */ sw $a2, 8($v0) diff --git a/asm/nonmatchings/code_341d0/func_80059D50.s b/asm/nonmatchings/code_341d0/update_effects.s similarity index 99% rename from asm/nonmatchings/code_341d0/func_80059D50.s rename to asm/nonmatchings/code_341d0/update_effects.s index 7a37758600..33c6f612e9 100644 --- a/asm/nonmatchings/code_341d0/func_80059D50.s +++ b/asm/nonmatchings/code_341d0/update_effects.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80059D50 +glabel update_effects /* 35150 80059D50 3C02800A */ lui $v0, %hi(D_8009A650) /* 35154 80059D54 8C42A650 */ lw $v0, %lo(D_8009A650)($v0) /* 35158 80059D58 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_362a0_len_2f70/func_8005BDD8.s b/asm/nonmatchings/code_362a0_len_2f70/get_flat_collider_normal.s similarity index 96% rename from asm/nonmatchings/code_362a0_len_2f70/func_8005BDD8.s rename to asm/nonmatchings/code_362a0_len_2f70/get_flat_collider_normal.s index 47957e1eaa..654079c580 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/func_8005BDD8.s +++ b/asm/nonmatchings/code_362a0_len_2f70/get_flat_collider_normal.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8005BDD8 +glabel get_flat_collider_normal /* 371D8 8005BDD8 000410C0 */ sll $v0, $a0, 3 /* 371DC 8005BDDC 00441023 */ subu $v0, $v0, $a0 /* 371E0 8005BDE0 3C03800B */ lui $v1, %hi(D_800B42E4) diff --git a/asm/nonmatchings/code_415D90/draw_battle_wheel.s b/asm/nonmatchings/code_415D90/draw_battle_wheel.s index 53ce80fbe3..3efd227151 100644 --- a/asm/nonmatchings/code_415D90/draw_battle_wheel.s +++ b/asm/nonmatchings/code_415D90/draw_battle_wheel.s @@ -175,8 +175,8 @@ glabel L802A1DB4_416B44 /* 416C74 802A1EE4 3C01802B */ lui $at, %hi(D_802AD070) /* 416C78 802A1EE8 E420D070 */ swc1 $f0, %lo(D_802AD070)($at) .L802A1EEC: -/* 416C7C 802A1EEC 3C02802B */ lui $v0, %hi(D_802AD0AC) -/* 416C80 802A1EF0 8C42D0AC */ lw $v0, %lo(D_802AD0AC)($v0) +/* 416C7C 802A1EEC 3C02802B */ lui $v0, %hi(main_menu_numOptions) +/* 416C80 802A1EF0 8C42D0AC */ lw $v0, %lo(main_menu_numOptions)($v0) /* 416C84 802A1EF4 3C01802B */ lui $at, %hi(D_802AD06C) /* 416C88 802A1EF8 C438D06C */ lwc1 $f24, %lo(D_802AD06C)($at) /* 416C8C 802A1EFC 1840008A */ blez $v0, .L802A2128 @@ -316,8 +316,8 @@ glabel L802A1DB4_416B44 /* 416E94 802A2104 0260202D */ daddu $a0, $s3, $zero /* 416E98 802A2108 26940001 */ addiu $s4, $s4, 1 .L802A210C: -/* 416E9C 802A210C 3C02802B */ lui $v0, %hi(D_802AD0AC) -/* 416EA0 802A2110 8C42D0AC */ lw $v0, %lo(D_802AD0AC)($v0) +/* 416E9C 802A210C 3C02802B */ lui $v0, %hi(main_menu_numOptions) +/* 416EA0 802A2110 8C42D0AC */ lw $v0, %lo(main_menu_numOptions)($v0) /* 416EA4 802A2114 3C0141E0 */ lui $at, 0x41e0 /* 416EA8 802A2118 44810000 */ mtc1 $at, $f0 /* 416EAC 802A211C 0282102A */ slt $v0, $s4, $v0 @@ -477,8 +477,8 @@ glabel L802A1DB4_416B44 /* 41710C 802A237C 0260202D */ daddu $a0, $s3, $zero /* 417110 802A2380 0C05108E */ jal func_80144238 /* 417114 802A2384 0260202D */ daddu $a0, $s3, $zero -/* 417118 802A2388 3C02802B */ lui $v0, %hi(D_802AD0AC) -/* 41711C 802A238C 8C42D0AC */ lw $v0, %lo(D_802AD0AC)($v0) +/* 417118 802A2388 3C02802B */ lui $v0, %hi(main_menu_numOptions) +/* 41711C 802A238C 8C42D0AC */ lw $v0, %lo(main_menu_numOptions)($v0) /* 417120 802A2390 3C01802B */ lui $at, %hi(D_802AD06C) /* 417124 802A2394 C438D06C */ lwc1 $f24, %lo(D_802AD06C)($at) /* 417128 802A2398 1840004D */ blez $v0, .L802A24D0 @@ -554,8 +554,8 @@ glabel L802A1DB4_416B44 /* 417238 802A24A8 0260202D */ daddu $a0, $s3, $zero /* 41723C 802A24AC 26520004 */ addiu $s2, $s2, 4 /* 417240 802A24B0 26940001 */ addiu $s4, $s4, 1 -/* 417244 802A24B4 3C02802B */ lui $v0, %hi(D_802AD0AC) -/* 417248 802A24B8 8C42D0AC */ lw $v0, %lo(D_802AD0AC)($v0) +/* 417244 802A24B4 3C02802B */ lui $v0, %hi(main_menu_numOptions) +/* 417248 802A24B8 8C42D0AC */ lw $v0, %lo(main_menu_numOptions)($v0) /* 41724C 802A24BC 3C0141E0 */ lui $at, 0x41e0 /* 417250 802A24C0 44810000 */ mtc1 $at, $f0 /* 417254 802A24C4 0282102A */ slt $v0, $s4, $v0 @@ -594,10 +594,10 @@ glabel L802A1DB4_416B44 /* 4172D4 802A2544 AFA00014 */ sw $zero, 0x14($sp) /* 4172D8 802A2548 00641821 */ addu $v1, $v1, $a0 /* 4172DC 802A254C 00031880 */ sll $v1, $v1, 2 -/* 4172E0 802A2550 3C04802B */ lui $a0, %hi(D_802AD090) +/* 4172E0 802A2550 3C04802B */ lui $a0, %hi(battle_menu_messageIDs) /* 4172E4 802A2554 00832021 */ addu $a0, $a0, $v1 -/* 4172E8 802A2558 8C84D090 */ lw $a0, %lo(D_802AD090)($a0) -/* 4172EC 802A255C 0C04993B */ jal draw_string +/* 4172E8 802A2558 8C84D090 */ lw $a0, %lo(battle_menu_messageIDs)($a0) +/* 4172EC 802A255C 0C04993B */ jal draw_msg /* 4172F0 802A2560 02A0382D */ daddu $a3, $s5, $zero .L802A2564: /* 4172F4 802A2564 3C04800E */ lui $a0, %hi(gBattleStatus) diff --git a/asm/nonmatchings/code_415D90/func_802A10B8.s b/asm/nonmatchings/code_415D90/func_802A10B8.s index cfb3e62ae1..29f37fd466 100644 --- a/asm/nonmatchings/code_415D90/func_802A10B8.s +++ b/asm/nonmatchings/code_415D90/func_802A10B8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802A10B8 -/* 415E48 802A10B8 3C02802B */ lui $v0, %hi(D_802AD0AC) -/* 415E4C 802A10BC 8C42D0AC */ lw $v0, %lo(D_802AD0AC)($v0) +/* 415E48 802A10B8 3C02802B */ lui $v0, %hi(main_menu_numOptions) +/* 415E4C 802A10BC 8C42D0AC */ lw $v0, %lo(main_menu_numOptions)($v0) /* 415E50 802A10C0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 415E54 802A10C4 AFB00010 */ sw $s0, 0x10($sp) /* 415E58 802A10C8 0000802D */ daddu $s0, $zero, $zero @@ -22,8 +22,8 @@ glabel func_802A10B8 /* 415E88 802A10F8 8E440000 */ lw $a0, ($s2) /* 415E8C 802A10FC 0C05123D */ jal free_icon /* 415E90 802A1100 26100001 */ addiu $s0, $s0, 1 -/* 415E94 802A1104 3C02802B */ lui $v0, %hi(D_802AD0AC) -/* 415E98 802A1108 8C42D0AC */ lw $v0, %lo(D_802AD0AC)($v0) +/* 415E94 802A1104 3C02802B */ lui $v0, %hi(main_menu_numOptions) +/* 415E98 802A1108 8C42D0AC */ lw $v0, %lo(main_menu_numOptions)($v0) /* 415E9C 802A110C 0202102A */ slt $v0, $s0, $v0 /* 415EA0 802A1110 1440FFF6 */ bnez $v0, .L802A10EC /* 415EA4 802A1114 26520004 */ addiu $s2, $s2, 4 diff --git a/asm/nonmatchings/code_415D90/func_802A11B0.s b/asm/nonmatchings/code_415D90/func_802A11B0.s index 20324b1704..bb1e65b751 100644 --- a/asm/nonmatchings/code_415D90/func_802A11B0.s +++ b/asm/nonmatchings/code_415D90/func_802A11B0.s @@ -69,8 +69,8 @@ glabel func_802A11B0 /* 416030 802A12A0 44810000 */ mtc1 $at, $f0 /* 416034 802A12A4 3C04802B */ lui $a0, %hi(D_802AD0B3) /* 416038 802A12A8 9084D0B3 */ lbu $a0, %lo(D_802AD0B3)($a0) -/* 41603C 802A12AC 3C05802B */ lui $a1, %hi(D_802AD0AC) -/* 416040 802A12B0 24A5D0AC */ addiu $a1, $a1, %lo(D_802AD0AC) +/* 41603C 802A12AC 3C05802B */ lui $a1, %hi(main_menu_numOptions) +/* 416040 802A12B0 24A5D0AC */ addiu $a1, $a1, %lo(main_menu_numOptions) /* 416044 802A12B4 3C01802B */ lui $at, %hi(D_802AD064) /* 416048 802A12B8 AC22D064 */ sw $v0, %lo(D_802AD064)($at) /* 41604C 802A12BC 3C01802B */ lui $at, %hi(D_802AD004) @@ -94,8 +94,8 @@ glabel func_802A11B0 /* 416094 802A1304 2694D028 */ addiu $s4, $s4, %lo(D_802AD028) /* 416098 802A1308 3C12802B */ lui $s2, %hi(D_802AD010) /* 41609C 802A130C 2652D010 */ addiu $s2, $s2, %lo(D_802AD010) -/* 4160A0 802A1310 3C10802B */ lui $s0, %hi(D_802AD078) -/* 4160A4 802A1314 2610D078 */ addiu $s0, $s0, %lo(D_802AD078) +/* 4160A0 802A1310 3C10802B */ lui $s0, %hi(main_battle_menu_iconScripts) +/* 4160A4 802A1314 2610D078 */ addiu $s0, $s0, %lo(main_battle_menu_iconScripts) .L802A1318: /* 4160A8 802A1318 8E040000 */ lw $a0, ($s0) /* 4160AC 802A131C 26100004 */ addiu $s0, $s0, 4 @@ -139,8 +139,8 @@ glabel func_802A11B0 /* 416144 802A13B4 0220202D */ daddu $a0, $s1, $zero /* 416148 802A13B8 0C051280 */ jal set_icon_flags /* 41614C 802A13BC 24050002 */ addiu $a1, $zero, 2 -/* 416150 802A13C0 3C02802B */ lui $v0, %hi(D_802AD0AC) -/* 416154 802A13C4 8C42D0AC */ lw $v0, %lo(D_802AD0AC)($v0) +/* 416150 802A13C0 3C02802B */ lui $v0, %hi(main_menu_numOptions) +/* 416154 802A13C4 8C42D0AC */ lw $v0, %lo(main_menu_numOptions)($v0) /* 416158 802A13C8 0262102A */ slt $v0, $s3, $v0 /* 41615C 802A13CC 1440FFD2 */ bnez $v0, .L802A1318 /* 416160 802A13D0 26940004 */ addiu $s4, $s4, 4 @@ -423,8 +423,8 @@ glabel func_802A11B0 /* 4165A4 802A1814 000218C0 */ sll $v1, $v0, 3 /* 4165A8 802A1818 00621823 */ subu $v1, $v1, $v0 /* 4165AC 802A181C 00031880 */ sll $v1, $v1, 2 -/* 4165B0 802A1820 3C02802B */ lui $v0, %hi(D_802AD0AC) -/* 4165B4 802A1824 8C42D0AC */ lw $v0, %lo(D_802AD0AC)($v0) +/* 4165B0 802A1820 3C02802B */ lui $v0, %hi(main_menu_numOptions) +/* 4165B4 802A1824 8C42D0AC */ lw $v0, %lo(main_menu_numOptions)($v0) /* 4165B8 802A1828 4483A000 */ mtc1 $v1, $f20 /* 4165BC 802A182C 00000000 */ nop /* 4165C0 802A1830 4680A520 */ cvt.s.w $f20, $f20 @@ -482,8 +482,8 @@ glabel func_802A11B0 /* 41668C 802A18FC 0220202D */ daddu $a0, $s1, $zero /* 416690 802A1900 0C05128B */ jal clear_icon_flags /* 416694 802A1904 24050002 */ addiu $a1, $zero, 2 -/* 416698 802A1908 3C02802B */ lui $v0, %hi(D_802AD0AC) -/* 41669C 802A190C 8C42D0AC */ lw $v0, %lo(D_802AD0AC)($v0) +/* 416698 802A1908 3C02802B */ lui $v0, %hi(main_menu_numOptions) +/* 41669C 802A190C 8C42D0AC */ lw $v0, %lo(main_menu_numOptions)($v0) /* 4166A0 802A1910 3C0141E0 */ lui $at, 0x41e0 /* 4166A4 802A1914 44810000 */ mtc1 $at, $f0 /* 4166A8 802A1918 0262102A */ slt $v0, $s3, $v0 @@ -551,9 +551,9 @@ glabel func_802A11B0 /* 416798 802A1A08 82430000 */ lb $v1, ($s2) /* 41679C 802A1A0C 00431021 */ addu $v0, $v0, $v1 /* 4167A0 802A1A10 00021080 */ sll $v0, $v0, 2 -/* 4167A4 802A1A14 3C01802B */ lui $at, %hi(D_802AD0D0) +/* 4167A4 802A1A14 3C01802B */ lui $at, %hi(battle_menu_isEnabled) /* 4167A8 802A1A18 00220821 */ addu $at, $at, $v0 -/* 4167AC 802A1A1C 8C22D0D0 */ lw $v0, %lo(D_802AD0D0)($at) +/* 4167AC 802A1A1C 8C22D0D0 */ lw $v0, %lo(battle_menu_isEnabled)($at) /* 4167B0 802A1A20 14450005 */ bne $v0, $a1, .L802A1A38 /* 4167B4 802A1A24 00000000 */ nop /* 4167B8 802A1A28 0C05272D */ jal play_sound diff --git a/asm/nonmatchings/code_415D90/func_802A2684.s b/asm/nonmatchings/code_415D90/func_802A2684.s index 2d6aae98d9..ee586404f0 100644 --- a/asm/nonmatchings/code_415D90/func_802A2684.s +++ b/asm/nonmatchings/code_415D90/func_802A2684.s @@ -4,8 +4,8 @@ glabel func_802A2684 /* 417414 802A2684 3C03802B */ lui $v1, %hi(D_802AD4A8) /* 417418 802A2688 2463D4A8 */ addiu $v1, $v1, %lo(D_802AD4A8) -/* 41741C 802A268C 3C05802B */ lui $a1, %hi(D_802AD4A4) -/* 417420 802A2690 24A5D4A4 */ addiu $a1, $a1, %lo(D_802AD4A4) +/* 41741C 802A268C 3C05802B */ lui $a1, %hi(battle_menu_moveOptionCount) +/* 417420 802A2690 24A5D4A4 */ addiu $a1, $a1, %lo(battle_menu_moveOptionCount) /* 417424 802A2694 8C620000 */ lw $v0, ($v1) /* 417428 802A2698 8CA70000 */ lw $a3, ($a1) /* 41742C 802A269C 0047102A */ slt $v0, $v0, $a3 @@ -13,14 +13,14 @@ glabel func_802A2684 /* 417434 802A26A4 24E2FFFF */ addiu $v0, $a3, -1 /* 417438 802A26A8 AC620000 */ sw $v0, ($v1) .L802A26AC: -/* 41743C 802A26AC 3C01802B */ lui $at, %hi(D_802AD108) -/* 417440 802A26B0 A020D108 */ sb $zero, %lo(D_802AD108)($at) +/* 41743C 802A26AC 3C01802B */ lui $at, %hi(battle_menu_moveState) +/* 417440 802A26B0 A020D108 */ sb $zero, %lo(battle_menu_moveState)($at) /* 417444 802A26B4 90640003 */ lbu $a0, 3($v1) -/* 417448 802A26B8 3C03802B */ lui $v1, %hi(D_802AD10C) -/* 41744C 802A26BC 2463D10C */ addiu $v1, $v1, %lo(D_802AD10C) +/* 417448 802A26B8 3C03802B */ lui $v1, %hi(battle_menu_moveScrollLine) +/* 41744C 802A26BC 2463D10C */ addiu $v1, $v1, %lo(battle_menu_moveScrollLine) /* 417450 802A26C0 A0600000 */ sb $zero, ($v1) -/* 417454 802A26C4 3C01802B */ lui $at, %hi(D_802AD109) -/* 417458 802A26C8 A024D109 */ sb $a0, %lo(D_802AD109)($at) +/* 417454 802A26C4 3C01802B */ lui $at, %hi(battle_menu_moveCursorPos) +/* 417458 802A26C8 A024D109 */ sb $a0, %lo(battle_menu_moveCursorPos)($at) /* 41745C 802A26CC 3C01802B */ lui $at, %hi(D_802AD10A) /* 417460 802A26D0 A024D10A */ sb $a0, %lo(D_802AD10A)($at) /* 417464 802A26D4 90A60003 */ lbu $a2, 3($a1) @@ -43,8 +43,8 @@ glabel func_802A2684 /* 4174A4 802A2714 A1060000 */ sb $a2, ($t0) .L802A2718: /* 4174A8 802A2718 240200FF */ addiu $v0, $zero, 0xff -/* 4174AC 802A271C 3C01802B */ lui $at, %hi(D_802AD116) -/* 4174B0 802A2720 A422D116 */ sh $v0, %lo(D_802AD116)($at) +/* 4174AC 802A271C 3C01802B */ lui $at, %hi(battle_menu_moveTextOpacity) +/* 4174B0 802A2720 A422D116 */ sh $v0, %lo(battle_menu_moveTextOpacity)($at) /* 4174B4 802A2724 24020001 */ addiu $v0, $zero, 1 /* 4174B8 802A2728 3C01802B */ lui $at, %hi(D_802AD10F) /* 4174BC 802A272C A022D10F */ sb $v0, %lo(D_802AD10F)($at) @@ -79,15 +79,15 @@ glabel func_802A2684 /* 417524 802A2794 00021080 */ sll $v0, $v0, 2 /* 417528 802A2798 00441021 */ addu $v0, $v0, $a0 /* 41752C 802A279C 00A31823 */ subu $v1, $a1, $v1 -/* 417530 802A27A0 3C01802B */ lui $at, %hi(D_802AD110) -/* 417534 802A27A4 A422D110 */ sh $v0, %lo(D_802AD110)($at) +/* 417530 802A27A0 3C01802B */ lui $at, %hi(battle_menu_moveScrollOffset) +/* 417534 802A27A4 A422D110 */ sh $v0, %lo(battle_menu_moveScrollOffset)($at) /* 417538 802A27A8 00031040 */ sll $v0, $v1, 1 /* 41753C 802A27AC 00431021 */ addu $v0, $v0, $v1 /* 417540 802A27B0 00021080 */ sll $v0, $v0, 2 /* 417544 802A27B4 00431021 */ addu $v0, $v0, $v1 /* 417548 802A27B8 3C01802B */ lui $at, %hi(D_802AD112) /* 41754C 802A27BC A422D112 */ sh $v0, %lo(D_802AD112)($at) -/* 417550 802A27C0 3C01802B */ lui $at, %hi(D_802AD600) -/* 417554 802A27C4 AC20D600 */ sw $zero, %lo(D_802AD600)($at) +/* 417550 802A27C0 3C01802B */ lui $at, %hi(battle_menu_moveOptionActive) +/* 417554 802A27C4 AC20D600 */ sw $zero, %lo(battle_menu_moveOptionActive)($at) /* 417558 802A27C8 03E00008 */ jr $ra /* 41755C 802A27CC 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802A27D0.s b/asm/nonmatchings/code_415D90/func_802A27D0.s index e1b6665c1b..7ad063ace3 100644 --- a/asm/nonmatchings/code_415D90/func_802A27D0.s +++ b/asm/nonmatchings/code_415D90/func_802A27D0.s @@ -3,7 +3,7 @@ glabel func_802A27D0 /* 417560 802A27D0 2402000A */ addiu $v0, $zero, 0xa -/* 417564 802A27D4 3C01802B */ lui $at, %hi(D_802AD108) -/* 417568 802A27D8 A022D108 */ sb $v0, %lo(D_802AD108)($at) +/* 417564 802A27D4 3C01802B */ lui $at, %hi(battle_menu_moveState) +/* 417568 802A27D8 A022D108 */ sb $v0, %lo(battle_menu_moveState)($at) /* 41756C 802A27DC 03E00008 */ jr $ra /* 417570 802A27E0 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802A27E4.s b/asm/nonmatchings/code_415D90/func_802A27E4.s index 575b03f6f9..ecd9bfabd5 100644 --- a/asm/nonmatchings/code_415D90/func_802A27E4.s +++ b/asm/nonmatchings/code_415D90/func_802A27E4.s @@ -7,72 +7,72 @@ glabel func_802A27E4 /* 41757C 802A27EC 24050002 */ addiu $a1, $zero, 2 /* 417580 802A27F0 AFBF0018 */ sw $ra, 0x18($sp) /* 417584 802A27F4 AFB10014 */ sw $s1, 0x14($sp) -/* 417588 802A27F8 0C051F9F */ jal func_80147E7C +/* 417588 802A27F8 0C051F9F */ jal set_window_update /* 41758C 802A27FC AFB00010 */ sw $s0, 0x10($sp) -/* 417590 802A2800 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 417594 802A2804 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 417590 802A2800 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 417594 802A2804 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 417598 802A2808 54400006 */ bnel $v0, $zero, .L802A2824 /* 41759C 802A280C 24040004 */ addiu $a0, $zero, 4 /* 4175A0 802A2810 24040002 */ addiu $a0, $zero, 2 -/* 4175A4 802A2814 0C051F9F */ jal func_80147E7C +/* 4175A4 802A2814 0C051F9F */ jal set_window_update /* 4175A8 802A2818 0080282D */ daddu $a1, $a0, $zero /* 4175AC 802A281C 080A8A0C */ j .L802A2830 /* 4175B0 802A2820 24040003 */ addiu $a0, $zero, 3 .L802A2824: -/* 4175B4 802A2824 0C051F9F */ jal func_80147E7C +/* 4175B4 802A2824 0C051F9F */ jal set_window_update /* 4175B8 802A2828 24050002 */ addiu $a1, $zero, 2 /* 4175BC 802A282C 24040005 */ addiu $a0, $zero, 5 .L802A2830: -/* 4175C0 802A2830 0C051F9F */ jal func_80147E7C +/* 4175C0 802A2830 0C051F9F */ jal set_window_update /* 4175C4 802A2834 24050002 */ addiu $a1, $zero, 2 /* 4175C8 802A2838 24040008 */ addiu $a0, $zero, 8 -/* 4175CC 802A283C 0C051F9F */ jal func_80147E7C +/* 4175CC 802A283C 0C051F9F */ jal set_window_update /* 4175D0 802A2840 24050002 */ addiu $a1, $zero, 2 -/* 4175D4 802A2844 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 4175D8 802A2848 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 4175D4 802A2844 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 4175D8 802A2848 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 4175DC 802A284C 1840000C */ blez $v0, .L802A2880 /* 4175E0 802A2850 0000802D */ daddu $s0, $zero, $zero -/* 4175E4 802A2854 3C11802B */ lui $s1, %hi(D_802AD128) -/* 4175E8 802A2858 2631D128 */ addiu $s1, $s1, %lo(D_802AD128) +/* 4175E4 802A2854 3C11802B */ lui $s1, %hi(battle_menu_moveOptionIconIDs) +/* 4175E8 802A2858 2631D128 */ addiu $s1, $s1, %lo(battle_menu_moveOptionIconIDs) .L802A285C: /* 4175EC 802A285C 8E240000 */ lw $a0, ($s1) /* 4175F0 802A2860 0C05123D */ jal free_icon /* 4175F4 802A2864 26310004 */ addiu $s1, $s1, 4 -/* 4175F8 802A2868 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 4175FC 802A286C 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 4175F8 802A2868 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 4175FC 802A286C 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 417600 802A2870 26100001 */ addiu $s0, $s0, 1 /* 417604 802A2874 0202102A */ slt $v0, $s0, $v0 /* 417608 802A2878 1440FFF8 */ bnez $v0, .L802A285C /* 41760C 802A287C 00000000 */ nop .L802A2880: -/* 417610 802A2880 3C04802B */ lui $a0, %hi(D_802AD118) -/* 417614 802A2884 8C84D118 */ lw $a0, %lo(D_802AD118)($a0) +/* 417610 802A2880 3C04802B */ lui $a0, %hi(battle_menu_moveCursorIcon) +/* 417614 802A2884 8C84D118 */ lw $a0, %lo(battle_menu_moveCursorIcon)($a0) /* 417618 802A2888 0C05123D */ jal free_icon /* 41761C 802A288C 0000802D */ daddu $s0, $zero, $zero -/* 417620 802A2890 3C04802B */ lui $a0, %hi(D_802AD11C) -/* 417624 802A2894 8C84D11C */ lw $a0, %lo(D_802AD11C)($a0) +/* 417620 802A2890 3C04802B */ lui $a0, %hi(battle_menu_moveUpArrowIcon) +/* 417624 802A2894 8C84D11C */ lw $a0, %lo(battle_menu_moveUpArrowIcon)($a0) /* 417628 802A2898 0C05123D */ jal free_icon /* 41762C 802A289C 00000000 */ nop -/* 417630 802A28A0 3C04802B */ lui $a0, %hi(D_802AD120) -/* 417634 802A28A4 8C84D120 */ lw $a0, %lo(D_802AD120)($a0) +/* 417630 802A28A0 3C04802B */ lui $a0, %hi(battle_menu_moveDownArrowIcon) +/* 417634 802A28A4 8C84D120 */ lw $a0, %lo(battle_menu_moveDownArrowIcon)($a0) /* 417638 802A28A8 0C05123D */ jal free_icon /* 41763C 802A28AC 00000000 */ nop -/* 417640 802A28B0 3C04802B */ lui $a0, %hi(D_802AD188) -/* 417644 802A28B4 8C84D188 */ lw $a0, %lo(D_802AD188)($a0) +/* 417640 802A28B0 3C04802B */ lui $a0, %hi(battle_menu_moveTitleIcon) +/* 417644 802A28B4 8C84D188 */ lw $a0, %lo(battle_menu_moveTitleIcon)($a0) /* 417648 802A28B8 0C05123D */ jal free_icon /* 41764C 802A28BC 00000000 */ nop -/* 417650 802A28C0 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 417654 802A28C4 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 417650 802A28C0 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 417654 802A28C4 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 417658 802A28C8 1840000C */ blez $v0, .L802A28FC /* 41765C 802A28CC 00000000 */ nop -/* 417660 802A28D0 3C11802B */ lui $s1, %hi(D_802AD190) -/* 417664 802A28D4 2631D190 */ addiu $s1, $s1, %lo(D_802AD190) +/* 417660 802A28D0 3C11802B */ lui $s1, %hi(battle_menu_moveOptionCostUnitIconIDs) +/* 417664 802A28D4 2631D190 */ addiu $s1, $s1, %lo(battle_menu_moveOptionCostUnitIconIDs) .L802A28D8: /* 417668 802A28D8 8E240000 */ lw $a0, ($s1) /* 41766C 802A28DC 0C05123D */ jal free_icon /* 417670 802A28E0 26310004 */ addiu $s1, $s1, 4 -/* 417674 802A28E4 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 417678 802A28E8 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 417674 802A28E4 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 417678 802A28E8 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 41767C 802A28EC 26100001 */ addiu $s0, $s0, 1 /* 417680 802A28F0 0202102A */ slt $v0, $s0, $v0 /* 417684 802A28F4 1440FFF8 */ bnez $v0, .L802A28D8 diff --git a/asm/nonmatchings/code_415D90/func_802A2910.s b/asm/nonmatchings/code_415D90/func_802A2910.s index 075f6c4e0f..2b17d60821 100644 --- a/asm/nonmatchings/code_415D90/func_802A2910.s +++ b/asm/nonmatchings/code_415D90/func_802A2910.s @@ -2,16 +2,16 @@ .set noreorder # don't insert nops after branches glabel func_802A2910 -/* 4176A0 802A2910 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 4176A4 802A2914 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 4176A0 802A2910 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 4176A4 802A2914 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 4176A8 802A2918 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 4176AC 802A291C AFB00010 */ sw $s0, 0x10($sp) /* 4176B0 802A2920 0000802D */ daddu $s0, $zero, $zero /* 4176B4 802A2924 AFBF0018 */ sw $ra, 0x18($sp) /* 4176B8 802A2928 1840000F */ blez $v0, .L802A2968 /* 4176BC 802A292C AFB10014 */ sw $s1, 0x14($sp) -/* 4176C0 802A2930 3C11802B */ lui $s1, %hi(D_802AD128) -/* 4176C4 802A2934 2631D128 */ addiu $s1, $s1, %lo(D_802AD128) +/* 4176C0 802A2930 3C11802B */ lui $s1, %hi(battle_menu_moveOptionIconIDs) +/* 4176C4 802A2934 2631D128 */ addiu $s1, $s1, %lo(battle_menu_moveOptionIconIDs) /* 4176C8 802A2938 240500FF */ addiu $a1, $zero, 0xff .L802A293C: /* 4176CC 802A293C 00A0302D */ daddu $a2, $a1, $zero @@ -19,8 +19,8 @@ glabel func_802A2910 /* 4176D4 802A2944 8E240000 */ lw $a0, ($s1) /* 4176D8 802A2948 0C0513BF */ jal icon_set_tint /* 4176DC 802A294C 26310004 */ addiu $s1, $s1, 4 -/* 4176E0 802A2950 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 4176E4 802A2954 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 4176E0 802A2950 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 4176E4 802A2954 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 4176E8 802A2958 26100001 */ addiu $s0, $s0, 1 /* 4176EC 802A295C 0202102A */ slt $v0, $s0, $v0 /* 4176F0 802A2960 1440FFF6 */ bnez $v0, .L802A293C @@ -28,34 +28,34 @@ glabel func_802A2910 .L802A2968: /* 4176F8 802A2968 240500FF */ addiu $a1, $zero, 0xff /* 4176FC 802A296C 00A0302D */ daddu $a2, $a1, $zero -/* 417700 802A2970 3C04802B */ lui $a0, %hi(D_802AD118) -/* 417704 802A2974 8C84D118 */ lw $a0, %lo(D_802AD118)($a0) +/* 417700 802A2970 3C04802B */ lui $a0, %hi(battle_menu_moveCursorIcon) +/* 417704 802A2974 8C84D118 */ lw $a0, %lo(battle_menu_moveCursorIcon)($a0) /* 417708 802A2978 0C0513BF */ jal icon_set_tint /* 41770C 802A297C 00A0382D */ daddu $a3, $a1, $zero /* 417710 802A2980 240500FF */ addiu $a1, $zero, 0xff /* 417714 802A2984 00A0302D */ daddu $a2, $a1, $zero -/* 417718 802A2988 3C04802B */ lui $a0, %hi(D_802AD11C) -/* 41771C 802A298C 8C84D11C */ lw $a0, %lo(D_802AD11C)($a0) +/* 417718 802A2988 3C04802B */ lui $a0, %hi(battle_menu_moveUpArrowIcon) +/* 41771C 802A298C 8C84D11C */ lw $a0, %lo(battle_menu_moveUpArrowIcon)($a0) /* 417720 802A2990 0C0513BF */ jal icon_set_tint /* 417724 802A2994 00A0382D */ daddu $a3, $a1, $zero /* 417728 802A2998 240500FF */ addiu $a1, $zero, 0xff /* 41772C 802A299C 00A0302D */ daddu $a2, $a1, $zero -/* 417730 802A29A0 3C04802B */ lui $a0, %hi(D_802AD120) -/* 417734 802A29A4 8C84D120 */ lw $a0, %lo(D_802AD120)($a0) +/* 417730 802A29A0 3C04802B */ lui $a0, %hi(battle_menu_moveDownArrowIcon) +/* 417734 802A29A4 8C84D120 */ lw $a0, %lo(battle_menu_moveDownArrowIcon)($a0) /* 417738 802A29A8 0C0513BF */ jal icon_set_tint /* 41773C 802A29AC 00A0382D */ daddu $a3, $a1, $zero /* 417740 802A29B0 240500FF */ addiu $a1, $zero, 0xff /* 417744 802A29B4 00A0302D */ daddu $a2, $a1, $zero -/* 417748 802A29B8 3C04802B */ lui $a0, %hi(D_802AD188) -/* 41774C 802A29BC 8C84D188 */ lw $a0, %lo(D_802AD188)($a0) +/* 417748 802A29B8 3C04802B */ lui $a0, %hi(battle_menu_moveTitleIcon) +/* 41774C 802A29BC 8C84D188 */ lw $a0, %lo(battle_menu_moveTitleIcon)($a0) /* 417750 802A29C0 0C0513BF */ jal icon_set_tint /* 417754 802A29C4 00A0382D */ daddu $a3, $a1, $zero -/* 417758 802A29C8 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 41775C 802A29CC 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 417758 802A29C8 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 41775C 802A29CC 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 417760 802A29D0 1840000F */ blez $v0, .L802A2A10 /* 417764 802A29D4 0000802D */ daddu $s0, $zero, $zero -/* 417768 802A29D8 3C11802B */ lui $s1, %hi(D_802AD190) -/* 41776C 802A29DC 2631D190 */ addiu $s1, $s1, %lo(D_802AD190) +/* 417768 802A29D8 3C11802B */ lui $s1, %hi(battle_menu_moveOptionCostUnitIconIDs) +/* 41776C 802A29DC 2631D190 */ addiu $s1, $s1, %lo(battle_menu_moveOptionCostUnitIconIDs) /* 417770 802A29E0 240500FF */ addiu $a1, $zero, 0xff .L802A29E4: /* 417774 802A29E4 00A0302D */ daddu $a2, $a1, $zero @@ -63,54 +63,54 @@ glabel func_802A2910 /* 41777C 802A29EC 8E240000 */ lw $a0, ($s1) /* 417780 802A29F0 0C0513BF */ jal icon_set_tint /* 417784 802A29F4 26310004 */ addiu $s1, $s1, 4 -/* 417788 802A29F8 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 41778C 802A29FC 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 417788 802A29F8 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 41778C 802A29FC 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 417790 802A2A00 26100001 */ addiu $s0, $s0, 1 /* 417794 802A2A04 0202102A */ slt $v0, $s0, $v0 /* 417798 802A2A08 5440FFF6 */ bnel $v0, $zero, .L802A29E4 /* 41779C 802A2A0C 240500FF */ addiu $a1, $zero, 0xff .L802A2A10: -/* 4177A0 802A2A10 3C04802B */ lui $a0, %hi(D_802AD118) -/* 4177A4 802A2A14 8C84D118 */ lw $a0, %lo(D_802AD118)($a0) +/* 4177A0 802A2A10 3C04802B */ lui $a0, %hi(battle_menu_moveCursorIcon) +/* 4177A4 802A2A14 8C84D118 */ lw $a0, %lo(battle_menu_moveCursorIcon)($a0) /* 4177A8 802A2A18 3C058010 */ lui $a1, %hi(D_80104A28) /* 4177AC 802A2A1C 24A54A28 */ addiu $a1, $a1, %lo(D_80104A28) /* 4177B0 802A2A20 0C0511FF */ jal set_menu_icon_script /* 4177B4 802A2A24 00000000 */ nop /* 4177B8 802A2A28 24040001 */ addiu $a0, $zero, 1 -/* 4177BC 802A2A2C 0C051F9F */ jal func_80147E7C +/* 4177BC 802A2A2C 0C051F9F */ jal set_window_update /* 4177C0 802A2A30 24050005 */ addiu $a1, $zero, 5 -/* 4177C4 802A2A34 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 4177C8 802A2A38 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 4177C4 802A2A34 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 4177C8 802A2A38 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 4177CC 802A2A3C 54400006 */ bnel $v0, $zero, .L802A2A58 /* 4177D0 802A2A40 24040004 */ addiu $a0, $zero, 4 /* 4177D4 802A2A44 24040002 */ addiu $a0, $zero, 2 -/* 4177D8 802A2A48 0C051F9F */ jal func_80147E7C +/* 4177D8 802A2A48 0C051F9F */ jal set_window_update /* 4177DC 802A2A4C 24050005 */ addiu $a1, $zero, 5 /* 4177E0 802A2A50 080A8A99 */ j .L802A2A64 /* 4177E4 802A2A54 24040003 */ addiu $a0, $zero, 3 .L802A2A58: -/* 4177E8 802A2A58 0C051F9F */ jal func_80147E7C +/* 4177E8 802A2A58 0C051F9F */ jal set_window_update /* 4177EC 802A2A5C 24050005 */ addiu $a1, $zero, 5 /* 4177F0 802A2A60 24040005 */ addiu $a0, $zero, 5 .L802A2A64: -/* 4177F4 802A2A64 0C051F9F */ jal func_80147E7C +/* 4177F4 802A2A64 0C051F9F */ jal set_window_update /* 4177F8 802A2A68 24050005 */ addiu $a1, $zero, 5 /* 4177FC 802A2A6C 24040008 */ addiu $a0, $zero, 8 -/* 417800 802A2A70 0C051F9F */ jal func_80147E7C +/* 417800 802A2A70 0C051F9F */ jal set_window_update /* 417804 802A2A74 24050001 */ addiu $a1, $zero, 1 /* 417808 802A2A78 2402000A */ addiu $v0, $zero, 0xa /* 41780C 802A2A7C 8FBF0018 */ lw $ra, 0x18($sp) /* 417810 802A2A80 8FB10014 */ lw $s1, 0x14($sp) /* 417814 802A2A84 8FB00010 */ lw $s0, 0x10($sp) /* 417818 802A2A88 24030001 */ addiu $v1, $zero, 1 -/* 41781C 802A2A8C 3C01802B */ lui $at, %hi(D_802AD114) -/* 417820 802A2A90 A422D114 */ sh $v0, %lo(D_802AD114)($at) +/* 41781C 802A2A8C 3C01802B */ lui $at, %hi(battle_menu_moveTextColor) +/* 417820 802A2A90 A422D114 */ sh $v0, %lo(battle_menu_moveTextColor)($at) /* 417824 802A2A94 240200FF */ addiu $v0, $zero, 0xff /* 417828 802A2A98 3C01802B */ lui $at, %hi(D_802AD10F) /* 41782C 802A2A9C A023D10F */ sb $v1, %lo(D_802AD10F)($at) -/* 417830 802A2AA0 3C01802B */ lui $at, %hi(D_802AD116) -/* 417834 802A2AA4 A422D116 */ sh $v0, %lo(D_802AD116)($at) -/* 417838 802A2AA8 3C01802B */ lui $at, %hi(D_802AD108) -/* 41783C 802A2AAC A023D108 */ sb $v1, %lo(D_802AD108)($at) +/* 417830 802A2AA0 3C01802B */ lui $at, %hi(battle_menu_moveTextOpacity) +/* 417834 802A2AA4 A422D116 */ sh $v0, %lo(battle_menu_moveTextOpacity)($at) +/* 417838 802A2AA8 3C01802B */ lui $at, %hi(battle_menu_moveState) +/* 41783C 802A2AAC A023D108 */ sb $v1, %lo(battle_menu_moveState)($at) /* 417840 802A2AB0 03E00008 */ jr $ra /* 417844 802A2AB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_415D90/func_802A2AB8.s b/asm/nonmatchings/code_415D90/func_802A2AB8.s index 02ec22228b..e008b139bc 100644 --- a/asm/nonmatchings/code_415D90/func_802A2AB8.s +++ b/asm/nonmatchings/code_415D90/func_802A2AB8.s @@ -7,33 +7,33 @@ glabel func_802A2AB8 /* 417850 802A2AC0 24050005 */ addiu $a1, $zero, 5 /* 417854 802A2AC4 AFBF0018 */ sw $ra, 0x18($sp) /* 417858 802A2AC8 AFB10014 */ sw $s1, 0x14($sp) -/* 41785C 802A2ACC 0C051F9F */ jal func_80147E7C +/* 41785C 802A2ACC 0C051F9F */ jal set_window_update /* 417860 802A2AD0 AFB00010 */ sw $s0, 0x10($sp) -/* 417864 802A2AD4 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 417868 802A2AD8 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 417864 802A2AD4 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 417868 802A2AD8 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 41786C 802A2ADC 54400006 */ bnel $v0, $zero, .L802A2AF8 /* 417870 802A2AE0 24040004 */ addiu $a0, $zero, 4 /* 417874 802A2AE4 24040002 */ addiu $a0, $zero, 2 -/* 417878 802A2AE8 0C051F9F */ jal func_80147E7C +/* 417878 802A2AE8 0C051F9F */ jal set_window_update /* 41787C 802A2AEC 24050005 */ addiu $a1, $zero, 5 /* 417880 802A2AF0 080A8AC1 */ j .L802A2B04 /* 417884 802A2AF4 24040003 */ addiu $a0, $zero, 3 .L802A2AF8: -/* 417888 802A2AF8 0C051F9F */ jal func_80147E7C +/* 417888 802A2AF8 0C051F9F */ jal set_window_update /* 41788C 802A2AFC 24050005 */ addiu $a1, $zero, 5 /* 417890 802A2B00 24040005 */ addiu $a0, $zero, 5 .L802A2B04: -/* 417894 802A2B04 0C051F9F */ jal func_80147E7C +/* 417894 802A2B04 0C051F9F */ jal set_window_update /* 417898 802A2B08 24050005 */ addiu $a1, $zero, 5 /* 41789C 802A2B0C 24040008 */ addiu $a0, $zero, 8 -/* 4178A0 802A2B10 0C051F9F */ jal func_80147E7C +/* 4178A0 802A2B10 0C051F9F */ jal set_window_update /* 4178A4 802A2B14 24050001 */ addiu $a1, $zero, 1 -/* 4178A8 802A2B18 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 4178AC 802A2B1C 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 4178A8 802A2B18 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 4178AC 802A2B1C 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 4178B0 802A2B20 1840000F */ blez $v0, .L802A2B60 /* 4178B4 802A2B24 0000802D */ daddu $s0, $zero, $zero -/* 4178B8 802A2B28 3C11802B */ lui $s1, %hi(D_802AD128) -/* 4178BC 802A2B2C 2631D128 */ addiu $s1, $s1, %lo(D_802AD128) +/* 4178B8 802A2B28 3C11802B */ lui $s1, %hi(battle_menu_moveOptionIconIDs) +/* 4178BC 802A2B2C 2631D128 */ addiu $s1, $s1, %lo(battle_menu_moveOptionIconIDs) /* 4178C0 802A2B30 240500FF */ addiu $a1, $zero, 0xff .L802A2B34: /* 4178C4 802A2B34 00A0302D */ daddu $a2, $a1, $zero @@ -41,8 +41,8 @@ glabel func_802A2AB8 /* 4178CC 802A2B3C 8E240000 */ lw $a0, ($s1) /* 4178D0 802A2B40 0C0513BF */ jal icon_set_tint /* 4178D4 802A2B44 26310004 */ addiu $s1, $s1, 4 -/* 4178D8 802A2B48 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 4178DC 802A2B4C 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 4178D8 802A2B48 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 4178DC 802A2B4C 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 4178E0 802A2B50 26100001 */ addiu $s0, $s0, 1 /* 4178E4 802A2B54 0202102A */ slt $v0, $s0, $v0 /* 4178E8 802A2B58 1440FFF6 */ bnez $v0, .L802A2B34 @@ -50,34 +50,34 @@ glabel func_802A2AB8 .L802A2B60: /* 4178F0 802A2B60 240500FF */ addiu $a1, $zero, 0xff /* 4178F4 802A2B64 00A0302D */ daddu $a2, $a1, $zero -/* 4178F8 802A2B68 3C04802B */ lui $a0, %hi(D_802AD118) -/* 4178FC 802A2B6C 8C84D118 */ lw $a0, %lo(D_802AD118)($a0) +/* 4178F8 802A2B68 3C04802B */ lui $a0, %hi(battle_menu_moveCursorIcon) +/* 4178FC 802A2B6C 8C84D118 */ lw $a0, %lo(battle_menu_moveCursorIcon)($a0) /* 417900 802A2B70 0C0513BF */ jal icon_set_tint /* 417904 802A2B74 00A0382D */ daddu $a3, $a1, $zero /* 417908 802A2B78 240500FF */ addiu $a1, $zero, 0xff /* 41790C 802A2B7C 00A0302D */ daddu $a2, $a1, $zero -/* 417910 802A2B80 3C04802B */ lui $a0, %hi(D_802AD11C) -/* 417914 802A2B84 8C84D11C */ lw $a0, %lo(D_802AD11C)($a0) +/* 417910 802A2B80 3C04802B */ lui $a0, %hi(battle_menu_moveUpArrowIcon) +/* 417914 802A2B84 8C84D11C */ lw $a0, %lo(battle_menu_moveUpArrowIcon)($a0) /* 417918 802A2B88 0C0513BF */ jal icon_set_tint /* 41791C 802A2B8C 00A0382D */ daddu $a3, $a1, $zero /* 417920 802A2B90 240500FF */ addiu $a1, $zero, 0xff /* 417924 802A2B94 00A0302D */ daddu $a2, $a1, $zero -/* 417928 802A2B98 3C04802B */ lui $a0, %hi(D_802AD120) -/* 41792C 802A2B9C 8C84D120 */ lw $a0, %lo(D_802AD120)($a0) +/* 417928 802A2B98 3C04802B */ lui $a0, %hi(battle_menu_moveDownArrowIcon) +/* 41792C 802A2B9C 8C84D120 */ lw $a0, %lo(battle_menu_moveDownArrowIcon)($a0) /* 417930 802A2BA0 0C0513BF */ jal icon_set_tint /* 417934 802A2BA4 00A0382D */ daddu $a3, $a1, $zero /* 417938 802A2BA8 240500FF */ addiu $a1, $zero, 0xff /* 41793C 802A2BAC 00A0302D */ daddu $a2, $a1, $zero -/* 417940 802A2BB0 3C04802B */ lui $a0, %hi(D_802AD188) -/* 417944 802A2BB4 8C84D188 */ lw $a0, %lo(D_802AD188)($a0) +/* 417940 802A2BB0 3C04802B */ lui $a0, %hi(battle_menu_moveTitleIcon) +/* 417944 802A2BB4 8C84D188 */ lw $a0, %lo(battle_menu_moveTitleIcon)($a0) /* 417948 802A2BB8 0C0513BF */ jal icon_set_tint /* 41794C 802A2BBC 00A0382D */ daddu $a3, $a1, $zero -/* 417950 802A2BC0 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 417954 802A2BC4 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 417950 802A2BC0 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 417954 802A2BC4 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 417958 802A2BC8 1840000F */ blez $v0, .L802A2C08 /* 41795C 802A2BCC 0000802D */ daddu $s0, $zero, $zero -/* 417960 802A2BD0 3C11802B */ lui $s1, %hi(D_802AD190) -/* 417964 802A2BD4 2631D190 */ addiu $s1, $s1, %lo(D_802AD190) +/* 417960 802A2BD0 3C11802B */ lui $s1, %hi(battle_menu_moveOptionCostUnitIconIDs) +/* 417964 802A2BD4 2631D190 */ addiu $s1, $s1, %lo(battle_menu_moveOptionCostUnitIconIDs) /* 417968 802A2BD8 240500FF */ addiu $a1, $zero, 0xff .L802A2BDC: /* 41796C 802A2BDC 00A0302D */ daddu $a2, $a1, $zero @@ -85,15 +85,15 @@ glabel func_802A2AB8 /* 417974 802A2BE4 8E240000 */ lw $a0, ($s1) /* 417978 802A2BE8 0C0513BF */ jal icon_set_tint /* 41797C 802A2BEC 26310004 */ addiu $s1, $s1, 4 -/* 417980 802A2BF0 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 417984 802A2BF4 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 417980 802A2BF0 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 417984 802A2BF4 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 417988 802A2BF8 26100001 */ addiu $s0, $s0, 1 /* 41798C 802A2BFC 0202102A */ slt $v0, $s0, $v0 /* 417990 802A2C00 1440FFF6 */ bnez $v0, .L802A2BDC /* 417994 802A2C04 240500FF */ addiu $a1, $zero, 0xff .L802A2C08: -/* 417998 802A2C08 3C04802B */ lui $a0, %hi(D_802AD118) -/* 41799C 802A2C0C 8C84D118 */ lw $a0, %lo(D_802AD118)($a0) +/* 417998 802A2C08 3C04802B */ lui $a0, %hi(battle_menu_moveCursorIcon) +/* 41799C 802A2C0C 8C84D118 */ lw $a0, %lo(battle_menu_moveCursorIcon)($a0) /* 4179A0 802A2C10 3C058010 */ lui $a1, %hi(D_80104A28) /* 4179A4 802A2C14 24A54A28 */ addiu $a1, $a1, %lo(D_80104A28) /* 4179A8 802A2C18 0C0511FF */ jal set_menu_icon_script @@ -102,13 +102,13 @@ glabel func_802A2AB8 /* 4179B4 802A2C24 8FB10014 */ lw $s1, 0x14($sp) /* 4179B8 802A2C28 8FB00010 */ lw $s0, 0x10($sp) /* 4179BC 802A2C2C 2402000A */ addiu $v0, $zero, 0xa -/* 4179C0 802A2C30 3C01802B */ lui $at, %hi(D_802AD114) -/* 4179C4 802A2C34 A422D114 */ sh $v0, %lo(D_802AD114)($at) +/* 4179C0 802A2C30 3C01802B */ lui $at, %hi(battle_menu_moveTextColor) +/* 4179C4 802A2C34 A422D114 */ sh $v0, %lo(battle_menu_moveTextColor)($at) /* 4179C8 802A2C38 24020001 */ addiu $v0, $zero, 1 /* 4179CC 802A2C3C 3C01802B */ lui $at, %hi(D_802AD10F) /* 4179D0 802A2C40 A022D10F */ sb $v0, %lo(D_802AD10F)($at) /* 4179D4 802A2C44 24020014 */ addiu $v0, $zero, 0x14 -/* 4179D8 802A2C48 3C01802B */ lui $at, %hi(D_802AD108) -/* 4179DC 802A2C4C A022D108 */ sb $v0, %lo(D_802AD108)($at) +/* 4179D8 802A2C48 3C01802B */ lui $at, %hi(battle_menu_moveState) +/* 4179DC 802A2C4C A022D108 */ sb $v0, %lo(battle_menu_moveState)($at) /* 4179E0 802A2C50 03E00008 */ jr $ra /* 4179E4 802A2C54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_415D90/func_802A2C58.s b/asm/nonmatchings/code_415D90/func_802A2C58.s index 58939c070e..a8112632da 100644 --- a/asm/nonmatchings/code_415D90/func_802A2C58.s +++ b/asm/nonmatchings/code_415D90/func_802A2C58.s @@ -5,11 +5,11 @@ glabel func_802A2C58 /* 4179E8 802A2C58 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4179EC 802A2C5C 24040008 */ addiu $a0, $zero, 8 /* 4179F0 802A2C60 AFBF0010 */ sw $ra, 0x10($sp) -/* 4179F4 802A2C64 0C051F9F */ jal func_80147E7C +/* 4179F4 802A2C64 0C051F9F */ jal set_window_update /* 4179F8 802A2C68 24050001 */ addiu $a1, $zero, 1 /* 4179FC 802A2C6C 8FBF0010 */ lw $ra, 0x10($sp) /* 417A00 802A2C70 2402001E */ addiu $v0, $zero, 0x1e -/* 417A04 802A2C74 3C01802B */ lui $at, %hi(D_802AD108) -/* 417A08 802A2C78 A022D108 */ sb $v0, %lo(D_802AD108)($at) +/* 417A04 802A2C74 3C01802B */ lui $at, %hi(battle_menu_moveState) +/* 417A08 802A2C78 A022D108 */ sb $v0, %lo(battle_menu_moveState)($at) /* 417A0C 802A2C7C 03E00008 */ jr $ra /* 417A10 802A2C80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_415D90/func_802A2C84.s b/asm/nonmatchings/code_415D90/func_802A2C84.s index 5dce7a309b..e94120002b 100644 --- a/asm/nonmatchings/code_415D90/func_802A2C84.s +++ b/asm/nonmatchings/code_415D90/func_802A2C84.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802A2C84 -/* 417A14 802A2C84 3C02802B */ lui $v0, %hi(D_802AD108) -/* 417A18 802A2C88 9042D108 */ lbu $v0, %lo(D_802AD108)($v0) +/* 417A14 802A2C84 3C02802B */ lui $v0, %hi(battle_menu_moveState) +/* 417A18 802A2C88 9042D108 */ lbu $v0, %lo(battle_menu_moveState)($v0) /* 417A1C 802A2C8C 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 417A20 802A2C90 AFB1002C */ sw $s1, 0x2c($sp) /* 417A24 802A2C94 3C11800E */ lui $s1, %hi(gBattleStatus) @@ -27,37 +27,37 @@ glabel func_802A2C84 /* 417A6C 802A2CDC 00400008 */ jr $v0 /* 417A70 802A2CE0 00000000 */ nop glabel L802A2CE4_417A74 -/* 417A74 802A2CE4 3C05802B */ lui $a1, %hi(D_802AD10C) -/* 417A78 802A2CE8 80A5D10C */ lb $a1, %lo(D_802AD10C)($a1) -/* 417A7C 802A2CEC 3C04802B */ lui $a0, %hi(D_802AD109) -/* 417A80 802A2CF0 8084D109 */ lb $a0, %lo(D_802AD109)($a0) +/* 417A74 802A2CE4 3C05802B */ lui $a1, %hi(battle_menu_moveScrollLine) +/* 417A78 802A2CE8 80A5D10C */ lb $a1, %lo(battle_menu_moveScrollLine)($a1) +/* 417A7C 802A2CEC 3C04802B */ lui $a0, %hi(battle_menu_moveCursorPos) +/* 417A80 802A2CF0 8084D109 */ lb $a0, %lo(battle_menu_moveCursorPos)($a0) /* 417A84 802A2CF4 24020014 */ addiu $v0, $zero, 0x14 -/* 417A88 802A2CF8 3C01802B */ lui $at, %hi(D_802AD1F0) -/* 417A8C 802A2CFC A422D1F0 */ sh $v0, %lo(D_802AD1F0)($at) +/* 417A88 802A2CF8 3C01802B */ lui $at, %hi(battle_menu_moveX) +/* 417A8C 802A2CFC A422D1F0 */ sh $v0, %lo(battle_menu_moveX)($at) /* 417A90 802A2D00 24020044 */ addiu $v0, $zero, 0x44 -/* 417A94 802A2D04 3C01802B */ lui $at, %hi(D_802AD1F2) -/* 417A98 802A2D08 A422D1F2 */ sh $v0, %lo(D_802AD1F2)($at) +/* 417A94 802A2D04 3C01802B */ lui $at, %hi(battle_menu_moveY) +/* 417A98 802A2D08 A422D1F2 */ sh $v0, %lo(battle_menu_moveY)($at) /* 417A9C 802A2D0C 00051823 */ negu $v1, $a1 /* 417AA0 802A2D10 00031040 */ sll $v0, $v1, 1 /* 417AA4 802A2D14 00431021 */ addu $v0, $v0, $v1 /* 417AA8 802A2D18 00021080 */ sll $v0, $v0, 2 /* 417AAC 802A2D1C 00431021 */ addu $v0, $v0, $v1 /* 417AB0 802A2D20 00852023 */ subu $a0, $a0, $a1 -/* 417AB4 802A2D24 3C01802B */ lui $at, %hi(D_802AD110) -/* 417AB8 802A2D28 A422D110 */ sh $v0, %lo(D_802AD110)($at) +/* 417AB4 802A2D24 3C01802B */ lui $at, %hi(battle_menu_moveScrollOffset) +/* 417AB8 802A2D28 A422D110 */ sh $v0, %lo(battle_menu_moveScrollOffset)($at) /* 417ABC 802A2D2C 00041040 */ sll $v0, $a0, 1 /* 417AC0 802A2D30 00441021 */ addu $v0, $v0, $a0 /* 417AC4 802A2D34 00021080 */ sll $v0, $v0, 2 -/* 417AC8 802A2D38 3C05802B */ lui $a1, %hi(D_802AD4A4) -/* 417ACC 802A2D3C 24A5D4A4 */ addiu $a1, $a1, %lo(D_802AD4A4) +/* 417AC8 802A2D38 3C05802B */ lui $a1, %hi(battle_menu_moveOptionCount) +/* 417ACC 802A2D3C 24A5D4A4 */ addiu $a1, $a1, %lo(battle_menu_moveOptionCount) /* 417AD0 802A2D40 8CA30000 */ lw $v1, ($a1) /* 417AD4 802A2D44 00441021 */ addu $v0, $v0, $a0 /* 417AD8 802A2D48 3C01802B */ lui $at, %hi(D_802AD112) /* 417ADC 802A2D4C A422D112 */ sh $v0, %lo(D_802AD112)($at) /* 417AE0 802A2D50 18600009 */ blez $v1, .L802A2D78 /* 417AE4 802A2D54 0000802D */ daddu $s0, $zero, $zero -/* 417AE8 802A2D58 3C03802B */ lui $v1, %hi(D_802AD1F8) -/* 417AEC 802A2D5C 2463D1F8 */ addiu $v1, $v1, %lo(D_802AD1F8) +/* 417AE8 802A2D58 3C03802B */ lui $v1, %hi(battle_menu_moveOptionIndexMap) +/* 417AEC 802A2D5C 2463D1F8 */ addiu $v1, $v1, %lo(battle_menu_moveOptionIndexMap) .L802A2D60: /* 417AF0 802A2D60 AC700000 */ sw $s0, ($v1) /* 417AF4 802A2D64 8CA20000 */ lw $v0, ($a1) @@ -66,24 +66,24 @@ glabel L802A2CE4_417A74 /* 417B00 802A2D70 1440FFFB */ bnez $v0, .L802A2D60 /* 417B04 802A2D74 24630004 */ addiu $v1, $v1, 4 .L802A2D78: -/* 417B08 802A2D78 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 417B0C 802A2D7C 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 417B08 802A2D78 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 417B0C 802A2D7C 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 417B10 802A2D80 14400042 */ bnez $v0, .L802A2E8C /* 417B14 802A2D84 00000000 */ nop -/* 417B18 802A2D88 3C03802B */ lui $v1, %hi(D_802AD4A4) -/* 417B1C 802A2D8C 8C63D4A4 */ lw $v1, %lo(D_802AD4A4)($v1) +/* 417B18 802A2D88 3C03802B */ lui $v1, %hi(battle_menu_moveOptionCount) +/* 417B1C 802A2D8C 8C63D4A4 */ lw $v1, %lo(battle_menu_moveOptionCount)($v1) /* 417B20 802A2D90 2462FFFF */ addiu $v0, $v1, -1 /* 417B24 802A2D94 1840003D */ blez $v0, .L802A2E8C /* 417B28 802A2D98 0000802D */ daddu $s0, $zero, $zero /* 417B2C 802A2D9C 0060882D */ daddu $s1, $v1, $zero -/* 417B30 802A2DA0 3C0E802B */ lui $t6, %hi(D_802AD5D0) -/* 417B34 802A2DA4 25CED5D0 */ addiu $t6, $t6, %lo(D_802AD5D0) -/* 417B38 802A2DA8 3C0D802B */ lui $t5, %hi(D_802AD320) -/* 417B3C 802A2DAC 25ADD320 */ addiu $t5, $t5, %lo(D_802AD320) -/* 417B40 802A2DB0 3C0C802B */ lui $t4, %hi(D_802AD440) -/* 417B44 802A2DB4 258CD440 */ addiu $t4, $t4, %lo(D_802AD440) -/* 417B48 802A2DB8 3C0F802B */ lui $t7, %hi(D_802AD1F8) -/* 417B4C 802A2DBC 25EFD1F8 */ addiu $t7, $t7, %lo(D_802AD1F8) +/* 417B30 802A2DA0 3C0E802B */ lui $t6, %hi(battle_menu_moveOptionSortPriorities) +/* 417B34 802A2DA4 25CED5D0 */ addiu $t6, $t6, %lo(battle_menu_moveOptionSortPriorities) +/* 417B38 802A2DA8 3C0D802B */ lui $t5, %hi(battle_menu_moveOptionDisplayCosts) +/* 417B3C 802A2DAC 25ADD320 */ addiu $t5, $t5, %lo(battle_menu_moveOptionDisplayCosts) +/* 417B40 802A2DB0 3C0C802B */ lui $t4, %hi(battle_menu_moveOptionBPCosts) +/* 417B44 802A2DB4 258CD440 */ addiu $t4, $t4, %lo(battle_menu_moveOptionBPCosts) +/* 417B48 802A2DB8 3C0F802B */ lui $t7, %hi(battle_menu_moveOptionIndexMap) +/* 417B4C 802A2DBC 25EFD1F8 */ addiu $t7, $t7, %lo(battle_menu_moveOptionIndexMap) /* 417B50 802A2DC0 01E0502D */ daddu $t2, $t7, $zero .L802A2DC4: /* 417B54 802A2DC4 26090001 */ addiu $t1, $s0, 1 @@ -91,8 +91,8 @@ glabel L802A2CE4_417A74 /* 417B5C 802A2DCC 10400028 */ beqz $v0, .L802A2E70 /* 417B60 802A2DD0 00091080 */ sll $v0, $t1, 2 /* 417B64 802A2DD4 0140402D */ daddu $t0, $t2, $zero -/* 417B68 802A2DD8 3C0B802B */ lui $t3, %hi(D_802AD4A4) -/* 417B6C 802A2DDC 8D6BD4A4 */ lw $t3, %lo(D_802AD4A4)($t3) +/* 417B68 802A2DD8 3C0B802B */ lui $t3, %hi(battle_menu_moveOptionCount) +/* 417B6C 802A2DDC 8D6BD4A4 */ lw $t3, %lo(battle_menu_moveOptionCount)($t3) /* 417B70 802A2DE0 004F3821 */ addu $a3, $v0, $t7 .L802A2DE4: /* 417B74 802A2DE4 8D060000 */ lw $a2, ($t0) @@ -133,24 +133,24 @@ glabel L802A2CE4_417A74 /* 417BF8 802A2E68 1440FFDE */ bnez $v0, .L802A2DE4 /* 417BFC 802A2E6C 24E70004 */ addiu $a3, $a3, 4 .L802A2E70: -/* 417C00 802A2E70 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 417C04 802A2E74 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 417C00 802A2E70 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 417C04 802A2E74 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 417C08 802A2E78 26100001 */ addiu $s0, $s0, 1 /* 417C0C 802A2E7C 2442FFFF */ addiu $v0, $v0, -1 /* 417C10 802A2E80 0202102A */ slt $v0, $s0, $v0 /* 417C14 802A2E84 1440FFCF */ bnez $v0, .L802A2DC4 /* 417C18 802A2E88 254A0004 */ addiu $t2, $t2, 4 .L802A2E8C: -/* 417C1C 802A2E8C 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 417C20 802A2E90 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 417C1C 802A2E8C 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 417C20 802A2E90 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 417C24 802A2E94 1840001C */ blez $v0, .L802A2F08 /* 417C28 802A2E98 0000802D */ daddu $s0, $zero, $zero -/* 417C2C 802A2E9C 3C14802B */ lui $s4, %hi(D_802AD260) -/* 417C30 802A2EA0 2694D260 */ addiu $s4, $s4, %lo(D_802AD260) -/* 417C34 802A2EA4 3C13802B */ lui $s3, %hi(D_802AD128) -/* 417C38 802A2EA8 2673D128 */ addiu $s3, $s3, %lo(D_802AD128) -/* 417C3C 802A2EAC 3C11802B */ lui $s1, %hi(D_802AD1F8) -/* 417C40 802A2EB0 2631D1F8 */ addiu $s1, $s1, %lo(D_802AD1F8) +/* 417C2C 802A2E9C 3C14802B */ lui $s4, %hi(battle_menu_moveOptionIconScripts) +/* 417C30 802A2EA0 2694D260 */ addiu $s4, $s4, %lo(battle_menu_moveOptionIconScripts) +/* 417C34 802A2EA4 3C13802B */ lui $s3, %hi(battle_menu_moveOptionIconIDs) +/* 417C38 802A2EA8 2673D128 */ addiu $s3, $s3, %lo(battle_menu_moveOptionIconIDs) +/* 417C3C 802A2EAC 3C11802B */ lui $s1, %hi(battle_menu_moveOptionIndexMap) +/* 417C40 802A2EB0 2631D1F8 */ addiu $s1, $s1, %lo(battle_menu_moveOptionIndexMap) .L802A2EB4: /* 417C44 802A2EB4 8E220000 */ lw $v0, ($s1) /* 417C48 802A2EB8 26310004 */ addiu $s1, $s1, 4 @@ -168,8 +168,8 @@ glabel L802A2CE4_417A74 /* 417C78 802A2EE8 0240202D */ daddu $a0, $s2, $zero /* 417C7C 802A2EEC 0C051280 */ jal set_icon_flags /* 417C80 802A2EF0 34058080 */ ori $a1, $zero, 0x8080 -/* 417C84 802A2EF4 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 417C88 802A2EF8 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 417C84 802A2EF4 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 417C88 802A2EF8 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 417C8C 802A2EFC 0202102A */ slt $v0, $s0, $v0 /* 417C90 802A2F00 1440FFEC */ bnez $v0, .L802A2EB4 /* 417C94 802A2F04 26730004 */ addiu $s3, $s3, 4 @@ -181,14 +181,14 @@ glabel L802A2CE4_417A74 /* 417CA8 802A2F18 0040902D */ daddu $s2, $v0, $zero /* 417CAC 802A2F1C 0240202D */ daddu $a0, $s2, $zero /* 417CB0 802A2F20 3C052000 */ lui $a1, 0x2000 -/* 417CB4 802A2F24 3C01802B */ lui $at, %hi(D_802AD118) -/* 417CB8 802A2F28 AC32D118 */ sw $s2, %lo(D_802AD118)($at) +/* 417CB4 802A2F24 3C01802B */ lui $at, %hi(battle_menu_moveCursorIcon) +/* 417CB8 802A2F28 AC32D118 */ sw $s2, %lo(battle_menu_moveCursorIcon)($at) /* 417CBC 802A2F2C 0C051280 */ jal set_icon_flags /* 417CC0 802A2F30 34A50080 */ ori $a1, $a1, 0x80 -/* 417CC4 802A2F34 3C11802B */ lui $s1, %hi(D_802AD1F0) -/* 417CC8 802A2F38 2631D1F0 */ addiu $s1, $s1, %lo(D_802AD1F0) -/* 417CCC 802A2F3C 3C10802B */ lui $s0, %hi(D_802AD1F2) -/* 417CD0 802A2F40 2610D1F2 */ addiu $s0, $s0, %lo(D_802AD1F2) +/* 417CC4 802A2F34 3C11802B */ lui $s1, %hi(battle_menu_moveX) +/* 417CC8 802A2F38 2631D1F0 */ addiu $s1, $s1, %lo(battle_menu_moveX) +/* 417CCC 802A2F3C 3C10802B */ lui $s0, %hi(battle_menu_moveY) +/* 417CD0 802A2F40 2610D1F2 */ addiu $s0, $s0, %lo(battle_menu_moveY) /* 417CD4 802A2F44 86250000 */ lh $a1, ($s1) /* 417CD8 802A2F48 86060000 */ lh $a2, ($s0) /* 417CDC 802A2F4C 0C051261 */ jal set_icon_render_pos @@ -200,8 +200,8 @@ glabel L802A2CE4_417A74 /* 417CF4 802A2F64 0040902D */ daddu $s2, $v0, $zero /* 417CF8 802A2F68 0240202D */ daddu $a0, $s2, $zero /* 417CFC 802A2F6C 3C052000 */ lui $a1, 0x2000 -/* 417D00 802A2F70 3C01802B */ lui $at, %hi(D_802AD11C) -/* 417D04 802A2F74 AC32D11C */ sw $s2, %lo(D_802AD11C)($at) +/* 417D00 802A2F70 3C01802B */ lui $at, %hi(battle_menu_moveUpArrowIcon) +/* 417D04 802A2F74 AC32D11C */ sw $s2, %lo(battle_menu_moveUpArrowIcon)($at) /* 417D08 802A2F78 0C051280 */ jal set_icon_flags /* 417D0C 802A2F7C 34A50080 */ ori $a1, $a1, 0x80 /* 417D10 802A2F80 0240202D */ daddu $a0, $s2, $zero @@ -217,8 +217,8 @@ glabel L802A2CE4_417A74 /* 417D38 802A2FA8 0040902D */ daddu $s2, $v0, $zero /* 417D3C 802A2FAC 0240202D */ daddu $a0, $s2, $zero /* 417D40 802A2FB0 3C052000 */ lui $a1, 0x2000 -/* 417D44 802A2FB4 3C01802B */ lui $at, %hi(D_802AD120) -/* 417D48 802A2FB8 AC32D120 */ sw $s2, %lo(D_802AD120)($at) +/* 417D44 802A2FB4 3C01802B */ lui $at, %hi(battle_menu_moveDownArrowIcon) +/* 417D48 802A2FB8 AC32D120 */ sw $s2, %lo(battle_menu_moveDownArrowIcon)($at) /* 417D4C 802A2FBC 0C051280 */ jal set_icon_flags /* 417D50 802A2FC0 34A50080 */ ori $a1, $a1, 0x80 /* 417D54 802A2FC4 0240202D */ daddu $a0, $s2, $zero @@ -227,8 +227,8 @@ glabel L802A2CE4_417A74 /* 417D60 802A2FD0 24A50027 */ addiu $a1, $a1, 0x27 /* 417D64 802A2FD4 0C051261 */ jal set_icon_render_pos /* 417D68 802A2FD8 24C6004E */ addiu $a2, $a2, 0x4e -/* 417D6C 802A2FDC 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 417D70 802A2FE0 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 417D6C 802A2FDC 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 417D70 802A2FE0 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 417D74 802A2FE4 1440000A */ bnez $v0, .L802A3010 /* 417D78 802A2FE8 00000000 */ nop /* 417D7C 802A2FEC 3C048011 */ lui $a0, %hi(D_80108538) @@ -236,8 +236,8 @@ glabel L802A2CE4_417A74 /* 417D84 802A2FF4 0C050529 */ jal create_icon /* 417D88 802A2FF8 00000000 */ nop /* 417D8C 802A2FFC 0040902D */ daddu $s2, $v0, $zero -/* 417D90 802A3000 3C01802B */ lui $at, %hi(D_802AD188) -/* 417D94 802A3004 AC22D188 */ sw $v0, %lo(D_802AD188)($at) +/* 417D90 802A3000 3C01802B */ lui $at, %hi(battle_menu_moveTitleIcon) +/* 417D94 802A3004 AC22D188 */ sw $v0, %lo(battle_menu_moveTitleIcon)($at) /* 417D98 802A3008 080A8C0F */ j .L802A303C /* 417D9C 802A300C 0240202D */ daddu $a0, $s2, $zero .L802A3010: @@ -247,8 +247,8 @@ glabel L802A2CE4_417A74 /* 417DAC 802A301C 00000000 */ nop /* 417DB0 802A3020 0040902D */ daddu $s2, $v0, $zero /* 417DB4 802A3024 3C053F40 */ lui $a1, 0x3f40 -/* 417DB8 802A3028 3C01802B */ lui $at, %hi(D_802AD188) -/* 417DBC 802A302C AC32D188 */ sw $s2, %lo(D_802AD188)($at) +/* 417DB8 802A3028 3C01802B */ lui $at, %hi(battle_menu_moveTitleIcon) +/* 417DBC 802A302C AC32D188 */ sw $s2, %lo(battle_menu_moveTitleIcon)($at) /* 417DC0 802A3030 0C051308 */ jal func_80144C20 /* 417DC4 802A3034 0240202D */ daddu $a0, $s2, $zero /* 417DC8 802A3038 0240202D */ daddu $a0, $s2, $zero @@ -256,26 +256,26 @@ glabel L802A2CE4_417A74 /* 417DCC 802A303C 0C051280 */ jal set_icon_flags /* 417DD0 802A3040 24050080 */ addiu $a1, $zero, 0x80 /* 417DD4 802A3044 0240202D */ daddu $a0, $s2, $zero -/* 417DD8 802A3048 3C05802B */ lui $a1, %hi(D_802AD1F0) -/* 417DDC 802A304C 84A5D1F0 */ lh $a1, %lo(D_802AD1F0)($a1) -/* 417DE0 802A3050 3C06802B */ lui $a2, %hi(D_802AD1F2) -/* 417DE4 802A3054 84C6D1F2 */ lh $a2, %lo(D_802AD1F2)($a2) +/* 417DD8 802A3048 3C05802B */ lui $a1, %hi(battle_menu_moveX) +/* 417DDC 802A304C 84A5D1F0 */ lh $a1, %lo(battle_menu_moveX)($a1) +/* 417DE0 802A3050 3C06802B */ lui $a2, %hi(battle_menu_moveY) +/* 417DE4 802A3054 84C6D1F2 */ lh $a2, %lo(battle_menu_moveY)($a2) /* 417DE8 802A3058 0C051261 */ jal set_icon_render_pos /* 417DEC 802A305C 24A50038 */ addiu $a1, $a1, 0x38 -/* 417DF0 802A3060 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 417DF4 802A3064 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 417DF0 802A3060 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 417DF4 802A3064 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 417DF8 802A3068 1840004B */ blez $v0, .L802A3198 /* 417DFC 802A306C 0000802D */ daddu $s0, $zero, $zero /* 417E00 802A3070 24160001 */ addiu $s6, $zero, 1 -/* 417E04 802A3074 3C13802B */ lui $s3, %hi(D_802AD190) -/* 417E08 802A3078 2673D190 */ addiu $s3, $s3, %lo(D_802AD190) +/* 417E04 802A3074 3C13802B */ lui $s3, %hi(battle_menu_moveOptionCostUnitIconIDs) +/* 417E08 802A3078 2673D190 */ addiu $s3, $s3, %lo(battle_menu_moveOptionCostUnitIconIDs) /* 417E0C 802A307C 0260A82D */ daddu $s5, $s3, $zero /* 417E10 802A3080 0200882D */ daddu $s1, $s0, $zero -/* 417E14 802A3084 3C14802B */ lui $s4, %hi(D_802AD3E0) -/* 417E18 802A3088 2694D3E0 */ addiu $s4, $s4, %lo(D_802AD3E0) +/* 417E14 802A3084 3C14802B */ lui $s4, %hi(battle_menu_moveOptionDisplayCostReductionColors) +/* 417E18 802A3088 2694D3E0 */ addiu $s4, $s4, %lo(battle_menu_moveOptionDisplayCostReductionColors) .L802A308C: -/* 417E1C 802A308C 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 417E20 802A3090 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 417E1C 802A308C 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 417E20 802A3090 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 417E24 802A3094 14400014 */ bnez $v0, .L802A30E8 /* 417E28 802A3098 00000000 */ nop /* 417E2C 802A309C 8E820000 */ lw $v0, ($s4) @@ -339,28 +339,28 @@ glabel L802A2CE4_417A74 /* 417EEC 802A315C 26730004 */ addiu $s3, $s3, 4 /* 417EF0 802A3160 26310004 */ addiu $s1, $s1, 4 /* 417EF4 802A3164 26940004 */ addiu $s4, $s4, 4 -/* 417EF8 802A3168 3C05802B */ lui $a1, %hi(D_802AD1F0) -/* 417EFC 802A316C 84A5D1F0 */ lh $a1, %lo(D_802AD1F0)($a1) -/* 417F00 802A3170 3C06802B */ lui $a2, %hi(D_802AD1F2) -/* 417F04 802A3174 84C6D1F2 */ lh $a2, %lo(D_802AD1F2)($a2) +/* 417EF8 802A3168 3C05802B */ lui $a1, %hi(battle_menu_moveX) +/* 417EFC 802A316C 84A5D1F0 */ lh $a1, %lo(battle_menu_moveX)($a1) +/* 417F00 802A3170 3C06802B */ lui $a2, %hi(battle_menu_moveY) +/* 417F04 802A3174 84C6D1F2 */ lh $a2, %lo(battle_menu_moveY)($a2) /* 417F08 802A3178 0C051261 */ jal set_icon_render_pos /* 417F0C 802A317C 24A50038 */ addiu $a1, $a1, 0x38 -/* 417F10 802A3180 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 417F14 802A3184 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 417F10 802A3180 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 417F14 802A3184 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 417F18 802A3188 26100001 */ addiu $s0, $s0, 1 /* 417F1C 802A318C 0202102A */ slt $v0, $s0, $v0 /* 417F20 802A3190 1440FFBE */ bnez $v0, .L802A308C /* 417F24 802A3194 00000000 */ nop .L802A3198: -/* 417F28 802A3198 3C13802B */ lui $s3, %hi(D_802AD1F0) -/* 417F2C 802A319C 8673D1F0 */ lh $s3, %lo(D_802AD1F0)($s3) +/* 417F28 802A3198 3C13802B */ lui $s3, %hi(battle_menu_moveX) +/* 417F2C 802A319C 8673D1F0 */ lh $s3, %lo(battle_menu_moveX)($s3) /* 417F30 802A31A0 2402000A */ addiu $v0, $zero, 0xa -/* 417F34 802A31A4 3C01802B */ lui $at, %hi(D_802AD114) -/* 417F38 802A31A8 A422D114 */ sh $v0, %lo(D_802AD114)($at) -/* 417F3C 802A31AC 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 417F40 802A31B0 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) -/* 417F44 802A31B4 3C12802B */ lui $s2, %hi(D_802AD1F2) -/* 417F48 802A31B8 8652D1F2 */ lh $s2, %lo(D_802AD1F2)($s2) +/* 417F34 802A31A4 3C01802B */ lui $at, %hi(battle_menu_moveTextColor) +/* 417F38 802A31A8 A422D114 */ sh $v0, %lo(battle_menu_moveTextColor)($at) +/* 417F3C 802A31AC 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 417F40 802A31B0 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) +/* 417F44 802A31B4 3C12802B */ lui $s2, %hi(battle_menu_moveY) +/* 417F48 802A31B8 8652D1F2 */ lh $s2, %lo(battle_menu_moveY)($s2) /* 417F4C 802A31BC 14400028 */ bnez $v0, .L802A3260 /* 417F50 802A31C0 24040001 */ addiu $a0, $zero, 1 /* 417F54 802A31C4 0260282D */ daddu $a1, $s3, $zero @@ -380,7 +380,7 @@ glabel L802A2CE4_417A74 /* 417F8C 802A31FC 00021080 */ sll $v0, $v0, 2 /* 417F90 802A3200 00431021 */ addu $v0, $v0, $v1 /* 417F94 802A3204 2442001C */ addiu $v0, $v0, 0x1c -/* 417F98 802A3208 0C051F32 */ jal set_ui_panel_properties +/* 417F98 802A3208 0C051F32 */ jal set_window_properties /* 417F9C 802A320C AFA20010 */ sw $v0, 0x10($sp) /* 417FA0 802A3210 24040002 */ addiu $a0, $zero, 2 /* 417FA4 802A3214 26650010 */ addiu $a1, $s3, 0x10 @@ -394,7 +394,7 @@ glabel L802A2CE4_417A74 /* 417FC4 802A3234 AFB10014 */ sw $s1, 0x14($sp) /* 417FC8 802A3238 AFA20018 */ sw $v0, 0x18($sp) /* 417FCC 802A323C AFA0001C */ sw $zero, 0x1c($sp) -/* 417FD0 802A3240 0C051F32 */ jal set_ui_panel_properties +/* 417FD0 802A3240 0C051F32 */ jal set_window_properties /* 417FD4 802A3244 AFB00020 */ sw $s0, 0x20($sp) /* 417FD8 802A3248 24040003 */ addiu $a0, $zero, 3 /* 417FDC 802A324C 26650072 */ addiu $a1, $s3, 0x72 @@ -420,7 +420,7 @@ glabel L802A2CE4_417A74 /* 418028 802A3298 00021080 */ sll $v0, $v0, 2 /* 41802C 802A329C 00431021 */ addu $v0, $v0, $v1 /* 418030 802A32A0 2442001C */ addiu $v0, $v0, 0x1c -/* 418034 802A32A4 0C051F32 */ jal set_ui_panel_properties +/* 418034 802A32A4 0C051F32 */ jal set_window_properties /* 418038 802A32A8 AFA20010 */ sw $v0, 0x10($sp) /* 41803C 802A32AC 24040004 */ addiu $a0, $zero, 4 /* 418040 802A32B0 2665000A */ addiu $a1, $s3, 0xa @@ -434,7 +434,7 @@ glabel L802A2CE4_417A74 /* 418060 802A32D0 AFB10014 */ sw $s1, 0x14($sp) /* 418064 802A32D4 AFA20018 */ sw $v0, 0x18($sp) /* 418068 802A32D8 AFA0001C */ sw $zero, 0x1c($sp) -/* 41806C 802A32DC 0C051F32 */ jal set_ui_panel_properties +/* 41806C 802A32DC 0C051F32 */ jal set_window_properties /* 418070 802A32E0 AFB00020 */ sw $s0, 0x20($sp) /* 418074 802A32E4 24040005 */ addiu $a0, $zero, 5 /* 418078 802A32E8 2665006E */ addiu $a1, $s3, 0x6e @@ -448,7 +448,7 @@ glabel L802A2CE4_417A74 /* 418094 802A3304 AFB10014 */ sw $s1, 0x14($sp) /* 418098 802A3308 AFA20018 */ sw $v0, 0x18($sp) /* 41809C 802A330C AFA0001C */ sw $zero, 0x1c($sp) -/* 4180A0 802A3310 0C051F32 */ jal set_ui_panel_properties +/* 4180A0 802A3310 0C051F32 */ jal set_window_properties /* 4180A4 802A3314 AFB00020 */ sw $s0, 0x20($sp) /* 4180A8 802A3318 24130014 */ addiu $s3, $zero, 0x14 /* 4180AC 802A331C 24040008 */ addiu $a0, $zero, 8 @@ -463,36 +463,36 @@ glabel L802A2CE4_417A74 /* 4180D0 802A3340 2402FFFF */ addiu $v0, $zero, -1 /* 4180D4 802A3344 AFB30014 */ sw $s3, 0x14($sp) /* 4180D8 802A3348 AFA0001C */ sw $zero, 0x1c($sp) -/* 4180DC 802A334C 0C051F32 */ jal set_ui_panel_properties +/* 4180DC 802A334C 0C051F32 */ jal set_window_properties /* 4180E0 802A3350 AFA20020 */ sw $v0, 0x20($sp) /* 4180E4 802A3354 24040001 */ addiu $a0, $zero, 1 -/* 4180E8 802A3358 0C051F9F */ jal func_80147E7C +/* 4180E8 802A3358 0C051F9F */ jal set_window_update /* 4180EC 802A335C 0080282D */ daddu $a1, $a0, $zero -/* 4180F0 802A3360 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 4180F4 802A3364 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 4180F0 802A3360 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 4180F4 802A3364 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 4180F8 802A3368 54400006 */ bnel $v0, $zero, .L802A3384 /* 4180FC 802A336C 24040004 */ addiu $a0, $zero, 4 /* 418100 802A3370 24040002 */ addiu $a0, $zero, 2 -/* 418104 802A3374 0C051F9F */ jal func_80147E7C +/* 418104 802A3374 0C051F9F */ jal set_window_update /* 418108 802A3378 24050001 */ addiu $a1, $zero, 1 /* 41810C 802A337C 080A8CE4 */ j .L802A3390 /* 418110 802A3380 24040003 */ addiu $a0, $zero, 3 .L802A3384: -/* 418114 802A3384 0C051F9F */ jal func_80147E7C +/* 418114 802A3384 0C051F9F */ jal set_window_update /* 418118 802A3388 24050001 */ addiu $a1, $zero, 1 /* 41811C 802A338C 24040005 */ addiu $a0, $zero, 5 .L802A3390: -/* 418120 802A3390 0C051F9F */ jal func_80147E7C +/* 418120 802A3390 0C051F9F */ jal set_window_update /* 418124 802A3394 24050001 */ addiu $a1, $zero, 1 /* 418128 802A3398 24040008 */ addiu $a0, $zero, 8 -/* 41812C 802A339C 0C051F9F */ jal func_80147E7C +/* 41812C 802A339C 0C051F9F */ jal set_window_update /* 418130 802A33A0 24050001 */ addiu $a1, $zero, 1 -/* 418134 802A33A4 3C05802B */ lui $a1, %hi(D_802AD10C) -/* 418138 802A33A8 24A5D10C */ addiu $a1, $a1, %lo(D_802AD10C) -/* 41813C 802A33AC 3C06802B */ lui $a2, %hi(D_802AD4A4) -/* 418140 802A33B0 24C6D4A4 */ addiu $a2, $a2, %lo(D_802AD4A4) -/* 418144 802A33B4 3C08802B */ lui $t0, %hi(D_802AD109) -/* 418148 802A33B8 8108D109 */ lb $t0, %lo(D_802AD109)($t0) +/* 418134 802A33A4 3C05802B */ lui $a1, %hi(battle_menu_moveScrollLine) +/* 418138 802A33A8 24A5D10C */ addiu $a1, $a1, %lo(battle_menu_moveScrollLine) +/* 41813C 802A33AC 3C06802B */ lui $a2, %hi(battle_menu_moveOptionCount) +/* 418140 802A33B0 24C6D4A4 */ addiu $a2, $a2, %lo(battle_menu_moveOptionCount) +/* 418144 802A33B4 3C08802B */ lui $t0, %hi(battle_menu_moveCursorPos) +/* 418148 802A33B8 8108D109 */ lb $t0, %lo(battle_menu_moveCursorPos)($t0) /* 41814C 802A33BC 3C07802B */ lui $a3, %hi(D_802AD10D) /* 418150 802A33C0 80E7D10D */ lb $a3, %lo(D_802AD10D)($a3) .L802A33C4: @@ -521,12 +521,12 @@ glabel L802A2CE4_417A74 .L802A341C: /* 4181AC 802A341C 1480FFE9 */ bnez $a0, .L802A33C4 /* 4181B0 802A3420 24020001 */ addiu $v0, $zero, 1 -/* 4181B4 802A3424 3C03802B */ lui $v1, %hi(D_802AD10C) -/* 4181B8 802A3428 9063D10C */ lbu $v1, %lo(D_802AD10C)($v1) -/* 4181BC 802A342C 3C04802B */ lui $a0, %hi(D_802AD109) -/* 4181C0 802A3430 8084D109 */ lb $a0, %lo(D_802AD109)($a0) -/* 4181C4 802A3434 3C01802B */ lui $at, %hi(D_802AD108) -/* 4181C8 802A3438 A022D108 */ sb $v0, %lo(D_802AD108)($at) +/* 4181B4 802A3424 3C03802B */ lui $v1, %hi(battle_menu_moveScrollLine) +/* 4181B8 802A3428 9063D10C */ lbu $v1, %lo(battle_menu_moveScrollLine)($v1) +/* 4181BC 802A342C 3C04802B */ lui $a0, %hi(battle_menu_moveCursorPos) +/* 4181C0 802A3430 8084D109 */ lb $a0, %lo(battle_menu_moveCursorPos)($a0) +/* 4181C4 802A3434 3C01802B */ lui $at, %hi(battle_menu_moveState) +/* 4181C8 802A3438 A022D108 */ sb $v0, %lo(battle_menu_moveState)($at) /* 4181CC 802A343C 24620006 */ addiu $v0, $v1, 6 /* 4181D0 802A3440 00031E00 */ sll $v1, $v1, 0x18 /* 4181D4 802A3444 00031E03 */ sra $v1, $v1, 0x18 @@ -538,8 +538,8 @@ glabel L802A2CE4_417A74 /* 4181EC 802A345C 00021080 */ sll $v0, $v0, 2 /* 4181F0 802A3460 00451021 */ addu $v0, $v0, $a1 /* 4181F4 802A3464 00832023 */ subu $a0, $a0, $v1 -/* 4181F8 802A3468 3C01802B */ lui $at, %hi(D_802AD110) -/* 4181FC 802A346C A422D110 */ sh $v0, %lo(D_802AD110)($at) +/* 4181F8 802A3468 3C01802B */ lui $at, %hi(battle_menu_moveScrollOffset) +/* 4181FC 802A346C A422D110 */ sh $v0, %lo(battle_menu_moveScrollOffset)($at) /* 418200 802A3470 00041040 */ sll $v0, $a0, 1 /* 418204 802A3474 00441021 */ addu $v0, $v0, $a0 /* 418208 802A3478 00021080 */ sll $v0, $v0, 2 @@ -550,8 +550,8 @@ glabel L802A2CE4_417A74 /* 41821C 802A348C 0000102D */ daddu $v0, $zero, $zero glabel L802A3490_418220 /* 418220 802A3490 3C050001 */ lui $a1, 1 -/* 418224 802A3494 3C04802B */ lui $a0, %hi(D_802AD109) -/* 418228 802A3498 2484D109 */ addiu $a0, $a0, %lo(D_802AD109) +/* 418224 802A3494 3C04802B */ lui $a0, %hi(battle_menu_moveCursorPos) +/* 418228 802A3498 2484D109 */ addiu $a0, $a0, %lo(battle_menu_moveCursorPos) /* 41822C 802A349C 34A52000 */ ori $a1, $a1, 0x2000 /* 418230 802A34A0 8E220218 */ lw $v0, 0x218($s1) /* 418234 802A34A4 90830000 */ lbu $v1, ($a0) @@ -575,10 +575,10 @@ glabel L802A3490_418220 /* 418274 802A34E4 00461024 */ and $v0, $v0, $a2 /* 418278 802A34E8 10400010 */ beqz $v0, .L802A352C /* 41827C 802A34EC 00000000 */ nop -/* 418280 802A34F0 3C05802B */ lui $a1, %hi(D_802AD109) -/* 418284 802A34F4 24A5D109 */ addiu $a1, $a1, %lo(D_802AD109) -/* 418288 802A34F8 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 41828C 802A34FC 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 418280 802A34F0 3C05802B */ lui $a1, %hi(battle_menu_moveCursorPos) +/* 418284 802A34F4 24A5D109 */ addiu $a1, $a1, %lo(battle_menu_moveCursorPos) +/* 418288 802A34F8 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 41828C 802A34FC 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 418290 802A3500 80A30000 */ lb $v1, ($a1) /* 418294 802A3504 90A40000 */ lbu $a0, ($a1) /* 418298 802A3508 2442FFFF */ addiu $v0, $v0, -1 @@ -592,8 +592,8 @@ glabel L802A3490_418220 .L802A3528: /* 4182B8 802A3528 A0A20000 */ sb $v0, ($a1) .L802A352C: -/* 4182BC 802A352C 3C10802B */ lui $s0, %hi(D_802AD109) -/* 4182C0 802A3530 2610D109 */ addiu $s0, $s0, %lo(D_802AD109) +/* 4182BC 802A352C 3C10802B */ lui $s0, %hi(battle_menu_moveCursorPos) +/* 4182C0 802A3530 2610D109 */ addiu $s0, $s0, %lo(battle_menu_moveCursorPos) /* 4182C4 802A3534 82020000 */ lb $v0, ($s0) /* 4182C8 802A3538 04410005 */ bgez $v0, .L802A3550 /* 4182CC 802A353C 00000000 */ nop @@ -602,8 +602,8 @@ glabel L802A3490_418220 /* 4182D8 802A3548 2442FFFF */ addiu $v0, $v0, -1 /* 4182DC 802A354C A2020000 */ sb $v0, ($s0) .L802A3550: -/* 4182E0 802A3550 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 4182E4 802A3554 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 4182E0 802A3550 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 4182E4 802A3554 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 4182E8 802A3558 82030000 */ lb $v1, ($s0) /* 4182EC 802A355C 2442FFFF */ addiu $v0, $v0, -1 /* 4182F0 802A3560 0043102A */ slt $v0, $v0, $v1 @@ -615,17 +615,17 @@ glabel L802A3490_418220 /* 418304 802A3574 82020000 */ lb $v0, ($s0) /* 418308 802A3578 10620009 */ beq $v1, $v0, .L802A35A0 /* 41830C 802A357C 00031080 */ sll $v0, $v1, 2 -/* 418310 802A3580 3C04802B */ lui $a0, %hi(D_802AD128) +/* 418310 802A3580 3C04802B */ lui $a0, %hi(battle_menu_moveOptionIconIDs) /* 418314 802A3584 00822021 */ addu $a0, $a0, $v0 -/* 418318 802A3588 8C84D128 */ lw $a0, %lo(D_802AD128)($a0) +/* 418318 802A3588 8C84D128 */ lw $a0, %lo(battle_menu_moveOptionIconIDs)($a0) /* 41831C 802A358C 3C053EE6 */ lui $a1, 0x3ee6 /* 418320 802A3590 0C051308 */ jal func_80144C20 /* 418324 802A3594 34A56666 */ ori $a1, $a1, 0x6666 /* 418328 802A3598 0C05272D */ jal play_sound /* 41832C 802A359C 240400C7 */ addiu $a0, $zero, 0xc7 .L802A35A0: -/* 418330 802A35A0 3C04802B */ lui $a0, %hi(D_802AD10C) -/* 418334 802A35A4 2484D10C */ addiu $a0, $a0, %lo(D_802AD10C) +/* 418330 802A35A0 3C04802B */ lui $a0, %hi(battle_menu_moveScrollLine) +/* 418334 802A35A4 2484D10C */ addiu $a0, $a0, %lo(battle_menu_moveScrollLine) /* 418338 802A35A8 80820000 */ lb $v0, ($a0) /* 41833C 802A35AC 82030000 */ lb $v1, ($s0) /* 418340 802A35B0 24420001 */ addiu $v0, $v0, 1 @@ -640,17 +640,17 @@ glabel L802A3490_418220 .L802A35D4: /* 418364 802A35D4 3C02802B */ lui $v0, %hi(D_802AD10D) /* 418368 802A35D8 8042D10D */ lb $v0, %lo(D_802AD10D)($v0) -/* 41836C 802A35DC 3C03802B */ lui $v1, %hi(D_802AD109) -/* 418370 802A35E0 8063D109 */ lb $v1, %lo(D_802AD109)($v1) +/* 41836C 802A35DC 3C03802B */ lui $v1, %hi(battle_menu_moveCursorPos) +/* 418370 802A35E0 8063D109 */ lb $v1, %lo(battle_menu_moveCursorPos)($v1) /* 418374 802A35E4 2442FFFF */ addiu $v0, $v0, -1 /* 418378 802A35E8 0062182A */ slt $v1, $v1, $v0 /* 41837C 802A35EC 14600015 */ bnez $v1, .L802A3644 /* 418380 802A35F0 00000000 */ nop -/* 418384 802A35F4 3C04802B */ lui $a0, %hi(D_802AD10C) -/* 418388 802A35F8 2484D10C */ addiu $a0, $a0, %lo(D_802AD10C) +/* 418384 802A35F4 3C04802B */ lui $a0, %hi(battle_menu_moveScrollLine) +/* 418388 802A35F8 2484D10C */ addiu $a0, $a0, %lo(battle_menu_moveScrollLine) /* 41838C 802A35FC 90820000 */ lbu $v0, ($a0) -/* 418390 802A3600 3C05802B */ lui $a1, %hi(D_802AD4A4) -/* 418394 802A3604 24A5D4A4 */ addiu $a1, $a1, %lo(D_802AD4A4) +/* 418390 802A3600 3C05802B */ lui $a1, %hi(battle_menu_moveOptionCount) +/* 418394 802A3604 24A5D4A4 */ addiu $a1, $a1, %lo(battle_menu_moveOptionCount) /* 418398 802A3608 24420001 */ addiu $v0, $v0, 1 /* 41839C 802A360C A0820000 */ sb $v0, ($a0) /* 4183A0 802A3610 00021600 */ sll $v0, $v0, 0x18 @@ -667,8 +667,8 @@ glabel L802A3490_418220 /* 4183CC 802A363C 04420001 */ bltzl $v0, .L802A3644 /* 4183D0 802A3640 A0800000 */ sb $zero, ($a0) .L802A3644: -/* 4183D4 802A3644 3C02802B */ lui $v0, %hi(D_802AD10C) -/* 4183D8 802A3648 9042D10C */ lbu $v0, %lo(D_802AD10C)($v0) +/* 4183D4 802A3644 3C02802B */ lui $v0, %hi(battle_menu_moveScrollLine) +/* 4183D8 802A3648 9042D10C */ lbu $v0, %lo(battle_menu_moveScrollLine)($v0) /* 4183DC 802A364C 8E230214 */ lw $v1, 0x214($s1) /* 4183E0 802A3650 24420006 */ addiu $v0, $v0, 6 /* 4183E4 802A3654 3C01802B */ lui $at, %hi(D_802AD10D) @@ -676,19 +676,19 @@ glabel L802A3490_418220 /* 4183EC 802A365C 30628000 */ andi $v0, $v1, 0x8000 /* 4183F0 802A3660 10400025 */ beqz $v0, .L802A36F8 /* 4183F4 802A3664 30624000 */ andi $v0, $v1, 0x4000 -/* 4183F8 802A3668 3C11802B */ lui $s1, %hi(D_802AD109) -/* 4183FC 802A366C 2631D109 */ addiu $s1, $s1, %lo(D_802AD109) +/* 4183F8 802A3668 3C11802B */ lui $s1, %hi(battle_menu_moveCursorPos) +/* 4183FC 802A366C 2631D109 */ addiu $s1, $s1, %lo(battle_menu_moveCursorPos) /* 418400 802A3670 82220000 */ lb $v0, ($s1) /* 418404 802A3674 00021080 */ sll $v0, $v0, 2 -/* 418408 802A3678 3C01802B */ lui $at, %hi(D_802AD1F8) +/* 418408 802A3678 3C01802B */ lui $at, %hi(battle_menu_moveOptionIndexMap) /* 41840C 802A367C 00220821 */ addu $at, $at, $v0 -/* 418410 802A3680 8C22D1F8 */ lw $v0, %lo(D_802AD1F8)($at) -/* 418414 802A3684 3C10802B */ lui $s0, %hi(D_802AD1F8) -/* 418418 802A3688 2610D1F8 */ addiu $s0, $s0, %lo(D_802AD1F8) +/* 418410 802A3680 8C22D1F8 */ lw $v0, %lo(battle_menu_moveOptionIndexMap)($at) +/* 418414 802A3684 3C10802B */ lui $s0, %hi(battle_menu_moveOptionIndexMap) +/* 418418 802A3688 2610D1F8 */ addiu $s0, $s0, %lo(battle_menu_moveOptionIndexMap) /* 41841C 802A368C 00021080 */ sll $v0, $v0, 2 -/* 418420 802A3690 3C03802B */ lui $v1, %hi(D_802AD510) +/* 418420 802A3690 3C03802B */ lui $v1, %hi(battle_menu_moveOptionsEnabled) /* 418424 802A3694 00621821 */ addu $v1, $v1, $v0 -/* 418428 802A3698 8C63D510 */ lw $v1, %lo(D_802AD510)($v1) +/* 418428 802A3698 8C63D510 */ lw $v1, %lo(battle_menu_moveOptionsEnabled)($v1) /* 41842C 802A369C 24020001 */ addiu $v0, $zero, 1 /* 418430 802A36A0 14620005 */ bne $v1, $v0, .L802A36B8 /* 418434 802A36A4 00000000 */ nop @@ -706,9 +706,9 @@ glabel L802A3490_418220 /* 418460 802A36D0 3C03802B */ lui $v1, %hi(D_802AD258) /* 418464 802A36D4 2463D258 */ addiu $v1, $v1, %lo(D_802AD258) /* 418468 802A36D8 AC600000 */ sw $zero, ($v1) -/* 41846C 802A36DC 3C01802B */ lui $at, %hi(D_802AD5E8) +/* 41846C 802A36DC 3C01802B */ lui $at, %hi(battle_menu_moveOptionCantUseTypes) /* 418470 802A36E0 00220821 */ addu $at, $at, $v0 -/* 418474 802A36E4 8022D5E8 */ lb $v0, %lo(D_802AD5E8)($at) +/* 418474 802A36E4 8022D5E8 */ lb $v0, %lo(battle_menu_moveOptionCantUseTypes)($at) /* 418478 802A36E8 54400001 */ bnel $v0, $zero, .L802A36F0 /* 41847C 802A36EC AC620000 */ sw $v0, ($v1) .L802A36F0: @@ -724,12 +724,12 @@ glabel L802A3490_418220 /* 4184A0 802A3710 080A8F19 */ j .L802A3C64 /* 4184A4 802A3714 2402FFFE */ addiu $v0, $zero, -2 glabel L802A3718_4184A8 -/* 4184A8 802A3718 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 4184AC 802A371C 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 4184A8 802A3718 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 4184AC 802A371C 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 4184B0 802A3720 1840000F */ blez $v0, .L802A3760 /* 4184B4 802A3724 0000802D */ daddu $s0, $zero, $zero -/* 4184B8 802A3728 3C11802B */ lui $s1, %hi(D_802AD128) -/* 4184BC 802A372C 2631D128 */ addiu $s1, $s1, %lo(D_802AD128) +/* 4184B8 802A3728 3C11802B */ lui $s1, %hi(battle_menu_moveOptionIconIDs) +/* 4184BC 802A372C 2631D128 */ addiu $s1, $s1, %lo(battle_menu_moveOptionIconIDs) /* 4184C0 802A3730 240500A0 */ addiu $a1, $zero, 0xa0 .L802A3734: /* 4184C4 802A3734 00A0302D */ daddu $a2, $a1, $zero @@ -737,8 +737,8 @@ glabel L802A3718_4184A8 /* 4184CC 802A373C 8E240000 */ lw $a0, ($s1) /* 4184D0 802A3740 0C0513BF */ jal icon_set_tint /* 4184D4 802A3744 26310004 */ addiu $s1, $s1, 4 -/* 4184D8 802A3748 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 4184DC 802A374C 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 4184D8 802A3748 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 4184DC 802A374C 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 4184E0 802A3750 26100001 */ addiu $s0, $s0, 1 /* 4184E4 802A3754 0202102A */ slt $v0, $s0, $v0 /* 4184E8 802A3758 1440FFF6 */ bnez $v0, .L802A3734 @@ -746,34 +746,34 @@ glabel L802A3718_4184A8 .L802A3760: /* 4184F0 802A3760 240500A0 */ addiu $a1, $zero, 0xa0 /* 4184F4 802A3764 00A0302D */ daddu $a2, $a1, $zero -/* 4184F8 802A3768 3C04802B */ lui $a0, %hi(D_802AD118) -/* 4184FC 802A376C 8C84D118 */ lw $a0, %lo(D_802AD118)($a0) +/* 4184F8 802A3768 3C04802B */ lui $a0, %hi(battle_menu_moveCursorIcon) +/* 4184FC 802A376C 8C84D118 */ lw $a0, %lo(battle_menu_moveCursorIcon)($a0) /* 418500 802A3770 0C0513BF */ jal icon_set_tint /* 418504 802A3774 00A0382D */ daddu $a3, $a1, $zero /* 418508 802A3778 240500A0 */ addiu $a1, $zero, 0xa0 /* 41850C 802A377C 00A0302D */ daddu $a2, $a1, $zero -/* 418510 802A3780 3C04802B */ lui $a0, %hi(D_802AD11C) -/* 418514 802A3784 8C84D11C */ lw $a0, %lo(D_802AD11C)($a0) +/* 418510 802A3780 3C04802B */ lui $a0, %hi(battle_menu_moveUpArrowIcon) +/* 418514 802A3784 8C84D11C */ lw $a0, %lo(battle_menu_moveUpArrowIcon)($a0) /* 418518 802A3788 0C0513BF */ jal icon_set_tint /* 41851C 802A378C 00A0382D */ daddu $a3, $a1, $zero /* 418520 802A3790 240500A0 */ addiu $a1, $zero, 0xa0 /* 418524 802A3794 00A0302D */ daddu $a2, $a1, $zero -/* 418528 802A3798 3C04802B */ lui $a0, %hi(D_802AD120) -/* 41852C 802A379C 8C84D120 */ lw $a0, %lo(D_802AD120)($a0) +/* 418528 802A3798 3C04802B */ lui $a0, %hi(battle_menu_moveDownArrowIcon) +/* 41852C 802A379C 8C84D120 */ lw $a0, %lo(battle_menu_moveDownArrowIcon)($a0) /* 418530 802A37A0 0C0513BF */ jal icon_set_tint /* 418534 802A37A4 00A0382D */ daddu $a3, $a1, $zero /* 418538 802A37A8 240500A0 */ addiu $a1, $zero, 0xa0 /* 41853C 802A37AC 00A0302D */ daddu $a2, $a1, $zero -/* 418540 802A37B0 3C04802B */ lui $a0, %hi(D_802AD188) -/* 418544 802A37B4 8C84D188 */ lw $a0, %lo(D_802AD188)($a0) +/* 418540 802A37B0 3C04802B */ lui $a0, %hi(battle_menu_moveTitleIcon) +/* 418544 802A37B4 8C84D188 */ lw $a0, %lo(battle_menu_moveTitleIcon)($a0) /* 418548 802A37B8 0C0513BF */ jal icon_set_tint /* 41854C 802A37BC 00A0382D */ daddu $a3, $a1, $zero -/* 418550 802A37C0 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 418554 802A37C4 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 418550 802A37C0 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 418554 802A37C4 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 418558 802A37C8 1840000F */ blez $v0, .L802A3808 /* 41855C 802A37CC 0000802D */ daddu $s0, $zero, $zero -/* 418560 802A37D0 3C11802B */ lui $s1, %hi(D_802AD190) -/* 418564 802A37D4 2631D190 */ addiu $s1, $s1, %lo(D_802AD190) +/* 418560 802A37D0 3C11802B */ lui $s1, %hi(battle_menu_moveOptionCostUnitIconIDs) +/* 418564 802A37D4 2631D190 */ addiu $s1, $s1, %lo(battle_menu_moveOptionCostUnitIconIDs) /* 418568 802A37D8 240500A0 */ addiu $a1, $zero, 0xa0 .L802A37DC: /* 41856C 802A37DC 00A0302D */ daddu $a2, $a1, $zero @@ -781,46 +781,46 @@ glabel L802A3718_4184A8 /* 418574 802A37E4 8E240000 */ lw $a0, ($s1) /* 418578 802A37E8 0C0513BF */ jal icon_set_tint /* 41857C 802A37EC 26310004 */ addiu $s1, $s1, 4 -/* 418580 802A37F0 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 418584 802A37F4 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 418580 802A37F0 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 418584 802A37F4 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 418588 802A37F8 26100001 */ addiu $s0, $s0, 1 /* 41858C 802A37FC 0202102A */ slt $v0, $s0, $v0 /* 418590 802A3800 5440FFF6 */ bnel $v0, $zero, .L802A37DC /* 418594 802A3804 240500A0 */ addiu $a1, $zero, 0xa0 .L802A3808: -/* 418598 802A3808 3C04802B */ lui $a0, %hi(D_802AD118) -/* 41859C 802A380C 8C84D118 */ lw $a0, %lo(D_802AD118)($a0) +/* 418598 802A3808 3C04802B */ lui $a0, %hi(battle_menu_moveCursorIcon) +/* 41859C 802A380C 8C84D118 */ lw $a0, %lo(battle_menu_moveCursorIcon)($a0) /* 4185A0 802A3810 3C058010 */ lui $a1, %hi(D_80104A00) /* 4185A4 802A3814 24A54A00 */ addiu $a1, $a1, %lo(D_80104A00) /* 4185A8 802A3818 0C0511FF */ jal set_menu_icon_script /* 4185AC 802A381C 00000000 */ nop /* 4185B0 802A3820 24040001 */ addiu $a0, $zero, 1 /* 4185B4 802A3824 2402000D */ addiu $v0, $zero, 0xd -/* 4185B8 802A3828 3C01802B */ lui $at, %hi(D_802AD114) -/* 4185BC 802A382C A422D114 */ sh $v0, %lo(D_802AD114)($at) -/* 4185C0 802A3830 0C051F9F */ jal func_80147E7C +/* 4185B8 802A3828 3C01802B */ lui $at, %hi(battle_menu_moveTextColor) +/* 4185BC 802A382C A422D114 */ sh $v0, %lo(battle_menu_moveTextColor)($at) +/* 4185C0 802A3830 0C051F9F */ jal set_window_update /* 4185C4 802A3834 24050004 */ addiu $a1, $zero, 4 -/* 4185C8 802A3838 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 4185CC 802A383C 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 4185C8 802A3838 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 4185CC 802A383C 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 4185D0 802A3840 54400006 */ bnel $v0, $zero, .L802A385C /* 4185D4 802A3844 24040004 */ addiu $a0, $zero, 4 /* 4185D8 802A3848 24040002 */ addiu $a0, $zero, 2 -/* 4185DC 802A384C 0C051F9F */ jal func_80147E7C +/* 4185DC 802A384C 0C051F9F */ jal set_window_update /* 4185E0 802A3850 24050004 */ addiu $a1, $zero, 4 /* 4185E4 802A3854 080A8E1A */ j .L802A3868 /* 4185E8 802A3858 24040003 */ addiu $a0, $zero, 3 .L802A385C: -/* 4185EC 802A385C 0C051F9F */ jal func_80147E7C +/* 4185EC 802A385C 0C051F9F */ jal set_window_update /* 4185F0 802A3860 0080282D */ daddu $a1, $a0, $zero /* 4185F4 802A3864 24040005 */ addiu $a0, $zero, 5 .L802A3868: -/* 4185F8 802A3868 0C051F9F */ jal func_80147E7C +/* 4185F8 802A3868 0C051F9F */ jal set_window_update /* 4185FC 802A386C 24050004 */ addiu $a1, $zero, 4 /* 418600 802A3870 24040008 */ addiu $a0, $zero, 8 -/* 418604 802A3874 0C051F9F */ jal func_80147E7C +/* 418604 802A3874 0C051F9F */ jal set_window_update /* 418608 802A3878 24050002 */ addiu $a1, $zero, 2 -/* 41860C 802A387C 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 418610 802A3880 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 41860C 802A387C 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 418610 802A3880 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 418614 802A3884 14400005 */ bnez $v0, .L802A389C /* 418618 802A3888 00000000 */ nop /* 41861C 802A388C 0C03A674 */ jal status_menu_stop_blinking_fp @@ -833,8 +833,8 @@ glabel L802A3718_4184A8 /* 418634 802A38A4 080A8E5D */ j .L802A3974 /* 418638 802A38A8 00000000 */ nop glabel L802A38AC_41863C -/* 41863C 802A38AC 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 418640 802A38B0 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 41863C 802A38AC 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 418640 802A38B0 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 418644 802A38B4 14400005 */ bnez $v0, .L802A38CC /* 418648 802A38B8 00000000 */ nop /* 41864C 802A38BC 0C03A674 */ jal status_menu_stop_blinking_fp @@ -848,29 +848,29 @@ glabel L802A38AC_41863C /* 418668 802A38D8 240200FF */ addiu $v0, $zero, 0xff glabel L802A38DC_41866C /* 41866C 802A38DC 24040001 */ addiu $a0, $zero, 1 -/* 418670 802A38E0 0C051F9F */ jal func_80147E7C +/* 418670 802A38E0 0C051F9F */ jal set_window_update /* 418674 802A38E4 24050002 */ addiu $a1, $zero, 2 -/* 418678 802A38E8 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 41867C 802A38EC 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 418678 802A38E8 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 41867C 802A38EC 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 418680 802A38F0 54400006 */ bnel $v0, $zero, .L802A390C /* 418684 802A38F4 24040004 */ addiu $a0, $zero, 4 /* 418688 802A38F8 24040002 */ addiu $a0, $zero, 2 -/* 41868C 802A38FC 0C051F9F */ jal func_80147E7C +/* 41868C 802A38FC 0C051F9F */ jal set_window_update /* 418690 802A3900 0080282D */ daddu $a1, $a0, $zero /* 418694 802A3904 080A8E46 */ j .L802A3918 /* 418698 802A3908 24040003 */ addiu $a0, $zero, 3 .L802A390C: -/* 41869C 802A390C 0C051F9F */ jal func_80147E7C +/* 41869C 802A390C 0C051F9F */ jal set_window_update /* 4186A0 802A3910 24050002 */ addiu $a1, $zero, 2 /* 4186A4 802A3914 24040005 */ addiu $a0, $zero, 5 .L802A3918: -/* 4186A8 802A3918 0C051F9F */ jal func_80147E7C +/* 4186A8 802A3918 0C051F9F */ jal set_window_update /* 4186AC 802A391C 24050002 */ addiu $a1, $zero, 2 /* 4186B0 802A3920 24040008 */ addiu $a0, $zero, 8 -/* 4186B4 802A3924 0C051F9F */ jal func_80147E7C +/* 4186B4 802A3924 0C051F9F */ jal set_window_update /* 4186B8 802A3928 24050002 */ addiu $a1, $zero, 2 -/* 4186BC 802A392C 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 4186C0 802A3930 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 4186BC 802A392C 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 4186C0 802A3930 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 4186C4 802A3934 14400005 */ bnez $v0, .L802A394C /* 4186C8 802A3938 00000000 */ nop /* 4186CC 802A393C 0C03A674 */ jal status_menu_stop_blinking_fp @@ -881,120 +881,120 @@ glabel L802A38DC_41866C /* 4186DC 802A394C 0C03A6A5 */ jal status_menu_stop_blinking_sp /* 4186E0 802A3950 00000000 */ nop .L802A3954: -/* 4186E4 802A3954 3C04802B */ lui $a0, %hi(D_802AD109) -/* 4186E8 802A3958 8084D109 */ lb $a0, %lo(D_802AD109)($a0) +/* 4186E4 802A3954 3C04802B */ lui $a0, %hi(battle_menu_moveCursorPos) +/* 4186E8 802A3958 8084D109 */ lb $a0, %lo(battle_menu_moveCursorPos)($a0) /* 4186EC 802A395C 00041080 */ sll $v0, $a0, 2 -/* 4186F0 802A3960 3C01802B */ lui $at, %hi(D_802AD1F8) +/* 4186F0 802A3960 3C01802B */ lui $at, %hi(battle_menu_moveOptionIndexMap) /* 4186F4 802A3964 00220821 */ addu $at, $at, $v0 -/* 4186F8 802A3968 8C22D1F8 */ lw $v0, %lo(D_802AD1F8)($at) +/* 4186F8 802A3968 8C22D1F8 */ lw $v0, %lo(battle_menu_moveOptionIndexMap)($at) /* 4186FC 802A396C 080A8E82 */ j .L802A3A08 /* 418700 802A3970 2403000B */ addiu $v1, $zero, 0xb .L802A3974: glabel L802A3974_418704 -/* 418704 802A3974 3C03802B */ lui $v1, %hi(D_802AD109) -/* 418708 802A3978 8063D109 */ lb $v1, %lo(D_802AD109)($v1) +/* 418704 802A3974 3C03802B */ lui $v1, %hi(battle_menu_moveCursorPos) +/* 418708 802A3978 8063D109 */ lb $v1, %lo(battle_menu_moveCursorPos)($v1) /* 41870C 802A397C 00031080 */ sll $v0, $v1, 2 -/* 418710 802A3980 3C01802B */ lui $at, %hi(D_802AD1F8) +/* 418710 802A3980 3C01802B */ lui $at, %hi(battle_menu_moveOptionIndexMap) /* 418714 802A3984 00220821 */ addu $at, $at, $v0 -/* 418718 802A3988 8C22D1F8 */ lw $v0, %lo(D_802AD1F8)($at) -/* 41871C 802A398C 3C01802B */ lui $at, %hi(D_802AD600) -/* 418720 802A3990 AC23D600 */ sw $v1, %lo(D_802AD600)($at) +/* 418718 802A3988 8C22D1F8 */ lw $v0, %lo(battle_menu_moveOptionIndexMap)($at) +/* 41871C 802A398C 3C01802B */ lui $at, %hi(battle_menu_moveOptionActive) +/* 418720 802A3990 AC23D600 */ sw $v1, %lo(battle_menu_moveOptionActive)($at) /* 418724 802A3994 080A8F1C */ j .L802A3C70 /* 418728 802A3998 24420001 */ addiu $v0, $v0, 1 glabel L802A399C_41872C /* 41872C 802A399C 24040001 */ addiu $a0, $zero, 1 -/* 418730 802A39A0 0C051F9F */ jal func_80147E7C +/* 418730 802A39A0 0C051F9F */ jal set_window_update /* 418734 802A39A4 0080282D */ daddu $a1, $a0, $zero -/* 418738 802A39A8 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 41873C 802A39AC 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 418738 802A39A8 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 41873C 802A39AC 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 418740 802A39B0 54400006 */ bnel $v0, $zero, .L802A39CC /* 418744 802A39B4 24040004 */ addiu $a0, $zero, 4 /* 418748 802A39B8 24040002 */ addiu $a0, $zero, 2 -/* 41874C 802A39BC 0C051F9F */ jal func_80147E7C +/* 41874C 802A39BC 0C051F9F */ jal set_window_update /* 418750 802A39C0 24050001 */ addiu $a1, $zero, 1 /* 418754 802A39C4 080A8E76 */ j .L802A39D8 /* 418758 802A39C8 24040003 */ addiu $a0, $zero, 3 .L802A39CC: -/* 41875C 802A39CC 0C051F9F */ jal func_80147E7C +/* 41875C 802A39CC 0C051F9F */ jal set_window_update /* 418760 802A39D0 24050001 */ addiu $a1, $zero, 1 /* 418764 802A39D4 24040005 */ addiu $a0, $zero, 5 .L802A39D8: -/* 418768 802A39D8 0C051F9F */ jal func_80147E7C +/* 418768 802A39D8 0C051F9F */ jal set_window_update /* 41876C 802A39DC 24050001 */ addiu $a1, $zero, 1 /* 418770 802A39E0 24040008 */ addiu $a0, $zero, 8 -/* 418774 802A39E4 0C051F9F */ jal func_80147E7C +/* 418774 802A39E4 0C051F9F */ jal set_window_update /* 418778 802A39E8 24050001 */ addiu $a1, $zero, 1 -/* 41877C 802A39EC 3C04802B */ lui $a0, %hi(D_802AD109) -/* 418780 802A39F0 8084D109 */ lb $a0, %lo(D_802AD109)($a0) +/* 41877C 802A39EC 3C04802B */ lui $a0, %hi(battle_menu_moveCursorPos) +/* 418780 802A39F0 8084D109 */ lb $a0, %lo(battle_menu_moveCursorPos)($a0) /* 418784 802A39F4 00041080 */ sll $v0, $a0, 2 -/* 418788 802A39F8 3C01802B */ lui $at, %hi(D_802AD1F8) +/* 418788 802A39F8 3C01802B */ lui $at, %hi(battle_menu_moveOptionIndexMap) /* 41878C 802A39FC 00220821 */ addu $at, $at, $v0 -/* 418790 802A3A00 8C22D1F8 */ lw $v0, %lo(D_802AD1F8)($at) +/* 418790 802A3A00 8C22D1F8 */ lw $v0, %lo(battle_menu_moveOptionIndexMap)($at) /* 418794 802A3A04 24030001 */ addiu $v1, $zero, 1 .L802A3A08: -/* 418798 802A3A08 3C01802B */ lui $at, %hi(D_802AD108) -/* 41879C 802A3A0C A023D108 */ sb $v1, %lo(D_802AD108)($at) -/* 4187A0 802A3A10 3C01802B */ lui $at, %hi(D_802AD600) -/* 4187A4 802A3A14 AC24D600 */ sw $a0, %lo(D_802AD600)($at) +/* 418798 802A3A08 3C01802B */ lui $at, %hi(battle_menu_moveState) +/* 41879C 802A3A0C A023D108 */ sb $v1, %lo(battle_menu_moveState)($at) +/* 4187A0 802A3A10 3C01802B */ lui $at, %hi(battle_menu_moveOptionActive) +/* 4187A4 802A3A14 AC24D600 */ sw $a0, %lo(battle_menu_moveOptionActive)($at) /* 4187A8 802A3A18 080A8F1C */ j .L802A3C70 /* 4187AC 802A3A1C 24420001 */ addiu $v0, $v0, 1 glabel L802A3A20_4187B0 /* 4187B0 802A3A20 24040001 */ addiu $a0, $zero, 1 -/* 4187B4 802A3A24 0C051F9F */ jal func_80147E7C +/* 4187B4 802A3A24 0C051F9F */ jal set_window_update /* 4187B8 802A3A28 24050009 */ addiu $a1, $zero, 9 -/* 4187BC 802A3A2C 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 4187C0 802A3A30 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 4187BC 802A3A2C 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 4187C0 802A3A30 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 4187C4 802A3A34 54400006 */ bnel $v0, $zero, .L802A3A50 /* 4187C8 802A3A38 24040004 */ addiu $a0, $zero, 4 /* 4187CC 802A3A3C 24040002 */ addiu $a0, $zero, 2 -/* 4187D0 802A3A40 0C051F9F */ jal func_80147E7C +/* 4187D0 802A3A40 0C051F9F */ jal set_window_update /* 4187D4 802A3A44 24050009 */ addiu $a1, $zero, 9 /* 4187D8 802A3A48 080A8E97 */ j .L802A3A5C /* 4187DC 802A3A4C 24040003 */ addiu $a0, $zero, 3 .L802A3A50: -/* 4187E0 802A3A50 0C051F9F */ jal func_80147E7C +/* 4187E0 802A3A50 0C051F9F */ jal set_window_update /* 4187E4 802A3A54 24050009 */ addiu $a1, $zero, 9 /* 4187E8 802A3A58 24040005 */ addiu $a0, $zero, 5 .L802A3A5C: -/* 4187EC 802A3A5C 0C051F9F */ jal func_80147E7C +/* 4187EC 802A3A5C 0C051F9F */ jal set_window_update /* 4187F0 802A3A60 24050009 */ addiu $a1, $zero, 9 /* 4187F4 802A3A64 24040008 */ addiu $a0, $zero, 8 -/* 4187F8 802A3A68 0C051F9F */ jal func_80147E7C +/* 4187F8 802A3A68 0C051F9F */ jal set_window_update /* 4187FC 802A3A6C 24050002 */ addiu $a1, $zero, 2 /* 418800 802A3A70 080A8F19 */ j .L802A3C64 /* 418804 802A3A74 2402FFFF */ addiu $v0, $zero, -1 glabel L802A3A78_418808 /* 418808 802A3A78 2402FFFF */ addiu $v0, $zero, -1 /* 41880C 802A3A7C 0040182D */ daddu $v1, $v0, $zero -/* 418810 802A3A80 3C01802B */ lui $at, %hi(D_802AD600) -/* 418814 802A3A84 AC23D600 */ sw $v1, %lo(D_802AD600)($at) +/* 418810 802A3A80 3C01802B */ lui $at, %hi(battle_menu_moveOptionActive) +/* 418814 802A3A84 AC23D600 */ sw $v1, %lo(battle_menu_moveOptionActive)($at) /* 418818 802A3A88 24030029 */ addiu $v1, $zero, 0x29 -/* 41881C 802A3A8C 3C01802B */ lui $at, %hi(D_802AD108) -/* 418820 802A3A90 A023D108 */ sb $v1, %lo(D_802AD108)($at) +/* 41881C 802A3A8C 3C01802B */ lui $at, %hi(battle_menu_moveState) +/* 418820 802A3A90 A023D108 */ sb $v1, %lo(battle_menu_moveState)($at) /* 418824 802A3A94 080A8F1C */ j .L802A3C70 /* 418828 802A3A98 00000000 */ nop glabel L802A3A9C_41882C /* 41882C 802A3A9C 24040001 */ addiu $a0, $zero, 1 -/* 418830 802A3AA0 0C051F9F */ jal func_80147E7C +/* 418830 802A3AA0 0C051F9F */ jal set_window_update /* 418834 802A3AA4 24050002 */ addiu $a1, $zero, 2 -/* 418838 802A3AA8 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 41883C 802A3AAC 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 418838 802A3AA8 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 41883C 802A3AAC 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 418840 802A3AB0 54400006 */ bnel $v0, $zero, .L802A3ACC /* 418844 802A3AB4 24040004 */ addiu $a0, $zero, 4 /* 418848 802A3AB8 24040002 */ addiu $a0, $zero, 2 -/* 41884C 802A3ABC 0C051F9F */ jal func_80147E7C +/* 41884C 802A3ABC 0C051F9F */ jal set_window_update /* 418850 802A3AC0 0080282D */ daddu $a1, $a0, $zero /* 418854 802A3AC4 080A8EB6 */ j .L802A3AD8 /* 418858 802A3AC8 24040003 */ addiu $a0, $zero, 3 .L802A3ACC: -/* 41885C 802A3ACC 0C051F9F */ jal func_80147E7C +/* 41885C 802A3ACC 0C051F9F */ jal set_window_update /* 418860 802A3AD0 24050002 */ addiu $a1, $zero, 2 /* 418864 802A3AD4 24040005 */ addiu $a0, $zero, 5 .L802A3AD8: -/* 418868 802A3AD8 0C051F9F */ jal func_80147E7C +/* 418868 802A3AD8 0C051F9F */ jal set_window_update /* 41886C 802A3ADC 24050002 */ addiu $a1, $zero, 2 /* 418870 802A3AE0 24040008 */ addiu $a0, $zero, 8 -/* 418874 802A3AE4 0C051F9F */ jal func_80147E7C +/* 418874 802A3AE4 0C051F9F */ jal set_window_update /* 418878 802A3AE8 24050002 */ addiu $a1, $zero, 2 /* 41887C 802A3AEC 3C11001D */ lui $s1, 0x1d /* 418880 802A3AF0 3C02802B */ lui $v0, %hi(D_802AD258) @@ -1002,8 +1002,8 @@ glabel L802A3A9C_41882C /* 418888 802A3AF8 14400008 */ bnez $v0, .L802A3B1C /* 41888C 802A3AFC 363100C3 */ ori $s1, $s1, 0xc3 /* 418890 802A3B00 3C11001D */ lui $s1, 0x1d -/* 418894 802A3B04 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 418898 802A3B08 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 418894 802A3B04 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 418898 802A3B08 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 41889C 802A3B0C 14400003 */ bnez $v0, .L802A3B1C /* 4188A0 802A3B10 363100A0 */ ori $s1, $s1, 0xa0 /* 4188A4 802A3B14 3C11001D */ lui $s1, 0x1d @@ -1018,7 +1018,7 @@ glabel L802A3A9C_41882C /* 4188C4 802A3B34 00021043 */ sra $v0, $v0, 1 /* 4188C8 802A3B38 240300A0 */ addiu $v1, $zero, 0xa0 /* 4188CC 802A3B3C 00629823 */ subu $s3, $v1, $v0 -/* 4188D0 802A3B40 0C04992C */ jal func_801264B0 +/* 4188D0 802A3B40 0C04992C */ jal get_msg_lines /* 4188D4 802A3B44 0220202D */ daddu $a0, $s1, $zero /* 4188D8 802A3B48 24040009 */ addiu $a0, $zero, 9 /* 4188DC 802A3B4C 0260282D */ daddu $a1, $s3, $zero @@ -1037,17 +1037,17 @@ glabel L802A3A9C_41882C /* 418910 802A3B80 2402FFFF */ addiu $v0, $zero, -1 /* 418914 802A3B84 AFA0001C */ sw $zero, 0x1c($sp) /* 418918 802A3B88 AFA20020 */ sw $v0, 0x20($sp) -/* 41891C 802A3B8C 0C051F32 */ jal set_ui_panel_properties +/* 41891C 802A3B8C 0C051F32 */ jal set_window_properties /* 418920 802A3B90 AFA30010 */ sw $v1, 0x10($sp) /* 418924 802A3B94 24040009 */ addiu $a0, $zero, 9 -/* 418928 802A3B98 0C051F9F */ jal func_80147E7C +/* 418928 802A3B98 0C051F9F */ jal set_window_update /* 41892C 802A3B9C 24050001 */ addiu $a1, $zero, 1 /* 418930 802A3BA0 2403003C */ addiu $v1, $zero, 0x3c /* 418934 802A3BA4 3C01802B */ lui $at, %hi(D_802AD10B) /* 418938 802A3BA8 A023D10B */ sb $v1, %lo(D_802AD10B)($at) /* 41893C 802A3BAC 2403002A */ addiu $v1, $zero, 0x2a -/* 418940 802A3BB0 3C01802B */ lui $at, %hi(D_802AD108) -/* 418944 802A3BB4 A023D108 */ sb $v1, %lo(D_802AD108)($at) +/* 418940 802A3BB0 3C01802B */ lui $at, %hi(battle_menu_moveState) +/* 418944 802A3BB4 A023D108 */ sb $v1, %lo(battle_menu_moveState)($at) /* 418948 802A3BB8 080A8F1C */ j .L802A3C70 /* 41894C 802A3BBC 2402FFFF */ addiu $v0, $zero, -1 glabel L802A3BC0_418950 @@ -1071,34 +1071,34 @@ glabel L802A3BC0_418950 /* 418990 802A3C00 2402FFFF */ addiu $v0, $zero, -1 .L802A3C04: /* 418994 802A3C04 24040009 */ addiu $a0, $zero, 9 -/* 418998 802A3C08 0C051F9F */ jal func_80147E7C +/* 418998 802A3C08 0C051F9F */ jal set_window_update /* 41899C 802A3C0C 24050002 */ addiu $a1, $zero, 2 /* 4189A0 802A3C10 24040001 */ addiu $a0, $zero, 1 -/* 4189A4 802A3C14 0C051F9F */ jal func_80147E7C +/* 4189A4 802A3C14 0C051F9F */ jal set_window_update /* 4189A8 802A3C18 0080282D */ daddu $a1, $a0, $zero -/* 4189AC 802A3C1C 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 4189B0 802A3C20 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 4189AC 802A3C1C 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 4189B0 802A3C20 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 4189B4 802A3C24 54400006 */ bnel $v0, $zero, .L802A3C40 /* 4189B8 802A3C28 24040004 */ addiu $a0, $zero, 4 /* 4189BC 802A3C2C 24040002 */ addiu $a0, $zero, 2 -/* 4189C0 802A3C30 0C051F9F */ jal func_80147E7C +/* 4189C0 802A3C30 0C051F9F */ jal set_window_update /* 4189C4 802A3C34 24050001 */ addiu $a1, $zero, 1 /* 4189C8 802A3C38 080A8F13 */ j .L802A3C4C /* 4189CC 802A3C3C 24040003 */ addiu $a0, $zero, 3 .L802A3C40: -/* 4189D0 802A3C40 0C051F9F */ jal func_80147E7C +/* 4189D0 802A3C40 0C051F9F */ jal set_window_update /* 4189D4 802A3C44 24050001 */ addiu $a1, $zero, 1 /* 4189D8 802A3C48 24040005 */ addiu $a0, $zero, 5 .L802A3C4C: -/* 4189DC 802A3C4C 0C051F9F */ jal func_80147E7C +/* 4189DC 802A3C4C 0C051F9F */ jal set_window_update /* 4189E0 802A3C50 24050001 */ addiu $a1, $zero, 1 /* 4189E4 802A3C54 24040008 */ addiu $a0, $zero, 8 -/* 4189E8 802A3C58 0C051F9F */ jal func_80147E7C +/* 4189E8 802A3C58 0C051F9F */ jal set_window_update /* 4189EC 802A3C5C 24050001 */ addiu $a1, $zero, 1 /* 4189F0 802A3C60 24020001 */ addiu $v0, $zero, 1 .L802A3C64: -/* 4189F4 802A3C64 3C01802B */ lui $at, %hi(D_802AD108) -/* 4189F8 802A3C68 A022D108 */ sb $v0, %lo(D_802AD108)($at) +/* 4189F4 802A3C64 3C01802B */ lui $at, %hi(battle_menu_moveState) +/* 4189F8 802A3C68 A022D108 */ sb $v0, %lo(battle_menu_moveState)($at) .L802A3C6C: glabel L802A3C6C_4189FC /* 4189FC 802A3C6C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_415D90/func_802A3C98.s b/asm/nonmatchings/code_415D90/func_802A3C98.s index 3c01077980..23c89ce4cd 100644 --- a/asm/nonmatchings/code_415D90/func_802A3C98.s +++ b/asm/nonmatchings/code_415D90/func_802A3C98.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802A3C98 -/* 418A28 802A3C98 3C02802B */ lui $v0, %hi(D_802AD108) -/* 418A2C 802A3C9C 9042D108 */ lbu $v0, %lo(D_802AD108)($v0) +/* 418A28 802A3C98 3C02802B */ lui $v0, %hi(battle_menu_moveState) +/* 418A2C 802A3C9C 9042D108 */ lbu $v0, %lo(battle_menu_moveState)($v0) /* 418A30 802A3CA0 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 418A34 802A3CA4 AFBF0044 */ sw $ra, 0x44($sp) /* 418A38 802A3CA8 AFBE0040 */ sw $fp, 0x40($sp) @@ -29,10 +29,10 @@ glabel func_802A3C98 /* 418A88 802A3CF8 00400008 */ jr $v0 /* 418A8C 802A3CFC 00000000 */ nop glabel L802A3D00_418A90 -/* 418A90 802A3D00 3C03802B */ lui $v1, %hi(D_802AD10C) -/* 418A94 802A3D04 8063D10C */ lb $v1, %lo(D_802AD10C)($v1) -/* 418A98 802A3D08 3C08802B */ lui $t0, %hi(D_802AD110) -/* 418A9C 802A3D0C 8508D110 */ lh $t0, %lo(D_802AD110)($t0) +/* 418A90 802A3D00 3C03802B */ lui $v1, %hi(battle_menu_moveScrollLine) +/* 418A94 802A3D04 8063D10C */ lb $v1, %lo(battle_menu_moveScrollLine)($v1) +/* 418A98 802A3D08 3C08802B */ lui $t0, %hi(battle_menu_moveScrollOffset) +/* 418A9C 802A3D0C 8508D110 */ lh $t0, %lo(battle_menu_moveScrollOffset)($t0) /* 418AA0 802A3D10 3C013FE0 */ lui $at, 0x3fe0 /* 418AA4 802A3D14 44811800 */ mtc1 $at, $f3 /* 418AA8 802A3D18 44801000 */ mtc1 $zero, $f2 @@ -57,8 +57,8 @@ glabel L802A3D00_418A90 /* 418AF0 802A3D60 0000982D */ daddu $s3, $zero, $zero /* 418AF4 802A3D64 3C06800A */ lui $a2, %hi(gMasterGfxPos) /* 418AF8 802A3D68 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) -/* 418AFC 802A3D6C 3C05802B */ lui $a1, %hi(D_802AD110) -/* 418B00 802A3D70 24A5D110 */ addiu $a1, $a1, %lo(D_802AD110) +/* 418AFC 802A3D6C 3C05802B */ lui $a1, %hi(battle_menu_moveScrollOffset) +/* 418B00 802A3D70 24A5D110 */ addiu $a1, $a1, %lo(battle_menu_moveScrollOffset) /* 418B04 802A3D74 8FA9004C */ lw $t1, 0x4c($sp) /* 418B08 802A3D78 8CC40000 */ lw $a0, ($a2) /* 418B0C 802A3D7C 3C03802B */ lui $v1, %hi(D_802AD10E) @@ -116,8 +116,8 @@ glabel L802A3D00_418A90 /* 418BDC 802A3E4C 3C02ED00 */ lui $v0, 0xed00 /* 418BE0 802A3E50 00822025 */ or $a0, $a0, $v0 /* 418BE4 802A3E54 00641825 */ or $v1, $v1, $a0 -/* 418BE8 802A3E58 3C04802B */ lui $a0, %hi(D_802AD4A4) -/* 418BEC 802A3E5C 8C84D4A4 */ lw $a0, %lo(D_802AD4A4)($a0) +/* 418BE8 802A3E58 3C04802B */ lui $a0, %hi(battle_menu_moveOptionCount) +/* 418BEC 802A3E5C 8C84D4A4 */ lw $a0, %lo(battle_menu_moveOptionCount)($a0) /* 418BF0 802A3E60 46040002 */ mul.s $f0, $f0, $f4 /* 418BF4 802A3E64 00000000 */ nop /* 418BF8 802A3E68 ACE30000 */ sw $v1, ($a3) @@ -133,16 +133,16 @@ glabel L802A3D00_418A90 /* 418C20 802A3E90 00431025 */ or $v0, $v0, $v1 /* 418C24 802A3E94 188000BC */ blez $a0, .L802A4188 /* 418C28 802A3E98 ACE20004 */ sw $v0, 4($a3) -/* 418C2C 802A3E9C 3C16802B */ lui $s6, %hi(D_802AD510) -/* 418C30 802A3EA0 26D6D510 */ addiu $s6, $s6, %lo(D_802AD510) -/* 418C34 802A3EA4 3C1E802B */ lui $fp, %hi(D_802AD320) -/* 418C38 802A3EA8 27DED320 */ addiu $fp, $fp, %lo(D_802AD320) -/* 418C3C 802A3EAC 3C14802B */ lui $s4, %hi(D_802AD1F8) -/* 418C40 802A3EB0 2694D1F8 */ addiu $s4, $s4, %lo(D_802AD1F8) +/* 418C2C 802A3E9C 3C16802B */ lui $s6, %hi(battle_menu_moveOptionsEnabled) +/* 418C30 802A3EA0 26D6D510 */ addiu $s6, $s6, %lo(battle_menu_moveOptionsEnabled) +/* 418C34 802A3EA4 3C1E802B */ lui $fp, %hi(battle_menu_moveOptionDisplayCosts) +/* 418C38 802A3EA8 27DED320 */ addiu $fp, $fp, %lo(battle_menu_moveOptionDisplayCosts) +/* 418C3C 802A3EAC 3C14802B */ lui $s4, %hi(battle_menu_moveOptionIndexMap) +/* 418C40 802A3EB0 2694D1F8 */ addiu $s4, $s4, %lo(battle_menu_moveOptionIndexMap) /* 418C44 802A3EB4 0260B82D */ daddu $s7, $s3, $zero .L802A3EB8: -/* 418C48 802A3EB8 3C03802B */ lui $v1, %hi(D_802AD10C) -/* 418C4C 802A3EBC 8063D10C */ lb $v1, %lo(D_802AD10C)($v1) +/* 418C48 802A3EB8 3C03802B */ lui $v1, %hi(battle_menu_moveScrollLine) +/* 418C4C 802A3EBC 8063D10C */ lb $v1, %lo(battle_menu_moveScrollLine)($v1) /* 418C50 802A3EC0 2462FFFF */ addiu $v0, $v1, -1 /* 418C54 802A3EC4 0262102A */ slt $v0, $s3, $v0 /* 418C58 802A3EC8 544000A7 */ bnel $v0, $zero, .L802A4168 @@ -157,31 +157,31 @@ glabel L802A3D00_418A90 /* 418C7C 802A3EEC 00022080 */ sll $a0, $v0, 2 /* 418C80 802A3EF0 00961021 */ addu $v0, $a0, $s6 /* 418C84 802A3EF4 8C420000 */ lw $v0, ($v0) -/* 418C88 802A3EF8 3C08802B */ lui $t0, %hi(D_802AD114) -/* 418C8C 802A3EFC 8508D114 */ lh $t0, %lo(D_802AD114)($t0) +/* 418C88 802A3EF8 3C08802B */ lui $t0, %hi(battle_menu_moveTextColor) +/* 418C8C 802A3EFC 8508D114 */ lh $t0, %lo(battle_menu_moveTextColor)($t0) /* 418C90 802A3F00 58400001 */ blezl $v0, .L802A3F08 /* 418C94 802A3F04 2408000B */ addiu $t0, $zero, 0xb .L802A3F08: -/* 418C98 802A3F08 3C02802B */ lui $v0, %hi(D_802AD2C0) -/* 418C9C 802A3F0C 2442D2C0 */ addiu $v0, $v0, %lo(D_802AD2C0) +/* 418C98 802A3F08 3C02802B */ lui $v0, %hi(battle_menu_moveOptionNames) +/* 418C9C 802A3F0C 2442D2C0 */ addiu $v0, $v0, %lo(battle_menu_moveOptionNames) /* 418CA0 802A3F10 00822021 */ addu $a0, $a0, $v0 /* 418CA4 802A3F14 8C820000 */ lw $v0, ($a0) /* 418CA8 802A3F18 04400009 */ bltz $v0, .L802A3F40 /* 418CAC 802A3F1C 02A0282D */ daddu $a1, $s5, $zero -/* 418CB0 802A3F20 3C07802B */ lui $a3, %hi(D_802AD116) -/* 418CB4 802A3F24 84E7D116 */ lh $a3, %lo(D_802AD116)($a3) +/* 418CB0 802A3F20 3C07802B */ lui $a3, %hi(battle_menu_moveTextOpacity) +/* 418CB4 802A3F24 84E7D116 */ lh $a3, %lo(battle_menu_moveTextOpacity)($a3) /* 418CB8 802A3F28 24020001 */ addiu $v0, $zero, 1 /* 418CBC 802A3F2C AFA80010 */ sw $t0, 0x10($sp) /* 418CC0 802A3F30 AFA20014 */ sw $v0, 0x14($sp) /* 418CC4 802A3F34 8C840000 */ lw $a0, ($a0) -/* 418CC8 802A3F38 0C04993B */ jal draw_string +/* 418CC8 802A3F38 0C04993B */ jal draw_msg /* 418CCC 802A3F3C 0220302D */ daddu $a2, $s1, $zero .L802A3F40: /* 418CD0 802A3F40 8E820000 */ lw $v0, ($s4) /* 418CD4 802A3F44 00021880 */ sll $v1, $v0, 2 -/* 418CD8 802A3F48 3C04802B */ lui $a0, %hi(D_802AD380) +/* 418CD8 802A3F48 3C04802B */ lui $a0, %hi(battle_menu_moveOptionDisplayCostReductions) /* 418CDC 802A3F4C 00832021 */ addu $a0, $a0, $v1 -/* 418CE0 802A3F50 8C84D380 */ lw $a0, %lo(D_802AD380)($a0) +/* 418CE0 802A3F50 8C84D380 */ lw $a0, %lo(battle_menu_moveOptionDisplayCostReductions)($a0) /* 418CE4 802A3F54 007E1021 */ addu $v0, $v1, $fp /* 418CE8 802A3F58 8C420000 */ lw $v0, ($v0) /* 418CEC 802A3F5C 10400003 */ beqz $v0, .L802A3F6C @@ -189,12 +189,12 @@ glabel L802A3D00_418A90 /* 418CF4 802A3F64 5A400001 */ blezl $s2, .L802A3F6C /* 418CF8 802A3F68 24120001 */ addiu $s2, $zero, 1 .L802A3F6C: -/* 418CFC 802A3F6C 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 418D00 802A3F70 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 418CFC 802A3F6C 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 418D00 802A3F70 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 418D04 802A3F74 14400015 */ bnez $v0, .L802A3FCC /* 418D08 802A3F78 00000000 */ nop -/* 418D0C 802A3F7C 3C02802B */ lui $v0, %hi(D_802AD109) -/* 418D10 802A3F80 8042D109 */ lb $v0, %lo(D_802AD109)($v0) +/* 418D0C 802A3F7C 3C02802B */ lui $v0, %hi(battle_menu_moveCursorPos) +/* 418D10 802A3F80 8042D109 */ lb $v0, %lo(battle_menu_moveCursorPos)($v0) /* 418D14 802A3F84 16620025 */ bne $s3, $v0, .L802A401C /* 418D18 802A3F88 00131080 */ sll $v0, $s3, 2 /* 418D1C 802A3F8C 12400007 */ beqz $s2, .L802A3FAC @@ -216,8 +216,8 @@ glabel L802A3D00_418A90 /* 418D54 802A3FC4 080A9007 */ j .L802A401C /* 418D58 802A3FC8 00131080 */ sll $v0, $s3, 2 .L802A3FCC: -/* 418D5C 802A3FCC 3C02802B */ lui $v0, %hi(D_802AD109) -/* 418D60 802A3FD0 8042D109 */ lb $v0, %lo(D_802AD109)($v0) +/* 418D5C 802A3FCC 3C02802B */ lui $v0, %hi(battle_menu_moveCursorPos) +/* 418D60 802A3FD0 8042D109 */ lb $v0, %lo(battle_menu_moveCursorPos)($v0) /* 418D64 802A3FD4 16620011 */ bne $s3, $v0, .L802A401C /* 418D68 802A3FD8 00131080 */ sll $v0, $s3, 2 /* 418D6C 802A3FDC 12400007 */ beqz $s2, .L802A3FFC @@ -239,9 +239,9 @@ glabel L802A3D00_418A90 /* 418DA4 802A4014 00000000 */ nop /* 418DA8 802A4018 00131080 */ sll $v0, $s3, 2 .L802A401C: -/* 418DAC 802A401C 3C03802B */ lui $v1, %hi(D_802AD3E0) +/* 418DAC 802A401C 3C03802B */ lui $v1, %hi(battle_menu_moveOptionDisplayCostReductionColors) /* 418DB0 802A4020 00621821 */ addu $v1, $v1, $v0 -/* 418DB4 802A4024 8C63D3E0 */ lw $v1, %lo(D_802AD3E0)($v1) +/* 418DB4 802A4024 8C63D3E0 */ lw $v1, %lo(battle_menu_moveOptionDisplayCostReductionColors)($v1) /* 418DB8 802A4028 10600005 */ beqz $v1, .L802A4040 /* 418DBC 802A402C 24020001 */ addiu $v0, $zero, 1 /* 418DC0 802A4030 10620005 */ beq $v1, $v0, .L802A4048 @@ -265,18 +265,18 @@ glabel L802A3D00_418A90 /* 418DF8 802A4068 8C420000 */ lw $v0, ($v0) /* 418DFC 802A406C 5040003E */ beql $v0, $zero, .L802A4168 /* 418E00 802A4070 2631000D */ addiu $s1, $s1, 0xd -/* 418E04 802A4074 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 418E08 802A4078 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) -/* 418E0C 802A407C 3C10802B */ lui $s0, %hi(D_802AD190) +/* 418E04 802A4074 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 418E08 802A4078 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) +/* 418E0C 802A407C 3C10802B */ lui $s0, %hi(battle_menu_moveOptionCostUnitIconIDs) /* 418E10 802A4080 02178021 */ addu $s0, $s0, $s7 -/* 418E14 802A4084 8E10D190 */ lw $s0, %lo(D_802AD190)($s0) +/* 418E14 802A4084 8E10D190 */ lw $s0, %lo(battle_menu_moveOptionCostUnitIconIDs)($s0) /* 418E18 802A4088 14400018 */ bnez $v0, .L802A40EC /* 418E1C 802A408C 0240202D */ daddu $a0, $s2, $zero /* 418E20 802A4090 26A5006C */ addiu $a1, $s5, 0x6c /* 418E24 802A4094 0220302D */ daddu $a2, $s1, $zero /* 418E28 802A4098 24070001 */ addiu $a3, $zero, 1 -/* 418E2C 802A409C 3C03802B */ lui $v1, %hi(D_802AD116) -/* 418E30 802A40A0 8463D116 */ lh $v1, %lo(D_802AD116)($v1) +/* 418E2C 802A409C 3C03802B */ lui $v1, %hi(battle_menu_moveTextOpacity) +/* 418E30 802A40A0 8463D116 */ lh $v1, %lo(battle_menu_moveTextOpacity)($v1) /* 418E34 802A40A4 24020003 */ addiu $v0, $zero, 3 /* 418E38 802A40A8 AFA80010 */ sw $t0, 0x10($sp) /* 418E3C 802A40AC AFA20018 */ sw $v0, 0x18($sp) @@ -300,8 +300,8 @@ glabel L802A3D00_418A90 /* 418E7C 802A40EC 26A5005D */ addiu $a1, $s5, 0x5d /* 418E80 802A40F0 0220302D */ daddu $a2, $s1, $zero /* 418E84 802A40F4 24070001 */ addiu $a3, $zero, 1 -/* 418E88 802A40F8 3C03802B */ lui $v1, %hi(D_802AD116) -/* 418E8C 802A40FC 8463D116 */ lh $v1, %lo(D_802AD116)($v1) +/* 418E88 802A40F8 3C03802B */ lui $v1, %hi(battle_menu_moveTextOpacity) +/* 418E8C 802A40FC 8463D116 */ lh $v1, %lo(battle_menu_moveTextOpacity)($v1) /* 418E90 802A4100 24020003 */ addiu $v0, $zero, 3 /* 418E94 802A4104 AFA80010 */ sw $t0, 0x10($sp) /* 418E98 802A4108 AFA20018 */ sw $v0, 0x18($sp) @@ -323,8 +323,8 @@ glabel L802A3D00_418A90 .L802A4144: /* 418ED4 802A4144 0C051261 */ jal set_icon_render_pos /* 418ED8 802A4148 26260007 */ addiu $a2, $s1, 7 -/* 418EDC 802A414C 3C05802B */ lui $a1, %hi(D_802AD116) -/* 418EE0 802A4150 84A5D116 */ lh $a1, %lo(D_802AD116)($a1) +/* 418EDC 802A414C 3C05802B */ lui $a1, %hi(battle_menu_moveTextOpacity) +/* 418EE0 802A4150 84A5D116 */ lh $a1, %lo(battle_menu_moveTextOpacity)($a1) /* 418EE4 802A4154 0C0513AC */ jal icon_set_opacity /* 418EE8 802A4158 0200202D */ daddu $a0, $s0, $zero /* 418EEC 802A415C 0C0511F8 */ jal draw_icon_2 @@ -333,28 +333,28 @@ glabel L802A3D00_418A90 .L802A4168: /* 418EF8 802A4168 26730001 */ addiu $s3, $s3, 1 /* 418EFC 802A416C 26940004 */ addiu $s4, $s4, 4 -/* 418F00 802A4170 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 418F04 802A4174 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 418F00 802A4170 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 418F04 802A4174 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 418F08 802A4178 0262102A */ slt $v0, $s3, $v0 /* 418F0C 802A417C 1440FF4E */ bnez $v0, .L802A3EB8 /* 418F10 802A4180 26F70004 */ addiu $s7, $s7, 4 /* 418F14 802A4184 0000982D */ daddu $s3, $zero, $zero .L802A4188: /* 418F18 802A4188 8FA9004C */ lw $t1, 0x4c($sp) -/* 418F1C 802A418C 3C02802B */ lui $v0, %hi(D_802AD110) -/* 418F20 802A4190 8442D110 */ lh $v0, %lo(D_802AD110)($v0) +/* 418F1C 802A418C 3C02802B */ lui $v0, %hi(battle_menu_moveScrollOffset) +/* 418F20 802A4190 8442D110 */ lh $v0, %lo(battle_menu_moveScrollOffset)($v0) /* 418F24 802A4194 25350018 */ addiu $s5, $t1, 0x18 /* 418F28 802A4198 8FA90050 */ lw $t1, 0x50($sp) -/* 418F2C 802A419C 3C03802B */ lui $v1, %hi(D_802AD4A4) -/* 418F30 802A41A0 8C63D4A4 */ lw $v1, %lo(D_802AD4A4)($v1) +/* 418F2C 802A419C 3C03802B */ lui $v1, %hi(battle_menu_moveOptionCount) +/* 418F30 802A41A0 8C63D4A4 */ lw $v1, %lo(battle_menu_moveOptionCount)($v1) /* 418F34 802A41A4 00491021 */ addu $v0, $v0, $t1 /* 418F38 802A41A8 18600022 */ blez $v1, .L802A4234 /* 418F3C 802A41AC 24510018 */ addiu $s1, $v0, 0x18 -/* 418F40 802A41B0 3C12802B */ lui $s2, %hi(D_802AD128) -/* 418F44 802A41B4 2652D128 */ addiu $s2, $s2, %lo(D_802AD128) +/* 418F40 802A41B0 3C12802B */ lui $s2, %hi(battle_menu_moveOptionIconIDs) +/* 418F44 802A41B4 2652D128 */ addiu $s2, $s2, %lo(battle_menu_moveOptionIconIDs) .L802A41B8: -/* 418F48 802A41B8 3C03802B */ lui $v1, %hi(D_802AD10C) -/* 418F4C 802A41BC 8063D10C */ lb $v1, %lo(D_802AD10C)($v1) +/* 418F48 802A41B8 3C03802B */ lui $v1, %hi(battle_menu_moveScrollLine) +/* 418F4C 802A41BC 8063D10C */ lb $v1, %lo(battle_menu_moveScrollLine)($v1) /* 418F50 802A41C0 2462FFFF */ addiu $v0, $v1, -1 /* 418F54 802A41C4 0262102A */ slt $v0, $s3, $v0 /* 418F58 802A41C8 54400014 */ bnel $v0, $zero, .L802A421C @@ -373,25 +373,25 @@ glabel L802A3D00_418A90 /* 418F88 802A41F8 2631000D */ addiu $s1, $s1, 0xd /* 418F8C 802A41FC 0C051261 */ jal set_icon_render_pos /* 418F90 802A4200 0200202D */ daddu $a0, $s0, $zero -/* 418F94 802A4204 3C05802B */ lui $a1, %hi(D_802AD116) -/* 418F98 802A4208 84A5D116 */ lh $a1, %lo(D_802AD116)($a1) +/* 418F94 802A4204 3C05802B */ lui $a1, %hi(battle_menu_moveTextOpacity) +/* 418F98 802A4208 84A5D116 */ lh $a1, %lo(battle_menu_moveTextOpacity)($a1) /* 418F9C 802A420C 0C0513AC */ jal icon_set_opacity /* 418FA0 802A4210 0200202D */ daddu $a0, $s0, $zero /* 418FA4 802A4214 0C0511F8 */ jal draw_icon_2 /* 418FA8 802A4218 0200202D */ daddu $a0, $s0, $zero .L802A421C: /* 418FAC 802A421C 26730001 */ addiu $s3, $s3, 1 -/* 418FB0 802A4220 3C02802B */ lui $v0, %hi(D_802AD4A4) -/* 418FB4 802A4224 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) +/* 418FB0 802A4220 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) +/* 418FB4 802A4224 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) /* 418FB8 802A4228 0262102A */ slt $v0, $s3, $v0 /* 418FBC 802A422C 1440FFE2 */ bnez $v0, .L802A41B8 /* 418FC0 802A4230 26520004 */ addiu $s2, $s2, 4 .L802A4234: /* 418FC4 802A4234 8FA9004C */ lw $t1, 0x4c($sp) -/* 418FC8 802A4238 3C03802B */ lui $v1, %hi(D_802AD109) -/* 418FCC 802A423C 8063D109 */ lb $v1, %lo(D_802AD109)($v1) -/* 418FD0 802A4240 3C02802B */ lui $v0, %hi(D_802AD10C) -/* 418FD4 802A4244 8042D10C */ lb $v0, %lo(D_802AD10C)($v0) +/* 418FC8 802A4238 3C03802B */ lui $v1, %hi(battle_menu_moveCursorPos) +/* 418FCC 802A423C 8063D109 */ lb $v1, %lo(battle_menu_moveCursorPos)($v1) +/* 418FD0 802A4240 3C02802B */ lui $v0, %hi(battle_menu_moveScrollLine) +/* 418FD4 802A4244 8042D10C */ lb $v0, %lo(battle_menu_moveScrollLine)($v0) /* 418FD8 802A4248 3C08802B */ lui $t0, %hi(D_802AD112) /* 418FDC 802A424C 8508D112 */ lh $t0, %lo(D_802AD112)($t0) /* 418FE0 802A4250 2535000A */ addiu $s5, $t1, 0xa @@ -414,8 +414,8 @@ glabel L802A3D00_418A90 /* 419020 802A4290 02A0282D */ daddu $a1, $s5, $zero /* 419024 802A4294 00083400 */ sll $a2, $t0, 0x10 /* 419028 802A4298 00063403 */ sra $a2, $a2, 0x10 -/* 41902C 802A429C 3C10802B */ lui $s0, %hi(D_802AD118) -/* 419030 802A42A0 8E10D118 */ lw $s0, %lo(D_802AD118)($s0) +/* 41902C 802A429C 3C10802B */ lui $s0, %hi(battle_menu_moveCursorIcon) +/* 419030 802A42A0 8E10D118 */ lw $s0, %lo(battle_menu_moveCursorIcon)($s0) /* 419034 802A42A4 8FA90050 */ lw $t1, 0x50($sp) /* 419038 802A42A8 24C6001A */ addiu $a2, $a2, 0x1a /* 41903C 802A42AC 3C01802B */ lui $at, %hi(D_802AD112) @@ -423,20 +423,20 @@ glabel L802A3D00_418A90 /* 419044 802A42B4 01263021 */ addu $a2, $t1, $a2 /* 419048 802A42B8 0C051261 */ jal set_icon_render_pos /* 41904C 802A42BC 0200202D */ daddu $a0, $s0, $zero -/* 419050 802A42C0 3C11802B */ lui $s1, %hi(D_802AD116) -/* 419054 802A42C4 2631D116 */ addiu $s1, $s1, %lo(D_802AD116) +/* 419050 802A42C0 3C11802B */ lui $s1, %hi(battle_menu_moveTextOpacity) +/* 419054 802A42C4 2631D116 */ addiu $s1, $s1, %lo(battle_menu_moveTextOpacity) /* 419058 802A42C8 86250000 */ lh $a1, ($s1) /* 41905C 802A42CC 0C0513AC */ jal icon_set_opacity /* 419060 802A42D0 0200202D */ daddu $a0, $s0, $zero /* 419064 802A42D4 0C0511F8 */ jal draw_icon_2 /* 419068 802A42D8 0200202D */ daddu $a0, $s0, $zero -/* 41906C 802A42DC 3C02802B */ lui $v0, %hi(D_802AD10C) -/* 419070 802A42E0 8042D10C */ lb $v0, %lo(D_802AD10C)($v0) +/* 41906C 802A42DC 3C02802B */ lui $v0, %hi(battle_menu_moveScrollLine) +/* 419070 802A42E0 8042D10C */ lb $v0, %lo(battle_menu_moveScrollLine)($v0) /* 419074 802A42E4 1840000E */ blez $v0, .L802A4320 /* 419078 802A42E8 00000000 */ nop /* 41907C 802A42EC 8FA9004C */ lw $t1, 0x4c($sp) -/* 419080 802A42F0 3C10802B */ lui $s0, %hi(D_802AD11C) -/* 419084 802A42F4 8E10D11C */ lw $s0, %lo(D_802AD11C)($s0) +/* 419080 802A42F0 3C10802B */ lui $s0, %hi(battle_menu_moveUpArrowIcon) +/* 419084 802A42F4 8E10D11C */ lw $s0, %lo(battle_menu_moveUpArrowIcon)($s0) /* 419088 802A42F8 25250048 */ addiu $a1, $t1, 0x48 /* 41908C 802A42FC 8FA90050 */ lw $t1, 0x50($sp) /* 419090 802A4300 0200202D */ daddu $a0, $s0, $zero @@ -450,14 +450,14 @@ glabel L802A3D00_418A90 .L802A4320: /* 4190B0 802A4320 3C02802B */ lui $v0, %hi(D_802AD10D) /* 4190B4 802A4324 8042D10D */ lb $v0, %lo(D_802AD10D)($v0) -/* 4190B8 802A4328 3C03802B */ lui $v1, %hi(D_802AD4A4) -/* 4190BC 802A432C 8C63D4A4 */ lw $v1, %lo(D_802AD4A4)($v1) +/* 4190B8 802A4328 3C03802B */ lui $v1, %hi(battle_menu_moveOptionCount) +/* 4190BC 802A432C 8C63D4A4 */ lw $v1, %lo(battle_menu_moveOptionCount)($v1) /* 4190C0 802A4330 0043102A */ slt $v0, $v0, $v1 /* 4190C4 802A4334 1040000E */ beqz $v0, .L802A4370 /* 4190C8 802A4338 00000000 */ nop /* 4190CC 802A433C 8FA9004C */ lw $t1, 0x4c($sp) -/* 4190D0 802A4340 3C10802B */ lui $s0, %hi(D_802AD120) -/* 4190D4 802A4344 8E10D120 */ lw $s0, %lo(D_802AD120)($s0) +/* 4190D0 802A4340 3C10802B */ lui $s0, %hi(battle_menu_moveDownArrowIcon) +/* 4190D4 802A4344 8E10D120 */ lw $s0, %lo(battle_menu_moveDownArrowIcon)($s0) /* 4190D8 802A4348 25250048 */ addiu $a1, $t1, 0x48 /* 4190DC 802A434C 8FA90050 */ lw $t1, 0x50($sp) /* 4190E0 802A4350 0200202D */ daddu $a0, $s0, $zero @@ -469,13 +469,13 @@ glabel L802A3D00_418A90 /* 4190F8 802A4368 0C0511EA */ jal draw_icon_0 /* 4190FC 802A436C 0200202D */ daddu $a0, $s0, $zero .L802A4370: -/* 419100 802A4370 3C03802B */ lui $v1, %hi(D_802AD108) -/* 419104 802A4374 8063D108 */ lb $v1, %lo(D_802AD108)($v1) +/* 419100 802A4370 3C03802B */ lui $v1, %hi(battle_menu_moveState) +/* 419104 802A4374 8063D108 */ lb $v1, %lo(battle_menu_moveState)($v1) /* 419108 802A4378 2402FFFF */ addiu $v0, $zero, -1 /* 41910C 802A437C 1462000B */ bne $v1, $v0, .L802A43AC /* 419110 802A4380 00000000 */ nop -/* 419114 802A4384 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 419118 802A4388 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 419114 802A4384 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 419118 802A4388 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 41911C 802A438C 14400005 */ bnez $v0, .L802A43A4 /* 419120 802A4390 00000000 */ nop /* 419124 802A4394 0C03A674 */ jal status_menu_stop_blinking_fp diff --git a/asm/nonmatchings/code_415D90/func_802A43DC.s b/asm/nonmatchings/code_415D90/func_802A43DC.s index b16699e9eb..84547a32c1 100644 --- a/asm/nonmatchings/code_415D90/func_802A43DC.s +++ b/asm/nonmatchings/code_415D90/func_802A43DC.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802A43DC -/* 41916C 802A43DC 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 419170 802A43E0 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 41916C 802A43DC 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 419170 802A43E0 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 419174 802A43E4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 419178 802A43E8 14400009 */ bnez $v0, .L802A4410 /* 41917C 802A43EC AFBF0018 */ sw $ra, 0x18($sp) @@ -11,8 +11,8 @@ glabel func_802A43DC /* 419184 802A43F4 34840045 */ ori $a0, $a0, 0x45 /* 419188 802A43F8 24A50010 */ addiu $a1, $a1, 0x10 /* 41918C 802A43FC 24C60002 */ addiu $a2, $a2, 2 -/* 419190 802A4400 3C07802B */ lui $a3, %hi(D_802AD116) -/* 419194 802A4404 84E7D116 */ lh $a3, %lo(D_802AD116)($a3) +/* 419190 802A4400 3C07802B */ lui $a3, %hi(battle_menu_moveTextOpacity) +/* 419194 802A4404 84E7D116 */ lh $a3, %lo(battle_menu_moveTextOpacity)($a3) /* 419198 802A4408 080A910B */ j .L802A442C /* 41919C 802A440C 24020030 */ addiu $v0, $zero, 0x30 .L802A4410: @@ -20,13 +20,13 @@ glabel func_802A43DC /* 4191A4 802A4414 3484003A */ ori $a0, $a0, 0x3a /* 4191A8 802A4418 24A50006 */ addiu $a1, $a1, 6 /* 4191AC 802A441C 24C60002 */ addiu $a2, $a2, 2 -/* 4191B0 802A4420 3C07802B */ lui $a3, %hi(D_802AD116) -/* 4191B4 802A4424 84E7D116 */ lh $a3, %lo(D_802AD116)($a3) +/* 4191B0 802A4420 3C07802B */ lui $a3, %hi(battle_menu_moveTextOpacity) +/* 4191B4 802A4424 84E7D116 */ lh $a3, %lo(battle_menu_moveTextOpacity)($a3) /* 4191B8 802A4428 24020031 */ addiu $v0, $zero, 0x31 .L802A442C: /* 4191BC 802A442C AFA20010 */ sw $v0, 0x10($sp) /* 4191C0 802A4430 24020001 */ addiu $v0, $zero, 1 -/* 4191C4 802A4434 0C04993B */ jal draw_string +/* 4191C4 802A4434 0C04993B */ jal draw_msg /* 4191C8 802A4438 AFA20014 */ sw $v0, 0x14($sp) /* 4191CC 802A443C 8FBF0018 */ lw $ra, 0x18($sp) /* 4191D0 802A4440 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_415D90/func_802A4448.s b/asm/nonmatchings/code_415D90/func_802A4448.s index c8f8505c96..da21c81f9f 100644 --- a/asm/nonmatchings/code_415D90/func_802A4448.s +++ b/asm/nonmatchings/code_415D90/func_802A4448.s @@ -5,14 +5,14 @@ glabel func_802A4448 /* 4191D8 802A4448 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4191DC 802A444C 24A50010 */ addiu $a1, $a1, 0x10 /* 4191E0 802A4450 AFB00010 */ sw $s0, 0x10($sp) -/* 4191E4 802A4454 3C10802B */ lui $s0, %hi(D_802AD188) -/* 4191E8 802A4458 8E10D188 */ lw $s0, %lo(D_802AD188)($s0) +/* 4191E4 802A4454 3C10802B */ lui $s0, %hi(battle_menu_moveTitleIcon) +/* 4191E8 802A4458 8E10D188 */ lw $s0, %lo(battle_menu_moveTitleIcon)($s0) /* 4191EC 802A445C 24C6000F */ addiu $a2, $a2, 0xf /* 4191F0 802A4460 AFBF0014 */ sw $ra, 0x14($sp) /* 4191F4 802A4464 0C051261 */ jal set_icon_render_pos /* 4191F8 802A4468 0200202D */ daddu $a0, $s0, $zero -/* 4191FC 802A446C 3C05802B */ lui $a1, %hi(D_802AD116) -/* 419200 802A4470 84A5D116 */ lh $a1, %lo(D_802AD116)($a1) +/* 4191FC 802A446C 3C05802B */ lui $a1, %hi(battle_menu_moveTextOpacity) +/* 419200 802A4470 84A5D116 */ lh $a1, %lo(battle_menu_moveTextOpacity)($a1) /* 419204 802A4474 0C0513AC */ jal icon_set_opacity /* 419208 802A4478 0200202D */ daddu $a0, $s0, $zero /* 41920C 802A447C 0C0511EA */ jal draw_icon_0 diff --git a/asm/nonmatchings/code_415D90/func_802A4494.s b/asm/nonmatchings/code_415D90/func_802A4494.s index 9ae5a4ed5a..7f14bd1180 100644 --- a/asm/nonmatchings/code_415D90/func_802A4494.s +++ b/asm/nonmatchings/code_415D90/func_802A4494.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802A4494 -/* 419224 802A4494 3C02802B */ lui $v0, %hi(D_802AD108) -/* 419228 802A4498 9042D108 */ lbu $v0, %lo(D_802AD108)($v0) +/* 419224 802A4494 3C02802B */ lui $v0, %hi(battle_menu_moveState) +/* 419228 802A4498 9042D108 */ lbu $v0, %lo(battle_menu_moveState)($v0) /* 41922C 802A449C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 419230 802A44A0 24420001 */ addiu $v0, $v0, 1 /* 419234 802A44A4 00021600 */ sll $v0, $v0, 0x18 @@ -22,23 +22,23 @@ glabel L802A44D0_419260 /* 419264 802A44D4 8042D10F */ lb $v0, %lo(D_802AD10F)($v0) /* 419268 802A44D8 10400013 */ beqz $v0, .L802A4528 /* 41926C 802A44DC 00000000 */ nop -/* 419270 802A44E0 3C02802B */ lui $v0, %hi(D_802AD109) -/* 419274 802A44E4 8042D109 */ lb $v0, %lo(D_802AD109)($v0) -/* 419278 802A44E8 3C03802B */ lui $v1, %hi(D_802AD114) -/* 41927C 802A44EC 8463D114 */ lh $v1, %lo(D_802AD114)($v1) -/* 419280 802A44F0 3C07802B */ lui $a3, %hi(D_802AD116) -/* 419284 802A44F4 84E7D116 */ lh $a3, %lo(D_802AD116)($a3) +/* 419270 802A44E0 3C02802B */ lui $v0, %hi(battle_menu_moveCursorPos) +/* 419274 802A44E4 8042D109 */ lb $v0, %lo(battle_menu_moveCursorPos)($v0) +/* 419278 802A44E8 3C03802B */ lui $v1, %hi(battle_menu_moveTextColor) +/* 41927C 802A44EC 8463D114 */ lh $v1, %lo(battle_menu_moveTextColor)($v1) +/* 419280 802A44F0 3C07802B */ lui $a3, %hi(battle_menu_moveTextOpacity) +/* 419284 802A44F4 84E7D116 */ lh $a3, %lo(battle_menu_moveTextOpacity)($a3) /* 419288 802A44F8 00021080 */ sll $v0, $v0, 2 -/* 41928C 802A44FC 3C01802B */ lui $at, %hi(D_802AD1F8) +/* 41928C 802A44FC 3C01802B */ lui $at, %hi(battle_menu_moveOptionIndexMap) /* 419290 802A4500 00220821 */ addu $at, $at, $v0 -/* 419294 802A4504 8C22D1F8 */ lw $v0, %lo(D_802AD1F8)($at) +/* 419294 802A4504 8C22D1F8 */ lw $v0, %lo(battle_menu_moveOptionIndexMap)($at) /* 419298 802A4508 AFA30010 */ sw $v1, 0x10($sp) /* 41929C 802A450C AFA00014 */ sw $zero, 0x14($sp) /* 4192A0 802A4510 00021080 */ sll $v0, $v0, 2 -/* 4192A4 802A4514 3C04802B */ lui $a0, %hi(D_802AD570) +/* 4192A4 802A4514 3C04802B */ lui $a0, %hi(battle_menu_moveOptionDescriptions) /* 4192A8 802A4518 00822021 */ addu $a0, $a0, $v0 -/* 4192AC 802A451C 8C84D570 */ lw $a0, %lo(D_802AD570)($a0) -/* 4192B0 802A4520 0C04993B */ jal draw_string +/* 4192AC 802A451C 8C84D570 */ lw $a0, %lo(battle_menu_moveOptionDescriptions)($a0) +/* 4192B0 802A4520 0C04993B */ jal draw_msg /* 4192B4 802A4524 24A50008 */ addiu $a1, $a1, 8 .L802A4528: glabel L802A4528_4192B8 diff --git a/asm/nonmatchings/code_415D90/func_802A4534.s b/asm/nonmatchings/code_415D90/func_802A4534.s index bcc94c946c..873543bb48 100644 --- a/asm/nonmatchings/code_415D90/func_802A4534.s +++ b/asm/nonmatchings/code_415D90/func_802A4534.s @@ -17,14 +17,14 @@ glabel func_802A4534 /* 4192F4 802A4564 361000C3 */ ori $s0, $s0, 0xc3 .L802A4568: /* 4192F8 802A4568 3C10001D */ lui $s0, 0x1d -/* 4192FC 802A456C 3C02802B */ lui $v0, %hi(D_802AD4A0) -/* 419300 802A4570 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) +/* 4192FC 802A456C 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) +/* 419300 802A4570 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) /* 419304 802A4574 14400003 */ bnez $v0, .L802A4584 /* 419308 802A4578 361000A0 */ ori $s0, $s0, 0xa0 /* 41930C 802A457C 3C10001D */ lui $s0, 0x1d /* 419310 802A4580 3610009F */ ori $s0, $s0, 0x9f .L802A4584: -/* 419314 802A4584 0C04992C */ jal func_801264B0 +/* 419314 802A4584 0C04992C */ jal get_msg_lines /* 419318 802A4588 0200202D */ daddu $a0, $s0, $zero /* 41931C 802A458C 0200202D */ daddu $a0, $s0, $zero /* 419320 802A4590 2442FFFF */ addiu $v0, $v0, -1 @@ -37,7 +37,7 @@ glabel func_802A4534 /* 41933C 802A45AC 240700FF */ addiu $a3, $zero, 0xff /* 419340 802A45B0 AFA20010 */ sw $v0, 0x10($sp) /* 419344 802A45B4 AFA00014 */ sw $zero, 0x14($sp) -/* 419348 802A45B8 0C04993B */ jal draw_string +/* 419348 802A45B8 0C04993B */ jal draw_msg /* 41934C 802A45BC 02263021 */ addu $a2, $s1, $a2 /* 419350 802A45C0 8FBF0024 */ lw $ra, 0x24($sp) /* 419354 802A45C4 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A472C.s b/asm/nonmatchings/code_415D90/func_802A472C.s index 187667da50..fc80097971 100644 --- a/asm/nonmatchings/code_415D90/func_802A472C.s +++ b/asm/nonmatchings/code_415D90/func_802A472C.s @@ -7,13 +7,13 @@ glabel func_802A472C /* 4194C4 802A4734 24050002 */ addiu $a1, $zero, 2 /* 4194C8 802A4738 AFBF0018 */ sw $ra, 0x18($sp) /* 4194CC 802A473C AFB10014 */ sw $s1, 0x14($sp) -/* 4194D0 802A4740 0C051F9F */ jal func_80147E7C +/* 4194D0 802A4740 0C051F9F */ jal set_window_update /* 4194D4 802A4744 AFB00010 */ sw $s0, 0x10($sp) /* 4194D8 802A4748 24040007 */ addiu $a0, $zero, 7 -/* 4194DC 802A474C 0C051F9F */ jal func_80147E7C +/* 4194DC 802A474C 0C051F9F */ jal set_window_update /* 4194E0 802A4750 24050002 */ addiu $a1, $zero, 2 /* 4194E4 802A4754 24040008 */ addiu $a0, $zero, 8 -/* 4194E8 802A4758 0C051F9F */ jal func_80147E7C +/* 4194E8 802A4758 0C051F9F */ jal set_window_update /* 4194EC 802A475C 24050002 */ addiu $a1, $zero, 2 /* 4194F0 802A4760 3C02802B */ lui $v0, %hi(D_802AD66C) /* 4194F4 802A4764 8C42D66C */ lw $v0, %lo(D_802AD66C)($v0) diff --git a/asm/nonmatchings/code_415D90/func_802A47E0.s b/asm/nonmatchings/code_415D90/func_802A47E0.s index 28b1951793..a136e4a68b 100644 --- a/asm/nonmatchings/code_415D90/func_802A47E0.s +++ b/asm/nonmatchings/code_415D90/func_802A47E0.s @@ -51,13 +51,13 @@ glabel func_802A47E0 /* 419620 802A4890 0C0511FF */ jal set_menu_icon_script /* 419624 802A4894 00000000 */ nop /* 419628 802A4898 24040006 */ addiu $a0, $zero, 6 -/* 41962C 802A489C 0C051F9F */ jal func_80147E7C +/* 41962C 802A489C 0C051F9F */ jal set_window_update /* 419630 802A48A0 24050005 */ addiu $a1, $zero, 5 /* 419634 802A48A4 24040007 */ addiu $a0, $zero, 7 -/* 419638 802A48A8 0C051F9F */ jal func_80147E7C +/* 419638 802A48A8 0C051F9F */ jal set_window_update /* 41963C 802A48AC 24050005 */ addiu $a1, $zero, 5 /* 419640 802A48B0 24040008 */ addiu $a0, $zero, 8 -/* 419644 802A48B4 0C051F9F */ jal func_80147E7C +/* 419644 802A48B4 0C051F9F */ jal set_window_update /* 419648 802A48B8 24050001 */ addiu $a1, $zero, 1 /* 41964C 802A48BC 2402000A */ addiu $v0, $zero, 0xa /* 419650 802A48C0 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A48FC.s b/asm/nonmatchings/code_415D90/func_802A48FC.s index ed67c84144..06e0f6f1be 100644 --- a/asm/nonmatchings/code_415D90/func_802A48FC.s +++ b/asm/nonmatchings/code_415D90/func_802A48FC.s @@ -7,13 +7,13 @@ glabel func_802A48FC /* 419694 802A4904 24050005 */ addiu $a1, $zero, 5 /* 419698 802A4908 AFBF0018 */ sw $ra, 0x18($sp) /* 41969C 802A490C AFB10014 */ sw $s1, 0x14($sp) -/* 4196A0 802A4910 0C051F9F */ jal func_80147E7C +/* 4196A0 802A4910 0C051F9F */ jal set_window_update /* 4196A4 802A4914 AFB00010 */ sw $s0, 0x10($sp) /* 4196A8 802A4918 24040007 */ addiu $a0, $zero, 7 -/* 4196AC 802A491C 0C051F9F */ jal func_80147E7C +/* 4196AC 802A491C 0C051F9F */ jal set_window_update /* 4196B0 802A4920 24050005 */ addiu $a1, $zero, 5 /* 4196B4 802A4924 24040008 */ addiu $a0, $zero, 8 -/* 4196B8 802A4928 0C051F9F */ jal func_80147E7C +/* 4196B8 802A4928 0C051F9F */ jal set_window_update /* 4196BC 802A492C 24050001 */ addiu $a1, $zero, 1 /* 4196C0 802A4930 3C02802B */ lui $v0, %hi(D_802AD66C) /* 4196C4 802A4934 8C42D66C */ lw $v0, %lo(D_802AD66C)($v0) diff --git a/asm/nonmatchings/code_415D90/func_802A4A10.s b/asm/nonmatchings/code_415D90/func_802A4A10.s index f0cfb16aa1..494e3615fd 100644 --- a/asm/nonmatchings/code_415D90/func_802A4A10.s +++ b/asm/nonmatchings/code_415D90/func_802A4A10.s @@ -5,13 +5,13 @@ glabel func_802A4A10 /* 4197A0 802A4A10 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4197A4 802A4A14 24040006 */ addiu $a0, $zero, 6 /* 4197A8 802A4A18 AFBF0010 */ sw $ra, 0x10($sp) -/* 4197AC 802A4A1C 0C051F9F */ jal func_80147E7C +/* 4197AC 802A4A1C 0C051F9F */ jal set_window_update /* 4197B0 802A4A20 24050005 */ addiu $a1, $zero, 5 /* 4197B4 802A4A24 24040007 */ addiu $a0, $zero, 7 -/* 4197B8 802A4A28 0C051F9F */ jal func_80147E7C +/* 4197B8 802A4A28 0C051F9F */ jal set_window_update /* 4197BC 802A4A2C 24050005 */ addiu $a1, $zero, 5 /* 4197C0 802A4A30 24040008 */ addiu $a0, $zero, 8 -/* 4197C4 802A4A34 0C051F9F */ jal func_80147E7C +/* 4197C4 802A4A34 0C051F9F */ jal set_window_update /* 4197C8 802A4A38 24050001 */ addiu $a1, $zero, 1 /* 4197CC 802A4A3C 8FBF0010 */ lw $ra, 0x10($sp) /* 4197D0 802A4A40 2402001E */ addiu $v0, $zero, 0x1e diff --git a/asm/nonmatchings/code_415D90/func_802A4A54.s b/asm/nonmatchings/code_415D90/func_802A4A54.s index 8edd129e7a..b2bba1e50c 100644 --- a/asm/nonmatchings/code_415D90/func_802A4A54.s +++ b/asm/nonmatchings/code_415D90/func_802A4A54.s @@ -152,7 +152,7 @@ glabel L802A4AA8_419838 /* 419A24 802A4C94 00021080 */ sll $v0, $v0, 2 /* 419A28 802A4C98 00431021 */ addu $v0, $v0, $v1 /* 419A2C 802A4C9C 2442001A */ addiu $v0, $v0, 0x1a -/* 419A30 802A4CA0 0C051F32 */ jal set_ui_panel_properties +/* 419A30 802A4CA0 0C051F32 */ jal set_window_properties /* 419A34 802A4CA4 AFA20010 */ sw $v0, 0x10($sp) /* 419A38 802A4CA8 24040007 */ addiu $a0, $zero, 7 /* 419A3C 802A4CAC 26650012 */ addiu $a1, $s3, 0x12 @@ -166,7 +166,7 @@ glabel L802A4AA8_419838 /* 419A5C 802A4CCC AFB00014 */ sw $s0, 0x14($sp) /* 419A60 802A4CD0 AFA20018 */ sw $v0, 0x18($sp) /* 419A64 802A4CD4 AFA0001C */ sw $zero, 0x1c($sp) -/* 419A68 802A4CD8 0C051F32 */ jal set_ui_panel_properties +/* 419A68 802A4CD8 0C051F32 */ jal set_window_properties /* 419A6C 802A4CDC AFB20020 */ sw $s2, 0x20($sp) /* 419A70 802A4CE0 24130014 */ addiu $s3, $zero, 0x14 /* 419A74 802A4CE4 24040008 */ addiu $a0, $zero, 8 @@ -180,16 +180,16 @@ glabel L802A4AA8_419838 /* 419A94 802A4D04 AFB30014 */ sw $s3, 0x14($sp) /* 419A98 802A4D08 AFA20018 */ sw $v0, 0x18($sp) /* 419A9C 802A4D0C AFA0001C */ sw $zero, 0x1c($sp) -/* 419AA0 802A4D10 0C051F32 */ jal set_ui_panel_properties +/* 419AA0 802A4D10 0C051F32 */ jal set_window_properties /* 419AA4 802A4D14 AFB20020 */ sw $s2, 0x20($sp) /* 419AA8 802A4D18 24040006 */ addiu $a0, $zero, 6 -/* 419AAC 802A4D1C 0C051F9F */ jal func_80147E7C +/* 419AAC 802A4D1C 0C051F9F */ jal set_window_update /* 419AB0 802A4D20 0200282D */ daddu $a1, $s0, $zero /* 419AB4 802A4D24 24040007 */ addiu $a0, $zero, 7 -/* 419AB8 802A4D28 0C051F9F */ jal func_80147E7C +/* 419AB8 802A4D28 0C051F9F */ jal set_window_update /* 419ABC 802A4D2C 0200282D */ daddu $a1, $s0, $zero /* 419AC0 802A4D30 24040008 */ addiu $a0, $zero, 8 -/* 419AC4 802A4D34 0C051F9F */ jal func_80147E7C +/* 419AC4 802A4D34 0C051F9F */ jal set_window_update /* 419AC8 802A4D38 0200282D */ daddu $a1, $s0, $zero /* 419ACC 802A4D3C 3C01802B */ lui $at, %hi(D_802AD604) /* 419AD0 802A4D40 A030D604 */ sb $s0, %lo(D_802AD604)($at) @@ -395,13 +395,13 @@ glabel L802A4F74_419D04 /* 419DB0 802A5020 2402000D */ addiu $v0, $zero, 0xd /* 419DB4 802A5024 3C01802B */ lui $at, %hi(D_802AD614) /* 419DB8 802A5028 A022D614 */ sb $v0, %lo(D_802AD614)($at) -/* 419DBC 802A502C 0C051F9F */ jal func_80147E7C +/* 419DBC 802A502C 0C051F9F */ jal set_window_update /* 419DC0 802A5030 24050004 */ addiu $a1, $zero, 4 /* 419DC4 802A5034 24040007 */ addiu $a0, $zero, 7 -/* 419DC8 802A5038 0C051F9F */ jal func_80147E7C +/* 419DC8 802A5038 0C051F9F */ jal set_window_update /* 419DCC 802A503C 24050004 */ addiu $a1, $zero, 4 /* 419DD0 802A5040 24040008 */ addiu $a0, $zero, 8 -/* 419DD4 802A5044 0C051F9F */ jal func_80147E7C +/* 419DD4 802A5044 0C051F9F */ jal set_window_update /* 419DD8 802A5048 24050002 */ addiu $a1, $zero, 2 /* 419DDC 802A504C 080A9424 */ j .L802A5090 /* 419DE0 802A5050 00000000 */ nop @@ -410,13 +410,13 @@ glabel L802A5054_419DE4 /* 419DE8 802A5058 240200FF */ addiu $v0, $zero, 0xff glabel L802A505C_419DEC /* 419DEC 802A505C 24040006 */ addiu $a0, $zero, 6 -/* 419DF0 802A5060 0C051F9F */ jal func_80147E7C +/* 419DF0 802A5060 0C051F9F */ jal set_window_update /* 419DF4 802A5064 24050002 */ addiu $a1, $zero, 2 /* 419DF8 802A5068 24040007 */ addiu $a0, $zero, 7 -/* 419DFC 802A506C 0C051F9F */ jal func_80147E7C +/* 419DFC 802A506C 0C051F9F */ jal set_window_update /* 419E00 802A5070 24050002 */ addiu $a1, $zero, 2 /* 419E04 802A5074 24040008 */ addiu $a0, $zero, 8 -/* 419E08 802A5078 0C051F9F */ jal func_80147E7C +/* 419E08 802A5078 0C051F9F */ jal set_window_update /* 419E0C 802A507C 24050002 */ addiu $a1, $zero, 2 /* 419E10 802A5080 3C02802B */ lui $v0, %hi(D_802AD605) /* 419E14 802A5084 8042D605 */ lb $v0, %lo(D_802AD605)($v0) @@ -430,13 +430,13 @@ glabel L802A5090_419E20 /* 419E2C 802A509C 24420001 */ addiu $v0, $v0, 1 glabel L802A50A0_419E30 /* 419E30 802A50A0 24040006 */ addiu $a0, $zero, 6 -/* 419E34 802A50A4 0C051F9F */ jal func_80147E7C +/* 419E34 802A50A4 0C051F9F */ jal set_window_update /* 419E38 802A50A8 24050001 */ addiu $a1, $zero, 1 /* 419E3C 802A50AC 24040007 */ addiu $a0, $zero, 7 -/* 419E40 802A50B0 0C051F9F */ jal func_80147E7C +/* 419E40 802A50B0 0C051F9F */ jal set_window_update /* 419E44 802A50B4 24050001 */ addiu $a1, $zero, 1 /* 419E48 802A50B8 24040008 */ addiu $a0, $zero, 8 -/* 419E4C 802A50BC 0C051F9F */ jal func_80147E7C +/* 419E4C 802A50BC 0C051F9F */ jal set_window_update /* 419E50 802A50C0 24050001 */ addiu $a1, $zero, 1 /* 419E54 802A50C4 3C02802B */ lui $v0, %hi(D_802AD605) /* 419E58 802A50C8 8042D605 */ lb $v0, %lo(D_802AD605)($v0) @@ -448,13 +448,13 @@ glabel L802A50A0_419E30 /* 419E6C 802A50DC 24420001 */ addiu $v0, $v0, 1 glabel L802A50E0_419E70 /* 419E70 802A50E0 24040006 */ addiu $a0, $zero, 6 -/* 419E74 802A50E4 0C051F9F */ jal func_80147E7C +/* 419E74 802A50E4 0C051F9F */ jal set_window_update /* 419E78 802A50E8 24050001 */ addiu $a1, $zero, 1 /* 419E7C 802A50EC 24040007 */ addiu $a0, $zero, 7 -/* 419E80 802A50F0 0C051F9F */ jal func_80147E7C +/* 419E80 802A50F0 0C051F9F */ jal set_window_update /* 419E84 802A50F4 24050001 */ addiu $a1, $zero, 1 /* 419E88 802A50F8 24040008 */ addiu $a0, $zero, 8 -/* 419E8C 802A50FC 0C051F9F */ jal func_80147E7C +/* 419E8C 802A50FC 0C051F9F */ jal set_window_update /* 419E90 802A5100 24050001 */ addiu $a1, $zero, 1 /* 419E94 802A5104 080A949A */ j .L802A5268 /* 419E98 802A5108 2402FFFF */ addiu $v0, $zero, -1 @@ -470,13 +470,13 @@ glabel L802A510C_419E9C /* 419EBC 802A512C 00000000 */ nop glabel L802A5130_419EC0 /* 419EC0 802A5130 24040006 */ addiu $a0, $zero, 6 -/* 419EC4 802A5134 0C051F9F */ jal func_80147E7C +/* 419EC4 802A5134 0C051F9F */ jal set_window_update /* 419EC8 802A5138 24050002 */ addiu $a1, $zero, 2 /* 419ECC 802A513C 24040007 */ addiu $a0, $zero, 7 -/* 419ED0 802A5140 0C051F9F */ jal func_80147E7C +/* 419ED0 802A5140 0C051F9F */ jal set_window_update /* 419ED4 802A5144 24050002 */ addiu $a1, $zero, 2 /* 419ED8 802A5148 24040008 */ addiu $a0, $zero, 8 -/* 419EDC 802A514C 0C051F9F */ jal func_80147E7C +/* 419EDC 802A514C 0C051F9F */ jal set_window_update /* 419EE0 802A5150 24050002 */ addiu $a1, $zero, 2 /* 419EE4 802A5154 3C03802B */ lui $v1, %hi(D_802AD610) /* 419EE8 802A5158 8463D610 */ lh $v1, %lo(D_802AD610)($v1) @@ -506,10 +506,10 @@ glabel L802A5130_419EC0 /* 419F40 802A51B0 AFA20018 */ sw $v0, 0x18($sp) /* 419F44 802A51B4 2402FFFF */ addiu $v0, $zero, -1 /* 419F48 802A51B8 AFA0001C */ sw $zero, 0x1c($sp) -/* 419F4C 802A51BC 0C051F32 */ jal set_ui_panel_properties +/* 419F4C 802A51BC 0C051F32 */ jal set_window_properties /* 419F50 802A51C0 AFA20020 */ sw $v0, 0x20($sp) /* 419F54 802A51C4 24040009 */ addiu $a0, $zero, 9 -/* 419F58 802A51C8 0C051F9F */ jal func_80147E7C +/* 419F58 802A51C8 0C051F9F */ jal set_window_update /* 419F5C 802A51CC 24050001 */ addiu $a1, $zero, 1 /* 419F60 802A51D0 2403003C */ addiu $v1, $zero, 0x3c /* 419F64 802A51D4 3C01802B */ lui $at, %hi(D_802AD612) @@ -540,16 +540,16 @@ glabel L802A51F0_419F80 /* 419FC0 802A5230 2402FFFF */ addiu $v0, $zero, -1 .L802A5234: /* 419FC4 802A5234 24040009 */ addiu $a0, $zero, 9 -/* 419FC8 802A5238 0C051F9F */ jal func_80147E7C +/* 419FC8 802A5238 0C051F9F */ jal set_window_update /* 419FCC 802A523C 24050002 */ addiu $a1, $zero, 2 /* 419FD0 802A5240 24040006 */ addiu $a0, $zero, 6 -/* 419FD4 802A5244 0C051F9F */ jal func_80147E7C +/* 419FD4 802A5244 0C051F9F */ jal set_window_update /* 419FD8 802A5248 24050001 */ addiu $a1, $zero, 1 /* 419FDC 802A524C 24040007 */ addiu $a0, $zero, 7 -/* 419FE0 802A5250 0C051F9F */ jal func_80147E7C +/* 419FE0 802A5250 0C051F9F */ jal set_window_update /* 419FE4 802A5254 24050001 */ addiu $a1, $zero, 1 /* 419FE8 802A5258 24040008 */ addiu $a0, $zero, 8 -/* 419FEC 802A525C 0C051F9F */ jal func_80147E7C +/* 419FEC 802A525C 0C051F9F */ jal set_window_update /* 419FF0 802A5260 24050001 */ addiu $a1, $zero, 1 /* 419FF4 802A5264 24020001 */ addiu $v0, $zero, 1 .L802A5268: diff --git a/asm/nonmatchings/code_415D90/func_802A5290.s b/asm/nonmatchings/code_415D90/func_802A5290.s index 7083ed698c..99787c1381 100644 --- a/asm/nonmatchings/code_415D90/func_802A5290.s +++ b/asm/nonmatchings/code_415D90/func_802A5290.s @@ -165,7 +165,7 @@ glabel L802A52F8_41A088 /* 41A28C 802A54FC 8C440000 */ lw $a0, ($v0) /* 41A290 802A5500 3C07802B */ lui $a3, %hi(D_802AD624) /* 41A294 802A5504 8CE7D624 */ lw $a3, %lo(D_802AD624)($a3) -/* 41A298 802A5508 0C04993B */ jal draw_string +/* 41A298 802A5508 0C04993B */ jal draw_msg /* 41A29C 802A550C 26940004 */ addiu $s4, $s4, 4 /* 41A2A0 802A5510 3C02802B */ lui $v0, %hi(D_802AD66C) /* 41A2A4 802A5514 8C42D66C */ lw $v0, %lo(D_802AD66C)($v0) diff --git a/asm/nonmatchings/code_415D90/func_802A56F8.s b/asm/nonmatchings/code_415D90/func_802A56F8.s index 0622950ea1..a1575051dd 100644 --- a/asm/nonmatchings/code_415D90/func_802A56F8.s +++ b/asm/nonmatchings/code_415D90/func_802A56F8.s @@ -13,7 +13,7 @@ glabel func_802A56F8 /* 41A4A8 802A5718 8CE7D624 */ lw $a3, %lo(D_802AD624)($a3) /* 41A4AC 802A571C 24C60002 */ addiu $a2, $a2, 2 /* 41A4B0 802A5720 AFBF0018 */ sw $ra, 0x18($sp) -/* 41A4B4 802A5724 0C04993B */ jal draw_string +/* 41A4B4 802A5724 0C04993B */ jal draw_msg /* 41A4B8 802A5728 AFA20014 */ sw $v0, 0x14($sp) /* 41A4BC 802A572C 8FBF0018 */ lw $ra, 0x18($sp) /* 41A4C0 802A5730 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_415D90/func_802A5738.s b/asm/nonmatchings/code_415D90/func_802A5738.s index ac12dfb947..59980a010b 100644 --- a/asm/nonmatchings/code_415D90/func_802A5738.s +++ b/asm/nonmatchings/code_415D90/func_802A5738.s @@ -34,7 +34,7 @@ glabel L802A5774_41A504 /* 41A538 802A57A8 3C04802B */ lui $a0, %hi(D_802AD6C0) /* 41A53C 802A57AC 00822021 */ addu $a0, $a0, $v0 /* 41A540 802A57B0 8C84D6C0 */ lw $a0, %lo(D_802AD6C0)($a0) -/* 41A544 802A57B4 0C04993B */ jal draw_string +/* 41A544 802A57B4 0C04993B */ jal draw_msg /* 41A548 802A57B8 24A50008 */ addiu $a1, $a1, 8 .L802A57BC: glabel L802A57BC_41A54C diff --git a/asm/nonmatchings/code_415D90/func_802A57C8.s b/asm/nonmatchings/code_415D90/func_802A57C8.s index 8580bc89ac..83927f7fd1 100644 --- a/asm/nonmatchings/code_415D90/func_802A57C8.s +++ b/asm/nonmatchings/code_415D90/func_802A57C8.s @@ -19,7 +19,7 @@ glabel func_802A57C8 /* 41A588 802A57F8 2402000F */ addiu $v0, $zero, 0xf /* 41A58C 802A57FC 240700FF */ addiu $a3, $zero, 0xff /* 41A590 802A5800 AFA20010 */ sw $v0, 0x10($sp) -/* 41A594 802A5804 0C04993B */ jal draw_string +/* 41A594 802A5804 0C04993B */ jal draw_msg /* 41A598 802A5808 AFA00014 */ sw $zero, 0x14($sp) /* 41A59C 802A580C 8FBF0018 */ lw $ra, 0x18($sp) /* 41A5A0 802A5810 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_415D90/func_802A9B44.s b/asm/nonmatchings/code_415D90/func_802A9B44.s index fd1e957400..79aabe2799 100644 --- a/asm/nonmatchings/code_415D90/func_802A9B44.s +++ b/asm/nonmatchings/code_415D90/func_802A9B44.s @@ -182,18 +182,18 @@ glabel L802A9DAC_41EB3C /* 41EB80 802A9DF0 AE220000 */ sw $v0, ($s1) .L802A9DF4: /* 41EB84 802A9DF4 24020008 */ addiu $v0, $zero, 8 -/* 41EB88 802A9DF8 3C07802B */ lui $a3, %hi(D_802AD0D0) -/* 41EB8C 802A9DFC 24E7D0D0 */ addiu $a3, $a3, %lo(D_802AD0D0) +/* 41EB88 802A9DF8 3C07802B */ lui $a3, %hi(battle_menu_isEnabled) +/* 41EB8C 802A9DFC 24E7D0D0 */ addiu $a3, $a3, %lo(battle_menu_isEnabled) /* 41EB90 802A9E00 A640017C */ sh $zero, 0x17c($s2) -/* 41EB94 802A9E04 3C01802B */ lui $at, %hi(D_802AD0B8) -/* 41EB98 802A9E08 AC22D0B8 */ sw $v0, %lo(D_802AD0B8)($at) +/* 41EB94 802A9E04 3C01802B */ lui $at, %hi(battle_menu_submenuIDs) +/* 41EB98 802A9E08 AC22D0B8 */ sw $v0, %lo(battle_menu_submenuIDs)($at) /* 41EB9C 802A9E0C 24020001 */ addiu $v0, $zero, 1 -/* 41EBA0 802A9E10 3C08802B */ lui $t0, %hi(D_802AD0E8) -/* 41EBA4 802A9E14 2508D0E8 */ addiu $t0, $t0, %lo(D_802AD0E8) +/* 41EBA0 802A9E10 3C08802B */ lui $t0, %hi(battle_menu_isMessageDisabled) +/* 41EBA4 802A9E14 2508D0E8 */ addiu $t0, $t0, %lo(battle_menu_isMessageDisabled) /* 41EBA8 802A9E18 3C06802B */ lui $a2, %hi(D_802AB720) /* 41EBAC 802A9E1C 24C6B720 */ addiu $a2, $a2, %lo(D_802AB720) -/* 41EBB0 802A9E20 3C05802B */ lui $a1, %hi(D_802AD078) -/* 41EBB4 802A9E24 24A5D078 */ addiu $a1, $a1, %lo(D_802AD078) +/* 41EBB0 802A9E20 3C05802B */ lui $a1, %hi(main_battle_menu_iconScripts) +/* 41EBB4 802A9E24 24A5D078 */ addiu $a1, $a1, %lo(main_battle_menu_iconScripts) /* 41EBB8 802A9E28 ACE20000 */ sw $v0, ($a3) /* 41EBBC 802A9E2C AD000000 */ sw $zero, ($t0) /* 41EBC0 802A9E30 8CC30000 */ lw $v1, ($a2) @@ -202,8 +202,8 @@ glabel L802A9DAC_41EB3C /* 41EBCC 802A9E3C 8C84B728 */ lw $a0, %lo(D_802AB728)($a0) /* 41EBD0 802A9E40 30420100 */ andi $v0, $v0, 0x100 /* 41EBD4 802A9E44 ACA30000 */ sw $v1, ($a1) -/* 41EBD8 802A9E48 3C01802B */ lui $at, %hi(D_802AD090) -/* 41EBDC 802A9E4C AC24D090 */ sw $a0, %lo(D_802AD090)($at) +/* 41EBD8 802A9E48 3C01802B */ lui $at, %hi(battle_menu_messageIDs) +/* 41EBDC 802A9E4C AC24D090 */ sw $a0, %lo(battle_menu_messageIDs)($at) /* 41EBE0 802A9E50 14400006 */ bnez $v0, .L802A9E6C /* 41EBE4 802A9E54 0000882D */ daddu $s1, $zero, $zero /* 41EBE8 802A9E58 ACE00000 */ sw $zero, ($a3) @@ -225,8 +225,8 @@ glabel L802A9DAC_41EB3C /* 41EC20 802A9E90 AC20D104 */ sw $zero, %lo(D_802AD104)($at) /* 41EC24 802A9E94 00511023 */ subu $v0, $v0, $s1 .L802A9E98: -/* 41EC28 802A9E98 3C01802B */ lui $at, %hi(D_802AD0AC) -/* 41EC2C 802A9E9C AC30D0AC */ sw $s0, %lo(D_802AD0AC)($at) +/* 41EC28 802A9E98 3C01802B */ lui $at, %hi(main_menu_numOptions) +/* 41EC2C 802A9E9C AC30D0AC */ sw $s0, %lo(main_menu_numOptions)($at) /* 41EC30 802A9EA0 3C01802B */ lui $at, %hi(D_802AD0A8) /* 41EC34 802A9EA4 AC20D0A8 */ sw $zero, %lo(D_802AD0A8)($at) /* 41EC38 802A9EA8 3C01802B */ lui $at, %hi(D_802AD0B0) diff --git a/asm/nonmatchings/code_415D90/func_802AA0B8.s b/asm/nonmatchings/code_415D90/func_802AA0B8.s index 2ab86f498d..580fc78527 100644 --- a/asm/nonmatchings/code_415D90/func_802AA0B8.s +++ b/asm/nonmatchings/code_415D90/func_802AA0B8.s @@ -218,18 +218,18 @@ glabel L802AA394_41F124 /* 41F168 802AA3D8 AE220000 */ sw $v0, ($s1) .L802AA3DC: /* 41F16C 802AA3DC 24020008 */ addiu $v0, $zero, 8 -/* 41F170 802AA3E0 3C07802B */ lui $a3, %hi(D_802AD0D0) -/* 41F174 802AA3E4 24E7D0D0 */ addiu $a3, $a3, %lo(D_802AD0D0) +/* 41F170 802AA3E0 3C07802B */ lui $a3, %hi(battle_menu_isEnabled) +/* 41F174 802AA3E4 24E7D0D0 */ addiu $a3, $a3, %lo(battle_menu_isEnabled) /* 41F178 802AA3E8 A640017C */ sh $zero, 0x17c($s2) -/* 41F17C 802AA3EC 3C01802B */ lui $at, %hi(D_802AD0B8) -/* 41F180 802AA3F0 AC22D0B8 */ sw $v0, %lo(D_802AD0B8)($at) +/* 41F17C 802AA3EC 3C01802B */ lui $at, %hi(battle_menu_submenuIDs) +/* 41F180 802AA3F0 AC22D0B8 */ sw $v0, %lo(battle_menu_submenuIDs)($at) /* 41F184 802AA3F4 24020001 */ addiu $v0, $zero, 1 -/* 41F188 802AA3F8 3C08802B */ lui $t0, %hi(D_802AD0E8) -/* 41F18C 802AA3FC 2508D0E8 */ addiu $t0, $t0, %lo(D_802AD0E8) +/* 41F188 802AA3F8 3C08802B */ lui $t0, %hi(battle_menu_isMessageDisabled) +/* 41F18C 802AA3FC 2508D0E8 */ addiu $t0, $t0, %lo(battle_menu_isMessageDisabled) /* 41F190 802AA400 3C06802B */ lui $a2, %hi(D_802AB72C) /* 41F194 802AA404 24C6B72C */ addiu $a2, $a2, %lo(D_802AB72C) -/* 41F198 802AA408 3C05802B */ lui $a1, %hi(D_802AD078) -/* 41F19C 802AA40C 24A5D078 */ addiu $a1, $a1, %lo(D_802AD078) +/* 41F198 802AA408 3C05802B */ lui $a1, %hi(main_battle_menu_iconScripts) +/* 41F19C 802AA40C 24A5D078 */ addiu $a1, $a1, %lo(main_battle_menu_iconScripts) /* 41F1A0 802AA410 ACE20000 */ sw $v0, ($a3) /* 41F1A4 802AA414 AD000000 */ sw $zero, ($t0) /* 41F1A8 802AA418 8CC30000 */ lw $v1, ($a2) @@ -238,8 +238,8 @@ glabel L802AA394_41F124 /* 41F1B4 802AA424 8C84B734 */ lw $a0, %lo(D_802AB734)($a0) /* 41F1B8 802AA428 30420100 */ andi $v0, $v0, 0x100 /* 41F1BC 802AA42C ACA30000 */ sw $v1, ($a1) -/* 41F1C0 802AA430 3C01802B */ lui $at, %hi(D_802AD090) -/* 41F1C4 802AA434 AC24D090 */ sw $a0, %lo(D_802AD090)($at) +/* 41F1C0 802AA430 3C01802B */ lui $at, %hi(battle_menu_messageIDs) +/* 41F1C4 802AA434 AC24D090 */ sw $a0, %lo(battle_menu_messageIDs)($at) /* 41F1C8 802AA438 14400006 */ bnez $v0, .L802AA454 /* 41F1CC 802AA43C 0000882D */ daddu $s1, $zero, $zero /* 41F1D0 802AA440 ACE00000 */ sw $zero, ($a3) @@ -261,8 +261,8 @@ glabel L802AA394_41F124 /* 41F208 802AA478 AC20D104 */ sw $zero, %lo(D_802AD104)($at) /* 41F20C 802AA47C 00511023 */ subu $v0, $v0, $s1 .L802AA480: -/* 41F210 802AA480 3C01802B */ lui $at, %hi(D_802AD0AC) -/* 41F214 802AA484 AC30D0AC */ sw $s0, %lo(D_802AD0AC)($at) +/* 41F210 802AA480 3C01802B */ lui $at, %hi(main_menu_numOptions) +/* 41F214 802AA484 AC30D0AC */ sw $s0, %lo(main_menu_numOptions)($at) /* 41F218 802AA488 3C01802B */ lui $at, %hi(D_802AD0A8) /* 41F21C 802AA48C AC20D0A8 */ sw $zero, %lo(D_802AD0A8)($at) /* 41F220 802AA490 3C01802B */ lui $at, %hi(D_802AD0B0) diff --git a/asm/nonmatchings/code_415D90/func_802AACD8.s b/asm/nonmatchings/code_415D90/func_802AACD8.s index 17c08f9ffa..b661582b74 100644 --- a/asm/nonmatchings/code_415D90/func_802AACD8.s +++ b/asm/nonmatchings/code_415D90/func_802AACD8.s @@ -420,7 +420,7 @@ glabel func_802AACD8 .L802AB2E8: /* 420078 802AB2E8 01052821 */ addu $a1, $t0, $a1 .L802AB2EC: -/* 42007C 802AB2EC 0C04993B */ jal draw_string +/* 42007C 802AB2EC 0C04993B */ jal draw_msg /* 420080 802AB2F0 00000000 */ nop .L802AB2F4: /* 420084 802AB2F4 8FBF008C */ lw $ra, 0x8c($sp) diff --git a/asm/nonmatchings/code_415D90/update_partner_menu.s b/asm/nonmatchings/code_415D90/update_partner_menu.s index 2c67640085..d951d846eb 100644 --- a/asm/nonmatchings/code_415D90/update_partner_menu.s +++ b/asm/nonmatchings/code_415D90/update_partner_menu.s @@ -229,25 +229,25 @@ glabel L802A84D0_41D260 /* 41D2B4 802A8524 0C098C9A */ jal func_80263268 /* 41D2B8 802A8528 00000000 */ nop /* 41D2BC 802A852C 24040007 */ addiu $a0, $zero, 7 -/* 41D2C0 802A8530 3C13802B */ lui $s3, %hi(D_802AD0D0) -/* 41D2C4 802A8534 2673D0D0 */ addiu $s3, $s3, %lo(D_802AD0D0) -/* 41D2C8 802A8538 3C15802B */ lui $s5, %hi(D_802AD0E8) -/* 41D2CC 802A853C 26B5D0E8 */ addiu $s5, $s5, %lo(D_802AD0E8) +/* 41D2C0 802A8530 3C13802B */ lui $s3, %hi(battle_menu_isEnabled) +/* 41D2C4 802A8534 2673D0D0 */ addiu $s3, $s3, %lo(battle_menu_isEnabled) +/* 41D2C8 802A8538 3C15802B */ lui $s5, %hi(battle_menu_isMessageDisabled) +/* 41D2CC 802A853C 26B5D0E8 */ addiu $s5, $s5, %lo(battle_menu_isMessageDisabled) /* 41D2D0 802A8540 3C03802B */ lui $v1, %hi(D_802AB478) /* 41D2D4 802A8544 2463B478 */ addiu $v1, $v1, %lo(D_802AB478) -/* 41D2D8 802A8548 3C12802B */ lui $s2, %hi(D_802AD078) -/* 41D2DC 802A854C 2652D078 */ addiu $s2, $s2, %lo(D_802AD078) -/* 41D2E0 802A8550 3C01802B */ lui $at, %hi(D_802AD0B8) -/* 41D2E4 802A8554 AC24D0B8 */ sw $a0, %lo(D_802AD0B8)($at) +/* 41D2D8 802A8548 3C12802B */ lui $s2, %hi(main_battle_menu_iconScripts) +/* 41D2DC 802A854C 2652D078 */ addiu $s2, $s2, %lo(main_battle_menu_iconScripts) +/* 41D2E0 802A8550 3C01802B */ lui $at, %hi(battle_menu_submenuIDs) +/* 41D2E4 802A8554 AC24D0B8 */ sw $a0, %lo(battle_menu_submenuIDs)($at) /* 41D2E8 802A8558 AE710000 */ sw $s1, ($s3) /* 41D2EC 802A855C AEA00000 */ sw $zero, ($s5) /* 41D2F0 802A8560 8C620000 */ lw $v0, ($v1) -/* 41D2F4 802A8564 3C16802B */ lui $s6, %hi(D_802AB4C0) -/* 41D2F8 802A8568 26D6B4C0 */ addiu $s6, $s6, %lo(D_802AB4C0) +/* 41D2F4 802A8564 3C16802B */ lui $s6, %hi(battle_menu_centeredMessages) +/* 41D2F8 802A8568 26D6B4C0 */ addiu $s6, $s6, %lo(battle_menu_centeredMessages) /* 41D2FC 802A856C AE420000 */ sw $v0, ($s2) /* 41D300 802A8570 8EC2001C */ lw $v0, 0x1c($s6) -/* 41D304 802A8574 3C1E802B */ lui $fp, %hi(D_802AD090) -/* 41D308 802A8578 27DED090 */ addiu $fp, $fp, %lo(D_802AD090) +/* 41D304 802A8574 3C1E802B */ lui $fp, %hi(battle_menu_messageIDs) +/* 41D308 802A8578 27DED090 */ addiu $fp, $fp, %lo(battle_menu_messageIDs) /* 41D30C 802A857C AFC20000 */ sw $v0, ($fp) /* 41D310 802A8580 96820070 */ lhu $v0, 0x70($s4) /* 41D314 802A8584 30420080 */ andi $v0, $v0, 0x80 @@ -344,8 +344,8 @@ glabel L802A84D0_41D260 .L802A86D8: /* 41D468 802A86D8 24100003 */ addiu $s0, $zero, 3 .L802A86DC: -/* 41D46C 802A86DC 3C01802B */ lui $at, %hi(D_802AD0AC) -/* 41D470 802A86E0 AC30D0AC */ sw $s0, %lo(D_802AD0AC)($at) +/* 41D46C 802A86DC 3C01802B */ lui $at, %hi(main_menu_numOptions) +/* 41D470 802A86E0 AC30D0AC */ sw $s0, %lo(main_menu_numOptions)($at) /* 41D474 802A86E4 24100001 */ addiu $s0, $zero, 1 /* 41D478 802A86E8 24020002 */ addiu $v0, $zero, 2 /* 41D47C 802A86EC 00511023 */ subu $v0, $v0, $s1 @@ -572,8 +572,8 @@ glabel L802A89F0_41D780 /* 41D798 802A8A08 24150008 */ addiu $s5, $zero, 8 .L802A8A0C: /* 41D79C 802A8A0C 02912821 */ addu $a1, $s4, $s1 -/* 41D7A0 802A8A10 3C02802B */ lui $v0, %hi(D_802AD5E8) -/* 41D7A4 802A8A14 2442D5E8 */ addiu $v0, $v0, %lo(D_802AD5E8) +/* 41D7A0 802A8A10 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCantUseTypes) +/* 41D7A4 802A8A14 2442D5E8 */ addiu $v0, $v0, %lo(battle_menu_moveOptionCantUseTypes) /* 41D7A8 802A8A18 02222021 */ addu $a0, $s1, $v0 /* 41D7AC 802A8A1C 90A301DE */ lbu $v1, 0x1de($a1) /* 41D7B0 802A8A20 3C188009 */ lui $t8, %hi(D_8008F060) @@ -601,8 +601,8 @@ glabel L802A89F0_41D780 /* 41D800 802A8A70 A0A001F6 */ sb $zero, 0x1f6($a1) /* 41D804 802A8A74 A0980000 */ sb $t8, ($a0) .L802A8A78: -/* 41D808 802A8A78 3C04802B */ lui $a0, %hi(D_802AD260) -/* 41D80C 802A8A7C 2484D260 */ addiu $a0, $a0, %lo(D_802AD260) +/* 41D808 802A8A78 3C04802B */ lui $a0, %hi(battle_menu_moveOptionIconScripts) +/* 41D80C 802A8A7C 2484D260 */ addiu $a0, $a0, %lo(battle_menu_moveOptionIconScripts) /* 41D810 802A8A80 82E30012 */ lb $v1, 0x12($s7) /* 41D814 802A8A84 00113080 */ sll $a2, $s1, 2 /* 41D818 802A8A88 00031080 */ sll $v0, $v1, 2 @@ -626,39 +626,39 @@ glabel L802A89F0_41D780 /* 41D860 802A8AD0 AC820000 */ sw $v0, ($a0) .L802A8AD4: /* 41D864 802A8AD4 90A201DE */ lbu $v0, 0x1de($a1) -/* 41D868 802A8AD8 3C01802B */ lui $at, %hi(D_802AD4B0) +/* 41D868 802A8AD8 3C01802B */ lui $at, %hi(battle_menu_moveIndices) /* 41D86C 802A8ADC 00260821 */ addu $at, $at, $a2 -/* 41D870 802A8AE0 AC22D4B0 */ sw $v0, %lo(D_802AD4B0)($at) +/* 41D870 802A8AE0 AC22D4B0 */ sw $v0, %lo(battle_menu_moveIndices)($at) /* 41D874 802A8AE4 80A201F6 */ lb $v0, 0x1f6($a1) -/* 41D878 802A8AE8 3C01802B */ lui $at, %hi(D_802AD510) +/* 41D878 802A8AE8 3C01802B */ lui $at, %hi(battle_menu_moveOptionsEnabled) /* 41D87C 802A8AEC 00260821 */ addu $at, $at, $a2 -/* 41D880 802A8AF0 AC22D510 */ sw $v0, %lo(D_802AD510)($at) +/* 41D880 802A8AF0 AC22D510 */ sw $v0, %lo(battle_menu_moveOptionsEnabled)($at) /* 41D884 802A8AF4 8CE20000 */ lw $v0, ($a3) -/* 41D888 802A8AF8 3C01802B */ lui $at, %hi(D_802AD2C0) +/* 41D888 802A8AF8 3C01802B */ lui $at, %hi(battle_menu_moveOptionNames) /* 41D88C 802A8AFC 00260821 */ addu $at, $at, $a2 -/* 41D890 802A8B00 AC22D2C0 */ sw $v0, %lo(D_802AD2C0)($at) +/* 41D890 802A8B00 AC22D2C0 */ sw $v0, %lo(battle_menu_moveOptionNames)($at) /* 41D894 802A8B04 8CE20008 */ lw $v0, 8($a3) -/* 41D898 802A8B08 3C01802B */ lui $at, %hi(D_802AD570) +/* 41D898 802A8B08 3C01802B */ lui $at, %hi(battle_menu_moveOptionDescriptions) /* 41D89C 802A8B0C 00260821 */ addu $at, $at, $a2 -/* 41D8A0 802A8B10 AC22D570 */ sw $v0, %lo(D_802AD570)($at) +/* 41D8A0 802A8B10 AC22D570 */ sw $v0, %lo(battle_menu_moveOptionDescriptions)($at) /* 41D8A4 802A8B14 80E20011 */ lb $v0, 0x11($a3) /* 41D8A8 802A8B18 0260202D */ daddu $a0, $s3, $zero -/* 41D8AC 802A8B1C 3C01802B */ lui $at, %hi(D_802AD320) +/* 41D8AC 802A8B1C 3C01802B */ lui $at, %hi(battle_menu_moveOptionDisplayCosts) /* 41D8B0 802A8B20 00260821 */ addu $at, $at, $a2 -/* 41D8B4 802A8B24 AC22D320 */ sw $v0, %lo(D_802AD320)($at) +/* 41D8B4 802A8B24 AC22D320 */ sw $v0, %lo(battle_menu_moveOptionDisplayCosts)($at) /* 41D8B8 802A8B28 80E20012 */ lb $v0, 0x12($a3) /* 41D8BC 802A8B2C 24050018 */ addiu $a1, $zero, 0x18 -/* 41D8C0 802A8B30 3C01802B */ lui $at, %hi(D_802AD5D0) +/* 41D8C0 802A8B30 3C01802B */ lui $at, %hi(battle_menu_moveOptionSortPriorities) /* 41D8C4 802A8B34 00310821 */ addu $at, $at, $s1 -/* 41D8C8 802A8B38 A031D5D0 */ sb $s1, %lo(D_802AD5D0)($at) -/* 41D8CC 802A8B3C 3C01802B */ lui $at, %hi(D_802AD440) +/* 41D8C8 802A8B38 A031D5D0 */ sb $s1, %lo(battle_menu_moveOptionSortPriorities)($at) +/* 41D8CC 802A8B3C 3C01802B */ lui $at, %hi(battle_menu_moveOptionBPCosts) /* 41D8D0 802A8B40 00260821 */ addu $at, $at, $a2 -/* 41D8D4 802A8B44 AC22D440 */ sw $v0, %lo(D_802AD440)($at) -/* 41D8D8 802A8B48 3C02802B */ lui $v0, %hi(D_802AD380) -/* 41D8DC 802A8B4C 2442D380 */ addiu $v0, $v0, %lo(D_802AD380) +/* 41D8D4 802A8B44 AC22D440 */ sw $v0, %lo(battle_menu_moveOptionBPCosts)($at) +/* 41D8D8 802A8B48 3C02802B */ lui $v0, %hi(battle_menu_moveOptionDisplayCostReductions) +/* 41D8DC 802A8B4C 2442D380 */ addiu $v0, $v0, %lo(battle_menu_moveOptionDisplayCostReductions) /* 41D8E0 802A8B50 00C28021 */ addu $s0, $a2, $v0 -/* 41D8E4 802A8B54 3C02802B */ lui $v0, %hi(D_802AD3E0) -/* 41D8E8 802A8B58 2442D3E0 */ addiu $v0, $v0, %lo(D_802AD3E0) +/* 41D8E4 802A8B54 3C02802B */ lui $v0, %hi(battle_menu_moveOptionDisplayCostReductionColors) +/* 41D8E8 802A8B58 2442D3E0 */ addiu $v0, $v0, %lo(battle_menu_moveOptionDisplayCostReductionColors) /* 41D8EC 802A8B5C 00C29021 */ addu $s2, $a2, $v0 /* 41D8F0 802A8B60 AE000000 */ sw $zero, ($s0) /* 41D8F4 802A8B64 0C099CAB */ jal heroes_is_ability_active @@ -701,10 +701,10 @@ glabel L802A89F0_41D780 .L802A8BEC: /* 41D97C 802A8BEC 8291005D */ lb $s1, 0x5d($s4) /* 41D980 802A8BF0 9282020E */ lbu $v0, 0x20e($s4) -/* 41D984 802A8BF4 3C01802B */ lui $at, %hi(D_802AD4A0) -/* 41D988 802A8BF8 AC20D4A0 */ sw $zero, %lo(D_802AD4A0)($at) -/* 41D98C 802A8BFC 3C01802B */ lui $at, %hi(D_802AD4A4) -/* 41D990 802A8C00 AC22D4A4 */ sw $v0, %lo(D_802AD4A4)($at) +/* 41D984 802A8BF4 3C01802B */ lui $at, %hi(battle_menu_hasSpiritsMenu) +/* 41D988 802A8BF8 AC20D4A0 */ sw $zero, %lo(battle_menu_hasSpiritsMenu)($at) +/* 41D98C 802A8BFC 3C01802B */ lui $at, %hi(battle_menu_moveOptionCount) +/* 41D990 802A8C00 AC22D4A4 */ sw $v0, %lo(battle_menu_moveOptionCount)($at) /* 41D994 802A8C04 3C01802B */ lui $at, %hi(D_802AD4A8) /* 41D998 802A8C08 AC31D4A8 */ sw $s1, %lo(D_802AD4A8)($at) /* 41D99C 802A8C0C 0C0A89A1 */ jal func_802A2684 @@ -1125,26 +1125,26 @@ glabel L802A91D0_41DF60 /* 41DF90 802A9200 2652F060 */ addiu $s2, $s2, %lo(D_8008F060) /* 41DF94 802A9204 3C0F802B */ lui $t7, %hi(D_802AB398) /* 41DF98 802A9208 25EFB398 */ addiu $t7, $t7, %lo(D_802AB398) -/* 41DF9C 802A920C 3C10802B */ lui $s0, %hi(D_802AD5D0) -/* 41DFA0 802A9210 2610D5D0 */ addiu $s0, $s0, %lo(D_802AD5D0) -/* 41DFA4 802A9214 3C0E802B */ lui $t6, %hi(D_802AD3E0) -/* 41DFA8 802A9218 25CED3E0 */ addiu $t6, $t6, %lo(D_802AD3E0) -/* 41DFAC 802A921C 3C0D802B */ lui $t5, %hi(D_802AD380) -/* 41DFB0 802A9220 25ADD380 */ addiu $t5, $t5, %lo(D_802AD380) -/* 41DFB4 802A9224 3C0C802B */ lui $t4, %hi(D_802AD570) -/* 41DFB8 802A9228 258CD570 */ addiu $t4, $t4, %lo(D_802AD570) -/* 41DFBC 802A922C 3C0B802B */ lui $t3, %hi(D_802AD2C0) -/* 41DFC0 802A9230 256BD2C0 */ addiu $t3, $t3, %lo(D_802AD2C0) -/* 41DFC4 802A9234 3C0A802B */ lui $t2, %hi(D_802AD510) -/* 41DFC8 802A9238 254AD510 */ addiu $t2, $t2, %lo(D_802AD510) -/* 41DFCC 802A923C 3C09802B */ lui $t1, %hi(D_802AD4B0) -/* 41DFD0 802A9240 2529D4B0 */ addiu $t1, $t1, %lo(D_802AD4B0) -/* 41DFD4 802A9244 3C08802B */ lui $t0, %hi(D_802AD440) -/* 41DFD8 802A9248 2508D440 */ addiu $t0, $t0, %lo(D_802AD440) -/* 41DFDC 802A924C 3C06802B */ lui $a2, %hi(D_802AD320) -/* 41DFE0 802A9250 24C6D320 */ addiu $a2, $a2, %lo(D_802AD320) -/* 41DFE4 802A9254 3C05802B */ lui $a1, %hi(D_802AD260) -/* 41DFE8 802A9258 24A5D260 */ addiu $a1, $a1, %lo(D_802AD260) +/* 41DF9C 802A920C 3C10802B */ lui $s0, %hi(battle_menu_moveOptionSortPriorities) +/* 41DFA0 802A9210 2610D5D0 */ addiu $s0, $s0, %lo(battle_menu_moveOptionSortPriorities) +/* 41DFA4 802A9214 3C0E802B */ lui $t6, %hi(battle_menu_moveOptionDisplayCostReductionColors) +/* 41DFA8 802A9218 25CED3E0 */ addiu $t6, $t6, %lo(battle_menu_moveOptionDisplayCostReductionColors) +/* 41DFAC 802A921C 3C0D802B */ lui $t5, %hi(battle_menu_moveOptionDisplayCostReductions) +/* 41DFB0 802A9220 25ADD380 */ addiu $t5, $t5, %lo(battle_menu_moveOptionDisplayCostReductions) +/* 41DFB4 802A9224 3C0C802B */ lui $t4, %hi(battle_menu_moveOptionDescriptions) +/* 41DFB8 802A9228 258CD570 */ addiu $t4, $t4, %lo(battle_menu_moveOptionDescriptions) +/* 41DFBC 802A922C 3C0B802B */ lui $t3, %hi(battle_menu_moveOptionNames) +/* 41DFC0 802A9230 256BD2C0 */ addiu $t3, $t3, %lo(battle_menu_moveOptionNames) +/* 41DFC4 802A9234 3C0A802B */ lui $t2, %hi(battle_menu_moveOptionsEnabled) +/* 41DFC8 802A9238 254AD510 */ addiu $t2, $t2, %lo(battle_menu_moveOptionsEnabled) +/* 41DFCC 802A923C 3C09802B */ lui $t1, %hi(battle_menu_moveIndices) +/* 41DFD0 802A9240 2529D4B0 */ addiu $t1, $t1, %lo(battle_menu_moveIndices) +/* 41DFD4 802A9244 3C08802B */ lui $t0, %hi(battle_menu_moveOptionBPCosts) +/* 41DFD8 802A9248 2508D440 */ addiu $t0, $t0, %lo(battle_menu_moveOptionBPCosts) +/* 41DFDC 802A924C 3C06802B */ lui $a2, %hi(battle_menu_moveOptionDisplayCosts) +/* 41DFE0 802A9250 24C6D320 */ addiu $a2, $a2, %lo(battle_menu_moveOptionDisplayCosts) +/* 41DFE4 802A9254 3C05802B */ lui $a1, %hi(battle_menu_moveOptionIconScripts) +/* 41DFE8 802A9258 24A5D260 */ addiu $a1, $a1, %lo(battle_menu_moveOptionIconScripts) .L802A925C: /* 41DFEC 802A925C 02912021 */ addu $a0, $s4, $s1 /* 41DFF0 802A9260 908301DE */ lbu $v1, 0x1de($a0) @@ -1203,10 +1203,10 @@ glabel L802A91D0_41DF60 /* 41E0B8 802A9328 82910062 */ lb $s1, 0x62($s4) /* 41E0BC 802A932C 9282020E */ lbu $v0, 0x20e($s4) /* 41E0C0 802A9330 24030001 */ addiu $v1, $zero, 1 -/* 41E0C4 802A9334 3C01802B */ lui $at, %hi(D_802AD4A0) -/* 41E0C8 802A9338 AC23D4A0 */ sw $v1, %lo(D_802AD4A0)($at) -/* 41E0CC 802A933C 3C01802B */ lui $at, %hi(D_802AD4A4) -/* 41E0D0 802A9340 AC22D4A4 */ sw $v0, %lo(D_802AD4A4)($at) +/* 41E0C4 802A9334 3C01802B */ lui $at, %hi(battle_menu_hasSpiritsMenu) +/* 41E0C8 802A9338 AC23D4A0 */ sw $v1, %lo(battle_menu_hasSpiritsMenu)($at) +/* 41E0CC 802A933C 3C01802B */ lui $at, %hi(battle_menu_moveOptionCount) +/* 41E0D0 802A9340 AC22D4A4 */ sw $v0, %lo(battle_menu_moveOptionCount)($at) /* 41E0D4 802A9344 3C01802B */ lui $at, %hi(D_802AD4A8) /* 41E0D8 802A9348 AC31D4A8 */ sw $s1, %lo(D_802AD4A8)($at) /* 41E0DC 802A934C 0C0A89A1 */ jal func_802A2684 @@ -1702,19 +1702,19 @@ glabel L802A9A54_41E7E4 /* 41E7F0 802A9A60 00000000 */ nop glabel L802A9A64_41E7F4 /* 41E7F4 802A9A64 24040006 */ addiu $a0, $zero, 6 -/* 41E7F8 802A9A68 0C051F9F */ jal func_80147E7C +/* 41E7F8 802A9A68 0C051F9F */ jal set_window_update /* 41E7FC 802A9A6C 24050002 */ addiu $a1, $zero, 2 /* 41E800 802A9A70 24040007 */ addiu $a0, $zero, 7 -/* 41E804 802A9A74 0C051F9F */ jal func_80147E7C +/* 41E804 802A9A74 0C051F9F */ jal set_window_update /* 41E808 802A9A78 24050002 */ addiu $a1, $zero, 2 /* 41E80C 802A9A7C 8643032C */ lh $v1, 0x32c($s2) /* 41E810 802A9A80 2402FFFF */ addiu $v0, $zero, -1 /* 41E814 802A9A84 10620009 */ beq $v1, $v0, .L802A9AAC /* 41E818 802A9A88 24040006 */ addiu $a0, $zero, 6 -/* 41E81C 802A9A8C 0C051F9F */ jal func_80147E7C +/* 41E81C 802A9A8C 0C051F9F */ jal set_window_update /* 41E820 802A9A90 24050009 */ addiu $a1, $zero, 9 /* 41E824 802A9A94 24040007 */ addiu $a0, $zero, 7 -/* 41E828 802A9A98 0C051F9F */ jal func_80147E7C +/* 41E828 802A9A98 0C051F9F */ jal set_window_update /* 41E82C 802A9A9C 24050009 */ addiu $a1, $zero, 9 /* 41E830 802A9AA0 2402001F */ addiu $v0, $zero, 0x1f .L802A9AA4: diff --git a/asm/nonmatchings/code_415D90/update_player_menu.s b/asm/nonmatchings/code_415D90/update_player_menu.s index 823e0b86ad..9871a0907d 100644 --- a/asm/nonmatchings/code_415D90/update_player_menu.s +++ b/asm/nonmatchings/code_415D90/update_player_menu.s @@ -228,18 +228,18 @@ glabel L802A5C50_41A9E0 /* 41AA70 802A5CE0 3C03802B */ lui $v1, %hi(D_802AB478) /* 41AA74 802A5CE4 8C63B478 */ lw $v1, %lo(D_802AB478)($v1) /* 41AA78 802A5CE8 24020007 */ addiu $v0, $zero, 7 -/* 41AA7C 802A5CEC 3C01802B */ lui $at, %hi(D_802AD0B8) -/* 41AA80 802A5CF0 AC22D0B8 */ sw $v0, %lo(D_802AD0B8)($at) +/* 41AA7C 802A5CEC 3C01802B */ lui $at, %hi(battle_menu_submenuIDs) +/* 41AA80 802A5CF0 AC22D0B8 */ sw $v0, %lo(battle_menu_submenuIDs)($at) /* 41AA84 802A5CF4 24020001 */ addiu $v0, $zero, 1 -/* 41AA88 802A5CF8 3C01802B */ lui $at, %hi(D_802AD0D0) -/* 41AA8C 802A5CFC AC22D0D0 */ sw $v0, %lo(D_802AD0D0)($at) +/* 41AA88 802A5CF8 3C01802B */ lui $at, %hi(battle_menu_isEnabled) +/* 41AA8C 802A5CFC AC22D0D0 */ sw $v0, %lo(battle_menu_isEnabled)($at) /* 41AA90 802A5D00 3C02802B */ lui $v0, %hi(D_802AB4DC) /* 41AA94 802A5D04 8C42B4DC */ lw $v0, %lo(D_802AB4DC)($v0) -/* 41AA98 802A5D08 3C01802B */ lui $at, %hi(D_802AD078) -/* 41AA9C 802A5D0C AC23D078 */ sw $v1, %lo(D_802AD078)($at) +/* 41AA98 802A5D08 3C01802B */ lui $at, %hi(main_battle_menu_iconScripts) +/* 41AA9C 802A5D0C AC23D078 */ sw $v1, %lo(main_battle_menu_iconScripts)($at) /* 41AAA0 802A5D10 82C30083 */ lb $v1, 0x83($s6) -/* 41AAA4 802A5D14 3C04802B */ lui $a0, %hi(D_802AD090) -/* 41AAA8 802A5D18 2484D090 */ addiu $a0, $a0, %lo(D_802AD090) +/* 41AAA4 802A5D14 3C04802B */ lui $a0, %hi(battle_menu_messageIDs) +/* 41AAA8 802A5D18 2484D090 */ addiu $a0, $a0, %lo(battle_menu_messageIDs) /* 41AAAC 802A5D1C 107E0006 */ beq $v1, $fp, .L802A5D38 /* 41AAB0 802A5D20 AC820000 */ sw $v0, ($a0) /* 41AAB4 802A5D24 8E020000 */ lw $v0, ($s0) @@ -252,8 +252,8 @@ glabel L802A5C50_41A9E0 /* 41AACC 802A5D3C 34420054 */ ori $v0, $v0, 0x54 /* 41AAD0 802A5D40 AC820000 */ sw $v0, ($a0) .L802A5D44: -/* 41AAD4 802A5D44 3C08802B */ lui $t0, %hi(D_802AD0E8) -/* 41AAD8 802A5D48 2508D0E8 */ addiu $t0, $t0, %lo(D_802AD0E8) +/* 41AAD4 802A5D44 3C08802B */ lui $t0, %hi(battle_menu_isMessageDisabled) +/* 41AAD8 802A5D48 2508D0E8 */ addiu $t0, $t0, %lo(battle_menu_isMessageDisabled) /* 41AADC 802A5D4C 00141880 */ sll $v1, $s4, 2 /* 41AAE0 802A5D50 00682021 */ addu $a0, $v1, $t0 /* 41AAE4 802A5D54 AC800000 */ sw $zero, ($a0) @@ -263,12 +263,12 @@ glabel L802A5C50_41A9E0 /* 41AAF4 802A5D64 00000000 */ nop /* 41AAF8 802A5D68 3C02802B */ lui $v0, %hi(D_802AB47C) /* 41AAFC 802A5D6C 8C42B47C */ lw $v0, %lo(D_802AB47C)($v0) -/* 41AB00 802A5D70 3C01802B */ lui $at, %hi(D_802AD0D0) +/* 41AB00 802A5D70 3C01802B */ lui $at, %hi(battle_menu_isEnabled) /* 41AB04 802A5D74 00230821 */ addu $at, $at, $v1 -/* 41AB08 802A5D78 AC20D0D0 */ sw $zero, %lo(D_802AD0D0)($at) -/* 41AB0C 802A5D7C 3C01802B */ lui $at, %hi(D_802AD078) +/* 41AB08 802A5D78 AC20D0D0 */ sw $zero, %lo(battle_menu_isEnabled)($at) +/* 41AB0C 802A5D7C 3C01802B */ lui $at, %hi(main_battle_menu_iconScripts) /* 41AB10 802A5D80 00230821 */ addu $at, $at, $v1 -/* 41AB14 802A5D84 AC22D078 */ sw $v0, %lo(D_802AD078)($at) +/* 41AB14 802A5D84 AC22D078 */ sw $v0, %lo(main_battle_menu_iconScripts)($at) /* 41AB18 802A5D88 24020048 */ addiu $v0, $zero, 0x48 /* 41AB1C 802A5D8C AC820000 */ sw $v0, ($a0) .L802A5D90: @@ -280,8 +280,8 @@ glabel L802A5C50_41A9E0 /* 41AB30 802A5DA0 82C2007D */ lb $v0, 0x7d($s6) /* 41AB34 802A5DA4 04400034 */ bltz $v0, .L802A5E78 /* 41AB38 802A5DA8 26940001 */ addiu $s4, $s4, 1 -/* 41AB3C 802A5DAC 3C03802B */ lui $v1, %hi(D_802AD078) -/* 41AB40 802A5DB0 2463D078 */ addiu $v1, $v1, %lo(D_802AD078) +/* 41AB3C 802A5DAC 3C03802B */ lui $v1, %hi(main_battle_menu_iconScripts) +/* 41AB40 802A5DB0 2463D078 */ addiu $v1, $v1, %lo(main_battle_menu_iconScripts) /* 41AB44 802A5DB4 00142080 */ sll $a0, $s4, 2 /* 41AB48 802A5DB8 3C07802B */ lui $a3, %hi(D_802AB388) /* 41AB4C 802A5DBC 24E7B388 */ addiu $a3, $a3, %lo(D_802AB388) @@ -289,19 +289,19 @@ glabel L802A5C50_41A9E0 /* 41AB54 802A5DC4 8CE20000 */ lw $v0, ($a3) /* 41AB58 802A5DC8 24090002 */ addiu $t1, $zero, 2 /* 41AB5C 802A5DCC ACC20000 */ sw $v0, ($a2) -/* 41AB60 802A5DD0 3C02802B */ lui $v0, %hi(D_802AD0D0) -/* 41AB64 802A5DD4 2442D0D0 */ addiu $v0, $v0, %lo(D_802AD0D0) +/* 41AB60 802A5DD0 3C02802B */ lui $v0, %hi(battle_menu_isEnabled) +/* 41AB64 802A5DD4 2442D0D0 */ addiu $v0, $v0, %lo(battle_menu_isEnabled) /* 41AB68 802A5DD8 00822821 */ addu $a1, $a0, $v0 /* 41AB6C 802A5DDC 24020001 */ addiu $v0, $zero, 1 -/* 41AB70 802A5DE0 3C01802B */ lui $at, %hi(D_802AD0B8) +/* 41AB70 802A5DE0 3C01802B */ lui $at, %hi(battle_menu_submenuIDs) /* 41AB74 802A5DE4 00240821 */ addu $at, $at, $a0 -/* 41AB78 802A5DE8 AC29D0B8 */ sw $t1, %lo(D_802AD0B8)($at) +/* 41AB78 802A5DE8 AC29D0B8 */ sw $t1, %lo(battle_menu_submenuIDs)($at) /* 41AB7C 802A5DEC ACA20000 */ sw $v0, ($a1) /* 41AB80 802A5DF0 3C02802B */ lui $v0, %hi(D_802AB4C8) /* 41AB84 802A5DF4 8C42B4C8 */ lw $v0, %lo(D_802AB4C8)($v0) -/* 41AB88 802A5DF8 3C01802B */ lui $at, %hi(D_802AD090) +/* 41AB88 802A5DF8 3C01802B */ lui $at, %hi(battle_menu_messageIDs) /* 41AB8C 802A5DFC 00240821 */ addu $at, $at, $a0 -/* 41AB90 802A5E00 AC22D090 */ sw $v0, %lo(D_802AD090)($at) +/* 41AB90 802A5E00 AC22D090 */ sw $v0, %lo(battle_menu_messageIDs)($at) /* 41AB94 802A5E04 82C2007D */ lb $v0, 0x7d($s6) /* 41AB98 802A5E08 14400006 */ bnez $v0, .L802A5E24 /* 41AB9C 802A5E0C 00881821 */ addu $v1, $a0, $t0 @@ -336,47 +336,47 @@ glabel L802A5C50_41A9E0 .L802A5E74: /* 41AC04 802A5E74 26940001 */ addiu $s4, $s4, 1 .L802A5E78: -/* 41AC08 802A5E78 3C0C802B */ lui $t4, %hi(D_802AD078) -/* 41AC0C 802A5E7C 258CD078 */ addiu $t4, $t4, %lo(D_802AD078) +/* 41AC08 802A5E78 3C0C802B */ lui $t4, %hi(main_battle_menu_iconScripts) +/* 41AC0C 802A5E7C 258CD078 */ addiu $t4, $t4, %lo(main_battle_menu_iconScripts) /* 41AC10 802A5E80 00141880 */ sll $v1, $s4, 2 /* 41AC14 802A5E84 006C3021 */ addu $a2, $v1, $t4 -/* 41AC18 802A5E88 3C0B802B */ lui $t3, %hi(D_802AD0D0) -/* 41AC1C 802A5E8C 256BD0D0 */ addiu $t3, $t3, %lo(D_802AD0D0) +/* 41AC18 802A5E88 3C0B802B */ lui $t3, %hi(battle_menu_isEnabled) +/* 41AC1C 802A5E8C 256BD0D0 */ addiu $t3, $t3, %lo(battle_menu_isEnabled) /* 41AC20 802A5E90 006B2821 */ addu $a1, $v1, $t3 /* 41AC24 802A5E94 24090001 */ addiu $t1, $zero, 1 -/* 41AC28 802A5E98 3C0A802B */ lui $t2, %hi(D_802AB4C0) -/* 41AC2C 802A5E9C 254AB4C0 */ addiu $t2, $t2, %lo(D_802AB4C0) +/* 41AC28 802A5E98 3C0A802B */ lui $t2, %hi(battle_menu_centeredMessages) +/* 41AC2C 802A5E9C 254AB4C0 */ addiu $t2, $t2, %lo(battle_menu_centeredMessages) /* 41AC30 802A5EA0 82A20000 */ lb $v0, ($s5) /* 41AC34 802A5EA4 24420001 */ addiu $v0, $v0, 1 /* 41AC38 802A5EA8 000210C0 */ sll $v0, $v0, 3 -/* 41AC3C 802A5EAC 3C01802B */ lui $at, %hi(D_802AB348) +/* 41AC3C 802A5EAC 3C01802B */ lui $at, %hi(battle_menu_iconScripts) /* 41AC40 802A5EB0 00220821 */ addu $at, $at, $v0 -/* 41AC44 802A5EB4 8C22B348 */ lw $v0, %lo(D_802AB348)($at) -/* 41AC48 802A5EB8 3C04802B */ lui $a0, %hi(D_802AB348) -/* 41AC4C 802A5EBC 2484B348 */ addiu $a0, $a0, %lo(D_802AB348) +/* 41AC44 802A5EB4 8C22B348 */ lw $v0, %lo(battle_menu_iconScripts)($at) +/* 41AC48 802A5EB8 3C04802B */ lui $a0, %hi(battle_menu_iconScripts) +/* 41AC4C 802A5EBC 2484B348 */ addiu $a0, $a0, %lo(battle_menu_iconScripts) /* 41AC50 802A5EC0 ACC20000 */ sw $v0, ($a2) -/* 41AC54 802A5EC4 3C01802B */ lui $at, %hi(D_802AD0B8) +/* 41AC54 802A5EC4 3C01802B */ lui $at, %hi(battle_menu_submenuIDs) /* 41AC58 802A5EC8 00230821 */ addu $at, $at, $v1 -/* 41AC5C 802A5ECC AC20D0B8 */ sw $zero, %lo(D_802AD0B8)($at) +/* 41AC5C 802A5ECC AC20D0B8 */ sw $zero, %lo(battle_menu_submenuIDs)($at) /* 41AC60 802A5ED0 ACA90000 */ sw $t1, ($a1) /* 41AC64 802A5ED4 8D420000 */ lw $v0, ($t2) -/* 41AC68 802A5ED8 3C07802B */ lui $a3, %hi(D_802AD0B8) -/* 41AC6C 802A5EDC 24E7D0B8 */ addiu $a3, $a3, %lo(D_802AD0B8) -/* 41AC70 802A5EE0 3C01802B */ lui $at, %hi(D_802AD090) +/* 41AC68 802A5ED8 3C07802B */ lui $a3, %hi(battle_menu_submenuIDs) +/* 41AC6C 802A5EDC 24E7D0B8 */ addiu $a3, $a3, %lo(battle_menu_submenuIDs) +/* 41AC70 802A5EE0 3C01802B */ lui $at, %hi(battle_menu_messageIDs) /* 41AC74 802A5EE4 00230821 */ addu $at, $at, $v1 -/* 41AC78 802A5EE8 AC22D090 */ sw $v0, %lo(D_802AD090)($at) +/* 41AC78 802A5EE8 AC22D090 */ sw $v0, %lo(battle_menu_messageIDs)($at) /* 41AC7C 802A5EEC 82C2007E */ lb $v0, 0x7e($s6) -/* 41AC80 802A5EF0 3C08802B */ lui $t0, %hi(D_802AD090) -/* 41AC84 802A5EF4 2508D090 */ addiu $t0, $t0, %lo(D_802AD090) +/* 41AC80 802A5EF0 3C08802B */ lui $t0, %hi(battle_menu_messageIDs) +/* 41AC84 802A5EF4 2508D090 */ addiu $t0, $t0, %lo(battle_menu_messageIDs) /* 41AC88 802A5EF8 1C400008 */ bgtz $v0, .L802A5F1C /* 41AC8C 802A5EFC 00000000 */ nop /* 41AC90 802A5F00 8C820000 */ lw $v0, ($a0) /* 41AC94 802A5F04 ACC20000 */ sw $v0, ($a2) /* 41AC98 802A5F08 24020043 */ addiu $v0, $zero, 0x43 /* 41AC9C 802A5F0C ACA00000 */ sw $zero, ($a1) -/* 41ACA0 802A5F10 3C01802B */ lui $at, %hi(D_802AD0E8) +/* 41ACA0 802A5F10 3C01802B */ lui $at, %hi(battle_menu_isMessageDisabled) /* 41ACA4 802A5F14 00230821 */ addu $at, $at, $v1 -/* 41ACA8 802A5F18 AC22D0E8 */ sw $v0, %lo(D_802AD0E8)($at) +/* 41ACA8 802A5F18 AC22D0E8 */ sw $v0, %lo(battle_menu_isMessageDisabled)($at) .L802A5F1C: /* 41ACAC 802A5F1C 96C20070 */ lhu $v0, 0x70($s6) /* 41ACB0 802A5F20 30420001 */ andi $v0, $v0, 1 @@ -386,9 +386,9 @@ glabel L802A5C50_41A9E0 /* 41ACC0 802A5F30 ACC20000 */ sw $v0, ($a2) /* 41ACC4 802A5F34 24020048 */ addiu $v0, $zero, 0x48 /* 41ACC8 802A5F38 ACA00000 */ sw $zero, ($a1) -/* 41ACCC 802A5F3C 3C01802B */ lui $at, %hi(D_802AD0E8) +/* 41ACCC 802A5F3C 3C01802B */ lui $at, %hi(battle_menu_isMessageDisabled) /* 41ACD0 802A5F40 00230821 */ addu $at, $at, $v1 -/* 41ACD4 802A5F44 AC22D0E8 */ sw $v0, %lo(D_802AD0E8)($at) +/* 41ACD4 802A5F44 AC22D0E8 */ sw $v0, %lo(battle_menu_isMessageDisabled)($at) .L802A5F48: /* 41ACD8 802A5F48 82C200AF */ lb $v0, 0xaf($s6) /* 41ACDC 802A5F4C 04400008 */ bltz $v0, .L802A5F70 @@ -397,9 +397,9 @@ glabel L802A5C50_41A9E0 /* 41ACE8 802A5F58 ACC20000 */ sw $v0, ($a2) /* 41ACEC 802A5F5C 24020048 */ addiu $v0, $zero, 0x48 /* 41ACF0 802A5F60 ACA00000 */ sw $zero, ($a1) -/* 41ACF4 802A5F64 3C01802B */ lui $at, %hi(D_802AD0E8) +/* 41ACF4 802A5F64 3C01802B */ lui $at, %hi(battle_menu_isMessageDisabled) /* 41ACF8 802A5F68 00230821 */ addu $at, $at, $v1 -/* 41ACFC 802A5F6C AC22D0E8 */ sw $v0, %lo(D_802AD0E8)($at) +/* 41ACFC 802A5F6C AC22D0E8 */ sw $v0, %lo(battle_menu_isMessageDisabled)($at) .L802A5F70: /* 41AD00 802A5F70 82C2004C */ lb $v0, 0x4c($s6) /* 41AD04 802A5F74 50400001 */ beql $v0, $zero, .L802A5F7C @@ -431,9 +431,9 @@ glabel L802A5C50_41A9E0 /* 41AD68 802A5FD8 ACC20000 */ sw $v0, ($a2) /* 41AD6C 802A5FDC 24020044 */ addiu $v0, $zero, 0x44 /* 41AD70 802A5FE0 ACA00000 */ sw $zero, ($a1) -/* 41AD74 802A5FE4 3C01802B */ lui $at, %hi(D_802AD0E8) +/* 41AD74 802A5FE4 3C01802B */ lui $at, %hi(battle_menu_isMessageDisabled) /* 41AD78 802A5FE8 00240821 */ addu $at, $at, $a0 -/* 41AD7C 802A5FEC AC22D0E8 */ sw $v0, %lo(D_802AD0E8)($at) +/* 41AD7C 802A5FEC AC22D0E8 */ sw $v0, %lo(battle_menu_isMessageDisabled)($at) .L802A5FF0: /* 41AD80 802A5FF0 96C20070 */ lhu $v0, 0x70($s6) /* 41AD84 802A5FF4 30420002 */ andi $v0, $v0, 2 @@ -443,9 +443,9 @@ glabel L802A5C50_41A9E0 /* 41AD94 802A6004 ACC20000 */ sw $v0, ($a2) /* 41AD98 802A6008 24020048 */ addiu $v0, $zero, 0x48 /* 41AD9C 802A600C ACA00000 */ sw $zero, ($a1) -/* 41ADA0 802A6010 3C01802B */ lui $at, %hi(D_802AD0E8) +/* 41ADA0 802A6010 3C01802B */ lui $at, %hi(battle_menu_isMessageDisabled) /* 41ADA4 802A6014 00240821 */ addu $at, $at, $a0 -/* 41ADA8 802A6018 AC22D0E8 */ sw $v0, %lo(D_802AD0E8)($at) +/* 41ADA8 802A6018 AC22D0E8 */ sw $v0, %lo(battle_menu_isMessageDisabled)($at) .L802A601C: /* 41ADAC 802A601C 82C200AE */ lb $v0, 0xae($s6) /* 41ADB0 802A6020 04400008 */ bltz $v0, .L802A6044 @@ -454,9 +454,9 @@ glabel L802A5C50_41A9E0 /* 41ADBC 802A602C ACC20000 */ sw $v0, ($a2) /* 41ADC0 802A6030 24020048 */ addiu $v0, $zero, 0x48 /* 41ADC4 802A6034 ACA00000 */ sw $zero, ($a1) -/* 41ADC8 802A6038 3C01802B */ lui $at, %hi(D_802AD0E8) +/* 41ADC8 802A6038 3C01802B */ lui $at, %hi(battle_menu_isMessageDisabled) /* 41ADCC 802A603C 00240821 */ addu $at, $at, $a0 -/* 41ADD0 802A6040 AC22D0E8 */ sw $v0, %lo(D_802AD0E8)($at) +/* 41ADD0 802A6040 AC22D0E8 */ sw $v0, %lo(battle_menu_isMessageDisabled)($at) .L802A6044: /* 41ADD4 802A6044 82C2004C */ lb $v0, 0x4c($s6) /* 41ADD8 802A6048 50490001 */ beql $v0, $t1, .L802A6050 @@ -467,29 +467,29 @@ glabel L802A5C50_41A9E0 /* 41ADE4 802A6054 82A2028E */ lb $v0, 0x28e($s5) /* 41ADE8 802A6058 10400027 */ beqz $v0, .L802A60F8 /* 41ADEC 802A605C 00141880 */ sll $v1, $s4, 2 -/* 41ADF0 802A6060 3C04802B */ lui $a0, %hi(D_802AD078) -/* 41ADF4 802A6064 2484D078 */ addiu $a0, $a0, %lo(D_802AD078) +/* 41ADF0 802A6060 3C04802B */ lui $a0, %hi(main_battle_menu_iconScripts) +/* 41ADF4 802A6064 2484D078 */ addiu $a0, $a0, %lo(main_battle_menu_iconScripts) /* 41ADF8 802A6068 3C06802B */ lui $a2, %hi(D_802AB390) /* 41ADFC 802A606C 24C6B390 */ addiu $a2, $a2, %lo(D_802AB390) /* 41AE00 802A6070 00642821 */ addu $a1, $v1, $a0 /* 41AE04 802A6074 8CC20000 */ lw $v0, ($a2) /* 41AE08 802A6078 24070008 */ addiu $a3, $zero, 8 /* 41AE0C 802A607C ACA20000 */ sw $v0, ($a1) -/* 41AE10 802A6080 3C02802B */ lui $v0, %hi(D_802AD0D0) -/* 41AE14 802A6084 2442D0D0 */ addiu $v0, $v0, %lo(D_802AD0D0) +/* 41AE10 802A6080 3C02802B */ lui $v0, %hi(battle_menu_isEnabled) +/* 41AE14 802A6084 2442D0D0 */ addiu $v0, $v0, %lo(battle_menu_isEnabled) /* 41AE18 802A6088 00622021 */ addu $a0, $v1, $v0 /* 41AE1C 802A608C 24020001 */ addiu $v0, $zero, 1 -/* 41AE20 802A6090 3C01802B */ lui $at, %hi(D_802AD0B8) +/* 41AE20 802A6090 3C01802B */ lui $at, %hi(battle_menu_submenuIDs) /* 41AE24 802A6094 00230821 */ addu $at, $at, $v1 -/* 41AE28 802A6098 AC27D0B8 */ sw $a3, %lo(D_802AD0B8)($at) +/* 41AE28 802A6098 AC27D0B8 */ sw $a3, %lo(battle_menu_submenuIDs)($at) /* 41AE2C 802A609C AC820000 */ sw $v0, ($a0) /* 41AE30 802A60A0 3C02802B */ lui $v0, %hi(D_802AB4E0) /* 41AE34 802A60A4 8C42B4E0 */ lw $v0, %lo(D_802AB4E0)($v0) -/* 41AE38 802A60A8 3C01802B */ lui $at, %hi(D_802AD090) +/* 41AE38 802A60A8 3C01802B */ lui $at, %hi(battle_menu_messageIDs) /* 41AE3C 802A60AC 00230821 */ addu $at, $at, $v1 -/* 41AE40 802A60B0 AC22D090 */ sw $v0, %lo(D_802AD090)($at) -/* 41AE44 802A60B4 3C02802B */ lui $v0, %hi(D_802AD0E8) -/* 41AE48 802A60B8 2442D0E8 */ addiu $v0, $v0, %lo(D_802AD0E8) +/* 41AE40 802A60B0 AC22D090 */ sw $v0, %lo(battle_menu_messageIDs)($at) +/* 41AE44 802A60B4 3C02802B */ lui $v0, %hi(battle_menu_isMessageDisabled) +/* 41AE48 802A60B8 2442D0E8 */ addiu $v0, $v0, %lo(battle_menu_isMessageDisabled) /* 41AE4C 802A60BC 00621821 */ addu $v1, $v1, $v0 /* 41AE50 802A60C0 AC600000 */ sw $zero, ($v1) /* 41AE54 802A60C4 96C20070 */ lhu $v0, 0x70($s6) @@ -510,8 +510,8 @@ glabel L802A5C50_41A9E0 .L802A60F8: /* 41AE88 802A60F8 24020002 */ addiu $v0, $zero, 2 /* 41AE8C 802A60FC 005E1023 */ subu $v0, $v0, $fp -/* 41AE90 802A6100 3C01802B */ lui $at, %hi(D_802AD0AC) -/* 41AE94 802A6104 AC34D0AC */ sw $s4, %lo(D_802AD0AC)($at) +/* 41AE90 802A6100 3C01802B */ lui $at, %hi(main_menu_numOptions) +/* 41AE94 802A6104 AC34D0AC */ sw $s4, %lo(main_menu_numOptions)($at) /* 41AE98 802A6108 3C01802B */ lui $at, %hi(D_802AD0A8) /* 41AE9C 802A610C AC20D0A8 */ sw $zero, %lo(D_802AD0A8)($at) /* 41AEA0 802A6110 3C01802B */ lui $at, %hi(D_802AD0B0) @@ -991,8 +991,8 @@ glabel L802A6170_41AF00 /* 41B548 802A67B8 006E9021 */ addu $s2, $v1, $t6 /* 41B54C 802A67BC 3C0E8008 */ lui $t6, %hi(gItemTable) /* 41B550 802A67C0 25CE78E0 */ addiu $t6, $t6, %lo(gItemTable) -/* 41B554 802A67C4 3C03802B */ lui $v1, %hi(D_802AD5E8) -/* 41B558 802A67C8 2463D5E8 */ addiu $v1, $v1, %lo(D_802AD5E8) +/* 41B554 802A67C4 3C03802B */ lui $v1, %hi(battle_menu_moveOptionCantUseTypes) +/* 41B558 802A67C8 2463D5E8 */ addiu $v1, $v1, %lo(battle_menu_moveOptionCantUseTypes) /* 41B55C 802A67CC 844201AE */ lh $v0, 0x1ae($v0) /* 41B560 802A67D0 02632021 */ addu $a0, $s3, $v1 /* 41B564 802A67D4 00021140 */ sll $v0, $v0, 5 @@ -1028,8 +1028,8 @@ glabel L802A6170_41AF00 /* 41B5D0 802A6840 A28001F6 */ sb $zero, 0x1f6($s4) /* 41B5D4 802A6844 A0820000 */ sb $v0, ($a0) .L802A6848: -/* 41B5D8 802A6848 3C03802B */ lui $v1, %hi(D_802AD260) -/* 41B5DC 802A684C 2463D260 */ addiu $v1, $v1, %lo(D_802AD260) +/* 41B5D8 802A6848 3C03802B */ lui $v1, %hi(battle_menu_moveOptionIconScripts) +/* 41B5DC 802A684C 2463D260 */ addiu $v1, $v1, %lo(battle_menu_moveOptionIconScripts) /* 41B5E0 802A6850 00138080 */ sll $s0, $s3, 2 /* 41B5E4 802A6854 8EA20000 */ lw $v0, ($s5) /* 41B5E8 802A6858 02031821 */ addu $v1, $s0, $v1 @@ -1042,22 +1042,22 @@ glabel L802A6170_41AF00 .L802A6874: /* 41B604 802A6874 82420011 */ lb $v0, 0x11($s2) /* 41B608 802A6878 02E0202D */ daddu $a0, $s7, $zero -/* 41B60C 802A687C 3C01802B */ lui $at, %hi(D_802AD320) +/* 41B60C 802A687C 3C01802B */ lui $at, %hi(battle_menu_moveOptionDisplayCosts) /* 41B610 802A6880 00300821 */ addu $at, $at, $s0 -/* 41B614 802A6884 AC22D320 */ sw $v0, %lo(D_802AD320)($at) +/* 41B614 802A6884 AC22D320 */ sw $v0, %lo(battle_menu_moveOptionDisplayCosts)($at) /* 41B618 802A6888 82420012 */ lb $v0, 0x12($s2) /* 41B61C 802A688C 24050018 */ addiu $a1, $zero, 0x18 -/* 41B620 802A6890 3C01802B */ lui $at, %hi(D_802AD5D0) +/* 41B620 802A6890 3C01802B */ lui $at, %hi(battle_menu_moveOptionSortPriorities) /* 41B624 802A6894 00330821 */ addu $at, $at, $s3 -/* 41B628 802A6898 A020D5D0 */ sb $zero, %lo(D_802AD5D0)($at) -/* 41B62C 802A689C 3C01802B */ lui $at, %hi(D_802AD440) +/* 41B628 802A6898 A020D5D0 */ sb $zero, %lo(battle_menu_moveOptionSortPriorities)($at) +/* 41B62C 802A689C 3C01802B */ lui $at, %hi(battle_menu_moveOptionBPCosts) /* 41B630 802A68A0 00300821 */ addu $at, $at, $s0 -/* 41B634 802A68A4 AC22D440 */ sw $v0, %lo(D_802AD440)($at) -/* 41B638 802A68A8 3C02802B */ lui $v0, %hi(D_802AD380) -/* 41B63C 802A68AC 2442D380 */ addiu $v0, $v0, %lo(D_802AD380) +/* 41B634 802A68A4 AC22D440 */ sw $v0, %lo(battle_menu_moveOptionBPCosts)($at) +/* 41B638 802A68A8 3C02802B */ lui $v0, %hi(battle_menu_moveOptionDisplayCostReductions) +/* 41B63C 802A68AC 2442D380 */ addiu $v0, $v0, %lo(battle_menu_moveOptionDisplayCostReductions) /* 41B640 802A68B0 02028821 */ addu $s1, $s0, $v0 -/* 41B644 802A68B4 3C02802B */ lui $v0, %hi(D_802AD3E0) -/* 41B648 802A68B8 2442D3E0 */ addiu $v0, $v0, %lo(D_802AD3E0) +/* 41B644 802A68B4 3C02802B */ lui $v0, %hi(battle_menu_moveOptionDisplayCostReductionColors) +/* 41B648 802A68B8 2442D3E0 */ addiu $v0, $v0, %lo(battle_menu_moveOptionDisplayCostReductionColors) /* 41B64C 802A68BC 0202A821 */ addu $s5, $s0, $v0 /* 41B650 802A68C0 AE200000 */ sw $zero, ($s1) /* 41B654 802A68C4 0C099CAB */ jal heroes_is_ability_active @@ -1086,21 +1086,21 @@ glabel L802A6170_41AF00 /* 41B6AC 802A691C AE230000 */ sw $v1, ($s1) /* 41B6B0 802A6920 AEA20000 */ sw $v0, ($s5) .L802A6924: -/* 41B6B4 802A6924 3C01802B */ lui $at, %hi(D_802AD4B0) +/* 41B6B4 802A6924 3C01802B */ lui $at, %hi(battle_menu_moveIndices) /* 41B6B8 802A6928 00300821 */ addu $at, $at, $s0 -/* 41B6BC 802A692C AC33D4B0 */ sw $s3, %lo(D_802AD4B0)($at) +/* 41B6BC 802A692C AC33D4B0 */ sw $s3, %lo(battle_menu_moveIndices)($at) /* 41B6C0 802A6930 828201F6 */ lb $v0, 0x1f6($s4) -/* 41B6C4 802A6934 3C01802B */ lui $at, %hi(D_802AD510) +/* 41B6C4 802A6934 3C01802B */ lui $at, %hi(battle_menu_moveOptionsEnabled) /* 41B6C8 802A6938 00300821 */ addu $at, $at, $s0 -/* 41B6CC 802A693C AC22D510 */ sw $v0, %lo(D_802AD510)($at) +/* 41B6CC 802A693C AC22D510 */ sw $v0, %lo(battle_menu_moveOptionsEnabled)($at) /* 41B6D0 802A6940 8E420000 */ lw $v0, ($s2) -/* 41B6D4 802A6944 3C01802B */ lui $at, %hi(D_802AD2C0) +/* 41B6D4 802A6944 3C01802B */ lui $at, %hi(battle_menu_moveOptionNames) /* 41B6D8 802A6948 00300821 */ addu $at, $at, $s0 -/* 41B6DC 802A694C AC22D2C0 */ sw $v0, %lo(D_802AD2C0)($at) +/* 41B6DC 802A694C AC22D2C0 */ sw $v0, %lo(battle_menu_moveOptionNames)($at) /* 41B6E0 802A6950 8E420008 */ lw $v0, 8($s2) -/* 41B6E4 802A6954 3C01802B */ lui $at, %hi(D_802AD570) +/* 41B6E4 802A6954 3C01802B */ lui $at, %hi(battle_menu_moveOptionDescriptions) /* 41B6E8 802A6958 00300821 */ addu $at, $at, $s0 -/* 41B6EC 802A695C AC22D570 */ sw $v0, %lo(D_802AD570)($at) +/* 41B6EC 802A695C AC22D570 */ sw $v0, %lo(battle_menu_moveOptionDescriptions)($at) /* 41B6F0 802A6960 92C2020E */ lbu $v0, 0x20e($s6) /* 41B6F4 802A6964 26730001 */ addiu $s3, $s3, 1 /* 41B6F8 802A6968 0262102A */ slt $v0, $s3, $v0 @@ -1108,12 +1108,12 @@ glabel L802A6170_41AF00 /* 41B700 802A6970 02D3A021 */ addu $s4, $s6, $s3 /* 41B704 802A6974 92C2020E */ lbu $v0, 0x20e($s6) .L802A6978: -/* 41B708 802A6978 3C01802B */ lui $at, %hi(D_802AD4A0) -/* 41B70C 802A697C AC20D4A0 */ sw $zero, %lo(D_802AD4A0)($at) +/* 41B708 802A6978 3C01802B */ lui $at, %hi(battle_menu_hasSpiritsMenu) +/* 41B70C 802A697C AC20D4A0 */ sw $zero, %lo(battle_menu_hasSpiritsMenu)($at) /* 41B710 802A6980 3C01802B */ lui $at, %hi(D_802AD4A8) /* 41B714 802A6984 AC3ED4A8 */ sw $fp, %lo(D_802AD4A8)($at) -/* 41B718 802A6988 3C01802B */ lui $at, %hi(D_802AD4A4) -/* 41B71C 802A698C AC22D4A4 */ sw $v0, %lo(D_802AD4A4)($at) +/* 41B718 802A6988 3C01802B */ lui $at, %hi(battle_menu_moveOptionCount) +/* 41B71C 802A698C AC22D4A4 */ sw $v0, %lo(battle_menu_moveOptionCount)($at) /* 41B720 802A6990 0C0A89A1 */ jal func_802A2684 /* 41B724 802A6994 00000000 */ nop /* 41B728 802A6998 080AA04F */ j .L802A813C @@ -1778,16 +1778,16 @@ glabel L802A72E4_41C074 /* 41C07C 802A72EC 0000982D */ daddu $s3, $zero, $zero /* 41C080 802A72F0 3C0D8009 */ lui $t5, %hi(D_8008F060) /* 41C084 802A72F4 25ADF060 */ addiu $t5, $t5, %lo(D_8008F060) -/* 41C088 802A72F8 3C0C802B */ lui $t4, %hi(D_802AD5E8) -/* 41C08C 802A72FC 258CD5E8 */ addiu $t4, $t4, %lo(D_802AD5E8) +/* 41C088 802A72F8 3C0C802B */ lui $t4, %hi(battle_menu_moveOptionCantUseTypes) +/* 41C08C 802A72FC 258CD5E8 */ addiu $t4, $t4, %lo(battle_menu_moveOptionCantUseTypes) /* 41C090 802A7300 240BFFFF */ addiu $t3, $zero, -1 /* 41C094 802A7304 24070048 */ addiu $a3, $zero, 0x48 /* 41C098 802A7308 240AFFFE */ addiu $t2, $zero, -2 /* 41C09C 802A730C 24090001 */ addiu $t1, $zero, 1 /* 41C0A0 802A7310 3C08802B */ lui $t0, %hi(D_802AB398) /* 41C0A4 802A7314 2508B398 */ addiu $t0, $t0, %lo(D_802AB398) -/* 41C0A8 802A7318 3C06802B */ lui $a2, %hi(D_802AD260) -/* 41C0AC 802A731C 24C6D260 */ addiu $a2, $a2, %lo(D_802AD260) +/* 41C0A8 802A7318 3C06802B */ lui $a2, %hi(battle_menu_moveOptionIconScripts) +/* 41C0AC 802A731C 24C6D260 */ addiu $a2, $a2, %lo(battle_menu_moveOptionIconScripts) .L802A7320: /* 41C0B0 802A7320 02D32021 */ addu $a0, $s6, $s3 /* 41C0B4 802A7324 908201DE */ lbu $v0, 0x1de($a0) @@ -1839,37 +1839,37 @@ glabel L802A72E4_41C074 /* 41C15C 802A73CC ACC20000 */ sw $v0, ($a2) .L802A73D0: /* 41C160 802A73D0 82420011 */ lb $v0, 0x11($s2) -/* 41C164 802A73D4 3C01802B */ lui $at, %hi(D_802AD320) +/* 41C164 802A73D4 3C01802B */ lui $at, %hi(battle_menu_moveOptionDisplayCosts) /* 41C168 802A73D8 00230821 */ addu $at, $at, $v1 -/* 41C16C 802A73DC AC22D320 */ sw $v0, %lo(D_802AD320)($at) +/* 41C16C 802A73DC AC22D320 */ sw $v0, %lo(battle_menu_moveOptionDisplayCosts)($at) /* 41C170 802A73E0 82420012 */ lb $v0, 0x12($s2) -/* 41C174 802A73E4 3C01802B */ lui $at, %hi(D_802AD5D0) +/* 41C174 802A73E4 3C01802B */ lui $at, %hi(battle_menu_moveOptionSortPriorities) /* 41C178 802A73E8 00330821 */ addu $at, $at, $s3 -/* 41C17C 802A73EC A020D5D0 */ sb $zero, %lo(D_802AD5D0)($at) -/* 41C180 802A73F0 3C01802B */ lui $at, %hi(D_802AD4B0) +/* 41C17C 802A73EC A020D5D0 */ sb $zero, %lo(battle_menu_moveOptionSortPriorities)($at) +/* 41C180 802A73F0 3C01802B */ lui $at, %hi(battle_menu_moveIndices) /* 41C184 802A73F4 00230821 */ addu $at, $at, $v1 -/* 41C188 802A73F8 AC33D4B0 */ sw $s3, %lo(D_802AD4B0)($at) -/* 41C18C 802A73FC 3C01802B */ lui $at, %hi(D_802AD440) +/* 41C188 802A73F8 AC33D4B0 */ sw $s3, %lo(battle_menu_moveIndices)($at) +/* 41C18C 802A73FC 3C01802B */ lui $at, %hi(battle_menu_moveOptionBPCosts) /* 41C190 802A7400 00230821 */ addu $at, $at, $v1 -/* 41C194 802A7404 AC22D440 */ sw $v0, %lo(D_802AD440)($at) +/* 41C194 802A7404 AC22D440 */ sw $v0, %lo(battle_menu_moveOptionBPCosts)($at) /* 41C198 802A7408 808201F6 */ lb $v0, 0x1f6($a0) -/* 41C19C 802A740C 3C01802B */ lui $at, %hi(D_802AD510) +/* 41C19C 802A740C 3C01802B */ lui $at, %hi(battle_menu_moveOptionsEnabled) /* 41C1A0 802A7410 00230821 */ addu $at, $at, $v1 -/* 41C1A4 802A7414 AC22D510 */ sw $v0, %lo(D_802AD510)($at) +/* 41C1A4 802A7414 AC22D510 */ sw $v0, %lo(battle_menu_moveOptionsEnabled)($at) /* 41C1A8 802A7418 8E420000 */ lw $v0, ($s2) -/* 41C1AC 802A741C 3C01802B */ lui $at, %hi(D_802AD2C0) +/* 41C1AC 802A741C 3C01802B */ lui $at, %hi(battle_menu_moveOptionNames) /* 41C1B0 802A7420 00230821 */ addu $at, $at, $v1 -/* 41C1B4 802A7424 AC22D2C0 */ sw $v0, %lo(D_802AD2C0)($at) +/* 41C1B4 802A7424 AC22D2C0 */ sw $v0, %lo(battle_menu_moveOptionNames)($at) /* 41C1B8 802A7428 8E420008 */ lw $v0, 8($s2) -/* 41C1BC 802A742C 3C01802B */ lui $at, %hi(D_802AD380) +/* 41C1BC 802A742C 3C01802B */ lui $at, %hi(battle_menu_moveOptionDisplayCostReductions) /* 41C1C0 802A7430 00230821 */ addu $at, $at, $v1 -/* 41C1C4 802A7434 AC20D380 */ sw $zero, %lo(D_802AD380)($at) -/* 41C1C8 802A7438 3C01802B */ lui $at, %hi(D_802AD3E0) +/* 41C1C4 802A7434 AC20D380 */ sw $zero, %lo(battle_menu_moveOptionDisplayCostReductions)($at) +/* 41C1C8 802A7438 3C01802B */ lui $at, %hi(battle_menu_moveOptionDisplayCostReductionColors) /* 41C1CC 802A743C 00230821 */ addu $at, $at, $v1 -/* 41C1D0 802A7440 AC20D3E0 */ sw $zero, %lo(D_802AD3E0)($at) -/* 41C1D4 802A7444 3C01802B */ lui $at, %hi(D_802AD570) +/* 41C1D0 802A7440 AC20D3E0 */ sw $zero, %lo(battle_menu_moveOptionDisplayCostReductionColors)($at) +/* 41C1D4 802A7444 3C01802B */ lui $at, %hi(battle_menu_moveOptionDescriptions) /* 41C1D8 802A7448 00230821 */ addu $at, $at, $v1 -/* 41C1DC 802A744C AC22D570 */ sw $v0, %lo(D_802AD570)($at) +/* 41C1DC 802A744C AC22D570 */ sw $v0, %lo(battle_menu_moveOptionDescriptions)($at) /* 41C1E0 802A7450 92C2020E */ lbu $v0, 0x20e($s6) /* 41C1E4 802A7454 26730001 */ addiu $s3, $s3, 1 /* 41C1E8 802A7458 0262102A */ slt $v0, $s3, $v0 @@ -1883,10 +1883,10 @@ glabel L802A72E4_41C074 /* 41C200 802A7470 82DE0052 */ lb $fp, 0x52($s6) /* 41C204 802A7474 92C2020E */ lbu $v0, 0x20e($s6) /* 41C208 802A7478 24030001 */ addiu $v1, $zero, 1 -/* 41C20C 802A747C 3C01802B */ lui $at, %hi(D_802AD4A0) -/* 41C210 802A7480 AC23D4A0 */ sw $v1, %lo(D_802AD4A0)($at) -/* 41C214 802A7484 3C01802B */ lui $at, %hi(D_802AD4A4) -/* 41C218 802A7488 AC22D4A4 */ sw $v0, %lo(D_802AD4A4)($at) +/* 41C20C 802A747C 3C01802B */ lui $at, %hi(battle_menu_hasSpiritsMenu) +/* 41C210 802A7480 AC23D4A0 */ sw $v1, %lo(battle_menu_hasSpiritsMenu)($at) +/* 41C214 802A7484 3C01802B */ lui $at, %hi(battle_menu_moveOptionCount) +/* 41C218 802A7488 AC22D4A4 */ sw $v0, %lo(battle_menu_moveOptionCount)($at) /* 41C21C 802A748C 3C01802B */ lui $at, %hi(D_802AD4A8) /* 41C220 802A7490 AC3ED4A8 */ sw $fp, %lo(D_802AD4A8)($at) /* 41C224 802A7494 0C0A89A1 */ jal func_802A2684 @@ -2343,8 +2343,8 @@ glabel L802A7A24_41C7B4 /* 41C88C 802A7AFC 3C01802B */ lui $at, %hi(D_802AD640) /* 41C890 802A7B00 00230821 */ addu $at, $at, $v1 /* 41C894 802A7B04 AC24D640 */ sw $a0, %lo(D_802AD640)($at) -/* 41C898 802A7B08 3C04802B */ lui $a0, %hi(D_802AB490) -/* 41C89C 802A7B0C 2484B490 */ addiu $a0, $a0, %lo(D_802AB490) +/* 41C898 802A7B08 3C04802B */ lui $a0, %hi(battle_menu_leftJustfiedMessages) +/* 41C89C 802A7B0C 2484B490 */ addiu $a0, $a0, %lo(battle_menu_leftJustfiedMessages) /* 41C8A0 802A7B10 8C820024 */ lw $v0, 0x24($a0) /* 41C8A4 802A7B14 3C09802B */ lui $t1, %hi(D_802AB488) /* 41C8A8 802A7B18 2529B488 */ addiu $t1, $t1, %lo(D_802AB488) @@ -2756,20 +2756,20 @@ glabel L802A80E8_41CE78 /* 41CE84 802A80F4 00000000 */ nop glabel L802A80F8_41CE88 /* 41CE88 802A80F8 24040006 */ addiu $a0, $zero, 6 -/* 41CE8C 802A80FC 0C051F9F */ jal func_80147E7C +/* 41CE8C 802A80FC 0C051F9F */ jal set_window_update /* 41CE90 802A8100 24050002 */ addiu $a1, $zero, 2 /* 41CE94 802A8104 24040007 */ addiu $a0, $zero, 7 -/* 41CE98 802A8108 0C051F9F */ jal func_80147E7C +/* 41CE98 802A8108 0C051F9F */ jal set_window_update /* 41CE9C 802A810C 24050002 */ addiu $a1, $zero, 2 /* 41CEA0 802A8110 3C03802B */ lui $v1, %hi(D_802ACFFC) /* 41CEA4 802A8114 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) /* 41CEA8 802A8118 2402FFFF */ addiu $v0, $zero, -1 /* 41CEAC 802A811C 10620009 */ beq $v1, $v0, .L802A8144 /* 41CEB0 802A8120 24040006 */ addiu $a0, $zero, 6 -/* 41CEB4 802A8124 0C051F9F */ jal func_80147E7C +/* 41CEB4 802A8124 0C051F9F */ jal set_window_update /* 41CEB8 802A8128 24050009 */ addiu $a1, $zero, 9 /* 41CEBC 802A812C 24040007 */ addiu $a0, $zero, 7 -/* 41CEC0 802A8130 0C051F9F */ jal func_80147E7C +/* 41CEC0 802A8130 0C051F9F */ jal set_window_update /* 41CEC4 802A8134 24050009 */ addiu $a1, $zero, 9 /* 41CEC8 802A8138 2402001F */ addiu $v0, $zero, 0x1f .L802A813C: diff --git a/asm/nonmatchings/code_756780/func_802A10A4_756824.s b/asm/nonmatchings/code_756780/func_802A10A4_756824.s index a9dfed2299..ead9642a6d 100644 --- a/asm/nonmatchings/code_756780/func_802A10A4_756824.s +++ b/asm/nonmatchings/code_756780/func_802A10A4_756824.s @@ -25,15 +25,15 @@ glabel func_802A10A4_756824 /* 756868 802A10E8 24040001 */ addiu $a0, $zero, 1 /* 75686C 802A10EC 0000282D */ daddu $a1, $zero, $zero /* 756870 802A10F0 00A0302D */ daddu $a2, $a1, $zero -/* 756874 802A10F4 0C04DF93 */ jal func_80137E4C +/* 756874 802A10F4 0C04DF93 */ jal set_transition_stencil_center /* 756878 802A10F8 00A0382D */ daddu $a3, $a1, $zero /* 75687C 802A10FC 24040001 */ addiu $a0, $zero, 1 /* 756880 802A1100 0080282D */ daddu $a1, $a0, $zero /* 756884 802A1104 24060140 */ addiu $a2, $zero, 0x140 -/* 756888 802A1108 0C04DF93 */ jal func_80137E4C +/* 756888 802A1108 0C04DF93 */ jal set_transition_stencil_center /* 75688C 802A110C 240700F0 */ addiu $a3, $zero, 0xf0 /* 756890 802A1110 3C054320 */ lui $a1, 0x4320 -/* 756894 802A1114 0C04DF69 */ jal func_80137DA4 +/* 756894 802A1114 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 756898 802A1118 2404000C */ addiu $a0, $zero, 0xc /* 75689C 802A111C 8E020074 */ lw $v0, 0x74($s0) /* 7568A0 802A1120 14400010 */ bnez $v0, .L802A1164 @@ -41,15 +41,15 @@ glabel func_802A10A4_756824 /* 7568A8 802A1128 24040001 */ addiu $a0, $zero, 1 /* 7568AC 802A112C 0000282D */ daddu $a1, $zero, $zero /* 7568B0 802A1130 00A0302D */ daddu $a2, $a1, $zero -/* 7568B4 802A1134 0C04DF93 */ jal func_80137E4C +/* 7568B4 802A1134 0C04DF93 */ jal set_transition_stencil_center /* 7568B8 802A1138 00A0382D */ daddu $a3, $a1, $zero /* 7568BC 802A113C 24040001 */ addiu $a0, $zero, 1 /* 7568C0 802A1140 0080282D */ daddu $a1, $a0, $zero /* 7568C4 802A1144 24060140 */ addiu $a2, $zero, 0x140 -/* 7568C8 802A1148 0C04DF93 */ jal func_80137E4C +/* 7568C8 802A1148 0C04DF93 */ jal set_transition_stencil_center /* 7568CC 802A114C 240700F0 */ addiu $a3, $zero, 0xf0 /* 7568D0 802A1150 2404000C */ addiu $a0, $zero, 0xc -/* 7568D4 802A1154 0C04DF69 */ jal func_80137DA4 +/* 7568D4 802A1154 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 7568D8 802A1158 0000282D */ daddu $a1, $zero, $zero /* 7568DC 802A115C 080A845B */ j .L802A116C /* 7568E0 802A1160 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_77480/func_800E0818.s b/asm/nonmatchings/code_77480/check_for_interactables.s similarity index 97% rename from asm/nonmatchings/code_77480/func_800E0818.s rename to asm/nonmatchings/code_77480/check_for_interactables.s index 2ac382a9f6..2c167c5833 100644 --- a/asm/nonmatchings/code_77480/func_800E0818.s +++ b/asm/nonmatchings/code_77480/check_for_interactables.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800E0818 +glabel check_for_interactables /* 79CC8 800E0818 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 79CCC 800E081C AFB10014 */ sw $s1, 0x14($sp) /* 79CD0 800E0820 3C118011 */ lui $s1, %hi(gPlayerStatus) @@ -95,14 +95,14 @@ glabel func_800E0818 /* 79E20 800E0970 32022000 */ andi $v0, $s0, 0x2000 /* 79E24 800E0974 14400012 */ bnez $v0, .L800E09C0 /* 79E28 800E0978 0000902D */ daddu $s2, $zero, $zero -/* 79E2C 800E097C 0C05173A */ jal func_80145CE8 +/* 79E2C 800E097C 0C05173A */ jal should_collider_allow_interact /* 79E30 800E0980 0200202D */ daddu $a0, $s0, $zero /* 79E34 800E0984 1440000E */ bnez $v0, .L800E09C0 /* 79E38 800E0988 3C03F7FF */ lui $v1, 0xf7ff /* 79E3C 800E098C 0803826A */ j .L800E09A8 /* 79E40 800E0990 00000000 */ nop .L800E0994: -/* 79E44 800E0994 0C0394BE */ jal func_800E52F8 +/* 79E44 800E0994 0C0394BE */ jal can_player_interact /* 79E48 800E0998 00000000 */ nop /* 79E4C 800E099C 14400008 */ bnez $v0, .L800E09C0 /* 79E50 800E09A0 24120001 */ addiu $s2, $zero, 1 @@ -158,7 +158,7 @@ glabel func_800E0818 /* 79F00 800E0A50 00000000 */ nop /* 79F04 800E0A54 0C03BCF5 */ jal func_800EF3D4 /* 79F08 800E0A58 0000202D */ daddu $a0, $zero, $zero -/* 79F0C 800E0A5C 0C03BCE9 */ jal func_800EF3A4 +/* 79F0C 800E0A5C 0C03BCE9 */ jal reset_parter_tether_distance /* 79F10 800E0A60 00000000 */ nop /* 79F14 800E0A64 080382AD */ j .L800E0AB4 /* 79F18 800E0A68 00000000 */ nop diff --git a/asm/nonmatchings/code_77480/func_800E06D8.s b/asm/nonmatchings/code_77480/func_800E06D8.s index a50e95dde7..b5128cac1e 100644 --- a/asm/nonmatchings/code_77480/func_800E06D8.s +++ b/asm/nonmatchings/code_77480/func_800E06D8.s @@ -46,14 +46,14 @@ glabel func_800E06D8 /* 79C20 800E0770 32024000 */ andi $v0, $s0, 0x4000 /* 79C24 800E0774 14400007 */ bnez $v0, .L800E0794 /* 79C28 800E0778 00000000 */ nop -/* 79C2C 800E077C 0C05173A */ jal func_80145CE8 +/* 79C2C 800E077C 0C05173A */ jal should_collider_allow_interact /* 79C30 800E0780 0200202D */ daddu $a0, $s0, $zero /* 79C34 800E0784 1440000E */ bnez $v0, .L800E07C0 /* 79C38 800E0788 0000102D */ daddu $v0, $zero, $zero /* 79C3C 800E078C 08038200 */ j .L800E0800 /* 79C40 800E0790 00000000 */ nop .L800E0794: -/* 79C44 800E0794 0C0394BE */ jal func_800E52F8 +/* 79C44 800E0794 0C0394BE */ jal can_player_interact /* 79C48 800E0798 00000000 */ nop /* 79C4C 800E079C 14400003 */ bnez $v0, .L800E07AC /* 79C50 800E07A0 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/code_77480/func_800E0B90.s b/asm/nonmatchings/code_77480/func_800E0B90.s index 893019568e..399f595548 100644 --- a/asm/nonmatchings/code_77480/func_800E0B90.s +++ b/asm/nonmatchings/code_77480/func_800E0B90.s @@ -224,7 +224,7 @@ glabel func_800E0B90 /* 7A380 800E0ED0 00000000 */ nop /* 7A384 800E0ED4 45000004 */ bc1f .L800E0EE8 /* 7A388 800E0ED8 00000000 */ nop -/* 7A38C 800E0EDC 0C0383FB */ jal func_800E0FEC +/* 7A38C 800E0EDC 0C0383FB */ jal get_player_back_anim /* 7A390 800E0EE0 0200202D */ daddu $a0, $s0, $zero /* 7A394 800E0EE4 0040802D */ daddu $s0, $v0, $zero .L800E0EE8: @@ -263,7 +263,7 @@ glabel func_800E0B90 /* 7A40C 800E0F5C 00000000 */ nop /* 7A410 800E0F60 45020005 */ bc1fl .L800E0F78 /* 7A414 800E0F64 AE3000A4 */ sw $s0, 0xa4($s1) -/* 7A418 800E0F68 0C0383FB */ jal func_800E0FEC +/* 7A418 800E0F68 0C0383FB */ jal get_player_back_anim /* 7A41C 800E0F6C 0200202D */ daddu $a0, $s0, $zero /* 7A420 800E0F70 0040802D */ daddu $s0, $v0, $zero /* 7A424 800E0F74 AE3000A4 */ sw $s0, 0xa4($s1) diff --git a/asm/nonmatchings/code_77480/func_800E0FEC.s b/asm/nonmatchings/code_77480/get_player_back_anim.s similarity index 99% rename from asm/nonmatchings/code_77480/func_800E0FEC.s rename to asm/nonmatchings/code_77480/get_player_back_anim.s index fd16b33937..3384569bf7 100644 --- a/asm/nonmatchings/code_77480/func_800E0FEC.s +++ b/asm/nonmatchings/code_77480/get_player_back_anim.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800E0FEC +glabel get_player_back_anim /* 7A49C 800E0FEC 00041403 */ sra $v0, $a0, 0x10 /* 7A4A0 800E0FF0 304300FF */ andi $v1, $v0, 0xff /* 7A4A4 800E0FF4 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_77480/update_player.s b/asm/nonmatchings/code_77480/update_player.s index dacb80a329..b4da225710 100644 --- a/asm/nonmatchings/code_77480/update_player.s +++ b/asm/nonmatchings/code_77480/update_player.s @@ -5,7 +5,7 @@ glabel update_player /* 78BF0 800DF740 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 78BF4 800DF744 AFBF0018 */ sw $ra, 0x18($sp) /* 78BF8 800DF748 AFB10014 */ sw $s1, 0x14($sp) -/* 78BFC 800DF74C 0C0382CE */ jal func_800E0B38 +/* 78BFC 800DF74C 0C0382CE */ jal update_partner_timers /* 78C00 800DF750 AFB00010 */ sw $s0, 0x10($sp) /* 78C04 800DF754 3C108011 */ lui $s0, %hi(gPlayerStatus) /* 78C08 800DF758 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) @@ -164,7 +164,7 @@ glabel update_player .L800DF998: /* 78E48 800DF998 0C0386F1 */ jal update_player_shadow /* 78E4C 800DF99C 00000000 */ nop -/* 78E50 800DF9A0 0C038206 */ jal func_800E0818 +/* 78E50 800DF9A0 0C038206 */ jal check_for_interactables /* 78E54 800DF9A4 00000000 */ nop /* 78E58 800DF9A8 0C038160 */ jal func_800E0580 /* 78E5C 800DF9AC 00000000 */ nop diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E52F8.s b/asm/nonmatchings/code_7bb60_len_41b0/can_player_interact.s similarity index 97% rename from asm/nonmatchings/code_7bb60_len_41b0/func_800E52F8.s rename to asm/nonmatchings/code_7bb60_len_41b0/can_player_interact.s index bc9b8b1af1..6ab8e58053 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E52F8.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/can_player_interact.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800E52F8 +glabel can_player_interact /* 7E7A8 800E52F8 3C028011 */ lui $v0, %hi(D_8010EBB0) /* 7E7AC 800E52FC 2442EBB0 */ addiu $v0, $v0, %lo(D_8010EBB0) /* 7E7B0 800E5300 80440000 */ lb $a0, ($v0) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s index 77690a1eeb..1d75abff46 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s @@ -104,7 +104,7 @@ glabel func_800E5A2C /* 7F044 800E5B94 30422000 */ andi $v0, $v0, 0x2000 /* 7F048 800E5B98 14400004 */ bnez $v0, .L800E5BAC /* 7F04C 800E5B9C 0000182D */ daddu $v1, $zero, $zero -/* 7F050 800E5BA0 0C010C77 */ jal func_800431DC +/* 7F050 800E5BA0 0C010C77 */ jal check_conversation_trigger /* 7F054 800E5BA4 00000000 */ nop /* 7F058 800E5BA8 0040182D */ daddu $v1, $v0, $zero .L800E5BAC: diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s index 5dc8a10f8c..a809e8920f 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s @@ -21,7 +21,7 @@ glabel func_800E5C78 /* 7F164 800E5CB4 30420020 */ andi $v0, $v0, 0x20 /* 7F168 800E5CB8 14400007 */ bnez $v0, .L800E5CD8 /* 7F16C 800E5CBC 00000000 */ nop -/* 7F170 800E5CC0 0C010C77 */ jal func_800431DC +/* 7F170 800E5CC0 0C010C77 */ jal check_conversation_trigger /* 7F174 800E5CC4 00000000 */ nop /* 7F178 800E5CC8 10400003 */ beqz $v0, .L800E5CD8 /* 7F17C 800E5CCC 00000000 */ nop diff --git a/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s b/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s index a17fb3dc6d..70857e1ef0 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s @@ -44,7 +44,7 @@ glabel update_fall_state /* 7C264 800E2DB4 E600002C */ swc1 $f0, 0x2c($s0) /* 7C268 800E2DB8 0C0389AC */ jal func_800E26B0 /* 7C26C 800E2DBC 00000000 */ nop -/* 7C270 800E2DC0 0C011052 */ jal func_80044148 +/* 7C270 800E2DC0 0C011052 */ jal is_starting_conversation /* 7C274 800E2DC4 00000000 */ nop /* 7C278 800E2DC8 1040001F */ beqz $v0, .L800E2E48 /* 7C27C 800E2DCC 00000000 */ nop diff --git a/asm/nonmatchings/code_7fd10_len_b40/can_pause.s b/asm/nonmatchings/code_7fd10_len_b40/can_pause.s index 264e4222eb..0245427530 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/can_pause.s +++ b/asm/nonmatchings/code_7fd10_len_b40/can_pause.s @@ -43,7 +43,7 @@ glabel can_pause /* 7FF20 800E6A70 00431024 */ and $v0, $v0, $v1 /* 7FF24 800E6A74 14400036 */ bnez $v0, .L800E6B50 /* 7FF28 800E6A78 0000102D */ daddu $v0, $zero, $zero -/* 7FF2C 800E6A7C 0C04D07A */ jal func_801341E8 +/* 7FF2C 800E6A7C 0C04D07A */ jal is_picking_up_item /* 7FF30 800E6A80 00000000 */ nop /* 7FF34 800E6A84 14400032 */ bnez $v0, .L800E6B50 /* 7FF38 800E6A88 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s b/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s index 895d815e93..feb5eba79c 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s +++ b/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s @@ -156,7 +156,7 @@ glabel check_input_open_menus /* 803C8 800E6F18 00000000 */ nop /* 803CC 800E6F1C 1040000B */ beqz $v0, .L800E6F4C /* 803D0 800E6F20 00000000 */ nop -/* 803D4 800E6F24 0C04D07A */ jal func_801341E8 +/* 803D4 800E6F24 0C04D07A */ jal is_picking_up_item /* 803D8 800E6F28 00000000 */ nop /* 803DC 800E6F2C 14400007 */ bnez $v0, .L800E6F4C /* 803E0 800E6F30 00000000 */ nop diff --git a/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s b/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s index 9719cc6c8e..ac5e53dec8 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s +++ b/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s @@ -41,7 +41,7 @@ glabel check_input_status_menu /* 807C4 800E7314 00000000 */ nop /* 807C8 800E7318 0C03A5D8 */ jal open_status_menu_long /* 807CC 800E731C 00000000 */ nop -/* 807D0 800E7320 0C04D07A */ jal func_801341E8 +/* 807D0 800E7320 0C04D07A */ jal is_picking_up_item /* 807D4 800E7324 00000000 */ nop /* 807D8 800E7328 14400015 */ bnez $v0, .L800E7380 /* 807DC 800E732C 24040003 */ addiu $a0, $zero, 3 @@ -58,9 +58,9 @@ glabel check_input_status_menu /* 80804 800E7354 00000000 */ nop /* 80808 800E7358 10400009 */ beqz $v0, .L800E7380 /* 8080C 800E735C 00000000 */ nop -/* 80810 800E7360 0C03A5EE */ jal func_800E97B8 +/* 80810 800E7360 0C03A5EE */ jal close_status_menu /* 80814 800E7364 00000000 */ nop -/* 80818 800E7368 0C04D07A */ jal func_801341E8 +/* 80818 800E7368 0C04D07A */ jal is_picking_up_item /* 8081C 800E736C 00000000 */ nop /* 80820 800E7370 14400003 */ bnez $v0, .L800E7380 /* 80824 800E7374 24040004 */ addiu $a0, $zero, 4 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s b/asm/nonmatchings/code_838b0_len_5900/_use_partner_ability.s similarity index 99% rename from asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s rename to asm/nonmatchings/code_838b0_len_5900/_use_partner_ability.s index 4b59a0107e..c678079849 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s +++ b/asm/nonmatchings/code_838b0_len_5900/_use_partner_ability.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800EA6CC +glabel _use_partner_ability /* 83B7C 800EA6CC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 83B80 800EA6D0 AFB3001C */ sw $s3, 0x1c($sp) /* 83B84 800EA6D4 3C138011 */ lui $s3, %hi(gPlayerData) @@ -167,7 +167,7 @@ glabel func_800EA6CC /* 83DE4 800EA934 8C42CFE4 */ lw $v0, %lo(D_8010CFE4)($v0) /* 83DE8 800EA938 3C018011 */ lui $at, %hi(D_8010CFD8) /* 83DEC 800EA93C AC22CFD8 */ sw $v0, %lo(D_8010CFD8)($at) -/* 83DF0 800EA940 0C03A974 */ jal func_800EA5D0 +/* 83DF0 800EA940 0C03A974 */ jal load_partner_npc /* 83DF4 800EA944 A2620012 */ sb $v0, 0x12($s3) /* 83DF8 800EA948 0C05272D */ jal play_sound /* 83DFC 800EA94C 2404000E */ addiu $a0, $zero, 0xe @@ -272,7 +272,7 @@ glabel func_800EA6CC /* 83F74 800EAAC4 8C42CFE4 */ lw $v0, %lo(D_8010CFE4)($v0) /* 83F78 800EAAC8 3C018011 */ lui $at, %hi(D_8010CFD8) /* 83F7C 800EAACC AC22CFD8 */ sw $v0, %lo(D_8010CFD8)($at) -/* 83F80 800EAAD0 0C03A974 */ jal func_800EA5D0 +/* 83F80 800EAAD0 0C03A974 */ jal load_partner_npc /* 83F84 800EAAD4 A2620012 */ sb $v0, 0x12($s3) /* 83F88 800EAAD8 3C048011 */ lui $a0, %hi(D_8010C930) /* 83F8C 800EAADC 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) @@ -406,7 +406,7 @@ glabel func_800EA6CC /* 84178 800EACC8 8C42CFE4 */ lw $v0, %lo(D_8010CFE4)($v0) /* 8417C 800EACCC 3C018011 */ lui $at, %hi(D_8010CFD8) /* 84180 800EACD0 AC22CFD8 */ sw $v0, %lo(D_8010CFD8)($at) -/* 84184 800EACD4 0C03A974 */ jal func_800EA5D0 +/* 84184 800EACD4 0C03A974 */ jal load_partner_npc /* 84188 800EACD8 A2620012 */ sb $v0, 0x12($s3) /* 8418C 800EACDC 3C028011 */ lui $v0, %hi(D_8010CFEC) /* 84190 800EACE0 8C42CFEC */ lw $v0, %lo(D_8010CFEC)($v0) @@ -486,7 +486,7 @@ glabel func_800EA6CC /* 842AC 800EADFC 8C42CFE4 */ lw $v0, %lo(D_8010CFE4)($v0) /* 842B0 800EAE00 3C018011 */ lui $at, %hi(D_8010CFD8) /* 842B4 800EAE04 AC22CFD8 */ sw $v0, %lo(D_8010CFD8)($at) -/* 842B8 800EAE08 0C03A974 */ jal func_800EA5D0 +/* 842B8 800EAE08 0C03A974 */ jal load_partner_npc /* 842BC 800EAE0C A2620012 */ sb $v0, 0x12($s3) /* 842C0 800EAE10 3C048011 */ lui $a0, %hi(D_8010C930) /* 842C4 800EAE14 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA5D0.s b/asm/nonmatchings/code_838b0_len_5900/load_partner_npc.s similarity index 99% rename from asm/nonmatchings/code_838b0_len_5900/func_800EA5D0.s rename to asm/nonmatchings/code_838b0_len_5900/load_partner_npc.s index 99eb05739e..425c7c313d 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA5D0.s +++ b/asm/nonmatchings/code_838b0_len_5900/load_partner_npc.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800EA5D0 +glabel load_partner_npc /* 83A80 800EA5D0 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 83A84 800EA5D4 3C028011 */ lui $v0, %hi(D_8010CFD8) /* 83A88 800EA5D8 8C42CFD8 */ lw $v0, %lo(D_8010CFD8)($v0) diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s index 8c66dc46b5..97c5fcc2a9 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s @@ -13,8 +13,8 @@ glabel partner_reset_data /* 84944 800EB494 AFBF0018 */ sw $ra, 0x18($sp) /* 84948 800EB498 0C00A580 */ jal mem_clear /* 8494C 800EB49C 24050360 */ addiu $a1, $zero, 0x360 -/* 84950 800EB4A0 3C04800F */ lui $a0, %hi(func_800EA6CC) -/* 84954 800EB4A4 2484A6CC */ addiu $a0, $a0, %lo(func_800EA6CC) +/* 84950 800EB4A0 3C04800F */ lui $a0, %hi(_use_partner_ability) +/* 84954 800EB4A4 2484A6CC */ addiu $a0, $a0, %lo(_use_partner_ability) /* 84958 800EB4A8 0C048C8F */ jal bind_dynamic_entity_7 /* 8495C 800EB4AC 0000282D */ daddu $a1, $zero, $zero /* 84960 800EB4B0 0C048D8F */ jal get_dynamic_entity @@ -55,7 +55,7 @@ glabel partner_reset_data /* 849E8 800EB538 0803AD5B */ j .L800EB56C /* 849EC 800EB53C ACC40000 */ sw $a0, ($a2) .L800EB540: -/* 849F0 800EB540 0C03A974 */ jal func_800EA5D0 +/* 849F0 800EB540 0C03A974 */ jal load_partner_npc /* 849F4 800EB544 00000000 */ nop /* 849F8 800EB548 3C028011 */ lui $v0, %hi(D_8010C930) /* 849FC 800EB54C 8C42C930 */ lw $v0, %lo(D_8010C930)($v0) @@ -64,7 +64,7 @@ glabel partner_reset_data /* 84A08 800EB558 00000000 */ nop /* 84A0C 800EB55C E4400054 */ swc1 $f0, 0x54($v0) /* 84A10 800EB560 E4400058 */ swc1 $f0, 0x58($v0) -/* 84A14 800EB564 0C03A9B3 */ jal func_800EA6CC +/* 84A14 800EB564 0C03A9B3 */ jal _use_partner_ability /* 84A18 800EB568 E440005C */ swc1 $f0, 0x5c($v0) .L800EB56C: /* 84A1C 800EB56C 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_use_ability.s b/asm/nonmatchings/code_838b0_len_5900/partner_use_ability.s index badab2975c..f89c99c355 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_use_ability.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_use_ability.s @@ -4,7 +4,7 @@ glabel partner_use_ability /* 847C4 800EB314 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 847C8 800EB318 AFBF0010 */ sw $ra, 0x10($sp) -/* 847CC 800EB31C 0C011052 */ jal func_80044148 +/* 847CC 800EB31C 0C011052 */ jal is_starting_conversation /* 847D0 800EB320 00000000 */ nop /* 847D4 800EB324 1440002B */ bnez $v0, .L800EB3D4 /* 847D8 800EB328 0000102D */ daddu $v0, $zero, $zero @@ -47,7 +47,7 @@ glabel partner_use_ability /* 84864 800EB3B4 24020008 */ addiu $v0, $zero, 8 /* 84868 800EB3B8 3C018011 */ lui $at, %hi(D_8010CFE8) /* 8486C 800EB3BC AC22CFE8 */ sw $v0, %lo(D_8010CFE8)($at) -/* 84870 800EB3C0 0C03A9B3 */ jal func_800EA6CC +/* 84870 800EB3C0 0C03A9B3 */ jal _use_partner_ability /* 84874 800EB3C4 00000000 */ nop /* 84878 800EB3C8 0803ACF5 */ j .L800EB3D4 /* 8487C 800EB3CC 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF3A4.s b/asm/nonmatchings/code_838b0_len_5900/reset_parter_tether_distance.s similarity index 92% rename from asm/nonmatchings/code_838b0_len_5900/func_800EF3A4.s rename to asm/nonmatchings/code_838b0_len_5900/reset_parter_tether_distance.s index 442f090a2c..32adf8e611 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF3A4.s +++ b/asm/nonmatchings/code_838b0_len_5900/reset_parter_tether_distance.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800EF3A4 +glabel reset_parter_tether_distance /* 88854 800EF3A4 3C014220 */ lui $at, 0x4220 /* 88858 800EF3A8 44810000 */ mtc1 $at, $f0 /* 8885C 800EF3AC 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF394.s b/asm/nonmatchings/code_838b0_len_5900/set_parter_tether_distance.s similarity index 89% rename from asm/nonmatchings/code_838b0_len_5900/func_800EF394.s rename to asm/nonmatchings/code_838b0_len_5900/set_parter_tether_distance.s index 64e92c7e5f..1d8bb3f831 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF394.s +++ b/asm/nonmatchings/code_838b0_len_5900/set_parter_tether_distance.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800EF394 +glabel set_parter_tether_distance /* 88844 800EF394 3C018011 */ lui $at, %hi(D_8010CFC0) /* 88848 800EF398 E42CCFC0 */ swc1 $f12, %lo(D_8010CFC0)($at) /* 8884C 800EF39C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_8800/update_cameras.s b/asm/nonmatchings/code_8800/update_cameras.s index db26523df1..4e667d3c87 100644 --- a/asm/nonmatchings/code_8800/update_cameras.s +++ b/asm/nonmatchings/code_8800/update_cameras.s @@ -101,7 +101,7 @@ glabel L8002D4F8_88F8 /* 8958 8002D558 30620004 */ andi $v0, $v1, 4 /* 895C 8002D55C 10400004 */ beqz $v0, .L8002D570 /* 8960 8002D560 261100D4 */ addiu $s1, $s0, 0xd4 -/* 8964 8002D564 0C00CCE5 */ jal func_80033394 +/* 8964 8002D564 0C00CCE5 */ jal create_camera_lead_player_mtx /* 8968 8002D568 0200202D */ daddu $a0, $s0, $zero /* 896C 8002D56C 261100D4 */ addiu $s1, $s0, 0xd4 .L8002D570: diff --git a/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s b/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s index 963029b726..731e85cf8a 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s +++ b/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s @@ -60,7 +60,7 @@ glabel draw_submenu_title /* 8DBC8 800F4718 8E070000 */ lw $a3, ($s0) /* 8DBCC 800F471C 24110032 */ addiu $s1, $zero, 0x32 /* 8DBD0 800F4720 AFB10010 */ sw $s1, 0x10($sp) -/* 8DBD4 800F4724 0C04993B */ jal draw_string +/* 8DBD4 800F4724 0C04993B */ jal draw_msg /* 8DBD8 800F4728 AFA80014 */ sw $t0, 0x14($sp) /* 8DBDC 800F472C 2685005E */ addiu $a1, $s4, 0x5e /* 8DBE0 800F4730 0240302D */ daddu $a2, $s2, $zero @@ -85,7 +85,7 @@ glabel draw_submenu_title /* 8DC28 800F4778 8E070000 */ lw $a3, ($s0) /* 8DC2C 800F477C 24110032 */ addiu $s1, $zero, 0x32 /* 8DC30 800F4780 AFB10010 */ sw $s1, 0x10($sp) -/* 8DC34 800F4784 0C04993B */ jal draw_string +/* 8DC34 800F4784 0C04993B */ jal draw_msg /* 8DC38 800F4788 AFA80014 */ sw $t0, 0x14($sp) /* 8DC3C 800F478C 2685005E */ addiu $a1, $s4, 0x5e /* 8DC40 800F4790 0240302D */ daddu $a2, $s2, $zero @@ -170,7 +170,7 @@ glabel draw_submenu_title /* 8DD74 800F48C4 24020001 */ addiu $v0, $zero, 1 /* 8DD78 800F48C8 AFA20014 */ sw $v0, 0x14($sp) .L800F48CC: -/* 8DD7C 800F48CC 0C04993B */ jal draw_string +/* 8DD7C 800F48CC 0C04993B */ jal draw_msg /* 8DD80 800F48D0 00000000 */ nop .L800F48D4: /* 8DD84 800F48D4 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s index b3af72c19c..5dae9582ce 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s @@ -23,7 +23,7 @@ glabel func_800F13B0 /* 8A8A8 800F13F8 2404000E */ addiu $a0, $zero, 0xe /* 8A8AC 800F13FC 3C108014 */ lui $s0, %hi(D_80147574) /* 8A8B0 800F1400 26107574 */ addiu $s0, $s0, %lo(D_80147574) -/* 8A8B4 800F1404 0C051F9F */ jal func_80147E7C +/* 8A8B4 800F1404 0C051F9F */ jal set_window_update /* 8A8B8 800F1408 0200282D */ daddu $a1, $s0, $zero /* 8A8BC 800F140C 0803C506 */ j .L800F1418 /* 8A8C0 800F1410 24040013 */ addiu $a0, $zero, 0x13 @@ -31,7 +31,7 @@ glabel func_800F13B0 .L800F1418: /* 8A8C8 800F1418 3C058014 */ lui $a1, %hi(D_80147574) /* 8A8CC 800F141C 24A57574 */ addiu $a1, $a1, %lo(D_80147574) -/* 8A8D0 800F1420 0C051F9F */ jal func_80147E7C +/* 8A8D0 800F1420 0C051F9F */ jal set_window_update /* 8A8D4 800F1424 00000000 */ nop .L800F1428: /* 8A8D8 800F1428 0803C51D */ j .L800F1474 @@ -49,13 +49,13 @@ glabel func_800F13B0 /* 8A904 800F1454 00400008 */ jr $v0 /* 8A908 800F1458 00000000 */ nop /* 8A90C 800F145C 2404000E */ addiu $a0, $zero, 0xe -/* 8A910 800F1460 0C051F9F */ jal func_80147E7C +/* 8A910 800F1460 0C051F9F */ jal set_window_update /* 8A914 800F1464 24050002 */ addiu $a1, $zero, 2 /* 8A918 800F1468 0803C51D */ j .L800F1474 /* 8A91C 800F146C 24040013 */ addiu $a0, $zero, 0x13 /* 8A920 800F1470 2404000E */ addiu $a0, $zero, 0xe .L800F1474: -/* 8A924 800F1474 0C051F9F */ jal func_80147E7C +/* 8A924 800F1474 0C051F9F */ jal set_window_update /* 8A928 800F1478 24050002 */ addiu $a1, $zero, 2 .L800F147C: /* 8A92C 800F147C 3C118011 */ lui $s1, %hi(D_8010D69C) @@ -67,10 +67,10 @@ glabel func_800F13B0 /* 8A944 800F1494 24040010 */ addiu $a0, $zero, 0x10 /* 8A948 800F1498 3C108014 */ lui $s0, %hi(D_80147574) /* 8A94C 800F149C 26107574 */ addiu $s0, $s0, %lo(D_80147574) -/* 8A950 800F14A0 0C051F9F */ jal func_80147E7C +/* 8A950 800F14A0 0C051F9F */ jal set_window_update /* 8A954 800F14A4 0200282D */ daddu $a1, $s0, $zero /* 8A958 800F14A8 24040014 */ addiu $a0, $zero, 0x14 -/* 8A95C 800F14AC 0C051F9F */ jal func_80147E7C +/* 8A95C 800F14AC 0C051F9F */ jal set_window_update /* 8A960 800F14B0 0200282D */ daddu $a1, $s0, $zero .L800F14B4: /* 8A964 800F14B4 8E220000 */ lw $v0, ($s1) @@ -80,7 +80,7 @@ glabel func_800F13B0 /* 8A974 800F14C4 00000000 */ nop /* 8A978 800F14C8 3C058014 */ lui $a1, %hi(D_80147574) /* 8A97C 800F14CC 24A57574 */ addiu $a1, $a1, %lo(D_80147574) -/* 8A980 800F14D0 0C051F9F */ jal func_80147E7C +/* 8A980 800F14D0 0C051F9F */ jal set_window_update /* 8A984 800F14D4 24040012 */ addiu $a0, $zero, 0x12 .L800F14D8: /* 8A988 800F14D8 8E220000 */ lw $v0, ($s1) @@ -90,10 +90,10 @@ glabel func_800F13B0 /* 8A998 800F14E8 24040010 */ addiu $a0, $zero, 0x10 /* 8A99C 800F14EC 3C108014 */ lui $s0, %hi(D_80147574) /* 8A9A0 800F14F0 26107574 */ addiu $s0, $s0, %lo(D_80147574) -/* 8A9A4 800F14F4 0C051F9F */ jal func_80147E7C +/* 8A9A4 800F14F4 0C051F9F */ jal set_window_update /* 8A9A8 800F14F8 0200282D */ daddu $a1, $s0, $zero /* 8A9AC 800F14FC 24040014 */ addiu $a0, $zero, 0x14 -/* 8A9B0 800F1500 0C051F9F */ jal func_80147E7C +/* 8A9B0 800F1500 0C051F9F */ jal set_window_update /* 8A9B4 800F1504 0200282D */ daddu $a1, $s0, $zero .L800F1508: /* 8A9B8 800F1508 3C038011 */ lui $v1, %hi(D_8010D692) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s index 073f92e1f3..fce965100c 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s @@ -100,7 +100,7 @@ glabel func_800F1538 /* 8AB4C 800F169C 0C03A631 */ jal func_800E98C4 /* 8AB50 800F16A0 00000000 */ nop .L800F16A4: -/* 8AB54 800F16A4 0C03A5EE */ jal func_800E97B8 +/* 8AB54 800F16A4 0C03A5EE */ jal close_status_menu /* 8AB58 800F16A8 00000000 */ nop .L800F16AC: /* 8AB5C 800F16AC 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s index ec03f8ba51..4fa8de853d 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s @@ -24,27 +24,27 @@ glabel func_800F16CC /* 8ABC8 800F1718 2404000E */ addiu $a0, $zero, 0xe /* 8ABCC 800F171C 3C108014 */ lui $s0, %hi(D_80147474) /* 8ABD0 800F1720 26107474 */ addiu $s0, $s0, %lo(D_80147474) -/* 8ABD4 800F1724 0C051F9F */ jal func_80147E7C +/* 8ABD4 800F1724 0C051F9F */ jal set_window_update /* 8ABD8 800F1728 0200282D */ daddu $a1, $s0, $zero /* 8ABDC 800F172C 0803C5D3 */ j .L800F174C /* 8ABE0 800F1730 24040001 */ addiu $a0, $zero, 1 /* 8ABE4 800F1734 2404000E */ addiu $a0, $zero, 0xe /* 8ABE8 800F1738 3C108014 */ lui $s0, %hi(D_80147474) /* 8ABEC 800F173C 26107474 */ addiu $s0, $s0, %lo(D_80147474) -/* 8ABF0 800F1740 0C051F9F */ jal func_80147E7C +/* 8ABF0 800F1740 0C051F9F */ jal set_window_update /* 8ABF4 800F1744 0200282D */ daddu $a1, $s0, $zero /* 8ABF8 800F1748 24040002 */ addiu $a0, $zero, 2 .L800F174C: /* 8ABFC 800F174C 0C05272D */ jal play_sound /* 8AC00 800F1750 00000000 */ nop /* 8AC04 800F1754 24040013 */ addiu $a0, $zero, 0x13 -/* 8AC08 800F1758 0C051F9F */ jal func_80147E7C +/* 8AC08 800F1758 0C051F9F */ jal set_window_update /* 8AC0C 800F175C 0200282D */ daddu $a1, $s0, $zero /* 8AC10 800F1760 0803C5E1 */ j .L800F1784 /* 8AC14 800F1764 24040015 */ addiu $a0, $zero, 0x15 /* 8AC18 800F1768 3C058014 */ lui $a1, %hi(D_80147474) /* 8AC1C 800F176C 24A57474 */ addiu $a1, $a1, %lo(D_80147474) -/* 8AC20 800F1770 0C051F9F */ jal func_80147E7C +/* 8AC20 800F1770 0C051F9F */ jal set_window_update /* 8AC24 800F1774 2404000E */ addiu $a0, $zero, 0xe /* 8AC28 800F1778 0C05272D */ jal play_sound /* 8AC2C 800F177C 24040001 */ addiu $a0, $zero, 1 @@ -68,12 +68,12 @@ glabel func_800F16CC /* 8AC68 800F17B8 00400008 */ jr $v0 /* 8AC6C 800F17BC 00000000 */ nop /* 8AC70 800F17C0 2404000E */ addiu $a0, $zero, 0xe -/* 8AC74 800F17C4 0C051F9F */ jal func_80147E7C +/* 8AC74 800F17C4 0C051F9F */ jal set_window_update /* 8AC78 800F17C8 24050001 */ addiu $a1, $zero, 1 /* 8AC7C 800F17CC 0803C5FB */ j .L800F17EC /* 8AC80 800F17D0 24040013 */ addiu $a0, $zero, 0x13 /* 8AC84 800F17D4 2404000E */ addiu $a0, $zero, 0xe -/* 8AC88 800F17D8 0C051F9F */ jal func_80147E7C +/* 8AC88 800F17D8 0C051F9F */ jal set_window_update /* 8AC8C 800F17DC 24050001 */ addiu $a1, $zero, 1 /* 8AC90 800F17E0 0803C5FB */ j .L800F17EC /* 8AC94 800F17E4 24040013 */ addiu $a0, $zero, 0x13 @@ -81,7 +81,7 @@ glabel func_800F16CC .L800F17EC: /* 8AC9C 800F17EC 24050001 */ addiu $a1, $zero, 1 .L800F17F0: -/* 8ACA0 800F17F0 0C051F9F */ jal func_80147E7C +/* 8ACA0 800F17F0 0C051F9F */ jal set_window_update /* 8ACA4 800F17F4 00000000 */ nop .L800F17F8: /* 8ACA8 800F17F8 3C118011 */ lui $s1, %hi(D_8010D69C) @@ -93,10 +93,10 @@ glabel func_800F16CC /* 8ACC0 800F1810 24040010 */ addiu $a0, $zero, 0x10 /* 8ACC4 800F1814 3C108014 */ lui $s0, %hi(D_80147474) /* 8ACC8 800F1818 26107474 */ addiu $s0, $s0, %lo(D_80147474) -/* 8ACCC 800F181C 0C051F9F */ jal func_80147E7C +/* 8ACCC 800F181C 0C051F9F */ jal set_window_update /* 8ACD0 800F1820 0200282D */ daddu $a1, $s0, $zero /* 8ACD4 800F1824 24040014 */ addiu $a0, $zero, 0x14 -/* 8ACD8 800F1828 0C051F9F */ jal func_80147E7C +/* 8ACD8 800F1828 0C051F9F */ jal set_window_update /* 8ACDC 800F182C 0200282D */ daddu $a1, $s0, $zero .L800F1830: /* 8ACE0 800F1830 8E220000 */ lw $v0, ($s1) @@ -106,7 +106,7 @@ glabel func_800F16CC /* 8ACF0 800F1840 00000000 */ nop /* 8ACF4 800F1844 3C058014 */ lui $a1, %hi(D_80147474) /* 8ACF8 800F1848 24A57474 */ addiu $a1, $a1, %lo(D_80147474) -/* 8ACFC 800F184C 0C051F9F */ jal func_80147E7C +/* 8ACFC 800F184C 0C051F9F */ jal set_window_update /* 8AD00 800F1850 24040012 */ addiu $a0, $zero, 0x12 .L800F1854: /* 8AD04 800F1854 8E220000 */ lw $v0, ($s1) @@ -116,7 +116,7 @@ glabel func_800F16CC /* 8AD14 800F1864 240500FF */ addiu $a1, $zero, 0xff /* 8AD18 800F1868 3C058014 */ lui $a1, %hi(D_80147474) /* 8AD1C 800F186C 24A57474 */ addiu $a1, $a1, %lo(D_80147474) -/* 8AD20 800F1870 0C051F9F */ jal func_80147E7C +/* 8AD20 800F1870 0C051F9F */ jal set_window_update /* 8AD24 800F1874 24040010 */ addiu $a0, $zero, 0x10 /* 8AD28 800F1878 240500FF */ addiu $a1, $zero, 0xff .L800F187C: diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s index a524450884..a7a25700ff 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s @@ -296,7 +296,7 @@ glabel func_800F1A10 /* 8B324 800F1E74 00021080 */ sll $v0, $v0, 2 /* 8B328 800F1E78 00431021 */ addu $v0, $v0, $v1 /* 8B32C 800F1E7C 2442001A */ addiu $v0, $v0, 0x1a -/* 8B330 800F1E80 0C051F32 */ jal set_ui_panel_properties +/* 8B330 800F1E80 0C051F32 */ jal set_window_properties /* 8B334 800F1E84 AFA20010 */ sw $v0, 0x10($sp) /* 8B338 800F1E88 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8B33C 800F1E8C 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) @@ -321,10 +321,10 @@ glabel func_800F1A10 /* 8B380 800F1ED0 AFA20018 */ sw $v0, 0x18($sp) /* 8B384 800F1ED4 2402000E */ addiu $v0, $zero, 0xe /* 8B388 800F1ED8 AFA0001C */ sw $zero, 0x1c($sp) -/* 8B38C 800F1EDC 0C051F32 */ jal set_ui_panel_properties +/* 8B38C 800F1EDC 0C051F32 */ jal set_window_properties /* 8B390 800F1EE0 AFA20020 */ sw $v0, 0x20($sp) /* 8B394 800F1EE4 2404000F */ addiu $a0, $zero, 0xf -/* 8B398 800F1EE8 0C051F9F */ jal func_80147E7C +/* 8B398 800F1EE8 0C051F9F */ jal set_window_update /* 8B39C 800F1EEC 24050001 */ addiu $a1, $zero, 1 /* 8B3A0 800F1EF0 24040011 */ addiu $a0, $zero, 0x11 /* 8B3A4 800F1EF4 0803C902 */ j .L800F2408 @@ -346,7 +346,7 @@ glabel func_800F1A10 /* 8B3E4 800F1F34 00021080 */ sll $v0, $v0, 2 /* 8B3E8 800F1F38 00431021 */ addu $v0, $v0, $v1 /* 8B3EC 800F1F3C 2442001A */ addiu $v0, $v0, 0x1a -/* 8B3F0 800F1F40 0C051F32 */ jal set_ui_panel_properties +/* 8B3F0 800F1F40 0C051F32 */ jal set_window_properties /* 8B3F4 800F1F44 AFA20010 */ sw $v0, 0x10($sp) /* 8B3F8 800F1F48 24040011 */ addiu $a0, $zero, 0x11 /* 8B3FC 800F1F4C 0803C8F0 */ j .L800F23C0 @@ -368,7 +368,7 @@ glabel func_800F1A10 /* 8B43C 800F1F8C 00021080 */ sll $v0, $v0, 2 /* 8B440 800F1F90 00431021 */ addu $v0, $v0, $v1 /* 8B444 800F1F94 2442001A */ addiu $v0, $v0, 0x1a -/* 8B448 800F1F98 0C051F32 */ jal set_ui_panel_properties +/* 8B448 800F1F98 0C051F32 */ jal set_window_properties /* 8B44C 800F1F9C AFA20010 */ sw $v0, 0x10($sp) /* 8B450 800F1FA0 2404000F */ addiu $a0, $zero, 0xf /* 8B454 800F1FA4 24050011 */ addiu $a1, $zero, 0x11 @@ -383,10 +383,10 @@ glabel func_800F1A10 /* 8B478 800F1FC8 AFA20018 */ sw $v0, 0x18($sp) /* 8B47C 800F1FCC 2402000E */ addiu $v0, $zero, 0xe /* 8B480 800F1FD0 AFA0001C */ sw $zero, 0x1c($sp) -/* 8B484 800F1FD4 0C051F32 */ jal set_ui_panel_properties +/* 8B484 800F1FD4 0C051F32 */ jal set_window_properties /* 8B488 800F1FD8 AFA20020 */ sw $v0, 0x20($sp) /* 8B48C 800F1FDC 2404000F */ addiu $a0, $zero, 0xf -/* 8B490 800F1FE0 0C051F9F */ jal func_80147E7C +/* 8B490 800F1FE0 0C051F9F */ jal set_window_update /* 8B494 800F1FE4 24050001 */ addiu $a1, $zero, 1 /* 8B498 800F1FE8 24040011 */ addiu $a0, $zero, 0x11 /* 8B49C 800F1FEC 0803C902 */ j .L800F2408 @@ -408,7 +408,7 @@ glabel func_800F1A10 /* 8B4DC 800F202C 00021080 */ sll $v0, $v0, 2 /* 8B4E0 800F2030 00431021 */ addu $v0, $v0, $v1 /* 8B4E4 800F2034 2442001A */ addiu $v0, $v0, 0x1a -/* 8B4E8 800F2038 0C051F32 */ jal set_ui_panel_properties +/* 8B4E8 800F2038 0C051F32 */ jal set_window_properties /* 8B4EC 800F203C AFA20010 */ sw $v0, 0x10($sp) /* 8B4F0 800F2040 24040011 */ addiu $a0, $zero, 0x11 /* 8B4F4 800F2044 0803C8F0 */ j .L800F23C0 @@ -430,7 +430,7 @@ glabel func_800F1A10 /* 8B534 800F2084 00021080 */ sll $v0, $v0, 2 /* 8B538 800F2088 00431021 */ addu $v0, $v0, $v1 /* 8B53C 800F208C 2442001A */ addiu $v0, $v0, 0x1a -/* 8B540 800F2090 0C051F32 */ jal set_ui_panel_properties +/* 8B540 800F2090 0C051F32 */ jal set_window_properties /* 8B544 800F2094 AFA20010 */ sw $v0, 0x10($sp) /* 8B548 800F2098 2404000F */ addiu $a0, $zero, 0xf /* 8B54C 800F209C 24050016 */ addiu $a1, $zero, 0x16 @@ -445,10 +445,10 @@ glabel func_800F1A10 /* 8B570 800F20C0 AFA20018 */ sw $v0, 0x18($sp) /* 8B574 800F20C4 2402000E */ addiu $v0, $zero, 0xe /* 8B578 800F20C8 AFA0001C */ sw $zero, 0x1c($sp) -/* 8B57C 800F20CC 0C051F32 */ jal set_ui_panel_properties +/* 8B57C 800F20CC 0C051F32 */ jal set_window_properties /* 8B580 800F20D0 AFA20020 */ sw $v0, 0x20($sp) /* 8B584 800F20D4 2404000F */ addiu $a0, $zero, 0xf -/* 8B588 800F20D8 0C051F9F */ jal func_80147E7C +/* 8B588 800F20D8 0C051F9F */ jal set_window_update /* 8B58C 800F20DC 24050001 */ addiu $a1, $zero, 1 /* 8B590 800F20E0 24040011 */ addiu $a0, $zero, 0x11 /* 8B594 800F20E4 0803C902 */ j .L800F2408 @@ -470,7 +470,7 @@ glabel func_800F1A10 /* 8B5D4 800F2124 00021080 */ sll $v0, $v0, 2 /* 8B5D8 800F2128 00431021 */ addu $v0, $v0, $v1 /* 8B5DC 800F212C 2442001A */ addiu $v0, $v0, 0x1a -/* 8B5E0 800F2130 0C051F32 */ jal set_ui_panel_properties +/* 8B5E0 800F2130 0C051F32 */ jal set_window_properties /* 8B5E4 800F2134 AFA20010 */ sw $v0, 0x10($sp) /* 8B5E8 800F2138 2404000F */ addiu $a0, $zero, 0xf /* 8B5EC 800F213C 24050020 */ addiu $a1, $zero, 0x20 @@ -485,10 +485,10 @@ glabel func_800F1A10 /* 8B610 800F2160 AFA20018 */ sw $v0, 0x18($sp) /* 8B614 800F2164 2402000E */ addiu $v0, $zero, 0xe /* 8B618 800F2168 AFA0001C */ sw $zero, 0x1c($sp) -/* 8B61C 800F216C 0C051F32 */ jal set_ui_panel_properties +/* 8B61C 800F216C 0C051F32 */ jal set_window_properties /* 8B620 800F2170 AFA20020 */ sw $v0, 0x20($sp) /* 8B624 800F2174 2404000F */ addiu $a0, $zero, 0xf -/* 8B628 800F2178 0C051F9F */ jal func_80147E7C +/* 8B628 800F2178 0C051F9F */ jal set_window_update /* 8B62C 800F217C 24050001 */ addiu $a1, $zero, 1 /* 8B630 800F2180 24040011 */ addiu $a0, $zero, 0x11 /* 8B634 800F2184 0803C902 */ j .L800F2408 @@ -510,7 +510,7 @@ glabel func_800F1A10 /* 8B674 800F21C4 00021080 */ sll $v0, $v0, 2 /* 8B678 800F21C8 00431021 */ addu $v0, $v0, $v1 /* 8B67C 800F21CC 2442001A */ addiu $v0, $v0, 0x1a -/* 8B680 800F21D0 0C051F32 */ jal set_ui_panel_properties +/* 8B680 800F21D0 0C051F32 */ jal set_window_properties /* 8B684 800F21D4 AFA20010 */ sw $v0, 0x10($sp) /* 8B688 800F21D8 2404000F */ addiu $a0, $zero, 0xf /* 8B68C 800F21DC 2405000C */ addiu $a1, $zero, 0xc @@ -525,10 +525,10 @@ glabel func_800F1A10 /* 8B6B0 800F2200 AFA20018 */ sw $v0, 0x18($sp) /* 8B6B4 800F2204 2402000E */ addiu $v0, $zero, 0xe /* 8B6B8 800F2208 AFA0001C */ sw $zero, 0x1c($sp) -/* 8B6BC 800F220C 0C051F32 */ jal set_ui_panel_properties +/* 8B6BC 800F220C 0C051F32 */ jal set_window_properties /* 8B6C0 800F2210 AFA20020 */ sw $v0, 0x20($sp) /* 8B6C4 800F2214 2404000F */ addiu $a0, $zero, 0xf -/* 8B6C8 800F2218 0C051F9F */ jal func_80147E7C +/* 8B6C8 800F2218 0C051F9F */ jal set_window_update /* 8B6CC 800F221C 24050001 */ addiu $a1, $zero, 1 /* 8B6D0 800F2220 24040011 */ addiu $a0, $zero, 0x11 /* 8B6D4 800F2224 0803C902 */ j .L800F2408 @@ -550,7 +550,7 @@ glabel func_800F1A10 /* 8B714 800F2264 00021080 */ sll $v0, $v0, 2 /* 8B718 800F2268 00431021 */ addu $v0, $v0, $v1 /* 8B71C 800F226C 2442001A */ addiu $v0, $v0, 0x1a -/* 8B720 800F2270 0C051F32 */ jal set_ui_panel_properties +/* 8B720 800F2270 0C051F32 */ jal set_window_properties /* 8B724 800F2274 AFA20010 */ sw $v0, 0x10($sp) /* 8B728 800F2278 2404000F */ addiu $a0, $zero, 0xf /* 8B72C 800F227C 2405000C */ addiu $a1, $zero, 0xc @@ -565,10 +565,10 @@ glabel func_800F1A10 /* 8B750 800F22A0 AFA20018 */ sw $v0, 0x18($sp) /* 8B754 800F22A4 2402000E */ addiu $v0, $zero, 0xe /* 8B758 800F22A8 AFA0001C */ sw $zero, 0x1c($sp) -/* 8B75C 800F22AC 0C051F32 */ jal set_ui_panel_properties +/* 8B75C 800F22AC 0C051F32 */ jal set_window_properties /* 8B760 800F22B0 AFA20020 */ sw $v0, 0x20($sp) /* 8B764 800F22B4 2404000F */ addiu $a0, $zero, 0xf -/* 8B768 800F22B8 0C051F9F */ jal func_80147E7C +/* 8B768 800F22B8 0C051F9F */ jal set_window_update /* 8B76C 800F22BC 24050001 */ addiu $a1, $zero, 1 /* 8B770 800F22C0 24040011 */ addiu $a0, $zero, 0x11 /* 8B774 800F22C4 0803C902 */ j .L800F2408 @@ -590,7 +590,7 @@ glabel func_800F1A10 /* 8B7B4 800F2304 00021080 */ sll $v0, $v0, 2 /* 8B7B8 800F2308 00431021 */ addu $v0, $v0, $v1 /* 8B7BC 800F230C 2442001A */ addiu $v0, $v0, 0x1a -/* 8B7C0 800F2310 0C051F32 */ jal set_ui_panel_properties +/* 8B7C0 800F2310 0C051F32 */ jal set_window_properties /* 8B7C4 800F2314 AFA20010 */ sw $v0, 0x10($sp) /* 8B7C8 800F2318 2404000F */ addiu $a0, $zero, 0xf /* 8B7CC 800F231C 24050006 */ addiu $a1, $zero, 6 @@ -605,10 +605,10 @@ glabel func_800F1A10 /* 8B7F0 800F2340 AFA20018 */ sw $v0, 0x18($sp) /* 8B7F4 800F2344 2402000E */ addiu $v0, $zero, 0xe /* 8B7F8 800F2348 AFA0001C */ sw $zero, 0x1c($sp) -/* 8B7FC 800F234C 0C051F32 */ jal set_ui_panel_properties +/* 8B7FC 800F234C 0C051F32 */ jal set_window_properties /* 8B800 800F2350 AFA20020 */ sw $v0, 0x20($sp) /* 8B804 800F2354 2404000F */ addiu $a0, $zero, 0xf -/* 8B808 800F2358 0C051F9F */ jal func_80147E7C +/* 8B808 800F2358 0C051F9F */ jal set_window_update /* 8B80C 800F235C 24050001 */ addiu $a1, $zero, 1 /* 8B810 800F2360 24040011 */ addiu $a0, $zero, 0x11 /* 8B814 800F2364 0803C902 */ j .L800F2408 @@ -630,7 +630,7 @@ glabel func_800F1A10 /* 8B854 800F23A4 00021080 */ sll $v0, $v0, 2 /* 8B858 800F23A8 00431021 */ addu $v0, $v0, $v1 /* 8B85C 800F23AC 2442001A */ addiu $v0, $v0, 0x1a -/* 8B860 800F23B0 0C051F32 */ jal set_ui_panel_properties +/* 8B860 800F23B0 0C051F32 */ jal set_window_properties /* 8B864 800F23B4 AFA20010 */ sw $v0, 0x10($sp) /* 8B868 800F23B8 24040011 */ addiu $a0, $zero, 0x11 /* 8B86C 800F23BC 2405000A */ addiu $a1, $zero, 0xa @@ -646,15 +646,15 @@ glabel func_800F1A10 /* 8B890 800F23E0 AFA20018 */ sw $v0, 0x18($sp) /* 8B894 800F23E4 2402000E */ addiu $v0, $zero, 0xe /* 8B898 800F23E8 AFA0001C */ sw $zero, 0x1c($sp) -/* 8B89C 800F23EC 0C051F32 */ jal set_ui_panel_properties +/* 8B89C 800F23EC 0C051F32 */ jal set_window_properties /* 8B8A0 800F23F0 AFA20020 */ sw $v0, 0x20($sp) /* 8B8A4 800F23F4 2404000F */ addiu $a0, $zero, 0xf -/* 8B8A8 800F23F8 0C051F9F */ jal func_80147E7C +/* 8B8A8 800F23F8 0C051F9F */ jal set_window_update /* 8B8AC 800F23FC 24050002 */ addiu $a1, $zero, 2 /* 8B8B0 800F2400 24040011 */ addiu $a0, $zero, 0x11 /* 8B8B4 800F2404 24050001 */ addiu $a1, $zero, 1 .L800F2408: -/* 8B8B8 800F2408 0C051F9F */ jal func_80147E7C +/* 8B8B8 800F2408 0C051F9F */ jal set_window_update /* 8B8BC 800F240C 00000000 */ nop .L800F2410: /* 8B8C0 800F2410 3C028011 */ lui $v0, %hi(D_8010D69C) @@ -685,7 +685,7 @@ glabel func_800F1A10 /* 8B918 800F2468 AFA20018 */ sw $v0, 0x18($sp) /* 8B91C 800F246C 2402000E */ addiu $v0, $zero, 0xe /* 8B920 800F2470 AFA0001C */ sw $zero, 0x1c($sp) -/* 8B924 800F2474 0C051F32 */ jal set_ui_panel_properties +/* 8B924 800F2474 0C051F32 */ jal set_window_properties /* 8B928 800F2478 AFA20020 */ sw $v0, 0x20($sp) .L800F247C: /* 8B92C 800F247C 3C108011 */ lui $s0, %hi(D_8010D69C) @@ -709,7 +709,7 @@ glabel func_800F1A10 /* 8B974 800F24C4 AFA20018 */ sw $v0, 0x18($sp) /* 8B978 800F24C8 2402FFFF */ addiu $v0, $zero, -1 /* 8B97C 800F24CC AFA0001C */ sw $zero, 0x1c($sp) -/* 8B980 800F24D0 0C051F32 */ jal set_ui_panel_properties +/* 8B980 800F24D0 0C051F32 */ jal set_window_properties /* 8B984 800F24D4 AFA20020 */ sw $v0, 0x20($sp) .L800F24D8: /* 8B988 800F24D8 3C078011 */ lui $a3, %hi(D_8010D654) @@ -791,7 +791,7 @@ glabel func_800F1A10 /* 8BAAC 800F25FC AFA20018 */ sw $v0, 0x18($sp) /* 8BAB0 800F2600 2402FFFF */ addiu $v0, $zero, -1 /* 8BAB4 800F2604 AFA0001C */ sw $zero, 0x1c($sp) -/* 8BAB8 800F2608 0C051F32 */ jal set_ui_panel_properties +/* 8BAB8 800F2608 0C051F32 */ jal set_window_properties /* 8BABC 800F260C AFA20020 */ sw $v0, 0x20($sp) .L800F2610: /* 8BAC0 800F2610 3C028011 */ lui $v0, %hi(D_8010D69C) @@ -841,7 +841,7 @@ glabel func_800F1A10 /* 8BB68 800F26B8 AFA20018 */ sw $v0, 0x18($sp) /* 8BB6C 800F26BC 2402FFFF */ addiu $v0, $zero, -1 /* 8BB70 800F26C0 AFA0001C */ sw $zero, 0x1c($sp) -/* 8BB74 800F26C4 0C051F32 */ jal set_ui_panel_properties +/* 8BB74 800F26C4 0C051F32 */ jal set_window_properties /* 8BB78 800F26C8 AFA20020 */ sw $v0, 0x20($sp) .L800F26CC: /* 8BB7C 800F26CC 3C028011 */ lui $v0, %hi(D_8010D68E) @@ -860,12 +860,12 @@ glabel func_800F1A10 /* 8BBB0 800F2700 00400008 */ jr $v0 /* 8BBB4 800F2704 00000000 */ nop /* 8BBB8 800F2708 2404000E */ addiu $a0, $zero, 0xe -/* 8BBBC 800F270C 0C051F9F */ jal func_80147E7C +/* 8BBBC 800F270C 0C051F9F */ jal set_window_update /* 8BBC0 800F2710 24050001 */ addiu $a1, $zero, 1 /* 8BBC4 800F2714 0803C9F4 */ j .L800F27D0 /* 8BBC8 800F2718 24040013 */ addiu $a0, $zero, 0x13 /* 8BBCC 800F271C 2404000E */ addiu $a0, $zero, 0xe -/* 8BBD0 800F2720 0C051F9F */ jal func_80147E7C +/* 8BBD0 800F2720 0C051F9F */ jal set_window_update /* 8BBD4 800F2724 24050001 */ addiu $a1, $zero, 1 /* 8BBD8 800F2728 0803C9F4 */ j .L800F27D0 /* 8BBDC 800F272C 24040013 */ addiu $a0, $zero, 0x13 @@ -886,34 +886,34 @@ glabel func_800F1A10 /* 8BC14 800F2764 2404000E */ addiu $a0, $zero, 0xe /* 8BC18 800F2768 3C108014 */ lui $s0, %hi(D_80147474) /* 8BC1C 800F276C 26107474 */ addiu $s0, $s0, %lo(D_80147474) -/* 8BC20 800F2770 0C051F9F */ jal func_80147E7C +/* 8BC20 800F2770 0C051F9F */ jal set_window_update /* 8BC24 800F2774 0200282D */ daddu $a1, $s0, $zero /* 8BC28 800F2778 0803C9E6 */ j .L800F2798 /* 8BC2C 800F277C 24040001 */ addiu $a0, $zero, 1 /* 8BC30 800F2780 2404000E */ addiu $a0, $zero, 0xe /* 8BC34 800F2784 3C108014 */ lui $s0, %hi(D_80147474) /* 8BC38 800F2788 26107474 */ addiu $s0, $s0, %lo(D_80147474) -/* 8BC3C 800F278C 0C051F9F */ jal func_80147E7C +/* 8BC3C 800F278C 0C051F9F */ jal set_window_update /* 8BC40 800F2790 0200282D */ daddu $a1, $s0, $zero /* 8BC44 800F2794 24040002 */ addiu $a0, $zero, 2 .L800F2798: /* 8BC48 800F2798 0C05272D */ jal play_sound /* 8BC4C 800F279C 00000000 */ nop /* 8BC50 800F27A0 24040013 */ addiu $a0, $zero, 0x13 -/* 8BC54 800F27A4 0C051F9F */ jal func_80147E7C +/* 8BC54 800F27A4 0C051F9F */ jal set_window_update /* 8BC58 800F27A8 0200282D */ daddu $a1, $s0, $zero /* 8BC5C 800F27AC 0803C9F4 */ j .L800F27D0 /* 8BC60 800F27B0 24040015 */ addiu $a0, $zero, 0x15 /* 8BC64 800F27B4 3C058014 */ lui $a1, %hi(D_80147474) /* 8BC68 800F27B8 24A57474 */ addiu $a1, $a1, %lo(D_80147474) -/* 8BC6C 800F27BC 0C051F9F */ jal func_80147E7C +/* 8BC6C 800F27BC 0C051F9F */ jal set_window_update /* 8BC70 800F27C0 2404000E */ addiu $a0, $zero, 0xe /* 8BC74 800F27C4 0C05272D */ jal play_sound /* 8BC78 800F27C8 24040001 */ addiu $a0, $zero, 1 .L800F27CC: /* 8BC7C 800F27CC 24040015 */ addiu $a0, $zero, 0x15 .L800F27D0: -/* 8BC80 800F27D0 0C051F9F */ jal func_80147E7C +/* 8BC80 800F27D0 0C051F9F */ jal set_window_update /* 8BC84 800F27D4 24050001 */ addiu $a1, $zero, 1 .L800F27D8: /* 8BC88 800F27D8 3C118011 */ lui $s1, %hi(D_8010D69C) @@ -925,10 +925,10 @@ glabel func_800F1A10 /* 8BCA0 800F27F0 24040010 */ addiu $a0, $zero, 0x10 /* 8BCA4 800F27F4 3C108014 */ lui $s0, %hi(D_80147474) /* 8BCA8 800F27F8 26107474 */ addiu $s0, $s0, %lo(D_80147474) -/* 8BCAC 800F27FC 0C051F9F */ jal func_80147E7C +/* 8BCAC 800F27FC 0C051F9F */ jal set_window_update /* 8BCB0 800F2800 0200282D */ daddu $a1, $s0, $zero /* 8BCB4 800F2804 24040014 */ addiu $a0, $zero, 0x14 -/* 8BCB8 800F2808 0C051F9F */ jal func_80147E7C +/* 8BCB8 800F2808 0C051F9F */ jal set_window_update /* 8BCBC 800F280C 0200282D */ daddu $a1, $s0, $zero .L800F2810: /* 8BCC0 800F2810 8E220000 */ lw $v0, ($s1) @@ -938,7 +938,7 @@ glabel func_800F1A10 /* 8BCD0 800F2820 00000000 */ nop /* 8BCD4 800F2824 3C058014 */ lui $a1, %hi(D_80147474) /* 8BCD8 800F2828 24A57474 */ addiu $a1, $a1, %lo(D_80147474) -/* 8BCDC 800F282C 0C051F9F */ jal func_80147E7C +/* 8BCDC 800F282C 0C051F9F */ jal set_window_update /* 8BCE0 800F2830 24040012 */ addiu $a0, $zero, 0x12 .L800F2834: /* 8BCE4 800F2834 8E220000 */ lw $v0, ($s1) @@ -948,7 +948,7 @@ glabel func_800F1A10 /* 8BCF4 800F2844 24020001 */ addiu $v0, $zero, 1 /* 8BCF8 800F2848 3C058014 */ lui $a1, %hi(D_80147474) /* 8BCFC 800F284C 24A57474 */ addiu $a1, $a1, %lo(D_80147474) -/* 8BD00 800F2850 0C051F9F */ jal func_80147E7C +/* 8BD00 800F2850 0C051F9F */ jal set_window_update /* 8BD04 800F2854 24040010 */ addiu $a0, $zero, 0x10 /* 8BD08 800F2858 0803CD93 */ j .L800F364C /* 8BD0C 800F285C 24020001 */ addiu $v0, $zero, 1 @@ -1389,18 +1389,18 @@ glabel func_800F1A10 /* 8C358 800F2EA8 00400008 */ jr $v0 /* 8C35C 800F2EAC 00000000 */ nop /* 8C360 800F2EB0 2404000E */ addiu $a0, $zero, 0xe -/* 8C364 800F2EB4 0C051F9F */ jal func_80147E7C +/* 8C364 800F2EB4 0C051F9F */ jal set_window_update /* 8C368 800F2EB8 24050002 */ addiu $a1, $zero, 2 /* 8C36C 800F2EBC 0803CBB7 */ j .L800F2EDC /* 8C370 800F2EC0 24040013 */ addiu $a0, $zero, 0x13 /* 8C374 800F2EC4 2404000E */ addiu $a0, $zero, 0xe -/* 8C378 800F2EC8 0C051F9F */ jal func_80147E7C +/* 8C378 800F2EC8 0C051F9F */ jal set_window_update /* 8C37C 800F2ECC 24050002 */ addiu $a1, $zero, 2 /* 8C380 800F2ED0 0803CBB7 */ j .L800F2EDC /* 8C384 800F2ED4 24040013 */ addiu $a0, $zero, 0x13 /* 8C388 800F2ED8 2404000E */ addiu $a0, $zero, 0xe .L800F2EDC: -/* 8C38C 800F2EDC 0C051F9F */ jal func_80147E7C +/* 8C38C 800F2EDC 0C051F9F */ jal set_window_update /* 8C390 800F2EE0 24050002 */ addiu $a1, $zero, 2 .L800F2EE4: /* 8C394 800F2EE4 0C03C54E */ jal func_800F1538 @@ -1490,16 +1490,16 @@ glabel func_800F1A10 /* 8C4DC 800F302C 0803CD99 */ j .L800F3664 /* 8C4E0 800F3030 A483032C */ sh $v1, 0x32c($a0) /* 8C4E4 800F3034 2404000E */ addiu $a0, $zero, 0xe -/* 8C4E8 800F3038 0C051F9F */ jal func_80147E7C +/* 8C4E8 800F3038 0C051F9F */ jal set_window_update /* 8C4EC 800F303C 24050002 */ addiu $a1, $zero, 2 /* 8C4F0 800F3040 24040013 */ addiu $a0, $zero, 0x13 -/* 8C4F4 800F3044 0C051F9F */ jal func_80147E7C +/* 8C4F4 800F3044 0C051F9F */ jal set_window_update /* 8C4F8 800F3048 24050002 */ addiu $a1, $zero, 2 /* 8C4FC 800F304C 3C028011 */ lui $v0, %hi(D_8010D68E) /* 8C500 800F3050 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) /* 8C504 800F3054 10400003 */ beqz $v0, .L800F3064 /* 8C508 800F3058 24040015 */ addiu $a0, $zero, 0x15 -/* 8C50C 800F305C 0C051F9F */ jal func_80147E7C +/* 8C50C 800F305C 0C051F9F */ jal set_window_update /* 8C510 800F3060 24050002 */ addiu $a1, $zero, 2 .L800F3064: /* 8C514 800F3064 3C04001D */ lui $a0, 0x1d @@ -1523,10 +1523,10 @@ glabel func_800F1A10 /* 8C55C 800F30AC AFA20018 */ sw $v0, 0x18($sp) /* 8C560 800F30B0 2402FFFF */ addiu $v0, $zero, -1 /* 8C564 800F30B4 AFA0001C */ sw $zero, 0x1c($sp) -/* 8C568 800F30B8 0C051F32 */ jal set_ui_panel_properties +/* 8C568 800F30B8 0C051F32 */ jal set_window_properties /* 8C56C 800F30BC AFA20020 */ sw $v0, 0x20($sp) /* 8C570 800F30C0 24040009 */ addiu $a0, $zero, 9 -/* 8C574 800F30C4 0C051F9F */ jal func_80147E7C +/* 8C574 800F30C4 0C051F9F */ jal set_window_update /* 8C578 800F30C8 24050001 */ addiu $a1, $zero, 1 /* 8C57C 800F30CC 2403003C */ addiu $v1, $zero, 0x3c /* 8C580 800F30D0 3C018011 */ lui $at, %hi(D_8010D644) @@ -1555,19 +1555,19 @@ glabel func_800F1A10 /* 8C5D8 800F3128 0000102D */ daddu $v0, $zero, $zero .L800F312C: /* 8C5DC 800F312C 24040009 */ addiu $a0, $zero, 9 -/* 8C5E0 800F3130 0C051F9F */ jal func_80147E7C +/* 8C5E0 800F3130 0C051F9F */ jal set_window_update /* 8C5E4 800F3134 24050002 */ addiu $a1, $zero, 2 /* 8C5E8 800F3138 2404000E */ addiu $a0, $zero, 0xe -/* 8C5EC 800F313C 0C051F9F */ jal func_80147E7C +/* 8C5EC 800F313C 0C051F9F */ jal set_window_update /* 8C5F0 800F3140 24050001 */ addiu $a1, $zero, 1 /* 8C5F4 800F3144 24040013 */ addiu $a0, $zero, 0x13 -/* 8C5F8 800F3148 0C051F9F */ jal func_80147E7C +/* 8C5F8 800F3148 0C051F9F */ jal set_window_update /* 8C5FC 800F314C 24050001 */ addiu $a1, $zero, 1 /* 8C600 800F3150 3C028011 */ lui $v0, %hi(D_8010D68E) /* 8C604 800F3154 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) /* 8C608 800F3158 10400003 */ beqz $v0, .L800F3168 /* 8C60C 800F315C 24040015 */ addiu $a0, $zero, 0x15 -/* 8C610 800F3160 0C051F9F */ jal func_80147E7C +/* 8C610 800F3160 0C051F9F */ jal set_window_update /* 8C614 800F3164 24050001 */ addiu $a1, $zero, 1 .L800F3168: /* 8C618 800F3168 3C038011 */ lui $v1, %hi(D_8010D69C) @@ -1688,18 +1688,18 @@ glabel func_800F1A10 /* 8C7D0 800F3320 00400008 */ jr $v0 /* 8C7D4 800F3324 00000000 */ nop /* 8C7D8 800F3328 2404000E */ addiu $a0, $zero, 0xe -/* 8C7DC 800F332C 0C051F9F */ jal func_80147E7C +/* 8C7DC 800F332C 0C051F9F */ jal set_window_update /* 8C7E0 800F3330 24050002 */ addiu $a1, $zero, 2 /* 8C7E4 800F3334 0803CCD5 */ j .L800F3354 /* 8C7E8 800F3338 24040013 */ addiu $a0, $zero, 0x13 /* 8C7EC 800F333C 2404000E */ addiu $a0, $zero, 0xe -/* 8C7F0 800F3340 0C051F9F */ jal func_80147E7C +/* 8C7F0 800F3340 0C051F9F */ jal set_window_update /* 8C7F4 800F3344 24050002 */ addiu $a1, $zero, 2 /* 8C7F8 800F3348 0803CCD5 */ j .L800F3354 /* 8C7FC 800F334C 24040013 */ addiu $a0, $zero, 0x13 /* 8C800 800F3350 2404000E */ addiu $a0, $zero, 0xe .L800F3354: -/* 8C804 800F3354 0C051F9F */ jal func_80147E7C +/* 8C804 800F3354 0C051F9F */ jal set_window_update /* 8C808 800F3358 24050002 */ addiu $a1, $zero, 2 .L800F335C: /* 8C80C 800F335C 3C04001D */ lui $a0, 0x1d @@ -1733,10 +1733,10 @@ glabel func_800F1A10 /* 8C878 800F33C8 AFA20018 */ sw $v0, 0x18($sp) /* 8C87C 800F33CC 2402FFFF */ addiu $v0, $zero, -1 /* 8C880 800F33D0 AFA0001C */ sw $zero, 0x1c($sp) -/* 8C884 800F33D4 0C051F32 */ jal set_ui_panel_properties +/* 8C884 800F33D4 0C051F32 */ jal set_window_properties /* 8C888 800F33D8 AFA20020 */ sw $v0, 0x20($sp) /* 8C88C 800F33DC 24040015 */ addiu $a0, $zero, 0x15 -/* 8C890 800F33E0 0C051F9F */ jal func_80147E7C +/* 8C890 800F33E0 0C051F9F */ jal set_window_update /* 8C894 800F33E4 24050001 */ addiu $a1, $zero, 1 /* 8C898 800F33E8 3C04001E */ lui $a0, 0x1e /* 8C89C 800F33EC 3C058011 */ lui $a1, %hi(D_8010D6A4) @@ -1756,7 +1756,7 @@ glabel func_800F1A10 /* 8C8D4 800F3424 24020001 */ addiu $v0, $zero, 1 /* 8C8D8 800F3428 1602008A */ bne $s0, $v0, .L800F3654 /* 8C8DC 800F342C 24040015 */ addiu $a0, $zero, 0x15 -/* 8C8E0 800F3430 0C051F9F */ jal func_80147E7C +/* 8C8E0 800F3430 0C051F9F */ jal set_window_update /* 8C8E4 800F3434 24050002 */ addiu $a1, $zero, 2 /* 8C8E8 800F3438 3C028011 */ lui $v0, %hi(D_8010D6A0) /* 8C8EC 800F343C 8C42D6A0 */ lw $v0, %lo(D_8010D6A0)($v0) @@ -1880,18 +1880,18 @@ glabel func_800F1A10 /* 8CAB0 800F3600 00400008 */ jr $v0 /* 8CAB4 800F3604 00000000 */ nop /* 8CAB8 800F3608 2404000E */ addiu $a0, $zero, 0xe -/* 8CABC 800F360C 0C051F9F */ jal func_80147E7C +/* 8CABC 800F360C 0C051F9F */ jal set_window_update /* 8CAC0 800F3610 24050001 */ addiu $a1, $zero, 1 /* 8CAC4 800F3614 0803CD8D */ j .L800F3634 /* 8CAC8 800F3618 24040013 */ addiu $a0, $zero, 0x13 /* 8CACC 800F361C 2404000E */ addiu $a0, $zero, 0xe -/* 8CAD0 800F3620 0C051F9F */ jal func_80147E7C +/* 8CAD0 800F3620 0C051F9F */ jal set_window_update /* 8CAD4 800F3624 24050001 */ addiu $a1, $zero, 1 /* 8CAD8 800F3628 0803CD8D */ j .L800F3634 /* 8CADC 800F362C 24040013 */ addiu $a0, $zero, 0x13 /* 8CAE0 800F3630 2404000E */ addiu $a0, $zero, 0xe .L800F3634: -/* 8CAE4 800F3634 0C051F9F */ jal func_80147E7C +/* 8CAE4 800F3634 0C051F9F */ jal set_window_update /* 8CAE8 800F3638 24050001 */ addiu $a1, $zero, 1 .L800F363C: /* 8CAEC 800F363C 2402000A */ addiu $v0, $zero, 0xa diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s index eb9b0634a4..d2e96ececb 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s @@ -494,7 +494,7 @@ glabel func_800F3680 /* 8D27C 800F3DCC AFB00010 */ sw $s0, 0x10($sp) /* 8D280 800F3DD0 AFAA0014 */ sw $t2, 0x14($sp) .L800F3DD4: -/* 8D284 800F3DD4 0C04993B */ jal draw_string +/* 8D284 800F3DD4 0C04993B */ jal draw_msg /* 8D288 800F3DD8 00000000 */ nop .L800F3DDC: /* 8D28C 800F3DDC 3C048011 */ lui $a0, %hi(D_8010D69C) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F48F4.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F48F4.s index 63917a59ef..8ba232684c 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F48F4.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F48F4.s @@ -17,7 +17,7 @@ glabel func_800F48F4 /* 8DDD4 800F4924 00021080 */ sll $v0, $v0, 2 /* 8DDD8 800F4928 00621821 */ addu $v1, $v1, $v0 /* 8DDDC 800F492C 8C640294 */ lw $a0, 0x294($v1) -/* 8DDE0 800F4930 0C04993B */ jal draw_string +/* 8DDE0 800F4930 0C04993B */ jal draw_msg /* 8DDE4 800F4934 24A50008 */ addiu $a1, $a1, 8 /* 8DDE8 800F4938 8FBF0018 */ lw $ra, 0x18($sp) /* 8DDEC 800F493C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s index 2a0a435b77..f099f292f4 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s @@ -180,7 +180,7 @@ glabel func_800F4944 /* 8E0A4 800F4BF4 240700FF */ addiu $a3, $zero, 0xff /* 8E0A8 800F4BF8 2402000F */ addiu $v0, $zero, 0xf /* 8E0AC 800F4BFC AFA20010 */ sw $v0, 0x10($sp) -/* 8E0B0 800F4C00 0C04993B */ jal draw_string +/* 8E0B0 800F4C00 0C04993B */ jal draw_msg /* 8E0B4 800F4C04 AFA00014 */ sw $zero, 0x14($sp) .L800F4C08: /* 8E0B8 800F4C08 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F4C1C.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F4C1C.s index 93b5a2d548..a47fe82afe 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F4C1C.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F4C1C.s @@ -18,7 +18,7 @@ glabel func_800F4C1C /* 8E0FC 800F4C4C 2402000F */ addiu $v0, $zero, 0xf /* 8E100 800F4C50 240700FF */ addiu $a3, $zero, 0xff /* 8E104 800F4C54 AFA20010 */ sw $v0, 0x10($sp) -/* 8E108 800F4C58 0C04993B */ jal draw_string +/* 8E108 800F4C58 0C04993B */ jal draw_msg /* 8E10C 800F4C5C AFA00014 */ sw $zero, 0x14($sp) /* 8E110 800F4C60 8FBF0018 */ lw $ra, 0x18($sp) /* 8E114 800F4C64 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F4CF0.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F4CF0.s index 616746d888..2c39b6087d 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F4CF0.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F4CF0.s @@ -11,7 +11,7 @@ glabel func_800F4CF0 /* 8E1B8 800F4D08 240700FF */ addiu $a3, $zero, 0xff /* 8E1BC 800F4D0C AFBF0018 */ sw $ra, 0x18($sp) /* 8E1C0 800F4D10 AFA20010 */ sw $v0, 0x10($sp) -/* 8E1C4 800F4D14 0C04993B */ jal draw_string +/* 8E1C4 800F4D14 0C04993B */ jal draw_msg /* 8E1C8 800F4D18 AFA00014 */ sw $zero, 0x14($sp) /* 8E1CC 800F4D1C 8FBF0018 */ lw $ra, 0x18($sp) /* 8E1D0 800F4D20 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_B0E0/do_camera_type_3.s b/asm/nonmatchings/code_B0E0/do_camera_type_3.s index de33dabcfa..cfa0cbc05c 100644 --- a/asm/nonmatchings/code_B0E0/do_camera_type_3.s +++ b/asm/nonmatchings/code_B0E0/do_camera_type_3.s @@ -402,7 +402,7 @@ glabel do_camera_type_3 /* CE64 80031A64 2625044C */ addiu $a1, $s1, 0x44c /* CE68 80031A68 AFA20030 */ sw $v0, 0x30($sp) /* CE6C 80031A6C AFB00034 */ sw $s0, 0x34($sp) -/* CE70 80031A70 0C00C13F */ jal func_800304FC +/* CE70 80031A70 0C00C13F */ jal update_camera_from_zone /* CE74 80031A74 AFA3002C */ sw $v1, 0x2c($sp) /* CE78 80031A78 86220008 */ lh $v0, 8($s1) /* CE7C 80031A7C 10400013 */ beqz $v0, .L80031ACC diff --git a/asm/nonmatchings/code_B0E0/func_800304FC.s b/asm/nonmatchings/code_B0E0/update_camera_from_zone.s similarity index 99% rename from asm/nonmatchings/code_B0E0/func_800304FC.s rename to asm/nonmatchings/code_B0E0/update_camera_from_zone.s index 5a7ddd1d01..6f58546ffe 100644 --- a/asm/nonmatchings/code_B0E0/func_800304FC.s +++ b/asm/nonmatchings/code_B0E0/update_camera_from_zone.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800304FC +glabel update_camera_from_zone /* B8FC 800304FC 27BDFF80 */ addiu $sp, $sp, -0x80 /* B900 80030500 AFB20030 */ sw $s2, 0x30($sp) /* B904 80030504 00A0902D */ daddu $s2, $a1, $zero diff --git a/asm/nonmatchings/code_B9D60/draw_string.s b/asm/nonmatchings/code_B9D60/draw_msg.s similarity index 99% rename from asm/nonmatchings/code_B9D60/draw_string.s rename to asm/nonmatchings/code_B9D60/draw_msg.s index 508bac879f..365aed34ce 100644 --- a/asm/nonmatchings/code_B9D60/draw_string.s +++ b/asm/nonmatchings/code_B9D60/draw_msg.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel draw_string +glabel draw_msg /* BCBEC 801264EC 27BDFA58 */ addiu $sp, $sp, -0x5a8 /* BCBF0 801264F0 8FA205BC */ lw $v0, 0x5bc($sp) /* BCBF4 801264F4 AFB7059C */ sw $s7, 0x59c($sp) diff --git a/asm/nonmatchings/code_B9D60/func_801264B0.s b/asm/nonmatchings/code_B9D60/get_msg_lines.s similarity index 97% rename from asm/nonmatchings/code_B9D60/func_801264B0.s rename to asm/nonmatchings/code_B9D60/get_msg_lines.s index a5489e6591..d1eefa0abc 100644 --- a/asm/nonmatchings/code_B9D60/func_801264B0.s +++ b/asm/nonmatchings/code_B9D60/get_msg_lines.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_801264B0 +glabel get_msg_lines /* BCBB0 801264B0 27BDFFD0 */ addiu $sp, $sp, -0x30 /* BCBB4 801264B4 27A20020 */ addiu $v0, $sp, 0x20 /* BCBB8 801264B8 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_C50A0/func_80133FC8.s b/asm/nonmatchings/code_C50A0/func_80133FC8.s index e1a425e491..012d89756c 100644 --- a/asm/nonmatchings/code_C50A0/func_80133FC8.s +++ b/asm/nonmatchings/code_C50A0/func_80133FC8.s @@ -15,7 +15,7 @@ glabel func_80133FC8 /* CA6F0 80133FF0 AFB3001C */ sw $s3, 0x1c($sp) /* CA6F4 80133FF4 AFB20018 */ sw $s2, 0x18($sp) /* CA6F8 80133FF8 AFB10014 */ sw $s1, 0x14($sp) -/* CA6FC 80133FFC 0C011052 */ jal func_80044148 +/* CA6FC 80133FFC 0C011052 */ jal is_starting_conversation /* CA700 80134000 AFB00010 */ sw $s0, 0x10($sp) /* CA704 80134004 14400045 */ bnez $v0, .L8013411C /* CA708 80134008 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/code_C50A0/func_801363A0.s b/asm/nonmatchings/code_C50A0/func_801363A0.s index 795003f2df..89c69c2380 100644 --- a/asm/nonmatchings/code_C50A0/func_801363A0.s +++ b/asm/nonmatchings/code_C50A0/func_801363A0.s @@ -145,7 +145,7 @@ glabel func_801363A0 /* CCC90 80136590 240300A0 */ addiu $v1, $zero, 0xa0 /* CCC94 80136594 00628823 */ subu $s1, $v1, $v0 .L80136598: -/* CCC98 80136598 0C04992C */ jal func_801264B0 +/* CCC98 80136598 0C04992C */ jal get_msg_lines /* CCC9C 8013659C 0240202D */ daddu $a0, $s2, $zero /* CCCA0 801365A0 2442FFFF */ addiu $v0, $v0, -1 /* CCCA4 801365A4 00021040 */ sll $v0, $v0, 1 @@ -175,7 +175,7 @@ glabel func_801363A0 /* CCD00 80136600 AFA80010 */ sw $t0, 0x10($sp) /* CCD04 80136604 AFA00014 */ sw $zero, 0x14($sp) /* CCD08 80136608 AFB4001C */ sw $s4, 0x1c($sp) -/* CCD0C 8013660C 0C051F32 */ jal set_ui_panel_properties +/* CCD0C 8013660C 0C051F32 */ jal set_window_properties /* CCD10 80136610 AFA20020 */ sw $v0, 0x20($sp) /* CCD14 80136614 86830018 */ lh $v1, 0x18($s4) /* CCD18 80136618 2402015C */ addiu $v0, $zero, 0x15c @@ -194,7 +194,7 @@ glabel func_801363A0 /* CCD4C 8013664C 2402FFFF */ addiu $v0, $zero, -1 /* CCD50 80136650 AFA00014 */ sw $zero, 0x14($sp) /* CCD54 80136654 AFB4001C */ sw $s4, 0x1c($sp) -/* CCD58 80136658 0C051F32 */ jal set_ui_panel_properties +/* CCD58 80136658 0C051F32 */ jal set_window_properties /* CCD5C 8013665C AFA20020 */ sw $v0, 0x20($sp) .L80136660: /* CCD60 80136660 8283001A */ lb $v1, 0x1a($s4) @@ -244,7 +244,7 @@ glabel func_801363A0 /* CCE08 80136708 2402FFFF */ addiu $v0, $zero, -1 /* CCE0C 8013670C AFA00014 */ sw $zero, 0x14($sp) /* CCE10 80136710 AFB4001C */ sw $s4, 0x1c($sp) -/* CCE14 80136714 0C051F32 */ jal set_ui_panel_properties +/* CCE14 80136714 0C051F32 */ jal set_window_properties /* CCE18 80136718 AFA20020 */ sw $v0, 0x20($sp) .L8013671C: /* CCE1C 8013671C 8FBF003C */ lw $ra, 0x3c($sp) diff --git a/asm/nonmatchings/code_C50A0/func_8013673C.s b/asm/nonmatchings/code_C50A0/func_8013673C.s index c58585be88..05e3e864ab 100644 --- a/asm/nonmatchings/code_C50A0/func_8013673C.s +++ b/asm/nonmatchings/code_C50A0/func_8013673C.s @@ -97,7 +97,7 @@ glabel L801367A4_CCEA4 /* CCF80 80136880 0C0496CF */ jal set_message_string /* CCF84 80136884 0000282D */ daddu $a1, $zero, $zero .L80136888: -/* CCF88 80136888 0C04992C */ jal func_801264B0 +/* CCF88 80136888 0C04992C */ jal get_msg_lines /* CCF8C 8013688C 0200202D */ daddu $a0, $s0, $zero /* CCF90 80136890 2442FFFF */ addiu $v0, $v0, -1 /* CCF94 80136894 86250018 */ lh $a1, 0x18($s1) @@ -132,7 +132,7 @@ glabel L801367A4_CCEA4 /* CD000 80136900 240700FF */ addiu $a3, $zero, 0xff /* CD004 80136904 2402002F */ addiu $v0, $zero, 0x2f /* CD008 80136908 AFA20010 */ sw $v0, 0x10($sp) -/* CD00C 8013690C 0C04993B */ jal draw_string +/* CD00C 8013690C 0C04993B */ jal draw_msg /* CD010 80136910 AFA00014 */ sw $zero, 0x14($sp) /* CD014 80136914 0804DA6D */ j .L801369B4 /* CD018 80136918 00000000 */ nop @@ -141,7 +141,7 @@ glabel L801367A4_CCEA4 /* CD020 80136920 240700FF */ addiu $a3, $zero, 0xff /* CD024 80136924 2402002F */ addiu $v0, $zero, 0x2f /* CD028 80136928 AFA20010 */ sw $v0, 0x10($sp) -/* CD02C 8013692C 0C04993B */ jal draw_string +/* CD02C 8013692C 0C04993B */ jal draw_msg /* CD030 80136930 AFA00014 */ sw $zero, 0x14($sp) /* CD034 80136934 96220006 */ lhu $v0, 6($s1) /* CD038 80136938 30420030 */ andi $v0, $v0, 0x30 @@ -165,7 +165,7 @@ glabel L8013694C_CD04C /* CD07C 8013697C 240700FF */ addiu $a3, $zero, 0xff /* CD080 80136980 2402002F */ addiu $v0, $zero, 0x2f /* CD084 80136984 AFA20010 */ sw $v0, 0x10($sp) -/* CD088 80136988 0C04993B */ jal draw_string +/* CD088 80136988 0C04993B */ jal draw_msg /* CD08C 8013698C AFA00014 */ sw $zero, 0x14($sp) /* CD090 80136990 26450014 */ addiu $a1, $s2, 0x14 .L80136994: diff --git a/asm/nonmatchings/code_C50A0/func_801369D0.s b/asm/nonmatchings/code_C50A0/func_801369D0.s index 41c2be53ef..49ccb9302b 100644 --- a/asm/nonmatchings/code_C50A0/func_801369D0.s +++ b/asm/nonmatchings/code_C50A0/func_801369D0.s @@ -11,7 +11,7 @@ glabel func_801369D0 /* CD0E8 801369E8 240700FF */ addiu $a3, $zero, 0xff /* CD0EC 801369EC AFBF0018 */ sw $ra, 0x18($sp) /* CD0F0 801369F0 AFA20010 */ sw $v0, 0x10($sp) -/* CD0F4 801369F4 0C04993B */ jal draw_string +/* CD0F4 801369F4 0C04993B */ jal draw_msg /* CD0F8 801369F8 AFA00014 */ sw $zero, 0x14($sp) /* CD0FC 801369FC 8FBF0018 */ lw $ra, 0x18($sp) /* CD100 80136A00 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_C50A0/func_80136A08.s b/asm/nonmatchings/code_C50A0/func_80136A08.s index 5041ac3765..d8a510c98b 100644 --- a/asm/nonmatchings/code_C50A0/func_80136A08.s +++ b/asm/nonmatchings/code_C50A0/func_80136A08.s @@ -25,7 +25,7 @@ glabel func_80136A08 /* CD154 80136A54 8C640014 */ lw $a0, 0x14($v1) /* CD158 80136A58 240700FF */ addiu $a3, $zero, 0xff /* CD15C 80136A5C AFA20010 */ sw $v0, 0x10($sp) -/* CD160 80136A60 0C04993B */ jal draw_string +/* CD160 80136A60 0C04993B */ jal draw_msg /* CD164 80136A64 AFA00014 */ sw $zero, 0x14($sp) .L80136A68: /* CD168 80136A68 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_C50A0/update_item_entity_temp.s b/asm/nonmatchings/code_C50A0/update_item_entity_temp.s index 00e460f74c..196b4c0804 100644 --- a/asm/nonmatchings/code_C50A0/update_item_entity_temp.s +++ b/asm/nonmatchings/code_C50A0/update_item_entity_temp.s @@ -289,13 +289,13 @@ glabel L801357A8_CBEA8 /* CC1E0 80135AE0 2404000C */ addiu $a0, $zero, 0xc /* CC1E4 80135AE4 3C108014 */ lui $s0, %hi(D_80147474) /* CC1E8 80135AE8 26107474 */ addiu $s0, $s0, %lo(D_80147474) -/* CC1EC 80135AEC 0C051F9F */ jal func_80147E7C +/* CC1EC 80135AEC 0C051F9F */ jal set_window_update /* CC1F0 80135AF0 0200282D */ daddu $a1, $s0, $zero /* CC1F4 80135AF4 24040011 */ addiu $a0, $zero, 0x11 -/* CC1F8 80135AF8 0C051F9F */ jal func_80147E7C +/* CC1F8 80135AF8 0C051F9F */ jal set_window_update /* CC1FC 80135AFC 0200282D */ daddu $a1, $s0, $zero /* CC200 80135B00 24040013 */ addiu $a0, $zero, 0x13 -/* CC204 80135B04 0C051F9F */ jal func_80147E7C +/* CC204 80135B04 0C051F9F */ jal set_window_update /* CC208 80135B08 0200282D */ daddu $a1, $s0, $zero .L80135B0C: /* CC20C 80135B0C 0C03A6D5 */ jal increment_status_menu_disabled @@ -452,7 +452,7 @@ glabel L80135B24_CC224 /* CC440 80135D40 2404000C */ addiu $a0, $zero, 0xc /* CC444 80135D44 3C108014 */ lui $s0, %hi(D_80147474) /* CC448 80135D48 26107474 */ addiu $s0, $s0, %lo(D_80147474) -/* CC44C 80135D4C 0C051F9F */ jal func_80147E7C +/* CC44C 80135D4C 0C051F9F */ jal set_window_update /* CC450 80135D50 0200282D */ daddu $a1, $s0, $zero /* CC454 80135D54 86230018 */ lh $v1, 0x18($s1) /* CC458 80135D58 2402015C */ addiu $v0, $zero, 0x15c @@ -460,7 +460,7 @@ glabel L80135B24_CC224 /* CC460 80135D60 24020157 */ addiu $v0, $zero, 0x157 /* CC464 80135D64 10620003 */ beq $v1, $v0, .L80135D74 /* CC468 80135D68 24040013 */ addiu $a0, $zero, 0x13 -/* CC46C 80135D6C 0C051F9F */ jal func_80147E7C +/* CC46C 80135D6C 0C051F9F */ jal set_window_update /* CC470 80135D70 0200282D */ daddu $a1, $s0, $zero .L80135D74: /* CC474 80135D74 3C038015 */ lui $v1, %hi(D_801568E4) @@ -511,10 +511,10 @@ glabel L80135B24_CC224 .L80135E20: /* CC520 80135E20 3C108014 */ lui $s0, %hi(D_80147574) /* CC524 80135E24 26107574 */ addiu $s0, $s0, %lo(D_80147574) -/* CC528 80135E28 0C051F9F */ jal func_80147E7C +/* CC528 80135E28 0C051F9F */ jal set_window_update /* CC52C 80135E2C 0200282D */ daddu $a1, $s0, $zero /* CC530 80135E30 24040013 */ addiu $a0, $zero, 0x13 -/* CC534 80135E34 0C051F9F */ jal func_80147E7C +/* CC534 80135E34 0C051F9F */ jal set_window_update /* CC538 80135E38 0200282D */ daddu $a1, $s0, $zero /* CC53C 80135E3C 24020003 */ addiu $v0, $zero, 3 /* CC540 80135E40 0804D8DF */ j .L8013637C @@ -700,10 +700,10 @@ glabel L80135FE8_CC6E8 /* CC7D8 801360D8 2404000C */ addiu $a0, $zero, 0xc /* CC7DC 801360DC 3C108014 */ lui $s0, %hi(D_80147574) /* CC7E0 801360E0 26107574 */ addiu $s0, $s0, %lo(D_80147574) -/* CC7E4 801360E4 0C051F9F */ jal func_80147E7C +/* CC7E4 801360E4 0C051F9F */ jal set_window_update /* CC7E8 801360E8 0200282D */ daddu $a1, $s0, $zero /* CC7EC 801360EC 24040011 */ addiu $a0, $zero, 0x11 -/* CC7F0 801360F0 0C051F9F */ jal func_80147E7C +/* CC7F0 801360F0 0C051F9F */ jal set_window_update /* CC7F4 801360F4 0200282D */ daddu $a1, $s0, $zero /* CC7F8 801360F8 2402000B */ addiu $v0, $zero, 0xb /* CC7FC 801360FC 3C018015 */ lui $at, %hi(D_801568E4) @@ -808,7 +808,7 @@ glabel L8013614C_CC84C /* CC974 80136274 0220202D */ daddu $a0, $s1, $zero /* CC978 80136278 3C058014 */ lui $a1, %hi(D_80147474) /* CC97C 8013627C 24A57474 */ addiu $a1, $a1, %lo(D_80147474) -/* CC980 80136280 0C051F9F */ jal func_80147E7C +/* CC980 80136280 0C051F9F */ jal set_window_update /* CC984 80136284 2404000C */ addiu $a0, $zero, 0xc /* CC988 80136288 24020032 */ addiu $v0, $zero, 0x32 /* CC98C 8013628C AEA20000 */ sw $v0, ($s5) @@ -824,7 +824,7 @@ glabel L8013629C_CC99C /* CC9B0 801362B0 00000000 */ nop /* CC9B4 801362B4 3C058014 */ lui $a1, %hi(D_80147574) /* CC9B8 801362B8 24A57574 */ addiu $a1, $a1, %lo(D_80147574) -/* CC9BC 801362BC 0C051F9F */ jal func_80147E7C +/* CC9BC 801362BC 0C051F9F */ jal set_window_update /* CC9C0 801362C0 2404000C */ addiu $a0, $zero, 0xc /* CC9C4 801362C4 2402000E */ addiu $v0, $zero, 0xe /* CC9C8 801362C8 0804D8DF */ j .L8013637C diff --git a/asm/nonmatchings/code_DF950/func_80149618.s b/asm/nonmatchings/code_DF950/func_80149618.s index fc909fa727..7c02ec58b8 100644 --- a/asm/nonmatchings/code_DF950/func_80149618.s +++ b/asm/nonmatchings/code_DF950/func_80149618.s @@ -18,7 +18,7 @@ glabel func_80149618 /* DFD4C 8014964C AC309AD0 */ sw $s0, %lo(D_80159AD0)($at) /* DFD50 80149650 0C0525FF */ jal func_801497FC /* DFD54 80149654 0000202D */ daddu $a0, $zero, $zero -/* DFD58 80149658 0C052580 */ jal func_80149600 +/* DFD58 80149658 0C052580 */ jal use_default_door_sounds /* DFD5C 8014965C 00000000 */ nop /* DFD60 80149660 8FBF0014 */ lw $ra, 0x14($sp) /* DFD64 80149664 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_E20110/func_802B7450_E20560.s b/asm/nonmatchings/code_E20110/func_802B7450_E20560.s index 9eeb4cb4f9..eb3906217f 100644 --- a/asm/nonmatchings/code_E20110/func_802B7450_E20560.s +++ b/asm/nonmatchings/code_E20110/func_802B7450_E20560.s @@ -73,12 +73,12 @@ glabel L802B74C8_E205D8 /* E20658 802B7548 32022000 */ andi $v0, $s0, 0x2000 /* E2065C 802B754C 14400010 */ bnez $v0, .L802B7590 /* E20660 802B7550 00000000 */ nop -/* E20664 802B7554 0C05173A */ jal func_80145CE8 +/* E20664 802B7554 0C05173A */ jal should_collider_allow_interact /* E20668 802B7558 0200202D */ daddu $a0, $s0, $zero /* E2066C 802B755C 080ADD5B */ j .L802B756C /* E20670 802B7560 00000000 */ nop .L802B7564: -/* E20674 802B7564 0C0394BE */ jal func_800E52F8 +/* E20674 802B7564 0C0394BE */ jal can_player_interact /* E20678 802B7568 00000000 */ nop .L802B756C: /* E2067C 802B756C 14400008 */ bnez $v0, .L802B7590 diff --git a/asm/nonmatchings/code_E20110/func_802B79C8_E20AD8.s b/asm/nonmatchings/code_E20110/func_802B79C8_E20AD8.s index 430e77b77b..89e9d3e85c 100644 --- a/asm/nonmatchings/code_E20110/func_802B79C8_E20AD8.s +++ b/asm/nonmatchings/code_E20110/func_802B79C8_E20AD8.s @@ -19,7 +19,7 @@ glabel func_802B79C8_E20AD8 /* E20B10 802B7A00 AC820004 */ sw $v0, 4($a0) /* E20B14 802B7A04 0C03BCF5 */ jal func_800EF3D4 /* E20B18 802B7A08 0000202D */ daddu $a0, $zero, $zero -/* E20B1C 802B7A0C 0C03BCE9 */ jal func_800EF3A4 +/* E20B1C 802B7A0C 0C03BCE9 */ jal reset_parter_tether_distance /* E20B20 802B7A10 00000000 */ nop /* E20B24 802B7A14 8FBF0010 */ lw $ra, 0x10($sp) /* E20B28 802B7A18 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_E21870/func_802B704C.s b/asm/nonmatchings/code_E21870/func_802B704C.s index c09a31f061..6467190b4d 100644 --- a/asm/nonmatchings/code_E21870/func_802B704C.s +++ b/asm/nonmatchings/code_E21870/func_802B704C.s @@ -7,7 +7,7 @@ glabel func_802B704C /* E218C4 802B7054 3C108011 */ lui $s0, %hi(gPlayerStatus) /* E218C8 802B7058 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* E218CC 802B705C AFBF0014 */ sw $ra, 0x14($sp) -/* E218D0 802B7060 0C011052 */ jal func_80044148 +/* E218D0 802B7060 0C011052 */ jal is_starting_conversation /* E218D4 802B7064 00000000 */ nop /* E218D8 802B7068 14400031 */ bnez $v0, .L802B7130 /* E218DC 802B706C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s b/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s index 04de94a655..9eee354e8d 100644 --- a/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s +++ b/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s @@ -13,7 +13,7 @@ glabel func_802BB000_E2D930 /* E2D950 802BB020 30420001 */ andi $v0, $v0, 1 /* E2D954 802BB024 10400019 */ beqz $v0, .L802BB08C /* E2D958 802BB028 00000000 */ nop -/* E2D95C 802BB02C 0C04D07A */ jal func_801341E8 +/* E2D95C 802BB02C 0C04D07A */ jal is_picking_up_item /* E2D960 802BB030 00000000 */ nop /* E2D964 802BB034 14400015 */ bnez $v0, .L802BB08C /* E2D968 802BB038 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s b/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s index d8c5306583..448e7af2b4 100644 --- a/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s +++ b/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s @@ -17,7 +17,7 @@ glabel func_802BBA60_E303B0 /* E303E0 802BBA90 8E300040 */ lw $s0, 0x40($s1) /* E303E4 802BBA94 14400017 */ bnez $v0, .L802BBAF4 /* E303E8 802BBA98 00000000 */ nop -/* E303EC 802BBA9C 0C04D07A */ jal func_801341E8 +/* E303EC 802BBA9C 0C04D07A */ jal is_picking_up_item /* E303F0 802BBAA0 00000000 */ nop /* E303F4 802BBAA4 14400013 */ bnez $v0, .L802BBAF4 /* E303F8 802BBAA8 00000000 */ nop @@ -186,7 +186,7 @@ glabel func_802BBA60_E303B0 /* E3065C 802BBD0C 3C018011 */ lui $at, %hi(D_8010C954) /* E30660 802BBD10 AC31C954 */ sw $s1, %lo(D_8010C954)($at) .L802BBD14: -/* E30664 802BBD14 0C04D07A */ jal func_801341E8 +/* E30664 802BBD14 0C04D07A */ jal is_picking_up_item /* E30668 802BBD18 00000000 */ nop /* E3066C 802BBD1C 1440001F */ bnez $v0, .L802BBD9C /* E30670 802BBD20 00000000 */ nop diff --git a/asm/nonmatchings/code_F5750/func_802D3028.s b/asm/nonmatchings/code_F5750/func_802D3028.s index 53c8ba6cbd..ea31c0d5f3 100644 --- a/asm/nonmatchings/code_F5750/func_802D3028.s +++ b/asm/nonmatchings/code_F5750/func_802D3028.s @@ -94,7 +94,7 @@ glabel func_802D3028 /* F7B38 802D3188 0C019D40 */ jal guMtxF2L /* F7B3C 802D318C 0260282D */ daddu $a1, $s3, $zero /* F7B40 802D3190 8E040000 */ lw $a0, ($s0) -/* F7B44 802D3194 0C04873A */ jal func_80121CE8 +/* F7B44 802D3194 0C04873A */ jal draw_entity_model_shadow /* F7B48 802D3198 0260282D */ daddu $a1, $s3, $zero .L802D319C: /* F7B4C 802D319C 2A420040 */ slti $v0, $s2, 0x40 diff --git a/asm/nonmatchings/code_F5750/func_802D31E0.s b/asm/nonmatchings/code_F5750/func_802D31E0.s index e156fa41d3..41d3f0a216 100644 --- a/asm/nonmatchings/code_F5750/func_802D31E0.s +++ b/asm/nonmatchings/code_F5750/func_802D31E0.s @@ -94,7 +94,7 @@ glabel func_802D31E0 /* F7CF0 802D3340 0C019D40 */ jal guMtxF2L /* F7CF4 802D3344 0260282D */ daddu $a1, $s3, $zero /* F7CF8 802D3348 8E040000 */ lw $a0, ($s0) -/* F7CFC 802D334C 0C0488A2 */ jal func_80122288 +/* F7CFC 802D334C 0C0488A2 */ jal draw_entity_model_extra3 /* F7D00 802D3350 0260282D */ daddu $a1, $s3, $zero .L802D3354: /* F7D04 802D3354 2A420040 */ slti $v0, $s2, 0x40 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111F2C.s b/asm/nonmatchings/code_a5dd0_len_114e0/UseDynamicShadow.s similarity index 98% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_80111F2C.s rename to asm/nonmatchings/code_a5dd0_len_114e0/UseDynamicShadow.s index 0e2a4146d3..6ac54b4036 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111F2C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/UseDynamicShadow.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80111F2C +glabel UseDynamicShadow /* A862C 80111F2C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A8630 80111F30 AFB00010 */ sw $s0, 0x10($sp) /* A8634 80111F34 0080802D */ daddu $s0, $a0, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s index 5ee4febffe..12856ac9d3 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s @@ -33,7 +33,7 @@ glabel func_8011B1D8 /* B1944 8011B244 8C420008 */ lw $v0, 8($v0) /* B1948 8011B248 10400012 */ beqz $v0, .L8011B294 /* B194C 8011B24C 00000000 */ nop -/* B1950 8011B250 0C04572A */ jal func_80115CA8 +/* B1950 8011B250 0C04572A */ jal mdl_get_child_count /* B1954 8011B254 02A0202D */ daddu $a0, $s5, $zero /* B1958 8011B258 3C038015 */ lui $v1, %hi(D_80153224) /* B195C 8011B25C 24633224 */ addiu $v1, $v1, %lo(D_80153224) @@ -82,7 +82,7 @@ glabel func_8011B1D8 /* B19FC 8011B2FC 8C420008 */ lw $v0, 8($v0) /* B1A00 8011B300 10400004 */ beqz $v0, .L8011B314 /* B1A04 8011B304 00000000 */ nop -/* B1A08 8011B308 0C04572A */ jal func_80115CA8 +/* B1A08 8011B308 0C04572A */ jal mdl_get_child_count /* B1A0C 8011B30C 0200202D */ daddu $a0, $s0, $zero /* B1A10 8011B310 02429021 */ addu $s2, $s2, $v0 .L8011B314: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE14.s b/asm/nonmatchings/code_a5dd0_len_114e0/is_identity_fixed_mtx.s similarity index 97% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE14.s rename to asm/nonmatchings/code_a5dd0_len_114e0/is_identity_fixed_mtx.s index 0a95afa063..cab09cb145 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE14.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/is_identity_fixed_mtx.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8011BE14 +glabel is_identity_fixed_mtx /* B2514 8011BE14 14800005 */ bnez $a0, .L8011BE2C /* B2518 8011BE18 0000282D */ daddu $a1, $zero, $zero /* B251C 8011BE1C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s b/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s index ca76ee403e..f94311a20b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s @@ -102,7 +102,7 @@ glabel load_model_transforms /* B162C 8011AF2C 24020005 */ addiu $v0, $zero, 5 /* B1630 8011AF30 14620021 */ bne $v1, $v0, .L8011AFB8 /* B1634 8011AF34 0240202D */ daddu $a0, $s2, $zero -/* B1638 8011AF38 0C04572A */ jal func_80115CA8 +/* B1638 8011AF38 0C04572A */ jal mdl_get_child_count /* B163C 8011AF3C 0220202D */ daddu $a0, $s1, $zero /* B1640 8011AF40 3C078015 */ lui $a3, %hi(D_80153224) /* B1644 8011AF44 24E73224 */ addiu $a3, $a3, %lo(D_80153224) @@ -137,7 +137,7 @@ glabel load_model_transforms /* B16B0 8011AFB0 AC620000 */ sw $v0, ($v1) /* B16B4 8011AFB4 0240202D */ daddu $a0, $s2, $zero .L8011AFB8: -/* B16B8 8011AFB8 0C045883 */ jal func_8011620C +/* B16B8 8011AFB8 0C045883 */ jal mdl_create_model /* B16BC 8011AFBC 24050004 */ addiu $a1, $zero, 4 /* B16C0 8011AFC0 3C038015 */ lui $v1, %hi(D_80153224) /* B16C4 8011AFC4 24633224 */ addiu $v1, $v1, %lo(D_80153224) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011620C.s b/asm/nonmatchings/code_a5dd0_len_114e0/mdl_create_model.s similarity index 99% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_8011620C.s rename to asm/nonmatchings/code_a5dd0_len_114e0/mdl_create_model.s index a8f5a21199..dde784dc9c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011620C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/mdl_create_model.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8011620C +glabel mdl_create_model /* AC90C 8011620C 27BDFFB8 */ addiu $sp, $sp, -0x48 /* AC910 80116210 AFB40040 */ sw $s4, 0x40($sp) /* AC914 80116214 0080A02D */ daddu $s4, $a0, $zero @@ -129,7 +129,7 @@ glabel func_8011620C /* ACAD4 801163D4 90420002 */ lbu $v0, 2($v0) /* ACAD8 801163D8 A22000A9 */ sb $zero, 0xa9($s1) /* ACADC 801163DC A22200A8 */ sb $v0, 0xa8($s1) -/* ACAE0 801163E0 0C046F85 */ jal func_8011BE14 +/* ACAE0 801163E0 0C046F85 */ jal is_identity_fixed_mtx /* ACAE4 801163E4 8E84000C */ lw $a0, 0xc($s4) /* ACAE8 801163E8 14400021 */ bnez $v0, .L80116470 /* ACAEC 801163EC 26240018 */ addiu $a0, $s1, 0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80115CA8.s b/asm/nonmatchings/code_a5dd0_len_114e0/mdl_get_child_count.s similarity index 96% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_80115CA8.s rename to asm/nonmatchings/code_a5dd0_len_114e0/mdl_get_child_count.s index cf438ab962..04d801e4b0 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80115CA8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/mdl_get_child_count.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80115CA8 +glabel mdl_get_child_count /* AC3A8 80115CA8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* AC3AC 80115CAC AFB3001C */ sw $s3, 0x1c($sp) /* AC3B0 80115CB0 0080982D */ daddu $s3, $a0, $zero @@ -28,7 +28,7 @@ glabel func_80115CA8 /* AC400 80115D00 00101080 */ sll $v0, $s0, 2 /* AC404 80115D04 00431021 */ addu $v0, $v0, $v1 /* AC408 80115D08 8C440000 */ lw $a0, ($v0) -/* AC40C 80115D0C 0C04572A */ jal func_80115CA8 +/* AC40C 80115D0C 0C04572A */ jal mdl_get_child_count /* AC410 80115D10 26100001 */ addiu $s0, $s0, 1 /* AC414 80115D14 02228821 */ addu $s1, $s1, $v0 /* AC418 80115D18 0212102A */ slt $v0, $s0, $s2 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s b/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s index 944f382dfe..dfa9167e01 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s @@ -130,14 +130,14 @@ glabel render_entities /* A6770 80110070 14E00006 */ bnez $a3, .L8011008C /* A6774 80110074 00000000 */ nop /* A6778 80110078 86040014 */ lh $a0, 0x14($s0) -/* A677C 8011007C 0C04873A */ jal func_80121CE8 +/* A677C 8011007C 0C04873A */ jal draw_entity_model_shadow /* A6780 80110080 260500B8 */ addiu $a1, $s0, 0xb8 /* A6784 80110084 08044028 */ j .L801100A0 /* A6788 80110088 26310001 */ addiu $s1, $s1, 1 .L8011008C: /* A678C 8011008C 86040014 */ lh $a0, 0x14($s0) /* A6790 80110090 86060012 */ lh $a2, 0x12($s0) -/* A6794 80110094 0C0487AE */ jal func_80121EB8 +/* A6794 80110094 0C0487AE */ jal draw_entity_model_main /* A6798 80110098 260500B8 */ addiu $a1, $s0, 0xb8 /* A679C 8011009C 26310001 */ addiu $s1, $s1, 1 .L801100A0: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s b/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s index 7968ec1f1c..4e1c6d8013 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s @@ -76,14 +76,14 @@ glabel render_shadows /* A68D4 801101D4 14E00006 */ bnez $a3, .L801101F0 /* A68D8 801101D8 00000000 */ nop /* A68DC 801101DC 86040008 */ lh $a0, 8($s0) -/* A68E0 801101E0 0C04873A */ jal func_80121CE8 +/* A68E0 801101E0 0C04873A */ jal draw_entity_model_shadow /* A68E4 801101E4 26050038 */ addiu $a1, $s0, 0x38 /* A68E8 801101E8 08044081 */ j .L80110204 /* A68EC 801101EC 26310001 */ addiu $s1, $s1, 1 .L801101F0: /* A68F0 801101F0 86040008 */ lh $a0, 8($s0) /* A68F4 801101F4 8606000A */ lh $a2, 0xa($s0) -/* A68F8 801101F8 0C0487AE */ jal func_80121EB8 +/* A68F8 801101F8 0C0487AE */ jal draw_entity_model_main /* A68FC 801101FC 26050038 */ addiu $a1, $s0, 0x38 .L80110200: /* A6900 80110200 26310001 */ addiu $s1, $s1, 1 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112BBC.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_next_game_mode.s similarity index 99% rename from asm/nonmatchings/code_a5dd0_len_114e0/func_80112BBC.s rename to asm/nonmatchings/code_a5dd0_len_114e0/set_next_game_mode.s index d54befee38..6548b3ed9f 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112BBC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_next_game_mode.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80112BBC +glabel set_next_game_mode /* A92BC 80112BBC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A92C0 80112BC0 AFB00010 */ sw $s0, 0x10($sp) /* A92C4 80112BC4 3C108015 */ lui $s0, %hi(gMainGameState) diff --git a/asm/nonmatchings/code_ad90_len_2880/update_camera_from_zone.s b/asm/nonmatchings/code_ad90_len_2880/update_camera_from_zone.s new file mode 100644 index 0000000000..6f58546ffe --- /dev/null +++ b/asm/nonmatchings/code_ad90_len_2880/update_camera_from_zone.s @@ -0,0 +1,1061 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel update_camera_from_zone +/* B8FC 800304FC 27BDFF80 */ addiu $sp, $sp, -0x80 +/* B900 80030500 AFB20030 */ sw $s2, 0x30($sp) +/* B904 80030504 00A0902D */ daddu $s2, $a1, $zero +/* B908 80030508 AFB40038 */ sw $s4, 0x38($sp) +/* B90C 8003050C 00C0A02D */ daddu $s4, $a2, $zero +/* B910 80030510 AFB30034 */ sw $s3, 0x34($sp) +/* B914 80030514 00E0982D */ daddu $s3, $a3, $zero +/* B918 80030518 AFB1002C */ sw $s1, 0x2c($sp) +/* B91C 8003051C AFBF0048 */ sw $ra, 0x48($sp) +/* B920 80030520 AFB70044 */ sw $s7, 0x44($sp) +/* B924 80030524 AFB60040 */ sw $s6, 0x40($sp) +/* B928 80030528 AFB5003C */ sw $s5, 0x3c($sp) +/* B92C 8003052C AFB00028 */ sw $s0, 0x28($sp) +/* B930 80030530 F7BE0078 */ sdc1 $f30, 0x78($sp) +/* B934 80030534 F7BC0070 */ sdc1 $f28, 0x70($sp) +/* B938 80030538 F7BA0068 */ sdc1 $f26, 0x68($sp) +/* B93C 8003053C F7B80060 */ sdc1 $f24, 0x60($sp) +/* B940 80030540 F7B60058 */ sdc1 $f22, 0x58($sp) +/* B944 80030544 F7B40050 */ sdc1 $f20, 0x50($sp) +/* B948 80030548 8E900000 */ lw $s0, ($s4) +/* B94C 8003054C C7B80094 */ lwc1 $f24, 0x94($sp) +/* B950 80030550 C7BE0098 */ lwc1 $f30, 0x98($sp) +/* B954 80030554 C7BA009C */ lwc1 $f26, 0x9c($sp) +/* B958 80030558 8FB500AC */ lw $s5, 0xac($sp) +/* B95C 8003055C 8FB600B0 */ lw $s6, 0xb0($sp) +/* B960 80030560 8FB700B4 */ lw $s7, 0xb4($sp) +/* B964 80030564 26020002 */ addiu $v0, $s0, 2 +/* B968 80030568 2C420002 */ sltiu $v0, $v0, 2 +/* B96C 8003056C 144000C4 */ bnez $v0, .L80030880 +/* B970 80030570 0240882D */ daddu $s1, $s2, $zero +/* B974 80030574 16000005 */ bnez $s0, .L8003058C +/* B978 80030578 00000000 */ nop +/* B97C 8003057C E6580010 */ swc1 $f24, 0x10($s2) +/* B980 80030580 E65E0014 */ swc1 $f30, 0x14($s2) +/* B984 80030584 0800C220 */ j .L80030880 +/* B988 80030588 E65A0018 */ swc1 $f26, 0x18($s2) +.L8003058C: +/* B98C 8003058C 8E030000 */ lw $v1, ($s0) +/* B990 80030590 2C620007 */ sltiu $v0, $v1, 7 +/* B994 80030594 104000BA */ beqz $v0, .L80030880 +/* B998 80030598 00031080 */ sll $v0, $v1, 2 +/* B99C 8003059C 3C01800A */ lui $at, %hi(jtbl_80098210) +/* B9A0 800305A0 00220821 */ addu $at, $at, $v0 +/* B9A4 800305A4 8C228210 */ lw $v0, %lo(jtbl_80098210)($at) +/* B9A8 800305A8 00400008 */ jr $v0 +/* B9AC 800305AC 00000000 */ nop +glabel L800305B0_B9B0 +/* B9B0 800305B0 8E020028 */ lw $v0, 0x28($s0) +/* B9B4 800305B4 504000B0 */ beql $v0, $zero, .L80030878 +/* B9B8 800305B8 E6380010 */ swc1 $f24, 0x10($s1) +/* B9BC 800305BC C60A0014 */ lwc1 $f10, 0x14($s0) +/* B9C0 800305C0 C60C0020 */ lwc1 $f12, 0x20($s0) +/* B9C4 800305C4 460C5281 */ sub.s $f10, $f10, $f12 +/* B9C8 800305C8 C6000018 */ lwc1 $f0, 0x18($s0) +/* B9CC 800305CC 46005287 */ neg.s $f10, $f10 +/* B9D0 800305D0 46005280 */ add.s $f10, $f10, $f0 +/* B9D4 800305D4 460A0201 */ sub.s $f8, $f0, $f10 +/* B9D8 800305D8 46084102 */ mul.s $f4, $f8, $f8 +/* B9DC 800305DC 00000000 */ nop +/* B9E0 800305E0 C606000C */ lwc1 $f6, 0xc($s0) +/* B9E4 800305E4 46003181 */ sub.s $f6, $f6, $f0 +/* B9E8 800305E8 460C3180 */ add.s $f6, $f6, $f12 +/* B9EC 800305EC 46066301 */ sub.s $f12, $f12, $f6 +/* B9F0 800305F0 460C6382 */ mul.s $f14, $f12, $f12 +/* B9F4 800305F4 00000000 */ nop +/* B9F8 800305F8 460AC081 */ sub.s $f2, $f24, $f10 +/* B9FC 800305FC 46081082 */ mul.s $f2, $f2, $f8 +/* BA00 80030600 00000000 */ nop +/* BA04 80030604 4606D001 */ sub.s $f0, $f26, $f6 +/* BA08 80030608 460C0002 */ mul.s $f0, $f0, $f12 +/* BA0C 8003060C 00000000 */ nop +/* BA10 80030610 460E2100 */ add.s $f4, $f4, $f14 +/* BA14 80030614 46001080 */ add.s $f2, $f2, $f0 +/* BA18 80030618 46041103 */ div.s $f4, $f2, $f4 +/* BA1C 8003061C 46082202 */ mul.s $f8, $f4, $f8 +/* BA20 80030620 00000000 */ nop +/* BA24 80030624 460C2102 */ mul.s $f4, $f4, $f12 +/* BA28 80030628 00000000 */ nop +/* BA2C 8003062C 460A4200 */ add.s $f8, $f8, $f10 +/* BA30 80030630 46062100 */ add.s $f4, $f4, $f6 +/* BA34 80030634 E63E0014 */ swc1 $f30, 0x14($s1) +/* BA38 80030638 E6280010 */ swc1 $f8, 0x10($s1) +/* BA3C 8003063C 0800C220 */ j .L80030880 +/* BA40 80030640 E6240018 */ swc1 $f4, 0x18($s1) +glabel L80030644_BA44 +/* BA44 80030644 C60E000C */ lwc1 $f14, 0xc($s0) +/* BA48 80030648 C61C0018 */ lwc1 $f28, 0x18($s0) +/* BA4C 8003064C 460EE201 */ sub.s $f8, $f28, $f14 +/* BA50 80030650 46084502 */ mul.s $f20, $f8, $f8 +/* BA54 80030654 00000000 */ nop +/* BA58 80030658 460EC081 */ sub.s $f2, $f24, $f14 +/* BA5C 8003065C 46081082 */ mul.s $f2, $f2, $f8 +/* BA60 80030660 00000000 */ nop +/* BA64 80030664 E7BC0010 */ swc1 $f28, 0x10($sp) +/* BA68 80030668 C60C0014 */ lwc1 $f12, 0x14($s0) +/* BA6C 8003066C C61C0020 */ lwc1 $f28, 0x20($s0) +/* BA70 80030670 460CE181 */ sub.s $f6, $f28, $f12 +/* BA74 80030674 46063482 */ mul.s $f18, $f6, $f6 +/* BA78 80030678 00000000 */ nop +/* BA7C 8003067C 460CD001 */ sub.s $f0, $f26, $f12 +/* BA80 80030680 46060002 */ mul.s $f0, $f0, $f6 +/* BA84 80030684 00000000 */ nop +/* BA88 80030688 4612A100 */ add.s $f4, $f20, $f18 +/* BA8C 8003068C 46001080 */ add.s $f2, $f2, $f0 +/* BA90 80030690 46041103 */ div.s $f4, $f2, $f4 +/* BA94 80030694 46082002 */ mul.s $f0, $f4, $f8 +/* BA98 80030698 00000000 */ nop +/* BA9C 8003069C 46062102 */ mul.s $f4, $f4, $f6 +/* BAA0 800306A0 00000000 */ nop +/* BAA4 800306A4 460E0400 */ add.s $f16, $f0, $f14 +/* BAA8 800306A8 46007586 */ mov.s $f22, $f14 +/* BAAC 800306AC 46004386 */ mov.s $f14, $f8 +/* BAB0 800306B0 46168201 */ sub.s $f8, $f16, $f22 +/* BAB4 800306B4 46087082 */ mul.s $f2, $f14, $f8 +/* BAB8 800306B8 00000000 */ nop +/* BABC 800306BC 460C2280 */ add.s $f10, $f4, $f12 +/* BAC0 800306C0 46006106 */ mov.s $f4, $f12 +/* BAC4 800306C4 46003306 */ mov.s $f12, $f6 +/* BAC8 800306C8 46045181 */ sub.s $f6, $f10, $f4 +/* BACC 800306CC 46066002 */ mul.s $f0, $f12, $f6 +/* BAD0 800306D0 00000000 */ nop +/* BAD4 800306D4 4610C501 */ sub.s $f20, $f24, $f16 +/* BAD8 800306D8 460AD481 */ sub.s $f18, $f26, $f10 +/* BADC 800306DC 46001080 */ add.s $f2, $f2, $f0 +/* BAE0 800306E0 44800000 */ mtc1 $zero, $f0 +/* BAE4 800306E4 00000000 */ nop +/* BAE8 800306E8 4600103C */ c.lt.s $f2, $f0 +/* BAEC 800306EC 00000000 */ nop +/* BAF0 800306F0 45000004 */ bc1f .L80030704 +/* BAF4 800306F4 E7BC0020 */ swc1 $f28, 0x20($sp) +/* BAF8 800306F8 4600B406 */ mov.s $f16, $f22 +/* BAFC 800306FC 0800C1D1 */ j .L80030744 +/* BB00 80030700 46002286 */ mov.s $f10, $f4 +.L80030704: +/* BB04 80030704 46084082 */ mul.s $f2, $f8, $f8 +/* BB08 80030708 00000000 */ nop +/* BB0C 8003070C 46063182 */ mul.s $f6, $f6, $f6 +/* BB10 80030710 00000000 */ nop +/* BB14 80030714 460E7002 */ mul.s $f0, $f14, $f14 +/* BB18 80030718 00000000 */ nop +/* BB1C 8003071C 460C6102 */ mul.s $f4, $f12, $f12 +/* BB20 80030720 00000000 */ nop +/* BB24 80030724 46061080 */ add.s $f2, $f2, $f6 +/* BB28 80030728 46040000 */ add.s $f0, $f0, $f4 +/* BB2C 8003072C 4602003C */ c.lt.s $f0, $f2 +/* BB30 80030730 00000000 */ nop +/* BB34 80030734 45000003 */ bc1f .L80030744 +/* BB38 80030738 00000000 */ nop +/* BB3C 8003073C C7B00010 */ lwc1 $f16, 0x10($sp) +/* BB40 80030740 C7AA0020 */ lwc1 $f10, 0x20($sp) +.L80030744: +/* BB44 80030744 8E020028 */ lw $v0, 0x28($s0) +/* BB48 80030748 54400004 */ bnel $v0, $zero, .L8003075C +/* BB4C 8003074C E6300010 */ swc1 $f16, 0x10($s1) +/* BB50 80030750 46148400 */ add.s $f16, $f16, $f20 +/* BB54 80030754 46125280 */ add.s $f10, $f10, $f18 +/* BB58 80030758 E6300010 */ swc1 $f16, 0x10($s1) +.L8003075C: +/* BB5C 8003075C E63E0014 */ swc1 $f30, 0x14($s1) +/* BB60 80030760 0800C220 */ j .L80030880 +/* BB64 80030764 E62A0018 */ swc1 $f10, 0x18($s1) +glabel L80030768_BB68 +/* BB68 80030768 8E020028 */ lw $v0, 0x28($s0) +/* BB6C 8003076C 50400042 */ beql $v0, $zero, .L80030878 +/* BB70 80030770 E6380010 */ swc1 $f24, 0x10($s1) +/* BB74 80030774 C600000C */ lwc1 $f0, 0xc($s0) +/* BB78 80030778 4600C581 */ sub.s $f22, $f24, $f0 +/* BB7C 8003077C 4616B082 */ mul.s $f2, $f22, $f22 +/* BB80 80030780 00000000 */ nop +/* BB84 80030784 C6000014 */ lwc1 $f0, 0x14($s0) +/* BB88 80030788 4600D501 */ sub.s $f20, $f26, $f0 +/* BB8C 8003078C 4614A002 */ mul.s $f0, $f20, $f20 +/* BB90 80030790 00000000 */ nop +/* BB94 80030794 46001600 */ add.s $f24, $f2, $f0 +/* BB98 80030798 44800000 */ mtc1 $zero, $f0 +/* BB9C 8003079C 00000000 */ nop +/* BBA0 800307A0 4600C032 */ c.eq.s $f24, $f0 +/* BBA4 800307A4 00000000 */ nop +/* BBA8 800307A8 45010035 */ bc1t .L80030880 +/* BBAC 800307AC 00000000 */ nop +/* BBB0 800307B0 4600C184 */ sqrt.s $f6, $f24 +/* BBB4 800307B4 46063032 */ c.eq.s $f6, $f6 +/* BBB8 800307B8 00000000 */ nop +/* BBBC 800307BC 45010004 */ bc1t .L800307D0 +/* BBC0 800307C0 00000000 */ nop +/* BBC4 800307C4 0C0187BC */ jal sqrtf +/* BBC8 800307C8 4600C306 */ mov.s $f12, $f24 +/* BBCC 800307CC 46000186 */ mov.s $f6, $f0 +.L800307D0: +/* BBD0 800307D0 C6040018 */ lwc1 $f4, 0x18($s0) +/* BBD4 800307D4 C600000C */ lwc1 $f0, 0xc($s0) +/* BBD8 800307D8 46002101 */ sub.s $f4, $f4, $f0 +/* BBDC 800307DC 46042102 */ mul.s $f4, $f4, $f4 +/* BBE0 800307E0 00000000 */ nop +/* BBE4 800307E4 C6020014 */ lwc1 $f2, 0x14($s0) +/* BBE8 800307E8 C6000020 */ lwc1 $f0, 0x20($s0) +/* BBEC 800307EC 46020001 */ sub.s $f0, $f0, $f2 +/* BBF0 800307F0 46000002 */ mul.s $f0, $f0, $f0 +/* BBF4 800307F4 00000000 */ nop +/* BBF8 800307F8 3C013F80 */ lui $at, 0x3f80 +/* BBFC 800307FC 44811000 */ mtc1 $at, $f2 +/* BC00 80030800 46002300 */ add.s $f12, $f4, $f0 +/* BC04 80030804 46061603 */ div.s $f24, $f2, $f6 +/* BC08 80030808 46006084 */ sqrt.s $f2, $f12 +/* BC0C 8003080C 46021032 */ c.eq.s $f2, $f2 +/* BC10 80030810 00000000 */ nop +/* BC14 80030814 45010004 */ bc1t .L80030828 +/* BC18 80030818 00000000 */ nop +/* BC1C 8003081C 0C0187BC */ jal sqrtf +/* BC20 80030820 00000000 */ nop +/* BC24 80030824 46000086 */ mov.s $f2, $f0 +.L80030828: +/* BC28 80030828 4602B002 */ mul.s $f0, $f22, $f2 +/* BC2C 8003082C 00000000 */ nop +/* BC30 80030830 4602A102 */ mul.s $f4, $f20, $f2 +/* BC34 80030834 00000000 */ nop +/* BC38 80030838 46180002 */ mul.s $f0, $f0, $f24 +/* BC3C 8003083C 00000000 */ nop +/* BC40 80030840 C602000C */ lwc1 $f2, 0xc($s0) +/* BC44 80030844 46001080 */ add.s $f2, $f2, $f0 +/* BC48 80030848 46182102 */ mul.s $f4, $f4, $f24 +/* BC4C 8003084C 00000000 */ nop +/* BC50 80030850 E63E0014 */ swc1 $f30, 0x14($s1) +/* BC54 80030854 E6220010 */ swc1 $f2, 0x10($s1) +/* BC58 80030858 C6000014 */ lwc1 $f0, 0x14($s0) +/* BC5C 8003085C 46040000 */ add.s $f0, $f0, $f4 +/* BC60 80030860 0800C220 */ j .L80030880 +/* BC64 80030864 E6200018 */ swc1 $f0, 0x18($s1) +glabel L80030868_BC68 +/* BC68 80030868 2402FFFF */ addiu $v0, $zero, -1 +/* BC6C 8003086C 0800C220 */ j .L80030880 +/* BC70 80030870 AE820000 */ sw $v0, ($s4) +glabel L80030874_BC74 +/* BC74 80030874 E6380010 */ swc1 $f24, 0x10($s1) +.L80030878: +/* BC78 80030878 E63E0014 */ swc1 $f30, 0x14($s1) +/* BC7C 8003087C E63A0018 */ swc1 $f26, 0x18($s1) +.L80030880: +glabel L80030880_BC80 +/* BC80 80030880 8FA20090 */ lw $v0, 0x90($sp) +/* BC84 80030884 C7B800A0 */ lwc1 $f24, 0xa0($sp) +/* BC88 80030888 C7BE00A4 */ lwc1 $f30, 0xa4($sp) +/* BC8C 8003088C 8C500000 */ lw $s0, ($v0) +/* BC90 80030890 C7BA00A8 */ lwc1 $f26, 0xa8($sp) +/* BC94 80030894 16000005 */ bnez $s0, .L800308AC +/* BC98 80030898 0260882D */ daddu $s1, $s3, $zero +/* BC9C 8003089C E6780010 */ swc1 $f24, 0x10($s3) +/* BCA0 800308A0 E67E0014 */ swc1 $f30, 0x14($s3) +/* BCA4 800308A4 0800C4F0 */ j .L800313C0 +/* BCA8 800308A8 E67A0018 */ swc1 $f26, 0x18($s3) +.L800308AC: +/* BCAC 800308AC 8E030000 */ lw $v1, ($s0) +/* BCB0 800308B0 2C620007 */ sltiu $v0, $v1, 7 +/* BCB4 800308B4 10400279 */ beqz $v0, .L8003129C +/* BCB8 800308B8 00031080 */ sll $v0, $v1, 2 +/* BCBC 800308BC 3C01800A */ lui $at, %hi(jtbl_80098230) +/* BCC0 800308C0 00220821 */ addu $at, $at, $v0 +/* BCC4 800308C4 8C228230 */ lw $v0, %lo(jtbl_80098230)($at) +/* BCC8 800308C8 00400008 */ jr $v0 +/* BCCC 800308CC 00000000 */ nop +glabel L800308D0_BCD0 +/* BCD0 800308D0 C6020018 */ lwc1 $f2, 0x18($s0) +/* BCD4 800308D4 C600000C */ lwc1 $f0, 0xc($s0) +/* BCD8 800308D8 46001081 */ sub.s $f2, $f2, $f0 +/* BCDC 800308DC C6000014 */ lwc1 $f0, 0x14($s0) +/* BCE0 800308E0 44061000 */ mfc1 $a2, $f2 +/* BCE4 800308E4 C6020020 */ lwc1 $f2, 0x20($s0) +/* BCE8 800308E8 4480A000 */ mtc1 $zero, $f20 +/* BCEC 800308EC 46001081 */ sub.s $f2, $f2, $f0 +/* BCF0 800308F0 4600A306 */ mov.s $f12, $f20 +/* BCF4 800308F4 44071000 */ mfc1 $a3, $f2 +/* BCF8 800308F8 0C00A720 */ jal atan2 +/* BCFC 800308FC 4600A386 */ mov.s $f14, $f20 +/* BD00 80030900 E6200000 */ swc1 $f0, ($s1) +/* BD04 80030904 C6000004 */ lwc1 $f0, 4($s0) +/* BD08 80030908 4614003C */ c.lt.s $f0, $f20 +/* BD0C 8003090C 00000000 */ nop +/* BD10 80030910 45030001 */ bc1tl .L80030918 +/* BD14 80030914 46000007 */ neg.s $f0, $f0 +.L80030918: +/* BD18 80030918 E6200004 */ swc1 $f0, 4($s1) +/* BD1C 8003091C C6000008 */ lwc1 $f0, 8($s0) +/* BD20 80030920 E6200008 */ swc1 $f0, 8($s1) +/* BD24 80030924 C6000024 */ lwc1 $f0, 0x24($s0) +/* BD28 80030928 E620000C */ swc1 $f0, 0xc($s1) +/* BD2C 8003092C 8E020028 */ lw $v0, 0x28($s0) +/* BD30 80030930 50400023 */ beql $v0, $zero, .L800309C0 +/* BD34 80030934 E6380010 */ swc1 $f24, 0x10($s1) +/* BD38 80030938 C60A0014 */ lwc1 $f10, 0x14($s0) +/* BD3C 8003093C C60C0020 */ lwc1 $f12, 0x20($s0) +/* BD40 80030940 460C5281 */ sub.s $f10, $f10, $f12 +/* BD44 80030944 C6000018 */ lwc1 $f0, 0x18($s0) +/* BD48 80030948 46005287 */ neg.s $f10, $f10 +/* BD4C 8003094C 46005280 */ add.s $f10, $f10, $f0 +/* BD50 80030950 460A0201 */ sub.s $f8, $f0, $f10 +/* BD54 80030954 46084102 */ mul.s $f4, $f8, $f8 +/* BD58 80030958 00000000 */ nop +/* BD5C 8003095C C606000C */ lwc1 $f6, 0xc($s0) +/* BD60 80030960 46003181 */ sub.s $f6, $f6, $f0 +/* BD64 80030964 460C3180 */ add.s $f6, $f6, $f12 +/* BD68 80030968 46066301 */ sub.s $f12, $f12, $f6 +/* BD6C 8003096C 460C6382 */ mul.s $f14, $f12, $f12 +/* BD70 80030970 00000000 */ nop +/* BD74 80030974 460AC081 */ sub.s $f2, $f24, $f10 +/* BD78 80030978 46081082 */ mul.s $f2, $f2, $f8 +/* BD7C 8003097C 00000000 */ nop +/* BD80 80030980 4606D001 */ sub.s $f0, $f26, $f6 +/* BD84 80030984 460C0002 */ mul.s $f0, $f0, $f12 +/* BD88 80030988 00000000 */ nop +/* BD8C 8003098C 460E2100 */ add.s $f4, $f4, $f14 +/* BD90 80030990 46001080 */ add.s $f2, $f2, $f0 +/* BD94 80030994 46041103 */ div.s $f4, $f2, $f4 +/* BD98 80030998 46082202 */ mul.s $f8, $f4, $f8 +/* BD9C 8003099C 00000000 */ nop +/* BDA0 800309A0 460C2102 */ mul.s $f4, $f4, $f12 +/* BDA4 800309A4 00000000 */ nop +/* BDA8 800309A8 460A4200 */ add.s $f8, $f8, $f10 +/* BDAC 800309AC 46062100 */ add.s $f4, $f4, $f6 +/* BDB0 800309B0 E63E0014 */ swc1 $f30, 0x14($s1) +/* BDB4 800309B4 E6280010 */ swc1 $f8, 0x10($s1) +/* BDB8 800309B8 0800C2D4 */ j .L80030B50 +/* BDBC 800309BC E6240018 */ swc1 $f4, 0x18($s1) +.L800309C0: +/* BDC0 800309C0 E63E0014 */ swc1 $f30, 0x14($s1) +/* BDC4 800309C4 0800C2D4 */ j .L80030B50 +/* BDC8 800309C8 E63A0018 */ swc1 $f26, 0x18($s1) +glabel L800309CC_BDCC +/* BDCC 800309CC C6020018 */ lwc1 $f2, 0x18($s0) +/* BDD0 800309D0 C600000C */ lwc1 $f0, 0xc($s0) +/* BDD4 800309D4 46001581 */ sub.s $f22, $f2, $f0 +/* BDD8 800309D8 C6020020 */ lwc1 $f2, 0x20($s0) +/* BDDC 800309DC C6000014 */ lwc1 $f0, 0x14($s0) +/* BDE0 800309E0 46001081 */ sub.s $f2, $f2, $f0 +/* BDE4 800309E4 44806000 */ mtc1 $zero, $f12 +/* BDE8 800309E8 4600B587 */ neg.s $f22, $f22 +/* BDEC 800309EC 4407B000 */ mfc1 $a3, $f22 +/* BDF0 800309F0 44061000 */ mfc1 $a2, $f2 +/* BDF4 800309F4 0C00A720 */ jal atan2 +/* BDF8 800309F8 46006386 */ mov.s $f14, $f12 +/* BDFC 800309FC E6200000 */ swc1 $f0, ($s1) +/* BE00 80030A00 C6000004 */ lwc1 $f0, 4($s0) +/* BE04 80030A04 4480E000 */ mtc1 $zero, $f28 +/* BE08 80030A08 00000000 */ nop +/* BE0C 80030A0C 461C003C */ c.lt.s $f0, $f28 +/* BE10 80030A10 00000000 */ nop +/* BE14 80030A14 45030001 */ bc1tl .L80030A1C +/* BE18 80030A18 46000007 */ neg.s $f0, $f0 +.L80030A1C: +/* BE1C 80030A1C E6200004 */ swc1 $f0, 4($s1) +/* BE20 80030A20 C6000008 */ lwc1 $f0, 8($s0) +/* BE24 80030A24 E6200008 */ swc1 $f0, 8($s1) +/* BE28 80030A28 C6000024 */ lwc1 $f0, 0x24($s0) +/* BE2C 80030A2C E620000C */ swc1 $f0, 0xc($s1) +/* BE30 80030A30 C60E000C */ lwc1 $f14, 0xc($s0) +/* BE34 80030A34 C61C0018 */ lwc1 $f28, 0x18($s0) +/* BE38 80030A38 460EE201 */ sub.s $f8, $f28, $f14 +/* BE3C 80030A3C 46084502 */ mul.s $f20, $f8, $f8 +/* BE40 80030A40 00000000 */ nop +/* BE44 80030A44 460EC081 */ sub.s $f2, $f24, $f14 +/* BE48 80030A48 46081082 */ mul.s $f2, $f2, $f8 +/* BE4C 80030A4C 00000000 */ nop +/* BE50 80030A50 E7BC0014 */ swc1 $f28, 0x14($sp) +/* BE54 80030A54 C60C0014 */ lwc1 $f12, 0x14($s0) +/* BE58 80030A58 C61C0020 */ lwc1 $f28, 0x20($s0) +/* BE5C 80030A5C 460CE181 */ sub.s $f6, $f28, $f12 +/* BE60 80030A60 46063482 */ mul.s $f18, $f6, $f6 +/* BE64 80030A64 00000000 */ nop +/* BE68 80030A68 460CD001 */ sub.s $f0, $f26, $f12 +/* BE6C 80030A6C 46060002 */ mul.s $f0, $f0, $f6 +/* BE70 80030A70 00000000 */ nop +/* BE74 80030A74 4612A100 */ add.s $f4, $f20, $f18 +/* BE78 80030A78 46001080 */ add.s $f2, $f2, $f0 +/* BE7C 80030A7C 46041103 */ div.s $f4, $f2, $f4 +/* BE80 80030A80 46082002 */ mul.s $f0, $f4, $f8 +/* BE84 80030A84 00000000 */ nop +/* BE88 80030A88 46062102 */ mul.s $f4, $f4, $f6 +/* BE8C 80030A8C 00000000 */ nop +/* BE90 80030A90 460E0400 */ add.s $f16, $f0, $f14 +/* BE94 80030A94 46007586 */ mov.s $f22, $f14 +/* BE98 80030A98 46004386 */ mov.s $f14, $f8 +/* BE9C 80030A9C 46168201 */ sub.s $f8, $f16, $f22 +/* BEA0 80030AA0 46087002 */ mul.s $f0, $f14, $f8 +/* BEA4 80030AA4 00000000 */ nop +/* BEA8 80030AA8 460C2280 */ add.s $f10, $f4, $f12 +/* BEAC 80030AAC 46006106 */ mov.s $f4, $f12 +/* BEB0 80030AB0 46003306 */ mov.s $f12, $f6 +/* BEB4 80030AB4 46045181 */ sub.s $f6, $f10, $f4 +/* BEB8 80030AB8 46066082 */ mul.s $f2, $f12, $f6 +/* BEBC 80030ABC 00000000 */ nop +/* BEC0 80030AC0 4610C501 */ sub.s $f20, $f24, $f16 +/* BEC4 80030AC4 E7BC0018 */ swc1 $f28, 0x18($sp) +/* BEC8 80030AC8 46020000 */ add.s $f0, $f0, $f2 +/* BECC 80030ACC 4480E000 */ mtc1 $zero, $f28 +/* BED0 80030AD0 00000000 */ nop +/* BED4 80030AD4 461C003C */ c.lt.s $f0, $f28 +/* BED8 80030AD8 00000000 */ nop +/* BEDC 80030ADC 45000004 */ bc1f .L80030AF0 +/* BEE0 80030AE0 460AD481 */ sub.s $f18, $f26, $f10 +/* BEE4 80030AE4 4600B406 */ mov.s $f16, $f22 +/* BEE8 80030AE8 0800C2CC */ j .L80030B30 +/* BEEC 80030AEC 46002286 */ mov.s $f10, $f4 +.L80030AF0: +/* BEF0 80030AF0 46084082 */ mul.s $f2, $f8, $f8 +/* BEF4 80030AF4 00000000 */ nop +/* BEF8 80030AF8 46063182 */ mul.s $f6, $f6, $f6 +/* BEFC 80030AFC 00000000 */ nop +/* BF00 80030B00 460E7002 */ mul.s $f0, $f14, $f14 +/* BF04 80030B04 00000000 */ nop +/* BF08 80030B08 460C6102 */ mul.s $f4, $f12, $f12 +/* BF0C 80030B0C 00000000 */ nop +/* BF10 80030B10 46061080 */ add.s $f2, $f2, $f6 +/* BF14 80030B14 46040000 */ add.s $f0, $f0, $f4 +/* BF18 80030B18 4602003C */ c.lt.s $f0, $f2 +/* BF1C 80030B1C 00000000 */ nop +/* BF20 80030B20 45000003 */ bc1f .L80030B30 +/* BF24 80030B24 00000000 */ nop +/* BF28 80030B28 C7B00014 */ lwc1 $f16, 0x14($sp) +/* BF2C 80030B2C C7AA0018 */ lwc1 $f10, 0x18($sp) +.L80030B30: +/* BF30 80030B30 8E020028 */ lw $v0, 0x28($s0) +/* BF34 80030B34 54400004 */ bnel $v0, $zero, .L80030B48 +/* BF38 80030B38 E6300010 */ swc1 $f16, 0x10($s1) +/* BF3C 80030B3C 46148400 */ add.s $f16, $f16, $f20 +/* BF40 80030B40 46125280 */ add.s $f10, $f10, $f18 +/* BF44 80030B44 E6300010 */ swc1 $f16, 0x10($s1) +.L80030B48: +/* BF48 80030B48 E63E0014 */ swc1 $f30, 0x14($s1) +/* BF4C 80030B4C E62A0018 */ swc1 $f10, 0x18($s1) +.L80030B50: +/* BF50 80030B50 12E0021B */ beqz $s7, .L800313C0 +/* BF54 80030B54 00000000 */ nop +/* BF58 80030B58 C6C00000 */ lwc1 $f0, ($s6) +/* BF5C 80030B5C 3C013F80 */ lui $at, 0x3f80 +/* BF60 80030B60 44812000 */ mtc1 $at, $f4 +/* BF64 80030B64 00000000 */ nop +/* BF68 80030B68 46040032 */ c.eq.s $f0, $f4 +/* BF6C 80030B6C 00000000 */ nop +/* BF70 80030B70 450101CA */ bc1t .L8003129C +/* BF74 80030B74 00000000 */ nop +/* BF78 80030B78 8E840000 */ lw $a0, ($s4) +/* BF7C 80030B7C 24820002 */ addiu $v0, $a0, 2 +/* BF80 80030B80 2C420003 */ sltiu $v0, $v0, 3 +/* BF84 80030B84 144001C5 */ bnez $v0, .L8003129C +/* BF88 80030B88 00000000 */ nop +/* BF8C 80030B8C 8C830000 */ lw $v1, ($a0) +/* BF90 80030B90 8E020000 */ lw $v0, ($s0) +/* BF94 80030B94 146201C1 */ bne $v1, $v0, .L8003129C +/* BF98 80030B98 00000000 */ nop +/* BF9C 80030B9C C4820004 */ lwc1 $f2, 4($a0) +/* BFA0 80030BA0 C6000004 */ lwc1 $f0, 4($s0) +/* BFA4 80030BA4 46001032 */ c.eq.s $f2, $f0 +/* BFA8 80030BA8 00000000 */ nop +/* BFAC 80030BAC 450001BB */ bc1f .L8003129C +/* BFB0 80030BB0 00000000 */ nop +/* BFB4 80030BB4 C4820008 */ lwc1 $f2, 8($a0) +/* BFB8 80030BB8 C6000008 */ lwc1 $f0, 8($s0) +/* BFBC 80030BBC 46001032 */ c.eq.s $f2, $f0 +/* BFC0 80030BC0 00000000 */ nop +/* BFC4 80030BC4 450001B5 */ bc1f .L8003129C +/* BFC8 80030BC8 00000000 */ nop +/* BFCC 80030BCC C4820024 */ lwc1 $f2, 0x24($a0) +/* BFD0 80030BD0 C6000024 */ lwc1 $f0, 0x24($s0) +/* BFD4 80030BD4 46001032 */ c.eq.s $f2, $f0 +/* BFD8 80030BD8 00000000 */ nop +/* BFDC 80030BDC 450001AF */ bc1f .L8003129C +/* BFE0 80030BE0 00000000 */ nop +/* BFE4 80030BE4 8C830028 */ lw $v1, 0x28($a0) +/* BFE8 80030BE8 8E020028 */ lw $v0, 0x28($s0) +/* BFEC 80030BEC 546201AB */ bnel $v1, $v0, .L8003129C +/* BFF0 80030BF0 E6C40000 */ swc1 $f4, ($s6) +/* BFF4 80030BF4 0800C4A7 */ j .L8003129C +/* BFF8 80030BF8 00000000 */ nop +glabel L80030BFC_BFFC +/* BFFC 80030BFC C6040004 */ lwc1 $f4, 4($s0) +/* C000 80030C00 44800000 */ mtc1 $zero, $f0 +/* C004 80030C04 00000000 */ nop +/* C008 80030C08 4600203C */ c.lt.s $f4, $f0 +/* C00C 80030C0C 00000000 */ nop +/* C010 80030C10 45000008 */ bc1f .L80030C34 +/* C014 80030C14 00000000 */ nop +/* C018 80030C18 C600000C */ lwc1 $f0, 0xc($s0) +/* C01C 80030C1C 4600C581 */ sub.s $f22, $f24, $f0 +/* C020 80030C20 C6020014 */ lwc1 $f2, 0x14($s0) +/* C024 80030C24 46002007 */ neg.s $f0, $f4 +/* C028 80030C28 E6200004 */ swc1 $f0, 4($s1) +/* C02C 80030C2C 0800C312 */ j .L80030C48 +/* C030 80030C30 4602D501 */ sub.s $f20, $f26, $f2 +.L80030C34: +/* C034 80030C34 C600000C */ lwc1 $f0, 0xc($s0) +/* C038 80030C38 46180581 */ sub.s $f22, $f0, $f24 +/* C03C 80030C3C C6000014 */ lwc1 $f0, 0x14($s0) +/* C040 80030C40 E6240004 */ swc1 $f4, 4($s1) +/* C044 80030C44 461A0501 */ sub.s $f20, $f0, $f26 +.L80030C48: +/* C048 80030C48 4406B000 */ mfc1 $a2, $f22 +/* C04C 80030C4C 44806000 */ mtc1 $zero, $f12 +/* C050 80030C50 4407A000 */ mfc1 $a3, $f20 +/* C054 80030C54 0C00A720 */ jal atan2 +/* C058 80030C58 46006386 */ mov.s $f14, $f12 +/* C05C 80030C5C E6200000 */ swc1 $f0, ($s1) +/* C060 80030C60 C6000008 */ lwc1 $f0, 8($s0) +/* C064 80030C64 E6200008 */ swc1 $f0, 8($s1) +/* C068 80030C68 C6000024 */ lwc1 $f0, 0x24($s0) +/* C06C 80030C6C E620000C */ swc1 $f0, 0xc($s1) +/* C070 80030C70 8E020028 */ lw $v0, 0x28($s0) +/* C074 80030C74 5040003E */ beql $v0, $zero, .L80030D70 +/* C078 80030C78 E6380010 */ swc1 $f24, 0x10($s1) +/* C07C 80030C7C C600000C */ lwc1 $f0, 0xc($s0) +/* C080 80030C80 4600C581 */ sub.s $f22, $f24, $f0 +/* C084 80030C84 4616B082 */ mul.s $f2, $f22, $f22 +/* C088 80030C88 00000000 */ nop +/* C08C 80030C8C C6000014 */ lwc1 $f0, 0x14($s0) +/* C090 80030C90 4600D501 */ sub.s $f20, $f26, $f0 +/* C094 80030C94 4614A002 */ mul.s $f0, $f20, $f20 +/* C098 80030C98 00000000 */ nop +/* C09C 80030C9C 46001600 */ add.s $f24, $f2, $f0 +/* C0A0 80030CA0 4480E000 */ mtc1 $zero, $f28 +/* C0A4 80030CA4 00000000 */ nop +/* C0A8 80030CA8 461CC032 */ c.eq.s $f24, $f28 +/* C0AC 80030CAC 00000000 */ nop +/* C0B0 80030CB0 45010031 */ bc1t .L80030D78 +/* C0B4 80030CB4 00000000 */ nop +/* C0B8 80030CB8 4600C184 */ sqrt.s $f6, $f24 +/* C0BC 80030CBC 46063032 */ c.eq.s $f6, $f6 +/* C0C0 80030CC0 00000000 */ nop +/* C0C4 80030CC4 45010004 */ bc1t .L80030CD8 +/* C0C8 80030CC8 00000000 */ nop +/* C0CC 80030CCC 0C0187BC */ jal sqrtf +/* C0D0 80030CD0 4600C306 */ mov.s $f12, $f24 +/* C0D4 80030CD4 46000186 */ mov.s $f6, $f0 +.L80030CD8: +/* C0D8 80030CD8 C6040018 */ lwc1 $f4, 0x18($s0) +/* C0DC 80030CDC C600000C */ lwc1 $f0, 0xc($s0) +/* C0E0 80030CE0 46002101 */ sub.s $f4, $f4, $f0 +/* C0E4 80030CE4 46042102 */ mul.s $f4, $f4, $f4 +/* C0E8 80030CE8 00000000 */ nop +/* C0EC 80030CEC C6020014 */ lwc1 $f2, 0x14($s0) +/* C0F0 80030CF0 C6000020 */ lwc1 $f0, 0x20($s0) +/* C0F4 80030CF4 46020001 */ sub.s $f0, $f0, $f2 +/* C0F8 80030CF8 46000002 */ mul.s $f0, $f0, $f0 +/* C0FC 80030CFC 00000000 */ nop +/* C100 80030D00 3C013F80 */ lui $at, 0x3f80 +/* C104 80030D04 44811000 */ mtc1 $at, $f2 +/* C108 80030D08 46002300 */ add.s $f12, $f4, $f0 +/* C10C 80030D0C 46061603 */ div.s $f24, $f2, $f6 +/* C110 80030D10 46006084 */ sqrt.s $f2, $f12 +/* C114 80030D14 46021032 */ c.eq.s $f2, $f2 +/* C118 80030D18 00000000 */ nop +/* C11C 80030D1C 45010004 */ bc1t .L80030D30 +/* C120 80030D20 00000000 */ nop +/* C124 80030D24 0C0187BC */ jal sqrtf +/* C128 80030D28 00000000 */ nop +/* C12C 80030D2C 46000086 */ mov.s $f2, $f0 +.L80030D30: +/* C130 80030D30 4602B002 */ mul.s $f0, $f22, $f2 +/* C134 80030D34 00000000 */ nop +/* C138 80030D38 4602A102 */ mul.s $f4, $f20, $f2 +/* C13C 80030D3C 00000000 */ nop +/* C140 80030D40 46180002 */ mul.s $f0, $f0, $f24 +/* C144 80030D44 00000000 */ nop +/* C148 80030D48 C602000C */ lwc1 $f2, 0xc($s0) +/* C14C 80030D4C 46001080 */ add.s $f2, $f2, $f0 +/* C150 80030D50 46182102 */ mul.s $f4, $f4, $f24 +/* C154 80030D54 00000000 */ nop +/* C158 80030D58 E63E0014 */ swc1 $f30, 0x14($s1) +/* C15C 80030D5C E6220010 */ swc1 $f2, 0x10($s1) +/* C160 80030D60 C6000014 */ lwc1 $f0, 0x14($s0) +/* C164 80030D64 46040000 */ add.s $f0, $f0, $f4 +/* C168 80030D68 0800C35E */ j .L80030D78 +/* C16C 80030D6C E6200018 */ swc1 $f0, 0x18($s1) +.L80030D70: +/* C170 80030D70 E63E0014 */ swc1 $f30, 0x14($s1) +/* C174 80030D74 E63A0018 */ swc1 $f26, 0x18($s1) +.L80030D78: +/* C178 80030D78 12E00191 */ beqz $s7, .L800313C0 +/* C17C 80030D7C 00000000 */ nop +/* C180 80030D80 C6C00000 */ lwc1 $f0, ($s6) +/* C184 80030D84 3C013F80 */ lui $at, 0x3f80 +/* C188 80030D88 44812000 */ mtc1 $at, $f4 +/* C18C 80030D8C 00000000 */ nop +/* C190 80030D90 46040032 */ c.eq.s $f0, $f4 +/* C194 80030D94 00000000 */ nop +/* C198 80030D98 45010140 */ bc1t .L8003129C +/* C19C 80030D9C 00000000 */ nop +/* C1A0 80030DA0 8E840000 */ lw $a0, ($s4) +/* C1A4 80030DA4 24820002 */ addiu $v0, $a0, 2 +/* C1A8 80030DA8 2C420003 */ sltiu $v0, $v0, 3 +/* C1AC 80030DAC 1440013B */ bnez $v0, .L8003129C +/* C1B0 80030DB0 00000000 */ nop +/* C1B4 80030DB4 8C830000 */ lw $v1, ($a0) +/* C1B8 80030DB8 8E020000 */ lw $v0, ($s0) +/* C1BC 80030DBC 14620137 */ bne $v1, $v0, .L8003129C +/* C1C0 80030DC0 00000000 */ nop +/* C1C4 80030DC4 C4820004 */ lwc1 $f2, 4($a0) +/* C1C8 80030DC8 C6000004 */ lwc1 $f0, 4($s0) +/* C1CC 80030DCC 46001032 */ c.eq.s $f2, $f0 +/* C1D0 80030DD0 00000000 */ nop +/* C1D4 80030DD4 45000131 */ bc1f .L8003129C +/* C1D8 80030DD8 00000000 */ nop +/* C1DC 80030DDC C4820008 */ lwc1 $f2, 8($a0) +/* C1E0 80030DE0 C6000008 */ lwc1 $f0, 8($s0) +/* C1E4 80030DE4 46001032 */ c.eq.s $f2, $f0 +/* C1E8 80030DE8 00000000 */ nop +/* C1EC 80030DEC 4500012B */ bc1f .L8003129C +/* C1F0 80030DF0 00000000 */ nop +/* C1F4 80030DF4 C4820024 */ lwc1 $f2, 0x24($a0) +/* C1F8 80030DF8 C6000024 */ lwc1 $f0, 0x24($s0) +/* C1FC 80030DFC 46001032 */ c.eq.s $f2, $f0 +/* C200 80030E00 00000000 */ nop +/* C204 80030E04 45000125 */ bc1f .L8003129C +/* C208 80030E08 00000000 */ nop +/* C20C 80030E0C 8C830028 */ lw $v1, 0x28($a0) +/* C210 80030E10 8E020028 */ lw $v0, 0x28($s0) +/* C214 80030E14 10620121 */ beq $v1, $v0, .L8003129C +/* C218 80030E18 00000000 */ nop +/* C21C 80030E1C C482000C */ lwc1 $f2, 0xc($a0) +/* C220 80030E20 C600000C */ lwc1 $f0, 0xc($s0) +/* C224 80030E24 46001032 */ c.eq.s $f2, $f0 +/* C228 80030E28 00000000 */ nop +/* C22C 80030E2C 4500011B */ bc1f .L8003129C +/* C230 80030E30 00000000 */ nop +/* C234 80030E34 C4820014 */ lwc1 $f2, 0x14($a0) +/* C238 80030E38 C6000014 */ lwc1 $f0, 0x14($s0) +/* C23C 80030E3C 46001032 */ c.eq.s $f2, $f0 +/* C240 80030E40 00000000 */ nop +/* C244 80030E44 45030115 */ bc1tl .L8003129C +/* C248 80030E48 E6C40000 */ swc1 $f4, ($s6) +/* C24C 80030E4C 0800C4A7 */ j .L8003129C +/* C250 80030E50 00000000 */ nop +glabel L80030E54_C254 +/* C254 80030E54 8E020028 */ lw $v0, 0x28($s0) +/* C258 80030E58 1440005D */ bnez $v0, .L80030FD0 +/* C25C 80030E5C 00000000 */ nop +/* C260 80030E60 C612000C */ lwc1 $f18, 0xc($s0) +/* C264 80030E64 C6100018 */ lwc1 $f16, 0x18($s0) +/* C268 80030E68 C60A0014 */ lwc1 $f10, 0x14($s0) +/* C26C 80030E6C C60C0020 */ lwc1 $f12, 0x20($s0) +/* C270 80030E70 C6040010 */ lwc1 $f4, 0x10($s0) +/* C274 80030E74 C60E001C */ lwc1 $f14, 0x1c($s0) +/* C278 80030E78 46109032 */ c.eq.s $f18, $f16 +/* C27C 80030E7C 00000000 */ nop +/* C280 80030E80 45000007 */ bc1f .L80030EA0 +/* C284 80030E84 46048201 */ sub.s $f8, $f16, $f4 +/* C288 80030E88 460C5032 */ c.eq.s $f10, $f12 +/* C28C 80030E8C 00000000 */ nop +/* C290 80030E90 45000003 */ bc1f .L80030EA0 +/* C294 80030E94 00000000 */ nop +/* C298 80030E98 46002486 */ mov.s $f18, $f4 +/* C29C 80030E9C 46007286 */ mov.s $f10, $f14 +.L80030EA0: +/* C2A0 80030EA0 44800000 */ mtc1 $zero, $f0 +/* C2A4 80030EA4 00000000 */ nop +/* C2A8 80030EA8 46004032 */ c.eq.s $f8, $f0 +/* C2AC 80030EAC 00000000 */ nop +/* C2B0 80030EB0 45020017 */ bc1fl .L80030F10 +/* C2B4 80030EB4 460C5181 */ sub.s $f6, $f10, $f12 +/* C2B8 80030EB8 46128181 */ sub.s $f6, $f16, $f18 +/* C2BC 80030EBC 46064102 */ mul.s $f4, $f8, $f6 +/* C2C0 80030EC0 00000000 */ nop +/* C2C4 80030EC4 461A6081 */ sub.s $f2, $f12, $f26 +/* C2C8 80030EC8 46081082 */ mul.s $f2, $f2, $f8 +/* C2CC 80030ECC 00000000 */ nop +/* C2D0 80030ED0 460C5281 */ sub.s $f10, $f10, $f12 +/* C2D4 80030ED4 460E6201 */ sub.s $f8, $f12, $f14 +/* C2D8 80030ED8 4610C001 */ sub.s $f0, $f24, $f16 +/* C2DC 80030EDC 46081083 */ div.s $f2, $f2, $f8 +/* C2E0 80030EE0 46020000 */ add.s $f0, $f0, $f2 +/* C2E4 80030EE4 46005082 */ mul.s $f2, $f10, $f0 +/* C2E8 80030EE8 00000000 */ nop +/* C2EC 80030EEC 46003182 */ mul.s $f6, $f6, $f0 +/* C2F0 80030EF0 00000000 */ nop +/* C2F4 80030EF4 46082103 */ div.s $f4, $f4, $f8 +/* C2F8 80030EF8 460A2101 */ sub.s $f4, $f4, $f10 +/* C2FC 80030EFC 46041083 */ div.s $f2, $f2, $f4 +/* C300 80030F00 46181200 */ add.s $f8, $f2, $f24 +/* C304 80030F04 46043183 */ div.s $f6, $f6, $f4 +/* C308 80030F08 0800C3D8 */ j .L80030F60 +/* C30C 80030F0C 461A3000 */ add.s $f0, $f6, $f26 +.L80030F10: +/* C310 80030F10 460E6081 */ sub.s $f2, $f12, $f14 +/* C314 80030F14 46023102 */ mul.s $f4, $f6, $f2 +/* C318 80030F18 00000000 */ nop +/* C31C 80030F1C 46188001 */ sub.s $f0, $f16, $f24 +/* C320 80030F20 46020002 */ mul.s $f0, $f0, $f2 +/* C324 80030F24 00000000 */ nop +/* C328 80030F28 460CD081 */ sub.s $f2, $f26, $f12 +/* C32C 80030F2C 46080003 */ div.s $f0, $f0, $f8 +/* C330 80030F30 46001080 */ add.s $f2, $f2, $f0 +/* C334 80030F34 46023182 */ mul.s $f6, $f6, $f2 +/* C338 80030F38 00000000 */ nop +/* C33C 80030F3C 46128001 */ sub.s $f0, $f16, $f18 +/* C340 80030F40 46020082 */ mul.s $f2, $f0, $f2 +/* C344 80030F44 00000000 */ nop +/* C348 80030F48 46082103 */ div.s $f4, $f4, $f8 +/* C34C 80030F4C 46002101 */ sub.s $f4, $f4, $f0 +/* C350 80030F50 46043183 */ div.s $f6, $f6, $f4 +/* C354 80030F54 46183200 */ add.s $f8, $f6, $f24 +/* C358 80030F58 46041083 */ div.s $f2, $f2, $f4 +/* C35C 80030F5C 461A1000 */ add.s $f0, $f2, $f26 +.L80030F60: +/* C360 80030F60 E6280010 */ swc1 $f8, 0x10($s1) +/* C364 80030F64 E63E0014 */ swc1 $f30, 0x14($s1) +/* C368 80030F68 12A0003E */ beqz $s5, .L80031064 +/* C36C 80030F6C E6200018 */ swc1 $f0, 0x18($s1) +/* C370 80030F70 C6020018 */ lwc1 $f2, 0x18($s0) +/* C374 80030F74 C600000C */ lwc1 $f0, 0xc($s0) +/* C378 80030F78 46001081 */ sub.s $f2, $f2, $f0 +/* C37C 80030F7C C6000014 */ lwc1 $f0, 0x14($s0) +/* C380 80030F80 44061000 */ mfc1 $a2, $f2 +/* C384 80030F84 C6020020 */ lwc1 $f2, 0x20($s0) +/* C388 80030F88 4480A000 */ mtc1 $zero, $f20 +/* C38C 80030F8C 46001081 */ sub.s $f2, $f2, $f0 +/* C390 80030F90 4600A306 */ mov.s $f12, $f20 +/* C394 80030F94 44071000 */ mfc1 $a3, $f2 +/* C398 80030F98 0C00A720 */ jal atan2 +/* C39C 80030F9C 4600A386 */ mov.s $f14, $f20 +/* C3A0 80030FA0 E6200000 */ swc1 $f0, ($s1) +/* C3A4 80030FA4 C6000004 */ lwc1 $f0, 4($s0) +/* C3A8 80030FA8 4614003C */ c.lt.s $f0, $f20 +/* C3AC 80030FAC 00000000 */ nop +/* C3B0 80030FB0 45030001 */ bc1tl .L80030FB8 +/* C3B4 80030FB4 46000007 */ neg.s $f0, $f0 +.L80030FB8: +/* C3B8 80030FB8 E6200004 */ swc1 $f0, 4($s1) +/* C3BC 80030FBC C6000008 */ lwc1 $f0, 8($s0) +/* C3C0 80030FC0 E6200008 */ swc1 $f0, 8($s1) +/* C3C4 80030FC4 C6000024 */ lwc1 $f0, 0x24($s0) +/* C3C8 80030FC8 0800C419 */ j .L80031064 +/* C3CC 80030FCC E620000C */ swc1 $f0, 0xc($s1) +.L80030FD0: +/* C3D0 80030FD0 12A0001D */ beqz $s5, .L80031048 +/* C3D4 80030FD4 00000000 */ nop +/* C3D8 80030FD8 C6020018 */ lwc1 $f2, 0x18($s0) +/* C3DC 80030FDC C600000C */ lwc1 $f0, 0xc($s0) +/* C3E0 80030FE0 46001081 */ sub.s $f2, $f2, $f0 +/* C3E4 80030FE4 C6000014 */ lwc1 $f0, 0x14($s0) +/* C3E8 80030FE8 44061000 */ mfc1 $a2, $f2 +/* C3EC 80030FEC C6020020 */ lwc1 $f2, 0x20($s0) +/* C3F0 80030FF0 4480A000 */ mtc1 $zero, $f20 +/* C3F4 80030FF4 46001081 */ sub.s $f2, $f2, $f0 +/* C3F8 80030FF8 4600A306 */ mov.s $f12, $f20 +/* C3FC 80030FFC 44071000 */ mfc1 $a3, $f2 +/* C400 80031000 0C00A720 */ jal atan2 +/* C404 80031004 4600A386 */ mov.s $f14, $f20 +/* C408 80031008 E6200000 */ swc1 $f0, ($s1) +/* C40C 8003100C C6000004 */ lwc1 $f0, 4($s0) +/* C410 80031010 4614003C */ c.lt.s $f0, $f20 +/* C414 80031014 00000000 */ nop +/* C418 80031018 45030001 */ bc1tl .L80031020 +/* C41C 8003101C 46000007 */ neg.s $f0, $f0 +.L80031020: +/* C420 80031020 E6200004 */ swc1 $f0, 4($s1) +/* C424 80031024 C6000008 */ lwc1 $f0, 8($s0) +/* C428 80031028 E6200008 */ swc1 $f0, 8($s1) +/* C42C 8003102C C6000024 */ lwc1 $f0, 0x24($s0) +/* C430 80031030 E620000C */ swc1 $f0, 0xc($s1) +/* C434 80031034 C6000018 */ lwc1 $f0, 0x18($s0) +/* C438 80031038 E6200010 */ swc1 $f0, 0x10($s1) +/* C43C 8003103C C6000020 */ lwc1 $f0, 0x20($s0) +/* C440 80031040 0800C418 */ j .L80031060 +/* C444 80031044 E6200018 */ swc1 $f0, 0x18($s1) +.L80031048: +/* C448 80031048 52E00006 */ beql $s7, $zero, .L80031064 +/* C44C 8003104C E63E0014 */ swc1 $f30, 0x14($s1) +/* C450 80031050 C6400010 */ lwc1 $f0, 0x10($s2) +/* C454 80031054 E6200010 */ swc1 $f0, 0x10($s1) +/* C458 80031058 C6400018 */ lwc1 $f0, 0x18($s2) +/* C45C 8003105C E6200018 */ swc1 $f0, 0x18($s1) +.L80031060: +/* C460 80031060 E63E0014 */ swc1 $f30, 0x14($s1) +.L80031064: +/* C464 80031064 0800C4A6 */ j .L80031298 +/* C468 80031068 2402FFFF */ addiu $v0, $zero, -1 +glabel L8003106C_C46C +/* C46C 8003106C 8E020028 */ lw $v0, 0x28($s0) +/* C470 80031070 1440003A */ bnez $v0, .L8003115C +/* C474 80031074 00000000 */ nop +/* C478 80031078 C60C0010 */ lwc1 $f12, 0x10($s0) +/* C47C 8003107C C6060018 */ lwc1 $f6, 0x18($s0) +/* C480 80031080 460C3181 */ sub.s $f6, $f6, $f12 +/* C484 80031084 46063102 */ mul.s $f4, $f6, $f6 +/* C488 80031088 00000000 */ nop +/* C48C 8003108C C60A001C */ lwc1 $f10, 0x1c($s0) +/* C490 80031090 C6080020 */ lwc1 $f8, 0x20($s0) +/* C494 80031094 460A4201 */ sub.s $f8, $f8, $f10 +/* C498 80031098 46084382 */ mul.s $f14, $f8, $f8 +/* C49C 8003109C 00000000 */ nop +/* C4A0 800310A0 460CC081 */ sub.s $f2, $f24, $f12 +/* C4A4 800310A4 46061082 */ mul.s $f2, $f2, $f6 +/* C4A8 800310A8 00000000 */ nop +/* C4AC 800310AC 460AD001 */ sub.s $f0, $f26, $f10 +/* C4B0 800310B0 46080002 */ mul.s $f0, $f0, $f8 +/* C4B4 800310B4 00000000 */ nop +/* C4B8 800310B8 460E2100 */ add.s $f4, $f4, $f14 +/* C4BC 800310BC 46001080 */ add.s $f2, $f2, $f0 +/* C4C0 800310C0 46041103 */ div.s $f4, $f2, $f4 +/* C4C4 800310C4 46062182 */ mul.s $f6, $f4, $f6 +/* C4C8 800310C8 00000000 */ nop +/* C4CC 800310CC 46082102 */ mul.s $f4, $f4, $f8 +/* C4D0 800310D0 00000000 */ nop +/* C4D4 800310D4 460C3080 */ add.s $f2, $f6, $f12 +/* C4D8 800310D8 44800000 */ mtc1 $zero, $f0 +/* C4DC 800310DC 460A2100 */ add.s $f4, $f4, $f10 +/* C4E0 800310E0 E63E0014 */ swc1 $f30, 0x14($s1) +/* C4E4 800310E4 E6220010 */ swc1 $f2, 0x10($s1) +/* C4E8 800310E8 E6240018 */ swc1 $f4, 0x18($s1) +/* C4EC 800310EC C6080004 */ lwc1 $f8, 4($s0) +/* C4F0 800310F0 4600403C */ c.lt.s $f8, $f0 +/* C4F4 800310F4 00000000 */ nop +/* C4F8 800310F8 45000008 */ bc1f .L8003111C +/* C4FC 800310FC 00000000 */ nop +/* C500 80031100 C600000C */ lwc1 $f0, 0xc($s0) +/* C504 80031104 46001581 */ sub.s $f22, $f2, $f0 +/* C508 80031108 C6020014 */ lwc1 $f2, 0x14($s0) +/* C50C 8003110C 46004007 */ neg.s $f0, $f8 +/* C510 80031110 E6200004 */ swc1 $f0, 4($s1) +/* C514 80031114 0800C44C */ j .L80031130 +/* C518 80031118 46022501 */ sub.s $f20, $f4, $f2 +.L8003111C: +/* C51C 8003111C C600000C */ lwc1 $f0, 0xc($s0) +/* C520 80031120 46020581 */ sub.s $f22, $f0, $f2 +/* C524 80031124 C6000014 */ lwc1 $f0, 0x14($s0) +/* C528 80031128 E6280004 */ swc1 $f8, 4($s1) +/* C52C 8003112C 46040501 */ sub.s $f20, $f0, $f4 +.L80031130: +/* C530 80031130 4406B000 */ mfc1 $a2, $f22 +/* C534 80031134 44806000 */ mtc1 $zero, $f12 +/* C538 80031138 4407A000 */ mfc1 $a3, $f20 +/* C53C 8003113C 0C00A720 */ jal atan2 +/* C540 80031140 46006386 */ mov.s $f14, $f12 +/* C544 80031144 E6200000 */ swc1 $f0, ($s1) +/* C548 80031148 C6000008 */ lwc1 $f0, 8($s0) +/* C54C 8003114C E6200008 */ swc1 $f0, 8($s1) +/* C550 80031150 C6000024 */ lwc1 $f0, 0x24($s0) +/* C554 80031154 0800C482 */ j .L80031208 +/* C558 80031158 E620000C */ swc1 $f0, 0xc($s1) +.L8003115C: +/* C55C 8003115C 12A00023 */ beqz $s5, .L800311EC +/* C560 80031160 00000000 */ nop +/* C564 80031164 C6060004 */ lwc1 $f6, 4($s0) +/* C568 80031168 44800000 */ mtc1 $zero, $f0 +/* C56C 8003116C 00000000 */ nop +/* C570 80031170 4600303C */ c.lt.s $f6, $f0 +/* C574 80031174 00000000 */ nop +/* C578 80031178 4500000A */ bc1f .L800311A4 +/* C57C 8003117C 00000000 */ nop +/* C580 80031180 C6020018 */ lwc1 $f2, 0x18($s0) +/* C584 80031184 C600000C */ lwc1 $f0, 0xc($s0) +/* C588 80031188 46001581 */ sub.s $f22, $f2, $f0 +/* C58C 8003118C C6040020 */ lwc1 $f4, 0x20($s0) +/* C590 80031190 C6020014 */ lwc1 $f2, 0x14($s0) +/* C594 80031194 46003007 */ neg.s $f0, $f6 +/* C598 80031198 E6200004 */ swc1 $f0, 4($s1) +/* C59C 8003119C 0800C470 */ j .L800311C0 +/* C5A0 800311A0 46022501 */ sub.s $f20, $f4, $f2 +.L800311A4: +/* C5A4 800311A4 C602000C */ lwc1 $f2, 0xc($s0) +/* C5A8 800311A8 C6000018 */ lwc1 $f0, 0x18($s0) +/* C5AC 800311AC 46001581 */ sub.s $f22, $f2, $f0 +/* C5B0 800311B0 C6020014 */ lwc1 $f2, 0x14($s0) +/* C5B4 800311B4 C6000020 */ lwc1 $f0, 0x20($s0) +/* C5B8 800311B8 E6260004 */ swc1 $f6, 4($s1) +/* C5BC 800311BC 46001501 */ sub.s $f20, $f2, $f0 +.L800311C0: +/* C5C0 800311C0 4406B000 */ mfc1 $a2, $f22 +/* C5C4 800311C4 44806000 */ mtc1 $zero, $f12 +/* C5C8 800311C8 4407A000 */ mfc1 $a3, $f20 +/* C5CC 800311CC 0C00A720 */ jal atan2 +/* C5D0 800311D0 46006386 */ mov.s $f14, $f12 +/* C5D4 800311D4 E6200000 */ swc1 $f0, ($s1) +/* C5D8 800311D8 C6000008 */ lwc1 $f0, 8($s0) +/* C5DC 800311DC E6200008 */ swc1 $f0, 8($s1) +/* C5E0 800311E0 C6000024 */ lwc1 $f0, 0x24($s0) +/* C5E4 800311E4 0800C47D */ j .L800311F4 +/* C5E8 800311E8 E620000C */ swc1 $f0, 0xc($s1) +.L800311EC: +/* C5EC 800311EC 52E00006 */ beql $s7, $zero, .L80031208 +/* C5F0 800311F0 E63E0014 */ swc1 $f30, 0x14($s1) +.L800311F4: +/* C5F4 800311F4 C6000018 */ lwc1 $f0, 0x18($s0) +/* C5F8 800311F8 E6200010 */ swc1 $f0, 0x10($s1) +/* C5FC 800311FC C6000020 */ lwc1 $f0, 0x20($s0) +/* C600 80031200 E6200018 */ swc1 $f0, 0x18($s1) +/* C604 80031204 E63E0014 */ swc1 $f30, 0x14($s1) +.L80031208: +/* C608 80031208 0800C4A6 */ j .L80031298 +/* C60C 8003120C 2402FFFF */ addiu $v0, $zero, -1 +glabel L80031210_C610 +/* C610 80031210 E6380010 */ swc1 $f24, 0x10($s1) +/* C614 80031214 E63E0014 */ swc1 $f30, 0x14($s1) +/* C618 80031218 0800C4A7 */ j .L8003129C +/* C61C 8003121C E63A0018 */ swc1 $f26, 0x18($s1) +glabel L80031220_C620 +/* C620 80031220 C6020018 */ lwc1 $f2, 0x18($s0) +/* C624 80031224 C600000C */ lwc1 $f0, 0xc($s0) +/* C628 80031228 46001081 */ sub.s $f2, $f2, $f0 +/* C62C 8003122C C6000014 */ lwc1 $f0, 0x14($s0) +/* C630 80031230 44061000 */ mfc1 $a2, $f2 +/* C634 80031234 C6020020 */ lwc1 $f2, 0x20($s0) +/* C638 80031238 4480A000 */ mtc1 $zero, $f20 +/* C63C 8003123C 46001081 */ sub.s $f2, $f2, $f0 +/* C640 80031240 4600A306 */ mov.s $f12, $f20 +/* C644 80031244 44071000 */ mfc1 $a3, $f2 +/* C648 80031248 0C00A720 */ jal atan2 +/* C64C 8003124C 4600A386 */ mov.s $f14, $f20 +/* C650 80031250 E6200000 */ swc1 $f0, ($s1) +/* C654 80031254 C6000004 */ lwc1 $f0, 4($s0) +/* C658 80031258 4614003C */ c.lt.s $f0, $f20 +/* C65C 8003125C 00000000 */ nop +/* C660 80031260 45030001 */ bc1tl .L80031268 +/* C664 80031264 46000007 */ neg.s $f0, $f0 +.L80031268: +/* C668 80031268 E6200004 */ swc1 $f0, 4($s1) +/* C66C 8003126C C6000008 */ lwc1 $f0, 8($s0) +/* C670 80031270 E6200008 */ swc1 $f0, 8($s1) +/* C674 80031274 C6000024 */ lwc1 $f0, 0x24($s0) +/* C678 80031278 E620000C */ swc1 $f0, 0xc($s1) +/* C67C 8003127C C6000018 */ lwc1 $f0, 0x18($s0) +/* C680 80031280 E6200010 */ swc1 $f0, 0x10($s1) +/* C684 80031284 C600001C */ lwc1 $f0, 0x1c($s0) +/* C688 80031288 E6200014 */ swc1 $f0, 0x14($s1) +/* C68C 8003128C C6000020 */ lwc1 $f0, 0x20($s0) +/* C690 80031290 2402FFFE */ addiu $v0, $zero, -2 +/* C694 80031294 E6200018 */ swc1 $f0, 0x18($s1) +.L80031298: +/* C698 80031298 AE820000 */ sw $v0, ($s4) +.L8003129C: +/* C69C 8003129C 12E00048 */ beqz $s7, .L800313C0 +/* C6A0 800312A0 24020005 */ addiu $v0, $zero, 5 +/* C6A4 800312A4 8E030000 */ lw $v1, ($s0) +/* C6A8 800312A8 10620007 */ beq $v1, $v0, .L800312C8 +/* C6AC 800312AC 00000000 */ nop +/* C6B0 800312B0 C6420000 */ lwc1 $f2, ($s2) +/* C6B4 800312B4 C6600000 */ lwc1 $f0, ($s3) +/* C6B8 800312B8 46001032 */ c.eq.s $f2, $f0 +/* C6BC 800312BC 00000000 */ nop +/* C6C0 800312C0 4501003F */ bc1t .L800313C0 +/* C6C4 800312C4 00000000 */ nop +.L800312C8: +/* C6C8 800312C8 C6400000 */ lwc1 $f0, ($s2) +/* C6CC 800312CC C6620000 */ lwc1 $f2, ($s3) +/* C6D0 800312D0 46020001 */ sub.s $f0, $f0, $f2 +/* C6D4 800312D4 3C014040 */ lui $at, 0x4040 +/* C6D8 800312D8 44811000 */ mtc1 $at, $f2 +/* C6DC 800312DC 46000005 */ abs.s $f0, $f0 +/* C6E0 800312E0 4602003C */ c.lt.s $f0, $f2 +/* C6E4 800312E4 00000000 */ nop +/* C6E8 800312E8 45000035 */ bc1f .L800313C0 +/* C6EC 800312EC 00000000 */ nop +/* C6F0 800312F0 C6400004 */ lwc1 $f0, 4($s2) +/* C6F4 800312F4 C6620004 */ lwc1 $f2, 4($s3) +/* C6F8 800312F8 46020001 */ sub.s $f0, $f0, $f2 +/* C6FC 800312FC 3C014120 */ lui $at, 0x4120 +/* C700 80031300 44812000 */ mtc1 $at, $f4 +/* C704 80031304 46000005 */ abs.s $f0, $f0 +/* C708 80031308 4604003C */ c.lt.s $f0, $f4 +/* C70C 8003130C 00000000 */ nop +/* C710 80031310 4500002B */ bc1f .L800313C0 +/* C714 80031314 00000000 */ nop +/* C718 80031318 C6400008 */ lwc1 $f0, 8($s2) +/* C71C 8003131C C6620008 */ lwc1 $f2, 8($s3) +/* C720 80031320 46020001 */ sub.s $f0, $f0, $f2 +/* C724 80031324 3C013F80 */ lui $at, 0x3f80 +/* C728 80031328 44813000 */ mtc1 $at, $f6 +/* C72C 8003132C 46000005 */ abs.s $f0, $f0 +/* C730 80031330 4606003C */ c.lt.s $f0, $f6 +/* C734 80031334 00000000 */ nop +/* C738 80031338 45000021 */ bc1f .L800313C0 +/* C73C 8003133C 00000000 */ nop +/* C740 80031340 C640000C */ lwc1 $f0, 0xc($s2) +/* C744 80031344 C662000C */ lwc1 $f2, 0xc($s3) +/* C748 80031348 46020001 */ sub.s $f0, $f0, $f2 +/* C74C 8003134C 46000005 */ abs.s $f0, $f0 +/* C750 80031350 4606003C */ c.lt.s $f0, $f6 +/* C754 80031354 00000000 */ nop +/* C758 80031358 45000019 */ bc1f .L800313C0 +/* C75C 8003135C 00000000 */ nop +/* C760 80031360 C6400010 */ lwc1 $f0, 0x10($s2) +/* C764 80031364 C6620010 */ lwc1 $f2, 0x10($s3) +/* C768 80031368 46020001 */ sub.s $f0, $f0, $f2 +/* C76C 8003136C 46000005 */ abs.s $f0, $f0 +/* C770 80031370 4604003C */ c.lt.s $f0, $f4 +/* C774 80031374 00000000 */ nop +/* C778 80031378 45000011 */ bc1f .L800313C0 +/* C77C 8003137C 00000000 */ nop +/* C780 80031380 C6400014 */ lwc1 $f0, 0x14($s2) +/* C784 80031384 C6620014 */ lwc1 $f2, 0x14($s3) +/* C788 80031388 46020001 */ sub.s $f0, $f0, $f2 +/* C78C 8003138C 46000005 */ abs.s $f0, $f0 +/* C790 80031390 4604003C */ c.lt.s $f0, $f4 +/* C794 80031394 00000000 */ nop +/* C798 80031398 45000009 */ bc1f .L800313C0 +/* C79C 8003139C 00000000 */ nop +/* C7A0 800313A0 C6400018 */ lwc1 $f0, 0x18($s2) +/* C7A4 800313A4 C6620018 */ lwc1 $f2, 0x18($s3) +/* C7A8 800313A8 46020001 */ sub.s $f0, $f0, $f2 +/* C7AC 800313AC 46000005 */ abs.s $f0, $f0 +/* C7B0 800313B0 4604003C */ c.lt.s $f0, $f4 +/* C7B4 800313B4 00000000 */ nop +/* C7B8 800313B8 45030001 */ bc1tl .L800313C0 +/* C7BC 800313BC E6C60000 */ swc1 $f6, ($s6) +.L800313C0: +/* C7C0 800313C0 8E830000 */ lw $v1, ($s4) +/* C7C4 800313C4 2402FFFF */ addiu $v0, $zero, -1 +/* C7C8 800313C8 14620021 */ bne $v1, $v0, .L80031450 +/* C7CC 800313CC 00000000 */ nop +/* C7D0 800313D0 12E00010 */ beqz $s7, .L80031414 +/* C7D4 800313D4 00000000 */ nop +/* C7D8 800313D8 C6460010 */ lwc1 $f6, 0x10($s2) +/* C7DC 800313DC C6600010 */ lwc1 $f0, 0x10($s3) +/* C7E0 800313E0 C6440014 */ lwc1 $f4, 0x14($s2) +/* C7E4 800313E4 46003181 */ sub.s $f6, $f6, $f0 +/* C7E8 800313E8 C6600014 */ lwc1 $f0, 0x14($s3) +/* C7EC 800313EC C6420018 */ lwc1 $f2, 0x18($s2) +/* C7F0 800313F0 46002101 */ sub.s $f4, $f4, $f0 +/* C7F4 800313F4 C6600018 */ lwc1 $f0, 0x18($s3) +/* C7F8 800313F8 46001081 */ sub.s $f2, $f2, $f0 +/* C7FC 800313FC 3C01800A */ lui $at, %hi(D_800A08E4) +/* C800 80031400 E42608E4 */ swc1 $f6, %lo(D_800A08E4)($at) +/* C804 80031404 3C01800A */ lui $at, %hi(D_800A08E8) +/* C808 80031408 E42408E8 */ swc1 $f4, %lo(D_800A08E8)($at) +/* C80C 8003140C 3C01800A */ lui $at, %hi(D_800A08EC) +/* C810 80031410 E42208EC */ swc1 $f2, %lo(D_800A08EC)($at) +.L80031414: +/* C814 80031414 C6600010 */ lwc1 $f0, 0x10($s3) +/* C818 80031418 3C01800A */ lui $at, %hi(D_800A08E4) +/* C81C 8003141C C42208E4 */ lwc1 $f2, %lo(D_800A08E4)($at) +/* C820 80031420 46020000 */ add.s $f0, $f0, $f2 +/* C824 80031424 3C01800A */ lui $at, %hi(D_800A08E8) +/* C828 80031428 C42208E8 */ lwc1 $f2, %lo(D_800A08E8)($at) +/* C82C 8003142C E6400010 */ swc1 $f0, 0x10($s2) +/* C830 80031430 C6600014 */ lwc1 $f0, 0x14($s3) +/* C834 80031434 46020000 */ add.s $f0, $f0, $f2 +/* C838 80031438 3C01800A */ lui $at, %hi(D_800A08EC) +/* C83C 8003143C C42208EC */ lwc1 $f2, %lo(D_800A08EC)($at) +/* C840 80031440 E6400014 */ swc1 $f0, 0x14($s2) +/* C844 80031444 C6600018 */ lwc1 $f0, 0x18($s3) +/* C848 80031448 46020000 */ add.s $f0, $f0, $f2 +/* C84C 8003144C E6400018 */ swc1 $f0, 0x18($s2) +.L80031450: +/* C850 80031450 8FBF0048 */ lw $ra, 0x48($sp) +/* C854 80031454 8FB70044 */ lw $s7, 0x44($sp) +/* C858 80031458 8FB60040 */ lw $s6, 0x40($sp) +/* C85C 8003145C 8FB5003C */ lw $s5, 0x3c($sp) +/* C860 80031460 8FB40038 */ lw $s4, 0x38($sp) +/* C864 80031464 8FB30034 */ lw $s3, 0x34($sp) +/* C868 80031468 8FB20030 */ lw $s2, 0x30($sp) +/* C86C 8003146C 8FB1002C */ lw $s1, 0x2c($sp) +/* C870 80031470 8FB00028 */ lw $s0, 0x28($sp) +/* C874 80031474 D7BE0078 */ ldc1 $f30, 0x78($sp) +/* C878 80031478 D7BC0070 */ ldc1 $f28, 0x70($sp) +/* C87C 8003147C D7BA0068 */ ldc1 $f26, 0x68($sp) +/* C880 80031480 D7B80060 */ ldc1 $f24, 0x60($sp) +/* C884 80031484 D7B60058 */ ldc1 $f22, 0x58($sp) +/* C888 80031488 D7B40050 */ ldc1 $f20, 0x50($sp) +/* C88C 8003148C 03E00008 */ jr $ra +/* C890 80031490 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122088.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra1.s similarity index 99% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80122088.s rename to asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra1.s index 4f58f5501c..a7994fae6f 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122088.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra1.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80122088 +glabel draw_entity_model_extra1 /* B8788 80122088 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* B878C 8012208C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* B8790 80122090 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122188.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra2.s similarity index 99% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80122188.s rename to asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra2.s index 69df46de86..ccfe08fd8c 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122188.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra2.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80122188 +glabel draw_entity_model_extra2 /* B8888 80122188 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* B888C 8012218C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* B8890 80122190 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s similarity index 99% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s rename to asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s index fdc8675ecc..113ce17435 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80122288 +glabel draw_entity_model_extra3 /* B8988 80122288 27BDFF08 */ addiu $sp, $sp, -0xf8 /* B898C 8012228C 2402F7FF */ addiu $v0, $zero, -0x801 /* B8990 80122290 00822024 */ and $a0, $a0, $v0 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_main.s similarity index 99% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s rename to asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_main.s index 06b1f13ccb..db73f575c3 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_main.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80121EB8 +glabel draw_entity_model_main /* B85B8 80121EB8 27BDFF60 */ addiu $sp, $sp, -0xa0 /* B85BC 80121EBC 0080402D */ daddu $t0, $a0, $zero /* B85C0 80121EC0 AFB1008C */ sw $s1, 0x8c($sp) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_shadow.s similarity index 99% rename from asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s rename to asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_shadow.s index 610e2b18b0..59ec926310 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_shadow.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80121CE8 +glabel draw_entity_model_shadow /* B83E8 80121CE8 27BDFF60 */ addiu $sp, $sp, -0xa0 /* B83EC 80121CEC 0080302D */ daddu $a2, $a0, $zero /* B83F0 80121CF0 AFB1008C */ sw $s1, 0x8c($sp) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s b/asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s similarity index 99% rename from asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s rename to asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s index f97493425a..564e3ecc3f 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s +++ b/asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80136A80 +glabel _render_transition_stencil /* CD180 80136A80 27BDFF88 */ addiu $sp, $sp, -0x78 /* CD184 80136A84 F7B80060 */ sdc1 $f24, 0x60($sp) /* CD188 80136A88 4485C000 */ mtc1 $a1, $f24 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s b/asm/nonmatchings/code_cd180_len_38f0/clear_transition_stencil.s similarity index 98% rename from asm/nonmatchings/code_cd180_len_38f0/func_80138108.s rename to asm/nonmatchings/code_cd180_len_38f0/clear_transition_stencil.s index f6003f8859..346ac52a0d 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s +++ b/asm/nonmatchings/code_cd180_len_38f0/clear_transition_stencil.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80138108 +glabel clear_transition_stencil /* CE808 80138108 3C048016 */ lui $a0, %hi(D_8015C790) /* CE80C 8013810C 2484C790 */ addiu $a0, $a0, %lo(D_8015C790) /* CE810 80138110 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s b/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s index 96c6ad7faa..c3edfc7db0 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s @@ -79,7 +79,7 @@ glabel L801383A4_CEAA4 /* CEAAC 801383AC 24120032 */ addiu $s2, $zero, 0x32 glabel L801383B0_CEAB0 /* CEAB0 801383B0 0000202D */ daddu $a0, $zero, $zero -/* CEAB4 801383B4 0C04E035 */ jal func_801380D4 +/* CEAB4 801383B4 0C04E035 */ jal set_transition_stencil_alpha /* CEAB8 801383B8 0000282D */ daddu $a1, $zero, $zero /* CEABC 801383BC 0804E11B */ j .L8013846C /* CEAC0 801383C0 24110004 */ addiu $s1, $zero, 4 @@ -89,7 +89,7 @@ glabel L801383C4_CEAC4 /* CEACC 801383CC 02A0982D */ daddu $s3, $s5, $zero glabel L801383D0_CEAD0 /* CEAD0 801383D0 0000202D */ daddu $a0, $zero, $zero -/* CEAD4 801383D4 0C04E035 */ jal func_801380D4 +/* CEAD4 801383D4 0C04E035 */ jal set_transition_stencil_alpha /* CEAD8 801383D8 0000282D */ daddu $a1, $zero, $zero /* CEADC 801383DC 24110004 */ addiu $s1, $zero, 4 /* CEAE0 801383E0 0804E11B */ j .L8013846C @@ -101,13 +101,13 @@ glabel L801383E8_CEAE8 /* CEAF4 801383F4 02A0A02D */ daddu $s4, $s5, $zero /* CEAF8 801383F8 02A0982D */ daddu $s3, $s5, $zero /* CEAFC 801383FC 24110005 */ addiu $s1, $zero, 5 -/* CEB00 80138400 0C04E035 */ jal func_801380D4 +/* CEB00 80138400 0C04E035 */ jal set_transition_stencil_alpha /* CEB04 80138404 24120007 */ addiu $s2, $zero, 7 /* CEB08 80138408 0804E11B */ j .L8013846C /* CEB0C 8013840C 00000000 */ nop glabel L80138410_CEB10 /* CEB10 80138410 0000202D */ daddu $a0, $zero, $zero -/* CEB14 80138414 0C04E035 */ jal func_801380D4 +/* CEB14 80138414 0C04E035 */ jal set_transition_stencil_alpha /* CEB18 80138418 0000282D */ daddu $a1, $zero, $zero /* CEB1C 8013841C 24110005 */ addiu $s1, $zero, 5 /* CEB20 80138420 0804E11B */ j .L8013846C @@ -116,15 +116,15 @@ glabel L80138428_CEB28 /* CEB28 80138428 0000202D */ daddu $a0, $zero, $zero /* CEB2C 8013842C 0080282D */ daddu $a1, $a0, $zero /* CEB30 80138430 2406000F */ addiu $a2, $zero, 0xf -/* CEB34 80138434 0C04DF93 */ jal func_80137E4C +/* CEB34 80138434 0C04DF93 */ jal set_transition_stencil_center /* CEB38 80138438 2407001C */ addiu $a3, $zero, 0x1c /* CEB3C 8013843C 0000202D */ daddu $a0, $zero, $zero /* CEB40 80138440 24050001 */ addiu $a1, $zero, 1 /* CEB44 80138444 24060131 */ addiu $a2, $zero, 0x131 -/* CEB48 80138448 0C04DF93 */ jal func_80137E4C +/* CEB48 80138448 0C04DF93 */ jal set_transition_stencil_center /* CEB4C 8013844C 2407009C */ addiu $a3, $zero, 0x9c /* CEB50 80138450 3C05437F */ lui $a1, 0x437f -/* CEB54 80138454 0C04DF62 */ jal func_80137D88 +/* CEB54 80138454 0C04DF62 */ jal set_transition_stencil_zoom_0 /* CEB58 80138458 2404000C */ addiu $a0, $zero, 0xc /* CEB5C 8013845C 24020001 */ addiu $v0, $zero, 1 /* CEB60 80138460 240300FF */ addiu $v1, $zero, 0xff @@ -155,10 +155,10 @@ glabel L80138428_CEB28 /* CEBC0 801384C0 00A22823 */ subu $a1, $a1, $v0 /* CEBC4 801384C4 30A500FF */ andi $a1, $a1, 0xff /* CEBC8 801384C8 00A0302D */ daddu $a2, $a1, $zero -/* CEBCC 801384CC 0C04DF84 */ jal func_80137E10 +/* CEBCC 801384CC 0C04DF84 */ jal set_transition_stencil_color /* CEBD0 801384D0 00A0382D */ daddu $a3, $a1, $zero /* CEBD4 801384D4 3C05437F */ lui $a1, 0x437f -/* CEBD8 801384D8 0C04DF62 */ jal func_80137D88 +/* CEBD8 801384D8 0C04DF62 */ jal set_transition_stencil_zoom_0 /* CEBDC 801384DC 0220202D */ daddu $a0, $s1, $zero /* CEBE0 801384E0 86C20000 */ lh $v0, ($s6) /* CEBE4 801384E4 96C30000 */ lhu $v1, ($s6) @@ -178,7 +178,7 @@ glabel L80138428_CEB28 /* CEC18 80138518 0200202D */ daddu $a0, $s0, $zero /* CEC1C 8013851C 0260282D */ daddu $a1, $s3, $zero /* CEC20 80138520 0280302D */ daddu $a2, $s4, $zero -/* CEC24 80138524 0C04DF84 */ jal func_80137E10 +/* CEC24 80138524 0C04DF84 */ jal set_transition_stencil_color /* CEC28 80138528 02A0382D */ daddu $a3, $s5, $zero /* CEC2C 8013852C 1600000A */ bnez $s0, .L80138558 /* CEC30 80138530 00000000 */ nop @@ -187,7 +187,7 @@ glabel L80138428_CEB28 /* CEC3C 8013853C 00000000 */ nop /* CEC40 80138540 46800020 */ cvt.s.w $f0, $f0 /* CEC44 80138544 44050000 */ mfc1 $a1, $f0 -/* CEC48 80138548 0C04DF62 */ jal func_80137D88 +/* CEC48 80138548 0C04DF62 */ jal set_transition_stencil_zoom_0 /* CEC4C 8013854C 0220202D */ daddu $a0, $s1, $zero /* CEC50 80138550 0804E15E */ j .L80138578 /* CEC54 80138554 240400FF */ addiu $a0, $zero, 0xff @@ -197,7 +197,7 @@ glabel L80138428_CEB28 /* CEC60 80138560 00000000 */ nop /* CEC64 80138564 46800020 */ cvt.s.w $f0, $f0 /* CEC68 80138568 44050000 */ mfc1 $a1, $f0 -/* CEC6C 8013856C 0C04DF69 */ jal func_80137DA4 +/* CEC6C 8013856C 0C04DF69 */ jal set_transition_stencil_zoom_1 /* CEC70 80138570 0220202D */ daddu $a0, $s1, $zero /* CEC74 80138574 240400FF */ addiu $a0, $zero, 0xff .L80138578: diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s b/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s index d3c9da62ac..a081562b0c 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s @@ -26,7 +26,7 @@ glabel L80138624_CED24 /* CED24 80138624 0000202D */ daddu $a0, $zero, $zero /* CED28 80138628 240500D0 */ addiu $a1, $zero, 0xd0 /* CED2C 8013862C 00A0302D */ daddu $a2, $a1, $zero -/* CED30 80138630 0C04DF84 */ jal func_80137E10 +/* CED30 80138630 0C04DF84 */ jal set_transition_stencil_color /* CED34 80138634 00A0382D */ daddu $a3, $a1, $zero /* CED38 80138638 0804E1B2 */ j .L801386C8 /* CED3C 8013863C 24100032 */ addiu $s0, $zero, 0x32 @@ -56,12 +56,12 @@ glabel L80138680_CED80 /* CED80 80138680 0000202D */ daddu $a0, $zero, $zero /* CED84 80138684 0080282D */ daddu $a1, $a0, $zero /* CED88 80138688 2406000F */ addiu $a2, $zero, 0xf -/* CED8C 8013868C 0C04DF93 */ jal func_80137E4C +/* CED8C 8013868C 0C04DF93 */ jal set_transition_stencil_center /* CED90 80138690 2407001C */ addiu $a3, $zero, 0x1c /* CED94 80138694 0000202D */ daddu $a0, $zero, $zero /* CED98 80138698 24050001 */ addiu $a1, $zero, 1 /* CED9C 8013869C 24060131 */ addiu $a2, $zero, 0x131 -/* CEDA0 801386A0 0C04DF93 */ jal func_80137E4C +/* CEDA0 801386A0 0C04DF93 */ jal set_transition_stencil_center /* CEDA4 801386A4 2407009C */ addiu $a3, $zero, 0x9c /* CEDA8 801386A8 86420000 */ lh $v0, ($s2) /* CEDAC 801386AC 2404000C */ addiu $a0, $zero, 0xc @@ -69,7 +69,7 @@ glabel L80138680_CED80 /* CEDB4 801386B4 00000000 */ nop /* CEDB8 801386B8 46800020 */ cvt.s.w $f0, $f0 /* CEDBC 801386BC 44050000 */ mfc1 $a1, $f0 -/* CEDC0 801386C0 0C04DF62 */ jal func_80137D88 +/* CEDC0 801386C0 0C04DF62 */ jal set_transition_stencil_zoom_0 /* CEDC4 801386C4 24100002 */ addiu $s0, $zero, 2 .L801386C8: /* CEDC8 801386C8 3C038015 */ lui $v1, %hi(D_8014C6F0) @@ -82,7 +82,7 @@ glabel L80138680_CED80 /* CEDE4 801386E4 00000000 */ nop /* CEDE8 801386E8 46800020 */ cvt.s.w $f0, $f0 /* CEDEC 801386EC 44050000 */ mfc1 $a1, $f0 -/* CEDF0 801386F0 0C04DF62 */ jal func_80137D88 +/* CEDF0 801386F0 0C04DF62 */ jal set_transition_stencil_zoom_0 /* CEDF4 801386F4 0220202D */ daddu $a0, $s1, $zero .L801386F8: /* CEDF8 801386F8 86420000 */ lh $v0, ($s2) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138220.s b/asm/nonmatchings/code_cd180_len_38f0/render_transition_stencil_lower.s similarity index 94% rename from asm/nonmatchings/code_cd180_len_38f0/func_80138220.s rename to asm/nonmatchings/code_cd180_len_38f0/render_transition_stencil_lower.s index 456ff7b67d..6dd8471ee2 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138220.s +++ b/asm/nonmatchings/code_cd180_len_38f0/render_transition_stencil_lower.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80138220 +glabel render_transition_stencil_lower /* CE920 80138220 27BDFFE8 */ addiu $sp, $sp, -0x18 /* CE924 80138224 3C048015 */ lui $a0, %hi(D_80156908) /* CE928 80138228 24846908 */ addiu $a0, $a0, %lo(D_80156908) @@ -29,7 +29,7 @@ glabel func_80138220 /* CE980 80138280 44051000 */ mfc1 $a1, $f2 /* CE984 80138284 3C068016 */ lui $a2, %hi(D_8015C7A8) /* CE988 80138288 24C6C7A8 */ addiu $a2, $a2, %lo(D_8015C7A8) -/* CE98C 8013828C 0C04DAA0 */ jal func_80136A80 +/* CE98C 8013828C 0C04DAA0 */ jal _render_transition_stencil /* CE990 80138290 00000000 */ nop .L80138294: /* CE994 80138294 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_801381A0.s b/asm/nonmatchings/code_cd180_len_38f0/render_transition_stencil_upper.s similarity index 94% rename from asm/nonmatchings/code_cd180_len_38f0/func_801381A0.s rename to asm/nonmatchings/code_cd180_len_38f0/render_transition_stencil_upper.s index 3febb18d80..1e9c747815 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_801381A0.s +++ b/asm/nonmatchings/code_cd180_len_38f0/render_transition_stencil_upper.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_801381A0 +glabel render_transition_stencil_upper /* CE8A0 801381A0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* CE8A4 801381A4 3C048015 */ lui $a0, %hi(D_80156900) /* CE8A8 801381A8 24846900 */ addiu $a0, $a0, %lo(D_80156900) @@ -29,7 +29,7 @@ glabel func_801381A0 /* CE900 80138200 44051000 */ mfc1 $a1, $f2 /* CE904 80138204 3C068016 */ lui $a2, %hi(D_8015C790) /* CE908 80138208 24C6C790 */ addiu $a2, $a2, %lo(D_8015C790) -/* CE90C 8013820C 0C04DAA0 */ jal func_80136A80 +/* CE90C 8013820C 0C04DAA0 */ jal _render_transition_stencil /* CE910 80138210 00000000 */ nop .L80138214: /* CE914 80138214 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_801380D4.s b/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_alpha.s similarity index 95% rename from asm/nonmatchings/code_cd180_len_38f0/func_801380D4.s rename to asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_alpha.s index 4135f04081..1ab9c3a861 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_801380D4.s +++ b/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_alpha.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_801380D4 +glabel set_transition_stencil_alpha /* CE7D4 801380D4 44850000 */ mtc1 $a1, $f0 /* CE7D8 801380D8 28820002 */ slti $v0, $a0, 2 /* CE7DC 801380DC 10400008 */ beqz $v0, .L80138100 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137E4C.s b/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_center.s similarity index 97% rename from asm/nonmatchings/code_cd180_len_38f0/func_80137E4C.s rename to asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_center.s index 792d7e40d2..dfa1350284 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137E4C.s +++ b/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_center.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80137E4C +glabel set_transition_stencil_center /* CE54C 80137E4C 28820002 */ slti $v0, $a0, 2 /* CE550 80137E50 10400019 */ beqz $v0, .L80137EB8 /* CE554 80137E54 00000000 */ nop diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137EC0.s b/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_center_worldpos.s similarity index 99% rename from asm/nonmatchings/code_cd180_len_38f0/func_80137EC0.s rename to asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_center_worldpos.s index 4ff7630a9e..e0099a9d3e 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137EC0.s +++ b/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_center_worldpos.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80137EC0 +glabel set_transition_stencil_center_worldpos /* CE5C0 80137EC0 27BDFFB0 */ addiu $sp, $sp, -0x50 /* CE5C4 80137EC4 AFB1003C */ sw $s1, 0x3c($sp) /* CE5C8 80137EC8 0080882D */ daddu $s1, $a0, $zero diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137E10.s b/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_color.s similarity index 96% rename from asm/nonmatchings/code_cd180_len_38f0/func_80137E10.s rename to asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_color.s index e8daed0539..9cb1c3b1fd 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137E10.s +++ b/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_color.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80137E10 +glabel set_transition_stencil_color /* CE510 80137E10 28820002 */ slti $v0, $a0, 2 /* CE514 80137E14 1040000B */ beqz $v0, .L80137E44 /* CE518 80137E18 00000000 */ nop diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137D88.s b/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_zoom_0.s similarity index 92% rename from asm/nonmatchings/code_cd180_len_38f0/func_80137D88.s rename to asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_zoom_0.s index 7b1d796573..7a22b26fa2 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137D88.s +++ b/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_zoom_0.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80137D88 +glabel set_transition_stencil_zoom_0 /* CE488 80137D88 308400FF */ andi $a0, $a0, 0xff /* CE48C 80137D8C 3C018015 */ lui $at, %hi(D_80156900) /* CE490 80137D90 AC246900 */ sw $a0, %lo(D_80156900)($at) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137DA4.s b/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_zoom_1.s similarity index 92% rename from asm/nonmatchings/code_cd180_len_38f0/func_80137DA4.s rename to asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_zoom_1.s index 7f533fd27b..7dc63421c5 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137DA4.s +++ b/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_zoom_1.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80137DA4 +glabel set_transition_stencil_zoom_1 /* CE4A4 80137DA4 308400FF */ andi $a0, $a0, 0xff /* CE4A8 80137DA8 3C018015 */ lui $at, %hi(D_80156908) /* CE4AC 80137DAC AC246908 */ sw $a0, %lo(D_80156908)($at) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s index 837a35a4ad..7942be50d6 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s @@ -370,7 +370,7 @@ glabel func_8013CFA8 /* D3C28 8013D528 01A0382D */ daddu $a3, $t5, $zero /* D3C2C 8013D52C AFB80020 */ sw $t8, 0x20($sp) /* D3C30 8013D530 AFB90024 */ sw $t9, 0x24($sp) -/* D3C34 8013D534 0C052071 */ jal func_801481C4 +/* D3C34 8013D534 0C052071 */ jal render_shaded_sprite /* D3C38 8013D538 AFA20018 */ sw $v0, 0x18($sp) /* D3C3C 8013D53C 8FB80020 */ lw $t8, 0x20($sp) /* D3C40 8013D540 0804F64E */ j .L8013D938 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s index 7bcf7b9870..849dcd8088 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s @@ -331,7 +331,7 @@ glabel func_8013DAB4 /* D46B0 8013DFB0 24E7FF00 */ addiu $a3, $a3, -0x100 /* D46B4 8013DFB4 AFAE0020 */ sw $t6, 0x20($sp) /* D46B8 8013DFB8 AFAF0024 */ sw $t7, 0x24($sp) -/* D46BC 8013DFBC 0C052071 */ jal func_801481C4 +/* D46BC 8013DFBC 0C052071 */ jal render_shaded_sprite /* D46C0 8013DFC0 AFA20018 */ sw $v0, 0x18($sp) /* D46C4 8013DFC4 8FAE0020 */ lw $t6, 0x20($sp) /* D46C8 8013DFC8 8FAF0024 */ lw $t7, 0x24($sp) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s index be5bef5019..ad2e66311a 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s @@ -275,7 +275,7 @@ glabel func_8013E2F0 /* D4E14 8013E714 AFA20010 */ sw $v0, 0x10($sp) /* D4E18 8013E718 8E620078 */ lw $v0, 0x78($s3) /* D4E1C 8013E71C 00A0302D */ daddu $a2, $a1, $zero -/* D4E20 8013E720 0C052071 */ jal func_801481C4 +/* D4E20 8013E720 0C052071 */ jal render_shaded_sprite /* D4E24 8013E724 AFA20018 */ sw $v0, 0x18($sp) /* D4E28 8013E728 0804FA25 */ j .L8013E894 /* D4E2C 8013E72C 3C07D838 */ lui $a3, 0xd838 diff --git a/asm/nonmatchings/code_d610_len_1330/func_80033394.s b/asm/nonmatchings/code_d610_len_1330/create_camera_lead_player_mtx.s similarity index 99% rename from asm/nonmatchings/code_d610_len_1330/func_80033394.s rename to asm/nonmatchings/code_d610_len_1330/create_camera_lead_player_mtx.s index dd03ea2ad9..83509343c0 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_80033394.s +++ b/asm/nonmatchings/code_d610_len_1330/create_camera_lead_player_mtx.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80033394 +glabel create_camera_lead_player_mtx /* E794 80033394 27BDFFD8 */ addiu $sp, $sp, -0x28 /* E798 80033398 AFB00010 */ sw $s0, 0x10($sp) /* E79C 8003339C 0080802D */ daddu $s0, $a0, $zero diff --git a/asm/nonmatchings/code_dbd70_len_700/create_trigger.s b/asm/nonmatchings/code_dbd70_len_700/create_trigger.s index 9a37a8ffd7..53c833994b 100644 --- a/asm/nonmatchings/code_dbd70_len_700/create_trigger.s +++ b/asm/nonmatchings/code_dbd70_len_700/create_trigger.s @@ -60,8 +60,8 @@ glabel create_trigger /* DBF30 80145830 8E22000C */ lw $v0, 0xc($s1) /* DBF34 80145834 14400004 */ bnez $v0, .L80145848 /* DBF38 80145838 ACC2000C */ sw $v0, 0xc($a2) -/* DBF3C 8014583C 3C028014 */ lui $v0, %hi(default_trigger_function_handler) -/* DBF40 80145840 24425670 */ addiu $v0, $v0, %lo(default_trigger_function_handler) +/* DBF3C 8014583C 3C028014 */ lui $v0, %hi(default_trigger_delegate) +/* DBF40 80145840 24425670 */ addiu $v0, $v0, %lo(default_trigger_delegate) /* DBF44 80145844 ACC2000C */ sw $v0, 0xc($a2) .L80145848: /* DBF48 80145848 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_dbd70_len_700/update_triggers.s b/asm/nonmatchings/code_dbd70_len_700/update_triggers.s index de74a3830d..32e93632ee 100644 --- a/asm/nonmatchings/code_dbd70_len_700/update_triggers.s +++ b/asm/nonmatchings/code_dbd70_len_700/update_triggers.s @@ -75,7 +75,7 @@ glabel update_triggers /* DC060 80145960 8E220008 */ lw $v0, 8($s1) /* DC064 80145964 5443007F */ bnel $v0, $v1, .L80145B64 /* DC068 80145968 26730001 */ addiu $s3, $s3, 1 -/* DC06C 8014596C 0C0394BE */ jal func_800E52F8 +/* DC06C 8014596C 0C0394BE */ jal can_player_interact /* DC070 80145970 00000000 */ nop /* DC074 80145974 5040007B */ beql $v0, $zero, .L80145B64 /* DC078 80145978 26730001 */ addiu $s3, $s3, 1 diff --git a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s b/asm/nonmatchings/code_dc470_len_14c0/enable_background_wave.s similarity index 99% rename from asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s rename to asm/nonmatchings/code_dc470_len_14c0/enable_background_wave.s index dfd7351765..1f6c540622 100644 --- a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s +++ b/asm/nonmatchings/code_dc470_len_14c0/enable_background_wave.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80145EC0 +glabel enable_background_wave /* DC5C0 80145EC0 27BDFF48 */ addiu $sp, $sp, -0xb8 /* DC5C4 80145EC4 AFB00080 */ sw $s0, 0x80($sp) /* DC5C8 80145EC8 0000802D */ daddu $s0, $zero, $zero @@ -243,20 +243,20 @@ glabel L801461A0_DC8A0 /* DC944 80146244 94700000 */ lhu $s0, ($v1) /* DC948 80146248 000528C3 */ sra $a1, $a1, 3 /* DC94C 8014624C 00102042 */ srl $a0, $s0, 1 -/* DC950 80146250 0C0517A6 */ jal func_80145E98 +/* DC950 80146250 0C0517A6 */ jal blend_background_channel /* DC954 80146254 3084001F */ andi $a0, $a0, 0x1f /* DC958 80146258 0040902D */ daddu $s2, $v0, $zero /* DC95C 8014625C 00102182 */ srl $a0, $s0, 6 /* DC960 80146260 3084001F */ andi $a0, $a0, 0x1f /* DC964 80146264 8FA5001C */ lw $a1, 0x1c($sp) /* DC968 80146268 8FA60024 */ lw $a2, 0x24($sp) -/* DC96C 8014626C 0C0517A6 */ jal func_80145E98 +/* DC96C 8014626C 0C0517A6 */ jal blend_background_channel /* DC970 80146270 000528C3 */ sra $a1, $a1, 3 /* DC974 80146274 0040882D */ daddu $s1, $v0, $zero /* DC978 80146278 001022C2 */ srl $a0, $s0, 0xb /* DC97C 8014627C 8FA50018 */ lw $a1, 0x18($sp) /* DC980 80146280 8FA60024 */ lw $a2, 0x24($sp) -/* DC984 80146284 0C0517A6 */ jal func_80145E98 +/* DC984 80146284 0C0517A6 */ jal blend_background_channel /* DC988 80146288 000528C3 */ sra $a1, $a1, 3 /* DC98C 8014628C 00121840 */ sll $v1, $s2, 1 /* DC990 80146290 00112180 */ sll $a0, $s1, 6 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s b/asm/nonmatchings/code_ddaf0_len_c50/basic_hidden_window_update.s similarity index 98% rename from asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s rename to asm/nonmatchings/code_ddaf0_len_c50/basic_hidden_window_update.s index 3b49ad62c7..9583e091ab 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/basic_hidden_window_update.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80147574 +glabel basic_hidden_window_update /* DDC74 80147574 3C028016 */ lui $v0, %hi(gUIPanels) /* DDC78 80147578 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* DDC7C 8014757C 00042140 */ sll $a0, $a0, 5 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s b/asm/nonmatchings/code_ddaf0_len_c50/basic_window_update.s similarity index 99% rename from asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s rename to asm/nonmatchings/code_ddaf0_len_c50/basic_window_update.s index b3e111cfe0..0e20eb4f60 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/basic_window_update.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80147474 +glabel basic_window_update /* DDB74 80147474 3C028016 */ lui $v0, %hi(gUIPanels) /* DDB78 80147478 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* DDB7C 8014747C 00042140 */ sll $a0, $a0, 5 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147650.s b/asm/nonmatchings/code_ddaf0_len_c50/main_menu_window_update.s similarity index 97% rename from asm/nonmatchings/code_ddaf0_len_c50/func_80147650.s rename to asm/nonmatchings/code_ddaf0_len_c50/main_menu_window_update.s index c0717df5e9..24da659523 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147650.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/main_menu_window_update.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80147650 +glabel main_menu_window_update /* DDD50 80147650 3C028016 */ lui $v0, %hi(gUIPanels) /* DDD54 80147654 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* DDD58 80147658 00042140 */ sll $a0, $a0, 5 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s b/asm/nonmatchings/code_ddaf0_len_c50/render_window_root.s similarity index 98% rename from asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s rename to asm/nonmatchings/code_ddaf0_len_c50/render_window_root.s index 49d380a089..5844baae0d 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/render_window_root.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80147AC4 +glabel render_window_root /* DE1C4 80147AC4 27BDFED0 */ addiu $sp, $sp, -0x130 /* DE1C8 80147AC8 27A20020 */ addiu $v0, $sp, 0x20 /* DE1CC 80147ACC 2404FFFF */ addiu $a0, $zero, -1 @@ -126,7 +126,7 @@ glabel func_80147AC4 /* DE39C 80147C9C AFA00010 */ sw $zero, 0x10($sp) /* DE3A0 80147CA0 AFA20014 */ sw $v0, 0x14($sp) /* DE3A4 80147CA4 AFA00018 */ sw $zero, 0x18($sp) -/* DE3A8 80147CA8 0C051DA6 */ jal func_80147698 +/* DE3A8 80147CA8 0C051DA6 */ jal render_windows /* DE3AC 80147CAC AFA0001C */ sw $zero, 0x1c($sp) /* DE3B0 80147CB0 8FBF012C */ lw $ra, 0x12c($sp) /* DE3B4 80147CB4 8FB20128 */ lw $s2, 0x128($sp) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s b/asm/nonmatchings/code_ddaf0_len_c50/render_windows.s similarity index 99% rename from asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s rename to asm/nonmatchings/code_ddaf0_len_c50/render_windows.s index 56f6a79c97..477eead514 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/render_windows.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80147698 +glabel render_windows /* DDD98 80147698 27BDFF10 */ addiu $sp, $sp, -0xf0 /* DDD9C 8014769C AFB700DC */ sw $s7, 0xdc($sp) /* DDDA0 801476A0 00A0B82D */ daddu $s7, $a1, $zero @@ -86,7 +86,7 @@ glabel func_80147698 /* DDED8 801477D8 10400004 */ beqz $v0, .L801477EC /* DDEDC 801477DC 00000000 */ nop /* DDEE0 801477E0 92250002 */ lbu $a1, 2($s1) -/* DDEE4 801477E4 0C051F5C */ jal func_80147D70 +/* DDEE4 801477E4 0C051F5C */ jal update_window_hierarchy /* DDEE8 801477E8 0240202D */ daddu $a0, $s2, $zero .L801477EC: /* DDEEC 801477EC 92020000 */ lbu $v0, ($s0) @@ -262,7 +262,7 @@ glabel func_80147698 /* DE16C 80147A6C 8FA200B4 */ lw $v0, 0xb4($sp) /* DE170 80147A70 0240282D */ daddu $a1, $s2, $zero /* DE174 80147A74 AFB0001C */ sw $s0, 0x1c($sp) -/* DE178 80147A78 0C051DA6 */ jal func_80147698 +/* DE178 80147A78 0C051DA6 */ jal render_windows /* DE17C 80147A7C AFA20018 */ sw $v0, 0x18($sp) /* DE180 80147A80 26D60001 */ addiu $s6, $s6, 1 .L80147A84: diff --git a/asm/nonmatchings/code_ddaf0_len_c50/set_ui_panel_properties.s b/asm/nonmatchings/code_ddaf0_len_c50/set_window_properties.s similarity index 96% rename from asm/nonmatchings/code_ddaf0_len_c50/set_ui_panel_properties.s rename to asm/nonmatchings/code_ddaf0_len_c50/set_window_properties.s index 23d07dbf69..5cdd7d6481 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/set_ui_panel_properties.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/set_window_properties.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel set_ui_panel_properties +glabel set_window_properties /* DE3C8 80147CC8 27BDFFE0 */ addiu $sp, $sp, -0x20 /* DE3CC 80147CCC 0080582D */ daddu $t3, $a0, $zero /* DE3D0 80147CD0 3C0A8016 */ lui $t2, %hi(gUIPanels) @@ -37,7 +37,7 @@ glabel set_ui_panel_properties /* DE448 80147D48 A0620000 */ sb $v0, ($v1) .L80147D4C: /* DE44C 80147D4C 0160202D */ daddu $a0, $t3, $zero -/* DE450 80147D50 0C051F5C */ jal func_80147D70 +/* DE450 80147D50 0C051F5C */ jal update_window_hierarchy /* DE454 80147D54 30A500FF */ andi $a1, $a1, 0xff /* DE458 80147D58 A2110002 */ sb $s1, 2($s0) /* DE45C 80147D5C 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s b/asm/nonmatchings/code_ddaf0_len_c50/set_windows_visible.s similarity index 98% rename from asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s rename to asm/nonmatchings/code_ddaf0_len_c50/set_windows_visible.s index dbec6e3d41..87363aaced 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/set_windows_visible.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80147EC4 +glabel set_windows_visible /* DE5C4 80147EC4 3C068016 */ lui $a2, %hi(gUIPanels) /* DE5C8 80147EC8 24C69D50 */ addiu $a2, $a2, %lo(gUIPanels) /* DE5CC 80147ECC 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s b/asm/nonmatchings/code_ddaf0_len_c50/setup_pause_menu_tab.s similarity index 96% rename from asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s rename to asm/nonmatchings/code_ddaf0_len_c50/setup_pause_menu_tab.s index b0c58d843a..3c84caadc2 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/setup_pause_menu_tab.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80147F30 +glabel setup_pause_menu_tab /* DE630 80147F30 27BDFFB8 */ addiu $sp, $sp, -0x48 /* DE634 80147F34 AFB1002C */ sw $s1, 0x2c($sp) /* DE638 80147F38 0080882D */ daddu $s1, $a0, $zero @@ -35,7 +35,7 @@ glabel func_80147F30 /* DE6A4 80147FA4 8E02FFF4 */ lw $v0, -0xc($s0) /* DE6A8 80147FA8 AFA2001C */ sw $v0, 0x1c($sp) /* DE6AC 80147FAC 8202FFF8 */ lb $v0, -8($s0) -/* DE6B0 80147FB0 0C051F32 */ jal set_ui_panel_properties +/* DE6B0 80147FB0 0C051F32 */ jal set_window_properties /* DE6B4 80147FB4 AFA20020 */ sw $v0, 0x20($sp) /* DE6B8 80147FB8 8E030004 */ lw $v1, 4($s0) /* DE6BC 80147FBC 10760005 */ beq $v1, $s6, .L80147FD4 @@ -47,7 +47,7 @@ glabel func_80147F30 .L80147FD4: /* DE6D4 80147FD4 82240000 */ lb $a0, ($s1) /* DE6D8 80147FD8 8E05FFFC */ lw $a1, -4($s0) -/* DE6DC 80147FDC 0C051F9F */ jal func_80147E7C +/* DE6DC 80147FDC 0C051F9F */ jal set_window_update /* DE6E0 80147FE0 26520001 */ addiu $s2, $s2, 1 /* DE6E4 80147FE4 82230000 */ lb $v1, ($s1) /* DE6E8 80147FE8 92040000 */ lbu $a0, ($s0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s b/asm/nonmatchings/code_ddaf0_len_c50/update_window_hierarchy.s similarity index 99% rename from asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s rename to asm/nonmatchings/code_ddaf0_len_c50/update_window_hierarchy.s index 67d6c7f3e0..a9b07d27f1 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/update_window_hierarchy.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80147D70 +glabel update_window_hierarchy /* DE470 80147D70 30A200FF */ andi $v0, $a1, 0xff /* DE474 80147D74 2C420041 */ sltiu $v0, $v0, 0x41 /* DE478 80147D78 14400002 */ bnez $v0, .L80147D84 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s b/asm/nonmatchings/code_ddaf0_len_c50/update_windows.s similarity index 98% rename from asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s rename to asm/nonmatchings/code_ddaf0_len_c50/update_windows.s index 31ace8872e..15afb66b7c 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/update_windows.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80147414 +glabel update_windows /* DDB14 80147414 0000302D */ daddu $a2, $zero, $zero /* DDB18 80147418 3C058016 */ lui $a1, %hi(gUIPanels) /* DDB1C 8014741C 24A59D50 */ addiu $a1, $a1, %lo(gUIPanels) diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s b/asm/nonmatchings/code_de740_len_23f0/appendGfx_shaded_sprite.s similarity index 99% rename from asm/nonmatchings/code_de740_len_23f0/func_801489B8.s rename to asm/nonmatchings/code_de740_len_23f0/appendGfx_shaded_sprite.s index 5243a9b9d8..118e70a19c 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s +++ b/asm/nonmatchings/code_de740_len_23f0/appendGfx_shaded_sprite.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_801489B8 +glabel appendGfx_shaded_sprite /* DF0B8 801489B8 27BDFF90 */ addiu $sp, $sp, -0x70 /* DF0BC 801489BC F7B60048 */ sdc1 $f22, 0x48($sp) /* DF0C0 801489C0 C7B60088 */ lwc1 $f22, 0x88($sp) diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801481C4.s b/asm/nonmatchings/code_de740_len_23f0/render_shaded_sprite.s similarity index 99% rename from asm/nonmatchings/code_de740_len_23f0/func_801481C4.s rename to asm/nonmatchings/code_de740_len_23f0/render_shaded_sprite.s index d6c370bf5d..56ed9061d4 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801481C4.s +++ b/asm/nonmatchings/code_de740_len_23f0/render_shaded_sprite.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_801481C4 +glabel render_shaded_sprite /* DE8C4 801481C4 27BDFF08 */ addiu $sp, $sp, -0xf8 /* DE8C8 801481C8 AFB300AC */ sw $s3, 0xac($sp) /* DE8CC 801481CC 0080982D */ daddu $s3, $a0, $zero @@ -516,7 +516,7 @@ glabel func_801481C4 /* DF05C 8014895C 8FA70104 */ lw $a3, 0x104($sp) /* DF060 80148960 03C0302D */ daddu $a2, $fp, $zero /* DF064 80148964 AFB60040 */ sw $s6, 0x40($sp) -/* DF068 80148968 0C05226E */ jal func_801489B8 +/* DF068 80148968 0C05226E */ jal appendGfx_shaded_sprite /* DF06C 8014896C AFA2003C */ sw $v0, 0x3c($sp) /* DF070 80148970 8FBF00C4 */ lw $ra, 0xc4($sp) /* DF074 80148974 8FBE00C0 */ lw $fp, 0xc0($sp) diff --git a/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s b/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s index cab2c28592..355f70307b 100644 --- a/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s +++ b/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s @@ -83,7 +83,7 @@ glabel step_battle /* EE0C 80033A0C 00000000 */ nop /* EE10 80033A10 0C052010 */ jal func_80148040 /* EE14 80033A14 00000000 */ nop -/* EE18 80033A18 0C05177E */ jal func_80145DF8 +/* EE18 80033A18 0C05177E */ jal use_default_background_settings /* EE1C 80033A1C 00000000 */ nop /* EE20 80033A20 0C0482EC */ jal clear_entity_models /* EE24 80033A24 00000000 */ nop @@ -120,7 +120,7 @@ glabel step_battle /* EEA0 80033AA0 00000000 */ nop /* EEA4 80033AA4 0C09027D */ jal func_802409F4 /* EEA8 80033AA8 00000000 */ nop -/* EEAC 80033AAC 0C01CAF7 */ jal func_80072BDC +/* EEAC 80033AAC 0C01CAF7 */ jal load_battle_section /* EEB0 80033AB0 00000000 */ nop /* EEB4 80033AB4 3C04800F */ lui $a0, %hi(gPlayerStatusPtr) /* EEB8 80033AB8 8C847B30 */ lw $a0, %lo(gPlayerStatusPtr)($a0) @@ -145,7 +145,7 @@ glabel step_battle /* EF04 80033B04 0481000F */ bgez $a0, .L80033B44 /* EF08 80033B08 ACA20000 */ sw $v0, ($a1) .L80033B0C: -/* EF0C 80033B0C 0C00F949 */ jal func_8003E524 +/* EF0C 80033B0C 0C00F949 */ jal update_counters /* EF10 80033B10 00000000 */ nop /* EF14 80033B14 0C08F90E */ jal update_battle_state /* EF18 80033B18 00000000 */ nop @@ -153,7 +153,7 @@ glabel step_battle /* EF20 80033B20 00000000 */ nop /* EF24 80033B24 0C04C7BB */ jal update_item_entities /* EF28 80033B28 00000000 */ nop -/* EF2C 80033B2C 0C016754 */ jal func_80059D50 +/* EF2C 80033B2C 0C016754 */ jal update_effects /* EF30 80033B30 00000000 */ nop /* EF34 80033B34 0C04599D */ jal func_80116674 /* EF38 80033B38 00000000 */ nop diff --git a/asm/nonmatchings/code_f270_len_1190/begin_state_logos.s b/asm/nonmatchings/code_f270_len_1190/begin_state_logos.s index 02f20e2622..e97313b535 100644 --- a/asm/nonmatchings/code_f270_len_1190/begin_state_logos.s +++ b/asm/nonmatchings/code_f270_len_1190/begin_state_logos.s @@ -122,11 +122,11 @@ glabel begin_state_logos /* F444 80034044 00000000 */ nop /* F448 80034048 0C050440 */ jal func_80141100 /* F44C 8003404C 00000000 */ nop -/* F450 80034050 0C05177E */ jal func_80145DF8 +/* F450 80034050 0C05177E */ jal use_default_background_settings /* F454 80034054 00000000 */ nop /* F458 80034058 0C04432E */ jal clear_entity_data /* F45C 8003405C 24040001 */ addiu $a0, $zero, 1 -/* F460 80034060 0C016727 */ jal func_80059C9C +/* F460 80034060 0C016727 */ jal clear_effect_data /* F464 80034064 00000000 */ nop /* F468 80034068 3C03800A */ lui $v1, %hi(D_8009A650) /* F46C 8003406C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) diff --git a/asm/nonmatchings/code_f270_len_1190/begin_state_pause_menu.s b/asm/nonmatchings/code_f270_len_1190/begin_state_pause_menu.s index eabdd30a7d..0a8f6b59bf 100644 --- a/asm/nonmatchings/code_f270_len_1190/begin_state_pause_menu.s +++ b/asm/nonmatchings/code_f270_len_1190/begin_state_pause_menu.s @@ -12,7 +12,7 @@ glabel begin_state_pause_menu /* FD5C 8003495C 00000000 */ nop /* FD60 80034960 0C009C22 */ jal func_80027088 /* FD64 80034964 24040003 */ addiu $a0, $zero, 3 -/* FD68 80034968 0C051FB1 */ jal func_80147EC4 +/* FD68 80034968 0C051FB1 */ jal set_windows_visible /* FD6C 8003496C 24040002 */ addiu $a0, $zero, 2 /* FD70 80034970 8FBF0010 */ lw $ra, 0x10($sp) /* FD74 80034974 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s b/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s index 8f7895c76f..c57520ea96 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s +++ b/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s @@ -165,7 +165,7 @@ glabel func_80034C3C /* 102A4 80034EA4 A462015C */ sh $v0, 0x15c($v1) /* 102A8 80034EA8 0C00EC6C */ jal func_8003B1B0 /* 102AC 80034EAC 00000000 */ nop -/* 102B0 80034EB0 0C051FB1 */ jal func_80147EC4 +/* 102B0 80034EB0 0C051FB1 */ jal set_windows_visible /* 102B4 80034EB4 0000202D */ daddu $a0, $zero, $zero /* 102B8 80034EB8 0C03A631 */ jal func_800E98C4 /* 102BC 80034EBC 00000000 */ nop @@ -184,13 +184,13 @@ glabel func_80034C3C /* 102F0 80034EF0 A082000F */ sb $v0, 0xf($a0) /* 102F4 80034EF4 3C01802E */ lui $at, %hi(D_802D9D71) /* 102F8 80034EF8 A0239D71 */ sb $v1, %lo(D_802D9D71)($at) -/* 102FC 80034EFC 0C00F949 */ jal func_8003E524 +/* 102FC 80034EFC 0C00F949 */ jal update_counters /* 10300 80034F00 00000000 */ nop /* 10304 80034F04 0C00E64C */ jal update_npcs /* 10308 80034F08 00000000 */ nop /* 1030C 80034F0C 0C037DD0 */ jal update_player /* 10310 80034F10 00000000 */ nop -/* 10314 80034F14 0C016754 */ jal func_80059D50 +/* 10314 80034F14 0C016754 */ jal update_effects /* 10318 80034F18 00000000 */ nop /* 1031C 80034F1C 3C03800A */ lui $v1, %hi(D_800A0922) /* 10320 80034F20 24630922 */ addiu $v1, $v1, %lo(D_800A0922) @@ -203,13 +203,13 @@ glabel func_80034C3C /* 1033C 80034F3C 0800D3F6 */ j .L80034FD8 /* 10340 80034F40 00000000 */ nop .L80034F44: -/* 10344 80034F44 0C00F949 */ jal func_8003E524 +/* 10344 80034F44 0C00F949 */ jal update_counters /* 10348 80034F48 00000000 */ nop /* 1034C 80034F4C 0C00E64C */ jal update_npcs /* 10350 80034F50 00000000 */ nop /* 10354 80034F54 0C037DD0 */ jal update_player /* 10358 80034F58 00000000 */ nop -/* 1035C 80034F5C 0C016754 */ jal func_80059D50 +/* 1035C 80034F5C 0C016754 */ jal update_effects /* 10360 80034F60 00000000 */ nop /* 10364 80034F64 3C04800A */ lui $a0, %hi(D_800A0922) /* 10368 80034F68 24840922 */ addiu $a0, $a0, %lo(D_800A0922) @@ -230,13 +230,13 @@ glabel func_80034C3C .L80034FA0: /* 103A0 80034FA0 0C009C22 */ jal func_80027088 /* 103A4 80034FA4 0000202D */ daddu $a0, $zero, $zero -/* 103A8 80034FA8 0C00F949 */ jal func_8003E524 +/* 103A8 80034FA8 0C00F949 */ jal update_counters /* 103AC 80034FAC 00000000 */ nop /* 103B0 80034FB0 0C00E64C */ jal update_npcs /* 103B4 80034FB4 00000000 */ nop /* 103B8 80034FB8 0C037DD0 */ jal update_player /* 103BC 80034FBC 00000000 */ nop -/* 103C0 80034FC0 0C016754 */ jal func_80059D50 +/* 103C0 80034FC0 0C016754 */ jal update_effects /* 103C4 80034FC4 00000000 */ nop /* 103C8 80034FC8 0C038069 */ jal enable_player_input /* 103CC 80034FCC 00000000 */ nop diff --git a/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s b/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s index ed9e564cfa..ca62142488 100644 --- a/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s +++ b/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s @@ -16,13 +16,13 @@ glabel step_pause_menu /* FDA8 800349A8 0800D2F8 */ j .L80034BE0 /* FDAC 800349AC 00000000 */ nop .L800349B0: -/* FDB0 800349B0 0C00F949 */ jal func_8003E524 +/* FDB0 800349B0 0C00F949 */ jal update_counters /* FDB4 800349B4 00000000 */ nop /* FDB8 800349B8 0C00E64C */ jal update_npcs /* FDBC 800349BC 00000000 */ nop /* FDC0 800349C0 0C037DD0 */ jal update_player /* FDC4 800349C4 00000000 */ nop -/* FDC8 800349C8 0C016754 */ jal func_80059D50 +/* FDC8 800349C8 0C016754 */ jal update_effects /* FDCC 800349CC 00000000 */ nop /* FDD0 800349D0 3C02800A */ lui $v0, %hi(D_8009A658) /* FDD4 800349D4 8C42A658 */ lw $v0, %lo(D_8009A658)($v0) @@ -89,7 +89,7 @@ glabel step_pause_menu /* FEC0 80034AC0 00000000 */ nop /* FEC4 80034AC4 0C052010 */ jal func_80148040 /* FEC8 80034AC8 00000000 */ nop -/* FECC 80034ACC 0C05177E */ jal func_80145DF8 +/* FECC 80034ACC 0C05177E */ jal use_default_background_settings /* FED0 80034AD0 00000000 */ nop /* FED4 80034AD4 0C0482EC */ jal clear_entity_models /* FED8 80034AD8 00000000 */ nop diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D6420.s b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D6420.s index 695e1d1167..77a1256743 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D6420.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D6420.s @@ -31,7 +31,7 @@ glabel func_802D6420 /* FAE30 802D6480 00000000 */ nop /* FAE34 802D6484 0C03BD8A */ jal func_800EF628 /* FAE38 802D6488 00000000 */ nop -/* FAE3C 802D648C 0C03A5EE */ jal func_800E97B8 +/* FAE3C 802D648C 0C03A5EE */ jal close_status_menu /* FAE40 802D6490 00000000 */ nop /* FAE44 802D6494 0000482D */ daddu $t1, $zero, $zero /* FAE48 802D6498 0120402D */ daddu $t0, $t1, $zero diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D663C.s b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D663C.s index 4eb1b71905..08c7829a7d 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D663C.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D663C.s @@ -31,7 +31,7 @@ glabel func_802D663C /* FB04C 802D669C 00000000 */ nop /* FB050 802D66A0 0C03BD8A */ jal func_800EF628 /* FB054 802D66A4 00000000 */ nop -/* FB058 802D66A8 0C03A5EE */ jal func_800E97B8 +/* FB058 802D66A8 0C03A5EE */ jal close_status_menu /* FB05C 802D66AC 00000000 */ nop /* FB060 802D66B0 0000482D */ daddu $t1, $zero, $zero /* FB064 802D66B4 0120402D */ daddu $t0, $t1, $zero diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s index ce4e83369f..4ebad3da43 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s @@ -255,7 +255,7 @@ glabel func_802DC008 /* FF4C4 802DC3D4 8FA40050 */ lw $a0, 0x50($sp) /* FF4C8 802DC3D8 0000282D */ daddu $a1, $zero, $zero /* FF4CC 802DC3DC 00A0302D */ daddu $a2, $a1, $zero -/* FF4D0 802DC3E0 0C052071 */ jal func_801481C4 +/* FF4D0 802DC3E0 0C052071 */ jal render_shaded_sprite /* FF4D4 802DC3E4 01A0382D */ daddu $a3, $t5, $zero /* FF4D8 802DC3E8 080B71E2 */ j .L802DC788 /* FF4DC 802DC3EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s index 7308b9e791..2cb20f73ee 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s @@ -11,7 +11,7 @@ glabel func_8006F890 /* 4ACA8 8006F8A8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4ACAC 8006F8AC E7B00028 */ swc1 $f16, 0x28($sp) /* 4ACB0 8006F8B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4ACB4 8006F8B4 0C016959 */ jal play_effect +/* 4ACB4 8006F8B4 0C016959 */ jal load_effect /* 4ACB8 8006F8B8 24040000 */ addiu $a0, $zero, 0 /* 4ACBC 8006F8BC 8FA40010 */ lw $a0, 0x10($sp) /* 4ACC0 8006F8C0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s index a87db96ed2..3563897e10 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s @@ -11,7 +11,7 @@ glabel func_8006F8F0 /* 4AD08 8006F908 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4AD0C 8006F90C E7B00028 */ swc1 $f16, 0x28($sp) /* 4AD10 8006F910 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AD14 8006F914 0C016959 */ jal play_effect +/* 4AD14 8006F914 0C016959 */ jal load_effect /* 4AD18 8006F918 24040001 */ addiu $a0, $zero, 1 /* 4AD1C 8006F91C 8FA40010 */ lw $a0, 0x10($sp) /* 4AD20 8006F920 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F950.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F950.s index d4f9bb7eb3..5519a5dc56 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F950.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F950.s @@ -11,7 +11,7 @@ glabel func_8006F950 /* 4AD68 8006F968 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4AD6C 8006F96C E7B00028 */ swc1 $f16, 0x28($sp) /* 4AD70 8006F970 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AD74 8006F974 0C016959 */ jal play_effect +/* 4AD74 8006F974 0C016959 */ jal load_effect /* 4AD78 8006F978 24040002 */ addiu $a0, $zero, 2 /* 4AD7C 8006F97C 8FA40010 */ lw $a0, 0x10($sp) /* 4AD80 8006F980 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F9B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F9B0.s index 45b47e5a0a..b165ec1762 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F9B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F9B0.s @@ -11,7 +11,7 @@ glabel func_8006F9B0 /* 4ADC8 8006F9C8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4ADCC 8006F9CC E7B00028 */ swc1 $f16, 0x28($sp) /* 4ADD0 8006F9D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4ADD4 8006F9D4 0C016959 */ jal play_effect +/* 4ADD4 8006F9D4 0C016959 */ jal load_effect /* 4ADD8 8006F9D8 24040003 */ addiu $a0, $zero, 3 /* 4ADDC 8006F9DC 8FA40010 */ lw $a0, 0x10($sp) /* 4ADE0 8006F9E0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA10.s index 88696d617f..fee7e34d60 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA10.s @@ -11,7 +11,7 @@ glabel func_8006FA10 /* 4AE28 8006FA28 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4AE2C 8006FA2C E7B00028 */ swc1 $f16, 0x28($sp) /* 4AE30 8006FA30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AE34 8006FA34 0C016959 */ jal play_effect +/* 4AE34 8006FA34 0C016959 */ jal load_effect /* 4AE38 8006FA38 24040004 */ addiu $a0, $zero, 4 /* 4AE3C 8006FA3C 8FA40010 */ lw $a0, 0x10($sp) /* 4AE40 8006FA40 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA70.s index a32d3d2617..5379ed5f2b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA70.s @@ -11,7 +11,7 @@ glabel func_8006FA70 /* 4AE88 8006FA88 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4AE8C 8006FA8C E7B00028 */ swc1 $f16, 0x28($sp) /* 4AE90 8006FA90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AE94 8006FA94 0C016959 */ jal play_effect +/* 4AE94 8006FA94 0C016959 */ jal load_effect /* 4AE98 8006FA98 24040005 */ addiu $a0, $zero, 5 /* 4AE9C 8006FA9C 8FA40010 */ lw $a0, 0x10($sp) /* 4AEA0 8006FAA0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s index 5b5944cc71..0aea3ec69d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s @@ -11,7 +11,7 @@ glabel func_8006FB90 /* 4AFA8 8006FBA8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4AFAC 8006FBAC E7B00028 */ swc1 $f16, 0x28($sp) /* 4AFB0 8006FBB0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AFB4 8006FBB4 0C016959 */ jal play_effect +/* 4AFB4 8006FBB4 0C016959 */ jal load_effect /* 4AFB8 8006FBB8 24040008 */ addiu $a0, $zero, 8 /* 4AFBC 8006FBBC 8FA40010 */ lw $a0, 0x10($sp) /* 4AFC0 8006FBC0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s index bbee9640ba..b84fde51c5 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s @@ -11,7 +11,7 @@ glabel func_8006FBF0 /* 4B008 8006FC08 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B00C 8006FC0C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B010 8006FC10 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B014 8006FC14 0C016959 */ jal play_effect +/* 4B014 8006FC14 0C016959 */ jal load_effect /* 4B018 8006FC18 24040009 */ addiu $a0, $zero, 9 /* 4B01C 8006FC1C 8FA40010 */ lw $a0, 0x10($sp) /* 4B020 8006FC20 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s index e2e396766a..afb0773c50 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s @@ -11,7 +11,7 @@ glabel func_8006FC50 /* 4B068 8006FC68 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B06C 8006FC6C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B070 8006FC70 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B074 8006FC74 0C016959 */ jal play_effect +/* 4B074 8006FC74 0C016959 */ jal load_effect /* 4B078 8006FC78 2404000A */ addiu $a0, $zero, 0xa /* 4B07C 8006FC7C 8FA40010 */ lw $a0, 0x10($sp) /* 4B080 8006FC80 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s index 5238b89679..89d9a6f40d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s @@ -11,7 +11,7 @@ glabel func_8006FCB0 /* 4B0C8 8006FCC8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B0CC 8006FCCC E7B00028 */ swc1 $f16, 0x28($sp) /* 4B0D0 8006FCD0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B0D4 8006FCD4 0C016959 */ jal play_effect +/* 4B0D4 8006FCD4 0C016959 */ jal load_effect /* 4B0D8 8006FCD8 2404000B */ addiu $a0, $zero, 0xb /* 4B0DC 8006FCDC 8FA40010 */ lw $a0, 0x10($sp) /* 4B0E0 8006FCE0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s index cc42632ad5..4f1f7ef188 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s @@ -11,7 +11,7 @@ glabel func_8006FD10 /* 4B128 8006FD28 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B12C 8006FD2C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B130 8006FD30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B134 8006FD34 0C016959 */ jal play_effect +/* 4B134 8006FD34 0C016959 */ jal load_effect /* 4B138 8006FD38 2404000C */ addiu $a0, $zero, 0xc /* 4B13C 8006FD3C 8FA40010 */ lw $a0, 0x10($sp) /* 4B140 8006FD40 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s index 451fecec2a..ab602ea2a9 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s @@ -11,7 +11,7 @@ glabel func_8006FD70 /* 4B188 8006FD88 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B18C 8006FD8C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B190 8006FD90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B194 8006FD94 0C016959 */ jal play_effect +/* 4B194 8006FD94 0C016959 */ jal load_effect /* 4B198 8006FD98 2404000D */ addiu $a0, $zero, 0xd /* 4B19C 8006FD9C 8FA40010 */ lw $a0, 0x10($sp) /* 4B1A0 8006FDA0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s index 240fae707b..aa5ad391c1 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s @@ -11,7 +11,7 @@ glabel func_8006FDD0 /* 4B1E8 8006FDE8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B1EC 8006FDEC E7B00028 */ swc1 $f16, 0x28($sp) /* 4B1F0 8006FDF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B1F4 8006FDF4 0C016959 */ jal play_effect +/* 4B1F4 8006FDF4 0C016959 */ jal load_effect /* 4B1F8 8006FDF8 2404000E */ addiu $a0, $zero, 0xe /* 4B1FC 8006FDFC 8FA40010 */ lw $a0, 0x10($sp) /* 4B200 8006FE00 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s index 90c4ba213b..db9fdf2b70 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s @@ -11,7 +11,7 @@ glabel func_8006FE30 /* 4B248 8006FE48 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B24C 8006FE4C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B250 8006FE50 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B254 8006FE54 0C016959 */ jal play_effect +/* 4B254 8006FE54 0C016959 */ jal load_effect /* 4B258 8006FE58 2404000F */ addiu $a0, $zero, 0xf /* 4B25C 8006FE5C 8FA40010 */ lw $a0, 0x10($sp) /* 4B260 8006FE60 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s index 0bb938b2dc..8e594edb8e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s @@ -11,7 +11,7 @@ glabel func_8006FEF0 /* 4B308 8006FF08 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B30C 8006FF0C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B310 8006FF10 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B314 8006FF14 0C016959 */ jal play_effect +/* 4B314 8006FF14 0C016959 */ jal load_effect /* 4B318 8006FF18 24040011 */ addiu $a0, $zero, 0x11 /* 4B31C 8006FF1C 8FA40010 */ lw $a0, 0x10($sp) /* 4B320 8006FF20 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s index 482847ac90..51f52a0b8a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s @@ -11,7 +11,7 @@ glabel func_8006FF50 /* 4B368 8006FF68 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B36C 8006FF6C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B370 8006FF70 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B374 8006FF74 0C016959 */ jal play_effect +/* 4B374 8006FF74 0C016959 */ jal load_effect /* 4B378 8006FF78 24040012 */ addiu $a0, $zero, 0x12 /* 4B37C 8006FF7C 8FA40010 */ lw $a0, 0x10($sp) /* 4B380 8006FF80 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s index 397a8c29b4..f83d6bcda1 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s @@ -11,7 +11,7 @@ glabel func_8006FFB0 /* 4B3C8 8006FFC8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B3CC 8006FFCC E7B00028 */ swc1 $f16, 0x28($sp) /* 4B3D0 8006FFD0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B3D4 8006FFD4 0C016959 */ jal play_effect +/* 4B3D4 8006FFD4 0C016959 */ jal load_effect /* 4B3D8 8006FFD8 24040013 */ addiu $a0, $zero, 0x13 /* 4B3DC 8006FFDC 8FA40010 */ lw $a0, 0x10($sp) /* 4B3E0 8006FFE0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s index c659eafe84..5c175f3f83 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s @@ -11,7 +11,7 @@ glabel func_80070010 /* 4B428 80070028 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B42C 8007002C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B430 80070030 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B434 80070034 0C016959 */ jal play_effect +/* 4B434 80070034 0C016959 */ jal load_effect /* 4B438 80070038 24040014 */ addiu $a0, $zero, 0x14 /* 4B43C 8007003C 8FA40010 */ lw $a0, 0x10($sp) /* 4B440 80070040 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s index 1082ec4808..71c71e5cbf 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s @@ -11,7 +11,7 @@ glabel func_80070070 /* 4B488 80070088 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B48C 8007008C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B490 80070090 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B494 80070094 0C016959 */ jal play_effect +/* 4B494 80070094 0C016959 */ jal load_effect /* 4B498 80070098 24040015 */ addiu $a0, $zero, 0x15 /* 4B49C 8007009C 8FA40010 */ lw $a0, 0x10($sp) /* 4B4A0 800700A0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s index 5f84066dbb..a010cb1670 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s @@ -11,7 +11,7 @@ glabel func_800700D0 /* 4B4E8 800700E8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B4EC 800700EC E7B00028 */ swc1 $f16, 0x28($sp) /* 4B4F0 800700F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B4F4 800700F4 0C016959 */ jal play_effect +/* 4B4F4 800700F4 0C016959 */ jal load_effect /* 4B4F8 800700F8 24040016 */ addiu $a0, $zero, 0x16 /* 4B4FC 800700FC 8FA40010 */ lw $a0, 0x10($sp) /* 4B500 80070100 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s index c638658332..d5cb45a16d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s @@ -11,7 +11,7 @@ glabel func_80070130 /* 4B548 80070148 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B54C 8007014C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B550 80070150 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B554 80070154 0C016959 */ jal play_effect +/* 4B554 80070154 0C016959 */ jal load_effect /* 4B558 80070158 24040017 */ addiu $a0, $zero, 0x17 /* 4B55C 8007015C 8FA40010 */ lw $a0, 0x10($sp) /* 4B560 80070160 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s index 4b2f229217..820e36128b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s @@ -11,7 +11,7 @@ glabel func_80070190 /* 4B5A8 800701A8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B5AC 800701AC E7B00028 */ swc1 $f16, 0x28($sp) /* 4B5B0 800701B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B5B4 800701B4 0C016959 */ jal play_effect +/* 4B5B4 800701B4 0C016959 */ jal load_effect /* 4B5B8 800701B8 24040018 */ addiu $a0, $zero, 0x18 /* 4B5BC 800701BC 8FA40010 */ lw $a0, 0x10($sp) /* 4B5C0 800701C0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s index d18cdced15..a64408c665 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s @@ -11,7 +11,7 @@ glabel func_800701F0 /* 4B608 80070208 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B60C 8007020C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B610 80070210 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B614 80070214 0C016959 */ jal play_effect +/* 4B614 80070214 0C016959 */ jal load_effect /* 4B618 80070218 24040019 */ addiu $a0, $zero, 0x19 /* 4B61C 8007021C 8FA40010 */ lw $a0, 0x10($sp) /* 4B620 80070220 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s index 1b8ee2262a..1c0121c268 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s @@ -11,7 +11,7 @@ glabel func_80070250 /* 4B668 80070268 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B66C 8007026C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B670 80070270 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B674 80070274 0C016959 */ jal play_effect +/* 4B674 80070274 0C016959 */ jal load_effect /* 4B678 80070278 2404001A */ addiu $a0, $zero, 0x1a /* 4B67C 8007027C 8FA40010 */ lw $a0, 0x10($sp) /* 4B680 80070280 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s index 9ef59a1a81..f8cca97a60 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s @@ -11,7 +11,7 @@ glabel func_800702B0 /* 4B6C8 800702C8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B6CC 800702CC E7B00028 */ swc1 $f16, 0x28($sp) /* 4B6D0 800702D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B6D4 800702D4 0C016959 */ jal play_effect +/* 4B6D4 800702D4 0C016959 */ jal load_effect /* 4B6D8 800702D8 2404001B */ addiu $a0, $zero, 0x1b /* 4B6DC 800702DC 8FA40010 */ lw $a0, 0x10($sp) /* 4B6E0 800702E0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s index d5ece2c775..f4fd01c7a8 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s @@ -11,7 +11,7 @@ glabel func_80070310 /* 4B728 80070328 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B72C 8007032C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B730 80070330 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B734 80070334 0C016959 */ jal play_effect +/* 4B734 80070334 0C016959 */ jal load_effect /* 4B738 80070338 2404001C */ addiu $a0, $zero, 0x1c /* 4B73C 8007033C 8FA40010 */ lw $a0, 0x10($sp) /* 4B740 80070340 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s index c12f4fe344..170da30bbb 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s @@ -11,7 +11,7 @@ glabel func_80070370 /* 4B788 80070388 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B78C 8007038C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B790 80070390 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B794 80070394 0C016959 */ jal play_effect +/* 4B794 80070394 0C016959 */ jal load_effect /* 4B798 80070398 2404001D */ addiu $a0, $zero, 0x1d /* 4B79C 8007039C 8FA40010 */ lw $a0, 0x10($sp) /* 4B7A0 800703A0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s index 6c7b0e03df..77984f0ade 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s @@ -11,7 +11,7 @@ glabel func_800703D0 /* 4B7E8 800703E8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B7EC 800703EC E7B00028 */ swc1 $f16, 0x28($sp) /* 4B7F0 800703F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B7F4 800703F4 0C016959 */ jal play_effect +/* 4B7F4 800703F4 0C016959 */ jal load_effect /* 4B7F8 800703F8 2404001E */ addiu $a0, $zero, 0x1e /* 4B7FC 800703FC 8FA40010 */ lw $a0, 0x10($sp) /* 4B800 80070400 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s index 0e5d905eef..6c655270d3 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s @@ -11,7 +11,7 @@ glabel func_80070430 /* 4B848 80070448 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B84C 8007044C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B850 80070450 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B854 80070454 0C016959 */ jal play_effect +/* 4B854 80070454 0C016959 */ jal load_effect /* 4B858 80070458 2404001F */ addiu $a0, $zero, 0x1f /* 4B85C 8007045C 8FA40010 */ lw $a0, 0x10($sp) /* 4B860 80070460 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s index f210d25008..80e95ba293 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s @@ -11,7 +11,7 @@ glabel func_80070490 /* 4B8A8 800704A8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B8AC 800704AC E7B00028 */ swc1 $f16, 0x28($sp) /* 4B8B0 800704B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B8B4 800704B4 0C016959 */ jal play_effect +/* 4B8B4 800704B4 0C016959 */ jal load_effect /* 4B8B8 800704B8 24040020 */ addiu $a0, $zero, 0x20 /* 4B8BC 800704BC 8FA40010 */ lw $a0, 0x10($sp) /* 4B8C0 800704C0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s index 3c9a261f05..121454b92e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s @@ -11,7 +11,7 @@ glabel func_800704F0 /* 4B908 80070508 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B90C 8007050C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B910 80070510 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B914 80070514 0C016959 */ jal play_effect +/* 4B914 80070514 0C016959 */ jal load_effect /* 4B918 80070518 24040021 */ addiu $a0, $zero, 0x21 /* 4B91C 8007051C 8FA40010 */ lw $a0, 0x10($sp) /* 4B920 80070520 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s index ee1087c6fe..3acc7f3a01 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s @@ -11,7 +11,7 @@ glabel func_80070550 /* 4B968 80070568 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B96C 8007056C E7B00028 */ swc1 $f16, 0x28($sp) /* 4B970 80070570 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B974 80070574 0C016959 */ jal play_effect +/* 4B974 80070574 0C016959 */ jal load_effect /* 4B978 80070578 24040022 */ addiu $a0, $zero, 0x22 /* 4B97C 8007057C 8FA40010 */ lw $a0, 0x10($sp) /* 4B980 80070580 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s index c8125a0d99..89509aa5de 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s @@ -11,7 +11,7 @@ glabel func_800705B0 /* 4B9C8 800705C8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B9CC 800705CC E7B00028 */ swc1 $f16, 0x28($sp) /* 4B9D0 800705D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B9D4 800705D4 0C016959 */ jal play_effect +/* 4B9D4 800705D4 0C016959 */ jal load_effect /* 4B9D8 800705D8 24040023 */ addiu $a0, $zero, 0x23 /* 4B9DC 800705DC 8FA40010 */ lw $a0, 0x10($sp) /* 4B9E0 800705E0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s index 2b20772f4c..a139fd7731 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s @@ -11,7 +11,7 @@ glabel func_80070610 /* 4BA28 80070628 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BA2C 8007062C E7B00028 */ swc1 $f16, 0x28($sp) /* 4BA30 80070630 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BA34 80070634 0C016959 */ jal play_effect +/* 4BA34 80070634 0C016959 */ jal load_effect /* 4BA38 80070638 24040024 */ addiu $a0, $zero, 0x24 /* 4BA3C 8007063C 8FA40010 */ lw $a0, 0x10($sp) /* 4BA40 80070640 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s index 6acfd64ccc..8ef2b4d60c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s @@ -11,7 +11,7 @@ glabel func_80070670 /* 4BA88 80070688 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BA8C 8007068C E7B00028 */ swc1 $f16, 0x28($sp) /* 4BA90 80070690 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BA94 80070694 0C016959 */ jal play_effect +/* 4BA94 80070694 0C016959 */ jal load_effect /* 4BA98 80070698 24040025 */ addiu $a0, $zero, 0x25 /* 4BA9C 8007069C 8FA40010 */ lw $a0, 0x10($sp) /* 4BAA0 800706A0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s index 73696488b4..ab6518f52e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s @@ -11,7 +11,7 @@ glabel func_800706D0 /* 4BAE8 800706E8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BAEC 800706EC E7B00028 */ swc1 $f16, 0x28($sp) /* 4BAF0 800706F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BAF4 800706F4 0C016959 */ jal play_effect +/* 4BAF4 800706F4 0C016959 */ jal load_effect /* 4BAF8 800706F8 24040026 */ addiu $a0, $zero, 0x26 /* 4BAFC 800706FC 8FA40010 */ lw $a0, 0x10($sp) /* 4BB00 80070700 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s index b72ae039a4..9ba24cb371 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s @@ -11,7 +11,7 @@ glabel func_80070730 /* 4BB48 80070748 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BB4C 8007074C E7B00028 */ swc1 $f16, 0x28($sp) /* 4BB50 80070750 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BB54 80070754 0C016959 */ jal play_effect +/* 4BB54 80070754 0C016959 */ jal load_effect /* 4BB58 80070758 24040027 */ addiu $a0, $zero, 0x27 /* 4BB5C 8007075C 8FA40010 */ lw $a0, 0x10($sp) /* 4BB60 80070760 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070850.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070850.s index 465e4c3e32..c46410a75a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070850.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070850.s @@ -11,7 +11,7 @@ glabel func_80070850 /* 4BC68 80070868 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BC6C 8007086C E7B00028 */ swc1 $f16, 0x28($sp) /* 4BC70 80070870 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BC74 80070874 0C016959 */ jal play_effect +/* 4BC74 80070874 0C016959 */ jal load_effect /* 4BC78 80070878 2404002A */ addiu $a0, $zero, 0x2a /* 4BC7C 8007087C 8FA40010 */ lw $a0, 0x10($sp) /* 4BC80 80070880 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s index fc2360b763..b02fe5a9ad 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s @@ -11,7 +11,7 @@ glabel func_800708B0 /* 4BCC8 800708C8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BCCC 800708CC E7B00028 */ swc1 $f16, 0x28($sp) /* 4BCD0 800708D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BCD4 800708D4 0C016959 */ jal play_effect +/* 4BCD4 800708D4 0C016959 */ jal load_effect /* 4BCD8 800708D8 2404002B */ addiu $a0, $zero, 0x2b /* 4BCDC 800708DC 8FA40010 */ lw $a0, 0x10($sp) /* 4BCE0 800708E0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s index 16c5a7c137..f9ff10f17f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s @@ -11,7 +11,7 @@ glabel func_80070910 /* 4BD28 80070928 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BD2C 8007092C E7B00028 */ swc1 $f16, 0x28($sp) /* 4BD30 80070930 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BD34 80070934 0C016959 */ jal play_effect +/* 4BD34 80070934 0C016959 */ jal load_effect /* 4BD38 80070938 2404002C */ addiu $a0, $zero, 0x2c /* 4BD3C 8007093C 8FA40010 */ lw $a0, 0x10($sp) /* 4BD40 80070940 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s index 2bdecbae03..cfc8648280 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s @@ -11,7 +11,7 @@ glabel func_80070970 /* 4BD88 80070988 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BD8C 8007098C E7B00028 */ swc1 $f16, 0x28($sp) /* 4BD90 80070990 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BD94 80070994 0C016959 */ jal play_effect +/* 4BD94 80070994 0C016959 */ jal load_effect /* 4BD98 80070998 2404002D */ addiu $a0, $zero, 0x2d /* 4BD9C 8007099C 8FA40010 */ lw $a0, 0x10($sp) /* 4BDA0 800709A0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s index 0660e026b3..b59e6d07a6 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s @@ -11,7 +11,7 @@ glabel func_800709D0 /* 4BDE8 800709E8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BDEC 800709EC E7B00028 */ swc1 $f16, 0x28($sp) /* 4BDF0 800709F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BDF4 800709F4 0C016959 */ jal play_effect +/* 4BDF4 800709F4 0C016959 */ jal load_effect /* 4BDF8 800709F8 2404002E */ addiu $a0, $zero, 0x2e /* 4BDFC 800709FC 8FA40010 */ lw $a0, 0x10($sp) /* 4BE00 80070A00 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s index 37045b3b57..4a07ee0a1b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s @@ -11,7 +11,7 @@ glabel func_80070A30 /* 4BE48 80070A48 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BE4C 80070A4C E7B00028 */ swc1 $f16, 0x28($sp) /* 4BE50 80070A50 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BE54 80070A54 0C016959 */ jal play_effect +/* 4BE54 80070A54 0C016959 */ jal load_effect /* 4BE58 80070A58 2404002F */ addiu $a0, $zero, 0x2f /* 4BE5C 80070A5C 8FA40010 */ lw $a0, 0x10($sp) /* 4BE60 80070A60 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s index f18b6fece1..12d1b4b73f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s @@ -11,7 +11,7 @@ glabel func_80070A90 /* 4BEA8 80070AA8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BEAC 80070AAC E7B00028 */ swc1 $f16, 0x28($sp) /* 4BEB0 80070AB0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BEB4 80070AB4 0C016959 */ jal play_effect +/* 4BEB4 80070AB4 0C016959 */ jal load_effect /* 4BEB8 80070AB8 24040030 */ addiu $a0, $zero, 0x30 /* 4BEBC 80070ABC 8FA40010 */ lw $a0, 0x10($sp) /* 4BEC0 80070AC0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s index 1555b534f0..2dd974b29e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s @@ -11,7 +11,7 @@ glabel func_80070AF0 /* 4BF08 80070B08 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BF0C 80070B0C E7B00028 */ swc1 $f16, 0x28($sp) /* 4BF10 80070B10 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BF14 80070B14 0C016959 */ jal play_effect +/* 4BF14 80070B14 0C016959 */ jal load_effect /* 4BF18 80070B18 24040031 */ addiu $a0, $zero, 0x31 /* 4BF1C 80070B1C 8FA40010 */ lw $a0, 0x10($sp) /* 4BF20 80070B20 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s index 32d41b1584..e200f6808f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s @@ -11,7 +11,7 @@ glabel func_80070B50 /* 4BF68 80070B68 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BF6C 80070B6C E7B00028 */ swc1 $f16, 0x28($sp) /* 4BF70 80070B70 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BF74 80070B74 0C016959 */ jal play_effect +/* 4BF74 80070B74 0C016959 */ jal load_effect /* 4BF78 80070B78 24040032 */ addiu $a0, $zero, 0x32 /* 4BF7C 80070B7C 8FA40010 */ lw $a0, 0x10($sp) /* 4BF80 80070B80 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s index cf45dedd05..fc2aaa8e93 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s @@ -11,7 +11,7 @@ glabel func_80070BB0 /* 4BFC8 80070BC8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BFCC 80070BCC E7B00028 */ swc1 $f16, 0x28($sp) /* 4BFD0 80070BD0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BFD4 80070BD4 0C016959 */ jal play_effect +/* 4BFD4 80070BD4 0C016959 */ jal load_effect /* 4BFD8 80070BD8 24040033 */ addiu $a0, $zero, 0x33 /* 4BFDC 80070BDC 8FA40010 */ lw $a0, 0x10($sp) /* 4BFE0 80070BE0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s index b0b4edfb33..7c525b0da7 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s @@ -11,7 +11,7 @@ glabel func_80070C10 /* 4C028 80070C28 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C02C 80070C2C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C030 80070C30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C034 80070C34 0C016959 */ jal play_effect +/* 4C034 80070C34 0C016959 */ jal load_effect /* 4C038 80070C38 24040034 */ addiu $a0, $zero, 0x34 /* 4C03C 80070C3C 8FA40010 */ lw $a0, 0x10($sp) /* 4C040 80070C40 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s index 0fdcc676ff..30d8f56e69 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s @@ -11,7 +11,7 @@ glabel func_80070C70 /* 4C088 80070C88 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C08C 80070C8C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C090 80070C90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C094 80070C94 0C016959 */ jal play_effect +/* 4C094 80070C94 0C016959 */ jal load_effect /* 4C098 80070C98 24040035 */ addiu $a0, $zero, 0x35 /* 4C09C 80070C9C 8FA40010 */ lw $a0, 0x10($sp) /* 4C0A0 80070CA0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s index 1f0ea79be0..a6b29f6e5a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s @@ -11,7 +11,7 @@ glabel func_80070CD0 /* 4C0E8 80070CE8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C0EC 80070CEC E7B00028 */ swc1 $f16, 0x28($sp) /* 4C0F0 80070CF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C0F4 80070CF4 0C016959 */ jal play_effect +/* 4C0F4 80070CF4 0C016959 */ jal load_effect /* 4C0F8 80070CF8 24040036 */ addiu $a0, $zero, 0x36 /* 4C0FC 80070CFC 8FA40010 */ lw $a0, 0x10($sp) /* 4C100 80070D00 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s index 94a685dccc..f750e5540f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s @@ -11,7 +11,7 @@ glabel func_80070D30 /* 4C148 80070D48 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C14C 80070D4C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C150 80070D50 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C154 80070D54 0C016959 */ jal play_effect +/* 4C154 80070D54 0C016959 */ jal load_effect /* 4C158 80070D58 24040037 */ addiu $a0, $zero, 0x37 /* 4C15C 80070D5C 8FA40010 */ lw $a0, 0x10($sp) /* 4C160 80070D60 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s index 62ef98565e..edb0a232e6 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s @@ -11,7 +11,7 @@ glabel func_80070D90 /* 4C1A8 80070DA8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C1AC 80070DAC E7B00028 */ swc1 $f16, 0x28($sp) /* 4C1B0 80070DB0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C1B4 80070DB4 0C016959 */ jal play_effect +/* 4C1B4 80070DB4 0C016959 */ jal load_effect /* 4C1B8 80070DB8 24040038 */ addiu $a0, $zero, 0x38 /* 4C1BC 80070DBC 8FA40010 */ lw $a0, 0x10($sp) /* 4C1C0 80070DC0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s index 6826866da3..8ff891d78f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s @@ -11,7 +11,7 @@ glabel func_80070DF0 /* 4C208 80070E08 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C20C 80070E0C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C210 80070E10 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C214 80070E14 0C016959 */ jal play_effect +/* 4C214 80070E14 0C016959 */ jal load_effect /* 4C218 80070E18 24040039 */ addiu $a0, $zero, 0x39 /* 4C21C 80070E1C 8FA40010 */ lw $a0, 0x10($sp) /* 4C220 80070E20 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s index 6583746755..37d9fcb9fe 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s @@ -11,7 +11,7 @@ glabel func_80070E50 /* 4C268 80070E68 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C26C 80070E6C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C270 80070E70 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C274 80070E74 0C016959 */ jal play_effect +/* 4C274 80070E74 0C016959 */ jal load_effect /* 4C278 80070E78 2404003A */ addiu $a0, $zero, 0x3a /* 4C27C 80070E7C 8FA40010 */ lw $a0, 0x10($sp) /* 4C280 80070E80 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s index 929b8ce8c2..c5ad2b443b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s @@ -11,7 +11,7 @@ glabel func_80070EB0 /* 4C2C8 80070EC8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C2CC 80070ECC E7B00028 */ swc1 $f16, 0x28($sp) /* 4C2D0 80070ED0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C2D4 80070ED4 0C016959 */ jal play_effect +/* 4C2D4 80070ED4 0C016959 */ jal load_effect /* 4C2D8 80070ED8 2404003B */ addiu $a0, $zero, 0x3b /* 4C2DC 80070EDC 8FA40010 */ lw $a0, 0x10($sp) /* 4C2E0 80070EE0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s index a3c36e34c9..a5bf818028 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s @@ -11,7 +11,7 @@ glabel func_80070F10 /* 4C328 80070F28 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C32C 80070F2C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C330 80070F30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C334 80070F34 0C016959 */ jal play_effect +/* 4C334 80070F34 0C016959 */ jal load_effect /* 4C338 80070F38 2404003C */ addiu $a0, $zero, 0x3c /* 4C33C 80070F3C 8FA40010 */ lw $a0, 0x10($sp) /* 4C340 80070F40 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s index fb2987760c..5d61fbae16 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s @@ -11,7 +11,7 @@ glabel func_80070F70 /* 4C388 80070F88 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C38C 80070F8C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C390 80070F90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C394 80070F94 0C016959 */ jal play_effect +/* 4C394 80070F94 0C016959 */ jal load_effect /* 4C398 80070F98 2404003D */ addiu $a0, $zero, 0x3d /* 4C39C 80070F9C 8FA40010 */ lw $a0, 0x10($sp) /* 4C3A0 80070FA0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s index 33c4227246..9ad42c48cf 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s @@ -11,7 +11,7 @@ glabel func_80070FD0 /* 4C3E8 80070FE8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C3EC 80070FEC E7B00028 */ swc1 $f16, 0x28($sp) /* 4C3F0 80070FF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C3F4 80070FF4 0C016959 */ jal play_effect +/* 4C3F4 80070FF4 0C016959 */ jal load_effect /* 4C3F8 80070FF8 2404003E */ addiu $a0, $zero, 0x3e /* 4C3FC 80070FFC 8FA40010 */ lw $a0, 0x10($sp) /* 4C400 80071000 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s index 97f34fb8c5..dba0a787e4 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s @@ -11,7 +11,7 @@ glabel func_80071030 /* 4C448 80071048 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C44C 8007104C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C450 80071050 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C454 80071054 0C016959 */ jal play_effect +/* 4C454 80071054 0C016959 */ jal load_effect /* 4C458 80071058 2404003F */ addiu $a0, $zero, 0x3f /* 4C45C 8007105C 8FA40010 */ lw $a0, 0x10($sp) /* 4C460 80071060 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s index 58bb4884a7..d07f7f178b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s @@ -11,7 +11,7 @@ glabel func_80071090 /* 4C4A8 800710A8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C4AC 800710AC E7B00028 */ swc1 $f16, 0x28($sp) /* 4C4B0 800710B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C4B4 800710B4 0C016959 */ jal play_effect +/* 4C4B4 800710B4 0C016959 */ jal load_effect /* 4C4B8 800710B8 24040040 */ addiu $a0, $zero, 0x40 /* 4C4BC 800710BC 8FA40010 */ lw $a0, 0x10($sp) /* 4C4C0 800710C0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s index 8a9913d85d..cda1e62149 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s @@ -11,7 +11,7 @@ glabel func_800710F0 /* 4C508 80071108 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C50C 8007110C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C510 80071110 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C514 80071114 0C016959 */ jal play_effect +/* 4C514 80071114 0C016959 */ jal load_effect /* 4C518 80071118 24040041 */ addiu $a0, $zero, 0x41 /* 4C51C 8007111C 8FA40010 */ lw $a0, 0x10($sp) /* 4C520 80071120 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s index 626132460f..5ac065703a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s @@ -11,7 +11,7 @@ glabel func_80071150 /* 4C568 80071168 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C56C 8007116C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C570 80071170 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C574 80071174 0C016959 */ jal play_effect +/* 4C574 80071174 0C016959 */ jal load_effect /* 4C578 80071178 24040042 */ addiu $a0, $zero, 0x42 /* 4C57C 8007117C 8FA40010 */ lw $a0, 0x10($sp) /* 4C580 80071180 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s index c31b21e885..2abc83d2e9 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s @@ -11,7 +11,7 @@ glabel func_800711B0 /* 4C5C8 800711C8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C5CC 800711CC E7B00028 */ swc1 $f16, 0x28($sp) /* 4C5D0 800711D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C5D4 800711D4 0C016959 */ jal play_effect +/* 4C5D4 800711D4 0C016959 */ jal load_effect /* 4C5D8 800711D8 24040043 */ addiu $a0, $zero, 0x43 /* 4C5DC 800711DC 8FA40010 */ lw $a0, 0x10($sp) /* 4C5E0 800711E0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s index adfae21e3b..afed78bde2 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s @@ -11,7 +11,7 @@ glabel func_80071210 /* 4C628 80071228 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C62C 8007122C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C630 80071230 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C634 80071234 0C016959 */ jal play_effect +/* 4C634 80071234 0C016959 */ jal load_effect /* 4C638 80071238 24040044 */ addiu $a0, $zero, 0x44 /* 4C63C 8007123C 8FA40010 */ lw $a0, 0x10($sp) /* 4C640 80071240 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s index 553357b993..20201e7f8d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s @@ -11,7 +11,7 @@ glabel func_80071270 /* 4C688 80071288 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C68C 8007128C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C690 80071290 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C694 80071294 0C016959 */ jal play_effect +/* 4C694 80071294 0C016959 */ jal load_effect /* 4C698 80071298 24040045 */ addiu $a0, $zero, 0x45 /* 4C69C 8007129C 8FA40010 */ lw $a0, 0x10($sp) /* 4C6A0 800712A0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s index e6d2c10e99..4b2a74c444 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s @@ -11,7 +11,7 @@ glabel func_800712D0 /* 4C6E8 800712E8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C6EC 800712EC E7B00028 */ swc1 $f16, 0x28($sp) /* 4C6F0 800712F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C6F4 800712F4 0C016959 */ jal play_effect +/* 4C6F4 800712F4 0C016959 */ jal load_effect /* 4C6F8 800712F8 24040046 */ addiu $a0, $zero, 0x46 /* 4C6FC 800712FC 8FA40010 */ lw $a0, 0x10($sp) /* 4C700 80071300 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s index c50e666026..7baac64322 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s @@ -11,7 +11,7 @@ glabel func_80071330 /* 4C748 80071348 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C74C 8007134C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C750 80071350 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C754 80071354 0C016959 */ jal play_effect +/* 4C754 80071354 0C016959 */ jal load_effect /* 4C758 80071358 24040047 */ addiu $a0, $zero, 0x47 /* 4C75C 8007135C 8FA40010 */ lw $a0, 0x10($sp) /* 4C760 80071360 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s index 09cd061bac..0ef36a383e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s @@ -11,7 +11,7 @@ glabel func_80071390 /* 4C7A8 800713A8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C7AC 800713AC E7B00028 */ swc1 $f16, 0x28($sp) /* 4C7B0 800713B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C7B4 800713B4 0C016959 */ jal play_effect +/* 4C7B4 800713B4 0C016959 */ jal load_effect /* 4C7B8 800713B8 24040048 */ addiu $a0, $zero, 0x48 /* 4C7BC 800713BC 8FA40010 */ lw $a0, 0x10($sp) /* 4C7C0 800713C0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s index 0ef6d2ff4d..008a7476b7 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s @@ -11,7 +11,7 @@ glabel func_800713F0 /* 4C808 80071408 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C80C 8007140C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C810 80071410 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C814 80071414 0C016959 */ jal play_effect +/* 4C814 80071414 0C016959 */ jal load_effect /* 4C818 80071418 24040049 */ addiu $a0, $zero, 0x49 /* 4C81C 8007141C 8FA40010 */ lw $a0, 0x10($sp) /* 4C820 80071420 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s index 5da809c181..0d46ebd3ef 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s @@ -11,7 +11,7 @@ glabel func_80071450 /* 4C868 80071468 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C86C 8007146C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C870 80071470 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C874 80071474 0C016959 */ jal play_effect +/* 4C874 80071474 0C016959 */ jal load_effect /* 4C878 80071478 2404004A */ addiu $a0, $zero, 0x4a /* 4C87C 8007147C 8FA40010 */ lw $a0, 0x10($sp) /* 4C880 80071480 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s index 45ffa7c84b..e23474d181 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s @@ -11,7 +11,7 @@ glabel func_800714B0 /* 4C8C8 800714C8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C8CC 800714CC E7B00028 */ swc1 $f16, 0x28($sp) /* 4C8D0 800714D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C8D4 800714D4 0C016959 */ jal play_effect +/* 4C8D4 800714D4 0C016959 */ jal load_effect /* 4C8D8 800714D8 2404004B */ addiu $a0, $zero, 0x4b /* 4C8DC 800714DC 8FA40010 */ lw $a0, 0x10($sp) /* 4C8E0 800714E0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s index 980d1a73e3..29e053521b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s @@ -11,7 +11,7 @@ glabel func_80071510 /* 4C928 80071528 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C92C 8007152C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C930 80071530 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C934 80071534 0C016959 */ jal play_effect +/* 4C934 80071534 0C016959 */ jal load_effect /* 4C938 80071538 2404004C */ addiu $a0, $zero, 0x4c /* 4C93C 8007153C 8FA40010 */ lw $a0, 0x10($sp) /* 4C940 80071540 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s index f3ad214b07..ca8b7d103b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s @@ -11,7 +11,7 @@ glabel func_80071570 /* 4C988 80071588 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C98C 8007158C E7B00028 */ swc1 $f16, 0x28($sp) /* 4C990 80071590 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C994 80071594 0C016959 */ jal play_effect +/* 4C994 80071594 0C016959 */ jal load_effect /* 4C998 80071598 2404004D */ addiu $a0, $zero, 0x4d /* 4C99C 8007159C 8FA40010 */ lw $a0, 0x10($sp) /* 4C9A0 800715A0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s index 6fe3ae0e89..415a2a41b0 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s @@ -11,7 +11,7 @@ glabel func_800715D0 /* 4C9E8 800715E8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4C9EC 800715EC E7B00028 */ swc1 $f16, 0x28($sp) /* 4C9F0 800715F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C9F4 800715F4 0C016959 */ jal play_effect +/* 4C9F4 800715F4 0C016959 */ jal load_effect /* 4C9F8 800715F8 2404004E */ addiu $a0, $zero, 0x4e /* 4C9FC 800715FC 8FA40010 */ lw $a0, 0x10($sp) /* 4CA00 80071600 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s index 96f9a8cfb3..d3d325f982 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s @@ -11,7 +11,7 @@ glabel func_80071630 /* 4CA48 80071648 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CA4C 8007164C E7B00028 */ swc1 $f16, 0x28($sp) /* 4CA50 80071650 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CA54 80071654 0C016959 */ jal play_effect +/* 4CA54 80071654 0C016959 */ jal load_effect /* 4CA58 80071658 2404004F */ addiu $a0, $zero, 0x4f /* 4CA5C 8007165C 8FA40010 */ lw $a0, 0x10($sp) /* 4CA60 80071660 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071690.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071690.s index 403c27253a..bb9d010abc 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071690.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071690.s @@ -11,7 +11,7 @@ glabel func_80071690 /* 4CAA8 800716A8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CAAC 800716AC E7B00028 */ swc1 $f16, 0x28($sp) /* 4CAB0 800716B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CAB4 800716B4 0C016959 */ jal play_effect +/* 4CAB4 800716B4 0C016959 */ jal load_effect /* 4CAB8 800716B8 24040050 */ addiu $a0, $zero, 0x50 /* 4CABC 800716BC 8FA40010 */ lw $a0, 0x10($sp) /* 4CAC0 800716C0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s index 630f557120..c8660059bd 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s @@ -11,7 +11,7 @@ glabel func_800716F0 /* 4CB08 80071708 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CB0C 8007170C E7B00028 */ swc1 $f16, 0x28($sp) /* 4CB10 80071710 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CB14 80071714 0C016959 */ jal play_effect +/* 4CB14 80071714 0C016959 */ jal load_effect /* 4CB18 80071718 24040051 */ addiu $a0, $zero, 0x51 /* 4CB1C 8007171C 8FA40010 */ lw $a0, 0x10($sp) /* 4CB20 80071720 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s index 2150d4b918..d0ea34f711 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s @@ -11,7 +11,7 @@ glabel func_80071750 /* 4CB68 80071768 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CB6C 8007176C E7B00028 */ swc1 $f16, 0x28($sp) /* 4CB70 80071770 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CB74 80071774 0C016959 */ jal play_effect +/* 4CB74 80071774 0C016959 */ jal load_effect /* 4CB78 80071778 24040052 */ addiu $a0, $zero, 0x52 /* 4CB7C 8007177C 8FA40010 */ lw $a0, 0x10($sp) /* 4CB80 80071780 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s index c746c55cfe..0586bfb7fd 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s @@ -11,7 +11,7 @@ glabel func_800717B0 /* 4CBC8 800717C8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CBCC 800717CC E7B00028 */ swc1 $f16, 0x28($sp) /* 4CBD0 800717D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CBD4 800717D4 0C016959 */ jal play_effect +/* 4CBD4 800717D4 0C016959 */ jal load_effect /* 4CBD8 800717D8 24040053 */ addiu $a0, $zero, 0x53 /* 4CBDC 800717DC 8FA40010 */ lw $a0, 0x10($sp) /* 4CBE0 800717E0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071810.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071810.s index a8a3748cd7..7fb785e5ea 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071810.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071810.s @@ -11,7 +11,7 @@ glabel func_80071810 /* 4CC28 80071828 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CC2C 8007182C E7B00028 */ swc1 $f16, 0x28($sp) /* 4CC30 80071830 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CC34 80071834 0C016959 */ jal play_effect +/* 4CC34 80071834 0C016959 */ jal load_effect /* 4CC38 80071838 24040054 */ addiu $a0, $zero, 0x54 /* 4CC3C 8007183C 8FA40010 */ lw $a0, 0x10($sp) /* 4CC40 80071840 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s index 71ba658dca..68345df8b1 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s @@ -11,7 +11,7 @@ glabel func_80071870 /* 4CC88 80071888 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CC8C 8007188C E7B00028 */ swc1 $f16, 0x28($sp) /* 4CC90 80071890 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CC94 80071894 0C016959 */ jal play_effect +/* 4CC94 80071894 0C016959 */ jal load_effect /* 4CC98 80071898 24040055 */ addiu $a0, $zero, 0x55 /* 4CC9C 8007189C 8FA40010 */ lw $a0, 0x10($sp) /* 4CCA0 800718A0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s index e39fb72f35..f42c06b76a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s @@ -11,7 +11,7 @@ glabel func_800718D0 /* 4CCE8 800718E8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CCEC 800718EC E7B00028 */ swc1 $f16, 0x28($sp) /* 4CCF0 800718F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CCF4 800718F4 0C016959 */ jal play_effect +/* 4CCF4 800718F4 0C016959 */ jal load_effect /* 4CCF8 800718F8 24040056 */ addiu $a0, $zero, 0x56 /* 4CCFC 800718FC 8FA40010 */ lw $a0, 0x10($sp) /* 4CD00 80071900 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s index 2d1b845d45..56176a9925 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s @@ -11,7 +11,7 @@ glabel func_80071930 /* 4CD48 80071948 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CD4C 8007194C E7B00028 */ swc1 $f16, 0x28($sp) /* 4CD50 80071950 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CD54 80071954 0C016959 */ jal play_effect +/* 4CD54 80071954 0C016959 */ jal load_effect /* 4CD58 80071958 24040057 */ addiu $a0, $zero, 0x57 /* 4CD5C 8007195C 8FA40010 */ lw $a0, 0x10($sp) /* 4CD60 80071960 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s index 651b804644..f746bf6875 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s @@ -11,7 +11,7 @@ glabel func_80071990 /* 4CDA8 800719A8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CDAC 800719AC E7B00028 */ swc1 $f16, 0x28($sp) /* 4CDB0 800719B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CDB4 800719B4 0C016959 */ jal play_effect +/* 4CDB4 800719B4 0C016959 */ jal load_effect /* 4CDB8 800719B8 24040058 */ addiu $a0, $zero, 0x58 /* 4CDBC 800719BC 8FA40010 */ lw $a0, 0x10($sp) /* 4CDC0 800719C0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s index 1f8d44b1eb..852f4db8d9 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s @@ -11,7 +11,7 @@ glabel func_800719F0 /* 4CE08 80071A08 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CE0C 80071A0C E7B00028 */ swc1 $f16, 0x28($sp) /* 4CE10 80071A10 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CE14 80071A14 0C016959 */ jal play_effect +/* 4CE14 80071A14 0C016959 */ jal load_effect /* 4CE18 80071A18 24040059 */ addiu $a0, $zero, 0x59 /* 4CE1C 80071A1C 8FA40010 */ lw $a0, 0x10($sp) /* 4CE20 80071A20 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s index cf02837eee..c3c3bbe7fb 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s @@ -11,7 +11,7 @@ glabel func_80071A50 /* 4CE68 80071A68 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CE6C 80071A6C E7B00028 */ swc1 $f16, 0x28($sp) /* 4CE70 80071A70 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CE74 80071A74 0C016959 */ jal play_effect +/* 4CE74 80071A74 0C016959 */ jal load_effect /* 4CE78 80071A78 2404005A */ addiu $a0, $zero, 0x5a /* 4CE7C 80071A7C 8FA40010 */ lw $a0, 0x10($sp) /* 4CE80 80071A80 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s index 01a8a5b7a1..a8067ee615 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s @@ -11,7 +11,7 @@ glabel func_80071AB0 /* 4CEC8 80071AC8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CECC 80071ACC E7B00028 */ swc1 $f16, 0x28($sp) /* 4CED0 80071AD0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CED4 80071AD4 0C016959 */ jal play_effect +/* 4CED4 80071AD4 0C016959 */ jal load_effect /* 4CED8 80071AD8 2404005B */ addiu $a0, $zero, 0x5b /* 4CEDC 80071ADC 8FA40010 */ lw $a0, 0x10($sp) /* 4CEE0 80071AE0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s index 45fd184f31..6e5edc26b1 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s @@ -11,7 +11,7 @@ glabel func_80071B10 /* 4CF28 80071B28 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CF2C 80071B2C E7B00028 */ swc1 $f16, 0x28($sp) /* 4CF30 80071B30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CF34 80071B34 0C016959 */ jal play_effect +/* 4CF34 80071B34 0C016959 */ jal load_effect /* 4CF38 80071B38 2404005C */ addiu $a0, $zero, 0x5c /* 4CF3C 80071B3C 8FA40010 */ lw $a0, 0x10($sp) /* 4CF40 80071B40 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s index 37245f5a60..0fc3ce121c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s @@ -11,7 +11,7 @@ glabel func_80071B70 /* 4CF88 80071B88 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CF8C 80071B8C E7B00028 */ swc1 $f16, 0x28($sp) /* 4CF90 80071B90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CF94 80071B94 0C016959 */ jal play_effect +/* 4CF94 80071B94 0C016959 */ jal load_effect /* 4CF98 80071B98 2404005D */ addiu $a0, $zero, 0x5d /* 4CF9C 80071B9C 8FA40010 */ lw $a0, 0x10($sp) /* 4CFA0 80071BA0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s index 67509cae1b..5af3bd24dd 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s @@ -11,7 +11,7 @@ glabel func_80071BD0 /* 4CFE8 80071BE8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4CFEC 80071BEC E7B00028 */ swc1 $f16, 0x28($sp) /* 4CFF0 80071BF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CFF4 80071BF4 0C016959 */ jal play_effect +/* 4CFF4 80071BF4 0C016959 */ jal load_effect /* 4CFF8 80071BF8 2404005E */ addiu $a0, $zero, 0x5e /* 4CFFC 80071BFC 8FA40010 */ lw $a0, 0x10($sp) /* 4D000 80071C00 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s index be78887acc..fee8727a62 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s @@ -11,7 +11,7 @@ glabel func_80071C30 /* 4D048 80071C48 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D04C 80071C4C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D050 80071C50 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D054 80071C54 0C016959 */ jal play_effect +/* 4D054 80071C54 0C016959 */ jal load_effect /* 4D058 80071C58 2404005F */ addiu $a0, $zero, 0x5f /* 4D05C 80071C5C 8FA40010 */ lw $a0, 0x10($sp) /* 4D060 80071C60 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s index 6c9f4d6cb7..caccdaa3de 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s @@ -11,7 +11,7 @@ glabel func_80071C90 /* 4D0A8 80071CA8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D0AC 80071CAC E7B00028 */ swc1 $f16, 0x28($sp) /* 4D0B0 80071CB0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D0B4 80071CB4 0C016959 */ jal play_effect +/* 4D0B4 80071CB4 0C016959 */ jal load_effect /* 4D0B8 80071CB8 24040060 */ addiu $a0, $zero, 0x60 /* 4D0BC 80071CBC 8FA40010 */ lw $a0, 0x10($sp) /* 4D0C0 80071CC0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s index 8b610ab330..db32dcb37d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s @@ -11,7 +11,7 @@ glabel func_80071CF0 /* 4D108 80071D08 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D10C 80071D0C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D110 80071D10 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D114 80071D14 0C016959 */ jal play_effect +/* 4D114 80071D14 0C016959 */ jal load_effect /* 4D118 80071D18 24040061 */ addiu $a0, $zero, 0x61 /* 4D11C 80071D1C 8FA40010 */ lw $a0, 0x10($sp) /* 4D120 80071D20 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s index 783194806b..eebee55806 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s @@ -11,7 +11,7 @@ glabel func_80071D50 /* 4D168 80071D68 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D16C 80071D6C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D170 80071D70 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D174 80071D74 0C016959 */ jal play_effect +/* 4D174 80071D74 0C016959 */ jal load_effect /* 4D178 80071D78 24040062 */ addiu $a0, $zero, 0x62 /* 4D17C 80071D7C 8FA40010 */ lw $a0, 0x10($sp) /* 4D180 80071D80 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s index 1bff07b585..601a33b844 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s @@ -11,7 +11,7 @@ glabel func_80071DB0 /* 4D1C8 80071DC8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D1CC 80071DCC E7B00028 */ swc1 $f16, 0x28($sp) /* 4D1D0 80071DD0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D1D4 80071DD4 0C016959 */ jal play_effect +/* 4D1D4 80071DD4 0C016959 */ jal load_effect /* 4D1D8 80071DD8 24040063 */ addiu $a0, $zero, 0x63 /* 4D1DC 80071DDC 8FA40010 */ lw $a0, 0x10($sp) /* 4D1E0 80071DE0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s index 7bc3280afa..864543a1d9 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s @@ -11,7 +11,7 @@ glabel func_80071E10 /* 4D228 80071E28 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D22C 80071E2C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D230 80071E30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D234 80071E34 0C016959 */ jal play_effect +/* 4D234 80071E34 0C016959 */ jal load_effect /* 4D238 80071E38 24040064 */ addiu $a0, $zero, 0x64 /* 4D23C 80071E3C 8FA40010 */ lw $a0, 0x10($sp) /* 4D240 80071E40 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s index ab70daa772..17e25a0f4c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s @@ -11,7 +11,7 @@ glabel func_80071E70 /* 4D288 80071E88 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D28C 80071E8C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D290 80071E90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D294 80071E94 0C016959 */ jal play_effect +/* 4D294 80071E94 0C016959 */ jal load_effect /* 4D298 80071E98 24040065 */ addiu $a0, $zero, 0x65 /* 4D29C 80071E9C 8FA40010 */ lw $a0, 0x10($sp) /* 4D2A0 80071EA0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s index 26b5f3a77f..2bfca19015 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s @@ -11,7 +11,7 @@ glabel func_80071ED0 /* 4D2E8 80071EE8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D2EC 80071EEC E7B00028 */ swc1 $f16, 0x28($sp) /* 4D2F0 80071EF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D2F4 80071EF4 0C016959 */ jal play_effect +/* 4D2F4 80071EF4 0C016959 */ jal load_effect /* 4D2F8 80071EF8 24040066 */ addiu $a0, $zero, 0x66 /* 4D2FC 80071EFC 8FA40010 */ lw $a0, 0x10($sp) /* 4D300 80071F00 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s index 77815d9137..d109f7abb8 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s @@ -11,7 +11,7 @@ glabel func_80071F30 /* 4D348 80071F48 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D34C 80071F4C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D350 80071F50 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D354 80071F54 0C016959 */ jal play_effect +/* 4D354 80071F54 0C016959 */ jal load_effect /* 4D358 80071F58 24040067 */ addiu $a0, $zero, 0x67 /* 4D35C 80071F5C 8FA40010 */ lw $a0, 0x10($sp) /* 4D360 80071F60 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s index ec262f2b4b..272ed96078 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s @@ -11,7 +11,7 @@ glabel func_80071F90 /* 4D3A8 80071FA8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D3AC 80071FAC E7B00028 */ swc1 $f16, 0x28($sp) /* 4D3B0 80071FB0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D3B4 80071FB4 0C016959 */ jal play_effect +/* 4D3B4 80071FB4 0C016959 */ jal load_effect /* 4D3B8 80071FB8 24040068 */ addiu $a0, $zero, 0x68 /* 4D3BC 80071FBC 8FA40010 */ lw $a0, 0x10($sp) /* 4D3C0 80071FC0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s index faa063cba0..9d21b69877 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s @@ -11,7 +11,7 @@ glabel func_80071FF0 /* 4D408 80072008 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D40C 8007200C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D410 80072010 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D414 80072014 0C016959 */ jal play_effect +/* 4D414 80072014 0C016959 */ jal load_effect /* 4D418 80072018 24040069 */ addiu $a0, $zero, 0x69 /* 4D41C 8007201C 8FA40010 */ lw $a0, 0x10($sp) /* 4D420 80072020 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072050.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072050.s index c29ce60a0b..c4f59d68c0 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072050.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072050.s @@ -11,7 +11,7 @@ glabel func_80072050 /* 4D468 80072068 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D46C 8007206C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D470 80072070 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D474 80072074 0C016959 */ jal play_effect +/* 4D474 80072074 0C016959 */ jal load_effect /* 4D478 80072078 2404006A */ addiu $a0, $zero, 0x6a /* 4D47C 8007207C 8FA40010 */ lw $a0, 0x10($sp) /* 4D480 80072080 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s index 0d22db3a98..eacaabadf2 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s @@ -11,7 +11,7 @@ glabel func_800720B0 /* 4D4C8 800720C8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D4CC 800720CC E7B00028 */ swc1 $f16, 0x28($sp) /* 4D4D0 800720D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D4D4 800720D4 0C016959 */ jal play_effect +/* 4D4D4 800720D4 0C016959 */ jal load_effect /* 4D4D8 800720D8 2404006B */ addiu $a0, $zero, 0x6b /* 4D4DC 800720DC 8FA40010 */ lw $a0, 0x10($sp) /* 4D4E0 800720E0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s index 5d2fbabb2c..f4da5e0bb5 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s @@ -11,7 +11,7 @@ glabel func_80072110 /* 4D528 80072128 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D52C 8007212C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D530 80072130 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D534 80072134 0C016959 */ jal play_effect +/* 4D534 80072134 0C016959 */ jal load_effect /* 4D538 80072138 2404006C */ addiu $a0, $zero, 0x6c /* 4D53C 8007213C 8FA40010 */ lw $a0, 0x10($sp) /* 4D540 80072140 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s index 53b28d1610..302de51e3b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s @@ -11,7 +11,7 @@ glabel func_80072170 /* 4D588 80072188 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D58C 8007218C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D590 80072190 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D594 80072194 0C016959 */ jal play_effect +/* 4D594 80072194 0C016959 */ jal load_effect /* 4D598 80072198 2404006D */ addiu $a0, $zero, 0x6d /* 4D59C 8007219C 8FA40010 */ lw $a0, 0x10($sp) /* 4D5A0 800721A0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s index 9057e90dd7..2bd9aa800c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s @@ -11,7 +11,7 @@ glabel func_800721D0 /* 4D5E8 800721E8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D5EC 800721EC E7B00028 */ swc1 $f16, 0x28($sp) /* 4D5F0 800721F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D5F4 800721F4 0C016959 */ jal play_effect +/* 4D5F4 800721F4 0C016959 */ jal load_effect /* 4D5F8 800721F8 2404006E */ addiu $a0, $zero, 0x6e /* 4D5FC 800721FC 8FA40010 */ lw $a0, 0x10($sp) /* 4D600 80072200 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s index be3e3bb704..137f669069 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s @@ -11,7 +11,7 @@ glabel func_80072230 /* 4D648 80072248 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D64C 8007224C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D650 80072250 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D654 80072254 0C016959 */ jal play_effect +/* 4D654 80072254 0C016959 */ jal load_effect /* 4D658 80072258 2404006F */ addiu $a0, $zero, 0x6f /* 4D65C 8007225C 8FA40010 */ lw $a0, 0x10($sp) /* 4D660 80072260 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s index 2cc4d8bac6..081795997b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s @@ -11,7 +11,7 @@ glabel func_80072290 /* 4D6A8 800722A8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D6AC 800722AC E7B00028 */ swc1 $f16, 0x28($sp) /* 4D6B0 800722B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D6B4 800722B4 0C016959 */ jal play_effect +/* 4D6B4 800722B4 0C016959 */ jal load_effect /* 4D6B8 800722B8 24040070 */ addiu $a0, $zero, 0x70 /* 4D6BC 800722BC 8FA40010 */ lw $a0, 0x10($sp) /* 4D6C0 800722C0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s index ece10a8246..b490931339 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s @@ -11,7 +11,7 @@ glabel func_800722F0 /* 4D708 80072308 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D70C 8007230C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D710 80072310 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D714 80072314 0C016959 */ jal play_effect +/* 4D714 80072314 0C016959 */ jal load_effect /* 4D718 80072318 24040071 */ addiu $a0, $zero, 0x71 /* 4D71C 8007231C 8FA40010 */ lw $a0, 0x10($sp) /* 4D720 80072320 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s index eae34daf11..66e0f5d39b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s @@ -11,7 +11,7 @@ glabel func_80072350 /* 4D768 80072368 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D76C 8007236C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D770 80072370 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D774 80072374 0C016959 */ jal play_effect +/* 4D774 80072374 0C016959 */ jal load_effect /* 4D778 80072378 24040072 */ addiu $a0, $zero, 0x72 /* 4D77C 8007237C 8FA40010 */ lw $a0, 0x10($sp) /* 4D780 80072380 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s index bb48285646..9a9a207481 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s @@ -11,7 +11,7 @@ glabel func_800723B0 /* 4D7C8 800723C8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D7CC 800723CC E7B00028 */ swc1 $f16, 0x28($sp) /* 4D7D0 800723D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D7D4 800723D4 0C016959 */ jal play_effect +/* 4D7D4 800723D4 0C016959 */ jal load_effect /* 4D7D8 800723D8 24040073 */ addiu $a0, $zero, 0x73 /* 4D7DC 800723DC 8FA40010 */ lw $a0, 0x10($sp) /* 4D7E0 800723E0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s index 00f84cd959..8e8c859a9b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s @@ -11,7 +11,7 @@ glabel func_80072410 /* 4D828 80072428 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D82C 8007242C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D830 80072430 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D834 80072434 0C016959 */ jal play_effect +/* 4D834 80072434 0C016959 */ jal load_effect /* 4D838 80072438 24040074 */ addiu $a0, $zero, 0x74 /* 4D83C 8007243C 8FA40010 */ lw $a0, 0x10($sp) /* 4D840 80072440 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s index 3f7595040e..ff9d6aa56c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s @@ -11,7 +11,7 @@ glabel func_80072470 /* 4D888 80072488 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D88C 8007248C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D890 80072490 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D894 80072494 0C016959 */ jal play_effect +/* 4D894 80072494 0C016959 */ jal load_effect /* 4D898 80072498 24040075 */ addiu $a0, $zero, 0x75 /* 4D89C 8007249C 8FA40010 */ lw $a0, 0x10($sp) /* 4D8A0 800724A0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800724D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800724D0.s index cf6c730b1f..99e0734960 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800724D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800724D0.s @@ -11,7 +11,7 @@ glabel func_800724D0 /* 4D8E8 800724E8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D8EC 800724EC E7B00028 */ swc1 $f16, 0x28($sp) /* 4D8F0 800724F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D8F4 800724F4 0C016959 */ jal play_effect +/* 4D8F4 800724F4 0C016959 */ jal load_effect /* 4D8F8 800724F8 24040076 */ addiu $a0, $zero, 0x76 /* 4D8FC 800724FC 8FA40010 */ lw $a0, 0x10($sp) /* 4D900 80072500 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s index b722194215..78688e27eb 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s @@ -11,7 +11,7 @@ glabel func_80072530 /* 4D948 80072548 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D94C 8007254C E7B00028 */ swc1 $f16, 0x28($sp) /* 4D950 80072550 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D954 80072554 0C016959 */ jal play_effect +/* 4D954 80072554 0C016959 */ jal load_effect /* 4D958 80072558 24040077 */ addiu $a0, $zero, 0x77 /* 4D95C 8007255C 8FA40010 */ lw $a0, 0x10($sp) /* 4D960 80072560 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s index c59d80d504..7812b03f95 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s @@ -11,7 +11,7 @@ glabel func_80072590 /* 4D9A8 800725A8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4D9AC 800725AC E7B00028 */ swc1 $f16, 0x28($sp) /* 4D9B0 800725B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D9B4 800725B4 0C016959 */ jal play_effect +/* 4D9B4 800725B4 0C016959 */ jal load_effect /* 4D9B8 800725B8 24040078 */ addiu $a0, $zero, 0x78 /* 4D9BC 800725BC 8FA40010 */ lw $a0, 0x10($sp) /* 4D9C0 800725C0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s index bcb39e6686..afdbb0060c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s @@ -11,7 +11,7 @@ glabel func_800725F0 /* 4DA08 80072608 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DA0C 8007260C E7B00028 */ swc1 $f16, 0x28($sp) /* 4DA10 80072610 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DA14 80072614 0C016959 */ jal play_effect +/* 4DA14 80072614 0C016959 */ jal load_effect /* 4DA18 80072618 24040079 */ addiu $a0, $zero, 0x79 /* 4DA1C 8007261C 8FA40010 */ lw $a0, 0x10($sp) /* 4DA20 80072620 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s index 1ab8ef8714..f6c1f6d39d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s @@ -11,7 +11,7 @@ glabel func_80072650 /* 4DA68 80072668 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DA6C 8007266C E7B00028 */ swc1 $f16, 0x28($sp) /* 4DA70 80072670 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DA74 80072674 0C016959 */ jal play_effect +/* 4DA74 80072674 0C016959 */ jal load_effect /* 4DA78 80072678 2404007A */ addiu $a0, $zero, 0x7a /* 4DA7C 8007267C 8FA40010 */ lw $a0, 0x10($sp) /* 4DA80 80072680 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s index d89e860b19..c8c9fe1b7d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s @@ -11,7 +11,7 @@ glabel func_800726B0 /* 4DAC8 800726C8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DACC 800726CC E7B00028 */ swc1 $f16, 0x28($sp) /* 4DAD0 800726D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DAD4 800726D4 0C016959 */ jal play_effect +/* 4DAD4 800726D4 0C016959 */ jal load_effect /* 4DAD8 800726D8 2404007B */ addiu $a0, $zero, 0x7b /* 4DADC 800726DC 8FA40010 */ lw $a0, 0x10($sp) /* 4DAE0 800726E0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s index 9d3e26a61b..6d9eb5712c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s @@ -11,7 +11,7 @@ glabel func_80072710 /* 4DB28 80072728 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DB2C 8007272C E7B00028 */ swc1 $f16, 0x28($sp) /* 4DB30 80072730 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DB34 80072734 0C016959 */ jal play_effect +/* 4DB34 80072734 0C016959 */ jal load_effect /* 4DB38 80072738 2404007C */ addiu $a0, $zero, 0x7c /* 4DB3C 8007273C 8FA40010 */ lw $a0, 0x10($sp) /* 4DB40 80072740 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s index fecaffc333..8283628f19 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s @@ -11,7 +11,7 @@ glabel func_80072770 /* 4DB88 80072788 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DB8C 8007278C E7B00028 */ swc1 $f16, 0x28($sp) /* 4DB90 80072790 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DB94 80072794 0C016959 */ jal play_effect +/* 4DB94 80072794 0C016959 */ jal load_effect /* 4DB98 80072798 2404007D */ addiu $a0, $zero, 0x7d /* 4DB9C 8007279C 8FA40010 */ lw $a0, 0x10($sp) /* 4DBA0 800727A0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s index c4a2104b25..55655c5619 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s @@ -11,7 +11,7 @@ glabel func_800727D0 /* 4DBE8 800727E8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DBEC 800727EC E7B00028 */ swc1 $f16, 0x28($sp) /* 4DBF0 800727F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DBF4 800727F4 0C016959 */ jal play_effect +/* 4DBF4 800727F4 0C016959 */ jal load_effect /* 4DBF8 800727F8 2404007E */ addiu $a0, $zero, 0x7e /* 4DBFC 800727FC 8FA40010 */ lw $a0, 0x10($sp) /* 4DC00 80072800 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s index 2697388c2c..f3fc6299d3 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s @@ -11,7 +11,7 @@ glabel func_80072830 /* 4DC48 80072848 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DC4C 8007284C E7B00028 */ swc1 $f16, 0x28($sp) /* 4DC50 80072850 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DC54 80072854 0C016959 */ jal play_effect +/* 4DC54 80072854 0C016959 */ jal load_effect /* 4DC58 80072858 2404007F */ addiu $a0, $zero, 0x7f /* 4DC5C 8007285C 8FA40010 */ lw $a0, 0x10($sp) /* 4DC60 80072860 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s index 14d0afd64e..239ce60130 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s @@ -11,7 +11,7 @@ glabel func_80072890 /* 4DCA8 800728A8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DCAC 800728AC E7B00028 */ swc1 $f16, 0x28($sp) /* 4DCB0 800728B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DCB4 800728B4 0C016959 */ jal play_effect +/* 4DCB4 800728B4 0C016959 */ jal load_effect /* 4DCB8 800728B8 24040080 */ addiu $a0, $zero, 0x80 /* 4DCBC 800728BC 8FA40010 */ lw $a0, 0x10($sp) /* 4DCC0 800728C0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s index b391f8cf30..faeddf5a95 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s @@ -11,7 +11,7 @@ glabel func_800728F0 /* 4DD08 80072908 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DD0C 8007290C E7B00028 */ swc1 $f16, 0x28($sp) /* 4DD10 80072910 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DD14 80072914 0C016959 */ jal play_effect +/* 4DD14 80072914 0C016959 */ jal load_effect /* 4DD18 80072918 24040081 */ addiu $a0, $zero, 0x81 /* 4DD1C 8007291C 8FA40010 */ lw $a0, 0x10($sp) /* 4DD20 80072920 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s index 0b37581ea0..fc5d91b57d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s @@ -11,7 +11,7 @@ glabel func_80072950 /* 4DD68 80072968 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DD6C 8007296C E7B00028 */ swc1 $f16, 0x28($sp) /* 4DD70 80072970 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DD74 80072974 0C016959 */ jal play_effect +/* 4DD74 80072974 0C016959 */ jal load_effect /* 4DD78 80072978 24040082 */ addiu $a0, $zero, 0x82 /* 4DD7C 8007297C 8FA40010 */ lw $a0, 0x10($sp) /* 4DD80 80072980 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s index 0b55df9323..07c917b545 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s @@ -11,7 +11,7 @@ glabel func_800729B0 /* 4DDC8 800729C8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DDCC 800729CC E7B00028 */ swc1 $f16, 0x28($sp) /* 4DDD0 800729D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DDD4 800729D4 0C016959 */ jal play_effect +/* 4DDD4 800729D4 0C016959 */ jal load_effect /* 4DDD8 800729D8 24040083 */ addiu $a0, $zero, 0x83 /* 4DDDC 800729DC 8FA40010 */ lw $a0, 0x10($sp) /* 4DDE0 800729E0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s index e779935a93..737d510511 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s @@ -11,7 +11,7 @@ glabel func_80072A10 /* 4DE28 80072A28 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DE2C 80072A2C E7B00028 */ swc1 $f16, 0x28($sp) /* 4DE30 80072A30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DE34 80072A34 0C016959 */ jal play_effect +/* 4DE34 80072A34 0C016959 */ jal load_effect /* 4DE38 80072A38 24040084 */ addiu $a0, $zero, 0x84 /* 4DE3C 80072A3C 8FA40010 */ lw $a0, 0x10($sp) /* 4DE40 80072A40 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s index d49bce7cde..9485a5e457 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s @@ -11,7 +11,7 @@ glabel func_80072A70 /* 4DE88 80072A88 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DE8C 80072A8C E7B00028 */ swc1 $f16, 0x28($sp) /* 4DE90 80072A90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DE94 80072A94 0C016959 */ jal play_effect +/* 4DE94 80072A94 0C016959 */ jal load_effect /* 4DE98 80072A98 24040085 */ addiu $a0, $zero, 0x85 /* 4DE9C 80072A9C 8FA40010 */ lw $a0, 0x10($sp) /* 4DEA0 80072AA0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s index 3148e133e6..dd7db08f1d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s @@ -11,7 +11,7 @@ glabel func_80072AD0 /* 4DEE8 80072AE8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4DEEC 80072AEC E7B00028 */ swc1 $f16, 0x28($sp) /* 4DEF0 80072AF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DEF4 80072AF4 0C016959 */ jal play_effect +/* 4DEF4 80072AF4 0C016959 */ jal load_effect /* 4DEF8 80072AF8 24040086 */ addiu $a0, $zero, 0x86 /* 4DEFC 80072AFC 8FA40010 */ lw $a0, 0x10($sp) /* 4DF00 80072B00 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s index 7d5140e02e..96fe15c4e3 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s @@ -11,7 +11,7 @@ glabel fx_emote /* 4B2A8 8006FEA8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4B2AC 8006FEAC E7B00028 */ swc1 $f16, 0x28($sp) /* 4B2B0 8006FEB0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B2B4 8006FEB4 0C016959 */ jal play_effect +/* 4B2B4 8006FEB4 0C016959 */ jal load_effect /* 4B2B8 8006FEB8 24040010 */ addiu $a0, $zero, 0x10 /* 4B2BC 8006FEBC 8FA40010 */ lw $a0, 0x10($sp) /* 4B2C0 8006FEC0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s index e261f91239..ee137db291 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s @@ -11,7 +11,7 @@ glabel fx_sleep_bubble /* 4BC08 80070808 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BC0C 8007080C E7B00028 */ swc1 $f16, 0x28($sp) /* 4BC10 80070810 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BC14 80070814 0C016959 */ jal play_effect +/* 4BC14 80070814 0C016959 */ jal load_effect /* 4BC18 80070818 24040029 */ addiu $a0, $zero, 0x29 /* 4BC1C 8007081C 8FA40010 */ lw $a0, 0x10($sp) /* 4BC20 80070820 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s index 760cabb2d9..0682717a76 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s @@ -11,7 +11,7 @@ glabel fx_sweat /* 4BBA8 800707A8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4BBAC 800707AC E7B00028 */ swc1 $f16, 0x28($sp) /* 4BBB0 800707B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BBB4 800707B4 0C016959 */ jal play_effect +/* 4BBB4 800707B4 0C016959 */ jal load_effect /* 4BBB8 800707B8 24040028 */ addiu $a0, $zero, 0x28 /* 4BBBC 800707BC 8FA40010 */ lw $a0, 0x10($sp) /* 4BBC0 800707C0 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s index 364c9eabda..5964806aaa 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s @@ -11,7 +11,7 @@ glabel fx_walk_large /* 4AEE8 8006FAE8 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4AEEC 8006FAEC E7B00028 */ swc1 $f16, 0x28($sp) /* 4AEF0 8006FAF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AEF4 8006FAF4 0C016959 */ jal play_effect +/* 4AEF4 8006FAF4 0C016959 */ jal load_effect /* 4AEF8 8006FAF8 24040006 */ addiu $a0, $zero, 6 /* 4AEFC 8006FAFC 8FA40010 */ lw $a0, 0x10($sp) /* 4AF00 8006FB00 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s index 0ae2e22ee1..0f59ce1b2b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s @@ -11,7 +11,7 @@ glabel fx_walk_normal /* 4AF48 8006FB48 E7AE0024 */ swc1 $f14, 0x24($sp) /* 4AF4C 8006FB4C E7B00028 */ swc1 $f16, 0x28($sp) /* 4AF50 8006FB50 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AF54 8006FB54 0C016959 */ jal play_effect +/* 4AF54 8006FB54 0C016959 */ jal load_effect /* 4AF58 8006FB58 24040007 */ addiu $a0, $zero, 7 /* 4AF5C 8006FB5C 8FA40010 */ lw $a0, 0x10($sp) /* 4AF60 8006FB60 8FA50014 */ lw $a1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BDC.s b/asm/nonmatchings/os/code_4ac90_len_3910/load_battle_section.s similarity index 99% rename from asm/nonmatchings/os/code_4ac90_len_3910/func_80072BDC.s rename to asm/nonmatchings/os/code_4ac90_len_3910/load_battle_section.s index 6476403e45..6c89df2543 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BDC.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/load_battle_section.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80072BDC +glabel load_battle_section /* 4DFDC 80072BDC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 4DFE0 80072BE0 3C02800E */ lui $v0, %hi(gBattleStatus+0x47A) /* 4DFE4 80072BE4 9042C4EA */ lbu $v0, %lo(gBattleStatus+0x47A)($v0) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s b/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s index 6773912682..3bd8c1333f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s @@ -38,7 +38,7 @@ glabel load_demo_battle /* 4E298 80072E98 00000000 */ nop /* 4E29C 80072E9C 0C052010 */ jal func_80148040 /* 4E2A0 80072EA0 00000000 */ nop -/* 4E2A4 80072EA4 0C05177E */ jal func_80145DF8 +/* 4E2A4 80072EA4 0C05177E */ jal use_default_background_settings /* 4E2A8 80072EA8 00000000 */ nop /* 4E2AC 80072EAC 0C04E062 */ jal func_80138188 /* 4E2B0 80072EB0 00000000 */ nop @@ -48,7 +48,7 @@ glabel load_demo_battle /* 4E2C0 80072EC0 00000000 */ nop /* 4E2C4 80072EC4 0C04432E */ jal clear_entity_data /* 4E2C8 80072EC8 24040001 */ addiu $a0, $zero, 1 -/* 4E2CC 80072ECC 0C016727 */ jal func_80059C9C +/* 4E2CC 80072ECC 0C016727 */ jal clear_effect_data /* 4E2D0 80072ED0 00000000 */ nop /* 4E2D4 80072ED4 0C037F14 */ jal clear_player_status /* 4E2D8 80072ED8 00000000 */ nop @@ -63,7 +63,7 @@ glabel load_demo_battle /* 4E2FC 80072EFC 0C04C3FC */ jal clear_item_entity_data /* 4E300 80072F00 00000000 */ nop /* 4E304 80072F04 3C05437F */ lui $a1, 0x437f -/* 4E308 80072F08 0C04DF62 */ jal func_80137D88 +/* 4E308 80072F08 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 4E30C 80072F0C 24040009 */ addiu $a0, $zero, 9 /* 4E310 80072F10 3C108011 */ lui $s0, %hi(gPlayerData) /* 4E314 80072F14 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) @@ -223,7 +223,7 @@ glabel L800730F8_4E4F8 /* 4E540 80073140 3C02800B */ lui $v0, %hi(gCurrentEncounter) /* 4E544 80073144 24420F10 */ addiu $v0, $v0, %lo(gCurrentEncounter) /* 4E548 80073148 A0400007 */ sb $zero, 7($v0) -/* 4E54C 8007314C 0C01CB33 */ jal func_80072CCC +/* 4E54C 8007314C 0C01CB33 */ jal set_battle_stage /* 4E550 80073150 A0400010 */ sb $zero, 0x10($v0) /* 4E554 80073154 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 4E558 80073158 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CCC.s b/asm/nonmatchings/os/code_4ac90_len_3910/set_battle_stage.s similarity index 93% rename from asm/nonmatchings/os/code_4ac90_len_3910/func_80072CCC.s rename to asm/nonmatchings/os/code_4ac90_len_3910/set_battle_stage.s index 08c9b604ef..9fadb7dc87 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CCC.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/set_battle_stage.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80072CCC +glabel set_battle_stage /* 4E0CC 80072CCC 3C01800E */ lui $at, %hi(gBattleStatus+0x47C) /* 4E0D0 80072CD0 AC24C4EC */ sw $a0, %lo(gBattleStatus+0x47C)($at) /* 4E0D4 80072CD4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242F08_C39438.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242F08_C39438.s index 1493384173..c0bf09ddb6 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242F08_C39438.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242F08_C39438.s @@ -24,7 +24,7 @@ glabel func_80242F08_C39438 /* C39484 80242F54 00A0382D */ daddu $a3, $a1, $zero /* C39488 80242F58 AE220088 */ sw $v0, 0x88($s1) /* C3948C 80242F5C AE200070 */ sw $zero, 0x70($s1) -/* C39490 80242F60 0C04DF84 */ jal func_80137E10 +/* C39490 80242F60 0C04DF84 */ jal set_transition_stencil_color /* C39494 80242F64 AE200074 */ sw $zero, 0x74($s1) .L80242F68: /* C39498 80242F68 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80242F08_C39438 /* C39548 80243018 C6200074 */ lwc1 $f0, 0x74($s1) /* C3954C 8024301C 46800020 */ cvt.s.w $f0, $f0 /* C39550 80243020 44050000 */ mfc1 $a1, $f0 -/* C39554 80243024 0C04DF62 */ jal func_80137D88 +/* C39554 80243024 0C04DF62 */ jal set_transition_stencil_zoom_0 /* C39558 80243028 24040001 */ addiu $a0, $zero, 1 /* C3955C 8024302C 0240102D */ daddu $v0, $s2, $zero /* C39560 80243030 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s index 4dc066c5af..efe47824a2 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s @@ -19,13 +19,13 @@ glabel func_802434CC_96C68C /* 96C6C4 80243504 0080282D */ daddu $a1, $a0, $zero /* 96C6C8 80243508 0040802D */ daddu $s0, $v0, $zero /* 96C6CC 8024350C 240600BE */ addiu $a2, $zero, 0xbe -/* 96C6D0 80243510 0C04DF93 */ jal func_80137E4C +/* 96C6D0 80243510 0C04DF93 */ jal set_transition_stencil_center /* 96C6D4 80243514 24070091 */ addiu $a3, $zero, 0x91 /* 96C6D8 80243518 44900000 */ mtc1 $s0, $f0 /* 96C6DC 8024351C 00000000 */ nop /* 96C6E0 80243520 46800020 */ cvt.s.w $f0, $f0 /* 96C6E4 80243524 44050000 */ mfc1 $a1, $f0 -/* 96C6E8 80243528 0C04DF62 */ jal func_80137D88 +/* 96C6E8 80243528 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 96C6EC 8024352C 322400FF */ andi $a0, $s1, 0xff /* 96C6F0 80243530 8FBF0018 */ lw $ra, 0x18($sp) /* 96C6F4 80243534 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698_96C858.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698_96C858.s index adaee1c2f5..3636c34097 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698_96C858.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698_96C858.s @@ -24,7 +24,7 @@ glabel func_80243698_96C858 /* 96C8A4 802436E4 0000202D */ daddu $a0, $zero, $zero /* 96C8A8 802436E8 324500FF */ andi $a1, $s2, 0xff /* 96C8AC 802436EC 320600FF */ andi $a2, $s0, 0xff -/* 96C8B0 802436F0 0C04DF84 */ jal func_80137E10 +/* 96C8B0 802436F0 0C04DF84 */ jal set_transition_stencil_color /* 96C8B4 802436F4 304700FF */ andi $a3, $v0, 0xff /* 96C8B8 802436F8 8FBF001C */ lw $ra, 0x1c($sp) /* 96C8BC 802436FC 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240B38_CAF878.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240B38_CAF878.s index 09457bb3b5..7c4051eefd 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240B38_CAF878.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240B38_CAF878.s @@ -24,7 +24,7 @@ glabel func_80240B38_CAF878 /* CAF8C4 80240B84 00A0382D */ daddu $a3, $a1, $zero /* CAF8C8 80240B88 AE220088 */ sw $v0, 0x88($s1) /* CAF8CC 80240B8C AE200070 */ sw $zero, 0x70($s1) -/* CAF8D0 80240B90 0C04DF84 */ jal func_80137E10 +/* CAF8D0 80240B90 0C04DF84 */ jal set_transition_stencil_color /* CAF8D4 80240B94 AE200074 */ sw $zero, 0x74($s1) .L80240B98: /* CAF8D8 80240B98 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80240B38_CAF878 /* CAF988 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) /* CAF98C 80240C4C 46800020 */ cvt.s.w $f0, $f0 /* CAF990 80240C50 44050000 */ mfc1 $a1, $f0 -/* CAF994 80240C54 0C04DF62 */ jal func_80137D88 +/* CAF994 80240C54 0C04DF62 */ jal set_transition_stencil_zoom_0 /* CAF998 80240C58 24040001 */ addiu $a0, $zero, 1 /* CAF99C 80240C5C 0240102D */ daddu $v0, $s2, $zero /* CAF9A0 80240C60 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240C18_CD2A48.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240C18_CD2A48.s index e362416627..9484d9e6a8 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240C18_CD2A48.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240C18_CD2A48.s @@ -24,7 +24,7 @@ glabel func_80240C18_CD2A48 /* CD2A94 80240C64 00A0382D */ daddu $a3, $a1, $zero /* CD2A98 80240C68 AE220088 */ sw $v0, 0x88($s1) /* CD2A9C 80240C6C AE200070 */ sw $zero, 0x70($s1) -/* CD2AA0 80240C70 0C04DF84 */ jal func_80137E10 +/* CD2AA0 80240C70 0C04DF84 */ jal set_transition_stencil_color /* CD2AA4 80240C74 AE200074 */ sw $zero, 0x74($s1) .L80240C78: /* CD2AA8 80240C78 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80240C18_CD2A48 /* CD2B58 80240D28 C6200074 */ lwc1 $f0, 0x74($s1) /* CD2B5C 80240D2C 46800020 */ cvt.s.w $f0, $f0 /* CD2B60 80240D30 44050000 */ mfc1 $a1, $f0 -/* CD2B64 80240D34 0C04DF62 */ jal func_80137D88 +/* CD2B64 80240D34 0C04DF62 */ jal set_transition_stencil_zoom_0 /* CD2B68 80240D38 24040001 */ addiu $a0, $zero, 1 /* CD2B6C 80240D3C 0240102D */ daddu $v0, $s2, $zero /* CD2B70 80240D40 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240784_CE3E74.s b/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240784_CE3E74.s index e8935be42f..ea139bf616 100644 --- a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240784_CE3E74.s +++ b/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240784_CE3E74.s @@ -7,7 +7,7 @@ glabel func_80240784_CE3E74 /* CE3E7C 8024078C C4800084 */ lwc1 $f0, 0x84($a0) /* CE3E80 80240790 46800020 */ cvt.s.w $f0, $f0 /* CE3E84 80240794 44050000 */ mfc1 $a1, $f0 -/* CE3E88 80240798 0C04DF69 */ jal func_80137DA4 +/* CE3E88 80240798 0C04DF69 */ jal set_transition_stencil_zoom_1 /* CE3E8C 8024079C 24040001 */ addiu $a0, $zero, 1 /* CE3E90 802407A0 8FBF0010 */ lw $ra, 0x10($sp) /* CE3E94 802407A4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s index eb942aac42..e785fb467a 100644 --- a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s +++ b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s @@ -39,7 +39,7 @@ glabel func_80240688_E1EAE8 /* E1EB70 80240710 00000000 */ nop /* E1EB74 80240714 0C052010 */ jal func_80148040 /* E1EB78 80240718 00000000 */ nop -/* E1EB7C 8024071C 0C05177E */ jal func_80145DF8 +/* E1EB7C 8024071C 0C05177E */ jal use_default_background_settings /* E1EB80 80240720 00000000 */ nop /* E1EB84 80240724 0C050440 */ jal func_80141100 /* E1EB88 80240728 00000000 */ nop @@ -49,7 +49,7 @@ glabel func_80240688_E1EAE8 /* E1EB98 80240738 00000000 */ nop /* E1EB9C 8024073C 0C04432E */ jal clear_entity_data /* E1EBA0 80240740 0000202D */ daddu $a0, $zero, $zero -/* E1EBA4 80240744 0C04E042 */ jal func_80138108 +/* E1EBA4 80240744 0C04E042 */ jal clear_transition_stencil /* E1EBA8 80240748 00000000 */ nop /* E1EBAC 8024074C 0C037F14 */ jal clear_player_status /* E1EBB0 80240750 00000000 */ nop @@ -61,7 +61,7 @@ glabel func_80240688_E1EAE8 /* E1EBC8 80240768 00000000 */ nop /* E1EBCC 8024076C 0C00F8CE */ jal func_8003E338 /* E1EBD0 80240770 00000000 */ nop -/* E1EBD4 80240774 0C016727 */ jal func_80059C9C +/* E1EBD4 80240774 0C016727 */ jal clear_effect_data /* E1EBD8 80240778 00000000 */ nop /* E1EBDC 8024077C 0C04C3FC */ jal clear_item_entity_data /* E1EBE0 80240780 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s index 2f20dbdcb4..d1fc66296e 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s @@ -19,13 +19,13 @@ glabel func_802421F0_A1D2F0 /* A1D328 80242228 0080282D */ daddu $a1, $a0, $zero /* A1D32C 8024222C 0040802D */ daddu $s0, $v0, $zero /* A1D330 80242230 240600BE */ addiu $a2, $zero, 0xbe -/* A1D334 80242234 0C04DF93 */ jal func_80137E4C +/* A1D334 80242234 0C04DF93 */ jal set_transition_stencil_center /* A1D338 80242238 24070091 */ addiu $a3, $zero, 0x91 /* A1D33C 8024223C 44900000 */ mtc1 $s0, $f0 /* A1D340 80242240 00000000 */ nop /* A1D344 80242244 46800020 */ cvt.s.w $f0, $f0 /* A1D348 80242248 44050000 */ mfc1 $a1, $f0 -/* A1D34C 8024224C 0C04DF62 */ jal func_80137D88 +/* A1D34C 8024224C 0C04DF62 */ jal set_transition_stencil_zoom_0 /* A1D350 80242250 322400FF */ andi $a0, $s1, 0xff /* A1D354 80242254 8FBF0018 */ lw $ra, 0x18($sp) /* A1D358 80242258 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC_A1D4BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC_A1D4BC.s index 1e07837e88..d3e90071b8 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC_A1D4BC.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC_A1D4BC.s @@ -24,7 +24,7 @@ glabel func_802423BC_A1D4BC /* A1D508 80242408 0000202D */ daddu $a0, $zero, $zero /* A1D50C 8024240C 324500FF */ andi $a1, $s2, 0xff /* A1D510 80242410 320600FF */ andi $a2, $s0, 0xff -/* A1D514 80242414 0C04DF84 */ jal func_80137E10 +/* A1D514 80242414 0C04DF84 */ jal set_transition_stencil_color /* A1D518 80242418 304700FF */ andi $a3, $v0, 0xff /* A1D51C 8024241C 8FBF001C */ lw $ra, 0x1c($sp) /* A1D520 80242420 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s b/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s index bba20b703f..a53cdd4ca7 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s @@ -20,7 +20,7 @@ glabel func_80240B60_A27A30 /* A27A64 80240B94 C6000074 */ lwc1 $f0, 0x74($s0) /* A27A68 80240B98 46800020 */ cvt.s.w $f0, $f0 /* A27A6C 80240B9C 44050000 */ mfc1 $a1, $f0 -/* A27A70 80240BA0 0C04DF62 */ jal func_80137D88 +/* A27A70 80240BA0 0C04DF62 */ jal set_transition_stencil_zoom_0 /* A27A74 80240BA4 0000202D */ daddu $a0, $zero, $zero /* A27A78 80240BA8 8E020074 */ lw $v0, 0x74($s0) /* A27A7C 80240BAC 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s index f8256240dc..ec85823069 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s @@ -152,7 +152,7 @@ glabel L80240D60_A27C30 /* A27CB4 80240DE4 8C440000 */ lw $a0, ($v0) /* A27CB8 80240DE8 1080000F */ beqz $a0, .L80240E28 /* A27CBC 80240DEC 00000000 */ nop -/* A27CC0 80240DF0 0C04992C */ jal func_801264B0 +/* A27CC0 80240DF0 0C04992C */ jal get_msg_lines /* A27CC4 80240DF4 0000802D */ daddu $s0, $zero, $zero /* A27CC8 80240DF8 28420002 */ slti $v0, $v0, 2 /* A27CCC 80240DFC 50400001 */ beql $v0, $zero, .L80240E04 @@ -165,7 +165,7 @@ glabel L80240D60_A27C30 /* A27CE4 80240E14 AFA20010 */ sw $v0, 0x10($sp) /* A27CE8 80240E18 AFA00014 */ sw $zero, 0x14($sp) /* A27CEC 80240E1C 8C640000 */ lw $a0, ($v1) -/* A27CF0 80240E20 0C04993B */ jal draw_string +/* A27CF0 80240E20 0C04993B */ jal draw_msg /* A27CF4 80240E24 0220382D */ daddu $a3, $s1, $zero .L80240E28: /* A27CF8 80240E28 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s index ad2edb12af..b888eae370 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s @@ -27,23 +27,23 @@ glabel func_80244934_A2EB74 /* A2EBC8 80244988 46800020 */ cvt.s.w $f0, $f0 /* A2EBCC 8024498C 44050000 */ mfc1 $a1, $f0 .L80244990: -/* A2EBD0 80244990 0C04DF69 */ jal func_80137DA4 +/* A2EBD0 80244990 0C04DF69 */ jal set_transition_stencil_zoom_1 /* A2EBD4 80244994 00000000 */ nop /* A2EBD8 80244998 24040001 */ addiu $a0, $zero, 1 /* A2EBDC 8024499C 240500FA */ addiu $a1, $zero, 0xfa /* A2EBE0 802449A0 00A0302D */ daddu $a2, $a1, $zero -/* A2EBE4 802449A4 0C04DF84 */ jal func_80137E10 +/* A2EBE4 802449A4 0C04DF84 */ jal set_transition_stencil_color /* A2EBE8 802449A8 00A0382D */ daddu $a3, $a1, $zero /* A2EBEC 802449AC 08091276 */ j .L802449D8 /* A2EBF0 802449B0 0000102D */ daddu $v0, $zero, $zero .L802449B4: /* A2EBF4 802449B4 0000202D */ daddu $a0, $zero, $zero -/* A2EBF8 802449B8 0C04DF69 */ jal func_80137DA4 +/* A2EBF8 802449B8 0C04DF69 */ jal set_transition_stencil_zoom_1 /* A2EBFC 802449BC 0000282D */ daddu $a1, $zero, $zero /* A2EC00 802449C0 24040001 */ addiu $a0, $zero, 1 /* A2EC04 802449C4 240500FA */ addiu $a1, $zero, 0xfa /* A2EC08 802449C8 00A0302D */ daddu $a2, $a1, $zero -/* A2EC0C 802449CC 0C04DF84 */ jal func_80137E10 +/* A2EC0C 802449CC 0C04DF84 */ jal set_transition_stencil_color /* A2EC10 802449D0 00A0382D */ daddu $a3, $a1, $zero /* A2EC14 802449D4 24020002 */ addiu $v0, $zero, 2 .L802449D8: diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s index 04ffe6b7ee..e912331970 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s @@ -152,7 +152,7 @@ glabel L80244B80_A2EDC0 /* A2EE44 80244C04 8C440000 */ lw $a0, ($v0) /* A2EE48 80244C08 1080000F */ beqz $a0, .L80244C48 /* A2EE4C 80244C0C 00000000 */ nop -/* A2EE50 80244C10 0C04992C */ jal func_801264B0 +/* A2EE50 80244C10 0C04992C */ jal get_msg_lines /* A2EE54 80244C14 0000802D */ daddu $s0, $zero, $zero /* A2EE58 80244C18 28420002 */ slti $v0, $v0, 2 /* A2EE5C 80244C1C 50400001 */ beql $v0, $zero, .L80244C24 @@ -165,7 +165,7 @@ glabel L80244B80_A2EDC0 /* A2EE74 80244C34 AFA20010 */ sw $v0, 0x10($sp) /* A2EE78 80244C38 AFA00014 */ sw $zero, 0x14($sp) /* A2EE7C 80244C3C 8C640000 */ lw $a0, ($v1) -/* A2EE80 80244C40 0C04993B */ jal draw_string +/* A2EE80 80244C40 0C04993B */ jal draw_msg /* A2EE84 80244C44 0220382D */ daddu $a3, $s1, $zero .L80244C48: /* A2EE88 80244C48 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BFC_A4033C.s b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BFC_A4033C.s index cf50c62cd5..80e4c50e9e 100644 --- a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BFC_A4033C.s +++ b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BFC_A4033C.s @@ -12,12 +12,12 @@ glabel func_80240BFC_A4033C /* A40354 80240C14 0000202D */ daddu $a0, $zero, $zero /* A40358 80240C18 240500D0 */ addiu $a1, $zero, 0xd0 /* A4035C 80240C1C 00A0302D */ daddu $a2, $a1, $zero -/* A40360 80240C20 0C04DF84 */ jal func_80137E10 +/* A40360 80240C20 0C04DF84 */ jal set_transition_stencil_color /* A40364 80240C24 00A0382D */ daddu $a3, $a1, $zero /* A40368 80240C28 C6000074 */ lwc1 $f0, 0x74($s0) /* A4036C 80240C2C 46800020 */ cvt.s.w $f0, $f0 /* A40370 80240C30 44050000 */ mfc1 $a1, $f0 -/* A40374 80240C34 0C04DF62 */ jal func_80137D88 +/* A40374 80240C34 0C04DF62 */ jal set_transition_stencil_zoom_0 /* A40378 80240C38 24040001 */ addiu $a0, $zero, 1 /* A4037C 80240C3C 8E020074 */ lw $v0, 0x74($s0) /* A40380 80240C40 240300FF */ addiu $v1, $zero, 0xff diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s index ccbb30a035..e0f6ee1b6d 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s @@ -24,7 +24,7 @@ glabel func_80240B38_989698 /* 9896E4 80240B84 00A0382D */ daddu $a3, $a1, $zero /* 9896E8 80240B88 AE220088 */ sw $v0, 0x88($s1) /* 9896EC 80240B8C AE200070 */ sw $zero, 0x70($s1) -/* 9896F0 80240B90 0C04DF84 */ jal func_80137E10 +/* 9896F0 80240B90 0C04DF84 */ jal set_transition_stencil_color /* 9896F4 80240B94 AE200074 */ sw $zero, 0x74($s1) .L80240B98: /* 9896F8 80240B98 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80240B38_989698 /* 9897A8 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) /* 9897AC 80240C4C 46800020 */ cvt.s.w $f0, $f0 /* 9897B0 80240C50 44050000 */ mfc1 $a1, $f0 -/* 9897B4 80240C54 0C04DF62 */ jal func_80137D88 +/* 9897B4 80240C54 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 9897B8 80240C58 24040001 */ addiu $a0, $zero, 1 /* 9897BC 80240C5C 0240102D */ daddu $v0, $s2, $zero /* 9897C0 80240C60 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s index 0a429f6dd0..63aee7cd7d 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s @@ -24,7 +24,7 @@ glabel func_80240E28_91F398 /* 91F3E4 80240E74 00A0382D */ daddu $a3, $a1, $zero /* 91F3E8 80240E78 AE220088 */ sw $v0, 0x88($s1) /* 91F3EC 80240E7C AE200070 */ sw $zero, 0x70($s1) -/* 91F3F0 80240E80 0C04DF84 */ jal func_80137E10 +/* 91F3F0 80240E80 0C04DF84 */ jal set_transition_stencil_color /* 91F3F4 80240E84 AE200074 */ sw $zero, 0x74($s1) .L80240E88: /* 91F3F8 80240E88 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80240E28_91F398 /* 91F4A8 80240F38 C6200074 */ lwc1 $f0, 0x74($s1) /* 91F4AC 80240F3C 46800020 */ cvt.s.w $f0, $f0 /* 91F4B0 80240F40 44050000 */ mfc1 $a1, $f0 -/* 91F4B4 80240F44 0C04DF62 */ jal func_80137D88 +/* 91F4B4 80240F44 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 91F4B8 80240F48 24040001 */ addiu $a0, $zero, 1 /* 91F4BC 80240F4C 0240102D */ daddu $v0, $s2, $zero /* 91F4C0 80240F50 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414F8_B360C8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414F8_B360C8.s index 0b69b4afea..e7cdb77b85 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414F8_B360C8.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414F8_B360C8.s @@ -19,13 +19,13 @@ glabel func_802414F8_B360C8 /* B36100 80241530 0080282D */ daddu $a1, $a0, $zero /* B36104 80241534 0040802D */ daddu $s0, $v0, $zero /* B36108 80241538 240600BE */ addiu $a2, $zero, 0xbe -/* B3610C 8024153C 0C04DF93 */ jal func_80137E4C +/* B3610C 8024153C 0C04DF93 */ jal set_transition_stencil_center /* B36110 80241540 24070091 */ addiu $a3, $zero, 0x91 /* B36114 80241544 44900000 */ mtc1 $s0, $f0 /* B36118 80241548 00000000 */ nop /* B3611C 8024154C 46800020 */ cvt.s.w $f0, $f0 /* B36120 80241550 44050000 */ mfc1 $a1, $f0 -/* B36124 80241554 0C04DF62 */ jal func_80137D88 +/* B36124 80241554 0C04DF62 */ jal set_transition_stencil_zoom_0 /* B36128 80241558 322400FF */ andi $a0, $s1, 0xff /* B3612C 8024155C 8FBF0018 */ lw $ra, 0x18($sp) /* B36130 80241560 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802416C4_B36294.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802416C4_B36294.s index 3a62ee67f5..6fbcb82825 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802416C4_B36294.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802416C4_B36294.s @@ -24,7 +24,7 @@ glabel func_802416C4_B36294 /* B362E0 80241710 0000202D */ daddu $a0, $zero, $zero /* B362E4 80241714 324500FF */ andi $a1, $s2, 0xff /* B362E8 80241718 320600FF */ andi $a2, $s0, 0xff -/* B362EC 8024171C 0C04DF84 */ jal func_80137E10 +/* B362EC 8024171C 0C04DF84 */ jal set_transition_stencil_color /* B362F0 80241720 304700FF */ andi $a3, $v0, 0xff /* B362F4 80241724 8FBF001C */ lw $ra, 0x1c($sp) /* B362F8 80241728 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s index 6ccbca166b..bc368075d9 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s @@ -24,7 +24,7 @@ glabel func_80241198_B5F448 /* B5F494 802411E4 00A0382D */ daddu $a3, $a1, $zero /* B5F498 802411E8 AE220088 */ sw $v0, 0x88($s1) /* B5F49C 802411EC AE200070 */ sw $zero, 0x70($s1) -/* B5F4A0 802411F0 0C04DF84 */ jal func_80137E10 +/* B5F4A0 802411F0 0C04DF84 */ jal set_transition_stencil_color /* B5F4A4 802411F4 AE200074 */ sw $zero, 0x74($s1) .L802411F8: /* B5F4A8 802411F8 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80241198_B5F448 /* B5F558 802412A8 C6200074 */ lwc1 $f0, 0x74($s1) /* B5F55C 802412AC 46800020 */ cvt.s.w $f0, $f0 /* B5F560 802412B0 44050000 */ mfc1 $a1, $f0 -/* B5F564 802412B4 0C04DF62 */ jal func_80137D88 +/* B5F564 802412B4 0C04DF62 */ jal set_transition_stencil_zoom_0 /* B5F568 802412B8 24040001 */ addiu $a0, $zero, 1 /* B5F56C 802412BC 0240102D */ daddu $v0, $s2, $zero /* B5F570 802412C0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s index 73707b553f..c472aecc3a 100644 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s +++ b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s @@ -32,7 +32,7 @@ glabel func_80240000_B70860 /* B708C8 80240068 44063000 */ mfc1 $a2, $f6 /* B708CC 8024006C 4600018D */ trunc.w.s $f6, $f0 /* B708D0 80240070 44073000 */ mfc1 $a3, $f6 -/* B708D4 80240074 0C04DFB0 */ jal func_80137EC0 +/* B708D4 80240074 0C04DFB0 */ jal set_transition_stencil_center_worldpos /* B708D8 80240078 0080282D */ daddu $a1, $a0, $zero /* B708DC 8024007C 3C028011 */ lui $v0, %hi(D_8010EBB0) /* B708E0 80240080 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) @@ -82,10 +82,10 @@ glabel func_80240000_B70860 /* B7097C 8024011C C6060070 */ lwc1 $f6, 0x70($s0) /* B70980 80240120 468031A0 */ cvt.s.w $f6, $f6 /* B70984 80240124 44053000 */ mfc1 $a1, $f6 -/* B70988 80240128 0C04E035 */ jal func_801380D4 +/* B70988 80240128 0C04E035 */ jal set_transition_stencil_alpha /* B7098C 8024012C 24040001 */ addiu $a0, $zero, 1 /* B70990 80240130 3C05437F */ lui $a1, 0x437f -/* B70994 80240134 0C04DF69 */ jal func_80137DA4 +/* B70994 80240134 0C04DF69 */ jal set_transition_stencil_zoom_1 /* B70998 80240138 2404000B */ addiu $a0, $zero, 0xb /* B7099C 8024013C 8FBF0024 */ lw $ra, 0x24($sp) /* B709A0 80240140 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s index 13cc96050c..c27b9f5d2f 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s @@ -32,7 +32,7 @@ glabel func_80240000_8A9A10 /* 8A9A78 80240068 44063000 */ mfc1 $a2, $f6 /* 8A9A7C 8024006C 4600018D */ trunc.w.s $f6, $f0 /* 8A9A80 80240070 44073000 */ mfc1 $a3, $f6 -/* 8A9A84 80240074 0C04DFB0 */ jal func_80137EC0 +/* 8A9A84 80240074 0C04DFB0 */ jal set_transition_stencil_center_worldpos /* 8A9A88 80240078 0080282D */ daddu $a1, $a0, $zero /* 8A9A8C 8024007C 3C028011 */ lui $v0, %hi(D_8010EBB0) /* 8A9A90 80240080 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) @@ -82,10 +82,10 @@ glabel func_80240000_8A9A10 /* 8A9B2C 8024011C C6060070 */ lwc1 $f6, 0x70($s0) /* 8A9B30 80240120 468031A0 */ cvt.s.w $f6, $f6 /* 8A9B34 80240124 44053000 */ mfc1 $a1, $f6 -/* 8A9B38 80240128 0C04E035 */ jal func_801380D4 +/* 8A9B38 80240128 0C04E035 */ jal set_transition_stencil_alpha /* 8A9B3C 8024012C 24040001 */ addiu $a0, $zero, 1 /* 8A9B40 80240130 3C05437F */ lui $a1, 0x437f -/* 8A9B44 80240134 0C04DF69 */ jal func_80137DA4 +/* 8A9B44 80240134 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 8A9B48 80240138 2404000B */ addiu $a0, $zero, 0xb /* 8A9B4C 8024013C 8FBF0024 */ lw $ra, 0x24($sp) /* 8A9B50 80240140 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s b/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s index e4e46a78ee..6deeec764c 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s +++ b/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s @@ -32,7 +32,7 @@ glabel func_80240000_8AA450 /* 8AA4B8 80240068 44063000 */ mfc1 $a2, $f6 /* 8AA4BC 8024006C 4600018D */ trunc.w.s $f6, $f0 /* 8AA4C0 80240070 44073000 */ mfc1 $a3, $f6 -/* 8AA4C4 80240074 0C04DFB0 */ jal func_80137EC0 +/* 8AA4C4 80240074 0C04DFB0 */ jal set_transition_stencil_center_worldpos /* 8AA4C8 80240078 0080282D */ daddu $a1, $a0, $zero /* 8AA4CC 8024007C 3C028011 */ lui $v0, %hi(D_8010EBB0) /* 8AA4D0 80240080 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) @@ -82,10 +82,10 @@ glabel func_80240000_8AA450 /* 8AA56C 8024011C C6060070 */ lwc1 $f6, 0x70($s0) /* 8AA570 80240120 468031A0 */ cvt.s.w $f6, $f6 /* 8AA574 80240124 44053000 */ mfc1 $a1, $f6 -/* 8AA578 80240128 0C04E035 */ jal func_801380D4 +/* 8AA578 80240128 0C04E035 */ jal set_transition_stencil_alpha /* 8AA57C 8024012C 24040001 */ addiu $a0, $zero, 1 /* 8AA580 80240130 3C05437F */ lui $a1, 0x437f -/* 8AA584 80240134 0C04DF69 */ jal func_80137DA4 +/* 8AA584 80240134 0C04DF69 */ jal set_transition_stencil_zoom_1 /* 8AA588 80240138 2404000B */ addiu $a0, $zero, 0xb /* 8AA58C 8024013C 8FBF0024 */ lw $ra, 0x24($sp) /* 8AA590 80240140 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240F40_ABC1D0.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240F40_ABC1D0.s index 18ce43b1f1..62557c0685 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240F40_ABC1D0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240F40_ABC1D0.s @@ -12,12 +12,12 @@ glabel func_80240F40_ABC1D0 /* ABC1E8 80240F58 0000202D */ daddu $a0, $zero, $zero /* ABC1EC 80240F5C 240500D0 */ addiu $a1, $zero, 0xd0 /* ABC1F0 80240F60 00A0302D */ daddu $a2, $a1, $zero -/* ABC1F4 80240F64 0C04DF84 */ jal func_80137E10 +/* ABC1F4 80240F64 0C04DF84 */ jal set_transition_stencil_color /* ABC1F8 80240F68 00A0382D */ daddu $a3, $a1, $zero /* ABC1FC 80240F6C C6000074 */ lwc1 $f0, 0x74($s0) /* ABC200 80240F70 46800020 */ cvt.s.w $f0, $f0 /* ABC204 80240F74 44050000 */ mfc1 $a1, $f0 -/* ABC208 80240F78 0C04DF62 */ jal func_80137D88 +/* ABC208 80240F78 0C04DF62 */ jal set_transition_stencil_zoom_0 /* ABC20C 80240F7C 24040001 */ addiu $a0, $zero, 1 /* ABC210 80240F80 8E020074 */ lw $v0, 0x74($s0) /* ABC214 80240F84 240300FF */ addiu $v1, $zero, 0xff diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802403F0_AD62C0.s b/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802403F0_AD62C0.s index 9902add225..855bf53cb7 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802403F0_AD62C0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802403F0_AD62C0.s @@ -20,12 +20,12 @@ glabel func_802403F0_AD62C0 .L80240428: /* AD62F8 80240428 240500A0 */ addiu $a1, $zero, 0xa0 /* AD62FC 8024042C 00A0302D */ daddu $a2, $a1, $zero -/* AD6300 80240430 0C04DF84 */ jal func_80137E10 +/* AD6300 80240430 0C04DF84 */ jal set_transition_stencil_color /* AD6304 80240434 00A0382D */ daddu $a3, $a1, $zero /* AD6308 80240438 C6000074 */ lwc1 $f0, 0x74($s0) /* AD630C 8024043C 46800020 */ cvt.s.w $f0, $f0 /* AD6310 80240440 44050000 */ mfc1 $a1, $f0 -/* AD6314 80240444 0C04DF62 */ jal func_80137D88 +/* AD6314 80240444 0C04DF62 */ jal set_transition_stencil_zoom_0 /* AD6318 80240448 24040001 */ addiu $a0, $zero, 1 /* AD631C 8024044C 8E020074 */ lw $v0, 0x74($s0) /* AD6320 80240450 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_8024046C_AD633C.s b/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_8024046C_AD633C.s index 8de0fd50e4..c2e070b4a5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_8024046C_AD633C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_8024046C_AD633C.s @@ -19,12 +19,12 @@ glabel func_8024046C_AD633C /* AD636C 8024049C 0000202D */ daddu $a0, $zero, $zero /* AD6370 802404A0 240500A0 */ addiu $a1, $zero, 0xa0 /* AD6374 802404A4 00A0302D */ daddu $a2, $a1, $zero -/* AD6378 802404A8 0C04DF84 */ jal func_80137E10 +/* AD6378 802404A8 0C04DF84 */ jal set_transition_stencil_color /* AD637C 802404AC 00A0382D */ daddu $a3, $a1, $zero /* AD6380 802404B0 C6000074 */ lwc1 $f0, 0x74($s0) /* AD6384 802404B4 46800020 */ cvt.s.w $f0, $f0 /* AD6388 802404B8 44050000 */ mfc1 $a1, $f0 -/* AD638C 802404BC 0C04DF62 */ jal func_80137D88 +/* AD638C 802404BC 0C04DF62 */ jal set_transition_stencil_zoom_0 /* AD6390 802404C0 24040001 */ addiu $a0, $zero, 1 /* AD6394 802404C4 8E020074 */ lw $v0, 0x74($s0) /* AD6398 802404C8 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240068_AF79B8.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240068_AF79B8.s index 493d4149d3..c0e16f049b 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240068_AF79B8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240068_AF79B8.s @@ -17,10 +17,10 @@ glabel func_80240068_AF79B8 /* AF79E4 80240094 3C108014 */ lui $s0, %hi(D_80147574) /* AF79E8 80240098 26107574 */ addiu $s0, $s0, %lo(D_80147574) .L8024009C: -/* AF79EC 8024009C 0C051F9F */ jal func_80147E7C +/* AF79EC 8024009C 0C051F9F */ jal set_window_update /* AF79F0 802400A0 0200282D */ daddu $a1, $s0, $zero /* AF79F4 802400A4 2404000B */ addiu $a0, $zero, 0xb -/* AF79F8 802400A8 0C051F9F */ jal func_80147E7C +/* AF79F8 802400A8 0C051F9F */ jal set_window_update /* AF79FC 802400AC 0200282D */ daddu $a1, $s0, $zero /* AF7A00 802400B0 3C038024 */ lui $v1, %hi(D_80240E8C_AF87DC) /* AF7A04 802400B4 24630E8C */ addiu $v1, $v1, %lo(D_80240E8C_AF87DC) diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s index 102081b7cc..0267df6a99 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s @@ -31,7 +31,7 @@ glabel func_802400E4_AF7A34 /* AF7A9C 8024014C AFA00010 */ sw $zero, 0x10($sp) /* AF7AA0 80240150 AFA00014 */ sw $zero, 0x14($sp) /* AF7AA4 80240154 8E040000 */ lw $a0, ($s0) -/* AF7AA8 80240158 0C04993B */ jal draw_string +/* AF7AA8 80240158 0C04993B */ jal draw_msg /* AF7AAC 8024015C 240700FF */ addiu $a3, $zero, 0xff /* AF7AB0 80240160 8FBF0024 */ lw $ra, 0x24($sp) /* AF7AB4 80240164 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s index 7c60a64bc8..dd5b6014c7 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s @@ -32,7 +32,7 @@ glabel func_80240178_AF7AC8 /* AF7B30 802401E0 AFA00014 */ sw $zero, 0x14($sp) /* AF7B34 802401E4 8C840014 */ lw $a0, 0x14($a0) .L802401E8: -/* AF7B38 802401E8 0C04993B */ jal draw_string +/* AF7B38 802401E8 0C04993B */ jal draw_msg /* AF7B3C 802401EC 240700FF */ addiu $a3, $zero, 0xff /* AF7B40 802401F0 8FBF0018 */ lw $ra, 0x18($sp) /* AF7B44 802401F4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s index 3be2ab54a8..c92bf46ca7 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s @@ -21,7 +21,7 @@ glabel func_802401FC_AF7B4C /* AF7B8C 8024023C 0040202D */ daddu $a0, $v0, $zero /* AF7B90 80240240 3C048024 */ lui $a0, %hi(D_80240EF0_AF8840) /* AF7B94 80240244 24840EF0 */ addiu $a0, $a0, %lo(D_80240EF0_AF8840) -/* AF7B98 80240248 0C051FCC */ jal func_80147F30 +/* AF7B98 80240248 0C051FCC */ jal setup_pause_menu_tab /* AF7B9C 8024024C 24050002 */ addiu $a1, $zero, 2 /* AF7BA0 80240250 0000802D */ daddu $s0, $zero, $zero /* AF7BA4 80240254 24120003 */ addiu $s2, $zero, 3 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C4C_AF859C.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C4C_AF859C.s index a883f85598..3964a04e97 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C4C_AF859C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C4C_AF859C.s @@ -20,7 +20,7 @@ glabel func_80240C4C_AF859C /* 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 func_80137D88 +/* AF85DC 80240C8C 0C04DF62 */ jal set_transition_stencil_zoom_0 /* AF85E0 80240C90 0000202D */ daddu $a0, $zero, $zero /* AF85E4 80240C94 8E020074 */ lw $v0, 0x74($s0) /* AF85E8 80240C98 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240CB4_AF8604.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240CB4_AF8604.s index 00076ee093..580bb589df 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240CB4_AF8604.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240CB4_AF8604.s @@ -16,7 +16,7 @@ glabel func_80240CB4_AF8604 /* AF862C 80240CDC 00000000 */ nop /* AF8630 80240CE0 46800020 */ cvt.s.w $f0, $f0 /* AF8634 80240CE4 44050000 */ mfc1 $a1, $f0 -/* AF8638 80240CE8 0C04DF62 */ jal func_80137D88 +/* AF8638 80240CE8 0C04DF62 */ jal set_transition_stencil_zoom_0 /* AF863C 80240CEC 0000202D */ daddu $a0, $zero, $zero /* AF8640 80240CF0 08090340 */ j .L80240D00 /* AF8644 80240CF4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240308_AFDE48.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240308_AFDE48.s index 5b63cdfedf..d30f4382a8 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240308_AFDE48.s +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240308_AFDE48.s @@ -19,13 +19,13 @@ glabel func_80240308_AFDE48 /* AFDE80 80240340 0080282D */ daddu $a1, $a0, $zero /* AFDE84 80240344 0040802D */ daddu $s0, $v0, $zero /* AFDE88 80240348 240600BE */ addiu $a2, $zero, 0xbe -/* AFDE8C 8024034C 0C04DF93 */ jal func_80137E4C +/* AFDE8C 8024034C 0C04DF93 */ jal set_transition_stencil_center /* AFDE90 80240350 24070091 */ addiu $a3, $zero, 0x91 /* AFDE94 80240354 44900000 */ mtc1 $s0, $f0 /* AFDE98 80240358 00000000 */ nop /* AFDE9C 8024035C 46800020 */ cvt.s.w $f0, $f0 /* AFDEA0 80240360 44050000 */ mfc1 $a1, $f0 -/* AFDEA4 80240364 0C04DF62 */ jal func_80137D88 +/* AFDEA4 80240364 0C04DF62 */ jal set_transition_stencil_zoom_0 /* AFDEA8 80240368 322400FF */ andi $a0, $s1, 0xff /* AFDEAC 8024036C 8FBF0018 */ lw $ra, 0x18($sp) /* AFDEB0 80240370 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802404D4_AFE014.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802404D4_AFE014.s index 56f222d48f..22d9ef8aa2 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802404D4_AFE014.s +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802404D4_AFE014.s @@ -24,7 +24,7 @@ glabel func_802404D4_AFE014 /* AFE060 80240520 0000202D */ daddu $a0, $zero, $zero /* AFE064 80240524 324500FF */ andi $a1, $s2, 0xff /* AFE068 80240528 320600FF */ andi $a2, $s0, 0xff -/* AFE06C 8024052C 0C04DF84 */ jal func_80137E10 +/* AFE06C 8024052C 0C04DF84 */ jal set_transition_stencil_color /* AFE070 80240530 304700FF */ andi $a3, $v0, 0xff /* AFE074 80240534 8FBF001C */ lw $ra, 0x1c($sp) /* AFE078 80240538 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06A20/func_80240020_B06A20.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06A20/func_80240020_B06A20.s index 47d211fa7a..911d1cccc2 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06A20/func_80240020_B06A20.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06A20/func_80240020_B06A20.s @@ -7,7 +7,7 @@ glabel func_80240020_B06A20 /* B06A28 80240028 0C03A6D5 */ jal increment_status_menu_disabled /* B06A2C 8024002C 00000000 */ nop /* B06A30 80240030 3C05437F */ lui $a1, 0x437f -/* B06A34 80240034 0C04DF69 */ jal func_80137DA4 +/* B06A34 80240034 0C04DF69 */ jal set_transition_stencil_zoom_1 /* B06A38 80240038 0000202D */ daddu $a0, $zero, $zero /* B06A3C 8024003C 8FBF0010 */ lw $ra, 0x10($sp) /* B06A40 80240040 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240D30_B07730.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240D30_B07730.s index 33e6d4e5f8..23fd4119d5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240D30_B07730.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240D30_B07730.s @@ -21,12 +21,12 @@ glabel func_80240D30_B07730 /* B07768 80240D68 0000202D */ daddu $a0, $zero, $zero /* B0776C 80240D6C 240500D0 */ addiu $a1, $zero, 0xd0 /* B07770 80240D70 0080302D */ daddu $a2, $a0, $zero -/* B07774 80240D74 0C04DF84 */ jal func_80137E10 +/* B07774 80240D74 0C04DF84 */ jal set_transition_stencil_color /* B07778 80240D78 0080382D */ daddu $a3, $a0, $zero /* B0777C 80240D7C C6000074 */ lwc1 $f0, 0x74($s0) /* B07780 80240D80 46800020 */ cvt.s.w $f0, $f0 /* B07784 80240D84 44050000 */ mfc1 $a1, $f0 -/* B07788 80240D88 0C04DF62 */ jal func_80137D88 +/* B07788 80240D88 0C04DF62 */ jal set_transition_stencil_zoom_0 /* B0778C 80240D8C 24040001 */ addiu $a0, $zero, 1 /* B07790 80240D90 8E020074 */ lw $v0, 0x74($s0) /* B07794 80240D94 240300FF */ addiu $v1, $zero, 0xff @@ -53,10 +53,10 @@ glabel func_80240D30_B07730 /* B077E4 80240DE4 000217C3 */ sra $v0, $v0, 0x1f /* B077E8 80240DE8 00C23023 */ subu $a2, $a2, $v0 /* B077EC 80240DEC 30C600FF */ andi $a2, $a2, 0xff -/* B077F0 80240DF0 0C04DF84 */ jal func_80137E10 +/* B077F0 80240DF0 0C04DF84 */ jal set_transition_stencil_color /* B077F4 80240DF4 00C0382D */ daddu $a3, $a2, $zero /* B077F8 80240DF8 3C05437F */ lui $a1, 0x437f -/* B077FC 80240DFC 0C04DF62 */ jal func_80137D88 +/* B077FC 80240DFC 0C04DF62 */ jal set_transition_stencil_zoom_0 /* B07800 80240E00 24040001 */ addiu $a0, $zero, 1 /* B07804 80240E04 8E020074 */ lw $v0, 0x74($s0) /* B07808 80240E08 240300FF */ addiu $v1, $zero, 0xff diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240E54_B07854.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240E54_B07854.s index 2dbe7c00ec..ce5cf8c087 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240E54_B07854.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240E54_B07854.s @@ -13,7 +13,7 @@ glabel func_80240E54_B07854 /* B07870 80240E70 C6000074 */ lwc1 $f0, 0x74($s0) /* B07874 80240E74 46800020 */ cvt.s.w $f0, $f0 /* B07878 80240E78 44050000 */ mfc1 $a1, $f0 -/* B0787C 80240E7C 0C04DF62 */ jal func_80137D88 +/* B0787C 80240E7C 0C04DF62 */ jal set_transition_stencil_zoom_0 /* B07880 80240E80 24040001 */ addiu $a0, $zero, 1 /* B07884 80240E84 8E020074 */ lw $v0, 0x74($s0) /* B07888 80240E88 14400003 */ bnez $v0, .L80240E98 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s index 4a2be860d9..f038424dee 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s @@ -4,7 +4,7 @@ glabel func_802427EC_8B285C /* 8B285C 802427EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 8B2860 802427F0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B2864 802427F4 0C03A5EE */ jal func_800E97B8 +/* 8B2864 802427F4 0C03A5EE */ jal close_status_menu /* 8B2868 802427F8 00000000 */ nop /* 8B286C 802427FC 8FBF0010 */ lw $ra, 0x10($sp) /* 8B2870 80242800 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s index 7620bcd018..fb86efd685 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s @@ -19,13 +19,13 @@ glabel func_802430B8_8B3128 /* 8B3160 802430F0 0080282D */ daddu $a1, $a0, $zero /* 8B3164 802430F4 0040802D */ daddu $s0, $v0, $zero /* 8B3168 802430F8 240600BE */ addiu $a2, $zero, 0xbe -/* 8B316C 802430FC 0C04DF93 */ jal func_80137E4C +/* 8B316C 802430FC 0C04DF93 */ jal set_transition_stencil_center /* 8B3170 80243100 24070091 */ addiu $a3, $zero, 0x91 /* 8B3174 80243104 44900000 */ mtc1 $s0, $f0 /* 8B3178 80243108 00000000 */ nop /* 8B317C 8024310C 46800020 */ cvt.s.w $f0, $f0 /* 8B3180 80243110 44050000 */ mfc1 $a1, $f0 -/* 8B3184 80243114 0C04DF62 */ jal func_80137D88 +/* 8B3184 80243114 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 8B3188 80243118 322400FF */ andi $a0, $s1, 0xff /* 8B318C 8024311C 8FBF0018 */ lw $ra, 0x18($sp) /* 8B3190 80243120 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284_8B32F4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284_8B32F4.s index c445cf8bd6..0093b509da 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284_8B32F4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284_8B32F4.s @@ -24,7 +24,7 @@ glabel func_80243284_8B32F4 /* 8B3340 802432D0 0000202D */ daddu $a0, $zero, $zero /* 8B3344 802432D4 324500FF */ andi $a1, $s2, 0xff /* 8B3348 802432D8 320600FF */ andi $a2, $s0, 0xff -/* 8B334C 802432DC 0C04DF84 */ jal func_80137E10 +/* 8B334C 802432DC 0C04DF84 */ jal set_transition_stencil_color /* 8B3350 802432E0 304700FF */ andi $a3, $v0, 0xff /* 8B3354 802432E4 8FBF001C */ lw $ra, 0x1c($sp) /* 8B3358 802432E8 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s index bf74b5d3c3..0ae0c6e615 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s @@ -145,7 +145,7 @@ glabel func_802406C8_8EC4E8 /* 8EC6E0 802408C0 AC820328 */ sw $v0, 0x328($a0) /* 8EC6E4 802408C4 0C03A631 */ jal func_800E98C4 /* 8EC6E8 802408C8 00000000 */ nop -/* 8EC6EC 802408CC 0C03A5EE */ jal func_800E97B8 +/* 8EC6EC 802408CC 0C03A5EE */ jal close_status_menu /* 8EC6F0 802408D0 00000000 */ nop /* 8EC6F4 802408D4 24020001 */ addiu $v0, $zero, 1 /* 8EC6F8 802408D8 AE800074 */ sw $zero, 0x74($s4) diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s index 670002b1d6..34d515b9d2 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s @@ -88,7 +88,7 @@ glabel func_80240B54_8EC974 /* 8ECAA4 80240C84 AC820328 */ sw $v0, 0x328($a0) /* 8ECAA8 80240C88 0C03A631 */ jal func_800E98C4 /* 8ECAAC 80240C8C 00000000 */ nop -/* 8ECAB0 80240C90 0C03A5EE */ jal func_800E97B8 +/* 8ECAB0 80240C90 0C03A5EE */ jal close_status_menu /* 8ECAB4 80240C94 00000000 */ nop /* 8ECAB8 80240C98 24020001 */ addiu $v0, $zero, 1 /* 8ECABC 80240C9C AE800074 */ sw $zero, 0x74($s4) diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s index 02567edada..f31280b935 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s @@ -19,13 +19,13 @@ glabel func_802412E8_8ED108 /* 8ED140 80241320 0080282D */ daddu $a1, $a0, $zero /* 8ED144 80241324 0040802D */ daddu $s0, $v0, $zero /* 8ED148 80241328 240600BE */ addiu $a2, $zero, 0xbe -/* 8ED14C 8024132C 0C04DF93 */ jal func_80137E4C +/* 8ED14C 8024132C 0C04DF93 */ jal set_transition_stencil_center /* 8ED150 80241330 24070091 */ addiu $a3, $zero, 0x91 /* 8ED154 80241334 44900000 */ mtc1 $s0, $f0 /* 8ED158 80241338 00000000 */ nop /* 8ED15C 8024133C 46800020 */ cvt.s.w $f0, $f0 /* 8ED160 80241340 44050000 */ mfc1 $a1, $f0 -/* 8ED164 80241344 0C04DF62 */ jal func_80137D88 +/* 8ED164 80241344 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 8ED168 80241348 322400FF */ andi $a0, $s1, 0xff /* 8ED16C 8024134C 8FBF0018 */ lw $ra, 0x18($sp) /* 8ED170 80241350 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4_8ED2D4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4_8ED2D4.s index 66a6d94837..486c6f983e 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4_8ED2D4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4_8ED2D4.s @@ -24,7 +24,7 @@ glabel func_802414B4_8ED2D4 /* 8ED320 80241500 0000202D */ daddu $a0, $zero, $zero /* 8ED324 80241504 324500FF */ andi $a1, $s2, 0xff /* 8ED328 80241508 320600FF */ andi $a2, $s0, 0xff -/* 8ED32C 8024150C 0C04DF84 */ jal func_80137E10 +/* 8ED32C 8024150C 0C04DF84 */ jal set_transition_stencil_color /* 8ED330 80241510 304700FF */ andi $a3, $v0, 0xff /* 8ED334 80241514 8FBF001C */ lw $ra, 0x1c($sp) /* 8ED338 80241518 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084_8EDEA4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084_8EDEA4.s index d1e5f2b321..42086f8bb7 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084_8EDEA4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084_8EDEA4.s @@ -20,7 +20,7 @@ glabel func_80242084_8EDEA4 /* 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 func_80137D88 +/* 8EDEE4 802420C4 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 8EDEE8 802420C8 0000202D */ daddu $a0, $zero, $zero /* 8EDEEC 802420CC 8E020074 */ lw $v0, 0x74($s0) /* 8EDEF0 802420D0 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC_8EDF0C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC_8EDF0C.s index 4eed322ac3..c2f19d0c39 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC_8EDF0C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC_8EDF0C.s @@ -16,7 +16,7 @@ glabel func_802420EC_8EDF0C /* 8EDF34 80242114 00000000 */ nop /* 8EDF38 80242118 46800020 */ cvt.s.w $f0, $f0 /* 8EDF3C 8024211C 44050000 */ mfc1 $a1, $f0 -/* 8EDF40 80242120 0C04DF62 */ jal func_80137D88 +/* 8EDF40 80242120 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 8EDF44 80242124 0000202D */ daddu $a0, $zero, $zero /* 8EDF48 80242128 0809084E */ j .L80242138 /* 8EDF4C 8024212C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s index 12ede7059f..a9b747a8e3 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s @@ -113,7 +113,7 @@ glabel func_802421A0_8EDFC0 /* 8EE168 80242348 24060032 */ addiu $a2, $zero, 0x32 /* 8EE16C 8024234C 0200382D */ daddu $a3, $s0, $zero /* 8EE170 80242350 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE174 80242354 0C04993B */ jal draw_string +/* 8EE174 80242354 0C04993B */ jal draw_msg /* 8EE178 80242358 AFB10014 */ sw $s1, 0x14($sp) /* 8EE17C 8024235C 240500D8 */ addiu $a1, $zero, 0xd8 /* 8EE180 80242360 24060033 */ addiu $a2, $zero, 0x33 @@ -136,7 +136,7 @@ glabel func_802421A0_8EDFC0 /* 8EE1C4 802423A4 24060041 */ addiu $a2, $zero, 0x41 /* 8EE1C8 802423A8 0200382D */ daddu $a3, $s0, $zero /* 8EE1CC 802423AC AFA00010 */ sw $zero, 0x10($sp) -/* 8EE1D0 802423B0 0C04993B */ jal draw_string +/* 8EE1D0 802423B0 0C04993B */ jal draw_msg /* 8EE1D4 802423B4 AFB10014 */ sw $s1, 0x14($sp) /* 8EE1D8 802423B8 240500E7 */ addiu $a1, $zero, 0xe7 /* 8EE1DC 802423BC 24060042 */ addiu $a2, $zero, 0x42 @@ -153,7 +153,7 @@ glabel func_802421A0_8EDFC0 /* 8EE208 802423E8 2406003F */ addiu $a2, $zero, 0x3f /* 8EE20C 802423EC 0200382D */ daddu $a3, $s0, $zero /* 8EE210 802423F0 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE214 802423F4 0C04993B */ jal draw_string +/* 8EE214 802423F4 0C04993B */ jal draw_msg /* 8EE218 802423F8 AFA00014 */ sw $zero, 0x14($sp) /* 8EE21C 802423FC 24040050 */ addiu $a0, $zero, 0x50 /* 8EE220 80242400 240500F4 */ addiu $a1, $zero, 0xf4 @@ -171,7 +171,7 @@ glabel func_802421A0_8EDFC0 /* 8EE250 80242430 24060050 */ addiu $a2, $zero, 0x50 /* 8EE254 80242434 0200382D */ daddu $a3, $s0, $zero /* 8EE258 80242438 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE25C 8024243C 0C04993B */ jal draw_string +/* 8EE25C 8024243C 0C04993B */ jal draw_msg /* 8EE260 80242440 AFB10014 */ sw $s1, 0x14($sp) /* 8EE264 80242444 08090937 */ j .L802424DC /* 8EE268 80242448 3C04000B */ lui $a0, 0xb @@ -185,7 +185,7 @@ glabel func_802421A0_8EDFC0 /* 8EE284 80242464 24060050 */ addiu $a2, $zero, 0x50 /* 8EE288 80242468 0200382D */ daddu $a3, $s0, $zero /* 8EE28C 8024246C AFA00010 */ sw $zero, 0x10($sp) -/* 8EE290 80242470 0C04993B */ jal draw_string +/* 8EE290 80242470 0C04993B */ jal draw_msg /* 8EE294 80242474 AFB10014 */ sw $s1, 0x14($sp) /* 8EE298 80242478 240500E7 */ addiu $a1, $zero, 0xe7 /* 8EE29C 8024247C 24060051 */ addiu $a2, $zero, 0x51 @@ -201,7 +201,7 @@ glabel func_802421A0_8EDFC0 /* 8EE2C4 802424A4 2406004E */ addiu $a2, $zero, 0x4e /* 8EE2C8 802424A8 0200382D */ daddu $a3, $s0, $zero /* 8EE2CC 802424AC AFA00010 */ sw $zero, 0x10($sp) -/* 8EE2D0 802424B0 0C04993B */ jal draw_string +/* 8EE2D0 802424B0 0C04993B */ jal draw_msg /* 8EE2D4 802424B4 AFA00014 */ sw $zero, 0x14($sp) /* 8EE2D8 802424B8 240400A0 */ addiu $a0, $zero, 0xa0 /* 8EE2DC 802424BC 240500F4 */ addiu $a1, $zero, 0xf4 @@ -226,7 +226,7 @@ glabel func_802421A0_8EDFC0 /* 8EE324 80242504 0200382D */ daddu $a3, $s0, $zero /* 8EE328 80242508 24020001 */ addiu $v0, $zero, 1 /* 8EE32C 8024250C AFA00010 */ sw $zero, 0x10($sp) -/* 8EE330 80242510 0C04993B */ jal draw_string +/* 8EE330 80242510 0C04993B */ jal draw_msg /* 8EE334 80242514 AFA20014 */ sw $v0, 0x14($sp) /* 8EE338 80242518 0809097C */ j .L802425F0 /* 8EE33C 8024251C 00000000 */ nop @@ -241,7 +241,7 @@ glabel func_802421A0_8EDFC0 /* 8EE35C 8024253C 0200382D */ daddu $a3, $s0, $zero /* 8EE360 80242540 24020001 */ addiu $v0, $zero, 1 /* 8EE364 80242544 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE368 80242548 0C04993B */ jal draw_string +/* 8EE368 80242548 0C04993B */ jal draw_msg /* 8EE36C 8024254C AFA20014 */ sw $v0, 0x14($sp) /* 8EE370 80242550 0000202D */ daddu $a0, $zero, $zero /* 8EE374 80242554 240500E7 */ addiu $a1, $zero, 0xe7 @@ -256,7 +256,7 @@ glabel func_802421A0_8EDFC0 /* 8EE394 80242574 0200382D */ daddu $a3, $s0, $zero /* 8EE398 80242578 24020001 */ addiu $v0, $zero, 1 /* 8EE39C 8024257C AFA00010 */ sw $zero, 0x10($sp) -/* 8EE3A0 80242580 0C04993B */ jal draw_string +/* 8EE3A0 80242580 0C04993B */ jal draw_msg /* 8EE3A4 80242584 AFA20014 */ sw $v0, 0x14($sp) /* 8EE3A8 80242588 240500E7 */ addiu $a1, $zero, 0xe7 /* 8EE3AC 8024258C 24060060 */ addiu $a2, $zero, 0x60 @@ -274,7 +274,7 @@ glabel func_802421A0_8EDFC0 /* 8EE3D8 802425B8 2406005D */ addiu $a2, $zero, 0x5d /* 8EE3DC 802425BC 0200382D */ daddu $a3, $s0, $zero /* 8EE3E0 802425C0 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE3E4 802425C4 0C04993B */ jal draw_string +/* 8EE3E4 802425C4 0C04993B */ jal draw_msg /* 8EE3E8 802425C8 AFA00014 */ sw $zero, 0x14($sp) /* 8EE3EC 802425CC 240500F4 */ addiu $a1, $zero, 0xf4 /* 8EE3F0 802425D0 2406005F */ addiu $a2, $zero, 0x5f @@ -297,7 +297,7 @@ glabel func_802421A0_8EDFC0 /* 8EE430 80242610 0200382D */ daddu $a3, $s0, $zero /* 8EE434 80242614 24020001 */ addiu $v0, $zero, 1 /* 8EE438 80242618 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE43C 8024261C 0C04993B */ jal draw_string +/* 8EE43C 8024261C 0C04993B */ jal draw_msg /* 8EE440 80242620 AFA20014 */ sw $v0, 0x14($sp) /* 8EE444 80242624 080909B3 */ j .L802426CC /* 8EE448 80242628 3C04000B */ lui $a0, 0xb @@ -313,7 +313,7 @@ glabel func_802421A0_8EDFC0 /* 8EE46C 8024264C 0200382D */ daddu $a3, $s0, $zero /* 8EE470 80242650 24020001 */ addiu $v0, $zero, 1 /* 8EE474 80242654 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE478 80242658 0C04993B */ jal draw_string +/* 8EE478 80242658 0C04993B */ jal draw_msg /* 8EE47C 8024265C AFA20014 */ sw $v0, 0x14($sp) /* 8EE480 80242660 240500E7 */ addiu $a1, $zero, 0xe7 /* 8EE484 80242664 2406006F */ addiu $a2, $zero, 0x6f @@ -330,7 +330,7 @@ glabel func_802421A0_8EDFC0 /* 8EE4B0 80242690 2406006C */ addiu $a2, $zero, 0x6c /* 8EE4B4 80242694 0200382D */ daddu $a3, $s0, $zero /* 8EE4B8 80242698 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE4BC 8024269C 0C04993B */ jal draw_string +/* 8EE4BC 8024269C 0C04993B */ jal draw_msg /* 8EE4C0 802426A0 AFA00014 */ sw $zero, 0x14($sp) /* 8EE4C4 802426A4 240500F4 */ addiu $a1, $zero, 0xf4 /* 8EE4C8 802426A8 2406006F */ addiu $a2, $zero, 0x6f @@ -354,7 +354,7 @@ glabel func_802421A0_8EDFC0 /* 8EE50C 802426EC 0200382D */ daddu $a3, $s0, $zero /* 8EE510 802426F0 24120001 */ addiu $s2, $zero, 1 /* 8EE514 802426F4 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE518 802426F8 0C04993B */ jal draw_string +/* 8EE518 802426F8 0C04993B */ jal draw_msg /* 8EE51C 802426FC AFB20014 */ sw $s2, 0x14($sp) /* 8EE520 80242700 240500D8 */ addiu $a1, $zero, 0xd8 /* 8EE524 80242704 2406007E */ addiu $a2, $zero, 0x7e @@ -377,7 +377,7 @@ glabel func_802421A0_8EDFC0 /* 8EE568 80242748 2406008C */ addiu $a2, $zero, 0x8c /* 8EE56C 8024274C 0200382D */ daddu $a3, $s0, $zero /* 8EE570 80242750 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE574 80242754 0C04993B */ jal draw_string +/* 8EE574 80242754 0C04993B */ jal draw_msg /* 8EE578 80242758 AFB20014 */ sw $s2, 0x14($sp) /* 8EE57C 8024275C 240500D8 */ addiu $a1, $zero, 0xd8 /* 8EE580 80242760 2406008D */ addiu $a2, $zero, 0x8d @@ -397,7 +397,7 @@ glabel func_802421A0_8EDFC0 /* 8EE5B8 80242798 2406009B */ addiu $a2, $zero, 0x9b /* 8EE5BC 8024279C 0200382D */ daddu $a3, $s0, $zero /* 8EE5C0 802427A0 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE5C4 802427A4 0C04993B */ jal draw_string +/* 8EE5C4 802427A4 0C04993B */ jal draw_msg /* 8EE5C8 802427A8 AFB20014 */ sw $s2, 0x14($sp) /* 8EE5CC 802427AC 240500D8 */ addiu $a1, $zero, 0xd8 /* 8EE5D0 802427B0 2406009C */ addiu $a2, $zero, 0x9c @@ -415,7 +415,7 @@ glabel func_802421A0_8EDFC0 /* 8EE600 802427E0 240600AA */ addiu $a2, $zero, 0xaa /* 8EE604 802427E4 0200382D */ daddu $a3, $s0, $zero /* 8EE608 802427E8 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE60C 802427EC 0C04993B */ jal draw_string +/* 8EE60C 802427EC 0C04993B */ jal draw_msg /* 8EE610 802427F0 AFB20014 */ sw $s2, 0x14($sp) /* 8EE614 802427F4 08090A12 */ j .L80242848 /* 8EE618 802427F8 00000000 */ nop @@ -429,7 +429,7 @@ glabel func_802421A0_8EDFC0 /* 8EE634 80242814 240600AA */ addiu $a2, $zero, 0xaa /* 8EE638 80242818 0200382D */ daddu $a3, $s0, $zero /* 8EE63C 8024281C AFA00010 */ sw $zero, 0x10($sp) -/* 8EE640 80242820 0C04993B */ jal draw_string +/* 8EE640 80242820 0C04993B */ jal draw_msg /* 8EE644 80242824 AFB20014 */ sw $s2, 0x14($sp) /* 8EE648 80242828 240500D8 */ addiu $a1, $zero, 0xd8 /* 8EE64C 8024282C 240600AB */ addiu $a2, $zero, 0xab diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024061C_90804C.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024061C_90804C.s index ce6a61139b..9f9d939d33 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024061C_90804C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024061C_90804C.s @@ -35,14 +35,14 @@ glabel func_8024061C_90804C /* 9080B8 80240688 0000202D */ daddu $a0, $zero, $zero /* 9080BC 8024068C 240500D0 */ addiu $a1, $zero, 0xd0 /* 9080C0 80240690 00A0302D */ daddu $a2, $a1, $zero -/* 9080C4 80240694 0C04DF84 */ jal func_80137E10 +/* 9080C4 80240694 0C04DF84 */ jal set_transition_stencil_color /* 9080C8 80240698 00A0382D */ daddu $a3, $a1, $zero /* 9080CC 8024069C 86220024 */ lh $v0, 0x24($s1) /* 9080D0 802406A0 44820000 */ mtc1 $v0, $f0 /* 9080D4 802406A4 00000000 */ nop /* 9080D8 802406A8 46800020 */ cvt.s.w $f0, $f0 /* 9080DC 802406AC 44050000 */ mfc1 $a1, $f0 -/* 9080E0 802406B0 0C04DF62 */ jal func_80137D88 +/* 9080E0 802406B0 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 9080E4 802406B4 24040001 */ addiu $a0, $zero, 1 /* 9080E8 802406B8 240400FF */ addiu $a0, $zero, 0xff /* 9080EC 802406BC 86220024 */ lh $v0, 0x24($s1) @@ -88,7 +88,7 @@ glabel func_8024061C_90804C /* 908180 80240750 00000000 */ nop /* 908184 80240754 46800020 */ cvt.s.w $f0, $f0 /* 908188 80240758 44050000 */ mfc1 $a1, $f0 -/* 90818C 8024075C 0C04DF62 */ jal func_80137D88 +/* 90818C 8024075C 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 908190 80240760 24040001 */ addiu $a0, $zero, 1 /* 908194 80240764 86220024 */ lh $v0, 0x24($s1) /* 908198 80240768 96230024 */ lhu $v1, 0x24($s1) diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s b/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s index fa0b451c25..4ae18fbc4d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s +++ b/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s @@ -32,7 +32,7 @@ glabel func_80240000_A46F60 /* A46FC8 80240068 44063000 */ mfc1 $a2, $f6 /* A46FCC 8024006C 4600018D */ trunc.w.s $f6, $f0 /* A46FD0 80240070 44073000 */ mfc1 $a3, $f6 -/* A46FD4 80240074 0C04DFB0 */ jal func_80137EC0 +/* A46FD4 80240074 0C04DFB0 */ jal set_transition_stencil_center_worldpos /* A46FD8 80240078 0080282D */ daddu $a1, $a0, $zero /* A46FDC 8024007C 3C028011 */ lui $v0, %hi(D_8010EBB0) /* A46FE0 80240080 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) @@ -82,10 +82,10 @@ glabel func_80240000_A46F60 /* A4707C 8024011C C6060070 */ lwc1 $f6, 0x70($s0) /* A47080 80240120 468031A0 */ cvt.s.w $f6, $f6 /* A47084 80240124 44053000 */ mfc1 $a1, $f6 -/* A47088 80240128 0C04E035 */ jal func_801380D4 +/* A47088 80240128 0C04E035 */ jal set_transition_stencil_alpha /* A4708C 8024012C 24040001 */ addiu $a0, $zero, 1 /* A47090 80240130 3C05437F */ lui $a1, 0x437f -/* A47094 80240134 0C04DF69 */ jal func_80137DA4 +/* A47094 80240134 0C04DF69 */ jal set_transition_stencil_zoom_1 /* A47098 80240138 2404000B */ addiu $a0, $zero, 0xb /* A4709C 8024013C 8FBF0024 */ lw $ra, 0x24($sp) /* A470A0 80240140 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s index 1cfdf8c3ba..b788280a78 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s @@ -32,7 +32,7 @@ glabel func_80240000_A485C0 /* A48628 80240068 44063000 */ mfc1 $a2, $f6 /* A4862C 8024006C 4600018D */ trunc.w.s $f6, $f0 /* A48630 80240070 44073000 */ mfc1 $a3, $f6 -/* A48634 80240074 0C04DFB0 */ jal func_80137EC0 +/* A48634 80240074 0C04DFB0 */ jal set_transition_stencil_center_worldpos /* A48638 80240078 0080282D */ daddu $a1, $a0, $zero /* A4863C 8024007C 3C028011 */ lui $v0, %hi(D_8010EBB0) /* A48640 80240080 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) @@ -82,10 +82,10 @@ glabel func_80240000_A485C0 /* A486DC 8024011C C6060070 */ lwc1 $f6, 0x70($s0) /* A486E0 80240120 468031A0 */ cvt.s.w $f6, $f6 /* A486E4 80240124 44053000 */ mfc1 $a1, $f6 -/* A486E8 80240128 0C04E035 */ jal func_801380D4 +/* A486E8 80240128 0C04E035 */ jal set_transition_stencil_alpha /* A486EC 8024012C 24040001 */ addiu $a0, $zero, 1 /* A486F0 80240130 3C05437F */ lui $a1, 0x437f -/* A486F4 80240134 0C04DF69 */ jal func_80137DA4 +/* A486F4 80240134 0C04DF69 */ jal set_transition_stencil_zoom_1 /* A486F8 80240138 2404000B */ addiu $a0, $zero, 0xb /* A486FC 8024013C 8FBF0024 */ lw $ra, 0x24($sp) /* A48700 80240140 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240310_A5A340.s b/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240310_A5A340.s index 51ea48a564..bc17876bd1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240310_A5A340.s +++ b/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240310_A5A340.s @@ -11,7 +11,7 @@ glabel func_80240310_A5A340 /* A5A358 80240328 00000000 */ nop /* A5A35C 8024032C 46800020 */ cvt.s.w $f0, $f0 /* A5A360 80240330 44050000 */ mfc1 $a1, $f0 -/* A5A364 80240334 0C04DF62 */ jal func_80137D88 +/* A5A364 80240334 0C04DF62 */ jal set_transition_stencil_zoom_0 /* A5A368 80240338 0000202D */ daddu $a0, $zero, $zero /* A5A36C 8024033C 8FBF0010 */ lw $ra, 0x10($sp) /* A5A370 80240340 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241570_A87FC0.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241570_A87FC0.s index f9481040ad..4f22039b02 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241570_A87FC0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241570_A87FC0.s @@ -19,13 +19,13 @@ glabel func_80241570_A87FC0 /* A87FF8 802415A8 0080282D */ daddu $a1, $a0, $zero /* A87FFC 802415AC 0040802D */ daddu $s0, $v0, $zero /* A88000 802415B0 240600BE */ addiu $a2, $zero, 0xbe -/* A88004 802415B4 0C04DF93 */ jal func_80137E4C +/* A88004 802415B4 0C04DF93 */ jal set_transition_stencil_center /* A88008 802415B8 24070091 */ addiu $a3, $zero, 0x91 /* A8800C 802415BC 44900000 */ mtc1 $s0, $f0 /* A88010 802415C0 00000000 */ nop /* A88014 802415C4 46800020 */ cvt.s.w $f0, $f0 /* A88018 802415C8 44050000 */ mfc1 $a1, $f0 -/* A8801C 802415CC 0C04DF62 */ jal func_80137D88 +/* A8801C 802415CC 0C04DF62 */ jal set_transition_stencil_zoom_0 /* A88020 802415D0 322400FF */ andi $a0, $s1, 0xff /* A88024 802415D4 8FBF0018 */ lw $ra, 0x18($sp) /* A88028 802415D8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024173C_A8818C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024173C_A8818C.s index abb8eeae34..7a83096d1d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024173C_A8818C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024173C_A8818C.s @@ -24,7 +24,7 @@ glabel func_8024173C_A8818C /* A881D8 80241788 0000202D */ daddu $a0, $zero, $zero /* A881DC 8024178C 324500FF */ andi $a1, $s2, 0xff /* A881E0 80241790 320600FF */ andi $a2, $s0, 0xff -/* A881E4 80241794 0C04DF84 */ jal func_80137E10 +/* A881E4 80241794 0C04DF84 */ jal set_transition_stencil_color /* A881E8 80241798 304700FF */ andi $a3, $v0, 0xff /* A881EC 8024179C 8FBF001C */ lw $ra, 0x1c($sp) /* A881F0 802417A0 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s index c12542e138..0808add511 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s @@ -19,13 +19,13 @@ glabel func_80241650_A8E0D0 /* A8E108 80241688 0080282D */ daddu $a1, $a0, $zero /* A8E10C 8024168C 0040802D */ daddu $s0, $v0, $zero /* A8E110 80241690 240600BE */ addiu $a2, $zero, 0xbe -/* A8E114 80241694 0C04DF93 */ jal func_80137E4C +/* A8E114 80241694 0C04DF93 */ jal set_transition_stencil_center /* A8E118 80241698 24070091 */ addiu $a3, $zero, 0x91 /* A8E11C 8024169C 44900000 */ mtc1 $s0, $f0 /* A8E120 802416A0 00000000 */ nop /* A8E124 802416A4 46800020 */ cvt.s.w $f0, $f0 /* A8E128 802416A8 44050000 */ mfc1 $a1, $f0 -/* A8E12C 802416AC 0C04DF62 */ jal func_80137D88 +/* A8E12C 802416AC 0C04DF62 */ jal set_transition_stencil_zoom_0 /* A8E130 802416B0 322400FF */ andi $a0, $s1, 0xff /* A8E134 802416B4 8FBF0018 */ lw $ra, 0x18($sp) /* A8E138 802416B8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024181C_A8E29C.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024181C_A8E29C.s index 36298e94f2..2aa8710454 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024181C_A8E29C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024181C_A8E29C.s @@ -24,7 +24,7 @@ glabel func_8024181C_A8E29C /* A8E2E8 80241868 0000202D */ daddu $a0, $zero, $zero /* A8E2EC 8024186C 324500FF */ andi $a1, $s2, 0xff /* A8E2F0 80241870 320600FF */ andi $a2, $s0, 0xff -/* A8E2F4 80241874 0C04DF84 */ jal func_80137E10 +/* A8E2F4 80241874 0C04DF84 */ jal set_transition_stencil_color /* A8E2F8 80241878 304700FF */ andi $a3, $v0, 0xff /* A8E2FC 8024187C 8FBF001C */ lw $ra, 0x1c($sp) /* A8E300 80241880 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240E48_C68F78.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240E48_C68F78.s index dd916127bd..a992cf9be6 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240E48_C68F78.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240E48_C68F78.s @@ -24,7 +24,7 @@ glabel func_80240E48_C68F78 /* C68FC4 80240E94 00A0382D */ daddu $a3, $a1, $zero /* C68FC8 80240E98 AE220088 */ sw $v0, 0x88($s1) /* C68FCC 80240E9C AE200070 */ sw $zero, 0x70($s1) -/* C68FD0 80240EA0 0C04DF84 */ jal func_80137E10 +/* C68FD0 80240EA0 0C04DF84 */ jal set_transition_stencil_color /* C68FD4 80240EA4 AE200074 */ sw $zero, 0x74($s1) .L80240EA8: /* C68FD8 80240EA8 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80240E48_C68F78 /* C69088 80240F58 C6200074 */ lwc1 $f0, 0x74($s1) /* C6908C 80240F5C 46800020 */ cvt.s.w $f0, $f0 /* C69090 80240F60 44050000 */ mfc1 $a1, $f0 -/* C69094 80240F64 0C04DF62 */ jal func_80137D88 +/* C69094 80240F64 0C04DF62 */ jal set_transition_stencil_zoom_0 /* C69098 80240F68 24040001 */ addiu $a0, $zero, 1 /* C6909C 80240F6C 0240102D */ daddu $v0, $s2, $zero /* C690A0 80240F70 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s index ef421dd8f7..a3d5001604 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s @@ -34,7 +34,7 @@ glabel func_80243EE0_C75360 /* C753D0 80243F50 44063000 */ mfc1 $a2, $f6 /* C753D4 80243F54 4600018D */ trunc.w.s $f6, $f0 /* C753D8 80243F58 44073000 */ mfc1 $a3, $f6 -/* C753DC 80243F5C 0C04DFB0 */ jal func_80137EC0 +/* C753DC 80243F5C 0C04DFB0 */ jal set_transition_stencil_center_worldpos /* C753E0 80243F60 0080282D */ daddu $a1, $a0, $zero /* C753E4 80243F64 27A40028 */ addiu $a0, $sp, 0x28 /* C753E8 80243F68 27A50029 */ addiu $a1, $sp, 0x29 @@ -86,7 +86,7 @@ glabel func_80243EE0_C75360 /* C75498 80244018 45000007 */ bc1f .L80244038 /* C7549C 8024401C 00000000 */ nop /* C754A0 80244020 4405A000 */ mfc1 $a1, $f20 -/* C754A4 80244024 0C04E035 */ jal func_801380D4 +/* C754A4 80244024 0C04E035 */ jal set_transition_stencil_alpha /* C754A8 80244028 24040001 */ addiu $a0, $zero, 1 /* C754AC 8024402C 4405A000 */ mfc1 $a1, $f20 /* C754B0 80244030 0809103C */ j .L802440F0 @@ -140,11 +140,11 @@ glabel func_80243EE0_C75360 /* C75558 802440D8 C6060070 */ lwc1 $f6, 0x70($s0) /* C7555C 802440DC 468031A0 */ cvt.s.w $f6, $f6 /* C75560 802440E0 44053000 */ mfc1 $a1, $f6 -/* C75564 802440E4 0C04E035 */ jal func_801380D4 +/* C75564 802440E4 0C04E035 */ jal set_transition_stencil_alpha /* C75568 802440E8 24040001 */ addiu $a0, $zero, 1 /* C7556C 802440EC 4405B000 */ mfc1 $a1, $f22 .L802440F0: -/* C75570 802440F0 0C04DF69 */ jal func_80137DA4 +/* C75570 802440F0 0C04DF69 */ jal set_transition_stencil_zoom_1 /* C75574 802440F4 2404000B */ addiu $a0, $zero, 0xb /* C75578 802440F8 0000102D */ daddu $v0, $zero, $zero /* C7557C 802440FC 8FBF0044 */ lw $ra, 0x44($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240B38_C77818.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240B38_C77818.s index ff5bcc44ec..9a1899e88e 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240B38_C77818.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240B38_C77818.s @@ -24,7 +24,7 @@ glabel func_80240B38_C77818 /* C77864 80240B84 00A0382D */ daddu $a3, $a1, $zero /* C77868 80240B88 AE220088 */ sw $v0, 0x88($s1) /* C7786C 80240B8C AE200070 */ sw $zero, 0x70($s1) -/* C77870 80240B90 0C04DF84 */ jal func_80137E10 +/* C77870 80240B90 0C04DF84 */ jal set_transition_stencil_color /* C77874 80240B94 AE200074 */ sw $zero, 0x74($s1) .L80240B98: /* C77878 80240B98 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80240B38_C77818 /* C77928 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) /* C7792C 80240C4C 46800020 */ cvt.s.w $f0, $f0 /* C77930 80240C50 44050000 */ mfc1 $a1, $f0 -/* C77934 80240C54 0C04DF62 */ jal func_80137D88 +/* C77934 80240C54 0C04DF62 */ jal set_transition_stencil_zoom_0 /* C77938 80240C58 24040001 */ addiu $a0, $zero, 1 /* C7793C 80240C5C 0240102D */ daddu $v0, $s2, $zero /* C77940 80240C60 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0_804240.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0_804240.s index 3c748dc99b..5bbf56af1a 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0_804240.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0_804240.s @@ -24,7 +24,7 @@ glabel func_802439C0_804240 /* 80428C 80243A0C 0000202D */ daddu $a0, $zero, $zero /* 804290 80243A10 324500FF */ andi $a1, $s2, 0xff /* 804294 80243A14 320600FF */ andi $a2, $s0, 0xff -/* 804298 80243A18 0C04DF84 */ jal func_80137E10 +/* 804298 80243A18 0C04DF84 */ jal set_transition_stencil_color /* 80429C 80243A1C 304700FF */ andi $a3, $v0, 0xff /* 8042A0 80243A20 8FBF001C */ lw $ra, 0x1c($sp) /* 8042A4 80243A24 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802447E0_805060.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802447E0_805060.s index 1410a02a9a..92dc3caee7 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802447E0_805060.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802447E0_805060.s @@ -20,7 +20,7 @@ glabel func_802447E0_805060 /* 805094 80244814 C6000074 */ lwc1 $f0, 0x74($s0) /* 805098 80244818 46800020 */ cvt.s.w $f0, $f0 /* 80509C 8024481C 44050000 */ mfc1 $a1, $f0 -/* 8050A0 80244820 0C04DF62 */ jal func_80137D88 +/* 8050A0 80244820 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 8050A4 80244824 0000202D */ daddu $a0, $zero, $zero /* 8050A8 80244828 8E020074 */ lw $v0, 0x74($s0) /* 8050AC 8024482C 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848_8050C8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848_8050C8.s index 977218992f..422d6d7a4f 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848_8050C8.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848_8050C8.s @@ -16,7 +16,7 @@ glabel func_80244848_8050C8 /* 8050F0 80244870 00000000 */ nop /* 8050F4 80244874 46800020 */ cvt.s.w $f0, $f0 /* 8050F8 80244878 44050000 */ mfc1 $a1, $f0 -/* 8050FC 8024487C 0C04DF62 */ jal func_80137D88 +/* 8050FC 8024487C 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 805100 80244880 0000202D */ daddu $a0, $zero, $zero /* 805104 80244884 08091225 */ j .L80244894 /* 805108 80244888 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s index 68989096ec..907bb7b990 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s @@ -85,7 +85,7 @@ glabel func_80245028_8058A8 /* 8059DC 8024515C AFC30328 */ sw $v1, 0x328($fp) /* 8059E0 80245160 0C03A631 */ jal func_800E98C4 /* 8059E4 80245164 00000000 */ nop -/* 8059E8 80245168 0C03A5EE */ jal func_800E97B8 +/* 8059E8 80245168 0C03A5EE */ jal close_status_menu /* 8059EC 8024516C 00000000 */ nop /* 8059F0 80245170 AEE00070 */ sw $zero, 0x70($s7) .L80245174: diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s index aaf46acb2c..5a61cbf6cf 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s @@ -81,7 +81,7 @@ glabel func_8024522C_805AAC /* 805BC8 80245348 AEC00328 */ sw $zero, 0x328($s6) /* 805BCC 8024534C 0C03A631 */ jal func_800E98C4 /* 805BD0 80245350 00000000 */ nop -/* 805BD4 80245354 0C03A5EE */ jal func_800E97B8 +/* 805BD4 80245354 0C03A5EE */ jal close_status_menu /* 805BD8 80245358 00000000 */ nop /* 805BDC 8024535C AEA00070 */ sw $zero, 0x70($s5) .L80245360: diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tutorial_draw_contents_804074.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tutorial_draw_contents_804074.s index 24e1c44b5b..d8a6b0dcde 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tutorial_draw_contents_804074.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tutorial_draw_contents_804074.s @@ -19,13 +19,13 @@ glabel pause_tutorial_draw_contents_804074 /* 8040AC 8024382C 0080282D */ daddu $a1, $a0, $zero /* 8040B0 80243830 0040802D */ daddu $s0, $v0, $zero /* 8040B4 80243834 240600BE */ addiu $a2, $zero, 0xbe -/* 8040B8 80243838 0C04DF93 */ jal func_80137E4C +/* 8040B8 80243838 0C04DF93 */ jal set_transition_stencil_center /* 8040BC 8024383C 24070091 */ addiu $a3, $zero, 0x91 /* 8040C0 80243840 44900000 */ mtc1 $s0, $f0 /* 8040C4 80243844 00000000 */ nop /* 8040C8 80243848 46800020 */ cvt.s.w $f0, $f0 /* 8040CC 8024384C 44050000 */ mfc1 $a1, $f0 -/* 8040D0 80243850 0C04DF62 */ jal func_80137D88 +/* 8040D0 80243850 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 8040D4 80243854 322400FF */ andi $a0, $s1, 0xff /* 8040D8 80243858 8FBF0018 */ lw $ra, 0x18($sp) /* 8040DC 8024385C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240048_7E73E8.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240048_7E73E8.s index e09afc56ba..0d227d02c2 100644 --- a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240048_7E73E8.s +++ b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240048_7E73E8.s @@ -18,7 +18,7 @@ glabel func_80240048_7E73E8 /* 7E7418 80240078 C6000074 */ lwc1 $f0, 0x74($s0) /* 7E741C 8024007C 46800020 */ cvt.s.w $f0, $f0 /* 7E7420 80240080 44050000 */ mfc1 $a1, $f0 -/* 7E7424 80240084 0C04DF62 */ jal func_80137D88 +/* 7E7424 80240084 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 7E7428 80240088 0000202D */ daddu $a0, $zero, $zero /* 7E742C 8024008C 8E020074 */ lw $v0, 0x74($s0) /* 7E7430 80240090 240300FF */ addiu $v1, $zero, 0xff diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114_7E74B4.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114_7E74B4.s index 227bf63c10..4fbad5ba24 100644 --- a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114_7E74B4.s +++ b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114_7E74B4.s @@ -19,7 +19,7 @@ glabel func_80240114_7E74B4 /* 7E74E8 80240148 C6000074 */ lwc1 $f0, 0x74($s0) /* 7E74EC 8024014C 46800020 */ cvt.s.w $f0, $f0 /* 7E74F0 80240150 44050000 */ mfc1 $a1, $f0 -/* 7E74F4 80240154 0C04DF62 */ jal func_80137D88 +/* 7E74F4 80240154 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 7E74F8 80240158 0000202D */ daddu $a0, $zero, $zero /* 7E74FC 8024015C 8E020074 */ lw $v0, 0x74($s0) /* 7E7500 80240160 14400009 */ bnez $v0, .L80240188 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s index 8f2d5ce13c..572a75477e 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s @@ -106,7 +106,7 @@ glabel func_802411E0_E0F980 /* E0FB0C 8024136C 24060039 */ addiu $a2, $zero, 0x39 /* E0FB10 80241370 0240382D */ daddu $a3, $s2, $zero /* E0FB14 80241374 AFB00010 */ sw $s0, 0x10($sp) -/* E0FB18 80241378 0C04993B */ jal draw_string +/* E0FB18 80241378 0C04993B */ jal draw_msg /* E0FB1C 8024137C AFA00014 */ sw $zero, 0x14($sp) /* E0FB20 80241380 240500DB */ addiu $a1, $zero, 0xdb /* E0FB24 80241384 2406004E */ addiu $a2, $zero, 0x4e @@ -137,7 +137,7 @@ glabel func_802411E0_E0F980 /* E0FB84 802413E4 24060039 */ addiu $a2, $zero, 0x39 /* E0FB88 802413E8 0240382D */ daddu $a3, $s2, $zero /* E0FB8C 802413EC AFB00010 */ sw $s0, 0x10($sp) -/* E0FB90 802413F0 0C04993B */ jal draw_string +/* E0FB90 802413F0 0C04993B */ jal draw_msg /* E0FB94 802413F4 AFA00014 */ sw $zero, 0x14($sp) /* E0FB98 802413F8 240500DB */ addiu $a1, $zero, 0xdb /* E0FB9C 802413FC 2406004E */ addiu $a2, $zero, 0x4e @@ -174,7 +174,7 @@ glabel func_802411E0_E0F980 /* E0FC14 80241474 0240382D */ daddu $a3, $s2, $zero /* E0FC18 80241478 24100001 */ addiu $s0, $zero, 1 /* E0FC1C 8024147C AFA00010 */ sw $zero, 0x10($sp) -/* E0FC20 80241480 0C04993B */ jal draw_string +/* E0FC20 80241480 0C04993B */ jal draw_msg /* E0FC24 80241484 AFB00014 */ sw $s0, 0x14($sp) /* E0FC28 80241488 3C040008 */ lui $a0, 8 /* E0FC2C 8024148C 34840023 */ ori $a0, $a0, 0x23 @@ -182,7 +182,7 @@ glabel func_802411E0_E0F980 /* E0FC34 80241494 2406004E */ addiu $a2, $zero, 0x4e /* E0FC38 80241498 0240382D */ daddu $a3, $s2, $zero /* E0FC3C 8024149C AFA00010 */ sw $zero, 0x10($sp) -/* E0FC40 802414A0 0C04993B */ jal draw_string +/* E0FC40 802414A0 0C04993B */ jal draw_msg /* E0FC44 802414A4 AFB00014 */ sw $s0, 0x14($sp) /* E0FC48 802414A8 3C040008 */ lui $a0, 8 /* E0FC4C 802414AC 3484001F */ ori $a0, $a0, 0x1f @@ -190,7 +190,7 @@ glabel func_802411E0_E0F980 /* E0FC54 802414B4 2406005D */ addiu $a2, $zero, 0x5d /* E0FC58 802414B8 0240382D */ daddu $a3, $s2, $zero /* E0FC5C 802414BC AFA00010 */ sw $zero, 0x10($sp) -/* E0FC60 802414C0 0C04993B */ jal draw_string +/* E0FC60 802414C0 0C04993B */ jal draw_msg /* E0FC64 802414C4 AFB00014 */ sw $s0, 0x14($sp) /* E0FC68 802414C8 3C040008 */ lui $a0, 8 /* E0FC6C 802414CC 34840021 */ ori $a0, $a0, 0x21 @@ -198,7 +198,7 @@ glabel func_802411E0_E0F980 /* E0FC74 802414D4 2406005D */ addiu $a2, $zero, 0x5d /* E0FC78 802414D8 0240382D */ daddu $a3, $s2, $zero /* E0FC7C 802414DC AFA00010 */ sw $zero, 0x10($sp) -/* E0FC80 802414E0 0C04993B */ jal draw_string +/* E0FC80 802414E0 0C04993B */ jal draw_msg /* E0FC84 802414E4 AFB00014 */ sw $s0, 0x14($sp) /* E0FC88 802414E8 3C040008 */ lui $a0, 8 /* E0FC8C 802414EC 34840020 */ ori $a0, $a0, 0x20 @@ -206,7 +206,7 @@ glabel func_802411E0_E0F980 /* E0FC94 802414F4 2406006C */ addiu $a2, $zero, 0x6c /* E0FC98 802414F8 0240382D */ daddu $a3, $s2, $zero /* E0FC9C 802414FC AFA00010 */ sw $zero, 0x10($sp) -/* E0FCA0 80241500 0C04993B */ jal draw_string +/* E0FCA0 80241500 0C04993B */ jal draw_msg /* E0FCA4 80241504 AFB00014 */ sw $s0, 0x14($sp) /* E0FCA8 80241508 3C040008 */ lui $a0, 8 /* E0FCAC 8024150C 34840021 */ ori $a0, $a0, 0x21 @@ -214,7 +214,7 @@ glabel func_802411E0_E0F980 /* E0FCB4 80241514 2406006C */ addiu $a2, $zero, 0x6c /* E0FCB8 80241518 0240382D */ daddu $a3, $s2, $zero /* E0FCBC 8024151C AFA00010 */ sw $zero, 0x10($sp) -/* E0FCC0 80241520 0C04993B */ jal draw_string +/* E0FCC0 80241520 0C04993B */ jal draw_msg /* E0FCC4 80241524 AFB00014 */ sw $s0, 0x14($sp) .L80241528: /* E0FCC8 80241528 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403FC_E12B5C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403FC_E12B5C.s index f61a02317a..abba01593f 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403FC_E12B5C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403FC_E12B5C.s @@ -11,7 +11,7 @@ glabel func_802403FC_E12B5C /* E12B74 80240414 00641825 */ or $v1, $v1, $a0 /* E12B78 80240418 0C03A625 */ jal func_800E9894 /* E12B7C 8024041C AC430000 */ sw $v1, ($v0) -/* E12B80 80240420 0C03A5EE */ jal func_800E97B8 +/* E12B80 80240420 0C03A5EE */ jal close_status_menu /* E12B84 80240424 00000000 */ nop /* E12B88 80240428 8FBF0010 */ lw $ra, 0x10($sp) /* E12B8C 8024042C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s index 41eae4139d..6159de6d84 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s @@ -35,7 +35,7 @@ glabel func_802415EC_E13D4C /* E13DC4 80241664 2402001C */ addiu $v0, $zero, 0x1c /* E13DC8 80241668 0C03A625 */ jal func_800E9894 /* E13DCC 8024166C AE020018 */ sw $v0, 0x18($s0) -/* E13DD0 80241670 0C03A5EE */ jal func_800E97B8 +/* E13DD0 80241670 0C03A5EE */ jal close_status_menu /* E13DD4 80241674 00000000 */ nop /* E13DD8 80241678 8FBF0018 */ lw $ra, 0x18($sp) /* E13DDC 8024167C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s index 74f964a7da..d295ba65ab 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s @@ -148,7 +148,7 @@ glabel func_80240000_E15D80 /* E15F9C 8024021C 240700FF */ addiu $a3, $zero, 0xff /* E15FA0 80240220 AFA00010 */ sw $zero, 0x10($sp) /* E15FA4 80240224 AFA00014 */ sw $zero, 0x14($sp) -/* E15FA8 80240228 0C04993B */ jal draw_string +/* E15FA8 80240228 0C04993B */ jal draw_msg /* E15FAC 8024022C 24A5002A */ addiu $a1, $a1, 0x2a /* E15FB0 80240230 2406002B */ addiu $a2, $zero, 0x2b /* E15FB4 80240234 24070001 */ addiu $a3, $zero, 1 @@ -267,7 +267,7 @@ glabel func_80240000_E15D80 /* E16174 802403F4 240700FF */ addiu $a3, $zero, 0xff /* E16178 802403F8 AFA00010 */ sw $zero, 0x10($sp) /* E1617C 802403FC AFA00014 */ sw $zero, 0x14($sp) -/* E16180 80240400 0C04993B */ jal draw_string +/* E16180 80240400 0C04993B */ jal draw_msg /* E16184 80240404 24A5001E */ addiu $a1, $a1, 0x1e /* E16188 80240408 8FBF006C */ lw $ra, 0x6c($sp) /* E1618C 8024040C 8FB60068 */ lw $s6, 0x68($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240544_E162C4.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240544_E162C4.s index b99004c668..6aac50b726 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240544_E162C4.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240544_E162C4.s @@ -11,7 +11,7 @@ glabel func_80240544_E162C4 /* E162DC 8024055C 00641825 */ or $v1, $v1, $a0 /* E162E0 80240560 0C03A625 */ jal func_800E9894 /* E162E4 80240564 AC430000 */ sw $v1, ($v0) -/* E162E8 80240568 0C03A5EE */ jal func_800E97B8 +/* E162E8 80240568 0C03A5EE */ jal close_status_menu /* E162EC 8024056C 00000000 */ nop /* E162F0 80240570 8FBF0010 */ lw $ra, 0x10($sp) /* E162F4 80240574 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s index b6cddbba90..46919d209b 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s @@ -18,7 +18,7 @@ glabel func_80242274_E17FF4 /* E18028 802422A8 24030384 */ addiu $v1, $zero, 0x384 /* E1802C 802422AC 0C03A625 */ jal func_800E9894 /* E18030 802422B0 AC430008 */ sw $v1, 8($v0) -/* E18034 802422B4 0C03A5EE */ jal func_800E97B8 +/* E18034 802422B4 0C03A5EE */ jal close_status_menu /* E18038 802422B8 00000000 */ nop /* E1803C 802422BC 8FBF0014 */ lw $ra, 0x14($sp) /* E18040 802422C0 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s index 7c69c9690f..8461b90780 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s @@ -19,13 +19,13 @@ glabel func_80240AB4_9C5E94 /* 9C5ECC 80240AEC 0080282D */ daddu $a1, $a0, $zero /* 9C5ED0 80240AF0 0040802D */ daddu $s0, $v0, $zero /* 9C5ED4 80240AF4 240600BE */ addiu $a2, $zero, 0xbe -/* 9C5ED8 80240AF8 0C04DF93 */ jal func_80137E4C +/* 9C5ED8 80240AF8 0C04DF93 */ jal set_transition_stencil_center /* 9C5EDC 80240AFC 24070091 */ addiu $a3, $zero, 0x91 /* 9C5EE0 80240B00 44900000 */ mtc1 $s0, $f0 /* 9C5EE4 80240B04 00000000 */ nop /* 9C5EE8 80240B08 46800020 */ cvt.s.w $f0, $f0 /* 9C5EEC 80240B0C 44050000 */ mfc1 $a1, $f0 -/* 9C5EF0 80240B10 0C04DF62 */ jal func_80137D88 +/* 9C5EF0 80240B10 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 9C5EF4 80240B14 322400FF */ andi $a0, $s1, 0xff /* 9C5EF8 80240B18 8FBF0018 */ lw $ra, 0x18($sp) /* 9C5EFC 80240B1C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C80_9C6060.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C80_9C6060.s index bcc46998d6..183fe9683b 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C80_9C6060.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C80_9C6060.s @@ -24,7 +24,7 @@ glabel func_80240C80_9C6060 /* 9C60AC 80240CCC 0000202D */ daddu $a0, $zero, $zero /* 9C60B0 80240CD0 324500FF */ andi $a1, $s2, 0xff /* 9C60B4 80240CD4 320600FF */ andi $a2, $s0, 0xff -/* 9C60B8 80240CD8 0C04DF84 */ jal func_80137E10 +/* 9C60B8 80240CD8 0C04DF84 */ jal set_transition_stencil_color /* 9C60BC 80240CDC 304700FF */ andi $a3, $v0, 0xff /* 9C60C0 80240CE0 8FBF001C */ lw $ra, 0x1c($sp) /* 9C60C4 80240CE4 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s index e9d562db7f..6e65f4f2ab 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s @@ -8,7 +8,7 @@ glabel func_80242790_9C7B70 /* 9C7B7C 8024279C 00000000 */ nop /* 9C7B80 802427A0 0C03A631 */ jal func_800E98C4 /* 9C7B84 802427A4 00000000 */ nop -/* 9C7B88 802427A8 0C03A5EE */ jal func_800E97B8 +/* 9C7B88 802427A8 0C03A5EE */ jal close_status_menu /* 9C7B8C 802427AC 00000000 */ nop /* 9C7B90 802427B0 8FBF0010 */ lw $ra, 0x10($sp) /* 9C7B94 802427B4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802412C8_DDDAF8.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802412C8_DDDAF8.s index af8f6cbde8..bdffd0bf8c 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802412C8_DDDAF8.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802412C8_DDDAF8.s @@ -24,7 +24,7 @@ glabel func_802412C8_DDDAF8 /* DDDB44 80241314 00A0382D */ daddu $a3, $a1, $zero /* DDDB48 80241318 AE220088 */ sw $v0, 0x88($s1) /* DDDB4C 8024131C AE200070 */ sw $zero, 0x70($s1) -/* DDDB50 80241320 0C04DF84 */ jal func_80137E10 +/* DDDB50 80241320 0C04DF84 */ jal set_transition_stencil_color /* DDDB54 80241324 AE200074 */ sw $zero, 0x74($s1) .L80241328: /* DDDB58 80241328 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_802412C8_DDDAF8 /* DDDC08 802413D8 C6200074 */ lwc1 $f0, 0x74($s1) /* DDDC0C 802413DC 46800020 */ cvt.s.w $f0, $f0 /* DDDC10 802413E0 44050000 */ mfc1 $a1, $f0 -/* DDDC14 802413E4 0C04DF62 */ jal func_80137D88 +/* DDDC14 802413E4 0C04DF62 */ jal set_transition_stencil_zoom_0 /* DDDC18 802413E8 24040001 */ addiu $a0, $zero, 1 /* DDDC1C 802413EC 0240102D */ daddu $v0, $s2, $zero /* DDDC20 802413F0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s index 978cf42f7a..3f05c7f49d 100644 --- a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s +++ b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s @@ -32,7 +32,7 @@ glabel func_80240184_DDF494 /* DDF4FC 802401EC 44063000 */ mfc1 $a2, $f6 /* DDF500 802401F0 4600018D */ trunc.w.s $f6, $f0 /* DDF504 802401F4 44073000 */ mfc1 $a3, $f6 -/* DDF508 802401F8 0C04DFB0 */ jal func_80137EC0 +/* DDF508 802401F8 0C04DFB0 */ jal set_transition_stencil_center_worldpos /* DDF50C 802401FC 0080282D */ daddu $a1, $a0, $zero /* DDF510 80240200 3C028011 */ lui $v0, %hi(D_8010EBB0) /* DDF514 80240204 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) @@ -82,10 +82,10 @@ glabel func_80240184_DDF494 /* DDF5B0 802402A0 C6060070 */ lwc1 $f6, 0x70($s0) /* DDF5B4 802402A4 468031A0 */ cvt.s.w $f6, $f6 /* DDF5B8 802402A8 44053000 */ mfc1 $a1, $f6 -/* DDF5BC 802402AC 0C04E035 */ jal func_801380D4 +/* DDF5BC 802402AC 0C04E035 */ jal set_transition_stencil_alpha /* DDF5C0 802402B0 24040001 */ addiu $a0, $zero, 1 /* DDF5C4 802402B4 3C05437F */ lui $a1, 0x437f -/* DDF5C8 802402B8 0C04DF69 */ jal func_80137DA4 +/* DDF5C8 802402B8 0C04DF69 */ jal set_transition_stencil_zoom_1 /* DDF5CC 802402BC 2404000B */ addiu $a0, $zero, 0xb /* DDF5D0 802402C0 8FBF0024 */ lw $ra, 0x24($sp) /* DDF5D4 802402C4 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240314_DDF624.s b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240314_DDF624.s index 0a8b4f7257..cef6429fda 100644 --- a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240314_DDF624.s +++ b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240314_DDF624.s @@ -32,16 +32,16 @@ glabel func_80240314_DDF624 /* DDF690 80240380 AFB00010 */ sw $s0, 0x10($sp) /* DDF694 80240384 0040802D */ daddu $s0, $v0, $zero /* DDF698 80240388 0260302D */ daddu $a2, $s3, $zero -/* DDF69C 8024038C 0C04DFB0 */ jal func_80137EC0 +/* DDF69C 8024038C 0C04DFB0 */ jal set_transition_stencil_center_worldpos /* DDF6A0 80240390 0240382D */ daddu $a3, $s2, $zero /* DDF6A4 80240394 44900000 */ mtc1 $s0, $f0 /* DDF6A8 80240398 00000000 */ nop /* DDF6AC 8024039C 46800020 */ cvt.s.w $f0, $f0 /* DDF6B0 802403A0 44050000 */ mfc1 $a1, $f0 -/* DDF6B4 802403A4 0C04E035 */ jal func_801380D4 +/* DDF6B4 802403A4 0C04E035 */ jal set_transition_stencil_alpha /* DDF6B8 802403A8 24040001 */ addiu $a0, $zero, 1 /* DDF6BC 802403AC 3C05437F */ lui $a1, 0x437f -/* DDF6C0 802403B0 0C04DF69 */ jal func_80137DA4 +/* DDF6C0 802403B0 0C04DF69 */ jal set_transition_stencil_zoom_1 /* DDF6C4 802403B4 2404000B */ addiu $a0, $zero, 0xb /* DDF6C8 802403B8 8FBF0028 */ lw $ra, 0x28($sp) /* DDF6CC 802403BC 8FB30024 */ lw $s3, 0x24($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802403D8_DDF6E8.s b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802403D8_DDF6E8.s index 2d253fd08c..0a35409fb8 100644 --- a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802403D8_DDF6E8.s +++ b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802403D8_DDF6E8.s @@ -8,10 +8,10 @@ glabel func_802403D8_DDF6E8 /* DDF6F4 802403E4 00000000 */ nop /* DDF6F8 802403E8 4405A000 */ mfc1 $a1, $f20 /* DDF6FC 802403EC AFBF0010 */ sw $ra, 0x10($sp) -/* DDF700 802403F0 0C04E035 */ jal func_801380D4 +/* DDF700 802403F0 0C04E035 */ jal set_transition_stencil_alpha /* DDF704 802403F4 24040001 */ addiu $a0, $zero, 1 /* DDF708 802403F8 4405A000 */ mfc1 $a1, $f20 -/* DDF70C 802403FC 0C04DF69 */ jal func_80137DA4 +/* DDF70C 802403FC 0C04DF69 */ jal set_transition_stencil_zoom_1 /* DDF710 80240400 2404000B */ addiu $a0, $zero, 0xb /* DDF714 80240404 8FBF0010 */ lw $ra, 0x10($sp) /* DDF718 80240408 D7B40018 */ ldc1 $f20, 0x18($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s b/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s index e3ab3cd5a5..b67fb1881a 100644 --- a/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s +++ b/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s @@ -32,7 +32,7 @@ glabel func_80240000_DE56B0 /* DE5718 80240068 44063000 */ mfc1 $a2, $f6 /* DE571C 8024006C 4600018D */ trunc.w.s $f6, $f0 /* DE5720 80240070 44073000 */ mfc1 $a3, $f6 -/* DE5724 80240074 0C04DFB0 */ jal func_80137EC0 +/* DE5724 80240074 0C04DFB0 */ jal set_transition_stencil_center_worldpos /* DE5728 80240078 0080282D */ daddu $a1, $a0, $zero /* DE572C 8024007C 3C028011 */ lui $v0, %hi(D_8010EBB0) /* DE5730 80240080 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) @@ -82,10 +82,10 @@ glabel func_80240000_DE56B0 /* DE57CC 8024011C C6060070 */ lwc1 $f6, 0x70($s0) /* DE57D0 80240120 468031A0 */ cvt.s.w $f6, $f6 /* DE57D4 80240124 44053000 */ mfc1 $a1, $f6 -/* DE57D8 80240128 0C04E035 */ jal func_801380D4 +/* DE57D8 80240128 0C04E035 */ jal set_transition_stencil_alpha /* DE57DC 8024012C 24040001 */ addiu $a0, $zero, 1 /* DE57E0 80240130 3C05437F */ lui $a1, 0x437f -/* DE57E4 80240134 0C04DF69 */ jal func_80137DA4 +/* DE57E4 80240134 0C04DF69 */ jal set_transition_stencil_zoom_1 /* DE57E8 80240138 2404000B */ addiu $a0, $zero, 0xb /* DE57EC 8024013C 8FBF0024 */ lw $ra, 0x24($sp) /* DE57F0 80240140 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802401A0_AB6430.s b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802401A0_AB6430.s index a762eeeb53..c238243e85 100644 --- a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802401A0_AB6430.s +++ b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802401A0_AB6430.s @@ -21,12 +21,12 @@ glabel func_802401A0_AB6430 /* AB6468 802401D8 0000202D */ daddu $a0, $zero, $zero /* AB646C 802401DC 240500D0 */ addiu $a1, $zero, 0xd0 /* AB6470 802401E0 00A0302D */ daddu $a2, $a1, $zero -/* AB6474 802401E4 0C04DF84 */ jal func_80137E10 +/* AB6474 802401E4 0C04DF84 */ jal set_transition_stencil_color /* AB6478 802401E8 00A0382D */ daddu $a3, $a1, $zero /* AB647C 802401EC C6000074 */ lwc1 $f0, 0x74($s0) /* AB6480 802401F0 46800020 */ cvt.s.w $f0, $f0 /* AB6484 802401F4 44050000 */ mfc1 $a1, $f0 -/* AB6488 802401F8 0C04DF62 */ jal func_80137D88 +/* AB6488 802401F8 0C04DF62 */ jal set_transition_stencil_zoom_0 /* AB648C 802401FC 24040001 */ addiu $a0, $zero, 1 /* AB6490 80240200 8E020074 */ lw $v0, 0x74($s0) /* AB6494 80240204 240300FF */ addiu $v1, $zero, 0xff @@ -46,12 +46,12 @@ glabel func_802401A0_AB6430 /* AB64C4 80240234 0000202D */ daddu $a0, $zero, $zero /* AB64C8 80240238 240500D0 */ addiu $a1, $zero, 0xd0 /* AB64CC 8024023C 00A0302D */ daddu $a2, $a1, $zero -/* AB64D0 80240240 0C04DF84 */ jal func_80137E10 +/* AB64D0 80240240 0C04DF84 */ jal set_transition_stencil_color /* AB64D4 80240244 00A0382D */ daddu $a3, $a1, $zero /* AB64D8 80240248 C6000074 */ lwc1 $f0, 0x74($s0) /* AB64DC 8024024C 46800020 */ cvt.s.w $f0, $f0 /* AB64E0 80240250 44050000 */ mfc1 $a1, $f0 -/* AB64E4 80240254 0C04DF62 */ jal func_80137D88 +/* AB64E4 80240254 0C04DF62 */ jal set_transition_stencil_zoom_0 /* AB64E8 80240258 24040001 */ addiu $a0, $zero, 1 /* AB64EC 8024025C 8E020074 */ lw $v0, 0x74($s0) /* AB64F0 80240260 14400003 */ bnez $v0, .L80240270 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240878_D05FA8.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240878_D05FA8.s index c4c5f984ef..8e34f8ae87 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240878_D05FA8.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240878_D05FA8.s @@ -19,13 +19,13 @@ glabel func_80240878_D05FA8 /* D05FE0 802408B0 0080282D */ daddu $a1, $a0, $zero /* D05FE4 802408B4 0040802D */ daddu $s0, $v0, $zero /* D05FE8 802408B8 240600BE */ addiu $a2, $zero, 0xbe -/* D05FEC 802408BC 0C04DF93 */ jal func_80137E4C +/* D05FEC 802408BC 0C04DF93 */ jal set_transition_stencil_center /* D05FF0 802408C0 24070091 */ addiu $a3, $zero, 0x91 /* D05FF4 802408C4 44900000 */ mtc1 $s0, $f0 /* D05FF8 802408C8 00000000 */ nop /* D05FFC 802408CC 46800020 */ cvt.s.w $f0, $f0 /* D06000 802408D0 44050000 */ mfc1 $a1, $f0 -/* D06004 802408D4 0C04DF62 */ jal func_80137D88 +/* D06004 802408D4 0C04DF62 */ jal set_transition_stencil_zoom_0 /* D06008 802408D8 322400FF */ andi $a0, $s1, 0xff /* D0600C 802408DC 8FBF0018 */ lw $ra, 0x18($sp) /* D06010 802408E0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240A44_D06174.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240A44_D06174.s index cb49d1440b..50ce266bd5 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240A44_D06174.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240A44_D06174.s @@ -24,7 +24,7 @@ glabel func_80240A44_D06174 /* D061C0 80240A90 0000202D */ daddu $a0, $zero, $zero /* D061C4 80240A94 324500FF */ andi $a1, $s2, 0xff /* D061C8 80240A98 320600FF */ andi $a2, $s0, 0xff -/* D061CC 80240A9C 0C04DF84 */ jal func_80137E10 +/* D061CC 80240A9C 0C04DF84 */ jal set_transition_stencil_color /* D061D0 80240AA0 304700FF */ andi $a3, $v0, 0xff /* D061D4 80240AA4 8FBF001C */ lw $ra, 0x1c($sp) /* D061D8 80240AA8 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F98_D21E28.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F98_D21E28.s index de6dcb7b04..9479108da4 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F98_D21E28.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F98_D21E28.s @@ -19,13 +19,13 @@ glabel func_80241F98_D21E28 /* D21E60 80241FD0 0080282D */ daddu $a1, $a0, $zero /* D21E64 80241FD4 0040802D */ daddu $s0, $v0, $zero /* D21E68 80241FD8 240600BE */ addiu $a2, $zero, 0xbe -/* D21E6C 80241FDC 0C04DF93 */ jal func_80137E4C +/* D21E6C 80241FDC 0C04DF93 */ jal set_transition_stencil_center /* D21E70 80241FE0 24070091 */ addiu $a3, $zero, 0x91 /* D21E74 80241FE4 44900000 */ mtc1 $s0, $f0 /* D21E78 80241FE8 00000000 */ nop /* D21E7C 80241FEC 46800020 */ cvt.s.w $f0, $f0 /* D21E80 80241FF0 44050000 */ mfc1 $a1, $f0 -/* D21E84 80241FF4 0C04DF62 */ jal func_80137D88 +/* D21E84 80241FF4 0C04DF62 */ jal set_transition_stencil_zoom_0 /* D21E88 80241FF8 322400FF */ andi $a0, $s1, 0xff /* D21E8C 80241FFC 8FBF0018 */ lw $ra, 0x18($sp) /* D21E90 80242000 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164_D21FF4.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164_D21FF4.s index 04b068105c..bdf07befa3 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164_D21FF4.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164_D21FF4.s @@ -24,7 +24,7 @@ glabel func_80242164_D21FF4 /* D22040 802421B0 0000202D */ daddu $a0, $zero, $zero /* D22044 802421B4 324500FF */ andi $a1, $s2, 0xff /* D22048 802421B8 320600FF */ andi $a2, $s0, 0xff -/* D2204C 802421BC 0C04DF84 */ jal func_80137E10 +/* D2204C 802421BC 0C04DF84 */ jal set_transition_stencil_color /* D22050 802421C0 304700FF */ andi $a3, $v0, 0xff /* D22054 802421C4 8FBF001C */ lw $ra, 0x1c($sp) /* D22058 802421C8 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240B38_D307B8.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240B38_D307B8.s index 305d38fb89..9ee2e1fc62 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240B38_D307B8.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240B38_D307B8.s @@ -24,7 +24,7 @@ glabel func_80240B38_D307B8 /* D30804 80240B84 00A0382D */ daddu $a3, $a1, $zero /* D30808 80240B88 AE220088 */ sw $v0, 0x88($s1) /* D3080C 80240B8C AE200070 */ sw $zero, 0x70($s1) -/* D30810 80240B90 0C04DF84 */ jal func_80137E10 +/* D30810 80240B90 0C04DF84 */ jal set_transition_stencil_color /* D30814 80240B94 AE200074 */ sw $zero, 0x74($s1) .L80240B98: /* D30818 80240B98 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80240B38_D307B8 /* D308C8 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) /* D308CC 80240C4C 46800020 */ cvt.s.w $f0, $f0 /* D308D0 80240C50 44050000 */ mfc1 $a1, $f0 -/* D308D4 80240C54 0C04DF62 */ jal func_80137D88 +/* D308D4 80240C54 0C04DF62 */ jal set_transition_stencil_zoom_0 /* D308D8 80240C58 24040001 */ addiu $a0, $zero, 1 /* D308DC 80240C5C 0240102D */ daddu $v0, $s2, $zero /* D308E0 80240C60 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240090_D4BAB0.s b/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240090_D4BAB0.s index c1bf957128..e5cbf63c6d 100644 --- a/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240090_D4BAB0.s +++ b/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240090_D4BAB0.s @@ -8,7 +8,7 @@ glabel func_80240090_D4BAB0 /* D4BABC 8024009C 0C0B210B */ jal get_float_variable /* D4BAC0 802400A0 8C450000 */ lw $a1, ($v0) /* D4BAC4 802400A4 44050000 */ mfc1 $a1, $f0 -/* D4BAC8 802400A8 0C04DF62 */ jal func_80137D88 +/* D4BAC8 802400A8 0C04DF62 */ jal set_transition_stencil_zoom_0 /* D4BACC 802400AC 0000202D */ daddu $a0, $zero, $zero /* D4BAD0 802400B0 8FBF0010 */ lw $ra, 0x10($sp) /* D4BAD4 802400B4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s index cccec80766..3c62eb34d7 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s @@ -24,7 +24,7 @@ glabel func_80240BB8_954B78 /* 954BC4 80240C04 00A0382D */ daddu $a3, $a1, $zero /* 954BC8 80240C08 AE220088 */ sw $v0, 0x88($s1) /* 954BCC 80240C0C AE200070 */ sw $zero, 0x70($s1) -/* 954BD0 80240C10 0C04DF84 */ jal func_80137E10 +/* 954BD0 80240C10 0C04DF84 */ jal set_transition_stencil_color /* 954BD4 80240C14 AE200074 */ sw $zero, 0x74($s1) .L80240C18: /* 954BD8 80240C18 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80240BB8_954B78 /* 954C88 80240CC8 C6200074 */ lwc1 $f0, 0x74($s1) /* 954C8C 80240CCC 46800020 */ cvt.s.w $f0, $f0 /* 954C90 80240CD0 44050000 */ mfc1 $a1, $f0 -/* 954C94 80240CD4 0C04DF62 */ jal func_80137D88 +/* 954C94 80240CD4 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 954C98 80240CD8 24040001 */ addiu $a0, $zero, 1 /* 954C9C 80240CDC 0240102D */ daddu $v0, $s2, $zero /* 954CA0 80240CE0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s index 4be78582b8..653c72ab0d 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s @@ -24,7 +24,7 @@ glabel func_80240E18_87A9F8 /* 87AA44 80240E64 00A0382D */ daddu $a3, $a1, $zero /* 87AA48 80240E68 AE220088 */ sw $v0, 0x88($s1) /* 87AA4C 80240E6C AE200070 */ sw $zero, 0x70($s1) -/* 87AA50 80240E70 0C04DF84 */ jal func_80137E10 +/* 87AA50 80240E70 0C04DF84 */ jal set_transition_stencil_color /* 87AA54 80240E74 AE200074 */ sw $zero, 0x74($s1) .L80240E78: /* 87AA58 80240E78 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80240E18_87A9F8 /* 87AB08 80240F28 C6200074 */ lwc1 $f0, 0x74($s1) /* 87AB0C 80240F2C 46800020 */ cvt.s.w $f0, $f0 /* 87AB10 80240F30 44050000 */ mfc1 $a1, $f0 -/* 87AB14 80240F34 0C04DF62 */ jal func_80137D88 +/* 87AB14 80240F34 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 87AB18 80240F38 24040001 */ addiu $a0, $zero, 1 /* 87AB1C 80240F3C 0240102D */ daddu $v0, $s2, $zero /* 87AB20 80240F40 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s index 7390da6541..acf3c1beb5 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s @@ -24,7 +24,7 @@ glabel func_802411B8_887578 /* 8875C4 80241204 00A0382D */ daddu $a3, $a1, $zero /* 8875C8 80241208 AE220088 */ sw $v0, 0x88($s1) /* 8875CC 8024120C AE200070 */ sw $zero, 0x70($s1) -/* 8875D0 80241210 0C04DF84 */ jal func_80137E10 +/* 8875D0 80241210 0C04DF84 */ jal set_transition_stencil_color /* 8875D4 80241214 AE200074 */ sw $zero, 0x74($s1) .L80241218: /* 8875D8 80241218 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_802411B8_887578 /* 887688 802412C8 C6200074 */ lwc1 $f0, 0x74($s1) /* 88768C 802412CC 46800020 */ cvt.s.w $f0, $f0 /* 887690 802412D0 44050000 */ mfc1 $a1, $f0 -/* 887694 802412D4 0C04DF62 */ jal func_80137D88 +/* 887694 802412D4 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 887698 802412D8 24040001 */ addiu $a0, $zero, 1 /* 88769C 802412DC 0240102D */ daddu $v0, $s2, $zero /* 8876A0 802412E0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s index 44ca8de161..d12c8e949f 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s @@ -24,7 +24,7 @@ glabel func_80241754_88A324 /* 88A370 802417A0 00A0382D */ daddu $a3, $a1, $zero /* 88A374 802417A4 AE220088 */ sw $v0, 0x88($s1) /* 88A378 802417A8 AE200070 */ sw $zero, 0x70($s1) -/* 88A37C 802417AC 0C04DF84 */ jal func_80137E10 +/* 88A37C 802417AC 0C04DF84 */ jal set_transition_stencil_color /* 88A380 802417B0 AE200074 */ sw $zero, 0x74($s1) .L802417B4: /* 88A384 802417B4 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80241754_88A324 /* 88A434 80241864 C6200074 */ lwc1 $f0, 0x74($s1) /* 88A438 80241868 46800020 */ cvt.s.w $f0, $f0 /* 88A43C 8024186C 44050000 */ mfc1 $a1, $f0 -/* 88A440 80241870 0C04DF62 */ jal func_80137D88 +/* 88A440 80241870 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 88A444 80241874 24040001 */ addiu $a0, $zero, 1 /* 88A448 80241878 0240102D */ daddu $v0, $s2, $zero /* 88A44C 8024187C 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s index 5d5317341b..df04045040 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s @@ -24,7 +24,7 @@ glabel func_80240B68_893588 /* 8935D4 80240BB4 00A0382D */ daddu $a3, $a1, $zero /* 8935D8 80240BB8 AE220088 */ sw $v0, 0x88($s1) /* 8935DC 80240BBC AE200070 */ sw $zero, 0x70($s1) -/* 8935E0 80240BC0 0C04DF84 */ jal func_80137E10 +/* 8935E0 80240BC0 0C04DF84 */ jal set_transition_stencil_color /* 8935E4 80240BC4 AE200074 */ sw $zero, 0x74($s1) .L80240BC8: /* 8935E8 80240BC8 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80240B68_893588 /* 893698 80240C78 C6200074 */ lwc1 $f0, 0x74($s1) /* 89369C 80240C7C 46800020 */ cvt.s.w $f0, $f0 /* 8936A0 80240C80 44050000 */ mfc1 $a1, $f0 -/* 8936A4 80240C84 0C04DF62 */ jal func_80137D88 +/* 8936A4 80240C84 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 8936A8 80240C88 24040001 */ addiu $a0, $zero, 1 /* 8936AC 80240C8C 0240102D */ daddu $v0, $s2, $zero /* 8936B0 80240C90 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s index f3c7070286..6f2114dc98 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s @@ -24,7 +24,7 @@ glabel func_80241128_898708 /* 898754 80241174 00A0382D */ daddu $a3, $a1, $zero /* 898758 80241178 AE220088 */ sw $v0, 0x88($s1) /* 89875C 8024117C AE200070 */ sw $zero, 0x70($s1) -/* 898760 80241180 0C04DF84 */ jal func_80137E10 +/* 898760 80241180 0C04DF84 */ jal set_transition_stencil_color /* 898764 80241184 AE200074 */ sw $zero, 0x74($s1) .L80241188: /* 898768 80241188 8E230070 */ lw $v1, 0x70($s1) @@ -81,7 +81,7 @@ glabel func_80241128_898708 /* 898818 80241238 C6200074 */ lwc1 $f0, 0x74($s1) /* 89881C 8024123C 46800020 */ cvt.s.w $f0, $f0 /* 898820 80241240 44050000 */ mfc1 $a1, $f0 -/* 898824 80241244 0C04DF62 */ jal func_80137D88 +/* 898824 80241244 0C04DF62 */ jal set_transition_stencil_zoom_0 /* 898828 80241248 24040001 */ addiu $a0, $zero, 1 /* 89882C 8024124C 0240102D */ daddu $v0, $s2, $zero /* 898830 80241250 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s b/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s index febfb65887..d68f40bae1 100644 --- a/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s +++ b/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s @@ -84,7 +84,7 @@ glabel func_802BD694_323FE4 /* 324104 802BD7B4 24040009 */ addiu $a0, $zero, 9 /* 324108 802BD7B8 10400005 */ beqz $v0, .L802BD7D0 /* 32410C 802BD7BC 00000000 */ nop -/* 324110 802BD7C0 0C011052 */ jal func_80044148 +/* 324110 802BD7C0 0C011052 */ jal is_starting_conversation /* 324114 802BD7C4 00000000 */ nop /* 324118 802BD7C8 10400010 */ beqz $v0, .L802BD80C /* 32411C 802BD7CC 00000000 */ nop diff --git a/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s b/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s index ab1619701e..c9cc8362ed 100644 --- a/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s +++ b/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s @@ -129,7 +129,7 @@ glabel func_802BD5D8_3174F8 /* 3176B8 802BD798 E640000C */ swc1 $f0, 0xc($s2) /* 3176BC 802BD79C 3C018011 */ lui $at, %hi(D_8010EBB0) /* 3176C0 802BD7A0 A033EBB0 */ sb $s3, %lo(D_8010EBB0)($at) -/* 3176C4 802BD7A4 0C03A5EE */ jal func_800E97B8 +/* 3176C4 802BD7A4 0C03A5EE */ jal close_status_menu /* 3176C8 802BD7A8 00000000 */ nop /* 3176CC 802BD7AC 3C02802C */ lui $v0, %hi(D_802BDF30) /* 3176D0 802BD7B0 8C42DF30 */ lw $v0, %lo(D_802BDF30)($v0) diff --git a/asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s b/asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s index fc36e56002..8b69fa0a8c 100644 --- a/asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s +++ b/asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s @@ -34,7 +34,7 @@ glabel func_802BD754_31D2C4 /* 31D338 802BD7C8 24040006 */ addiu $a0, $zero, 6 /* 31D33C 802BD7CC 10400146 */ beqz $v0, .L802BDCE8 /* 31D340 802BD7D0 24020002 */ addiu $v0, $zero, 2 -/* 31D344 802BD7D4 0C011052 */ jal func_80044148 +/* 31D344 802BD7D4 0C011052 */ jal is_starting_conversation /* 31D348 802BD7D8 00000000 */ nop /* 31D34C 802BD7DC 14400142 */ bnez $v0, .L802BDCE8 /* 31D350 802BD7E0 24020002 */ addiu $v0, $zero, 2 @@ -121,7 +121,7 @@ glabel func_802BD754_31D2C4 /* 31D474 802BD904 24040006 */ addiu $a0, $zero, 6 /* 31D478 802BD908 104000F7 */ beqz $v0, .L802BDCE8 /* 31D47C 802BD90C 24020002 */ addiu $v0, $zero, 2 -/* 31D480 802BD910 0C011052 */ jal func_80044148 +/* 31D480 802BD910 0C011052 */ jal is_starting_conversation /* 31D484 802BD914 00000000 */ nop /* 31D488 802BD918 144000F3 */ bnez $v0, .L802BDCE8 /* 31D48C 802BD91C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s index 1bdec272e9..cb0ce373bb 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s +++ b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s @@ -192,7 +192,7 @@ glabel MakeShop /* 7E29B0 80281B30 AFA00014 */ sw $zero, 0x14($sp) /* 7E29B4 80281B34 AFA20018 */ sw $v0, 0x18($sp) /* 7E29B8 80281B38 AFA0001C */ sw $zero, 0x1c($sp) -/* 7E29BC 80281B3C 0C051F32 */ jal set_ui_panel_properties +/* 7E29BC 80281B3C 0C051F32 */ jal set_window_properties /* 7E29C0 80281B40 AFB00020 */ sw $s0, 0x20($sp) /* 7E29C4 80281B44 2404000B */ addiu $a0, $zero, 0xb /* 7E29C8 80281B48 24050020 */ addiu $a1, $zero, 0x20 @@ -206,7 +206,7 @@ glabel MakeShop /* 7E29E8 80281B68 244214D0 */ addiu $v0, $v0, %lo(func_802814D0) /* 7E29EC 80281B6C AFA20018 */ sw $v0, 0x18($sp) /* 7E29F0 80281B70 AFA0001C */ sw $zero, 0x1c($sp) -/* 7E29F4 80281B74 0C051F32 */ jal set_ui_panel_properties +/* 7E29F4 80281B74 0C051F32 */ jal set_window_properties /* 7E29F8 80281B78 AFB00020 */ sw $s0, 0x20($sp) /* 7E29FC 80281B7C 3C048015 */ lui $a0, %hi(D_8014F150) /* 7E2A00 80281B80 2484F150 */ addiu $a0, $a0, %lo(D_8014F150) diff --git a/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s b/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s index 5ea689b2a6..1933c6553e 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s +++ b/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s @@ -30,10 +30,10 @@ glabel draw_shop_items /* 7E2404 80281584 3C108014 */ lui $s0, %hi(D_80147574) /* 7E2408 80281588 26107574 */ addiu $s0, $s0, %lo(D_80147574) .L8028158C: -/* 7E240C 8028158C 0C051F9F */ jal func_80147E7C +/* 7E240C 8028158C 0C051F9F */ jal set_window_update /* 7E2410 80281590 0200282D */ daddu $a1, $s0, $zero /* 7E2414 80281594 2404000B */ addiu $a0, $zero, 0xb -/* 7E2418 80281598 0C051F9F */ jal func_80147E7C +/* 7E2418 80281598 0C051F9F */ jal set_window_update /* 7E241C 8028159C 0200282D */ daddu $a1, $s0, $zero /* 7E2420 802815A0 96420000 */ lhu $v0, ($s2) /* 7E2424 802815A4 30420001 */ andi $v0, $v0, 1 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80281434.s b/asm/nonmatchings/world/script_api/7E0E80/func_80281434.s index 5dcd366f21..1f60bd1b26 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/func_80281434.s +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80281434.s @@ -33,7 +33,7 @@ glabel func_80281434 /* 7E2324 802814A4 AFA00010 */ sw $zero, 0x10($sp) /* 7E2328 802814A8 AFA00014 */ sw $zero, 0x14($sp) /* 7E232C 802814AC 8E040000 */ lw $a0, ($s0) -/* 7E2330 802814B0 0C04993B */ jal draw_string +/* 7E2330 802814B0 0C04993B */ jal draw_msg /* 7E2334 802814B4 240700FF */ addiu $a3, $zero, 0xff /* 7E2338 802814B8 8FBF0024 */ lw $ra, 0x24($sp) /* 7E233C 802814BC 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s b/asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s index 663497bde0..e6a680c6e7 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s +++ b/asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s @@ -18,7 +18,7 @@ glabel func_802814D0 /* 7E2384 80281504 00021080 */ sll $v0, $v0, 2 /* 7E2388 80281508 00621821 */ addu $v1, $v1, $v0 /* 7E238C 8028150C 8C640008 */ lw $a0, 8($v1) -/* 7E2390 80281510 0C04993B */ jal draw_string +/* 7E2390 80281510 0C04993B */ jal draw_msg /* 7E2394 80281514 240700FF */ addiu $a3, $zero, 0xff /* 7E2398 80281518 8FBF0018 */ lw $ra, 0x18($sp) /* 7E239C 8028151C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s b/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s index 28d4d4c8b7..0b689f251f 100644 --- a/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s +++ b/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s @@ -90,7 +90,7 @@ glabel MakeDoorAdvanced /* 7E2C60 80281DE0 0280202D */ daddu $a0, $s4, $zero /* 7E2C64 80281DE4 27A50024 */ addiu $a1, $sp, 0x24 /* 7E2C68 80281DE8 0200302D */ daddu $a2, $s0, $zero -/* 7E2C6C 80281DEC 0C016F76 */ jal func_8005BDD8 +/* 7E2C6C 80281DEC 0C016F76 */ jal get_flat_collider_normal /* 7E2C70 80281DF0 27A70028 */ addiu $a3, $sp, 0x28 /* 7E2C74 80281DF4 326300FF */ andi $v1, $s3, 0xff /* 7E2C78 80281DF8 2C620008 */ sltiu $v0, $v1, 8 diff --git a/asm/nonmatchings/world/world/load_map_by_IDs.s b/asm/nonmatchings/world/world/load_map_by_IDs.s index 8ea13681a4..ebae6a40f0 100644 --- a/asm/nonmatchings/world/world/load_map_by_IDs.s +++ b/asm/nonmatchings/world/world/load_map_by_IDs.s @@ -195,7 +195,7 @@ glabel load_map_by_IDs /* 35DC8 8005A9C8 00000000 */ nop /* 35DCC 8005A9CC 0C052010 */ jal func_80148040 /* 35DD0 8005A9D0 00000000 */ nop -/* 35DD4 8005A9D4 0C05177E */ jal func_80145DF8 +/* 35DD4 8005A9D4 0C05177E */ jal use_default_background_settings /* 35DD8 8005A9D8 00000000 */ nop /* 35DDC 8005A9DC 8E020000 */ lw $v0, ($s0) /* 35DE0 8005A9E0 804300A8 */ lb $v1, 0xa8($v0) @@ -218,7 +218,7 @@ glabel load_map_by_IDs /* 35E1C 8005AA1C 00000000 */ nop /* 35E20 8005AA20 0C04432E */ jal clear_entity_data /* 35E24 8005AA24 24040001 */ addiu $a0, $zero, 1 -/* 35E28 8005AA28 0C016727 */ jal func_80059C9C +/* 35E28 8005AA28 0C016727 */ jal clear_effect_data /* 35E2C 8005AA2C 00000000 */ nop /* 35E30 8005AA30 0C037F14 */ jal clear_player_status /* 35E34 8005AA34 00000000 */ nop @@ -241,7 +241,7 @@ glabel load_map_by_IDs /* 35E78 8005AA78 00822021 */ addu $a0, $a0, $v0 /* 35E7C 8005AA7C 0C0525FF */ jal func_801497FC /* 35E80 8005AA80 8C84FF60 */ lw $a0, %lo(D_8008FF60)($a0) -/* 35E84 8005AA84 0C052580 */ jal func_80149600 +/* 35E84 8005AA84 0C052580 */ jal use_default_door_sounds /* 35E88 8005AA88 00000000 */ nop /* 35E8C 8005AA8C 1680000B */ bnez $s4, .L8005AABC /* 35E90 8005AA90 00000000 */ nop diff --git a/build.cfg b/build.cfg new file mode 100644 index 0000000000..40a896afc7 --- /dev/null +++ b/build.cfg @@ -0,0 +1,14 @@ +target = papermario +build_dir = build + +asset_dirs = assets + +maps = dro_01 dro_02 hos_00 hos_01 hos_02 hos_03 hos_04 hos_05 hos_06 hos_10 hos_20 isk_01 isk_02 isk_03 isk_04 isk_05 isk_06 isk_07 isk_08 isk_09 isk_10 isk_11 isk_12 isk_13 isk_14 isk_16 isk_18 isk_19 iwa_00 iwa_01 iwa_02 iwa_03 iwa_04 iwa_10 iwa_11 osr_00 osr_01 osr_02 osr_03 kkj_00 kkj_01 kkj_02 kkj_03 kkj_10 kkj_11 kkj_12 kkj_13 kkj_14 kkj_15 kkj_16 kkj_17 kkj_18 kkj_19 kkj_20 kkj_21 kkj_22 kkj_23 kkj_24 kkj_25 kkj_26 kkj_27 kkj_28 kkj_29 kmr_00 kmr_02 kmr_03 kmr_04 kmr_05 kmr_06 kmr_07 kmr_09 kmr_10 kmr_11 kmr_12 kmr_20 kmr_30 kpa_01 kpa_03 kpa_04 kpa_08 kpa_09 kpa_10 kpa_11 kpa_12 kpa_13 kpa_14 kpa_15 kpa_16 kpa_17 kpa_32 kpa_33 kpa_40 kpa_41 kpa_50 kpa_52 kpa_60 kpa_61 kpa_62 kpa_63 kpa_70 kpa_80 kpa_90 kpa_91 kpa_94 kpa_95 kpa_96 kpa_102 kpa_111 kpa_112 kpa_113 kpa_115 kpa_116 kpa_117 kpa_118 kpa_119 kpa_121 kpa_130 kpa_133 kpa_134 machi mac_00 mac_01 mac_02 mac_03 mac_04 mac_05 mac_06 tik_01 tik_02 tik_03 tik_04 tik_05 tik_06 tik_07 tik_08 tik_09 tik_10 tik_12 tik_14 tik_15 tik_17 tik_18 tik_19 tik_20 tik_21 tik_22 tik_23 tik_25 kgr_01 kgr_02 nok_01 nok_02 nok_03 nok_04 nok_11 nok_12 nok_13 nok_14 nok_15 sbk_00 sbk_01 sbk_02 sbk_03 sbk_04 sbk_05 sbk_06 sbk_10 sbk_11 sbk_12 sbk_13 sbk_14 sbk_15 sbk_16 sbk_20 sbk_21 sbk_22 sbk_23 sbk_24 sbk_25 sbk_26 sbk_30 sbk_31 sbk_32 sbk_33 sbk_34 sbk_35 sbk_36 sbk_40 sbk_41 sbk_42 sbk_43 sbk_44 sbk_45 sbk_46 sbk_50 sbk_51 sbk_52 sbk_53 sbk_54 sbk_55 sbk_56 sbk_60 sbk_61 sbk_62 sbk_63 sbk_64 sbk_65 sbk_66 sbk_99 trd_00 trd_01 trd_02 trd_03 trd_04 trd_05 trd_06 trd_07 trd_08 trd_09 trd_10 tst_01 tst_02 tst_03 tst_04 tst_10 tst_11 tst_12 tst_13 tst_20 jan_00 jan_01 jan_02 jan_03 jan_04 jan_05 jan_06 jan_07 jan_08 jan_09 jan_10 jan_11 jan_12 jan_13 jan_14 jan_15 jan_16 jan_17 jan_18 jan_19 jan_22 jan_23 mim_01 mim_02 mim_03 mim_04 mim_05 mim_06 mim_07 mim_08 mim_09 mim_10 mim_11 mim_12 obk_01 obk_02 obk_03 obk_04 obk_05 obk_06 obk_07 obk_08 obk_09 arn_02 arn_03 arn_04 arn_05 arn_07 arn_08 arn_09 arn_10 arn_11 arn_12 arn_13 arn_20 dgb_01 dgb_02 dgb_03 dgb_04 dgb_05 dgb_06 dgb_07 dgb_08 dgb_09 dgb_10 dgb_11 dgb_12 dgb_13 dgb_14 dgb_15 dgb_16 dgb_17 dgb_18 kzn_01 kzn_02 kzn_03 kzn_04 kzn_05 kzn_06 kzn_07 kzn_08 kzn_09 kzn_10 kzn_11 kzn_17 kzn_18 kzn_19 kzn_20 kzn_22 kzn_23 flo_00 flo_03 flo_07 flo_08 flo_09 flo_10 flo_11 flo_12 flo_13 flo_14 flo_15 flo_16 flo_17 flo_18 flo_19 flo_21 flo_22 flo_23 flo_24 flo_25 sam_01 sam_02 sam_03 sam_04 sam_05 sam_06 sam_07 sam_08 sam_09 sam_10 sam_11 sam_12 pra_01 pra_02 pra_03 pra_04 pra_05 pra_09 pra_10 pra_11 pra_13 pra_14 pra_15 pra_16 pra_18 pra_19 pra_20 pra_21 pra_22 pra_29 pra_31 pra_32 pra_33 pra_34 pra_35 pra_40 omo_01 omo_02 omo_03 omo_04 omo_05 omo_06 omo_07 omo_08 omo_09 omo_10 omo_11 omo_12 omo_13 omo_14 omo_15 omo_16 omo_17 end_00 end_01 mgm_00 mgm_01 mgm_02 mgm_03 gv_01 kmr_bt03 kmr_bt04 kmr_bt05 kmr_bt06 nok_bt01 nok_bt02 nok_bt03 nok_bt04 trd_bt00 trd_bt01 trd_bt02 trd_bt03 trd_bt04 trd_bt05 iwa_bt01 iwa_bt02 sbk_bt02 isk_bt01 isk_bt02 isk_bt03 isk_bt04 isk_bt05 isk_bt06 isk_bt07 isk_bt08 arn_bt01 arn_bt02 arn_bt03 arn_bt04 arn_bt05 arn_bt06 dgb_bt01 dgb_bt02 dgb_bt03 dgb_bt04 dgb_bt05 mim_bt01 omo_bt01 omo_bt02 omo_bt03 omo_bt04 omo_bt05 omo_bt06 omo_bt07 kgr_bt01 flo_bt01 flo_bt02 flo_bt03 flo_bt04 flo_bt05 flo_bt06 jan_bt00 jan_bt01 jan_bt02 jan_bt03 jan_bt04 kzn_bt01 kzn_bt02 kzn_bt04 kzn_bt05 sam_bt01 sam_bt02 sam_bt03 sam_bt04 tik_bt01 tik_bt02 tik_bt03 tik_bt04 tik_bt05 pra_bt01 pra_bt02 pra_bt03 pra_bt04 mac_bt01 mac_bt02 kpa_bt01 kpa_bt02 kpa_bt03 kpa_bt04 kpa_bt05 kpa_bt07 kpa_bt08 kpa_bt09 kpa_bt11 kpa_bt13 kpa_bt14 hos_bt01 hos_bt02 kkj_bt01 kkj_bt02 + +npc_sprites = world_goombario world_kooper world_bombette world_parakarry world_bow world_watt world_sushie world_lakilester battle_goombario battle_kooper battle_bombette battle_parakarry battle_bow battle_watt battle_sushie battle_lakilester kooper_without_shell world_eldstar world_mamar world_skolar world_muskular world_misstar world_klevar world_kalmar battle_eldstar battle_mamar battle_skolar battle_muskular battle_misstar battle_klevar battle_kalmar twink jr_troopa spiked_jr_troopa spiked_para_jr_troopa mage_jr_troopa para_jr_troopa goomba spiked_goomba paragoomba koopa_troopa para_troopa fuzzy bob_omb bullet_bill bill_blaster monty_mole cleft pokey battle_bandit buzzy_beetle swooper stone_chomp putrid_piranha piranha_plant sentinel world_clubba battle_clubba shy_guy groove_guy sky_guy pyro_guy spy_guy medi_guy fuzzipede jungle_guy heart_plant hurt_plant m_bush bubble kent_c_koopa dayzee lakitu spiny bzzap ruff_puff spike_top duplighost albino_dino blooper baby_blooper gulpit dry_bones thrown_bone bony_beetle magikoopa flying_magikoopa world_koopatrol koopatrol hammer_bros bush_basic bush_blocky bush_dry bush_leafy bush_matted world_kammy battle_kammy goomba_bros goomba_king spiky_goomnut dark_toad koopa_bros buzzar tutankoopa chain_chomp world_tubba battle_tubba tubbas_heart big_lantern_ghost shy_squad_guy marshal_guy stilt_guy stilt_guy_unfold shy_stack_guy shy_stack_unfold shy_stack_damage shy_stack_rock general_guy general_guy_bomb tank_guy lava_piranha_head petit_piranha lava_bud huff_n_puff tuff_puff monstar crystal_king world_bowser battle_bowser luigi toad three_sisters vanna_t toad_kid toad_guard harry_t toad_minister postmaster conductor_toad train_station_toad fishmael artist_toad koopa koopa_without_shell world_bob_omb whacka dryite mouser boo yoshi yoshi_kid raven bubulb penguin shiver_toad world_bandit goompa goombaria gooma goompapa goomama the_master chan lee merlon chet_rippo rowf minh_t russ_t tayce_t fice_t bartender chanterelle rip_cheato chuck_quizmo merluvlee merlar merlow star_kid kolorado_wife koopa_koot kolorado battle_kolorado archeologist nomadimouse world_merlee battle_merlee disguised_moustafa moustafa oaklie bootler yakkey gourmet_guy village_leader leaders_friend rafael_raven tolielup gate_flower petunia posie lily rosie sun lakilulu ninji mayor_penguin mayor_penguin_wife penguin_patrol herringway merle star_rod fire coin parade_peach parade_koopas parade_burnt_bowser parade_luigi parade_partners parade_yoshis parade_kolorados parade_chicks parade_ice_show parade_toads parade_batons parade_drums parade_flags parade_horns parade_tubba_balloon parade_wizards parade_mario parade_shy_guys parade_twink leaf + +backgrounds = kmr_bg nok_bg sbk_bg sbk3_bg iwa_bg hos_bg arn_bg obk_bg omo_bg yos_bg jan_bg fla_bg flb_bg sra_bg yki_bg sam_bg kpa_bg title_bg + +party_images = party_kurio party_kameki party_pinki party_pareta party_resa party_akari party_opuku party_pokopi + +texture_archives = mac_tex tik_tex kgr_tex kmr_tex iwa_tex sbk_tex dro_tex isk_tex trd_tex nok_tex hos_tex kpa_tex osr_tex kkj_tex tst_tex jan_tex mim_tex obk_tex arn_tex dgb_tex kzn_tex flo_tex sam_tex pra_tex omo_tex end_tex mgm_tex gv__tex diff --git a/configure.py b/configure.py index 4da0c2fbb4..cb3adf6d3f 100755 --- a/configure.py +++ b/configure.py @@ -16,15 +16,24 @@ from segtypes.n64.code import Subsegment INCLUDE_ASM_RE = re.compile(r"___INCLUDE_ASM\([^,]+, ([^,]+), ([^,)]+)") # note _ prefix -TARGET = "papermario" +CFG = {} +with open("build.cfg", "r") as f: + for line in f.readlines(): + if line.strip() != "": + key, value = [part.strip() for part in line.split("=", 1)] + CFG[key] = value + +TARGET = CFG.get("target", "papermario") BUILD_DIR = "build" -ASSET_DIRS = ["assets"] +ASSET_DIRS = CFG.get("asset_dirs", "assets").split(" ") -NPC_SPRITES = "world_goombario world_kooper world_bombette world_parakarry world_bow world_watt world_sushie world_lakilester battle_goombario battle_kooper battle_bombette battle_parakarry battle_bow battle_watt battle_sushie battle_lakilester kooper_without_shell world_eldstar world_mamar world_skolar world_muskular world_misstar world_klevar world_kalmar battle_eldstar battle_mamar battle_skolar battle_muskular battle_misstar battle_klevar battle_kalmar twink jr_troopa spiked_jr_troopa spiked_para_jr_troopa mage_jr_troopa para_jr_troopa goomba spiked_goomba paragoomba koopa_troopa para_troopa fuzzy bob_omb bullet_bill bill_blaster monty_mole cleft pokey battle_bandit buzzy_beetle swooper stone_chomp putrid_piranha piranha_plant sentinel world_clubba battle_clubba shy_guy groove_guy sky_guy pyro_guy spy_guy medi_guy fuzzipede jungle_guy heart_plant hurt_plant m_bush bubble kent_c_koopa dayzee lakitu spiny bzzap ruff_puff spike_top duplighost albino_dino blooper baby_blooper gulpit dry_bones thrown_bone bony_beetle magikoopa flying_magikoopa world_koopatrol koopatrol hammer_bros bush_basic bush_blocky bush_dry bush_leafy bush_matted world_kammy battle_kammy goomba_bros goomba_king spiky_goomnut dark_toad koopa_bros buzzar tutankoopa chain_chomp world_tubba battle_tubba tubbas_heart big_lantern_ghost shy_squad_guy marshal_guy stilt_guy stilt_guy_unfold shy_stack_guy shy_stack_unfold shy_stack_damage shy_stack_rock general_guy general_guy_bomb tank_guy lava_piranha_head petit_piranha lava_bud huff_n_puff tuff_puff monstar crystal_king world_bowser battle_bowser luigi toad three_sisters vanna_t toad_kid toad_guard harry_t toad_minister postmaster conductor_toad train_station_toad fishmael artist_toad koopa koopa_without_shell world_bob_omb whacka dryite mouser boo yoshi yoshi_kid raven bubulb penguin shiver_toad world_bandit goompa goombaria gooma goompapa goomama the_master chan lee merlon chet_rippo rowf minh_t russ_t tayce_t fice_t bartender chanterelle rip_cheato chuck_quizmo merluvlee merlar merlow star_kid kolorado_wife koopa_koot kolorado battle_kolorado archeologist nomadimouse world_merlee battle_merlee disguised_moustafa moustafa oaklie bootler yakkey gourmet_guy village_leader leaders_friend rafael_raven tolielup gate_flower petunia posie lily rosie sun lakilulu ninji mayor_penguin mayor_penguin_wife penguin_patrol herringway merle star_rod fire coin parade_peach parade_koopas parade_burnt_bowser parade_luigi parade_partners parade_yoshis parade_kolorados parade_chicks parade_ice_show parade_toads parade_batons parade_drums parade_flags parade_horns parade_tubba_balloon parade_wizards parade_mario parade_shy_guys parade_twink leaf".split(" ") +NPC_SPRITES = CFG.get("npc_sprites", "").split(" ") +MAPS = CFG.get("maps", "").split(" ") +TEXTURE_ARCHIVES = CFG.get("texture_archives", "").split(" ") +BACKGROUNDS = CFG.get("backgrounds", "").split(" ") +PARTY_IMAGES = CFG.get("party_images", "").split(" ") -MAPS = "dro_01 dro_02 hos_00 hos_01 hos_02 hos_03 hos_04 hos_05 hos_06 hos_10 hos_20 isk_01 isk_02 isk_03 isk_04 isk_05 isk_06 isk_07 isk_08 isk_09 isk_10 isk_11 isk_12 isk_13 isk_14 isk_16 isk_18 isk_19 iwa_00 iwa_01 iwa_02 iwa_03 iwa_04 iwa_10 iwa_11 osr_00 osr_01 osr_02 osr_03 kkj_00 kkj_01 kkj_02 kkj_03 kkj_10 kkj_11 kkj_12 kkj_13 kkj_14 kkj_15 kkj_16 kkj_17 kkj_18 kkj_19 kkj_20 kkj_21 kkj_22 kkj_23 kkj_24 kkj_25 kkj_26 kkj_27 kkj_28 kkj_29 kmr_00 kmr_02 kmr_03 kmr_04 kmr_05 kmr_06 kmr_07 kmr_09 kmr_10 kmr_11 kmr_12 kmr_20 kmr_30 kpa_01 kpa_03 kpa_04 kpa_08 kpa_09 kpa_10 kpa_11 kpa_12 kpa_13 kpa_14 kpa_15 kpa_16 kpa_17 kpa_32 kpa_33 kpa_40 kpa_41 kpa_50 kpa_52 kpa_60 kpa_61 kpa_62 kpa_63 kpa_70 kpa_80 kpa_90 kpa_91 kpa_94 kpa_95 kpa_96 kpa_102 kpa_111 kpa_112 kpa_113 kpa_115 kpa_116 kpa_117 kpa_118 kpa_119 kpa_121 kpa_130 kpa_133 kpa_134 machi mac_00 mac_01 mac_02 mac_03 mac_04 mac_05 mac_06 tik_01 tik_02 tik_03 tik_04 tik_05 tik_06 tik_07 tik_08 tik_09 tik_10 tik_12 tik_14 tik_15 tik_17 tik_18 tik_19 tik_20 tik_21 tik_22 tik_23 tik_25 kgr_01 kgr_02 nok_01 nok_02 nok_03 nok_04 nok_11 nok_12 nok_13 nok_14 nok_15 sbk_00 sbk_01 sbk_02 sbk_03 sbk_04 sbk_05 sbk_06 sbk_10 sbk_11 sbk_12 sbk_13 sbk_14 sbk_15 sbk_16 sbk_20 sbk_21 sbk_22 sbk_23 sbk_24 sbk_25 sbk_26 sbk_30 sbk_31 sbk_32 sbk_33 sbk_34 sbk_35 sbk_36 sbk_40 sbk_41 sbk_42 sbk_43 sbk_44 sbk_45 sbk_46 sbk_50 sbk_51 sbk_52 sbk_53 sbk_54 sbk_55 sbk_56 sbk_60 sbk_61 sbk_62 sbk_63 sbk_64 sbk_65 sbk_66 sbk_99 trd_00 trd_01 trd_02 trd_03 trd_04 trd_05 trd_06 trd_07 trd_08 trd_09 trd_10 tst_01 tst_02 tst_03 tst_04 tst_10 tst_11 tst_12 tst_13 tst_20 jan_00 jan_01 jan_02 jan_03 jan_04 jan_05 jan_06 jan_07 jan_08 jan_09 jan_10 jan_11 jan_12 jan_13 jan_14 jan_15 jan_16 jan_17 jan_18 jan_19 jan_22 jan_23 mim_01 mim_02 mim_03 mim_04 mim_05 mim_06 mim_07 mim_08 mim_09 mim_10 mim_11 mim_12 obk_01 obk_02 obk_03 obk_04 obk_05 obk_06 obk_07 obk_08 obk_09 arn_02 arn_03 arn_04 arn_05 arn_07 arn_08 arn_09 arn_10 arn_11 arn_12 arn_13 arn_20 dgb_01 dgb_02 dgb_03 dgb_04 dgb_05 dgb_06 dgb_07 dgb_08 dgb_09 dgb_10 dgb_11 dgb_12 dgb_13 dgb_14 dgb_15 dgb_16 dgb_17 dgb_18 kzn_01 kzn_02 kzn_03 kzn_04 kzn_05 kzn_06 kzn_07 kzn_08 kzn_09 kzn_10 kzn_11 kzn_17 kzn_18 kzn_19 kzn_20 kzn_22 kzn_23 flo_00 flo_03 flo_07 flo_08 flo_09 flo_10 flo_11 flo_12 flo_13 flo_14 flo_15 flo_16 flo_17 flo_18 flo_19 flo_21 flo_22 flo_23 flo_24 flo_25 sam_01 sam_02 sam_03 sam_04 sam_05 sam_06 sam_07 sam_08 sam_09 sam_10 sam_11 sam_12 pra_01 pra_02 pra_03 pra_04 pra_05 pra_09 pra_10 pra_11 pra_13 pra_14 pra_15 pra_16 pra_18 pra_19 pra_20 pra_21 pra_22 pra_29 pra_31 pra_32 pra_33 pra_34 pra_35 pra_40 omo_01 omo_02 omo_03 omo_04 omo_05 omo_06 omo_07 omo_08 omo_09 omo_10 omo_11 omo_12 omo_13 omo_14 omo_15 omo_16 omo_17 end_00 end_01 mgm_00 mgm_01 mgm_02 mgm_03 gv_01 kmr_bt03 kmr_bt04 kmr_bt05 kmr_bt06 nok_bt01 nok_bt02 nok_bt03 nok_bt04 trd_bt00 trd_bt01 trd_bt02 trd_bt03 trd_bt04 trd_bt05 iwa_bt01 iwa_bt02 sbk_bt02 isk_bt01 isk_bt02 isk_bt03 isk_bt04 isk_bt05 isk_bt06 isk_bt07 isk_bt08 arn_bt01 arn_bt02 arn_bt03 arn_bt04 arn_bt05 arn_bt06 dgb_bt01 dgb_bt02 dgb_bt03 dgb_bt04 dgb_bt05 mim_bt01 omo_bt01 omo_bt02 omo_bt03 omo_bt04 omo_bt05 omo_bt06 omo_bt07 kgr_bt01 flo_bt01 flo_bt02 flo_bt03 flo_bt04 flo_bt05 flo_bt06 jan_bt00 jan_bt01 jan_bt02 jan_bt03 jan_bt04 kzn_bt01 kzn_bt02 kzn_bt04 kzn_bt05 sam_bt01 sam_bt02 sam_bt03 sam_bt04 tik_bt01 tik_bt02 tik_bt03 tik_bt04 tik_bt05 pra_bt01 pra_bt02 pra_bt03 pra_bt04 mac_bt01 mac_bt02 kpa_bt01 kpa_bt02 kpa_bt03 kpa_bt04 kpa_bt05 kpa_bt07 kpa_bt08 kpa_bt09 kpa_bt11 kpa_bt13 kpa_bt14 hos_bt01 hos_bt02 kkj_bt01 kkj_bt02".split(" ") - -ASSETS = sum([[f"{map_name}_shape", f"{map_name}_hit"] for map_name in MAPS], []) + "mac_tex tik_tex kgr_tex kmr_tex iwa_tex sbk_tex dro_tex isk_tex trd_tex nok_tex hos_tex kpa_tex osr_tex kkj_tex tst_tex jan_tex mim_tex obk_tex arn_tex dgb_tex kzn_tex flo_tex sam_tex pra_tex omo_tex end_tex mgm_tex gv__tex kmr_bg nok_bg sbk_bg sbk3_bg iwa_bg hos_bg arn_bg obk_bg omo_bg yos_bg jan_bg fla_bg flb_bg sra_bg yki_bg sam_bg kpa_bg title_bg title_data party_kurio party_kameki party_pinki party_pareta party_resa party_akari party_opuku party_pokopi".split(" ") +ASSETS = sum([[f"{map_name}_shape", f"{map_name}_hit"] for map_name in MAPS], []) + TEXTURE_ARCHIVES + BACKGROUNDS + ["title_data"] + PARTY_IMAGES def obj(path: str): if not path.startswith("$builddir/"): @@ -100,7 +109,7 @@ async def build_c_file(c_file: str, generated_headers, ccache, cppflags): s_deps = [] for line in stdout.splitlines(): - if line.startswith("_INCLUDE_ASM"): + if line.startswith("___INCLUDE_ASM"): match = INCLUDE_ASM_RE.match(line) if match: s_deps.append("asm/nonmatchings/" + eval(match[1]) + "/" + match[2] + ".s") @@ -121,7 +130,7 @@ def build_image(f: str, segment): out = "$builddir/" + path + "." + img_type + ".png" flags = "" - if img_type != "palette": + if img_type != "palette" and not isinstance(segment, dict): if segment.flip_horizontal: flags += "--flip-x" if segment.flip_vertical: @@ -142,7 +151,10 @@ def find_asset_dir(path): if os.path.exists(d + "/" + path): return d - print("unable to find asset: " + path) + print("Unable to find asset: " + path) + print("The asset dump may be incomplete. Run") + print(" rm .splat_cache") + print("And then run ./configure.py again.") exit(1) def find_asset(path): @@ -400,7 +412,7 @@ async def main(): npc_sprite_yay0s = [] for sprite_id, sprite_name in enumerate(NPC_SPRITES, 1): asset_dir = find_asset_dir(f"sprite/npc/{sprite_name}") - sources = glob(f"{asset_dir}/npc/{sprite_name}/**/*.*", recursive=True) + sources = glob(f"{asset_dir}/sprite/npc/{sprite_name}/**/*.*", recursive=True) variables = { "sprite_name": sprite_name, "sprite_dir": f"{asset_dir}/sprite/npc/{sprite_name}", @@ -478,9 +490,40 @@ async def main(): for asset_name in ASSETS: if asset_name.endswith("_tex"): # uncompressed - asset_files.append(find_asset(f"{asset_name}.bin")) - asset_files.append(find_asset(f"{asset_name}.bin")) - else: # uncompressed + asset_files.append(find_asset(f"map/{asset_name}.bin")) + asset_files.append(find_asset(f"map/{asset_name}.bin")) + elif asset_name.startswith("party_"): + source_file = f"$builddir/{asset_name}.bin" + asset_file = f"$builddir/{asset_name}.Yay0" + + n.build(source_file, "img", find_asset(f"party/{asset_name}.png"), implicit="tools/img/build.py", variables={ + "img_type": "party", + "img_flags": "", + }) + + asset_files.append(source_file) + asset_files.append(asset_file) + n.build(asset_file, "yay0compress", source_file, implicit="tools/Yay0compress") + elif asset_name.endswith("_bg"): + source_file = f"$builddir/{asset_name}.bin" + asset_file = f"$builddir/{asset_name}.Yay0" + + n.build(source_file, "img", find_asset(f"map/{asset_name}.png"), implicit="tools/img/build.py", variables={ + "img_type": "bg", + "img_flags": "", + }) + + asset_files.append(source_file) + asset_files.append(asset_file) + n.build(asset_file, "yay0compress", source_file, implicit="tools/Yay0compress") + elif asset_name.endswith("_shape") or asset_name.endswith("_hit"): + source_file = find_asset(f"map/{asset_name}.bin") + asset_file = f"$builddir/assets/{asset_name}.Yay0" + + asset_files.append(source_file) + asset_files.append(asset_file) + n.build(asset_file, "yay0compress", source_file, implicit="tools/Yay0compress") + else: source_file = find_asset(f"{asset_name}.bin") asset_file = f"$builddir/assets/{asset_name}.Yay0" diff --git a/include/common_structs.h b/include/common_structs.h index 05ddbf7136..2b0fb9c55f 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1418,8 +1418,8 @@ typedef struct TileDescriptor { } TileDescriptor; // size = 0x30 typedef struct BackgroundHeader { - /* 0x00 */ UNK_PTR raster; - /* 0x04 */ UNK_PTR palette; + /* 0x00 */ void* raster; + /* 0x04 */ void* palette; /* 0x08 */ u16 startX; /* 0x0A */ u16 startY; /* 0x0C */ u16 width; @@ -1721,7 +1721,7 @@ typedef struct { /* 0x00018 */ Light l2[2]; /* 0x00030 */ Matrix4s camPerspMatrix[8]; // could only be length 4, unsure /* 0x00230 */ s32 mainGfx[0x4100]; - /* 0x10630 */ s32 smallGfx[0x400]; // used by func 800269EC + /* 0x10630 */ s32 smallGfx[0x400]; // used by gfx_task_background /* 0x11630 */ Matrix4s matrixStack[0x200]; } DisplayContext; // size = 0x19630 diff --git a/include/functions.h b/include/functions.h index 9b57b3bedb..d73f525ae3 100644 --- a/include/functions.h +++ b/include/functions.h @@ -136,7 +136,7 @@ void fx_emote(s32, Npc*, f32, f32, f32, f32, f32, s32, s32*); f32 func_800E0088(f32, f32); void func_800E06C0(s32); -void func_800E97B8(void); +void close_status_menu(void); s32 func_800EB168(s32); Shadow* create_shadow_type(s32 type, f32 x, f32 y, f32 z); @@ -163,7 +163,7 @@ s32 is_current_partner_flying(void); void func_800ED5D0(Npc* partner); void clear_partner_move_history(Npc* partner); -s32 func_800EF394(f32); +s32 set_parter_tether_distance(f32); s32 does_script_exist(s32 id); s32 does_script_exist_by_ref(ScriptInstance* script); ScriptInstance* start_script(Bytecode* initialLine, s32 priority, s32 initialState); @@ -172,11 +172,11 @@ ScriptInstance* start_script_in_group(Bytecode* initialLine, u8 priority, u8 ini void set_animation_rate(ActorID actorID, s32 partIndex, f32 rate); void func_8011B7C0(u16, s32, s32); AnimatedMesh* get_anim_mesh(s32 arg0); -void func_80137D88(s32, f32); -void func_80137DA4(s32, f32); +void set_transition_stencil_zoom_0(s32, f32); +void set_transition_stencil_zoom_1(s32, f32); void func_80137DC0(s32, f32*, f32*); -s32 func_80137E10(s32, u8, u8, u8); -void func_80137E4C(s32, s32, s32, s32); +s32 set_transition_stencil_color(s32, u8, u8, u8); +void set_transition_stencil_center(s32, s32, s32, s32); s32 rand_int(s32); void sort_items(void); s32 is_ability_active(s32 arg0); diff --git a/include/script_api/common.h b/include/script_api/common.h index bbf328f034..1547a028c4 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -264,7 +264,7 @@ ApiStatus DemoJoystickXY(ScriptInstance* script, s32 isInitialCall); ApiStatus func_802CFE2C(ScriptInstance* script, s32 isInitialCall); ApiStatus func_802CFD30(ScriptInstance* script, s32 isInitialCall); -ApiStatus func_800441F0(ScriptInstance* script, s32 isInitialCall); +ApiStatus IsStartingConversation(ScriptInstance* script, s32 isInitialCall); ApiStatus func_802D5830(ScriptInstance* script, s32 isInitialCall); ApiStatus func_802D3474(ScriptInstance* script, s32 isInitialCall); diff --git a/include/si.h b/include/si.h index 9d027e4c78..eb023be11c 100644 --- a/include/si.h +++ b/include/si.h @@ -111,6 +111,9 @@ typedef enum ScriptOpcode { #define SI_ARRAY_FLAG(v) ((v - 210000000)) #define SI_FIXED(v) (((v * 1024.0f) + -230000000)) // See float_to_fixed_var +#define STORY_PROGRESS SI_SAVE_VAR(0x000) +#define WORLD_LOCATION SI_SAVE_VAR(0x1A9) + /* Return type of si_execute_next_command */ #define SI_CONTINUE 0 /* Continue to next command */ #define SI_ABORT 1 /* Quit execution */ diff --git a/src/code_10400_len_d30.c b/src/code_10400_len_d30.c index 86fe3df05c..bbf19c8096 100644 --- a/src/code_10400_len_d30.c +++ b/src/code_10400_len_d30.c @@ -1,17 +1,17 @@ #include "common.h" -INCLUDE_ASM(s32, "code_10400_len_d30", func_80035000); +INCLUDE_ASM(s32, "code_10400_len_d30", state_init_language_select); -INCLUDE_ASM(s32, "code_10400_len_d30", func_80035058); +INCLUDE_ASM(s32, "code_10400_len_d30", state_init_file_select); -INCLUDE_ASM(s32, "code_10400_len_d30", func_800351C8); +INCLUDE_ASM(s32, "code_10400_len_d30", state_step_language_select); INCLUDE_ASM(s32, "code_10400_len_d30", func_800354EC); -void func_800355C4(void) { +void state_drawUI_language_select(void) { } -void func_800355CC(void) { +void state_drawUI_file_select(void) { } INCLUDE_ASM(s32, "code_10400_len_d30", func_800355D4); diff --git a/src/code_11130_len_c0.c b/src/code_11130_len_c0.c index 89c0c4e8aa..21f1197cfe 100644 --- a/src/code_11130_len_c0.c +++ b/src/code_11130_len_c0.c @@ -5,21 +5,21 @@ void begin_state_world(void) { } void step_world(void) { - func_8003E524(); + update_counters(); update_npcs(); update_player(); update_item_entities(); - func_80059D50(); + update_effects(); func_80116674(); update_cameras(); } void func_80035DA0(void) { draw_status_ui(); - func_8003E5B0(); + draw_encounter_ui(); func_8013A6E8(); } void func_80035DCC(void) { - func_8003E63C(); + draw_first_strike_ui(); } diff --git a/src/code_11a50_len_7a0.c b/src/code_11a50_len_7a0.c index c4089d4516..020a34d1f2 100644 --- a/src/code_11a50_len_7a0.c +++ b/src/code_11a50_len_7a0.c @@ -78,8 +78,8 @@ void begin_state_intro(void) { } } - func_80137DA4(D_800A0963, (f32)D_800A0954); - func_80137E10(1, D_800A095B, D_800A095D, D_800A095F); + set_transition_stencil_zoom_1(D_800A0963, (f32)D_800A0954); + set_transition_stencil_color(1, D_800A095B, D_800A095D, D_800A095F); intro_logos_update_fade(); } diff --git a/src/code_121f0_len_1290.c b/src/code_121f0_len_1290.c index ce062a8fa6..b383356a98 100644 --- a/src/code_121f0_len_1290.c +++ b/src/code_121f0_len_1290.c @@ -6,15 +6,15 @@ INCLUDE_ASM(s32, "code_121f0_len_1290", step_title_screen); INCLUDE_ASM(s32, "code_121f0_len_1290", func_800375A4); -INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037638); +INCLUDE_ASM(s32, "code_121f0_len_1290", title_append_gfx); void func_80037960(void) { } -INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037968); +INCLUDE_ASM(s32, "code_121f0_len_1290", title_draw_images); -INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037994); +INCLUDE_ASM(s32, "code_121f0_len_1290", title_draw_logo); -INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037BC8); +INCLUDE_ASM(s32, "code_121f0_len_1290", title_draw_press_start); -INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037E14); +INCLUDE_ASM(s32, "code_121f0_len_1290", title_draw_copyright); diff --git a/src/code_13480_len_3f0.c b/src/code_13480_len_3f0.c index 6f90505eb5..9dd4dbb6a1 100644 --- a/src/code_13480_len_3f0.c +++ b/src/code_13480_len_3f0.c @@ -17,7 +17,7 @@ void init_demo_data(void) { func_80056228(); set_map_transition_effect(2); - func_80137D88(0, 255.0f); + set_transition_stencil_zoom_0(0, 255.0f); clear_saved_variables(); clear_script_list(); } diff --git a/src/code_1370_len_7d0.c b/src/code_1370_len_7d0.c index 295190afc7..99129707d6 100644 --- a/src/code_1370_len_7d0.c +++ b/src/code_1370_len_7d0.c @@ -3,7 +3,7 @@ void gfxRetrace_Callback(s32); void gfxPreNMI_Callback(void); -void func_80026164(void); +void gfx_task_main(void); extern s32* D_80073E00; extern s32 D_80073E04; @@ -69,7 +69,7 @@ void gfxRetrace_Callback(s32 arg0) { } } if (D_80073E00 == 2) { - func_80026164(); + gfx_task_main(); } } else { s16* temp_80073E0A = &D_80073E0A; @@ -84,14 +84,14 @@ void gfxRetrace_Callback(s32 arg0) { if (arg0 < 3) { *temp_80073E08 = 0; - func_800269EC(); + gfx_task_background(); gfx_draw_frame(); } } } } -INCLUDE_ASM(void, "code_1370_len_7d0", func_80026164); +INCLUDE_ASM(void, "code_1370_len_7d0", gfx_task_main); void gfxPreNMI_Callback(void) { D_80073E00 = 1; diff --git a/src/code_13870_len_6980.c b/src/code_13870_len_6980.c index f83f0e8bb9..a2ce84576a 100644 --- a/src/code_13870_len_6980.c +++ b/src/code_13870_len_6980.c @@ -69,7 +69,7 @@ INCLUDE_ASM(s32, "code_13870_len_6980", enable_npc_shadow); INCLUDE_ASM(s32, "code_13870_len_6980", disable_npc_shadow); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003AC5C); +INCLUDE_ASM(s32, "code_13870_len_6980", set_npc_sprite); INCLUDE_ASM(s32, "code_13870_len_6980", enable_npc_blur); @@ -223,11 +223,11 @@ void func_8003E50C(void) { INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E514); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E524); +INCLUDE_ASM(s32, "code_13870_len_6980", update_counters); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E5B0); +INCLUDE_ASM(s32, "code_13870_len_6980", draw_encounter_ui); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E63C); +INCLUDE_ASM(s32, "code_13870_len_6980", draw_first_strike_ui); void func_8003E670(void) { } diff --git a/src/code_1a1f0_len_5390.c b/src/code_1a1f0_len_5390.c index 6eb4f013f5..d408a9407f 100644 --- a/src/code_1a1f0_len_5390.c +++ b/src/code_1a1f0_len_5390.c @@ -31,18 +31,18 @@ void set_defeated(s32 mapID, s32 encounterID) { currentEncounter->defeatFlags[mapID][encounterIdx] |= (1 << encounterShift);*/ } -ApiStatus func_8003EE98(ScriptInstance* script, s32 isInitialCall) { +ApiStatus ShowMerleeCoinMessage(ScriptInstance* script, s32 isInitialCall) { if (isInitialCall) { func_80045D00(0, 60); } - return (func_80045FA4() == 0) * ApiStatus_DONE2; + return (is_merlee_message_done() == 0) * ApiStatus_DONE2; } -ApiStatus func_8003EECC(ScriptInstance* script, s32 isInitialCall) { +ApiStatus ShowMerleeRanOutMessage(ScriptInstance* script, s32 isInitialCall) { if (isInitialCall) { func_80045D00(1, 60); } - return (func_80045FA4() == 0) * ApiStatus_DONE2; + return (is_merlee_message_done() == 0) * ApiStatus_DONE2; } ApiStatus FadeBackgroundToBlack(ScriptInstance* script, s32 isInitialCall) { @@ -75,7 +75,7 @@ ApiStatus UnfadeBackgroundFromBlack(ScriptInstance* script, s32 isInitialCall) { } } -ApiStatus func_8003F018(ScriptInstance* script, s32 isInitialCall) { +ApiStatus FadeInMerlee(ScriptInstance* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(-0xA); if (isInitialCall) { @@ -92,7 +92,7 @@ ApiStatus func_8003F018(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus func_8003F084(ScriptInstance* script, s32 isInitialCall) { +ApiStatus FadeOutMerlee(ScriptInstance* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(-0xA); npc->unk_AC -= 17; @@ -104,9 +104,9 @@ ApiStatus func_8003F084(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F0C4); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", MerleeUpdateFX); -ApiStatus func_8003F384(ScriptInstance* script, s32 isInitialCall) { +ApiStatus MerleeStopFX(ScriptInstance* script, s32 isInitialCall) { D_800A0BB8 = 1; return ApiStatus_DONE2; } @@ -128,7 +128,7 @@ ApiStatus HasMerleeCasts(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_8003F414(ScriptInstance* script, s32 isInitialCall) { +ApiStatus PlayMerleeGatherFX(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 var0 = get_variable(script, *args++); s32 var1 = get_variable(script, *args++); @@ -138,7 +138,7 @@ ApiStatus func_8003F414(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_8003F4CC(ScriptInstance* script, s32 isInitialCall) { +ApiStatus PlayMerleeOrbFX(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 var0 = get_variable(script, *args++); s32 var1 = get_variable(script, *args++); @@ -212,32 +212,33 @@ ApiStatus OnFleeBattleDrops(ScriptInstance* script, s32 isInitialCall) { return --script->functionTemp[1].s == 0; } -INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F7CC); +/// Default/neutral state during world gameplay; checks for player-enemy collisions and initiates battles when they occur. +INCLUDE_ASM(s32, "code_1a1f0_len_5390", update_encounters_neutral); -void func_8004135C() { +void draw_encounters_neutral() { } -INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_80041364); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", update_encounters_pre_battle); -INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_80041964); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", draw_encounters_pre_battle); INCLUDE_ASM(s32, "code_1a1f0_len_5390", show_first_strike_message); -INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_80041F10); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", update_encounters_post_battle); -s32 func_8004304C(void) { +s32 draw_encounters_post_battle(void) { EncounterStatus* currentEncounter = &gCurrentEncounter; s32 ret = currentEncounter->unk_98; if (ret != 0) { - func_80137D88(0, currentEncounter->unk_90); - ret = func_80137E10(0, 0, 0, 0); + set_transition_stencil_zoom_0(0, currentEncounter->unk_90); + ret = set_transition_stencil_color(0, 0, 0, 0); } return ret; } -void func_8004309C(void) { +void update_encounters_conversation(void) { EncounterStatus* encounter = &gCurrentEncounter; PlayerStatus* playerStatus = PLAYER_STATUS; Enemy* currentEnemy; @@ -293,17 +294,17 @@ void func_8004309C(void) { } } -void func_800431D4() { +void draw_encounters_conversation() { } -INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_800431DC); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", check_conversation_trigger); -INCLUDE_ASM(s32, "code_1a1f0_len_5390", create_npcs); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", create_encounters); -void func_80044140() { +void init_encounters_ui() { } -s32 func_80044148(void) { +s32 is_starting_conversation(void) { s32 ret = gGameState == 3; if (gCurrentEncounter.hitType == 5) { diff --git a/src/code_1b40_len_20b0.c b/src/code_1b40_len_20b0.c index d55fc69313..d681036c56 100644 --- a/src/code_1b40_len_20b0.c +++ b/src/code_1b40_len_20b0.c @@ -33,7 +33,7 @@ extern s32 D_8009A5D8; INCLUDE_ASM(void, "code_1b40_len_20b0", step_game_loop); -INCLUDE_ASM(s32, "code_1b40_len_20b0", func_800269EC); +INCLUDE_ASM(s32, "code_1b40_len_20b0", gfx_task_background); INCLUDE_ASM(s32, "code_1b40_len_20b0", gfx_draw_frame); @@ -76,7 +76,7 @@ void load_engine_data(void) { func_8011E224(); clear_model_data(); func_80148040(); - func_80145DF8(); + use_default_background_settings(); clear_character_set(); clear_printers(); func_80112B98(); @@ -86,15 +86,15 @@ void load_engine_data(void) { func_80110CB8(0); clear_player_data(); func_8003E338(); - func_80138108(); - func_80059C9C(); + clear_transition_stencil(); + clear_effect_data(); clear_saved_variables(); clear_item_entity_data(); func_8014A498(); - func_80147230(); + reset_ambient_sounds(); func_80149618(); - func_801473F0(); - func_8002BA40(); + clear_windows(); + curtains_init(); poll_rumble(); phi_s0 = GAME_STATUS; @@ -152,16 +152,16 @@ s32 func_80027190(void) { } #ifdef NON_MATCHING -void func_800271A0(void) { +void gfx_init_state(void) { gSPSegment(gMasterGfxPos++, 0x00, 0x0); gSPDisplayList(gMasterGfxPos++, OS_K0_TO_PHYSICAL(&D_80074230)); gSPDisplayList(gMasterGfxPos++, OS_K0_TO_PHYSICAL(&D_80074210)); } #else -INCLUDE_ASM(s32, "code_1b40_len_20b0", func_800271A0); +INCLUDE_ASM(s32, "code_1b40_len_20b0", gfx_init_state); #endif -// void func_800271A0(void) { +// void gfx_init_state(void) { // gSPSegment(gMasterGfxPos++, 0x00, 0x00000000); // gSPDisplayList(gMasterGfxPos++, D_00074230); // gSPDisplayList(gMasterGfxPos++, D_00074210); @@ -179,4 +179,4 @@ INCLUDE_ASM(s32, "code_1b40_len_20b0", func_800279B4); INCLUDE_ASM(s32, "code_1b40_len_20b0", func_80027BAC); -INCLUDE_ASM(s32, "code_1b40_len_20b0", func_80027E10); +INCLUDE_ASM(s32, "code_1b40_len_20b0", gfx_draw_background); diff --git a/src/code_1f580_len_1940.c b/src/code_1f580_len_1940.c index 4965b3997a..2b2d452dd5 100644 --- a/src/code_1f580_len_1940.c +++ b/src/code_1f580_len_1940.c @@ -16,10 +16,10 @@ ApiStatus SetEncounterStatusFlags(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_800441F0(ScriptInstance* script, s32 isInitialCall) { +ApiStatus IsStartingConversation(ScriptInstance* script, s32 isInitialCall) { Bytecode arg1 = *script->ptrReadPos; - set_variable(script, arg1, func_80044148()); + set_variable(script, arg1, is_starting_conversation()); return ApiStatus_DONE2; } @@ -411,7 +411,7 @@ ApiStatus SetSelfEnemyFlagBits(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80045580(ScriptInstance* script, s32 isInitialCall) { +ApiStatus SyncOverrideEnemyPos(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* owner = script->owner1.enemy; Npc* npc = get_npc_unsafe(script->owner2.npcID); @@ -493,7 +493,7 @@ ApiStatus func_800457F8(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_8004580C(ScriptInstance* script, s32 isInitialCall) { +ApiStatus GetEncounterTriggerHitTier(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, gCurrentEncounter.hitTier); return ApiStatus_DONE2; } diff --git a/src/code_20ec0_len_5040.c b/src/code_20ec0_len_5040.c index fa8dcc230f..5c31794c38 100644 --- a/src/code_20ec0_len_5040.c +++ b/src/code_20ec0_len_5040.c @@ -5,11 +5,11 @@ INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045AC0); INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045B10); -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045B68); +INCLUDE_ASM(s32, "code_20ec0_len_5040", update_merlee_messages); INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045BC8); -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045C28); +INCLUDE_ASM(s32, "code_20ec0_len_5040", draw_merlee_messages); INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045C88); @@ -19,11 +19,11 @@ INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045D00); INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045D7C); -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045E4C); +INCLUDE_ASM(s32, "code_20ec0_len_5040", draw_merlee_message_string); -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045ED0); +INCLUDE_ASM(s32, "code_20ec0_len_5040", draw_merlee_message); -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045FA4); +INCLUDE_ASM(s32, "code_20ec0_len_5040", is_merlee_message_done); INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045FB4); diff --git a/src/code_341d0.c b/src/code_341d0.c index 6bb7bb45d3..eecd2dc5cd 100644 --- a/src/code_341d0.c +++ b/src/code_341d0.c @@ -18,17 +18,18 @@ INCLUDE_ASM(s32, "code_341d0", func_80059AB8); INCLUDE_ASM(s32, "code_341d0", func_80059BD4); -void func_80059C80(EffectInstance* effectInst) { +/// Used for unbound function points in effect structs. +void stub_effect_delegate(EffectInstance* effectInst) { } -INCLUDE_ASM(s32, "code_341d0", func_80059C88); +INCLUDE_ASM(s32, "code_341d0", set_effect_pos_offset); -INCLUDE_ASM(s32, "code_341d0", func_80059C9C); +INCLUDE_ASM(s32, "code_341d0", clear_effect_data); void func_80059D48(void) { } -INCLUDE_ASM(s32, "code_341d0", func_80059D50); +INCLUDE_ASM(s32, "code_341d0", update_effects); #define EFFECT_LOADED 1 @@ -93,17 +94,17 @@ EffectInstance* func_8005A2BC(EffectBlueprint* effectBp) { if (curEffect->instanceCounter == 0) { curEffect->update = effectBp->update; if (curEffect->update == NULL) { - curEffect->renderWorld = func_80059C80; + curEffect->renderWorld = stub_effect_delegate; } curEffect->renderWorld = effectBp->renderWorld; if (curEffect->unk_18 == NULL) { - curEffect->unk_18 = func_80059C80; + curEffect->unk_18 = stub_effect_delegate; } curEffect->unk_18 = effectBp->unk_14; if (curEffect->unk_18 == NULL) { - curEffect->unk_18 = func_80059C80; + curEffect->unk_18 = stub_effect_delegate; } } @@ -165,7 +166,7 @@ typedef TlbEntry TlbMappablePage[15]; extern TlbMappablePage D_80197000; extern EffectTableEntry D_8007F210[135]; -s32 play_effect(s32 effectIndex) { +s32 load_effect(s32 effectIndex) { EffectTableEntry* effectTable = &D_8007F210[0]; EffectTableEntry* effectEntry; Effect* curEffect; diff --git a/src/code_362a0_len_2f70.c b/src/code_362a0_len_2f70.c index a4cc41e4a8..53007c1a92 100644 --- a/src/code_362a0_len_2f70.c +++ b/src/code_362a0_len_2f70.c @@ -28,7 +28,7 @@ INCLUDE_ASM(void, "code_362a0_len_2f70", update_collider_transform, s16 collider INCLUDE_ASM(s32, "code_362a0_len_2f70", get_collider_type_by_id); -INCLUDE_ASM(s32, "code_362a0_len_2f70", func_8005BDD8); +INCLUDE_ASM(s32, "code_362a0_len_2f70", get_flat_collider_normal); INCLUDE_ASM(void, "code_362a0_len_2f70", get_collider_center, s32 colliderID, f32* x, f32* y, f32* z); diff --git a/src/code_42e0_len_1f60.c b/src/code_42e0_len_1f60.c index 4b357fd778..ebd5af4e9f 100644 --- a/src/code_42e0_len_1f60.c +++ b/src/code_42e0_len_1f60.c @@ -85,13 +85,13 @@ void start_rumble(s32 freq, s32 frame) { } } -void func_80028F8C(void) { +void update_max_rumble_duration(void) { s32* sym = &D_80074264; u16* sym2; if (*sym != GAME_STATUS->currentButtons) { *sym = GAME_STATUS->currentButtons; - func_80028FE0(); + reset_max_rumble_duration(); } sym2 = &D_80074260; @@ -100,7 +100,7 @@ void func_80028F8C(void) { } } -void func_80028FE0(void) { +void reset_max_rumble_duration(void) { D_80074260 = 300; } diff --git a/src/code_77480.c b/src/code_77480.c index 80f676e91e..d3745d2292 100644 --- a/src/code_77480.c +++ b/src/code_77480.c @@ -250,7 +250,7 @@ void func_800E06C0(s32 arg0) { INCLUDE_ASM(s32, "code_77480", func_800E06D8); -INCLUDE_ASM(s32, "code_77480", func_800E0818); +INCLUDE_ASM(s32, "code_77480", check_for_interactables); void func_800E0AD0(void) { if ((gPlayerStatusPtr->animFlags & 0x10) && (D_8010C958 != 0)) { @@ -263,7 +263,7 @@ void func_800E0B14(void) { gPlayerStatusPtr->animFlags &= ~0x10; } -void func_800E0B38(void) { +void update_partner_timers(void) { PlayerData* playerData = PLAYER_DATA; if (!GAME_STATUS->isBattle) { @@ -279,7 +279,7 @@ void func_800E0B38(void) { INCLUDE_ASM(s32, "code_77480", func_800E0B90); -INCLUDE_ASM(s32, "code_77480", func_800E0FEC); +INCLUDE_ASM(s32, "code_77480", get_player_back_anim); void render_player(void) { if (!GAME_STATUS->disableScripts) { @@ -291,6 +291,8 @@ INCLUDE_ASM(void, "code_77480", render_player_model); INCLUDE_ASM(s32, "code_77480", appendGfx_player); +/// Only used when speedy spinning. INCLUDE_ASM(s32, "code_77480", appendGfx_player_spin); INCLUDE_ASM(s32, "code_77480", update_player_shadow); + diff --git a/src/code_7bb60_len_41b0.c b/src/code_7bb60_len_41b0.c index 301c0a8afb..15e19396bf 100644 --- a/src/code_7bb60_len_41b0.c +++ b/src/code_7bb60_len_41b0.c @@ -107,7 +107,7 @@ void func_800E5150(void) { INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5174); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E52F8); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", can_player_interact); INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5348); diff --git a/src/code_80850_len_3060.c b/src/code_80850_len_3060.c index f4df47f552..7a09995546 100644 --- a/src/code_80850_len_3060.c +++ b/src/code_80850_len_3060.c @@ -313,7 +313,7 @@ void initialize_status_menu(void) { uiStatus->unk_6C[1] = 0; uiStatus->iconIndex12 = -1; - func_800E97B8(); + close_status_menu(); iconIndex = create_icon(&D_80108248); uiStatus->hpIconIndexes[0] = iconIndex; @@ -433,7 +433,7 @@ void update_coin_counter(void) { if ((uiStatus->displayCoins == playerData->coins) || (uiStatus->unk_6C[0] <= 30)) { uiStatus->unk_6C[0] -= 1; if (uiStatus->unk_6C[0] == 0) { - func_80147E7C(20, &D_80147574); + set_window_update(20, &D_80147574); uiStatus->unk_6C[1] = 15; D_8010CD10 = 0; D_8010CD12 = 1; @@ -455,7 +455,7 @@ void show_coin_counter(void) { s32 index; if ((*coinCounterUnk != 0) || (D_8010CD12 != 0)) { - func_80147E7C(0x14, 2); + set_window_update(0x14, 2); if (uiStatus->iconIndex12 > -1) { free_icon(uiStatus->iconIndex10); free_icon(uiStatus->iconIndex11); @@ -468,8 +468,8 @@ void show_coin_counter(void) { } if (uiStatus->unk_6C[0] == 0) { - set_ui_panel_properties(0x14, 0x20, 0xa4, 0x40, 0x14, 0x15, coin_counter_draw_content, 0, -1); - func_80147E7C(0x14, &D_80147474); + set_window_properties(0x14, 0x20, 0xa4, 0x40, 0x14, 0x15, coin_counter_draw_content, 0, -1); + set_window_update(0x14, &D_80147474); index = create_icon(&D_80109270); uiStatus->iconIndex10 = index; set_icon_flags(index, 0x80); @@ -540,7 +540,7 @@ void open_status_menu_short(void) { } } -void func_800E97B8(void) { +void close_status_menu(void) { UiStatus* uiStatus = &gUIStatus; if (uiStatus->hidden != 1) { diff --git a/src/code_838b0_len_5900.c b/src/code_838b0_len_5900.c index 031096e67e..fe7108e664 100644 --- a/src/code_838b0_len_5900.c +++ b/src/code_838b0_len_5900.c @@ -23,11 +23,11 @@ INCLUDE_ASM(s32, "code_838b0_len_5900", is_current_partner_flying, void); INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA5B8); -INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA5D0); +INCLUDE_ASM(s32, "code_838b0_len_5900", load_partner_npc); INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6A8); -INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6CC); +INCLUDE_ASM(s32, "code_838b0_len_5900", _use_partner_ability); INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB168, s32 arg0); @@ -89,9 +89,9 @@ INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF314); INCLUDE_ASM(void, "code_838b0_len_5900", enable_partner_ai, void); -INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF394, f32 arg0); +INCLUDE_ASM(s32, "code_838b0_len_5900", set_parter_tether_distance, f32 arg0); -INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF3A4); +INCLUDE_ASM(s32, "code_838b0_len_5900", reset_parter_tether_distance); INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF3C0); diff --git a/src/code_B0E0.c b/src/code_B0E0.c index 8e8ab67b8a..93276b559e 100644 --- a/src/code_B0E0.c +++ b/src/code_B0E0.c @@ -13,6 +13,6 @@ void func_80030450(void) { INCLUDE_ASM(s32, "code_B0E0", test_ray_zone_aabb); -INCLUDE_ASM(s32, "code_B0E0", func_800304FC); +INCLUDE_ASM(s32, "code_B0E0", update_camera_from_zone); INCLUDE_ASM(s32, "code_B0E0", do_camera_type_3); diff --git a/src/code_B9D60.c b/src/code_B9D60.c index e95afdc2e3..71b121a7b0 100644 --- a/src/code_B9D60.c +++ b/src/code_B9D60.c @@ -69,9 +69,9 @@ INCLUDE_ASM(s32, "code_B9D60", get_string_properties); INCLUDE_ASM(s32, "code_B9D60", get_string_width); -INCLUDE_ASM(s32, "code_B9D60", func_801264B0); +INCLUDE_ASM(s32, "code_B9D60", get_msg_lines); -INCLUDE_ASM(s32, "code_B9D60", draw_string); +INCLUDE_ASM(s32, "code_B9D60", draw_msg); INCLUDE_ASM(s32, "code_B9D60", func_80126790); diff --git a/src/code_C50A0.c b/src/code_C50A0.c index 0650e726ff..c94e055145 100644 --- a/src/code_C50A0.c +++ b/src/code_C50A0.c @@ -97,7 +97,8 @@ void func_801341B0(s32 index) { itemEntity->flags |= 0x100; } -s32 func_801341E8(void) { +/// @returns TRUE when "you got X" popup is on-screen +s32 is_picking_up_item(void) { s32 ret = D_801565A8 != 0; if (D_801565A4 != 0) { diff --git a/src/code_DF950.c b/src/code_DF950.c index f2e630f1b8..f1256928c6 100644 --- a/src/code_DF950.c +++ b/src/code_DF950.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_DF950", func_80149250); -void func_80149600(void) { +void use_default_door_sounds(void) { gCurrentDoorSoundsSet = 0; D_80151308 = 0; } diff --git a/src/code_F5750.c b/src/code_F5750.c index 5cd4bb19b8..0f54e6ff8c 100644 --- a/src/code_F5750.c +++ b/src/code_F5750.c @@ -50,7 +50,7 @@ ApiStatus DisablePlayerInput(ScriptInstance* script, s32 isInitialCall) { if (enable) { disable_player_input(); func_800EF628(); - func_800E97B8(); + close_status_menu(); func_800E984C(); if (playerStatus->actionState == ActionState_SPIN) { playerStatus->animFlags |= 0x40000; @@ -320,7 +320,7 @@ INCLUDE_ASM(s32, "code_F5750", UseExitHeading); INCLUDE_ASM(s32, "code_F5750", func_802D23F8); -ApiStatus func_802D244C(ScriptInstance* script, s32 isInitialCall) { +ApiStatus WaitForPlayerTouchingFloor(ScriptInstance* script, s32 isInitialCall) { if ((gCollisionStatus.currentFloor >= 0) && (func_802D23F8() != 0)) { return ApiStatus_DONE2; } @@ -332,7 +332,7 @@ ApiStatus func_802D2484(ScriptInstance* script, s32 isInitialCall) { return (gCollisionStatus.currentFloor >= 0) * ApiStatus_DONE2; } -ApiStatus func_802D249C(ScriptInstance* script, s32 isInitialCall) { +ApiStatus IsPlayerOnValidFloor(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 val = 0; @@ -344,11 +344,11 @@ ApiStatus func_802D249C(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D24F4(ScriptInstance* script, s32 isInitialCall) { +ApiStatus WaitForPlayerMoveToComplete(ScriptInstance* script, s32 isInitialCall) { return (gPlayerStatus.moveFrames == 0) * ApiStatus_DONE2; } -ApiStatus func_802D2508(ScriptInstance* script, s32 isInitialCall) { +ApiStatus WaitForPlayerInputEnabled(ScriptInstance* script, s32 isInitialCall) { return !(gPlayerStatus.flags & 0x2000) * ApiStatus_DONE2; } diff --git a/src/code_FBE10.c b/src/code_FBE10.c index d43442c1cb..f12c46eaf6 100644 --- a/src/code_FBE10.c +++ b/src/code_FBE10.c @@ -78,17 +78,17 @@ ApiStatus func_802D7BA4(ScriptInstance* script, s32 isInitialCall) { script->functionTemp[0].s = var6; func_80137DC0(1, &t0, &t1); script->functionTemp[1].s = t1; - func_80137E4C(1, 0, var1, var2); - func_80137E4C(1, 1, var3, var4); + set_transition_stencil_center(1, 0, var1, var2); + set_transition_stencil_center(1, 1, var3, var4); } func_80137DC0(1, &t0, &t1); temp = (script->functionTemp[1].s - var5) * script->functionTemp[0].s; - func_80137DA4(12, (temp / var6) + var5); + set_transition_stencil_zoom_1(12, (temp / var6) + var5); script->functionTemp[0].s--; if (script->functionTemp[0].s < 0) { - func_80137DA4(12, var5); + set_transition_stencil_zoom_1(12, var5); return ApiStatus_DONE2; } return ApiStatus_BLOCK; diff --git a/src/code_a5dd0_len_114e0.c b/src/code_a5dd0_len_114e0.c index 752ead4331..e095a26fcb 100644 --- a/src/code_a5dd0_len_114e0.c +++ b/src/code_a5dd0_len_114e0.c @@ -120,7 +120,7 @@ INCLUDE_ASM(s32, "code_a5dd0_len_114e0", MakeEntity, ScriptInstance* script, s32 INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80111E9C); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80111F2C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", UseDynamicShadow); INCLUDE_ASM(s32, "code_a5dd0_len_114e0", AssignScript, ScriptInstance* script, s32 isInitialCall); @@ -168,7 +168,7 @@ void NOP_state(void) { INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112B98); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112BBC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_next_game_mode); INCLUDE_ASM(s32, "code_a5dd0_len_114e0", _set_game_mode); @@ -204,7 +204,7 @@ INCLUDE_ASM(s32, "code_a5dd0_len_114e0", _load_model_textures); INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_model_textures); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80115CA8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", mdl_get_child_count); INCLUDE_ASM(s32, "code_a5dd0_len_114e0", clear_model_data); @@ -212,7 +212,7 @@ INCLUDE_ASM(s32, "code_a5dd0_len_114e0", init_model_data); INCLUDE_ASM(s32, "code_a5dd0_len_114e0", calculate_model_sizes); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011620C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", mdl_create_model); INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80116674); @@ -297,7 +297,8 @@ INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BCD0); INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BCEC); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BE14); +/// @returns TRUE if mtx is NULL or identity. +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", is_identity_fixed_mtx); INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_background_color_blend); diff --git a/src/code_b72b0_len_15ed0.c b/src/code_b72b0_len_15ed0.c index ed7f06f77b..2e629c5899 100644 --- a/src/code_b72b0_len_15ed0.c +++ b/src/code_b72b0_len_15ed0.c @@ -31,15 +31,15 @@ void make_mtx_flipZ(Matrix4f* arg0) { INCLUDE_ASM(s32, "code_b72b0_len_15ed0", appendGfx_entity_model); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80121CE8); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_entity_model_shadow); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80121EB8); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_entity_model_main); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122088); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_entity_model_extra1); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122188); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_entity_model_extra2); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122288); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_entity_model_extra3); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122D7C); diff --git a/src/code_cd180_len_38f0.c b/src/code_cd180_len_38f0.c index d89afb0159..8df1e43541 100644 --- a/src/code_cd180_len_38f0.c +++ b/src/code_cd180_len_38f0.c @@ -1,31 +1,31 @@ #include "common.h" -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80136A80); +INCLUDE_ASM(s32, "code_cd180_len_38f0", _render_transition_stencil); -INCLUDE_ASM(void, "code_cd180_len_38f0", func_80137D88, s32 arg0, f32 arg1); +INCLUDE_ASM(void, "code_cd180_len_38f0", set_transition_stencil_zoom_0, s32 arg0, f32 arg1); -INCLUDE_ASM(void, "code_cd180_len_38f0", func_80137DA4, s32 arg0, f32 arg1); +INCLUDE_ASM(void, "code_cd180_len_38f0", set_transition_stencil_zoom_1, s32 arg0, f32 arg1); INCLUDE_ASM(void, "code_cd180_len_38f0", func_80137DC0, s32 arg0, f32* arg1, f32* arg2); -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80137E10, s32 arg0, u8 arg1, u8 arg2, u8 arg3); +INCLUDE_ASM(s32, "code_cd180_len_38f0", set_transition_stencil_color, s32 arg0, u8 arg1, u8 arg2, u8 arg3); -INCLUDE_ASM(void, "code_cd180_len_38f0", func_80137E4C, s32 arg0, s32 arg1, s32 arg2, s32 arg3); +INCLUDE_ASM(void, "code_cd180_len_38f0", set_transition_stencil_center, s32 arg0, s32 arg1, s32 arg2, s32 arg3); -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80137EC0); +INCLUDE_ASM(s32, "code_cd180_len_38f0", set_transition_stencil_center_worldpos); -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_801380D4); +INCLUDE_ASM(s32, "code_cd180_len_38f0", set_transition_stencil_alpha); -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138108); +INCLUDE_ASM(s32, "code_cd180_len_38f0", clear_transition_stencil); INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138188); void func_80138198(void) { } -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_801381A0); +INCLUDE_ASM(s32, "code_cd180_len_38f0", render_transition_stencil_upper); -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138220); +INCLUDE_ASM(s32, "code_cd180_len_38f0", render_transition_stencil_lower); INCLUDE_ASM(s32, "code_cd180_len_38f0", set_map_transition_effect); diff --git a/src/code_d610_len_1330.c b/src/code_d610_len_1330.c index f43ef7af55..550635ad8b 100644 --- a/src/code_d610_len_1330.c +++ b/src/code_d610_len_1330.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "code_d610_len_1330", func_80032970); INCLUDE_ASM(s32, "code_d610_len_1330", func_80032C64); -INCLUDE_ASM(s32, "code_d610_len_1330", func_80033394); +INCLUDE_ASM(s32, "code_d610_len_1330", create_camera_lead_player_mtx); void func_800334E8(void) { } diff --git a/src/code_dbd70_len_700.c b/src/code_dbd70_len_700.c index e5c36c58ce..692e9bc84c 100644 --- a/src/code_dbd70_len_700.c +++ b/src/code_dbd70_len_700.c @@ -1,6 +1,6 @@ #include "common.h" -void default_trigger_function_handler(s32* arg0) { +void default_trigger_delegate(s32* arg0) { arg0[0] |= 2; } @@ -42,10 +42,11 @@ Trigger* get_trigger_by_id(s32 triggerID) { return (*gCurrentTriggerListPtr)[triggerID]; } -s32 func_80145CE8(s32 arg0) { +/// @returns TRUE if colliderID is bound to an interaction trigger (press A) and the player can use it. +s32 should_collider_allow_interact(s32 colliderID) { s32 i; - if (func_800E52F8() == 0) { + if (can_player_interact() == 0) { return 0; } @@ -54,7 +55,7 @@ s32 func_80145CE8(s32 arg0) { if ((trigger != NULL) && (trigger->unk_30 != 0) && - (trigger->params2 == arg0) && + (trigger->params2 == colliderID) && (trigger->flags.flags & 0x100)) { return 1; } diff --git a/src/code_dc470_len_14c0.c b/src/code_dc470_len_14c0.c index d6feef829d..aab5e9160e 100644 --- a/src/code_dc470_len_14c0.c +++ b/src/code_dc470_len_14c0.c @@ -25,7 +25,7 @@ void load_map_bg(char* optAssetName) { general_heap_free(compressedData); } -void func_80145DF8(void) { +void use_default_background_settings(void) { GameStatus* gameStatus = GAME_STATUS; D_801595A0 = 0; D_8014F12F = 0; @@ -56,10 +56,10 @@ void set_background_size(s16 startX, s16 startY, s16 sizeX, s16 sizeY) { gameStatus->backgroundMinH = sizeY; } -u16 func_80145E98(s32 arg0, s32 arg1, s32 arg2) { +u16 blend_background_channel(s32 arg0, s32 arg1, s32 alpha) { s32 temp_lo; - temp_lo = (arg1 - (u16)arg0) * arg2; + temp_lo = (arg1 - (u16)arg0) * alpha; if (temp_lo < 0) { temp_lo = temp_lo + 0xFF; } @@ -67,12 +67,12 @@ u16 func_80145E98(s32 arg0, s32 arg1, s32 arg2) { return temp_lo; } -INCLUDE_ASM(s32, "code_dc470_len_14c0", func_80145EC0); +INCLUDE_ASM(s32, "code_dc470_len_14c0", enable_background_wave); void func_8014720C(void) { D_8014F12F = 1; } -void func_8014721C(void) { +void disable_background_wave(void) { D_8014F12F = 0; } diff --git a/src/code_dd930_len_1c0.c b/src/code_dd930_len_1c0.c index 721f0c13f9..ed49f94426 100644 --- a/src/code_dd930_len_1c0.c +++ b/src/code_dd930_len_1c0.c @@ -12,11 +12,11 @@ typedef struct { extern struct_80147230 D_8014F140; extern struct_80147230 D_8015C7C0; -void func_80147230(void) { +void reset_ambient_sounds(void) { D_8015C7C0 = D_8014F140; } -void func_80147264(void) { +void update_ambient_sounds(void) { struct_80147230* temp = &D_8015C7C0; switch (temp->fadeState) { diff --git a/src/code_ddaf0_len_c50.c b/src/code_ddaf0_len_c50.c index 36f7a8ee95..4f8e81ecdc 100644 --- a/src/code_ddaf0_len_c50.c +++ b/src/code_ddaf0_len_c50.c @@ -1,7 +1,7 @@ #include "common.h" // this is definitely wrong but I had issues trying to use an array accessor -void func_801473F0(void) { +void clear_windows(void) { UIPanel* panelIt = gUIPanels; s32 i; @@ -10,23 +10,23 @@ void func_801473F0(void) { } } -INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147414); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", update_windows); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147474); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", basic_window_update); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147574); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", basic_hidden_window_update); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147650); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", main_menu_window_update); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147698); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", render_windows); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147AC4); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", render_window_root); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", set_ui_panel_properties); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", set_window_properties); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147D70); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", update_window_hierarchy); -void func_80147E48(s32 panelIndex, s8 arg1, s32 arg2) { +void replace_window_update(s32 panelIndex, s8 arg1, s32 arg2) { UIPanel* panels = gUIPanels; if (panels[panelIndex].flags & 1) { @@ -36,7 +36,7 @@ void func_80147E48(s32 panelIndex, s8 arg1, s32 arg2) { } } -void func_80147E7C(s32 panelIndex, s32 arg1) { +void set_window_update(s32 panelIndex, s32 arg1) { UIPanel* panels = gUIPanels; if (panels[panelIndex].flags & 1) { @@ -49,6 +49,6 @@ void func_80147E7C(s32 panelIndex, s32 arg1) { } } -INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147EC4); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", set_windows_visible); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147F30); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", setup_pause_menu_tab); diff --git a/src/code_de740_len_23f0.c b/src/code_de740_len_23f0.c index e8351663c6..8b2203453f 100644 --- a/src/code_de740_len_23f0.c +++ b/src/code_de740_len_23f0.c @@ -6,9 +6,9 @@ INCLUDE_ASM(s32, "code_de740_len_23f0", func_801480F0); INCLUDE_ASM(s32, "code_de740_len_23f0", func_80148154); -INCLUDE_ASM(s32, "code_de740_len_23f0", func_801481C4); +INCLUDE_ASM(s32, "code_de740_len_23f0", render_shaded_sprite); -INCLUDE_ASM(s32, "code_de740_len_23f0", func_801489B8); +INCLUDE_ASM(s32, "code_de740_len_23f0", appendGfx_shaded_sprite); void func_801491E4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 alpha) { gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0x00, 0x00, 0x00, alpha); diff --git a/src/code_e940_len_290.c b/src/code_e940_len_290.c index 038e779f0e..a7885db8d2 100644 --- a/src/code_e940_len_290.c +++ b/src/code_e940_len_290.c @@ -39,24 +39,24 @@ void step_init_state(void) { func_8011E224(); clear_model_data(); func_80148040(); - func_80145DF8(); + use_default_background_settings(); func_801452E8(0, 0); func_80141100(); clear_trigger_data(); clear_printers(); clear_entity_data(0); - func_80138108(); + clear_transition_stencil(); clear_player_status(); clear_npcs(); clear_player_data(); func_80072B30(); func_8003E338(); - func_80059C9C(); + clear_effect_data(); clear_item_entity_data(); clear_saved_variables(); initialize_collision(); func_8014AC08(); - func_801473F0(); + clear_windows(); partner_initialize_data(); func_80149618(); func_8014A52C(); @@ -81,6 +81,6 @@ void step_init_state(void) { set_game_mode(1); } -void func_80033788(void) { +void state_drawUI_startup(void) { func_8002AB5C(0, 0, 0x13F, 0xEF, 0, 0, 0, 0xFF); } diff --git a/src/code_ebd0_len_6a0.c b/src/code_ebd0_len_6a0.c index e1f40e50e7..98712a1406 100644 --- a/src/code_ebd0_len_6a0.c +++ b/src/code_ebd0_len_6a0.c @@ -43,8 +43,8 @@ s16 intro_logos_fade_out(s16 addAlpha) { } void intro_logos_update_fade(void) { - func_80137D88(0, GAME_STATUS->bootAlpha); - func_80137E10(0, GAME_STATUS->bootBlue, GAME_STATUS->bootGreen, GAME_STATUS->bootRed); + set_transition_stencil_zoom_0(0, GAME_STATUS->bootAlpha); + set_transition_stencil_color(0, GAME_STATUS->bootBlue, GAME_STATUS->bootGreen, GAME_STATUS->bootRed); } void begin_state_battle(void) { @@ -54,7 +54,7 @@ void begin_state_battle(void) { INCLUDE_ASM(s32, "code_ebd0_len_6a0", step_battle); void func_80033B54(void) { - func_8003E5B0(); + draw_encounter_ui(); if (D_800A0900 < 0) { draw_main_battle_ui(); } diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 5604e8392c..1643561aec 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -23,6 +23,7 @@ void set_npc_animation(Npc* npc, u32 arg1) { } } +/// Used in battle scripts. INCLUDE_ASM(ApiStatus, "code_f2470_len_27f0", CreateNpc, ScriptInstance* script, s32 isInitialCall); ApiStatus DeleteNpc(ScriptInstance* script, s32 isInitialCall) { @@ -305,7 +306,7 @@ ApiStatus func_802CF1B4(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802CF208(ScriptInstance* script, s32 isInitialCall) { +ApiStatus SetNpcSprite(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; NpcId npcId = get_variable(script, *args++); Bytecode arg1 = *args; @@ -315,7 +316,7 @@ ApiStatus func_802CF208(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } - func_8003AC5C(npc, arg1, 0); + set_npc_sprite(npc, arg1, 0); return ApiStatus_DONE2; } diff --git a/src/code_f8f60_len_1560.c b/src/code_f8f60_len_1560.c index a369e6073a..0cce21e6a5 100644 --- a/src/code_f8f60_len_1560.c +++ b/src/code_f8f60_len_1560.c @@ -210,7 +210,7 @@ ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) { *t1 = 255; } - func_80137DA4(10, *t1); + set_transition_stencil_zoom_1(10, *t1); } return ApiStatus_BLOCK; @@ -229,7 +229,7 @@ ApiStatus func_802D4C4C(ScriptInstance* script, s32 initialCall) { if (*t0 == 0) { t1v = *t1; if (t1v == 0) { - func_80137DA4(255, -1.0f); + set_transition_stencil_zoom_1(255, -1.0f); return ApiStatus_DONE2; } t1v -= 10; @@ -237,7 +237,7 @@ ApiStatus func_802D4C4C(ScriptInstance* script, s32 initialCall) { if (t1v < 0) { *t1 = 0; } - func_80137DA4(10, *t1); + set_transition_stencil_zoom_1(10, *t1); } return ApiStatus_BLOCK; @@ -246,9 +246,9 @@ ApiStatus func_802D4C4C(ScriptInstance* script, s32 initialCall) { ApiStatus func_802D4CC4(ScriptInstance* script, s32 initialCall) { s32 value = get_variable(script, *script->ptrReadPos); if (value < 0) { - func_80137DA4(255, -1.0f); + set_transition_stencil_zoom_1(255, -1.0f); } else { - func_80137DA4(10, value); + set_transition_stencil_zoom_1(10, value); } return ApiStatus_DONE2; @@ -257,15 +257,15 @@ ApiStatus func_802D4CC4(ScriptInstance* script, s32 initialCall) { ApiStatus func_802D4D14(ScriptInstance* script, s32 initialCall) { s32 value = get_float_variable(script, *script->ptrReadPos); - func_80137E4C(0, 0, 0xC, 0x14); - func_80137E4C(0, 1, 0x134, 0xDC); - func_80137D88(0xC, value); + set_transition_stencil_center(0, 0, 0xC, 0x14); + set_transition_stencil_center(0, 1, 0x134, 0xDC); + set_transition_stencil_zoom_0(0xC, value); return ApiStatus_DONE2; } ApiStatus func_802D4D88(ScriptInstance* script, s32 initialCall) { - func_80137D88(0xC, 0); + set_transition_stencil_zoom_0(0xC, 0); return ApiStatus_DONE2; } @@ -444,7 +444,7 @@ ApiStatus EnableStatusMenu(ScriptInstance* script, s32 isInitialCall) { ApiStatus ShowStatusMenu(ScriptInstance* script, s32 isInitialCall) { if (get_variable(script, *script->ptrReadPos) != 0) { func_800E9894(); - func_800E97B8(); + close_status_menu(); } else { func_800E98C4(); } diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c index b250c27c43..8aed6e17ad 100644 --- a/src/os/code_4ac90_len_3910.c +++ b/src/os/code_4ac90_len_3910.c @@ -283,11 +283,11 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072BB0); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072BCC); -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072BDC); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", load_battle_section); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", load_battle); -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072CCC); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", set_battle_stage); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072CDC); diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index 37dd1046e1..cbda2ed0fc 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -28,9 +28,9 @@ ApiStatus func_802405EC_E1EA4C(ScriptInstance* script, s32 isInitialCall) { script->functionTemp[0].s = 255; } - func_80137E10(1, 208, 208, 208); - func_80137DA4(0, script->functionTemp[0].s); - func_801380D4(1, 0); + set_transition_stencil_color(1, 208, 208, 208); + set_transition_stencil_zoom_1(0, script->functionTemp[0].s); + set_transition_stencil_alpha(1, 0); return script->functionTemp[0].s == 255; } diff --git a/src/world/area_kmr/kmr.h b/src/world/area_kmr/kmr.h new file mode 100644 index 0000000000..80fd66c4d8 --- /dev/null +++ b/src/world/area_kmr/kmr.h @@ -0,0 +1,98 @@ +#ifndef _WORLD_AREA_KMR_KMR_H_ +#define _WORLD_AREA_KMR_KMR_H_ + +#include "si.h" + +#define KMR20_MarioReadLetterFlags_00 SI_SAVE_VAR(0x00E) +#define KMR20_MarioReadLetterFlags_01 SI_SAVE_VAR(0x00F) + +#define KMR04_Tree3_Dolly SI_SAVE_FLAG(0x01E) +#define KMR02_KeptDolly SI_SAVE_FLAG(0x01F) +#define KMR02_Met_Goompapa SI_SAVE_FLAG(0x020) +#define KMR02_Goompapa_SaidFarewell SI_SAVE_FLAG(0x021) +#define KMR02_Met_Goomama SI_SAVE_FLAG(0x022) +#define KMR02_Goomama_SaidFarewell SI_SAVE_FLAG(0x023) +#define KMR02_Met_Goombario SI_SAVE_FLAG(0x024) +#define KMR02_Goombario_SwapDialogue SI_SAVE_FLAG(0x025) +#define KMR02_Met_Gooma SI_SAVE_FLAG(0x026) +#define KMR02_Gooma_HealthAdvice SI_SAVE_FLAG(0x027) +#define KMR02_Met_Goompa SI_SAVE_FLAG(0x028) +#define KMR02_Goompa_SwapDialogue SI_SAVE_FLAG(0x029) +#define KMR02_ToadHouse_Intro SI_SAVE_FLAG(0x02A) +#define KMR02_ReturnedWithGoompa SI_SAVE_FLAG(0x02B) +#define KMR11_GoombaBrosFledToCastle SI_SAVE_FLAG(0x02D) +#define KMR02_Item_ShootingStar SI_SAVE_FLAG(0x02E) +#define KMR02_Bush2_Coin SI_SAVE_FLAG(0x02F) +#define KMR02_Tree1_Goomnut SI_SAVE_FLAG(0x030) +#define KMR02_Item_FireFlower SI_SAVE_FLAG(0x031) +#define KMR03_ItemBlock_Coin SI_SAVE_FLAG(0x032) +#define KMR03_HiddenItem_RepelGel SI_SAVE_FLAG(0x034) +#define KMR03_Tree1_Mushroom SI_SAVE_FLAG(0x035) +#define KMR03_Hammer1Block SI_SAVE_FLAG(0x036) +#define KMR03_Item_CoinA SI_SAVE_FLAG(0x038) +#define KMR03_Item_CoinB SI_SAVE_FLAG(0x039) +#define KMR03_Item_CoinC SI_SAVE_FLAG(0x03A) +#define KMR03_Item_CoinD SI_SAVE_FLAG(0x03B) +#define KMR04_Tree1_Coin SI_SAVE_FLAG(0x03C) +#define KMR04_Tree2_Coin SI_SAVE_FLAG(0x03D) +#define KMR04_Bush1_Coin SI_SAVE_FLAG(0x03E) +#define KMR04_Bush2_Coin SI_SAVE_FLAG(0x03F) +#define KMR04_Bush3_CoinA SI_SAVE_FLAG(0x040) +#define KMR04_Bush3_CoinB SI_SAVE_FLAG(0x041) +#define KMR04_Bush4_Coin SI_SAVE_FLAG(0x042) +#define KMR04_Bush5_Coin SI_SAVE_FLAG(0x043) +#define KMR04_MultiCoinBrick SI_SAVE_FLAG(0x046) +#define KMR04_Hammer1Block SI_SAVE_FLAG(0x047) +#define KMR05_EnemyWarning SI_SAVE_FLAG(0x048) +#define KMR05_Tree1_Coin SI_SAVE_FLAG(0x049) +#define KMR05_Item_StarPiece SI_SAVE_FLAG(0x04A) +#define KMR09_ItemBlock_CoinA SI_SAVE_FLAG(0x04D) +#define KMR09_ItemBlock_CoinB SI_SAVE_FLAG(0x04E) +#define KMR06_Item_Mushroom SI_SAVE_FLAG(0x04F) +#define KMR06_BadgeBlock_CloseCall SI_SAVE_FLAG(0x050) +#define KMR11_ItemBlock_SuperShroom SI_SAVE_FLAG(0x051) +#define KMR11_Tree1_StarPiece SI_SAVE_FLAG(0x052) +#define KMR11_Tree2_Coin SI_SAVE_FLAG(0x053) +#define KMR10_Chest_HammerThrow SI_SAVE_FLAG(0x054) +#define KMR10_ItemBlock_SleepySheep SI_SAVE_FLAG(0x055) +#define KMR00_HiddenPanel SI_SAVE_FLAG(0x056) +#define KMR03_HiddenPanel SI_SAVE_FLAG(0x058) +#define KMR11_HiddenPanel SI_SAVE_FLAG(0x05A) +#define KMR10_UnreadFlagForSpring SI_SAVE_FLAG(0x05B) +#define Tutorial_Badges SI_SAVE_FLAG(0x05E) +#define Tutorial_SaveBlock SI_SAVE_FLAG(0x05F) +#define Tutorial_HeartBlock SI_SAVE_FLAG(0x060) +#define Tutorial_GotItem SI_SAVE_FLAG(0x061) +#define KMR20_ReunitedWithLuigi SI_SAVE_FLAG(0x062) ///< And saw him whistling +#define KMR20_Gift_LuigisAutograph SI_SAVE_FLAG(0x063) +#define KMR02_Gift_TheTape SI_SAVE_FLAG(0x064) +#define Tutorial_GotStarPiece SI_SAVE_FLAG(0x065) +#define FoughtTheMaster SI_SAVE_FLAG(0x066) +#define KMR20_ReadThankYouLetterFromKoopaVillage SI_SAVE_FLAG(0x067) +#define KMR02_Goombario_RelayedMessage SI_SAVE_FLAG(0x068) +#define KMR20_CaughtLuigiInBasement SI_SAVE_FLAG(0x069) +#define KMR20_CaughtLuigiReadingLetter SI_SAVE_FLAG(0x06A) +#define KMR20_FoundLuigisDiary SI_SAVE_FLAG(0x06B) +#define KMR20_CheckedDeskForMail SI_SAVE_FLAG(0x06C) +#define KMR20_ChasedOffShyGuy SI_SAVE_FLAG(0x06D) +#define KMR10_KnockedSpringOutOfTree SI_SAVE_FLAG(0x06E) + +MapConfig kmr_00_config; +MapConfig kmr_02_config; +MapConfig kmr_03_config; +MapConfig kmr_04_config; +MapConfig kmr_05_config; +MapConfig kmr_06_config; +MapConfig kmr_07_config; +MapConfig kmr_09_config; +MapConfig kmr_10_config; +MapConfig kmr_11_config; +MapConfig kmr_12_config; +MapConfig kmr_20_config; +MapConfig kmr_21_config; +MapConfig kmr_22_config; +MapConfig kmr_23_config; +MapConfig kmr_24_config; +MapConfig kmr_30_config; + +#endif diff --git a/src/world/area_kmr/kmr_00/kmr_00.h b/src/world/area_kmr/kmr_00/kmr_00.h index dcc340b6aa..8e99aec33f 100644 --- a/src/world/area_kmr/kmr_00/kmr_00.h +++ b/src/world/area_kmr/kmr_00/kmr_00.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_00 diff --git a/src/world/area_kmr/kmr_02/kmr_02.h b/src/world/area_kmr/kmr_02/kmr_02.h index 56343d3a47..9678778780 100644 --- a/src/world/area_kmr/kmr_02/kmr_02.h +++ b/src/world/area_kmr/kmr_02/kmr_02.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_02 diff --git a/src/world/area_kmr/kmr_03/kmr_03.h b/src/world/area_kmr/kmr_03/kmr_03.h index 0878fd7c51..6878c0fd34 100644 --- a/src/world/area_kmr/kmr_03/kmr_03.h +++ b/src/world/area_kmr/kmr_03/kmr_03.h @@ -1,5 +1,6 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_03 diff --git a/src/world/area_kmr/kmr_04/kmr_04.h b/src/world/area_kmr/kmr_04/kmr_04.h index f0f147ae8c..5e02285d2a 100644 --- a/src/world/area_kmr/kmr_04/kmr_04.h +++ b/src/world/area_kmr/kmr_04/kmr_04.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_04 diff --git a/src/world/area_kmr/kmr_05/kmr_05.h b/src/world/area_kmr/kmr_05/kmr_05.h index 3d8b36e174..e136417473 100644 --- a/src/world/area_kmr/kmr_05/kmr_05.h +++ b/src/world/area_kmr/kmr_05/kmr_05.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_05 diff --git a/src/world/area_kmr/kmr_06/kmr_06.h b/src/world/area_kmr/kmr_06/kmr_06.h index 8584126298..c0675b8c38 100644 --- a/src/world/area_kmr/kmr_06/kmr_06.h +++ b/src/world/area_kmr/kmr_06/kmr_06.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_06 diff --git a/src/world/area_kmr/kmr_07/kmr_07.h b/src/world/area_kmr/kmr_07/kmr_07.h index 9299a1d295..b46afc6fca 100644 --- a/src/world/area_kmr/kmr_07/kmr_07.h +++ b/src/world/area_kmr/kmr_07/kmr_07.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_07 diff --git a/src/world/area_kmr/kmr_09/kmr_09.h b/src/world/area_kmr/kmr_09/kmr_09.h index e5237a963d..ff0fc12712 100644 --- a/src/world/area_kmr/kmr_09/kmr_09.h +++ b/src/world/area_kmr/kmr_09/kmr_09.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_09 diff --git a/src/world/area_kmr/kmr_10/kmr_10.h b/src/world/area_kmr/kmr_10/kmr_10.h index 9fe672b5e5..3ae02d8ea0 100644 --- a/src/world/area_kmr/kmr_10/kmr_10.h +++ b/src/world/area_kmr/kmr_10/kmr_10.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_10 diff --git a/src/world/area_kmr/kmr_11/kmr_11.h b/src/world/area_kmr/kmr_11/kmr_11.h index 96918ce8e4..266f52a574 100644 --- a/src/world/area_kmr/kmr_11/kmr_11.h +++ b/src/world/area_kmr/kmr_11/kmr_11.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_11 diff --git a/src/world/area_kmr/kmr_12/events.c b/src/world/area_kmr/kmr_12/events.c index c5ec0d9471..8d02050f8a 100644 --- a/src/world/area_kmr/kmr_12/events.c +++ b/src/world/area_kmr/kmr_12/events.c @@ -10,7 +10,7 @@ Script N(BindExits) = SCRIPT({ }); Script N(Main) = SCRIPT({ - SI_SAVE_VAR(425) = 31; + WORLD_LOCATION = 31; SetSpriteShading(-1); SetCamPerspective(0, 3, 25, 16, 4096); SetCamBGColor(0, 0, 0, 0); @@ -192,7 +192,7 @@ NpcGroupList N(npcGroupList) = { }; Script N(ReadEastSign) = SCRIPT({ - func_800441F0($a); + IsStartingConversation($a); if ($a == 1) { return; } diff --git a/src/world/area_kmr/kmr_12/kmr_12.h b/src/world/area_kmr/kmr_12/kmr_12.h index 22fd29a308..2226969567 100644 --- a/src/world/area_kmr/kmr_12/kmr_12.h +++ b/src/world/area_kmr/kmr_12/kmr_12.h @@ -1,5 +1,6 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_12 diff --git a/src/world/area_kmr/kmr_20/kmr_20.h b/src/world/area_kmr/kmr_20/kmr_20.h index f0d5c626b0..c43a5f00d7 100644 --- a/src/world/area_kmr/kmr_20/kmr_20.h +++ b/src/world/area_kmr/kmr_20/kmr_20.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_20 diff --git a/src/world/area_kmr/kmr_21/kmr_21.h b/src/world/area_kmr/kmr_21/kmr_21.h index 308d28ff84..41327a876d 100644 --- a/src/world/area_kmr/kmr_21/kmr_21.h +++ b/src/world/area_kmr/kmr_21/kmr_21.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_21 diff --git a/src/world/area_kmr/kmr_22/kmr_22.h b/src/world/area_kmr/kmr_22/kmr_22.h index 8e6f5c619c..bad76cc4ea 100644 --- a/src/world/area_kmr/kmr_22/kmr_22.h +++ b/src/world/area_kmr/kmr_22/kmr_22.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_22 diff --git a/src/world/area_kmr/kmr_23/kmr_23.h b/src/world/area_kmr/kmr_23/kmr_23.h index 8199db5e87..574abc5c09 100644 --- a/src/world/area_kmr/kmr_23/kmr_23.h +++ b/src/world/area_kmr/kmr_23/kmr_23.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_23 diff --git a/src/world/area_kmr/kmr_24/kmr_24.h b/src/world/area_kmr/kmr_24/kmr_24.h index 411e03c74f..cd914d0a17 100644 --- a/src/world/area_kmr/kmr_24/kmr_24.h +++ b/src/world/area_kmr/kmr_24/kmr_24.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_24 diff --git a/src/world/area_kmr/kmr_30/kmr_30.h b/src/world/area_kmr/kmr_30/kmr_30.h index d583b43e26..7ce609734f 100644 --- a/src/world/area_kmr/kmr_30/kmr_30.h +++ b/src/world/area_kmr/kmr_30/kmr_30.h @@ -1,4 +1,5 @@ #include "common.h" #include "map.h" +#include "../kmr.h" #define NAMESPACE kmr_30 diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index aca2aa64d7..c53d87eda9 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -201,11 +201,11 @@ void func_802454B4_805D34(void) { } ApiStatus func_80245504_805D84(ScriptInstance* script, s32 isInitialCall) { - func_800EF394(20.0f); + set_parter_tether_distance(20.0f); return ApiStatus_DONE2; } ApiStatus func_8024552C_805DAC(ScriptInstance* script, s32 isInitialCall) { - func_800EF3A4(); + reset_parter_tether_distance(); return ApiStatus_DONE2; } diff --git a/src/world/common/UnkFunc1.inc.c b/src/world/common/UnkFunc1.inc.c index f3e8e97f7c..a821cc7964 100644 --- a/src/world/common/UnkFunc1.inc.c +++ b/src/world/common/UnkFunc1.inc.c @@ -3,6 +3,6 @@ ApiStatus N(UnkFunc1)(ScriptInstance* script, s32 isInitialCall) { increment_status_menu_disabled(); - func_80137DA4(0, 255.0f); + set_transition_stencil_zoom_1(0, 255.0f); return ApiStatus_DONE2; } diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index b0b74969b3..45764e55db 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -42,7 +42,7 @@ void func_80280B44(void) { func_800F1538(); func_800E9900(); func_800E98C4(); - func_800E97B8(); + close_status_menu(); } INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280B78); diff --git a/src/world/script_api/7E2AA0.c b/src/world/script_api/7E2AA0.c index 551578f737..3df504431c 100644 --- a/src/world/script_api/7E2AA0.c +++ b/src/world/script_api/7E2AA0.c @@ -26,13 +26,13 @@ ApiStatus func_80281C20(ScriptInstance* script, s32 isInitialCall) { Bytecode* thisPos = script->ptrReadPos; func_800EF414(get_variable(script, *thisPos++), get_variable(script, *thisPos++)); - func_800EF394(0.0f); + set_parter_tether_distance(0.0f); return ApiStatus_DONE2; } ApiStatus func_80281C84(ScriptInstance* script, s32 isInitialCall) { func_800EF3E4(); - func_800EF3A4(); + reset_parter_tether_distance(); return ApiStatus_DONE2; } diff --git a/src/world/script_api/7E4690.c b/src/world/script_api/7E4690.c index 344d7dc702..378811b2fa 100644 --- a/src/world/script_api/7E4690.c +++ b/src/world/script_api/7E4690.c @@ -72,12 +72,12 @@ INCLUDE_ASM(s32, "world/script_api/7E4690", func_80283908); INCLUDE_ASM(s32, "world/script_api/7E4690", func_80283A50); ApiStatus func_80283B88(ScriptInstance* script, s32 isInitialCall) { - func_800EF394(20.0f); + set_parter_tether_distance(20.0f); return ApiStatus_DONE2; } ApiStatus func_80283BB0(ScriptInstance* script, s32 isInitialCall) { - func_800EF3A4(); + reset_parter_tether_distance(); return ApiStatus_DONE2; } diff --git a/src/world/world.c b/src/world/world.c index d95dfa8090..59191a194f 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -96,7 +96,7 @@ static Map kgr_maps[] = { }; /// Goomba Region -MapConfig kmr_12_config; +#include "area_kmr/kmr.h" static Map kmr_maps[] = { { MAP_UNSPLIT(kmr_00, 0x80240D80), .bgName = "kmr_bg", .flags = 1 }, { MAP_UNSPLIT(kmr_02, 0x80243AF0), .bgName = "kmr_bg" }, diff --git a/tools/add_to_symbol_addrs.py b/tools/add_to_symbol_addrs.py new file mode 100755 index 0000000000..e688e46460 --- /dev/null +++ b/tools/add_to_symbol_addrs.py @@ -0,0 +1,46 @@ +#!/usr/bin/python3 + +import argparse +import os +import re + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = script_dir + "/../" +asm_dir = root_dir + "asm/nonmatchings/" + +symbol_addrs_txt = os.path.join(script_dir, "symbol_addrs.txt") + +with open(symbol_addrs_txt, "r") as f: + symbols = set() + + for line in f.readlines(): + line = line.split(";")[0] + + s = [s.strip() for s in line.split("=", 1)] + name = s[0] + + symbols.add(name) + +with open(symbol_addrs_txt, "a") as symbol_addrs: + for root, dirs, files in os.walk(asm_dir): + for f_name in files: + if f_name.endswith(".s"): + f_path = os.path.join(root, f_name) + + with open(f_path, "r") as f: + lines = f.readlines() + line = lines[3] + try: + addr = lines[4].split(" ")[2] + except: + addr = "" + + + if not line.startswith("glabel ") or not addr.startswith("80"): + print(f"??? {f_path}") + continue + + func_name = line.split(" ")[1].rstrip() + + if not func_name in symbols: + symbol_addrs.write(f"{func_name} = 0x{addr}; // type:func\n") diff --git a/create_renames.py b/tools/create_renames.py similarity index 100% rename from create_renames.py rename to tools/create_renames.py diff --git a/tools/fix_s_filenames.py b/tools/fix_s_filenames.py new file mode 100755 index 0000000000..bf98557fa0 --- /dev/null +++ b/tools/fix_s_filenames.py @@ -0,0 +1,31 @@ +#!/usr/bin/python3 + +# Renames asm/nonmatchings/ files to match the glabel they hold. + +import argparse +import os +import re + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = script_dir + "/../" +asm_dir = root_dir + "asm/nonmatchings/" + +for root, dirs, files in os.walk(asm_dir): + for f_name in files: + if f_name.endswith(".s"): + f_path = os.path.join(root, f_name) + + with open(f_path, "r") as f: + line = f.readlines()[3] + + if not line.startswith("glabel "): + print(f"??? {f_path}") + continue + + func_name = line.split(" ")[1].rstrip() + parent_path = os.path.split(f_path)[:-1] + new_f_path = os.path.join(*parent_path, func_name + ".s") + + if f_path != new_f_path: + print(f"{f_path} => {new_f_path}") + os.rename(f_path, new_f_path) diff --git a/tools/img/build.py b/tools/img/build.py index 97245ef49f..0c90ae59e8 100755 --- a/tools/img/build.py +++ b/tools/img/build.py @@ -3,6 +3,7 @@ from sys import argv, stderr from math import floor, ceil from itertools import zip_longest +from glob import glob import png def unpack_color(s): @@ -181,6 +182,67 @@ class Converter(): i = rgb_to_intensity(*rgba[:3]) f.write(i.to_bytes(1, byteorder="big")) + elif self.mode == "party": + data = img.read()[2] + img.preamble(True) + palette = img.palette(alpha="force") + + with open(self.outfile, "wb") as f: + # palette + for rgba in palette: + if rgba[3] not in (0, 0xFF): + self.warn("alpha mask mode but translucent pixels used") + + color = pack_color(*rgba) + f.write(color.to_bytes(2, byteorder="big")) + + assert f.tell() == 0x200, "palette has wrong size" + + # ci 8 + for row in reversed_if(data, self.flip_y): + f.write(row) + + f.write(b"\0\0\0\0\0\0\0\0\0\0") # padding + elif self.mode == "bg": + width, height, data, info = img.read() + img.preamble(True) + palettes = [img.palette(alpha="force")] + + for palettepath in glob(self.infile.split(".")[0] + ".*.png"): + pal = png.Reader(palettepath) + pal.preamble(True) + palettes.append(pal.palette(alpha="force")) + + with open(self.outfile, "wb") as f: + baseaddr = 0x80200000 # gBackgroundImage + headers_len = 0x10 * len(palettes) + palettes_len = 0x200 * len(palettes) + + # header (struct BackgroundHeader) + for i, palette in enumerate(palettes): + f.write((baseaddr + palettes_len + headers_len).to_bytes(4, byteorder="big")) # raster offset + f.write((baseaddr + headers_len + 0x200 * i).to_bytes(4, byteorder="big")) # palette offset + f.write((12).to_bytes(2, byteorder="big")) # startX + f.write((20).to_bytes(2, byteorder="big")) # startY + f.write((width).to_bytes(2, byteorder="big")) # width + f.write((height).to_bytes(2, byteorder="big")) # height + + assert f.tell() == headers_len + + for palette in palettes: + # palette + for rgba in palette: + if rgba[3] not in (0, 0xFF): + self.warn("alpha mask mode but translucent pixels used") + + color = pack_color(*rgba) + f.write(color.to_bytes(2, byteorder="big")) + + assert f.tell() == palettes_len + headers_len + + # ci 8 + for row in reversed_if(data, self.flip_y): + f.write(row) else: print("unsupported mode", file=stderr) exit(1) diff --git a/tools/smallest_with_symbol.py b/tools/smallest_with_symbol.py index a1e8ba533f..807c1e8a0f 100755 --- a/tools/smallest_with_symbol.py +++ b/tools/smallest_with_symbol.py @@ -16,7 +16,7 @@ smallest_len = 1000 for root, dirs, files in os.walk(asm_dir): for f_name in files: - if f_name.endswith(".s") and not f_name.startswith("func_E") and len(f_name) < 20 and f_name not in ["func_8011800C.s", "func_E011A3BC.s", "func_8024F768.s", "func_800271A0.s", "func_80240448_B141B8.s"]: + if f_name.endswith(".s") and not f_name.startswith("func_E") and len(f_name) < 20 and f_name not in ["func_8011800C.s", "func_E011A3BC.s", "func_8024F768.s", "gfx_init_state.s", "func_80240448_B141B8.s"]: f_path = os.path.join(root, f_name) with open(f_path) as f: f_text = f.read() diff --git a/tools/splat_ext/PaperMarioMapFS.py b/tools/splat_ext/PaperMarioMapFS.py index fff89857e4..b93f73141f 100644 --- a/tools/splat_ext/PaperMarioMapFS.py +++ b/tools/splat_ext/PaperMarioMapFS.py @@ -2,6 +2,9 @@ import os from segtypes.n64.segment import N64Segment from pathlib import Path from util.n64 import Yay0decompress +from util.color import unpack_color +from util.iter import iter_in_groups +import png def decode_null_terminated_ascii(data): @@ -14,12 +17,22 @@ def decode_null_terminated_ascii(data): return data[:length].decode('ascii') +def parse_palette(data): + palette = [] + + for a, b in iter_in_groups(data, 2): + palette.append(unpack_color([a, b])) + + return palette + + class N64SegPaperMarioMapFS(N64Segment): def __init__(self, segment, next_segment, options): super().__init__(segment, next_segment, options) def split(self, rom_bytes, base_path): bin_dir = self.create_split_dir(base_path, self.options.get("assets_dir", "bin")) + img_party_dir = self.create_split_dir(base_path, self.options.get("assets_dir", "img") + "/party") data = rom_bytes[self.rom_start: self.rom_end] @@ -37,23 +50,62 @@ class N64SegPaperMarioMapFS(N64Segment): if offset == 0: path = None + elif name.startswith("party_"): + path = os.path.join(img_party_dir, "{}.png".format(name)) + elif name.endswith("_hit") or name.endswith("_shape"): + map_dir = self.create_split_dir(base_path, self.options.get("assets_dir", "bin") + f"/map") + path = os.path.join(map_dir, "{}.bin".format(name)) + elif name.endswith("_tex"): + map_dir = self.create_split_dir(base_path, self.options.get("assets_dir", "bin") + f"/map") + path = os.path.join(map_dir, "{}.bin".format(name)) + elif name.endswith("_bg"): + map_dir = self.create_split_dir(base_path, self.options.get("assets_dir", "bin") + f"/map") + path = os.path.join(map_dir, "{}.png".format(name)) else: - path = "{}.bin".format(name) - self.create_parent_dir(bin_dir, path) + path = os.path.join(bin_dir, "{}.bin".format(name)) if name == "end_data": break - with open(os.path.join(bin_dir, path), "wb") as f: - bytes = rom_bytes[self.rom_start + 0x20 + - offset: self.rom_start + 0x20 + offset + size] + bytes = rom_bytes[self.rom_start + 0x20 + + offset: self.rom_start + 0x20 + offset + size] - if is_compressed: - self.log(f"Decompressing {name}...") - bytes = Yay0decompress.decompress_yay0(bytes) + Path(path).parent.mkdir(parents=True, exist_ok=True) - f.write(bytes) - self.log(f"Wrote {name} to {Path(bin_dir, path)}") + if is_compressed: + self.log(f"Decompressing {name}...") + bytes = Yay0decompress.decompress_yay0(bytes) + + if name.startswith("party_"): + with open(path, "wb") as f: + # CI-8 + w = png.Writer(150, 105, palette=parse_palette(bytes[:0x200])) + w.write_array(f, bytes[0x200:]) + elif name.endswith("_bg"): + def write_bg_png(bytes, path, header_offset=0): + header = bytes[header_offset:header_offset+0x10] + + raster_offset = int.from_bytes(header[0:4], byteorder="big") - 0x80200000 + palette_offset = int.from_bytes(header[4:8], byteorder="big") - 0x80200000 + assert int.from_bytes(header[8:12], byteorder="big") == 0x000C0014 # draw pos + width = int.from_bytes(header[12:14], byteorder="big") + height = int.from_bytes(header[14:16], byteorder="big") + + with open(path, "wb") as f: + # CI-8 + w = png.Writer(width, height, palette=parse_palette(bytes[palette_offset:palette_offset+512])) + w.write_array(f, bytes[raster_offset:]) + + write_bg_png(bytes, path) + + # sbk_bg has an alternative palette + if name == "sbk_bg": + write_bg_png(bytes, path.split(".")[0] + ".alt.png", header_offset=0x10) + else: + with open(path, "wb") as f: + f.write(bytes) + + self.log(f"Wrote {name} to {Path(bin_dir, path)}") asset_idx += 1 diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 1c9bc61972..5b2bccf615 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -182,7 +182,7 @@ HasMerleeCasts = 0x8003F3F4; // type:func rom:0x1A7F4 OnDefeatEnemy = 0x8003F580; // type:func rom:0x1A980 OnFleeBattleDrops = 0x8003F6E8; // type:func rom:0x1AAE8 show_first_strike_message = 0x80041C5C; // type:func rom:0x1D05C -create_npcs = 0x800436B0; // type:func rom:0x1EAB0 +create_encounters = 0x800436B0; // type:func rom:0x1EAB0 SetEncounterStatusFlags = 0x80044180; // type:func rom:0x1F580 LoadDemoBattle = 0x80044264; // type:func rom:0x1F664 MakeNpcs = 0x80044298; // type:func rom:0x1F698 @@ -243,7 +243,7 @@ alHeapAlloc = 0x80057F90; // type:func rom:0x33390 render_effects = 0x80059EF4; // type:func rom:0x352F4 remove_effect = 0x8005A450; // type:func rom:0x35850 remove_all_effects = 0x8005A4E0; // type:func rom:0x358E0 -play_effect = 0x8005A564; // type:func rom:0x35964 +load_effect = 0x8005A564; // type:func rom:0x35964 load_world_script_api = 0x8005A6C0; // type:func rom:0x35AC0 load_map_by_IDs = 0x8005A6F4; // type:func rom:0x35AF4 get_current_map_config = 0x8005ABD8; // type:func rom:0x35FD8 @@ -838,7 +838,7 @@ close_message = 0x80125C70; // type:func rom:0xBC370 get_char_width = 0x80125DF4; // type:func rom:0xBC4F4 get_string_properties = 0x80125F68; // type:func rom:0xBC668 get_string_width = 0x80126474; // type:func rom:0xBCB74 -draw_string = 0x801264EC; // type:func rom:0xBCBEC +draw_msg = 0x801264EC; // type:func rom:0xBCBEC draw_digit = 0x801274C0; // type:func rom:0xBDBC0 draw_number = 0x8012769C; // type:func rom:0xBDD9C _draw_message_box = 0x8012CC08; // type:func rom:0xC3308 @@ -895,7 +895,7 @@ set_area_flag = 0x801455A0; // type:func rom:0xDBCA0 get_area_flag = 0x801455F0; // type:func rom:0xDBCF0 set_area_byte = 0x80145638; // type:func rom:0xDBD38 get_area_byte = 0x80145650; // type:func rom:0xDBD50 -default_trigger_function_handler = 0x80145670; // type:func rom:0xDBD70 +default_trigger_delegate = 0x80145670; // type:func rom:0xDBD70 clear_trigger_data = 0x80145680; // type:func rom:0xDBD80 init_trigger_list = 0x80145728; // type:func rom:0xDBE28 create_trigger = 0x8014576C; // type:func rom:0xDBE6C @@ -907,7 +907,7 @@ load_map_bg = 0x80145D70; // type:func rom:0xDC470 read_background_size = 0x80145E28; // type:func rom:0xDC528 set_background_size = 0x80145E70; // type:func rom:0xDC570 play_ambient_sounds = 0x80147368; // type:func rom:0xDDA68 -set_ui_panel_properties = 0x80147CC8; // type:func rom:0xDE3C8 +set_window_properties = 0x80147CC8; // type:func rom:0xDE3C8 _play_sound = 0x80149AB8; // type:func rom:0xE01B8 stop_sound = 0x80149C6C; // type:func rom:0xE036C play_sound = 0x80149CB4; // type:func rom:0xE03B4 @@ -8879,6 +8879,1537 @@ func_802D38EC = 0x802D38EC; // type:func rom:0xF829C func_802D3840 = 0x802D3840; // type:func rom:0xF81F0 func_802D39FC = 0x802D39FC; // type:func rom:0xF83AC func_802D3C58 = 0x802D3C58; // type:func rom:0xF8608 +func_8005DECC = 0x8005DECC; // type:func +func_8005E12C = 0x8005E12C; // type:func +func_8005DFD4 = 0x8005DFD4; // type:func +func_8026EA7C = 0x8026EA7C; // type:func +func_8026E914 = 0x8026E914; // type:func +func_8026E558 = 0x8026E558; // type:func +func_8026EB20 = 0x8026EB20; // type:func +func_8026ED20 = 0x8026ED20; // type:func +func_8026E260 = 0x8026E260; // type:func +func_8026F1A0 = 0x8026F1A0; // type:func +func_8026E208 = 0x8026E208; // type:func +func_8026E9A0 = 0x8026E9A0; // type:func +func_8026E198 = 0x8026E198; // type:func +func_8026EBF8 = 0x8026EBF8; // type:func +func_8026EDE4 = 0x8026EDE4; // type:func +func_80035EEC = 0x80035EEC; // type:func +func_8003617C = 0x8003617C; // type:func +func_8003646C = 0x8003646C; // type:func +func_80058E84 = 0x80058E84; // type:func +set_effect_pos_offset = 0x80059C88; // type:func +func_80059310 = 0x80059310; // type:func +func_80058F88 = 0x80058F88; // type:func +func_80058DD0 = 0x80058DD0; // type:func +func_80059AB8 = 0x80059AB8; // type:func +func_8005904C = 0x8005904C; // type:func +func_80059F94 = 0x80059F94; // type:func +clear_effect_data = 0x80059C9C; // type:func +func_80059008 = 0x80059008; // type:func +update_effects = 0x80059D50; // type:func +func_80059BD4 = 0x80059BD4; // type:func +func_800598A0 = 0x800598A0; // type:func +func_80149838 = 0x80149838; // type:func +func_80149618 = 0x80149618; // type:func +func_80149250 = 0x80149250; // type:func +func_80149E04 = 0x80149E04; // type:func +func_80149734 = 0x80149734; // type:func +func_801497FC = 0x801497FC; // type:func +func_80149974 = 0x80149974; // type:func +func_80149670 = 0x80149670; // type:func +func_80149BE4 = 0x80149BE4; // type:func +func_8014A1B4 = 0x8014A1B4; // type:func +func_80149908 = 0x80149908; // type:func +func_801499EC = 0x801499EC; // type:func +func_80149828 = 0x80149828; // type:func +func_801498C4 = 0x801498C4; // type:func +func_80149A6C = 0x80149A6C; // type:func +func_80149F58 = 0x80149F58; // type:func +func_802A4718 = 0x802A4718; // type:func +func_802A9B30 = 0x802A9B30; // type:func +func_802A8180 = 0x802A8180; // type:func +func_802A56F8 = 0x802A56F8; // type:func +func_802A4A10 = 0x802A4A10; // type:func +func_802A1098 = 0x802A1098; // type:func +func_802A2684 = 0x802A2684; // type:func +func_802A47E0 = 0x802A47E0; // type:func +func_802A48FC = 0x802A48FC; // type:func +func_802AA0A4 = 0x802AA0A4; // type:func +func_802A1000 = 0x802A1000; // type:func +func_802A9B44 = 0x802A9B44; // type:func +func_802A43DC = 0x802A43DC; // type:func +func_802A2AB8 = 0x802A2AB8; // type:func +func_802A45D8 = 0x802A45D8; // type:func +func_802A5738 = 0x802A5738; // type:func +func_802A10B8 = 0x802A10B8; // type:func +func_802A1078 = 0x802A1078; // type:func +func_802A27E4 = 0x802A27E4; // type:func +func_802A2910 = 0x802A2910; // type:func +func_802A11B0 = 0x802A11B0; // type:func +func_802A472C = 0x802A472C; // type:func +func_802AA640 = 0x802AA640; // type:func +func_802AACD8 = 0x802AACD8; // type:func +func_802AA0B8 = 0x802AA0B8; // type:func +func_802A4494 = 0x802A4494; // type:func +func_802A27D0 = 0x802A27D0; // type:func +func_802A1030 = 0x802A1030; // type:func +func_802A4534 = 0x802A4534; // type:func +func_802A2C58 = 0x802A2C58; // type:func +func_802A2C84 = 0x802A2C84; // type:func +func_802AA05C = 0x802AA05C; // type:func +func_802A4A54 = 0x802A4A54; // type:func +func_802A1050 = 0x802A1050; // type:func +func_802A57C8 = 0x802A57C8; // type:func +func_802A3C98 = 0x802A3C98; // type:func +func_802A9AE8 = 0x802A9AE8; // type:func +func_802A5290 = 0x802A5290; // type:func +func_802A4448 = 0x802A4448; // type:func +func_802A58D0 = 0x802A58D0; // type:func +enable_background_wave = 0x80145EC0; // type:func +func_802C90FC = 0x802C90FC; // type:func +func_802C9FD4 = 0x802C9FD4; // type:func +func_802C95A0 = 0x802C95A0; // type:func +func_80261DF4 = 0x80261DF4; // type:func +func_802616F4 = 0x802616F4; // type:func +func_80260E90 = 0x80260E90; // type:func +func_80260AD4 = 0x80260AD4; // type:func +func_802610CC = 0x802610CC; // type:func +func_80261B40 = 0x80261B40; // type:func +func_80261FB4 = 0x80261FB4; // type:func +func_80261478 = 0x80261478; // type:func +func_802619B4 = 0x802619B4; // type:func +func_80260BF4 = 0x80260BF4; // type:func +func_80261648 = 0x80261648; // type:func +func_802620F8 = 0x802620F8; // type:func +func_802611E8 = 0x802611E8; // type:func +func_8026127C = 0x8026127C; // type:func +func_802616B4 = 0x802616B4; // type:func +func_802619E8 = 0x802619E8; // type:func +func_80260A60 = 0x80260A60; // type:func +func_80261530 = 0x80261530; // type:func +func_80261164 = 0x80261164; // type:func +func_802615C8 = 0x802615C8; // type:func +func_80260B70 = 0x80260B70; // type:func +func_802613BC = 0x802613BC; // type:func +func_80261064 = 0x80261064; // type:func +func_80052CFC = 0x80052CFC; // type:func +func_80052660 = 0x80052660; // type:func +func_80052E18 = 0x80052E18; // type:func +func_80052BF8 = 0x80052BF8; // type:func +func_802E586C = 0x802E586C; // type:func +func_802E6390 = 0x802E6390; // type:func +func_802E61B0 = 0x802E61B0; // type:func +func_802E6118 = 0x802E6118; // type:func +func_802E6178 = 0x802E6178; // type:func +func_802E5FB0 = 0x802E5FB0; // type:func +func_802E6574 = 0x802E6574; // type:func +func_802E6064 = 0x802E6064; // type:func +func_802E619C = 0x802E619C; // type:func +func_802E6338 = 0x802E6338; // type:func +func_802E6B6C = 0x802E6B6C; // type:func +func_802E63A8 = 0x802E63A8; // type:func +func_802E6C24 = 0x802E6C24; // type:func +func_80125C84 = 0x80125C84; // type:func +func_80124434 = 0x80124434; // type:func +func_8012D3DC = 0x8012D3DC; // type:func +func_8012DB58 = 0x8012DB58; // type:func +func_80126F78 = 0x80126F78; // type:func +func_80126790 = 0x80126790; // type:func +func_80126EAC = 0x80126EAC; // type:func +func_8012C324 = 0x8012C324; // type:func +func_80127D90 = 0x80127D90; // type:func +func_80127BA4 = 0x80127BA4; // type:func +func_8012CA08 = 0x8012CA08; // type:func +func_8012C9A8 = 0x8012C9A8; // type:func +func_8012E8E0 = 0x8012E8E0; // type:func +get_msg_lines = 0x801264B0; // type:func +func_80124570 = 0x80124570; // type:func +func_802E3F0C = 0x802E3F0C; // type:func +func_802E3EE0 = 0x802E3EE0; // type:func +func_80240000_EC71B0 = 0x80240000; // type:func +func_80240124_EC72D4 = 0x80240124; // type:func +func_80057548 = 0x80057548; // type:func +func_80056D5C = 0x80056D5C; // type:func +func_80058004 = 0x80058004; // type:func +func_80058C6C = 0x80058C6C; // type:func +func_80057C54 = 0x80057C54; // type:func +func_80057F20 = 0x80057F20; // type:func +func_8005736C = 0x8005736C; // type:func +func_80057D0C = 0x80057D0C; // type:func +func_800576EC = 0x800576EC; // type:func +func_80056250 = 0x80056250; // type:func +func_80056E34 = 0x80056E34; // type:func +func_800579D8 = 0x800579D8; // type:func +func_80056FA4 = 0x80056FA4; // type:func +func_80058B20 = 0x80058B20; // type:func +func_80058050 = 0x80058050; // type:func +func_80056EE8 = 0x80056EE8; // type:func +func_80057224 = 0x80057224; // type:func +func_80057874 = 0x80057874; // type:func +state_step_language_select = 0x800351C8; // type:func +func_80035704 = 0x80035704; // type:func +func_80035660 = 0x80035660; // type:func +state_init_language_select = 0x80035000; // type:func +func_800355D4 = 0x800355D4; // type:func +state_init_file_select = 0x80035058; // type:func +func_80035B40 = 0x80035B40; // type:func +func_800354EC = 0x800354EC; // type:func +func_80283D00 = 0x80283D00; // type:func +func_80283A50 = 0x80283A50; // type:func +func_80283DF0 = 0x80283DF0; // type:func +func_80283C34 = 0x80283C34; // type:func +func_80283D6C = 0x80283D6C; // type:func +func_80283908 = 0x80283908; // type:func +func_80283E2C = 0x80283E2C; // type:func +func_802828DC = 0x802828DC; // type:func +func_80283174 = 0x80283174; // type:func +func_80283240 = 0x80283240; // type:func +func_80282E30 = 0x80282E30; // type:func +func_80282C40 = 0x80282C40; // type:func +func_80283080 = 0x80283080; // type:func +func_80282414 = 0x80282414; // type:func +func_802822A8 = 0x802822A8; // type:func +func_80282634 = 0x80282634; // type:func +func_8028236C = 0x8028236C; // type:func +func_802823B0 = 0x802823B0; // type:func +func_80282594 = 0x80282594; // type:func +func_80282700 = 0x80282700; // type:func +func_80281434 = 0x80281434; // type:func +func_802814D0 = 0x802814D0; // type:func +func_80280B78 = 0x80280B78; // type:func +func_80280954 = 0x80280954; // type:func +func_8028035C = 0x8028035C; // type:func +func_80280AC4 = 0x80280AC4; // type:func +func_8028017C = 0x8028017C; // type:func +func_80280088 = 0x80280088; // type:func +func_80280BD0 = 0x80280BD0; // type:func +func_802802D0 = 0x802802D0; // type:func +func_80280000 = 0x80280000; // type:func +func_80280410 = 0x80280410; // type:func +func_8028051C = 0x8028051C; // type:func +func_80280208 = 0x80280208; // type:func +pause_tabs_draw_badges_A2EF00 = 0x80244CC0; // type:func +update_starpoints_display_D18B9C = 0x802403BC; // type:func +update_starpoints_display_C528FC = 0x802403BC; // type:func +update_starpoints_display_C2EF5C = 0x802403BC; // type:func +update_starpoints_display_C4F8CC = 0x802403BC; // type:func +update_starpoints_display_C3DFAC = 0x802403BC; // type:func +update_starpoints_display_C46F9C = 0x802403BC; // type:func +update_heroes_start_turn_A70404 = 0x80242024; // type:func +pause_tabs_draw_stats_805418 = 0x80244B98; // type:func +pause_tabs_draw_badges_805540 = 0x80244CC0; // type:func +pause_tutorial_draw_contents_804074 = 0x802437F4; // type:func +func_80242BA0_BB04E0 = 0x80242BA0; // type:func +func_802BD720_318470 = 0x802BD720; // type:func +func_802BE6E8_319438 = 0x802BE6E8; // type:func +func_802BD2D8_318028 = 0x802BD2D8; // type:func +func_802BD338_318088 = 0x802BD338; // type:func +func_802BE520_319270 = 0x802BE520; // type:func +func_802BD6DC_31842C = 0x802BD6DC; // type:func +func_802BD758_3184A8 = 0x802BD758; // type:func +func_802BDB30_317A50 = 0x802BDB30; // type:func +world_goombario_can_pause = 0x802BD5A8; // type:func +func_802BD564_317484 = 0x802BD564; // type:func +func_802BD5D8_3174F8 = 0x802BD5D8; // type:func +world_goombario_pre_battle = 0x802BDBBC; // type:func +func_802BD1D0_3170F0 = 0x802BD1D0; // type:func +func_802BD188_3170A8 = 0x802BD188; // type:func +func_802BD4E0_324DF0 = 0x802BD4E0; // type:func +func_802BD14C_324A5C = 0x802BD14C; // type:func +func_802BD99C_3214EC = 0x802BD99C; // type:func +func_802BFAA8_3235F8 = 0x802BFAA8; // type:func +func_802BD6BC_32120C = 0x802BD6BC; // type:func +func_802BFA00_323550 = 0x802BFA00; // type:func +func_802BF4F0_323040 = 0x802BF4F0; // type:func +func_802BDDD8_321928 = 0x802BDDD8; // type:func +func_802BD21C_320D6C = 0x802BD21C; // type:func +func_802BE724_322274 = 0x802BE724; // type:func +func_802BFBA0_3236F0 = 0x802BFBA0; // type:func +func_802BFB44_323694 = 0x802BFB44; // type:func +func_802BDA90_3215E0 = 0x802BDA90; // type:func +func_802BD678_3211C8 = 0x802BD678; // type:func +func_802BD2D4_320E24 = 0x802BD2D4; // type:func +func_802BE6A0_3221F0 = 0x802BE6A0; // type:func +func_802BD29C_320DEC = 0x802BD29C; // type:func +func_80240D68_9C6148 = 0x80240D68; // type:func +render_shaded_sprite = 0x801481C4; // type:func +func_801480F0 = 0x801480F0; // type:func +func_80148154 = 0x80148154; // type:func +appendGfx_shaded_sprite = 0x801489B8; // type:func +func_80148040 = 0x80148040; // type:func +func_802409F4 = 0x802409F4; // type:func +func_8023E104 = 0x8023E104; // type:func +func_80240AA8 = 0x80240AA8; // type:func +func_8023F060 = 0x8023F060; // type:func +func_8023ED5C = 0x8023ED5C; // type:func +func_8023F088 = 0x8023F088; // type:func +func_8023E11C = 0x8023E11C; // type:func +func_80240124_EE66D4 = 0x80240124; // type:func +func_80240000_EE65B0 = 0x80240000; // type:func +func_800F0B3C = 0x800F0B3C; // type:func +func_800EFD08 = 0x800EFD08; // type:func +func_800F09EC = 0x800F09EC; // type:func +func_800EFE2C = 0x800EFE2C; // type:func +func_800F0248 = 0x800F0248; // type:func +func_800F0C9C = 0x800F0C9C; // type:func +func_800F0864 = 0x800F0864; // type:func +func_800F0490 = 0x800F0490; // type:func +func_800E24F8 = 0x800E24F8; // type:func +func_800E205C = 0x800E205C; // type:func +func_800E23FC = 0x800E23FC; // type:func +func_8012E9A0 = 0x8012E9A0; // type:func +func_801363A0 = 0x801363A0; // type:func +func_80130F70 = 0x80130F70; // type:func +func_80130ACC = 0x80130ACC; // type:func +func_80133A94 = 0x80133A94; // type:func +func_80131DD4 = 0x80131DD4; // type:func +func_8012FE10 = 0x8012FE10; // type:func +func_8012F500 = 0x8012F500; // type:func +func_80136A08 = 0x80136A08; // type:func +func_80130FAC = 0x80130FAC; // type:func +func_801369D0 = 0x801369D0; // type:func +func_801309F0 = 0x801309F0; // type:func +func_80131128 = 0x80131128; // type:func +func_8013673C = 0x8013673C; // type:func +func_80132D94 = 0x80132D94; // type:func +func_8012EC94 = 0x8012EC94; // type:func +func_8012FE78 = 0x8012FE78; // type:func +func_8013559C = 0x8013559C; // type:func +func_80130A04 = 0x80130A04; // type:func +func_80133FC8 = 0x80133FC8; // type:func +func_8003CFB4 = 0x8003CFB4; // type:func +func_8003857C = 0x8003857C; // type:func +func_8003C444 = 0x8003C444; // type:func +func_8003D1D4 = 0x8003D1D4; // type:func +func_8003C3D8 = 0x8003C3D8; // type:func +func_8003BA60 = 0x8003BA60; // type:func +func_8003C8B4 = 0x8003C8B4; // type:func +func_8003D3BC = 0x8003D3BC; // type:func +func_8003B420 = 0x8003B420; // type:func +func_80039DA4 = 0x80039DA4; // type:func +update_counters = 0x8003E524; // type:func +func_8003C984 = 0x8003C984; // type:func +func_8003C53C = 0x8003C53C; // type:func +func_8003C61C = 0x8003C61C; // type:func +func_8003E0D4 = 0x8003E0D4; // type:func +func_8003D660 = 0x8003D660; // type:func +draw_first_strike_ui = 0x8003E63C; // type:func +func_8003B47C = 0x8003B47C; // type:func +func_8003BED8 = 0x8003BED8; // type:func +func_8003B1B0 = 0x8003B1B0; // type:func +set_npc_sprite = 0x8003AC5C; // type:func +func_8003B3D0 = 0x8003B3D0; // type:func +func_8003CC8C = 0x8003CC8C; // type:func +func_8003DFA0 = 0x8003DFA0; // type:func +func_8003CB44 = 0x8003CB44; // type:func +func_8003CFA8 = 0x8003CFA8; // type:func +func_8003D624 = 0x8003D624; // type:func +func_8003B3F8 = 0x8003B3F8; // type:func +func_8003DA38 = 0x8003DA38; // type:func +func_8003C7A8 = 0x8003C7A8; // type:func +func_8003B184 = 0x8003B184; // type:func +func_8003C428 = 0x8003C428; // type:func +func_8003E514 = 0x8003E514; // type:func +func_8003CB20 = 0x8003CB20; // type:func +func_8003C78C = 0x8003C78C; // type:func +func_8003E338 = 0x8003E338; // type:func +func_8003B500 = 0x8003B500; // type:func +func_8003DC38 = 0x8003DC38; // type:func +func_8003C668 = 0x8003C668; // type:func +func_8003B5B4 = 0x8003B5B4; // type:func +func_80039688 = 0x80039688; // type:func +func_8003D2F8 = 0x8003D2F8; // type:func +func_8003CCB0 = 0x8003CCB0; // type:func +func_8003D0C4 = 0x8003D0C4; // type:func +func_800397E8 = 0x800397E8; // type:func +func_8003B464 = 0x8003B464; // type:func +func_8003D788 = 0x8003D788; // type:func +func_8003B44C = 0x8003B44C; // type:func +draw_encounter_ui = 0x8003E5B0; // type:func +func_8003C9A8 = 0x8003C9A8; // type:func +func_8003B96C = 0x8003B96C; // type:func +func_8003B198 = 0x8003B198; // type:func +func_8003E1D0 = 0x8003E1D0; // type:func +func_800E5938 = 0x800E5938; // type:func +func_800E5098 = 0x800E5098; // type:func +func_800E4404 = 0x800E4404; // type:func +func_800E4508 = 0x800E4508; // type:func +func_800E4B40 = 0x800E4B40; // type:func +func_800E4F10 = 0x800E4F10; // type:func +func_800E3100 = 0x800E3100; // type:func +func_800E4BB8 = 0x800E4BB8; // type:func +func_800E58F0 = 0x800E58F0; // type:func +func_800E66C4 = 0x800E66C4; // type:func +func_800E5A2C = 0x800E5A2C; // type:func +func_800E5C78 = 0x800E5C78; // type:func +func_800E2BB0 = 0x800E2BB0; // type:func +func_800E6500 = 0x800E6500; // type:func +func_800E6428 = 0x800E6428; // type:func +func_800E46C8 = 0x800E46C8; // type:func +func_800E546C = 0x800E546C; // type:func +func_800E5530 = 0x800E5530; // type:func +can_player_interact = 0x800E52F8; // type:func +func_800E63A4 = 0x800E63A4; // type:func +func_800E4AD8 = 0x800E4AD8; // type:func +func_800E29C8 = 0x800E29C8; // type:func +func_800E5348 = 0x800E5348; // type:func +func_800E5174 = 0x800E5174; // type:func +func_800E26C4 = 0x800E26C4; // type:func +func_800E3514 = 0x800E3514; // type:func +func_800E59A0 = 0x800E59A0; // type:func +func_800E2F60 = 0x800E2F60; // type:func +func_800E315C = 0x800E315C; // type:func +func_800E4744 = 0x800E4744; // type:func +func_800E45E0 = 0x800E45E0; // type:func +func_800DC778 = 0x800DC778; // type:func +func_800DD228 = 0x800DD228; // type:func +func_800DDC44 = 0x800DDC44; // type:func +func_800DD04C = 0x800DD04C; // type:func +func_800DCE70 = 0x800DCE70; // type:func +func_800DDD94 = 0x800DDD94; // type:func +func_800DCB7C = 0x800DCB7C; // type:func +func_800DDAE4 = 0x800DDAE4; // type:func +func_800DD8FC = 0x800DD8FC; // type:func +func_800DC500 = 0x800DC500; // type:func +func_800DD44C = 0x800DD44C; // type:func +func_800DDCEC = 0x800DDCEC; // type:func +func_800DD618 = 0x800DD618; // type:func +func_80240000_EB7230 = 0x80240000; // type:func +func_80240124_EB7354 = 0x80240124; // type:func +func_80200080 = 0x80200080; // type:func +func_802D5B10 = 0x802D5B10; // type:func +func_802D5C70 = 0x802D5C70; // type:func +func_802D6420 = 0x802D6420; // type:func +func_802D74C0 = 0x802D74C0; // type:func +func_802D663C = 0x802D663C; // type:func +func_802D7460 = 0x802D7460; // type:func +func_800F1A10 = 0x800F1A10; // type:func +func_800F4E40 = 0x800F4E40; // type:func +func_800F4D28 = 0x800F4D28; // type:func +func_800F13B0 = 0x800F13B0; // type:func +func_800F48F4 = 0x800F48F4; // type:func +func_800F4CF0 = 0x800F4CF0; // type:func +func_800F3680 = 0x800F3680; // type:func +func_800F4C1C = 0x800F4C1C; // type:func +func_800F4944 = 0x800F4944; // type:func +func_800F16CC = 0x800F16CC; // type:func +func_800F4FC4 = 0x800F4FC4; // type:func +func_800F4C6C = 0x800F4C6C; // type:func +func_800F1538 = 0x800F1538; // type:func +func_800F513C = 0x800F513C; // type:func +func_801200EC = 0x801200EC; // type:func +func_80120420 = 0x80120420; // type:func +func_80120198 = 0x80120198; // type:func +func_8011EA54 = 0x8011EA54; // type:func +func_8011E224 = 0x8011E224; // type:func +func_8012003C = 0x8012003C; // type:func +func_8011E09C = 0x8011E09C; // type:func +func_8011E400 = 0x8011E400; // type:func +func_8011E150 = 0x8011E150; // type:func +func_8011DE80 = 0x8011DE80; // type:func +func_8011FFB4 = 0x8011FFB4; // type:func +func_8011E0DC = 0x8011E0DC; // type:func +func_80120064 = 0x80120064; // type:func +func_8012009C = 0x8012009C; // type:func +func_8011EBF0 = 0x8011EBF0; // type:func +func_80120474 = 0x80120474; // type:func +func_8011E014 = 0x8011E014; // type:func +func_8011E058 = 0x8011E058; // type:func +func_8011F3E8 = 0x8011F3E8; // type:func +func_8011FF74 = 0x8011FF74; // type:func +func_80120678 = 0x80120678; // type:func +func_8011E4B8 = 0x8011E4B8; // type:func +func_80120234 = 0x80120234; // type:func +func_8011E1C4 = 0x8011E1C4; // type:func +func_80120028 = 0x80120028; // type:func +func_8012008C = 0x8012008C; // type:func +func_801200B8 = 0x801200B8; // type:func +func_8011E5E0 = 0x8011E5E0; // type:func +func_8011F058 = 0x8011F058; // type:func +func_8011E310 = 0x8011E310; // type:func +func_801206F8 = 0x801206F8; // type:func +func_8011F4D4 = 0x8011F4D4; // type:func +func_8011E438 = 0x8011E438; // type:func +func_8011FF98 = 0x8011FF98; // type:func +func_8012004C = 0x8012004C; // type:func +func_801203AC = 0x801203AC; // type:func +func_80120118 = 0x80120118; // type:func +func_8011DFD0 = 0x8011DFD0; // type:func +func_8011E718 = 0x8011E718; // type:func +func_8011E398 = 0x8011E398; // type:func +func_8011F118 = 0x8011F118; // type:func +func_80120530 = 0x80120530; // type:func +func_8011E8BC = 0x8011E8BC; // type:func +func_8011F304 = 0x8011F304; // type:func +func_8011FA54 = 0x8011FA54; // type:func +func_8011C130 = 0x8011C130; // type:func +func_801180E8 = 0x801180E8; // type:func +func_8011BCB4 = 0x8011BCB4; // type:func +func_80110BCC = 0x80110BCC; // type:func +func_80110678 = 0x80110678; // type:func +mdl_get_child_count = 0x80115CA8; // type:func +func_8011BFD4 = 0x8011BFD4; // type:func +func_8011D9B8 = 0x8011D9B8; // type:func +func_80112D84 = 0x80112D84; // type:func +func_80112344 = 0x80112344; // type:func +func_801109DC = 0x801109DC; // type:func +func_8011C164 = 0x8011C164; // type:func +func_8011B1D8 = 0x8011B1D8; // type:func +func_80110BF8 = 0x80110BF8; // type:func +func_8010FE44 = 0x8010FE44; // type:func +func_80112FC4 = 0x80112FC4; // type:func +func_8011C2B0 = 0x8011C2B0; // type:func +func_80112328 = 0x80112328; // type:func +func_80112DFC = 0x80112DFC; // type:func +func_8011BF14 = 0x8011BF14; // type:func +func_801110B4 = 0x801110B4; // type:func +func_8011B5D0 = 0x8011B5D0; // type:func +func_80116698 = 0x80116698; // type:func +func_8011BEB4 = 0x8011BEB4; // type:func +func_8011C028 = 0x8011C028; // type:func +func_80117E74 = 0x80117E74; // type:func +func_8011085C = 0x8011085C; // type:func +func_80112E4C = 0x80112E4C; // type:func +func_8011CFBC = 0x8011CFBC; // type:func +func_80112B98 = 0x80112B98; // type:func +func_8011D82C = 0x8011D82C; // type:func +func_8011D890 = 0x8011D890; // type:func +func_8011C0DC = 0x8011C0DC; // type:func +set_next_game_mode = 0x80112BBC; // type:func +func_8011B7C0 = 0x8011B7C0; // type:func +func_80111790 = 0x80111790; // type:func +func_80112E24 = 0x80112E24; // type:func +func_80114B58 = 0x80114B58; // type:func +mdl_create_model = 0x8011620C; // type:func +func_80110F10 = 0x80110F10; // type:func +func_8011BCEC = 0x8011BCEC; // type:func +func_8011B950 = 0x8011B950; // type:func +func_8011BC7C = 0x8011BC7C; // type:func +func_80115498 = 0x80115498; // type:func +func_80110E58 = 0x80110E58; // type:func +func_8011BAE8 = 0x8011BAE8; // type:func +func_80112DD4 = 0x80112DD4; // type:func +func_8011C32C = 0x8011C32C; // type:func +func_8011C80C = 0x8011C80C; // type:func +func_80111E9C = 0x80111E9C; // type:func +func_8011BCD0 = 0x8011BCD0; // type:func +func_801125E8 = 0x801125E8; // type:func +func_80116674 = 0x80116674; // type:func +func_8011B1C0 = 0x8011B1C0; // type:func +func_8011B090 = 0x8011B090; // type:func +is_identity_fixed_mtx = 0x8011BE14; // type:func +UseDynamicShadow = 0x80111F2C; // type:func +func_8011B37C = 0x8011B37C; // type:func +func_8011BF98 = 0x8011BF98; // type:func +func_80117D00 = 0x80117D00; // type:func +func_8011C2EC = 0x8011C2EC; // type:func +func_80112B20 = 0x80112B20; // type:func +func_8011D7E4 = 0x8011D7E4; // type:func +func_8011800C = 0x8011800C; // type:func +func_8011B660 = 0x8011B660; // type:func +func_8011D8D0 = 0x8011D8D0; // type:func +func_80112EEC = 0x80112EEC; // type:func +func_801117DC = 0x801117DC; // type:func +render_window_root = 0x80147AC4; // type:func +update_window_hierarchy = 0x80147D70; // type:func +main_menu_window_update = 0x80147650; // type:func +update_windows = 0x80147414; // type:func +basic_hidden_window_update = 0x80147574; // type:func +render_windows = 0x80147698; // type:func +setup_pause_menu_tab = 0x80147F30; // type:func +set_windows_visible = 0x80147EC4; // type:func +basic_window_update = 0x80147474; // type:func +func_80240000_EB5130 = 0x80240000; // type:func +func_80240124_EB5254 = 0x80240124; // type:func +func_80240124_EFEC24 = 0x80240124; // type:func +func_80240000_EFEB00 = 0x80240000; // type:func +func_802B70B4 = 0x802B70B4; // type:func +func_802B742C = 0x802B742C; // type:func +func_802B71C8 = 0x802B71C8; // type:func +get_flat_collider_normal = 0x8005BDD8; // type:func +func_8005DB00 = 0x8005DB00; // type:func +func_8005DD54 = 0x8005DD54; // type:func +func_80033BC0 = 0x80033BC0; // type:func +func_80030210 = 0x80030210; // type:func +update_camera_from_zone = 0x800304FC; // type:func +func_8003034C = 0x8003034C; // type:func +func_802DEFB4 = 0x802DEFB4; // type:func +func_802DEEA0 = 0x802DEEA0; // type:func +func_802DF00C = 0x802DF00C; // type:func +func_802DED60 = 0x802DED60; // type:func +func_802DF2D8 = 0x802DF2D8; // type:func +func_802DEAA0 = 0x802DEAA0; // type:func +func_80244030 = 0x80244030; // type:func +func_80242E00 = 0x80242E00; // type:func +func_80243468 = 0x80243468; // type:func +func_80244B00 = 0x80244B00; // type:func +func_80243EEC = 0x80243EEC; // type:func +func_80242F68 = 0x80242F68; // type:func +func_80243628 = 0x80243628; // type:func +func_802434DC = 0x802434DC; // type:func +func_80243898 = 0x80243898; // type:func +func_802436F0 = 0x802436F0; // type:func +func_802437B8 = 0x802437B8; // type:func +func_8024381C = 0x8024381C; // type:func +func_80243908 = 0x80243908; // type:func +func_802448E0 = 0x802448E0; // type:func +func_80242D94 = 0x80242D94; // type:func +func_802433F4 = 0x802433F4; // type:func +func_80243380 = 0x80243380; // type:func +func_80244BC4 = 0x80244BC4; // type:func +func_8024330C = 0x8024330C; // type:func +func_80243550 = 0x80243550; // type:func +func_80242BA0 = 0x80242BA0; // type:func +func_802435C4 = 0x802435C4; // type:func +func_8024368C = 0x8024368C; // type:func +func_80242DEC = 0x80242DEC; // type:func +func_80243CCC = 0x80243CCC; // type:func +func_80243754 = 0x80243754; // type:func +func_802431A0 = 0x802431A0; // type:func +func_80243B10 = 0x80243B10; // type:func +func_802440BC = 0x802440BC; // type:func +func_802CD7D8 = 0x802CD7D8; // type:func +func_802CD4B4 = 0x802CD4B4; // type:func +func_802CD6E0 = 0x802CD6E0; // type:func +func_802CD9F0 = 0x802CD9F0; // type:func +func_802CD5C0 = 0x802CD5C0; // type:func +func_802CD8F8 = 0x802CD8F8; // type:func +func_802CB008 = 0x802CB008; // type:func +func_80244CEC = 0x80244CEC; // type:func +func_80245678 = 0x80245678; // type:func +func_80244E54 = 0x80244E54; // type:func +func_80245718 = 0x80245718; // type:func +func_80246CBC = 0x80246CBC; // type:func +func_80244F44 = 0x80244F44; // type:func +func_80245588 = 0x80245588; // type:func +func_80244D60 = 0x80244D60; // type:func +func_80245808 = 0x80245808; // type:func +func_80244C30 = 0x80244C30; // type:func +func_8024544C = 0x8024544C; // type:func +func_80245768 = 0x80245768; // type:func +func_802455D8 = 0x802455D8; // type:func +func_80244FD4 = 0x80244FD4; // type:func +func_80245628 = 0x80245628; // type:func +func_80244DD0 = 0x80244DD0; // type:func +func_80246B2C = 0x80246B2C; // type:func +func_802457B8 = 0x802457B8; // type:func +func_802456C8 = 0x802456C8; // type:func +func_80245A40 = 0x80245A40; // type:func +func_800EF3C0 = 0x800EF3C0; // type:func +func_800EB2A4 = 0x800EB2A4; // type:func +func_800EB168 = 0x800EB168; // type:func +func_800EA52C = 0x800EA52C; // type:func +func_800EF600 = 0x800EF600; // type:func +func_800EF82C = 0x800EF82C; // type:func +func_800EA6A8 = 0x800EA6A8; // type:func +func_800EF3D4 = 0x800EF3D4; // type:func +load_partner_npc = 0x800EA5D0; // type:func +func_800EA4B0 = 0x800EA4B0; // type:func +func_800EF414 = 0x800EF414; // type:func +func_800EF4E0 = 0x800EF4E0; // type:func +func_800EA5B8 = 0x800EA5B8; // type:func +func_800EF640 = 0x800EF640; // type:func +func_800ED5D0 = 0x800ED5D0; // type:func +func_800EE994 = 0x800EE994; // type:func +func_800EF628 = 0x800EF628; // type:func +func_800EF314 = 0x800EF314; // type:func +func_800EECE8 = 0x800EECE8; // type:func +func_800EB200 = 0x800EB200; // type:func +func_800EF43C = 0x800EF43C; // type:func +func_800EBA3C = 0x800EBA3C; // type:func +func_800EECC4 = 0x800EECC4; // type:func +func_800EF3E4 = 0x800EF3E4; // type:func +func_800EE9B8 = 0x800EE9B8; // type:func +func_800EF300 = 0x800EF300; // type:func +_use_partner_ability = 0x800EA6CC; // type:func +func_800EBB40 = 0x800EBB40; // type:func +func_800EBC74 = 0x800EBC74; // type:func +set_parter_tether_distance = 0x800EF394; // type:func +func_800ED9F8 = 0x800ED9F8; // type:func +reset_parter_tether_distance = 0x800EF3A4; // type:func +func_8024D930 = 0x8024D930; // type:func +func_802B7000_E20110 = 0x802B7000; // type:func +func_8025D290 = 0x8025D290; // type:func +func_8025C120 = 0x8025C120; // type:func +func_8025DBD0 = 0x8025DBD0; // type:func +func_802549C0 = 0x802549C0; // type:func +func_8025CD28 = 0x8025CD28; // type:func +func_80254250 = 0x80254250; // type:func +func_8025593C = 0x8025593C; // type:func +func_802596C0 = 0x802596C0; // type:func +func_8025D620 = 0x8025D620; // type:func +func_8025995C = 0x8025995C; // type:func +func_8025D6FC = 0x8025D6FC; // type:func +func_80257B28 = 0x80257B28; // type:func +func_8025D830 = 0x8025D830; // type:func +func_80258E14 = 0x80258E14; // type:func +func_8025A74C = 0x8025A74C; // type:func +func_802549A0 = 0x802549A0; // type:func +func_8025D3CC = 0x8025D3CC; // type:func +func_80259D9C = 0x80259D9C; // type:func +func_80257B48 = 0x80257B48; // type:func +func_8025950C = 0x8025950C; // type:func +func_80254950 = 0x80254950; // type:func +func_8025BAA0 = 0x8025BAA0; // type:func +func_8025D4A0 = 0x8025D4A0; // type:func +func_802546B0 = 0x802546B0; // type:func +func_8025595C = 0x8025595C; // type:func +func_8025D2B0 = 0x8025D2B0; // type:func +func_8025D8EC = 0x8025D8EC; // type:func +func_8025C918 = 0x8025C918; // type:func +func_80259A48 = 0x80259A48; // type:func +func_8025D4C8 = 0x8025D4C8; // type:func +func_802591EC = 0x802591EC; // type:func +func_8025D160 = 0x8025D160; // type:func +func_8025D71C = 0x8025D71C; // type:func +func_802597B0 = 0x802597B0; // type:func +func_80257B68 = 0x80257B68; // type:func +func_8025CD40 = 0x8025CD40; // type:func +func_8025CEC8 = 0x8025CEC8; // type:func +func_802549F4 = 0x802549F4; // type:func +func_8025CCC8 = 0x8025CCC8; // type:func +func_8025DD60 = 0x8025DD60; // type:func +func_8025B5C0 = 0x8025B5C0; // type:func +func_80254C50 = 0x80254C50; // type:func +func_8025A2C4 = 0x8025A2C4; // type:func +func_80257B88 = 0x80257B88; // type:func +func_8025D810 = 0x8025D810; // type:func +func_8025C8A0 = 0x8025C8A0; // type:func +func_8025DA68 = 0x8025DA68; // type:func +func_802571F0 = 0x802571F0; // type:func +func_80255FE0 = 0x80255FE0; // type:func +func_802550BC = 0x802550BC; // type:func +func_8025AD90 = 0x8025AD90; // type:func +func_8025A50C = 0x8025A50C; // type:func +func_8025C840 = 0x8025C840; // type:func +func_80259AAC = 0x80259AAC; // type:func +func_8025D90C = 0x8025D90C; // type:func +func_802552EC = 0x802552EC; // type:func +func_8025DD40 = 0x8025DD40; // type:func +func_8025B1A8 = 0x8025B1A8; // type:func +func_8025597C = 0x8025597C; // type:func +func_8025AA80 = 0x8025AA80; // type:func +func_8025D640 = 0x8025D640; // type:func +func_8025DE88 = 0x8025DE88; // type:func +func_80259494 = 0x80259494; // type:func +func_80254610 = 0x80254610; // type:func +func_8025599C = 0x8025599C; // type:func +func_80257DA4 = 0x80257DA4; // type:func +func_800F0D80 = 0x800F0D80; // type:func +func_800F0CB0 = 0x800F0CB0; // type:func +func_800F102C = 0x800F102C; // type:func +func_80240124_EF7BA4 = 0x80240124; // type:func +func_80240000_EF7A80 = 0x80240000; // type:func +func_80240000_EA0900 = 0x80240000; // type:func +func_80240124_EA0A24 = 0x80240124; // type:func +func_800E0398 = 0x800E0398; // type:func +func_800DEE5C = 0x800DEE5C; // type:func +check_for_interactables = 0x800E0818; // type:func +func_800DFD48 = 0x800DFD48; // type:func +func_800E0294 = 0x800E0294; // type:func +func_800E06D8 = 0x800E06D8; // type:func +func_800DF15C = 0x800DF15C; // type:func +get_player_back_anim = 0x800E0FEC; // type:func +func_800DFAAC = 0x800DFAAC; // type:func +func_800DFFCC = 0x800DFFCC; // type:func +func_800E0580 = 0x800E0580; // type:func +func_800E0B90 = 0x800E0B90; // type:func +func_800DE46C = 0x800DE46C; // type:func +func_80047FE8 = 0x80047FE8; // type:func +func_80049F7C = 0x80049F7C; // type:func +func_80047F58 = 0x80047F58; // type:func +draw_merlee_message = 0x80045ED0; // type:func +func_80048F0C = 0x80048F0C; // type:func +func_80049ECC = 0x80049ECC; // type:func +func_80047DC0 = 0x80047DC0; // type:func +func_80045FB4 = 0x80045FB4; // type:func +func_80047C14 = 0x80047C14; // type:func +func_80047820 = 0x80047820; // type:func +func_8004A6F0 = 0x8004A6F0; // type:func +func_80047CA4 = 0x80047CA4; // type:func +func_80047B38 = 0x80047B38; // type:func +func_80047BE4 = 0x80047BE4; // type:func +func_8004778C = 0x8004778C; // type:func +func_80048064 = 0x80048064; // type:func +func_800477F4 = 0x800477F4; // type:func +func_80045B10 = 0x80045B10; // type:func +func_800495A0 = 0x800495A0; // type:func +func_800494C0 = 0x800494C0; // type:func +func_80045BC8 = 0x80045BC8; // type:func +func_80047608 = 0x80047608; // type:func +func_8004A124 = 0x8004A124; // type:func +func_80047AA8 = 0x80047AA8; // type:func +func_80047B08 = 0x80047B08; // type:func +func_80047E1C = 0x80047E1C; // type:func +func_800496B8 = 0x800496B8; // type:func +func_80045AC0 = 0x80045AC0; // type:func +func_80049E3C = 0x80049E3C; // type:func +func_800480F4 = 0x800480F4; // type:func +func_80047928 = 0x80047928; // type:func +func_80049550 = 0x80049550; // type:func +func_80047B84 = 0x80047B84; // type:func +func_80048200 = 0x80048200; // type:func +func_80048170 = 0x80048170; // type:func +func_80048034 = 0x80048034; // type:func +draw_merlee_messages = 0x80045C28; // type:func +func_800490B4 = 0x800490B4; // type:func +func_8004A784 = 0x8004A784; // type:func +func_8004824C = 0x8004824C; // type:func +func_80046030 = 0x80046030; // type:func +func_800479A0 = 0x800479A0; // type:func +func_800465E0 = 0x800465E0; // type:func +func_800478F8 = 0x800478F8; // type:func +func_80047898 = 0x80047898; // type:func +func_8004A73C = 0x8004A73C; // type:func +func_80047D00 = 0x80047D00; // type:func +func_80047F28 = 0x80047F28; // type:func +func_80048140 = 0x80048140; // type:func +draw_merlee_message_string = 0x80045E4C; // type:func +func_80047D30 = 0x80047D30; // type:func +func_80047A00 = 0x80047A00; // type:func +func_80045C88 = 0x80045C88; // type:func +func_800476F4 = 0x800476F4; // type:func +func_80047E4C = 0x80047E4C; // type:func +is_merlee_message_done = 0x80045FA4; // type:func +func_80045D7C = 0x80045D7C; // type:func +func_80049C04 = 0x80049C04; // type:func +update_merlee_messages = 0x80045B68; // type:func +func_8004A3E8 = 0x8004A3E8; // type:func +func_80047EDC = 0x80047EDC; // type:func +func_80045D00 = 0x80045D00; // type:func +func_80045CC4 = 0x80045CC4; // type:func +func_80047A30 = 0x80047A30; // type:func +func_80048E34 = 0x80048E34; // type:func +func_800493EC = 0x800493EC; // type:func +func_802B704C = 0x802B704C; // type:func +func_802B74F0 = 0x802B74F0; // type:func +func_802B7140 = 0x802B7140; // type:func +func_80034BFC = 0x80034BFC; // type:func +func_800343A4 = 0x800343A4; // type:func +func_80034C3C = 0x80034C3C; // type:func +func_8004AB00 = 0x8004AB00; // type:func +func_8004AE08 = 0x8004AE08; // type:func +func_8004B328 = 0x8004B328; // type:func +func_80138740 = 0x80138740; // type:func +func_80139F10 = 0x80139F10; // type:func +func_80138E54 = 0x80138E54; // type:func +func_80138D88 = 0x80138D88; // type:func +_render_transition_stencil = 0x80136A80; // type:func +set_transition_stencil_color = 0x80137E10; // type:func +func_80138188 = 0x80138188; // type:func +render_transition_stencil_lower = 0x80138220; // type:func +render_transition_stencil_upper = 0x801381A0; // type:func +set_transition_stencil_zoom_1 = 0x80137DA4; // type:func +func_801385D4 = 0x801385D4; // type:func +set_transition_stencil_alpha = 0x801380D4; // type:func +clear_transition_stencil = 0x80138108; // type:func +set_transition_stencil_center = 0x80137E4C; // type:func +func_80137DC0 = 0x80137DC0; // type:func +func_801382AC = 0x801382AC; // type:func +set_transition_stencil_center_worldpos = 0x80137EC0; // type:func +set_transition_stencil_zoom_0 = 0x80137D88; // type:func +func_802D5270 = 0x802D5270; // type:func +func_8002E82C = 0x8002E82C; // type:func +func_802C3EE4 = 0x802C3EE4; // type:func +func_802C39F8 = 0x802C39F8; // type:func +func_80240124_EB0F84 = 0x80240124; // type:func +func_80240000_EB0E60 = 0x80240000; // type:func +func_8002AAC4 = 0x8002AAC4; // type:func +func_80029860 = 0x80029860; // type:func +func_8002AB5C = 0x8002AB5C; // type:func +func_8002A904 = 0x8002A904; // type:func +func_8024EEA8 = 0x8024EEA8; // type:func +func_8024EE48 = 0x8024EE48; // type:func +func_8024EDC0 = 0x8024EDC0; // type:func +func_8024FAFC = 0x8024FAFC; // type:func +func_8024F7C8 = 0x8024F7C8; // type:func +func_8024FAE8 = 0x8024FAE8; // type:func +func_80251454 = 0x80251454; // type:func +func_8024EF08 = 0x8024EF08; // type:func +func_8024EDEC = 0x8024EDEC; // type:func +func_8024F5AC = 0x8024F5AC; // type:func +func_8024FB3C = 0x8024FB3C; // type:func +func_8024F768 = 0x8024F768; // type:func +func_8024F394 = 0x8024F394; // type:func +func_8024EFA4 = 0x8024EFA4; // type:func +func_8024F84C = 0x8024F84C; // type:func +func_80251474 = 0x80251474; // type:func +func_80250818 = 0x80250818; // type:func +func_80251434 = 0x80251434; // type:func +func_8024F940 = 0x8024F940; // type:func +func_8024EFE0 = 0x8024EFE0; // type:func +func_80122FB8 = 0x80122FB8; // type:func +draw_entity_model_extra2 = 0x80122188; // type:func +draw_entity_model_main = 0x80121EB8; // type:func +draw_entity_model_extra1 = 0x80122088; // type:func +func_80122F8C = 0x80122F8C; // type:func +func_80122F64 = 0x80122F64; // type:func +draw_entity_model_shadow = 0x80121CE8; // type:func +func_80123550 = 0x80123550; // type:func +func_801234E0 = 0x801234E0; // type:func +func_801235C0 = 0x801235C0; // type:func +draw_entity_model_extra3 = 0x80122288; // type:func +func_80122D7C = 0x80122D7C; // type:func +func_80247B04 = 0x80247B04; // type:func +func_80244E38 = 0x80244E38; // type:func +func_80244008 = 0x80244008; // type:func +func_8024721C = 0x8024721C; // type:func +func_80245440 = 0x80245440; // type:func +func_80244D90 = 0x80244D90; // type:func +func_80244710 = 0x80244710; // type:func +func_80241190 = 0x80241190; // type:func +func_80240E60 = 0x80240E60; // type:func +func_80248660 = 0x80248660; // type:func +func_80241AB8 = 0x80241AB8; // type:func +func_802480F0 = 0x802480F0; // type:func +func_80242FE0 = 0x80242FE0; // type:func +func_80241B14 = 0x80241B14; // type:func +func_80248190 = 0x80248190; // type:func +func_80246B2C = 0x80246B2C; // type:func +func_80248D78 = 0x80248D78; // type:func +func_80240FDC = 0x80240FDC; // type:func +func_802439D8 = 0x802439D8; // type:func +func_802485FC = 0x802485FC; // type:func +func_80248AA4 = 0x80248AA4; // type:func +func_80248B08 = 0x80248B08; // type:func +func_802D2F34 = 0x802D2F34; // type:func +func_802D42AC = 0x802D42AC; // type:func +func_802D3F74 = 0x802D3F74; // type:func +func_802D3FC8 = 0x802D3FC8; // type:func +func_802D3998 = 0x802D3998; // type:func +func_802D2D30 = 0x802D2D30; // type:func +func_802D31E0 = 0x802D31E0; // type:func +func_802D378C = 0x802D378C; // type:func +func_802D4488 = 0x802D4488; // type:func +func_802D1380 = 0x802D1380; // type:func +func_802D2ED4 = 0x802D2ED4; // type:func +func_802D3028 = 0x802D3028; // type:func +func_802D3A60 = 0x802D3A60; // type:func +func_802D4050 = 0x802D4050; // type:func +func_802D3398 = 0x802D3398; // type:func +func_802D43F4 = 0x802D43F4; // type:func +func_802D3EB8 = 0x802D3EB8; // type:func +func_802D33D4 = 0x802D33D4; // type:func +func_802D4560 = 0x802D4560; // type:func +func_802D23F8 = 0x802D23F8; // type:func +func_802D2520 = 0x802D2520; // type:func +func_802D417C = 0x802D417C; // type:func +func_802D4434 = 0x802D4434; // type:func +func_802D4364 = 0x802D4364; // type:func +func_802D1270 = 0x802D1270; // type:func +func_802D2FCC = 0x802D2FCC; // type:func +func_802D2884 = 0x802D2884; // type:func +func_802D3674 = 0x802D3674; // type:func +func_802D420C = 0x802D420C; // type:func +func_802DDA8C = 0x802DDA8C; // type:func +func_802DE780 = 0x802DE780; // type:func +func_802DBFC0 = 0x802DBFC0; // type:func +func_802DD634 = 0x802DD634; // type:func +func_802DE894 = 0x802DE894; // type:func +func_802DE5E8 = 0x802DE5E8; // type:func +func_802DC008 = 0x802DC008; // type:func +func_802DDEE4 = 0x802DDEE4; // type:func +func_802DE0EC = 0x802DE0EC; // type:func +func_802DD89C = 0x802DD89C; // type:func +func_802DE748 = 0x802DE748; // type:func +func_802DEA40 = 0x802DEA40; // type:func +func_802DDFF8 = 0x802DDFF8; // type:func +func_802DD8F8 = 0x802DD8F8; // type:func +func_802DD7B0 = 0x802DD7B0; // type:func +func_802DE5C8 = 0x802DE5C8; // type:func +func_802DBDBC = 0x802DBDBC; // type:func +func_802DD820 = 0x802DD820; // type:func +func_802DE9D8 = 0x802DE9D8; // type:func +func_802DD6DC = 0x802DD6DC; // type:func +func_802DBD40 = 0x802DBD40; // type:func +func_802DEA6C = 0x802DEA6C; // type:func +func_802DE8DC = 0x802DE8DC; // type:func +func_802DDEC4 = 0x802DDEC4; // type:func +func_802DE044 = 0x802DE044; // type:func +func_802DE2AC = 0x802DE2AC; // type:func +func_802DBD8C = 0x802DBD8C; // type:func +func_802DE3D8 = 0x802DE3D8; // type:func +func_802DE0C0 = 0x802DE0C0; // type:func +func_802DBE78 = 0x802DBE78; // type:func +func_80246D10 = 0x80246D10; // type:func +func_802471EC = 0x802471EC; // type:func +func_80246E24 = 0x80246E24; // type:func +func_80247198 = 0x80247198; // type:func +create_camera_lead_player_mtx = 0x80033394; // type:func +func_800322DC = 0x800322DC; // type:func +func_800328A4 = 0x800328A4; // type:func +func_80032970 = 0x80032970; // type:func +func_80032210 = 0x80032210; // type:func +func_800325E4 = 0x800325E4; // type:func +func_80032C64 = 0x80032C64; // type:func +func_80240000_EA8AE0 = 0x80240000; // type:func +func_80240124_EA8C04 = 0x80240124; // type:func +func_802691C8 = 0x802691C8; // type:func +func_8026880C = 0x8026880C; // type:func +func_802694A4 = 0x802694A4; // type:func +func_80269470 = 0x80269470; // type:func +func_80268938 = 0x80268938; // type:func +func_80268E88 = 0x80268E88; // type:func +func_80268284 = 0x80268284; // type:func +func_8026939C = 0x8026939C; // type:func +func_802687BC = 0x802687BC; // type:func +func_80268AF8 = 0x80268AF8; // type:func +func_80268224 = 0x80268224; // type:func +func_80268C9C = 0x80268C9C; // type:func +func_80269370 = 0x80269370; // type:func +func_80269344 = 0x80269344; // type:func +func_80269160 = 0x80269160; // type:func +func_80268798 = 0x80268798; // type:func +func_80268834 = 0x80268834; // type:func +func_80268770 = 0x80268770; // type:func +func_802687E4 = 0x802687E4; // type:func +func_80268858 = 0x80268858; // type:func +func_80269118 = 0x80269118; // type:func +func_80263464 = 0x80263464; // type:func +func_80266EA8 = 0x80266EA8; // type:func +func_80267A3C = 0x80267A3C; // type:func +func_80263434 = 0x80263434; // type:func +func_80266ADC = 0x80266ADC; // type:func +func_802664DC = 0x802664DC; // type:func +func_80263300 = 0x80263300; // type:func +func_80266978 = 0x80266978; // type:func +func_80263CC4 = 0x80263CC4; // type:func +func_8026777C = 0x8026777C; // type:func +func_80266970 = 0x80266970; // type:func +func_80263C60 = 0x80263C60; // type:func +func_80264084 = 0x80264084; // type:func +func_8026787C = 0x8026787C; // type:func +func_80267018 = 0x80267018; // type:func +func_80266684 = 0x80266684; // type:func +func_80266DAC = 0x80266DAC; // type:func +func_80263230 = 0x80263230; // type:func +func_80266B14 = 0x80266B14; // type:func +func_802670C8 = 0x802670C8; // type:func +func_802636E4 = 0x802636E4; // type:func +func_802633E8 = 0x802633E8; // type:func +func_8026709C = 0x8026709C; // type:func +func_80266FD8 = 0x80266FD8; // type:func +func_80266D6C = 0x80266D6C; // type:func +func_80263914 = 0x80263914; // type:func +func_80266E40 = 0x80266E40; // type:func +func_80263FE8 = 0x80263FE8; // type:func +func_80265CE8 = 0x80265CE8; // type:func +func_80266F60 = 0x80266F60; // type:func +func_80265D44 = 0x80265D44; // type:func +func_80266AF8 = 0x80266AF8; // type:func +func_80266EE8 = 0x80266EE8; // type:func +func_80263064 = 0x80263064; // type:func +func_80266E14 = 0x80266E14; // type:func +func_802634B8 = 0x802634B8; // type:func +func_8026324C = 0x8026324C; // type:func +func_802666E4 = 0x802666E4; // type:func +func_80263268 = 0x80263268; // type:func +func_80263E08 = 0x80263E08; // type:func +func_802667F0 = 0x802667F0; // type:func +func_80266F8C = 0x80266F8C; // type:func +func_802E7D54 = 0x802E7D54; // type:func +func_802E7034 = 0x802E7034; // type:func +func_802E7D28 = 0x802E7D28; // type:func +func_802E7D38 = 0x802E7D38; // type:func +func_802E71F8 = 0x802E71F8; // type:func +func_802E7C70 = 0x802E7C70; // type:func +func_802E7230 = 0x802E7230; // type:func +func_802E70B0 = 0x802E70B0; // type:func +func_802E75E4 = 0x802E75E4; // type:func +func_802E7CB8 = 0x802E7CB8; // type:func +func_802E7AE4 = 0x802E7AE4; // type:func +func_802E7C8C = 0x802E7C8C; // type:func +func_802E6E90 = 0x802E6E90; // type:func +func_802E75C0 = 0x802E75C0; // type:func +func_802E6ED8 = 0x802E6ED8; // type:func +func_802E6E20 = 0x802E6E20; // type:func +func_802E742C = 0x802E742C; // type:func +gfx_task_background = 0x800269EC; // type:func +func_800271FC = 0x800271FC; // type:func +gfx_init_state = 0x800271A0; // type:func +func_80027BAC = 0x80027BAC; // type:func +gfx_draw_background = 0x80027E10; // type:func +func_80027774 = 0x80027774; // type:func +func_800279B4 = 0x800279B4; // type:func +func_80027088 = 0x80027088; // type:func +func_80027600 = 0x80027600; // type:func +func_8002725C = 0x8002725C; // type:func +func_80271484 = 0x80271484; // type:func +func_80273444 = 0x80273444; // type:func +func_80274A18 = 0x80274A18; // type:func +func_80271328 = 0x80271328; // type:func +func_80275F00 = 0x80275F00; // type:func +func_802752AC = 0x802752AC; // type:func +func_80271588 = 0x80271588; // type:func +func_802713B0 = 0x802713B0; // type:func +func_802712A0 = 0x802712A0; // type:func +func_8014AC94 = 0x8014AC94; // type:func +func_8014AD40 = 0x8014AD40; // type:func +func_8014A548 = 0x8014A548; // type:func +func_800E6904 = 0x800E6904; // type:func +pause_interp_text_scroll_EE1DD8 = 0x80243418; // type:func +func_8024E9B0 = 0x8024E9B0; // type:func +func_8024E664 = 0x8024E664; // type:func +func_8024ECF8 = 0x8024ECF8; // type:func +func_8024E584 = 0x8024E584; // type:func +func_8024AFE4 = 0x8024AFE4; // type:func +func_8024C570 = 0x8024C570; // type:func +func_8024E748 = 0x8024E748; // type:func +func_8024CB68 = 0x8024CB68; // type:func +func_8024B9A0 = 0x8024B9A0; // type:func +func_8024E45C = 0x8024E45C; // type:func +func_80249804 = 0x80249804; // type:func +func_8024E554 = 0x8024E554; // type:func +func_8024A990 = 0x8024A990; // type:func +func_8024BDA4 = 0x8024BDA4; // type:func +func_8024E484 = 0x8024E484; // type:func +func_8024C180 = 0x8024C180; // type:func +func_8024E820 = 0x8024E820; // type:func +func_8024E40C = 0x8024E40C; // type:func +func_80248DD0 = 0x80248DD0; // type:func +func_8024CE9C = 0x8024CE9C; // type:func +func_8024E60C = 0x8024E60C; // type:func +func_8024E6B4 = 0x8024E6B4; // type:func +func_8024EDA4 = 0x8024EDA4; // type:func +func_8024A214 = 0x8024A214; // type:func +func_8024E3D8 = 0x8024E3D8; // type:func +func_8024EB84 = 0x8024EB84; // type:func +func_8024C944 = 0x8024C944; // type:func +func_8024B5FC = 0x8024B5FC; // type:func +func_80248DE4 = 0x80248DE4; // type:func +func_802D8248 = 0x802D8248; // type:func +func_802D7690 = 0x802D7690; // type:func +func_802D7E08 = 0x802D7E08; // type:func +func_802D74C0 = 0x802D74C0; // type:func +func_802D7460 = 0x802D7460; // type:func +func_8026220C = 0x8026220C; // type:func +func_80262130 = 0x80262130; // type:func +func_80053C58 = 0x80053C58; // type:func +func_80054C84 = 0x80054C84; // type:func +func_800549F8 = 0x800549F8; // type:func +func_800538F8 = 0x800538F8; // type:func +func_80054F48 = 0x80054F48; // type:func +func_80054DA8 = 0x80054DA8; // type:func +func_80053CB4 = 0x80053CB4; // type:func +func_80053974 = 0x80053974; // type:func +func_80053CF8 = 0x80053CF8; // type:func +func_80054AA0 = 0x80054AA0; // type:func +func_80053BE8 = 0x80053BE8; // type:func +func_80053F80 = 0x80053F80; // type:func +func_80053E58 = 0x80053E58; // type:func +func_80054CE0 = 0x80054CE0; // type:func +func_80054744 = 0x80054744; // type:func +func_80054E90 = 0x80054E90; // type:func +func_8005465C = 0x8005465C; // type:func +func_802E263C = 0x802E263C; // type:func +func_802E153C = 0x802E153C; // type:func +func_802E1EDC = 0x802E1EDC; // type:func +func_802E17A8 = 0x802E17A8; // type:func +func_802E2BA4 = 0x802E2BA4; // type:func +func_802E246C = 0x802E246C; // type:func +func_802E4710 = 0x802E4710; // type:func +func_802E4E04 = 0x802E4E04; // type:func +func_802E4730 = 0x802E4730; // type:func +func_802E4C10 = 0x802E4C10; // type:func +func_802E5324 = 0x802E5324; // type:func +func_802E30C0 = 0x802E30C0; // type:func +func_802E3370 = 0x802E3370; // type:func +func_802E3BA4 = 0x802E3BA4; // type:func +func_802AE000 = 0x802AE000; // type:func +func_8002BFB0 = 0x8002BFB0; // type:func +func_8002C7B0 = 0x8002C7B0; // type:func +func_8002C1D4 = 0x8002C1D4; // type:func +func_8002C054 = 0x8002C054; // type:func +func_8002C324 = 0x8002C324; // type:func +func_8002C94C = 0x8002C94C; // type:func +func_802E7DE0 = 0x802E7DE0; // type:func +func_802E8ADC = 0x802E8ADC; // type:func +func_802E854C = 0x802E854C; // type:func +func_802E7FA0 = 0x802E7FA0; // type:func +title_draw_copyright = 0x80037E14; // type:func +title_draw_press_start = 0x80037BC8; // type:func +title_draw_images = 0x80037968; // type:func +title_draw_logo = 0x80037994; // type:func +title_append_gfx = 0x80037638; // type:func +func_800375A4 = 0x800375A4; // type:func +func_8027FC90 = 0x8027FC90; // type:func +func_802807D0 = 0x802807D0; // type:func +func_80280818 = 0x80280818; // type:func +func_8028070C = 0x8028070C; // type:func +func_8013AF70 = 0x8013AF70; // type:func +func_8013A6E8 = 0x8013A6E8; // type:func +func_8013E904 = 0x8013E904; // type:func +func_8013DAB4 = 0x8013DAB4; // type:func +func_8013A610 = 0x8013A610; // type:func +func_8013A9C8 = 0x8013A9C8; // type:func +func_8013A93C = 0x8013A93C; // type:func +func_8013A704 = 0x8013A704; // type:func +func_8013A920 = 0x8013A920; // type:func +func_8013EE68 = 0x8013EE68; // type:func +func_8013CFA8 = 0x8013CFA8; // type:func +func_8013E2F0 = 0x8013E2F0; // type:func +func_8013EE48 = 0x8013EE48; // type:func +func_8013C220 = 0x8013C220; // type:func +func_8013A4D0 = 0x8013A4D0; // type:func +func_8013AA9C = 0x8013AA9C; // type:func +func_8013B1B0 = 0x8013B1B0; // type:func +func_8013A8E0 = 0x8013A8E0; // type:func +func_8013A888 = 0x8013A888; // type:func +func_8013BC88 = 0x8013BC88; // type:func +func_8013A370 = 0x8013A370; // type:func +func_8013A650 = 0x8013A650; // type:func +func_8013A9E8 = 0x8013A9E8; // type:func +func_8013F1F8 = 0x8013F1F8; // type:func +func_8013A37C = 0x8013A37C; // type:func +func_8013C048 = 0x8013C048; // type:func +func_8013C3F0 = 0x8013C3F0; // type:func +func_8013AF20 = 0x8013AF20; // type:func +func_8013B0EC = 0x8013B0EC; // type:func +func_8024313C = 0x8024313C; // type:func +func_80243188 = 0x80243188; // type:func +func_802430E4 = 0x802430E4; // type:func +func_80243090 = 0x80243090; // type:func +func_80242FBC = 0x80242FBC; // type:func +func_802434DC = 0x802434DC; // type:func +func_80243388 = 0x80243388; // type:func +func_80242FF4 = 0x80242FF4; // type:func +func_80243238 = 0x80243238; // type:func +func_802432E8 = 0x802432E8; // type:func +func_80242D04 = 0x80242D04; // type:func +func_80242F90 = 0x80242F90; // type:func +func_80242BA0 = 0x80242BA0; // type:func +func_80242BAC = 0x80242BAC; // type:func +func_80144F28 = 0x80144F28; // type:func +func_80144218 = 0x80144218; // type:func +func_80144E74 = 0x80144E74; // type:func +func_80144258 = 0x80144258; // type:func +func_80141100 = 0x80141100; // type:func +func_80144238 = 0x80144238; // type:func +func_80144DF4 = 0x80144DF4; // type:func +func_801413F8 = 0x801413F8; // type:func +func_80145108 = 0x80145108; // type:func +func_801452E8 = 0x801452E8; // type:func +func_80145274 = 0x80145274; // type:func +func_80145070 = 0x80145070; // type:func +func_80144C20 = 0x80144C20; // type:func +func_80141704 = 0x80141704; // type:func +func_80144278 = 0x80144278; // type:func +func_80142210 = 0x80142210; // type:func +func_80144FD8 = 0x80144FD8; // type:func +func_8013F704 = 0x8013F704; // type:func +func_80145224 = 0x80145224; // type:func +func_8013F350 = 0x8013F350; // type:func +func_80145184 = 0x80145184; // type:func +func_80143C48 = 0x80143C48; // type:func +func_8014271C = 0x8014271C; // type:func +func_80144A5C = 0x80144A5C; // type:func +func_80144E4C = 0x80144E4C; // type:func +func_801451D4 = 0x801451D4; // type:func +func_801449DC = 0x801449DC; // type:func +func_801452B4 = 0x801452B4; // type:func +func_80050E84 = 0x80050E84; // type:func +func_80050900 = 0x80050900; // type:func +func_8004D794 = 0x8004D794; // type:func +func_80051434 = 0x80051434; // type:func +func_800506C8 = 0x800506C8; // type:func +func_8004E880 = 0x8004E880; // type:func +func_8004E5D8 = 0x8004E5D8; // type:func +func_8004FE6C = 0x8004FE6C; // type:func +func_800521D0 = 0x800521D0; // type:func +func_800502F0 = 0x800502F0; // type:func +func_800522A8 = 0x800522A8; // type:func +func_80050568 = 0x80050568; // type:func +func_80050654 = 0x80050654; // type:func +func_800511BC = 0x800511BC; // type:func +func_8004DFD4 = 0x8004DFD4; // type:func +func_8004DCB8 = 0x8004DCB8; // type:func +func_800501A8 = 0x800501A8; // type:func +func_80050C64 = 0x80050C64; // type:func +func_8004E844 = 0x8004E844; // type:func +func_800521E8 = 0x800521E8; // type:func +func_8004E904 = 0x8004E904; // type:func +func_8004DB28 = 0x8004DB28; // type:func +func_8004D510 = 0x8004D510; // type:func +func_80051334 = 0x80051334; // type:func +func_80050770 = 0x80050770; // type:func +func_8005015C = 0x8005015C; // type:func +func_800510A4 = 0x800510A4; // type:func +func_80050020 = 0x80050020; // type:func +func_80051050 = 0x80051050; // type:func +func_8004DE2C = 0x8004DE2C; // type:func +func_8004E344 = 0x8004E344; // type:func +func_8004E0F4 = 0x8004E0F4; // type:func +func_80050D50 = 0x80050D50; // type:func +func_8004E444 = 0x8004E444; // type:func +func_80050888 = 0x80050888; // type:func +func_8004EA34 = 0x8004EA34; // type:func +func_8005087C = 0x8005087C; // type:func +func_80050F64 = 0x80050F64; // type:func +func_80050FD0 = 0x80050FD0; // type:func +func_80050CA0 = 0x80050CA0; // type:func +func_800505E4 = 0x800505E4; // type:func +func_80050970 = 0x80050970; // type:func +func_80050EF0 = 0x80050EF0; // type:func +func_8004EAD4 = 0x8004EAD4; // type:func +func_80050E18 = 0x80050E18; // type:func +func_8004DC80 = 0x8004DC80; // type:func +func_8004EC68 = 0x8004EC68; // type:func +func_80050818 = 0x80050818; // type:func +func_8004DB4C = 0x8004DB4C; // type:func +func_80050B90 = 0x80050B90; // type:func +func_8004FED0 = 0x8004FED0; // type:func +func_8005068C = 0x8005068C; // type:func +func_8004E4B8 = 0x8004E4B8; // type:func +func_8004DA74 = 0x8004DA74; // type:func +func_8004D7E0 = 0x8004D7E0; // type:func +func_8005232C = 0x8005232C; // type:func +func_8004EC04 = 0x8004EC04; // type:func +func_8004DAE0 = 0x8004DAE0; // type:func +func_80055E48 = 0x80055E48; // type:func +func_80055D38 = 0x80055D38; // type:func +func_80055A18 = 0x80055A18; // type:func +func_80055DDC = 0x80055DDC; // type:func +func_800560BC = 0x800560BC; // type:func +func_8005610C = 0x8005610C; // type:func +func_80055ABC = 0x80055ABC; // type:func +func_80055B80 = 0x80055B80; // type:func +func_80055B28 = 0x80055B28; // type:func +func_80055C64 = 0x80055C64; // type:func +func_80055CC4 = 0x80055CC4; // type:func +func_800558D4 = 0x800558D4; // type:func +func_80055AF0 = 0x80055AF0; // type:func +func_80055BF0 = 0x80055BF0; // type:func +func_80055EB4 = 0x80055EB4; // type:func +func_80055970 = 0x80055970; // type:func +func_80055A6C = 0x80055A6C; // type:func +func_80055068 = 0x80055068; // type:func +func_80055BB8 = 0x80055BB8; // type:func +func_80055CE8 = 0x80055CE8; // type:func +func_80055C94 = 0x80055C94; // type:func +func_8005591C = 0x8005591C; // type:func +func_80055C2C = 0x80055C2C; // type:func +func_8005513C = 0x8005513C; // type:func +func_80055D8C = 0x80055D8C; // type:func +func_802E0DE0 = 0x802E0DE0; // type:func +func_80200000 = 0x80200000; // type:func +func_8025E030 = 0x8025E030; // type:func +func_8025E14C = 0x8025E14C; // type:func +func_80260A20 = 0x80260A20; // type:func +func_8025DEB0 = 0x8025DEB0; // type:func +func_8025E190 = 0x8025E190; // type:func +func_802601BC = 0x802601BC; // type:func +func_8025E044 = 0x8025E044; // type:func +func_80260948 = 0x80260948; // type:func +func_8025E108 = 0x8025E108; // type:func +func_8025DEC4 = 0x8025DEC4; // type:func +func_8025FF8C = 0x8025FF8C; // type:func +gfx_task_main = 0x80026164; // type:func +func_80248170 = 0x80248170; // type:func +func_80248024 = 0x80248024; // type:func +func_802481B8 = 0x802481B8; // type:func +func_8024830C = 0x8024830C; // type:func +func_80247FD0 = 0x80247FD0; // type:func +func_80248A80 = 0x80248A80; // type:func +func_80248BF4 = 0x80248BF4; // type:func +func_8024932C = 0x8024932C; // type:func +func_80247D30 = 0x80247D30; // type:func +func_8006E310 = 0x8006E310; // type:func +func_8006DDC0 = 0x8006DDC0; // type:func +func_80070FD0 = 0x80070FD0; // type:func +func_800710F0 = 0x800710F0; // type:func +func_800727D0 = 0x800727D0; // type:func +func_80072A70 = 0x80072A70; // type:func +func_80072590 = 0x80072590; // type:func +func_8006FA70 = 0x8006FA70; // type:func +func_80071B70 = 0x80071B70; // type:func +func_80071690 = 0x80071690; // type:func +func_80071090 = 0x80071090; // type:func +func_80071DB0 = 0x80071DB0; // type:func +func_800703D0 = 0x800703D0; // type:func +func_800711B0 = 0x800711B0; // type:func +func_800704F0 = 0x800704F0; // type:func +func_80070310 = 0x80070310; // type:func +func_800726B0 = 0x800726B0; // type:func +func_800708B0 = 0x800708B0; // type:func +func_80072AD0 = 0x80072AD0; // type:func +func_8006FD10 = 0x8006FD10; // type:func +func_80071A50 = 0x80071A50; // type:func +func_8006FFB0 = 0x8006FFB0; // type:func +func_8006FEF0 = 0x8006FEF0; // type:func +func_80071570 = 0x80071570; // type:func +func_8006FB90 = 0x8006FB90; // type:func +func_800713F0 = 0x800713F0; // type:func +func_8006FC50 = 0x8006FC50; // type:func +func_80071D50 = 0x80071D50; // type:func +func_800729B0 = 0x800729B0; // type:func +func_8006FF50 = 0x8006FF50; // type:func +func_80072CF4 = 0x80072CF4; // type:func +func_80070010 = 0x80070010; // type:func +func_8006F950 = 0x8006F950; // type:func +func_80070B50 = 0x80070B50; // type:func +func_80072BB0 = 0x80072BB0; // type:func +func_80072230 = 0x80072230; // type:func +func_800720B0 = 0x800720B0; // type:func +func_80071930 = 0x80071930; // type:func +func_80070C70 = 0x80070C70; // type:func +func_80070EB0 = 0x80070EB0; // type:func +func_80072050 = 0x80072050; // type:func +load_battle_section = 0x80072BDC; // type:func +func_80070DF0 = 0x80070DF0; // type:func +func_8006FD70 = 0x8006FD70; // type:func +func_80071870 = 0x80071870; // type:func +func_80071990 = 0x80071990; // type:func +func_80071E10 = 0x80071E10; // type:func +func_80070970 = 0x80070970; // type:func +func_80071BD0 = 0x80071BD0; // type:func +func_80071F90 = 0x80071F90; // type:func +func_80071F30 = 0x80071F30; // type:func +func_80071810 = 0x80071810; // type:func +func_80070A30 = 0x80070A30; // type:func +func_800725F0 = 0x800725F0; // type:func +func_80072B30 = 0x80072B30; // type:func +func_80071B10 = 0x80071B10; // type:func +func_80072530 = 0x80072530; // type:func +func_80072A10 = 0x80072A10; // type:func +func_80070250 = 0x80070250; // type:func +func_80070D90 = 0x80070D90; // type:func +func_80071210 = 0x80071210; // type:func +func_8006F890 = 0x8006F890; // type:func +func_80070670 = 0x80070670; // type:func +func_80070550 = 0x80070550; // type:func +func_80072110 = 0x80072110; // type:func +func_80072770 = 0x80072770; // type:func +func_80072710 = 0x80072710; // type:func +func_80071150 = 0x80071150; // type:func +func_800714B0 = 0x800714B0; // type:func +func_80071ED0 = 0x80071ED0; // type:func +func_80070130 = 0x80070130; // type:func +func_80070CD0 = 0x80070CD0; // type:func +func_80070A90 = 0x80070A90; // type:func +func_80072470 = 0x80072470; // type:func +func_80072170 = 0x80072170; // type:func +func_80070850 = 0x80070850; // type:func +func_80072950 = 0x80072950; // type:func +func_80071390 = 0x80071390; // type:func +func_80071630 = 0x80071630; // type:func +func_80072CDC = 0x80072CDC; // type:func +func_80070AF0 = 0x80070AF0; // type:func +func_8006F8F0 = 0x8006F8F0; // type:func +func_80070F10 = 0x80070F10; // type:func +func_80072350 = 0x80072350; // type:func +func_800723B0 = 0x800723B0; // type:func +func_80070C10 = 0x80070C10; // type:func +func_800702B0 = 0x800702B0; // type:func +func_80070E50 = 0x80070E50; // type:func +func_8006FE30 = 0x8006FE30; // type:func +func_800700D0 = 0x800700D0; // type:func +func_80070070 = 0x80070070; // type:func +func_800716F0 = 0x800716F0; // type:func +func_80071270 = 0x80071270; // type:func +func_80071C90 = 0x80071C90; // type:func +func_80072830 = 0x80072830; // type:func +func_80070190 = 0x80070190; // type:func +func_800728F0 = 0x800728F0; // type:func +func_80070430 = 0x80070430; // type:func +func_80072BCC = 0x80072BCC; // type:func +func_80070610 = 0x80070610; // type:func +func_80070F70 = 0x80070F70; // type:func +func_800721D0 = 0x800721D0; // type:func +func_80070BB0 = 0x80070BB0; // type:func +func_80070910 = 0x80070910; // type:func +func_80070730 = 0x80070730; // type:func +func_8006F9B0 = 0x8006F9B0; // type:func +func_800706D0 = 0x800706D0; // type:func +func_80072410 = 0x80072410; // type:func +func_800717B0 = 0x800717B0; // type:func +func_80070490 = 0x80070490; // type:func +func_80071750 = 0x80071750; // type:func +func_8006FBF0 = 0x8006FBF0; // type:func +func_800705B0 = 0x800705B0; // type:func +func_80071CF0 = 0x80071CF0; // type:func +func_80071C30 = 0x80071C30; // type:func +set_battle_stage = 0x80072CCC; // type:func +func_8006FCB0 = 0x8006FCB0; // type:func +func_80071AB0 = 0x80071AB0; // type:func +func_800719F0 = 0x800719F0; // type:func +func_80072890 = 0x80072890; // type:func +func_80072650 = 0x80072650; // type:func +func_80070D30 = 0x80070D30; // type:func +func_800722F0 = 0x800722F0; // type:func +func_80070370 = 0x80070370; // type:func +func_80071FF0 = 0x80071FF0; // type:func +func_80071510 = 0x80071510; // type:func +func_800712D0 = 0x800712D0; // type:func +func_800718D0 = 0x800718D0; // type:func +func_800709D0 = 0x800709D0; // type:func +func_800724D0 = 0x800724D0; // type:func +func_80071450 = 0x80071450; // type:func +func_8006FA10 = 0x8006FA10; // type:func +func_80072290 = 0x80072290; // type:func +func_80071E70 = 0x80071E70; // type:func +func_80071030 = 0x80071030; // type:func +func_800715D0 = 0x800715D0; // type:func +func_8006FDD0 = 0x8006FDD0; // type:func +func_800701F0 = 0x800701F0; // type:func +func_80071330 = 0x80071330; // type:func +func_8006E870 = 0x8006E870; // type:func +func_8006A9E0 = 0x8006A9E0; // type:func +func_8006A650 = 0x8006A650; // type:func +func_8006EF28 = 0x8006EF28; // type:func +func_8006D800 = 0x8006D800; // type:func +func_80249380 = 0x80249380; // type:func +func_80249AB8 = 0x80249AB8; // type:func +func_80249AA4 = 0x80249AA4; // type:func +func_8024997C = 0x8024997C; // type:func +check_conversation_trigger = 0x800431DC; // type:func +draw_encounters_pre_battle = 0x80041964; // type:func +update_encounters_neutral = 0x8003F7CC; // type:func +update_encounters_post_battle = 0x80041F10; // type:func +update_encounters_pre_battle = 0x80041364; // type:func +MerleeUpdateFX = 0x8003F0C4; // type:func +func_8004C884 = 0x8004C884; // type:func +func_8004CDF8 = 0x8004CDF8; // type:func +func_8004D00C = 0x8004D00C; // type:func +func_8004D15C = 0x8004D15C; // type:func +func_8004C268 = 0x8004C268; // type:func +func_8004D23C = 0x8004D23C; // type:func +func_8004D07C = 0x8004D07C; // type:func +func_8004D36C = 0x8004D36C; // type:func +func_8004C358 = 0x8004C358; // type:func +func_8004CF3C = 0x8004CF3C; // type:func +func_8004D4BC = 0x8004D4BC; // type:func +func_8004D354 = 0x8004D354; // type:func +func_8004D484 = 0x8004D484; // type:func +func_8004D2B0 = 0x8004D2B0; // type:func +func_8004C444 = 0x8004C444; // type:func +func_8004CE70 = 0x8004CE70; // type:func +func_8004CEA4 = 0x8004CEA4; // type:func +func_8004D180 = 0x8004D180; // type:func +func_8004D310 = 0x8004D310; // type:func +func_8004D33C = 0x8004D33C; // type:func +func_8004C3D4 = 0x8004C3D4; // type:func +func_8004D1B4 = 0x8004D1B4; // type:func +func_8004D2E4 = 0x8004D2E4; // type:func +func_8004C2A4 = 0x8004C2A4; // type:func +func_8004C300 = 0x8004C300; // type:func +func_8004C844 = 0x8004C844; // type:func +func_8004D130 = 0x8004D130; // type:func +func_8004CEC4 = 0x8004CEC4; // type:func +func_8004C578 = 0x8004C578; // type:func +func_8004D3A0 = 0x8004D3A0; // type:func +func_8004CD94 = 0x8004CD94; // type:func +func_8004D114 = 0x8004D114; // type:func +func_8004B62C = 0x8004B62C; // type:func +func_8004D3F8 = 0x8004D3F8; // type:func +func_8004D050 = 0x8004D050; // type:func +func_8004D038 = 0x8004D038; // type:func +func_8004BA74 = 0x8004BA74; // type:func +func_8004CF0C = 0x8004CF0C; // type:func +func_8004C0E4 = 0x8004C0E4; // type:func +func_8004D324 = 0x8004D324; // type:func +func_8004B748 = 0x8004B748; // type:func +func_8004D428 = 0x8004D428; // type:func gBattleItemTable = 0x80293C04; // type:data func_8006A9F0 = 0x8006A9F0; // type:func rom:0x45B74 rdpstateinit_dl = 0x80093BB8; // type:data diff --git a/undefined_syms_auto.txt b/undefined_syms_auto.txt index 98aed7c9ae..cc80e99042 100644 --- a/undefined_syms_auto.txt +++ b/undefined_syms_auto.txt @@ -2298,7 +2298,7 @@ D_802AD008 = 0x802AD008; D_802AD000 = 0x802AD000; D_802AD068 = 0x802AD068; D_802AD001 = 0x802AD001; -D_802AD0AC = 0x802AD0AC; +main_menu_numOptions = 0x802AD0AC; D_802AD028 = 0x802AD028; D_802AD010 = 0x802AD010; D_802AD040 = 0x802AD040; @@ -2317,7 +2317,7 @@ D_802AD070 = 0x802AD070; D_802AD06B = 0x802AD06B; D_802AD069 = 0x802AD069; D_802AD06A = 0x802AD06A; -D_802AD078 = 0x802AD078; +main_battle_menu_iconScripts = 0x802AD078; D_80292C00 = 0x80292C00; D_80292BD8 = 0x80292BD8; D_80292CF4 = 0x80292CF4; @@ -2329,45 +2329,45 @@ D_802AD00A = 0x802AD00A; D_802AD06C = 0x802AD06C; D_802AD002 = 0x802AD002; D_802AD003 = 0x802AD003; -D_802AD0D0 = 0x802AD0D0; +battle_menu_isEnabled = 0x802AD0D0; D_802AD0EB = 0x802AD0EB; jtbl_802AB770 = 0x802AB770; D_802AB7F0 = 0x802AB7F0; D_802AB7F8 = 0x802AB7F8; D_802AB800 = 0x802AB800; -D_802AD090 = 0x802AD090; +battle_menu_messageIDs = 0x802AD090; D_802AD104 = 0x802AD104; D_802AD4A8 = 0x802AD4A8; -D_802AD4A4 = 0x802AD4A4; -D_802AD108 = 0x802AD108; -D_802AD10C = 0x802AD10C; -D_802AD109 = 0x802AD109; +battle_menu_moveOptionCount = 0x802AD4A4; +battle_menu_moveState = 0x802AD108; +battle_menu_moveScrollLine = 0x802AD10C; +battle_menu_moveCursorPos = 0x802AD109; D_802AD10A = 0x802AD10A; D_802AD10E = 0x802AD10E; D_802AD10D = 0x802AD10D; -D_802AD116 = 0x802AD116; +battle_menu_moveTextOpacity = 0x802AD116; D_802AD10F = 0x802AD10F; -D_802AD110 = 0x802AD110; +battle_menu_moveScrollOffset = 0x802AD110; D_802AD112 = 0x802AD112; -D_802AD600 = 0x802AD600; -D_802AD4A0 = 0x802AD4A0; -D_802AD128 = 0x802AD128; -D_802AD118 = 0x802AD118; -D_802AD11C = 0x802AD11C; -D_802AD120 = 0x802AD120; -D_802AD188 = 0x802AD188; -D_802AD190 = 0x802AD190; -D_802AD114 = 0x802AD114; +battle_menu_moveOptionActive = 0x802AD600; +battle_menu_hasSpiritsMenu = 0x802AD4A0; +battle_menu_moveOptionIconIDs = 0x802AD128; +battle_menu_moveCursorIcon = 0x802AD118; +battle_menu_moveUpArrowIcon = 0x802AD11C; +battle_menu_moveDownArrowIcon = 0x802AD120; +battle_menu_moveTitleIcon = 0x802AD188; +battle_menu_moveOptionCostUnitIconIDs = 0x802AD190; +battle_menu_moveTextColor = 0x802AD114; jtbl_802AB808 = 0x802AB808; -D_802AD1F0 = 0x802AD1F0; -D_802AD1F2 = 0x802AD1F2; -D_802AD1F8 = 0x802AD1F8; -D_802AD5D0 = 0x802AD5D0; -D_802AD320 = 0x802AD320; -D_802AD440 = 0x802AD440; -D_802AD260 = 0x802AD260; +battle_menu_moveX = 0x802AD1F0; +battle_menu_moveY = 0x802AD1F2; +battle_menu_moveOptionIndexMap = 0x802AD1F8; +battle_menu_moveOptionSortPriorities = 0x802AD5D0; +battle_menu_moveOptionDisplayCosts = 0x802AD320; +battle_menu_moveOptionBPCosts = 0x802AD440; +battle_menu_moveOptionIconScripts = 0x802AD260; D_80108974 = 0x80108974; -D_802AD3E0 = 0x802AD3E0; +battle_menu_moveOptionDisplayCostReductionColors = 0x802AD3E0; D_80107638 = 0x80107638; D_80107664 = 0x80107664; D_80107690 = 0x80107690; @@ -2375,18 +2375,18 @@ D_801076E8 = 0x801076E8; D_80107714 = 0x80107714; D_80107740 = 0x80107740; D_802AD4A7 = 0x802AD4A7; -D_802AD510 = 0x802AD510; +battle_menu_moveOptionsEnabled = 0x802AD510; D_802AD258 = 0x802AD258; -D_802AD5E8 = 0x802AD5E8; +battle_menu_moveOptionCantUseTypes = 0x802AD5E8; D_802AB340 = 0x802AB340; D_802AD10B = 0x802AD10B; jtbl_802AB8C0 = 0x802AB8C0; -D_802AD2C0 = 0x802AD2C0; -D_802AD380 = 0x802AD380; +battle_menu_moveOptionNames = 0x802AD2C0; +battle_menu_moveOptionDisplayCostReductions = 0x802AD380; D_801076BC = 0x801076BC; D_8010776C = 0x8010776C; jtbl_802AB970 = 0x802AB970; -D_802AD570 = 0x802AD570; +battle_menu_moveOptionDescriptions = 0x802AD570; D_802AB344 = 0x802AB344; D_802AD608 = 0x802AD608; D_802AD673 = 0x802AD673; @@ -2423,14 +2423,14 @@ jtbl_802ABB58 = 0x802ABB58; D_802AD6C0 = 0x802AD6C0; jtbl_802ABBD8 = 0x802ABBD8; D_802AB478 = 0x802AB478; -D_802AD0B8 = 0x802AD0B8; +battle_menu_submenuIDs = 0x802AD0B8; D_802AB4DC = 0x802AB4DC; -D_802AD0E8 = 0x802AD0E8; +battle_menu_isMessageDisabled = 0x802AD0E8; D_802AB47C = 0x802AB47C; D_802AB388 = 0x802AB388; D_802AB4C8 = 0x802AB4C8; -D_802AB4C0 = 0x802AB4C0; -D_802AB348 = 0x802AB348; +battle_menu_centeredMessages = 0x802AB4C0; +battle_menu_iconScripts = 0x802AB348; D_802AB368 = 0x802AB368; D_802AB390 = 0x802AB390; D_802AB4E0 = 0x802AB4E0; @@ -2444,7 +2444,7 @@ D_802AB4F0 = 0x802AB4F0; D_8008F9C0 = 0x8008F9C0; D_8008FA4C = 0x8008FA4C; D_8008FA60 = 0x8008FA60; -D_802AD4B0 = 0x802AD4B0; +battle_menu_moveIndices = 0x802AD4B0; D_802AD4B3 = 0x802AD4B3; D_802AD603 = 0x802AD603; D_802ACCD0 = 0x802ACCD0; @@ -2461,7 +2461,7 @@ D_802AB3F8 = 0x802AB3F8; D_802AB438 = 0x802AB438; D_802AD6A8 = 0x802AD6A8; D_802AB480 = 0x802AB480; -D_802AB490 = 0x802AB490; +battle_menu_leftJustfiedMessages = 0x802AB490; D_802AB488 = 0x802AB488; D_802AD670 = 0x802AD670; D_802AD67B = 0x802AD67B;