diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242D98_95DF98.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242D98_95DF98.s deleted file mode 100644 index 961e5f519c..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242D98_95DF98.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D98_95DF98 -/* 95DF98 80242D98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95DF9C 80242D9C AFB10014 */ sw $s1, 0x14($sp) -/* 95DFA0 80242DA0 0080882D */ daddu $s1, $a0, $zero -/* 95DFA4 80242DA4 AFBF0018 */ sw $ra, 0x18($sp) -/* 95DFA8 80242DA8 AFB00010 */ sw $s0, 0x10($sp) -/* 95DFAC 80242DAC 8E30000C */ lw $s0, 0xc($s1) -/* 95DFB0 80242DB0 8E050000 */ lw $a1, ($s0) -/* 95DFB4 80242DB4 0C0B1EAF */ jal get_variable -/* 95DFB8 80242DB8 26100004 */ addiu $s0, $s0, 4 -/* 95DFBC 80242DBC AE22008C */ sw $v0, 0x8c($s1) -/* 95DFC0 80242DC0 8E050000 */ lw $a1, ($s0) -/* 95DFC4 80242DC4 26100004 */ addiu $s0, $s0, 4 -/* 95DFC8 80242DC8 0C0B1EAF */ jal get_variable -/* 95DFCC 80242DCC 0220202D */ daddu $a0, $s1, $zero -/* 95DFD0 80242DD0 AE220090 */ sw $v0, 0x90($s1) -/* 95DFD4 80242DD4 8E050000 */ lw $a1, ($s0) -/* 95DFD8 80242DD8 26100004 */ addiu $s0, $s0, 4 -/* 95DFDC 80242DDC 0C0B1EAF */ jal get_variable -/* 95DFE0 80242DE0 0220202D */ daddu $a0, $s1, $zero -/* 95DFE4 80242DE4 AE220094 */ sw $v0, 0x94($s1) -/* 95DFE8 80242DE8 8E050000 */ lw $a1, ($s0) -/* 95DFEC 80242DEC 26100004 */ addiu $s0, $s0, 4 -/* 95DFF0 80242DF0 0C0B1EAF */ jal get_variable -/* 95DFF4 80242DF4 0220202D */ daddu $a0, $s1, $zero -/* 95DFF8 80242DF8 AE220098 */ sw $v0, 0x98($s1) -/* 95DFFC 80242DFC 8E050000 */ lw $a1, ($s0) -/* 95E000 80242E00 26100004 */ addiu $s0, $s0, 4 -/* 95E004 80242E04 0C0B1EAF */ jal get_variable -/* 95E008 80242E08 0220202D */ daddu $a0, $s1, $zero -/* 95E00C 80242E0C AE22009C */ sw $v0, 0x9c($s1) -/* 95E010 80242E10 8E050000 */ lw $a1, ($s0) -/* 95E014 80242E14 26100004 */ addiu $s0, $s0, 4 -/* 95E018 80242E18 0C0B1EAF */ jal get_variable -/* 95E01C 80242E1C 0220202D */ daddu $a0, $s1, $zero -/* 95E020 80242E20 AE2200A0 */ sw $v0, 0xa0($s1) -/* 95E024 80242E24 8E050000 */ lw $a1, ($s0) -/* 95E028 80242E28 26100004 */ addiu $s0, $s0, 4 -/* 95E02C 80242E2C 0C0B1EAF */ jal get_variable -/* 95E030 80242E30 0220202D */ daddu $a0, $s1, $zero -/* 95E034 80242E34 AE2200A4 */ sw $v0, 0xa4($s1) -/* 95E038 80242E38 8E050000 */ lw $a1, ($s0) -/* 95E03C 80242E3C 26100004 */ addiu $s0, $s0, 4 -/* 95E040 80242E40 0C0B1EAF */ jal get_variable -/* 95E044 80242E44 0220202D */ daddu $a0, $s1, $zero -/* 95E048 80242E48 AE2200A8 */ sw $v0, 0xa8($s1) -/* 95E04C 80242E4C 8E050000 */ lw $a1, ($s0) -/* 95E050 80242E50 26100004 */ addiu $s0, $s0, 4 -/* 95E054 80242E54 0C0B1EAF */ jal get_variable -/* 95E058 80242E58 0220202D */ daddu $a0, $s1, $zero -/* 95E05C 80242E5C AE2200AC */ sw $v0, 0xac($s1) -/* 95E060 80242E60 8E050000 */ lw $a1, ($s0) -/* 95E064 80242E64 0C0B1EAF */ jal get_variable -/* 95E068 80242E68 0220202D */ daddu $a0, $s1, $zero -/* 95E06C 80242E6C AE2200B0 */ sw $v0, 0xb0($s1) -/* 95E070 80242E70 8FBF0018 */ lw $ra, 0x18($sp) -/* 95E074 80242E74 8FB10014 */ lw $s1, 0x14($sp) -/* 95E078 80242E78 8FB00010 */ lw $s0, 0x10($sp) -/* 95E07C 80242E7C 24020002 */ addiu $v0, $zero, 2 -/* 95E080 80242E80 03E00008 */ jr $ra -/* 95E084 80242E84 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243780_96C940.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243780_96C940.s deleted file mode 100644 index 43d174e59b..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243780_96C940.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243780_96C940 -/* 96C940 80243780 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96C944 80243784 AFB10014 */ sw $s1, 0x14($sp) -/* 96C948 80243788 0080882D */ daddu $s1, $a0, $zero -/* 96C94C 8024378C AFBF0018 */ sw $ra, 0x18($sp) -/* 96C950 80243790 AFB00010 */ sw $s0, 0x10($sp) -/* 96C954 80243794 8E30000C */ lw $s0, 0xc($s1) -/* 96C958 80243798 8E050000 */ lw $a1, ($s0) -/* 96C95C 8024379C 0C0B1EAF */ jal get_variable -/* 96C960 802437A0 26100004 */ addiu $s0, $s0, 4 -/* 96C964 802437A4 AE22008C */ sw $v0, 0x8c($s1) -/* 96C968 802437A8 8E050000 */ lw $a1, ($s0) -/* 96C96C 802437AC 26100004 */ addiu $s0, $s0, 4 -/* 96C970 802437B0 0C0B1EAF */ jal get_variable -/* 96C974 802437B4 0220202D */ daddu $a0, $s1, $zero -/* 96C978 802437B8 AE220090 */ sw $v0, 0x90($s1) -/* 96C97C 802437BC 8E050000 */ lw $a1, ($s0) -/* 96C980 802437C0 26100004 */ addiu $s0, $s0, 4 -/* 96C984 802437C4 0C0B1EAF */ jal get_variable -/* 96C988 802437C8 0220202D */ daddu $a0, $s1, $zero -/* 96C98C 802437CC AE220094 */ sw $v0, 0x94($s1) -/* 96C990 802437D0 8E050000 */ lw $a1, ($s0) -/* 96C994 802437D4 26100004 */ addiu $s0, $s0, 4 -/* 96C998 802437D8 0C0B1EAF */ jal get_variable -/* 96C99C 802437DC 0220202D */ daddu $a0, $s1, $zero -/* 96C9A0 802437E0 AE220098 */ sw $v0, 0x98($s1) -/* 96C9A4 802437E4 8E050000 */ lw $a1, ($s0) -/* 96C9A8 802437E8 26100004 */ addiu $s0, $s0, 4 -/* 96C9AC 802437EC 0C0B1EAF */ jal get_variable -/* 96C9B0 802437F0 0220202D */ daddu $a0, $s1, $zero -/* 96C9B4 802437F4 AE22009C */ sw $v0, 0x9c($s1) -/* 96C9B8 802437F8 8E050000 */ lw $a1, ($s0) -/* 96C9BC 802437FC 26100004 */ addiu $s0, $s0, 4 -/* 96C9C0 80243800 0C0B1EAF */ jal get_variable -/* 96C9C4 80243804 0220202D */ daddu $a0, $s1, $zero -/* 96C9C8 80243808 AE2200A0 */ sw $v0, 0xa0($s1) -/* 96C9CC 8024380C 8E050000 */ lw $a1, ($s0) -/* 96C9D0 80243810 26100004 */ addiu $s0, $s0, 4 -/* 96C9D4 80243814 0C0B1EAF */ jal get_variable -/* 96C9D8 80243818 0220202D */ daddu $a0, $s1, $zero -/* 96C9DC 8024381C AE2200A4 */ sw $v0, 0xa4($s1) -/* 96C9E0 80243820 8E050000 */ lw $a1, ($s0) -/* 96C9E4 80243824 26100004 */ addiu $s0, $s0, 4 -/* 96C9E8 80243828 0C0B1EAF */ jal get_variable -/* 96C9EC 8024382C 0220202D */ daddu $a0, $s1, $zero -/* 96C9F0 80243830 AE2200A8 */ sw $v0, 0xa8($s1) -/* 96C9F4 80243834 8E050000 */ lw $a1, ($s0) -/* 96C9F8 80243838 26100004 */ addiu $s0, $s0, 4 -/* 96C9FC 8024383C 0C0B1EAF */ jal get_variable -/* 96CA00 80243840 0220202D */ daddu $a0, $s1, $zero -/* 96CA04 80243844 AE2200AC */ sw $v0, 0xac($s1) -/* 96CA08 80243848 8E050000 */ lw $a1, ($s0) -/* 96CA0C 8024384C 0C0B1EAF */ jal get_variable -/* 96CA10 80243850 0220202D */ daddu $a0, $s1, $zero -/* 96CA14 80243854 AE2200B0 */ sw $v0, 0xb0($s1) -/* 96CA18 80243858 8FBF0018 */ lw $ra, 0x18($sp) -/* 96CA1C 8024385C 8FB10014 */ lw $s1, 0x14($sp) -/* 96CA20 80243860 8FB00010 */ lw $s0, 0x10($sp) -/* 96CA24 80243864 24020002 */ addiu $v0, $zero, 2 -/* 96CA28 80243868 03E00008 */ jr $ra -/* 96CA2C 8024386C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024077C_A39C5C.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024077C_A39C5C.s deleted file mode 100644 index 4409ca1ff0..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024077C_A39C5C.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024077C_A39C5C -/* A39C5C 8024077C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A39C60 80240780 AFB10014 */ sw $s1, 0x14($sp) -/* A39C64 80240784 0080882D */ daddu $s1, $a0, $zero -/* A39C68 80240788 AFBF0018 */ sw $ra, 0x18($sp) -/* A39C6C 8024078C AFB00010 */ sw $s0, 0x10($sp) -/* A39C70 80240790 8E30000C */ lw $s0, 0xc($s1) -/* A39C74 80240794 8E050000 */ lw $a1, ($s0) -/* A39C78 80240798 0C0B1EAF */ jal get_variable -/* A39C7C 8024079C 26100004 */ addiu $s0, $s0, 4 -/* A39C80 802407A0 AE22008C */ sw $v0, 0x8c($s1) -/* A39C84 802407A4 8E050000 */ lw $a1, ($s0) -/* A39C88 802407A8 26100004 */ addiu $s0, $s0, 4 -/* A39C8C 802407AC 0C0B1EAF */ jal get_variable -/* A39C90 802407B0 0220202D */ daddu $a0, $s1, $zero -/* A39C94 802407B4 AE220090 */ sw $v0, 0x90($s1) -/* A39C98 802407B8 8E050000 */ lw $a1, ($s0) -/* A39C9C 802407BC 26100004 */ addiu $s0, $s0, 4 -/* A39CA0 802407C0 0C0B1EAF */ jal get_variable -/* A39CA4 802407C4 0220202D */ daddu $a0, $s1, $zero -/* A39CA8 802407C8 AE220094 */ sw $v0, 0x94($s1) -/* A39CAC 802407CC 8E050000 */ lw $a1, ($s0) -/* A39CB0 802407D0 26100004 */ addiu $s0, $s0, 4 -/* A39CB4 802407D4 0C0B1EAF */ jal get_variable -/* A39CB8 802407D8 0220202D */ daddu $a0, $s1, $zero -/* A39CBC 802407DC AE220098 */ sw $v0, 0x98($s1) -/* A39CC0 802407E0 8E050000 */ lw $a1, ($s0) -/* A39CC4 802407E4 26100004 */ addiu $s0, $s0, 4 -/* A39CC8 802407E8 0C0B1EAF */ jal get_variable -/* A39CCC 802407EC 0220202D */ daddu $a0, $s1, $zero -/* A39CD0 802407F0 AE22009C */ sw $v0, 0x9c($s1) -/* A39CD4 802407F4 8E050000 */ lw $a1, ($s0) -/* A39CD8 802407F8 26100004 */ addiu $s0, $s0, 4 -/* A39CDC 802407FC 0C0B1EAF */ jal get_variable -/* A39CE0 80240800 0220202D */ daddu $a0, $s1, $zero -/* A39CE4 80240804 AE2200A0 */ sw $v0, 0xa0($s1) -/* A39CE8 80240808 8E050000 */ lw $a1, ($s0) -/* A39CEC 8024080C 26100004 */ addiu $s0, $s0, 4 -/* A39CF0 80240810 0C0B1EAF */ jal get_variable -/* A39CF4 80240814 0220202D */ daddu $a0, $s1, $zero -/* A39CF8 80240818 AE2200A4 */ sw $v0, 0xa4($s1) -/* A39CFC 8024081C 8E050000 */ lw $a1, ($s0) -/* A39D00 80240820 26100004 */ addiu $s0, $s0, 4 -/* A39D04 80240824 0C0B1EAF */ jal get_variable -/* A39D08 80240828 0220202D */ daddu $a0, $s1, $zero -/* A39D0C 8024082C AE2200A8 */ sw $v0, 0xa8($s1) -/* A39D10 80240830 8E050000 */ lw $a1, ($s0) -/* A39D14 80240834 26100004 */ addiu $s0, $s0, 4 -/* A39D18 80240838 0C0B1EAF */ jal get_variable -/* A39D1C 8024083C 0220202D */ daddu $a0, $s1, $zero -/* A39D20 80240840 AE2200AC */ sw $v0, 0xac($s1) -/* A39D24 80240844 8E050000 */ lw $a1, ($s0) -/* A39D28 80240848 0C0B1EAF */ jal get_variable -/* A39D2C 8024084C 0220202D */ daddu $a0, $s1, $zero -/* A39D30 80240850 AE2200B0 */ sw $v0, 0xb0($s1) -/* A39D34 80240854 8FBF0018 */ lw $ra, 0x18($sp) -/* A39D38 80240858 8FB10014 */ lw $s1, 0x14($sp) -/* A39D3C 8024085C 8FB00010 */ lw $s0, 0x10($sp) -/* A39D40 80240860 24020002 */ addiu $v0, $zero, 2 -/* A39D44 80240864 03E00008 */ jr $ra -/* A39D48 80240868 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240860_B20DA0.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240860_B20DA0.s deleted file mode 100644 index 0a022614ec..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240860_B20DA0.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240860_B20DA0 -/* B20DA0 80240860 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B20DA4 80240864 AFB10014 */ sw $s1, 0x14($sp) -/* B20DA8 80240868 0080882D */ daddu $s1, $a0, $zero -/* B20DAC 8024086C AFBF0018 */ sw $ra, 0x18($sp) -/* B20DB0 80240870 AFB00010 */ sw $s0, 0x10($sp) -/* B20DB4 80240874 8E30000C */ lw $s0, 0xc($s1) -/* B20DB8 80240878 8E050000 */ lw $a1, ($s0) -/* B20DBC 8024087C 0C0B1EAF */ jal get_variable -/* B20DC0 80240880 26100004 */ addiu $s0, $s0, 4 -/* B20DC4 80240884 AE22008C */ sw $v0, 0x8c($s1) -/* B20DC8 80240888 8E050000 */ lw $a1, ($s0) -/* B20DCC 8024088C 26100004 */ addiu $s0, $s0, 4 -/* B20DD0 80240890 0C0B1EAF */ jal get_variable -/* B20DD4 80240894 0220202D */ daddu $a0, $s1, $zero -/* B20DD8 80240898 AE220090 */ sw $v0, 0x90($s1) -/* B20DDC 8024089C 8E050000 */ lw $a1, ($s0) -/* B20DE0 802408A0 26100004 */ addiu $s0, $s0, 4 -/* B20DE4 802408A4 0C0B1EAF */ jal get_variable -/* B20DE8 802408A8 0220202D */ daddu $a0, $s1, $zero -/* B20DEC 802408AC AE220094 */ sw $v0, 0x94($s1) -/* B20DF0 802408B0 8E050000 */ lw $a1, ($s0) -/* B20DF4 802408B4 26100004 */ addiu $s0, $s0, 4 -/* B20DF8 802408B8 0C0B1EAF */ jal get_variable -/* B20DFC 802408BC 0220202D */ daddu $a0, $s1, $zero -/* B20E00 802408C0 AE220098 */ sw $v0, 0x98($s1) -/* B20E04 802408C4 8E050000 */ lw $a1, ($s0) -/* B20E08 802408C8 26100004 */ addiu $s0, $s0, 4 -/* B20E0C 802408CC 0C0B1EAF */ jal get_variable -/* B20E10 802408D0 0220202D */ daddu $a0, $s1, $zero -/* B20E14 802408D4 AE22009C */ sw $v0, 0x9c($s1) -/* B20E18 802408D8 8E050000 */ lw $a1, ($s0) -/* B20E1C 802408DC 26100004 */ addiu $s0, $s0, 4 -/* B20E20 802408E0 0C0B1EAF */ jal get_variable -/* B20E24 802408E4 0220202D */ daddu $a0, $s1, $zero -/* B20E28 802408E8 AE2200A0 */ sw $v0, 0xa0($s1) -/* B20E2C 802408EC 8E050000 */ lw $a1, ($s0) -/* B20E30 802408F0 26100004 */ addiu $s0, $s0, 4 -/* B20E34 802408F4 0C0B1EAF */ jal get_variable -/* B20E38 802408F8 0220202D */ daddu $a0, $s1, $zero -/* B20E3C 802408FC AE2200A4 */ sw $v0, 0xa4($s1) -/* B20E40 80240900 8E050000 */ lw $a1, ($s0) -/* B20E44 80240904 26100004 */ addiu $s0, $s0, 4 -/* B20E48 80240908 0C0B1EAF */ jal get_variable -/* B20E4C 8024090C 0220202D */ daddu $a0, $s1, $zero -/* B20E50 80240910 AE2200A8 */ sw $v0, 0xa8($s1) -/* B20E54 80240914 8E050000 */ lw $a1, ($s0) -/* B20E58 80240918 26100004 */ addiu $s0, $s0, 4 -/* B20E5C 8024091C 0C0B1EAF */ jal get_variable -/* B20E60 80240920 0220202D */ daddu $a0, $s1, $zero -/* B20E64 80240924 AE2200AC */ sw $v0, 0xac($s1) -/* B20E68 80240928 8E050000 */ lw $a1, ($s0) -/* B20E6C 8024092C 0C0B1EAF */ jal get_variable -/* B20E70 80240930 0220202D */ daddu $a0, $s1, $zero -/* B20E74 80240934 AE2200B0 */ sw $v0, 0xb0($s1) -/* B20E78 80240938 8FBF0018 */ lw $ra, 0x18($sp) -/* B20E7C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* B20E80 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* B20E84 80240944 24020002 */ addiu $v0, $zero, 2 -/* B20E88 80240948 03E00008 */ jr $ra -/* B20E8C 8024094C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C30_B37800.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C30_B37800.s deleted file mode 100644 index 25955915de..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C30_B37800.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C30_B37800 -/* B37800 80242C30 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B37804 80242C34 AFB10014 */ sw $s1, 0x14($sp) -/* B37808 80242C38 0080882D */ daddu $s1, $a0, $zero -/* B3780C 80242C3C AFBF0018 */ sw $ra, 0x18($sp) -/* B37810 80242C40 AFB00010 */ sw $s0, 0x10($sp) -/* B37814 80242C44 8E30000C */ lw $s0, 0xc($s1) -/* B37818 80242C48 8E050000 */ lw $a1, ($s0) -/* B3781C 80242C4C 0C0B1EAF */ jal get_variable -/* B37820 80242C50 26100004 */ addiu $s0, $s0, 4 -/* B37824 80242C54 AE22008C */ sw $v0, 0x8c($s1) -/* B37828 80242C58 8E050000 */ lw $a1, ($s0) -/* B3782C 80242C5C 26100004 */ addiu $s0, $s0, 4 -/* B37830 80242C60 0C0B1EAF */ jal get_variable -/* B37834 80242C64 0220202D */ daddu $a0, $s1, $zero -/* B37838 80242C68 AE220090 */ sw $v0, 0x90($s1) -/* B3783C 80242C6C 8E050000 */ lw $a1, ($s0) -/* B37840 80242C70 26100004 */ addiu $s0, $s0, 4 -/* B37844 80242C74 0C0B1EAF */ jal get_variable -/* B37848 80242C78 0220202D */ daddu $a0, $s1, $zero -/* B3784C 80242C7C AE220094 */ sw $v0, 0x94($s1) -/* B37850 80242C80 8E050000 */ lw $a1, ($s0) -/* B37854 80242C84 26100004 */ addiu $s0, $s0, 4 -/* B37858 80242C88 0C0B1EAF */ jal get_variable -/* B3785C 80242C8C 0220202D */ daddu $a0, $s1, $zero -/* B37860 80242C90 AE220098 */ sw $v0, 0x98($s1) -/* B37864 80242C94 8E050000 */ lw $a1, ($s0) -/* B37868 80242C98 26100004 */ addiu $s0, $s0, 4 -/* B3786C 80242C9C 0C0B1EAF */ jal get_variable -/* B37870 80242CA0 0220202D */ daddu $a0, $s1, $zero -/* B37874 80242CA4 AE22009C */ sw $v0, 0x9c($s1) -/* B37878 80242CA8 8E050000 */ lw $a1, ($s0) -/* B3787C 80242CAC 26100004 */ addiu $s0, $s0, 4 -/* B37880 80242CB0 0C0B1EAF */ jal get_variable -/* B37884 80242CB4 0220202D */ daddu $a0, $s1, $zero -/* B37888 80242CB8 AE2200A0 */ sw $v0, 0xa0($s1) -/* B3788C 80242CBC 8E050000 */ lw $a1, ($s0) -/* B37890 80242CC0 26100004 */ addiu $s0, $s0, 4 -/* B37894 80242CC4 0C0B1EAF */ jal get_variable -/* B37898 80242CC8 0220202D */ daddu $a0, $s1, $zero -/* B3789C 80242CCC AE2200A4 */ sw $v0, 0xa4($s1) -/* B378A0 80242CD0 8E050000 */ lw $a1, ($s0) -/* B378A4 80242CD4 26100004 */ addiu $s0, $s0, 4 -/* B378A8 80242CD8 0C0B1EAF */ jal get_variable -/* B378AC 80242CDC 0220202D */ daddu $a0, $s1, $zero -/* B378B0 80242CE0 AE2200A8 */ sw $v0, 0xa8($s1) -/* B378B4 80242CE4 8E050000 */ lw $a1, ($s0) -/* B378B8 80242CE8 26100004 */ addiu $s0, $s0, 4 -/* B378BC 80242CEC 0C0B1EAF */ jal get_variable -/* B378C0 80242CF0 0220202D */ daddu $a0, $s1, $zero -/* B378C4 80242CF4 AE2200AC */ sw $v0, 0xac($s1) -/* B378C8 80242CF8 8E050000 */ lw $a1, ($s0) -/* B378CC 80242CFC 0C0B1EAF */ jal get_variable -/* B378D0 80242D00 0220202D */ daddu $a0, $s1, $zero -/* B378D4 80242D04 AE2200B0 */ sw $v0, 0xb0($s1) -/* B378D8 80242D08 8FBF0018 */ lw $ra, 0x18($sp) -/* B378DC 80242D0C 8FB10014 */ lw $s1, 0x14($sp) -/* B378E0 80242D10 8FB00010 */ lw $s0, 0x10($sp) -/* B378E4 80242D14 24020002 */ addiu $v0, $zero, 2 -/* B378E8 80242D18 03E00008 */ jr $ra -/* B378EC 80242D1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242424_8B2494.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242424_8B2494.s deleted file mode 100644 index 2ae1dc3a25..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242424_8B2494.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242424_8B2494 -/* 8B2494 80242424 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B2498 80242428 AFB10014 */ sw $s1, 0x14($sp) -/* 8B249C 8024242C 0080882D */ daddu $s1, $a0, $zero -/* 8B24A0 80242430 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B24A4 80242434 AFB00010 */ sw $s0, 0x10($sp) -/* 8B24A8 80242438 8E30000C */ lw $s0, 0xc($s1) -/* 8B24AC 8024243C 8E050000 */ lw $a1, ($s0) -/* 8B24B0 80242440 0C0B1EAF */ jal get_variable -/* 8B24B4 80242444 26100004 */ addiu $s0, $s0, 4 -/* 8B24B8 80242448 AE22008C */ sw $v0, 0x8c($s1) -/* 8B24BC 8024244C 8E050000 */ lw $a1, ($s0) -/* 8B24C0 80242450 26100004 */ addiu $s0, $s0, 4 -/* 8B24C4 80242454 0C0B1EAF */ jal get_variable -/* 8B24C8 80242458 0220202D */ daddu $a0, $s1, $zero -/* 8B24CC 8024245C AE220090 */ sw $v0, 0x90($s1) -/* 8B24D0 80242460 8E050000 */ lw $a1, ($s0) -/* 8B24D4 80242464 26100004 */ addiu $s0, $s0, 4 -/* 8B24D8 80242468 0C0B1EAF */ jal get_variable -/* 8B24DC 8024246C 0220202D */ daddu $a0, $s1, $zero -/* 8B24E0 80242470 AE220094 */ sw $v0, 0x94($s1) -/* 8B24E4 80242474 8E050000 */ lw $a1, ($s0) -/* 8B24E8 80242478 26100004 */ addiu $s0, $s0, 4 -/* 8B24EC 8024247C 0C0B1EAF */ jal get_variable -/* 8B24F0 80242480 0220202D */ daddu $a0, $s1, $zero -/* 8B24F4 80242484 AE220098 */ sw $v0, 0x98($s1) -/* 8B24F8 80242488 8E050000 */ lw $a1, ($s0) -/* 8B24FC 8024248C 26100004 */ addiu $s0, $s0, 4 -/* 8B2500 80242490 0C0B1EAF */ jal get_variable -/* 8B2504 80242494 0220202D */ daddu $a0, $s1, $zero -/* 8B2508 80242498 AE22009C */ sw $v0, 0x9c($s1) -/* 8B250C 8024249C 8E050000 */ lw $a1, ($s0) -/* 8B2510 802424A0 26100004 */ addiu $s0, $s0, 4 -/* 8B2514 802424A4 0C0B1EAF */ jal get_variable -/* 8B2518 802424A8 0220202D */ daddu $a0, $s1, $zero -/* 8B251C 802424AC AE2200A0 */ sw $v0, 0xa0($s1) -/* 8B2520 802424B0 8E050000 */ lw $a1, ($s0) -/* 8B2524 802424B4 26100004 */ addiu $s0, $s0, 4 -/* 8B2528 802424B8 0C0B1EAF */ jal get_variable -/* 8B252C 802424BC 0220202D */ daddu $a0, $s1, $zero -/* 8B2530 802424C0 AE2200A4 */ sw $v0, 0xa4($s1) -/* 8B2534 802424C4 8E050000 */ lw $a1, ($s0) -/* 8B2538 802424C8 26100004 */ addiu $s0, $s0, 4 -/* 8B253C 802424CC 0C0B1EAF */ jal get_variable -/* 8B2540 802424D0 0220202D */ daddu $a0, $s1, $zero -/* 8B2544 802424D4 AE2200A8 */ sw $v0, 0xa8($s1) -/* 8B2548 802424D8 8E050000 */ lw $a1, ($s0) -/* 8B254C 802424DC 26100004 */ addiu $s0, $s0, 4 -/* 8B2550 802424E0 0C0B1EAF */ jal get_variable -/* 8B2554 802424E4 0220202D */ daddu $a0, $s1, $zero -/* 8B2558 802424E8 AE2200AC */ sw $v0, 0xac($s1) -/* 8B255C 802424EC 8E050000 */ lw $a1, ($s0) -/* 8B2560 802424F0 0C0B1EAF */ jal get_variable -/* 8B2564 802424F4 0220202D */ daddu $a0, $s1, $zero -/* 8B2568 802424F8 AE2200B0 */ sw $v0, 0xb0($s1) -/* 8B256C 802424FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B2570 80242500 8FB10014 */ lw $s1, 0x14($sp) -/* 8B2574 80242504 8FB00010 */ lw $s0, 0x10($sp) -/* 8B2578 80242508 24020002 */ addiu $v0, $zero, 2 -/* 8B257C 8024250C 03E00008 */ jr $ra -/* 8B2580 80242510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242438_C5CB78.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242438_C5CB78.s deleted file mode 100644 index 94e730485e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242438_C5CB78.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242438_C5CB78 -/* C5CB78 80242438 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5CB7C 8024243C AFB10014 */ sw $s1, 0x14($sp) -/* C5CB80 80242440 0080882D */ daddu $s1, $a0, $zero -/* C5CB84 80242444 AFBF0018 */ sw $ra, 0x18($sp) -/* C5CB88 80242448 AFB00010 */ sw $s0, 0x10($sp) -/* C5CB8C 8024244C 8E30000C */ lw $s0, 0xc($s1) -/* C5CB90 80242450 8E050000 */ lw $a1, ($s0) -/* C5CB94 80242454 0C0B1EAF */ jal get_variable -/* C5CB98 80242458 26100004 */ addiu $s0, $s0, 4 -/* C5CB9C 8024245C AE22008C */ sw $v0, 0x8c($s1) -/* C5CBA0 80242460 8E050000 */ lw $a1, ($s0) -/* C5CBA4 80242464 26100004 */ addiu $s0, $s0, 4 -/* C5CBA8 80242468 0C0B1EAF */ jal get_variable -/* C5CBAC 8024246C 0220202D */ daddu $a0, $s1, $zero -/* C5CBB0 80242470 AE220090 */ sw $v0, 0x90($s1) -/* C5CBB4 80242474 8E050000 */ lw $a1, ($s0) -/* C5CBB8 80242478 26100004 */ addiu $s0, $s0, 4 -/* C5CBBC 8024247C 0C0B1EAF */ jal get_variable -/* C5CBC0 80242480 0220202D */ daddu $a0, $s1, $zero -/* C5CBC4 80242484 AE220094 */ sw $v0, 0x94($s1) -/* C5CBC8 80242488 8E050000 */ lw $a1, ($s0) -/* C5CBCC 8024248C 26100004 */ addiu $s0, $s0, 4 -/* C5CBD0 80242490 0C0B1EAF */ jal get_variable -/* C5CBD4 80242494 0220202D */ daddu $a0, $s1, $zero -/* C5CBD8 80242498 AE220098 */ sw $v0, 0x98($s1) -/* C5CBDC 8024249C 8E050000 */ lw $a1, ($s0) -/* C5CBE0 802424A0 26100004 */ addiu $s0, $s0, 4 -/* C5CBE4 802424A4 0C0B1EAF */ jal get_variable -/* C5CBE8 802424A8 0220202D */ daddu $a0, $s1, $zero -/* C5CBEC 802424AC AE22009C */ sw $v0, 0x9c($s1) -/* C5CBF0 802424B0 8E050000 */ lw $a1, ($s0) -/* C5CBF4 802424B4 26100004 */ addiu $s0, $s0, 4 -/* C5CBF8 802424B8 0C0B1EAF */ jal get_variable -/* C5CBFC 802424BC 0220202D */ daddu $a0, $s1, $zero -/* C5CC00 802424C0 AE2200A0 */ sw $v0, 0xa0($s1) -/* C5CC04 802424C4 8E050000 */ lw $a1, ($s0) -/* C5CC08 802424C8 26100004 */ addiu $s0, $s0, 4 -/* C5CC0C 802424CC 0C0B1EAF */ jal get_variable -/* C5CC10 802424D0 0220202D */ daddu $a0, $s1, $zero -/* C5CC14 802424D4 AE2200A4 */ sw $v0, 0xa4($s1) -/* C5CC18 802424D8 8E050000 */ lw $a1, ($s0) -/* C5CC1C 802424DC 26100004 */ addiu $s0, $s0, 4 -/* C5CC20 802424E0 0C0B1EAF */ jal get_variable -/* C5CC24 802424E4 0220202D */ daddu $a0, $s1, $zero -/* C5CC28 802424E8 AE2200A8 */ sw $v0, 0xa8($s1) -/* C5CC2C 802424EC 8E050000 */ lw $a1, ($s0) -/* C5CC30 802424F0 26100004 */ addiu $s0, $s0, 4 -/* C5CC34 802424F4 0C0B1EAF */ jal get_variable -/* C5CC38 802424F8 0220202D */ daddu $a0, $s1, $zero -/* C5CC3C 802424FC AE2200AC */ sw $v0, 0xac($s1) -/* C5CC40 80242500 8E050000 */ lw $a1, ($s0) -/* C5CC44 80242504 0C0B1EAF */ jal get_variable -/* C5CC48 80242508 0220202D */ daddu $a0, $s1, $zero -/* C5CC4C 8024250C AE2200B0 */ sw $v0, 0xb0($s1) -/* C5CC50 80242510 8FBF0018 */ lw $ra, 0x18($sp) -/* C5CC54 80242514 8FB10014 */ lw $s1, 0x14($sp) -/* C5CC58 80242518 8FB00010 */ lw $s0, 0x10($sp) -/* C5CC5C 8024251C 24020002 */ addiu $v0, $zero, 2 -/* C5CC60 80242520 03E00008 */ jr $ra -/* C5CC64 80242524 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242A08_C63718.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242A08_C63718.s deleted file mode 100644 index 92202d1817..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242A08_C63718.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A08_C63718 -/* C63718 80242A08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C6371C 80242A0C AFB10014 */ sw $s1, 0x14($sp) -/* C63720 80242A10 0080882D */ daddu $s1, $a0, $zero -/* C63724 80242A14 AFBF0018 */ sw $ra, 0x18($sp) -/* C63728 80242A18 AFB00010 */ sw $s0, 0x10($sp) -/* C6372C 80242A1C 8E30000C */ lw $s0, 0xc($s1) -/* C63730 80242A20 8E050000 */ lw $a1, ($s0) -/* C63734 80242A24 0C0B1EAF */ jal get_variable -/* C63738 80242A28 26100004 */ addiu $s0, $s0, 4 -/* C6373C 80242A2C AE22008C */ sw $v0, 0x8c($s1) -/* C63740 80242A30 8E050000 */ lw $a1, ($s0) -/* C63744 80242A34 26100004 */ addiu $s0, $s0, 4 -/* C63748 80242A38 0C0B1EAF */ jal get_variable -/* C6374C 80242A3C 0220202D */ daddu $a0, $s1, $zero -/* C63750 80242A40 AE220090 */ sw $v0, 0x90($s1) -/* C63754 80242A44 8E050000 */ lw $a1, ($s0) -/* C63758 80242A48 26100004 */ addiu $s0, $s0, 4 -/* C6375C 80242A4C 0C0B1EAF */ jal get_variable -/* C63760 80242A50 0220202D */ daddu $a0, $s1, $zero -/* C63764 80242A54 AE220094 */ sw $v0, 0x94($s1) -/* C63768 80242A58 8E050000 */ lw $a1, ($s0) -/* C6376C 80242A5C 26100004 */ addiu $s0, $s0, 4 -/* C63770 80242A60 0C0B1EAF */ jal get_variable -/* C63774 80242A64 0220202D */ daddu $a0, $s1, $zero -/* C63778 80242A68 AE220098 */ sw $v0, 0x98($s1) -/* C6377C 80242A6C 8E050000 */ lw $a1, ($s0) -/* C63780 80242A70 26100004 */ addiu $s0, $s0, 4 -/* C63784 80242A74 0C0B1EAF */ jal get_variable -/* C63788 80242A78 0220202D */ daddu $a0, $s1, $zero -/* C6378C 80242A7C AE22009C */ sw $v0, 0x9c($s1) -/* C63790 80242A80 8E050000 */ lw $a1, ($s0) -/* C63794 80242A84 26100004 */ addiu $s0, $s0, 4 -/* C63798 80242A88 0C0B1EAF */ jal get_variable -/* C6379C 80242A8C 0220202D */ daddu $a0, $s1, $zero -/* C637A0 80242A90 AE2200A0 */ sw $v0, 0xa0($s1) -/* C637A4 80242A94 8E050000 */ lw $a1, ($s0) -/* C637A8 80242A98 26100004 */ addiu $s0, $s0, 4 -/* C637AC 80242A9C 0C0B1EAF */ jal get_variable -/* C637B0 80242AA0 0220202D */ daddu $a0, $s1, $zero -/* C637B4 80242AA4 AE2200A4 */ sw $v0, 0xa4($s1) -/* C637B8 80242AA8 8E050000 */ lw $a1, ($s0) -/* C637BC 80242AAC 26100004 */ addiu $s0, $s0, 4 -/* C637C0 80242AB0 0C0B1EAF */ jal get_variable -/* C637C4 80242AB4 0220202D */ daddu $a0, $s1, $zero -/* C637C8 80242AB8 AE2200A8 */ sw $v0, 0xa8($s1) -/* C637CC 80242ABC 8E050000 */ lw $a1, ($s0) -/* C637D0 80242AC0 26100004 */ addiu $s0, $s0, 4 -/* C637D4 80242AC4 0C0B1EAF */ jal get_variable -/* C637D8 80242AC8 0220202D */ daddu $a0, $s1, $zero -/* C637DC 80242ACC AE2200AC */ sw $v0, 0xac($s1) -/* C637E0 80242AD0 8E050000 */ lw $a1, ($s0) -/* C637E4 80242AD4 0C0B1EAF */ jal get_variable -/* C637E8 80242AD8 0220202D */ daddu $a0, $s1, $zero -/* C637EC 80242ADC AE2200B0 */ sw $v0, 0xb0($s1) -/* C637F0 80242AE0 8FBF0018 */ lw $ra, 0x18($sp) -/* C637F4 80242AE4 8FB10014 */ lw $s1, 0x14($sp) -/* C637F8 80242AE8 8FB00010 */ lw $s0, 0x10($sp) -/* C637FC 80242AEC 24020002 */ addiu $v0, $zero, 2 -/* C63800 80242AF0 03E00008 */ jr $ra -/* C63804 80242AF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243718_C7A3F8.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243718_C7A3F8.s deleted file mode 100644 index a06b03c524..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243718_C7A3F8.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243718_C7A3F8 -/* C7A3F8 80243718 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7A3FC 8024371C AFB10014 */ sw $s1, 0x14($sp) -/* C7A400 80243720 0080882D */ daddu $s1, $a0, $zero -/* C7A404 80243724 AFBF0018 */ sw $ra, 0x18($sp) -/* C7A408 80243728 AFB00010 */ sw $s0, 0x10($sp) -/* C7A40C 8024372C 8E30000C */ lw $s0, 0xc($s1) -/* C7A410 80243730 8E050000 */ lw $a1, ($s0) -/* C7A414 80243734 0C0B1EAF */ jal get_variable -/* C7A418 80243738 26100004 */ addiu $s0, $s0, 4 -/* C7A41C 8024373C AE22008C */ sw $v0, 0x8c($s1) -/* C7A420 80243740 8E050000 */ lw $a1, ($s0) -/* C7A424 80243744 26100004 */ addiu $s0, $s0, 4 -/* C7A428 80243748 0C0B1EAF */ jal get_variable -/* C7A42C 8024374C 0220202D */ daddu $a0, $s1, $zero -/* C7A430 80243750 AE220090 */ sw $v0, 0x90($s1) -/* C7A434 80243754 8E050000 */ lw $a1, ($s0) -/* C7A438 80243758 26100004 */ addiu $s0, $s0, 4 -/* C7A43C 8024375C 0C0B1EAF */ jal get_variable -/* C7A440 80243760 0220202D */ daddu $a0, $s1, $zero -/* C7A444 80243764 AE220094 */ sw $v0, 0x94($s1) -/* C7A448 80243768 8E050000 */ lw $a1, ($s0) -/* C7A44C 8024376C 26100004 */ addiu $s0, $s0, 4 -/* C7A450 80243770 0C0B1EAF */ jal get_variable -/* C7A454 80243774 0220202D */ daddu $a0, $s1, $zero -/* C7A458 80243778 AE220098 */ sw $v0, 0x98($s1) -/* C7A45C 8024377C 8E050000 */ lw $a1, ($s0) -/* C7A460 80243780 26100004 */ addiu $s0, $s0, 4 -/* C7A464 80243784 0C0B1EAF */ jal get_variable -/* C7A468 80243788 0220202D */ daddu $a0, $s1, $zero -/* C7A46C 8024378C AE22009C */ sw $v0, 0x9c($s1) -/* C7A470 80243790 8E050000 */ lw $a1, ($s0) -/* C7A474 80243794 26100004 */ addiu $s0, $s0, 4 -/* C7A478 80243798 0C0B1EAF */ jal get_variable -/* C7A47C 8024379C 0220202D */ daddu $a0, $s1, $zero -/* C7A480 802437A0 AE2200A0 */ sw $v0, 0xa0($s1) -/* C7A484 802437A4 8E050000 */ lw $a1, ($s0) -/* C7A488 802437A8 26100004 */ addiu $s0, $s0, 4 -/* C7A48C 802437AC 0C0B1EAF */ jal get_variable -/* C7A490 802437B0 0220202D */ daddu $a0, $s1, $zero -/* C7A494 802437B4 AE2200A4 */ sw $v0, 0xa4($s1) -/* C7A498 802437B8 8E050000 */ lw $a1, ($s0) -/* C7A49C 802437BC 26100004 */ addiu $s0, $s0, 4 -/* C7A4A0 802437C0 0C0B1EAF */ jal get_variable -/* C7A4A4 802437C4 0220202D */ daddu $a0, $s1, $zero -/* C7A4A8 802437C8 AE2200A8 */ sw $v0, 0xa8($s1) -/* C7A4AC 802437CC 8E050000 */ lw $a1, ($s0) -/* C7A4B0 802437D0 26100004 */ addiu $s0, $s0, 4 -/* C7A4B4 802437D4 0C0B1EAF */ jal get_variable -/* C7A4B8 802437D8 0220202D */ daddu $a0, $s1, $zero -/* C7A4BC 802437DC AE2200AC */ sw $v0, 0xac($s1) -/* C7A4C0 802437E0 8E050000 */ lw $a1, ($s0) -/* C7A4C4 802437E4 0C0B1EAF */ jal get_variable -/* C7A4C8 802437E8 0220202D */ daddu $a0, $s1, $zero -/* C7A4CC 802437EC AE2200B0 */ sw $v0, 0xb0($s1) -/* C7A4D0 802437F0 8FBF0018 */ lw $ra, 0x18($sp) -/* C7A4D4 802437F4 8FB10014 */ lw $s1, 0x14($sp) -/* C7A4D8 802437F8 8FB00010 */ lw $s0, 0x10($sp) -/* C7A4DC 802437FC 24020002 */ addiu $v0, $zero, 2 -/* C7A4E0 80243800 03E00008 */ jr $ra -/* C7A4E4 80243804 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242A08_C884B8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242A08_C884B8.s deleted file mode 100644 index e9541fa82f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242A08_C884B8.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A08_C884B8 -/* C884B8 80242A08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C884BC 80242A0C AFB10014 */ sw $s1, 0x14($sp) -/* C884C0 80242A10 0080882D */ daddu $s1, $a0, $zero -/* C884C4 80242A14 AFBF0018 */ sw $ra, 0x18($sp) -/* C884C8 80242A18 AFB00010 */ sw $s0, 0x10($sp) -/* C884CC 80242A1C 8E30000C */ lw $s0, 0xc($s1) -/* C884D0 80242A20 8E050000 */ lw $a1, ($s0) -/* C884D4 80242A24 0C0B1EAF */ jal get_variable -/* C884D8 80242A28 26100004 */ addiu $s0, $s0, 4 -/* C884DC 80242A2C AE22008C */ sw $v0, 0x8c($s1) -/* C884E0 80242A30 8E050000 */ lw $a1, ($s0) -/* C884E4 80242A34 26100004 */ addiu $s0, $s0, 4 -/* C884E8 80242A38 0C0B1EAF */ jal get_variable -/* C884EC 80242A3C 0220202D */ daddu $a0, $s1, $zero -/* C884F0 80242A40 AE220090 */ sw $v0, 0x90($s1) -/* C884F4 80242A44 8E050000 */ lw $a1, ($s0) -/* C884F8 80242A48 26100004 */ addiu $s0, $s0, 4 -/* C884FC 80242A4C 0C0B1EAF */ jal get_variable -/* C88500 80242A50 0220202D */ daddu $a0, $s1, $zero -/* C88504 80242A54 AE220094 */ sw $v0, 0x94($s1) -/* C88508 80242A58 8E050000 */ lw $a1, ($s0) -/* C8850C 80242A5C 26100004 */ addiu $s0, $s0, 4 -/* C88510 80242A60 0C0B1EAF */ jal get_variable -/* C88514 80242A64 0220202D */ daddu $a0, $s1, $zero -/* C88518 80242A68 AE220098 */ sw $v0, 0x98($s1) -/* C8851C 80242A6C 8E050000 */ lw $a1, ($s0) -/* C88520 80242A70 26100004 */ addiu $s0, $s0, 4 -/* C88524 80242A74 0C0B1EAF */ jal get_variable -/* C88528 80242A78 0220202D */ daddu $a0, $s1, $zero -/* C8852C 80242A7C AE22009C */ sw $v0, 0x9c($s1) -/* C88530 80242A80 8E050000 */ lw $a1, ($s0) -/* C88534 80242A84 26100004 */ addiu $s0, $s0, 4 -/* C88538 80242A88 0C0B1EAF */ jal get_variable -/* C8853C 80242A8C 0220202D */ daddu $a0, $s1, $zero -/* C88540 80242A90 AE2200A0 */ sw $v0, 0xa0($s1) -/* C88544 80242A94 8E050000 */ lw $a1, ($s0) -/* C88548 80242A98 26100004 */ addiu $s0, $s0, 4 -/* C8854C 80242A9C 0C0B1EAF */ jal get_variable -/* C88550 80242AA0 0220202D */ daddu $a0, $s1, $zero -/* C88554 80242AA4 AE2200A4 */ sw $v0, 0xa4($s1) -/* C88558 80242AA8 8E050000 */ lw $a1, ($s0) -/* C8855C 80242AAC 26100004 */ addiu $s0, $s0, 4 -/* C88560 80242AB0 0C0B1EAF */ jal get_variable -/* C88564 80242AB4 0220202D */ daddu $a0, $s1, $zero -/* C88568 80242AB8 AE2200A8 */ sw $v0, 0xa8($s1) -/* C8856C 80242ABC 8E050000 */ lw $a1, ($s0) -/* C88570 80242AC0 26100004 */ addiu $s0, $s0, 4 -/* C88574 80242AC4 0C0B1EAF */ jal get_variable -/* C88578 80242AC8 0220202D */ daddu $a0, $s1, $zero -/* C8857C 80242ACC AE2200AC */ sw $v0, 0xac($s1) -/* C88580 80242AD0 8E050000 */ lw $a1, ($s0) -/* C88584 80242AD4 0C0B1EAF */ jal get_variable -/* C88588 80242AD8 0220202D */ daddu $a0, $s1, $zero -/* C8858C 80242ADC AE2200B0 */ sw $v0, 0xb0($s1) -/* C88590 80242AE0 8FBF0018 */ lw $ra, 0x18($sp) -/* C88594 80242AE4 8FB10014 */ lw $s1, 0x14($sp) -/* C88598 80242AE8 8FB00010 */ lw $s0, 0x10($sp) -/* C8859C 80242AEC 24020002 */ addiu $v0, $zero, 2 -/* C885A0 80242AF0 03E00008 */ jr $ra -/* C885A4 80242AF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802418D4_C8F484.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802418D4_C8F484.s deleted file mode 100644 index d0ad0d1938..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802418D4_C8F484.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418D4_C8F484 -/* C8F484 802418D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C8F488 802418D8 AFB10014 */ sw $s1, 0x14($sp) -/* C8F48C 802418DC 0080882D */ daddu $s1, $a0, $zero -/* C8F490 802418E0 AFBF0018 */ sw $ra, 0x18($sp) -/* C8F494 802418E4 AFB00010 */ sw $s0, 0x10($sp) -/* C8F498 802418E8 8E30000C */ lw $s0, 0xc($s1) -/* C8F49C 802418EC 8E050000 */ lw $a1, ($s0) -/* C8F4A0 802418F0 0C0B1EAF */ jal get_variable -/* C8F4A4 802418F4 26100004 */ addiu $s0, $s0, 4 -/* C8F4A8 802418F8 AE22008C */ sw $v0, 0x8c($s1) -/* C8F4AC 802418FC 8E050000 */ lw $a1, ($s0) -/* C8F4B0 80241900 26100004 */ addiu $s0, $s0, 4 -/* C8F4B4 80241904 0C0B1EAF */ jal get_variable -/* C8F4B8 80241908 0220202D */ daddu $a0, $s1, $zero -/* C8F4BC 8024190C AE220090 */ sw $v0, 0x90($s1) -/* C8F4C0 80241910 8E050000 */ lw $a1, ($s0) -/* C8F4C4 80241914 26100004 */ addiu $s0, $s0, 4 -/* C8F4C8 80241918 0C0B1EAF */ jal get_variable -/* C8F4CC 8024191C 0220202D */ daddu $a0, $s1, $zero -/* C8F4D0 80241920 AE220094 */ sw $v0, 0x94($s1) -/* C8F4D4 80241924 8E050000 */ lw $a1, ($s0) -/* C8F4D8 80241928 26100004 */ addiu $s0, $s0, 4 -/* C8F4DC 8024192C 0C0B1EAF */ jal get_variable -/* C8F4E0 80241930 0220202D */ daddu $a0, $s1, $zero -/* C8F4E4 80241934 AE220098 */ sw $v0, 0x98($s1) -/* C8F4E8 80241938 8E050000 */ lw $a1, ($s0) -/* C8F4EC 8024193C 26100004 */ addiu $s0, $s0, 4 -/* C8F4F0 80241940 0C0B1EAF */ jal get_variable -/* C8F4F4 80241944 0220202D */ daddu $a0, $s1, $zero -/* C8F4F8 80241948 AE22009C */ sw $v0, 0x9c($s1) -/* C8F4FC 8024194C 8E050000 */ lw $a1, ($s0) -/* C8F500 80241950 26100004 */ addiu $s0, $s0, 4 -/* C8F504 80241954 0C0B1EAF */ jal get_variable -/* C8F508 80241958 0220202D */ daddu $a0, $s1, $zero -/* C8F50C 8024195C AE2200A0 */ sw $v0, 0xa0($s1) -/* C8F510 80241960 8E050000 */ lw $a1, ($s0) -/* C8F514 80241964 26100004 */ addiu $s0, $s0, 4 -/* C8F518 80241968 0C0B1EAF */ jal get_variable -/* C8F51C 8024196C 0220202D */ daddu $a0, $s1, $zero -/* C8F520 80241970 AE2200A4 */ sw $v0, 0xa4($s1) -/* C8F524 80241974 8E050000 */ lw $a1, ($s0) -/* C8F528 80241978 26100004 */ addiu $s0, $s0, 4 -/* C8F52C 8024197C 0C0B1EAF */ jal get_variable -/* C8F530 80241980 0220202D */ daddu $a0, $s1, $zero -/* C8F534 80241984 AE2200A8 */ sw $v0, 0xa8($s1) -/* C8F538 80241988 8E050000 */ lw $a1, ($s0) -/* C8F53C 8024198C 26100004 */ addiu $s0, $s0, 4 -/* C8F540 80241990 0C0B1EAF */ jal get_variable -/* C8F544 80241994 0220202D */ daddu $a0, $s1, $zero -/* C8F548 80241998 AE2200AC */ sw $v0, 0xac($s1) -/* C8F54C 8024199C 8E050000 */ lw $a1, ($s0) -/* C8F550 802419A0 0C0B1EAF */ jal get_variable -/* C8F554 802419A4 0220202D */ daddu $a0, $s1, $zero -/* C8F558 802419A8 AE2200B0 */ sw $v0, 0xb0($s1) -/* C8F55C 802419AC 8FBF0018 */ lw $ra, 0x18($sp) -/* C8F560 802419B0 8FB10014 */ lw $s1, 0x14($sp) -/* C8F564 802419B4 8FB00010 */ lw $s0, 0x10($sp) -/* C8F568 802419B8 24020002 */ addiu $v0, $zero, 2 -/* C8F56C 802419BC 03E00008 */ jr $ra -/* C8F570 802419C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_8024077C_C966AC.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_8024077C_C966AC.s deleted file mode 100644 index 84f90ea99a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_8024077C_C966AC.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024077C_C966AC -/* C966AC 8024077C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C966B0 80240780 AFB10014 */ sw $s1, 0x14($sp) -/* C966B4 80240784 0080882D */ daddu $s1, $a0, $zero -/* C966B8 80240788 AFBF0018 */ sw $ra, 0x18($sp) -/* C966BC 8024078C AFB00010 */ sw $s0, 0x10($sp) -/* C966C0 80240790 8E30000C */ lw $s0, 0xc($s1) -/* C966C4 80240794 8E050000 */ lw $a1, ($s0) -/* C966C8 80240798 0C0B1EAF */ jal get_variable -/* C966CC 8024079C 26100004 */ addiu $s0, $s0, 4 -/* C966D0 802407A0 AE22008C */ sw $v0, 0x8c($s1) -/* C966D4 802407A4 8E050000 */ lw $a1, ($s0) -/* C966D8 802407A8 26100004 */ addiu $s0, $s0, 4 -/* C966DC 802407AC 0C0B1EAF */ jal get_variable -/* C966E0 802407B0 0220202D */ daddu $a0, $s1, $zero -/* C966E4 802407B4 AE220090 */ sw $v0, 0x90($s1) -/* C966E8 802407B8 8E050000 */ lw $a1, ($s0) -/* C966EC 802407BC 26100004 */ addiu $s0, $s0, 4 -/* C966F0 802407C0 0C0B1EAF */ jal get_variable -/* C966F4 802407C4 0220202D */ daddu $a0, $s1, $zero -/* C966F8 802407C8 AE220094 */ sw $v0, 0x94($s1) -/* C966FC 802407CC 8E050000 */ lw $a1, ($s0) -/* C96700 802407D0 26100004 */ addiu $s0, $s0, 4 -/* C96704 802407D4 0C0B1EAF */ jal get_variable -/* C96708 802407D8 0220202D */ daddu $a0, $s1, $zero -/* C9670C 802407DC AE220098 */ sw $v0, 0x98($s1) -/* C96710 802407E0 8E050000 */ lw $a1, ($s0) -/* C96714 802407E4 26100004 */ addiu $s0, $s0, 4 -/* C96718 802407E8 0C0B1EAF */ jal get_variable -/* C9671C 802407EC 0220202D */ daddu $a0, $s1, $zero -/* C96720 802407F0 AE22009C */ sw $v0, 0x9c($s1) -/* C96724 802407F4 8E050000 */ lw $a1, ($s0) -/* C96728 802407F8 26100004 */ addiu $s0, $s0, 4 -/* C9672C 802407FC 0C0B1EAF */ jal get_variable -/* C96730 80240800 0220202D */ daddu $a0, $s1, $zero -/* C96734 80240804 AE2200A0 */ sw $v0, 0xa0($s1) -/* C96738 80240808 8E050000 */ lw $a1, ($s0) -/* C9673C 8024080C 26100004 */ addiu $s0, $s0, 4 -/* C96740 80240810 0C0B1EAF */ jal get_variable -/* C96744 80240814 0220202D */ daddu $a0, $s1, $zero -/* C96748 80240818 AE2200A4 */ sw $v0, 0xa4($s1) -/* C9674C 8024081C 8E050000 */ lw $a1, ($s0) -/* C96750 80240820 26100004 */ addiu $s0, $s0, 4 -/* C96754 80240824 0C0B1EAF */ jal get_variable -/* C96758 80240828 0220202D */ daddu $a0, $s1, $zero -/* C9675C 8024082C AE2200A8 */ sw $v0, 0xa8($s1) -/* C96760 80240830 8E050000 */ lw $a1, ($s0) -/* C96764 80240834 26100004 */ addiu $s0, $s0, 4 -/* C96768 80240838 0C0B1EAF */ jal get_variable -/* C9676C 8024083C 0220202D */ daddu $a0, $s1, $zero -/* C96770 80240840 AE2200AC */ sw $v0, 0xac($s1) -/* C96774 80240844 8E050000 */ lw $a1, ($s0) -/* C96778 80240848 0C0B1EAF */ jal get_variable -/* C9677C 8024084C 0220202D */ daddu $a0, $s1, $zero -/* C96780 80240850 AE2200B0 */ sw $v0, 0xb0($s1) -/* C96784 80240854 8FBF0018 */ lw $ra, 0x18($sp) -/* C96788 80240858 8FB10014 */ lw $s1, 0x14($sp) -/* C9678C 8024085C 8FB00010 */ lw $s0, 0x10($sp) -/* C96790 80240860 24020002 */ addiu $v0, $zero, 2 -/* C96794 80240864 03E00008 */ jr $ra -/* C96798 80240868 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241AB4_7EC7C4.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241AB4_7EC7C4.s deleted file mode 100644 index d31d5d8f33..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241AB4_7EC7C4.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AB4_7EC7C4 -/* 7EC7C4 80241AB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EC7C8 80241AB8 AFB10014 */ sw $s1, 0x14($sp) -/* 7EC7CC 80241ABC 0080882D */ daddu $s1, $a0, $zero -/* 7EC7D0 80241AC0 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EC7D4 80241AC4 AFB00010 */ sw $s0, 0x10($sp) -/* 7EC7D8 80241AC8 8E30000C */ lw $s0, 0xc($s1) -/* 7EC7DC 80241ACC 8E050000 */ lw $a1, ($s0) -/* 7EC7E0 80241AD0 0C0B1EAF */ jal get_variable -/* 7EC7E4 80241AD4 26100004 */ addiu $s0, $s0, 4 -/* 7EC7E8 80241AD8 AE22008C */ sw $v0, 0x8c($s1) -/* 7EC7EC 80241ADC 8E050000 */ lw $a1, ($s0) -/* 7EC7F0 80241AE0 26100004 */ addiu $s0, $s0, 4 -/* 7EC7F4 80241AE4 0C0B1EAF */ jal get_variable -/* 7EC7F8 80241AE8 0220202D */ daddu $a0, $s1, $zero -/* 7EC7FC 80241AEC AE220090 */ sw $v0, 0x90($s1) -/* 7EC800 80241AF0 8E050000 */ lw $a1, ($s0) -/* 7EC804 80241AF4 26100004 */ addiu $s0, $s0, 4 -/* 7EC808 80241AF8 0C0B1EAF */ jal get_variable -/* 7EC80C 80241AFC 0220202D */ daddu $a0, $s1, $zero -/* 7EC810 80241B00 AE220094 */ sw $v0, 0x94($s1) -/* 7EC814 80241B04 8E050000 */ lw $a1, ($s0) -/* 7EC818 80241B08 26100004 */ addiu $s0, $s0, 4 -/* 7EC81C 80241B0C 0C0B1EAF */ jal get_variable -/* 7EC820 80241B10 0220202D */ daddu $a0, $s1, $zero -/* 7EC824 80241B14 AE220098 */ sw $v0, 0x98($s1) -/* 7EC828 80241B18 8E050000 */ lw $a1, ($s0) -/* 7EC82C 80241B1C 26100004 */ addiu $s0, $s0, 4 -/* 7EC830 80241B20 0C0B1EAF */ jal get_variable -/* 7EC834 80241B24 0220202D */ daddu $a0, $s1, $zero -/* 7EC838 80241B28 AE22009C */ sw $v0, 0x9c($s1) -/* 7EC83C 80241B2C 8E050000 */ lw $a1, ($s0) -/* 7EC840 80241B30 26100004 */ addiu $s0, $s0, 4 -/* 7EC844 80241B34 0C0B1EAF */ jal get_variable -/* 7EC848 80241B38 0220202D */ daddu $a0, $s1, $zero -/* 7EC84C 80241B3C AE2200A0 */ sw $v0, 0xa0($s1) -/* 7EC850 80241B40 8E050000 */ lw $a1, ($s0) -/* 7EC854 80241B44 26100004 */ addiu $s0, $s0, 4 -/* 7EC858 80241B48 0C0B1EAF */ jal get_variable -/* 7EC85C 80241B4C 0220202D */ daddu $a0, $s1, $zero -/* 7EC860 80241B50 AE2200A4 */ sw $v0, 0xa4($s1) -/* 7EC864 80241B54 8E050000 */ lw $a1, ($s0) -/* 7EC868 80241B58 26100004 */ addiu $s0, $s0, 4 -/* 7EC86C 80241B5C 0C0B1EAF */ jal get_variable -/* 7EC870 80241B60 0220202D */ daddu $a0, $s1, $zero -/* 7EC874 80241B64 AE2200A8 */ sw $v0, 0xa8($s1) -/* 7EC878 80241B68 8E050000 */ lw $a1, ($s0) -/* 7EC87C 80241B6C 26100004 */ addiu $s0, $s0, 4 -/* 7EC880 80241B70 0C0B1EAF */ jal get_variable -/* 7EC884 80241B74 0220202D */ daddu $a0, $s1, $zero -/* 7EC888 80241B78 AE2200AC */ sw $v0, 0xac($s1) -/* 7EC88C 80241B7C 8E050000 */ lw $a1, ($s0) -/* 7EC890 80241B80 0C0B1EAF */ jal get_variable -/* 7EC894 80241B84 0220202D */ daddu $a0, $s1, $zero -/* 7EC898 80241B88 AE2200B0 */ sw $v0, 0xb0($s1) -/* 7EC89C 80241B8C 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EC8A0 80241B90 8FB10014 */ lw $s1, 0x14($sp) -/* 7EC8A4 80241B94 8FB00010 */ lw $s0, 0x10($sp) -/* 7EC8A8 80241B98 24020002 */ addiu $v0, $zero, 2 -/* 7EC8AC 80241B9C 03E00008 */ jr $ra -/* 7EC8B0 80241BA0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024386C_7EE57C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024386C_7EE57C.s deleted file mode 100644 index d98cc678db..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024386C_7EE57C.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024386C_7EE57C -/* 7EE57C 8024386C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EE580 80243870 AFB10014 */ sw $s1, 0x14($sp) -/* 7EE584 80243874 0080882D */ daddu $s1, $a0, $zero -/* 7EE588 80243878 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EE58C 8024387C AFB00010 */ sw $s0, 0x10($sp) -/* 7EE590 80243880 8E30000C */ lw $s0, 0xc($s1) -/* 7EE594 80243884 8E050000 */ lw $a1, ($s0) -/* 7EE598 80243888 0C0B1EAF */ jal get_variable -/* 7EE59C 8024388C 26100004 */ addiu $s0, $s0, 4 -/* 7EE5A0 80243890 AE22008C */ sw $v0, 0x8c($s1) -/* 7EE5A4 80243894 8E050000 */ lw $a1, ($s0) -/* 7EE5A8 80243898 26100004 */ addiu $s0, $s0, 4 -/* 7EE5AC 8024389C 0C0B1EAF */ jal get_variable -/* 7EE5B0 802438A0 0220202D */ daddu $a0, $s1, $zero -/* 7EE5B4 802438A4 AE220090 */ sw $v0, 0x90($s1) -/* 7EE5B8 802438A8 8E050000 */ lw $a1, ($s0) -/* 7EE5BC 802438AC 26100004 */ addiu $s0, $s0, 4 -/* 7EE5C0 802438B0 0C0B1EAF */ jal get_variable -/* 7EE5C4 802438B4 0220202D */ daddu $a0, $s1, $zero -/* 7EE5C8 802438B8 AE220094 */ sw $v0, 0x94($s1) -/* 7EE5CC 802438BC 8E050000 */ lw $a1, ($s0) -/* 7EE5D0 802438C0 26100004 */ addiu $s0, $s0, 4 -/* 7EE5D4 802438C4 0C0B1EAF */ jal get_variable -/* 7EE5D8 802438C8 0220202D */ daddu $a0, $s1, $zero -/* 7EE5DC 802438CC AE220098 */ sw $v0, 0x98($s1) -/* 7EE5E0 802438D0 8E050000 */ lw $a1, ($s0) -/* 7EE5E4 802438D4 26100004 */ addiu $s0, $s0, 4 -/* 7EE5E8 802438D8 0C0B1EAF */ jal get_variable -/* 7EE5EC 802438DC 0220202D */ daddu $a0, $s1, $zero -/* 7EE5F0 802438E0 AE22009C */ sw $v0, 0x9c($s1) -/* 7EE5F4 802438E4 8E050000 */ lw $a1, ($s0) -/* 7EE5F8 802438E8 26100004 */ addiu $s0, $s0, 4 -/* 7EE5FC 802438EC 0C0B1EAF */ jal get_variable -/* 7EE600 802438F0 0220202D */ daddu $a0, $s1, $zero -/* 7EE604 802438F4 AE2200A0 */ sw $v0, 0xa0($s1) -/* 7EE608 802438F8 8E050000 */ lw $a1, ($s0) -/* 7EE60C 802438FC 26100004 */ addiu $s0, $s0, 4 -/* 7EE610 80243900 0C0B1EAF */ jal get_variable -/* 7EE614 80243904 0220202D */ daddu $a0, $s1, $zero -/* 7EE618 80243908 AE2200A4 */ sw $v0, 0xa4($s1) -/* 7EE61C 8024390C 8E050000 */ lw $a1, ($s0) -/* 7EE620 80243910 26100004 */ addiu $s0, $s0, 4 -/* 7EE624 80243914 0C0B1EAF */ jal get_variable -/* 7EE628 80243918 0220202D */ daddu $a0, $s1, $zero -/* 7EE62C 8024391C AE2200A8 */ sw $v0, 0xa8($s1) -/* 7EE630 80243920 8E050000 */ lw $a1, ($s0) -/* 7EE634 80243924 26100004 */ addiu $s0, $s0, 4 -/* 7EE638 80243928 0C0B1EAF */ jal get_variable -/* 7EE63C 8024392C 0220202D */ daddu $a0, $s1, $zero -/* 7EE640 80243930 AE2200AC */ sw $v0, 0xac($s1) -/* 7EE644 80243934 8E050000 */ lw $a1, ($s0) -/* 7EE648 80243938 0C0B1EAF */ jal get_variable -/* 7EE64C 8024393C 0220202D */ daddu $a0, $s1, $zero -/* 7EE650 80243940 AE2200B0 */ sw $v0, 0xb0($s1) -/* 7EE654 80243944 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EE658 80243948 8FB10014 */ lw $s1, 0x14($sp) -/* 7EE65C 8024394C 8FB00010 */ lw $s0, 0x10($sp) -/* 7EE660 80243950 24020002 */ addiu $v0, $zero, 2 -/* 7EE664 80243954 03E00008 */ jr $ra -/* 7EE668 80243958 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243DFC_80467C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243DFC_80467C.s deleted file mode 100644 index 029702e759..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243DFC_80467C.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243DFC_80467C -/* 80467C 80243DFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 804680 80243E00 AFB10014 */ sw $s1, 0x14($sp) -/* 804684 80243E04 0080882D */ daddu $s1, $a0, $zero -/* 804688 80243E08 AFBF0018 */ sw $ra, 0x18($sp) -/* 80468C 80243E0C AFB00010 */ sw $s0, 0x10($sp) -/* 804690 80243E10 8E30000C */ lw $s0, 0xc($s1) -/* 804694 80243E14 8E050000 */ lw $a1, ($s0) -/* 804698 80243E18 0C0B1EAF */ jal get_variable -/* 80469C 80243E1C 26100004 */ addiu $s0, $s0, 4 -/* 8046A0 80243E20 AE22008C */ sw $v0, 0x8c($s1) -/* 8046A4 80243E24 8E050000 */ lw $a1, ($s0) -/* 8046A8 80243E28 26100004 */ addiu $s0, $s0, 4 -/* 8046AC 80243E2C 0C0B1EAF */ jal get_variable -/* 8046B0 80243E30 0220202D */ daddu $a0, $s1, $zero -/* 8046B4 80243E34 AE220090 */ sw $v0, 0x90($s1) -/* 8046B8 80243E38 8E050000 */ lw $a1, ($s0) -/* 8046BC 80243E3C 26100004 */ addiu $s0, $s0, 4 -/* 8046C0 80243E40 0C0B1EAF */ jal get_variable -/* 8046C4 80243E44 0220202D */ daddu $a0, $s1, $zero -/* 8046C8 80243E48 AE220094 */ sw $v0, 0x94($s1) -/* 8046CC 80243E4C 8E050000 */ lw $a1, ($s0) -/* 8046D0 80243E50 26100004 */ addiu $s0, $s0, 4 -/* 8046D4 80243E54 0C0B1EAF */ jal get_variable -/* 8046D8 80243E58 0220202D */ daddu $a0, $s1, $zero -/* 8046DC 80243E5C AE220098 */ sw $v0, 0x98($s1) -/* 8046E0 80243E60 8E050000 */ lw $a1, ($s0) -/* 8046E4 80243E64 26100004 */ addiu $s0, $s0, 4 -/* 8046E8 80243E68 0C0B1EAF */ jal get_variable -/* 8046EC 80243E6C 0220202D */ daddu $a0, $s1, $zero -/* 8046F0 80243E70 AE22009C */ sw $v0, 0x9c($s1) -/* 8046F4 80243E74 8E050000 */ lw $a1, ($s0) -/* 8046F8 80243E78 26100004 */ addiu $s0, $s0, 4 -/* 8046FC 80243E7C 0C0B1EAF */ jal get_variable -/* 804700 80243E80 0220202D */ daddu $a0, $s1, $zero -/* 804704 80243E84 AE2200A0 */ sw $v0, 0xa0($s1) -/* 804708 80243E88 8E050000 */ lw $a1, ($s0) -/* 80470C 80243E8C 26100004 */ addiu $s0, $s0, 4 -/* 804710 80243E90 0C0B1EAF */ jal get_variable -/* 804714 80243E94 0220202D */ daddu $a0, $s1, $zero -/* 804718 80243E98 AE2200A4 */ sw $v0, 0xa4($s1) -/* 80471C 80243E9C 8E050000 */ lw $a1, ($s0) -/* 804720 80243EA0 26100004 */ addiu $s0, $s0, 4 -/* 804724 80243EA4 0C0B1EAF */ jal get_variable -/* 804728 80243EA8 0220202D */ daddu $a0, $s1, $zero -/* 80472C 80243EAC AE2200A8 */ sw $v0, 0xa8($s1) -/* 804730 80243EB0 8E050000 */ lw $a1, ($s0) -/* 804734 80243EB4 26100004 */ addiu $s0, $s0, 4 -/* 804738 80243EB8 0C0B1EAF */ jal get_variable -/* 80473C 80243EBC 0220202D */ daddu $a0, $s1, $zero -/* 804740 80243EC0 AE2200AC */ sw $v0, 0xac($s1) -/* 804744 80243EC4 8E050000 */ lw $a1, ($s0) -/* 804748 80243EC8 0C0B1EAF */ jal get_variable -/* 80474C 80243ECC 0220202D */ daddu $a0, $s1, $zero -/* 804750 80243ED0 AE2200B0 */ sw $v0, 0xb0($s1) -/* 804754 80243ED4 8FBF0018 */ lw $ra, 0x18($sp) -/* 804758 80243ED8 8FB10014 */ lw $s1, 0x14($sp) -/* 80475C 80243EDC 8FB00010 */ lw $s0, 0x10($sp) -/* 804760 80243EE0 24020002 */ addiu $v0, $zero, 2 -/* 804764 80243EE4 03E00008 */ jr $ra -/* 804768 80243EE8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243104_8263C4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243104_8263C4.s deleted file mode 100644 index f35d9a9c0c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243104_8263C4.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243104_8263C4 -/* 8263C4 80243104 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8263C8 80243108 AFB10014 */ sw $s1, 0x14($sp) -/* 8263CC 8024310C 0080882D */ daddu $s1, $a0, $zero -/* 8263D0 80243110 AFBF0018 */ sw $ra, 0x18($sp) -/* 8263D4 80243114 AFB00010 */ sw $s0, 0x10($sp) -/* 8263D8 80243118 8E30000C */ lw $s0, 0xc($s1) -/* 8263DC 8024311C 8E050000 */ lw $a1, ($s0) -/* 8263E0 80243120 0C0B1EAF */ jal get_variable -/* 8263E4 80243124 26100004 */ addiu $s0, $s0, 4 -/* 8263E8 80243128 AE22008C */ sw $v0, 0x8c($s1) -/* 8263EC 8024312C 8E050000 */ lw $a1, ($s0) -/* 8263F0 80243130 26100004 */ addiu $s0, $s0, 4 -/* 8263F4 80243134 0C0B1EAF */ jal get_variable -/* 8263F8 80243138 0220202D */ daddu $a0, $s1, $zero -/* 8263FC 8024313C AE220090 */ sw $v0, 0x90($s1) -/* 826400 80243140 8E050000 */ lw $a1, ($s0) -/* 826404 80243144 26100004 */ addiu $s0, $s0, 4 -/* 826408 80243148 0C0B1EAF */ jal get_variable -/* 82640C 8024314C 0220202D */ daddu $a0, $s1, $zero -/* 826410 80243150 AE220094 */ sw $v0, 0x94($s1) -/* 826414 80243154 8E050000 */ lw $a1, ($s0) -/* 826418 80243158 26100004 */ addiu $s0, $s0, 4 -/* 82641C 8024315C 0C0B1EAF */ jal get_variable -/* 826420 80243160 0220202D */ daddu $a0, $s1, $zero -/* 826424 80243164 AE220098 */ sw $v0, 0x98($s1) -/* 826428 80243168 8E050000 */ lw $a1, ($s0) -/* 82642C 8024316C 26100004 */ addiu $s0, $s0, 4 -/* 826430 80243170 0C0B1EAF */ jal get_variable -/* 826434 80243174 0220202D */ daddu $a0, $s1, $zero -/* 826438 80243178 AE22009C */ sw $v0, 0x9c($s1) -/* 82643C 8024317C 8E050000 */ lw $a1, ($s0) -/* 826440 80243180 26100004 */ addiu $s0, $s0, 4 -/* 826444 80243184 0C0B1EAF */ jal get_variable -/* 826448 80243188 0220202D */ daddu $a0, $s1, $zero -/* 82644C 8024318C AE2200A0 */ sw $v0, 0xa0($s1) -/* 826450 80243190 8E050000 */ lw $a1, ($s0) -/* 826454 80243194 26100004 */ addiu $s0, $s0, 4 -/* 826458 80243198 0C0B1EAF */ jal get_variable -/* 82645C 8024319C 0220202D */ daddu $a0, $s1, $zero -/* 826460 802431A0 AE2200A4 */ sw $v0, 0xa4($s1) -/* 826464 802431A4 8E050000 */ lw $a1, ($s0) -/* 826468 802431A8 26100004 */ addiu $s0, $s0, 4 -/* 82646C 802431AC 0C0B1EAF */ jal get_variable -/* 826470 802431B0 0220202D */ daddu $a0, $s1, $zero -/* 826474 802431B4 AE2200A8 */ sw $v0, 0xa8($s1) -/* 826478 802431B8 8E050000 */ lw $a1, ($s0) -/* 82647C 802431BC 26100004 */ addiu $s0, $s0, 4 -/* 826480 802431C0 0C0B1EAF */ jal get_variable -/* 826484 802431C4 0220202D */ daddu $a0, $s1, $zero -/* 826488 802431C8 AE2200AC */ sw $v0, 0xac($s1) -/* 82648C 802431CC 8E050000 */ lw $a1, ($s0) -/* 826490 802431D0 0C0B1EAF */ jal get_variable -/* 826494 802431D4 0220202D */ daddu $a0, $s1, $zero -/* 826498 802431D8 AE2200B0 */ sw $v0, 0xb0($s1) -/* 82649C 802431DC 8FBF0018 */ lw $ra, 0x18($sp) -/* 8264A0 802431E0 8FB10014 */ lw $s1, 0x14($sp) -/* 8264A4 802431E4 8FB00010 */ lw $s0, 0x10($sp) -/* 8264A8 802431E8 24020002 */ addiu $v0, $zero, 2 -/* 8264AC 802431EC 03E00008 */ jr $ra -/* 8264B0 802431F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241898_833098.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241898_833098.s deleted file mode 100644 index aa4f2d188f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241898_833098.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241898_833098 -/* 833098 80241898 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 83309C 8024189C AFB10014 */ sw $s1, 0x14($sp) -/* 8330A0 802418A0 0080882D */ daddu $s1, $a0, $zero -/* 8330A4 802418A4 AFBF0018 */ sw $ra, 0x18($sp) -/* 8330A8 802418A8 AFB00010 */ sw $s0, 0x10($sp) -/* 8330AC 802418AC 8E30000C */ lw $s0, 0xc($s1) -/* 8330B0 802418B0 8E050000 */ lw $a1, ($s0) -/* 8330B4 802418B4 0C0B1EAF */ jal get_variable -/* 8330B8 802418B8 26100004 */ addiu $s0, $s0, 4 -/* 8330BC 802418BC AE22008C */ sw $v0, 0x8c($s1) -/* 8330C0 802418C0 8E050000 */ lw $a1, ($s0) -/* 8330C4 802418C4 26100004 */ addiu $s0, $s0, 4 -/* 8330C8 802418C8 0C0B1EAF */ jal get_variable -/* 8330CC 802418CC 0220202D */ daddu $a0, $s1, $zero -/* 8330D0 802418D0 AE220090 */ sw $v0, 0x90($s1) -/* 8330D4 802418D4 8E050000 */ lw $a1, ($s0) -/* 8330D8 802418D8 26100004 */ addiu $s0, $s0, 4 -/* 8330DC 802418DC 0C0B1EAF */ jal get_variable -/* 8330E0 802418E0 0220202D */ daddu $a0, $s1, $zero -/* 8330E4 802418E4 AE220094 */ sw $v0, 0x94($s1) -/* 8330E8 802418E8 8E050000 */ lw $a1, ($s0) -/* 8330EC 802418EC 26100004 */ addiu $s0, $s0, 4 -/* 8330F0 802418F0 0C0B1EAF */ jal get_variable -/* 8330F4 802418F4 0220202D */ daddu $a0, $s1, $zero -/* 8330F8 802418F8 AE220098 */ sw $v0, 0x98($s1) -/* 8330FC 802418FC 8E050000 */ lw $a1, ($s0) -/* 833100 80241900 26100004 */ addiu $s0, $s0, 4 -/* 833104 80241904 0C0B1EAF */ jal get_variable -/* 833108 80241908 0220202D */ daddu $a0, $s1, $zero -/* 83310C 8024190C AE22009C */ sw $v0, 0x9c($s1) -/* 833110 80241910 8E050000 */ lw $a1, ($s0) -/* 833114 80241914 26100004 */ addiu $s0, $s0, 4 -/* 833118 80241918 0C0B1EAF */ jal get_variable -/* 83311C 8024191C 0220202D */ daddu $a0, $s1, $zero -/* 833120 80241920 AE2200A0 */ sw $v0, 0xa0($s1) -/* 833124 80241924 8E050000 */ lw $a1, ($s0) -/* 833128 80241928 26100004 */ addiu $s0, $s0, 4 -/* 83312C 8024192C 0C0B1EAF */ jal get_variable -/* 833130 80241930 0220202D */ daddu $a0, $s1, $zero -/* 833134 80241934 AE2200A4 */ sw $v0, 0xa4($s1) -/* 833138 80241938 8E050000 */ lw $a1, ($s0) -/* 83313C 8024193C 26100004 */ addiu $s0, $s0, 4 -/* 833140 80241940 0C0B1EAF */ jal get_variable -/* 833144 80241944 0220202D */ daddu $a0, $s1, $zero -/* 833148 80241948 AE2200A8 */ sw $v0, 0xa8($s1) -/* 83314C 8024194C 8E050000 */ lw $a1, ($s0) -/* 833150 80241950 26100004 */ addiu $s0, $s0, 4 -/* 833154 80241954 0C0B1EAF */ jal get_variable -/* 833158 80241958 0220202D */ daddu $a0, $s1, $zero -/* 83315C 8024195C AE2200AC */ sw $v0, 0xac($s1) -/* 833160 80241960 8E050000 */ lw $a1, ($s0) -/* 833164 80241964 0C0B1EAF */ jal get_variable -/* 833168 80241968 0220202D */ daddu $a0, $s1, $zero -/* 83316C 8024196C AE2200B0 */ sw $v0, 0xb0($s1) -/* 833170 80241970 8FBF0018 */ lw $ra, 0x18($sp) -/* 833174 80241974 8FB10014 */ lw $s1, 0x14($sp) -/* 833178 80241978 8FB00010 */ lw $s0, 0x10($sp) -/* 83317C 8024197C 24020002 */ addiu $v0, $zero, 2 -/* 833180 80241980 03E00008 */ jr $ra -/* 833184 80241984 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802427A4_854914.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802427A4_854914.s deleted file mode 100644 index f3721fcf4d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802427A4_854914.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427A4_854914 -/* 854914 802427A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 854918 802427A8 AFB10014 */ sw $s1, 0x14($sp) -/* 85491C 802427AC 0080882D */ daddu $s1, $a0, $zero -/* 854920 802427B0 AFBF0018 */ sw $ra, 0x18($sp) -/* 854924 802427B4 AFB00010 */ sw $s0, 0x10($sp) -/* 854928 802427B8 8E30000C */ lw $s0, 0xc($s1) -/* 85492C 802427BC 8E050000 */ lw $a1, ($s0) -/* 854930 802427C0 0C0B1EAF */ jal get_variable -/* 854934 802427C4 26100004 */ addiu $s0, $s0, 4 -/* 854938 802427C8 AE22008C */ sw $v0, 0x8c($s1) -/* 85493C 802427CC 8E050000 */ lw $a1, ($s0) -/* 854940 802427D0 26100004 */ addiu $s0, $s0, 4 -/* 854944 802427D4 0C0B1EAF */ jal get_variable -/* 854948 802427D8 0220202D */ daddu $a0, $s1, $zero -/* 85494C 802427DC AE220090 */ sw $v0, 0x90($s1) -/* 854950 802427E0 8E050000 */ lw $a1, ($s0) -/* 854954 802427E4 26100004 */ addiu $s0, $s0, 4 -/* 854958 802427E8 0C0B1EAF */ jal get_variable -/* 85495C 802427EC 0220202D */ daddu $a0, $s1, $zero -/* 854960 802427F0 AE220094 */ sw $v0, 0x94($s1) -/* 854964 802427F4 8E050000 */ lw $a1, ($s0) -/* 854968 802427F8 26100004 */ addiu $s0, $s0, 4 -/* 85496C 802427FC 0C0B1EAF */ jal get_variable -/* 854970 80242800 0220202D */ daddu $a0, $s1, $zero -/* 854974 80242804 AE220098 */ sw $v0, 0x98($s1) -/* 854978 80242808 8E050000 */ lw $a1, ($s0) -/* 85497C 8024280C 26100004 */ addiu $s0, $s0, 4 -/* 854980 80242810 0C0B1EAF */ jal get_variable -/* 854984 80242814 0220202D */ daddu $a0, $s1, $zero -/* 854988 80242818 AE22009C */ sw $v0, 0x9c($s1) -/* 85498C 8024281C 8E050000 */ lw $a1, ($s0) -/* 854990 80242820 26100004 */ addiu $s0, $s0, 4 -/* 854994 80242824 0C0B1EAF */ jal get_variable -/* 854998 80242828 0220202D */ daddu $a0, $s1, $zero -/* 85499C 8024282C AE2200A0 */ sw $v0, 0xa0($s1) -/* 8549A0 80242830 8E050000 */ lw $a1, ($s0) -/* 8549A4 80242834 26100004 */ addiu $s0, $s0, 4 -/* 8549A8 80242838 0C0B1EAF */ jal get_variable -/* 8549AC 8024283C 0220202D */ daddu $a0, $s1, $zero -/* 8549B0 80242840 AE2200A4 */ sw $v0, 0xa4($s1) -/* 8549B4 80242844 8E050000 */ lw $a1, ($s0) -/* 8549B8 80242848 26100004 */ addiu $s0, $s0, 4 -/* 8549BC 8024284C 0C0B1EAF */ jal get_variable -/* 8549C0 80242850 0220202D */ daddu $a0, $s1, $zero -/* 8549C4 80242854 AE2200A8 */ sw $v0, 0xa8($s1) -/* 8549C8 80242858 8E050000 */ lw $a1, ($s0) -/* 8549CC 8024285C 26100004 */ addiu $s0, $s0, 4 -/* 8549D0 80242860 0C0B1EAF */ jal get_variable -/* 8549D4 80242864 0220202D */ daddu $a0, $s1, $zero -/* 8549D8 80242868 AE2200AC */ sw $v0, 0xac($s1) -/* 8549DC 8024286C 8E050000 */ lw $a1, ($s0) -/* 8549E0 80242870 0C0B1EAF */ jal get_variable -/* 8549E4 80242874 0220202D */ daddu $a0, $s1, $zero -/* 8549E8 80242878 AE2200B0 */ sw $v0, 0xb0($s1) -/* 8549EC 8024287C 8FBF0018 */ lw $ra, 0x18($sp) -/* 8549F0 80242880 8FB10014 */ lw $s1, 0x14($sp) -/* 8549F4 80242884 8FB00010 */ lw $s0, 0x10($sp) -/* 8549F8 80242888 24020002 */ addiu $v0, $zero, 2 -/* 8549FC 8024288C 03E00008 */ jr $ra -/* 854A00 80242890 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242150_9C7530.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242150_9C7530.s deleted file mode 100644 index f07f774a3a..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242150_9C7530.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242150_9C7530 -/* 9C7530 80242150 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C7534 80242154 AFB10014 */ sw $s1, 0x14($sp) -/* 9C7538 80242158 0080882D */ daddu $s1, $a0, $zero -/* 9C753C 8024215C AFBF0018 */ sw $ra, 0x18($sp) -/* 9C7540 80242160 AFB00010 */ sw $s0, 0x10($sp) -/* 9C7544 80242164 8E30000C */ lw $s0, 0xc($s1) -/* 9C7548 80242168 8E050000 */ lw $a1, ($s0) -/* 9C754C 8024216C 0C0B1EAF */ jal get_variable -/* 9C7550 80242170 26100004 */ addiu $s0, $s0, 4 -/* 9C7554 80242174 AE22008C */ sw $v0, 0x8c($s1) -/* 9C7558 80242178 8E050000 */ lw $a1, ($s0) -/* 9C755C 8024217C 26100004 */ addiu $s0, $s0, 4 -/* 9C7560 80242180 0C0B1EAF */ jal get_variable -/* 9C7564 80242184 0220202D */ daddu $a0, $s1, $zero -/* 9C7568 80242188 AE220090 */ sw $v0, 0x90($s1) -/* 9C756C 8024218C 8E050000 */ lw $a1, ($s0) -/* 9C7570 80242190 26100004 */ addiu $s0, $s0, 4 -/* 9C7574 80242194 0C0B1EAF */ jal get_variable -/* 9C7578 80242198 0220202D */ daddu $a0, $s1, $zero -/* 9C757C 8024219C AE220094 */ sw $v0, 0x94($s1) -/* 9C7580 802421A0 8E050000 */ lw $a1, ($s0) -/* 9C7584 802421A4 26100004 */ addiu $s0, $s0, 4 -/* 9C7588 802421A8 0C0B1EAF */ jal get_variable -/* 9C758C 802421AC 0220202D */ daddu $a0, $s1, $zero -/* 9C7590 802421B0 AE220098 */ sw $v0, 0x98($s1) -/* 9C7594 802421B4 8E050000 */ lw $a1, ($s0) -/* 9C7598 802421B8 26100004 */ addiu $s0, $s0, 4 -/* 9C759C 802421BC 0C0B1EAF */ jal get_variable -/* 9C75A0 802421C0 0220202D */ daddu $a0, $s1, $zero -/* 9C75A4 802421C4 AE22009C */ sw $v0, 0x9c($s1) -/* 9C75A8 802421C8 8E050000 */ lw $a1, ($s0) -/* 9C75AC 802421CC 26100004 */ addiu $s0, $s0, 4 -/* 9C75B0 802421D0 0C0B1EAF */ jal get_variable -/* 9C75B4 802421D4 0220202D */ daddu $a0, $s1, $zero -/* 9C75B8 802421D8 AE2200A0 */ sw $v0, 0xa0($s1) -/* 9C75BC 802421DC 8E050000 */ lw $a1, ($s0) -/* 9C75C0 802421E0 26100004 */ addiu $s0, $s0, 4 -/* 9C75C4 802421E4 0C0B1EAF */ jal get_variable -/* 9C75C8 802421E8 0220202D */ daddu $a0, $s1, $zero -/* 9C75CC 802421EC AE2200A4 */ sw $v0, 0xa4($s1) -/* 9C75D0 802421F0 8E050000 */ lw $a1, ($s0) -/* 9C75D4 802421F4 26100004 */ addiu $s0, $s0, 4 -/* 9C75D8 802421F8 0C0B1EAF */ jal get_variable -/* 9C75DC 802421FC 0220202D */ daddu $a0, $s1, $zero -/* 9C75E0 80242200 AE2200A8 */ sw $v0, 0xa8($s1) -/* 9C75E4 80242204 8E050000 */ lw $a1, ($s0) -/* 9C75E8 80242208 26100004 */ addiu $s0, $s0, 4 -/* 9C75EC 8024220C 0C0B1EAF */ jal get_variable -/* 9C75F0 80242210 0220202D */ daddu $a0, $s1, $zero -/* 9C75F4 80242214 AE2200AC */ sw $v0, 0xac($s1) -/* 9C75F8 80242218 8E050000 */ lw $a1, ($s0) -/* 9C75FC 8024221C 0C0B1EAF */ jal get_variable -/* 9C7600 80242220 0220202D */ daddu $a0, $s1, $zero -/* 9C7604 80242224 AE2200B0 */ sw $v0, 0xb0($s1) -/* 9C7608 80242228 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C760C 8024222C 8FB10014 */ lw $s1, 0x14($sp) -/* 9C7610 80242230 8FB00010 */ lw $s0, 0x10($sp) -/* 9C7614 80242234 24020002 */ addiu $v0, $zero, 2 -/* 9C7618 80242238 03E00008 */ jr $ra -/* 9C761C 8024223C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242CF8_9D9D18.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242CF8_9D9D18.s deleted file mode 100644 index 1202ac03f7..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242CF8_9D9D18.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CF8_9D9D18 -/* 9D9D18 80242CF8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D9D1C 80242CFC AFB10014 */ sw $s1, 0x14($sp) -/* 9D9D20 80242D00 0080882D */ daddu $s1, $a0, $zero -/* 9D9D24 80242D04 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D9D28 80242D08 AFB00010 */ sw $s0, 0x10($sp) -/* 9D9D2C 80242D0C 8E30000C */ lw $s0, 0xc($s1) -/* 9D9D30 80242D10 8E050000 */ lw $a1, ($s0) -/* 9D9D34 80242D14 0C0B1EAF */ jal get_variable -/* 9D9D38 80242D18 26100004 */ addiu $s0, $s0, 4 -/* 9D9D3C 80242D1C AE22008C */ sw $v0, 0x8c($s1) -/* 9D9D40 80242D20 8E050000 */ lw $a1, ($s0) -/* 9D9D44 80242D24 26100004 */ addiu $s0, $s0, 4 -/* 9D9D48 80242D28 0C0B1EAF */ jal get_variable -/* 9D9D4C 80242D2C 0220202D */ daddu $a0, $s1, $zero -/* 9D9D50 80242D30 AE220090 */ sw $v0, 0x90($s1) -/* 9D9D54 80242D34 8E050000 */ lw $a1, ($s0) -/* 9D9D58 80242D38 26100004 */ addiu $s0, $s0, 4 -/* 9D9D5C 80242D3C 0C0B1EAF */ jal get_variable -/* 9D9D60 80242D40 0220202D */ daddu $a0, $s1, $zero -/* 9D9D64 80242D44 AE220094 */ sw $v0, 0x94($s1) -/* 9D9D68 80242D48 8E050000 */ lw $a1, ($s0) -/* 9D9D6C 80242D4C 26100004 */ addiu $s0, $s0, 4 -/* 9D9D70 80242D50 0C0B1EAF */ jal get_variable -/* 9D9D74 80242D54 0220202D */ daddu $a0, $s1, $zero -/* 9D9D78 80242D58 AE220098 */ sw $v0, 0x98($s1) -/* 9D9D7C 80242D5C 8E050000 */ lw $a1, ($s0) -/* 9D9D80 80242D60 26100004 */ addiu $s0, $s0, 4 -/* 9D9D84 80242D64 0C0B1EAF */ jal get_variable -/* 9D9D88 80242D68 0220202D */ daddu $a0, $s1, $zero -/* 9D9D8C 80242D6C AE22009C */ sw $v0, 0x9c($s1) -/* 9D9D90 80242D70 8E050000 */ lw $a1, ($s0) -/* 9D9D94 80242D74 26100004 */ addiu $s0, $s0, 4 -/* 9D9D98 80242D78 0C0B1EAF */ jal get_variable -/* 9D9D9C 80242D7C 0220202D */ daddu $a0, $s1, $zero -/* 9D9DA0 80242D80 AE2200A0 */ sw $v0, 0xa0($s1) -/* 9D9DA4 80242D84 8E050000 */ lw $a1, ($s0) -/* 9D9DA8 80242D88 26100004 */ addiu $s0, $s0, 4 -/* 9D9DAC 80242D8C 0C0B1EAF */ jal get_variable -/* 9D9DB0 80242D90 0220202D */ daddu $a0, $s1, $zero -/* 9D9DB4 80242D94 AE2200A4 */ sw $v0, 0xa4($s1) -/* 9D9DB8 80242D98 8E050000 */ lw $a1, ($s0) -/* 9D9DBC 80242D9C 26100004 */ addiu $s0, $s0, 4 -/* 9D9DC0 80242DA0 0C0B1EAF */ jal get_variable -/* 9D9DC4 80242DA4 0220202D */ daddu $a0, $s1, $zero -/* 9D9DC8 80242DA8 AE2200A8 */ sw $v0, 0xa8($s1) -/* 9D9DCC 80242DAC 8E050000 */ lw $a1, ($s0) -/* 9D9DD0 80242DB0 26100004 */ addiu $s0, $s0, 4 -/* 9D9DD4 80242DB4 0C0B1EAF */ jal get_variable -/* 9D9DD8 80242DB8 0220202D */ daddu $a0, $s1, $zero -/* 9D9DDC 80242DBC AE2200AC */ sw $v0, 0xac($s1) -/* 9D9DE0 80242DC0 8E050000 */ lw $a1, ($s0) -/* 9D9DE4 80242DC4 0C0B1EAF */ jal get_variable -/* 9D9DE8 80242DC8 0220202D */ daddu $a0, $s1, $zero -/* 9D9DEC 80242DCC AE2200B0 */ sw $v0, 0xb0($s1) -/* 9D9DF0 80242DD0 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D9DF4 80242DD4 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9DF8 80242DD8 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9DFC 80242DDC 24020002 */ addiu $v0, $zero, 2 -/* 9D9E00 80242DE0 03E00008 */ jr $ra -/* 9D9E04 80242DE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240C4C_BBDDEC.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240C4C_BBDDEC.s deleted file mode 100644 index 92ce7605a0..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240C4C_BBDDEC.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_BBDDEC -/* BBDDEC 80240C4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBDDF0 80240C50 AFB10014 */ sw $s1, 0x14($sp) -/* BBDDF4 80240C54 0080882D */ daddu $s1, $a0, $zero -/* BBDDF8 80240C58 AFBF0018 */ sw $ra, 0x18($sp) -/* BBDDFC 80240C5C AFB00010 */ sw $s0, 0x10($sp) -/* BBDE00 80240C60 8E30000C */ lw $s0, 0xc($s1) -/* BBDE04 80240C64 8E050000 */ lw $a1, ($s0) -/* BBDE08 80240C68 0C0B1EAF */ jal get_variable -/* BBDE0C 80240C6C 26100004 */ addiu $s0, $s0, 4 -/* BBDE10 80240C70 AE22008C */ sw $v0, 0x8c($s1) -/* BBDE14 80240C74 8E050000 */ lw $a1, ($s0) -/* BBDE18 80240C78 26100004 */ addiu $s0, $s0, 4 -/* BBDE1C 80240C7C 0C0B1EAF */ jal get_variable -/* BBDE20 80240C80 0220202D */ daddu $a0, $s1, $zero -/* BBDE24 80240C84 AE220090 */ sw $v0, 0x90($s1) -/* BBDE28 80240C88 8E050000 */ lw $a1, ($s0) -/* BBDE2C 80240C8C 26100004 */ addiu $s0, $s0, 4 -/* BBDE30 80240C90 0C0B1EAF */ jal get_variable -/* BBDE34 80240C94 0220202D */ daddu $a0, $s1, $zero -/* BBDE38 80240C98 AE220094 */ sw $v0, 0x94($s1) -/* BBDE3C 80240C9C 8E050000 */ lw $a1, ($s0) -/* BBDE40 80240CA0 26100004 */ addiu $s0, $s0, 4 -/* BBDE44 80240CA4 0C0B1EAF */ jal get_variable -/* BBDE48 80240CA8 0220202D */ daddu $a0, $s1, $zero -/* BBDE4C 80240CAC AE220098 */ sw $v0, 0x98($s1) -/* BBDE50 80240CB0 8E050000 */ lw $a1, ($s0) -/* BBDE54 80240CB4 26100004 */ addiu $s0, $s0, 4 -/* BBDE58 80240CB8 0C0B1EAF */ jal get_variable -/* BBDE5C 80240CBC 0220202D */ daddu $a0, $s1, $zero -/* BBDE60 80240CC0 AE22009C */ sw $v0, 0x9c($s1) -/* BBDE64 80240CC4 8E050000 */ lw $a1, ($s0) -/* BBDE68 80240CC8 26100004 */ addiu $s0, $s0, 4 -/* BBDE6C 80240CCC 0C0B1EAF */ jal get_variable -/* BBDE70 80240CD0 0220202D */ daddu $a0, $s1, $zero -/* BBDE74 80240CD4 AE2200A0 */ sw $v0, 0xa0($s1) -/* BBDE78 80240CD8 8E050000 */ lw $a1, ($s0) -/* BBDE7C 80240CDC 26100004 */ addiu $s0, $s0, 4 -/* BBDE80 80240CE0 0C0B1EAF */ jal get_variable -/* BBDE84 80240CE4 0220202D */ daddu $a0, $s1, $zero -/* BBDE88 80240CE8 AE2200A4 */ sw $v0, 0xa4($s1) -/* BBDE8C 80240CEC 8E050000 */ lw $a1, ($s0) -/* BBDE90 80240CF0 26100004 */ addiu $s0, $s0, 4 -/* BBDE94 80240CF4 0C0B1EAF */ jal get_variable -/* BBDE98 80240CF8 0220202D */ daddu $a0, $s1, $zero -/* BBDE9C 80240CFC AE2200A8 */ sw $v0, 0xa8($s1) -/* BBDEA0 80240D00 8E050000 */ lw $a1, ($s0) -/* BBDEA4 80240D04 26100004 */ addiu $s0, $s0, 4 -/* BBDEA8 80240D08 0C0B1EAF */ jal get_variable -/* BBDEAC 80240D0C 0220202D */ daddu $a0, $s1, $zero -/* BBDEB0 80240D10 AE2200AC */ sw $v0, 0xac($s1) -/* BBDEB4 80240D14 8E050000 */ lw $a1, ($s0) -/* BBDEB8 80240D18 0C0B1EAF */ jal get_variable -/* BBDEBC 80240D1C 0220202D */ daddu $a0, $s1, $zero -/* BBDEC0 80240D20 AE2200B0 */ sw $v0, 0xb0($s1) -/* BBDEC4 80240D24 8FBF0018 */ lw $ra, 0x18($sp) -/* BBDEC8 80240D28 8FB10014 */ lw $s1, 0x14($sp) -/* BBDECC 80240D2C 8FB00010 */ lw $s0, 0x10($sp) -/* BBDED0 80240D30 24020002 */ addiu $v0, $zero, 2 -/* BBDED4 80240D34 03E00008 */ jr $ra -/* BBDED8 80240D38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802405DC_BC485C.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802405DC_BC485C.s deleted file mode 100644 index 73df842251..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802405DC_BC485C.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405DC_BC485C -/* BC485C 802405DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC4860 802405E0 AFB10014 */ sw $s1, 0x14($sp) -/* BC4864 802405E4 0080882D */ daddu $s1, $a0, $zero -/* BC4868 802405E8 AFBF0018 */ sw $ra, 0x18($sp) -/* BC486C 802405EC AFB00010 */ sw $s0, 0x10($sp) -/* BC4870 802405F0 8E30000C */ lw $s0, 0xc($s1) -/* BC4874 802405F4 8E050000 */ lw $a1, ($s0) -/* BC4878 802405F8 0C0B1EAF */ jal get_variable -/* BC487C 802405FC 26100004 */ addiu $s0, $s0, 4 -/* BC4880 80240600 AE22008C */ sw $v0, 0x8c($s1) -/* BC4884 80240604 8E050000 */ lw $a1, ($s0) -/* BC4888 80240608 26100004 */ addiu $s0, $s0, 4 -/* BC488C 8024060C 0C0B1EAF */ jal get_variable -/* BC4890 80240610 0220202D */ daddu $a0, $s1, $zero -/* BC4894 80240614 AE220090 */ sw $v0, 0x90($s1) -/* BC4898 80240618 8E050000 */ lw $a1, ($s0) -/* BC489C 8024061C 26100004 */ addiu $s0, $s0, 4 -/* BC48A0 80240620 0C0B1EAF */ jal get_variable -/* BC48A4 80240624 0220202D */ daddu $a0, $s1, $zero -/* BC48A8 80240628 AE220094 */ sw $v0, 0x94($s1) -/* BC48AC 8024062C 8E050000 */ lw $a1, ($s0) -/* BC48B0 80240630 26100004 */ addiu $s0, $s0, 4 -/* BC48B4 80240634 0C0B1EAF */ jal get_variable -/* BC48B8 80240638 0220202D */ daddu $a0, $s1, $zero -/* BC48BC 8024063C AE220098 */ sw $v0, 0x98($s1) -/* BC48C0 80240640 8E050000 */ lw $a1, ($s0) -/* BC48C4 80240644 26100004 */ addiu $s0, $s0, 4 -/* BC48C8 80240648 0C0B1EAF */ jal get_variable -/* BC48CC 8024064C 0220202D */ daddu $a0, $s1, $zero -/* BC48D0 80240650 AE22009C */ sw $v0, 0x9c($s1) -/* BC48D4 80240654 8E050000 */ lw $a1, ($s0) -/* BC48D8 80240658 26100004 */ addiu $s0, $s0, 4 -/* BC48DC 8024065C 0C0B1EAF */ jal get_variable -/* BC48E0 80240660 0220202D */ daddu $a0, $s1, $zero -/* BC48E4 80240664 AE2200A0 */ sw $v0, 0xa0($s1) -/* BC48E8 80240668 8E050000 */ lw $a1, ($s0) -/* BC48EC 8024066C 26100004 */ addiu $s0, $s0, 4 -/* BC48F0 80240670 0C0B1EAF */ jal get_variable -/* BC48F4 80240674 0220202D */ daddu $a0, $s1, $zero -/* BC48F8 80240678 AE2200A4 */ sw $v0, 0xa4($s1) -/* BC48FC 8024067C 8E050000 */ lw $a1, ($s0) -/* BC4900 80240680 26100004 */ addiu $s0, $s0, 4 -/* BC4904 80240684 0C0B1EAF */ jal get_variable -/* BC4908 80240688 0220202D */ daddu $a0, $s1, $zero -/* BC490C 8024068C AE2200A8 */ sw $v0, 0xa8($s1) -/* BC4910 80240690 8E050000 */ lw $a1, ($s0) -/* BC4914 80240694 26100004 */ addiu $s0, $s0, 4 -/* BC4918 80240698 0C0B1EAF */ jal get_variable -/* BC491C 8024069C 0220202D */ daddu $a0, $s1, $zero -/* BC4920 802406A0 AE2200AC */ sw $v0, 0xac($s1) -/* BC4924 802406A4 8E050000 */ lw $a1, ($s0) -/* BC4928 802406A8 0C0B1EAF */ jal get_variable -/* BC492C 802406AC 0220202D */ daddu $a0, $s1, $zero -/* BC4930 802406B0 AE2200B0 */ sw $v0, 0xb0($s1) -/* BC4934 802406B4 8FBF0018 */ lw $ra, 0x18($sp) -/* BC4938 802406B8 8FB10014 */ lw $s1, 0x14($sp) -/* BC493C 802406BC 8FB00010 */ lw $s0, 0x10($sp) -/* BC4940 802406C0 24020002 */ addiu $v0, $zero, 2 -/* BC4944 802406C4 03E00008 */ jr $ra -/* BC4948 802406C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802407CC_AB07BC.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802407CC_AB07BC.s deleted file mode 100644 index 23a7a36d5d..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802407CC_AB07BC.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_AB07BC -/* AB07BC 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB07C0 802407D0 AFB10014 */ sw $s1, 0x14($sp) -/* AB07C4 802407D4 0080882D */ daddu $s1, $a0, $zero -/* AB07C8 802407D8 AFBF0018 */ sw $ra, 0x18($sp) -/* AB07CC 802407DC AFB00010 */ sw $s0, 0x10($sp) -/* AB07D0 802407E0 8E30000C */ lw $s0, 0xc($s1) -/* AB07D4 802407E4 8E050000 */ lw $a1, ($s0) -/* AB07D8 802407E8 0C0B1EAF */ jal get_variable -/* AB07DC 802407EC 26100004 */ addiu $s0, $s0, 4 -/* AB07E0 802407F0 AE22008C */ sw $v0, 0x8c($s1) -/* AB07E4 802407F4 8E050000 */ lw $a1, ($s0) -/* AB07E8 802407F8 26100004 */ addiu $s0, $s0, 4 -/* AB07EC 802407FC 0C0B1EAF */ jal get_variable -/* AB07F0 80240800 0220202D */ daddu $a0, $s1, $zero -/* AB07F4 80240804 AE220090 */ sw $v0, 0x90($s1) -/* AB07F8 80240808 8E050000 */ lw $a1, ($s0) -/* AB07FC 8024080C 26100004 */ addiu $s0, $s0, 4 -/* AB0800 80240810 0C0B1EAF */ jal get_variable -/* AB0804 80240814 0220202D */ daddu $a0, $s1, $zero -/* AB0808 80240818 AE220094 */ sw $v0, 0x94($s1) -/* AB080C 8024081C 8E050000 */ lw $a1, ($s0) -/* AB0810 80240820 26100004 */ addiu $s0, $s0, 4 -/* AB0814 80240824 0C0B1EAF */ jal get_variable -/* AB0818 80240828 0220202D */ daddu $a0, $s1, $zero -/* AB081C 8024082C AE220098 */ sw $v0, 0x98($s1) -/* AB0820 80240830 8E050000 */ lw $a1, ($s0) -/* AB0824 80240834 26100004 */ addiu $s0, $s0, 4 -/* AB0828 80240838 0C0B1EAF */ jal get_variable -/* AB082C 8024083C 0220202D */ daddu $a0, $s1, $zero -/* AB0830 80240840 AE22009C */ sw $v0, 0x9c($s1) -/* AB0834 80240844 8E050000 */ lw $a1, ($s0) -/* AB0838 80240848 26100004 */ addiu $s0, $s0, 4 -/* AB083C 8024084C 0C0B1EAF */ jal get_variable -/* AB0840 80240850 0220202D */ daddu $a0, $s1, $zero -/* AB0844 80240854 AE2200A0 */ sw $v0, 0xa0($s1) -/* AB0848 80240858 8E050000 */ lw $a1, ($s0) -/* AB084C 8024085C 26100004 */ addiu $s0, $s0, 4 -/* AB0850 80240860 0C0B1EAF */ jal get_variable -/* AB0854 80240864 0220202D */ daddu $a0, $s1, $zero -/* AB0858 80240868 AE2200A4 */ sw $v0, 0xa4($s1) -/* AB085C 8024086C 8E050000 */ lw $a1, ($s0) -/* AB0860 80240870 26100004 */ addiu $s0, $s0, 4 -/* AB0864 80240874 0C0B1EAF */ jal get_variable -/* AB0868 80240878 0220202D */ daddu $a0, $s1, $zero -/* AB086C 8024087C AE2200A8 */ sw $v0, 0xa8($s1) -/* AB0870 80240880 8E050000 */ lw $a1, ($s0) -/* AB0874 80240884 26100004 */ addiu $s0, $s0, 4 -/* AB0878 80240888 0C0B1EAF */ jal get_variable -/* AB087C 8024088C 0220202D */ daddu $a0, $s1, $zero -/* AB0880 80240890 AE2200AC */ sw $v0, 0xac($s1) -/* AB0884 80240894 8E050000 */ lw $a1, ($s0) -/* AB0888 80240898 0C0B1EAF */ jal get_variable -/* AB088C 8024089C 0220202D */ daddu $a0, $s1, $zero -/* AB0890 802408A0 AE2200B0 */ sw $v0, 0xb0($s1) -/* AB0894 802408A4 8FBF0018 */ lw $ra, 0x18($sp) -/* AB0898 802408A8 8FB10014 */ lw $s1, 0x14($sp) -/* AB089C 802408AC 8FB00010 */ lw $s0, 0x10($sp) -/* AB08A0 802408B0 24020002 */ addiu $v0, $zero, 2 -/* AB08A4 802408B4 03E00008 */ jr $ra -/* AB08A8 802408B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241794_CF9304.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241794_CF9304.s deleted file mode 100644 index 5b45117350..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241794_CF9304.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241794_CF9304 -/* CF9304 80241794 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF9308 80241798 AFB10014 */ sw $s1, 0x14($sp) -/* CF930C 8024179C 0080882D */ daddu $s1, $a0, $zero -/* CF9310 802417A0 AFBF0018 */ sw $ra, 0x18($sp) -/* CF9314 802417A4 AFB00010 */ sw $s0, 0x10($sp) -/* CF9318 802417A8 8E30000C */ lw $s0, 0xc($s1) -/* CF931C 802417AC 8E050000 */ lw $a1, ($s0) -/* CF9320 802417B0 0C0B1EAF */ jal get_variable -/* CF9324 802417B4 26100004 */ addiu $s0, $s0, 4 -/* CF9328 802417B8 AE22008C */ sw $v0, 0x8c($s1) -/* CF932C 802417BC 8E050000 */ lw $a1, ($s0) -/* CF9330 802417C0 26100004 */ addiu $s0, $s0, 4 -/* CF9334 802417C4 0C0B1EAF */ jal get_variable -/* CF9338 802417C8 0220202D */ daddu $a0, $s1, $zero -/* CF933C 802417CC AE220090 */ sw $v0, 0x90($s1) -/* CF9340 802417D0 8E050000 */ lw $a1, ($s0) -/* CF9344 802417D4 26100004 */ addiu $s0, $s0, 4 -/* CF9348 802417D8 0C0B1EAF */ jal get_variable -/* CF934C 802417DC 0220202D */ daddu $a0, $s1, $zero -/* CF9350 802417E0 AE220094 */ sw $v0, 0x94($s1) -/* CF9354 802417E4 8E050000 */ lw $a1, ($s0) -/* CF9358 802417E8 26100004 */ addiu $s0, $s0, 4 -/* CF935C 802417EC 0C0B1EAF */ jal get_variable -/* CF9360 802417F0 0220202D */ daddu $a0, $s1, $zero -/* CF9364 802417F4 AE220098 */ sw $v0, 0x98($s1) -/* CF9368 802417F8 8E050000 */ lw $a1, ($s0) -/* CF936C 802417FC 26100004 */ addiu $s0, $s0, 4 -/* CF9370 80241800 0C0B1EAF */ jal get_variable -/* CF9374 80241804 0220202D */ daddu $a0, $s1, $zero -/* CF9378 80241808 AE22009C */ sw $v0, 0x9c($s1) -/* CF937C 8024180C 8E050000 */ lw $a1, ($s0) -/* CF9380 80241810 26100004 */ addiu $s0, $s0, 4 -/* CF9384 80241814 0C0B1EAF */ jal get_variable -/* CF9388 80241818 0220202D */ daddu $a0, $s1, $zero -/* CF938C 8024181C AE2200A0 */ sw $v0, 0xa0($s1) -/* CF9390 80241820 8E050000 */ lw $a1, ($s0) -/* CF9394 80241824 26100004 */ addiu $s0, $s0, 4 -/* CF9398 80241828 0C0B1EAF */ jal get_variable -/* CF939C 8024182C 0220202D */ daddu $a0, $s1, $zero -/* CF93A0 80241830 AE2200A4 */ sw $v0, 0xa4($s1) -/* CF93A4 80241834 8E050000 */ lw $a1, ($s0) -/* CF93A8 80241838 26100004 */ addiu $s0, $s0, 4 -/* CF93AC 8024183C 0C0B1EAF */ jal get_variable -/* CF93B0 80241840 0220202D */ daddu $a0, $s1, $zero -/* CF93B4 80241844 AE2200A8 */ sw $v0, 0xa8($s1) -/* CF93B8 80241848 8E050000 */ lw $a1, ($s0) -/* CF93BC 8024184C 26100004 */ addiu $s0, $s0, 4 -/* CF93C0 80241850 0C0B1EAF */ jal get_variable -/* CF93C4 80241854 0220202D */ daddu $a0, $s1, $zero -/* CF93C8 80241858 AE2200AC */ sw $v0, 0xac($s1) -/* CF93CC 8024185C 8E050000 */ lw $a1, ($s0) -/* CF93D0 80241860 0C0B1EAF */ jal get_variable -/* CF93D4 80241864 0220202D */ daddu $a0, $s1, $zero -/* CF93D8 80241868 AE2200B0 */ sw $v0, 0xb0($s1) -/* CF93DC 8024186C 8FBF0018 */ lw $ra, 0x18($sp) -/* CF93E0 80241870 8FB10014 */ lw $s1, 0x14($sp) -/* CF93E4 80241874 8FB00010 */ lw $s0, 0x10($sp) -/* CF93E8 80241878 24020002 */ addiu $v0, $zero, 2 -/* CF93EC 8024187C 03E00008 */ jr $ra -/* CF93F0 80241880 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024224C_D220DC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024224C_D220DC.s deleted file mode 100644 index 75f273998e..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024224C_D220DC.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024224C_D220DC -/* D220DC 8024224C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D220E0 80242250 AFB10014 */ sw $s1, 0x14($sp) -/* D220E4 80242254 0080882D */ daddu $s1, $a0, $zero -/* D220E8 80242258 AFBF0018 */ sw $ra, 0x18($sp) -/* D220EC 8024225C AFB00010 */ sw $s0, 0x10($sp) -/* D220F0 80242260 8E30000C */ lw $s0, 0xc($s1) -/* D220F4 80242264 8E050000 */ lw $a1, ($s0) -/* D220F8 80242268 0C0B1EAF */ jal get_variable -/* D220FC 8024226C 26100004 */ addiu $s0, $s0, 4 -/* D22100 80242270 AE22008C */ sw $v0, 0x8c($s1) -/* D22104 80242274 8E050000 */ lw $a1, ($s0) -/* D22108 80242278 26100004 */ addiu $s0, $s0, 4 -/* D2210C 8024227C 0C0B1EAF */ jal get_variable -/* D22110 80242280 0220202D */ daddu $a0, $s1, $zero -/* D22114 80242284 AE220090 */ sw $v0, 0x90($s1) -/* D22118 80242288 8E050000 */ lw $a1, ($s0) -/* D2211C 8024228C 26100004 */ addiu $s0, $s0, 4 -/* D22120 80242290 0C0B1EAF */ jal get_variable -/* D22124 80242294 0220202D */ daddu $a0, $s1, $zero -/* D22128 80242298 AE220094 */ sw $v0, 0x94($s1) -/* D2212C 8024229C 8E050000 */ lw $a1, ($s0) -/* D22130 802422A0 26100004 */ addiu $s0, $s0, 4 -/* D22134 802422A4 0C0B1EAF */ jal get_variable -/* D22138 802422A8 0220202D */ daddu $a0, $s1, $zero -/* D2213C 802422AC AE220098 */ sw $v0, 0x98($s1) -/* D22140 802422B0 8E050000 */ lw $a1, ($s0) -/* D22144 802422B4 26100004 */ addiu $s0, $s0, 4 -/* D22148 802422B8 0C0B1EAF */ jal get_variable -/* D2214C 802422BC 0220202D */ daddu $a0, $s1, $zero -/* D22150 802422C0 AE22009C */ sw $v0, 0x9c($s1) -/* D22154 802422C4 8E050000 */ lw $a1, ($s0) -/* D22158 802422C8 26100004 */ addiu $s0, $s0, 4 -/* D2215C 802422CC 0C0B1EAF */ jal get_variable -/* D22160 802422D0 0220202D */ daddu $a0, $s1, $zero -/* D22164 802422D4 AE2200A0 */ sw $v0, 0xa0($s1) -/* D22168 802422D8 8E050000 */ lw $a1, ($s0) -/* D2216C 802422DC 26100004 */ addiu $s0, $s0, 4 -/* D22170 802422E0 0C0B1EAF */ jal get_variable -/* D22174 802422E4 0220202D */ daddu $a0, $s1, $zero -/* D22178 802422E8 AE2200A4 */ sw $v0, 0xa4($s1) -/* D2217C 802422EC 8E050000 */ lw $a1, ($s0) -/* D22180 802422F0 26100004 */ addiu $s0, $s0, 4 -/* D22184 802422F4 0C0B1EAF */ jal get_variable -/* D22188 802422F8 0220202D */ daddu $a0, $s1, $zero -/* D2218C 802422FC AE2200A8 */ sw $v0, 0xa8($s1) -/* D22190 80242300 8E050000 */ lw $a1, ($s0) -/* D22194 80242304 26100004 */ addiu $s0, $s0, 4 -/* D22198 80242308 0C0B1EAF */ jal get_variable -/* D2219C 8024230C 0220202D */ daddu $a0, $s1, $zero -/* D221A0 80242310 AE2200AC */ sw $v0, 0xac($s1) -/* D221A4 80242314 8E050000 */ lw $a1, ($s0) -/* D221A8 80242318 0C0B1EAF */ jal get_variable -/* D221AC 8024231C 0220202D */ daddu $a0, $s1, $zero -/* D221B0 80242320 AE2200B0 */ sw $v0, 0xb0($s1) -/* D221B4 80242324 8FBF0018 */ lw $ra, 0x18($sp) -/* D221B8 80242328 8FB10014 */ lw $s1, 0x14($sp) -/* D221BC 8024232C 8FB00010 */ lw $s0, 0x10($sp) -/* D221C0 80242330 24020002 */ addiu $v0, $zero, 2 -/* D221C4 80242334 03E00008 */ jr $ra -/* D221C8 80242338 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802412E4_940894.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802412E4_940894.s deleted file mode 100644 index f6e2ece714..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802412E4_940894.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E4_940894 -/* 940894 802412E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 940898 802412E8 AFB10014 */ sw $s1, 0x14($sp) -/* 94089C 802412EC 0080882D */ daddu $s1, $a0, $zero -/* 9408A0 802412F0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9408A4 802412F4 AFB00010 */ sw $s0, 0x10($sp) -/* 9408A8 802412F8 8E30000C */ lw $s0, 0xc($s1) -/* 9408AC 802412FC 8E050000 */ lw $a1, ($s0) -/* 9408B0 80241300 0C0B1EAF */ jal get_variable -/* 9408B4 80241304 26100004 */ addiu $s0, $s0, 4 -/* 9408B8 80241308 AE22008C */ sw $v0, 0x8c($s1) -/* 9408BC 8024130C 8E050000 */ lw $a1, ($s0) -/* 9408C0 80241310 26100004 */ addiu $s0, $s0, 4 -/* 9408C4 80241314 0C0B1EAF */ jal get_variable -/* 9408C8 80241318 0220202D */ daddu $a0, $s1, $zero -/* 9408CC 8024131C AE220090 */ sw $v0, 0x90($s1) -/* 9408D0 80241320 8E050000 */ lw $a1, ($s0) -/* 9408D4 80241324 26100004 */ addiu $s0, $s0, 4 -/* 9408D8 80241328 0C0B1EAF */ jal get_variable -/* 9408DC 8024132C 0220202D */ daddu $a0, $s1, $zero -/* 9408E0 80241330 AE220094 */ sw $v0, 0x94($s1) -/* 9408E4 80241334 8E050000 */ lw $a1, ($s0) -/* 9408E8 80241338 26100004 */ addiu $s0, $s0, 4 -/* 9408EC 8024133C 0C0B1EAF */ jal get_variable -/* 9408F0 80241340 0220202D */ daddu $a0, $s1, $zero -/* 9408F4 80241344 AE220098 */ sw $v0, 0x98($s1) -/* 9408F8 80241348 8E050000 */ lw $a1, ($s0) -/* 9408FC 8024134C 26100004 */ addiu $s0, $s0, 4 -/* 940900 80241350 0C0B1EAF */ jal get_variable -/* 940904 80241354 0220202D */ daddu $a0, $s1, $zero -/* 940908 80241358 AE22009C */ sw $v0, 0x9c($s1) -/* 94090C 8024135C 8E050000 */ lw $a1, ($s0) -/* 940910 80241360 26100004 */ addiu $s0, $s0, 4 -/* 940914 80241364 0C0B1EAF */ jal get_variable -/* 940918 80241368 0220202D */ daddu $a0, $s1, $zero -/* 94091C 8024136C AE2200A0 */ sw $v0, 0xa0($s1) -/* 940920 80241370 8E050000 */ lw $a1, ($s0) -/* 940924 80241374 26100004 */ addiu $s0, $s0, 4 -/* 940928 80241378 0C0B1EAF */ jal get_variable -/* 94092C 8024137C 0220202D */ daddu $a0, $s1, $zero -/* 940930 80241380 AE2200A4 */ sw $v0, 0xa4($s1) -/* 940934 80241384 8E050000 */ lw $a1, ($s0) -/* 940938 80241388 26100004 */ addiu $s0, $s0, 4 -/* 94093C 8024138C 0C0B1EAF */ jal get_variable -/* 940940 80241390 0220202D */ daddu $a0, $s1, $zero -/* 940944 80241394 AE2200A8 */ sw $v0, 0xa8($s1) -/* 940948 80241398 8E050000 */ lw $a1, ($s0) -/* 94094C 8024139C 26100004 */ addiu $s0, $s0, 4 -/* 940950 802413A0 0C0B1EAF */ jal get_variable -/* 940954 802413A4 0220202D */ daddu $a0, $s1, $zero -/* 940958 802413A8 AE2200AC */ sw $v0, 0xac($s1) -/* 94095C 802413AC 8E050000 */ lw $a1, ($s0) -/* 940960 802413B0 0C0B1EAF */ jal get_variable -/* 940964 802413B4 0220202D */ daddu $a0, $s1, $zero -/* 940968 802413B8 AE2200B0 */ sw $v0, 0xb0($s1) -/* 94096C 802413BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 940970 802413C0 8FB10014 */ lw $s1, 0x14($sp) -/* 940974 802413C4 8FB00010 */ lw $s0, 0x10($sp) -/* 940978 802413C8 24020002 */ addiu $v0, $zero, 2 -/* 94097C 802413CC 03E00008 */ jr $ra -/* 940980 802413D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802404AC_94637C.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802404AC_94637C.s deleted file mode 100644 index 34f681f9c3..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802404AC_94637C.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404AC_94637C -/* 94637C 802404AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 946380 802404B0 AFB10014 */ sw $s1, 0x14($sp) -/* 946384 802404B4 0080882D */ daddu $s1, $a0, $zero -/* 946388 802404B8 AFBF0018 */ sw $ra, 0x18($sp) -/* 94638C 802404BC AFB00010 */ sw $s0, 0x10($sp) -/* 946390 802404C0 8E30000C */ lw $s0, 0xc($s1) -/* 946394 802404C4 8E050000 */ lw $a1, ($s0) -/* 946398 802404C8 0C0B1EAF */ jal get_variable -/* 94639C 802404CC 26100004 */ addiu $s0, $s0, 4 -/* 9463A0 802404D0 AE22008C */ sw $v0, 0x8c($s1) -/* 9463A4 802404D4 8E050000 */ lw $a1, ($s0) -/* 9463A8 802404D8 26100004 */ addiu $s0, $s0, 4 -/* 9463AC 802404DC 0C0B1EAF */ jal get_variable -/* 9463B0 802404E0 0220202D */ daddu $a0, $s1, $zero -/* 9463B4 802404E4 AE220090 */ sw $v0, 0x90($s1) -/* 9463B8 802404E8 8E050000 */ lw $a1, ($s0) -/* 9463BC 802404EC 26100004 */ addiu $s0, $s0, 4 -/* 9463C0 802404F0 0C0B1EAF */ jal get_variable -/* 9463C4 802404F4 0220202D */ daddu $a0, $s1, $zero -/* 9463C8 802404F8 AE220094 */ sw $v0, 0x94($s1) -/* 9463CC 802404FC 8E050000 */ lw $a1, ($s0) -/* 9463D0 80240500 26100004 */ addiu $s0, $s0, 4 -/* 9463D4 80240504 0C0B1EAF */ jal get_variable -/* 9463D8 80240508 0220202D */ daddu $a0, $s1, $zero -/* 9463DC 8024050C AE220098 */ sw $v0, 0x98($s1) -/* 9463E0 80240510 8E050000 */ lw $a1, ($s0) -/* 9463E4 80240514 26100004 */ addiu $s0, $s0, 4 -/* 9463E8 80240518 0C0B1EAF */ jal get_variable -/* 9463EC 8024051C 0220202D */ daddu $a0, $s1, $zero -/* 9463F0 80240520 AE22009C */ sw $v0, 0x9c($s1) -/* 9463F4 80240524 8E050000 */ lw $a1, ($s0) -/* 9463F8 80240528 26100004 */ addiu $s0, $s0, 4 -/* 9463FC 8024052C 0C0B1EAF */ jal get_variable -/* 946400 80240530 0220202D */ daddu $a0, $s1, $zero -/* 946404 80240534 AE2200A0 */ sw $v0, 0xa0($s1) -/* 946408 80240538 8E050000 */ lw $a1, ($s0) -/* 94640C 8024053C 26100004 */ addiu $s0, $s0, 4 -/* 946410 80240540 0C0B1EAF */ jal get_variable -/* 946414 80240544 0220202D */ daddu $a0, $s1, $zero -/* 946418 80240548 AE2200A4 */ sw $v0, 0xa4($s1) -/* 94641C 8024054C 8E050000 */ lw $a1, ($s0) -/* 946420 80240550 26100004 */ addiu $s0, $s0, 4 -/* 946424 80240554 0C0B1EAF */ jal get_variable -/* 946428 80240558 0220202D */ daddu $a0, $s1, $zero -/* 94642C 8024055C AE2200A8 */ sw $v0, 0xa8($s1) -/* 946430 80240560 8E050000 */ lw $a1, ($s0) -/* 946434 80240564 26100004 */ addiu $s0, $s0, 4 -/* 946438 80240568 0C0B1EAF */ jal get_variable -/* 94643C 8024056C 0220202D */ daddu $a0, $s1, $zero -/* 946440 80240570 AE2200AC */ sw $v0, 0xac($s1) -/* 946444 80240574 8E050000 */ lw $a1, ($s0) -/* 946448 80240578 0C0B1EAF */ jal get_variable -/* 94644C 8024057C 0220202D */ daddu $a0, $s1, $zero -/* 946450 80240580 AE2200B0 */ sw $v0, 0xb0($s1) -/* 946454 80240584 8FBF0018 */ lw $ra, 0x18($sp) -/* 946458 80240588 8FB10014 */ lw $s1, 0x14($sp) -/* 94645C 8024058C 8FB00010 */ lw $s0, 0x10($sp) -/* 946460 80240590 24020002 */ addiu $v0, $zero, 2 -/* 946464 80240594 03E00008 */ jr $ra -/* 946468 80240598 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index f16416dea8..208d76cad7 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -90,7 +90,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802427BC_95D9BC); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242858_95DA58); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242D98_95DF98); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242E88_95E088); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index f9d3a03e1d..251302454b 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -112,7 +112,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243748_96C908); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243778_96C938); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243780_96C940); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243870_96CA30); diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index 1c44cb553d..fafb354ba1 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406A8_A39B88); INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406E0_A39BC0); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_8024077C_A39C5C); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_8024086C_A39D4C); diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index 4334edd8f0..2f679fbd64 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024078C_B20CCC); INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802407C4_B20D04); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240860_B20DA0); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240950_B20E90); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 52ee00e0bb..11e6cf8579 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -132,7 +132,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242B94_B37764); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242C00_B377D0); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242C30_B37800); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242D20_B378F0); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index abf92b1234..6d1fa11b6f 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -106,7 +106,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422F8_8B2368); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242424_8B2494); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242514_8B2584); diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index ea458dfeec..d00f405fc3 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242364_C5CAA4); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_8024239C_C5CADC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242438_C5CB78); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242528_C5CC68); diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 3e5439754b..68010c0c99 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242934_C63644); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024296C_C6367C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242A08_C63718); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242AF8_C63808); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index c2c10da1f1..04d5ab7ac6 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243644_C7A324); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024367C_C7A35C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243718_C7A3F8); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243808_C7A4E8); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index a6defb4b83..9fde24f7b6 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242934_C883E4); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024296C_C8841C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242A08_C884B8); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242AF8_C885A8); diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index 7b3921127f..be23948c10 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241800_C8F3B0); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241838_C8F3E8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802418D4_C8F484); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802419C4_C8F574); diff --git a/src/world/area_kzn/kzn_20/C96240.c b/src/world/area_kzn/kzn_20/C96240.c index 98974d85ea..0e8eca006f 100644 --- a/src/world/area_kzn/kzn_20/C96240.c +++ b/src/world/area_kzn/kzn_20/C96240.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802406A8_C965D8); INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802406E0_C96610); -INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_8024077C_C966AC); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_8024086C_C9679C); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 6e7e17daef..dc0aee8862 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024197C_7EC68C); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18_7EC728); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241AB4_7EC7C4); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241BA4_7EC8B4); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 4d70a12c6b..24a4fc796b 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243798_7EE4A8); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802437D0_7EE4E0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_8024386C_7EE57C); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_8024395C_7EE66C); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index beee517673..211df11243 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -128,7 +128,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D28_8045A8); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D60_8045E0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243DFC_80467C); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243EEC_80476C); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 6f1b87f44f..9aa784db8e 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -102,7 +102,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243088_826348); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802430D0_826390); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243104_8263C4); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802431F4_8264B4); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index 9803d69af2..eea95acf15 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417C4_832FC4); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417FC_832FFC); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241898_833098); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241988_833188); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 33f7c4c269..cfc94e963f 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -98,7 +98,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024266C_8547DC); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242708_854878); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802427A4_854914); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242894_854A04); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index a39efb44a0..eed594b41d 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -108,7 +108,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C_9C745C); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802420B4_9C7494); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242150_9C7530); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242240_9C7620); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 6170cb4e2a..0c23bf22ed 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C24_9D9C44); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C5C_9D9C7C); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242CF8_9D9D18); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242DE8_9D9E08); diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c index 4d52a8675b..bfe7e6c613 100644 --- a/src/world/area_obk/obk_01/BBD980.c +++ b/src/world/area_obk/obk_01/BBD980.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B78_BBDD18); INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240BB0_BBDD50); -INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240C4C_BBDDEC); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240D3C_BBDEDC); diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c index 981d70babf..7c2aff0cb2 100644 --- a/src/world/area_obk/obk_03/BC43F0.c +++ b/src/world/area_obk/obk_03/BC43F0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240508_BC4788); INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240540_BC47C0); -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802405DC_BC485C); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802406CC_BC494C); diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index e4fde737d3..934894db3e 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406F8_AB06E8); INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240730_AB0720); -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802407CC_AB07BC); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802408BC_AB08AC); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index a9fa715189..daf62f5f23 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802416F8_CF9268); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241764_CF92D4); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241794_CF9304); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241884_CF93F4); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 27870c4d3e..a68c9a33cd 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -62,7 +62,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242214_D220A4); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242244_D220D4); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024224C_D220DC); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024233C_D221CC); diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 5a9c0cc701..119b3811c8 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802411AC_94075C); INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241248_9407F8); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802412E4_940894); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802413D4_940984); diff --git a/src/world/area_sbk/sbk_34/945F10.c b/src/world/area_sbk/sbk_34/945F10.c index 8422aa5dc1..67f9208fd7 100644 --- a/src/world/area_sbk/sbk_34/945F10.c +++ b/src/world/area_sbk/sbk_34/945F10.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_802403D8_9462A8); INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240410_9462E0); -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_802404AC_94637C); +#include "world/common/SetManyVars.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_8024059C_94646C); diff --git a/src/world/common/SetManyVars.inc.c b/src/world/common/SetManyVars.inc.c new file mode 100644 index 0000000000..275b18ed8a --- /dev/null +++ b/src/world/common/SetManyVars.inc.c @@ -0,0 +1,17 @@ +#include "common.h" + +static ApiStatus SetManyVars(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + script->varTable[2] = get_variable(script, *args++); + script->varTable[3] = get_variable(script, *args++); + script->varTable[4] = get_variable(script, *args++); + script->varTable[5] = get_variable(script, *args++); + script->varTable[6] = get_variable(script, *args++); + script->varTable[7] = get_variable(script, *args++); + script->varTable[8] = get_variable(script, *args++); + script->varTable[9] = get_variable(script, *args++); + script->varTable[10] = get_variable(script, *args++); + script->varTable[11] = get_variable(script, *args++); + return ApiStatus_DONE2; +}