mirror of
https://github.com/pmret/papermario.git
synced 2024-11-08 12:02:30 +01:00
Sjg misc decomp (#766)
* Decompile func_802400BC_A4C01C * Decompile world functions • func_80240310_C5AA50 • func_802403B0_C5AAF0 • func_802403DC_C5AB1C * Update variable names * Moved star to the left * Update partner variables
This commit is contained in:
Stephen Giardina
GitHub
parent
408c49cb75
commit
64083a6748
@ -5,7 +5,7 @@ static char* N(exit_str_1) = "kpa_81";
|
||||
|
||||
#include "world/common/UnkFunc11.inc.c"
|
||||
|
||||
ApiStatus func_802400BC_A4C01C(Evt *script, s32 isInitialCall) {
|
||||
ApiStatus func_802400BC_A4C01C(Evt* script, s32 isInitialCall) {
|
||||
PlayerStatus* playerstatus = &gPlayerStatus;
|
||||
f32 dist;
|
||||
f32 x;
|
||||
|
||||
@ -1,9 +1,45 @@
|
||||
#include "kzn_02.h"
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AA50", func_80240310_C5AA50);
|
||||
ApiStatus func_80240310_C5AA50(Evt* script, s32 isInitialCall) {
|
||||
Bytecode* args = script->ptrReadPos;
|
||||
f32 centerX;
|
||||
f32 centerY;
|
||||
f32 centerZ;
|
||||
f32 sizeX;
|
||||
f32 sizeY;
|
||||
f32 sizeZ;
|
||||
|
||||
get_model_center_and_size(evt_get_variable(script, *args++), ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ);
|
||||
script->varTable[7] = centerX;
|
||||
script->varTable[8] = centerZ;
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
|
||||
#include "world/common/GetFloorCollider.inc.c"
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AA50", func_802403B0_C5AAF0);
|
||||
ApiStatus func_802403B0_C5AAF0(Evt* script, s32 isInitialCall) {
|
||||
Bytecode* args = script->ptrReadPos;
|
||||
evt_set_variable(script, *args++, gPartnerActionStatus.actingPartner);
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AA50", func_802403DC_C5AB1C);
|
||||
ApiStatus func_802403DC_C5AB1C(Evt* script, s32 isInitialCall) {
|
||||
Bytecode* args = script->ptrReadPos;
|
||||
s32 temp_s2 = evt_get_variable(script, *args++);
|
||||
s32 temp_s1 = evt_get_variable(script, *args++);
|
||||
s32 temp_s0_3 = evt_get_variable(script, *args++);
|
||||
PlayerStatus* playerStatus = &gPlayerStatus;
|
||||
CollisionStatus* collisionStatus= &gCollisionStatus;
|
||||
Npc* partner;
|
||||
|
||||
if ((collisionStatus->currentFloor == temp_s1) || ((collisionStatus->lastTouchedFloor == temp_s1)) || (collisionStatus->currentFloor == temp_s0_3) || (collisionStatus->lastTouchedFloor == temp_s0_3)) {
|
||||
playerStatus->extraVelocity.x = temp_s2;
|
||||
}
|
||||
if (gPlayerData.currentPartner != PARTNER_NONE){
|
||||
partner = get_npc_unsafe(NPC_PARTNER);
|
||||
if ((partner->currentFloor == temp_s1) || (partner->currentFloor == temp_s0_3)) {
|
||||
partner->pos.x += temp_s2;
|
||||
}
|
||||
}
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80240310_C5AA50
|
||||
/* C5AA50 80240310 27BDFFC0 */ addiu $sp, $sp, -0x40
|
||||
/* C5AA54 80240314 AFB00038 */ sw $s0, 0x38($sp)
|
||||
/* C5AA58 80240318 0080802D */ daddu $s0, $a0, $zero
|
||||
/* C5AA5C 8024031C AFBF003C */ sw $ra, 0x3c($sp)
|
||||
/* C5AA60 80240320 8E02000C */ lw $v0, 0xc($s0)
|
||||
/* C5AA64 80240324 0C0B1EAF */ jal evt_get_variable
|
||||
/* C5AA68 80240328 8C450000 */ lw $a1, ($v0)
|
||||
/* C5AA6C 8024032C 3044FFFF */ andi $a0, $v0, 0xffff
|
||||
/* C5AA70 80240330 27A50020 */ addiu $a1, $sp, 0x20
|
||||
/* C5AA74 80240334 27A2002C */ addiu $v0, $sp, 0x2c
|
||||
/* C5AA78 80240338 AFA20010 */ sw $v0, 0x10($sp)
|
||||
/* C5AA7C 8024033C 27A20030 */ addiu $v0, $sp, 0x30
|
||||
/* C5AA80 80240340 AFA20014 */ sw $v0, 0x14($sp)
|
||||
/* C5AA84 80240344 27A20034 */ addiu $v0, $sp, 0x34
|
||||
/* C5AA88 80240348 27A60024 */ addiu $a2, $sp, 0x24
|
||||
/* C5AA8C 8024034C 27A70028 */ addiu $a3, $sp, 0x28
|
||||
/* C5AA90 80240350 0C046C3B */ jal get_model_center_and_size
|
||||
/* C5AA94 80240354 AFA20018 */ sw $v0, 0x18($sp)
|
||||
/* C5AA98 80240358 C7A00020 */ lwc1 $f0, 0x20($sp)
|
||||
/* C5AA9C 8024035C C7A20028 */ lwc1 $f2, 0x28($sp)
|
||||
/* C5AAA0 80240360 4600010D */ trunc.w.s $f4, $f0
|
||||
/* C5AAA4 80240364 E60400A0 */ swc1 $f4, 0xa0($s0)
|
||||
/* C5AAA8 80240368 4600110D */ trunc.w.s $f4, $f2
|
||||
/* C5AAAC 8024036C E60400A4 */ swc1 $f4, 0xa4($s0)
|
||||
/* C5AAB0 80240370 8FBF003C */ lw $ra, 0x3c($sp)
|
||||
/* C5AAB4 80240374 8FB00038 */ lw $s0, 0x38($sp)
|
||||
/* C5AAB8 80240378 24020002 */ addiu $v0, $zero, 2
|
||||
/* C5AABC 8024037C 03E00008 */ jr $ra
|
||||
/* C5AAC0 80240380 27BD0040 */ addiu $sp, $sp, 0x40
|
||||
@ -1,15 +0,0 @@
|
||||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_802403B0_C5AAF0
|
||||
/* C5AAF0 802403B0 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* C5AAF4 802403B4 AFBF0010 */ sw $ra, 0x10($sp)
|
||||
/* C5AAF8 802403B8 8C82000C */ lw $v0, 0xc($a0)
|
||||
/* C5AAFC 802403BC 3C068011 */ lui $a2, %hi(gPartnerActionStatus+0x3)
|
||||
/* C5AB00 802403C0 80C6EBB3 */ lb $a2, %lo(gPartnerActionStatus+0x3)($a2)
|
||||
/* C5AB04 802403C4 0C0B2026 */ jal evt_set_variable
|
||||
/* C5AB08 802403C8 8C450000 */ lw $a1, ($v0)
|
||||
/* C5AB0C 802403CC 8FBF0010 */ lw $ra, 0x10($sp)
|
||||
/* C5AB10 802403D0 24020002 */ addiu $v0, $zero, 2
|
||||
/* C5AB14 802403D4 03E00008 */ jr $ra
|
||||
/* C5AB18 802403D8 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
@ -1,73 +0,0 @@
|
||||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_802403DC_C5AB1C
|
||||
/* C5AB1C 802403DC 27BDFFE0 */ addiu $sp, $sp, -0x20
|
||||
/* C5AB20 802403E0 AFB10014 */ sw $s1, 0x14($sp)
|
||||
/* C5AB24 802403E4 0080882D */ daddu $s1, $a0, $zero
|
||||
/* C5AB28 802403E8 AFBF001C */ sw $ra, 0x1c($sp)
|
||||
/* C5AB2C 802403EC AFB20018 */ sw $s2, 0x18($sp)
|
||||
/* C5AB30 802403F0 AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* C5AB34 802403F4 8E30000C */ lw $s0, 0xc($s1)
|
||||
/* C5AB38 802403F8 8E050000 */ lw $a1, ($s0)
|
||||
/* C5AB3C 802403FC 0C0B1EAF */ jal evt_get_variable
|
||||
/* C5AB40 80240400 26100004 */ addiu $s0, $s0, 4
|
||||
/* C5AB44 80240404 8E050000 */ lw $a1, ($s0)
|
||||
/* C5AB48 80240408 26100004 */ addiu $s0, $s0, 4
|
||||
/* C5AB4C 8024040C 0220202D */ daddu $a0, $s1, $zero
|
||||
/* C5AB50 80240410 0C0B1EAF */ jal evt_get_variable
|
||||
/* C5AB54 80240414 0040902D */ daddu $s2, $v0, $zero
|
||||
/* C5AB58 80240418 0220202D */ daddu $a0, $s1, $zero
|
||||
/* C5AB5C 8024041C 8E050000 */ lw $a1, ($s0)
|
||||
/* C5AB60 80240420 0C0B1EAF */ jal evt_get_variable
|
||||
/* C5AB64 80240424 0040882D */ daddu $s1, $v0, $zero
|
||||
/* C5AB68 80240428 0040802D */ daddu $s0, $v0, $zero
|
||||
/* C5AB6C 8024042C 3C028016 */ lui $v0, %hi(gCollisionStatus)
|
||||
/* C5AB70 80240430 2442A550 */ addiu $v0, $v0, %lo(gCollisionStatus)
|
||||
/* C5AB74 80240434 84430002 */ lh $v1, 2($v0)
|
||||
/* C5AB78 80240438 10710008 */ beq $v1, $s1, .L8024045C
|
||||
/* C5AB7C 8024043C 00000000 */ nop
|
||||
/* C5AB80 80240440 84420004 */ lh $v0, 4($v0)
|
||||
/* C5AB84 80240444 10510005 */ beq $v0, $s1, .L8024045C
|
||||
/* C5AB88 80240448 00000000 */ nop
|
||||
/* C5AB8C 8024044C 10700003 */ beq $v1, $s0, .L8024045C
|
||||
/* C5AB90 80240450 00000000 */ nop
|
||||
/* C5AB94 80240454 14500007 */ bne $v0, $s0, .L80240474
|
||||
/* C5AB98 80240458 00000000 */ nop
|
||||
.L8024045C:
|
||||
/* C5AB9C 8024045C 44920000 */ mtc1 $s2, $f0
|
||||
/* C5ABA0 80240460 00000000 */ nop
|
||||
/* C5ABA4 80240464 46800020 */ cvt.s.w $f0, $f0
|
||||
/* C5ABA8 80240468 3C028011 */ lui $v0, %hi(gPlayerStatus)
|
||||
/* C5ABAC 8024046C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus)
|
||||
/* C5ABB0 80240470 E440001C */ swc1 $f0, 0x1c($v0)
|
||||
.L80240474:
|
||||
/* C5ABB4 80240474 3C028011 */ lui $v0, %hi(gPlayerData+0x12)
|
||||
/* C5ABB8 80240478 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0)
|
||||
/* C5ABBC 8024047C 1040000E */ beqz $v0, .L802404B8
|
||||
/* C5ABC0 80240480 00000000 */ nop
|
||||
/* C5ABC4 80240484 0C00EABB */ jal get_npc_unsafe
|
||||
/* C5ABC8 80240488 2404FFFC */ addiu $a0, $zero, -4
|
||||
/* C5ABCC 8024048C 84430084 */ lh $v1, 0x84($v0)
|
||||
/* C5ABD0 80240490 10710003 */ beq $v1, $s1, .L802404A0
|
||||
/* C5ABD4 80240494 00000000 */ nop
|
||||
/* C5ABD8 80240498 14700007 */ bne $v1, $s0, .L802404B8
|
||||
/* C5ABDC 8024049C 00000000 */ nop
|
||||
.L802404A0:
|
||||
/* C5ABE0 802404A0 C4400038 */ lwc1 $f0, 0x38($v0)
|
||||
/* C5ABE4 802404A4 44921000 */ mtc1 $s2, $f2
|
||||
/* C5ABE8 802404A8 00000000 */ nop
|
||||
/* C5ABEC 802404AC 468010A0 */ cvt.s.w $f2, $f2
|
||||
/* C5ABF0 802404B0 46020000 */ add.s $f0, $f0, $f2
|
||||
/* C5ABF4 802404B4 E4400038 */ swc1 $f0, 0x38($v0)
|
||||
.L802404B8:
|
||||
/* C5ABF8 802404B8 8FBF001C */ lw $ra, 0x1c($sp)
|
||||
/* C5ABFC 802404BC 8FB20018 */ lw $s2, 0x18($sp)
|
||||
/* C5AC00 802404C0 8FB10014 */ lw $s1, 0x14($sp)
|
||||
/* C5AC04 802404C4 8FB00010 */ lw $s0, 0x10($sp)
|
||||
/* C5AC08 802404C8 24020002 */ addiu $v0, $zero, 2
|
||||
/* C5AC0C 802404CC 03E00008 */ jr $ra
|
||||
/* C5AC10 802404D0 27BD0020 */ addiu $sp, $sp, 0x20
|
||||
/* C5AC14 802404D4 00000000 */ nop
|
||||
/* C5AC18 802404D8 00000000 */ nop
|
||||
/* C5AC1C 802404DC 00000000 */ nop
|
||||
Loading…
Reference in New Issue
Block a user