diff --git a/ld/gamefiles.inc b/ld/gamefiles.inc index 8eab69d82..b4ff83738 100644 --- a/ld/gamefiles.inc +++ b/ld/gamefiles.inc @@ -173,7 +173,7 @@ build/ROMID/game/game_17f930.o (section); \ build/ROMID/game/mplayer.o (section); \ build/ROMID/game/data/data_02da90.o (section); \ - build/ROMID/game/game_18e5a0.o (section); \ + build/ROMID/game/radar.o (section); \ build/ROMID/game/game_190260.o (section); \ build/ROMID/game/game_197600.o (section); \ build/ROMID/game/game_1999b0.o (section); \ diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index a5bc9ba3f..549ee4435 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -47,7 +47,7 @@ #include "game/game_16e810.h" #include "game/game_177e00.h" #include "game/game_17f930.h" -#include "game/game_18e5a0.h" +#include "game/radar.h" #include "game/training.h" #include "game/game_1a3340.h" #include "game/mplayer.h" @@ -10156,7 +10156,7 @@ Gfx *func0f0c07c8(Gfx *gdl) gdl = hudRenderAmmo(gdl); } - gdl = func0f18f874(gdl); + gdl = radarRender(gdl); gdl = hudRenderMessages(gdl); gdl = currentPlayerDrawFade(gdl); } else { diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c index 5d544f8e8..9ee6b35f3 100644 --- a/src/game/game_17f930.c +++ b/src/game/game_17f930.c @@ -25,7 +25,7 @@ #include "game/game_1531a0.h" #include "game/game_179060.h" #include "game/game_17f930.h" -#include "game/game_18e5a0.h" +#include "game/radar.h" #include "game/game_197600.h" #include "game/game_19aa80.h" #include "game/lang.h" diff --git a/src/game/game_190260.c b/src/game/game_190260.c index 870a49ad5..4156b96f8 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -20,7 +20,7 @@ #include "game/game_157db0.h" #include "game/game_179060.h" #include "game/game_17f930.h" -#include "game/game_18e5a0.h" +#include "game/radar.h" #include "game/game_190260.h" #include "game/game_197600.h" #include "game/game_1999b0.h" diff --git a/src/game/game_18e5a0.c b/src/game/radar.c similarity index 99% rename from src/game/game_18e5a0.c rename to src/game/radar.c index beb1f1228..559b41ccd 100644 --- a/src/game/game_18e5a0.c +++ b/src/game/radar.c @@ -15,7 +15,7 @@ #include "game/game_152fa0.h" #include "game/game_1531a0.h" #include "game/game_17f930.h" -#include "game/game_18e5a0.h" +#include "game/radar.h" #include "game/pdoptions.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" @@ -1251,7 +1251,7 @@ glabel radarDrawDot ); GLOBAL_ASM( -glabel func0f18f874 +glabel radarRender /* f18f874: 27bdff78 */ addiu $sp,$sp,-136 /* f18f878: afb20028 */ sw $s2,0x28($sp) /* f18f87c: 3c12800a */ lui $s2,%hi(g_Vars) diff --git a/src/include/game/game_18e5a0.h b/src/include/game/radar.h similarity index 72% rename from src/include/game/game_18e5a0.h rename to src/include/game/radar.h index 2f6078418..994f160dc 100644 --- a/src/include/game/game_18e5a0.h +++ b/src/include/game/radar.h @@ -1,12 +1,12 @@ -#ifndef IN_GAME_GAME_18E5A0_H -#define IN_GAME_GAME_18E5A0_H +#ifndef IN_GAME_RADAR_H +#define IN_GAME_RADAR_H #include #include "types.h" u32 func0f18e5ac(void); s32 teamGetIndex(s32 team); Gfx *radarDrawDot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour, s32 arg4, s32 arg5); -Gfx *func0f18f874(Gfx *gdl); +Gfx *radarRender(Gfx *gdl); Gfx *radarDrawProps(Gfx *gdl); #endif