diff --git a/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s b/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s index 0d594eb640..67e7671126 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s +++ b/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s @@ -14,17 +14,17 @@ glabel func_80035EEC /* 11310 80035F10 50400005 */ beql $v0, $zero, .L80035F28 /* 11314 80035F14 24020002 */ addiu $v0, $zero, 2 /* 11318 80035F18 10600007 */ beqz $v1, .L80035F38 -/* 1131C 80035F1C 00000000 */ nop +/* 1131C 80035F1C 00000000 */ nop /* 11320 80035F20 0800D83B */ j .L800360EC -/* 11324 80035F24 00000000 */ nop +/* 11324 80035F24 00000000 */ nop .L80035F28: /* 11328 80035F28 10620055 */ beq $v1, $v0, .L80036080 -/* 1132C 80035F2C 00000000 */ nop +/* 1132C 80035F2C 00000000 */ nop /* 11330 80035F30 0800D83B */ j .L800360EC -/* 11334 80035F34 00000000 */ nop +/* 11334 80035F34 00000000 */ nop .L80035F38: -/* 11338 80035F38 3C04800A */ lui $a0, 0x800a -/* 1133C 80035F3C 24840946 */ addiu $a0, $a0, 0x946 +/* 11338 80035F38 3C04800A */ lui $a0, %hi(D_800A0946) +/* 1133C 80035F3C 24840946 */ addiu $a0, $a0, %lo(D_800A0946) /* 11340 80035F40 84820000 */ lh $v0, ($a0) /* 11344 80035F44 94830000 */ lhu $v1, ($a0) /* 11348 80035F48 1440003B */ bnez $v0, .L80036038 @@ -35,8 +35,8 @@ glabel func_80035EEC /* 1135C 80035F5C A0400070 */ sb $zero, 0x70($v0) /* 11360 80035F60 8C620000 */ lw $v0, ($v1) /* 11364 80035F64 A0400078 */ sb $zero, 0x78($v0) -/* 11368 80035F68 3C02800A */ lui $v0, 0x800a -/* 1136C 80035F6C 84420948 */ lh $v0, 0x948($v0) +/* 11368 80035F68 3C02800A */ lui $v0, %hi(D_800A0948) +/* 1136C 80035F6C 84420948 */ lh $v0, %lo(D_800A0948)($v0) /* 11370 80035F70 14400006 */ bnez $v0, .L80035F8C /* 11374 80035F74 24060001 */ addiu $a2, $zero, 1 /* 11378 80035F78 8C620000 */ lw $v0, ($v1) @@ -50,7 +50,7 @@ glabel func_80035EEC /* 11394 80035F94 8445008C */ lh $a1, 0x8c($v0) .L80035F98: /* 11398 80035F98 0C0169BD */ jal load_map_by_IDs -/* 1139C 80035F9C 00000000 */ nop +/* 1139C 80035F9C 00000000 */ nop /* 113A0 80035FA0 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 113A4 80035FA4 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 113A8 80035FA8 8E020000 */ lw $v0, ($s0) @@ -61,32 +61,32 @@ glabel func_80035EEC /* 113BC 80035FBC 8E020000 */ lw $v0, ($s0) /* 113C0 80035FC0 80420071 */ lb $v0, 0x71($v0) /* 113C4 80035FC4 14400003 */ bnez $v0, .L80035FD4 -/* 113C8 80035FC8 00000000 */ nop +/* 113C8 80035FC8 00000000 */ nop /* 113CC 80035FCC 0C03805E */ jal disable_player_input -/* 113D0 80035FD0 00000000 */ nop +/* 113D0 80035FD0 00000000 */ nop .L80035FD4: /* 113D4 80035FD4 0C00B500 */ jal update_cameras -/* 113D8 80035FD8 00000000 */ nop +/* 113D8 80035FD8 00000000 */ nop /* 113DC 80035FDC 3C02800A */ lui $v0, %hi(D_800A0944) /* 113E0 80035FE0 24420944 */ addiu $v0, $v0, %lo(D_800A0944) /* 113E4 80035FE4 94430000 */ lhu $v1, ($v0) /* 113E8 80035FE8 24040002 */ addiu $a0, $zero, 2 -/* 113EC 80035FEC 3C01800A */ lui $at, 0x800a -/* 113F0 80035FF0 A4240946 */ sh $a0, 0x946($at) +/* 113EC 80035FEC 3C01800A */ lui $at, %hi(D_800A0946) +/* 113F0 80035FF0 A4240946 */ sh $a0, %lo(D_800A0946)($at) /* 113F4 80035FF4 24630001 */ addiu $v1, $v1, 1 /* 113F8 80035FF8 0800D83B */ j .L800360EC /* 113FC 80035FFC A4430000 */ sh $v1, ($v0) .L80036000: /* 11400 80036000 0C00F949 */ jal func_8003E524 -/* 11404 80036004 00000000 */ nop +/* 11404 80036004 00000000 */ nop /* 11408 80036008 0C00E64C */ jal update_npcs -/* 1140C 8003600C 00000000 */ nop +/* 1140C 8003600C 00000000 */ nop /* 11410 80036010 0C037DD0 */ jal update_player -/* 11414 80036014 00000000 */ nop +/* 11414 80036014 00000000 */ nop /* 11418 80036018 0C00B500 */ jal update_cameras -/* 1141C 8003601C 00000000 */ nop -/* 11420 80036020 3C04800A */ lui $a0, 0x800a -/* 11424 80036024 24840946 */ addiu $a0, $a0, 0x946 +/* 1141C 8003601C 00000000 */ nop +/* 11420 80036020 3C04800A */ lui $a0, %hi(D_800A0946) +/* 11424 80036024 24840946 */ addiu $a0, $a0, %lo(D_800A0946) /* 11428 80036028 84820000 */ lh $v0, ($a0) /* 1142C 8003602C 94830000 */ lhu $v1, ($a0) /* 11430 80036030 10400003 */ beqz $v0, .L80036040 @@ -100,7 +100,7 @@ glabel func_80035EEC /* 11448 80036048 0C0B1059 */ jal does_script_exist /* 1144C 8003604C 8C44006C */ lw $a0, 0x6c($v0) /* 11450 80036050 14400026 */ bnez $v0, .L800360EC -/* 11454 80036054 00000000 */ nop +/* 11454 80036054 00000000 */ nop /* 11458 80036058 3C05800A */ lui $a1, %hi(D_8009A650) /* 1145C 8003605C 24A5A650 */ addiu $a1, $a1, %lo(D_8009A650) /* 11460 80036060 2404FFF7 */ addiu $a0, $zero, -9 @@ -113,27 +113,27 @@ glabel func_80035EEC /* 1147C 8003607C A6030000 */ sh $v1, ($s0) .L80036080: /* 11480 80036080 0C00E64C */ jal update_npcs -/* 11484 80036084 00000000 */ nop +/* 11484 80036084 00000000 */ nop /* 11488 80036088 0C037DD0 */ jal update_player -/* 1148C 8003608C 00000000 */ nop +/* 1148C 8003608C 00000000 */ nop /* 11490 80036090 0C016754 */ jal func_80059D50 -/* 11494 80036094 00000000 */ nop +/* 11494 80036094 00000000 */ nop /* 11498 80036098 0C00B500 */ jal update_cameras -/* 1149C 8003609C 00000000 */ nop +/* 1149C 8003609C 00000000 */ nop /* 114A0 800360A0 3C04800A */ lui $a0, %hi(gMapTransitionAlpha) /* 114A4 800360A4 24840940 */ addiu $a0, $a0, %lo(gMapTransitionAlpha) /* 114A8 800360A8 0C04E175 */ jal func_801385D4 -/* 114AC 800360AC 00000000 */ nop +/* 114AC 800360AC 00000000 */ nop /* 114B0 800360B0 00021400 */ sll $v0, $v0, 0x10 /* 114B4 800360B4 1040000D */ beqz $v0, .L800360EC -/* 114B8 800360B8 00000000 */ nop +/* 114B8 800360B8 00000000 */ nop /* 114BC 800360BC 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 114C0 800360C0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 114C4 800360C4 80420071 */ lb $v0, 0x71($v0) /* 114C8 800360C8 14400003 */ bnez $v0, .L800360D8 -/* 114CC 800360CC 00000000 */ nop +/* 114CC 800360CC 00000000 */ nop /* 114D0 800360D0 0C038069 */ jal enable_player_input -/* 114D4 800360D4 00000000 */ nop +/* 114D4 800360D4 00000000 */ nop .L800360D8: /* 114D8 800360D8 3C05BF80 */ lui $a1, 0xbf80 /* 114DC 800360DC 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/code_111f0_len_860/func_8003617C.s b/asm/nonmatchings/code_111f0_len_860/func_8003617C.s index 196c5bdf03..0df6804b46 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_8003617C.s +++ b/asm/nonmatchings/code_111f0_len_860/func_8003617C.s @@ -15,22 +15,22 @@ glabel func_8003617C /* 115A4 800361A4 00220821 */ addu $at, $at, $v0 /* 115A8 800361A8 8C228320 */ lw $v0, -0x7ce0($at) /* 115AC 800361AC 00400008 */ jr $v0 -/* 115B0 800361B0 00000000 */ nop +/* 115B0 800361B0 00000000 */ nop /* 115B4 800361B4 0C00E64C */ jal update_npcs -/* 115B8 800361B8 00000000 */ nop +/* 115B8 800361B8 00000000 */ nop /* 115BC 800361BC 0C037DD0 */ jal update_player -/* 115C0 800361C0 00000000 */ nop +/* 115C0 800361C0 00000000 */ nop /* 115C4 800361C4 0C016754 */ jal func_80059D50 -/* 115C8 800361C8 00000000 */ nop +/* 115C8 800361C8 00000000 */ nop /* 115CC 800361CC 0C00B500 */ jal update_cameras -/* 115D0 800361D0 00000000 */ nop +/* 115D0 800361D0 00000000 */ nop /* 115D4 800361D4 3C04800A */ lui $a0, %hi(gMapTransitionAlpha) /* 115D8 800361D8 24840940 */ addiu $a0, $a0, %lo(gMapTransitionAlpha) /* 115DC 800361DC 0C04E0AB */ jal func_801382AC -/* 115E0 800361E0 00000000 */ nop +/* 115E0 800361E0 00000000 */ nop /* 115E4 800361E4 00021400 */ sll $v0, $v0, 0x10 /* 115E8 800361E8 1040007F */ beqz $v0, .L800363E8 -/* 115EC 800361EC 00000000 */ nop +/* 115EC 800361EC 00000000 */ nop /* 115F0 800361F0 3C03800A */ lui $v1, %hi(D_800A0944) /* 115F4 800361F4 24630944 */ addiu $v1, $v1, %lo(D_800A0944) /* 115F8 800361F8 94620000 */ lhu $v0, ($v1) @@ -47,8 +47,8 @@ glabel func_8003617C /* 11624 80036224 24840944 */ addiu $a0, $a0, %lo(D_800A0944) /* 11628 80036228 94820000 */ lhu $v0, ($a0) /* 1162C 8003622C 24030004 */ addiu $v1, $zero, 4 -/* 11630 80036230 3C01800A */ lui $at, 0x800a -/* 11634 80036234 A4230946 */ sh $v1, 0x946($at) +/* 11630 80036230 3C01800A */ lui $at, %hi(D_800A0946) +/* 11634 80036234 A4230946 */ sh $v1, %lo(D_800A0946)($at) /* 11638 80036238 24420001 */ addiu $v0, $v0, 1 /* 1163C 8003623C 0800D8FA */ j .L800363E8 /* 11640 80036240 A4820000 */ sh $v0, ($a0) @@ -57,12 +57,12 @@ glabel func_8003617C /* 1164C 8003624C 8E020000 */ lw $v0, ($s0) /* 11650 80036250 80420071 */ lb $v0, 0x71($v0) /* 11654 80036254 10400003 */ beqz $v0, .L80036264 -/* 11658 80036258 00000000 */ nop +/* 11658 80036258 00000000 */ nop /* 1165C 8003625C 0C00CD3C */ jal set_game_mode /* 11660 80036260 24040011 */ addiu $a0, $zero, 0x11 .L80036264: -/* 11664 80036264 3C11800A */ lui $s1, 0x800a -/* 11668 80036268 26310946 */ addiu $s1, $s1, 0x946 +/* 11664 80036264 3C11800A */ lui $s1, %hi(D_800A0946) +/* 11668 80036268 26310946 */ addiu $s1, $s1, %lo(D_800A0946) /* 1166C 8003626C 86220000 */ lh $v0, ($s1) /* 11670 80036270 96230000 */ lhu $v1, ($s1) /* 11674 80036274 10400003 */ beqz $v0, .L80036284 @@ -82,16 +82,16 @@ glabel func_8003617C /* 116A8 800362A8 0C009C22 */ jal func_80027088 /* 116AC 800362AC 0000202D */ daddu $a0, $zero, $zero /* 116B0 800362B0 0C018030 */ jal nuContRmbForceStopEnd -/* 116B4 800362B4 00000000 */ nop +/* 116B4 800362B4 00000000 */ nop /* 116B8 800362B8 8E020000 */ lw $v0, ($s0) /* 116BC 800362BC 80420071 */ lb $v0, 0x71($v0) /* 116C0 800362C0 14400003 */ bnez $v0, .L800362D0 -/* 116C4 800362C4 00000000 */ nop +/* 116C4 800362C4 00000000 */ nop /* 116C8 800362C8 0C03805E */ jal disable_player_input -/* 116CC 800362CC 00000000 */ nop +/* 116CC 800362CC 00000000 */ nop .L800362D0: /* 116D0 800362D0 0C00B500 */ jal update_cameras -/* 116D4 800362D4 00000000 */ nop +/* 116D4 800362D4 00000000 */ nop /* 116D8 800362D8 3C02800A */ lui $v0, %hi(D_800A0944) /* 116DC 800362DC 24420944 */ addiu $v0, $v0, %lo(D_800A0944) /* 116E0 800362E0 94430000 */ lhu $v1, ($v0) @@ -101,15 +101,15 @@ glabel func_8003617C /* 116F0 800362F0 0800D8FA */ j .L800363E8 /* 116F4 800362F4 A4430000 */ sh $v1, ($v0) /* 116F8 800362F8 0C00F949 */ jal func_8003E524 -/* 116FC 800362FC 00000000 */ nop +/* 116FC 800362FC 00000000 */ nop /* 11700 80036300 0C00E64C */ jal update_npcs -/* 11704 80036304 00000000 */ nop +/* 11704 80036304 00000000 */ nop /* 11708 80036308 0C037DD0 */ jal update_player -/* 1170C 8003630C 00000000 */ nop +/* 1170C 8003630C 00000000 */ nop /* 11710 80036310 0C00B500 */ jal update_cameras -/* 11714 80036314 00000000 */ nop -/* 11718 80036318 3C04800A */ lui $a0, 0x800a -/* 1171C 8003631C 24840946 */ addiu $a0, $a0, 0x946 +/* 11714 80036314 00000000 */ nop +/* 11718 80036318 3C04800A */ lui $a0, %hi(D_800A0946) +/* 1171C 8003631C 24840946 */ addiu $a0, $a0, %lo(D_800A0946) /* 11720 80036320 84820000 */ lh $v0, ($a0) /* 11724 80036324 94830000 */ lhu $v1, ($a0) /* 11728 80036328 10400003 */ beqz $v0, .L80036338 @@ -135,27 +135,27 @@ glabel func_8003617C /* 11774 80036374 0800D8FA */ j .L800363E8 /* 11778 80036378 A4C30000 */ sh $v1, ($a2) /* 1177C 8003637C 0C00E64C */ jal update_npcs -/* 11780 80036380 00000000 */ nop +/* 11780 80036380 00000000 */ nop /* 11784 80036384 0C037DD0 */ jal update_player -/* 11788 80036388 00000000 */ nop +/* 11788 80036388 00000000 */ nop /* 1178C 8003638C 0C016754 */ jal func_80059D50 -/* 11790 80036390 00000000 */ nop +/* 11790 80036390 00000000 */ nop /* 11794 80036394 0C00B500 */ jal update_cameras -/* 11798 80036398 00000000 */ nop +/* 11798 80036398 00000000 */ nop /* 1179C 8003639C 3C04800A */ lui $a0, %hi(gMapTransitionAlpha) /* 117A0 800363A0 24840940 */ addiu $a0, $a0, %lo(gMapTransitionAlpha) /* 117A4 800363A4 0C04E175 */ jal func_801385D4 -/* 117A8 800363A8 00000000 */ nop +/* 117A8 800363A8 00000000 */ nop /* 117AC 800363AC 00021400 */ sll $v0, $v0, 0x10 /* 117B0 800363B0 1040000D */ beqz $v0, .L800363E8 -/* 117B4 800363B4 00000000 */ nop +/* 117B4 800363B4 00000000 */ nop /* 117B8 800363B8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 117BC 800363BC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 117C0 800363C0 80420071 */ lb $v0, 0x71($v0) /* 117C4 800363C4 14400003 */ bnez $v0, .L800363D4 -/* 117C8 800363C8 00000000 */ nop +/* 117C8 800363C8 00000000 */ nop /* 117CC 800363CC 0C038069 */ jal enable_player_input -/* 117D0 800363D0 00000000 */ nop +/* 117D0 800363D0 00000000 */ nop .L800363D4: /* 117D4 800363D4 3C05BF80 */ lui $a1, 0xbf80 /* 117D8 800363D8 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/code_111f0_len_860/func_8003646C.s b/asm/nonmatchings/code_111f0_len_860/func_8003646C.s index 05e815a902..36a13df4c4 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_8003646C.s +++ b/asm/nonmatchings/code_111f0_len_860/func_8003646C.s @@ -15,17 +15,17 @@ glabel func_8003646C /* 11894 80036494 10400005 */ beqz $v0, .L800364AC /* 11898 80036498 24020001 */ addiu $v0, $zero, 1 /* 1189C 8003649C 1062000A */ beq $v1, $v0, .L800364C8 -/* 118A0 800364A0 00000000 */ nop +/* 118A0 800364A0 00000000 */ nop /* 118A4 800364A4 0800D984 */ j .L80036610 -/* 118A8 800364A8 00000000 */ nop +/* 118A8 800364A8 00000000 */ nop .L800364AC: /* 118AC 800364AC 24020003 */ addiu $v0, $zero, 3 /* 118B0 800364B0 1062002A */ beq $v1, $v0, .L8003655C /* 118B4 800364B4 24020004 */ addiu $v0, $zero, 4 /* 118B8 800364B8 1062003C */ beq $v1, $v0, .L800365AC -/* 118BC 800364BC 00000000 */ nop +/* 118BC 800364BC 00000000 */ nop /* 118C0 800364C0 0800D984 */ j .L80036610 -/* 118C4 800364C4 00000000 */ nop +/* 118C4 800364C4 00000000 */ nop .L800364C8: /* 118C8 800364C8 3C03800A */ lui $v1, %hi(D_8009A650) /* 118CC 800364CC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) @@ -35,13 +35,13 @@ glabel func_8003646C /* 118DC 800364DC AC620000 */ sw $v0, ($v1) /* 118E0 800364E0 96020000 */ lhu $v0, ($s0) /* 118E4 800364E4 24030004 */ addiu $v1, $zero, 4 -/* 118E8 800364E8 3C01800A */ lui $at, 0x800a -/* 118EC 800364EC A4230946 */ sh $v1, 0x946($at) +/* 118E8 800364E8 3C01800A */ lui $at, %hi(D_800A0946) +/* 118EC 800364EC A4230946 */ sh $v1, %lo(D_800A0946)($at) /* 118F0 800364F0 0800D955 */ j .L80036554 /* 118F4 800364F4 24420001 */ addiu $v0, $v0, 1 .L800364F8: -/* 118F8 800364F8 3C04800A */ lui $a0, 0x800a -/* 118FC 800364FC 24840946 */ addiu $a0, $a0, 0x946 +/* 118F8 800364F8 3C04800A */ lui $a0, %hi(D_800A0946) +/* 118FC 800364FC 24840946 */ addiu $a0, $a0, %lo(D_800A0946) /* 11900 80036500 84820000 */ lh $v0, ($a0) /* 11904 80036504 94830000 */ lhu $v1, ($a0) /* 11908 80036508 10400003 */ beqz $v0, .L80036518 @@ -61,7 +61,7 @@ glabel func_8003646C /* 1193C 8003653C 0C0169BD */ jal load_map_by_IDs /* 11940 80036540 0000302D */ daddu $a2, $zero, $zero /* 11944 80036544 0C018030 */ jal nuContRmbForceStopEnd -/* 11948 80036548 00000000 */ nop +/* 11948 80036548 00000000 */ nop /* 1194C 8003654C 96020000 */ lhu $v0, ($s0) /* 11950 80036550 24420001 */ addiu $v0, $v0, 1 .L80036554: @@ -69,15 +69,15 @@ glabel func_8003646C /* 11958 80036558 A6020000 */ sh $v0, ($s0) .L8003655C: /* 1195C 8003655C 0C00F949 */ jal func_8003E524 -/* 11960 80036560 00000000 */ nop +/* 11960 80036560 00000000 */ nop /* 11964 80036564 0C00E64C */ jal update_npcs -/* 11968 80036568 00000000 */ nop +/* 11968 80036568 00000000 */ nop /* 1196C 8003656C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 11970 80036570 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 11974 80036574 0C0B1059 */ jal does_script_exist /* 11978 80036578 8C44006C */ lw $a0, 0x6c($v0) /* 1197C 8003657C 1440002C */ bnez $v0, .L80036630 -/* 11980 80036580 00000000 */ nop +/* 11980 80036580 00000000 */ nop /* 11984 80036584 3C05800A */ lui $a1, %hi(D_8009A650) /* 11988 80036588 24A5A650 */ addiu $a1, $a1, %lo(D_8009A650) /* 1198C 8003658C 2404FFF7 */ addiu $a0, $zero, -9 @@ -108,18 +108,18 @@ glabel func_8003646C /* 119EC 800365EC 24040004 */ addiu $a0, $zero, 4 .L800365F0: /* 119F0 800365F0 0C00E64C */ jal update_npcs -/* 119F4 800365F4 00000000 */ nop +/* 119F4 800365F4 00000000 */ nop /* 119F8 800365F8 0C037DD0 */ jal update_player -/* 119FC 800365FC 00000000 */ nop +/* 119FC 800365FC 00000000 */ nop /* 11A00 80036600 0C016754 */ jal func_80059D50 -/* 11A04 80036604 00000000 */ nop +/* 11A04 80036604 00000000 */ nop /* 11A08 80036608 0C00B500 */ jal update_cameras -/* 11A0C 8003660C 00000000 */ nop +/* 11A0C 8003660C 00000000 */ nop .L80036610: /* 11A10 80036610 3C02800A */ lui $v0, %hi(gMapTransitionAlpha) /* 11A14 80036614 84420940 */ lh $v0, %lo(gMapTransitionAlpha)($v0) /* 11A18 80036618 44820000 */ mtc1 $v0, $f0 -/* 11A1C 8003661C 00000000 */ nop +/* 11A1C 8003661C 00000000 */ nop /* 11A20 80036620 46800020 */ cvt.s.w $f0, $f0 /* 11A24 80036624 44050000 */ mfc1 $a1, $f0 /* 11A28 80036628 0C04DF62 */ jal func_80137D88