mirror of
https://github.com/pmret/papermario.git
synced 2024-11-18 08:52:40 +01:00
Match various (dead) code (#469)
* Match some functions in EB1170 * Code style fixes * Match various (dead) code * Don't edit gitignore * Clean up PR * More PR fixes * PR fixes
This commit is contained in:
Gota7
GitHub
parent
b1b328d0e8
commit
936261657f
17
src/EB1170.c
17
src/EB1170.c
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#define NAMESPACE EB1170
|
#define NAMESPACE EB1170
|
||||||
|
|
||||||
extern s32 func_80059AC8(s32 a, s32 b);
|
extern s32 func_80059AC8(s32, s32);
|
||||||
extern s16 D_80169B12;
|
extern s16 D_80169B12;
|
||||||
extern s32 D_802417E4_EB2644;
|
extern s32 D_802417E4_EB2644;
|
||||||
extern s32 D_802417E8_EB2648;
|
extern s32 D_802417E8_EB2648;
|
||||||
@ -29,7 +29,7 @@ ApiStatus func_80240654_EB14B4(Evt* script, s32 isInitialCall) {
|
|||||||
}
|
}
|
||||||
if (D_802417E4_EB2644 != 0) {
|
if (D_802417E4_EB2644 != 0) {
|
||||||
D_802417E4_EB2644 = 0;
|
D_802417E4_EB2644 = 0;
|
||||||
dead_evt_set_variable(script, *args, D_802417E8_EB2648);
|
dead_evt_set_variable(script, *args++, D_802417E8_EB2648);
|
||||||
return ApiStatus_DONE2;
|
return ApiStatus_DONE2;
|
||||||
}
|
}
|
||||||
return ApiStatus_BLOCK;
|
return ApiStatus_BLOCK;
|
||||||
@ -39,14 +39,16 @@ INCLUDE_ASM(s32, "EB1170", func_80240654_EB14B4);
|
|||||||
#endif // NON_MATCHING
|
#endif // NON_MATCHING
|
||||||
|
|
||||||
ApiStatus func_802406A8_EB1508(Evt* script, s32 isInitialCall) {
|
ApiStatus func_802406A8_EB1508(Evt* script, s32 isInitialCall) {
|
||||||
D_802417E8_EB2648 = evt_get_variable(script, *script->ptrReadPos);
|
Bytecode* args = script->ptrReadPos;
|
||||||
|
|
||||||
|
D_802417E8_EB2648 = evt_get_variable(script, *args++);
|
||||||
D_802417E4_EB2644 = 1;
|
D_802417E4_EB2644 = 1;
|
||||||
return ApiStatus_DONE2;
|
return ApiStatus_DONE2;
|
||||||
}
|
}
|
||||||
|
|
||||||
ApiStatus func_802406E0_EB1540(Evt* script, s32 isInitialCall) {
|
ApiStatus func_802406E0_EB1540(Evt* script, s32 isInitialCall) {
|
||||||
Bytecode* args = script->ptrReadPos;
|
Bytecode* args = script->ptrReadPos;
|
||||||
s32* ptr = evt_get_variable(script, *args);
|
s32* ptr = evt_get_variable(script, *args++);
|
||||||
s32 i;
|
s32 i;
|
||||||
|
|
||||||
if (ptr != NULL) {
|
if (ptr != NULL) {
|
||||||
@ -69,9 +71,8 @@ ApiStatus func_802406E0_EB1540(Evt* script, s32 isInitialCall) {
|
|||||||
|
|
||||||
ApiStatus func_802409F8_EB1858(Evt* script, s32 isInitialCall) {
|
ApiStatus func_802409F8_EB1858(Evt* script, s32 isInitialCall) {
|
||||||
Npc* npc = get_npc_unsafe(script->varTable[2]);
|
Npc* npc = get_npc_unsafe(script->varTable[2]);
|
||||||
u32 anim = npc->currentAnim.w;
|
|
||||||
|
|
||||||
D_80244494 = anim;
|
D_80244494 = npc->currentAnim.w;
|
||||||
npc->currentAnim.w = (u32)script->varTable[4];
|
npc->currentAnim.w = (u32)script->varTable[4];
|
||||||
return ApiStatus_DONE2;
|
return ApiStatus_DONE2;
|
||||||
}
|
}
|
||||||
@ -88,6 +89,8 @@ ApiStatus func_80240A68_EB18C8(Evt* script, s32 isInitialCall) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ApiStatus func_80240A8C_EB18EC(Evt* script, s32 isInitialCall) {
|
ApiStatus func_80240A8C_EB18EC(Evt* script, s32 isInitialCall) {
|
||||||
evt_set_variable(script, *script->ptrReadPos, D_80169B12);
|
Bytecode* args = script->ptrReadPos;
|
||||||
|
|
||||||
|
evt_set_variable(script, *args++, D_80169B12);
|
||||||
return ApiStatus_DONE2;
|
return ApiStatus_DONE2;
|
||||||
}
|
}
|
||||||
|
|||||||
62
src/ED8E20.c
62
src/ED8E20.c
@ -1,16 +1,68 @@
|
|||||||
#include "dead.h"
|
#include "dead.h"
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "ED8E20", func_80240000_ED8E20);
|
extern s16 D_80169B12;
|
||||||
|
extern GameStatus* D_80079430;
|
||||||
|
extern f32 D_800B8DEC;
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "ED8E20", func_80240020_ED8E40);
|
typedef struct DokanModelInfo {
|
||||||
|
/* 0x00 */ s32 no;
|
||||||
|
/* 0x04 */ Vec3f position;
|
||||||
|
} DokanModelInfo;
|
||||||
|
|
||||||
|
ApiStatus func_80240000_ED8E20(Evt* script, s32 isInitialCall) {
|
||||||
|
gPlayerStatusPtr->animFlags |= 0x100000;
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|
||||||
|
ApiStatus func_80240020_ED8E40(Evt* script, s32 isInitialCall) {
|
||||||
|
script->varTable[0] = (s32)D_80169B12;
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "ED8E20", func_80240034_ED8E54);
|
INCLUDE_ASM(s32, "ED8E20", func_80240034_ED8E54);
|
||||||
|
|
||||||
|
#ifdef NON_EQUIVALENT
|
||||||
|
|
||||||
|
// Something off with the pointers? Not sure if functionally equivalent.
|
||||||
|
ApiStatus func_802400F0_ED8F10(Evt* script, s32 isInitialCall) {
|
||||||
|
s32 temp_s1;
|
||||||
|
Model* temp_s2;
|
||||||
|
|
||||||
|
temp_s2 = func_8005F128();
|
||||||
|
temp_s1 = evt_get_variable(script, EVT_VAR(0)) * 0x10;
|
||||||
|
evt_set_variable(script, EVT_VAR(1), (s32) ((DokanModelInfo*)temp_s2->extData + temp_s1)->no);
|
||||||
|
evt_set_variable(script, EVT_VAR(2), (s32) ((DokanModelInfo*)temp_s2->extData + temp_s1)->position.x);
|
||||||
|
evt_set_variable(script, EVT_VAR(3), (s32) ((DokanModelInfo*)temp_s2->extData + temp_s1)->position.y);
|
||||||
|
evt_set_variable(script, EVT_VAR(4), (s32) ((DokanModelInfo*)temp_s2->extData + temp_s1)->position.z);
|
||||||
|
osSyncPrintf("[%d] dokan get pos (no=%d) pos=%d, %d, %d, dir=%d\n\0\0\0flo_23\0\0flo_12\0\0flo_11", D_80079430->frameCounter, script->varTable[0], script->varTable[1], script->varTable[2], script->varTable[3], script->varTable[4]);
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
INCLUDE_ASM(s32, "ED8E20", func_802400F0_ED8F10);
|
INCLUDE_ASM(s32, "ED8E20", func_802400F0_ED8F10);
|
||||||
|
#endif
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "ED8E20", func_80240208_ED9028);
|
ApiStatus func_80240208_ED9028(Evt* script, s32 isInitialCall) {
|
||||||
|
script->varTable[0] = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f);
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "ED8E20", func_80240274_ED9094);
|
ApiStatus func_80240274_ED9094(Evt* script, s32 isInitialCall) {
|
||||||
|
Bytecode* args = script->ptrReadPos;
|
||||||
|
f32 temp_a2 = evt_get_float_variable(script, *args++);
|
||||||
|
f32 playerX = gPlayerStatus.position.x;
|
||||||
|
f32 playerY = gPlayerStatus.position.y;
|
||||||
|
f32 playerZ = gPlayerStatus.position.z;
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "ED8E20", func_80240318_ED9138);
|
add_vec2D_polar(&playerX, &playerZ, temp_a2, gPlayerStatus.targetYaw);
|
||||||
|
evt_set_float_variable(script, EVT_VAR(0), playerX);
|
||||||
|
evt_set_float_variable(script, EVT_VAR(1), playerY);
|
||||||
|
evt_set_float_variable(script, EVT_VAR(2), playerZ);
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|
||||||
|
ApiStatus func_80240318_ED9138(Evt* script, s32 isInitialCall) {
|
||||||
|
func_80077BD0(0, 0, 0, 0, 0, 0);
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|||||||
29
src/EE2040.c
29
src/EE2040.c
@ -1,5 +1,32 @@
|
|||||||
#include "dead.h"
|
#include "dead.h"
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
|
typedef struct UnkStructEE2040 {
|
||||||
|
/* 0x00 */ s32* unk_00;
|
||||||
|
/* 0x04 */ s32* unk_04;
|
||||||
|
/* 0x08 */ s16 unk_08[2];
|
||||||
|
/* 0x0C */ s32 unk_0C;
|
||||||
|
/* 0x10 */ s32 unk_10;
|
||||||
|
} UnkStructEE2040;
|
||||||
|
|
||||||
|
extern s32 D_80247BF0;
|
||||||
|
extern s32 D_80247DF0;
|
||||||
|
extern UnkStructEE2040 D_8024BB80;
|
||||||
|
|
||||||
// Dead version of LoadPartyImage?
|
// Dead version of LoadPartyImage?
|
||||||
INCLUDE_ASM(s32, "EE2040", func_80243680_EE2040);
|
ApiStatus func_80243680_EE2040(Evt* script, s32 isInitialCall) {
|
||||||
|
s32 sp10;
|
||||||
|
s32 temp_s0;
|
||||||
|
|
||||||
|
temp_s0 = func_8005F238("party_pokopi", &sp10);
|
||||||
|
func_80074070(temp_s0, &D_80247BF0);
|
||||||
|
func_8002BF68(temp_s0);
|
||||||
|
D_8024BB80.unk_00 = &D_80247DF0;
|
||||||
|
D_8024BB80.unk_08[0] = 0x96;
|
||||||
|
D_8024BB80.unk_08[1] = 0x69;
|
||||||
|
D_8024BB80.unk_0C = 2;
|
||||||
|
D_8024BB80.unk_04 = &D_80247BF0;
|
||||||
|
D_8024BB80.unk_10 = 1;
|
||||||
|
func_80130C64(&D_8024BB80);
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|||||||
58
src/EED1E0.c
58
src/EED1E0.c
@ -3,11 +3,25 @@
|
|||||||
|
|
||||||
#define NAMESPACE EED1E0
|
#define NAMESPACE EED1E0
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "EED1E0", func_802400E0_EED1E0);
|
extern s32 D_80094900[];
|
||||||
|
extern s8 D_80117852;
|
||||||
|
extern s32 D_800A15A8;
|
||||||
|
extern s8 D_80117160[];
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "EED1E0", func_802400FC_EED1FC);
|
ApiStatus func_802400E0_EED1E0(Evt* script, s32 isInitialCall) {
|
||||||
|
D_800A15A8 |= 0x40;
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "EED1E0", func_8024011C_EED21C);
|
ApiStatus func_802400FC_EED1FC(Evt* script, s32 isInitialCall) {
|
||||||
|
D_800A15A8 &= ~0x40;
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|
||||||
|
ApiStatus func_8024011C_EED21C(Evt* script, s32 isInitialCall) {
|
||||||
|
func_802F3B00(evt_get_variable(script, *script->ptrReadPos));
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "EED1E0", func_80240148_EED248);
|
INCLUDE_ASM(s32, "EED1E0", func_80240148_EED248);
|
||||||
|
|
||||||
@ -17,13 +31,26 @@ INCLUDE_ASM(s32, "EED1E0", func_80240200_EED300);
|
|||||||
|
|
||||||
INCLUDE_ASM(s32, "EED1E0", func_802402AC_EED3AC);
|
INCLUDE_ASM(s32, "EED1E0", func_802402AC_EED3AC);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "EED1E0", func_802404FC_EED5FC);
|
ApiStatus func_802404FC_EED5FC(Evt* script, s32 isInitialCall) {
|
||||||
|
Bytecode* args = script->ptrReadPos;
|
||||||
|
func_800F2D5C(evt_get_variable(script, *args++));
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "EED1E0", func_80240528_EED628);
|
ApiStatus func_80240528_EED628(Evt* script, s32 isInitialCall) {
|
||||||
|
func_80130C74(D_80094900[D_80117852 * 4], 0);
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "EED1E0", func_80240560_EED660);
|
INCLUDE_ASM(s32, "EED1E0", func_80240560_EED660);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "EED1E0", func_802405F0_EED6F0);
|
ApiStatus func_802405F0_EED6F0(Evt* script, s32 isInitialCall) {
|
||||||
|
Bytecode* args = script->ptrReadPos;
|
||||||
|
s32* temp_v0 = evt_get_variable(script, *args++);
|
||||||
|
|
||||||
|
*temp_v0 |= 0x10;
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "EED1E0", func_80240624_EED724);
|
INCLUDE_ASM(s32, "EED1E0", func_80240624_EED724);
|
||||||
|
|
||||||
@ -35,6 +62,21 @@ INCLUDE_ASM(s32, "EED1E0", func_80240C18_EEDD18);
|
|||||||
|
|
||||||
#include "world/common/DeadUnkPartnerPosFuncs.inc.c"
|
#include "world/common/DeadUnkPartnerPosFuncs.inc.c"
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "EED1E0", func_80240DE8_EEDEE8);
|
ApiStatus func_80240DE8_EEDEE8(Evt* script, s32 isInitialCall) {
|
||||||
|
script->varTable[0] = FALSE;
|
||||||
|
if (D_80117160[0] != 0 && D_80117160[3] == 3) {
|
||||||
|
script->varTable[0] = TRUE;
|
||||||
|
}
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "EED1E0", func_80240E18_EEDF18);
|
ApiStatus func_80240E18_EEDF18(Evt* script, s32 isInitialCall) {
|
||||||
|
script->varTable[0] = FALSE;
|
||||||
|
|
||||||
|
do {} while (0);
|
||||||
|
|
||||||
|
if (gPlayerActionState == ACTION_STATE_GROUND_POUND || gPlayerActionState == ACTION_STATE_ULTRA_POUND) {
|
||||||
|
script->varTable[0] = TRUE;
|
||||||
|
}
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
|||||||
@ -5,10 +5,13 @@ INCLUDE_ASM(s32, "effects/effect_94", fx_94_main);
|
|||||||
void func_E00BC1D0(void) {
|
void func_E00BC1D0(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "effects/effect_94", func_E00BC1D8);
|
f32 func_E00BC1D8(f32 arg0) {
|
||||||
|
return (f32)shim_rand_int((s32)arg0) - arg0 * 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "effects/effect_94", func_E00BC238);
|
INCLUDE_ASM(s32, "effects/effect_94", func_E00BC238);
|
||||||
|
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "effects/effect_94", func_E00BC2E8);
|
INCLUDE_ASM(s32, "effects/effect_94", func_E00BC2E8);
|
||||||
|
|
||||||
void func_E00BC36C(void) {
|
void func_E00BC36C(void) {
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_80240000_ED8E20
|
|
||||||
/* ED8E20 80240000 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr)
|
|
||||||
/* ED8E24 80240004 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0)
|
|
||||||
/* ED8E28 80240008 8C430004 */ lw $v1, 4($v0)
|
|
||||||
/* ED8E2C 8024000C 3C040010 */ lui $a0, 0x10
|
|
||||||
/* ED8E30 80240010 00641825 */ or $v1, $v1, $a0
|
|
||||||
/* ED8E34 80240014 AC430004 */ sw $v1, 4($v0)
|
|
||||||
/* ED8E38 80240018 03E00008 */ jr $ra
|
|
||||||
/* ED8E3C 8024001C 24020002 */ addiu $v0, $zero, 2
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_80240020_ED8E40
|
|
||||||
/* ED8E40 80240020 3C028017 */ lui $v0, %hi(D_80169B12)
|
|
||||||
/* ED8E44 80240024 84429B12 */ lh $v0, %lo(D_80169B12)($v0)
|
|
||||||
/* ED8E48 80240028 AC820084 */ sw $v0, 0x84($a0)
|
|
||||||
/* ED8E4C 8024002C 03E00008 */ jr $ra
|
|
||||||
/* ED8E50 80240030 24020002 */ addiu $v0, $zero, 2
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_80240208_ED9028
|
|
||||||
/* ED9028 80240208 3C038008 */ lui $v1, %hi(dead_gCurrentCameraID)
|
|
||||||
/* ED902C 8024020C 8C63C760 */ lw $v1, %lo(dead_gCurrentCameraID)($v1)
|
|
||||||
/* ED9030 80240210 3C014334 */ lui $at, 0x4334
|
|
||||||
/* ED9034 80240214 44816000 */ mtc1 $at, $f12
|
|
||||||
/* ED9038 80240218 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
||||||
/* ED903C 8024021C AFBF0014 */ sw $ra, 0x14($sp)
|
|
||||||
/* ED9040 80240220 AFB00010 */ sw $s0, 0x10($sp)
|
|
||||||
/* ED9044 80240224 00031080 */ sll $v0, $v1, 2
|
|
||||||
/* ED9048 80240228 00431021 */ addu $v0, $v0, $v1
|
|
||||||
/* ED904C 8024022C 00021080 */ sll $v0, $v0, 2
|
|
||||||
/* ED9050 80240230 00431023 */ subu $v0, $v0, $v1
|
|
||||||
/* ED9054 80240234 000218C0 */ sll $v1, $v0, 3
|
|
||||||
/* ED9058 80240238 00431021 */ addu $v0, $v0, $v1
|
|
||||||
/* ED905C 8024023C 000210C0 */ sll $v0, $v0, 3
|
|
||||||
/* ED9060 80240240 3C01800C */ lui $at, %hi(D_800B8DEC)
|
|
||||||
/* ED9064 80240244 00220821 */ addu $at, $at, $v0
|
|
||||||
/* ED9068 80240248 C4208DEC */ lwc1 $f0, %lo(D_800B8DEC)($at)
|
|
||||||
/* ED906C 8024024C 460C0300 */ add.s $f12, $f0, $f12
|
|
||||||
/* ED9070 80240250 0C00AB85 */ jal dead_clamp_angle
|
|
||||||
/* ED9074 80240254 0080802D */ daddu $s0, $a0, $zero
|
|
||||||
/* ED9078 80240258 4600008D */ trunc.w.s $f2, $f0
|
|
||||||
/* ED907C 8024025C E6020084 */ swc1 $f2, 0x84($s0)
|
|
||||||
/* ED9080 80240260 8FBF0014 */ lw $ra, 0x14($sp)
|
|
||||||
/* ED9084 80240264 8FB00010 */ lw $s0, 0x10($sp)
|
|
||||||
/* ED9088 80240268 24020002 */ addiu $v0, $zero, 2
|
|
||||||
/* ED908C 8024026C 03E00008 */ jr $ra
|
|
||||||
/* ED9090 80240270 27BD0018 */ addiu $sp, $sp, 0x18
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_80240274_ED9094
|
|
||||||
/* ED9094 80240274 27BDFFD8 */ addiu $sp, $sp, -0x28
|
|
||||||
/* ED9098 80240278 AFB00018 */ sw $s0, 0x18($sp)
|
|
||||||
/* ED909C 8024027C 0080802D */ daddu $s0, $a0, $zero
|
|
||||||
/* ED90A0 80240280 AFBF001C */ sw $ra, 0x1c($sp)
|
|
||||||
/* ED90A4 80240284 F7B40020 */ sdc1 $f20, 0x20($sp)
|
|
||||||
/* ED90A8 80240288 8E02000C */ lw $v0, 0xc($s0)
|
|
||||||
/* ED90AC 8024028C 0C0B55FF */ jal dead_evt_get_float_variable
|
|
||||||
/* ED90B0 80240290 8C450000 */ lw $a1, ($v0)
|
|
||||||
/* ED90B4 80240294 27A40010 */ addiu $a0, $sp, 0x10
|
|
||||||
/* ED90B8 80240298 3C028011 */ lui $v0, %hi(dead_gPlayerStatus)
|
|
||||||
/* ED90BC 8024029C 24427578 */ addiu $v0, $v0, %lo(dead_gPlayerStatus)
|
|
||||||
/* ED90C0 802402A0 44060000 */ mfc1 $a2, $f0
|
|
||||||
/* ED90C4 802402A4 C4400028 */ lwc1 $f0, 0x28($v0)
|
|
||||||
/* ED90C8 802402A8 C4420030 */ lwc1 $f2, 0x30($v0)
|
|
||||||
/* ED90CC 802402AC E7A00010 */ swc1 $f0, 0x10($sp)
|
|
||||||
/* ED90D0 802402B0 E7A20014 */ swc1 $f2, 0x14($sp)
|
|
||||||
/* ED90D4 802402B4 8C470080 */ lw $a3, 0x80($v0)
|
|
||||||
/* ED90D8 802402B8 C454002C */ lwc1 $f20, 0x2c($v0)
|
|
||||||
/* ED90DC 802402BC 0C00ACA3 */ jal dead_add_vec2D_polar
|
|
||||||
/* ED90E0 802402C0 27A50014 */ addiu $a1, $sp, 0x14
|
|
||||||
/* ED90E4 802402C4 0200202D */ daddu $a0, $s0, $zero
|
|
||||||
/* ED90E8 802402C8 3C05FE36 */ lui $a1, 0xfe36
|
|
||||||
/* ED90EC 802402CC 8FA60010 */ lw $a2, 0x10($sp)
|
|
||||||
/* ED90F0 802402D0 0C0B5684 */ jal dead_evt_set_float_variable
|
|
||||||
/* ED90F4 802402D4 34A53C80 */ ori $a1, $a1, 0x3c80
|
|
||||||
/* ED90F8 802402D8 0200202D */ daddu $a0, $s0, $zero
|
|
||||||
/* ED90FC 802402DC 3C05FE36 */ lui $a1, 0xfe36
|
|
||||||
/* ED9100 802402E0 4406A000 */ mfc1 $a2, $f20
|
|
||||||
/* ED9104 802402E4 0C0B5684 */ jal dead_evt_set_float_variable
|
|
||||||
/* ED9108 802402E8 34A53C81 */ ori $a1, $a1, 0x3c81
|
|
||||||
/* ED910C 802402EC 0200202D */ daddu $a0, $s0, $zero
|
|
||||||
/* ED9110 802402F0 3C05FE36 */ lui $a1, 0xfe36
|
|
||||||
/* ED9114 802402F4 8FA60014 */ lw $a2, 0x14($sp)
|
|
||||||
/* ED9118 802402F8 0C0B5684 */ jal dead_evt_set_float_variable
|
|
||||||
/* ED911C 802402FC 34A53C82 */ ori $a1, $a1, 0x3c82
|
|
||||||
/* ED9120 80240300 8FBF001C */ lw $ra, 0x1c($sp)
|
|
||||||
/* ED9124 80240304 8FB00018 */ lw $s0, 0x18($sp)
|
|
||||||
/* ED9128 80240308 D7B40020 */ ldc1 $f20, 0x20($sp)
|
|
||||||
/* ED912C 8024030C 24020002 */ addiu $v0, $zero, 2
|
|
||||||
/* ED9130 80240310 03E00008 */ jr $ra
|
|
||||||
/* ED9134 80240314 27BD0028 */ addiu $sp, $sp, 0x28
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_80240318_ED9138
|
|
||||||
/* ED9138 80240318 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
||||||
/* ED913C 8024031C 0000202D */ daddu $a0, $zero, $zero
|
|
||||||
/* ED9140 80240320 0080282D */ daddu $a1, $a0, $zero
|
|
||||||
/* ED9144 80240324 0080302D */ daddu $a2, $a0, $zero
|
|
||||||
/* ED9148 80240328 0080382D */ daddu $a3, $a0, $zero
|
|
||||||
/* ED914C 8024032C AFBF0018 */ sw $ra, 0x18($sp)
|
|
||||||
/* ED9150 80240330 AFA00010 */ sw $zero, 0x10($sp)
|
|
||||||
/* ED9154 80240334 0C01DEF4 */ jal func_80077BD0
|
|
||||||
/* ED9158 80240338 AFA00014 */ sw $zero, 0x14($sp)
|
|
||||||
/* ED915C 8024033C 8FBF0018 */ lw $ra, 0x18($sp)
|
|
||||||
/* ED9160 80240340 24020002 */ addiu $v0, $zero, 2
|
|
||||||
/* ED9164 80240344 03E00008 */ jr $ra
|
|
||||||
/* ED9168 80240348 27BD0020 */ addiu $sp, $sp, 0x20
|
|
||||||
/* ED916C 8024034C 00000000 */ nop
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
.section .rodata
|
|
||||||
|
|
||||||
glabel D_80247BE0_EE65A0
|
|
||||||
.ascii "party_pokopi\0\0\0\0"
|
|
||||||
|
|
||||||
.section .text
|
|
||||||
|
|
||||||
glabel func_80243680_EE2040
|
|
||||||
/* EE2040 80243680 27BDFFD8 */ addiu $sp, $sp, -0x28
|
|
||||||
/* EE2044 80243684 3C048024 */ lui $a0, %hi(D_80247BE0_EE65A0)
|
|
||||||
/* EE2048 80243688 24847BE0 */ addiu $a0, $a0, %lo(D_80247BE0_EE65A0)
|
|
||||||
/* EE204C 8024368C 27A50010 */ addiu $a1, $sp, 0x10
|
|
||||||
/* EE2050 80243690 AFBF0020 */ sw $ra, 0x20($sp)
|
|
||||||
/* EE2054 80243694 AFB1001C */ sw $s1, 0x1c($sp)
|
|
||||||
/* EE2058 80243698 0C017C8E */ jal func_8005F238
|
|
||||||
/* EE205C 8024369C AFB00018 */ sw $s0, 0x18($sp)
|
|
||||||
/* EE2060 802436A0 0040802D */ daddu $s0, $v0, $zero
|
|
||||||
/* EE2064 802436A4 0200202D */ daddu $a0, $s0, $zero
|
|
||||||
/* EE2068 802436A8 3C118024 */ lui $s1, %hi(D_80247BF0)
|
|
||||||
/* EE206C 802436AC 26317BF0 */ addiu $s1, $s1, %lo(D_80247BF0)
|
|
||||||
/* EE2070 802436B0 0C01D01C */ jal func_80074070
|
|
||||||
/* EE2074 802436B4 0220282D */ daddu $a1, $s1, $zero
|
|
||||||
/* EE2078 802436B8 0C00AFDA */ jal func_8002BF68
|
|
||||||
/* EE207C 802436BC 0200202D */ daddu $a0, $s0, $zero
|
|
||||||
/* EE2080 802436C0 3C048025 */ lui $a0, %hi(D_8024BB80)
|
|
||||||
/* EE2084 802436C4 2484BB80 */ addiu $a0, $a0, %lo(D_8024BB80)
|
|
||||||
/* EE2088 802436C8 3C028024 */ lui $v0, %hi(D_80247DF0)
|
|
||||||
/* EE208C 802436CC 24427DF0 */ addiu $v0, $v0, %lo(D_80247DF0)
|
|
||||||
/* EE2090 802436D0 AC820000 */ sw $v0, ($a0)
|
|
||||||
/* EE2094 802436D4 24020096 */ addiu $v0, $zero, 0x96
|
|
||||||
/* EE2098 802436D8 A4820008 */ sh $v0, 8($a0)
|
|
||||||
/* EE209C 802436DC 24020069 */ addiu $v0, $zero, 0x69
|
|
||||||
/* EE20A0 802436E0 A482000A */ sh $v0, 0xa($a0)
|
|
||||||
/* EE20A4 802436E4 24020002 */ addiu $v0, $zero, 2
|
|
||||||
/* EE20A8 802436E8 AC82000C */ sw $v0, 0xc($a0)
|
|
||||||
/* EE20AC 802436EC 24020001 */ addiu $v0, $zero, 1
|
|
||||||
/* EE20B0 802436F0 AC910004 */ sw $s1, 4($a0)
|
|
||||||
/* EE20B4 802436F4 0C04C319 */ jal func_80130C64
|
|
||||||
/* EE20B8 802436F8 AC820010 */ sw $v0, 0x10($a0)
|
|
||||||
/* EE20BC 802436FC 8FBF0020 */ lw $ra, 0x20($sp)
|
|
||||||
/* EE20C0 80243700 8FB1001C */ lw $s1, 0x1c($sp)
|
|
||||||
/* EE20C4 80243704 8FB00018 */ lw $s0, 0x18($sp)
|
|
||||||
/* EE20C8 80243708 24020002 */ addiu $v0, $zero, 2
|
|
||||||
/* EE20CC 8024370C 03E00008 */ jr $ra
|
|
||||||
/* EE20D0 80243710 27BD0028 */ addiu $sp, $sp, 0x28
|
|
||||||
/* EE20D4 80243714 00000000 */ nop
|
|
||||||
/* EE20D8 80243718 00000000 */ nop
|
|
||||||
/* EE20DC 8024371C 00000000 */ nop
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_802400E0_EED1E0
|
|
||||||
/* EED1E0 802400E0 3C03800A */ lui $v1, %hi(D_800A15A8)
|
|
||||||
/* EED1E4 802400E4 246315A8 */ addiu $v1, $v1, %lo(D_800A15A8)
|
|
||||||
/* EED1E8 802400E8 8C620000 */ lw $v0, ($v1)
|
|
||||||
/* EED1EC 802400EC 34420040 */ ori $v0, $v0, 0x40
|
|
||||||
/* EED1F0 802400F0 AC620000 */ sw $v0, ($v1)
|
|
||||||
/* EED1F4 802400F4 03E00008 */ jr $ra
|
|
||||||
/* EED1F8 802400F8 24020002 */ addiu $v0, $zero, 2
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_802400FC_EED1FC
|
|
||||||
/* EED1FC 802400FC 3C02800A */ lui $v0, %hi(D_800A15A8)
|
|
||||||
/* EED200 80240100 244215A8 */ addiu $v0, $v0, %lo(D_800A15A8)
|
|
||||||
/* EED204 80240104 8C430000 */ lw $v1, ($v0)
|
|
||||||
/* EED208 80240108 2404FFBF */ addiu $a0, $zero, -0x41
|
|
||||||
/* EED20C 8024010C 00641824 */ and $v1, $v1, $a0
|
|
||||||
/* EED210 80240110 AC430000 */ sw $v1, ($v0)
|
|
||||||
/* EED214 80240114 03E00008 */ jr $ra
|
|
||||||
/* EED218 80240118 24020002 */ addiu $v0, $zero, 2
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_8024011C_EED21C
|
|
||||||
/* EED21C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
||||||
/* EED220 80240120 AFBF0010 */ sw $ra, 0x10($sp)
|
|
||||||
/* EED224 80240124 8C82000C */ lw $v0, 0xc($a0)
|
|
||||||
/* EED228 80240128 0C0B53A3 */ jal dead_evt_get_variable
|
|
||||||
/* EED22C 8024012C 8C450000 */ lw $a1, ($v0)
|
|
||||||
/* EED230 80240130 0C0BCEC0 */ jal func_802F3B00
|
|
||||||
/* EED234 80240134 0040202D */ daddu $a0, $v0, $zero
|
|
||||||
/* EED238 80240138 8FBF0010 */ lw $ra, 0x10($sp)
|
|
||||||
/* EED23C 8024013C 24020002 */ addiu $v0, $zero, 2
|
|
||||||
/* EED240 80240140 03E00008 */ jr $ra
|
|
||||||
/* EED244 80240144 27BD0018 */ addiu $sp, $sp, 0x18
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_802404FC_EED5FC
|
|
||||||
/* EED5FC 802404FC 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
||||||
/* EED600 80240500 AFBF0010 */ sw $ra, 0x10($sp)
|
|
||||||
/* EED604 80240504 8C82000C */ lw $v0, 0xc($a0)
|
|
||||||
/* EED608 80240508 0C0B53A3 */ jal dead_evt_get_variable
|
|
||||||
/* EED60C 8024050C 8C450000 */ lw $a1, ($v0)
|
|
||||||
/* EED610 80240510 0C03CB57 */ jal func_800F2D5C
|
|
||||||
/* EED614 80240514 0040202D */ daddu $a0, $v0, $zero
|
|
||||||
/* EED618 80240518 8FBF0010 */ lw $ra, 0x10($sp)
|
|
||||||
/* EED61C 8024051C 24020002 */ addiu $v0, $zero, 2
|
|
||||||
/* EED620 80240520 03E00008 */ jr $ra
|
|
||||||
/* EED624 80240524 27BD0018 */ addiu $sp, $sp, 0x18
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_80240528_EED628
|
|
||||||
/* EED628 80240528 3C028011 */ lui $v0, %hi(D_80117852)
|
|
||||||
/* EED62C 8024052C 80427852 */ lb $v0, %lo(D_80117852)($v0)
|
|
||||||
/* EED630 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
||||||
/* EED634 80240534 AFBF0010 */ sw $ra, 0x10($sp)
|
|
||||||
/* EED638 80240538 00021100 */ sll $v0, $v0, 4
|
|
||||||
/* EED63C 8024053C 3C048009 */ lui $a0, %hi(D_80094900)
|
|
||||||
/* EED640 80240540 00822021 */ addu $a0, $a0, $v0
|
|
||||||
/* EED644 80240544 8C844900 */ lw $a0, %lo(D_80094900)($a0)
|
|
||||||
/* EED648 80240548 0C04C31D */ jal func_80130C74
|
|
||||||
/* EED64C 8024054C 0000282D */ daddu $a1, $zero, $zero
|
|
||||||
/* EED650 80240550 8FBF0010 */ lw $ra, 0x10($sp)
|
|
||||||
/* EED654 80240554 24020002 */ addiu $v0, $zero, 2
|
|
||||||
/* EED658 80240558 03E00008 */ jr $ra
|
|
||||||
/* EED65C 8024055C 27BD0018 */ addiu $sp, $sp, 0x18
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_802405F0_EED6F0
|
|
||||||
/* EED6F0 802405F0 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
||||||
/* EED6F4 802405F4 AFBF0010 */ sw $ra, 0x10($sp)
|
|
||||||
/* EED6F8 802405F8 8C82000C */ lw $v0, 0xc($a0)
|
|
||||||
/* EED6FC 802405FC 0C0B53A3 */ jal dead_evt_get_variable
|
|
||||||
/* EED700 80240600 8C450000 */ lw $a1, ($v0)
|
|
||||||
/* EED704 80240604 0040202D */ daddu $a0, $v0, $zero
|
|
||||||
/* EED708 80240608 8C830000 */ lw $v1, ($a0)
|
|
||||||
/* EED70C 8024060C 34630010 */ ori $v1, $v1, 0x10
|
|
||||||
/* EED710 80240610 AC830000 */ sw $v1, ($a0)
|
|
||||||
/* EED714 80240614 8FBF0010 */ lw $ra, 0x10($sp)
|
|
||||||
/* EED718 80240618 24020002 */ addiu $v0, $zero, 2
|
|
||||||
/* EED71C 8024061C 03E00008 */ jr $ra
|
|
||||||
/* EED720 80240620 27BD0018 */ addiu $sp, $sp, 0x18
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_80240DE8_EEDEE8
|
|
||||||
/* EEDEE8 80240DE8 3C038011 */ lui $v1, %hi(D_80117160)
|
|
||||||
/* EEDEEC 80240DEC 24637160 */ addiu $v1, $v1, %lo(D_80117160)
|
|
||||||
/* EEDEF0 80240DF0 AC800084 */ sw $zero, 0x84($a0)
|
|
||||||
/* EEDEF4 80240DF4 80620000 */ lb $v0, ($v1)
|
|
||||||
/* EEDEF8 80240DF8 10400005 */ beqz $v0, .L80240E10
|
|
||||||
/* EEDEFC 80240DFC 24020003 */ addiu $v0, $zero, 3
|
|
||||||
/* EEDF00 80240E00 80630003 */ lb $v1, 3($v1)
|
|
||||||
/* EEDF04 80240E04 14620002 */ bne $v1, $v0, .L80240E10
|
|
||||||
/* EEDF08 80240E08 24020001 */ addiu $v0, $zero, 1
|
|
||||||
/* EEDF0C 80240E0C AC820084 */ sw $v0, 0x84($a0)
|
|
||||||
.L80240E10:
|
|
||||||
/* EEDF10 80240E10 03E00008 */ jr $ra
|
|
||||||
/* EEDF14 80240E14 24020002 */ addiu $v0, $zero, 2
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_80240E18_EEDF18
|
|
||||||
/* EEDF18 80240E18 AC800084 */ sw $zero, 0x84($a0)
|
|
||||||
/* EEDF1C 80240E1C 3C038011 */ lui $v1, %hi(dead_gPlayerActionState)
|
|
||||||
/* EEDF20 80240E20 8063762C */ lb $v1, %lo(dead_gPlayerActionState)($v1)
|
|
||||||
/* EEDF24 80240E24 2402000E */ addiu $v0, $zero, 0xe
|
|
||||||
/* EEDF28 80240E28 10620004 */ beq $v1, $v0, .L80240E3C
|
|
||||||
/* EEDF2C 80240E2C 24020001 */ addiu $v0, $zero, 1
|
|
||||||
/* EEDF30 80240E30 24020010 */ addiu $v0, $zero, 0x10
|
|
||||||
/* EEDF34 80240E34 14620002 */ bne $v1, $v0, .L80240E40
|
|
||||||
/* EEDF38 80240E38 24020001 */ addiu $v0, $zero, 1
|
|
||||||
.L80240E3C:
|
|
||||||
/* EEDF3C 80240E3C AC820084 */ sw $v0, 0x84($a0)
|
|
||||||
.L80240E40:
|
|
||||||
/* EEDF40 80240E40 03E00008 */ jr $ra
|
|
||||||
/* EEDF44 80240E44 24020002 */ addiu $v0, $zero, 2
|
|
||||||
/* EEDF48 80240E48 00000000 */ nop
|
|
||||||
/* EEDF4C 80240E4C 00000000 */ nop
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel func_E00BC1D8
|
|
||||||
/* 3BA208 E00BC1D8 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
||||||
/* 3BA20C E00BC1DC F7B40018 */ sdc1 $f20, 0x18($sp)
|
|
||||||
/* 3BA210 E00BC1E0 46006506 */ mov.s $f20, $f12
|
|
||||||
/* 3BA214 E00BC1E4 4600A08D */ trunc.w.s $f2, $f20
|
|
||||||
/* 3BA218 E00BC1E8 44041000 */ mfc1 $a0, $f2
|
|
||||||
/* 3BA21C E00BC1EC AFBF0010 */ sw $ra, 0x10($sp)
|
|
||||||
/* 3BA220 E00BC1F0 0C080138 */ jal shim_rand_int
|
|
||||||
/* 3BA224 E00BC1F4 00000000 */ nop
|
|
||||||
/* 3BA228 E00BC1F8 3C013FE0 */ lui $at, 0x3fe0
|
|
||||||
/* 3BA22C E00BC1FC 44810800 */ mtc1 $at, $f1
|
|
||||||
/* 3BA230 E00BC200 44800000 */ mtc1 $zero, $f0
|
|
||||||
/* 3BA234 E00BC204 4600A521 */ cvt.d.s $f20, $f20
|
|
||||||
/* 3BA238 E00BC208 4620A502 */ mul.d $f20, $f20, $f0
|
|
||||||
/* 3BA23C E00BC20C 00000000 */ nop
|
|
||||||
/* 3BA240 E00BC210 44820000 */ mtc1 $v0, $f0
|
|
||||||
/* 3BA244 E00BC214 00000000 */ nop
|
|
||||||
/* 3BA248 E00BC218 46800020 */ cvt.s.w $f0, $f0
|
|
||||||
/* 3BA24C E00BC21C 46000021 */ cvt.d.s $f0, $f0
|
|
||||||
/* 3BA250 E00BC220 46340001 */ sub.d $f0, $f0, $f20
|
|
||||||
/* 3BA254 E00BC224 8FBF0010 */ lw $ra, 0x10($sp)
|
|
||||||
/* 3BA258 E00BC228 D7B40018 */ ldc1 $f20, 0x18($sp)
|
|
||||||
/* 3BA25C E00BC22C 46200020 */ cvt.s.d $f0, $f0
|
|
||||||
/* 3BA260 E00BC230 03E00008 */ jr $ra
|
|
||||||
/* 3BA264 E00BC234 27BD0020 */ addiu $sp, $sp, 0x20
|
|
||||||
Loading…
Reference in New Issue
Block a user