From 6a159d9c751057ed2663b2fbbcaad36524cb2861 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 29 Jun 2020 22:38:18 +1000 Subject: [PATCH] Decompile func0001a518 --- src/game/data/data_000000.c | 2 +- src/include/game/data/data_000000.h | 1 + src/include/lib/lib_1a500.h | 2 +- src/lib/lib_1a500.c | 10 ++++------ 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/game/data/data_000000.c b/src/game/data/data_000000.c index 8d3d410af..26149f70e 100644 --- a/src/game/data/data_000000.c +++ b/src/game/data/data_000000.c @@ -4608,7 +4608,7 @@ u32 var8005efb8 = 0x3f800000; u32 var8005efbc = 0x00000000; u32 var8005efc0 = 0x00000000; u32 var8005efc4 = 0x00000000; -u32 var8005efc8 = 0x00000000; +void *var8005efc8 = NULL; // pointer to a function u32 var8005efcc = 0x00000000; u32 var8005efd0 = 0x00000000; u32 var8005efd4 = 0x00000000; diff --git a/src/include/game/data/data_000000.h b/src/include/game/data/data_000000.h index b0ce5cd05..6ffede17f 100644 --- a/src/include/game/data/data_000000.h +++ b/src/include/game/data/data_000000.h @@ -131,6 +131,7 @@ extern u32 var8005ef7c; extern u32 var8005ef90; extern u32 var8005efb4; extern u32 var8005efb8; +extern void *var8005efc8; extern u32 var8005efcc; extern u32 var8005efd0; extern u32 var8005efe0; diff --git a/src/include/lib/lib_1a500.h b/src/include/lib/lib_1a500.h index 5b6d1657c..91c4a7587 100644 --- a/src/include/lib/lib_1a500.h +++ b/src/include/lib/lib_1a500.h @@ -5,7 +5,7 @@ u32 func0001a500(void); u32 func0001a50c(void); -void func0001a518(void *ptr); +void func0001a518(void *callback); u32 func0001a524(void); u32 func0001a5cc(void); u32 func0001a60c(void); diff --git a/src/lib/lib_1a500.c b/src/lib/lib_1a500.c index d98d96742..101d9ee6d 100644 --- a/src/lib/lib_1a500.c +++ b/src/lib/lib_1a500.c @@ -40,12 +40,10 @@ glabel func0001a50c /* 1a514: e42cefb8 */ swc1 $f12,-0x1048($at) ); -GLOBAL_ASM( -glabel func0001a518 -/* 1a518: 3c018006 */ lui $at,%hi(var8005efc8) -/* 1a51c: 03e00008 */ jr $ra -/* 1a520: ac24efc8 */ sw $a0,%lo(var8005efc8)($at) -); +void func0001a518(void *callback) +{ + var8005efc8 = callback; +} GLOBAL_ASM( glabel func0001a524