pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 00:42:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Match evt_get_float_variable and a world function (#471)

Browse Source 
* Match evt_get_float_variable

* Delete evt_get_float_variable.s

* Match func_80240240_D13810

* Delete func_80240240_D13810.s

* Address Ethan's wants

* Remove space

* Create SetAngleClamped.inc.c

* Update D13810.c

* Update DA5260.c

* Update DB7910.c

* Update DC43D0.c

* Update DD79B0.c

* Update DEBED0.c

* Update DEEEA0.c

* Delete func_8024003C_DA527C.s

* Delete func_8024001C_DB792C.s

* Delete func_8024001C_DC43EC.s

* Delete func_8024001C_DD79CC.s

* Delete func_8024001C_DEBEEC.s

* Delete func_8024001C_DEEEBC.s

* Fix build stuff (#5)

* Fix more instances of build issues (#6)
This commit is contained in:
JoshDuMan 2021-10-12 22:56:42 -04:00 committed by GitHub
parent b1989c4f0c
commit b1b328d0e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 32 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/SetAngleClamped.inc.c Normal file
View File

@ -0,0 +1,14 @@
#include "common.h"
ApiStatus N(SetAngleClamped)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 var = *args++;
f32 x1 = evt_get_float_variable(script, *args++);
f32 z1 = evt_get_float_variable(script, *args++);
f32 x2 = evt_get_float_variable(script, *args++);
f32 z2 = evt_get_float_variable(script, *args++);
f32 angle = clamp_angle(atan2(x1, z1, x2, z2));
evt_set_float_variable(script, var, angle);
return ApiStatus_DONE2;
}

11
src/evt/evt.c
View File

@ -1834,8 +1834,6 @@ s32 evt_get_variable_index_alt(s32 var) {
INCLUDE_ASM(s32, "evt/si", evt_set_variable, Evt* script, Bytecode var, s32 value);
// Tiny regalloc issue with the var <= -80000000 / -60000000 blocks
#ifdef NON_MATCHING
f32 evt_get_float_variable(Evt* script, Bytecode var) {
s32 temp;
@ -1857,7 +1855,8 @@ f32 evt_get_float_variable(Evt* script, Bytecode var) {
} else if (var <= -80000000) {
var += 90000000;
temp = var % 32;
if ((gMapFlags[var / 32] & (1 << temp))) {
var = gMapFlags[var / 32] & (1 << temp);
if (var) {
return 1.0f;
} else {
return 0.0f;
@ -1865,7 +1864,8 @@ f32 evt_get_float_variable(Evt* script, Bytecode var) {
} else if (var <= -60000000) {
var += 70000000;
temp = var % 32;
if ((script->varFlags[var / 32] & (1 << temp))) {
var = script->varFlags[var / 32] & (1 << temp);
if (var) {
return 1.0f;
} else {
return 0.0f;
@ -1880,9 +1880,6 @@ f32 evt_get_float_variable(Evt* script, Bytecode var) {
return evt_fixed_var_to_float(var);
}
}
#else
INCLUDE_ASM(f32, "evt/si", evt_get_float_variable, Evt* script, Bytecode var);
#endif
INCLUDE_ASM(f32, "evt/si", evt_set_float_variable, Evt* script, Bytecode var, f32 value);

2
src/world/area_omo/omo_03/DA5260.c
View File

@ -4,7 +4,7 @@
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
#define NAMESPACE omo_03
INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024003C_DA527C);
#include "common/SetAngleClamped.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240104_DA5344);

2
src/world/area_omo/omo_06/DB7910.c
View File

@ -11,7 +11,7 @@ static char* N(exit_str_7) = "";
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_8024001C_DB792C);
#include "common/SetAngleClamped.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_802400E4_DB79F4);

2
src/world/area_omo/omo_08/DC43D0.c
View File

@ -9,7 +9,7 @@ static char* N(exit_str_5) = "omo_16";
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_8024001C_DC43EC);
#include "common/SetAngleClamped.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_802400E4_DC44B4);

2
src/world/area_omo/omo_10/DD79B0.c
View File

@ -11,7 +11,7 @@ static char* N(exit_str_7) = "";
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_8024001C_DD79CC);
#include "common/SetAngleClamped.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_802400E4_DD7A94);

2
src/world/area_omo/omo_16/DEBED0.c
View File

@ -7,7 +7,7 @@ static char* N(exit_str_3) = "omo_03";
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_8024001C_DEBEEC);
#include "common/SetAngleClamped.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_802400E4_DEBFB4);

2
src/world/area_omo/omo_17/DEEEA0.c
View File

@ -11,7 +11,7 @@ static char* N(exit_str_7) = "";
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_8024001C_DEEEBC);
#include "common/SetAngleClamped.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_802400E4_DEEF84);

2
src/world/area_sam/sam_04/D13810.c
View File

@ -1,3 +1,3 @@
#include "sam_04.h"
INCLUDE_ASM(s32, "world/area_sam/sam_04/D13810", func_80240240_D13810);
#include "common/SetAngleClamped.inc.c"

2
ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/world/area_omo/omo_16/DEC600.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/world/area_omo/omo_17/DF2C90.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/world/area_sam/sam_04/D15010.data.s
View File

File diff suppressed because one or more lines are too long

152
ver/us/asm/nonmatchings/evt/si/evt_get_float_variable.s
View File

@ -1,152 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel evt_get_float_variable
/* ECDDC 802C842C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* ECDE0 802C8430 3C02EFE8 */ lui $v0, 0xefe8
/* ECDE4 802C8434 34422080 */ ori $v0, $v0, 0x2080
/* ECDE8 802C8438 0045102A */ slt $v0, $v0, $a1
/* ECDEC 802C843C 10400006 */ beqz $v0, .L802C8458
/* ECDF0 802C8440 AFBF0010 */ sw $ra, 0x10($sp)
/* ECDF4 802C8444 3C02F119 */ lui $v0, 0xf119
/* ECDF8 802C8448 34424D80 */ ori $v0, $v0, 0x4d80
/* ECDFC 802C844C 0045102A */ slt $v0, $v0, $a1
/* ECE00 802C8450 14400005 */ bnez $v0, .L802C8468
/* ECE04 802C8454 3C02F2E3 */ lui $v0, 0xf2e3
.L802C8458:
/* ECE08 802C8458 44850000 */ mtc1 $a1, $f0
/* ECE0C 802C845C 00000000 */ nop
/* ECE10 802C8460 080B218D */ j .L802C8634
/* ECE14 802C8464 46800020 */ cvt.s.w $f0, $f0
.L802C8468:
/* ECE18 802C8468 34421100 */ ori $v0, $v0, 0x1100
/* ECE1C 802C846C 0045102A */ slt $v0, $v0, $a1
/* ECE20 802C8470 14400003 */ bnez $v0, .L802C8480
/* ECE24 802C8474 3C02F545 */ lui $v0, 0xf545
/* ECE28 802C8478 080B218B */ j .L802C862C
/* ECE2C 802C847C 00A0202D */ daddu $a0, $a1, $zero
.L802C8480:
/* ECE30 802C8480 34426B00 */ ori $v0, $v0, 0x6b00
/* ECE34 802C8484 0045102A */ slt $v0, $v0, $a1
/* ECE38 802C8488 14400009 */ bnez $v0, .L802C84B0
/* ECE3C 802C848C 3C02F676 */ lui $v0, 0xf676
/* ECE40 802C8490 3C020B53 */ lui $v0, 0xb53
/* ECE44 802C8494 34422B80 */ ori $v0, $v0, 0x2b80
/* ECE48 802C8498 00A22821 */ addu $a1, $a1, $v0
/* ECE4C 802C849C 8C83013C */ lw $v1, 0x13c($a0)
/* ECE50 802C84A0 00051080 */ sll $v0, $a1, 2
/* ECE54 802C84A4 00431021 */ addu $v0, $v0, $v1
/* ECE58 802C84A8 080B218B */ j .L802C862C
/* ECE5C 802C84AC 8C440000 */ lw $a0, ($v0)
.L802C84B0:
/* ECE60 802C84B0 34429800 */ ori $v0, $v0, 0x9800
/* ECE64 802C84B4 0045102A */ slt $v0, $v0, $a1
/* ECE68 802C84B8 14400007 */ bnez $v0, .L802C84D8
/* ECE6C 802C84BC 3C02F7A7 */ lui $v0, 0xf7a7
/* ECE70 802C84C0 3C040A21 */ lui $a0, 0xa21
/* ECE74 802C84C4 3484FE80 */ ori $a0, $a0, 0xfe80
/* ECE78 802C84C8 0C05154E */ jal get_global_byte
/* ECE7C 802C84CC 00A42021 */ addu $a0, $a1, $a0
/* ECE80 802C84D0 080B218B */ j .L802C862C
/* ECE84 802C84D4 0040202D */ daddu $a0, $v0, $zero
.L802C84D8:
/* ECE88 802C84D8 3442C500 */ ori $v0, $v0, 0xc500
/* ECE8C 802C84DC 0045102A */ slt $v0, $v0, $a1
/* ECE90 802C84E0 14400007 */ bnez $v0, .L802C8500
/* ECE94 802C84E4 3C02FB3B */ lui $v0, 0xfb3b
/* ECE98 802C84E8 3C0408F0 */ lui $a0, 0x8f0
/* ECE9C 802C84EC 3484D180 */ ori $a0, $a0, 0xd180
/* ECEA0 802C84F0 0C051594 */ jal get_area_byte
/* ECEA4 802C84F4 00A42021 */ addu $a0, $a1, $a0
/* ECEA8 802C84F8 080B218B */ j .L802C862C
/* ECEAC 802C84FC 0040202D */ daddu $a0, $v0, $zero
.L802C8500:
/* ECEB0 802C8500 34424C00 */ ori $v0, $v0, 0x4c00
/* ECEB4 802C8504 0045102A */ slt $v0, $v0, $a1
/* ECEB8 802C8508 14400015 */ bnez $v0, .L802C8560
/* ECEBC 802C850C 3C02FC6C */ lui $v0, 0xfc6c
/* ECEC0 802C8510 3C02055D */ lui $v0, 0x55d
/* ECEC4 802C8514 34424A80 */ ori $v0, $v0, 0x4a80
/* ECEC8 802C8518 00A22821 */ addu $a1, $a1, $v0
/* ECECC 802C851C 04A10002 */ bgez $a1, .L802C8528
/* ECED0 802C8520 00A0182D */ daddu $v1, $a1, $zero
/* ECED4 802C8524 24A3001F */ addiu $v1, $a1, 0x1f
.L802C8528:
/* ECED8 802C8528 00033143 */ sra $a2, $v1, 5
/* ECEDC 802C852C 00C0182D */ daddu $v1, $a2, $zero
/* ECEE0 802C8530 00031140 */ sll $v0, $v1, 5
/* ECEE4 802C8534 00A23023 */ subu $a2, $a1, $v0
/* ECEE8 802C8538 00031880 */ sll $v1, $v1, 2
/* ECEEC 802C853C 3C02802E */ lui $v0, %hi(gMapFlags)
/* ECEF0 802C8540 8C42A480 */ lw $v0, %lo(gMapFlags)($v0)
/* ECEF4 802C8544 3C013F80 */ lui $at, 0x3f80
/* ECEF8 802C8548 44810000 */ mtc1 $at, $f0
/* ECEFC 802C854C 00621821 */ addu $v1, $v1, $v0
/* ECF00 802C8550 24020001 */ addiu $v0, $zero, 1
/* ECF04 802C8554 8C630000 */ lw $v1, ($v1)
/* ECF08 802C8558 080B216D */ j .L802C85B4
/* ECF0C 802C855C 00C21004 */ sllv $v0, $v0, $a2
.L802C8560:
/* ECF10 802C8560 34427900 */ ori $v0, $v0, 0x7900
/* ECF14 802C8564 0045102A */ slt $v0, $v0, $a1
/* ECF18 802C8568 14400018 */ bnez $v0, .L802C85CC
/* ECF1C 802C856C 3C02FD9D */ lui $v0, 0xfd9d
/* ECF20 802C8570 3C02042C */ lui $v0, 0x42c
/* ECF24 802C8574 34421D80 */ ori $v0, $v0, 0x1d80
/* ECF28 802C8578 00A22821 */ addu $a1, $a1, $v0
/* ECF2C 802C857C 04A10002 */ bgez $a1, .L802C8588
/* ECF30 802C8580 00A0182D */ daddu $v1, $a1, $zero
/* ECF34 802C8584 24A3001F */ addiu $v1, $a1, 0x1f
.L802C8588:
/* ECF38 802C8588 00033143 */ sra $a2, $v1, 5
/* ECF3C 802C858C 00C0182D */ daddu $v1, $a2, $zero
/* ECF40 802C8590 00031140 */ sll $v0, $v1, 5
/* ECF44 802C8594 00A23023 */ subu $a2, $a1, $v0
/* ECF48 802C8598 00031880 */ sll $v1, $v1, 2
/* ECF4C 802C859C 00831821 */ addu $v1, $a0, $v1
/* ECF50 802C85A0 24020001 */ addiu $v0, $zero, 1
/* ECF54 802C85A4 00C21004 */ sllv $v0, $v0, $a2
/* ECF58 802C85A8 8C6300C4 */ lw $v1, 0xc4($v1)
/* ECF5C 802C85AC 3C013F80 */ lui $at, 0x3f80
/* ECF60 802C85B0 44810000 */ mtc1 $at, $f0
.L802C85B4:
/* ECF64 802C85B4 00622824 */ and $a1, $v1, $v0
/* ECF68 802C85B8 14A0001E */ bnez $a1, .L802C8634
/* ECF6C 802C85BC 00000000 */ nop
/* ECF70 802C85C0 44800000 */ mtc1 $zero, $f0
/* ECF74 802C85C4 080B218D */ j .L802C8634
/* ECF78 802C85C8 00000000 */ nop
.L802C85CC:
/* ECF7C 802C85CC 3442A600 */ ori $v0, $v0, 0xa600
/* ECF80 802C85D0 0045102A */ slt $v0, $v0, $a1
/* ECF84 802C85D4 1440000A */ bnez $v0, .L802C8600
/* ECF88 802C85D8 3C02FECE */ lui $v0, 0xfece
/* ECF8C 802C85DC 3C0202FA */ lui $v0, 0x2fa
/* ECF90 802C85E0 3442F080 */ ori $v0, $v0, 0xf080
/* ECF94 802C85E4 00A22821 */ addu $a1, $a1, $v0
/* ECF98 802C85E8 3C03802E */ lui $v1, %hi(gMapVars)
/* ECF9C 802C85EC 8C63A484 */ lw $v1, %lo(gMapVars)($v1)
/* ECFA0 802C85F0 00051080 */ sll $v0, $a1, 2
/* ECFA4 802C85F4 00431021 */ addu $v0, $v0, $v1
/* ECFA8 802C85F8 080B218B */ j .L802C862C
/* ECFAC 802C85FC 8C440000 */ lw $a0, ($v0)
.L802C8600:
/* ECFB0 802C8600 3442D300 */ ori $v0, $v0, 0xd300
/* ECFB4 802C8604 0045102A */ slt $v0, $v0, $a1
/* ECFB8 802C8608 10400003 */ beqz $v0, .L802C8618
/* ECFBC 802C860C 3C0201C9 */ lui $v0, 0x1c9
/* ECFC0 802C8610 080B218B */ j .L802C862C
/* ECFC4 802C8614 00A0202D */ daddu $a0, $a1, $zero
.L802C8618:
/* ECFC8 802C8618 3442C380 */ ori $v0, $v0, 0xc380
/* ECFCC 802C861C 00A22821 */ addu $a1, $a1, $v0
/* ECFD0 802C8620 00051080 */ sll $v0, $a1, 2
/* ECFD4 802C8624 00821021 */ addu $v0, $a0, $v0
/* ECFD8 802C8628 8C440084 */ lw $a0, 0x84($v0)
.L802C862C:
/* ECFDC 802C862C 0C0B1248 */ jal evt_fixed_var_to_float
/* ECFE0 802C8630 00000000 */ nop
.L802C8634:
/* ECFE4 802C8634 8FBF0010 */ lw $ra, 0x10($sp)
/* ECFE8 802C8638 03E00008 */ jr $ra
/* ECFEC 802C863C 27BD0018 */ addiu $sp, $sp, 0x18

54
ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024003C_DA527C.s
View File

@ -1,54 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024003C_DA527C
/* DA527C 8024003C 27BDFFC8 */ addiu $sp, $sp, -0x38
/* DA5280 80240040 AFB10014 */ sw $s1, 0x14($sp)
/* DA5284 80240044 0080882D */ daddu $s1, $a0, $zero
/* DA5288 80240048 AFBF001C */ sw $ra, 0x1c($sp)
/* DA528C 8024004C AFB20018 */ sw $s2, 0x18($sp)
/* DA5290 80240050 AFB00010 */ sw $s0, 0x10($sp)
/* DA5294 80240054 F7B80030 */ sdc1 $f24, 0x30($sp)
/* DA5298 80240058 F7B60028 */ sdc1 $f22, 0x28($sp)
/* DA529C 8024005C F7B40020 */ sdc1 $f20, 0x20($sp)
/* DA52A0 80240060 8E30000C */ lw $s0, 0xc($s1)
/* DA52A4 80240064 8E120000 */ lw $s2, ($s0)
/* DA52A8 80240068 26100004 */ addiu $s0, $s0, 4
/* DA52AC 8024006C 8E050000 */ lw $a1, ($s0)
/* DA52B0 80240070 0C0B210B */ jal evt_get_float_variable
/* DA52B4 80240074 26100004 */ addiu $s0, $s0, 4
/* DA52B8 80240078 8E050000 */ lw $a1, ($s0)
/* DA52BC 8024007C 26100004 */ addiu $s0, $s0, 4
/* DA52C0 80240080 0220202D */ daddu $a0, $s1, $zero
/* DA52C4 80240084 0C0B210B */ jal evt_get_float_variable
/* DA52C8 80240088 46000606 */ mov.s $f24, $f0
/* DA52CC 8024008C 8E050000 */ lw $a1, ($s0)
/* DA52D0 80240090 26100004 */ addiu $s0, $s0, 4
/* DA52D4 80240094 0220202D */ daddu $a0, $s1, $zero
/* DA52D8 80240098 0C0B210B */ jal evt_get_float_variable
/* DA52DC 8024009C 46000586 */ mov.s $f22, $f0
/* DA52E0 802400A0 0220202D */ daddu $a0, $s1, $zero
/* DA52E4 802400A4 8E050000 */ lw $a1, ($s0)
/* DA52E8 802400A8 0C0B210B */ jal evt_get_float_variable
/* DA52EC 802400AC 46000506 */ mov.s $f20, $f0
/* DA52F0 802400B0 4600C306 */ mov.s $f12, $f24
/* DA52F4 802400B4 4406A000 */ mfc1 $a2, $f20
/* DA52F8 802400B8 44070000 */ mfc1 $a3, $f0
/* DA52FC 802400BC 0C00A720 */ jal atan2
/* DA5300 802400C0 4600B386 */ mov.s $f14, $f22
/* DA5304 802400C4 0C00A6C9 */ jal clamp_angle
/* DA5308 802400C8 46000306 */ mov.s $f12, $f0
/* DA530C 802400CC 0220202D */ daddu $a0, $s1, $zero
/* DA5310 802400D0 44060000 */ mfc1 $a2, $f0
/* DA5314 802400D4 0C0B2190 */ jal evt_set_float_variable
/* DA5318 802400D8 0240282D */ daddu $a1, $s2, $zero
/* DA531C 802400DC 8FBF001C */ lw $ra, 0x1c($sp)
/* DA5320 802400E0 8FB20018 */ lw $s2, 0x18($sp)
/* DA5324 802400E4 8FB10014 */ lw $s1, 0x14($sp)
/* DA5328 802400E8 8FB00010 */ lw $s0, 0x10($sp)
/* DA532C 802400EC D7B80030 */ ldc1 $f24, 0x30($sp)
/* DA5330 802400F0 D7B60028 */ ldc1 $f22, 0x28($sp)
/* DA5334 802400F4 D7B40020 */ ldc1 $f20, 0x20($sp)
/* DA5338 802400F8 24020002 */ addiu $v0, $zero, 2
/* DA533C 802400FC 03E00008 */ jr $ra
/* DA5340 80240100 27BD0038 */ addiu $sp, $sp, 0x38

54
ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_8024001C_DB792C.s
View File

@ -1,54 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024001C_DB792C
/* DB792C 8024001C 27BDFFC8 */ addiu $sp, $sp, -0x38
/* DB7930 80240020 AFB10014 */ sw $s1, 0x14($sp)
/* DB7934 80240024 0080882D */ daddu $s1, $a0, $zero
/* DB7938 80240028 AFBF001C */ sw $ra, 0x1c($sp)
/* DB793C 8024002C AFB20018 */ sw $s2, 0x18($sp)
/* DB7940 80240030 AFB00010 */ sw $s0, 0x10($sp)
/* DB7944 80240034 F7B80030 */ sdc1 $f24, 0x30($sp)
/* DB7948 80240038 F7B60028 */ sdc1 $f22, 0x28($sp)
/* DB794C 8024003C F7B40020 */ sdc1 $f20, 0x20($sp)
/* DB7950 80240040 8E30000C */ lw $s0, 0xc($s1)
/* DB7954 80240044 8E120000 */ lw $s2, ($s0)
/* DB7958 80240048 26100004 */ addiu $s0, $s0, 4
/* DB795C 8024004C 8E050000 */ lw $a1, ($s0)
/* DB7960 80240050 0C0B210B */ jal evt_get_float_variable
/* DB7964 80240054 26100004 */ addiu $s0, $s0, 4
/* DB7968 80240058 8E050000 */ lw $a1, ($s0)
/* DB796C 8024005C 26100004 */ addiu $s0, $s0, 4
/* DB7970 80240060 0220202D */ daddu $a0, $s1, $zero
/* DB7974 80240064 0C0B210B */ jal evt_get_float_variable
/* DB7978 80240068 46000606 */ mov.s $f24, $f0
/* DB797C 8024006C 8E050000 */ lw $a1, ($s0)
/* DB7980 80240070 26100004 */ addiu $s0, $s0, 4
/* DB7984 80240074 0220202D */ daddu $a0, $s1, $zero
/* DB7988 80240078 0C0B210B */ jal evt_get_float_variable
/* DB798C 8024007C 46000586 */ mov.s $f22, $f0
/* DB7990 80240080 0220202D */ daddu $a0, $s1, $zero
/* DB7994 80240084 8E050000 */ lw $a1, ($s0)
/* DB7998 80240088 0C0B210B */ jal evt_get_float_variable
/* DB799C 8024008C 46000506 */ mov.s $f20, $f0
/* DB79A0 80240090 4600C306 */ mov.s $f12, $f24
/* DB79A4 80240094 4406A000 */ mfc1 $a2, $f20
/* DB79A8 80240098 44070000 */ mfc1 $a3, $f0
/* DB79AC 8024009C 0C00A720 */ jal atan2
/* DB79B0 802400A0 4600B386 */ mov.s $f14, $f22
/* DB79B4 802400A4 0C00A6C9 */ jal clamp_angle
/* DB79B8 802400A8 46000306 */ mov.s $f12, $f0
/* DB79BC 802400AC 0220202D */ daddu $a0, $s1, $zero
/* DB79C0 802400B0 44060000 */ mfc1 $a2, $f0
/* DB79C4 802400B4 0C0B2190 */ jal evt_set_float_variable
/* DB79C8 802400B8 0240282D */ daddu $a1, $s2, $zero
/* DB79CC 802400BC 8FBF001C */ lw $ra, 0x1c($sp)
/* DB79D0 802400C0 8FB20018 */ lw $s2, 0x18($sp)
/* DB79D4 802400C4 8FB10014 */ lw $s1, 0x14($sp)
/* DB79D8 802400C8 8FB00010 */ lw $s0, 0x10($sp)
/* DB79DC 802400CC D7B80030 */ ldc1 $f24, 0x30($sp)
/* DB79E0 802400D0 D7B60028 */ ldc1 $f22, 0x28($sp)
/* DB79E4 802400D4 D7B40020 */ ldc1 $f20, 0x20($sp)
/* DB79E8 802400D8 24020002 */ addiu $v0, $zero, 2
/* DB79EC 802400DC 03E00008 */ jr $ra
/* DB79F0 802400E0 27BD0038 */ addiu $sp, $sp, 0x38

54
ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_8024001C_DC43EC.s
View File

@ -1,54 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024001C_DC43EC
/* DC43EC 8024001C 27BDFFC8 */ addiu $sp, $sp, -0x38
/* DC43F0 80240020 AFB10014 */ sw $s1, 0x14($sp)
/* DC43F4 80240024 0080882D */ daddu $s1, $a0, $zero
/* DC43F8 80240028 AFBF001C */ sw $ra, 0x1c($sp)
/* DC43FC 8024002C AFB20018 */ sw $s2, 0x18($sp)
/* DC4400 80240030 AFB00010 */ sw $s0, 0x10($sp)
/* DC4404 80240034 F7B80030 */ sdc1 $f24, 0x30($sp)
/* DC4408 80240038 F7B60028 */ sdc1 $f22, 0x28($sp)
/* DC440C 8024003C F7B40020 */ sdc1 $f20, 0x20($sp)
/* DC4410 80240040 8E30000C */ lw $s0, 0xc($s1)
/* DC4414 80240044 8E120000 */ lw $s2, ($s0)
/* DC4418 80240048 26100004 */ addiu $s0, $s0, 4
/* DC441C 8024004C 8E050000 */ lw $a1, ($s0)
/* DC4420 80240050 0C0B210B */ jal evt_get_float_variable
/* DC4424 80240054 26100004 */ addiu $s0, $s0, 4
/* DC4428 80240058 8E050000 */ lw $a1, ($s0)
/* DC442C 8024005C 26100004 */ addiu $s0, $s0, 4
/* DC4430 80240060 0220202D */ daddu $a0, $s1, $zero
/* DC4434 80240064 0C0B210B */ jal evt_get_float_variable
/* DC4438 80240068 46000606 */ mov.s $f24, $f0
/* DC443C 8024006C 8E050000 */ lw $a1, ($s0)
/* DC4440 80240070 26100004 */ addiu $s0, $s0, 4
/* DC4444 80240074 0220202D */ daddu $a0, $s1, $zero
/* DC4448 80240078 0C0B210B */ jal evt_get_float_variable
/* DC444C 8024007C 46000586 */ mov.s $f22, $f0
/* DC4450 80240080 0220202D */ daddu $a0, $s1, $zero
/* DC4454 80240084 8E050000 */ lw $a1, ($s0)
/* DC4458 80240088 0C0B210B */ jal evt_get_float_variable
/* DC445C 8024008C 46000506 */ mov.s $f20, $f0
/* DC4460 80240090 4600C306 */ mov.s $f12, $f24
/* DC4464 80240094 4406A000 */ mfc1 $a2, $f20
/* DC4468 80240098 44070000 */ mfc1 $a3, $f0
/* DC446C 8024009C 0C00A720 */ jal atan2
/* DC4470 802400A0 4600B386 */ mov.s $f14, $f22
/* DC4474 802400A4 0C00A6C9 */ jal clamp_angle
/* DC4478 802400A8 46000306 */ mov.s $f12, $f0
/* DC447C 802400AC 0220202D */ daddu $a0, $s1, $zero
/* DC4480 802400B0 44060000 */ mfc1 $a2, $f0
/* DC4484 802400B4 0C0B2190 */ jal evt_set_float_variable
/* DC4488 802400B8 0240282D */ daddu $a1, $s2, $zero
/* DC448C 802400BC 8FBF001C */ lw $ra, 0x1c($sp)
/* DC4490 802400C0 8FB20018 */ lw $s2, 0x18($sp)
/* DC4494 802400C4 8FB10014 */ lw $s1, 0x14($sp)
/* DC4498 802400C8 8FB00010 */ lw $s0, 0x10($sp)
/* DC449C 802400CC D7B80030 */ ldc1 $f24, 0x30($sp)
/* DC44A0 802400D0 D7B60028 */ ldc1 $f22, 0x28($sp)
/* DC44A4 802400D4 D7B40020 */ ldc1 $f20, 0x20($sp)
/* DC44A8 802400D8 24020002 */ addiu $v0, $zero, 2
/* DC44AC 802400DC 03E00008 */ jr $ra
/* DC44B0 802400E0 27BD0038 */ addiu $sp, $sp, 0x38

54
ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_8024001C_DD79CC.s
View File

@ -1,54 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024001C_DD79CC
/* DD79CC 8024001C 27BDFFC8 */ addiu $sp, $sp, -0x38
/* DD79D0 80240020 AFB10014 */ sw $s1, 0x14($sp)
/* DD79D4 80240024 0080882D */ daddu $s1, $a0, $zero
/* DD79D8 80240028 AFBF001C */ sw $ra, 0x1c($sp)
/* DD79DC 8024002C AFB20018 */ sw $s2, 0x18($sp)
/* DD79E0 80240030 AFB00010 */ sw $s0, 0x10($sp)
/* DD79E4 80240034 F7B80030 */ sdc1 $f24, 0x30($sp)
/* DD79E8 80240038 F7B60028 */ sdc1 $f22, 0x28($sp)
/* DD79EC 8024003C F7B40020 */ sdc1 $f20, 0x20($sp)
/* DD79F0 80240040 8E30000C */ lw $s0, 0xc($s1)
/* DD79F4 80240044 8E120000 */ lw $s2, ($s0)
/* DD79F8 80240048 26100004 */ addiu $s0, $s0, 4
/* DD79FC 8024004C 8E050000 */ lw $a1, ($s0)
/* DD7A00 80240050 0C0B210B */ jal evt_get_float_variable
/* DD7A04 80240054 26100004 */ addiu $s0, $s0, 4
/* DD7A08 80240058 8E050000 */ lw $a1, ($s0)
/* DD7A0C 8024005C 26100004 */ addiu $s0, $s0, 4
/* DD7A10 80240060 0220202D */ daddu $a0, $s1, $zero
/* DD7A14 80240064 0C0B210B */ jal evt_get_float_variable
/* DD7A18 80240068 46000606 */ mov.s $f24, $f0
/* DD7A1C 8024006C 8E050000 */ lw $a1, ($s0)
/* DD7A20 80240070 26100004 */ addiu $s0, $s0, 4
/* DD7A24 80240074 0220202D */ daddu $a0, $s1, $zero
/* DD7A28 80240078 0C0B210B */ jal evt_get_float_variable
/* DD7A2C 8024007C 46000586 */ mov.s $f22, $f0
/* DD7A30 80240080 0220202D */ daddu $a0, $s1, $zero
/* DD7A34 80240084 8E050000 */ lw $a1, ($s0)
/* DD7A38 80240088 0C0B210B */ jal evt_get_float_variable
/* DD7A3C 8024008C 46000506 */ mov.s $f20, $f0
/* DD7A40 80240090 4600C306 */ mov.s $f12, $f24
/* DD7A44 80240094 4406A000 */ mfc1 $a2, $f20
/* DD7A48 80240098 44070000 */ mfc1 $a3, $f0
/* DD7A4C 8024009C 0C00A720 */ jal atan2
/* DD7A50 802400A0 4600B386 */ mov.s $f14, $f22
/* DD7A54 802400A4 0C00A6C9 */ jal clamp_angle
/* DD7A58 802400A8 46000306 */ mov.s $f12, $f0
/* DD7A5C 802400AC 0220202D */ daddu $a0, $s1, $zero
/* DD7A60 802400B0 44060000 */ mfc1 $a2, $f0
/* DD7A64 802400B4 0C0B2190 */ jal evt_set_float_variable
/* DD7A68 802400B8 0240282D */ daddu $a1, $s2, $zero
/* DD7A6C 802400BC 8FBF001C */ lw $ra, 0x1c($sp)
/* DD7A70 802400C0 8FB20018 */ lw $s2, 0x18($sp)
/* DD7A74 802400C4 8FB10014 */ lw $s1, 0x14($sp)
/* DD7A78 802400C8 8FB00010 */ lw $s0, 0x10($sp)
/* DD7A7C 802400CC D7B80030 */ ldc1 $f24, 0x30($sp)
/* DD7A80 802400D0 D7B60028 */ ldc1 $f22, 0x28($sp)
/* DD7A84 802400D4 D7B40020 */ ldc1 $f20, 0x20($sp)
/* DD7A88 802400D8 24020002 */ addiu $v0, $zero, 2
/* DD7A8C 802400DC 03E00008 */ jr $ra
/* DD7A90 802400E0 27BD0038 */ addiu $sp, $sp, 0x38

54
ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024001C_DEBEEC.s
View File

@ -1,54 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024001C_DEBEEC
/* DEBEEC 8024001C 27BDFFC8 */ addiu $sp, $sp, -0x38
/* DEBEF0 80240020 AFB10014 */ sw $s1, 0x14($sp)
/* DEBEF4 80240024 0080882D */ daddu $s1, $a0, $zero
/* DEBEF8 80240028 AFBF001C */ sw $ra, 0x1c($sp)
/* DEBEFC 8024002C AFB20018 */ sw $s2, 0x18($sp)
/* DEBF00 80240030 AFB00010 */ sw $s0, 0x10($sp)
/* DEBF04 80240034 F7B80030 */ sdc1 $f24, 0x30($sp)
/* DEBF08 80240038 F7B60028 */ sdc1 $f22, 0x28($sp)
/* DEBF0C 8024003C F7B40020 */ sdc1 $f20, 0x20($sp)
/* DEBF10 80240040 8E30000C */ lw $s0, 0xc($s1)
/* DEBF14 80240044 8E120000 */ lw $s2, ($s0)
/* DEBF18 80240048 26100004 */ addiu $s0, $s0, 4
/* DEBF1C 8024004C 8E050000 */ lw $a1, ($s0)
/* DEBF20 80240050 0C0B210B */ jal evt_get_float_variable
/* DEBF24 80240054 26100004 */ addiu $s0, $s0, 4
/* DEBF28 80240058 8E050000 */ lw $a1, ($s0)
/* DEBF2C 8024005C 26100004 */ addiu $s0, $s0, 4
/* DEBF30 80240060 0220202D */ daddu $a0, $s1, $zero
/* DEBF34 80240064 0C0B210B */ jal evt_get_float_variable
/* DEBF38 80240068 46000606 */ mov.s $f24, $f0
/* DEBF3C 8024006C 8E050000 */ lw $a1, ($s0)
/* DEBF40 80240070 26100004 */ addiu $s0, $s0, 4
/* DEBF44 80240074 0220202D */ daddu $a0, $s1, $zero
/* DEBF48 80240078 0C0B210B */ jal evt_get_float_variable
/* DEBF4C 8024007C 46000586 */ mov.s $f22, $f0
/* DEBF50 80240080 0220202D */ daddu $a0, $s1, $zero
/* DEBF54 80240084 8E050000 */ lw $a1, ($s0)
/* DEBF58 80240088 0C0B210B */ jal evt_get_float_variable
/* DEBF5C 8024008C 46000506 */ mov.s $f20, $f0
/* DEBF60 80240090 4600C306 */ mov.s $f12, $f24
/* DEBF64 80240094 4406A000 */ mfc1 $a2, $f20
/* DEBF68 80240098 44070000 */ mfc1 $a3, $f0
/* DEBF6C 8024009C 0C00A720 */ jal atan2
/* DEBF70 802400A0 4600B386 */ mov.s $f14, $f22
/* DEBF74 802400A4 0C00A6C9 */ jal clamp_angle
/* DEBF78 802400A8 46000306 */ mov.s $f12, $f0
/* DEBF7C 802400AC 0220202D */ daddu $a0, $s1, $zero
/* DEBF80 802400B0 44060000 */ mfc1 $a2, $f0
/* DEBF84 802400B4 0C0B2190 */ jal evt_set_float_variable
/* DEBF88 802400B8 0240282D */ daddu $a1, $s2, $zero
/* DEBF8C 802400BC 8FBF001C */ lw $ra, 0x1c($sp)
/* DEBF90 802400C0 8FB20018 */ lw $s2, 0x18($sp)
/* DEBF94 802400C4 8FB10014 */ lw $s1, 0x14($sp)
/* DEBF98 802400C8 8FB00010 */ lw $s0, 0x10($sp)
/* DEBF9C 802400CC D7B80030 */ ldc1 $f24, 0x30($sp)
/* DEBFA0 802400D0 D7B60028 */ ldc1 $f22, 0x28($sp)
/* DEBFA4 802400D4 D7B40020 */ ldc1 $f20, 0x20($sp)
/* DEBFA8 802400D8 24020002 */ addiu $v0, $zero, 2
/* DEBFAC 802400DC 03E00008 */ jr $ra
/* DEBFB0 802400E0 27BD0038 */ addiu $sp, $sp, 0x38

54
ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_8024001C_DEEEBC.s
View File

@ -1,54 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024001C_DEEEBC
/* DEEEBC 8024001C 27BDFFC8 */ addiu $sp, $sp, -0x38
/* DEEEC0 80240020 AFB10014 */ sw $s1, 0x14($sp)
/* DEEEC4 80240024 0080882D */ daddu $s1, $a0, $zero
/* DEEEC8 80240028 AFBF001C */ sw $ra, 0x1c($sp)
/* DEEECC 8024002C AFB20018 */ sw $s2, 0x18($sp)
/* DEEED0 80240030 AFB00010 */ sw $s0, 0x10($sp)
/* DEEED4 80240034 F7B80030 */ sdc1 $f24, 0x30($sp)
/* DEEED8 80240038 F7B60028 */ sdc1 $f22, 0x28($sp)
/* DEEEDC 8024003C F7B40020 */ sdc1 $f20, 0x20($sp)
/* DEEEE0 80240040 8E30000C */ lw $s0, 0xc($s1)
/* DEEEE4 80240044 8E120000 */ lw $s2, ($s0)
/* DEEEE8 80240048 26100004 */ addiu $s0, $s0, 4
/* DEEEEC 8024004C 8E050000 */ lw $a1, ($s0)
/* DEEEF0 80240050 0C0B210B */ jal evt_get_float_variable
/* DEEEF4 80240054 26100004 */ addiu $s0, $s0, 4
/* DEEEF8 80240058 8E050000 */ lw $a1, ($s0)
/* DEEEFC 8024005C 26100004 */ addiu $s0, $s0, 4
/* DEEF00 80240060 0220202D */ daddu $a0, $s1, $zero
/* DEEF04 80240064 0C0B210B */ jal evt_get_float_variable
/* DEEF08 80240068 46000606 */ mov.s $f24, $f0
/* DEEF0C 8024006C 8E050000 */ lw $a1, ($s0)
/* DEEF10 80240070 26100004 */ addiu $s0, $s0, 4
/* DEEF14 80240074 0220202D */ daddu $a0, $s1, $zero
/* DEEF18 80240078 0C0B210B */ jal evt_get_float_variable
/* DEEF1C 8024007C 46000586 */ mov.s $f22, $f0
/* DEEF20 80240080 0220202D */ daddu $a0, $s1, $zero
/* DEEF24 80240084 8E050000 */ lw $a1, ($s0)
/* DEEF28 80240088 0C0B210B */ jal evt_get_float_variable
/* DEEF2C 8024008C 46000506 */ mov.s $f20, $f0
/* DEEF30 80240090 4600C306 */ mov.s $f12, $f24
/* DEEF34 80240094 4406A000 */ mfc1 $a2, $f20
/* DEEF38 80240098 44070000 */ mfc1 $a3, $f0
/* DEEF3C 8024009C 0C00A720 */ jal atan2
/* DEEF40 802400A0 4600B386 */ mov.s $f14, $f22
/* DEEF44 802400A4 0C00A6C9 */ jal clamp_angle
/* DEEF48 802400A8 46000306 */ mov.s $f12, $f0
/* DEEF4C 802400AC 0220202D */ daddu $a0, $s1, $zero
/* DEEF50 802400B0 44060000 */ mfc1 $a2, $f0
/* DEEF54 802400B4 0C0B2190 */ jal evt_set_float_variable
/* DEEF58 802400B8 0240282D */ daddu $a1, $s2, $zero
/* DEEF5C 802400BC 8FBF001C */ lw $ra, 0x1c($sp)
/* DEEF60 802400C0 8FB20018 */ lw $s2, 0x18($sp)
/* DEEF64 802400C4 8FB10014 */ lw $s1, 0x14($sp)
/* DEEF68 802400C8 8FB00010 */ lw $s0, 0x10($sp)
/* DEEF6C 802400CC D7B80030 */ ldc1 $f24, 0x30($sp)
/* DEEF70 802400D0 D7B60028 */ ldc1 $f22, 0x28($sp)
/* DEEF74 802400D4 D7B40020 */ ldc1 $f20, 0x20($sp)
/* DEEF78 802400D8 24020002 */ addiu $v0, $zero, 2
/* DEEF7C 802400DC 03E00008 */ jr $ra
/* DEEF80 802400E0 27BD0038 */ addiu $sp, $sp, 0x38

56
ver/us/asm/nonmatchings/world/area_sam/sam_04/D13810/func_80240240_D13810.s
View File

@ -1,56 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240240_D13810
/* D13810 80240240 27BDFFC8 */ addiu $sp, $sp, -0x38
/* D13814 80240244 AFB10014 */ sw $s1, 0x14($sp)
/* D13818 80240248 0080882D */ daddu $s1, $a0, $zero
/* D1381C 8024024C AFBF001C */ sw $ra, 0x1c($sp)
/* D13820 80240250 AFB20018 */ sw $s2, 0x18($sp)
/* D13824 80240254 AFB00010 */ sw $s0, 0x10($sp)
/* D13828 80240258 F7B80030 */ sdc1 $f24, 0x30($sp)
/* D1382C 8024025C F7B60028 */ sdc1 $f22, 0x28($sp)
/* D13830 80240260 F7B40020 */ sdc1 $f20, 0x20($sp)
/* D13834 80240264 8E30000C */ lw $s0, 0xc($s1)
/* D13838 80240268 8E120000 */ lw $s2, ($s0)
/* D1383C 8024026C 26100004 */ addiu $s0, $s0, 4
/* D13840 80240270 8E050000 */ lw $a1, ($s0)
/* D13844 80240274 0C0B210B */ jal evt_get_float_variable
/* D13848 80240278 26100004 */ addiu $s0, $s0, 4
/* D1384C 8024027C 8E050000 */ lw $a1, ($s0)
/* D13850 80240280 26100004 */ addiu $s0, $s0, 4
/* D13854 80240284 0220202D */ daddu $a0, $s1, $zero
/* D13858 80240288 0C0B210B */ jal evt_get_float_variable
/* D1385C 8024028C 46000606 */ mov.s $f24, $f0
/* D13860 80240290 8E050000 */ lw $a1, ($s0)
/* D13864 80240294 26100004 */ addiu $s0, $s0, 4
/* D13868 80240298 0220202D */ daddu $a0, $s1, $zero
/* D1386C 8024029C 0C0B210B */ jal evt_get_float_variable
/* D13870 802402A0 46000586 */ mov.s $f22, $f0
/* D13874 802402A4 0220202D */ daddu $a0, $s1, $zero
/* D13878 802402A8 8E050000 */ lw $a1, ($s0)
/* D1387C 802402AC 0C0B210B */ jal evt_get_float_variable
/* D13880 802402B0 46000506 */ mov.s $f20, $f0
/* D13884 802402B4 4600C306 */ mov.s $f12, $f24
/* D13888 802402B8 4406A000 */ mfc1 $a2, $f20
/* D1388C 802402BC 44070000 */ mfc1 $a3, $f0
/* D13890 802402C0 0C00A720 */ jal atan2
/* D13894 802402C4 4600B386 */ mov.s $f14, $f22
/* D13898 802402C8 0C00A6C9 */ jal clamp_angle
/* D1389C 802402CC 46000306 */ mov.s $f12, $f0
/* D138A0 802402D0 0220202D */ daddu $a0, $s1, $zero
/* D138A4 802402D4 44060000 */ mfc1 $a2, $f0
/* D138A8 802402D8 0C0B2190 */ jal evt_set_float_variable
/* D138AC 802402DC 0240282D */ daddu $a1, $s2, $zero
/* D138B0 802402E0 8FBF001C */ lw $ra, 0x1c($sp)
/* D138B4 802402E4 8FB20018 */ lw $s2, 0x18($sp)
/* D138B8 802402E8 8FB10014 */ lw $s1, 0x14($sp)
/* D138BC 802402EC 8FB00010 */ lw $s0, 0x10($sp)
/* D138C0 802402F0 D7B80030 */ ldc1 $f24, 0x30($sp)
/* D138C4 802402F4 D7B60028 */ ldc1 $f22, 0x28($sp)
/* D138C8 802402F8 D7B40020 */ ldc1 $f20, 0x20($sp)
/* D138CC 802402FC 24020002 */ addiu $v0, $zero, 2
/* D138D0 80240300 03E00008 */ jr $ra
/* D138D4 80240304 27BD0038 */ addiu $sp, $sp, 0x38
/* D138D8 80240308 00000000 */ nop
/* D138DC 8024030C 00000000 */ nop