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

Match func_802A9634_42A354 (#441)

Browse Source 
* Match func_802A9634_42A354

* Delete func_802A9634_42A354.s

* Update functions.h

* Update squirt.c
This commit is contained in:
JoshDuMan 2021-09-26 17:00:26 -04:00 committed by GitHub
parent 205103bf2e
commit a8571ab3e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/functions.h
View File

@ -508,5 +508,8 @@ void set_window_properties(s32 panelID, s32 posX, s32 posY, s32 width, s32 heigh
void set_window_update(s32 panelID, s32);
void snd_stop_sound(SoundID soundID);
void partner_disable_input(void);
void func_80268798(s32, s32, s32, s32);
void func_802687E4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void sfx_stop_sound(SongID soundID);
#endif

20
src/battle/action_cmd/squirt.c
View File

@ -72,25 +72,21 @@ ApiStatus func_802A911C_429E3C(Evt* script) {
INCLUDE_ASM(s32, "battle/action_cmd/squirt", func_802A9208_429F28);
#ifdef NON_MATCHING
void func_802A9634_42A354(void) {
s32 x, y;
HudElement* hudElement;
s32 hudElement;
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
draw_hud_element_clipped(gActionCommandStatus.hudElements[0]);
hudElement = gActionCommandStatus.hudElements[1];
draw_hud_element_clipped(actionCommandStatus->hudElements[0]);
hudElement = actionCommandStatus->hudElements[1];
draw_hud_element_clipped(hudElement);
get_hud_element_render_pos(hudElement, &x, &y);
if (gActionCommandStatus.unk_5C == 0) {
func_80268798(x, y, gActionCommandStatus.unk_44 / 100, 1);
return;
if (actionCommandStatus->unk_5C == 0) {
func_80268798(x, y, actionCommandStatus->unk_44 / 100, 1);
} else {
func_802687E4(x, y, actionCommandStatus->unk_44 / 100, 1, 1);
}
func_802687E4(x, y, gActionCommandStatus.unk_44 / 100, 1, 1);
}
#else
INCLUDE_ASM(s32, "battle/action_cmd/squirt", func_802A9634_42A354);
#endif
void func_802A9720_42A440(void) {
sfx_stop_sound(0x80000041);

65
ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9634_42A354.s
View File

@ -1,65 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802A9634_42A354
/* 42A354 802A9634 27BDFFD0 */ addiu $sp, $sp, -0x30
/* 42A358 802A9638 AFB10024 */ sw $s1, 0x24($sp)
/* 42A35C 802A963C 3C11802A */ lui $s1, %hi(gActionCommandStatus)
/* 42A360 802A9640 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus)
/* 42A364 802A9644 AFBF0028 */ sw $ra, 0x28($sp)
/* 42A368 802A9648 AFB00020 */ sw $s0, 0x20($sp)
/* 42A36C 802A964C 0C0511EA */ jal draw_hud_element_clipped
/* 42A370 802A9650 8E240004 */ lw $a0, 4($s1)
/* 42A374 802A9654 8E300008 */ lw $s0, 8($s1)
/* 42A378 802A9658 0C0511EA */ jal draw_hud_element_clipped
/* 42A37C 802A965C 0200202D */ daddu $a0, $s0, $zero
/* 42A380 802A9660 0200202D */ daddu $a0, $s0, $zero
/* 42A384 802A9664 27A50018 */ addiu $a1, $sp, 0x18
/* 42A388 802A9668 0C05126B */ jal get_hud_element_render_pos
/* 42A38C 802A966C 27A6001C */ addiu $a2, $sp, 0x1c
/* 42A390 802A9670 8222005C */ lb $v0, 0x5c($s1)
/* 42A394 802A9674 14400013 */ bnez $v0, .L802A96C4
/* 42A398 802A9678 0220802D */ daddu $s0, $s1, $zero
/* 42A39C 802A967C 3C0451EB */ lui $a0, 0x51eb
/* 42A3A0 802A9680 96230044 */ lhu $v1, 0x44($s1)
/* 42A3A4 802A9684 3484851F */ ori $a0, $a0, 0x851f
/* 42A3A8 802A9688 00031C00 */ sll $v1, $v1, 0x10
/* 42A3AC 802A968C 00031403 */ sra $v0, $v1, 0x10
/* 42A3B0 802A9690 00440018 */ mult $v0, $a0
/* 42A3B4 802A9694 24070001 */ addiu $a3, $zero, 1
/* 42A3B8 802A9698 8FA5001C */ lw $a1, 0x1c($sp)
/* 42A3BC 802A969C 00031FC3 */ sra $v1, $v1, 0x1f
/* 42A3C0 802A96A0 8FA40018 */ lw $a0, 0x18($sp)
/* 42A3C4 802A96A4 00004010 */ mfhi $t0
/* 42A3C8 802A96A8 00083143 */ sra $a2, $t0, 5
/* 42A3CC 802A96AC 00C33023 */ subu $a2, $a2, $v1
/* 42A3D0 802A96B0 00063400 */ sll $a2, $a2, 0x10
/* 42A3D4 802A96B4 0C09A1E6 */ jal func_80268798
/* 42A3D8 802A96B8 00063403 */ sra $a2, $a2, 0x10
/* 42A3DC 802A96BC 080AA5C3 */ j .L802A970C
/* 42A3E0 802A96C0 00000000 */ nop
.L802A96C4:
/* 42A3E4 802A96C4 3C0451EB */ lui $a0, 0x51eb
/* 42A3E8 802A96C8 3484851F */ ori $a0, $a0, 0x851f
/* 42A3EC 802A96CC 24070001 */ addiu $a3, $zero, 1
/* 42A3F0 802A96D0 96030044 */ lhu $v1, 0x44($s0)
/* 42A3F4 802A96D4 8FA5001C */ lw $a1, 0x1c($sp)
/* 42A3F8 802A96D8 00031C00 */ sll $v1, $v1, 0x10
/* 42A3FC 802A96DC 00031403 */ sra $v0, $v1, 0x10
/* 42A400 802A96E0 00440018 */ mult $v0, $a0
/* 42A404 802A96E4 00E0102D */ daddu $v0, $a3, $zero
/* 42A408 802A96E8 8FA40018 */ lw $a0, 0x18($sp)
/* 42A40C 802A96EC 00031FC3 */ sra $v1, $v1, 0x1f
/* 42A410 802A96F0 AFA20010 */ sw $v0, 0x10($sp)
/* 42A414 802A96F4 00004010 */ mfhi $t0
/* 42A418 802A96F8 00083143 */ sra $a2, $t0, 5
/* 42A41C 802A96FC 00C33023 */ subu $a2, $a2, $v1
/* 42A420 802A9700 00063400 */ sll $a2, $a2, 0x10
/* 42A424 802A9704 0C09A1F9 */ jal func_802687E4
/* 42A428 802A9708 00063403 */ sra $a2, $a2, 0x10
.L802A970C:
/* 42A42C 802A970C 8FBF0028 */ lw $ra, 0x28($sp)
/* 42A430 802A9710 8FB10024 */ lw $s1, 0x24($sp)
/* 42A434 802A9714 8FB00020 */ lw $s0, 0x20($sp)
/* 42A438 802A9718 03E00008 */ jr $ra
/* 42A43C 802A971C 27BD0030 */ addiu $sp, $sp, 0x30