falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix data type issues and run coverage.py

This commit is contained in:
brotenko@gmail.com 2021-02-13 01:04:40 +01:00
parent 19eef41547
commit a3fa592845
3 changed files with 4 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
asm/nonmatchings/code_1AF120/ActorAddMovePos.s generated
View File

@ -1,56 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel ActorAddMovePos
/* 1AF160 80280880 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 1AF164 80280884 AFB10014 */ sw $s1, 0x14($sp)
/* 1AF168 80280888 0080882D */ daddu $s1, $a0, $zero
/* 1AF16C 8028088C AFBF001C */ sw $ra, 0x1c($sp)
/* 1AF170 80280890 AFB20018 */ sw $s2, 0x18($sp)
/* 1AF174 80280894 AFB00010 */ sw $s0, 0x10($sp)
/* 1AF178 80280898 8E30000C */ lw $s0, 0xc($s1)
/* 1AF17C 8028089C 8E050000 */ lw $a1, ($s0)
/* 1AF180 802808A0 0C0B1EAF */ jal get_variable
/* 1AF184 802808A4 26100004 */ addiu $s0, $s0, 4
/* 1AF188 802808A8 0220202D */ daddu $a0, $s1, $zero
/* 1AF18C 802808AC 8E050000 */ lw $a1, ($s0)
/* 1AF190 802808B0 0C0B1EAF */ jal get_variable
/* 1AF194 802808B4 0040902D */ daddu $s2, $v0, $zero
/* 1AF198 802808B8 8E43000C */ lw $v1, 0xc($s2)
/* 1AF19C 802808BC C4600004 */ lwc1 $f0, 4($v1)
/* 1AF1A0 802808C0 44821000 */ mtc1 $v0, $f2
/* 1AF1A4 802808C4 00000000 */ nop
/* 1AF1A8 802808C8 468010A0 */ cvt.s.w $f2, $f2
/* 1AF1AC 802808CC 46020000 */ add.s $f0, $f0, $f2
/* 1AF1B0 802808D0 26100004 */ addiu $s0, $s0, 4
/* 1AF1B4 802808D4 E4600004 */ swc1 $f0, 4($v1)
/* 1AF1B8 802808D8 8E050000 */ lw $a1, ($s0)
/* 1AF1BC 802808DC 0C0B1EAF */ jal get_variable
/* 1AF1C0 802808E0 0220202D */ daddu $a0, $s1, $zero
/* 1AF1C4 802808E4 8E43000C */ lw $v1, 0xc($s2)
/* 1AF1C8 802808E8 C4600008 */ lwc1 $f0, 8($v1)
/* 1AF1CC 802808EC 44821000 */ mtc1 $v0, $f2
/* 1AF1D0 802808F0 00000000 */ nop
/* 1AF1D4 802808F4 468010A0 */ cvt.s.w $f2, $f2
/* 1AF1D8 802808F8 46020000 */ add.s $f0, $f0, $f2
/* 1AF1DC 802808FC 26100004 */ addiu $s0, $s0, 4
/* 1AF1E0 80280900 E4600008 */ swc1 $f0, 8($v1)
/* 1AF1E4 80280904 8E050000 */ lw $a1, ($s0)
/* 1AF1E8 80280908 0C0B1EAF */ jal get_variable
/* 1AF1EC 8028090C 0220202D */ daddu $a0, $s1, $zero
/* 1AF1F0 80280910 8E43000C */ lw $v1, 0xc($s2)
/* 1AF1F4 80280914 C460000C */ lwc1 $f0, 0xc($v1)
/* 1AF1F8 80280918 44821000 */ mtc1 $v0, $f2
/* 1AF1FC 8028091C 00000000 */ nop
/* 1AF200 80280920 468010A0 */ cvt.s.w $f2, $f2
/* 1AF204 80280924 46020000 */ add.s $f0, $f0, $f2
/* 1AF208 80280928 E460000C */ swc1 $f0, 0xc($v1)
/* 1AF20C 8028092C 8FBF001C */ lw $ra, 0x1c($sp)
/* 1AF210 80280930 8FB20018 */ lw $s2, 0x18($sp)
/* 1AF214 80280934 8FB10014 */ lw $s1, 0x14($sp)
/* 1AF218 80280938 8FB00010 */ lw $s0, 0x10($sp)
/* 1AF21C 8028093C 24020002 */ addiu $v0, $zero, 2
/* 1AF220 80280940 03E00008 */ jr $ra
/* 1AF224 80280944 27BD0020 */ addiu $sp, $sp, 0x20
/* 1AF228 80280948 00000000 */ nop
/* 1AF22C 8028094C 00000000 */ nop

44
asm/nonmatchings/code_1AF230/LoadStarPowerScript.s generated
View File

@ -1,44 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel LoadStarPowerScript
/* 1AF230 80280950 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 1AF234 80280954 AFB10014 */ sw $s1, 0x14($sp)
/* 1AF238 80280958 0080882D */ daddu $s1, $a0, $zero
/* 1AF23C 8028095C 3C05800E */ lui $a1, %hi(gBattleStatus)
/* 1AF240 80280960 24A5C070 */ addiu $a1, $a1, %lo(gBattleStatus)
/* 1AF244 80280964 AFBF0018 */ sw $ra, 0x18($sp)
/* 1AF248 80280968 AFB00010 */ sw $s0, 0x10($sp)
/* 1AF24C 8028096C 84A3017C */ lh $v1, 0x17c($a1)
/* 1AF250 80280970 3C048011 */ lui $a0, %hi(gPlayerData)
/* 1AF254 80280974 2484F290 */ addiu $a0, $a0, %lo(gPlayerData)
/* 1AF258 80280978 00031080 */ sll $v0, $v1, 2
/* 1AF25C 8028097C 00431021 */ addu $v0, $v0, $v1
/* 1AF260 80280980 00021080 */ sll $v0, $v0, 2
/* 1AF264 80280984 3C018009 */ lui $at, %hi(D_8008F071)
/* 1AF268 80280988 00220821 */ addu $at, $at, $v0
/* 1AF26C 8028098C 8022F071 */ lb $v0, %lo(D_8008F071)($at)
/* 1AF270 80280990 94830290 */ lhu $v1, 0x290($a0)
/* 1AF274 80280994 00021200 */ sll $v0, $v0, 8
/* 1AF278 80280998 00621823 */ subu $v1, $v1, $v0
/* 1AF27C 8028099C A4830290 */ sh $v1, 0x290($a0)
/* 1AF280 802809A0 84B0017A */ lh $s0, 0x17a($a1)
/* 1AF284 802809A4 3C02802A */ lui $v0, %hi(D_8029C7D0)
/* 1AF288 802809A8 2442C7D0 */ addiu $v0, $v0, %lo(D_8029C7D0)
/* 1AF28C 802809AC 00108100 */ sll $s0, $s0, 4
/* 1AF290 802809B0 02028021 */ addu $s0, $s0, $v0
/* 1AF294 802809B4 8E040000 */ lw $a0, ($s0)
/* 1AF298 802809B8 8E050004 */ lw $a1, 4($s0)
/* 1AF29C 802809BC 0C00A5CF */ jal dma_copy
/* 1AF2A0 802809C0 8E060008 */ lw $a2, 8($s0)
/* 1AF2A4 802809C4 8E03000C */ lw $v1, 0xc($s0)
/* 1AF2A8 802809C8 AE230084 */ sw $v1, 0x84($s1)
/* 1AF2AC 802809CC 8FBF0018 */ lw $ra, 0x18($sp)
/* 1AF2B0 802809D0 8FB10014 */ lw $s1, 0x14($sp)
/* 1AF2B4 802809D4 8FB00010 */ lw $s0, 0x10($sp)
/* 1AF2B8 802809D8 24020002 */ addiu $v0, $zero, 2
/* 1AF2BC 802809DC 03E00008 */ jr $ra
/* 1AF2C0 802809E0 27BD0020 */ addiu $sp, $sp, 0x20
/* 1AF2C4 802809E4 00000000 */ nop
/* 1AF2C8 802809E8 00000000 */ nop
/* 1AF2CC 802809EC 00000000 */ nop

8
src/code_341d0.c
View File

@ -133,13 +133,13 @@ void remove_effect(EffectInstance* arg0) {
ASSERT(i < ARRAY_COUNT(D_800B4398));
if (arg0->unk_0C == NULL) {
if (arg0->data == NULL) {
general_heap_free(arg0);
D_800B4398[i] = NULL;
return;
}
general_heap_free(arg0->unk_0C);
general_heap_free(arg0->data);
general_heap_free(arg0);
D_800B4398[i] = NULL;
}
@ -151,8 +151,8 @@ void remove_all_effects(void) {
for (i = 0; i < ARRAY_COUNT(D_800B4398); i++) {
EffectInstance* temp2 = temp[i];
if (temp2 != NULL && temp2->flags & 4) {
if (temp2->unk_0C != NULL) {
general_heap_free(temp2->unk_0C);
if (temp2->data != NULL) {
general_heap_free(temp2->data);
}
general_heap_free(temp2);
temp[i] = NULL;