diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 9b5d789aa..c9ec88e79 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -341,20 +341,12 @@ glabel func0f153ab0 /* f153b3c: 27bd0020 */ addiu $sp,$sp,0x20 ); -GLOBAL_ASM( -glabel func0f153b40 -/* f153b40: 3c04800a */ lui $a0,%hi(var800a4634) -/* f153b44: 3c018008 */ lui $at,%hi(var8007fb9c) -/* f153b48: 24844634 */ addiu $a0,$a0,%lo(var800a4634) -/* f153b4c: ac20fb9c */ sw $zero,%lo(var8007fb9c)($at) -/* f153b50: 8c830000 */ lw $v1,0x0($a0) -/* f153b54: 3c0fb800 */ lui $t7,0xb800 -/* f153b58: 246e0008 */ addiu $t6,$v1,0x8 -/* f153b5c: ac8e0000 */ sw $t6,0x0($a0) -/* f153b60: ac600004 */ sw $zero,0x4($v1) -/* f153b64: 03e00008 */ jr $ra -/* f153b68: ac6f0000 */ sw $t7,0x0($v1) -); +void func0f153b40(void) +{ + var8007fb9c = 0; + + gSPEndDisplayList(var800a4634++); +} GLOBAL_ASM( glabel func0f153b6c diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index b1207049a..7e59aff80 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -15363,7 +15363,7 @@ u32 var800a45c8 = 0; u32 var800a45cc = 0; struct var800a45d0 var800a45d0 = {0}; u32 var800a4630 = 0; -u32 var800a4634 = 0; +Gfx *var800a4634 = NULL; u32 var800a4638 = 0; u32 var800a463c = 0; struct var800a4640 var800a4640 = {0}; diff --git a/src/include/game/game_1531a0.h b/src/include/game/game_1531a0.h index 649c6996d..7936fe886 100644 --- a/src/include/game/game_1531a0.h +++ b/src/include/game/game_1531a0.h @@ -17,7 +17,7 @@ Gfx *func0f1538e4(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2); Gfx *func0f153990(Gfx *gdl, s32 left, s32 top, s32 width, s32 height); Gfx *func0f153a34(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour); u32 func0f153ab0(void); -u32 func0f153b40(void); +void func0f153b40(void); u32 func0f153b6c(void); void func0f153c20(s32 x, s32 y, f32 arg2, u8 arg3); void func0f153c50(void); diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 7d871fa8e..c1485ca0b 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -716,7 +716,7 @@ extern u32 var800a45a8; extern s32 var800a45c0; // count of var800a45c4 extern struct var800a45c4 *var800a45c4; extern struct var800a45d0 var800a45d0; -extern u32 var800a4634; +extern Gfx *var800a4634; extern struct var800a4640 var800a4640; extern u32 var800a491c; extern u32 var800a4920;