From 3629973afde1d5d1dc5a80b8fd03ad3a2723bf82 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 24 Sep 2020 22:25:43 +1000 Subject: [PATCH] Decompile menuInitItemScrollable --- src/game/game_0e5ce0.c | 13 +++++-------- src/include/types.h | 8 ++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 213b93db7..3492feb12 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -9637,14 +9637,11 @@ glabel menuTickItemScrollable /* f0ed510: 24020001 */ addiu $v0,$zero,0x1 ); -GLOBAL_ASM( -glabel menuInitItemScrollable -/* f0ed514: 240effff */ addiu $t6,$zero,-1 -/* f0ed518: 240ffff6 */ addiu $t7,$zero,-10 -/* f0ed51c: a48e0006 */ sh $t6,0x6($a0) -/* f0ed520: 03e00008 */ jr $ra -/* f0ed524: a48f0000 */ sh $t7,0x0($a0) -); +void menuInitItemScrollable(union menuitemtickdata *data) +{ + data->scrollable.unk06 = -1; + data->scrollable.unk00 = -10; +} GLOBAL_ASM( glabel menuRenderItemMarquee diff --git a/src/include/types.h b/src/include/types.h index 749ffe89a..24d90bf55 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -3261,6 +3261,13 @@ struct menuitemtickdata_ranking { u16 unk00; }; +struct menuitemtickdata_scrollable { + s16 unk00; + u16 unk02; + u16 unk04; + s16 unk06; +}; + struct menuitemtickdata_slider { u16 unk00; }; @@ -3268,6 +3275,7 @@ struct menuitemtickdata_slider { union menuitemtickdata { struct menuitemtickdata_marquee marquee; struct menuitemtickdata_ranking ranking; + struct menuitemtickdata_scrollable scrollable; struct menuitemtickdata_slider slider; };