From 7fd4294f59d47bc50e54306a17e9c54f0faaaa61 Mon Sep 17 00:00:00 2001 From: gijs Date: Wed, 27 Sep 2023 01:05:10 +0200 Subject: [PATCH] Decompiled `func_80080768` --- include/common.h | 1 + src/_ob_shrill_snail.c | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/include/common.h b/include/common.h index 2466fb3..b5c3ac3 100644 --- a/include/common.h +++ b/include/common.h @@ -569,6 +569,7 @@ extern Gfx DISPLAY_LIST_80186E70[]; extern Gfx DISPLAY_LIST_801869C8[]; extern Gfx DISPLAY_LIST_801FCF70[]; extern Gfx DISPLAY_LIST_801FCF98[]; +extern Gfx DISPLAY_LIST_800A96C8[]; extern Vp obVpMinResolution; diff --git a/src/_ob_shrill_snail.c b/src/_ob_shrill_snail.c index 5768bcd..3e6b7f3 100644 --- a/src/_ob_shrill_snail.c +++ b/src/_ob_shrill_snail.c @@ -1,12 +1,5 @@ #include "common.h" -// INCLUDE_ASM(const s32, "_ob_shrill_snail", func_80080280); - -/* 10680 80080280 */ -void __set_obPtrPtrDisplayList(Gfx **displayList) { - obPtrPtrDisplayList = displayList; -} - extern s8 D_800A96C0; extern s16 D_800B17B4; extern s16 D_800B17B6; @@ -16,9 +9,13 @@ extern s16 D_800B17BC; extern s16 D_800B17BE; extern s16 D_800B17C0; extern u8 D_800B17C2; -extern Gfx** obPtrPtrDisplayList; -extern Gfx DISPLAY_LIST_800A96C8[]; +extern void func_800803B8(); + +/* 10680 80080280 */ +void __set_obPtrPtrDisplayList(Gfx **displayList) { + obPtrPtrDisplayList = displayList; +} /* 1068C 8008028C */ void func_8008028C(void) { @@ -53,12 +50,17 @@ void func_80080304(s16 arg0, s16 arg1) { D_800B17B6 = arg1; } - INCLUDE_ASM(const s32, "_ob_shrill_snail", func_8008038C); INCLUDE_ASM(const s32, "_ob_shrill_snail", func_800803B8); -INCLUDE_ASM(const s32, "_ob_shrill_snail", func_80080768); +/* 10B68 80080768 */ +void func_80080768(s16 arg, s16 arg1, s16 arg2) { + D_800B17B8 = arg1; + D_800B17BA = arg1; + D_800B17BC = arg2; + func_800803B8(); +} INCLUDE_ASM(const s32, "_ob_shrill_snail", func_80080798);