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

Decomp RestorePreDefeatState + 2 more, add enum for RushFlags (#651)

Browse Source 
* 3 funcs

* Rename rushesFlags to rushFlags, rename the RushFlags enum values
This commit is contained in:
JaThePlayer 2022-02-19 17:46:27 +01:00 committed by GitHub
parent e98ea95df4
commit b427897581
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 186 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common_structs.h
View File

@ -891,7 +891,7 @@ typedef struct BattleStatus {
/* 0x096 */ s8 hammerCharge;
/* 0x097 */ s8 jumpCharge;
/* 0x098 */ char unk_98;
/* 0x099 */ u8 rushesFlags; /* 1 = mega rush, 2 = power rush */
/* 0x099 */ u8 rushFlags; /* 1 = mega rush, 2 = power rush */
/* 0x09A */ s8 outtaSightActive;
/* 0x09B */ s8 turboChargeTurnsLeft;
/* 0x09C */ u8 turboChargeAmount; /* unused? */

7
include/enums.h
View File

@ -2410,6 +2410,7 @@ enum BattleStatusFlags2 {
BS_FLAGS2_NO_TARGET_AVAILABLE = 0x00001000,
BS_FLAGS2_1000000 = 0x01000000,
BS_FLAGS2_2000000 = 0x02000000,
BS_FLAGS2_8000000 = 0x08000000,
};
enum BattleStates2 {
@ -3325,4 +3326,10 @@ enum WindowGroupId {
WINDOW_GROUP_FILE_MENU = 3,
};
enum RushFlags {
RUSH_FLAG_NONE = 0,
RUSH_FLAG_MEGA = 1,
RUSH_FLAG_POWER = 2,
};
#endif

29
src/18F340.c
View File

@ -201,33 +201,30 @@ ApiStatus ConsumeLifeShroom(Evt *script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
// TODO something wrong with the struct breakdown for BattleStatus
#ifdef NON_EQUIVALENT
ApiStatus RestorePreDefeatState(Evt* script, s32 isInitialCall) {
PlayerData* playerData = &gPlayerData;
BattleStatus* battleStatus = &gBattleStatus;
battleStatus->dangerFlags = 0;
gBattleState = battleStatus->unk_474;
battleStatus->battleState = battleStatus->unk_468;
battleStatus->flags1 |= 8;
battleStatus->flags2 &= ~0x8000000;
battleStatus->rushFlags = RUSH_FLAG_NONE;
gBattleState = D_800DC4E4;
gBattleState2 = D_800DC4D8;
battleStatus->flags1 |= BS_FLAGS1_8;
battleStatus->flags2 &= ~BS_FLAGS2_8000000;
if (!(battleStatus->flags2 & 0x40)) {
if (!(battleStatus->flags2 & BS_FLAGS2_40)) {
if (playerData->curHP <= 1 && is_ability_active(ABILITY_MEGA_RUSH)) {
battleStatus->flags2 |= 0x8000000;
gBattleStatus.dangerFlags |= 1;
gBattleStatus.flags2 |= BS_FLAGS2_8000000;
battleStatus->rushFlags |= RUSH_FLAG_MEGA;
}
if (playerData->curHP <= 5 && is_ability_active(ABILITY_POWER_RUSH) && !(battleStatus->dangerFlags & 1)) {
battleStatus->flags2 |= 0x8000000;
gBattleStatus.dangerFlags |= 2;
if (playerData->curHP <= 5 && is_ability_active(ABILITY_POWER_RUSH) &&
!(battleStatus->rushFlags & RUSH_FLAG_MEGA)) {
gBattleStatus.flags2 |= BS_FLAGS2_8000000;
battleStatus->rushFlags |= RUSH_FLAG_POWER;
}
}
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "18F340", RestorePreDefeatState);
#endif
ApiStatus func_80261388(Evt* script, s32 isInitialCall) {
s32 partnerActorExists = gBattleStatus.partnerActor != NULL;

25
src/341d0.c
View File

@ -37,6 +37,16 @@ s32 D_8007F1D0[] = {
0x00000000
};
typedef struct unk341d0 {
s32 unk_00;
s16 unk_04;
s16 unk_06;
s16 unk_08;
s16 unk_0A;
s16* unk_0C;
s16* unk_10;
} unk341d0;
s32* D_8007F1F8 = D_8007F1D0;
s32* D_8007F1FC = D_8007F1D0;
@ -45,13 +55,26 @@ s32* D_8007F200 = D_8007F1D0;
s32* D_8007F204 = D_8007F1D0;
void func_80058DD0(s16* arg);
INCLUDE_ASM(s32, "341d0", func_80058DD0);
INCLUDE_ASM(s32, "341d0", func_80058E84);
INCLUDE_ASM(s32, "341d0", func_80058F88);
INCLUDE_ASM(s32, "341d0", func_80059008);
void func_80059008(unk341d0* arg0, s16 arg1, s16 arg2, s16 arg3) {
arg0->unk_06 = arg1;
arg0->unk_08 = arg2;
if (arg3 != 0) {
arg0->unk_0C = arg0->unk_10;
*arg0->unk_0C = arg3;
func_80058DD0(arg0->unk_0C);
return;
}
arg0->unk_0C = NULL;
}
INCLUDE_ASM(s32, "341d0", func_8005904C);

142
src/891b0_len_fb0.c
View File

@ -1,17 +1,157 @@
#include "common.h"
#include "effects.h"
void func_800EFE2C(void);
void func_800F0248(void);
void func_800F0490(void);
void func_800F0864(void);
void func_800F09EC(void);
void func_800F0B3C(void);
extern s32 D_80109480;
extern s32 D_8010CFF0;
extern s32 D_8010CFF4;
extern f32 D_8010948C;
extern s16 D_80109490;
extern s16 D_80109492;
extern s32 D_80109494;
extern s16 D_801094A4;
extern s32 D_801094A8;
void func_800EFD00(void) {
}
INCLUDE_ASM(s32, "891b0_len_fb0", func_800EFD08);
void func_800EFD08(void) {
s32 colliderType = 0;
PlayerStatus* playerStatus = &gPlayerStatus;
if (playerStatus->actionState == ACTION_STATE_JUMP) {
colliderType = D_80109480;
}
D_80109480 = get_collider_type_by_id((u16)gCollisionStatus.currentFloor) & 0xFF;
if (playerStatus->actionState != ACTION_STATE_JUMP) {
colliderType = D_80109480;
}
if (playerStatus->actionState == ACTION_STATE_LAND && playerStatus->flags < 0) {
D_8010CFF4 = D_8010CFF0;
}
D_8010CFF0 = playerStatus->decorationList;
switch (colliderType) {
case 6:
func_800F0248();
break;
case 7:
func_800F0490();
break;
case 8:
func_800F0864();
break;
case 9:
func_800F09EC();
break;
case 1:
func_800F0B3C();
break;
default:
func_800EFE2C();
break;
}
}
INCLUDE_ASM(s32, "891b0_len_fb0", func_800EFE2C);
#ifdef NON_EQUIVALENT // requires data migration + float weirdness in the last if
void func_800F0248(void) {
PlayerStatus* playerStatus = &gPlayerStatus;
f32 sin, cos, x, y, z;
if (playerStatus->actionState == ACTION_STATE_JUMP && playerStatus->decorationList == 1 && D_80109492 == 5) {
fx_flower_splash(
playerStatus->position.x,
playerStatus->position.y + 14.0f,
playerStatus->position.z,
D_8010948C
);
D_8010948C = clamp_angle(D_8010948C + 35.0f);
D_80109492 = 0;
return;
}
D_80109492++;
if (D_80109492 > 5) {
D_80109492 = 5;
}
if (
playerStatus->actionState != ACTION_STATE_WALK && playerStatus->actionState != ACTION_STATE_RUN &&
(playerStatus->actionState != ACTION_STATE_SPIN || playerStatus->fallState != 0)
) {
D_80109490 = 0;
return;
}
if (D_80109490++ > 0) {
D_80109490 = 0;
sin_cos_rad((clamp_angle(-playerStatus->currentYaw) * TAU) / 360.0f, &sin, &cos);
x = (playerStatus->colliderDiameter * sin * -0.4f) + playerStatus->position.x;
z = (playerStatus->colliderDiameter * cos * -0.4f) + playerStatus->position.z;
y = playerStatus->position.y + 15.5f;
fx_flower_trail(
0,
x,
y,
z,
-playerStatus->currentYaw + rand_int(10) - 5.0f,
D_80109494
);
D_80109494 = !D_80109494;
}
}
#else
INCLUDE_ASM(s32, "891b0_len_fb0", func_800F0248);
#endif
INCLUDE_ASM(s32, "891b0_len_fb0", func_800F0490);
#ifdef NON_MATCHING // requires data migration
void func_800F0864(void) {
f32 sin, cos;
PlayerStatus* playerStatus = &gPlayerStatus;
if (
(
playerStatus->actionState != ACTION_STATE_WALK && playerStatus->actionState != ACTION_STATE_RUN &&
(playerStatus->actionState != ACTION_STATE_SPIN || playerStatus->fallState != 0) &&
playerStatus->actionState != ACTION_STATE_LAND && playerStatus->actionState != ACTION_STATE_IDLE
) || playerStatus->flags >= 0
) {
D_801094A4 = 4;
return;
}
if (D_801094A4++ >= 4) {
D_801094A4 = 0;
sin_cos_rad((clamp_angle(-playerStatus->currentYaw) * TAU) / 360.0f, &sin, &cos);
fx_footprint(
playerStatus->position.x + (playerStatus->colliderDiameter * sin * 0.2f),
playerStatus->position.y + 1.5f,
playerStatus->position.z + (playerStatus->colliderDiameter * cos * 0.2f),
-playerStatus->currentYaw,
D_801094A8
);
D_801094A8 = !D_801094A8;
}
}
#else
INCLUDE_ASM(s32, "891b0_len_fb0", func_800F0864);
#endif
INCLUDE_ASM(s32, "891b0_len_fb0", func_800F09EC);

73
ver/us/asm/nonmatchings/18F340/RestorePreDefeatState.s
View File

@ -1,73 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel RestorePreDefeatState
/* 18FB5C 8026127C 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 18FB60 80261280 3C04F7FF */ lui $a0, 0xf7ff
/* 18FB64 80261284 3C02800E */ lui $v0, %hi(gBattleStatus+0x474)
/* 18FB68 80261288 8C42C4E4 */ lw $v0, %lo(gBattleStatus+0x474)($v0)
/* 18FB6C 8026128C 3C03800E */ lui $v1, %hi(D_800DC4D8)
/* 18FB70 80261290 8C63C4D8 */ lw $v1, %lo(D_800DC4D8)($v1)
/* 18FB74 80261294 3484FFFF */ ori $a0, $a0, 0xffff
/* 18FB78 80261298 AFB00010 */ sw $s0, 0x10($sp)
/* 18FB7C 8026129C 3C10800E */ lui $s0, %hi(gBattleStatus)
/* 18FB80 802612A0 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus)
/* 18FB84 802612A4 AFBF0018 */ sw $ra, 0x18($sp)
/* 18FB88 802612A8 AFB10014 */ sw $s1, 0x14($sp)
/* 18FB8C 802612AC A2000099 */ sb $zero, 0x99($s0)
/* 18FB90 802612B0 3C01800E */ lui $at, %hi(gBattleState)
/* 18FB94 802612B4 AC22C068 */ sw $v0, %lo(gBattleState)($at)
/* 18FB98 802612B8 8E020000 */ lw $v0, ($s0)
/* 18FB9C 802612BC 3C118011 */ lui $s1, %hi(gPlayerData)
/* 18FBA0 802612C0 2631F290 */ addiu $s1, $s1, %lo(gPlayerData)
/* 18FBA4 802612C4 3C01800E */ lui $at, %hi(gBattleState2)
/* 18FBA8 802612C8 AC23C4DC */ sw $v1, %lo(gBattleState2)($at)
/* 18FBAC 802612CC 8E030004 */ lw $v1, 4($s0)
/* 18FBB0 802612D0 34420008 */ ori $v0, $v0, 8
/* 18FBB4 802612D4 00642024 */ and $a0, $v1, $a0
/* 18FBB8 802612D8 30630040 */ andi $v1, $v1, 0x40
/* 18FBBC 802612DC AE020000 */ sw $v0, ($s0)
/* 18FBC0 802612E0 14600023 */ bnez $v1, .L80261370
/* 18FBC4 802612E4 AE040004 */ sw $a0, 4($s0)
/* 18FBC8 802612E8 82220002 */ lb $v0, 2($s1)
/* 18FBCC 802612EC 28420002 */ slti $v0, $v0, 2
/* 18FBD0 802612F0 1040000B */ beqz $v0, .L80261320
/* 18FBD4 802612F4 00000000 */ nop
/* 18FBD8 802612F8 0C03A752 */ jal is_ability_active
/* 18FBDC 802612FC 24040014 */ addiu $a0, $zero, 0x14
/* 18FBE0 80261300 10400007 */ beqz $v0, .L80261320
/* 18FBE4 80261304 3C020800 */ lui $v0, 0x800
/* 18FBE8 80261308 8E030004 */ lw $v1, 4($s0)
/* 18FBEC 8026130C 92040099 */ lbu $a0, 0x99($s0)
/* 18FBF0 80261310 00621825 */ or $v1, $v1, $v0
/* 18FBF4 80261314 34840001 */ ori $a0, $a0, 1
/* 18FBF8 80261318 AE030004 */ sw $v1, 4($s0)
/* 18FBFC 8026131C A2040099 */ sb $a0, 0x99($s0)
.L80261320:
/* 18FC00 80261320 82220002 */ lb $v0, 2($s1)
/* 18FC04 80261324 28420006 */ slti $v0, $v0, 6
/* 18FC08 80261328 10400011 */ beqz $v0, .L80261370
/* 18FC0C 8026132C 00000000 */ nop
/* 18FC10 80261330 0C03A752 */ jal is_ability_active
/* 18FC14 80261334 2404001E */ addiu $a0, $zero, 0x1e
/* 18FC18 80261338 1040000D */ beqz $v0, .L80261370
/* 18FC1C 8026133C 00000000 */ nop
/* 18FC20 80261340 92020099 */ lbu $v0, 0x99($s0)
/* 18FC24 80261344 30420001 */ andi $v0, $v0, 1
/* 18FC28 80261348 14400009 */ bnez $v0, .L80261370
/* 18FC2C 8026134C 3C040800 */ lui $a0, 0x800
/* 18FC30 80261350 3C05800E */ lui $a1, %hi(gBattleStatus)
/* 18FC34 80261354 24A5C070 */ addiu $a1, $a1, %lo(gBattleStatus)
/* 18FC38 80261358 8CA20004 */ lw $v0, 4($a1)
/* 18FC3C 8026135C 92030099 */ lbu $v1, 0x99($s0)
/* 18FC40 80261360 00441025 */ or $v0, $v0, $a0
/* 18FC44 80261364 34630002 */ ori $v1, $v1, 2
/* 18FC48 80261368 ACA20004 */ sw $v0, 4($a1)
/* 18FC4C 8026136C A2030099 */ sb $v1, 0x99($s0)
.L80261370:
/* 18FC50 80261370 8FBF0018 */ lw $ra, 0x18($sp)
/* 18FC54 80261374 8FB10014 */ lw $s1, 0x14($sp)
/* 18FC58 80261378 8FB00010 */ lw $s0, 0x10($sp)
/* 18FC5C 8026137C 24020002 */ addiu $v0, $zero, 2
/* 18FC60 80261380 03E00008 */ jr $ra
/* 18FC64 80261384 27BD0020 */ addiu $sp, $sp, 0x20

23
ver/us/asm/nonmatchings/341d0/func_80059008.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80059008
/* 34408 80059008 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 3440C 8005900C 00071400 */ sll $v0, $a3, 0x10
/* 34410 80059010 AFBF0010 */ sw $ra, 0x10($sp)
/* 34414 80059014 A4850006 */ sh $a1, 6($a0)
/* 34418 80059018 10400008 */ beqz $v0, .L8005903C
/* 3441C 8005901C A4860008 */ sh $a2, 8($a0)
/* 34420 80059020 8C820010 */ lw $v0, 0x10($a0)
/* 34424 80059024 AC82000C */ sw $v0, 0xc($a0)
/* 34428 80059028 A4470000 */ sh $a3, ($v0)
/* 3442C 8005902C 0C016374 */ jal func_80058DD0
/* 34430 80059030 8C84000C */ lw $a0, 0xc($a0)
/* 34434 80059034 08016410 */ j .L80059040
/* 34438 80059038 00000000 */ nop
.L8005903C:
/* 3443C 8005903C AC80000C */ sw $zero, 0xc($a0)
.L80059040:
/* 34440 80059040 8FBF0010 */ lw $ra, 0x10($sp)
/* 34444 80059044 03E00008 */ jr $ra
/* 34448 80059048 27BD0018 */ addiu $sp, $sp, 0x18

94
ver/us/asm/nonmatchings/891b0_len_fb0/func_800EFD08.s
View File

@ -1,94 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel jtbl_8010C2E8
.word .L800EFDFC_892AC, .L800EFE0C_892BC, .L800EFE0C_892BC, .L800EFE0C_892BC, .L800EFE0C_892BC, .L800EFDBC_8926C, .L800EFDCC_8927C, .L800EFDDC_8928C, .L800EFDEC_8929C, 0
.section .text
glabel func_800EFD08
/* 891B8 800EFD08 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 891BC 800EFD0C AFB00010 */ sw $s0, 0x10($sp)
/* 891C0 800EFD10 AFB10014 */ sw $s1, 0x14($sp)
/* 891C4 800EFD14 3C118011 */ lui $s1, %hi(gPlayerStatus)
/* 891C8 800EFD18 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus)
/* 891CC 800EFD1C AFBF001C */ sw $ra, 0x1c($sp)
/* 891D0 800EFD20 AFB20018 */ sw $s2, 0x18($sp)
/* 891D4 800EFD24 822200B4 */ lb $v0, 0xb4($s1)
/* 891D8 800EFD28 24120003 */ addiu $s2, $zero, 3
/* 891DC 800EFD2C 14520003 */ bne $v0, $s2, .L800EFD3C
/* 891E0 800EFD30 0000802D */ daddu $s0, $zero, $zero
/* 891E4 800EFD34 3C108011 */ lui $s0, %hi(D_80109480)
/* 891E8 800EFD38 8E109480 */ lw $s0, %lo(D_80109480)($s0)
.L800EFD3C:
/* 891EC 800EFD3C 3C048016 */ lui $a0, %hi(gCollisionStatus+0x2)
/* 891F0 800EFD40 9484A552 */ lhu $a0, %lo(gCollisionStatus+0x2)($a0)
/* 891F4 800EFD44 0C016F6A */ jal get_collider_type_by_id
/* 891F8 800EFD48 00000000 */ nop
/* 891FC 800EFD4C 822300B4 */ lb $v1, 0xb4($s1)
/* 89200 800EFD50 304200FF */ andi $v0, $v0, 0xff
/* 89204 800EFD54 3C018011 */ lui $at, %hi(D_80109480)
/* 89208 800EFD58 AC229480 */ sw $v0, %lo(D_80109480)($at)
/* 8920C 800EFD5C 54720001 */ bnel $v1, $s2, .L800EFD64
/* 89210 800EFD60 0040802D */ daddu $s0, $v0, $zero
.L800EFD64:
/* 89214 800EFD64 2402000A */ addiu $v0, $zero, 0xa
/* 89218 800EFD68 14620008 */ bne $v1, $v0, .L800EFD8C
/* 8921C 800EFD6C 00000000 */ nop
/* 89220 800EFD70 8E220000 */ lw $v0, ($s1)
/* 89224 800EFD74 04410005 */ bgez $v0, .L800EFD8C
/* 89228 800EFD78 00000000 */ nop
/* 8922C 800EFD7C 3C028011 */ lui $v0, %hi(D_8010CFF0)
/* 89230 800EFD80 8C42CFF0 */ lw $v0, %lo(D_8010CFF0)($v0)
/* 89234 800EFD84 3C018011 */ lui $at, %hi(D_8010CFF4)
/* 89238 800EFD88 AC22CFF4 */ sw $v0, %lo(D_8010CFF4)($at)
.L800EFD8C:
/* 8923C 800EFD8C 862200C0 */ lh $v0, 0xc0($s1)
/* 89240 800EFD90 2603FFFF */ addiu $v1, $s0, -1
/* 89244 800EFD94 3C018011 */ lui $at, %hi(D_8010CFF0)
/* 89248 800EFD98 AC22CFF0 */ sw $v0, %lo(D_8010CFF0)($at)
/* 8924C 800EFD9C 2C620009 */ sltiu $v0, $v1, 9
/* 89250 800EFDA0 1040001A */ beqz $v0, .L800EFE0C_892BC
/* 89254 800EFDA4 00031080 */ sll $v0, $v1, 2
/* 89258 800EFDA8 3C018011 */ lui $at, %hi(jtbl_8010C2E8)
/* 8925C 800EFDAC 00220821 */ addu $at, $at, $v0
/* 89260 800EFDB0 8C22C2E8 */ lw $v0, %lo(jtbl_8010C2E8)($at)
/* 89264 800EFDB4 00400008 */ jr $v0
/* 89268 800EFDB8 00000000 */ nop
.L800EFDBC_8926C:
/* 8926C 800EFDBC 0C03C092 */ jal func_800F0248
/* 89270 800EFDC0 00000000 */ nop
/* 89274 800EFDC4 0803BF85 */ j .L800EFE14
/* 89278 800EFDC8 00000000 */ nop
.L800EFDCC_8927C:
/* 8927C 800EFDCC 0C03C124 */ jal func_800F0490
/* 89280 800EFDD0 00000000 */ nop
/* 89284 800EFDD4 0803BF85 */ j .L800EFE14
/* 89288 800EFDD8 00000000 */ nop
.L800EFDDC_8928C:
/* 8928C 800EFDDC 0C03C219 */ jal func_800F0864
/* 89290 800EFDE0 00000000 */ nop
/* 89294 800EFDE4 0803BF85 */ j .L800EFE14
/* 89298 800EFDE8 00000000 */ nop
.L800EFDEC_8929C:
/* 8929C 800EFDEC 0C03C27B */ jal func_800F09EC
/* 892A0 800EFDF0 00000000 */ nop
/* 892A4 800EFDF4 0803BF85 */ j .L800EFE14
/* 892A8 800EFDF8 00000000 */ nop
.L800EFDFC_892AC:
/* 892AC 800EFDFC 0C03C2CF */ jal func_800F0B3C
/* 892B0 800EFE00 00000000 */ nop
/* 892B4 800EFE04 0803BF85 */ j .L800EFE14
/* 892B8 800EFE08 00000000 */ nop
.L800EFE0C_892BC:
/* 892BC 800EFE0C 0C03BF8B */ jal func_800EFE2C
/* 892C0 800EFE10 00000000 */ nop
.L800EFE14:
/* 892C4 800EFE14 8FBF001C */ lw $ra, 0x1c($sp)
/* 892C8 800EFE18 8FB20018 */ lw $s2, 0x18($sp)
/* 892CC 800EFE1C 8FB10014 */ lw $s1, 0x14($sp)
/* 892D0 800EFE20 8FB00010 */ lw $s0, 0x10($sp)
/* 892D4 800EFE24 03E00008 */ jr $ra
/* 892D8 800EFE28 27BD0020 */ addiu $sp, $sp, 0x20