From 6570eea1f248c84f1fb6bd5371209a2d8e1f6ac1 Mon Sep 17 00:00:00 2001 From: theo3 Date: Wed, 19 Aug 2020 22:31:54 -0700 Subject: [PATCH] _EntUpdate --- linker.ld | 2 +- src/entity.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/linker.ld b/linker.ld index 2ac92320..b60efc36 100644 --- a/linker.ld +++ b/linker.ld @@ -258,7 +258,7 @@ SECTIONS { . = 0x00005D90; gUnk_03005D90 = .; . = 0x00005E60; gUnk_03005E60 = .; . = 0x00005E98; gUnk_03005E98 = .; - . = 0x00005F24; gUnk_03005F24 = .; + . = 0x00005F24; _EntUpdate = .; . = 0x00005F40; gUnk_03005F40 = .; . = 0x00005FBC; gUnk_03005FBC = .; . = 0x00005FF0; gUnk_03005FF0 = .; diff --git a/src/entity.c b/src/entity.c index e63ea1a0..3b4c9442 100644 --- a/src/entity.c +++ b/src/entity.c @@ -46,13 +46,12 @@ typedef struct { extern struct_03003DD0 gUnk_03003DD0; extern u32 _call_via_r0(u32*); -extern u32 gUnk_03005F24; +extern u32 _EntUpdate; extern void DeleteEntityAny(Entity*); void DeleteThisEntity(void) { DeleteEntityAny(gUnk_03003DD0.field_0x8); - _call_via_r0((u32*)&gUnk_03005F24); - return; + _call_via_r0((u32*)&_EntUpdate); } void DeleteEntity(Entity*);