From 4f1ab43ad3da62c9fd23b2bb8d66b35c70579f75 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 24 Sep 2020 22:23:04 +1000 Subject: [PATCH] Decompile menuInitItemMarquee --- src/game/game_0e5ce0.c | 14 ++++++-------- src/include/types.h | 1 + 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 546f7c15d..213b93db7 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -10273,14 +10273,12 @@ bool menuTickItemMarquee(struct menuitem *item, union menuitemtickdata *data) return true; } -GLOBAL_ASM( -glabel menuInitItemMarquee -/* f0edb50: 240e0032 */ addiu $t6,$zero,0x32 -/* f0edb54: a4800000 */ sh $zero,0x0($a0) -/* f0edb58: a48e0004 */ sh $t6,0x4($a0) -/* f0edb5c: 03e00008 */ jr $ra -/* f0edb60: a4800006 */ sh $zero,0x6($a0) -); +void menuInitItemMarquee(union menuitemtickdata *data) +{ + data->marquee.totalmoved = 0; + data->marquee.unk04 = 50; + data->marquee.unk06 = 0; +} Gfx *menuRenderItem07(Gfx *gdl) { diff --git a/src/include/types.h b/src/include/types.h index c36737279..749ffe89a 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -3254,6 +3254,7 @@ struct menuitemtickdata_marquee { u16 totalmoved; u16 sum; u16 unk04; + u16 unk06; }; struct menuitemtickdata_ranking {