From 9f2d371be709f5534cbabe30a3ccce7f4620f125 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 8 Sep 2021 22:34:24 +1000 Subject: [PATCH] Decompile func0f0d579c --- src/game/game_0d4690.c | 25 +++++-------------------- src/include/game/game_0d4690.h | 2 +- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index f2c799e54..5095dbd6b 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -1046,26 +1046,11 @@ void func0f0d575c(struct savebuffer *buffer, u32 *arg1) savebufferOr(buffer, *(u16 *) (arg1 + 1), 13); } -GLOBAL_ASM( -glabel func0f0d579c -/* f0d579c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0d57a0: afbf0014 */ sw $ra,0x14($sp) -/* f0d57a4: afa5001c */ sw $a1,0x1c($sp) -/* f0d57a8: afa40018 */ sw $a0,0x18($sp) -/* f0d57ac: 0fc354fe */ jal savebufferReadBits -/* f0d57b0: 24050007 */ addiu $a1,$zero,0x7 -/* f0d57b4: 8fae001c */ lw $t6,0x1c($sp) -/* f0d57b8: 2405000d */ addiu $a1,$zero,0xd -/* f0d57bc: adc20000 */ sw $v0,0x0($t6) -/* f0d57c0: 0fc354fe */ jal savebufferReadBits -/* f0d57c4: 8fa40018 */ lw $a0,0x18($sp) -/* f0d57c8: 8faf001c */ lw $t7,0x1c($sp) -/* f0d57cc: a5e20004 */ sh $v0,0x4($t7) -/* f0d57d0: 8fbf0014 */ lw $ra,0x14($sp) -/* f0d57d4: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0d57d8: 03e00008 */ jr $ra -/* f0d57dc: 00000000 */ nop -); +void func0f0d579c(struct savebuffer *buffer, u32 *arg1) +{ + *(s32 *) arg1 = savebufferReadBits(buffer, 7); + *(u16 *) (arg1 + 1) = savebufferReadBits(buffer, 13); +} GLOBAL_ASM( glabel formatTime diff --git a/src/include/game/game_0d4690.h b/src/include/game/game_0d4690.h index 635fc0d65..bab6605d3 100644 --- a/src/include/game/game_0d4690.h +++ b/src/include/game/game_0d4690.h @@ -22,7 +22,7 @@ u32 func0f0d55a4(void); void func0f0d564c(u8 *data, char *dst, bool addlinebreak); void func0f0d5690(u8 *dst, char *buffer); void func0f0d575c(struct savebuffer *buffer, u32 *arg1); -u32 func0f0d579c(void); +void func0f0d579c(struct savebuffer *buffer, u32 *arg1); void formatTime(char *dst, s32 time, u32 arg2); void func0f0d5a7c(void);