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

some more fixes

Browse Source
This commit is contained in:
dark-samus 2021-01-15 12:34:27 -05:00
parent 75cfb78012
commit 728f0e44d1
5 changed files with 11 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
asm/nonmatchings/code_109660_len_1270/func_802E7F6C.s
View File

@ -1,17 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802E7F6C
/* 1097EC 802E7F6C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 1097F0 802E7F70 3C050A00 */ lui $a1, 0xa00
/* 1097F4 802E7F74 24A54350 */ addiu $a1, $a1, 0x4350
/* 1097F8 802E7F78 AFBF0010 */ sw $ra, 0x10($sp)
/* 1097FC 802E7F7C 8C820040 */ lw $v0, 0x40($a0)
/* 109800 802E7F80 C480004C */ lwc1 $f0, 0x4c($a0)
/* 109804 802E7F84 3C060A00 */ lui $a2, 0xa00
/* 109808 802E7F88 24C626F0 */ addiu $a2, $a2, 0x26f0
/* 10980C 802E7F8C 0C0B9F78 */ jal func_802E7DE0
/* 109810 802E7F90 E440000C */ swc1 $f0, 0xc($v0)
/* 109814 802E7F94 8FBF0010 */ lw $ra, 0x10($sp)
/* 109818 802E7F98 03E00008 */ jr $ra
/* 10981C 802E7F9C 27BD0018 */ addiu $sp, $sp, 0x18

44
asm/nonmatchings/code_109660_len_1270/func_802E8858.s
View File

@ -1,44 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802E8858
/* 10A0D8 802E8858 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 10A0DC 802E885C AFB00010 */ sw $s0, 0x10($sp)
/* 10A0E0 802E8860 0080802D */ daddu $s0, $a0, $zero
/* 10A0E4 802E8864 AFBF0014 */ sw $ra, 0x14($sp)
/* 10A0E8 802E8868 92020006 */ lbu $v0, 6($s0)
/* 10A0EC 802E886C 30420001 */ andi $v0, $v0, 1
/* 10A0F0 802E8870 1040000C */ beqz $v0, .L802E88A4
/* 10A0F4 802E8874 0000202D */ daddu $a0, $zero, $zero
/* 10A0F8 802E8878 3C028011 */ lui $v0, %hi(gPlayerStatus)
/* 10A0FC 802E887C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus)
/* 10A100 802E8880 804300B4 */ lb $v1, 0xb4($v0)
/* 10A104 802E8884 2402000E */ addiu $v0, $zero, 0xe
/* 10A108 802E8888 10620003 */ beq $v1, $v0, .L802E8898
/* 10A10C 802E888C 24020010 */ addiu $v0, $zero, 0x10
/* 10A110 802E8890 14620004 */ bne $v1, $v0, .L802E88A4
/* 10A114 802E8894 00000000 */ nop
.L802E8898:
/* 10A118 802E8898 0C039769 */ jal set_action_state
/* 10A11C 802E889C 24040008 */ addiu $a0, $zero, 8
/* 10A120 802E88A0 24040001 */ addiu $a0, $zero, 1
.L802E88A4:
/* 10A124 802E88A4 1080000D */ beqz $a0, .L802E88DC
/* 10A128 802E88A8 00000000 */ nop
/* 10A12C 802E88AC 0C0B9FDB */ jal func_802E7F6C
/* 10A130 802E88B0 0200202D */ daddu $a0, $s0, $zero
/* 10A134 802E88B4 3C05802F */ lui $a1, %hi(D_802EAE7C)
/* 10A138 802E88B8 24A5AE7C */ addiu $a1, $a1, %lo(D_802EAE7C)
/* 10A13C 802E88BC 0C0442F3 */ jal func_80110BCC
/* 10A140 802E88C0 0200202D */ daddu $a0, $s0, $zero
/* 10A144 802E88C4 0C04419E */ jal func_80110678
/* 10A148 802E88C8 0200202D */ daddu $a0, $s0, $zero
/* 10A14C 802E88CC 0C043F5A */ jal func_8010FD68
/* 10A150 802E88D0 0200202D */ daddu $a0, $s0, $zero
/* 10A154 802E88D4 0C05272D */ jal play_sound
/* 10A158 802E88D8 240420AE */ addiu $a0, $zero, 0x20ae
.L802E88DC:
/* 10A15C 802E88DC 8FBF0014 */ lw $ra, 0x14($sp)
/* 10A160 802E88E0 8FB00010 */ lw $s0, 0x10($sp)
/* 10A164 802E88E4 03E00008 */ jr $ra
/* 10A168 802E88E8 27BD0018 */ addiu $sp, $sp, 0x18

5
include/variables.h
View File

@ -294,4 +294,9 @@ extern Gfx* gMasterGfxPos;
extern u16 gMatrixListPos;
extern u16 gCurrentDisplayContextIndex;
extern UNK_TYPE D_0A004350;
extern UNK_TYPE D_0A0026F0;
extern UNK_TYPE D_802EAE7C;
extern f64 D_802EB370;
#endif

16
src/code_109660_len_1270.c
View File

@ -44,26 +44,18 @@ void func_802E7F40(Entity* entity) {
temp_v1->unk_00 = D_8015C7D0;
}
extern UNK_TYPE D_0A004350;
extern UNK_TYPE D_0A0026F0;
INCLUDE_ASM(s32, "code_109660_len_1270", func_802E7F6C);
/*void func_802E7F6C(Entity* entity) {
void func_802E7F6C(Entity* entity) {
struct802E7F40* temp = entity->dataBuf;
temp->unk_0C = entity->position.y;
func_802E7DE0(entity, &D_0A004350, &D_0A0026F0);
}*/
}
INCLUDE_ASM(s32, "code_109660_len_1270", func_802E7FA0);
INCLUDE_ASM(s32, "code_109660_len_1270", func_802E854C);
extern UNK_TYPE D_802EAE7C;
extern f64 D_802EB370;
INCLUDE_ASM(s32, "code_109660_len_1270", func_802E8858);
/*s32 func_802E8858(Entity* entity) {
s32 func_802E8858(Entity* entity) {
PlayerStatus* playerStatus = &gPlayerStatus;
s32 phi_a0 = 0;
@ -81,7 +73,7 @@ INCLUDE_ASM(s32, "code_109660_len_1270", func_802E8858);
func_8010FD68(entity);
play_sound(0x20AE);
}
}*/
}
INCLUDE_ASM(s32, "code_109660_len_1270", func_802E88EC);

2
undefined_syms.txt
View File

@ -78,3 +78,5 @@ D_0A000380 = 0x0A000380;
D_0A000800 = 0x0A000800;
D_0A000750 = 0x0A000750;
D_0A000750 = 0x0A000750;
D_0A004350 = 0x0A004350;
D_0A0026F0 = 0x0A0026F0;