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

Fix ROM shift.

Browse Source
This commit is contained in:
brotenko@gmail.com 2021-02-14 22:14:53 +01:00
parent a4789cfddd
commit ddf89a2336
12 changed files with 16 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
asm/nonmatchings/battle/move/spin_smash_737890/func_802A10EC_73797C.s generated
View File

@ -1,25 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802A10EC_73797C
/* 73797C 802A10EC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 737980 802A10F0 AFB00010 */ sw $s0, 0x10($sp)
/* 737984 802A10F4 0080802D */ daddu $s0, $a0, $zero
/* 737988 802A10F8 2402000F */ addiu $v0, $zero, 0xf
/* 73798C 802A10FC 3C03800E */ lui $v1, %hi(gBattleStatus+0x83)
/* 737990 802A1100 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1)
/* 737994 802A1104 24040015 */ addiu $a0, $zero, 0x15
/* 737998 802A1108 AFBF0014 */ sw $ra, 0x14($sp)
/* 73799C 802A110C AE020088 */ sw $v0, 0x88($s0)
/* 7379A0 802A1110 0C03A752 */ jal is_ability_active
/* 7379A4 802A1114 AE030084 */ sw $v1, 0x84($s0)
/* 7379A8 802A1118 10400003 */ beqz $v0, .L802A1128
/* 7379AC 802A111C 24020028 */ addiu $v0, $zero, 0x28
/* 7379B0 802A1120 AE000084 */ sw $zero, 0x84($s0)
/* 7379B4 802A1124 AE020088 */ sw $v0, 0x88($s0)
.L802A1128:
/* 7379B8 802A1128 8FBF0014 */ lw $ra, 0x14($sp)
/* 7379BC 802A112C 8FB00010 */ lw $s0, 0x10($sp)
/* 7379C0 802A1130 24020002 */ addiu $v0, $zero, 2
/* 7379C4 802A1134 03E00008 */ jr $ra
/* 7379C8 802A1138 27BD0018 */ addiu $sp, $sp, 0x18

27
asm/nonmatchings/code_77F240/func_802A1050_77F290.s generated
View File

@ -1,27 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802A1050_77F290
/* 77F290 802A1050 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 77F294 802A1054 AFB00010 */ sw $s0, 0x10($sp)
/* 77F298 802A1058 0080802D */ daddu $s0, $a0, $zero
/* 77F29C 802A105C 24040016 */ addiu $a0, $zero, 0x16
/* 77F2A0 802A1060 AFBF0014 */ sw $ra, 0x14($sp)
/* 77F2A4 802A1064 0C03A752 */ jal is_ability_active
/* 77F2A8 802A1068 AE000084 */ sw $zero, 0x84($s0)
/* 77F2AC 802A106C 10400002 */ beqz $v0, .L802A1078
/* 77F2B0 802A1070 24020001 */ addiu $v0, $zero, 1
/* 77F2B4 802A1074 AE020084 */ sw $v0, 0x84($s0)
.L802A1078:
/* 77F2B8 802A1078 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 77F2BC 802A107C 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0)
/* 77F2C0 802A1080 30421000 */ andi $v0, $v0, 0x1000
/* 77F2C4 802A1084 10400002 */ beqz $v0, .L802A1090
/* 77F2C8 802A1088 24020001 */ addiu $v0, $zero, 1
/* 77F2CC 802A108C AE020084 */ sw $v0, 0x84($s0)
.L802A1090:
/* 77F2D0 802A1090 8FBF0014 */ lw $ra, 0x14($sp)
/* 77F2D4 802A1094 8FB00010 */ lw $s0, 0x10($sp)
/* 77F2D8 802A1098 24020002 */ addiu $v0, $zero, 2
/* 77F2DC 802A109C 03E00008 */ jr $ra
/* 77F2E0 802A10A0 27BD0018 */ addiu $sp, $sp, 0x18

2
src/battle/move/d_down_jump_781920.c
View File

@ -37,7 +37,7 @@ ApiStatus func_802A10E4_781A04(ScriptInstance* script, s32 isInitialCall) {
if (script->varTable[10] == 0) {
func_80070B50(TRUE, var0, var1, var2, 0.0f);
} else {
func_80070B50(FALSE, var0, var1, var2, 0.,0f);
func_80070B50(FALSE, var0, var1, var2, 0.0f);
}
return ApiStatus_DONE2;

5
src/battle/move/hammer_charge_1_7595B0.c
View File

@ -1,7 +1,6 @@
#include "common.h"
extern s32 D_802A2C50;
extern UNK_TYPE D_802A43D0;
extern s32 D_802A43D0;
ApiStatus func_802A1000_7595B0(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = *(&gBattleStatus.unk_83);
@ -50,7 +49,7 @@ ApiStatus func_802A10C8_759678(ScriptInstance* script, s32 isInitialCall) {
s32* var4;
func_800718D0(1, var1, var2, var3, 1.0f, 60);
var4 = &D_802A2C50;
var4 = &D_802A43D0;
*var4 = 0;
if (battleStatus2->hammerCharge > 0) {
*var4 = 1;

7
src/battle/move/hammer_charge_2_75E5D0.c
View File

@ -1,7 +1,6 @@
#include "common.h"
extern s32 D_802A2C50;
extern UNK_TYPE D_802A43D0;
extern s32 D_802A4350;
ApiStatus func_802A1000_75E5D0(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = *(&gBattleStatus.unk_83);
@ -50,7 +49,7 @@ ApiStatus func_802A10C8_75E698(ScriptInstance* script, s32 isInitialCall) {
s32* var4;
func_800718D0(2, var1, var2, var3, 1.0f, 60);
var4 = &D_802A2C50;
var4 = &D_802A4350;
*var4 = 0;
if (battleStatus2->hammerCharge > 0) {
*var4 = 1;
@ -84,7 +83,7 @@ ApiStatus func_802A11E8_75E7B8(ScriptInstance* script, s32 isInitialCall) {
}
ApiStatus func_802A12FC_75E8CC(ScriptInstance* script, s32 isInitialCall) {
if (D_802A43D0 == 0) {
if (D_802A4350 == 0) {
script->varTable[0] = 4;
} else {
script->varTable[0] = 5;

3
src/battle/move/jump_charge_1_75C980.c
View File

@ -1,7 +1,6 @@
#include "common.h"
extern s32 D_802A2C50;
extern UNK_TYPE D_802A43D0;
ApiStatus func_802A1000_75C980(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
@ -86,7 +85,7 @@ ApiStatus func_802A1228_75CBA8(ScriptInstance* script, s32 isInitialCall) {
}
ApiStatus func_802A133C_75CCBC(ScriptInstance* script, s32 isInitialCall) {
if (D_802A43D0 == 0) {
if (D_802A2C50 == 0) {
script->varTable[0] = 6;
} else {
script->varTable[0] = 7;

7
src/battle/move/jump_charge_2_761920.c
View File

@ -1,7 +1,6 @@
#include "common.h"
extern s32 D_802A2C50;
extern UNK_TYPE D_802A43D0;
extern s32 D_802A2C20;
ApiStatus func_802A1000_761920(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
@ -52,7 +51,7 @@ ApiStatus func_802A1108_761A28(ScriptInstance* script, s32 isInitialCall) {
s32* var4;
func_800718D0(2, var1, var2, var3, 1.0f, 60);
var4 = &D_802A2C50;
var4 = &D_802A2C20;
*var4 = 0;
if (battleStatus2->jumpCharge > 0) {
*var4 = 1;
@ -86,7 +85,7 @@ ApiStatus func_802A1228_761B48(ScriptInstance* script, s32 isInitialCall) {
}
ApiStatus func_802A133C_761C5C(ScriptInstance* script, s32 isInitialCall) {
if (D_802A43D0 == 0) {
if (D_802A2C20 == 0) {
script->varTable[0] = 6;
} else {
script->varTable[0] = 7;

1
src/battle/move/mega_quake_756780.c
View File

@ -27,3 +27,4 @@ ApiStatus func_802A1050_7567D0(ScriptInstance* script, s32 isInitialCall) {
}
INCLUDE_ASM(s32, "battle/move/mega_quake_756780", func_802A10A4_756824);

2
src/battle/move/shell_crack_77F240.c
View File

@ -12,7 +12,7 @@ ApiStatus func_802A1000_77F240(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus func_802A10A4_77F2E4(ScriptInstance* script, s32 isInitialCall) {
ApiStatus func_802A1050_77F290(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = 0;
if (is_ability_active(Ability_RIGHT_ON) != FALSE) {

1
src/battle/move/spin_smash_737890.c
View File

@ -4,7 +4,6 @@ INCLUDE_ASM(s32, "battle/move/spin_smash_737890", func_802A1000_737890);
INCLUDE_ASM(s32, "battle/move/spin_smash_737890", func_802A1074_737904);
INCLUDE_ASM(s32, "battle/move/spin_smash_737890", func_802A10EC_73797C);
ApiStatus func_802A10EC_73797C(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = *(&gBattleStatus.unk_83);
script->varTable[1] = 15;

4
src/battle/partner/goombario_6F10E0.c
View File

@ -1,6 +1,6 @@
#include "common.h"
extern UNK_TYPE D_802A43D0;
extern s32 D_8023CDA4;
//INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_80238000_6F10E0);
ApiStatus func_80238000_6F10E0(ScriptInstance* script, s32 isInitialCall) {
@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_802390B0_6F2190);
INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_802390C8_6F21A8);
ApiStatus func_80239190_6F2270(ScriptInstance* script, s32 isInitialCall) {
if (D_802A43D0 == 0) {
if (D_8023CDA4 == 0) {
script->varTable[0] = 36;
} else {
script->varTable[0] = 37;

4
src/os/code_4ac90_len_3910.c
View File

@ -107,7 +107,7 @@ INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070AF0, s32 arg0, f32 arg1, f
INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070B50, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4);
INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070BB0);
INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070BB0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070C10);
@ -177,7 +177,7 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071810);
INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071870);
INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800718D0);
INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_800718D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071930);