pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-16 14:32:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Matched a couple random functions (#761)

Browse Source 
* matched function rising_bubble_update

* matched function func_80240A5C_9B21EC

* matched func_802417AC_EAA28C

* fixed build, addressed PR comments

* addressed more PR comments
This commit is contained in:
Kevin Klions 2022-09-07 09:19:01 -04:00 committed by GitHub
parent 0df93d5b2b
commit a580f19ab8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 69 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/effects.h
View File

@ -510,7 +510,15 @@ typedef struct StarsShimmerFXData {
} StarsShimmerFXData; // size = unknown
typedef struct RisingBubbleFXData {
/* 0x00 */ char todo[0];
/* 0x00 */ char unk_00[0x08];
/* 0x08 */ f32 unk_08;
/* 0x0C */ char unk_0C[0x04];
/* 0x10 */ f32 unk_10;
/* 0x14 */ s32 unk_14;
/* 0x18 */ s32 unk_18;
/* 0x1C */ s32 unk_1C;
/* 0x20 */ s32 unk_20;
/* 0x24 */ f32 unk_24;
} RisingBubbleFXData; // size = unknown
typedef struct RingBlastFXData {

22
src/EA8AE0.c
View File

@ -1,6 +1,7 @@
#include "dead.h"
#include "common.h"
#include "effects.h"
#include "battle/battle.h"
// Copy of kzn_19 (C8DBB0.c)
@ -8,6 +9,8 @@
extern s32 D_80248388[];
extern s32 D_80248380;
extern s32 D_80243DD8_EAC8B8;
extern s32 D_80243DDC_EAC8BC;
#include "world/common/atomic/TexturePan.inc.c"
@ -44,7 +47,26 @@ INCLUDE_ASM(s32, "EA8AE0", func_8024140C_EA9EEC);
#include "world/common/AddPlayerHandsOffset.inc.c"
#ifdef NON_MATCHING
ApiStatus func_802417AC_EAA28C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
if (isInitialCall) {
D_80243DD8_EAC8B8 = 0;
}
if (D_80243DD8_EAC8B8 != 0) {
D_80243DD8_EAC8B8 = 0;
dead_evt_set_variable(script, *args++, D_80243DDC_EAC8BC);
return ApiStatus_DONE2;
}
return ApiStatus_BLOCK;
}
#else
INCLUDE_ASM(s32, "EA8AE0", func_802417AC_EAA28C);
#endif
INCLUDE_ASM(s32, "EA8AE0", func_80241800_EAA2E0);

33
src/effects/rising_bubble.c
View File

@ -8,7 +8,38 @@ INCLUDE_ASM(s32, "effects/rising_bubble", rising_bubble_main);
void rising_bubble_init(void) {
}
INCLUDE_ASM(s32, "effects/rising_bubble", rising_bubble_update);
void rising_bubble_update(EffectInstance* effect) {
RisingBubbleFXData* data = effect->data.risingBubble;
s32 temp_a2 = data->unk_18;
if (data->unk_08 >= data->unk_24) {
data->unk_18--;
data->unk_1C++;
if (data->unk_18 < 0) {
shim_remove_effect(effect);
return;
}
if (temp_a2 >= 6) {
data->unk_14 += (120 - data->unk_14) * 0.3;
} else {
data->unk_14 = temp_a2 * 20;
}
data->unk_20++;
if (data->unk_20 >= 32) {
data->unk_20 -= 32;
}
data->unk_10 += 0.1;
return;
}
data->unk_14 = 255;
data->unk_1C++;
data->unk_08 += 2.0f;
}
void rising_bubble_render(EffectInstance* effect) {
RenderTask renderTask;

7
src/world/area_trd/trd_06/9B1AA0.c
View File

@ -1,5 +1,7 @@
#include "trd_06.h"
extern s32 D_802451F0;
INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240310_9B1AA0);
INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240724_9B1EB4);
@ -10,7 +12,10 @@ INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240854_9B1FE4);
INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_8024093C_9B20CC);
INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240A5C_9B21EC);
ApiStatus func_80240A5C_9B21EC(void) {
D_802451F0 = 1;
return ApiStatus_DONE2;
}
ApiStatus func_80240A70_9B2200(Evt* script, s32 isInitialCall) {
f32 partnerCollisionHeight = get_npc_unsafe(NPC_PARTNER)->collisionHeight;

91
ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_update.s
View File

@ -1,91 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E0046638
.double 0.3
dlabel D_E0046640
.double 0.1, 0.0
.section .text
glabel rising_bubble_update
/* 356040 E0046160 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 356044 E0046164 AFBF0010 */ sw $ra, 0x10($sp)
/* 356048 E0046168 8C85000C */ lw $a1, 0xc($a0)
/* 35604C E004616C C4A20008 */ lwc1 $f2, 8($a1)
/* 356050 E0046170 C4A00024 */ lwc1 $f0, 0x24($a1)
/* 356054 E0046174 8CA60018 */ lw $a2, 0x18($a1)
/* 356058 E0046178 4602003E */ c.le.s $f0, $f2
/* 35605C E004617C 00000000 */ nop
/* 356060 E0046180 45000031 */ bc1f .LE0046248
/* 356064 E0046184 24C2FFFF */ addiu $v0, $a2, -1
/* 356068 E0046188 ACA20018 */ sw $v0, 0x18($a1)
/* 35606C E004618C 8CA2001C */ lw $v0, 0x1c($a1)
/* 356070 E0046190 8CA30018 */ lw $v1, 0x18($a1)
/* 356074 E0046194 24420001 */ addiu $v0, $v0, 1
/* 356078 E0046198 04610005 */ bgez $v1, .LE00461B0
/* 35607C E004619C ACA2001C */ sw $v0, 0x1c($a1)
/* 356080 E00461A0 0C080128 */ jal shim_remove_effect
/* 356084 E00461A4 00000000 */ nop
/* 356088 E00461A8 0801189C */ j .LE0046270
/* 35608C E00461AC 00000000 */ nop
.LE00461B0:
/* 356090 E00461B0 28C20006 */ slti $v0, $a2, 6
/* 356094 E00461B4 14400012 */ bnez $v0, .LE0046200
/* 356098 E00461B8 00061080 */ sll $v0, $a2, 2
/* 35609C E00461BC 24020078 */ addiu $v0, $zero, 0x78
/* 3560A0 E00461C0 8CA30014 */ lw $v1, 0x14($a1)
/* 3560A4 E00461C4 3C01E004 */ lui $at, %hi(D_E0046638)
/* 3560A8 E00461C8 D4206638 */ ldc1 $f0, %lo(D_E0046638)($at)
/* 3560AC E00461CC 00431023 */ subu $v0, $v0, $v1
/* 3560B0 E00461D0 44821000 */ mtc1 $v0, $f2
/* 3560B4 E00461D4 00000000 */ nop
/* 3560B8 E00461D8 468010A1 */ cvt.d.w $f2, $f2
/* 3560BC E00461DC 46201082 */ mul.d $f2, $f2, $f0
/* 3560C0 E00461E0 00000000 */ nop
/* 3560C4 E00461E4 44830000 */ mtc1 $v1, $f0
/* 3560C8 E00461E8 00000000 */ nop
/* 3560CC E00461EC 46800021 */ cvt.d.w $f0, $f0
/* 3560D0 E00461F0 46220000 */ add.d $f0, $f0, $f2
/* 3560D4 E00461F4 4620010D */ trunc.w.d $f4, $f0
/* 3560D8 E00461F8 08011883 */ j .LE004620C
/* 3560DC E00461FC E4A40014 */ swc1 $f4, 0x14($a1)
.LE0046200:
/* 3560E0 E0046200 00461021 */ addu $v0, $v0, $a2
/* 3560E4 E0046204 00021080 */ sll $v0, $v0, 2
/* 3560E8 E0046208 ACA20014 */ sw $v0, 0x14($a1)
.LE004620C:
/* 3560EC E004620C 8CA30020 */ lw $v1, 0x20($a1)
/* 3560F0 E0046210 24620001 */ addiu $v0, $v1, 1
/* 3560F4 E0046214 ACA20020 */ sw $v0, 0x20($a1)
/* 3560F8 E0046218 28420020 */ slti $v0, $v0, 0x20
/* 3560FC E004621C 14400002 */ bnez $v0, .LE0046228
/* 356100 E0046220 2462FFE1 */ addiu $v0, $v1, -0x1f
/* 356104 E0046224 ACA20020 */ sw $v0, 0x20($a1)
.LE0046228:
/* 356108 E0046228 C4A00010 */ lwc1 $f0, 0x10($a1)
/* 35610C E004622C 3C01E004 */ lui $at, %hi(D_E0046640)
/* 356110 E0046230 D4226640 */ ldc1 $f2, %lo(D_E0046640)($at)
/* 356114 E0046234 46000021 */ cvt.d.s $f0, $f0
/* 356118 E0046238 46220000 */ add.d $f0, $f0, $f2
/* 35611C E004623C 46200020 */ cvt.s.d $f0, $f0
/* 356120 E0046240 0801189C */ j .LE0046270
/* 356124 E0046244 E4A00010 */ swc1 $f0, 0x10($a1)
.LE0046248:
/* 356128 E0046248 C4A00008 */ lwc1 $f0, 8($a1)
/* 35612C E004624C 3C014000 */ lui $at, 0x4000
/* 356130 E0046250 44811000 */ mtc1 $at, $f2
/* 356134 E0046254 240200FF */ addiu $v0, $zero, 0xff
/* 356138 E0046258 ACA20014 */ sw $v0, 0x14($a1)
/* 35613C E004625C 8CA2001C */ lw $v0, 0x1c($a1)
/* 356140 E0046260 46020000 */ add.s $f0, $f0, $f2
/* 356144 E0046264 24420001 */ addiu $v0, $v0, 1
/* 356148 E0046268 ACA2001C */ sw $v0, 0x1c($a1)
/* 35614C E004626C E4A00008 */ swc1 $f0, 8($a1)
.LE0046270:
/* 356150 E0046270 8FBF0010 */ lw $ra, 0x10($sp)
/* 356154 E0046274 03E00008 */ jr $ra
/* 356158 E0046278 27BD0018 */ addiu $sp, $sp, 0x18

9
ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240A5C_9B21EC.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240A5C_9B21EC
/* 9B21EC 80240A5C 24020001 */ addiu $v0, $zero, 1
/* 9B21F0 80240A60 3C018024 */ lui $at, %hi(D_802451F0)
/* 9B21F4 80240A64 AC2251F0 */ sw $v0, %lo(D_802451F0)($at)
/* 9B21F8 80240A68 03E00008 */ jr $ra
/* 9B21FC 80240A6C 24020002 */ addiu $v0, $zero, 2